make update-po. Now translations can be updated on launchpad.

author: Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> 2010-12-13 20:05:52 +0100
committer: Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> 2010-12-13 20:05:52 +0100
commit: d92eb6c97f7b148b0b3b390bb93ea89179b614c8 (patch)
tree: e9534424b9c8c46e2ed231e371dd8f24d40e8fda /po
parent: 12214ad30d89cc4dc033b1ef912c4072dd80927e (diff)
download: mana-client-d92eb6c97f7b148b0b3b390bb93ea89179b614c8.tar.gz
mana-client-d92eb6c97f7b148b0b3b390bb93ea89179b614c8.tar.bz2
mana-client-d92eb6c97f7b148b0b3b390bb93ea89179b614c8.tar.xz
mana-client-d92eb6c97f7b148b0b3b390bb93ea89179b614c8.zip
39 files changed, 43401 insertions, 43838 deletions
diff --git a/po/POTFILES.in b/po/POTFILES.in
index e2fbe68b..55c2f59d 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -52,7 +52,6 @@ src/gui/textdialog.cpp
 src/gui/trade.cpp
 src/gui/unregisterdialog.cpp
 src/gui/updatewindow.cpp
-src/gui/userpalette.cpp
 src/gui/widgets/channeltab.cpp
 src/gui/widgets/chattab.cpp
 src/gui/widgets/whispertab.cpp
@@ -69,7 +68,6 @@ src/net/manaserv/guildhandler.cpp
 src/net/manaserv/loginhandler.cpp
 src/net/manaserv/partyhandler.cpp
 src/net/manaserv/playerhandler.cpp
-src/net/manaserv/stats.cpp
 src/net/manaserv/tradehandler.cpp
 src/net/tmwa/adminhandler.cpp
 src/net/tmwa/buysellhandler.cpp
@@ -90,6 +88,5 @@ src/net/tmwa/tradehandler.cpp
 src/playerrelations.cpp
 src/resources/itemdb.cpp
 src/resources/monsterdb.cpp
-src/resources/monsterinfo.cpp
 src/utils/gettext.h
 src/utils/stringutils.h
diff --git a/po/ar.po b/po/ar.po
index 5e4a85dc..a14f609c 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2010-03-05 21:52+0100\n"
+"POT-Creation-Date: 2010-12-13 20:04+0100\n"
 "PO-Revision-Date: 2009-06-08 22:01+0000\n"
 "Last-Translator: Thorbjørn Lindeijer <bjorn@lindeijer.nl>\n"
 "Language-Team: Arabic <ar@li.org>\n"
+"Language: ar\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,441 +20,455 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/client.cpp:553 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:62
+#: src/client.cpp:598 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
 msgid "Setup"
 msgstr "تثبيت"
 
-#: src/client.cpp:623
+#: src/client.cpp:679
 #, fuzzy
 msgid "Connecting to server"
 msgstr "جارِ الاتّصال..."
 
-#: src/client.cpp:650
+#: src/client.cpp:706
 #, fuzzy
 msgid "Logging in"
 msgstr "ولوج"
 
-#: src/client.cpp:683
+#: src/client.cpp:739
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:739
+#: src/client.cpp:804
 #, fuzzy
 msgid "Requesting characters"
 msgstr "إنتقاء الشخصيّة"
 
-#: src/client.cpp:768
+#: src/client.cpp:833
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:799 src/client.cpp:806 src/client.cpp:940
+#: src/client.cpp:843
+#, fuzzy
+msgid "Changing game servers"
+msgstr "تغيير"
+
+#: src/client.cpp:872 src/client.cpp:879 src/client.cpp:1014
 #: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
 #: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
-#: src/gui/serverdialog.cpp:261 src/gui/unregisterdialog.cpp:133
-#: src/net/ea/charserverhandler.cpp:135 src/net/ea/charserverhandler.cpp:152
-#: src/net/manaserv/charhandler.cpp:161 src/net/manaserv/charhandler.cpp:204
+#: src/gui/serverdialog.cpp:323 src/gui/unregisterdialog.cpp:133
+#: src/net/manaserv/charhandler.cpp:174 src/net/manaserv/charhandler.cpp:217
+#: src/net/tmwa/charserverhandler.cpp:134
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Error"
 msgstr "خطأ"
 
-#: src/client.cpp:815
+#: src/client.cpp:888
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:842
+#: src/client.cpp:915
 #, fuzzy
 msgid "Password Change"
 msgstr "كلمة السرّ:"
 
-#: src/client.cpp:843
+#: src/client.cpp:916
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:862
+#: src/client.cpp:935
 #, fuzzy
 msgid "Email Change"
 msgstr "تغيير"
 
-#: src/client.cpp:863
+#: src/client.cpp:936
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:883
+#: src/client.cpp:956
 #, fuzzy
 msgid "Unregister Successful"
 msgstr "إلغاء التسجيل"
 
-#: src/client.cpp:884
+#: src/client.cpp:957
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1007 src/client.cpp:1030
+#: src/client.cpp:1138 src/client.cpp:1161
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1119
+#: src/client.cpp:1281
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1153 src/client.cpp:1159
+#: src/client.cpp:1315 src/client.cpp:1321
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/commandhandler.cpp:127 src/commandhandler.cpp:308
+#: src/commandhandler.cpp:131 src/commandhandler.cpp:317
 msgid "Unknown command."
 msgstr ""
 
-#: src/commandhandler.cpp:156
+#: src/commandhandler.cpp:160
 msgid "-- Help --"
 msgstr ""
 
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:161
 msgid "/help > Display this help"
 msgstr ""
 
-#: src/commandhandler.cpp:159
+#: src/commandhandler.cpp:163
 msgid "/where > Display map name"
 msgstr ""
 
-#: src/commandhandler.cpp:160
+#: src/commandhandler.cpp:164
 msgid "/who > Display number of online users"
 msgstr ""
 
-#: src/commandhandler.cpp:161
+#: src/commandhandler.cpp:165
 msgid "/me > Tell something about yourself"
 msgstr ""
 
-#: src/commandhandler.cpp:163
+#: src/commandhandler.cpp:167
 msgid "/clear > Clears this window"
 msgstr ""
 
-#: src/commandhandler.cpp:165
+#: src/commandhandler.cpp:169
 msgid "/msg > Send a private message to a user"
 msgstr ""
 
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:170
 msgid "/whisper > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:167
+#: src/commandhandler.cpp:171
 msgid "/w > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:168
+#: src/commandhandler.cpp:172
 msgid "/query > Makes a tab for private messages with another user"
 msgstr ""
 
-#: src/commandhandler.cpp:169
+#: src/commandhandler.cpp:174
 msgid "/q > Alias of query"
 msgstr ""
 
-#: src/commandhandler.cpp:171
+#: src/commandhandler.cpp:176
 msgid "/ignore > ignore a player"
 msgstr ""
 
-#: src/commandhandler.cpp:172
+#: src/commandhandler.cpp:177
 msgid "/unignore > stop ignoring a player"
 msgstr ""
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:179
 msgid "/list > Display all public channels"
 msgstr ""
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:180
 msgid "/join > Join or create a channel"
 msgstr ""
 
-#: src/commandhandler.cpp:177
+#: src/commandhandler.cpp:182
 msgid "/createparty > Create a new party"
 msgstr ""
 
-#: src/commandhandler.cpp:178
+#: src/commandhandler.cpp:183
 msgid "/party > Invite a user to party"
 msgstr ""
 
-#: src/commandhandler.cpp:180
+#: src/commandhandler.cpp:185
 msgid "/record > Start recording the chat to an external file"
 msgstr ""
 
-#: src/commandhandler.cpp:181
+#: src/commandhandler.cpp:187
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr ""
 
-#: src/commandhandler.cpp:182
+#: src/commandhandler.cpp:189
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
 
-#: src/commandhandler.cpp:184
+#: src/commandhandler.cpp:192
 msgid "/announce > Global announcement (GM only)"
 msgstr ""
 
-#: src/commandhandler.cpp:188
+#: src/commandhandler.cpp:196
 msgid "For more information, type /help <command>."
 msgstr ""
 
-#: src/commandhandler.cpp:192
+#: src/commandhandler.cpp:200
 msgid "Command: /help"
 msgstr ""
 
-#: src/commandhandler.cpp:193
+#: src/commandhandler.cpp:201
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: src/commandhandler.cpp:194
+#: src/commandhandler.cpp:203
 msgid "Command: /help <command>"
 msgstr ""
 
-#: src/commandhandler.cpp:195
+#: src/commandhandler.cpp:204
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/commandhandler.cpp:203
+#: src/commandhandler.cpp:212
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: src/commandhandler.cpp:204
+#: src/commandhandler.cpp:213
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/commandhandler.cpp:205
+#: src/commandhandler.cpp:214
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:210
+#: src/commandhandler.cpp:219
 msgid "Command: /clear"
 msgstr ""
 
-#: src/commandhandler.cpp:211
+#: src/commandhandler.cpp:220
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:224
 msgid "Command: /ignore <player>"
 msgstr ""
 
-#: src/commandhandler.cpp:216
+#: src/commandhandler.cpp:225
 msgid "This command ignores the given player regardless of current relations."
 msgstr ""
 
-#: src/commandhandler.cpp:221
+#: src/commandhandler.cpp:230
 msgid "Command: /join <channel>"
 msgstr ""
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:231
 msgid "This command makes you enter <channel>."
 msgstr ""
 
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:232
 msgid "If <channel> doesn't exist, it's created."
 msgstr ""
 
-#: src/commandhandler.cpp:227
+#: src/commandhandler.cpp:236
 msgid "Command: /list"
 msgstr ""
 
-#: src/commandhandler.cpp:228
+#: src/commandhandler.cpp:237
 msgid "This command shows a list of all channels."
 msgstr ""
 
-#: src/commandhandler.cpp:232
+#: src/commandhandler.cpp:241
 msgid "Command: /me <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:233
+#: src/commandhandler.cpp:242
 msgid "This command tell others you are (doing) <msg>."
 msgstr ""
 
-#: src/commandhandler.cpp:237
+#: src/commandhandler.cpp:246
 msgid "Command: /msg <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:238
+#: src/commandhandler.cpp:247
 msgid "Command: /whisper <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:239
+#: src/commandhandler.cpp:248
 msgid "Command: /w <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:240
+#: src/commandhandler.cpp:249
 msgid "This command sends the text <message> to <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:241 src/commandhandler.cpp:260
+#: src/commandhandler.cpp:250 src/commandhandler.cpp:269
 #: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
-#: src/net/ea/gui/guildtab.cpp:75 src/net/ea/gui/partytab.cpp:75
+#: src/net/tmwa/gui/guildtab.cpp:75 src/net/tmwa/gui/partytab.cpp:75
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:255
 msgid "Command: /query <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:247
+#: src/commandhandler.cpp:256
 msgid "Command: /q <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:248
+#: src/commandhandler.cpp:257
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:253
+#: src/commandhandler.cpp:262
 msgid "Command: /createparty <name>"
 msgstr ""
 
-#: src/commandhandler.cpp:254
+#: src/commandhandler.cpp:263
 msgid "This command creates a new party called <name>."
 msgstr ""
 
-#: src/commandhandler.cpp:258
+#: src/commandhandler.cpp:267
 msgid "Command: /party <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:259 src/net/ea/gui/partytab.cpp:74
+#: src/commandhandler.cpp:268 src/net/tmwa/gui/partytab.cpp:74
 msgid "This command invites <nick> to party with you."
 msgstr ""
 
-#: src/commandhandler.cpp:265
+#: src/commandhandler.cpp:274
 msgid "Command: /present"
 msgstr ""
 
-#: src/commandhandler.cpp:266
+#: src/commandhandler.cpp:275
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: src/commandhandler.cpp:272
+#: src/commandhandler.cpp:281
 msgid "Command: /record <filename>"
 msgstr ""
 
-#: src/commandhandler.cpp:273
+#: src/commandhandler.cpp:282
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr ""
 
-#: src/commandhandler.cpp:275
+#: src/commandhandler.cpp:284
 msgid "Command: /record"
 msgstr ""
 
-#: src/commandhandler.cpp:276
+#: src/commandhandler.cpp:285
 msgid "This command finishes a recording session."
 msgstr ""
 
-#: src/commandhandler.cpp:280
+#: src/commandhandler.cpp:289
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: src/commandhandler.cpp:281
+#: src/commandhandler.cpp:290
 msgid ""
 "This command sets whether the return key should toggle the chat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: src/commandhandler.cpp:283
+#: src/commandhandler.cpp:292
 msgid ""
-"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
-"\", \"no\", \"false\" to turn the toggle off."
+"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
+"\"0\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: src/commandhandler.cpp:286
+#: src/commandhandler.cpp:295
 msgid "Command: /toggle"
 msgstr ""
 
-#: src/commandhandler.cpp:287
+#: src/commandhandler.cpp:296
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: src/commandhandler.cpp:291 src/gui/widgets/whispertab.cpp:93
+#: src/commandhandler.cpp:300 src/gui/widgets/whispertab.cpp:95
 msgid "Command: /unignore <player>"
 msgstr ""
 
-#: src/commandhandler.cpp:292
+#: src/commandhandler.cpp:301
 msgid "This command stops ignoring the given player if they are being ignored"
 msgstr ""
 
-#: src/commandhandler.cpp:297
+#: src/commandhandler.cpp:306
 msgid "Command: /where"
 msgstr ""
 
-#: src/commandhandler.cpp:298
+#: src/commandhandler.cpp:307
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: src/commandhandler.cpp:302
+#: src/commandhandler.cpp:311
 msgid "Command: /who"
 msgstr ""
 
-#: src/commandhandler.cpp:303
+#: src/commandhandler.cpp:312
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:309
+#: src/commandhandler.cpp:318
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: src/commandhandler.cpp:375
+#: src/commandhandler.cpp:384
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:383
+#: src/commandhandler.cpp:392
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:397
+#: src/commandhandler.cpp:406
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:410 src/net/ea/gui/partytab.cpp:109
+#: src/commandhandler.cpp:419 src/net/tmwa/gui/partytab.cpp:109
 msgid "Party name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:423 src/commandhandler.cpp:471
-#: src/commandhandler.cpp:493
+#: src/commandhandler.cpp:432 src/commandhandler.cpp:509
+#: src/commandhandler.cpp:531
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:441
+#: src/commandhandler.cpp:450
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:441
+#: src/commandhandler.cpp:450
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:450
+#: src/commandhandler.cpp:459
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:454
+#: src/commandhandler.cpp:463
 msgid "Message now closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:477
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:489
+msgid "Show IP: On"
+msgstr ""
+
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:485
+msgid "Show IP: Off"
+msgstr ""
+
+#: src/commandhandler.cpp:515
 msgid "Player already ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:484
+#: src/commandhandler.cpp:522
 msgid "Player successfully ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:486
+#: src/commandhandler.cpp:524
 msgid "Player could not be ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:501
+#: src/commandhandler.cpp:539
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:506
+#: src/commandhandler.cpp:544
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:508
+#: src/commandhandler.cpp:546
 msgid "Player could not be unignored!"
 msgstr ""
 
@@ -466,40 +481,40 @@ msgstr ""
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:326
+#: src/game.cpp:342
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:331
+#: src/game.cpp:347
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:355
+#: src/game.cpp:378
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:360
+#: src/game.cpp:382
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:705
+#: src/game.cpp:721
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:712
+#: src/game.cpp:726
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:946
+#: src/game.cpp:954
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:947
+#: src/game.cpp:955
 #, c-format
 msgid "Error while loading %s"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:75
+#: src/gui/beingpopup.cpp:76
 #, c-format
 msgid "Party: %s"
 msgstr ""
@@ -508,34 +523,34 @@ msgstr ""
 msgid "Buy"
 msgstr "شراء"
 
-#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
-#: src/gui/sell.cpp:276
+#: src/gui/buy.cpp:69 src/gui/buy.cpp:261 src/gui/sell.cpp:71
+#: src/gui/sell.cpp:288
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:99 src/gui/npcdialog.cpp:100
-#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:479
+#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:112 src/gui/npcdialog.cpp:124
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:463
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:98 src/gui/npcdialog.cpp:101
-#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:491
+#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:111 src/gui/npcdialog.cpp:125
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:475
 msgid "-"
 msgstr ""
 
 #: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
-#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:182
-#: src/keyboardconfig.cpp:103
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:228
+#: src/keyboardconfig.cpp:102
 msgid "Quit"
 msgstr "مغادرة"
 
-#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:408
-#: src/gui/statuswindow.cpp:478 src/gui/statuswindow.cpp:512
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:384
+#: src/gui/statuswindow.cpp:462 src/gui/statuswindow.cpp:496
 msgid "Max"
 msgstr ""
 
@@ -549,11 +564,11 @@ msgstr "بيع"
 
 #: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
 #: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
-#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:101
-#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:178
-#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:402
+#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:114
+#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:389
 #: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
-#: src/gui/socialwindow.cpp:242 src/gui/textdialog.cpp:39
+#: src/gui/socialwindow.cpp:275 src/gui/textdialog.cpp:40
 #: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr "إلغاء"
@@ -590,7 +605,7 @@ msgstr ""
 msgid "Change Password"
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:53
+#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:55
 #: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
 msgid "Password:"
 msgstr "كلمة السرّ:"
@@ -621,19 +636,19 @@ msgstr ""
 msgid "Create Character"
 msgstr "إنشاء شخصيّة"
 
-#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:52
+#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:54
 #: src/gui/register.cpp:67
 msgid "Name:"
 msgstr "الاسم:"
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
 #: src/gui/outfitwindow.cpp:67
 msgid ">"
 msgstr ""
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
 #: src/gui/outfitwindow.cpp:66
@@ -650,8 +665,8 @@ msgstr "لون الشعر:"
 msgid "Hair style:"
 msgstr "قصّة الشعر:"
 
-#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:397
-#: src/gui/socialwindow.cpp:296
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:392
+#: src/gui/socialwindow.cpp:329
 msgid "Create"
 msgstr "إنشاء"
 
@@ -707,33 +722,33 @@ msgstr "إلغاء التسجيل"
 msgid "Change Email"
 msgstr "تغيير"
 
-#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:185
-#: src/gui/setup_players.cpp:230
+#: src/gui/charselectdialog.cpp:336 src/gui/serverdialog.cpp:231
+#: src/gui/setup_players.cpp:229
 msgid "Delete"
 msgstr "حذف"
 
-#: src/gui/charselectdialog.cpp:387
+#: src/gui/charselectdialog.cpp:380
 msgid "Choose"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:399 src/gui/charselectdialog.cpp:400
+#: src/gui/charselectdialog.cpp:394 src/gui/charselectdialog.cpp:395
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:77 src/gui/palette.cpp:96
+#: src/gui/chat.cpp:88
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chat.cpp:287
+#: src/gui/chat.cpp:311
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:305
+#: src/gui/chat.cpp:329
 msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:469
+#: src/gui/chat.cpp:493
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -795,142 +810,172 @@ msgstr ""
 msgid "Ambient FX: %s"
 msgstr "مؤثّرات محيطة"
 
-#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:56
+#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:55
 msgid "Equipment"
 msgstr "العتاد"
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:77
-#: src/gui/inventorywindow.cpp:79 src/gui/inventorywindow.cpp:298
-#: src/gui/popupmenu.cpp:372
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:89
+#: src/gui/inventorywindow.cpp:337 src/gui/popupmenu.cpp:359
 msgid "Unequip"
 msgstr "تجريد من العتاد"
 
-#: src/gui/help.cpp:36
+#: src/gui/help.cpp:37
 msgid "Help"
 msgstr ""
 
-#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:73
+#: src/gui/help.cpp:51 src/gui/npcdialog.cpp:50
 msgid "Close"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:56 src/gui/windowmenu.cpp:57
+#: src/gui/inventorywindow.cpp:59 src/gui/windowmenu.cpp:56
 msgid "Inventory"
 msgstr "الجردة"
 
-#: src/gui/inventorywindow.cpp:72 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:300 src/gui/popupmenu.cpp:374
+#: src/gui/inventorywindow.cpp:59
+msgid "Storage"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:82
+msgid "Slots:"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:87 src/gui/inventorywindow.cpp:100
+#: src/gui/inventorywindow.cpp:339 src/gui/popupmenu.cpp:361
 msgid "Equip"
 msgstr "استعمال العتاد"
 
-#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:304 src/gui/popupmenu.cpp:377
+#: src/gui/inventorywindow.cpp:88
 msgid "Use"
 msgstr "استخدام"
 
-#: src/gui/inventorywindow.cpp:83 src/gui/inventorywindow.cpp:308
-#: src/gui/popupmenu.cpp:380
+#: src/gui/inventorywindow.cpp:101 src/gui/popupmenu.cpp:364
+msgid "Activate"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:102 src/gui/inventorywindow.cpp:348
+#: src/gui/popupmenu.cpp:367
 #, fuzzy
 msgid "Drop..."
 msgstr "إسقاط"
 
-#: src/gui/inventorywindow.cpp:84 src/gui/popupmenu.cpp:386
+#: src/gui/inventorywindow.cpp:103 src/gui/popupmenu.cpp:373
 msgid "Split"
 msgstr "قسم"
 
-#: src/gui/inventorywindow.cpp:85 src/gui/outfitwindow.cpp:51
+#: src/gui/inventorywindow.cpp:104 src/gui/outfitwindow.cpp:51
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:96 src/gui/storagewindow.cpp:83
-msgid "Slots:"
+#: src/gui/inventorywindow.cpp:106
+msgid "Weight:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:97
-msgid "Weight:"
+#: src/gui/inventorywindow.cpp:124 src/gui/popupmenu.cpp:378
+msgid "Store"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:310 src/gui/popupmenu.cpp:382
+#: src/gui/inventorywindow.cpp:125 src/gui/popupmenu.cpp:385
+msgid "Retrieve"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:350 src/gui/popupmenu.cpp:369
 msgid "Drop"
 msgstr "إسقاط"
 
-#: src/gui/itemamount.cpp:100 src/gui/okdialog.cpp:42
-#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:38 src/gui/trade.cpp:73
-#: src/gui/trade.cpp:75
+#: src/gui/itemamount.cpp:113 src/gui/okdialog.cpp:42
+#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:39 src/gui/trade.cpp:72
+#: src/gui/trade.cpp:74
 msgid "OK"
 msgstr ""
 
-#: src/gui/itemamount.cpp:102
+#: src/gui/itemamount.cpp:115
 msgid "All"
 msgstr ""
 
-#: src/gui/itemamount.cpp:128
+#: src/gui/itemamount.cpp:141
 msgid "Select amount of items to trade."
 msgstr "انتقاء كمّيّة من المواد للمتاجرة بها."
 
-#: src/gui/itemamount.cpp:131
+#: src/gui/itemamount.cpp:144
 msgid "Select amount of items to drop."
 msgstr "انتقاء كمّيّة من المواد لإسقاطها."
 
-#: src/gui/itemamount.cpp:134
+#: src/gui/itemamount.cpp:147
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/itemamount.cpp:137
+#: src/gui/itemamount.cpp:150
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamount.cpp:140
+#: src/gui/itemamount.cpp:153
 msgid "Select amount of items to split."
 msgstr "انتقاء كمّيّة من المواد لقسمها."
 
-#: src/gui/itempopup.cpp:92
+#: src/gui/itempopup.cpp:137
 #, fuzzy, c-format
 msgid "Weight: %s"
 msgstr "التأثير: %s"
 
-#: src/gui/login.cpp:49 src/gui/login.cpp:61
+#: src/gui/login.cpp:51 src/gui/login.cpp:63
 msgid "Login"
 msgstr "ولوج"
 
-#: src/gui/login.cpp:58
+#: src/gui/login.cpp:60
 msgid "Remember username"
 msgstr ""
 
-#: src/gui/login.cpp:59 src/gui/register.cpp:58 src/gui/register.cpp:73
+#: src/gui/login.cpp:61 src/gui/register.cpp:58 src/gui/register.cpp:73
 msgid "Register"
 msgstr "تسجيل"
 
-#: src/gui/login.cpp:60
+#: src/gui/login.cpp:62
 #, fuzzy
 msgid "Change Server"
 msgstr "تغيير"
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
+#: src/gui/login.cpp:129
+msgid "Registration disabled"
+msgstr ""
+
+#: src/gui/login.cpp:129
+msgid "You need to use the website to register an account for this server."
+msgstr ""
+
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:86
 msgid "Map"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:44
+#: src/gui/ministatus.cpp:235
+msgid "Need"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:48
 msgid "Waiting for server"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:45
+#: src/gui/npcdialog.cpp:49
 msgid "Next"
 msgstr "التّالي"
 
-#: src/gui/npcdialog.cpp:47
+#: src/gui/npcdialog.cpp:51
 msgid "Submit"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:52 src/gui/npcpostdialog.cpp:41
+#: src/gui/npcdialog.cpp:73 src/gui/npcpostdialog.cpp:41
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:110
+#: src/gui/npcdialog.cpp:118
+msgid "Clear log"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:134
 msgid "Reset"
 msgstr ""
 
 #. TRANSLATORS: Please leave the \n sequences intact.
-#: src/gui/npcdialog.cpp:171
+#: src/gui/npcdialog.cpp:208
 #, fuzzy
 msgid ""
 "\n"
@@ -945,7 +990,7 @@ msgstr ""
 msgid "Send"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:96
+#: src/gui/npcpostdialog.cpp:99
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
@@ -960,303 +1005,82 @@ msgstr ""
 msgid "Unequip first"
 msgstr "تجريد من العتاد"
 
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:143
-msgid "Text"
-msgstr ""
-
-#: src/gui/palette.cpp:82
-msgid "Text Shadow"
-msgstr ""
-
-#: src/gui/palette.cpp:83
-msgid "Text Outline"
-msgstr ""
-
-#: src/gui/palette.cpp:84
-msgid "Progress Bar Labels"
-msgstr ""
-
-#: src/gui/palette.cpp:85
-msgid "Buttons"
-msgstr ""
-
-#: src/gui/palette.cpp:86
-msgid "Disabled Buttons"
-msgstr ""
-
-#: src/gui/palette.cpp:87
-msgid "Tabs"
-msgstr ""
-
-#: src/gui/palette.cpp:89
-msgid "Background"
-msgstr ""
-
-#: src/gui/palette.cpp:91
-msgid "Highlight"
-msgstr ""
-
-#: src/gui/palette.cpp:92
-msgid "Tab Highlight"
-msgstr ""
-
-#: src/gui/palette.cpp:93
-msgid "Item Too Expensive"
-msgstr ""
-
-#: src/gui/palette.cpp:94
-msgid "Item Is Equipped"
-msgstr ""
-
-#: src/gui/palette.cpp:97
-msgid "GM"
-msgstr ""
-
-#: src/gui/palette.cpp:98
-msgid "Player"
-msgstr ""
-
-#: src/gui/palette.cpp:99
-msgid "Whisper"
-msgstr ""
-
-#: src/gui/palette.cpp:100
-msgid "Is"
-msgstr ""
-
-#: src/gui/palette.cpp:101 src/net/ea/gui/partytab.cpp:43
-msgid "Party"
-msgstr ""
-
-#: src/gui/palette.cpp:102 src/net/ea/gui/guildtab.cpp:45
-msgid "Guild"
-msgstr ""
-
-#: src/gui/palette.cpp:103
-msgid "Server"
-msgstr ""
-
-#: src/gui/palette.cpp:104
-msgid "Logger"
-msgstr ""
-
-#: src/gui/palette.cpp:105
-msgid "Hyperlink"
-msgstr ""
-
-#: src/gui/palette.cpp:107
-msgid "Being"
-msgstr ""
-
-#: src/gui/palette.cpp:108
-msgid "Other Players' Names"
-msgstr ""
-
-#: src/gui/palette.cpp:109
-msgid "Own Name"
-msgstr ""
-
-#: src/gui/palette.cpp:110
-msgid "GM Names"
-msgstr ""
-
-#: src/gui/palette.cpp:111
-msgid "NPCs"
-msgstr ""
-
-#: src/gui/palette.cpp:112
-msgid "Monsters"
-msgstr ""
-
-#: src/gui/palette.cpp:114
-msgid "Unknown Item Type"
-msgstr ""
-
-#: src/gui/palette.cpp:115
-msgid "Generics"
-msgstr ""
-
-#: src/gui/palette.cpp:116
-msgid "Hats"
-msgstr ""
-
-#: src/gui/palette.cpp:117
-msgid "Usables"
-msgstr ""
-
-#: src/gui/palette.cpp:118
-msgid "Shirts"
-msgstr ""
-
-#: src/gui/palette.cpp:119
-msgid "One Handed Weapons"
-msgstr ""
-
-#: src/gui/palette.cpp:120
-msgid "Pants"
-msgstr ""
-
-#: src/gui/palette.cpp:121
-msgid "Shoes"
-msgstr ""
-
-#: src/gui/palette.cpp:122
-msgid "Two Handed Weapons"
-msgstr ""
-
-#: src/gui/palette.cpp:123
-msgid "Shields"
-msgstr ""
-
-#: src/gui/palette.cpp:124
-msgid "Rings"
-msgstr ""
-
-#: src/gui/palette.cpp:125
-msgid "Necklaces"
-msgstr ""
-
-#: src/gui/palette.cpp:126
-msgid "Arms"
-msgstr ""
-
-#: src/gui/palette.cpp:127
-msgid "Ammo"
-msgstr ""
-
-#: src/gui/palette.cpp:129
-msgid "Particle Effects"
-msgstr ""
-
-#: src/gui/palette.cpp:130
-msgid "Pickup Notification"
-msgstr ""
-
-#: src/gui/palette.cpp:131
-msgid "Exp Notification"
-msgstr ""
-
-#: src/gui/palette.cpp:133
-msgid "Player Hits Monster"
-msgstr ""
-
-#: src/gui/palette.cpp:135
-msgid "Monster Hits Player"
-msgstr ""
-
-#: src/gui/palette.cpp:136
-msgid "Critical Hit"
-msgstr ""
-
-#: src/gui/palette.cpp:137
-msgid "Misses"
-msgstr ""
-
-#: src/gui/palette.cpp:139
-msgid "HP Bar"
-msgstr ""
-
-#: src/gui/palette.cpp:140
-msgid "3/4 HP Bar"
-msgstr ""
-
-#: src/gui/palette.cpp:141
-msgid "1/2 HP Bar"
-msgstr ""
-
-#: src/gui/palette.cpp:142
-msgid "1/4 HP Bar"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:84
+#: src/gui/popupmenu.cpp:83
 #, fuzzy, c-format
 msgid "Trade with %s..."
 msgstr "@@تجارة|متاجرة مع %s@@"
 
-#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:161
+#: src/gui/popupmenu.cpp:87 src/gui/popupmenu.cpp:158
 #, fuzzy, c-format
 msgid "Attack %s"
 msgstr "مهاجمة %+d"
 
-#: src/gui/popupmenu.cpp:92
+#: src/gui/popupmenu.cpp:91
 #, c-format
 msgid "Whisper %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:101
+#: src/gui/popupmenu.cpp:100
 #, c-format
 msgid "Befriend %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:106
+#: src/gui/popupmenu.cpp:105
 #, c-format
 msgid "Disregard %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:109
+#: src/gui/popupmenu.cpp:108
 #, c-format
 msgid "Ignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:115 src/gui/popupmenu.cpp:124
+#: src/gui/popupmenu.cpp:114 src/gui/popupmenu.cpp:123
 #, c-format
 msgid "Unignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:118
+#: src/gui/popupmenu.cpp:117
 #, c-format
 msgid "Completely ignore %s"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:130
 #, c-format
-msgid "Follow %s"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:133
-#, c-format
 msgid "Invite %s to join your guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:137
+#: src/gui/popupmenu.cpp:134
 #, c-format
 msgid "Invite %s to join your party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144
+#: src/gui/popupmenu.cpp:141
 msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:153
+#: src/gui/popupmenu.cpp:150
 #, c-format
 msgid "Talk to %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:166
+#: src/gui/popupmenu.cpp:163
 msgid "Kick monster"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:174
+#: src/gui/popupmenu.cpp:171
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:191
+#: src/gui/popupmenu.cpp:188
 #, c-format
 msgid "Pick up %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:400
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:387
 msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:70
-msgid "Store"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:71
-msgid "Retrieve"
-msgstr ""
-
 #: src/gui/quitdialog.cpp:44
 msgid "Switch server"
 msgstr "تبديل الخادوم"
@@ -1325,50 +1149,63 @@ msgstr "يجب أن يكون طول كلمة السرّ أقل من %d محار�
 msgid "Passwords do not match."
 msgstr "كلمات السرّ غير متطابقة."
 
-#: src/gui/serverdialog.cpp:134
+#: src/gui/serverdialog.cpp:197
 msgid "Choose Your Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:141 src/gui/widgets/chattab.cpp:139
+#: src/gui/serverdialog.cpp:206 src/gui/widgets/chattab.cpp:142
 msgid "Server:"
 msgstr "الخادوم:"
 
-#: src/gui/serverdialog.cpp:142
+#: src/gui/serverdialog.cpp:207
 msgid "Port:"
 msgstr "المنفذ:"
 
-#: src/gui/serverdialog.cpp:143
+#: src/gui/serverdialog.cpp:208
 #, fuzzy
 msgid "Server type:"
 msgstr "الخادوم:"
 
-#: src/gui/serverdialog.cpp:183
+#: src/gui/serverdialog.cpp:229
 #, fuzzy
 msgid "Connect"
 msgstr "جارِ الاتّصال..."
 
-#: src/gui/serverdialog.cpp:184
+#: src/gui/serverdialog.cpp:230
 #, fuzzy
 msgid "Custom Server"
 msgstr "مؤشّر مخصّص"
 
-#: src/gui/serverdialog.cpp:262
+#: src/gui/serverdialog.cpp:324
 msgid "Please type both the address and the port of a server."
 msgstr "رجاء طباعة عنوان ومنفذ الخادوم."
 
-#: src/gui/serverdialog.cpp:411
+#: src/gui/serverdialog.cpp:441
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:417
+#: src/gui/serverdialog.cpp:447
 msgid "Waiting for server..."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:421
+#: src/gui/serverdialog.cpp:451
 msgid "Preparing download"
 msgstr ""
 
+#: src/gui/serverdialog.cpp:455
+msgid "Error retreiving server list!"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:550
+msgid "requires a newer version"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:552
+#, c-format
+msgid "requires v%s"
+msgstr ""
+
 #: src/gui/setup_audio.cpp:42
 msgid "Sound"
 msgstr "صوت"
@@ -1401,50 +1238,50 @@ msgstr ""
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:44
+#: src/gui/setup_colors.cpp:46
 msgid "This is what the color looks like"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:49
+#: src/gui/setup_colors.cpp:51
 msgid "Colors"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:70
+#: src/gui/setup_colors.cpp:72
 msgid "Type:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:81 src/gui/setup_colors.cpp:433
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:331
 msgid "Static"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:84
-#: src/gui/setup_colors.cpp:434
+#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
+#: src/gui/setup_colors.cpp:332
 msgid "Pulse"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
+#: src/gui/setup_colors.cpp:333
 msgid "Rainbow"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
+#: src/gui/setup_colors.cpp:333
 msgid "Spectrum"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:92
+#: src/gui/setup_colors.cpp:94
 msgid "Delay:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:107
+#: src/gui/setup_colors.cpp:109
 msgid "Red:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:122
+#: src/gui/setup_colors.cpp:124
 msgid "Green:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:137
+#: src/gui/setup_colors.cpp:139
 msgid "Blue:"
 msgstr ""
 
@@ -1489,569 +1326,581 @@ msgid "Assign"
 msgstr ""
 
 #: src/gui/setup_keyboard.cpp:90
+msgid "Unassign"
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:94
 msgid "Default"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:119
+#: src/gui/setup_keyboard.cpp:125
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_players.cpp:57
+#: src/gui/setup_players.cpp:58
 msgid "Name"
 msgstr ""
 
-#: src/gui/setup_players.cpp:58
+#: src/gui/setup_players.cpp:59
 msgid "Relation"
 msgstr ""
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:64
 msgid "Neutral"
 msgstr ""
 
-#: src/gui/setup_players.cpp:64
+#: src/gui/setup_players.cpp:65
 msgid "Friend"
 msgstr ""
 
-#: src/gui/setup_players.cpp:65
+#: src/gui/setup_players.cpp:66
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_players.cpp:67
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_players.cpp:208 src/gui/setup_video.cpp:132
+#: src/gui/setup_players.cpp:206 src/gui/setup_video.cpp:153
 msgid "???"
 msgstr ""
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_players.cpp:225
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_players.cpp:228
+#: src/gui/setup_players.cpp:227
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:231
 msgid "Put all whispers in tabs"
 msgstr ""
 
-#: src/gui/setup_players.cpp:234
+#: src/gui/setup_players.cpp:233
 msgid "Show gender"
 msgstr ""
 
-#: src/gui/setup_players.cpp:236
+#: src/gui/setup_players.cpp:235
+msgid "Enable Chat log"
+msgstr ""
+
+#: src/gui/setup_players.cpp:237
 msgid "Players"
 msgstr ""
 
-#: src/gui/setup_players.cpp:261
+#: src/gui/setup_players.cpp:262
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:113
+#: src/gui/setup_video.cpp:134
 msgid "Tiny"
 msgstr ""
 
-#: src/gui/setup_video.cpp:114
+#: src/gui/setup_video.cpp:135
 msgid "Small"
 msgstr ""
 
-#: src/gui/setup_video.cpp:115
+#: src/gui/setup_video.cpp:136
 msgid "Medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:116
+#: src/gui/setup_video.cpp:137
 msgid "Large"
 msgstr ""
 
-#: src/gui/setup_video.cpp:142
+#: src/gui/setup_video.cpp:163
 msgid "No text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:144
+#: src/gui/setup_video.cpp:164
+msgid "Text"
+msgstr ""
+
+#: src/gui/setup_video.cpp:165
 msgid "Bubbles, no names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:145
+#: src/gui/setup_video.cpp:166
 msgid "Bubbles with names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:157
+#: src/gui/setup_video.cpp:178
 msgid "off"
 msgstr "واقف"
 
-#: src/gui/setup_video.cpp:158 src/gui/setup_video.cpp:171
+#: src/gui/setup_video.cpp:179 src/gui/setup_video.cpp:192
 msgid "low"
 msgstr "منخفض"
 
-#: src/gui/setup_video.cpp:159 src/gui/setup_video.cpp:173
+#: src/gui/setup_video.cpp:180 src/gui/setup_video.cpp:194
 msgid "high"
 msgstr "مرتفع"
 
-#: src/gui/setup_video.cpp:172
+#: src/gui/setup_video.cpp:193
 msgid "medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:174
+#: src/gui/setup_video.cpp:195
 msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:196
+#: src/gui/setup_video.cpp:217
 msgid "Full screen"
 msgstr "ملء الشاشة"
 
-#: src/gui/setup_video.cpp:197
+#: src/gui/setup_video.cpp:218
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:198
+#: src/gui/setup_video.cpp:219
 msgid "Custom cursor"
 msgstr "مؤشّر مخصّص"
 
-#: src/gui/setup_video.cpp:200
+#: src/gui/setup_video.cpp:221
 msgid "Visible names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:223
 msgid "Particle effects"
 msgstr ""
 
-#: src/gui/setup_video.cpp:204
+#: src/gui/setup_video.cpp:225
 msgid "Show own name"
 msgstr ""
 
-#: src/gui/setup_video.cpp:205
+#: src/gui/setup_video.cpp:226
+msgid "Log NPC dialogue"
+msgstr ""
+
+#: src/gui/setup_video.cpp:227
 msgid "Show pickup notification"
 msgstr ""
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:207
+#. TRANSLATORS: Refers to "Show pickup notification"
+#: src/gui/setup_video.cpp:229
 msgid "in chat"
 msgstr ""
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:209
+#. TRANSLATORS: Refers to "Show pickup notification"
+#: src/gui/setup_video.cpp:231
 msgid "as particle"
 msgstr ""
 
-#: src/gui/setup_video.cpp:214
+#: src/gui/setup_video.cpp:236
 #, fuzzy
 msgid "FPS limit:"
 msgstr "حدّ FPS:"
 
-#: src/gui/setup_video.cpp:225
+#: src/gui/setup_video.cpp:247
+msgid "Disable transparency (Low CPU mode)"
+msgstr ""
+
+#: src/gui/setup_video.cpp:250
 msgid "Video"
 msgstr "مرئية"
 
-#: src/gui/setup_video.cpp:227
-msgid "Show monster damage"
+#: src/gui/setup_video.cpp:252
+msgid "Show damage"
 msgstr ""
 
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:258
 msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:259
 msgid "Gui opacity"
 msgstr "عتمة واجهة المستخدم"
 
-#: src/gui/setup_video.cpp:235
+#: src/gui/setup_video.cpp:260
 msgid "Ambient FX"
 msgstr "مؤثّرات محيطة"
 
-#: src/gui/setup_video.cpp:236
+#: src/gui/setup_video.cpp:261
 msgid "Particle detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237
+#: src/gui/setup_video.cpp:262
 msgid "Font size"
 msgstr ""
 
-#: src/gui/setup_video.cpp:251 src/gui/setup_video.cpp:454
-#: src/gui/setup_video.cpp:568
+#: src/gui/setup_video.cpp:277 src/gui/setup_video.cpp:532
+#: src/gui/setup_video.cpp:662
 #, fuzzy
 msgid "None"
 msgstr "لا"
 
-#: src/gui/setup_video.cpp:381
+#: src/gui/setup_video.cpp:426
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:387
+#: src/gui/setup_video.cpp:432
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:398
+#: src/gui/setup_video.cpp:443
 #, fuzzy
 msgid "Switching to Full Screen"
 msgstr "جارِ ملء الشاشة"
 
-#: src/gui/setup_video.cpp:399
+#: src/gui/setup_video.cpp:444
 msgid "Restart needed for changes to take effect."
 msgstr "يجب إعادة التشغيل لتفعّل التغييرات."
 
-#: src/gui/setup_video.cpp:411
+#: src/gui/setup_video.cpp:458
 #, fuzzy
 msgid "Changing to OpenGL"
 msgstr "تغيير OpenGL"
 
-#: src/gui/setup_video.cpp:412
+#: src/gui/setup_video.cpp:459
+msgid ""
+"Applying change to OpenGL requires restart. In case OpenGL messes up your "
+"game graphics, restart the game with the command line option \"--no-opengl\"."
+msgstr ""
+
+#: src/gui/setup_video.cpp:466
+msgid "Deactivating OpenGL"
+msgstr ""
+
+#: src/gui/setup_video.cpp:467
 msgid "Applying change to OpenGL requires restart."
 msgstr "تطبيق التغيير على OpenGL يحتاج لإعادة تشغيل."
 
-#: src/gui/setup_video.cpp:486 src/gui/setup_video.cpp:491
+#: src/gui/setup_video.cpp:475
+msgid "Transparency disabled"
+msgstr ""
+
+#: src/gui/setup_video.cpp:476 src/gui/setup_video.cpp:484
+msgid "You must restart to apply changes."
+msgstr ""
+
+#: src/gui/setup_video.cpp:483
+msgid "Transparency enabled"
+msgstr ""
+
+#: src/gui/setup_video.cpp:576 src/gui/setup_video.cpp:581
 msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:487 src/gui/setup_video.cpp:492
+#: src/gui/setup_video.cpp:577 src/gui/setup_video.cpp:582
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:489
+#: src/gui/setup_video.cpp:579
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:522
+#: src/gui/setup_video.cpp:612
 msgid "Particle Effect Settings Changed."
 msgstr ""
 
-#: src/gui/setup_video.cpp:523
+#: src/gui/setup_video.cpp:613
 msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skilldialog.cpp:197 src/gui/windowmenu.cpp:58
+#: src/gui/skilldialog.cpp:212 src/gui/windowmenu.cpp:59
 msgid "Skills"
 msgstr "مهارات"
 
-#: src/gui/skilldialog.cpp:208
+#: src/gui/skilldialog.cpp:223
 msgid "Up"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:262
+#: src/gui/skilldialog.cpp:269
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:314
+#: src/gui/skilldialog.cpp:351
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:323
+#: src/gui/skilldialog.cpp:360
 #, fuzzy, c-format
 msgid "Skill %d"
 msgstr "مهارات"
 
-#: src/gui/skilldialog.cpp:405
+#: src/gui/skilldialog.cpp:442
 #, fuzzy, c-format
 msgid "Lvl: %d (%+d)"
 msgstr "المستوى: %d"
 
-#: src/gui/skilldialog.cpp:416
+#: src/gui/skilldialog.cpp:453
 #, fuzzy, c-format
 msgid "Lvl: %d"
 msgstr "المستوى: %d"
 
-#: src/gui/socialwindow.cpp:117
+#: src/gui/socialwindow.cpp:126
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:126
+#: src/gui/socialwindow.cpp:139
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:136
+#: src/gui/socialwindow.cpp:153
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:137
+#: src/gui/socialwindow.cpp:154
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:146
+#: src/gui/socialwindow.cpp:163
 msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:147
+#: src/gui/socialwindow.cpp:164
 #, fuzzy, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "هل أنت متأكّد من حذف هذه الشخصيّة؟"
 
-#: src/gui/socialwindow.cpp:182
+#: src/gui/socialwindow.cpp:207 src/net/tmwa/partyhandler.cpp:330
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:218
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:199
+#: src/gui/socialwindow.cpp:232
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:200
+#: src/gui/socialwindow.cpp:233
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:209
+#: src/gui/socialwindow.cpp:242
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:210
+#: src/gui/socialwindow.cpp:243
 #, fuzzy, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "هل أنت متأكّد من حذف هذه الشخصيّة؟"
 
-#: src/gui/socialwindow.cpp:239
+#: src/gui/socialwindow.cpp:272
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:240 src/gui/socialwindow.cpp:564
+#: src/gui/socialwindow.cpp:273 src/gui/socialwindow.cpp:620
 #, fuzzy
 msgid "Create Party"
 msgstr "إنشاء شخصيّة"
 
-#: src/gui/socialwindow.cpp:279 src/gui/windowmenu.cpp:60
+#: src/gui/socialwindow.cpp:312 src/gui/windowmenu.cpp:64
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:297
+#: src/gui/socialwindow.cpp:330
 msgid "Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:298
+#: src/gui/socialwindow.cpp:331
 msgid "Leave"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:394
+#: src/gui/socialwindow.cpp:443
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:400
+#: src/gui/socialwindow.cpp:449
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:413
+#: src/gui/socialwindow.cpp:462
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:419
+#: src/gui/socialwindow.cpp:468
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:463
+#: src/gui/socialwindow.cpp:497
+msgid "Creating guild failed, please choose a shorter name."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:504
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:477
+#: src/gui/socialwindow.cpp:520
+msgid "Creating party failed, please choose a shorter name."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:527
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:484
+#: src/gui/socialwindow.cpp:541
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:485
+#: src/gui/socialwindow.cpp:542
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:497
+#: src/gui/socialwindow.cpp:554
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:502
+#: src/gui/socialwindow.cpp:559
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:507
+#: src/gui/socialwindow.cpp:564
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:519
+#: src/gui/socialwindow.cpp:576
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:529
+#: src/gui/socialwindow.cpp:585
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:533
+#: src/gui/socialwindow.cpp:589
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:541
+#: src/gui/socialwindow.cpp:597
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:546
+#: src/gui/socialwindow.cpp:602
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:554
+#: src/gui/socialwindow.cpp:610
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:565
+#: src/gui/socialwindow.cpp:621
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:570
+#: src/gui/socialwindow.cpp:626
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:571
+#: src/gui/socialwindow.cpp:627
 msgid "Choose your party's name."
 msgstr ""
 
-#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:59
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:62
 msgid "Specials"
 msgstr ""
 
-#: src/gui/specialswindow.cpp:174
-#, c-format
-msgid "Specials Set %d"
-msgstr ""
-
-#: src/gui/specialswindow.cpp:191
-#, c-format
-msgid "Special %d"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:99 src/gui/statuswindow.cpp:247
+#: src/gui/statuswindow.cpp:113 src/gui/statuswindow.cpp:215
+#: src/gui/statuswindow.cpp:262
 #, c-format
 msgid "Level: %d"
 msgstr "المستوى: %d"
 
-#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:211
+#: src/gui/statuswindow.cpp:114 src/gui/statuswindow.cpp:208
+#: src/gui/statuswindow.cpp:239
 #, c-format
 msgid "Money: %s"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:102
+#: src/gui/statuswindow.cpp:117
 msgid "HP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:107
+#: src/gui/statuswindow.cpp:122
 msgid "Exp:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:112
+#: src/gui/statuswindow.cpp:130
 msgid "MP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:132 src/gui/statuswindow.cpp:219
+#: src/gui/statuswindow.cpp:158 src/gui/statuswindow.cpp:275
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:133
+#: src/gui/statuswindow.cpp:159
 msgid "Job:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:194
-msgid "HP"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:200
-msgid "MP"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:206
-msgid "Exp"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:215
-#, fuzzy
-msgid "Money"
-msgstr "النقود: %d"
-
-#: src/gui/statuswindow.cpp:225
-msgid "Job"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:229
+#: src/gui/statuswindow.cpp:211 src/gui/statuswindow.cpp:247
 #, fuzzy, c-format
 msgid "Character points: %d"
 msgstr "إحصائيات الشخصيّة جيّدة"
 
-#: src/gui/statuswindow.cpp:235
+#: src/gui/statuswindow.cpp:255
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:251
-#, fuzzy
-msgid "Level"
-msgstr "المستوى: %d"
-
-#: src/gui/storagewindow.cpp:58
-msgid "Storage"
-msgstr ""
-
-#: src/gui/trade.cpp:52
+#: src/gui/trade.cpp:53
 msgid "Propose trade"
 msgstr "اقتراح متاجرة"
 
-#: src/gui/trade.cpp:53
+#: src/gui/trade.cpp:54
 msgid "Confirmed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:55
 msgid "Agree trade"
 msgstr ""
 
-#: src/gui/trade.cpp:55
+#: src/gui/trade.cpp:56
 msgid "Agreed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:58
+#: src/gui/trade.cpp:59
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/trade.cpp:74 src/gui/trade.cpp:75
+#: src/gui/trade.cpp:73 src/gui/trade.cpp:74
 msgid "Trade"
 msgstr ""
 
-#: src/gui/trade.cpp:77
+#: src/gui/trade.cpp:76
 msgid "Add"
 msgstr "إضافة"
 
-#: src/gui/trade.cpp:99 src/gui/trade.cpp:135
+#: src/gui/trade.cpp:98 src/gui/trade.cpp:134
 #, fuzzy, c-format
 msgid "You get %s"
 msgstr "أنت تقدّم:"
 
-#: src/gui/trade.cpp:100
+#: src/gui/trade.cpp:99
 msgid "You give:"
 msgstr "أنت تقدّم:"
 
-#: src/gui/trade.cpp:104
+#: src/gui/trade.cpp:103
 msgid "Change"
 msgstr "تغيير"
 
-#: src/gui/trade.cpp:275
+#: src/gui/trade.cpp:262
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/trade.cpp:318
+#: src/gui/trade.cpp:304
 msgid "You don't have enough money."
 msgstr ""
 
@@ -2072,21 +1921,21 @@ msgstr "جارِ الاتّصال..."
 msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:405
+#: src/gui/updatewindow.cpp:417
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:407
+#: src/gui/updatewindow.cpp:419
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:409
+#: src/gui/updatewindow.cpp:421
 msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:501
+#: src/gui/updatewindow.cpp:515
 msgid "Completed"
 msgstr ""
 
@@ -2166,61 +2015,61 @@ msgstr ""
 msgid "Need a user to kick!"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:118
+#: src/gui/widgets/chattab.cpp:121
 msgid "Global announcement:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:124
+#: src/gui/widgets/chattab.cpp:127
 #, c-format
 msgid "Global announcement from %s:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:150
+#: src/gui/widgets/chattab.cpp:153
 #, c-format
 msgid "%s whispers: %s"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:51
+#: src/gui/widgets/whispertab.cpp:53
 msgid "Cannot send empty chat!"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:70
+#: src/gui/widgets/whispertab.cpp:72
 msgid "/ignore > Ignore the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:71
+#: src/gui/widgets/whispertab.cpp:73
 msgid "/unignore > Stop ignoring the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:72
+#: src/gui/widgets/whispertab.cpp:74
 msgid "/close > Close the whisper tab"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:82
+#: src/gui/widgets/whispertab.cpp:84
 msgid "Command: /close"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:83
+#: src/gui/widgets/whispertab.cpp:85
 msgid "This command closes the current whisper tab."
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:87
+#: src/gui/widgets/whispertab.cpp:89
 msgid "Command: /ignore"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:88
+#: src/gui/widgets/whispertab.cpp:90
 msgid "This command ignores the other player regardless of current relations."
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:94
+#: src/gui/widgets/whispertab.cpp:96
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:55
+#: src/gui/windowmenu.cpp:54
 msgid "Status"
 msgstr "الحالة"
 
-#: src/gui/windowmenu.cpp:61
+#: src/gui/windowmenu.cpp:65
 msgid "Shortcut"
 msgstr "اختصار"
 
@@ -2237,1360 +2086,1384 @@ msgstr "تغيير"
 msgid "Choose World"
 msgstr ""
 
-#: src/keyboardconfig.cpp:40
+#: src/keyboardconfig.cpp:39
 msgid "Move Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:41
+#: src/keyboardconfig.cpp:40
 msgid "Move Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:41
 msgid "Move Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:42
 msgid "Move Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:44 src/net/ea/generalhandler.cpp:223
+#: src/keyboardconfig.cpp:43 src/net/tmwa/generalhandler.cpp:237
 msgid "Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:44
 msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:45
 msgid "Smilie"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:46
 msgid "Talk"
 msgstr ""
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:47
 msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:48
 msgid "Target Monster"
 msgstr ""
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboardconfig.cpp:49
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:50
 msgid "Target Player"
 msgstr ""
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:51
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:52
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:53
 msgid "Sit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:54
 msgid "Screenshot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:55
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:56
 msgid "Find Path to Mouse"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58 src/keyboardconfig.cpp:59
-#: src/keyboardconfig.cpp:60 src/keyboardconfig.cpp:61
-#: src/keyboardconfig.cpp:62 src/keyboardconfig.cpp:63
-#: src/keyboardconfig.cpp:64 src/keyboardconfig.cpp:65
-#: src/keyboardconfig.cpp:66 src/keyboardconfig.cpp:67
-#: src/keyboardconfig.cpp:68 src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:57 src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60
+#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62
+#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64
+#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68
 #, c-format
 msgid "Item Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:69
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:70
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:71
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:72
 msgid "Equipment Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:73
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:74
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:75
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:76
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:77
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:78
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:79
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:80
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:81
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:83
+#: src/keyboardconfig.cpp:82
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:83
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86
-#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88
-#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90
-#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92
-#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:84 src/keyboardconfig.cpp:85
+#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:87
+#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:89
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:91
+#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:93
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:95
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:96
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:97
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:98
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:99
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:100
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:101
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:103
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:105
+#: src/keyboardconfig.cpp:104
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:178
+#: src/keyboardconfig.cpp:183
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:913
+#: src/localplayer.cpp:985
 msgid "Unable to pick up item."
 msgstr ""
 
 #. TRANSLATORS: This sentence may be translated differently
 #. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:922
+#: src/localplayer.cpp:994
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/main.cpp:43
+#: src/main.cpp:42
 msgid "mana [options] [mana-file]"
 msgstr ""
 
+#: src/main.cpp:43
+msgid "[mana-file] : The mana file is an XML file (.mana)"
+msgstr ""
+
 #: src/main.cpp:44
-msgid "Options:"
+msgid "              used to set custom parameters"
 msgstr ""
 
 #: src/main.cpp:45
+msgid "              to the mana client."
+msgstr ""
+
+#: src/main.cpp:47
+msgid "Options:"
+msgstr ""
+
+#: src/main.cpp:48
 msgid "  -v --version        : Display the version"
 msgstr ""
 
-#: src/main.cpp:46
+#: src/main.cpp:49
 msgid "  -h --help           : Display this help"
 msgstr ""
 
-#: src/main.cpp:47
+#: src/main.cpp:50
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
-#: src/main.cpp:48
+#: src/main.cpp:51
 msgid "  -U --username       : Login with this username"
 msgstr ""
 
-#: src/main.cpp:49
+#: src/main.cpp:52
 msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/main.cpp:50
+#: src/main.cpp:53
 msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/main.cpp:51
+#: src/main.cpp:54
 msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:52
+#: src/main.cpp:55
 msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/main.cpp:53
+#: src/main.cpp:56
 msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/main.cpp:54
+#: src/main.cpp:57
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:56
+#: src/main.cpp:59
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:57
+#: src/main.cpp:60
 msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:58
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
+#: src/main.cpp:61
+msgid "     --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/main.cpp:59
+#: src/main.cpp:62
+msgid "     --chat-log-dir   : Chat log dir to use"
+msgstr ""
+
+#: src/main.cpp:63
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/main.cpp:61
+#: src/main.cpp:65
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:63
+#: src/net/manaserv/beinghandler.cpp:303 src/net/tmwa/playerhandler.cpp:94
+msgid "You are dead."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:304 src/net/tmwa/playerhandler.cpp:95
+msgid "We regret to inform you that your character was killed in battle."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:306 src/net/tmwa/playerhandler.cpp:97
+msgid "You are not that alive anymore."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:307 src/net/tmwa/playerhandler.cpp:98
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:308 src/net/tmwa/playerhandler.cpp:99
+msgid "Game Over!"
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:309 src/net/tmwa/playerhandler.cpp:101
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:311 src/net/tmwa/playerhandler.cpp:103
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:313 src/net/tmwa/playerhandler.cpp:105
+msgid "I guess this did not run too well."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:107
+msgid "Do you want your possessions identified?"
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:109
+msgid "Sadly, no trace of you was ever found..."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:111
+msgid "Annihilated."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:113
+msgid "Looks like you got your head handed to you."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:115
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:323
+msgid "Press OK to respawn."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:324
+#, fuzzy
+msgid "You Died"
+msgstr "أنت تقدّم:"
+
+#: src/net/manaserv/charhandler.cpp:138 src/net/manaserv/charhandler.cpp:209
+msgid "Not logged in."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:141
+msgid "No empty slot."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:144
+msgid "Invalid name."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:147
+msgid "Character's name already exists."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:150
+msgid "Invalid hairstyle."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:153
+msgid "Invalid hair color."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:156
+msgid "Invalid gender."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:159
+#, fuzzy
+msgid "Character's stats are too high."
+msgstr "إحصائيات الشخصيّة جيّدة"
+
+#: src/net/manaserv/charhandler.cpp:162
+#, fuzzy
+msgid "Character's stats are too low."
+msgstr "إحصائيات الشخصيّة جيّدة"
+
+#: src/net/manaserv/charhandler.cpp:165
+#, c-format
+msgid "At least one statis out of the permitted range: (%u - %u)."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:171 src/net/manaserv/loginhandler.cpp:96
+#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
+#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
+#: src/net/tmwa/loginhandler.cpp:95 src/net/tmwa/loginhandler.cpp:182
+msgid "Unknown error."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:200 src/net/tmwa/charserverhandler.cpp:146
+msgid "Info"
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:200
+msgid "Player deleted."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:212
+#, fuzzy
+msgid "Selection out of range."
+msgstr "انتقاء كمّيّة من المواد للمتاجرة بها."
+
+#: src/net/manaserv/charhandler.cpp:215
+#, c-format
+msgid "Unknown error (%d)."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:250
+msgid "No gameservers are available."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:187 src/net/manaserv/chathandler.cpp:313
+#: src/net/manaserv/guildhandler.cpp:260
+#, c-format
+msgid "Topic: %s"
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:274
+msgid "Players in this channel:"
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:208
+msgid "Error joining channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:214
+msgid "Listing channels."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:226
+msgid "End of channel list."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:303
+#, c-format
+msgid "%s entered the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:308
+#, c-format
+msgid "%s left the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:324
+#, c-format
+msgid "%s has set mode %s on user %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:334
+#, c-format
+msgid "%s has kicked %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:339
+msgid "Unknown channel event."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:82
+msgid "Guild created."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:87
+msgid "Error creating guild."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:97
+msgid "Invite sent."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:204
+msgid "Member was promoted successfully."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:209
+msgid "Failed to promote member."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:87
+msgid "Wrong magic_token."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
+msgid "Already logged in."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:93
+msgid "Account banned."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:118
+msgid "New password incorrect."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:121 src/net/tmwa/loginhandler.cpp:89
+msgid "Old password incorrect."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
+msgid "Account not connected. Please login first."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:149
+msgid "New email address incorrect."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:152
+msgid "Old email address incorrect."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:158
+msgid "The new email address already exists."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:239
+msgid ""
+"Client registration is not allowed. Please contact server administration."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
+msgid "Client version is too old."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:266
+msgid "Wrong username or password."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:272
+msgid "Account banned"
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:275
+msgid "Login attempt too soon after previous attempt."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:303
+msgid "Wrong username, password or email address."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:306
+msgid "Username already exists."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:309
+msgid "Email address already exists."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:312
+msgid "You took too long with the captcha or your response was incorrect."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:87
+msgid "Joined party."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:105
+#, c-format
+msgid "%s joined the party."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:123
+#, c-format
+msgid "%s rejected your invite."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:95
+msgid "Accepting incoming trade requests."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:97
+msgid "Ignoring incoming trade requests."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:115 src/net/tmwa/tradehandler.cpp:109
+msgid "Request for Trade"
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:116 src/net/tmwa/tradehandler.cpp:110
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:134
+#, c-format
+msgid "Trading with %s"
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:148 src/net/tmwa/tradehandler.cpp:224
+msgid "Trade canceled."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:155 src/net/tmwa/tradehandler.cpp:231
+msgid "Trade completed."
+msgstr ""
+
+#: src/net/tmwa/adminhandler.cpp:64
 msgid "Kick failed!"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:65
+#: src/net/tmwa/adminhandler.cpp:66
 msgid "Kick succeeded!"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:110
+#: src/net/tmwa/buysellhandler.cpp:109
 msgid "Nothing to sell."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:117
+#: src/net/tmwa/buysellhandler.cpp:116
 msgid "Thanks for buying."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:124
+#: src/net/tmwa/buysellhandler.cpp:123
 msgid "Unable to buy."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:130
+#: src/net/tmwa/buysellhandler.cpp:129
 msgid "Thanks for selling."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:132
+#: src/net/tmwa/buysellhandler.cpp:131
 msgid "Unable to sell."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:103
-msgid "Access denied."
+#: src/net/tmwa/charserverhandler.cpp:103
+msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:106
+#: src/net/tmwa/charserverhandler.cpp:107
 msgid "Cannot use this ID."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:109
-msgid "Unknown failure to select character."
+#: src/net/tmwa/charserverhandler.cpp:110
+msgid "Unknown char-server failure."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:135
+#: src/net/tmwa/charserverhandler.cpp:134
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:147 src/net/manaserv/charhandler.cpp:187
-msgid "Info"
-msgstr ""
-
-#: src/net/ea/charserverhandler.cpp:147
+#: src/net/tmwa/charserverhandler.cpp:146
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:152
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Failed to delete character."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:237 src/net/manaserv/charhandler.cpp:263
+#: src/net/tmwa/charserverhandler.cpp:266
 msgid "Strength:"
 msgstr "القوّة:"
 
-#: src/net/ea/charserverhandler.cpp:238 src/net/manaserv/charhandler.cpp:264
+#: src/net/tmwa/charserverhandler.cpp:267
 msgid "Agility:"
 msgstr "خفّة الحركة:"
 
-#: src/net/ea/charserverhandler.cpp:239 src/net/manaserv/charhandler.cpp:266
+#: src/net/tmwa/charserverhandler.cpp:268
 msgid "Vitality:"
 msgstr "نشاط:"
 
-#: src/net/ea/charserverhandler.cpp:240 src/net/manaserv/charhandler.cpp:267
+#: src/net/tmwa/charserverhandler.cpp:269
 msgid "Intelligence:"
 msgstr "ذكاء:"
 
-#: src/net/ea/charserverhandler.cpp:241 src/net/manaserv/charhandler.cpp:265
+#: src/net/tmwa/charserverhandler.cpp:270
 msgid "Dexterity:"
 msgstr "المهارة:"
 
-#: src/net/ea/charserverhandler.cpp:242
+#: src/net/tmwa/charserverhandler.cpp:271
 msgid "Luck:"
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:80
-msgid "Whisper could not be sent, user is offline."
+#: src/net/tmwa/chathandler.cpp:87
+#, c-format
+msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:84
-msgid "Whisper could not be sent, ignored by user."
+#: src/net/tmwa/chathandler.cpp:96
+#, c-format
+msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:171
+#: src/net/tmwa/chathandler.cpp:230
 msgid "MVP player."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:204 src/net/ea/chathandler.cpp:210
-#: src/net/ea/chathandler.cpp:215 src/net/ea/chathandler.cpp:220
-#: src/net/ea/chathandler.cpp:225 src/net/ea/chathandler.cpp:230
-#: src/net/ea/chathandler.cpp:235 src/net/ea/chathandler.cpp:240
+#: src/net/tmwa/chathandler.cpp:265 src/net/tmwa/chathandler.cpp:271
+#: src/net/tmwa/chathandler.cpp:276 src/net/tmwa/chathandler.cpp:281
+#: src/net/tmwa/chathandler.cpp:286 src/net/tmwa/chathandler.cpp:291
+#: src/net/tmwa/chathandler.cpp:296 src/net/tmwa/chathandler.cpp:301
 msgid "Channels are not supported!"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:86
+#: src/net/tmwa/gamehandler.cpp:88
 #, c-format
 msgid "Online users: %d"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:100
+#: src/net/tmwa/gamehandler.cpp:101
 #, fuzzy
 msgid "Game"
 msgstr "الاسم:"
 
-#: src/net/ea/gamehandler.cpp:100
+#: src/net/tmwa/gamehandler.cpp:101
 msgid "Request to quit denied!"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:102 src/net/manaserv/generalhandler.cpp:95
+#: src/net/tmwa/generalhandler.cpp:102
 #, c-format
 msgid "Strength %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:103 src/net/manaserv/generalhandler.cpp:96
+#: src/net/tmwa/generalhandler.cpp:103
 #, c-format
 msgid "Agility %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:104 src/net/manaserv/generalhandler.cpp:98
+#: src/net/tmwa/generalhandler.cpp:104
 #, c-format
 msgid "Vitality %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:105 src/net/manaserv/generalhandler.cpp:99
+#: src/net/tmwa/generalhandler.cpp:105
 #, c-format
 msgid "Intelligence %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:106 src/net/manaserv/generalhandler.cpp:97
+#: src/net/tmwa/generalhandler.cpp:106
 #, c-format
 msgid "Dexterity %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:107
+#: src/net/tmwa/generalhandler.cpp:107
 #, c-format
 msgid "Luck %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:130
+#: src/net/tmwa/generalhandler.cpp:132
 msgid "Authentication failed."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:133
+#: src/net/tmwa/generalhandler.cpp:135
 msgid "No servers available."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:137
+#: src/net/tmwa/generalhandler.cpp:139
 msgid "Someone else is trying to use this account."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:140
+#: src/net/tmwa/generalhandler.cpp:142
 msgid "This account is already logged in."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:143
+#: src/net/tmwa/generalhandler.cpp:145
 msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:146
+#: src/net/tmwa/generalhandler.cpp:148
 msgid "Duplicated login."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:149
+#: src/net/tmwa/generalhandler.cpp:151
 msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:205
+#: src/net/tmwa/generalhandler.cpp:209
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:216 src/net/manaserv/generalhandler.cpp:166
+#: src/net/tmwa/generalhandler.cpp:230
 msgid "Strength"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:217 src/net/manaserv/generalhandler.cpp:167
+#: src/net/tmwa/generalhandler.cpp:231
 msgid "Agility"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:218 src/net/manaserv/generalhandler.cpp:169
+#: src/net/tmwa/generalhandler.cpp:232
 msgid "Vitality"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:219 src/net/manaserv/generalhandler.cpp:170
+#: src/net/tmwa/generalhandler.cpp:233
 msgid "Intelligence"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:220 src/net/manaserv/generalhandler.cpp:168
+#: src/net/tmwa/generalhandler.cpp:234
 msgid "Dexterity"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:221
+#: src/net/tmwa/generalhandler.cpp:235
 msgid "Luck"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:224
+#: src/net/tmwa/generalhandler.cpp:238
 #, fuzzy
 msgid "Defense"
 msgstr "دفاع %+d"
 
-#: src/net/ea/generalhandler.cpp:225
+#: src/net/tmwa/generalhandler.cpp:239
 #, fuzzy
 msgid "M.Attack"
 msgstr "مهاجمة %+d"
 
-#: src/net/ea/generalhandler.cpp:226
+#: src/net/tmwa/generalhandler.cpp:240
 #, fuzzy
 msgid "M.Defense"
 msgstr "دفاع %+d"
 
-#: src/net/ea/generalhandler.cpp:227
+#: src/net/tmwa/generalhandler.cpp:241
 #, c-format
 msgid "% Accuracy"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:228
+#: src/net/tmwa/generalhandler.cpp:242
 #, c-format
 msgid "% Evade"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:229
+#: src/net/tmwa/generalhandler.cpp:243
 #, c-format
 msgid "% Critical"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:61 src/net/ea/gui/partytab.cpp:59
+#: src/net/tmwa/gui/guildtab.cpp:45
+msgid "Guild"
+msgstr ""
+
+#: src/net/tmwa/gui/guildtab.cpp:61 src/net/tmwa/gui/partytab.cpp:59
 msgid "/help > Display this help."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:62
+#: src/net/tmwa/gui/guildtab.cpp:62
 msgid "/invite > Invite a player to your guild"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:63
+#: src/net/tmwa/gui/guildtab.cpp:63
 msgid "/leave > Leave the guild you are in"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:64
+#: src/net/tmwa/gui/guildtab.cpp:64
 msgid "/kick > Kick some one from the guild you are in"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:73 src/net/ea/gui/partytab.cpp:73
+#: src/net/tmwa/gui/guildtab.cpp:73 src/net/tmwa/gui/partytab.cpp:73
 msgid "Command: /invite <nick>"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:74
+#: src/net/tmwa/gui/guildtab.cpp:74
 msgid "This command invites <nick> to the guild you're in."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:80 src/net/ea/gui/partytab.cpp:80
+#: src/net/tmwa/gui/guildtab.cpp:80 src/net/tmwa/gui/partytab.cpp:80
 msgid "Command: /leave"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:81
+#: src/net/tmwa/gui/guildtab.cpp:81
 msgid "This command causes the player to leave the guild."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:89
+#: src/net/tmwa/gui/guildtab.cpp:89
 msgid "Guild name is missing."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:293
+#: src/net/tmwa/guildhandler.cpp:296
 msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:298
+#: src/net/tmwa/guildhandler.cpp:301
 msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:303
+#: src/net/tmwa/guildhandler.cpp:306
 msgid "User is now part of your guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:308
+#: src/net/tmwa/guildhandler.cpp:311
 msgid "Your guild is full."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:313
+#: src/net/tmwa/guildhandler.cpp:316
 msgid "Unknown guild invite response."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:390
+#: src/net/tmwa/guildhandler.cpp:393
 msgid "Guild creation isn't supported yet."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:60
+#: src/net/tmwa/gui/partytab.cpp:43
+msgid "Party"
+msgstr ""
+
+#: src/net/tmwa/gui/partytab.cpp:60
 msgid "/invite > Invite a player to your party"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:61
+#: src/net/tmwa/gui/partytab.cpp:61
 msgid "/leave > Leave the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:62
+#: src/net/tmwa/gui/partytab.cpp:62
 msgid "/kick > Kick some one from the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:63
+#: src/net/tmwa/gui/partytab.cpp:63
 msgid "/item > Show/change party item sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:64
+#: src/net/tmwa/gui/partytab.cpp:64
 msgid "/exp > Show/change party experience sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:81
+#: src/net/tmwa/gui/partytab.cpp:81
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:85
+#: src/net/tmwa/gui/partytab.cpp:85
 msgid "Command: /item <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:86
+#: src/net/tmwa/gui/partytab.cpp:86
 msgid "This command changes the party's item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:87
+#: src/net/tmwa/gui/partytab.cpp:87
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:90
+#: src/net/tmwa/gui/partytab.cpp:90
 msgid "Command: /item"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/tmwa/gui/partytab.cpp:91
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/tmwa/gui/partytab.cpp:95
 msgid "Command: /exp <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:96
+#: src/net/tmwa/gui/partytab.cpp:96
 msgid "This command changes the party's experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/tmwa/gui/partytab.cpp:97
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:100
+#: src/net/tmwa/gui/partytab.cpp:100
 msgid "Command: /exp"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/tmwa/gui/partytab.cpp:101
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:132 src/net/ea/partyhandler.cpp:198
+#: src/net/tmwa/gui/partytab.cpp:132 src/net/tmwa/partyhandler.cpp:196
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:135 src/net/ea/partyhandler.cpp:204
+#: src/net/tmwa/gui/partytab.cpp:135 src/net/tmwa/partyhandler.cpp:202
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:138 src/net/ea/partyhandler.cpp:210
+#: src/net/tmwa/gui/partytab.cpp:138 src/net/tmwa/partyhandler.cpp:208
 msgid "Item sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:141
+#: src/net/tmwa/gui/partytab.cpp:141
 msgid "Item sharing unknown."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:167 src/net/ea/partyhandler.cpp:174
+#: src/net/tmwa/gui/partytab.cpp:167 src/net/tmwa/partyhandler.cpp:172
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:170 src/net/ea/partyhandler.cpp:180
+#: src/net/tmwa/gui/partytab.cpp:170 src/net/tmwa/partyhandler.cpp:178
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:173 src/net/ea/partyhandler.cpp:186
+#: src/net/tmwa/gui/partytab.cpp:173 src/net/tmwa/partyhandler.cpp:184
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:176
+#: src/net/tmwa/gui/partytab.cpp:176
 msgid "Experience sharing unknown."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:281
+#: src/net/tmwa/inventoryhandler.cpp:285
 msgid "Failed to use item."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:391
+#: src/net/tmwa/inventoryhandler.cpp:399
 msgid "Unable to equip."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:402
+#: src/net/tmwa/inventoryhandler.cpp:410
 msgid "Unable to unequip."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:79
+#: src/net/tmwa/loginhandler.cpp:86
 msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:82 src/net/manaserv/loginhandler.cpp:121
-msgid "Old password incorrect."
-msgstr ""
-
-#: src/net/ea/loginhandler.cpp:85
+#: src/net/tmwa/loginhandler.cpp:92
 msgid "New password too short."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:88 src/net/ea/loginhandler.cpp:175
-#: src/net/manaserv/charhandler.cpp:158 src/net/manaserv/loginhandler.cpp:96
-#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
-#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
-msgid "Unknown error."
-msgstr ""
-
-#: src/net/ea/loginhandler.cpp:149
+#: src/net/tmwa/loginhandler.cpp:156
 #, fuzzy
 msgid "Unregistered ID."
 msgstr "إلغاء التسجيل"
 
-#: src/net/ea/loginhandler.cpp:152
+#: src/net/tmwa/loginhandler.cpp:159
 msgid "Wrong password."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:155
+#: src/net/tmwa/loginhandler.cpp:162
 msgid "Account expired."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:158
+#: src/net/tmwa/loginhandler.cpp:165
 msgid "Rejected from server."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:161
+#: src/net/tmwa/loginhandler.cpp:168
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:165
+#: src/net/tmwa/loginhandler.cpp:172
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:172
+#: src/net/tmwa/loginhandler.cpp:179
 msgid "This user name is already taken."
 msgstr ""
 
-#: src/net/ea/network.cpp:145
+#: src/net/tmwa/network.cpp:145
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/ea/network.cpp:345
+#: src/net/tmwa/network.cpp:345
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/ea/network.cpp:414
+#: src/net/tmwa/network.cpp:414
 msgid "Connection to server terminated. "
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:81
+#: src/net/tmwa/partyhandler.cpp:82
 msgid "Could not create party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:84
+#: src/net/tmwa/partyhandler.cpp:84
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:118
+#: src/net/tmwa/partyhandler.cpp:119
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:122
+#: src/net/tmwa/partyhandler.cpp:123
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:126
+#: src/net/tmwa/partyhandler.cpp:127
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:130
+#: src/net/tmwa/partyhandler.cpp:131
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:238
+#: src/net/tmwa/partyhandler.cpp:236
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:249
+#: src/net/tmwa/partyhandler.cpp:246
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:301
+#: src/net/tmwa/partyhandler.cpp:299
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:329
-msgid "Inviting like this isn't supported at the moment."
+#: src/net/tmwa/partyhandler.cpp:335
+#, c-format
+msgid "Inviting failed, because you can't see a player called %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:334
+#: src/net/tmwa/partyhandler.cpp:340
 msgid "You can only inivte when you are in a party!"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:365
+#: src/net/tmwa/partyhandler.cpp:368
 #, c-format
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:304
-msgid "You are dead."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:305
-msgid "We regret to inform you that your character was killed in battle."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:307
-msgid "You are not that alive anymore."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:308
-msgid "The cold hands of the grim reaper are grabbing for your soul."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:309
-msgid "Game Over!"
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:105
+#: src/net/tmwa/playerhandler.cpp:100
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:310
-msgid ""
-"No, kids. Your character did not really die. It... err... went to a better "
-"place."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:312
-msgid ""
-"Your plan of breaking your enemies weapon by bashing it with your throat "
-"failed."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:314
-msgid "I guess this did not run too well."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:315
-msgid "Do you want your possessions identified?"
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:316
-msgid "Sadly, no trace of you was ever found..."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:317
-msgid "Annihilated."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:318
-msgid "Looks like you got your head handed to you."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:120 src/net/manaserv/beinghandler.cpp:319
-msgid ""
-"You screwed up again, dump your body down the tubes and get you another one."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/tmwa/playerhandler.cpp:118
 msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/tmwa/playerhandler.cpp:119
 msgid "You are no more."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/tmwa/playerhandler.cpp:120
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/tmwa/playerhandler.cpp:121
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/tmwa/playerhandler.cpp:122
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/tmwa/playerhandler.cpp:123
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/tmwa/playerhandler.cpp:124
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:130
+#: src/net/tmwa/playerhandler.cpp:125
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:131
+#: src/net/tmwa/playerhandler.cpp:126
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/tmwa/playerhandler.cpp:127
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/tmwa/playerhandler.cpp:128
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:135
+#: src/net/tmwa/playerhandler.cpp:130
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:136
+#: src/net/tmwa/playerhandler.cpp:131
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:249 src/net/ea/playerhandler.cpp:310
+#: src/net/tmwa/playerhandler.cpp:246 src/net/tmwa/playerhandler.cpp:285
 msgid "Message"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:250
+#: src/net/tmwa/playerhandler.cpp:247
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:333
+#: src/net/tmwa/playerhandler.cpp:313
 #, c-format
 msgid "You picked up %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:369
+#: src/net/tmwa/playerhandler.cpp:348
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:532
+#: src/net/tmwa/playerhandler.cpp:488
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:147
+#: src/net/tmwa/specialhandler.cpp:144
 msgid "Trade failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:150
+#: src/net/tmwa/specialhandler.cpp:147
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:153
+#: src/net/tmwa/specialhandler.cpp:150
 msgid "Sit failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:156
+#: src/net/tmwa/specialhandler.cpp:153
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:159
+#: src/net/tmwa/specialhandler.cpp:156
 msgid "Could not join party!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:162
+#: src/net/tmwa/specialhandler.cpp:159
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:171
+#: src/net/tmwa/specialhandler.cpp:168
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:174
+#: src/net/tmwa/specialhandler.cpp:171
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:177
+#: src/net/tmwa/specialhandler.cpp:174
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:180
+#: src/net/tmwa/specialhandler.cpp:177
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:183
+#: src/net/tmwa/specialhandler.cpp:180
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:186
+#: src/net/tmwa/specialhandler.cpp:183
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:189
+#: src/net/tmwa/specialhandler.cpp:186
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:192
+#: src/net/tmwa/specialhandler.cpp:189
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:195
+#: src/net/tmwa/specialhandler.cpp:192
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:198
+#: src/net/tmwa/specialhandler.cpp:195
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:201
+#: src/net/tmwa/specialhandler.cpp:198
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:210
+#: src/net/tmwa/specialhandler.cpp:207
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:213
+#: src/net/tmwa/specialhandler.cpp:210
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:216
+#: src/net/tmwa/specialhandler.cpp:213
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:116
-msgid "Request for Trade"
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:108 src/net/manaserv/tradehandler.cpp:117
-#, c-format
-msgid "%s wants to trade with you, do you accept?"
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:124
+#: src/net/tmwa/tradehandler.cpp:126
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:128
+#: src/net/tmwa/tradehandler.cpp:130
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:132
+#: src/net/tmwa/tradehandler.cpp:134
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:137
+#: src/net/tmwa/tradehandler.cpp:139
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:144
+#: src/net/tmwa/tradehandler.cpp:146
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:153
+#: src/net/tmwa/tradehandler.cpp:154
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:202
+#: src/net/tmwa/tradehandler.cpp:202
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:207
+#: src/net/tmwa/tradehandler.cpp:207
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:211
+#: src/net/tmwa/tradehandler.cpp:211
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:224 src/net/manaserv/tradehandler.cpp:149
-msgid "Trade canceled."
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:231 src/net/manaserv/tradehandler.cpp:156
-msgid "Trade completed."
-msgstr ""
-
-#: src/net/manaserv/beinghandler.cpp:324
-msgid "Press OK to respawn."
-msgstr ""
-
-#: src/net/manaserv/beinghandler.cpp:325
-#, fuzzy
-msgid "You Died"
-msgstr "أنت تقدّم:"
-
-#: src/net/manaserv/charhandler.cpp:128 src/net/manaserv/charhandler.cpp:196
-msgid "Not logged in."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:131
-msgid "No empty slot."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:134
-msgid "Invalid name."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:137
-msgid "Character's name already exists."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:140
-msgid "Invalid hairstyle."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:143
-msgid "Invalid hair color."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:146
-msgid "Invalid gender."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:149
-#, fuzzy
-msgid "Character's stats are too high."
-msgstr "إحصائيات الشخصيّة جيّدة"
-
-#: src/net/manaserv/charhandler.cpp:152
-#, fuzzy
-msgid "Character's stats are too low."
-msgstr "إحصائيات الشخصيّة جيّدة"
-
-#: src/net/manaserv/charhandler.cpp:155
-msgid "One stat is zero."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:187
-msgid "Player deleted."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:199
-#, fuzzy
-msgid "Selection out of range."
-msgstr "انتقاء كمّيّة من المواد للمتاجرة بها."
-
-#: src/net/manaserv/charhandler.cpp:202
-#, c-format
-msgid "Unknown error (%d)."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:242
-msgid "No gameservers are available."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:268
-msgid "Willpower:"
-msgstr "قوّة الذات:"
-
-#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
-#: src/net/manaserv/guildhandler.cpp:259
-#, c-format
-msgid "Topic: %s"
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
-msgid "Players in this channel:"
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:201
-msgid "Error joining channel."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:207
-msgid "Listing channels."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:219
-msgid "End of channel list."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:291
-#, c-format
-msgid "%s entered the channel."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:296
-#, c-format
-msgid "%s left the channel."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:312
-#, c-format
-msgid "%s has set mode %s on user %s."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:322
-#, c-format
-msgid "%s has kicked %s."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:327
-msgid "Unknown channel event."
-msgstr ""
-
-#: src/net/manaserv/generalhandler.cpp:100
-#, c-format
-msgid "Willpower %+d"
-msgstr ""
-
-#: src/net/manaserv/generalhandler.cpp:171
-#, fuzzy
-msgid "Willpower"
-msgstr "قوّة الذات:"
-
-#: src/net/manaserv/guildhandler.cpp:81
-msgid "Guild created."
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:86
-msgid "Error creating guild."
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:96
-msgid "Invite sent."
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:203
-msgid "Member was promoted successfully."
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:208
-msgid "Failed to promote member."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:87
-msgid "Wrong magic_token."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
-msgid "Already logged in."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:93 src/net/manaserv/loginhandler.cpp:272
-msgid "Server is full."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:118
-msgid "New password incorrect."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
-msgid "Account not connected. Please login first."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:149
-msgid "New email address incorrect."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:152
-msgid "Old email address incorrect."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:158
-msgid "The new email address already exists."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:239
-msgid ""
-"Client registration is not allowed. Please contact server administration."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
-msgid "Client version is too old."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:266
-msgid "Wrong username or password."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:275
-msgid "Login attempt too soon after previous attempt."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:303
-msgid "Wrong username, password or email address."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:306
-msgid "Username already exists."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:309
-msgid "Email address already exists."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:312
-msgid "You took too long with the captcha or your response was incorrect."
-msgstr ""
-
-#: src/net/manaserv/partyhandler.cpp:88
-msgid "Joined party."
-msgstr ""
-
-#: src/net/manaserv/partyhandler.cpp:106
-#, c-format
-msgid "%s joined the party."
-msgstr ""
-
-#: src/net/manaserv/partyhandler.cpp:123
-#, c-format
-msgid "%s rejected your invite."
-msgstr ""
-
-#: src/net/manaserv/tradehandler.cpp:96
-msgid "Accepting incoming trade requests."
-msgstr ""
-
-#: src/net/manaserv/tradehandler.cpp:98
-msgid "Ignoring incoming trade requests."
-msgstr ""
-
-#: src/net/manaserv/tradehandler.cpp:135
-#, c-format
-msgid "Trading with %s"
-msgstr ""
-
-#: src/playerrelations.cpp:304
+#: src/playerrelations.cpp:310
 msgid "Completely ignore"
 msgstr ""
 
-#: src/playerrelations.cpp:318
+#: src/playerrelations.cpp:324
 msgid "Print '...'"
 msgstr ""
 
-#: src/playerrelations.cpp:334
+#: src/playerrelations.cpp:340
 msgid "Blink name"
 msgstr ""
 
-#: src/playerrelations.cpp:371
-msgid "Floating '...' bubble"
-msgstr ""
-
-#: src/playerrelations.cpp:374
-msgid "Floating bubble"
-msgstr ""
-
-#: src/resources/itemdb.cpp:52
+#: src/resources/itemdb.cpp:44
 #, c-format
 msgid "Attack %+d"
 msgstr "مهاجمة %+d"
 
-#: src/resources/itemdb.cpp:53
+#: src/resources/itemdb.cpp:45
 #, c-format
 msgid "Defense %+d"
 msgstr "دفاع %+d"
 
-#: src/resources/itemdb.cpp:54
+#: src/resources/itemdb.cpp:46
 #, c-format
 msgid "HP %+d"
 msgstr "HP %+d"
 
-#: src/resources/itemdb.cpp:55
+#: src/resources/itemdb.cpp:47
 #, c-format
 msgid "MP %+d"
 msgstr "MP %+d"
 
-#: src/resources/itemdb.cpp:114
+#: src/resources/itemdb.cpp:92
 msgid "Unknown item"
 msgstr ""
 
-#: src/resources/itemdb.cpp:158 src/resources/monsterdb.cpp:45
-#: src/resources/monsterdb.cpp:67
+#: src/resources/itemdb.cpp:135 src/resources/monsterdb.cpp:77
 msgid "unnamed"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Money"
+#~ msgstr "النقود: %d"
+
+#, fuzzy
+#~ msgid "Level"
+#~ msgstr "المستوى: %d"
+
+#~ msgid "Willpower:"
+#~ msgstr "قوّة الذات:"
+
+#, fuzzy
+#~ msgid "Willpower"
+#~ msgstr "قوّة الذات:"
+
 #~ msgid "Description: %s"
 #~ msgstr "الوصف: %s"
 
diff --git a/po/bg.po b/po/bg.po
index 88618c95..a098616a 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2010-03-05 21:52+0100\n"
+"POT-Creation-Date: 2010-12-13 20:04+0100\n"
 "PO-Revision-Date: 2009-10-21 13:06+0000\n"
 "Last-Translator: Mila <Unknown>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
+"Language: bg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,435 +19,448 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/client.cpp:553 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:62
+#: src/client.cpp:598 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
 msgid "Setup"
 msgstr ""
 
-#: src/client.cpp:623
+#: src/client.cpp:679
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:650
+#: src/client.cpp:706
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:683
+#: src/client.cpp:739
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:739
+#: src/client.cpp:804
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:768
+#: src/client.cpp:833
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:799 src/client.cpp:806 src/client.cpp:940
+#: src/client.cpp:843
+msgid "Changing game servers"
+msgstr ""
+
+#: src/client.cpp:872 src/client.cpp:879 src/client.cpp:1014
 #: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
 #: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
-#: src/gui/serverdialog.cpp:261 src/gui/unregisterdialog.cpp:133
-#: src/net/ea/charserverhandler.cpp:135 src/net/ea/charserverhandler.cpp:152
-#: src/net/manaserv/charhandler.cpp:161 src/net/manaserv/charhandler.cpp:204
+#: src/gui/serverdialog.cpp:323 src/gui/unregisterdialog.cpp:133
+#: src/net/manaserv/charhandler.cpp:174 src/net/manaserv/charhandler.cpp:217
+#: src/net/tmwa/charserverhandler.cpp:134
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Error"
 msgstr ""
 
-#: src/client.cpp:815
+#: src/client.cpp:888
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:842
+#: src/client.cpp:915
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:843
+#: src/client.cpp:916
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:862
+#: src/client.cpp:935
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:863
+#: src/client.cpp:936
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:883
+#: src/client.cpp:956
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:884
+#: src/client.cpp:957
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1007 src/client.cpp:1030
+#: src/client.cpp:1138 src/client.cpp:1161
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1119
+#: src/client.cpp:1281
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1153 src/client.cpp:1159
+#: src/client.cpp:1315 src/client.cpp:1321
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/commandhandler.cpp:127 src/commandhandler.cpp:308
+#: src/commandhandler.cpp:131 src/commandhandler.cpp:317
 msgid "Unknown command."
 msgstr "Непозната команда."
 
-#: src/commandhandler.cpp:156
+#: src/commandhandler.cpp:160
 msgid "-- Help --"
 msgstr "-- Помощ --"
 
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:161
 msgid "/help > Display this help"
 msgstr ""
 
-#: src/commandhandler.cpp:159
+#: src/commandhandler.cpp:163
 msgid "/where > Display map name"
 msgstr ""
 
-#: src/commandhandler.cpp:160
+#: src/commandhandler.cpp:164
 msgid "/who > Display number of online users"
 msgstr ""
 
-#: src/commandhandler.cpp:161
+#: src/commandhandler.cpp:165
 msgid "/me > Tell something about yourself"
 msgstr ""
 
-#: src/commandhandler.cpp:163
+#: src/commandhandler.cpp:167
 msgid "/clear > Clears this window"
 msgstr ""
 
-#: src/commandhandler.cpp:165
+#: src/commandhandler.cpp:169
 msgid "/msg > Send a private message to a user"
 msgstr ""
 
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:170
 msgid "/whisper > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:167
+#: src/commandhandler.cpp:171
 msgid "/w > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:168
+#: src/commandhandler.cpp:172
 msgid "/query > Makes a tab for private messages with another user"
 msgstr ""
 
-#: src/commandhandler.cpp:169
+#: src/commandhandler.cpp:174
 msgid "/q > Alias of query"
 msgstr ""
 
-#: src/commandhandler.cpp:171
+#: src/commandhandler.cpp:176
 msgid "/ignore > ignore a player"
 msgstr ""
 
-#: src/commandhandler.cpp:172
+#: src/commandhandler.cpp:177
 msgid "/unignore > stop ignoring a player"
 msgstr ""
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:179
 msgid "/list > Display all public channels"
 msgstr ""
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:180
 msgid "/join > Join or create a channel"
 msgstr ""
 
-#: src/commandhandler.cpp:177
+#: src/commandhandler.cpp:182
 msgid "/createparty > Create a new party"
 msgstr ""
 
-#: src/commandhandler.cpp:178
+#: src/commandhandler.cpp:183
 msgid "/party > Invite a user to party"
 msgstr ""
 
-#: src/commandhandler.cpp:180
+#: src/commandhandler.cpp:185
 msgid "/record > Start recording the chat to an external file"
 msgstr ""
 
-#: src/commandhandler.cpp:181
+#: src/commandhandler.cpp:187
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr ""
 
-#: src/commandhandler.cpp:182
+#: src/commandhandler.cpp:189
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
 
-#: src/commandhandler.cpp:184
+#: src/commandhandler.cpp:192
 msgid "/announce > Global announcement (GM only)"
 msgstr ""
 
-#: src/commandhandler.cpp:188
+#: src/commandhandler.cpp:196
 msgid "For more information, type /help <command>."
 msgstr ""
 
-#: src/commandhandler.cpp:192
+#: src/commandhandler.cpp:200
 msgid "Command: /help"
 msgstr ""
 
-#: src/commandhandler.cpp:193
+#: src/commandhandler.cpp:201
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: src/commandhandler.cpp:194
+#: src/commandhandler.cpp:203
 msgid "Command: /help <command>"
 msgstr ""
 
-#: src/commandhandler.cpp:195
+#: src/commandhandler.cpp:204
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/commandhandler.cpp:203
+#: src/commandhandler.cpp:212
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: src/commandhandler.cpp:204
+#: src/commandhandler.cpp:213
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/commandhandler.cpp:205
+#: src/commandhandler.cpp:214
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:210
+#: src/commandhandler.cpp:219
 msgid "Command: /clear"
 msgstr ""
 
-#: src/commandhandler.cpp:211
+#: src/commandhandler.cpp:220
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:224
 msgid "Command: /ignore <player>"
 msgstr ""
 
-#: src/commandhandler.cpp:216
+#: src/commandhandler.cpp:225
 msgid "This command ignores the given player regardless of current relations."
 msgstr ""
 
-#: src/commandhandler.cpp:221
+#: src/commandhandler.cpp:230
 msgid "Command: /join <channel>"
 msgstr ""
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:231
 msgid "This command makes you enter <channel>."
 msgstr ""
 
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:232
 msgid "If <channel> doesn't exist, it's created."
 msgstr ""
 
-#: src/commandhandler.cpp:227
+#: src/commandhandler.cpp:236
 msgid "Command: /list"
 msgstr ""
 
-#: src/commandhandler.cpp:228
+#: src/commandhandler.cpp:237
 msgid "This command shows a list of all channels."
 msgstr ""
 
-#: src/commandhandler.cpp:232
+#: src/commandhandler.cpp:241
 msgid "Command: /me <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:233
+#: src/commandhandler.cpp:242
 msgid "This command tell others you are (doing) <msg>."
 msgstr ""
 
-#: src/commandhandler.cpp:237
+#: src/commandhandler.cpp:246
 msgid "Command: /msg <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:238
+#: src/commandhandler.cpp:247
 msgid "Command: /whisper <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:239
+#: src/commandhandler.cpp:248
 msgid "Command: /w <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:240
+#: src/commandhandler.cpp:249
 msgid "This command sends the text <message> to <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:241 src/commandhandler.cpp:260
+#: src/commandhandler.cpp:250 src/commandhandler.cpp:269
 #: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
-#: src/net/ea/gui/guildtab.cpp:75 src/net/ea/gui/partytab.cpp:75
+#: src/net/tmwa/gui/guildtab.cpp:75 src/net/tmwa/gui/partytab.cpp:75
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:255
 msgid "Command: /query <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:247
+#: src/commandhandler.cpp:256
 msgid "Command: /q <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:248
+#: src/commandhandler.cpp:257
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:253
+#: src/commandhandler.cpp:262
 msgid "Command: /createparty <name>"
 msgstr ""
 
-#: src/commandhandler.cpp:254
+#: src/commandhandler.cpp:263
 msgid "This command creates a new party called <name>."
 msgstr ""
 
-#: src/commandhandler.cpp:258
+#: src/commandhandler.cpp:267
 msgid "Command: /party <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:259 src/net/ea/gui/partytab.cpp:74
+#: src/commandhandler.cpp:268 src/net/tmwa/gui/partytab.cpp:74
 msgid "This command invites <nick> to party with you."
 msgstr ""
 
-#: src/commandhandler.cpp:265
+#: src/commandhandler.cpp:274
 msgid "Command: /present"
 msgstr ""
 
-#: src/commandhandler.cpp:266
+#: src/commandhandler.cpp:275
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: src/commandhandler.cpp:272
+#: src/commandhandler.cpp:281
 msgid "Command: /record <filename>"
 msgstr ""
 
-#: src/commandhandler.cpp:273
+#: src/commandhandler.cpp:282
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr ""
 
-#: src/commandhandler.cpp:275
+#: src/commandhandler.cpp:284
 msgid "Command: /record"
 msgstr ""
 
-#: src/commandhandler.cpp:276
+#: src/commandhandler.cpp:285
 msgid "This command finishes a recording session."
 msgstr ""
 
-#: src/commandhandler.cpp:280
+#: src/commandhandler.cpp:289
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: src/commandhandler.cpp:281
+#: src/commandhandler.cpp:290
 msgid ""
 "This command sets whether the return key should toggle the chat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: src/commandhandler.cpp:283
+#: src/commandhandler.cpp:292
 msgid ""
-"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
-"\", \"no\", \"false\" to turn the toggle off."
+"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
+"\"0\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: src/commandhandler.cpp:286
+#: src/commandhandler.cpp:295
 msgid "Command: /toggle"
 msgstr ""
 
-#: src/commandhandler.cpp:287
+#: src/commandhandler.cpp:296
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: src/commandhandler.cpp:291 src/gui/widgets/whispertab.cpp:93
+#: src/commandhandler.cpp:300 src/gui/widgets/whispertab.cpp:95
 msgid "Command: /unignore <player>"
 msgstr ""
 
-#: src/commandhandler.cpp:292
+#: src/commandhandler.cpp:301
 msgid "This command stops ignoring the given player if they are being ignored"
 msgstr ""
 
-#: src/commandhandler.cpp:297
+#: src/commandhandler.cpp:306
 msgid "Command: /where"
 msgstr ""
 
-#: src/commandhandler.cpp:298
+#: src/commandhandler.cpp:307
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: src/commandhandler.cpp:302
+#: src/commandhandler.cpp:311
 msgid "Command: /who"
 msgstr ""
 
-#: src/commandhandler.cpp:303
+#: src/commandhandler.cpp:312
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:309
+#: src/commandhandler.cpp:318
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: src/commandhandler.cpp:375
+#: src/commandhandler.cpp:384
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:383
+#: src/commandhandler.cpp:392
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:397
+#: src/commandhandler.cpp:406
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:410 src/net/ea/gui/partytab.cpp:109
+#: src/commandhandler.cpp:419 src/net/tmwa/gui/partytab.cpp:109
 msgid "Party name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:423 src/commandhandler.cpp:471
-#: src/commandhandler.cpp:493
+#: src/commandhandler.cpp:432 src/commandhandler.cpp:509
+#: src/commandhandler.cpp:531
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:441
+#: src/commandhandler.cpp:450
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:441
+#: src/commandhandler.cpp:450
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:450
+#: src/commandhandler.cpp:459
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:454
+#: src/commandhandler.cpp:463
 msgid "Message now closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:477
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:489
+msgid "Show IP: On"
+msgstr ""
+
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:485
+msgid "Show IP: Off"
+msgstr ""
+
+#: src/commandhandler.cpp:515
 msgid "Player already ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:484
+#: src/commandhandler.cpp:522
 msgid "Player successfully ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:486
+#: src/commandhandler.cpp:524
 msgid "Player could not be ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:501
+#: src/commandhandler.cpp:539
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:506
+#: src/commandhandler.cpp:544
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:508
+#: src/commandhandler.cpp:546
 msgid "Player could not be unignored!"
 msgstr ""
 
@@ -459,40 +473,40 @@ msgstr ""
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:326
+#: src/game.cpp:342
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:331
+#: src/game.cpp:347
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:355
+#: src/game.cpp:378
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:360
+#: src/game.cpp:382
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:705
+#: src/game.cpp:721
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:712
+#: src/game.cpp:726
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:946
+#: src/game.cpp:954
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:947
+#: src/game.cpp:955
 #, c-format
 msgid "Error while loading %s"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:75
+#: src/gui/beingpopup.cpp:76
 #, c-format
 msgid "Party: %s"
 msgstr ""
@@ -501,34 +515,34 @@ msgstr ""
 msgid "Buy"
 msgstr ""
 
-#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
-#: src/gui/sell.cpp:276
+#: src/gui/buy.cpp:69 src/gui/buy.cpp:261 src/gui/sell.cpp:71
+#: src/gui/sell.cpp:288
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:99 src/gui/npcdialog.cpp:100
-#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:479
+#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:112 src/gui/npcdialog.cpp:124
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:463
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:98 src/gui/npcdialog.cpp:101
-#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:491
+#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:111 src/gui/npcdialog.cpp:125
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:475
 msgid "-"
 msgstr ""
 
 #: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
-#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:182
-#: src/keyboardconfig.cpp:103
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:228
+#: src/keyboardconfig.cpp:102
 msgid "Quit"
 msgstr ""
 
-#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:408
-#: src/gui/statuswindow.cpp:478 src/gui/statuswindow.cpp:512
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:384
+#: src/gui/statuswindow.cpp:462 src/gui/statuswindow.cpp:496
 msgid "Max"
 msgstr ""
 
@@ -542,11 +556,11 @@ msgstr ""
 
 #: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
 #: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
-#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:101
-#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:178
-#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:402
+#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:114
+#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:389
 #: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
-#: src/gui/socialwindow.cpp:242 src/gui/textdialog.cpp:39
+#: src/gui/socialwindow.cpp:275 src/gui/textdialog.cpp:40
 #: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr ""
@@ -583,7 +597,7 @@ msgstr ""
 msgid "Change Password"
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:53
+#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:55
 #: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
 msgid "Password:"
 msgstr ""
@@ -614,19 +628,19 @@ msgstr ""
 msgid "Create Character"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:52
+#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:54
 #: src/gui/register.cpp:67
 msgid "Name:"
 msgstr ""
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
 #: src/gui/outfitwindow.cpp:67
 msgid ">"
 msgstr ""
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
 #: src/gui/outfitwindow.cpp:66
@@ -641,8 +655,8 @@ msgstr ""
 msgid "Hair style:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:397
-#: src/gui/socialwindow.cpp:296
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:392
+#: src/gui/socialwindow.cpp:329
 msgid "Create"
 msgstr ""
 
@@ -697,33 +711,33 @@ msgstr ""
 msgid "Change Email"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:185
-#: src/gui/setup_players.cpp:230
+#: src/gui/charselectdialog.cpp:336 src/gui/serverdialog.cpp:231
+#: src/gui/setup_players.cpp:229
 msgid "Delete"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:387
+#: src/gui/charselectdialog.cpp:380
 msgid "Choose"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:399 src/gui/charselectdialog.cpp:400
+#: src/gui/charselectdialog.cpp:394 src/gui/charselectdialog.cpp:395
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:77 src/gui/palette.cpp:96
+#: src/gui/chat.cpp:88
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chat.cpp:287
+#: src/gui/chat.cpp:311
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:305
+#: src/gui/chat.cpp:329
 msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:469
+#: src/gui/chat.cpp:493
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -785,140 +799,170 @@ msgstr ""
 msgid "Ambient FX: %s"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:56
+#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:55
 msgid "Equipment"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:77
-#: src/gui/inventorywindow.cpp:79 src/gui/inventorywindow.cpp:298
-#: src/gui/popupmenu.cpp:372
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:89
+#: src/gui/inventorywindow.cpp:337 src/gui/popupmenu.cpp:359
 msgid "Unequip"
 msgstr ""
 
-#: src/gui/help.cpp:36
+#: src/gui/help.cpp:37
 msgid "Help"
 msgstr ""
 
-#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:73
+#: src/gui/help.cpp:51 src/gui/npcdialog.cpp:50
 msgid "Close"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:56 src/gui/windowmenu.cpp:57
+#: src/gui/inventorywindow.cpp:59 src/gui/windowmenu.cpp:56
 msgid "Inventory"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:72 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:300 src/gui/popupmenu.cpp:374
+#: src/gui/inventorywindow.cpp:59
+msgid "Storage"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:82
+msgid "Slots:"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:87 src/gui/inventorywindow.cpp:100
+#: src/gui/inventorywindow.cpp:339 src/gui/popupmenu.cpp:361
 msgid "Equip"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:304 src/gui/popupmenu.cpp:377
+#: src/gui/inventorywindow.cpp:88
 msgid "Use"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:83 src/gui/inventorywindow.cpp:308
-#: src/gui/popupmenu.cpp:380
+#: src/gui/inventorywindow.cpp:101 src/gui/popupmenu.cpp:364
+msgid "Activate"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:102 src/gui/inventorywindow.cpp:348
+#: src/gui/popupmenu.cpp:367
 msgid "Drop..."
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:84 src/gui/popupmenu.cpp:386
+#: src/gui/inventorywindow.cpp:103 src/gui/popupmenu.cpp:373
 msgid "Split"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:85 src/gui/outfitwindow.cpp:51
+#: src/gui/inventorywindow.cpp:104 src/gui/outfitwindow.cpp:51
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:96 src/gui/storagewindow.cpp:83
-msgid "Slots:"
+#: src/gui/inventorywindow.cpp:106
+msgid "Weight:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:97
-msgid "Weight:"
+#: src/gui/inventorywindow.cpp:124 src/gui/popupmenu.cpp:378
+msgid "Store"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:310 src/gui/popupmenu.cpp:382
+#: src/gui/inventorywindow.cpp:125 src/gui/popupmenu.cpp:385
+msgid "Retrieve"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:350 src/gui/popupmenu.cpp:369
 msgid "Drop"
 msgstr ""
 
-#: src/gui/itemamount.cpp:100 src/gui/okdialog.cpp:42
-#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:38 src/gui/trade.cpp:73
-#: src/gui/trade.cpp:75
+#: src/gui/itemamount.cpp:113 src/gui/okdialog.cpp:42
+#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:39 src/gui/trade.cpp:72
+#: src/gui/trade.cpp:74
 msgid "OK"
 msgstr ""
 
-#: src/gui/itemamount.cpp:102
+#: src/gui/itemamount.cpp:115
 msgid "All"
 msgstr ""
 
-#: src/gui/itemamount.cpp:128
+#: src/gui/itemamount.cpp:141
 msgid "Select amount of items to trade."
 msgstr ""
 
-#: src/gui/itemamount.cpp:131
+#: src/gui/itemamount.cpp:144
 msgid "Select amount of items to drop."
 msgstr ""
 
-#: src/gui/itemamount.cpp:134
+#: src/gui/itemamount.cpp:147
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/itemamount.cpp:137
+#: src/gui/itemamount.cpp:150
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamount.cpp:140
+#: src/gui/itemamount.cpp:153
 msgid "Select amount of items to split."
 msgstr ""
 
-#: src/gui/itempopup.cpp:92
+#: src/gui/itempopup.cpp:137
 #, c-format
 msgid "Weight: %s"
 msgstr ""
 
-#: src/gui/login.cpp:49 src/gui/login.cpp:61
+#: src/gui/login.cpp:51 src/gui/login.cpp:63
 msgid "Login"
 msgstr ""
 
-#: src/gui/login.cpp:58
+#: src/gui/login.cpp:60
 msgid "Remember username"
 msgstr ""
 
-#: src/gui/login.cpp:59 src/gui/register.cpp:58 src/gui/register.cpp:73
+#: src/gui/login.cpp:61 src/gui/register.cpp:58 src/gui/register.cpp:73
 msgid "Register"
 msgstr ""
 
-#: src/gui/login.cpp:60
+#: src/gui/login.cpp:62
 msgid "Change Server"
 msgstr ""
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
+#: src/gui/login.cpp:129
+msgid "Registration disabled"
+msgstr ""
+
+#: src/gui/login.cpp:129
+msgid "You need to use the website to register an account for this server."
+msgstr ""
+
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:86
 msgid "Map"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:44
+#: src/gui/ministatus.cpp:235
+msgid "Need"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:48
 msgid "Waiting for server"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:45
+#: src/gui/npcdialog.cpp:49
 msgid "Next"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:47
+#: src/gui/npcdialog.cpp:51
 msgid "Submit"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:52 src/gui/npcpostdialog.cpp:41
+#: src/gui/npcdialog.cpp:73 src/gui/npcpostdialog.cpp:41
 msgid "NPC"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:110
+#: src/gui/npcdialog.cpp:118
+msgid "Clear log"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:134
 msgid "Reset"
 msgstr ""
 
 #. TRANSLATORS: Please leave the \n sequences intact.
-#: src/gui/npcdialog.cpp:171
+#: src/gui/npcdialog.cpp:208
 msgid ""
 "\n"
 "> Next\n"
@@ -932,7 +976,7 @@ msgstr ""
 msgid "Send"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:96
+#: src/gui/npcpostdialog.cpp:99
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
@@ -946,303 +990,82 @@ msgstr ""
 msgid "Unequip first"
 msgstr ""
 
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:143
-msgid "Text"
-msgstr ""
-
-#: src/gui/palette.cpp:82
-msgid "Text Shadow"
-msgstr ""
-
-#: src/gui/palette.cpp:83
-msgid "Text Outline"
-msgstr ""
-
-#: src/gui/palette.cpp:84
-msgid "Progress Bar Labels"
-msgstr ""
-
-#: src/gui/palette.cpp:85
-msgid "Buttons"
-msgstr ""
-
-#: src/gui/palette.cpp:86
-msgid "Disabled Buttons"
-msgstr ""
-
-#: src/gui/palette.cpp:87
-msgid "Tabs"
-msgstr ""
-
-#: src/gui/palette.cpp:89
-msgid "Background"
-msgstr ""
-
-#: src/gui/palette.cpp:91
-msgid "Highlight"
-msgstr ""
-
-#: src/gui/palette.cpp:92
-msgid "Tab Highlight"
-msgstr ""
-
-#: src/gui/palette.cpp:93
-msgid "Item Too Expensive"
-msgstr ""
-
-#: src/gui/palette.cpp:94
-msgid "Item Is Equipped"
-msgstr ""
-
-#: src/gui/palette.cpp:97
-msgid "GM"
-msgstr ""
-
-#: src/gui/palette.cpp:98
-msgid "Player"
-msgstr ""
-
-#: src/gui/palette.cpp:99
-msgid "Whisper"
-msgstr ""
-
-#: src/gui/palette.cpp:100
-msgid "Is"
-msgstr ""
-
-#: src/gui/palette.cpp:101 src/net/ea/gui/partytab.cpp:43
-msgid "Party"
-msgstr ""
-
-#: src/gui/palette.cpp:102 src/net/ea/gui/guildtab.cpp:45
-msgid "Guild"
-msgstr ""
-
-#: src/gui/palette.cpp:103
-msgid "Server"
-msgstr ""
-
-#: src/gui/palette.cpp:104
-msgid "Logger"
-msgstr ""
-
-#: src/gui/palette.cpp:105
-msgid "Hyperlink"
-msgstr ""
-
-#: src/gui/palette.cpp:107
-msgid "Being"
-msgstr ""
-
-#: src/gui/palette.cpp:108
-msgid "Other Players' Names"
-msgstr ""
-
-#: src/gui/palette.cpp:109
-msgid "Own Name"
-msgstr ""
-
-#: src/gui/palette.cpp:110
-msgid "GM Names"
-msgstr ""
-
-#: src/gui/palette.cpp:111
-msgid "NPCs"
-msgstr ""
-
-#: src/gui/palette.cpp:112
-msgid "Monsters"
-msgstr ""
-
-#: src/gui/palette.cpp:114
-msgid "Unknown Item Type"
-msgstr ""
-
-#: src/gui/palette.cpp:115
-msgid "Generics"
-msgstr ""
-
-#: src/gui/palette.cpp:116
-msgid "Hats"
-msgstr ""
-
-#: src/gui/palette.cpp:117
-msgid "Usables"
-msgstr ""
-
-#: src/gui/palette.cpp:118
-msgid "Shirts"
-msgstr ""
-
-#: src/gui/palette.cpp:119
-msgid "One Handed Weapons"
-msgstr ""
-
-#: src/gui/palette.cpp:120
-msgid "Pants"
-msgstr ""
-
-#: src/gui/palette.cpp:121
-msgid "Shoes"
-msgstr ""
-
-#: src/gui/palette.cpp:122
-msgid "Two Handed Weapons"
-msgstr ""
-
-#: src/gui/palette.cpp:123
-msgid "Shields"
-msgstr ""
-
-#: src/gui/palette.cpp:124
-msgid "Rings"
-msgstr ""
-
-#: src/gui/palette.cpp:125
-msgid "Necklaces"
-msgstr ""
-
-#: src/gui/palette.cpp:126
-msgid "Arms"
-msgstr ""
-
-#: src/gui/palette.cpp:127
-msgid "Ammo"
-msgstr ""
-
-#: src/gui/palette.cpp:129
-msgid "Particle Effects"
-msgstr ""
-
-#: src/gui/palette.cpp:130
-msgid "Pickup Notification"
-msgstr ""
-
-#: src/gui/palette.cpp:131
-msgid "Exp Notification"
-msgstr ""
-
-#: src/gui/palette.cpp:133
-msgid "Player Hits Monster"
-msgstr ""
-
-#: src/gui/palette.cpp:135
-msgid "Monster Hits Player"
-msgstr ""
-
-#: src/gui/palette.cpp:136
-msgid "Critical Hit"
-msgstr ""
-
-#: src/gui/palette.cpp:137
-msgid "Misses"
-msgstr ""
-
-#: src/gui/palette.cpp:139
-msgid "HP Bar"
-msgstr ""
-
-#: src/gui/palette.cpp:140
-msgid "3/4 HP Bar"
-msgstr ""
-
-#: src/gui/palette.cpp:141
-msgid "1/2 HP Bar"
-msgstr ""
-
-#: src/gui/palette.cpp:142
-msgid "1/4 HP Bar"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:84
+#: src/gui/popupmenu.cpp:83
 #, c-format
 msgid "Trade with %s..."
 msgstr ""
 
-#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:161
+#: src/gui/popupmenu.cpp:87 src/gui/popupmenu.cpp:158
 #, c-format
 msgid "Attack %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:92
+#: src/gui/popupmenu.cpp:91
 #, c-format
 msgid "Whisper %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:101
+#: src/gui/popupmenu.cpp:100
 #, c-format
 msgid "Befriend %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:106
+#: src/gui/popupmenu.cpp:105
 #, c-format
 msgid "Disregard %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:109
+#: src/gui/popupmenu.cpp:108
 #, c-format
 msgid "Ignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:115 src/gui/popupmenu.cpp:124
+#: src/gui/popupmenu.cpp:114 src/gui/popupmenu.cpp:123
 #, c-format
 msgid "Unignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:118
+#: src/gui/popupmenu.cpp:117
 #, c-format
 msgid "Completely ignore %s"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:130
 #, c-format
-msgid "Follow %s"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:133
-#, c-format
 msgid "Invite %s to join your guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:137
+#: src/gui/popupmenu.cpp:134
 #, c-format
 msgid "Invite %s to join your party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144
+#: src/gui/popupmenu.cpp:141
 msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:153
+#: src/gui/popupmenu.cpp:150
 #, c-format
 msgid "Talk to %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:166
+#: src/gui/popupmenu.cpp:163
 msgid "Kick monster"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:174
+#: src/gui/popupmenu.cpp:171
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:191
+#: src/gui/popupmenu.cpp:188
 #, c-format
 msgid "Pick up %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:400
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:387
 msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:70
-msgid "Store"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:71
-msgid "Retrieve"
-msgstr ""
-
 #: src/gui/quitdialog.cpp:44
 msgid "Switch server"
 msgstr ""
@@ -1311,47 +1134,60 @@ msgstr ""
 msgid "Passwords do not match."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:134
+#: src/gui/serverdialog.cpp:197
 msgid "Choose Your Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:141 src/gui/widgets/chattab.cpp:139
+#: src/gui/serverdialog.cpp:206 src/gui/widgets/chattab.cpp:142
 msgid "Server:"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:142
+#: src/gui/serverdialog.cpp:207
 msgid "Port:"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:143
+#: src/gui/serverdialog.cpp:208
 msgid "Server type:"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:183
+#: src/gui/serverdialog.cpp:229
 msgid "Connect"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:184
+#: src/gui/serverdialog.cpp:230
 msgid "Custom Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:262
+#: src/gui/serverdialog.cpp:324
 msgid "Please type both the address and the port of a server."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:411
+#: src/gui/serverdialog.cpp:441
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:417
+#: src/gui/serverdialog.cpp:447
 msgid "Waiting for server..."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:421
+#: src/gui/serverdialog.cpp:451
 msgid "Preparing download"
 msgstr ""
 
+#: src/gui/serverdialog.cpp:455
+msgid "Error retreiving server list!"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:550
+msgid "requires a newer version"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:552
+#, c-format
+msgid "requires v%s"
+msgstr ""
+
 #: src/gui/setup_audio.cpp:42
 msgid "Sound"
 msgstr ""
@@ -1384,50 +1220,50 @@ msgstr ""
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:44
+#: src/gui/setup_colors.cpp:46
 msgid "This is what the color looks like"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:49
+#: src/gui/setup_colors.cpp:51
 msgid "Colors"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:70
+#: src/gui/setup_colors.cpp:72
 msgid "Type:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:81 src/gui/setup_colors.cpp:433
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:331
 msgid "Static"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:84
-#: src/gui/setup_colors.cpp:434
+#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
+#: src/gui/setup_colors.cpp:332
 msgid "Pulse"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
+#: src/gui/setup_colors.cpp:333
 msgid "Rainbow"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
+#: src/gui/setup_colors.cpp:333
 msgid "Spectrum"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:92
+#: src/gui/setup_colors.cpp:94
 msgid "Delay:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:107
+#: src/gui/setup_colors.cpp:109
 msgid "Red:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:122
+#: src/gui/setup_colors.cpp:124
 msgid "Green:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:137
+#: src/gui/setup_colors.cpp:139
 msgid "Blue:"
 msgstr ""
 
@@ -1472,562 +1308,576 @@ msgid "Assign"
 msgstr ""
 
 #: src/gui/setup_keyboard.cpp:90
+msgid "Unassign"
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:94
 msgid "Default"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:119
+#: src/gui/setup_keyboard.cpp:125
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_players.cpp:57
+#: src/gui/setup_players.cpp:58
 msgid "Name"
 msgstr ""
 
-#: src/gui/setup_players.cpp:58
+#: src/gui/setup_players.cpp:59
 msgid "Relation"
 msgstr ""
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:64
 msgid "Neutral"
 msgstr ""
 
-#: src/gui/setup_players.cpp:64
+#: src/gui/setup_players.cpp:65
 msgid "Friend"
 msgstr ""
 
-#: src/gui/setup_players.cpp:65
+#: src/gui/setup_players.cpp:66
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_players.cpp:67
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_players.cpp:208 src/gui/setup_video.cpp:132
+#: src/gui/setup_players.cpp:206 src/gui/setup_video.cpp:153
 msgid "???"
 msgstr ""
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_players.cpp:225
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_players.cpp:228
+#: src/gui/setup_players.cpp:227
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:231
 msgid "Put all whispers in tabs"
 msgstr ""
 
-#: src/gui/setup_players.cpp:234
+#: src/gui/setup_players.cpp:233
 msgid "Show gender"
 msgstr ""
 
-#: src/gui/setup_players.cpp:236
+#: src/gui/setup_players.cpp:235
+msgid "Enable Chat log"
+msgstr ""
+
+#: src/gui/setup_players.cpp:237
 msgid "Players"
 msgstr ""
 
-#: src/gui/setup_players.cpp:261
+#: src/gui/setup_players.cpp:262
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:113
+#: src/gui/setup_video.cpp:134
 msgid "Tiny"
 msgstr ""
 
-#: src/gui/setup_video.cpp:114
+#: src/gui/setup_video.cpp:135
 msgid "Small"
 msgstr ""
 
-#: src/gui/setup_video.cpp:115
+#: src/gui/setup_video.cpp:136
 msgid "Medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:116
+#: src/gui/setup_video.cpp:137
 msgid "Large"
 msgstr ""
 
-#: src/gui/setup_video.cpp:142
+#: src/gui/setup_video.cpp:163
 msgid "No text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:144
+#: src/gui/setup_video.cpp:164
+msgid "Text"
+msgstr ""
+
+#: src/gui/setup_video.cpp:165
 msgid "Bubbles, no names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:145
+#: src/gui/setup_video.cpp:166
 msgid "Bubbles with names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:157
+#: src/gui/setup_video.cpp:178
 msgid "off"
 msgstr ""
 
-#: src/gui/setup_video.cpp:158 src/gui/setup_video.cpp:171
+#: src/gui/setup_video.cpp:179 src/gui/setup_video.cpp:192
 msgid "low"
 msgstr ""
 
-#: src/gui/setup_video.cpp:159 src/gui/setup_video.cpp:173
+#: src/gui/setup_video.cpp:180 src/gui/setup_video.cpp:194
 msgid "high"
 msgstr ""
 
-#: src/gui/setup_video.cpp:172
+#: src/gui/setup_video.cpp:193
 msgid "medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:174
+#: src/gui/setup_video.cpp:195
 msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:196
+#: src/gui/setup_video.cpp:217
 msgid "Full screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:197
+#: src/gui/setup_video.cpp:218
 msgid "OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:198
+#: src/gui/setup_video.cpp:219
 msgid "Custom cursor"
 msgstr ""
 
-#: src/gui/setup_video.cpp:200
+#: src/gui/setup_video.cpp:221
 msgid "Visible names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:223
 msgid "Particle effects"
 msgstr ""
 
-#: src/gui/setup_video.cpp:204
+#: src/gui/setup_video.cpp:225
 msgid "Show own name"
 msgstr ""
 
-#: src/gui/setup_video.cpp:205
+#: src/gui/setup_video.cpp:226
+msgid "Log NPC dialogue"
+msgstr ""
+
+#: src/gui/setup_video.cpp:227
 msgid "Show pickup notification"
 msgstr ""
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:207
+#. TRANSLATORS: Refers to "Show pickup notification"
+#: src/gui/setup_video.cpp:229
 msgid "in chat"
 msgstr ""
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:209
+#. TRANSLATORS: Refers to "Show pickup notification"
+#: src/gui/setup_video.cpp:231
 msgid "as particle"
 msgstr ""
 
-#: src/gui/setup_video.cpp:214
+#: src/gui/setup_video.cpp:236
 msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:225
+#: src/gui/setup_video.cpp:247
+msgid "Disable transparency (Low CPU mode)"
+msgstr ""
+
+#: src/gui/setup_video.cpp:250
 msgid "Video"
 msgstr ""
 
-#: src/gui/setup_video.cpp:227
-msgid "Show monster damage"
+#: src/gui/setup_video.cpp:252
+msgid "Show damage"
 msgstr ""
 
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:258
 msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:259
 msgid "Gui opacity"
 msgstr ""
 
-#: src/gui/setup_video.cpp:235
+#: src/gui/setup_video.cpp:260
 msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_video.cpp:236
+#: src/gui/setup_video.cpp:261
 msgid "Particle detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237
+#: src/gui/setup_video.cpp:262
 msgid "Font size"
 msgstr ""
 
-#: src/gui/setup_video.cpp:251 src/gui/setup_video.cpp:454
-#: src/gui/setup_video.cpp:568
+#: src/gui/setup_video.cpp:277 src/gui/setup_video.cpp:532
+#: src/gui/setup_video.cpp:662
 msgid "None"
 msgstr ""
 
-#: src/gui/setup_video.cpp:381
+#: src/gui/setup_video.cpp:426
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:387
+#: src/gui/setup_video.cpp:432
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:398
+#: src/gui/setup_video.cpp:443
 msgid "Switching to Full Screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:399
+#: src/gui/setup_video.cpp:444
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:411
+#: src/gui/setup_video.cpp:458
 msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:412
+#: src/gui/setup_video.cpp:459
+msgid ""
+"Applying change to OpenGL requires restart. In case OpenGL messes up your "
+"game graphics, restart the game with the command line option \"--no-opengl\"."
+msgstr ""
+
+#: src/gui/setup_video.cpp:466
+msgid "Deactivating OpenGL"
+msgstr ""
+
+#: src/gui/setup_video.cpp:467
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#: src/gui/setup_video.cpp:486 src/gui/setup_video.cpp:491
+#: src/gui/setup_video.cpp:475
+msgid "Transparency disabled"
+msgstr ""
+
+#: src/gui/setup_video.cpp:476 src/gui/setup_video.cpp:484
+msgid "You must restart to apply changes."
+msgstr ""
+
+#: src/gui/setup_video.cpp:483
+msgid "Transparency enabled"
+msgstr ""
+
+#: src/gui/setup_video.cpp:576 src/gui/setup_video.cpp:581
 msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:487 src/gui/setup_video.cpp:492
+#: src/gui/setup_video.cpp:577 src/gui/setup_video.cpp:582
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:489
+#: src/gui/setup_video.cpp:579
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:522
+#: src/gui/setup_video.cpp:612
 msgid "Particle Effect Settings Changed."
 msgstr ""
 
-#: src/gui/setup_video.cpp:523
+#: src/gui/setup_video.cpp:613
 msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skilldialog.cpp:197 src/gui/windowmenu.cpp:58
+#: src/gui/skilldialog.cpp:212 src/gui/windowmenu.cpp:59
 msgid "Skills"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:208
+#: src/gui/skilldialog.cpp:223
 msgid "Up"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:262
+#: src/gui/skilldialog.cpp:269
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:314
+#: src/gui/skilldialog.cpp:351
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:323
+#: src/gui/skilldialog.cpp:360
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:405
+#: src/gui/skilldialog.cpp:442
 #, c-format
 msgid "Lvl: %d (%+d)"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:416
+#: src/gui/skilldialog.cpp:453
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:117
+#: src/gui/socialwindow.cpp:126
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:126
+#: src/gui/socialwindow.cpp:139
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:136
+#: src/gui/socialwindow.cpp:153
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:137
+#: src/gui/socialwindow.cpp:154
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:146
+#: src/gui/socialwindow.cpp:163
 msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:147
+#: src/gui/socialwindow.cpp:164
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:182
+#: src/gui/socialwindow.cpp:207 src/net/tmwa/partyhandler.cpp:330
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:218
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:199
+#: src/gui/socialwindow.cpp:232
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:200
+#: src/gui/socialwindow.cpp:233
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:209
+#: src/gui/socialwindow.cpp:242
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:210
+#: src/gui/socialwindow.cpp:243
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:239
+#: src/gui/socialwindow.cpp:272
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:240 src/gui/socialwindow.cpp:564
+#: src/gui/socialwindow.cpp:273 src/gui/socialwindow.cpp:620
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:279 src/gui/windowmenu.cpp:60
+#: src/gui/socialwindow.cpp:312 src/gui/windowmenu.cpp:64
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:297
+#: src/gui/socialwindow.cpp:330
 msgid "Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:298
+#: src/gui/socialwindow.cpp:331
 msgid "Leave"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:394
+#: src/gui/socialwindow.cpp:443
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:400
+#: src/gui/socialwindow.cpp:449
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:413
+#: src/gui/socialwindow.cpp:462
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:419
+#: src/gui/socialwindow.cpp:468
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:463
+#: src/gui/socialwindow.cpp:497
+msgid "Creating guild failed, please choose a shorter name."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:504
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:477
+#: src/gui/socialwindow.cpp:520
+msgid "Creating party failed, please choose a shorter name."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:527
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:484
+#: src/gui/socialwindow.cpp:541
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:485
+#: src/gui/socialwindow.cpp:542
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:497
+#: src/gui/socialwindow.cpp:554
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:502
+#: src/gui/socialwindow.cpp:559
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:507
+#: src/gui/socialwindow.cpp:564
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:519
+#: src/gui/socialwindow.cpp:576
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:529
+#: src/gui/socialwindow.cpp:585
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:533
+#: src/gui/socialwindow.cpp:589
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:541
+#: src/gui/socialwindow.cpp:597
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:546
+#: src/gui/socialwindow.cpp:602
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:554
+#: src/gui/socialwindow.cpp:610
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:565
+#: src/gui/socialwindow.cpp:621
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:570
+#: src/gui/socialwindow.cpp:626
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:571
+#: src/gui/socialwindow.cpp:627
 msgid "Choose your party's name."
 msgstr ""
 
-#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:59
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:62
 msgid "Specials"
 msgstr ""
 
-#: src/gui/specialswindow.cpp:174
-#, c-format
-msgid "Specials Set %d"
-msgstr ""
-
-#: src/gui/specialswindow.cpp:191
-#, c-format
-msgid "Special %d"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:99 src/gui/statuswindow.cpp:247
+#: src/gui/statuswindow.cpp:113 src/gui/statuswindow.cpp:215
+#: src/gui/statuswindow.cpp:262
 #, c-format
 msgid "Level: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:211
+#: src/gui/statuswindow.cpp:114 src/gui/statuswindow.cpp:208
+#: src/gui/statuswindow.cpp:239
 #, c-format
 msgid "Money: %s"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:102
+#: src/gui/statuswindow.cpp:117
 msgid "HP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:107
+#: src/gui/statuswindow.cpp:122
 msgid "Exp:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:112
+#: src/gui/statuswindow.cpp:130
 msgid "MP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:132 src/gui/statuswindow.cpp:219
+#: src/gui/statuswindow.cpp:158 src/gui/statuswindow.cpp:275
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:133
+#: src/gui/statuswindow.cpp:159
 msgid "Job:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:194
-msgid "HP"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:200
-msgid "MP"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:206
-msgid "Exp"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:215
-msgid "Money"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:225
-msgid "Job"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:229
+#: src/gui/statuswindow.cpp:211 src/gui/statuswindow.cpp:247
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:235
+#: src/gui/statuswindow.cpp:255
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:251
-msgid "Level"
-msgstr ""
-
-#: src/gui/storagewindow.cpp:58
-msgid "Storage"
-msgstr ""
-
-#: src/gui/trade.cpp:52
+#: src/gui/trade.cpp:53
 msgid "Propose trade"
 msgstr ""
 
-#: src/gui/trade.cpp:53
+#: src/gui/trade.cpp:54
 msgid "Confirmed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:55
 msgid "Agree trade"
 msgstr ""
 
-#: src/gui/trade.cpp:55
+#: src/gui/trade.cpp:56
 msgid "Agreed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:58
+#: src/gui/trade.cpp:59
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/trade.cpp:74 src/gui/trade.cpp:75
+#: src/gui/trade.cpp:73 src/gui/trade.cpp:74
 msgid "Trade"
 msgstr ""
 
-#: src/gui/trade.cpp:77
+#: src/gui/trade.cpp:76
 msgid "Add"
 msgstr ""
 
-#: src/gui/trade.cpp:99 src/gui/trade.cpp:135
+#: src/gui/trade.cpp:98 src/gui/trade.cpp:134
 #, c-format
 msgid "You get %s"
 msgstr ""
 
-#: src/gui/trade.cpp:100
+#: src/gui/trade.cpp:99
 msgid "You give:"
 msgstr ""
 
-#: src/gui/trade.cpp:104
+#: src/gui/trade.cpp:103
 msgid "Change"
 msgstr ""
 
-#: src/gui/trade.cpp:275
+#: src/gui/trade.cpp:262
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/trade.cpp:318
+#: src/gui/trade.cpp:304
 msgid "You don't have enough money."
 msgstr ""
 
@@ -2048,21 +1898,21 @@ msgstr ""
 msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:405
+#: src/gui/updatewindow.cpp:417
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:407
+#: src/gui/updatewindow.cpp:419
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:409
+#: src/gui/updatewindow.cpp:421
 msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:501
+#: src/gui/updatewindow.cpp:515
 msgid "Completed"
 msgstr ""
 
@@ -2142,61 +1992,61 @@ msgstr ""
 msgid "Need a user to kick!"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:118
+#: src/gui/widgets/chattab.cpp:121
 msgid "Global announcement:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:124
+#: src/gui/widgets/chattab.cpp:127
 #, c-format
 msgid "Global announcement from %s:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:150
+#: src/gui/widgets/chattab.cpp:153
 #, c-format
 msgid "%s whispers: %s"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:51
+#: src/gui/widgets/whispertab.cpp:53
 msgid "Cannot send empty chat!"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:70
+#: src/gui/widgets/whispertab.cpp:72
 msgid "/ignore > Ignore the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:71
+#: src/gui/widgets/whispertab.cpp:73
 msgid "/unignore > Stop ignoring the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:72
+#: src/gui/widgets/whispertab.cpp:74
 msgid "/close > Close the whisper tab"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:82
+#: src/gui/widgets/whispertab.cpp:84
 msgid "Command: /close"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:83
+#: src/gui/widgets/whispertab.cpp:85
 msgid "This command closes the current whisper tab."
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:87
+#: src/gui/widgets/whispertab.cpp:89
 msgid "Command: /ignore"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:88
+#: src/gui/widgets/whispertab.cpp:90
 msgid "This command ignores the other player regardless of current relations."
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:94
+#: src/gui/widgets/whispertab.cpp:96
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:55
+#: src/gui/windowmenu.cpp:54
 msgid "Status"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:61
+#: src/gui/windowmenu.cpp:65
 msgid "Shortcut"
 msgstr ""
 
@@ -2212,1348 +2062,1359 @@ msgstr ""
 msgid "Choose World"
 msgstr ""
 
-#: src/keyboardconfig.cpp:40
+#: src/keyboardconfig.cpp:39
 msgid "Move Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:41
+#: src/keyboardconfig.cpp:40
 msgid "Move Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:41
 msgid "Move Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:42
 msgid "Move Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:44 src/net/ea/generalhandler.cpp:223
+#: src/keyboardconfig.cpp:43 src/net/tmwa/generalhandler.cpp:237
 msgid "Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:44
 msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:45
 msgid "Smilie"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:46
 msgid "Talk"
 msgstr ""
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:47
 msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:48
 msgid "Target Monster"
 msgstr ""
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboardconfig.cpp:49
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:50
 msgid "Target Player"
 msgstr ""
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:51
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:52
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:53
 msgid "Sit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:54
 msgid "Screenshot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:55
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:56
 msgid "Find Path to Mouse"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58 src/keyboardconfig.cpp:59
-#: src/keyboardconfig.cpp:60 src/keyboardconfig.cpp:61
-#: src/keyboardconfig.cpp:62 src/keyboardconfig.cpp:63
-#: src/keyboardconfig.cpp:64 src/keyboardconfig.cpp:65
-#: src/keyboardconfig.cpp:66 src/keyboardconfig.cpp:67
-#: src/keyboardconfig.cpp:68 src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:57 src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60
+#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62
+#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64
+#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68
 #, c-format
 msgid "Item Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:69
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:70
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:71
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:72
 msgid "Equipment Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:73
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:74
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:75
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:76
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:77
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:78
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:79
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:80
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:81
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:83
+#: src/keyboardconfig.cpp:82
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:83
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86
-#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88
-#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90
-#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92
-#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:84 src/keyboardconfig.cpp:85
+#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:87
+#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:89
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:91
+#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:93
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:95
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:96
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:97
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:98
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:99
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:100
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:101
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:103
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:105
+#: src/keyboardconfig.cpp:104
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:178
+#: src/keyboardconfig.cpp:183
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:913
+#: src/localplayer.cpp:985
 msgid "Unable to pick up item."
 msgstr ""
 
 #. TRANSLATORS: This sentence may be translated differently
 #. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:922
+#: src/localplayer.cpp:994
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/main.cpp:43
+#: src/main.cpp:42
 msgid "mana [options] [mana-file]"
 msgstr ""
 
+#: src/main.cpp:43
+msgid "[mana-file] : The mana file is an XML file (.mana)"
+msgstr ""
+
 #: src/main.cpp:44
-msgid "Options:"
+msgid "              used to set custom parameters"
 msgstr ""
 
 #: src/main.cpp:45
+msgid "              to the mana client."
+msgstr ""
+
+#: src/main.cpp:47
+msgid "Options:"
+msgstr ""
+
+#: src/main.cpp:48
 msgid "  -v --version        : Display the version"
 msgstr ""
 
-#: src/main.cpp:46
+#: src/main.cpp:49
 msgid "  -h --help           : Display this help"
 msgstr ""
 
-#: src/main.cpp:47
+#: src/main.cpp:50
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
-#: src/main.cpp:48
+#: src/main.cpp:51
 msgid "  -U --username       : Login with this username"
 msgstr ""
 
-#: src/main.cpp:49
+#: src/main.cpp:52
 msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/main.cpp:50
+#: src/main.cpp:53
 msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/main.cpp:51
+#: src/main.cpp:54
 msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:52
+#: src/main.cpp:55
 msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/main.cpp:53
+#: src/main.cpp:56
 msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/main.cpp:54
+#: src/main.cpp:57
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:56
+#: src/main.cpp:59
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:57
+#: src/main.cpp:60
 msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:58
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
+#: src/main.cpp:61
+msgid "     --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/main.cpp:59
+#: src/main.cpp:62
+msgid "     --chat-log-dir   : Chat log dir to use"
+msgstr ""
+
+#: src/main.cpp:63
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/main.cpp:61
+#: src/main.cpp:65
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:63
+#: src/net/manaserv/beinghandler.cpp:303 src/net/tmwa/playerhandler.cpp:94
+msgid "You are dead."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:304 src/net/tmwa/playerhandler.cpp:95
+msgid "We regret to inform you that your character was killed in battle."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:306 src/net/tmwa/playerhandler.cpp:97
+msgid "You are not that alive anymore."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:307 src/net/tmwa/playerhandler.cpp:98
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:308 src/net/tmwa/playerhandler.cpp:99
+msgid "Game Over!"
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:309 src/net/tmwa/playerhandler.cpp:101
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:311 src/net/tmwa/playerhandler.cpp:103
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:313 src/net/tmwa/playerhandler.cpp:105
+msgid "I guess this did not run too well."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:107
+msgid "Do you want your possessions identified?"
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:109
+msgid "Sadly, no trace of you was ever found..."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:111
+msgid "Annihilated."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:113
+msgid "Looks like you got your head handed to you."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:115
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:323
+msgid "Press OK to respawn."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:324
+msgid "You Died"
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:138 src/net/manaserv/charhandler.cpp:209
+msgid "Not logged in."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:141
+msgid "No empty slot."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:144
+msgid "Invalid name."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:147
+msgid "Character's name already exists."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:150
+msgid "Invalid hairstyle."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:153
+msgid "Invalid hair color."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:156
+msgid "Invalid gender."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:159
+msgid "Character's stats are too high."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:162
+msgid "Character's stats are too low."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:165
+#, c-format
+msgid "At least one statis out of the permitted range: (%u - %u)."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:171 src/net/manaserv/loginhandler.cpp:96
+#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
+#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
+#: src/net/tmwa/loginhandler.cpp:95 src/net/tmwa/loginhandler.cpp:182
+#, fuzzy
+msgid "Unknown error."
+msgstr "Непозната команда."
+
+#: src/net/manaserv/charhandler.cpp:200 src/net/tmwa/charserverhandler.cpp:146
+msgid "Info"
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:200
+msgid "Player deleted."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:212
+msgid "Selection out of range."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:215
+#, fuzzy, c-format
+msgid "Unknown error (%d)."
+msgstr "Непозната команда."
+
+#: src/net/manaserv/charhandler.cpp:250
+msgid "No gameservers are available."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:187 src/net/manaserv/chathandler.cpp:313
+#: src/net/manaserv/guildhandler.cpp:260
+#, c-format
+msgid "Topic: %s"
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:274
+msgid "Players in this channel:"
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:208
+msgid "Error joining channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:214
+msgid "Listing channels."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:226
+msgid "End of channel list."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:303
+#, c-format
+msgid "%s entered the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:308
+#, c-format
+msgid "%s left the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:324
+#, c-format
+msgid "%s has set mode %s on user %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:334
+#, c-format
+msgid "%s has kicked %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:339
+#, fuzzy
+msgid "Unknown channel event."
+msgstr "Непозната команда."
+
+#: src/net/manaserv/guildhandler.cpp:82
+msgid "Guild created."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:87
+msgid "Error creating guild."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:97
+msgid "Invite sent."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:204
+msgid "Member was promoted successfully."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:209
+msgid "Failed to promote member."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:87
+msgid "Wrong magic_token."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
+msgid "Already logged in."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:93
+msgid "Account banned."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:118
+msgid "New password incorrect."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:121 src/net/tmwa/loginhandler.cpp:89
+msgid "Old password incorrect."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
+msgid "Account not connected. Please login first."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:149
+msgid "New email address incorrect."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:152
+msgid "Old email address incorrect."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:158
+msgid "The new email address already exists."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:239
+msgid ""
+"Client registration is not allowed. Please contact server administration."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
+msgid "Client version is too old."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:266
+msgid "Wrong username or password."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:272
+msgid "Account banned"
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:275
+msgid "Login attempt too soon after previous attempt."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:303
+msgid "Wrong username, password or email address."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:306
+msgid "Username already exists."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:309
+msgid "Email address already exists."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:312
+msgid "You took too long with the captcha or your response was incorrect."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:87
+msgid "Joined party."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:105
+#, c-format
+msgid "%s joined the party."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:123
+#, c-format
+msgid "%s rejected your invite."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:95
+msgid "Accepting incoming trade requests."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:97
+msgid "Ignoring incoming trade requests."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:115 src/net/tmwa/tradehandler.cpp:109
+msgid "Request for Trade"
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:116 src/net/tmwa/tradehandler.cpp:110
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:134
+#, c-format
+msgid "Trading with %s"
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:148 src/net/tmwa/tradehandler.cpp:224
+msgid "Trade canceled."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:155 src/net/tmwa/tradehandler.cpp:231
+msgid "Trade completed."
+msgstr ""
+
+#: src/net/tmwa/adminhandler.cpp:64
 msgid "Kick failed!"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:65
+#: src/net/tmwa/adminhandler.cpp:66
 msgid "Kick succeeded!"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:110
+#: src/net/tmwa/buysellhandler.cpp:109
 msgid "Nothing to sell."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:117
+#: src/net/tmwa/buysellhandler.cpp:116
 msgid "Thanks for buying."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:124
+#: src/net/tmwa/buysellhandler.cpp:123
 msgid "Unable to buy."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:130
+#: src/net/tmwa/buysellhandler.cpp:129
 msgid "Thanks for selling."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:132
+#: src/net/tmwa/buysellhandler.cpp:131
 msgid "Unable to sell."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:103
-msgid "Access denied."
+#: src/net/tmwa/charserverhandler.cpp:103
+msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:106
+#: src/net/tmwa/charserverhandler.cpp:107
 msgid "Cannot use this ID."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:109
-msgid "Unknown failure to select character."
-msgstr ""
+#: src/net/tmwa/charserverhandler.cpp:110
+#, fuzzy
+msgid "Unknown char-server failure."
+msgstr "Непозната команда."
 
-#: src/net/ea/charserverhandler.cpp:135
+#: src/net/tmwa/charserverhandler.cpp:134
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:147 src/net/manaserv/charhandler.cpp:187
-msgid "Info"
-msgstr ""
-
-#: src/net/ea/charserverhandler.cpp:147
+#: src/net/tmwa/charserverhandler.cpp:146
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:152
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Failed to delete character."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:237 src/net/manaserv/charhandler.cpp:263
+#: src/net/tmwa/charserverhandler.cpp:266
 msgid "Strength:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:238 src/net/manaserv/charhandler.cpp:264
+#: src/net/tmwa/charserverhandler.cpp:267
 msgid "Agility:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:239 src/net/manaserv/charhandler.cpp:266
+#: src/net/tmwa/charserverhandler.cpp:268
 msgid "Vitality:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:240 src/net/manaserv/charhandler.cpp:267
+#: src/net/tmwa/charserverhandler.cpp:269
 msgid "Intelligence:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:241 src/net/manaserv/charhandler.cpp:265
+#: src/net/tmwa/charserverhandler.cpp:270
 msgid "Dexterity:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:242
+#: src/net/tmwa/charserverhandler.cpp:271
 msgid "Luck:"
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:80
-msgid "Whisper could not be sent, user is offline."
+#: src/net/tmwa/chathandler.cpp:87
+#, c-format
+msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:84
-msgid "Whisper could not be sent, ignored by user."
+#: src/net/tmwa/chathandler.cpp:96
+#, c-format
+msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:171
+#: src/net/tmwa/chathandler.cpp:230
 msgid "MVP player."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:204 src/net/ea/chathandler.cpp:210
-#: src/net/ea/chathandler.cpp:215 src/net/ea/chathandler.cpp:220
-#: src/net/ea/chathandler.cpp:225 src/net/ea/chathandler.cpp:230
-#: src/net/ea/chathandler.cpp:235 src/net/ea/chathandler.cpp:240
+#: src/net/tmwa/chathandler.cpp:265 src/net/tmwa/chathandler.cpp:271
+#: src/net/tmwa/chathandler.cpp:276 src/net/tmwa/chathandler.cpp:281
+#: src/net/tmwa/chathandler.cpp:286 src/net/tmwa/chathandler.cpp:291
+#: src/net/tmwa/chathandler.cpp:296 src/net/tmwa/chathandler.cpp:301
 msgid "Channels are not supported!"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:86
+#: src/net/tmwa/gamehandler.cpp:88
 #, c-format
 msgid "Online users: %d"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:100
+#: src/net/tmwa/gamehandler.cpp:101
 msgid "Game"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:100
+#: src/net/tmwa/gamehandler.cpp:101
 msgid "Request to quit denied!"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:102 src/net/manaserv/generalhandler.cpp:95
+#: src/net/tmwa/generalhandler.cpp:102
 #, c-format
 msgid "Strength %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:103 src/net/manaserv/generalhandler.cpp:96
+#: src/net/tmwa/generalhandler.cpp:103
 #, c-format
 msgid "Agility %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:104 src/net/manaserv/generalhandler.cpp:98
+#: src/net/tmwa/generalhandler.cpp:104
 #, c-format
 msgid "Vitality %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:105 src/net/manaserv/generalhandler.cpp:99
+#: src/net/tmwa/generalhandler.cpp:105
 #, c-format
 msgid "Intelligence %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:106 src/net/manaserv/generalhandler.cpp:97
+#: src/net/tmwa/generalhandler.cpp:106
 #, c-format
 msgid "Dexterity %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:107
+#: src/net/tmwa/generalhandler.cpp:107
 #, c-format
 msgid "Luck %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:130
+#: src/net/tmwa/generalhandler.cpp:132
 msgid "Authentication failed."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:133
+#: src/net/tmwa/generalhandler.cpp:135
 msgid "No servers available."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:137
+#: src/net/tmwa/generalhandler.cpp:139
 msgid "Someone else is trying to use this account."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:140
+#: src/net/tmwa/generalhandler.cpp:142
 msgid "This account is already logged in."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:143
+#: src/net/tmwa/generalhandler.cpp:145
 msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:146
+#: src/net/tmwa/generalhandler.cpp:148
 msgid "Duplicated login."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:149
+#: src/net/tmwa/generalhandler.cpp:151
 msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:205
+#: src/net/tmwa/generalhandler.cpp:209
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:216 src/net/manaserv/generalhandler.cpp:166
+#: src/net/tmwa/generalhandler.cpp:230
 msgid "Strength"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:217 src/net/manaserv/generalhandler.cpp:167
+#: src/net/tmwa/generalhandler.cpp:231
 msgid "Agility"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:218 src/net/manaserv/generalhandler.cpp:169
+#: src/net/tmwa/generalhandler.cpp:232
 msgid "Vitality"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:219 src/net/manaserv/generalhandler.cpp:170
+#: src/net/tmwa/generalhandler.cpp:233
 msgid "Intelligence"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:220 src/net/manaserv/generalhandler.cpp:168
+#: src/net/tmwa/generalhandler.cpp:234
 msgid "Dexterity"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:221
+#: src/net/tmwa/generalhandler.cpp:235
 msgid "Luck"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:224
+#: src/net/tmwa/generalhandler.cpp:238
 msgid "Defense"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:225
+#: src/net/tmwa/generalhandler.cpp:239
 msgid "M.Attack"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:226
+#: src/net/tmwa/generalhandler.cpp:240
 msgid "M.Defense"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:227
+#: src/net/tmwa/generalhandler.cpp:241
 #, c-format
 msgid "% Accuracy"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:228
+#: src/net/tmwa/generalhandler.cpp:242
 #, c-format
 msgid "% Evade"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:229
+#: src/net/tmwa/generalhandler.cpp:243
 #, c-format
 msgid "% Critical"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:61 src/net/ea/gui/partytab.cpp:59
+#: src/net/tmwa/gui/guildtab.cpp:45
+msgid "Guild"
+msgstr ""
+
+#: src/net/tmwa/gui/guildtab.cpp:61 src/net/tmwa/gui/partytab.cpp:59
 msgid "/help > Display this help."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:62
+#: src/net/tmwa/gui/guildtab.cpp:62
 msgid "/invite > Invite a player to your guild"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:63
+#: src/net/tmwa/gui/guildtab.cpp:63
 msgid "/leave > Leave the guild you are in"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:64
+#: src/net/tmwa/gui/guildtab.cpp:64
 msgid "/kick > Kick some one from the guild you are in"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:73 src/net/ea/gui/partytab.cpp:73
+#: src/net/tmwa/gui/guildtab.cpp:73 src/net/tmwa/gui/partytab.cpp:73
 msgid "Command: /invite <nick>"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:74
+#: src/net/tmwa/gui/guildtab.cpp:74
 msgid "This command invites <nick> to the guild you're in."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:80 src/net/ea/gui/partytab.cpp:80
+#: src/net/tmwa/gui/guildtab.cpp:80 src/net/tmwa/gui/partytab.cpp:80
 msgid "Command: /leave"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:81
+#: src/net/tmwa/gui/guildtab.cpp:81
 msgid "This command causes the player to leave the guild."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:89
+#: src/net/tmwa/gui/guildtab.cpp:89
 msgid "Guild name is missing."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:293
+#: src/net/tmwa/guildhandler.cpp:296
 msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:298
+#: src/net/tmwa/guildhandler.cpp:301
 msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:303
+#: src/net/tmwa/guildhandler.cpp:306
 msgid "User is now part of your guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:308
+#: src/net/tmwa/guildhandler.cpp:311
 msgid "Your guild is full."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:313
+#: src/net/tmwa/guildhandler.cpp:316
 msgid "Unknown guild invite response."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:390
+#: src/net/tmwa/guildhandler.cpp:393
 msgid "Guild creation isn't supported yet."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:60
+#: src/net/tmwa/gui/partytab.cpp:43
+msgid "Party"
+msgstr ""
+
+#: src/net/tmwa/gui/partytab.cpp:60
 msgid "/invite > Invite a player to your party"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:61
+#: src/net/tmwa/gui/partytab.cpp:61
 msgid "/leave > Leave the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:62
+#: src/net/tmwa/gui/partytab.cpp:62
 msgid "/kick > Kick some one from the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:63
+#: src/net/tmwa/gui/partytab.cpp:63
 msgid "/item > Show/change party item sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:64
+#: src/net/tmwa/gui/partytab.cpp:64
 msgid "/exp > Show/change party experience sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:81
+#: src/net/tmwa/gui/partytab.cpp:81
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:85
+#: src/net/tmwa/gui/partytab.cpp:85
 msgid "Command: /item <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:86
+#: src/net/tmwa/gui/partytab.cpp:86
 msgid "This command changes the party's item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:87
+#: src/net/tmwa/gui/partytab.cpp:87
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:90
+#: src/net/tmwa/gui/partytab.cpp:90
 msgid "Command: /item"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/tmwa/gui/partytab.cpp:91
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/tmwa/gui/partytab.cpp:95
 msgid "Command: /exp <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:96
+#: src/net/tmwa/gui/partytab.cpp:96
 msgid "This command changes the party's experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/tmwa/gui/partytab.cpp:97
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:100
+#: src/net/tmwa/gui/partytab.cpp:100
 msgid "Command: /exp"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/tmwa/gui/partytab.cpp:101
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:132 src/net/ea/partyhandler.cpp:198
+#: src/net/tmwa/gui/partytab.cpp:132 src/net/tmwa/partyhandler.cpp:196
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:135 src/net/ea/partyhandler.cpp:204
+#: src/net/tmwa/gui/partytab.cpp:135 src/net/tmwa/partyhandler.cpp:202
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:138 src/net/ea/partyhandler.cpp:210
+#: src/net/tmwa/gui/partytab.cpp:138 src/net/tmwa/partyhandler.cpp:208
 msgid "Item sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:141
+#: src/net/tmwa/gui/partytab.cpp:141
 msgid "Item sharing unknown."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:167 src/net/ea/partyhandler.cpp:174
+#: src/net/tmwa/gui/partytab.cpp:167 src/net/tmwa/partyhandler.cpp:172
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:170 src/net/ea/partyhandler.cpp:180
+#: src/net/tmwa/gui/partytab.cpp:170 src/net/tmwa/partyhandler.cpp:178
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:173 src/net/ea/partyhandler.cpp:186
+#: src/net/tmwa/gui/partytab.cpp:173 src/net/tmwa/partyhandler.cpp:184
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:176
+#: src/net/tmwa/gui/partytab.cpp:176
 msgid "Experience sharing unknown."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:281
+#: src/net/tmwa/inventoryhandler.cpp:285
 msgid "Failed to use item."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:391
+#: src/net/tmwa/inventoryhandler.cpp:399
 msgid "Unable to equip."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:402
+#: src/net/tmwa/inventoryhandler.cpp:410
 msgid "Unable to unequip."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:79
+#: src/net/tmwa/loginhandler.cpp:86
 msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:82 src/net/manaserv/loginhandler.cpp:121
-msgid "Old password incorrect."
-msgstr ""
-
-#: src/net/ea/loginhandler.cpp:85
+#: src/net/tmwa/loginhandler.cpp:92
 msgid "New password too short."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:88 src/net/ea/loginhandler.cpp:175
-#: src/net/manaserv/charhandler.cpp:158 src/net/manaserv/loginhandler.cpp:96
-#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
-#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
-#, fuzzy
-msgid "Unknown error."
-msgstr "Непозната команда."
-
-#: src/net/ea/loginhandler.cpp:149
+#: src/net/tmwa/loginhandler.cpp:156
 msgid "Unregistered ID."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:152
+#: src/net/tmwa/loginhandler.cpp:159
 msgid "Wrong password."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:155
+#: src/net/tmwa/loginhandler.cpp:162
 msgid "Account expired."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:158
+#: src/net/tmwa/loginhandler.cpp:165
 msgid "Rejected from server."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:161
+#: src/net/tmwa/loginhandler.cpp:168
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:165
+#: src/net/tmwa/loginhandler.cpp:172
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:172
+#: src/net/tmwa/loginhandler.cpp:179
 msgid "This user name is already taken."
 msgstr ""
 
-#: src/net/ea/network.cpp:145
+#: src/net/tmwa/network.cpp:145
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/ea/network.cpp:345
+#: src/net/tmwa/network.cpp:345
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/ea/network.cpp:414
+#: src/net/tmwa/network.cpp:414
 msgid "Connection to server terminated. "
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:81
+#: src/net/tmwa/partyhandler.cpp:82
 msgid "Could not create party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:84
+#: src/net/tmwa/partyhandler.cpp:84
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:118
+#: src/net/tmwa/partyhandler.cpp:119
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:122
+#: src/net/tmwa/partyhandler.cpp:123
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:126
+#: src/net/tmwa/partyhandler.cpp:127
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:130
+#: src/net/tmwa/partyhandler.cpp:131
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:238
+#: src/net/tmwa/partyhandler.cpp:236
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:249
+#: src/net/tmwa/partyhandler.cpp:246
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:301
+#: src/net/tmwa/partyhandler.cpp:299
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:329
-msgid "Inviting like this isn't supported at the moment."
+#: src/net/tmwa/partyhandler.cpp:335
+#, c-format
+msgid "Inviting failed, because you can't see a player called %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:334
+#: src/net/tmwa/partyhandler.cpp:340
 msgid "You can only inivte when you are in a party!"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:365
+#: src/net/tmwa/partyhandler.cpp:368
 #, c-format
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:304
-msgid "You are dead."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:305
-msgid "We regret to inform you that your character was killed in battle."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:307
-msgid "You are not that alive anymore."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:308
-msgid "The cold hands of the grim reaper are grabbing for your soul."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:309
-msgid "Game Over!"
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:105
+#: src/net/tmwa/playerhandler.cpp:100
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:310
-msgid ""
-"No, kids. Your character did not really die. It... err... went to a better "
-"place."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:312
-msgid ""
-"Your plan of breaking your enemies weapon by bashing it with your throat "
-"failed."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:314
-msgid "I guess this did not run too well."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:315
-msgid "Do you want your possessions identified?"
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:316
-msgid "Sadly, no trace of you was ever found..."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:317
-msgid "Annihilated."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:318
-msgid "Looks like you got your head handed to you."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:120 src/net/manaserv/beinghandler.cpp:319
-msgid ""
-"You screwed up again, dump your body down the tubes and get you another one."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/tmwa/playerhandler.cpp:118
 msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/tmwa/playerhandler.cpp:119
 msgid "You are no more."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/tmwa/playerhandler.cpp:120
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/tmwa/playerhandler.cpp:121
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/tmwa/playerhandler.cpp:122
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/tmwa/playerhandler.cpp:123
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/tmwa/playerhandler.cpp:124
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:130
+#: src/net/tmwa/playerhandler.cpp:125
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:131
+#: src/net/tmwa/playerhandler.cpp:126
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/tmwa/playerhandler.cpp:127
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/tmwa/playerhandler.cpp:128
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:135
+#: src/net/tmwa/playerhandler.cpp:130
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:136
+#: src/net/tmwa/playerhandler.cpp:131
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:249 src/net/ea/playerhandler.cpp:310
+#: src/net/tmwa/playerhandler.cpp:246 src/net/tmwa/playerhandler.cpp:285
 msgid "Message"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:250
+#: src/net/tmwa/playerhandler.cpp:247
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:333
+#: src/net/tmwa/playerhandler.cpp:313
 #, c-format
 msgid "You picked up %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:369
+#: src/net/tmwa/playerhandler.cpp:348
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:532
+#: src/net/tmwa/playerhandler.cpp:488
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:147
+#: src/net/tmwa/specialhandler.cpp:144
 msgid "Trade failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:150
+#: src/net/tmwa/specialhandler.cpp:147
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:153
+#: src/net/tmwa/specialhandler.cpp:150
 msgid "Sit failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:156
+#: src/net/tmwa/specialhandler.cpp:153
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:159
+#: src/net/tmwa/specialhandler.cpp:156
 msgid "Could not join party!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:162
+#: src/net/tmwa/specialhandler.cpp:159
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:171
+#: src/net/tmwa/specialhandler.cpp:168
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:174
+#: src/net/tmwa/specialhandler.cpp:171
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:177
+#: src/net/tmwa/specialhandler.cpp:174
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:180
+#: src/net/tmwa/specialhandler.cpp:177
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:183
+#: src/net/tmwa/specialhandler.cpp:180
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:186
+#: src/net/tmwa/specialhandler.cpp:183
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:189
+#: src/net/tmwa/specialhandler.cpp:186
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:192
+#: src/net/tmwa/specialhandler.cpp:189
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:195
+#: src/net/tmwa/specialhandler.cpp:192
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:198
+#: src/net/tmwa/specialhandler.cpp:195
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:201
+#: src/net/tmwa/specialhandler.cpp:198
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:210
+#: src/net/tmwa/specialhandler.cpp:207
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:213
+#: src/net/tmwa/specialhandler.cpp:210
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:216
+#: src/net/tmwa/specialhandler.cpp:213
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:116
-msgid "Request for Trade"
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:108 src/net/manaserv/tradehandler.cpp:117
-#, c-format
-msgid "%s wants to trade with you, do you accept?"
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:124
+#: src/net/tmwa/tradehandler.cpp:126
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:128
+#: src/net/tmwa/tradehandler.cpp:130
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:132
+#: src/net/tmwa/tradehandler.cpp:134
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:137
+#: src/net/tmwa/tradehandler.cpp:139
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:144
+#: src/net/tmwa/tradehandler.cpp:146
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:153
+#: src/net/tmwa/tradehandler.cpp:154
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:202
+#: src/net/tmwa/tradehandler.cpp:202
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:207
+#: src/net/tmwa/tradehandler.cpp:207
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:211
+#: src/net/tmwa/tradehandler.cpp:211
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:224 src/net/manaserv/tradehandler.cpp:149
-msgid "Trade canceled."
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:231 src/net/manaserv/tradehandler.cpp:156
-msgid "Trade completed."
-msgstr ""
-
-#: src/net/manaserv/beinghandler.cpp:324
-msgid "Press OK to respawn."
-msgstr ""
-
-#: src/net/manaserv/beinghandler.cpp:325
-msgid "You Died"
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:128 src/net/manaserv/charhandler.cpp:196
-msgid "Not logged in."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:131
-msgid "No empty slot."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:134
-msgid "Invalid name."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:137
-msgid "Character's name already exists."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:140
-msgid "Invalid hairstyle."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:143
-msgid "Invalid hair color."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:146
-msgid "Invalid gender."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:149
-msgid "Character's stats are too high."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:152
-msgid "Character's stats are too low."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:155
-msgid "One stat is zero."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:187
-msgid "Player deleted."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:199
-msgid "Selection out of range."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:202
-#, fuzzy, c-format
-msgid "Unknown error (%d)."
-msgstr "Непозната команда."
-
-#: src/net/manaserv/charhandler.cpp:242
-msgid "No gameservers are available."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:268
-msgid "Willpower:"
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
-#: src/net/manaserv/guildhandler.cpp:259
-#, c-format
-msgid "Topic: %s"
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
-msgid "Players in this channel:"
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:201
-msgid "Error joining channel."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:207
-msgid "Listing channels."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:219
-msgid "End of channel list."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:291
-#, c-format
-msgid "%s entered the channel."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:296
-#, c-format
-msgid "%s left the channel."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:312
-#, c-format
-msgid "%s has set mode %s on user %s."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:322
-#, c-format
-msgid "%s has kicked %s."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:327
-#, fuzzy
-msgid "Unknown channel event."
-msgstr "Непозната команда."
-
-#: src/net/manaserv/generalhandler.cpp:100
-#, c-format
-msgid "Willpower %+d"
-msgstr ""
-
-#: src/net/manaserv/generalhandler.cpp:171
-msgid "Willpower"
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:81
-msgid "Guild created."
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:86
-msgid "Error creating guild."
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:96
-msgid "Invite sent."
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:203
-msgid "Member was promoted successfully."
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:208
-msgid "Failed to promote member."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:87
-msgid "Wrong magic_token."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
-msgid "Already logged in."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:93 src/net/manaserv/loginhandler.cpp:272
-msgid "Server is full."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:118
-msgid "New password incorrect."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
-msgid "Account not connected. Please login first."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:149
-msgid "New email address incorrect."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:152
-msgid "Old email address incorrect."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:158
-msgid "The new email address already exists."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:239
-msgid ""
-"Client registration is not allowed. Please contact server administration."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
-msgid "Client version is too old."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:266
-msgid "Wrong username or password."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:275
-msgid "Login attempt too soon after previous attempt."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:303
-msgid "Wrong username, password or email address."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:306
-msgid "Username already exists."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:309
-msgid "Email address already exists."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:312
-msgid "You took too long with the captcha or your response was incorrect."
-msgstr ""
-
-#: src/net/manaserv/partyhandler.cpp:88
-msgid "Joined party."
-msgstr ""
-
-#: src/net/manaserv/partyhandler.cpp:106
-#, c-format
-msgid "%s joined the party."
-msgstr ""
-
-#: src/net/manaserv/partyhandler.cpp:123
-#, c-format
-msgid "%s rejected your invite."
-msgstr ""
-
-#: src/net/manaserv/tradehandler.cpp:96
-msgid "Accepting incoming trade requests."
-msgstr ""
-
-#: src/net/manaserv/tradehandler.cpp:98
-msgid "Ignoring incoming trade requests."
-msgstr ""
-
-#: src/net/manaserv/tradehandler.cpp:135
-#, c-format
-msgid "Trading with %s"
-msgstr ""
-
-#: src/playerrelations.cpp:304
+#: src/playerrelations.cpp:310
 msgid "Completely ignore"
 msgstr ""
 
-#: src/playerrelations.cpp:318
+#: src/playerrelations.cpp:324
 msgid "Print '...'"
 msgstr ""
 
-#: src/playerrelations.cpp:334
+#: src/playerrelations.cpp:340
 msgid "Blink name"
 msgstr ""
 
-#: src/playerrelations.cpp:371
-msgid "Floating '...' bubble"
-msgstr ""
-
-#: src/playerrelations.cpp:374
-msgid "Floating bubble"
-msgstr ""
-
-#: src/resources/itemdb.cpp:52
+#: src/resources/itemdb.cpp:44
 #, c-format
 msgid "Attack %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:53
+#: src/resources/itemdb.cpp:45
 #, c-format
 msgid "Defense %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:54
+#: src/resources/itemdb.cpp:46
 #, c-format
 msgid "HP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:55
+#: src/resources/itemdb.cpp:47
 #, c-format
 msgid "MP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:114
+#: src/resources/itemdb.cpp:92
 msgid "Unknown item"
 msgstr ""
 
-#: src/resources/itemdb.cpp:158 src/resources/monsterdb.cpp:45
-#: src/resources/monsterdb.cpp:67
+#: src/resources/itemdb.cpp:135 src/resources/monsterdb.cpp:77
 msgid "unnamed"
 msgstr ""
diff --git a/po/ca.po b/po/ca.po
index 1722d9db..6863372c 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2010-03-05 21:52+0100\n"
+"POT-Creation-Date: 2010-12-13 20:04+0100\n"
 "PO-Revision-Date: 2009-06-08 22:01+0000\n"
 "Last-Translator: Thorbjørn Lindeijer <bjorn@lindeijer.nl>\n"
 "Language-Team: Catalan <ca@li.org>\n"
+"Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,436 +19,450 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/client.cpp:553 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:62
+#: src/client.cpp:598 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
 msgid "Setup"
 msgstr ""
 
-#: src/client.cpp:623
+#: src/client.cpp:679
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:650
+#: src/client.cpp:706
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:683
+#: src/client.cpp:739
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:739
+#: src/client.cpp:804
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:768
+#: src/client.cpp:833
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:799 src/client.cpp:806 src/client.cpp:940
+#: src/client.cpp:843
+#, fuzzy
+msgid "Changing game servers"
+msgstr "canvi"
+
+#: src/client.cpp:872 src/client.cpp:879 src/client.cpp:1014
 #: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
 #: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
-#: src/gui/serverdialog.cpp:261 src/gui/unregisterdialog.cpp:133
-#: src/net/ea/charserverhandler.cpp:135 src/net/ea/charserverhandler.cpp:152
-#: src/net/manaserv/charhandler.cpp:161 src/net/manaserv/charhandler.cpp:204
+#: src/gui/serverdialog.cpp:323 src/gui/unregisterdialog.cpp:133
+#: src/net/manaserv/charhandler.cpp:174 src/net/manaserv/charhandler.cpp:217
+#: src/net/tmwa/charserverhandler.cpp:134
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Error"
 msgstr ""
 
-#: src/client.cpp:815
+#: src/client.cpp:888
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:842
+#: src/client.cpp:915
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:843
+#: src/client.cpp:916
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:862
+#: src/client.cpp:935
 #, fuzzy
 msgid "Email Change"
 msgstr "canvi"
 
-#: src/client.cpp:863
+#: src/client.cpp:936
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:883
+#: src/client.cpp:956
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:884
+#: src/client.cpp:957
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1007 src/client.cpp:1030
+#: src/client.cpp:1138 src/client.cpp:1161
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1119
+#: src/client.cpp:1281
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1153 src/client.cpp:1159
+#: src/client.cpp:1315 src/client.cpp:1321
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/commandhandler.cpp:127 src/commandhandler.cpp:308
+#: src/commandhandler.cpp:131 src/commandhandler.cpp:317
 msgid "Unknown command."
 msgstr ""
 
-#: src/commandhandler.cpp:156
+#: src/commandhandler.cpp:160
 msgid "-- Help --"
 msgstr ""
 
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:161
 msgid "/help > Display this help"
 msgstr ""
 
-#: src/commandhandler.cpp:159
+#: src/commandhandler.cpp:163
 msgid "/where > Display map name"
 msgstr ""
 
-#: src/commandhandler.cpp:160
+#: src/commandhandler.cpp:164
 msgid "/who > Display number of online users"
 msgstr ""
 
-#: src/commandhandler.cpp:161
+#: src/commandhandler.cpp:165
 msgid "/me > Tell something about yourself"
 msgstr ""
 
-#: src/commandhandler.cpp:163
+#: src/commandhandler.cpp:167
 msgid "/clear > Clears this window"
 msgstr ""
 
-#: src/commandhandler.cpp:165
+#: src/commandhandler.cpp:169
 msgid "/msg > Send a private message to a user"
 msgstr ""
 
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:170
 msgid "/whisper > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:167
+#: src/commandhandler.cpp:171
 msgid "/w > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:168
+#: src/commandhandler.cpp:172
 msgid "/query > Makes a tab for private messages with another user"
 msgstr ""
 
-#: src/commandhandler.cpp:169
+#: src/commandhandler.cpp:174
 msgid "/q > Alias of query"
 msgstr ""
 
-#: src/commandhandler.cpp:171
+#: src/commandhandler.cpp:176
 msgid "/ignore > ignore a player"
 msgstr ""
 
-#: src/commandhandler.cpp:172
+#: src/commandhandler.cpp:177
 msgid "/unignore > stop ignoring a player"
 msgstr ""
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:179
 msgid "/list > Display all public channels"
 msgstr ""
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:180
 msgid "/join > Join or create a channel"
 msgstr ""
 
-#: src/commandhandler.cpp:177
+#: src/commandhandler.cpp:182
 msgid "/createparty > Create a new party"
 msgstr ""
 
-#: src/commandhandler.cpp:178
+#: src/commandhandler.cpp:183
 msgid "/party > Invite a user to party"
 msgstr ""
 
-#: src/commandhandler.cpp:180
+#: src/commandhandler.cpp:185
 msgid "/record > Start recording the chat to an external file"
 msgstr ""
 
-#: src/commandhandler.cpp:181
+#: src/commandhandler.cpp:187
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr ""
 
-#: src/commandhandler.cpp:182
+#: src/commandhandler.cpp:189
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
 
-#: src/commandhandler.cpp:184
+#: src/commandhandler.cpp:192
 msgid "/announce > Global announcement (GM only)"
 msgstr ""
 
-#: src/commandhandler.cpp:188
+#: src/commandhandler.cpp:196
 msgid "For more information, type /help <command>."
 msgstr ""
 
-#: src/commandhandler.cpp:192
+#: src/commandhandler.cpp:200
 msgid "Command: /help"
 msgstr ""
 
-#: src/commandhandler.cpp:193
+#: src/commandhandler.cpp:201
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: src/commandhandler.cpp:194
+#: src/commandhandler.cpp:203
 msgid "Command: /help <command>"
 msgstr ""
 
-#: src/commandhandler.cpp:195
+#: src/commandhandler.cpp:204
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/commandhandler.cpp:203
+#: src/commandhandler.cpp:212
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: src/commandhandler.cpp:204
+#: src/commandhandler.cpp:213
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/commandhandler.cpp:205
+#: src/commandhandler.cpp:214
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:210
+#: src/commandhandler.cpp:219
 msgid "Command: /clear"
 msgstr ""
 
-#: src/commandhandler.cpp:211
+#: src/commandhandler.cpp:220
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:224
 msgid "Command: /ignore <player>"
 msgstr ""
 
-#: src/commandhandler.cpp:216
+#: src/commandhandler.cpp:225
 msgid "This command ignores the given player regardless of current relations."
 msgstr ""
 
-#: src/commandhandler.cpp:221
+#: src/commandhandler.cpp:230
 msgid "Command: /join <channel>"
 msgstr ""
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:231
 msgid "This command makes you enter <channel>."
 msgstr ""
 
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:232
 msgid "If <channel> doesn't exist, it's created."
 msgstr ""
 
-#: src/commandhandler.cpp:227
+#: src/commandhandler.cpp:236
 msgid "Command: /list"
 msgstr ""
 
-#: src/commandhandler.cpp:228
+#: src/commandhandler.cpp:237
 msgid "This command shows a list of all channels."
 msgstr ""
 
-#: src/commandhandler.cpp:232
+#: src/commandhandler.cpp:241
 msgid "Command: /me <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:233
+#: src/commandhandler.cpp:242
 msgid "This command tell others you are (doing) <msg>."
 msgstr ""
 
-#: src/commandhandler.cpp:237
+#: src/commandhandler.cpp:246
 msgid "Command: /msg <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:238
+#: src/commandhandler.cpp:247
 msgid "Command: /whisper <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:239
+#: src/commandhandler.cpp:248
 msgid "Command: /w <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:240
+#: src/commandhandler.cpp:249
 msgid "This command sends the text <message> to <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:241 src/commandhandler.cpp:260
+#: src/commandhandler.cpp:250 src/commandhandler.cpp:269
 #: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
-#: src/net/ea/gui/guildtab.cpp:75 src/net/ea/gui/partytab.cpp:75
+#: src/net/tmwa/gui/guildtab.cpp:75 src/net/tmwa/gui/partytab.cpp:75
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:255
 msgid "Command: /query <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:247
+#: src/commandhandler.cpp:256
 msgid "Command: /q <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:248
+#: src/commandhandler.cpp:257
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:253
+#: src/commandhandler.cpp:262
 msgid "Command: /createparty <name>"
 msgstr ""
 
-#: src/commandhandler.cpp:254
+#: src/commandhandler.cpp:263
 msgid "This command creates a new party called <name>."
 msgstr ""
 
-#: src/commandhandler.cpp:258
+#: src/commandhandler.cpp:267
 msgid "Command: /party <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:259 src/net/ea/gui/partytab.cpp:74
+#: src/commandhandler.cpp:268 src/net/tmwa/gui/partytab.cpp:74
 msgid "This command invites <nick> to party with you."
 msgstr ""
 
-#: src/commandhandler.cpp:265
+#: src/commandhandler.cpp:274
 msgid "Command: /present"
 msgstr ""
 
-#: src/commandhandler.cpp:266
+#: src/commandhandler.cpp:275
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: src/commandhandler.cpp:272
+#: src/commandhandler.cpp:281
 msgid "Command: /record <filename>"
 msgstr ""
 
-#: src/commandhandler.cpp:273
+#: src/commandhandler.cpp:282
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr ""
 
-#: src/commandhandler.cpp:275
+#: src/commandhandler.cpp:284
 msgid "Command: /record"
 msgstr ""
 
-#: src/commandhandler.cpp:276
+#: src/commandhandler.cpp:285
 msgid "This command finishes a recording session."
 msgstr ""
 
-#: src/commandhandler.cpp:280
+#: src/commandhandler.cpp:289
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: src/commandhandler.cpp:281
+#: src/commandhandler.cpp:290
 msgid ""
 "This command sets whether the return key should toggle the chat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: src/commandhandler.cpp:283
+#: src/commandhandler.cpp:292
 msgid ""
-"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
-"\", \"no\", \"false\" to turn the toggle off."
+"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
+"\"0\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: src/commandhandler.cpp:286
+#: src/commandhandler.cpp:295
 msgid "Command: /toggle"
 msgstr ""
 
-#: src/commandhandler.cpp:287
+#: src/commandhandler.cpp:296
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: src/commandhandler.cpp:291 src/gui/widgets/whispertab.cpp:93
+#: src/commandhandler.cpp:300 src/gui/widgets/whispertab.cpp:95
 msgid "Command: /unignore <player>"
 msgstr ""
 
-#: src/commandhandler.cpp:292
+#: src/commandhandler.cpp:301
 msgid "This command stops ignoring the given player if they are being ignored"
 msgstr ""
 
-#: src/commandhandler.cpp:297
+#: src/commandhandler.cpp:306
 msgid "Command: /where"
 msgstr ""
 
-#: src/commandhandler.cpp:298
+#: src/commandhandler.cpp:307
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: src/commandhandler.cpp:302
+#: src/commandhandler.cpp:311
 msgid "Command: /who"
 msgstr ""
 
-#: src/commandhandler.cpp:303
+#: src/commandhandler.cpp:312
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:309
+#: src/commandhandler.cpp:318
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: src/commandhandler.cpp:375
+#: src/commandhandler.cpp:384
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:383
+#: src/commandhandler.cpp:392
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:397
+#: src/commandhandler.cpp:406
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:410 src/net/ea/gui/partytab.cpp:109
+#: src/commandhandler.cpp:419 src/net/tmwa/gui/partytab.cpp:109
 msgid "Party name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:423 src/commandhandler.cpp:471
-#: src/commandhandler.cpp:493
+#: src/commandhandler.cpp:432 src/commandhandler.cpp:509
+#: src/commandhandler.cpp:531
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:441
+#: src/commandhandler.cpp:450
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:441
+#: src/commandhandler.cpp:450
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:450
+#: src/commandhandler.cpp:459
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:454
+#: src/commandhandler.cpp:463
 msgid "Message now closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:477
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:489
+msgid "Show IP: On"
+msgstr ""
+
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:485
+msgid "Show IP: Off"
+msgstr ""
+
+#: src/commandhandler.cpp:515
 msgid "Player already ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:484
+#: src/commandhandler.cpp:522
 msgid "Player successfully ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:486
+#: src/commandhandler.cpp:524
 msgid "Player could not be ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:501
+#: src/commandhandler.cpp:539
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:506
+#: src/commandhandler.cpp:544
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:508
+#: src/commandhandler.cpp:546
 msgid "Player could not be unignored!"
 msgstr ""
 
@@ -460,40 +475,40 @@ msgstr ""
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:326
+#: src/game.cpp:342
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:331
+#: src/game.cpp:347
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:355
+#: src/game.cpp:378
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:360
+#: src/game.cpp:382
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:705
+#: src/game.cpp:721
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:712
+#: src/game.cpp:726
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:946
+#: src/game.cpp:954
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:947
+#: src/game.cpp:955
 #, c-format
 msgid "Error while loading %s"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:75
+#: src/gui/beingpopup.cpp:76
 #, c-format
 msgid "Party: %s"
 msgstr ""
@@ -502,34 +517,34 @@ msgstr ""
 msgid "Buy"
 msgstr ""
 
-#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
-#: src/gui/sell.cpp:276
+#: src/gui/buy.cpp:69 src/gui/buy.cpp:261 src/gui/sell.cpp:71
+#: src/gui/sell.cpp:288
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:99 src/gui/npcdialog.cpp:100
-#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:479
+#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:112 src/gui/npcdialog.cpp:124
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:463
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:98 src/gui/npcdialog.cpp:101
-#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:491
+#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:111 src/gui/npcdialog.cpp:125
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:475
 msgid "-"
 msgstr ""
 
 #: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
-#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:182
-#: src/keyboardconfig.cpp:103
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:228
+#: src/keyboardconfig.cpp:102
 msgid "Quit"
 msgstr "sortir"
 
-#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:408
-#: src/gui/statuswindow.cpp:478 src/gui/statuswindow.cpp:512
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:384
+#: src/gui/statuswindow.cpp:462 src/gui/statuswindow.cpp:496
 msgid "Max"
 msgstr ""
 
@@ -543,11 +558,11 @@ msgstr ""
 
 #: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
 #: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
-#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:101
-#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:178
-#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:402
+#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:114
+#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:389
 #: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
-#: src/gui/socialwindow.cpp:242 src/gui/textdialog.cpp:39
+#: src/gui/socialwindow.cpp:275 src/gui/textdialog.cpp:40
 #: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr ""
@@ -584,7 +599,7 @@ msgstr ""
 msgid "Change Password"
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:53
+#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:55
 #: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
 msgid "Password:"
 msgstr ""
@@ -615,19 +630,19 @@ msgstr ""
 msgid "Create Character"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:52
+#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:54
 #: src/gui/register.cpp:67
 msgid "Name:"
 msgstr "nom"
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
 #: src/gui/outfitwindow.cpp:67
 msgid ">"
 msgstr ""
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
 #: src/gui/outfitwindow.cpp:66
@@ -642,8 +657,8 @@ msgstr ""
 msgid "Hair style:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:397
-#: src/gui/socialwindow.cpp:296
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:392
+#: src/gui/socialwindow.cpp:329
 msgid "Create"
 msgstr ""
 
@@ -699,33 +714,33 @@ msgstr ""
 msgid "Change Email"
 msgstr "canvi"
 
-#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:185
-#: src/gui/setup_players.cpp:230
+#: src/gui/charselectdialog.cpp:336 src/gui/serverdialog.cpp:231
+#: src/gui/setup_players.cpp:229
 msgid "Delete"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:387
+#: src/gui/charselectdialog.cpp:380
 msgid "Choose"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:399 src/gui/charselectdialog.cpp:400
+#: src/gui/charselectdialog.cpp:394 src/gui/charselectdialog.cpp:395
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:77 src/gui/palette.cpp:96
+#: src/gui/chat.cpp:88
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chat.cpp:287
+#: src/gui/chat.cpp:311
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:305
+#: src/gui/chat.cpp:329
 msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:469
+#: src/gui/chat.cpp:493
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -787,141 +802,171 @@ msgstr ""
 msgid "Ambient FX: %s"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:56
+#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:55
 msgid "Equipment"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:77
-#: src/gui/inventorywindow.cpp:79 src/gui/inventorywindow.cpp:298
-#: src/gui/popupmenu.cpp:372
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:89
+#: src/gui/inventorywindow.cpp:337 src/gui/popupmenu.cpp:359
 msgid "Unequip"
 msgstr ""
 
-#: src/gui/help.cpp:36
+#: src/gui/help.cpp:37
 msgid "Help"
 msgstr ""
 
-#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:73
+#: src/gui/help.cpp:51 src/gui/npcdialog.cpp:50
 msgid "Close"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:56 src/gui/windowmenu.cpp:57
+#: src/gui/inventorywindow.cpp:59 src/gui/windowmenu.cpp:56
 msgid "Inventory"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:72 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:300 src/gui/popupmenu.cpp:374
+#: src/gui/inventorywindow.cpp:59
+msgid "Storage"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:82
+msgid "Slots:"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:87 src/gui/inventorywindow.cpp:100
+#: src/gui/inventorywindow.cpp:339 src/gui/popupmenu.cpp:361
 msgid "Equip"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:304 src/gui/popupmenu.cpp:377
+#: src/gui/inventorywindow.cpp:88
 msgid "Use"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:83 src/gui/inventorywindow.cpp:308
-#: src/gui/popupmenu.cpp:380
+#: src/gui/inventorywindow.cpp:101 src/gui/popupmenu.cpp:364
+msgid "Activate"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:102 src/gui/inventorywindow.cpp:348
+#: src/gui/popupmenu.cpp:367
 msgid "Drop..."
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:84 src/gui/popupmenu.cpp:386
+#: src/gui/inventorywindow.cpp:103 src/gui/popupmenu.cpp:373
 msgid "Split"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:85 src/gui/outfitwindow.cpp:51
+#: src/gui/inventorywindow.cpp:104 src/gui/outfitwindow.cpp:51
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:96 src/gui/storagewindow.cpp:83
-msgid "Slots:"
+#: src/gui/inventorywindow.cpp:106
+msgid "Weight:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:97
-msgid "Weight:"
+#: src/gui/inventorywindow.cpp:124 src/gui/popupmenu.cpp:378
+msgid "Store"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:125 src/gui/popupmenu.cpp:385
+msgid "Retrieve"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:310 src/gui/popupmenu.cpp:382
+#: src/gui/inventorywindow.cpp:350 src/gui/popupmenu.cpp:369
 msgid "Drop"
 msgstr ""
 
-#: src/gui/itemamount.cpp:100 src/gui/okdialog.cpp:42
-#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:38 src/gui/trade.cpp:73
-#: src/gui/trade.cpp:75
+#: src/gui/itemamount.cpp:113 src/gui/okdialog.cpp:42
+#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:39 src/gui/trade.cpp:72
+#: src/gui/trade.cpp:74
 msgid "OK"
 msgstr ""
 
-#: src/gui/itemamount.cpp:102
+#: src/gui/itemamount.cpp:115
 msgid "All"
 msgstr ""
 
-#: src/gui/itemamount.cpp:128
+#: src/gui/itemamount.cpp:141
 msgid "Select amount of items to trade."
 msgstr ""
 
-#: src/gui/itemamount.cpp:131
+#: src/gui/itemamount.cpp:144
 msgid "Select amount of items to drop."
 msgstr ""
 
-#: src/gui/itemamount.cpp:134
+#: src/gui/itemamount.cpp:147
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/itemamount.cpp:137
+#: src/gui/itemamount.cpp:150
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamount.cpp:140
+#: src/gui/itemamount.cpp:153
 msgid "Select amount of items to split."
 msgstr ""
 
-#: src/gui/itempopup.cpp:92
+#: src/gui/itempopup.cpp:137
 #, c-format
 msgid "Weight: %s"
 msgstr ""
 
-#: src/gui/login.cpp:49 src/gui/login.cpp:61
+#: src/gui/login.cpp:51 src/gui/login.cpp:63
 msgid "Login"
 msgstr ""
 
-#: src/gui/login.cpp:58
+#: src/gui/login.cpp:60
 msgid "Remember username"
 msgstr ""
 
-#: src/gui/login.cpp:59 src/gui/register.cpp:58 src/gui/register.cpp:73
+#: src/gui/login.cpp:61 src/gui/register.cpp:58 src/gui/register.cpp:73
 msgid "Register"
 msgstr ""
 
-#: src/gui/login.cpp:60
+#: src/gui/login.cpp:62
 #, fuzzy
 msgid "Change Server"
 msgstr "canvi"
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
+#: src/gui/login.cpp:129
+msgid "Registration disabled"
+msgstr ""
+
+#: src/gui/login.cpp:129
+msgid "You need to use the website to register an account for this server."
+msgstr ""
+
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:86
 msgid "Map"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:44
+#: src/gui/ministatus.cpp:235
+msgid "Need"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:48
 msgid "Waiting for server"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:45
+#: src/gui/npcdialog.cpp:49
 msgid "Next"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:47
+#: src/gui/npcdialog.cpp:51
 msgid "Submit"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:52 src/gui/npcpostdialog.cpp:41
+#: src/gui/npcdialog.cpp:73 src/gui/npcpostdialog.cpp:41
 msgid "NPC"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:110
+#: src/gui/npcdialog.cpp:118
+msgid "Clear log"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:134
 msgid "Reset"
 msgstr ""
 
 #. TRANSLATORS: Please leave the \n sequences intact.
-#: src/gui/npcdialog.cpp:171
+#: src/gui/npcdialog.cpp:208
 msgid ""
 "\n"
 "> Next\n"
@@ -935,7 +980,7 @@ msgstr ""
 msgid "Send"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:96
+#: src/gui/npcpostdialog.cpp:99
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
@@ -949,303 +994,82 @@ msgstr ""
 msgid "Unequip first"
 msgstr ""
 
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:143
-msgid "Text"
-msgstr ""
-
-#: src/gui/palette.cpp:82
-msgid "Text Shadow"
-msgstr ""
-
-#: src/gui/palette.cpp:83
-msgid "Text Outline"
-msgstr ""
-
-#: src/gui/palette.cpp:84
-msgid "Progress Bar Labels"
-msgstr ""
-
-#: src/gui/palette.cpp:85
-msgid "Buttons"
-msgstr ""
-
-#: src/gui/palette.cpp:86
-msgid "Disabled Buttons"
-msgstr ""
-
-#: src/gui/palette.cpp:87
-msgid "Tabs"
-msgstr ""
-
-#: src/gui/palette.cpp:89
-msgid "Background"
-msgstr ""
-
-#: src/gui/palette.cpp:91
-msgid "Highlight"
-msgstr ""
-
-#: src/gui/palette.cpp:92
-msgid "Tab Highlight"
-msgstr ""
-
-#: src/gui/palette.cpp:93
-msgid "Item Too Expensive"
-msgstr ""
-
-#: src/gui/palette.cpp:94
-msgid "Item Is Equipped"
-msgstr ""
-
-#: src/gui/palette.cpp:97
-msgid "GM"
-msgstr ""
-
-#: src/gui/palette.cpp:98
-msgid "Player"
-msgstr ""
-
-#: src/gui/palette.cpp:99
-msgid "Whisper"
-msgstr ""
-
-#: src/gui/palette.cpp:100
-msgid "Is"
-msgstr ""
-
-#: src/gui/palette.cpp:101 src/net/ea/gui/partytab.cpp:43
-msgid "Party"
-msgstr ""
-
-#: src/gui/palette.cpp:102 src/net/ea/gui/guildtab.cpp:45
-msgid "Guild"
-msgstr ""
-
-#: src/gui/palette.cpp:103
-msgid "Server"
-msgstr ""
-
-#: src/gui/palette.cpp:104
-msgid "Logger"
-msgstr ""
-
-#: src/gui/palette.cpp:105
-msgid "Hyperlink"
-msgstr ""
-
-#: src/gui/palette.cpp:107
-msgid "Being"
-msgstr ""
-
-#: src/gui/palette.cpp:108
-msgid "Other Players' Names"
-msgstr ""
-
-#: src/gui/palette.cpp:109
-msgid "Own Name"
-msgstr ""
-
-#: src/gui/palette.cpp:110
-msgid "GM Names"
-msgstr ""
-
-#: src/gui/palette.cpp:111
-msgid "NPCs"
-msgstr ""
-
-#: src/gui/palette.cpp:112
-msgid "Monsters"
-msgstr ""
-
-#: src/gui/palette.cpp:114
-msgid "Unknown Item Type"
-msgstr ""
-
-#: src/gui/palette.cpp:115
-msgid "Generics"
-msgstr ""
-
-#: src/gui/palette.cpp:116
-msgid "Hats"
-msgstr ""
-
-#: src/gui/palette.cpp:117
-msgid "Usables"
-msgstr ""
-
-#: src/gui/palette.cpp:118
-msgid "Shirts"
-msgstr ""
-
-#: src/gui/palette.cpp:119
-msgid "One Handed Weapons"
-msgstr ""
-
-#: src/gui/palette.cpp:120
-msgid "Pants"
-msgstr ""
-
-#: src/gui/palette.cpp:121
-msgid "Shoes"
-msgstr ""
-
-#: src/gui/palette.cpp:122
-msgid "Two Handed Weapons"
-msgstr ""
-
-#: src/gui/palette.cpp:123
-msgid "Shields"
-msgstr ""
-
-#: src/gui/palette.cpp:124
-msgid "Rings"
-msgstr ""
-
-#: src/gui/palette.cpp:125
-msgid "Necklaces"
-msgstr ""
-
-#: src/gui/palette.cpp:126
-msgid "Arms"
-msgstr ""
-
-#: src/gui/palette.cpp:127
-msgid "Ammo"
-msgstr ""
-
-#: src/gui/palette.cpp:129
-msgid "Particle Effects"
-msgstr ""
-
-#: src/gui/palette.cpp:130
-msgid "Pickup Notification"
-msgstr ""
-
-#: src/gui/palette.cpp:131
-msgid "Exp Notification"
-msgstr ""
-
-#: src/gui/palette.cpp:133
-msgid "Player Hits Monster"
-msgstr ""
-
-#: src/gui/palette.cpp:135
-msgid "Monster Hits Player"
-msgstr ""
-
-#: src/gui/palette.cpp:136
-msgid "Critical Hit"
-msgstr ""
-
-#: src/gui/palette.cpp:137
-msgid "Misses"
-msgstr ""
-
-#: src/gui/palette.cpp:139
-msgid "HP Bar"
-msgstr ""
-
-#: src/gui/palette.cpp:140
-msgid "3/4 HP Bar"
-msgstr ""
-
-#: src/gui/palette.cpp:141
-msgid "1/2 HP Bar"
-msgstr ""
-
-#: src/gui/palette.cpp:142
-msgid "1/4 HP Bar"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:84
+#: src/gui/popupmenu.cpp:83
 #, c-format
 msgid "Trade with %s..."
 msgstr ""
 
-#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:161
+#: src/gui/popupmenu.cpp:87 src/gui/popupmenu.cpp:158
 #, c-format
 msgid "Attack %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:92
+#: src/gui/popupmenu.cpp:91
 #, c-format
 msgid "Whisper %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:101
+#: src/gui/popupmenu.cpp:100
 #, c-format
 msgid "Befriend %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:106
+#: src/gui/popupmenu.cpp:105
 #, c-format
 msgid "Disregard %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:109
+#: src/gui/popupmenu.cpp:108
 #, c-format
 msgid "Ignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:115 src/gui/popupmenu.cpp:124
+#: src/gui/popupmenu.cpp:114 src/gui/popupmenu.cpp:123
 #, c-format
 msgid "Unignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:118
+#: src/gui/popupmenu.cpp:117
 #, c-format
 msgid "Completely ignore %s"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:130
 #, c-format
-msgid "Follow %s"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:133
-#, c-format
 msgid "Invite %s to join your guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:137
+#: src/gui/popupmenu.cpp:134
 #, c-format
 msgid "Invite %s to join your party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144
+#: src/gui/popupmenu.cpp:141
 msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:153
+#: src/gui/popupmenu.cpp:150
 #, c-format
 msgid "Talk to %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:166
+#: src/gui/popupmenu.cpp:163
 msgid "Kick monster"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:174
+#: src/gui/popupmenu.cpp:171
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:191
+#: src/gui/popupmenu.cpp:188
 #, c-format
 msgid "Pick up %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:400
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:387
 msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:70
-msgid "Store"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:71
-msgid "Retrieve"
-msgstr ""
-
 #: src/gui/quitdialog.cpp:44
 msgid "Switch server"
 msgstr ""
@@ -1314,47 +1138,60 @@ msgstr ""
 msgid "Passwords do not match."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:134
+#: src/gui/serverdialog.cpp:197
 msgid "Choose Your Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:141 src/gui/widgets/chattab.cpp:139
+#: src/gui/serverdialog.cpp:206 src/gui/widgets/chattab.cpp:142
 msgid "Server:"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:142
+#: src/gui/serverdialog.cpp:207
 msgid "Port:"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:143
+#: src/gui/serverdialog.cpp:208
 msgid "Server type:"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:183
+#: src/gui/serverdialog.cpp:229
 msgid "Connect"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:184
+#: src/gui/serverdialog.cpp:230
 msgid "Custom Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:262
+#: src/gui/serverdialog.cpp:324
 msgid "Please type both the address and the port of a server."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:411
+#: src/gui/serverdialog.cpp:441
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:417
+#: src/gui/serverdialog.cpp:447
 msgid "Waiting for server..."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:421
+#: src/gui/serverdialog.cpp:451
 msgid "Preparing download"
 msgstr ""
 
+#: src/gui/serverdialog.cpp:455
+msgid "Error retreiving server list!"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:550
+msgid "requires a newer version"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:552
+#, c-format
+msgid "requires v%s"
+msgstr ""
+
 #: src/gui/setup_audio.cpp:42
 msgid "Sound"
 msgstr ""
@@ -1387,50 +1224,50 @@ msgstr ""
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:44
+#: src/gui/setup_colors.cpp:46
 msgid "This is what the color looks like"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:49
+#: src/gui/setup_colors.cpp:51
 msgid "Colors"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:70
+#: src/gui/setup_colors.cpp:72
 msgid "Type:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:81 src/gui/setup_colors.cpp:433
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:331
 msgid "Static"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:84
-#: src/gui/setup_colors.cpp:434
+#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
+#: src/gui/setup_colors.cpp:332
 msgid "Pulse"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
+#: src/gui/setup_colors.cpp:333
 msgid "Rainbow"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
+#: src/gui/setup_colors.cpp:333
 msgid "Spectrum"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:92
+#: src/gui/setup_colors.cpp:94
 msgid "Delay:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:107
+#: src/gui/setup_colors.cpp:109
 msgid "Red:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:122
+#: src/gui/setup_colors.cpp:124
 msgid "Green:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:137
+#: src/gui/setup_colors.cpp:139
 msgid "Blue:"
 msgstr ""
 
@@ -1475,563 +1312,577 @@ msgid "Assign"
 msgstr ""
 
 #: src/gui/setup_keyboard.cpp:90
+msgid "Unassign"
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:94
 msgid "Default"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:119
+#: src/gui/setup_keyboard.cpp:125
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_players.cpp:57
+#: src/gui/setup_players.cpp:58
 msgid "Name"
 msgstr ""
 
-#: src/gui/setup_players.cpp:58
+#: src/gui/setup_players.cpp:59
 msgid "Relation"
 msgstr ""
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:64
 msgid "Neutral"
 msgstr ""
 
-#: src/gui/setup_players.cpp:64
+#: src/gui/setup_players.cpp:65
 msgid "Friend"
 msgstr ""
 
-#: src/gui/setup_players.cpp:65
+#: src/gui/setup_players.cpp:66
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_players.cpp:67
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_players.cpp:208 src/gui/setup_video.cpp:132
+#: src/gui/setup_players.cpp:206 src/gui/setup_video.cpp:153
 msgid "???"
 msgstr ""
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_players.cpp:225
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_players.cpp:228
+#: src/gui/setup_players.cpp:227
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:231
 msgid "Put all whispers in tabs"
 msgstr ""
 
-#: src/gui/setup_players.cpp:234
+#: src/gui/setup_players.cpp:233
 msgid "Show gender"
 msgstr ""
 
-#: src/gui/setup_players.cpp:236
+#: src/gui/setup_players.cpp:235
+msgid "Enable Chat log"
+msgstr ""
+
+#: src/gui/setup_players.cpp:237
 msgid "Players"
 msgstr ""
 
-#: src/gui/setup_players.cpp:261
+#: src/gui/setup_players.cpp:262
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:113
+#: src/gui/setup_video.cpp:134
 msgid "Tiny"
 msgstr ""
 
-#: src/gui/setup_video.cpp:114
+#: src/gui/setup_video.cpp:135
 msgid "Small"
 msgstr ""
 
-#: src/gui/setup_video.cpp:115
+#: src/gui/setup_video.cpp:136
 msgid "Medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:116
+#: src/gui/setup_video.cpp:137
 msgid "Large"
 msgstr ""
 
-#: src/gui/setup_video.cpp:142
+#: src/gui/setup_video.cpp:163
 msgid "No text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:144
+#: src/gui/setup_video.cpp:164
+msgid "Text"
+msgstr ""
+
+#: src/gui/setup_video.cpp:165
 msgid "Bubbles, no names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:145
+#: src/gui/setup_video.cpp:166
 msgid "Bubbles with names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:157
+#: src/gui/setup_video.cpp:178
 msgid "off"
 msgstr ""
 
-#: src/gui/setup_video.cpp:158 src/gui/setup_video.cpp:171
+#: src/gui/setup_video.cpp:179 src/gui/setup_video.cpp:192
 msgid "low"
 msgstr ""
 
-#: src/gui/setup_video.cpp:159 src/gui/setup_video.cpp:173
+#: src/gui/setup_video.cpp:180 src/gui/setup_video.cpp:194
 msgid "high"
 msgstr ""
 
-#: src/gui/setup_video.cpp:172
+#: src/gui/setup_video.cpp:193
 msgid "medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:174
+#: src/gui/setup_video.cpp:195
 msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:196
+#: src/gui/setup_video.cpp:217
 msgid "Full screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:197
+#: src/gui/setup_video.cpp:218
 msgid "OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:198
+#: src/gui/setup_video.cpp:219
 msgid "Custom cursor"
 msgstr ""
 
-#: src/gui/setup_video.cpp:200
+#: src/gui/setup_video.cpp:221
 msgid "Visible names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:223
 msgid "Particle effects"
 msgstr ""
 
-#: src/gui/setup_video.cpp:204
+#: src/gui/setup_video.cpp:225
 msgid "Show own name"
 msgstr ""
 
-#: src/gui/setup_video.cpp:205
+#: src/gui/setup_video.cpp:226
+msgid "Log NPC dialogue"
+msgstr ""
+
+#: src/gui/setup_video.cpp:227
 msgid "Show pickup notification"
 msgstr ""
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:207
+#. TRANSLATORS: Refers to "Show pickup notification"
+#: src/gui/setup_video.cpp:229
 msgid "in chat"
 msgstr ""
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:209
+#. TRANSLATORS: Refers to "Show pickup notification"
+#: src/gui/setup_video.cpp:231
 msgid "as particle"
 msgstr ""
 
-#: src/gui/setup_video.cpp:214
+#: src/gui/setup_video.cpp:236
 msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:225
+#: src/gui/setup_video.cpp:247
+msgid "Disable transparency (Low CPU mode)"
+msgstr ""
+
+#: src/gui/setup_video.cpp:250
 msgid "Video"
 msgstr ""
 
-#: src/gui/setup_video.cpp:227
-msgid "Show monster damage"
+#: src/gui/setup_video.cpp:252
+msgid "Show damage"
 msgstr ""
 
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:258
 msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:259
 msgid "Gui opacity"
 msgstr ""
 
-#: src/gui/setup_video.cpp:235
+#: src/gui/setup_video.cpp:260
 msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_video.cpp:236
+#: src/gui/setup_video.cpp:261
 msgid "Particle detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237
+#: src/gui/setup_video.cpp:262
 msgid "Font size"
 msgstr ""
 
-#: src/gui/setup_video.cpp:251 src/gui/setup_video.cpp:454
-#: src/gui/setup_video.cpp:568
+#: src/gui/setup_video.cpp:277 src/gui/setup_video.cpp:532
+#: src/gui/setup_video.cpp:662
 #, fuzzy
 msgid "None"
 msgstr "no"
 
-#: src/gui/setup_video.cpp:381
+#: src/gui/setup_video.cpp:426
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:387
+#: src/gui/setup_video.cpp:432
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:398
+#: src/gui/setup_video.cpp:443
 msgid "Switching to Full Screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:399
+#: src/gui/setup_video.cpp:444
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:411
+#: src/gui/setup_video.cpp:458
 msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:412
+#: src/gui/setup_video.cpp:459
+msgid ""
+"Applying change to OpenGL requires restart. In case OpenGL messes up your "
+"game graphics, restart the game with the command line option \"--no-opengl\"."
+msgstr ""
+
+#: src/gui/setup_video.cpp:466
+msgid "Deactivating OpenGL"
+msgstr ""
+
+#: src/gui/setup_video.cpp:467
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#: src/gui/setup_video.cpp:486 src/gui/setup_video.cpp:491
+#: src/gui/setup_video.cpp:475
+msgid "Transparency disabled"
+msgstr ""
+
+#: src/gui/setup_video.cpp:476 src/gui/setup_video.cpp:484
+msgid "You must restart to apply changes."
+msgstr ""
+
+#: src/gui/setup_video.cpp:483
+msgid "Transparency enabled"
+msgstr ""
+
+#: src/gui/setup_video.cpp:576 src/gui/setup_video.cpp:581
 msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:487 src/gui/setup_video.cpp:492
+#: src/gui/setup_video.cpp:577 src/gui/setup_video.cpp:582
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:489
+#: src/gui/setup_video.cpp:579
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:522
+#: src/gui/setup_video.cpp:612
 msgid "Particle Effect Settings Changed."
 msgstr ""
 
-#: src/gui/setup_video.cpp:523
+#: src/gui/setup_video.cpp:613
 msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skilldialog.cpp:197 src/gui/windowmenu.cpp:58
+#: src/gui/skilldialog.cpp:212 src/gui/windowmenu.cpp:59
 msgid "Skills"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:208
+#: src/gui/skilldialog.cpp:223
 msgid "Up"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:262
+#: src/gui/skilldialog.cpp:269
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:314
+#: src/gui/skilldialog.cpp:351
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:323
+#: src/gui/skilldialog.cpp:360
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:405
+#: src/gui/skilldialog.cpp:442
 #, c-format
 msgid "Lvl: %d (%+d)"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:416
+#: src/gui/skilldialog.cpp:453
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:117
+#: src/gui/socialwindow.cpp:126
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:126
+#: src/gui/socialwindow.cpp:139
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:136
+#: src/gui/socialwindow.cpp:153
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:137
+#: src/gui/socialwindow.cpp:154
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:146
+#: src/gui/socialwindow.cpp:163
 msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:147
+#: src/gui/socialwindow.cpp:164
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:182
+#: src/gui/socialwindow.cpp:207 src/net/tmwa/partyhandler.cpp:330
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:218
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:199
+#: src/gui/socialwindow.cpp:232
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:200
+#: src/gui/socialwindow.cpp:233
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:209
+#: src/gui/socialwindow.cpp:242
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:210
+#: src/gui/socialwindow.cpp:243
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:239
+#: src/gui/socialwindow.cpp:272
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:240 src/gui/socialwindow.cpp:564
+#: src/gui/socialwindow.cpp:273 src/gui/socialwindow.cpp:620
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:279 src/gui/windowmenu.cpp:60
+#: src/gui/socialwindow.cpp:312 src/gui/windowmenu.cpp:64
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:297
+#: src/gui/socialwindow.cpp:330
 msgid "Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:298
+#: src/gui/socialwindow.cpp:331
 msgid "Leave"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:394
+#: src/gui/socialwindow.cpp:443
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:400
+#: src/gui/socialwindow.cpp:449
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:413
+#: src/gui/socialwindow.cpp:462
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:419
+#: src/gui/socialwindow.cpp:468
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:463
+#: src/gui/socialwindow.cpp:497
+msgid "Creating guild failed, please choose a shorter name."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:504
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:477
+#: src/gui/socialwindow.cpp:520
+msgid "Creating party failed, please choose a shorter name."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:527
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:484
+#: src/gui/socialwindow.cpp:541
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:485
+#: src/gui/socialwindow.cpp:542
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:497
+#: src/gui/socialwindow.cpp:554
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:502
+#: src/gui/socialwindow.cpp:559
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:507
+#: src/gui/socialwindow.cpp:564
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:519
+#: src/gui/socialwindow.cpp:576
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:529
+#: src/gui/socialwindow.cpp:585
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:533
+#: src/gui/socialwindow.cpp:589
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:541
+#: src/gui/socialwindow.cpp:597
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:546
+#: src/gui/socialwindow.cpp:602
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:554
+#: src/gui/socialwindow.cpp:610
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:565
+#: src/gui/socialwindow.cpp:621
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:570
+#: src/gui/socialwindow.cpp:626
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:571
+#: src/gui/socialwindow.cpp:627
 msgid "Choose your party's name."
 msgstr ""
 
-#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:59
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:62
 msgid "Specials"
 msgstr ""
 
-#: src/gui/specialswindow.cpp:174
-#, c-format
-msgid "Specials Set %d"
-msgstr ""
-
-#: src/gui/specialswindow.cpp:191
-#, c-format
-msgid "Special %d"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:99 src/gui/statuswindow.cpp:247
+#: src/gui/statuswindow.cpp:113 src/gui/statuswindow.cpp:215
+#: src/gui/statuswindow.cpp:262
 #, c-format
 msgid "Level: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:211
+#: src/gui/statuswindow.cpp:114 src/gui/statuswindow.cpp:208
+#: src/gui/statuswindow.cpp:239
 #, c-format
 msgid "Money: %s"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:102
+#: src/gui/statuswindow.cpp:117
 msgid "HP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:107
+#: src/gui/statuswindow.cpp:122
 msgid "Exp:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:112
+#: src/gui/statuswindow.cpp:130
 msgid "MP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:132 src/gui/statuswindow.cpp:219
+#: src/gui/statuswindow.cpp:158 src/gui/statuswindow.cpp:275
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:133
+#: src/gui/statuswindow.cpp:159
 msgid "Job:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:194
-msgid "HP"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:200
-msgid "MP"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:206
-msgid "Exp"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:215
-msgid "Money"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:225
-msgid "Job"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:229
+#: src/gui/statuswindow.cpp:211 src/gui/statuswindow.cpp:247
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:235
+#: src/gui/statuswindow.cpp:255
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:251
-msgid "Level"
-msgstr ""
-
-#: src/gui/storagewindow.cpp:58
-msgid "Storage"
-msgstr ""
-
-#: src/gui/trade.cpp:52
+#: src/gui/trade.cpp:53
 msgid "Propose trade"
 msgstr ""
 
-#: src/gui/trade.cpp:53
+#: src/gui/trade.cpp:54
 msgid "Confirmed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:55
 msgid "Agree trade"
 msgstr ""
 
-#: src/gui/trade.cpp:55
+#: src/gui/trade.cpp:56
 msgid "Agreed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:58
+#: src/gui/trade.cpp:59
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/trade.cpp:74 src/gui/trade.cpp:75
+#: src/gui/trade.cpp:73 src/gui/trade.cpp:74
 msgid "Trade"
 msgstr ""
 
-#: src/gui/trade.cpp:77
+#: src/gui/trade.cpp:76
 msgid "Add"
 msgstr ""
 
-#: src/gui/trade.cpp:99 src/gui/trade.cpp:135
+#: src/gui/trade.cpp:98 src/gui/trade.cpp:134
 #, c-format
 msgid "You get %s"
 msgstr ""
 
-#: src/gui/trade.cpp:100
+#: src/gui/trade.cpp:99
 msgid "You give:"
 msgstr ""
 
-#: src/gui/trade.cpp:104
+#: src/gui/trade.cpp:103
 msgid "Change"
 msgstr "canvi"
 
-#: src/gui/trade.cpp:275
+#: src/gui/trade.cpp:262
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/trade.cpp:318
+#: src/gui/trade.cpp:304
 msgid "You don't have enough money."
 msgstr ""
 
@@ -2052,21 +1903,21 @@ msgstr ""
 msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:405
+#: src/gui/updatewindow.cpp:417
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:407
+#: src/gui/updatewindow.cpp:419
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:409
+#: src/gui/updatewindow.cpp:421
 msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:501
+#: src/gui/updatewindow.cpp:515
 msgid "Completed"
 msgstr ""
 
@@ -2146,61 +1997,61 @@ msgstr ""
 msgid "Need a user to kick!"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:118
+#: src/gui/widgets/chattab.cpp:121
 msgid "Global announcement:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:124
+#: src/gui/widgets/chattab.cpp:127
 #, c-format
 msgid "Global announcement from %s:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:150
+#: src/gui/widgets/chattab.cpp:153
 #, c-format
 msgid "%s whispers: %s"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:51
+#: src/gui/widgets/whispertab.cpp:53
 msgid "Cannot send empty chat!"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:70
+#: src/gui/widgets/whispertab.cpp:72
 msgid "/ignore > Ignore the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:71
+#: src/gui/widgets/whispertab.cpp:73
 msgid "/unignore > Stop ignoring the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:72
+#: src/gui/widgets/whispertab.cpp:74
 msgid "/close > Close the whisper tab"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:82
+#: src/gui/widgets/whispertab.cpp:84
 msgid "Command: /close"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:83
+#: src/gui/widgets/whispertab.cpp:85
 msgid "This command closes the current whisper tab."
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:87
+#: src/gui/widgets/whispertab.cpp:89
 msgid "Command: /ignore"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:88
+#: src/gui/widgets/whispertab.cpp:90
 msgid "This command ignores the other player regardless of current relations."
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:94
+#: src/gui/widgets/whispertab.cpp:96
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:55
+#: src/gui/windowmenu.cpp:54
 msgid "Status"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:61
+#: src/gui/windowmenu.cpp:65
 msgid "Shortcut"
 msgstr ""
 
@@ -2217,1348 +2068,1358 @@ msgstr "canvi"
 msgid "Choose World"
 msgstr ""
 
-#: src/keyboardconfig.cpp:40
+#: src/keyboardconfig.cpp:39
 msgid "Move Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:41
+#: src/keyboardconfig.cpp:40
 msgid "Move Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:41
 msgid "Move Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:42
 msgid "Move Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:44 src/net/ea/generalhandler.cpp:223
+#: src/keyboardconfig.cpp:43 src/net/tmwa/generalhandler.cpp:237
 msgid "Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:44
 msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:45
 msgid "Smilie"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:46
 msgid "Talk"
 msgstr ""
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:47
 msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:48
 msgid "Target Monster"
 msgstr ""
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboardconfig.cpp:49
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:50
 msgid "Target Player"
 msgstr ""
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:51
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:52
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:53
 msgid "Sit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:54
 msgid "Screenshot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:55
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:56
 msgid "Find Path to Mouse"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58 src/keyboardconfig.cpp:59
-#: src/keyboardconfig.cpp:60 src/keyboardconfig.cpp:61
-#: src/keyboardconfig.cpp:62 src/keyboardconfig.cpp:63
-#: src/keyboardconfig.cpp:64 src/keyboardconfig.cpp:65
-#: src/keyboardconfig.cpp:66 src/keyboardconfig.cpp:67
-#: src/keyboardconfig.cpp:68 src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:57 src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60
+#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62
+#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64
+#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68
 #, c-format
 msgid "Item Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:69
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:70
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:71
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:72
 msgid "Equipment Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:73
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:74
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:75
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:76
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:77
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:78
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:79
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:80
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:81
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:83
+#: src/keyboardconfig.cpp:82
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:83
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86
-#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88
-#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90
-#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92
-#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:84 src/keyboardconfig.cpp:85
+#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:87
+#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:89
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:91
+#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:93
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:95
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:96
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:97
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:98
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:99
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:100
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:101
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:103
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:105
+#: src/keyboardconfig.cpp:104
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:178
+#: src/keyboardconfig.cpp:183
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:913
+#: src/localplayer.cpp:985
 msgid "Unable to pick up item."
 msgstr ""
 
 #. TRANSLATORS: This sentence may be translated differently
 #. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:922
+#: src/localplayer.cpp:994
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/main.cpp:43
+#: src/main.cpp:42
 msgid "mana [options] [mana-file]"
 msgstr ""
 
+#: src/main.cpp:43
+msgid "[mana-file] : The mana file is an XML file (.mana)"
+msgstr ""
+
 #: src/main.cpp:44
-msgid "Options:"
+msgid "              used to set custom parameters"
 msgstr ""
 
 #: src/main.cpp:45
+msgid "              to the mana client."
+msgstr ""
+
+#: src/main.cpp:47
+msgid "Options:"
+msgstr ""
+
+#: src/main.cpp:48
 msgid "  -v --version        : Display the version"
 msgstr ""
 
-#: src/main.cpp:46
+#: src/main.cpp:49
 msgid "  -h --help           : Display this help"
 msgstr ""
 
-#: src/main.cpp:47
+#: src/main.cpp:50
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
-#: src/main.cpp:48
+#: src/main.cpp:51
 msgid "  -U --username       : Login with this username"
 msgstr ""
 
-#: src/main.cpp:49
+#: src/main.cpp:52
 msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/main.cpp:50
+#: src/main.cpp:53
 msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/main.cpp:51
+#: src/main.cpp:54
 msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:52
+#: src/main.cpp:55
 msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/main.cpp:53
+#: src/main.cpp:56
 msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/main.cpp:54
+#: src/main.cpp:57
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:56
+#: src/main.cpp:59
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:57
+#: src/main.cpp:60
 msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:58
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
+#: src/main.cpp:61
+msgid "     --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/main.cpp:59
+#: src/main.cpp:62
+msgid "     --chat-log-dir   : Chat log dir to use"
+msgstr ""
+
+#: src/main.cpp:63
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/main.cpp:61
+#: src/main.cpp:65
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:63
+#: src/net/manaserv/beinghandler.cpp:303 src/net/tmwa/playerhandler.cpp:94
+msgid "You are dead."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:304 src/net/tmwa/playerhandler.cpp:95
+msgid "We regret to inform you that your character was killed in battle."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:306 src/net/tmwa/playerhandler.cpp:97
+msgid "You are not that alive anymore."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:307 src/net/tmwa/playerhandler.cpp:98
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:308 src/net/tmwa/playerhandler.cpp:99
+msgid "Game Over!"
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:309 src/net/tmwa/playerhandler.cpp:101
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:311 src/net/tmwa/playerhandler.cpp:103
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:313 src/net/tmwa/playerhandler.cpp:105
+msgid "I guess this did not run too well."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:107
+msgid "Do you want your possessions identified?"
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:109
+msgid "Sadly, no trace of you was ever found..."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:111
+msgid "Annihilated."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:113
+msgid "Looks like you got your head handed to you."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:115
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:323
+msgid "Press OK to respawn."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:324
+msgid "You Died"
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:138 src/net/manaserv/charhandler.cpp:209
+msgid "Not logged in."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:141
+msgid "No empty slot."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:144
+msgid "Invalid name."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:147
+msgid "Character's name already exists."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:150
+msgid "Invalid hairstyle."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:153
+msgid "Invalid hair color."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:156
+msgid "Invalid gender."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:159
+msgid "Character's stats are too high."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:162
+msgid "Character's stats are too low."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:165
+#, c-format
+msgid "At least one statis out of the permitted range: (%u - %u)."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:171 src/net/manaserv/loginhandler.cpp:96
+#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
+#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
+#: src/net/tmwa/loginhandler.cpp:95 src/net/tmwa/loginhandler.cpp:182
+msgid "Unknown error."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:200 src/net/tmwa/charserverhandler.cpp:146
+msgid "Info"
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:200
+msgid "Player deleted."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:212
+msgid "Selection out of range."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:215
+#, c-format
+msgid "Unknown error (%d)."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:250
+msgid "No gameservers are available."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:187 src/net/manaserv/chathandler.cpp:313
+#: src/net/manaserv/guildhandler.cpp:260
+#, c-format
+msgid "Topic: %s"
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:274
+msgid "Players in this channel:"
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:208
+msgid "Error joining channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:214
+msgid "Listing channels."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:226
+msgid "End of channel list."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:303
+#, c-format
+msgid "%s entered the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:308
+#, c-format
+msgid "%s left the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:324
+#, c-format
+msgid "%s has set mode %s on user %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:334
+#, c-format
+msgid "%s has kicked %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:339
+msgid "Unknown channel event."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:82
+msgid "Guild created."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:87
+msgid "Error creating guild."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:97
+msgid "Invite sent."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:204
+msgid "Member was promoted successfully."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:209
+msgid "Failed to promote member."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:87
+msgid "Wrong magic_token."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
+msgid "Already logged in."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:93
+msgid "Account banned."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:118
+msgid "New password incorrect."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:121 src/net/tmwa/loginhandler.cpp:89
+msgid "Old password incorrect."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
+msgid "Account not connected. Please login first."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:149
+msgid "New email address incorrect."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:152
+msgid "Old email address incorrect."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:158
+msgid "The new email address already exists."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:239
+msgid ""
+"Client registration is not allowed. Please contact server administration."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
+msgid "Client version is too old."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:266
+msgid "Wrong username or password."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:272
+msgid "Account banned"
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:275
+msgid "Login attempt too soon after previous attempt."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:303
+msgid "Wrong username, password or email address."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:306
+msgid "Username already exists."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:309
+msgid "Email address already exists."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:312
+msgid "You took too long with the captcha or your response was incorrect."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:87
+msgid "Joined party."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:105
+#, c-format
+msgid "%s joined the party."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:123
+#, c-format
+msgid "%s rejected your invite."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:95
+msgid "Accepting incoming trade requests."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:97
+msgid "Ignoring incoming trade requests."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:115 src/net/tmwa/tradehandler.cpp:109
+msgid "Request for Trade"
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:116 src/net/tmwa/tradehandler.cpp:110
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:134
+#, c-format
+msgid "Trading with %s"
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:148 src/net/tmwa/tradehandler.cpp:224
+msgid "Trade canceled."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:155 src/net/tmwa/tradehandler.cpp:231
+msgid "Trade completed."
+msgstr ""
+
+#: src/net/tmwa/adminhandler.cpp:64
 msgid "Kick failed!"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:65
+#: src/net/tmwa/adminhandler.cpp:66
 msgid "Kick succeeded!"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:110
+#: src/net/tmwa/buysellhandler.cpp:109
 msgid "Nothing to sell."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:117
+#: src/net/tmwa/buysellhandler.cpp:116
 msgid "Thanks for buying."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:124
+#: src/net/tmwa/buysellhandler.cpp:123
 msgid "Unable to buy."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:130
+#: src/net/tmwa/buysellhandler.cpp:129
 msgid "Thanks for selling."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:132
+#: src/net/tmwa/buysellhandler.cpp:131
 msgid "Unable to sell."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:103
-msgid "Access denied."
+#: src/net/tmwa/charserverhandler.cpp:103
+msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:106
+#: src/net/tmwa/charserverhandler.cpp:107
 msgid "Cannot use this ID."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:109
-msgid "Unknown failure to select character."
+#: src/net/tmwa/charserverhandler.cpp:110
+msgid "Unknown char-server failure."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:135
+#: src/net/tmwa/charserverhandler.cpp:134
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:147 src/net/manaserv/charhandler.cpp:187
-msgid "Info"
-msgstr ""
-
-#: src/net/ea/charserverhandler.cpp:147
+#: src/net/tmwa/charserverhandler.cpp:146
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:152
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Failed to delete character."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:237 src/net/manaserv/charhandler.cpp:263
+#: src/net/tmwa/charserverhandler.cpp:266
 msgid "Strength:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:238 src/net/manaserv/charhandler.cpp:264
+#: src/net/tmwa/charserverhandler.cpp:267
 msgid "Agility:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:239 src/net/manaserv/charhandler.cpp:266
+#: src/net/tmwa/charserverhandler.cpp:268
 msgid "Vitality:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:240 src/net/manaserv/charhandler.cpp:267
+#: src/net/tmwa/charserverhandler.cpp:269
 msgid "Intelligence:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:241 src/net/manaserv/charhandler.cpp:265
+#: src/net/tmwa/charserverhandler.cpp:270
 msgid "Dexterity:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:242
+#: src/net/tmwa/charserverhandler.cpp:271
 msgid "Luck:"
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:80
-msgid "Whisper could not be sent, user is offline."
+#: src/net/tmwa/chathandler.cpp:87
+#, c-format
+msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:84
-msgid "Whisper could not be sent, ignored by user."
+#: src/net/tmwa/chathandler.cpp:96
+#, c-format
+msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:171
+#: src/net/tmwa/chathandler.cpp:230
 msgid "MVP player."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:204 src/net/ea/chathandler.cpp:210
-#: src/net/ea/chathandler.cpp:215 src/net/ea/chathandler.cpp:220
-#: src/net/ea/chathandler.cpp:225 src/net/ea/chathandler.cpp:230
-#: src/net/ea/chathandler.cpp:235 src/net/ea/chathandler.cpp:240
+#: src/net/tmwa/chathandler.cpp:265 src/net/tmwa/chathandler.cpp:271
+#: src/net/tmwa/chathandler.cpp:276 src/net/tmwa/chathandler.cpp:281
+#: src/net/tmwa/chathandler.cpp:286 src/net/tmwa/chathandler.cpp:291
+#: src/net/tmwa/chathandler.cpp:296 src/net/tmwa/chathandler.cpp:301
 msgid "Channels are not supported!"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:86
+#: src/net/tmwa/gamehandler.cpp:88
 #, c-format
 msgid "Online users: %d"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:100
+#: src/net/tmwa/gamehandler.cpp:101
 #, fuzzy
 msgid "Game"
 msgstr "nom"
 
-#: src/net/ea/gamehandler.cpp:100
+#: src/net/tmwa/gamehandler.cpp:101
 msgid "Request to quit denied!"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:102 src/net/manaserv/generalhandler.cpp:95
+#: src/net/tmwa/generalhandler.cpp:102
 #, c-format
 msgid "Strength %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:103 src/net/manaserv/generalhandler.cpp:96
+#: src/net/tmwa/generalhandler.cpp:103
 #, c-format
 msgid "Agility %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:104 src/net/manaserv/generalhandler.cpp:98
+#: src/net/tmwa/generalhandler.cpp:104
 #, c-format
 msgid "Vitality %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:105 src/net/manaserv/generalhandler.cpp:99
+#: src/net/tmwa/generalhandler.cpp:105
 #, c-format
 msgid "Intelligence %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:106 src/net/manaserv/generalhandler.cpp:97
+#: src/net/tmwa/generalhandler.cpp:106
 #, c-format
 msgid "Dexterity %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:107
+#: src/net/tmwa/generalhandler.cpp:107
 #, c-format
 msgid "Luck %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:130
+#: src/net/tmwa/generalhandler.cpp:132
 msgid "Authentication failed."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:133
+#: src/net/tmwa/generalhandler.cpp:135
 msgid "No servers available."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:137
+#: src/net/tmwa/generalhandler.cpp:139
 msgid "Someone else is trying to use this account."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:140
+#: src/net/tmwa/generalhandler.cpp:142
 msgid "This account is already logged in."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:143
+#: src/net/tmwa/generalhandler.cpp:145
 msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:146
+#: src/net/tmwa/generalhandler.cpp:148
 msgid "Duplicated login."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:149
+#: src/net/tmwa/generalhandler.cpp:151
 msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:205
+#: src/net/tmwa/generalhandler.cpp:209
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:216 src/net/manaserv/generalhandler.cpp:166
+#: src/net/tmwa/generalhandler.cpp:230
 msgid "Strength"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:217 src/net/manaserv/generalhandler.cpp:167
+#: src/net/tmwa/generalhandler.cpp:231
 msgid "Agility"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:218 src/net/manaserv/generalhandler.cpp:169
+#: src/net/tmwa/generalhandler.cpp:232
 msgid "Vitality"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:219 src/net/manaserv/generalhandler.cpp:170
+#: src/net/tmwa/generalhandler.cpp:233
 msgid "Intelligence"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:220 src/net/manaserv/generalhandler.cpp:168
+#: src/net/tmwa/generalhandler.cpp:234
 msgid "Dexterity"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:221
+#: src/net/tmwa/generalhandler.cpp:235
 msgid "Luck"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:224
+#: src/net/tmwa/generalhandler.cpp:238
 msgid "Defense"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:225
+#: src/net/tmwa/generalhandler.cpp:239
 msgid "M.Attack"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:226
+#: src/net/tmwa/generalhandler.cpp:240
 msgid "M.Defense"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:227
+#: src/net/tmwa/generalhandler.cpp:241
 #, c-format
 msgid "% Accuracy"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:228
+#: src/net/tmwa/generalhandler.cpp:242
 #, c-format
 msgid "% Evade"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:229
+#: src/net/tmwa/generalhandler.cpp:243
 #, c-format
 msgid "% Critical"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:61 src/net/ea/gui/partytab.cpp:59
+#: src/net/tmwa/gui/guildtab.cpp:45
+msgid "Guild"
+msgstr ""
+
+#: src/net/tmwa/gui/guildtab.cpp:61 src/net/tmwa/gui/partytab.cpp:59
 msgid "/help > Display this help."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:62
+#: src/net/tmwa/gui/guildtab.cpp:62
 msgid "/invite > Invite a player to your guild"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:63
+#: src/net/tmwa/gui/guildtab.cpp:63
 msgid "/leave > Leave the guild you are in"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:64
+#: src/net/tmwa/gui/guildtab.cpp:64
 msgid "/kick > Kick some one from the guild you are in"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:73 src/net/ea/gui/partytab.cpp:73
+#: src/net/tmwa/gui/guildtab.cpp:73 src/net/tmwa/gui/partytab.cpp:73
 msgid "Command: /invite <nick>"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:74
+#: src/net/tmwa/gui/guildtab.cpp:74
 msgid "This command invites <nick> to the guild you're in."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:80 src/net/ea/gui/partytab.cpp:80
+#: src/net/tmwa/gui/guildtab.cpp:80 src/net/tmwa/gui/partytab.cpp:80
 msgid "Command: /leave"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:81
+#: src/net/tmwa/gui/guildtab.cpp:81
 msgid "This command causes the player to leave the guild."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:89
+#: src/net/tmwa/gui/guildtab.cpp:89
 msgid "Guild name is missing."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:293
+#: src/net/tmwa/guildhandler.cpp:296
 msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:298
+#: src/net/tmwa/guildhandler.cpp:301
 msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:303
+#: src/net/tmwa/guildhandler.cpp:306
 msgid "User is now part of your guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:308
+#: src/net/tmwa/guildhandler.cpp:311
 msgid "Your guild is full."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:313
+#: src/net/tmwa/guildhandler.cpp:316
 msgid "Unknown guild invite response."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:390
+#: src/net/tmwa/guildhandler.cpp:393
 msgid "Guild creation isn't supported yet."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:60
+#: src/net/tmwa/gui/partytab.cpp:43
+msgid "Party"
+msgstr ""
+
+#: src/net/tmwa/gui/partytab.cpp:60
 msgid "/invite > Invite a player to your party"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:61
+#: src/net/tmwa/gui/partytab.cpp:61
 msgid "/leave > Leave the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:62
+#: src/net/tmwa/gui/partytab.cpp:62
 msgid "/kick > Kick some one from the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:63
+#: src/net/tmwa/gui/partytab.cpp:63
 msgid "/item > Show/change party item sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:64
+#: src/net/tmwa/gui/partytab.cpp:64
 msgid "/exp > Show/change party experience sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:81
+#: src/net/tmwa/gui/partytab.cpp:81
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:85
+#: src/net/tmwa/gui/partytab.cpp:85
 msgid "Command: /item <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:86
+#: src/net/tmwa/gui/partytab.cpp:86
 msgid "This command changes the party's item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:87
+#: src/net/tmwa/gui/partytab.cpp:87
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:90
+#: src/net/tmwa/gui/partytab.cpp:90
 msgid "Command: /item"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/tmwa/gui/partytab.cpp:91
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/tmwa/gui/partytab.cpp:95
 msgid "Command: /exp <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:96
+#: src/net/tmwa/gui/partytab.cpp:96
 msgid "This command changes the party's experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/tmwa/gui/partytab.cpp:97
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:100
+#: src/net/tmwa/gui/partytab.cpp:100
 msgid "Command: /exp"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/tmwa/gui/partytab.cpp:101
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:132 src/net/ea/partyhandler.cpp:198
+#: src/net/tmwa/gui/partytab.cpp:132 src/net/tmwa/partyhandler.cpp:196
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:135 src/net/ea/partyhandler.cpp:204
+#: src/net/tmwa/gui/partytab.cpp:135 src/net/tmwa/partyhandler.cpp:202
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:138 src/net/ea/partyhandler.cpp:210
+#: src/net/tmwa/gui/partytab.cpp:138 src/net/tmwa/partyhandler.cpp:208
 msgid "Item sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:141
+#: src/net/tmwa/gui/partytab.cpp:141
 msgid "Item sharing unknown."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:167 src/net/ea/partyhandler.cpp:174
+#: src/net/tmwa/gui/partytab.cpp:167 src/net/tmwa/partyhandler.cpp:172
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:170 src/net/ea/partyhandler.cpp:180
+#: src/net/tmwa/gui/partytab.cpp:170 src/net/tmwa/partyhandler.cpp:178
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:173 src/net/ea/partyhandler.cpp:186
+#: src/net/tmwa/gui/partytab.cpp:173 src/net/tmwa/partyhandler.cpp:184
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:176
+#: src/net/tmwa/gui/partytab.cpp:176
 msgid "Experience sharing unknown."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:281
+#: src/net/tmwa/inventoryhandler.cpp:285
 msgid "Failed to use item."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:391
+#: src/net/tmwa/inventoryhandler.cpp:399
 msgid "Unable to equip."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:402
+#: src/net/tmwa/inventoryhandler.cpp:410
 msgid "Unable to unequip."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:79
+#: src/net/tmwa/loginhandler.cpp:86
 msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:82 src/net/manaserv/loginhandler.cpp:121
-msgid "Old password incorrect."
-msgstr ""
-
-#: src/net/ea/loginhandler.cpp:85
+#: src/net/tmwa/loginhandler.cpp:92
 msgid "New password too short."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:88 src/net/ea/loginhandler.cpp:175
-#: src/net/manaserv/charhandler.cpp:158 src/net/manaserv/loginhandler.cpp:96
-#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
-#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
-msgid "Unknown error."
-msgstr ""
-
-#: src/net/ea/loginhandler.cpp:149
+#: src/net/tmwa/loginhandler.cpp:156
 msgid "Unregistered ID."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:152
+#: src/net/tmwa/loginhandler.cpp:159
 msgid "Wrong password."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:155
+#: src/net/tmwa/loginhandler.cpp:162
 msgid "Account expired."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:158
+#: src/net/tmwa/loginhandler.cpp:165
 msgid "Rejected from server."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:161
+#: src/net/tmwa/loginhandler.cpp:168
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:165
+#: src/net/tmwa/loginhandler.cpp:172
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:172
+#: src/net/tmwa/loginhandler.cpp:179
 msgid "This user name is already taken."
 msgstr ""
 
-#: src/net/ea/network.cpp:145
+#: src/net/tmwa/network.cpp:145
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/ea/network.cpp:345
+#: src/net/tmwa/network.cpp:345
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/ea/network.cpp:414
+#: src/net/tmwa/network.cpp:414
 msgid "Connection to server terminated. "
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:81
+#: src/net/tmwa/partyhandler.cpp:82
 msgid "Could not create party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:84
+#: src/net/tmwa/partyhandler.cpp:84
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:118
+#: src/net/tmwa/partyhandler.cpp:119
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:122
+#: src/net/tmwa/partyhandler.cpp:123
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:126
+#: src/net/tmwa/partyhandler.cpp:127
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:130
+#: src/net/tmwa/partyhandler.cpp:131
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:238
+#: src/net/tmwa/partyhandler.cpp:236
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:249
+#: src/net/tmwa/partyhandler.cpp:246
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:301
+#: src/net/tmwa/partyhandler.cpp:299
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:329
-msgid "Inviting like this isn't supported at the moment."
+#: src/net/tmwa/partyhandler.cpp:335
+#, c-format
+msgid "Inviting failed, because you can't see a player called %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:334
+#: src/net/tmwa/partyhandler.cpp:340
 msgid "You can only inivte when you are in a party!"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:365
+#: src/net/tmwa/partyhandler.cpp:368
 #, c-format
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:304
-msgid "You are dead."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:305
-msgid "We regret to inform you that your character was killed in battle."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:307
-msgid "You are not that alive anymore."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:308
-msgid "The cold hands of the grim reaper are grabbing for your soul."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:309
-msgid "Game Over!"
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:105
+#: src/net/tmwa/playerhandler.cpp:100
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:310
-msgid ""
-"No, kids. Your character did not really die. It... err... went to a better "
-"place."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:312
-msgid ""
-"Your plan of breaking your enemies weapon by bashing it with your throat "
-"failed."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:314
-msgid "I guess this did not run too well."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:315
-msgid "Do you want your possessions identified?"
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:316
-msgid "Sadly, no trace of you was ever found..."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:317
-msgid "Annihilated."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:318
-msgid "Looks like you got your head handed to you."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:120 src/net/manaserv/beinghandler.cpp:319
-msgid ""
-"You screwed up again, dump your body down the tubes and get you another one."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/tmwa/playerhandler.cpp:118
 msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/tmwa/playerhandler.cpp:119
 msgid "You are no more."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/tmwa/playerhandler.cpp:120
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/tmwa/playerhandler.cpp:121
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/tmwa/playerhandler.cpp:122
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/tmwa/playerhandler.cpp:123
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/tmwa/playerhandler.cpp:124
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:130
+#: src/net/tmwa/playerhandler.cpp:125
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:131
+#: src/net/tmwa/playerhandler.cpp:126
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/tmwa/playerhandler.cpp:127
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/tmwa/playerhandler.cpp:128
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:135
+#: src/net/tmwa/playerhandler.cpp:130
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:136
+#: src/net/tmwa/playerhandler.cpp:131
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:249 src/net/ea/playerhandler.cpp:310
+#: src/net/tmwa/playerhandler.cpp:246 src/net/tmwa/playerhandler.cpp:285
 msgid "Message"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:250
+#: src/net/tmwa/playerhandler.cpp:247
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:333
+#: src/net/tmwa/playerhandler.cpp:313
 #, c-format
 msgid "You picked up %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:369
+#: src/net/tmwa/playerhandler.cpp:348
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:532
+#: src/net/tmwa/playerhandler.cpp:488
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:147
+#: src/net/tmwa/specialhandler.cpp:144
 msgid "Trade failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:150
+#: src/net/tmwa/specialhandler.cpp:147
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:153
+#: src/net/tmwa/specialhandler.cpp:150
 msgid "Sit failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:156
+#: src/net/tmwa/specialhandler.cpp:153
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:159
+#: src/net/tmwa/specialhandler.cpp:156
 msgid "Could not join party!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:162
+#: src/net/tmwa/specialhandler.cpp:159
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:171
+#: src/net/tmwa/specialhandler.cpp:168
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:174
+#: src/net/tmwa/specialhandler.cpp:171
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:177
+#: src/net/tmwa/specialhandler.cpp:174
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:180
+#: src/net/tmwa/specialhandler.cpp:177
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:183
+#: src/net/tmwa/specialhandler.cpp:180
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:186
+#: src/net/tmwa/specialhandler.cpp:183
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:189
+#: src/net/tmwa/specialhandler.cpp:186
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:192
+#: src/net/tmwa/specialhandler.cpp:189
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:195
+#: src/net/tmwa/specialhandler.cpp:192
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:198
+#: src/net/tmwa/specialhandler.cpp:195
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:201
+#: src/net/tmwa/specialhandler.cpp:198
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:210
+#: src/net/tmwa/specialhandler.cpp:207
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:213
+#: src/net/tmwa/specialhandler.cpp:210
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:216
+#: src/net/tmwa/specialhandler.cpp:213
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:116
-msgid "Request for Trade"
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:108 src/net/manaserv/tradehandler.cpp:117
-#, c-format
-msgid "%s wants to trade with you, do you accept?"
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:124
+#: src/net/tmwa/tradehandler.cpp:126
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:128
+#: src/net/tmwa/tradehandler.cpp:130
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:132
+#: src/net/tmwa/tradehandler.cpp:134
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:137
+#: src/net/tmwa/tradehandler.cpp:139
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:144
+#: src/net/tmwa/tradehandler.cpp:146
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:153
+#: src/net/tmwa/tradehandler.cpp:154
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:202
+#: src/net/tmwa/tradehandler.cpp:202
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:207
+#: src/net/tmwa/tradehandler.cpp:207
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:211
+#: src/net/tmwa/tradehandler.cpp:211
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:224 src/net/manaserv/tradehandler.cpp:149
-msgid "Trade canceled."
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:231 src/net/manaserv/tradehandler.cpp:156
-msgid "Trade completed."
-msgstr ""
-
-#: src/net/manaserv/beinghandler.cpp:324
-msgid "Press OK to respawn."
-msgstr ""
-
-#: src/net/manaserv/beinghandler.cpp:325
-msgid "You Died"
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:128 src/net/manaserv/charhandler.cpp:196
-msgid "Not logged in."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:131
-msgid "No empty slot."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:134
-msgid "Invalid name."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:137
-msgid "Character's name already exists."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:140
-msgid "Invalid hairstyle."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:143
-msgid "Invalid hair color."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:146
-msgid "Invalid gender."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:149
-msgid "Character's stats are too high."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:152
-msgid "Character's stats are too low."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:155
-msgid "One stat is zero."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:187
-msgid "Player deleted."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:199
-msgid "Selection out of range."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:202
-#, c-format
-msgid "Unknown error (%d)."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:242
-msgid "No gameservers are available."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:268
-msgid "Willpower:"
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
-#: src/net/manaserv/guildhandler.cpp:259
-#, c-format
-msgid "Topic: %s"
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
-msgid "Players in this channel:"
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:201
-msgid "Error joining channel."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:207
-msgid "Listing channels."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:219
-msgid "End of channel list."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:291
-#, c-format
-msgid "%s entered the channel."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:296
-#, c-format
-msgid "%s left the channel."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:312
-#, c-format
-msgid "%s has set mode %s on user %s."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:322
-#, c-format
-msgid "%s has kicked %s."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:327
-msgid "Unknown channel event."
-msgstr ""
-
-#: src/net/manaserv/generalhandler.cpp:100
-#, c-format
-msgid "Willpower %+d"
-msgstr ""
-
-#: src/net/manaserv/generalhandler.cpp:171
-msgid "Willpower"
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:81
-msgid "Guild created."
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:86
-msgid "Error creating guild."
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:96
-msgid "Invite sent."
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:203
-msgid "Member was promoted successfully."
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:208
-msgid "Failed to promote member."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:87
-msgid "Wrong magic_token."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
-msgid "Already logged in."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:93 src/net/manaserv/loginhandler.cpp:272
-msgid "Server is full."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:118
-msgid "New password incorrect."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
-msgid "Account not connected. Please login first."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:149
-msgid "New email address incorrect."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:152
-msgid "Old email address incorrect."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:158
-msgid "The new email address already exists."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:239
-msgid ""
-"Client registration is not allowed. Please contact server administration."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
-msgid "Client version is too old."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:266
-msgid "Wrong username or password."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:275
-msgid "Login attempt too soon after previous attempt."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:303
-msgid "Wrong username, password or email address."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:306
-msgid "Username already exists."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:309
-msgid "Email address already exists."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:312
-msgid "You took too long with the captcha or your response was incorrect."
-msgstr ""
-
-#: src/net/manaserv/partyhandler.cpp:88
-msgid "Joined party."
-msgstr ""
-
-#: src/net/manaserv/partyhandler.cpp:106
-#, c-format
-msgid "%s joined the party."
-msgstr ""
-
-#: src/net/manaserv/partyhandler.cpp:123
-#, c-format
-msgid "%s rejected your invite."
-msgstr ""
-
-#: src/net/manaserv/tradehandler.cpp:96
-msgid "Accepting incoming trade requests."
-msgstr ""
-
-#: src/net/manaserv/tradehandler.cpp:98
-msgid "Ignoring incoming trade requests."
-msgstr ""
-
-#: src/net/manaserv/tradehandler.cpp:135
-#, c-format
-msgid "Trading with %s"
-msgstr ""
-
-#: src/playerrelations.cpp:304
+#: src/playerrelations.cpp:310
 msgid "Completely ignore"
 msgstr ""
 
-#: src/playerrelations.cpp:318
+#: src/playerrelations.cpp:324
 msgid "Print '...'"
 msgstr ""
 
-#: src/playerrelations.cpp:334
+#: src/playerrelations.cpp:340
 msgid "Blink name"
 msgstr ""
 
-#: src/playerrelations.cpp:371
-msgid "Floating '...' bubble"
-msgstr ""
-
-#: src/playerrelations.cpp:374
-msgid "Floating bubble"
-msgstr ""
-
-#: src/resources/itemdb.cpp:52
+#: src/resources/itemdb.cpp:44
 #, c-format
 msgid "Attack %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:53
+#: src/resources/itemdb.cpp:45
 #, c-format
 msgid "Defense %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:54
+#: src/resources/itemdb.cpp:46
 #, c-format
 msgid "HP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:55
+#: src/resources/itemdb.cpp:47
 #, c-format
 msgid "MP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:114
+#: src/resources/itemdb.cpp:92
 msgid "Unknown item"
 msgstr ""
 
-#: src/resources/itemdb.cpp:158 src/resources/monsterdb.cpp:45
-#: src/resources/monsterdb.cpp:67
+#: src/resources/itemdb.cpp:135 src/resources/monsterdb.cpp:77
 msgid "unnamed"
 msgstr ""
 
diff --git a/po/cs.po b/po/cs.po
index 06a9fb63..4fb50c54 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2010-03-05 21:52+0100\n"
+"POT-Creation-Date: 2010-12-13 20:04+0100\n"
 "PO-Revision-Date: 2009-12-04 15:16+0000\n"
 "Last-Translator: David Kolibáč <david@kolibac.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,447 +19,461 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/client.cpp:553 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:62
+#: src/client.cpp:598 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
 msgid "Setup"
 msgstr "Nastavení"
 
-#: src/client.cpp:623
+#: src/client.cpp:679
 #, fuzzy
 msgid "Connecting to server"
 msgstr "Čeká se na server"
 
-#: src/client.cpp:650
+#: src/client.cpp:706
 #, fuzzy
 msgid "Logging in"
 msgstr "Přihlášení"
 
-#: src/client.cpp:683
+#: src/client.cpp:739
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:739
+#: src/client.cpp:804
 #, fuzzy
 msgid "Requesting characters"
 msgstr "Vyber postavu"
 
-#: src/client.cpp:768
+#: src/client.cpp:833
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:799 src/client.cpp:806 src/client.cpp:940
+#: src/client.cpp:843
+#, fuzzy
+msgid "Changing game servers"
+msgstr "Server"
+
+#: src/client.cpp:872 src/client.cpp:879 src/client.cpp:1014
 #: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
 #: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
-#: src/gui/serverdialog.cpp:261 src/gui/unregisterdialog.cpp:133
-#: src/net/ea/charserverhandler.cpp:135 src/net/ea/charserverhandler.cpp:152
-#: src/net/manaserv/charhandler.cpp:161 src/net/manaserv/charhandler.cpp:204
+#: src/gui/serverdialog.cpp:323 src/gui/unregisterdialog.cpp:133
+#: src/net/manaserv/charhandler.cpp:174 src/net/manaserv/charhandler.cpp:217
+#: src/net/tmwa/charserverhandler.cpp:134
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Error"
 msgstr "Chyba"
 
-#: src/client.cpp:815
+#: src/client.cpp:888
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:842
+#: src/client.cpp:915
 #, fuzzy
 msgid "Password Change"
 msgstr "Heslo:"
 
-#: src/client.cpp:843
+#: src/client.cpp:916
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:862
+#: src/client.cpp:935
 #, fuzzy
 msgid "Email Change"
 msgstr "Změnit"
 
-#: src/client.cpp:863
+#: src/client.cpp:936
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:883
+#: src/client.cpp:956
 #, fuzzy
 msgid "Unregister Successful"
 msgstr "Zrušit registraci"
 
-#: src/client.cpp:884
+#: src/client.cpp:957
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1007 src/client.cpp:1030
+#: src/client.cpp:1138 src/client.cpp:1161
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1119
+#: src/client.cpp:1281
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1153 src/client.cpp:1159
+#: src/client.cpp:1315 src/client.cpp:1321
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/commandhandler.cpp:127 src/commandhandler.cpp:308
+#: src/commandhandler.cpp:131 src/commandhandler.cpp:317
 msgid "Unknown command."
 msgstr "Neznámý příkaz."
 
-#: src/commandhandler.cpp:156
+#: src/commandhandler.cpp:160
 msgid "-- Help --"
 msgstr "-- Nápověda --"
 
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:161
 msgid "/help > Display this help"
 msgstr "/help > Zobrazit tuto nápovědu"
 
-#: src/commandhandler.cpp:159
+#: src/commandhandler.cpp:163
 msgid "/where > Display map name"
 msgstr "/where > Zobrazit jméno mapy"
 
-#: src/commandhandler.cpp:160
+#: src/commandhandler.cpp:164
 msgid "/who > Display number of online users"
 msgstr "/who > Zobrazit počet uživatelů on-line"
 
-#: src/commandhandler.cpp:161
+#: src/commandhandler.cpp:165
 msgid "/me > Tell something about yourself"
 msgstr "/me > Říct něco o sobě"
 
-#: src/commandhandler.cpp:163
+#: src/commandhandler.cpp:167
 msgid "/clear > Clears this window"
 msgstr "/clear > Vyčistit toto okno"
 
-#: src/commandhandler.cpp:165
+#: src/commandhandler.cpp:169
 msgid "/msg > Send a private message to a user"
 msgstr "/msg > Odeslat soukromou zprávu uživateli"
 
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:170
 msgid "/whisper > Alias of msg"
 msgstr "/whisper > Jiné označení pro msg"
 
-#: src/commandhandler.cpp:167
+#: src/commandhandler.cpp:171
 msgid "/w > Alias of msg"
 msgstr "/w > Jiné označení pro msg"
 
-#: src/commandhandler.cpp:168
+#: src/commandhandler.cpp:172
 msgid "/query > Makes a tab for private messages with another user"
 msgstr "/query > Založit kartu pro soukromé zprávy jinému uživateli"
 
-#: src/commandhandler.cpp:169
+#: src/commandhandler.cpp:174
 msgid "/q > Alias of query"
 msgstr "/q > Jiné označení pro query"
 
-#: src/commandhandler.cpp:171
+#: src/commandhandler.cpp:176
 msgid "/ignore > ignore a player"
 msgstr ""
 
-#: src/commandhandler.cpp:172
+#: src/commandhandler.cpp:177
 msgid "/unignore > stop ignoring a player"
 msgstr ""
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:179
 msgid "/list > Display all public channels"
 msgstr "/list > Zobrazit seznam všech veřejných kanálů"
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:180
 msgid "/join > Join or create a channel"
 msgstr "/join > Připojit se, nebo vytvořit kanál"
 
-#: src/commandhandler.cpp:177
+#: src/commandhandler.cpp:182
 #, fuzzy
 msgid "/createparty > Create a new party"
 msgstr "/party >Pozvat uživatele do party"
 
-#: src/commandhandler.cpp:178
+#: src/commandhandler.cpp:183
 msgid "/party > Invite a user to party"
 msgstr "/party >Pozvat uživatele do party"
 
-#: src/commandhandler.cpp:180
+#: src/commandhandler.cpp:185
 msgid "/record > Start recording the chat to an external file"
 msgstr "/record > Spustit nahrávání záznamu chatu do externího souboru"
 
-#: src/commandhandler.cpp:181
+#: src/commandhandler.cpp:187
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr ""
 
-#: src/commandhandler.cpp:182
+#: src/commandhandler.cpp:189
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
 
-#: src/commandhandler.cpp:184
+#: src/commandhandler.cpp:192
 msgid "/announce > Global announcement (GM only)"
 msgstr "/announce > Globální oznámení (jen GM)"
 
-#: src/commandhandler.cpp:188
+#: src/commandhandler.cpp:196
 msgid "For more information, type /help <command>."
 msgstr "Pro bližší informace zadejte /help <command>."
 
-#: src/commandhandler.cpp:192
+#: src/commandhandler.cpp:200
 msgid "Command: /help"
 msgstr "Příkaz: /help"
 
-#: src/commandhandler.cpp:193
+#: src/commandhandler.cpp:201
 msgid "This command displays a list of all commands available."
 msgstr "Tento příkaz zobrazí seznam všech příkazů, které jsou k dispozici."
 
-#: src/commandhandler.cpp:194
+#: src/commandhandler.cpp:203
 msgid "Command: /help <command>"
 msgstr "Příkaz: /help <command>"
 
-#: src/commandhandler.cpp:195
+#: src/commandhandler.cpp:204
 msgid "This command displays help on <command>."
 msgstr "Tento příkaz zobrazí nápovědu k <command>."
 
-#: src/commandhandler.cpp:203
+#: src/commandhandler.cpp:212
 msgid "Command: /announce <msg>"
 msgstr "Příkaz: /announce <msg>"
 
-#: src/commandhandler.cpp:204
+#: src/commandhandler.cpp:213
 msgid "*** only available to a GM ***"
 msgstr "*** K dispozici pouze pro GM ***"
 
-#: src/commandhandler.cpp:205
+#: src/commandhandler.cpp:214
 msgid "This command sends the message <msg> to all players currently online."
 msgstr "Tento příkaz odešle zprávu <msg> všem hráčům, kteří jsou on-line."
 
-#: src/commandhandler.cpp:210
+#: src/commandhandler.cpp:219
 msgid "Command: /clear"
 msgstr "Příkaz: /clear"
 
-#: src/commandhandler.cpp:211
+#: src/commandhandler.cpp:220
 msgid "This command clears the chat log of previous chat."
 msgstr "Tento příkaz vyčistí záznam předchozího chatu."
 
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:224
 #, fuzzy
 msgid "Command: /ignore <player>"
 msgstr "Příkaz: /join <channel>"
 
-#: src/commandhandler.cpp:216
+#: src/commandhandler.cpp:225
 #, fuzzy
 msgid "This command ignores the given player regardless of current relations."
 msgstr "Tento příkaz zobrazí počet hráčů, kteří jsou momentálně online."
 
-#: src/commandhandler.cpp:221
+#: src/commandhandler.cpp:230
 msgid "Command: /join <channel>"
 msgstr "Příkaz: /join <channel>"
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:231
 msgid "This command makes you enter <channel>."
 msgstr "Tento příkaz vás připojí ke kanálu <channel>."
 
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:232
 msgid "If <channel> doesn't exist, it's created."
 msgstr "Pokud <channel> neexistuje, bude vytvořen."
 
-#: src/commandhandler.cpp:227
+#: src/commandhandler.cpp:236
 msgid "Command: /list"
 msgstr "Příkaz: /list"
 
-#: src/commandhandler.cpp:228
+#: src/commandhandler.cpp:237
 msgid "This command shows a list of all channels."
 msgstr "Tento příkaz zobrazí seznam všech kanálů."
 
-#: src/commandhandler.cpp:232
+#: src/commandhandler.cpp:241
 msgid "Command: /me <message>"
 msgstr "Příkaz: /me <message>"
 
-#: src/commandhandler.cpp:233
+#: src/commandhandler.cpp:242
 msgid "This command tell others you are (doing) <msg>."
 msgstr ""
 
-#: src/commandhandler.cpp:237
+#: src/commandhandler.cpp:246
 msgid "Command: /msg <nick> <message>"
 msgstr "Příkaz: /msg <nick> <message>"
 
-#: src/commandhandler.cpp:238
+#: src/commandhandler.cpp:247
 msgid "Command: /whisper <nick> <message>"
 msgstr "Příkaz: /whisper <nick> <message>"
 
-#: src/commandhandler.cpp:239
+#: src/commandhandler.cpp:248
 msgid "Command: /w <nick> <message>"
 msgstr "Příkaz: /w <nick> <message>"
 
-#: src/commandhandler.cpp:240
+#: src/commandhandler.cpp:249
 msgid "This command sends the text <message> to <nick>."
 msgstr "Tento příkaz odešle zprávu <message> uživateli <nick>."
 
-#: src/commandhandler.cpp:241 src/commandhandler.cpp:260
+#: src/commandhandler.cpp:250 src/commandhandler.cpp:269
 #: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
-#: src/net/ea/gui/guildtab.cpp:75 src/net/ea/gui/partytab.cpp:75
+#: src/net/tmwa/gui/guildtab.cpp:75 src/net/tmwa/gui/partytab.cpp:75
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr "Pokud <nick> obsahuje mezeru, uzavřete jej do uvozovek (\")."
 
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:255
 msgid "Command: /query <nick>"
 msgstr "Příkaz: /query <nick>"
 
-#: src/commandhandler.cpp:247
+#: src/commandhandler.cpp:256
 msgid "Command: /q <nick>"
 msgstr "Příkaz: /q <nick>"
 
-#: src/commandhandler.cpp:248
+#: src/commandhandler.cpp:257
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:253
+#: src/commandhandler.cpp:262
 #, fuzzy
 msgid "Command: /createparty <name>"
 msgstr "Příkaz: /party <nick>"
 
-#: src/commandhandler.cpp:254
+#: src/commandhandler.cpp:263
 #, fuzzy
 msgid "This command creates a new party called <name>."
 msgstr "Tento příkaz vás připojí ke kanálu <channel>."
 
-#: src/commandhandler.cpp:258
+#: src/commandhandler.cpp:267
 msgid "Command: /party <nick>"
 msgstr "Příkaz: /party <nick>"
 
-#: src/commandhandler.cpp:259 src/net/ea/gui/partytab.cpp:74
+#: src/commandhandler.cpp:268 src/net/tmwa/gui/partytab.cpp:74
 msgid "This command invites <nick> to party with you."
 msgstr ""
 
-#: src/commandhandler.cpp:265
+#: src/commandhandler.cpp:274
 msgid "Command: /present"
 msgstr "Příkaz: /present"
 
-#: src/commandhandler.cpp:266
+#: src/commandhandler.cpp:275
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: src/commandhandler.cpp:272
+#: src/commandhandler.cpp:281
 msgid "Command: /record <filename>"
 msgstr "Příkaz: /record <filename>"
 
-#: src/commandhandler.cpp:273
+#: src/commandhandler.cpp:282
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr ""
 
-#: src/commandhandler.cpp:275
+#: src/commandhandler.cpp:284
 msgid "Command: /record"
 msgstr "Příkaz: /record"
 
-#: src/commandhandler.cpp:276
+#: src/commandhandler.cpp:285
 msgid "This command finishes a recording session."
 msgstr ""
 
-#: src/commandhandler.cpp:280
+#: src/commandhandler.cpp:289
 msgid "Command: /toggle <state>"
 msgstr "Příkaz: /toggle <state>"
 
-#: src/commandhandler.cpp:281
+#: src/commandhandler.cpp:290
 msgid ""
 "This command sets whether the return key should toggle the chat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: src/commandhandler.cpp:283
+#: src/commandhandler.cpp:292
 msgid ""
-"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
-"\", \"no\", \"false\" to turn the toggle off."
+"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
+"\"0\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: src/commandhandler.cpp:286
+#: src/commandhandler.cpp:295
 msgid "Command: /toggle"
 msgstr "Příkaz: /toggle"
 
-#: src/commandhandler.cpp:287
+#: src/commandhandler.cpp:296
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: src/commandhandler.cpp:291 src/gui/widgets/whispertab.cpp:93
+#: src/commandhandler.cpp:300 src/gui/widgets/whispertab.cpp:95
 #, fuzzy
 msgid "Command: /unignore <player>"
 msgstr "Příkaz: /announce <msg>"
 
-#: src/commandhandler.cpp:292
+#: src/commandhandler.cpp:301
 msgid "This command stops ignoring the given player if they are being ignored"
 msgstr ""
 
-#: src/commandhandler.cpp:297
+#: src/commandhandler.cpp:306
 msgid "Command: /where"
 msgstr ""
 
-#: src/commandhandler.cpp:298
+#: src/commandhandler.cpp:307
 msgid "This command displays the name of the current map."
 msgstr "Tento příkaz zobrazí název aktuální mapy."
 
-#: src/commandhandler.cpp:302
+#: src/commandhandler.cpp:311
 msgid "Command: /who"
 msgstr ""
 
-#: src/commandhandler.cpp:303
+#: src/commandhandler.cpp:312
 msgid "This command displays the number of players currently online."
 msgstr "Tento příkaz zobrazí počet hráčů, kteří jsou momentálně online."
 
-#: src/commandhandler.cpp:309
+#: src/commandhandler.cpp:318
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: src/commandhandler.cpp:375
+#: src/commandhandler.cpp:384
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:383
+#: src/commandhandler.cpp:392
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:397
+#: src/commandhandler.cpp:406
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:410 src/net/ea/gui/partytab.cpp:109
+#: src/commandhandler.cpp:419 src/net/tmwa/gui/partytab.cpp:109
 msgid "Party name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:423 src/commandhandler.cpp:471
-#: src/commandhandler.cpp:493
+#: src/commandhandler.cpp:432 src/commandhandler.cpp:509
+#: src/commandhandler.cpp:531
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:441
+#: src/commandhandler.cpp:450
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:441
+#: src/commandhandler.cpp:450
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:450
+#: src/commandhandler.cpp:459
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:454
+#: src/commandhandler.cpp:463
 msgid "Message now closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:477
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:489
+msgid "Show IP: On"
+msgstr ""
+
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:485
+msgid "Show IP: Off"
+msgstr ""
+
+#: src/commandhandler.cpp:515
 msgid "Player already ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:484
+#: src/commandhandler.cpp:522
 msgid "Player successfully ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:486
+#: src/commandhandler.cpp:524
 msgid "Player could not be ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:501
+#: src/commandhandler.cpp:539
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:506
+#: src/commandhandler.cpp:544
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:508
+#: src/commandhandler.cpp:546
 msgid "Player could not be unignored!"
 msgstr ""
 
@@ -471,43 +486,43 @@ msgstr ""
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:326
+#: src/game.cpp:342
 #, fuzzy
 msgid "Screenshot saved as "
 msgstr "Snímek obrazovky uložen do ~/"
 
-#: src/game.cpp:331
+#: src/game.cpp:347
 msgid "Saving screenshot failed!"
 msgstr "Ukládání snímku obrazovky selhalo!"
 
-#: src/game.cpp:355
+#: src/game.cpp:378
 #, fuzzy
 msgid "The connection to the server was lost."
 msgstr "Připojení k serveru bylo ztraceno, program nyní bude ukončen"
 
-#: src/game.cpp:360
+#: src/game.cpp:382
 msgid "Network Error"
 msgstr "Chyba sítě"
 
-#: src/game.cpp:705
+#: src/game.cpp:721
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorovat příchozí žádosti o obchodování"
 
-#: src/game.cpp:712
+#: src/game.cpp:726
 msgid "Accepting incoming trade requests"
 msgstr "Akceptovat příchozí žádosti o obchodování"
 
-#: src/game.cpp:946
+#: src/game.cpp:954
 #, fuzzy
 msgid "Could Not Load Map"
 msgstr "Nelze nahrát mapu"
 
-#: src/game.cpp:947
+#: src/game.cpp:955
 #, c-format
 msgid "Error while loading %s"
 msgstr "Chyba při načítání %s"
 
-#: src/gui/beingpopup.cpp:75
+#: src/gui/beingpopup.cpp:76
 #, fuzzy, c-format
 msgid "Party: %s"
 msgstr "Parta (%s)"
@@ -516,34 +531,34 @@ msgstr "Parta (%s)"
 msgid "Buy"
 msgstr "Nákup"
 
-#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
-#: src/gui/sell.cpp:276
+#: src/gui/buy.cpp:69 src/gui/buy.cpp:261 src/gui/sell.cpp:71
+#: src/gui/sell.cpp:288
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:99 src/gui/npcdialog.cpp:100
-#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:479
+#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:112 src/gui/npcdialog.cpp:124
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:463
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:98 src/gui/npcdialog.cpp:101
-#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:491
+#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:111 src/gui/npcdialog.cpp:125
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:475
 msgid "-"
 msgstr ""
 
 #: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
-#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:182
-#: src/keyboardconfig.cpp:103
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:228
+#: src/keyboardconfig.cpp:102
 msgid "Quit"
 msgstr "Ukončit"
 
-#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:408
-#: src/gui/statuswindow.cpp:478 src/gui/statuswindow.cpp:512
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:384
+#: src/gui/statuswindow.cpp:462 src/gui/statuswindow.cpp:496
 msgid "Max"
 msgstr "Vše"
 
@@ -557,11 +572,11 @@ msgstr "Prodej"
 
 #: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
 #: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
-#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:101
-#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:178
-#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:402
+#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:114
+#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:389
 #: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
-#: src/gui/socialwindow.cpp:242 src/gui/textdialog.cpp:39
+#: src/gui/socialwindow.cpp:275 src/gui/textdialog.cpp:40
 #: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr "Zrušit"
@@ -599,7 +614,7 @@ msgstr ""
 msgid "Change Password"
 msgstr "Změnit heslo"
 
-#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:53
+#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:55
 #: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
 msgid "Password:"
 msgstr "Heslo:"
@@ -631,19 +646,19 @@ msgstr ""
 msgid "Create Character"
 msgstr "Vytvořit postavu"
 
-#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:52
+#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:54
 #: src/gui/register.cpp:67
 msgid "Name:"
 msgstr "Jméno:"
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
 #: src/gui/outfitwindow.cpp:67
 msgid ">"
 msgstr ""
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
 #: src/gui/outfitwindow.cpp:66
@@ -660,8 +675,8 @@ msgstr "Barva vlasů:"
 msgid "Hair style:"
 msgstr "Účes:"
 
-#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:397
-#: src/gui/socialwindow.cpp:296
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:392
+#: src/gui/socialwindow.cpp:329
 msgid "Create"
 msgstr "Vytvořit"
 
@@ -717,34 +732,34 @@ msgstr "Zrušit registraci"
 msgid "Change Email"
 msgstr "Změnit e-mail"
 
-#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:185
-#: src/gui/setup_players.cpp:230
+#: src/gui/charselectdialog.cpp:336 src/gui/serverdialog.cpp:231
+#: src/gui/setup_players.cpp:229
 msgid "Delete"
 msgstr "Smazat"
 
-#: src/gui/charselectdialog.cpp:387
+#: src/gui/charselectdialog.cpp:380
 #, fuzzy
 msgid "Choose"
 msgstr "Barvy"
 
-#: src/gui/charselectdialog.cpp:399 src/gui/charselectdialog.cpp:400
+#: src/gui/charselectdialog.cpp:394 src/gui/charselectdialog.cpp:395
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:77 src/gui/palette.cpp:96
+#: src/gui/chat.cpp:88
 msgid "Chat"
 msgstr "Chat"
 
-#: src/gui/chat.cpp:287
+#: src/gui/chat.cpp:311
 #, fuzzy, c-format
 msgid "Present: %s; %d players are present."
 msgstr "%d hráči jsou přítomni."
 
-#: src/gui/chat.cpp:305
+#: src/gui/chat.cpp:329
 msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:469
+#: src/gui/chat.cpp:493
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -806,143 +821,173 @@ msgstr ""
 msgid "Ambient FX: %s"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:56
+#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:55
 msgid "Equipment"
 msgstr "Vybavení"
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:77
-#: src/gui/inventorywindow.cpp:79 src/gui/inventorywindow.cpp:298
-#: src/gui/popupmenu.cpp:372
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:89
+#: src/gui/inventorywindow.cpp:337 src/gui/popupmenu.cpp:359
 msgid "Unequip"
 msgstr "Odstranit z vybavení"
 
-#: src/gui/help.cpp:36
+#: src/gui/help.cpp:37
 msgid "Help"
 msgstr "Pomoc"
 
-#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:73
+#: src/gui/help.cpp:51 src/gui/npcdialog.cpp:50
 msgid "Close"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:56 src/gui/windowmenu.cpp:57
+#: src/gui/inventorywindow.cpp:59 src/gui/windowmenu.cpp:56
 msgid "Inventory"
 msgstr "Inventář"
 
-#: src/gui/inventorywindow.cpp:72 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:300 src/gui/popupmenu.cpp:374
+#: src/gui/inventorywindow.cpp:59
+msgid "Storage"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:82
+msgid "Slots:"
+msgstr "Sloty:"
+
+#: src/gui/inventorywindow.cpp:87 src/gui/inventorywindow.cpp:100
+#: src/gui/inventorywindow.cpp:339 src/gui/popupmenu.cpp:361
 msgid "Equip"
 msgstr "Vybavit"
 
-#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:304 src/gui/popupmenu.cpp:377
+#: src/gui/inventorywindow.cpp:88
 msgid "Use"
 msgstr "Použít"
 
-#: src/gui/inventorywindow.cpp:83 src/gui/inventorywindow.cpp:308
-#: src/gui/popupmenu.cpp:380
+#: src/gui/inventorywindow.cpp:101 src/gui/popupmenu.cpp:364
+msgid "Activate"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:102 src/gui/inventorywindow.cpp:348
+#: src/gui/popupmenu.cpp:367
 #, fuzzy
 msgid "Drop..."
 msgstr "Upustit"
 
-#: src/gui/inventorywindow.cpp:84 src/gui/popupmenu.cpp:386
+#: src/gui/inventorywindow.cpp:103 src/gui/popupmenu.cpp:373
 msgid "Split"
 msgstr "Rozdělit"
 
-#: src/gui/inventorywindow.cpp:85 src/gui/outfitwindow.cpp:51
+#: src/gui/inventorywindow.cpp:104 src/gui/outfitwindow.cpp:51
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:96 src/gui/storagewindow.cpp:83
-msgid "Slots:"
-msgstr "Sloty:"
-
-#: src/gui/inventorywindow.cpp:97
+#: src/gui/inventorywindow.cpp:106
 msgid "Weight:"
 msgstr "Hmotnost:"
 
-#: src/gui/inventorywindow.cpp:310 src/gui/popupmenu.cpp:382
+#: src/gui/inventorywindow.cpp:124 src/gui/popupmenu.cpp:378
+msgid "Store"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:125 src/gui/popupmenu.cpp:385
+msgid "Retrieve"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:350 src/gui/popupmenu.cpp:369
 msgid "Drop"
 msgstr "Upustit"
 
-#: src/gui/itemamount.cpp:100 src/gui/okdialog.cpp:42
-#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:38 src/gui/trade.cpp:73
-#: src/gui/trade.cpp:75
+#: src/gui/itemamount.cpp:113 src/gui/okdialog.cpp:42
+#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:39 src/gui/trade.cpp:72
+#: src/gui/trade.cpp:74
 msgid "OK"
 msgstr "OK"
 
-#: src/gui/itemamount.cpp:102
+#: src/gui/itemamount.cpp:115
 msgid "All"
 msgstr "Vše"
 
-#: src/gui/itemamount.cpp:128
+#: src/gui/itemamount.cpp:141
 msgid "Select amount of items to trade."
 msgstr "Vyberte množství předmětů, se kterými budete obchodovat."
 
-#: src/gui/itemamount.cpp:131
+#: src/gui/itemamount.cpp:144
 msgid "Select amount of items to drop."
 msgstr "Vyberte množství předmětů, které chcete upustit."
 
-#: src/gui/itemamount.cpp:134
+#: src/gui/itemamount.cpp:147
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/itemamount.cpp:137
+#: src/gui/itemamount.cpp:150
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamount.cpp:140
+#: src/gui/itemamount.cpp:153
 msgid "Select amount of items to split."
 msgstr ""
 
-#: src/gui/itempopup.cpp:92
+#: src/gui/itempopup.cpp:137
 #, fuzzy, c-format
 msgid "Weight: %s"
 msgstr "Hmotnost: "
 
-#: src/gui/login.cpp:49 src/gui/login.cpp:61
+#: src/gui/login.cpp:51 src/gui/login.cpp:63
 msgid "Login"
 msgstr "Přihlášení"
 
-#: src/gui/login.cpp:58
+#: src/gui/login.cpp:60
 #, fuzzy
 msgid "Remember username"
 msgstr "Zapamatovat uživatelské jméno"
 
-#: src/gui/login.cpp:59 src/gui/register.cpp:58 src/gui/register.cpp:73
+#: src/gui/login.cpp:61 src/gui/register.cpp:58 src/gui/register.cpp:73
 msgid "Register"
 msgstr "Registrace"
 
-#: src/gui/login.cpp:60
+#: src/gui/login.cpp:62
 #, fuzzy
 msgid "Change Server"
 msgstr "Server"
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
+#: src/gui/login.cpp:129
+msgid "Registration disabled"
+msgstr ""
+
+#: src/gui/login.cpp:129
+msgid "You need to use the website to register an account for this server."
+msgstr ""
+
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:86
 msgid "Map"
 msgstr "Mapa"
 
-#: src/gui/npcdialog.cpp:44
+#: src/gui/ministatus.cpp:235
+msgid "Need"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:48
 msgid "Waiting for server"
 msgstr "Čeká se na server"
 
-#: src/gui/npcdialog.cpp:45
+#: src/gui/npcdialog.cpp:49
 msgid "Next"
 msgstr "Další"
 
-#: src/gui/npcdialog.cpp:47
+#: src/gui/npcdialog.cpp:51
 msgid "Submit"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:52 src/gui/npcpostdialog.cpp:41
+#: src/gui/npcdialog.cpp:73 src/gui/npcpostdialog.cpp:41
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:110
+#: src/gui/npcdialog.cpp:118
+msgid "Clear log"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:134
 msgid "Reset"
 msgstr "Reset"
 
 #. TRANSLATORS: Please leave the \n sequences intact.
-#: src/gui/npcdialog.cpp:171
+#: src/gui/npcdialog.cpp:208
 #, fuzzy
 msgid ""
 "\n"
@@ -957,7 +1002,7 @@ msgstr ""
 msgid "Send"
 msgstr "Odeslat"
 
-#: src/gui/npcpostdialog.cpp:96
+#: src/gui/npcpostdialog.cpp:99
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
@@ -972,308 +1017,83 @@ msgstr ""
 msgid "Unequip first"
 msgstr "Odstranit z vybavení"
 
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:143
-msgid "Text"
-msgstr "Text"
-
-#: src/gui/palette.cpp:82
-msgid "Text Shadow"
-msgstr ""
-
-#: src/gui/palette.cpp:83
-msgid "Text Outline"
-msgstr ""
-
-#: src/gui/palette.cpp:84
-msgid "Progress Bar Labels"
-msgstr ""
-
-#: src/gui/palette.cpp:85
-msgid "Buttons"
-msgstr ""
-
-#: src/gui/palette.cpp:86
-msgid "Disabled Buttons"
-msgstr ""
-
-#: src/gui/palette.cpp:87
-msgid "Tabs"
-msgstr ""
-
-#: src/gui/palette.cpp:89
-msgid "Background"
-msgstr "Pozadí"
-
-#: src/gui/palette.cpp:91
-msgid "Highlight"
-msgstr "Zvýraznit"
-
-#: src/gui/palette.cpp:92
-msgid "Tab Highlight"
-msgstr ""
-
-#: src/gui/palette.cpp:93
-#, fuzzy
-msgid "Item Too Expensive"
-msgstr "Předmět je příliš drahý"
-
-#: src/gui/palette.cpp:94
-#, fuzzy
-msgid "Item Is Equipped"
-msgstr "Předmět je ve vybavení"
-
-#: src/gui/palette.cpp:97
-msgid "GM"
-msgstr "GM"
-
-#: src/gui/palette.cpp:98
-msgid "Player"
-msgstr "Hráč"
-
-#: src/gui/palette.cpp:99
-msgid "Whisper"
-msgstr "Šeptat"
-
-#: src/gui/palette.cpp:100
-msgid "Is"
-msgstr "Je"
-
-#: src/gui/palette.cpp:101 src/net/ea/gui/partytab.cpp:43
-msgid "Party"
-msgstr "Parta"
-
-#: src/gui/palette.cpp:102 src/net/ea/gui/guildtab.cpp:45
-msgid "Guild"
-msgstr "Guilda"
-
-#: src/gui/palette.cpp:103
-msgid "Server"
-msgstr "Server"
-
-#: src/gui/palette.cpp:104
-msgid "Logger"
-msgstr ""
-
-#: src/gui/palette.cpp:105
-msgid "Hyperlink"
-msgstr ""
-
-#: src/gui/palette.cpp:107
-msgid "Being"
-msgstr ""
-
-#: src/gui/palette.cpp:108
-msgid "Other Players' Names"
-msgstr "Jména ostatních hráčů"
-
-#: src/gui/palette.cpp:109
-msgid "Own Name"
-msgstr ""
-
-#: src/gui/palette.cpp:110
-msgid "GM Names"
-msgstr "Jména GM"
-
-#: src/gui/palette.cpp:111
-msgid "NPCs"
-msgstr ""
-
-#: src/gui/palette.cpp:112
-msgid "Monsters"
-msgstr "Monstra"
-
-#: src/gui/palette.cpp:114
-msgid "Unknown Item Type"
-msgstr ""
-
-#: src/gui/palette.cpp:115
-msgid "Generics"
-msgstr ""
-
-#: src/gui/palette.cpp:116
-msgid "Hats"
-msgstr "Klobouky"
-
-#: src/gui/palette.cpp:117
-msgid "Usables"
-msgstr ""
-
-#: src/gui/palette.cpp:118
-msgid "Shirts"
-msgstr ""
-
-#: src/gui/palette.cpp:119
-#, fuzzy
-msgid "One Handed Weapons"
-msgstr "Jednoruční zbraně"
-
-#: src/gui/palette.cpp:120
-msgid "Pants"
-msgstr "Kalhoty"
-
-#: src/gui/palette.cpp:121
-msgid "Shoes"
-msgstr "Boty"
-
-#: src/gui/palette.cpp:122
-#, fuzzy
-msgid "Two Handed Weapons"
-msgstr "Jednoruční zbraně"
-
-#: src/gui/palette.cpp:123
-msgid "Shields"
-msgstr "Štíty"
-
-#: src/gui/palette.cpp:124
-msgid "Rings"
-msgstr "Prsteny"
-
-#: src/gui/palette.cpp:125
-msgid "Necklaces"
-msgstr "Náhrdelníky"
-
-#: src/gui/palette.cpp:126
-msgid "Arms"
-msgstr ""
-
-#: src/gui/palette.cpp:127
-msgid "Ammo"
-msgstr "Munice"
-
-#: src/gui/palette.cpp:129
-msgid "Particle Effects"
-msgstr ""
-
-#: src/gui/palette.cpp:130
-msgid "Pickup Notification"
-msgstr ""
-
-#: src/gui/palette.cpp:131
-msgid "Exp Notification"
-msgstr ""
-
-#: src/gui/palette.cpp:133
-msgid "Player Hits Monster"
-msgstr ""
-
-#: src/gui/palette.cpp:135
-msgid "Monster Hits Player"
-msgstr ""
-
-#: src/gui/palette.cpp:136
-msgid "Critical Hit"
-msgstr "Kritický zásah"
-
-#: src/gui/palette.cpp:137
-msgid "Misses"
-msgstr ""
-
-#: src/gui/palette.cpp:139
-msgid "HP Bar"
-msgstr ""
-
-#: src/gui/palette.cpp:140
-msgid "3/4 HP Bar"
-msgstr ""
-
-#: src/gui/palette.cpp:141
-msgid "1/2 HP Bar"
-msgstr ""
-
-#: src/gui/palette.cpp:142
-msgid "1/4 HP Bar"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:84
+#: src/gui/popupmenu.cpp:83
 #, c-format
 msgid "Trade with %s..."
 msgstr ""
 
-#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:161
+#: src/gui/popupmenu.cpp:87 src/gui/popupmenu.cpp:158
 #, fuzzy, c-format
 msgid "Attack %s"
 msgstr "Útok %+d"
 
-#: src/gui/popupmenu.cpp:92
+#: src/gui/popupmenu.cpp:91
 #, fuzzy, c-format
 msgid "Whisper %s"
 msgstr "Šeptat"
 
-#: src/gui/popupmenu.cpp:101
+#: src/gui/popupmenu.cpp:100
 #, c-format
 msgid "Befriend %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:106
+#: src/gui/popupmenu.cpp:105
 #, c-format
 msgid "Disregard %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:109
+#: src/gui/popupmenu.cpp:108
 #, c-format
 msgid "Ignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:115 src/gui/popupmenu.cpp:124
+#: src/gui/popupmenu.cpp:114 src/gui/popupmenu.cpp:123
 #, c-format
 msgid "Unignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:118
+#: src/gui/popupmenu.cpp:117
 #, c-format
 msgid "Completely ignore %s"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:130
 #, c-format
-msgid "Follow %s"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:133
-#, c-format
 msgid "Invite %s to join your guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:137
+#: src/gui/popupmenu.cpp:134
 #, fuzzy, c-format
 msgid "Invite %s to join your party"
 msgstr "%s vás zve ke vstupu do své party."
 
-#: src/gui/popupmenu.cpp:144
+#: src/gui/popupmenu.cpp:141
 msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:153
+#: src/gui/popupmenu.cpp:150
 #, c-format
 msgid "Talk to %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:166
+#: src/gui/popupmenu.cpp:163
 #, fuzzy
 msgid "Kick monster"
 msgstr "Monstra"
 
-#: src/gui/popupmenu.cpp:174
+#: src/gui/popupmenu.cpp:171
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:191
+#: src/gui/popupmenu.cpp:188
 #, c-format
 msgid "Pick up %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:400
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:387
 msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:70
-msgid "Store"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:71
-msgid "Retrieve"
-msgstr ""
-
 #: src/gui/quitdialog.cpp:44
 msgid "Switch server"
 msgstr ""
@@ -1342,52 +1162,65 @@ msgstr "Heslo musí být kratší než %d znaků."
 msgid "Passwords do not match."
 msgstr "Hesla se neshodují."
 
-#: src/gui/serverdialog.cpp:134
+#: src/gui/serverdialog.cpp:197
 #, fuzzy
 msgid "Choose Your Server"
 msgstr "Vyberte si server"
 
-#: src/gui/serverdialog.cpp:141 src/gui/widgets/chattab.cpp:139
+#: src/gui/serverdialog.cpp:206 src/gui/widgets/chattab.cpp:142
 msgid "Server:"
 msgstr "Server:"
 
-#: src/gui/serverdialog.cpp:142
+#: src/gui/serverdialog.cpp:207
 msgid "Port:"
 msgstr "Port:"
 
-#: src/gui/serverdialog.cpp:143
+#: src/gui/serverdialog.cpp:208
 #, fuzzy
 msgid "Server type:"
 msgstr "Server:"
 
-#: src/gui/serverdialog.cpp:183
+#: src/gui/serverdialog.cpp:229
 #, fuzzy
 msgid "Connect"
 msgstr "Připojuji se..."
 
-#: src/gui/serverdialog.cpp:184
+#: src/gui/serverdialog.cpp:230
 #, fuzzy
 msgid "Custom Server"
 msgstr "Vlastní kurzor"
 
-#: src/gui/serverdialog.cpp:262
+#: src/gui/serverdialog.cpp:324
 msgid "Please type both the address and the port of a server."
 msgstr "Prosím zadejte adresu a port serveru."
 
-#: src/gui/serverdialog.cpp:411
+#: src/gui/serverdialog.cpp:441
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:417
+#: src/gui/serverdialog.cpp:447
 #, fuzzy
 msgid "Waiting for server..."
 msgstr "Čeká se na server"
 
-#: src/gui/serverdialog.cpp:421
+#: src/gui/serverdialog.cpp:451
 msgid "Preparing download"
 msgstr ""
 
+#: src/gui/serverdialog.cpp:455
+msgid "Error retreiving server list!"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:550
+msgid "requires a newer version"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:552
+#, c-format
+msgid "requires v%s"
+msgstr ""
+
 #: src/gui/setup_audio.cpp:42
 msgid "Sound"
 msgstr "Zvuk"
@@ -1421,54 +1254,54 @@ msgstr ""
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:44
+#: src/gui/setup_colors.cpp:46
 msgid "This is what the color looks like"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:49
+#: src/gui/setup_colors.cpp:51
 msgid "Colors"
 msgstr "Barvy"
 
-#: src/gui/setup_colors.cpp:70
+#: src/gui/setup_colors.cpp:72
 #, fuzzy
 msgid "Type:"
 msgstr "Typ: "
 
-#: src/gui/setup_colors.cpp:81 src/gui/setup_colors.cpp:433
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:331
 msgid "Static"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:84
-#: src/gui/setup_colors.cpp:434
+#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
+#: src/gui/setup_colors.cpp:332
 msgid "Pulse"
 msgstr "Puls"
 
-#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
+#: src/gui/setup_colors.cpp:333
 msgid "Rainbow"
 msgstr "Duha"
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
+#: src/gui/setup_colors.cpp:333
 msgid "Spectrum"
 msgstr "Spektrum"
 
-#: src/gui/setup_colors.cpp:92
+#: src/gui/setup_colors.cpp:94
 #, fuzzy
 msgid "Delay:"
 msgstr "Hrát"
 
-#: src/gui/setup_colors.cpp:107
+#: src/gui/setup_colors.cpp:109
 #, fuzzy
 msgid "Red:"
 msgstr "Červená: "
 
-#: src/gui/setup_colors.cpp:122
+#: src/gui/setup_colors.cpp:124
 #, fuzzy
 msgid "Green:"
 msgstr "Zelená: "
 
-#: src/gui/setup_colors.cpp:137
+#: src/gui/setup_colors.cpp:139
 msgid "Blue:"
 msgstr ""
 
@@ -1513,579 +1346,590 @@ msgid "Assign"
 msgstr ""
 
 #: src/gui/setup_keyboard.cpp:90
+msgid "Unassign"
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:94
 msgid "Default"
 msgstr "Výchozí"
 
-#: src/gui/setup_keyboard.cpp:119
+#: src/gui/setup_keyboard.cpp:125
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_players.cpp:57
+#: src/gui/setup_players.cpp:58
 msgid "Name"
 msgstr "Jméno"
 
-#: src/gui/setup_players.cpp:58
+#: src/gui/setup_players.cpp:59
 msgid "Relation"
 msgstr ""
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:64
 msgid "Neutral"
 msgstr "Neutrální"
 
-#: src/gui/setup_players.cpp:64
+#: src/gui/setup_players.cpp:65
 msgid "Friend"
 msgstr ""
 
-#: src/gui/setup_players.cpp:65
+#: src/gui/setup_players.cpp:66
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_players.cpp:67
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_players.cpp:208 src/gui/setup_video.cpp:132
+#: src/gui/setup_players.cpp:206 src/gui/setup_video.cpp:153
 msgid "???"
 msgstr "???"
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_players.cpp:225
 msgid "Allow trading"
 msgstr "Povolit obchodování"
 
-#: src/gui/setup_players.cpp:228
+#: src/gui/setup_players.cpp:227
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:231
 msgid "Put all whispers in tabs"
 msgstr ""
 
-#: src/gui/setup_players.cpp:234
+#: src/gui/setup_players.cpp:233
 msgid "Show gender"
 msgstr ""
 
-#: src/gui/setup_players.cpp:236
+#: src/gui/setup_players.cpp:235
+msgid "Enable Chat log"
+msgstr ""
+
+#: src/gui/setup_players.cpp:237
 msgid "Players"
 msgstr "Hráči"
 
-#: src/gui/setup_players.cpp:261
+#: src/gui/setup_players.cpp:262
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:113
+#: src/gui/setup_video.cpp:134
 msgid "Tiny"
 msgstr ""
 
-#: src/gui/setup_video.cpp:114
+#: src/gui/setup_video.cpp:135
 msgid "Small"
 msgstr "Malý"
 
-#: src/gui/setup_video.cpp:115
+#: src/gui/setup_video.cpp:136
 msgid "Medium"
 msgstr "Střední"
 
-#: src/gui/setup_video.cpp:116
+#: src/gui/setup_video.cpp:137
 msgid "Large"
 msgstr "Velký"
 
-#: src/gui/setup_video.cpp:142
+#: src/gui/setup_video.cpp:163
 msgid "No text"
 msgstr "Bez textu"
 
-#: src/gui/setup_video.cpp:144
+#: src/gui/setup_video.cpp:164
+msgid "Text"
+msgstr "Text"
+
+#: src/gui/setup_video.cpp:165
 msgid "Bubbles, no names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:145
+#: src/gui/setup_video.cpp:166
 msgid "Bubbles with names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:157
+#: src/gui/setup_video.cpp:178
 msgid "off"
 msgstr "vypnout"
 
-#: src/gui/setup_video.cpp:158 src/gui/setup_video.cpp:171
+#: src/gui/setup_video.cpp:179 src/gui/setup_video.cpp:192
 msgid "low"
 msgstr "nízký"
 
-#: src/gui/setup_video.cpp:159 src/gui/setup_video.cpp:173
+#: src/gui/setup_video.cpp:180 src/gui/setup_video.cpp:194
 msgid "high"
 msgstr "vysoký"
 
-#: src/gui/setup_video.cpp:172
+#: src/gui/setup_video.cpp:193
 msgid "medium"
 msgstr "střední"
 
-#: src/gui/setup_video.cpp:174
+#: src/gui/setup_video.cpp:195
 msgid "max"
 msgstr "max"
 
-#: src/gui/setup_video.cpp:196
+#: src/gui/setup_video.cpp:217
 msgid "Full screen"
 msgstr "Celá obrazovka"
 
-#: src/gui/setup_video.cpp:197
+#: src/gui/setup_video.cpp:218
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:198
+#: src/gui/setup_video.cpp:219
 msgid "Custom cursor"
 msgstr "Vlastní kurzor"
 
-#: src/gui/setup_video.cpp:200
+#: src/gui/setup_video.cpp:221
 msgid "Visible names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:223
 msgid "Particle effects"
 msgstr ""
 
-#: src/gui/setup_video.cpp:204
+#: src/gui/setup_video.cpp:225
 msgid "Show own name"
 msgstr ""
 
-#: src/gui/setup_video.cpp:205
+#: src/gui/setup_video.cpp:226
+msgid "Log NPC dialogue"
+msgstr ""
+
+#: src/gui/setup_video.cpp:227
 msgid "Show pickup notification"
 msgstr ""
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:207
+#. TRANSLATORS: Refers to "Show pickup notification"
+#: src/gui/setup_video.cpp:229
 msgid "in chat"
 msgstr ""
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:209
+#. TRANSLATORS: Refers to "Show pickup notification"
+#: src/gui/setup_video.cpp:231
 msgid "as particle"
 msgstr ""
 
-#: src/gui/setup_video.cpp:214
+#: src/gui/setup_video.cpp:236
 msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:225
+#: src/gui/setup_video.cpp:247
+msgid "Disable transparency (Low CPU mode)"
+msgstr ""
+
+#: src/gui/setup_video.cpp:250
 msgid "Video"
 msgstr "Video"
 
-#: src/gui/setup_video.cpp:227
-msgid "Show monster damage"
+#: src/gui/setup_video.cpp:252
+msgid "Show damage"
 msgstr ""
 
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:258
 msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:259
 msgid "Gui opacity"
 msgstr ""
 
-#: src/gui/setup_video.cpp:235
+#: src/gui/setup_video.cpp:260
 msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_video.cpp:236
+#: src/gui/setup_video.cpp:261
 msgid "Particle detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237
+#: src/gui/setup_video.cpp:262
 msgid "Font size"
 msgstr "Velikost písma"
 
-#: src/gui/setup_video.cpp:251 src/gui/setup_video.cpp:454
-#: src/gui/setup_video.cpp:568
+#: src/gui/setup_video.cpp:277 src/gui/setup_video.cpp:532
+#: src/gui/setup_video.cpp:662
 #, fuzzy
 msgid "None"
 msgstr "Ne"
 
-#: src/gui/setup_video.cpp:381
+#: src/gui/setup_video.cpp:426
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:387
+#: src/gui/setup_video.cpp:432
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:398
+#: src/gui/setup_video.cpp:443
 #, fuzzy
 msgid "Switching to Full Screen"
 msgstr "Přepnout na celou obrazovku"
 
-#: src/gui/setup_video.cpp:399
+#: src/gui/setup_video.cpp:444
 msgid "Restart needed for changes to take effect."
 msgstr "Pro uplatnění změn je potřeba restart."
 
-#: src/gui/setup_video.cpp:411
+#: src/gui/setup_video.cpp:458
 #, fuzzy
 msgid "Changing to OpenGL"
 msgstr "Přepnout OpenGL"
 
-#: src/gui/setup_video.cpp:412
+#: src/gui/setup_video.cpp:459
+msgid ""
+"Applying change to OpenGL requires restart. In case OpenGL messes up your "
+"game graphics, restart the game with the command line option \"--no-opengl\"."
+msgstr ""
+
+#: src/gui/setup_video.cpp:466
+msgid "Deactivating OpenGL"
+msgstr ""
+
+#: src/gui/setup_video.cpp:467
 msgid "Applying change to OpenGL requires restart."
 msgstr "Změny v OpenGL vyžadují restart."
 
-#: src/gui/setup_video.cpp:486 src/gui/setup_video.cpp:491
+#: src/gui/setup_video.cpp:475
+msgid "Transparency disabled"
+msgstr ""
+
+#: src/gui/setup_video.cpp:476 src/gui/setup_video.cpp:484
+msgid "You must restart to apply changes."
+msgstr ""
+
+#: src/gui/setup_video.cpp:483
+msgid "Transparency enabled"
+msgstr ""
+
+#: src/gui/setup_video.cpp:576 src/gui/setup_video.cpp:581
 msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:487 src/gui/setup_video.cpp:492
+#: src/gui/setup_video.cpp:577 src/gui/setup_video.cpp:582
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:489
+#: src/gui/setup_video.cpp:579
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:522
+#: src/gui/setup_video.cpp:612
 msgid "Particle Effect Settings Changed."
 msgstr ""
 
-#: src/gui/setup_video.cpp:523
+#: src/gui/setup_video.cpp:613
 msgid "Changes will take effect on map change."
 msgstr "Změny se projeví až po změně mapy."
 
-#: src/gui/skilldialog.cpp:197 src/gui/windowmenu.cpp:58
+#: src/gui/skilldialog.cpp:212 src/gui/windowmenu.cpp:59
 msgid "Skills"
 msgstr "Dovednosti"
 
-#: src/gui/skilldialog.cpp:208
+#: src/gui/skilldialog.cpp:223
 msgid "Up"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:262
+#: src/gui/skilldialog.cpp:269
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:314
+#: src/gui/skilldialog.cpp:351
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:323
+#: src/gui/skilldialog.cpp:360
 #, fuzzy, c-format
 msgid "Skill %d"
 msgstr "Dovednosti"
 
-#: src/gui/skilldialog.cpp:405
+#: src/gui/skilldialog.cpp:442
 #, fuzzy, c-format
 msgid "Lvl: %d (%+d)"
 msgstr "Úroveň: %d"
 
-#: src/gui/skilldialog.cpp:416
+#: src/gui/skilldialog.cpp:453
 #, fuzzy, c-format
 msgid "Lvl: %d"
 msgstr "Úroveň: %d"
 
-#: src/gui/socialwindow.cpp:117
+#: src/gui/socialwindow.cpp:126
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:126
+#: src/gui/socialwindow.cpp:139
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:136
+#: src/gui/socialwindow.cpp:153
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:137
+#: src/gui/socialwindow.cpp:154
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:146
+#: src/gui/socialwindow.cpp:163
 #, fuzzy
 msgid "Leave Guild?"
 msgstr "Vytvořit guildu"
 
-#: src/gui/socialwindow.cpp:147
+#: src/gui/socialwindow.cpp:164
 #, fuzzy, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Opravdu chcete skončit?"
 
-#: src/gui/socialwindow.cpp:182
+#: src/gui/socialwindow.cpp:207 src/net/tmwa/partyhandler.cpp:330
 #, fuzzy, c-format
 msgid "Invited user %s to party."
 msgstr "/party >Pozvat uživatele do party"
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:218
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:199
+#: src/gui/socialwindow.cpp:232
 #, fuzzy
 msgid "Member Invite to Party"
 msgstr "/party >Pozvat uživatele do party"
 
-#: src/gui/socialwindow.cpp:200
+#: src/gui/socialwindow.cpp:233
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:209
+#: src/gui/socialwindow.cpp:242
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:210
+#: src/gui/socialwindow.cpp:243
 #, fuzzy, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Opravdu chcete skončit?"
 
-#: src/gui/socialwindow.cpp:239
+#: src/gui/socialwindow.cpp:272
 msgid "Create Guild"
 msgstr "Vytvořit guildu"
 
-#: src/gui/socialwindow.cpp:240 src/gui/socialwindow.cpp:564
+#: src/gui/socialwindow.cpp:273 src/gui/socialwindow.cpp:620
 #, fuzzy
 msgid "Create Party"
 msgstr "Vytvořit postavu"
 
-#: src/gui/socialwindow.cpp:279 src/gui/windowmenu.cpp:60
+#: src/gui/socialwindow.cpp:312 src/gui/windowmenu.cpp:64
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:297
+#: src/gui/socialwindow.cpp:330
 #, fuzzy
 msgid "Invite"
 msgstr "Pozvat uživatele"
 
-#: src/gui/socialwindow.cpp:298
+#: src/gui/socialwindow.cpp:331
 #, fuzzy
 msgid "Leave"
 msgstr "Velký"
 
-#: src/gui/socialwindow.cpp:394
+#: src/gui/socialwindow.cpp:443
 #, fuzzy, c-format
 msgid "Accepted party invite from %s."
 msgstr "Přijmout pozvání od %s."
 
-#: src/gui/socialwindow.cpp:400
+#: src/gui/socialwindow.cpp:449
 #, fuzzy, c-format
 msgid "Rejected party invite from %s."
 msgstr "Odmítnout pozvání od %s."
 
-#: src/gui/socialwindow.cpp:413
+#: src/gui/socialwindow.cpp:462
 #, fuzzy, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Přijmout pozvání od %s."
 
-#: src/gui/socialwindow.cpp:419
+#: src/gui/socialwindow.cpp:468
 #, fuzzy, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Odmítnout pozvání od %s."
 
-#: src/gui/socialwindow.cpp:463
+#: src/gui/socialwindow.cpp:497
+msgid "Creating guild failed, please choose a shorter name."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:504
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:477
+#: src/gui/socialwindow.cpp:520
+msgid "Creating party failed, please choose a shorter name."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:527
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:484
+#: src/gui/socialwindow.cpp:541
 #, fuzzy
 msgid "Guild Name"
 msgstr "Guilda"
 
-#: src/gui/socialwindow.cpp:485
+#: src/gui/socialwindow.cpp:542
 #, fuzzy
 msgid "Choose your guild's name."
 msgstr "Vyberte si server"
 
-#: src/gui/socialwindow.cpp:497
+#: src/gui/socialwindow.cpp:554
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:502
+#: src/gui/socialwindow.cpp:559
 #, fuzzy, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s vás zve ke vstupu do party: %s"
 
-#: src/gui/socialwindow.cpp:507
+#: src/gui/socialwindow.cpp:564
 #, fuzzy
 msgid "Accept Guild Invite"
 msgstr "Přijmout pozvání do party"
 
-#: src/gui/socialwindow.cpp:519
+#: src/gui/socialwindow.cpp:576
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:529
+#: src/gui/socialwindow.cpp:585
 #, fuzzy
 msgid "You have been invited you to join a party."
 msgstr "%s vás zve ke vstupu do své party."
 
-#: src/gui/socialwindow.cpp:533
+#: src/gui/socialwindow.cpp:589
 #, fuzzy, c-format
 msgid "You have been invited to join the %s party."
 msgstr "%s vás zve ke vstupu do party: %s"
 
-#: src/gui/socialwindow.cpp:541
+#: src/gui/socialwindow.cpp:597
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s vás zve ke vstupu do své party."
 
-#: src/gui/socialwindow.cpp:546
+#: src/gui/socialwindow.cpp:602
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s vás zve ke vstupu do party: %s"
 
-#: src/gui/socialwindow.cpp:554
+#: src/gui/socialwindow.cpp:610
 msgid "Accept Party Invite"
 msgstr "Přijmout pozvání do party"
 
-#: src/gui/socialwindow.cpp:565
+#: src/gui/socialwindow.cpp:621
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:570
+#: src/gui/socialwindow.cpp:626
 #, fuzzy
 msgid "Party Name"
 msgstr "Parta"
 
-#: src/gui/socialwindow.cpp:571
+#: src/gui/socialwindow.cpp:627
 #, fuzzy
 msgid "Choose your party's name."
 msgstr "Vyberte si server"
 
-#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:59
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:62
 msgid "Specials"
 msgstr ""
 
-#: src/gui/specialswindow.cpp:174
-#, c-format
-msgid "Specials Set %d"
-msgstr ""
-
-#: src/gui/specialswindow.cpp:191
-#, c-format
-msgid "Special %d"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:99 src/gui/statuswindow.cpp:247
+#: src/gui/statuswindow.cpp:113 src/gui/statuswindow.cpp:215
+#: src/gui/statuswindow.cpp:262
 #, c-format
 msgid "Level: %d"
 msgstr "Úroveň: %d"
 
-#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:211
+#: src/gui/statuswindow.cpp:114 src/gui/statuswindow.cpp:208
+#: src/gui/statuswindow.cpp:239
 #, c-format
 msgid "Money: %s"
 msgstr "Peníze: %s"
 
-#: src/gui/statuswindow.cpp:102
+#: src/gui/statuswindow.cpp:117
 msgid "HP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:107
+#: src/gui/statuswindow.cpp:122
 msgid "Exp:"
 msgstr "Exp:"
 
-#: src/gui/statuswindow.cpp:112
+#: src/gui/statuswindow.cpp:130
 msgid "MP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:132 src/gui/statuswindow.cpp:219
+#: src/gui/statuswindow.cpp:158 src/gui/statuswindow.cpp:275
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:133
+#: src/gui/statuswindow.cpp:159
 msgid "Job:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:194
-msgid "HP"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:200
-msgid "MP"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:206
-#, fuzzy
-msgid "Exp"
-msgstr "Exp:"
-
-#: src/gui/statuswindow.cpp:215
-#, fuzzy
-msgid "Money"
-msgstr "Peníze: %d"
-
-#: src/gui/statuswindow.cpp:225
-msgid "Job"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:229
+#: src/gui/statuswindow.cpp:211 src/gui/statuswindow.cpp:247
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:235
+#: src/gui/statuswindow.cpp:255
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:251
-#, fuzzy
-msgid "Level"
-msgstr "Úroveň: %d"
-
-#: src/gui/storagewindow.cpp:58
-msgid "Storage"
-msgstr ""
-
-#: src/gui/trade.cpp:52
+#: src/gui/trade.cpp:53
 msgid "Propose trade"
 msgstr "Nabídnout obchod"
 
-#: src/gui/trade.cpp:53
+#: src/gui/trade.cpp:54
 msgid "Confirmed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:55
 msgid "Agree trade"
 msgstr "Souhlasit s obchodem"
 
-#: src/gui/trade.cpp:55
+#: src/gui/trade.cpp:56
 msgid "Agreed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:58
+#: src/gui/trade.cpp:59
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/trade.cpp:74 src/gui/trade.cpp:75
+#: src/gui/trade.cpp:73 src/gui/trade.cpp:74
 msgid "Trade"
 msgstr "Obchod"
 
-#: src/gui/trade.cpp:77
+#: src/gui/trade.cpp:76
 msgid "Add"
 msgstr "Přidat"
 
-#: src/gui/trade.cpp:99 src/gui/trade.cpp:135
+#: src/gui/trade.cpp:98 src/gui/trade.cpp:134
 #, c-format
 msgid "You get %s"
 msgstr ""
 
-#: src/gui/trade.cpp:100
+#: src/gui/trade.cpp:99
 msgid "You give:"
 msgstr ""
 
-#: src/gui/trade.cpp:104
+#: src/gui/trade.cpp:103
 msgid "Change"
 msgstr "Změnit"
 
-#: src/gui/trade.cpp:275
+#: src/gui/trade.cpp:262
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/trade.cpp:318
+#: src/gui/trade.cpp:304
 msgid "You don't have enough money."
 msgstr "Nemáte dost peněz."
 
@@ -2106,21 +1950,21 @@ msgstr "Připojuji se..."
 msgid "Play"
 msgstr "Hrát"
 
-#: src/gui/updatewindow.cpp:405
+#: src/gui/updatewindow.cpp:417
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:407
+#: src/gui/updatewindow.cpp:419
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:409
+#: src/gui/updatewindow.cpp:421
 msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:501
+#: src/gui/updatewindow.cpp:515
 msgid "Completed"
 msgstr ""
 
@@ -2200,63 +2044,63 @@ msgstr ""
 msgid "Need a user to kick!"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:118
+#: src/gui/widgets/chattab.cpp:121
 msgid "Global announcement:"
 msgstr "Globální oznámení:"
 
-#: src/gui/widgets/chattab.cpp:124
+#: src/gui/widgets/chattab.cpp:127
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "Globální oznámení od %s:"
 
-#: src/gui/widgets/chattab.cpp:150
+#: src/gui/widgets/chattab.cpp:153
 #, c-format
 msgid "%s whispers: %s"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:51
+#: src/gui/widgets/whispertab.cpp:53
 msgid "Cannot send empty chat!"
 msgstr "Nelze poslat prázdný chat!"
 
-#: src/gui/widgets/whispertab.cpp:70
+#: src/gui/widgets/whispertab.cpp:72
 msgid "/ignore > Ignore the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:71
+#: src/gui/widgets/whispertab.cpp:73
 msgid "/unignore > Stop ignoring the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:72
+#: src/gui/widgets/whispertab.cpp:74
 msgid "/close > Close the whisper tab"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:82
+#: src/gui/widgets/whispertab.cpp:84
 msgid "Command: /close"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:83
+#: src/gui/widgets/whispertab.cpp:85
 msgid "This command closes the current whisper tab."
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:87
+#: src/gui/widgets/whispertab.cpp:89
 #, fuzzy
 msgid "Command: /ignore"
 msgstr "Příkaz: /record"
 
-#: src/gui/widgets/whispertab.cpp:88
+#: src/gui/widgets/whispertab.cpp:90
 #, fuzzy
 msgid "This command ignores the other player regardless of current relations."
 msgstr "Tento příkaz zobrazí počet hráčů, kteří jsou momentálně online."
 
-#: src/gui/widgets/whispertab.cpp:94
+#: src/gui/widgets/whispertab.cpp:96
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:55
+#: src/gui/windowmenu.cpp:54
 msgid "Status"
 msgstr "Stav"
 
-#: src/gui/windowmenu.cpp:61
+#: src/gui/windowmenu.cpp:65
 msgid "Shortcut"
 msgstr "Zkratka"
 
@@ -2275,1371 +2119,1472 @@ msgstr "Změnit"
 msgid "Choose World"
 msgstr "Vyberte si server"
 
-#: src/keyboardconfig.cpp:40
+#: src/keyboardconfig.cpp:39
 msgid "Move Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:41
+#: src/keyboardconfig.cpp:40
 msgid "Move Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:41
 msgid "Move Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:42
 msgid "Move Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:44 src/net/ea/generalhandler.cpp:223
+#: src/keyboardconfig.cpp:43 src/net/tmwa/generalhandler.cpp:237
 msgid "Attack"
 msgstr "Útok"
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:44
 msgid "Target & Attack"
 msgstr "Cíl & Útok"
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:45
 msgid "Smilie"
 msgstr "Smajlíky"
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:46
 msgid "Talk"
 msgstr ""
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:47
 msgid "Stop Attack"
 msgstr "Zastavit Útok"
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:48
 #, fuzzy
 msgid "Target Monster"
 msgstr "Monstra"
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboardconfig.cpp:49
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:50
 msgid "Target Player"
 msgstr ""
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:51
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:52
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:53
 msgid "Sit"
 msgstr "Sednout si"
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:54
 msgid "Screenshot"
 msgstr "Snímek obrazovky"
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:55
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:56
 msgid "Find Path to Mouse"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58 src/keyboardconfig.cpp:59
-#: src/keyboardconfig.cpp:60 src/keyboardconfig.cpp:61
-#: src/keyboardconfig.cpp:62 src/keyboardconfig.cpp:63
-#: src/keyboardconfig.cpp:64 src/keyboardconfig.cpp:65
-#: src/keyboardconfig.cpp:66 src/keyboardconfig.cpp:67
-#: src/keyboardconfig.cpp:68 src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:57 src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60
+#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62
+#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64
+#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68
 #, c-format
 msgid "Item Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:69
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:70
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:71
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:72
 msgid "Equipment Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:73
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:74
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:75
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:76
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:77
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:78
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:79
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:80
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:81
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:83
+#: src/keyboardconfig.cpp:82
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:83
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86
-#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88
-#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90
-#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92
-#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:84 src/keyboardconfig.cpp:85
+#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:87
+#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:89
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:91
+#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:93
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:95
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:96
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:97
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:98
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:99
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:100
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:101
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:103
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:105
+#: src/keyboardconfig.cpp:104
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:178
+#: src/keyboardconfig.cpp:183
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:913
+#: src/localplayer.cpp:985
 msgid "Unable to pick up item."
 msgstr ""
 
 #. TRANSLATORS: This sentence may be translated differently
 #. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:922
+#: src/localplayer.cpp:994
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/main.cpp:43
+#: src/main.cpp:42
 msgid "mana [options] [mana-file]"
 msgstr ""
 
+#: src/main.cpp:43
+msgid "[mana-file] : The mana file is an XML file (.mana)"
+msgstr ""
+
 #: src/main.cpp:44
+msgid "              used to set custom parameters"
+msgstr ""
+
+#: src/main.cpp:45
+msgid "              to the mana client."
+msgstr ""
+
+#: src/main.cpp:47
 msgid "Options:"
 msgstr "Nastavení:"
 
-#: src/main.cpp:45
+#: src/main.cpp:48
 msgid "  -v --version        : Display the version"
 msgstr ""
 
-#: src/main.cpp:46
+#: src/main.cpp:49
 #, fuzzy
 msgid "  -h --help           : Display this help"
 msgstr "/help > Zobrazit tuto nápovědu"
 
-#: src/main.cpp:47
+#: src/main.cpp:50
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
-#: src/main.cpp:48
+#: src/main.cpp:51
 msgid "  -U --username       : Login with this username"
 msgstr ""
 
-#: src/main.cpp:49
+#: src/main.cpp:52
 msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/main.cpp:50
+#: src/main.cpp:53
 msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/main.cpp:51
+#: src/main.cpp:54
 msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:52
+#: src/main.cpp:55
 msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/main.cpp:53
+#: src/main.cpp:56
 msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/main.cpp:54
+#: src/main.cpp:57
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:56
+#: src/main.cpp:59
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:57
+#: src/main.cpp:60
 msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:58
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
+#: src/main.cpp:61
+msgid "     --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/main.cpp:59
+#: src/main.cpp:62
+msgid "     --chat-log-dir   : Chat log dir to use"
+msgstr ""
+
+#: src/main.cpp:63
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/main.cpp:61
+#: src/main.cpp:65
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:63
+#: src/net/manaserv/beinghandler.cpp:303 src/net/tmwa/playerhandler.cpp:94
+msgid "You are dead."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:304 src/net/tmwa/playerhandler.cpp:95
+msgid "We regret to inform you that your character was killed in battle."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:306 src/net/tmwa/playerhandler.cpp:97
+msgid "You are not that alive anymore."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:307 src/net/tmwa/playerhandler.cpp:98
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:308 src/net/tmwa/playerhandler.cpp:99
+msgid "Game Over!"
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:309 src/net/tmwa/playerhandler.cpp:101
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:311 src/net/tmwa/playerhandler.cpp:103
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:313 src/net/tmwa/playerhandler.cpp:105
+msgid "I guess this did not run too well."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:107
+msgid "Do you want your possessions identified?"
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:109
+msgid "Sadly, no trace of you was ever found..."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:111
+msgid "Annihilated."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:113
+msgid "Looks like you got your head handed to you."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:115
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:323
+msgid "Press OK to respawn."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:324
+msgid "You Died"
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:138 src/net/manaserv/charhandler.cpp:209
+msgid "Not logged in."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:141
+msgid "No empty slot."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:144
+msgid "Invalid name."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:147
+msgid "Character's name already exists."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:150
+msgid "Invalid hairstyle."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:153
+msgid "Invalid hair color."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:156
+msgid "Invalid gender."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:159
+msgid "Character's stats are too high."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:162
+msgid "Character's stats are too low."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:165
+#, c-format
+msgid "At least one statis out of the permitted range: (%u - %u)."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:171 src/net/manaserv/loginhandler.cpp:96
+#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
+#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
+#: src/net/tmwa/loginhandler.cpp:95 src/net/tmwa/loginhandler.cpp:182
+#, fuzzy
+msgid "Unknown error."
+msgstr "Neznámý předmět"
+
+#: src/net/manaserv/charhandler.cpp:200 src/net/tmwa/charserverhandler.cpp:146
+msgid "Info"
+msgstr "Info"
+
+#: src/net/manaserv/charhandler.cpp:200
+msgid "Player deleted."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:212
+#, fuzzy
+msgid "Selection out of range."
+msgstr "Vyberte množství předmětů, se kterými budete obchodovat."
+
+#: src/net/manaserv/charhandler.cpp:215
+#, fuzzy, c-format
+msgid "Unknown error (%d)."
+msgstr "Neznámý příkaz."
+
+#: src/net/manaserv/charhandler.cpp:250
+msgid "No gameservers are available."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:187 src/net/manaserv/chathandler.cpp:313
+#: src/net/manaserv/guildhandler.cpp:260
+#, c-format
+msgid "Topic: %s"
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:274
+msgid "Players in this channel:"
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:208
+#, fuzzy
+msgid "Error joining channel."
+msgstr "Příkaz: /join <channel>"
+
+#: src/net/manaserv/chathandler.cpp:214
+msgid "Listing channels."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:226
+msgid "End of channel list."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:303
+#, c-format
+msgid "%s entered the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:308
+#, c-format
+msgid "%s left the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:324
+#, c-format
+msgid "%s has set mode %s on user %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:334
+#, c-format
+msgid "%s has kicked %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:339
+#, fuzzy
+msgid "Unknown channel event."
+msgstr "Neznámý příkaz."
+
+#: src/net/manaserv/guildhandler.cpp:82
+msgid "Guild created."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:87
+msgid "Error creating guild."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:97
+msgid "Invite sent."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:204
+msgid "Member was promoted successfully."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:209
+msgid "Failed to promote member."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:87
+msgid "Wrong magic_token."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
+msgid "Already logged in."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:93
+#, fuzzy
+msgid "Account banned."
+msgstr "Účet: %s"
+
+#: src/net/manaserv/loginhandler.cpp:118
+#, fuzzy
+msgid "New password incorrect."
+msgstr "Zadejte dvakrát nové heslo:"
+
+#: src/net/manaserv/loginhandler.cpp:121 src/net/tmwa/loginhandler.cpp:89
+msgid "Old password incorrect."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
+msgid "Account not connected. Please login first."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:149
+#, fuzzy
+msgid "New email address incorrect."
+msgstr "Zadejte dvakrát nový e-mail:"
+
+#: src/net/manaserv/loginhandler.cpp:152
+msgid "Old email address incorrect."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:158
+msgid "The new email address already exists."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:239
+msgid ""
+"Client registration is not allowed. Please contact server administration."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
+msgid "Client version is too old."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:266
+#, fuzzy
+msgid "Wrong username or password."
+msgstr "Chybné uživatelské jméno nebo heslo"
+
+#: src/net/manaserv/loginhandler.cpp:272
+#, fuzzy
+msgid "Account banned"
+msgstr "Účet: %s"
+
+#: src/net/manaserv/loginhandler.cpp:275
+msgid "Login attempt too soon after previous attempt."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:303
+#, fuzzy
+msgid "Wrong username, password or email address."
+msgstr "Chybné uživatelské jméno, heslo nebo e-mail"
+
+#: src/net/manaserv/loginhandler.cpp:306
+msgid "Username already exists."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:309
+msgid "Email address already exists."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:312
+msgid "You took too long with the captcha or your response was incorrect."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:87
+msgid "Joined party."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:105
+#, c-format
+msgid "%s joined the party."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:123
+#, fuzzy, c-format
+msgid "%s rejected your invite."
+msgstr "Odmítnout pozvání od %s."
+
+#: src/net/manaserv/tradehandler.cpp:95
+msgid "Accepting incoming trade requests."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:97
+msgid "Ignoring incoming trade requests."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:115 src/net/tmwa/tradehandler.cpp:109
+msgid "Request for Trade"
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:116 src/net/tmwa/tradehandler.cpp:110
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:134
+#, c-format
+msgid "Trading with %s"
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:148 src/net/tmwa/tradehandler.cpp:224
+msgid "Trade canceled."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:155 src/net/tmwa/tradehandler.cpp:231
+msgid "Trade completed."
+msgstr ""
+
+#: src/net/tmwa/adminhandler.cpp:64
 msgid "Kick failed!"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:65
+#: src/net/tmwa/adminhandler.cpp:66
 msgid "Kick succeeded!"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:110
+#: src/net/tmwa/buysellhandler.cpp:109
 msgid "Nothing to sell."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:117
+#: src/net/tmwa/buysellhandler.cpp:116
 msgid "Thanks for buying."
 msgstr "Děkuji za nákup."
 
-#: src/net/ea/buysellhandler.cpp:124
+#: src/net/tmwa/buysellhandler.cpp:123
 msgid "Unable to buy."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:130
+#: src/net/tmwa/buysellhandler.cpp:129
 msgid "Thanks for selling."
 msgstr "Děkuji za prodej."
 
-#: src/net/ea/buysellhandler.cpp:132
+#: src/net/tmwa/buysellhandler.cpp:131
 msgid "Unable to sell."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:103
-#, fuzzy
-msgid "Access denied."
-msgstr "Přístup zamítnut"
+#: src/net/tmwa/charserverhandler.cpp:103
+msgid "Access denied. Most likely, there are too many players on this server."
+msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:106
+#: src/net/tmwa/charserverhandler.cpp:107
 msgid "Cannot use this ID."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:109
-msgid "Unknown failure to select character."
-msgstr ""
+#: src/net/tmwa/charserverhandler.cpp:110
+#, fuzzy
+msgid "Unknown char-server failure."
+msgstr "Neznámý předmět"
 
-#: src/net/ea/charserverhandler.cpp:135
+#: src/net/tmwa/charserverhandler.cpp:134
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:147 src/net/manaserv/charhandler.cpp:187
-msgid "Info"
-msgstr "Info"
-
-#: src/net/ea/charserverhandler.cpp:147
+#: src/net/tmwa/charserverhandler.cpp:146
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:152
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Failed to delete character."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:237 src/net/manaserv/charhandler.cpp:263
+#: src/net/tmwa/charserverhandler.cpp:266
 msgid "Strength:"
 msgstr "Síla:"
 
-#: src/net/ea/charserverhandler.cpp:238 src/net/manaserv/charhandler.cpp:264
+#: src/net/tmwa/charserverhandler.cpp:267
 msgid "Agility:"
 msgstr "Hbitost:"
 
-#: src/net/ea/charserverhandler.cpp:239 src/net/manaserv/charhandler.cpp:266
+#: src/net/tmwa/charserverhandler.cpp:268
 msgid "Vitality:"
 msgstr "Vitalita:"
 
-#: src/net/ea/charserverhandler.cpp:240 src/net/manaserv/charhandler.cpp:267
+#: src/net/tmwa/charserverhandler.cpp:269
 msgid "Intelligence:"
 msgstr "Inteligence:"
 
-#: src/net/ea/charserverhandler.cpp:241 src/net/manaserv/charhandler.cpp:265
+#: src/net/tmwa/charserverhandler.cpp:270
 msgid "Dexterity:"
 msgstr "Obratnost:"
 
-#: src/net/ea/charserverhandler.cpp:242
+#: src/net/tmwa/charserverhandler.cpp:271
 msgid "Luck:"
 msgstr "Štěstí:"
 
-#: src/net/ea/chathandler.cpp:80
-msgid "Whisper could not be sent, user is offline."
+#: src/net/tmwa/chathandler.cpp:87
+#, c-format
+msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:84
-msgid "Whisper could not be sent, ignored by user."
+#: src/net/tmwa/chathandler.cpp:96
+#, c-format
+msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:171
+#: src/net/tmwa/chathandler.cpp:230
 #, fuzzy
 msgid "MVP player."
 msgstr "Hráč"
 
-#: src/net/ea/chathandler.cpp:204 src/net/ea/chathandler.cpp:210
-#: src/net/ea/chathandler.cpp:215 src/net/ea/chathandler.cpp:220
-#: src/net/ea/chathandler.cpp:225 src/net/ea/chathandler.cpp:230
-#: src/net/ea/chathandler.cpp:235 src/net/ea/chathandler.cpp:240
+#: src/net/tmwa/chathandler.cpp:265 src/net/tmwa/chathandler.cpp:271
+#: src/net/tmwa/chathandler.cpp:276 src/net/tmwa/chathandler.cpp:281
+#: src/net/tmwa/chathandler.cpp:286 src/net/tmwa/chathandler.cpp:291
+#: src/net/tmwa/chathandler.cpp:296 src/net/tmwa/chathandler.cpp:301
 msgid "Channels are not supported!"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:86
+#: src/net/tmwa/gamehandler.cpp:88
 #, c-format
 msgid "Online users: %d"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:100
+#: src/net/tmwa/gamehandler.cpp:101
 #, fuzzy
 msgid "Game"
 msgstr "Jméno"
 
-#: src/net/ea/gamehandler.cpp:100
+#: src/net/tmwa/gamehandler.cpp:101
 msgid "Request to quit denied!"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:102 src/net/manaserv/generalhandler.cpp:95
+#: src/net/tmwa/generalhandler.cpp:102
 #, c-format
 msgid "Strength %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:103 src/net/manaserv/generalhandler.cpp:96
+#: src/net/tmwa/generalhandler.cpp:103
 #, c-format
 msgid "Agility %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:104 src/net/manaserv/generalhandler.cpp:98
+#: src/net/tmwa/generalhandler.cpp:104
 #, c-format
 msgid "Vitality %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:105 src/net/manaserv/generalhandler.cpp:99
+#: src/net/tmwa/generalhandler.cpp:105
 #, c-format
 msgid "Intelligence %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:106 src/net/manaserv/generalhandler.cpp:97
+#: src/net/tmwa/generalhandler.cpp:106
 #, c-format
 msgid "Dexterity %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:107
+#: src/net/tmwa/generalhandler.cpp:107
 #, c-format
 msgid "Luck %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:130
+#: src/net/tmwa/generalhandler.cpp:132
 msgid "Authentication failed."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:133
+#: src/net/tmwa/generalhandler.cpp:135
 msgid "No servers available."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:137
+#: src/net/tmwa/generalhandler.cpp:139
 msgid "Someone else is trying to use this account."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:140
+#: src/net/tmwa/generalhandler.cpp:142
 msgid "This account is already logged in."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:143
+#: src/net/tmwa/generalhandler.cpp:145
 msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:146
+#: src/net/tmwa/generalhandler.cpp:148
 msgid "Duplicated login."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:149
+#: src/net/tmwa/generalhandler.cpp:151
 msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:205
+#: src/net/tmwa/generalhandler.cpp:209
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:216 src/net/manaserv/generalhandler.cpp:166
+#: src/net/tmwa/generalhandler.cpp:230
 msgid "Strength"
 msgstr "Síla"
 
-#: src/net/ea/generalhandler.cpp:217 src/net/manaserv/generalhandler.cpp:167
+#: src/net/tmwa/generalhandler.cpp:231
 msgid "Agility"
 msgstr "Hbitost"
 
-#: src/net/ea/generalhandler.cpp:218 src/net/manaserv/generalhandler.cpp:169
+#: src/net/tmwa/generalhandler.cpp:232
 msgid "Vitality"
 msgstr "Vitalita"
 
-#: src/net/ea/generalhandler.cpp:219 src/net/manaserv/generalhandler.cpp:170
+#: src/net/tmwa/generalhandler.cpp:233
 msgid "Intelligence"
 msgstr "Inteligence"
 
-#: src/net/ea/generalhandler.cpp:220 src/net/manaserv/generalhandler.cpp:168
+#: src/net/tmwa/generalhandler.cpp:234
 msgid "Dexterity"
 msgstr "Obratnost"
 
-#: src/net/ea/generalhandler.cpp:221
+#: src/net/tmwa/generalhandler.cpp:235
 msgid "Luck"
 msgstr "Štěstí"
 
-#: src/net/ea/generalhandler.cpp:224
+#: src/net/tmwa/generalhandler.cpp:238
 #, fuzzy
 msgid "Defense"
 msgstr "Obrana:"
 
-#: src/net/ea/generalhandler.cpp:225
+#: src/net/tmwa/generalhandler.cpp:239
 #, fuzzy
 msgid "M.Attack"
 msgstr "M.Útok:"
 
-#: src/net/ea/generalhandler.cpp:226
+#: src/net/tmwa/generalhandler.cpp:240
 #, fuzzy
 msgid "M.Defense"
 msgstr "M.Obrana:"
 
-#: src/net/ea/generalhandler.cpp:227
+#: src/net/tmwa/generalhandler.cpp:241
 #, fuzzy, c-format
 msgid "% Accuracy"
 msgstr "% Přesnost:"
 
-#: src/net/ea/generalhandler.cpp:228
+#: src/net/tmwa/generalhandler.cpp:242
 #, fuzzy, c-format
 msgid "% Evade"
 msgstr "% Únik:"
 
-#: src/net/ea/generalhandler.cpp:229
+#: src/net/tmwa/generalhandler.cpp:243
 #, fuzzy, c-format
 msgid "% Critical"
 msgstr "Kritický zásah"
 
-#: src/net/ea/gui/guildtab.cpp:61 src/net/ea/gui/partytab.cpp:59
+#: src/net/tmwa/gui/guildtab.cpp:45
+msgid "Guild"
+msgstr "Guilda"
+
+#: src/net/tmwa/gui/guildtab.cpp:61 src/net/tmwa/gui/partytab.cpp:59
 msgid "/help > Display this help."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:62
+#: src/net/tmwa/gui/guildtab.cpp:62
 #, fuzzy
 msgid "/invite > Invite a player to your guild"
 msgstr "/party >Pozvat uživatele do party"
 
-#: src/net/ea/gui/guildtab.cpp:63
+#: src/net/tmwa/gui/guildtab.cpp:63
 msgid "/leave > Leave the guild you are in"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:64
+#: src/net/tmwa/gui/guildtab.cpp:64
 msgid "/kick > Kick some one from the guild you are in"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:73 src/net/ea/gui/partytab.cpp:73
+#: src/net/tmwa/gui/guildtab.cpp:73 src/net/tmwa/gui/partytab.cpp:73
 msgid "Command: /invite <nick>"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:74
+#: src/net/tmwa/gui/guildtab.cpp:74
 msgid "This command invites <nick> to the guild you're in."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:80 src/net/ea/gui/partytab.cpp:80
+#: src/net/tmwa/gui/guildtab.cpp:80 src/net/tmwa/gui/partytab.cpp:80
 msgid "Command: /leave"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:81
+#: src/net/tmwa/gui/guildtab.cpp:81
 #, fuzzy
 msgid "This command causes the player to leave the guild."
 msgstr "Tento příkaz odešle zprávu <message> uživateli <nick>."
 
-#: src/net/ea/gui/guildtab.cpp:89
+#: src/net/tmwa/gui/guildtab.cpp:89
 msgid "Guild name is missing."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:293
+#: src/net/tmwa/guildhandler.cpp:296
 msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:298
+#: src/net/tmwa/guildhandler.cpp:301
 msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:303
+#: src/net/tmwa/guildhandler.cpp:306
 msgid "User is now part of your guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:308
+#: src/net/tmwa/guildhandler.cpp:311
 msgid "Your guild is full."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:313
+#: src/net/tmwa/guildhandler.cpp:316
 msgid "Unknown guild invite response."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:390
+#: src/net/tmwa/guildhandler.cpp:393
 msgid "Guild creation isn't supported yet."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:60
+#: src/net/tmwa/gui/partytab.cpp:43
+msgid "Party"
+msgstr "Parta"
+
+#: src/net/tmwa/gui/partytab.cpp:60
 msgid "/invite > Invite a player to your party"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:61
+#: src/net/tmwa/gui/partytab.cpp:61
 msgid "/leave > Leave the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:62
+#: src/net/tmwa/gui/partytab.cpp:62
 msgid "/kick > Kick some one from the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:63
+#: src/net/tmwa/gui/partytab.cpp:63
 msgid "/item > Show/change party item sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:64
+#: src/net/tmwa/gui/partytab.cpp:64
 msgid "/exp > Show/change party experience sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:81
+#: src/net/tmwa/gui/partytab.cpp:81
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:85
+#: src/net/tmwa/gui/partytab.cpp:85
 msgid "Command: /item <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:86
+#: src/net/tmwa/gui/partytab.cpp:86
 msgid "This command changes the party's item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:87
+#: src/net/tmwa/gui/partytab.cpp:87
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:90
+#: src/net/tmwa/gui/partytab.cpp:90
 msgid "Command: /item"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/tmwa/gui/partytab.cpp:91
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/tmwa/gui/partytab.cpp:95
 msgid "Command: /exp <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:96
+#: src/net/tmwa/gui/partytab.cpp:96
 msgid "This command changes the party's experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/tmwa/gui/partytab.cpp:97
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:100
+#: src/net/tmwa/gui/partytab.cpp:100
 msgid "Command: /exp"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/tmwa/gui/partytab.cpp:101
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:132 src/net/ea/partyhandler.cpp:198
+#: src/net/tmwa/gui/partytab.cpp:132 src/net/tmwa/partyhandler.cpp:196
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:135 src/net/ea/partyhandler.cpp:204
+#: src/net/tmwa/gui/partytab.cpp:135 src/net/tmwa/partyhandler.cpp:202
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:138 src/net/ea/partyhandler.cpp:210
+#: src/net/tmwa/gui/partytab.cpp:138 src/net/tmwa/partyhandler.cpp:208
 msgid "Item sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:141
+#: src/net/tmwa/gui/partytab.cpp:141
 msgid "Item sharing unknown."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:167 src/net/ea/partyhandler.cpp:174
+#: src/net/tmwa/gui/partytab.cpp:167 src/net/tmwa/partyhandler.cpp:172
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:170 src/net/ea/partyhandler.cpp:180
+#: src/net/tmwa/gui/partytab.cpp:170 src/net/tmwa/partyhandler.cpp:178
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:173 src/net/ea/partyhandler.cpp:186
+#: src/net/tmwa/gui/partytab.cpp:173 src/net/tmwa/partyhandler.cpp:184
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:176
+#: src/net/tmwa/gui/partytab.cpp:176
 msgid "Experience sharing unknown."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:281
+#: src/net/tmwa/inventoryhandler.cpp:285
 msgid "Failed to use item."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:391
+#: src/net/tmwa/inventoryhandler.cpp:399
 msgid "Unable to equip."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:402
+#: src/net/tmwa/inventoryhandler.cpp:410
 msgid "Unable to unequip."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:79
+#: src/net/tmwa/loginhandler.cpp:86
 msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:82 src/net/manaserv/loginhandler.cpp:121
-msgid "Old password incorrect."
-msgstr ""
-
-#: src/net/ea/loginhandler.cpp:85
+#: src/net/tmwa/loginhandler.cpp:92
 msgid "New password too short."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:88 src/net/ea/loginhandler.cpp:175
-#: src/net/manaserv/charhandler.cpp:158 src/net/manaserv/loginhandler.cpp:96
-#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
-#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
-#, fuzzy
-msgid "Unknown error."
-msgstr "Neznámý předmět"
-
-#: src/net/ea/loginhandler.cpp:149
+#: src/net/tmwa/loginhandler.cpp:156
 #, fuzzy
 msgid "Unregistered ID."
 msgstr "Zrušit registraci"
 
-#: src/net/ea/loginhandler.cpp:152
+#: src/net/tmwa/loginhandler.cpp:159
 #, fuzzy
 msgid "Wrong password."
 msgstr "Špatné heslo"
 
-#: src/net/ea/loginhandler.cpp:155
+#: src/net/tmwa/loginhandler.cpp:162
 msgid "Account expired."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:158
+#: src/net/tmwa/loginhandler.cpp:165
 #, fuzzy
 msgid "Rejected from server."
 msgstr "Odmítnout pozvání od %s."
 
-#: src/net/ea/loginhandler.cpp:161
+#: src/net/tmwa/loginhandler.cpp:168
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:165
+#: src/net/tmwa/loginhandler.cpp:172
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:172
+#: src/net/tmwa/loginhandler.cpp:179
 msgid "This user name is already taken."
 msgstr ""
 
-#: src/net/ea/network.cpp:145
+#: src/net/tmwa/network.cpp:145
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/ea/network.cpp:345
+#: src/net/tmwa/network.cpp:345
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/ea/network.cpp:414
+#: src/net/tmwa/network.cpp:414
 msgid "Connection to server terminated. "
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:81
+#: src/net/tmwa/partyhandler.cpp:82
 msgid "Could not create party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:84
+#: src/net/tmwa/partyhandler.cpp:84
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:118
+#: src/net/tmwa/partyhandler.cpp:119
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:122
+#: src/net/tmwa/partyhandler.cpp:123
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:126
+#: src/net/tmwa/partyhandler.cpp:127
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:130
+#: src/net/tmwa/partyhandler.cpp:131
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:238
+#: src/net/tmwa/partyhandler.cpp:236
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:249
+#: src/net/tmwa/partyhandler.cpp:246
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:301
+#: src/net/tmwa/partyhandler.cpp:299
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:329
-msgid "Inviting like this isn't supported at the moment."
+#: src/net/tmwa/partyhandler.cpp:335
+#, c-format
+msgid "Inviting failed, because you can't see a player called %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:334
+#: src/net/tmwa/partyhandler.cpp:340
 msgid "You can only inivte when you are in a party!"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:365
+#: src/net/tmwa/partyhandler.cpp:368
 #, c-format
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:304
-msgid "You are dead."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:305
-msgid "We regret to inform you that your character was killed in battle."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:307
-msgid "You are not that alive anymore."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:308
-msgid "The cold hands of the grim reaper are grabbing for your soul."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:309
-msgid "Game Over!"
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:105
+#: src/net/tmwa/playerhandler.cpp:100
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:310
-msgid ""
-"No, kids. Your character did not really die. It... err... went to a better "
-"place."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:312
-msgid ""
-"Your plan of breaking your enemies weapon by bashing it with your throat "
-"failed."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:314
-msgid "I guess this did not run too well."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:315
-msgid "Do you want your possessions identified?"
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:316
-msgid "Sadly, no trace of you was ever found..."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:317
-msgid "Annihilated."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:318
-msgid "Looks like you got your head handed to you."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:120 src/net/manaserv/beinghandler.cpp:319
-msgid ""
-"You screwed up again, dump your body down the tubes and get you another one."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/tmwa/playerhandler.cpp:118
 msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/tmwa/playerhandler.cpp:119
 msgid "You are no more."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/tmwa/playerhandler.cpp:120
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/tmwa/playerhandler.cpp:121
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/tmwa/playerhandler.cpp:122
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/tmwa/playerhandler.cpp:123
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/tmwa/playerhandler.cpp:124
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:130
+#: src/net/tmwa/playerhandler.cpp:125
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:131
+#: src/net/tmwa/playerhandler.cpp:126
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/tmwa/playerhandler.cpp:127
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/tmwa/playerhandler.cpp:128
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:135
+#: src/net/tmwa/playerhandler.cpp:130
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:136
+#: src/net/tmwa/playerhandler.cpp:131
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:249 src/net/ea/playerhandler.cpp:310
+#: src/net/tmwa/playerhandler.cpp:246 src/net/tmwa/playerhandler.cpp:285
 msgid "Message"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:250
+#: src/net/tmwa/playerhandler.cpp:247
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:333
+#: src/net/tmwa/playerhandler.cpp:313
 #, c-format
 msgid "You picked up %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:369
+#: src/net/tmwa/playerhandler.cpp:348
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:532
+#: src/net/tmwa/playerhandler.cpp:488
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:147
+#: src/net/tmwa/specialhandler.cpp:144
 msgid "Trade failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:150
+#: src/net/tmwa/specialhandler.cpp:147
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:153
+#: src/net/tmwa/specialhandler.cpp:150
 msgid "Sit failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:156
+#: src/net/tmwa/specialhandler.cpp:153
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:159
+#: src/net/tmwa/specialhandler.cpp:156
 msgid "Could not join party!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:162
+#: src/net/tmwa/specialhandler.cpp:159
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:171
+#: src/net/tmwa/specialhandler.cpp:168
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:174
+#: src/net/tmwa/specialhandler.cpp:171
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:177
+#: src/net/tmwa/specialhandler.cpp:174
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:180
+#: src/net/tmwa/specialhandler.cpp:177
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:183
+#: src/net/tmwa/specialhandler.cpp:180
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:186
+#: src/net/tmwa/specialhandler.cpp:183
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:189
+#: src/net/tmwa/specialhandler.cpp:186
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:192
+#: src/net/tmwa/specialhandler.cpp:189
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:195
+#: src/net/tmwa/specialhandler.cpp:192
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:198
+#: src/net/tmwa/specialhandler.cpp:195
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:201
+#: src/net/tmwa/specialhandler.cpp:198
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:210
+#: src/net/tmwa/specialhandler.cpp:207
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:213
+#: src/net/tmwa/specialhandler.cpp:210
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:216
+#: src/net/tmwa/specialhandler.cpp:213
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:116
-msgid "Request for Trade"
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:108 src/net/manaserv/tradehandler.cpp:117
-#, c-format
-msgid "%s wants to trade with you, do you accept?"
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:124
+#: src/net/tmwa/tradehandler.cpp:126
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:128
+#: src/net/tmwa/tradehandler.cpp:130
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:132
+#: src/net/tmwa/tradehandler.cpp:134
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:137
+#: src/net/tmwa/tradehandler.cpp:139
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:144
+#: src/net/tmwa/tradehandler.cpp:146
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:153
+#: src/net/tmwa/tradehandler.cpp:154
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:202
+#: src/net/tmwa/tradehandler.cpp:202
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:207
+#: src/net/tmwa/tradehandler.cpp:207
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:211
+#: src/net/tmwa/tradehandler.cpp:211
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:224 src/net/manaserv/tradehandler.cpp:149
-msgid "Trade canceled."
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:231 src/net/manaserv/tradehandler.cpp:156
-msgid "Trade completed."
-msgstr ""
-
-#: src/net/manaserv/beinghandler.cpp:324
-msgid "Press OK to respawn."
-msgstr ""
-
-#: src/net/manaserv/beinghandler.cpp:325
-msgid "You Died"
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:128 src/net/manaserv/charhandler.cpp:196
-msgid "Not logged in."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:131
-msgid "No empty slot."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:134
-msgid "Invalid name."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:137
-msgid "Character's name already exists."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:140
-msgid "Invalid hairstyle."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:143
-msgid "Invalid hair color."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:146
-msgid "Invalid gender."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:149
-msgid "Character's stats are too high."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:152
-msgid "Character's stats are too low."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:155
-msgid "One stat is zero."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:187
-msgid "Player deleted."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:199
-#, fuzzy
-msgid "Selection out of range."
-msgstr "Vyberte množství předmětů, se kterými budete obchodovat."
-
-#: src/net/manaserv/charhandler.cpp:202
-#, fuzzy, c-format
-msgid "Unknown error (%d)."
-msgstr "Neznámý příkaz."
-
-#: src/net/manaserv/charhandler.cpp:242
-msgid "No gameservers are available."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:268
-msgid "Willpower:"
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
-#: src/net/manaserv/guildhandler.cpp:259
-#, c-format
-msgid "Topic: %s"
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
-msgid "Players in this channel:"
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:201
-#, fuzzy
-msgid "Error joining channel."
-msgstr "Příkaz: /join <channel>"
-
-#: src/net/manaserv/chathandler.cpp:207
-msgid "Listing channels."
+#: src/playerrelations.cpp:310
+msgid "Completely ignore"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:219
-msgid "End of channel list."
+#: src/playerrelations.cpp:324
+msgid "Print '...'"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:291
-#, c-format
-msgid "%s entered the channel."
+#: src/playerrelations.cpp:340
+msgid "Blink name"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:296
+#: src/resources/itemdb.cpp:44
 #, c-format
-msgid "%s left the channel."
-msgstr ""
+msgid "Attack %+d"
+msgstr "Útok %+d"
 
-#: src/net/manaserv/chathandler.cpp:312
+#: src/resources/itemdb.cpp:45
 #, c-format
-msgid "%s has set mode %s on user %s."
-msgstr ""
+msgid "Defense %+d"
+msgstr "Obrana %+d"
 
-#: src/net/manaserv/chathandler.cpp:322
+#: src/resources/itemdb.cpp:46
 #, c-format
-msgid "%s has kicked %s."
+msgid "HP %+d"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:327
-#, fuzzy
-msgid "Unknown channel event."
-msgstr "Neznámý příkaz."
-
-#: src/net/manaserv/generalhandler.cpp:100
+#: src/resources/itemdb.cpp:47
 #, c-format
-msgid "Willpower %+d"
-msgstr ""
-
-#: src/net/manaserv/generalhandler.cpp:171
-#, fuzzy
-msgid "Willpower"
-msgstr "Šeptat"
-
-#: src/net/manaserv/guildhandler.cpp:81
-msgid "Guild created."
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:86
-msgid "Error creating guild."
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:96
-msgid "Invite sent."
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:203
-msgid "Member was promoted successfully."
+msgid "MP %+d"
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:208
-msgid "Failed to promote member."
-msgstr ""
+#: src/resources/itemdb.cpp:92
+msgid "Unknown item"
+msgstr "Neznámý předmět"
 
-#: src/net/manaserv/loginhandler.cpp:87
-msgid "Wrong magic_token."
+#: src/resources/itemdb.cpp:135 src/resources/monsterdb.cpp:77
+msgid "unnamed"
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
-msgid "Already logged in."
-msgstr ""
+#~ msgid "Background"
+#~ msgstr "Pozadí"
 
-#: src/net/manaserv/loginhandler.cpp:93 src/net/manaserv/loginhandler.cpp:272
-msgid "Server is full."
-msgstr ""
+#~ msgid "Highlight"
+#~ msgstr "Zvýraznit"
 
-#: src/net/manaserv/loginhandler.cpp:118
 #, fuzzy
-msgid "New password incorrect."
-msgstr "Zadejte dvakrát nové heslo:"
-
-#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
-msgid "Account not connected. Please login first."
-msgstr ""
+#~ msgid "Item Too Expensive"
+#~ msgstr "Předmět je příliš drahý"
 
-#: src/net/manaserv/loginhandler.cpp:149
 #, fuzzy
-msgid "New email address incorrect."
-msgstr "Zadejte dvakrát nový e-mail:"
+#~ msgid "Item Is Equipped"
+#~ msgstr "Předmět je ve vybavení"
 
-#: src/net/manaserv/loginhandler.cpp:152
-msgid "Old email address incorrect."
-msgstr ""
+#~ msgid "GM"
+#~ msgstr "GM"
 
-#: src/net/manaserv/loginhandler.cpp:158
-msgid "The new email address already exists."
-msgstr ""
+#~ msgid "Player"
+#~ msgstr "Hráč"
 
-#: src/net/manaserv/loginhandler.cpp:239
-msgid ""
-"Client registration is not allowed. Please contact server administration."
-msgstr ""
+#~ msgid "Whisper"
+#~ msgstr "Šeptat"
 
-#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
-msgid "Client version is too old."
-msgstr ""
+#~ msgid "Is"
+#~ msgstr "Je"
 
-#: src/net/manaserv/loginhandler.cpp:266
-#, fuzzy
-msgid "Wrong username or password."
-msgstr "Chybné uživatelské jméno nebo heslo"
+#~ msgid "Server"
+#~ msgstr "Server"
 
-#: src/net/manaserv/loginhandler.cpp:275
-msgid "Login attempt too soon after previous attempt."
-msgstr ""
+#~ msgid "Other Players' Names"
+#~ msgstr "Jména ostatních hráčů"
 
-#: src/net/manaserv/loginhandler.cpp:303
-#, fuzzy
-msgid "Wrong username, password or email address."
-msgstr "Chybné uživatelské jméno, heslo nebo e-mail"
+#~ msgid "GM Names"
+#~ msgstr "Jména GM"
 
-#: src/net/manaserv/loginhandler.cpp:306
-msgid "Username already exists."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:309
-msgid "Email address already exists."
-msgstr ""
+#~ msgid "Monsters"
+#~ msgstr "Monstra"
 
-#: src/net/manaserv/loginhandler.cpp:312
-msgid "You took too long with the captcha or your response was incorrect."
-msgstr ""
-
-#: src/net/manaserv/partyhandler.cpp:88
-msgid "Joined party."
-msgstr ""
-
-#: src/net/manaserv/partyhandler.cpp:106
-#, c-format
-msgid "%s joined the party."
-msgstr ""
+#~ msgid "Hats"
+#~ msgstr "Klobouky"
 
-#: src/net/manaserv/partyhandler.cpp:123
-#, fuzzy, c-format
-msgid "%s rejected your invite."
-msgstr "Odmítnout pozvání od %s."
-
-#: src/net/manaserv/tradehandler.cpp:96
-msgid "Accepting incoming trade requests."
-msgstr ""
+#, fuzzy
+#~ msgid "One Handed Weapons"
+#~ msgstr "Jednoruční zbraně"
 
-#: src/net/manaserv/tradehandler.cpp:98
-msgid "Ignoring incoming trade requests."
-msgstr ""
+#~ msgid "Pants"
+#~ msgstr "Kalhoty"
 
-#: src/net/manaserv/tradehandler.cpp:135
-#, c-format
-msgid "Trading with %s"
-msgstr ""
+#~ msgid "Shoes"
+#~ msgstr "Boty"
 
-#: src/playerrelations.cpp:304
-msgid "Completely ignore"
-msgstr ""
+#, fuzzy
+#~ msgid "Two Handed Weapons"
+#~ msgstr "Jednoruční zbraně"
 
-#: src/playerrelations.cpp:318
-msgid "Print '...'"
-msgstr ""
+#~ msgid "Shields"
+#~ msgstr "Štíty"
 
-#: src/playerrelations.cpp:334
-msgid "Blink name"
-msgstr ""
+#~ msgid "Rings"
+#~ msgstr "Prsteny"
 
-#: src/playerrelations.cpp:371
-msgid "Floating '...' bubble"
-msgstr ""
+#~ msgid "Necklaces"
+#~ msgstr "Náhrdelníky"
 
-#: src/playerrelations.cpp:374
-msgid "Floating bubble"
-msgstr ""
+#~ msgid "Ammo"
+#~ msgstr "Munice"
 
-#: src/resources/itemdb.cpp:52
-#, c-format
-msgid "Attack %+d"
-msgstr "Útok %+d"
+#~ msgid "Critical Hit"
+#~ msgstr "Kritický zásah"
 
-#: src/resources/itemdb.cpp:53
-#, c-format
-msgid "Defense %+d"
-msgstr "Obrana %+d"
+#, fuzzy
+#~ msgid "Exp"
+#~ msgstr "Exp:"
 
-#: src/resources/itemdb.cpp:54
-#, c-format
-msgid "HP %+d"
-msgstr ""
+#, fuzzy
+#~ msgid "Money"
+#~ msgstr "Peníze: %d"
 
-#: src/resources/itemdb.cpp:55
-#, c-format
-msgid "MP %+d"
-msgstr ""
+#, fuzzy
+#~ msgid "Level"
+#~ msgstr "Úroveň: %d"
 
-#: src/resources/itemdb.cpp:114
-msgid "Unknown item"
-msgstr "Neznámý předmět"
+#, fuzzy
+#~ msgid "Access denied."
+#~ msgstr "Přístup zamítnut"
 
-#: src/resources/itemdb.cpp:158 src/resources/monsterdb.cpp:45
-#: src/resources/monsterdb.cpp:67
-msgid "unnamed"
-msgstr ""
+#, fuzzy
+#~ msgid "Willpower"
+#~ msgstr "Šeptat"
 
 #~ msgid "no"
 #~ msgstr "ne"
diff --git a/po/da.po b/po/da.po
index 7427bab3..6b8b6e2f 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2010-03-16 22:27+0100\n"
+"POT-Creation-Date: 2010-12-13 20:04+0100\n"
 "PO-Revision-Date: 2009-07-25 17:33+0000\n"
 "Last-Translator: Niels L Ellegaard <niels.ellegaard@gmail.com>\n"
 "Language-Team: Danish <none@none.none>\n"
+"Language: da\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,318 +19,324 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/client.cpp:555 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
+#: src/client.cpp:598 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
 msgid "Setup"
 msgstr "Opsætning"
 
-#: src/client.cpp:625
+#: src/client.cpp:679
 #, fuzzy
 msgid "Connecting to server"
 msgstr "Opretter forbindelse til kort-serveren..."
 
-#: src/client.cpp:652
+#: src/client.cpp:706
 #, fuzzy
 msgid "Logging in"
 msgstr "Log Ind"
 
-#: src/client.cpp:685
+#: src/client.cpp:739
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:741
+#: src/client.cpp:804
 #, fuzzy
 msgid "Requesting characters"
 msgstr "Vælg Karakter"
 
-#: src/client.cpp:770
+#: src/client.cpp:833
 #, fuzzy
 msgid "Connecting to the game server"
 msgstr "Opretter forbindelse til kort-serveren..."
 
-#: src/client.cpp:801 src/client.cpp:808 src/client.cpp:942
+#: src/client.cpp:843
+#, fuzzy
+msgid "Changing game servers"
+msgstr "Server"
+
+#: src/client.cpp:872 src/client.cpp:879 src/client.cpp:1014
 #: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
 #: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
-#: src/gui/serverdialog.cpp:241 src/gui/unregisterdialog.cpp:133
-#: src/net/ea/charserverhandler.cpp:135 src/net/ea/charserverhandler.cpp:152
-#: src/net/manaserv/charhandler.cpp:161 src/net/manaserv/charhandler.cpp:204
+#: src/gui/serverdialog.cpp:323 src/gui/unregisterdialog.cpp:133
+#: src/net/manaserv/charhandler.cpp:174 src/net/manaserv/charhandler.cpp:217
+#: src/net/tmwa/charserverhandler.cpp:134
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Error"
 msgstr "Fejl"
 
-#: src/client.cpp:817
+#: src/client.cpp:888
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:844
+#: src/client.cpp:915
 #, fuzzy
 msgid "Password Change"
 msgstr "Adgangskode:"
 
-#: src/client.cpp:845
+#: src/client.cpp:916
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:864
+#: src/client.cpp:935
 #, fuzzy
 msgid "Email Change"
 msgstr "Ændre"
 
-#: src/client.cpp:865
+#: src/client.cpp:936
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:885
+#: src/client.cpp:956
 #, fuzzy
 msgid "Unregister Successful"
 msgstr "Frameld"
 
-#: src/client.cpp:886
+#: src/client.cpp:957
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1009 src/client.cpp:1032
+#: src/client.cpp:1138 src/client.cpp:1161
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1121
+#: src/client.cpp:1281
 #, fuzzy, c-format
 msgid "Invalid update host: %s"
 msgstr "Ugyldig opdaterings host: "
 
-#: src/client.cpp:1155 src/client.cpp:1161
+#: src/client.cpp:1315 src/client.cpp:1321
 msgid "Error creating updates directory!"
 msgstr "Fejl under oprettelsen af opdateringen mappen!"
 
-#: src/commandhandler.cpp:127 src/commandhandler.cpp:308
+#: src/commandhandler.cpp:131 src/commandhandler.cpp:317
 msgid "Unknown command."
 msgstr "Ukendt kommando"
 
-#: src/commandhandler.cpp:156
+#: src/commandhandler.cpp:160
 msgid "-- Help --"
 msgstr "--Hjælp--"
 
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:161
 msgid "/help > Display this help"
 msgstr "/help > Vis denne hjælpebesked"
 
-#: src/commandhandler.cpp:159
+#: src/commandhandler.cpp:163
 msgid "/where > Display map name"
 msgstr "/where > Vis dine koordinater på kortet"
 
-#: src/commandhandler.cpp:160
+#: src/commandhandler.cpp:164
 msgid "/who > Display number of online users"
 msgstr "/who > Vis antallet af spillere der er online"
 
-#: src/commandhandler.cpp:161
+#: src/commandhandler.cpp:165
 msgid "/me > Tell something about yourself"
 msgstr "/me > Vis en beskrivelse af dig"
 
-#: src/commandhandler.cpp:163
+#: src/commandhandler.cpp:167
 msgid "/clear > Clears this window"
 msgstr "/clear > Sletter text i chat-vinduet."
 
-#: src/commandhandler.cpp:165
+#: src/commandhandler.cpp:169
 msgid "/msg > Send a private message to a user"
 msgstr "/msg > Send en privat besked til en spiller"
 
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:170
 msgid "/whisper > Alias of msg"
 msgstr "/whisper > Samme som msg"
 
-#: src/commandhandler.cpp:167
+#: src/commandhandler.cpp:171
 msgid "/w > Alias of msg"
 msgstr "/w > Samme som msg"
 
-#: src/commandhandler.cpp:168
+#: src/commandhandler.cpp:172
 msgid "/query > Makes a tab for private messages with another user"
 msgstr "/query > Starter en privat samtale med en spiller"
 
-#: src/commandhandler.cpp:169
+#: src/commandhandler.cpp:174
 msgid "/q > Alias of query"
 msgstr "/q > Samme som query"
 
-#: src/commandhandler.cpp:171
+#: src/commandhandler.cpp:176
 msgid "/ignore > ignore a player"
 msgstr ""
 
-#: src/commandhandler.cpp:172
+#: src/commandhandler.cpp:177
 msgid "/unignore > stop ignoring a player"
 msgstr ""
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:179
 msgid "/list > Display all public channels"
 msgstr "/list > Vis alle offentlige chat-kanaler"
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:180
 msgid "/join > Join or create a channel"
 msgstr "/join > Deltag i en chat-kanal"
 
-#: src/commandhandler.cpp:177
+#: src/commandhandler.cpp:182
 #, fuzzy
 msgid "/createparty > Create a new party"
 msgstr "/create > Opret en ny gruppe"
 
-#: src/commandhandler.cpp:178
+#: src/commandhandler.cpp:183
 msgid "/party > Invite a user to party"
 msgstr "/party > Inviter en spiller til din gruppe"
 
-#: src/commandhandler.cpp:180
+#: src/commandhandler.cpp:185
 msgid "/record > Start recording the chat to an external file"
 msgstr "/record > Gem/ chat i en lokal fil"
 
-#: src/commandhandler.cpp:181
+#: src/commandhandler.cpp:187
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr "/toggle > Afgør om et tryk på retur-knappen skal aktivere chatvinduet."
 
-#: src/commandhandler.cpp:182
+#: src/commandhandler.cpp:189
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
 "/present > Vis en liste af alle spillere på serveren (Sendes til chat-loggen "
 "hvis den er slået til)"
 
-#: src/commandhandler.cpp:184
+#: src/commandhandler.cpp:192
 msgid "/announce > Global announcement (GM only)"
 msgstr "/announce > Send en besked til allle spillere (Kun for GM)"
 
-#: src/commandhandler.cpp:188
+#: src/commandhandler.cpp:196
 msgid "For more information, type /help <command>."
 msgstr "/help <kommando>   > Vis en detaljeret beskrivelse af <kommando>"
 
-#: src/commandhandler.cpp:192
+#: src/commandhandler.cpp:200
 msgid "Command: /help"
 msgstr "Kommando: /help"
 
-#: src/commandhandler.cpp:193
+#: src/commandhandler.cpp:201
 msgid "This command displays a list of all commands available."
 msgstr "Denne kommando viser en liste over alle tilgængelige kommandoer"
 
-#: src/commandhandler.cpp:194
+#: src/commandhandler.cpp:203
 msgid "Command: /help <command>"
 msgstr "Kommando: /help <kommando>"
 
-#: src/commandhandler.cpp:195
+#: src/commandhandler.cpp:204
 msgid "This command displays help on <command>."
 msgstr "Denne kommando viser hjælp for <kommando>"
 
-#: src/commandhandler.cpp:203
+#: src/commandhandler.cpp:212
 msgid "Command: /announce <msg>"
 msgstr "Kommando: /announce <besked>"
 
-#: src/commandhandler.cpp:204
+#: src/commandhandler.cpp:213
 msgid "*** only available to a GM ***"
 msgstr "*** kun tilgængelig for en GM ***"
 
-#: src/commandhandler.cpp:205
+#: src/commandhandler.cpp:214
 msgid "This command sends the message <msg> to all players currently online."
 msgstr "Denne kommando sender beskeden <besked> til alle brugere online."
 
-#: src/commandhandler.cpp:210
+#: src/commandhandler.cpp:219
 msgid "Command: /clear"
 msgstr "Kommando: /clear"
 
-#: src/commandhandler.cpp:211
+#: src/commandhandler.cpp:220
 msgid "This command clears the chat log of previous chat."
 msgstr "Denne kommando rydder chat loggen"
 
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:224
 #, fuzzy
 msgid "Command: /ignore <player>"
 msgstr "Kommand: /item <regel>"
 
-#: src/commandhandler.cpp:216
+#: src/commandhandler.cpp:225
 #, fuzzy
 msgid "This command ignores the given player regardless of current relations."
 msgstr ""
 "Denne kommando viser det antal af online brugere, der er online  lige nu."
 
-#: src/commandhandler.cpp:221
+#: src/commandhandler.cpp:230
 msgid "Command: /join <channel>"
 msgstr "Kommando: : /join <chat-kanal>"
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:231
 msgid "This command makes you enter <channel>."
 msgstr "Denne kommando tilmelder dig til <chat-kanal>"
 
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:232
 msgid "If <channel> doesn't exist, it's created."
 msgstr "Hvis <chat-kanal> ikke eksisterer, så bliver den oprettet."
 
-#: src/commandhandler.cpp:227
+#: src/commandhandler.cpp:236
 msgid "Command: /list"
 msgstr "Kommando: /list"
 
-#: src/commandhandler.cpp:228
+#: src/commandhandler.cpp:237
 msgid "This command shows a list of all channels."
 msgstr "Denne kommando viser en liste over alle chat-kanaler."
 
-#: src/commandhandler.cpp:232
+#: src/commandhandler.cpp:241
 msgid "Command: /me <message>"
 msgstr "Kommando: /me <besked>"
 
-#: src/commandhandler.cpp:233
+#: src/commandhandler.cpp:242
 msgid "This command tell others you are (doing) <msg>."
 msgstr "Denne kommando fortæller andre at du er (eller gør) <besked>"
 
-#: src/commandhandler.cpp:237
+#: src/commandhandler.cpp:246
 msgid "Command: /msg <nick> <message>"
 msgstr "Kommando: /msg <spiller> <besked>"
 
-#: src/commandhandler.cpp:238
+#: src/commandhandler.cpp:247
 msgid "Command: /whisper <nick> <message>"
 msgstr "Kommando: /whisper <spiller> <besked>"
 
-#: src/commandhandler.cpp:239
+#: src/commandhandler.cpp:248
 msgid "Command: /w <nick> <message>"
 msgstr "Kommando: /w <spiller> <besked>"
 
-#: src/commandhandler.cpp:240
+#: src/commandhandler.cpp:249
 msgid "This command sends the text <message> to <nick>."
 msgstr "Denne kommando sender <besked> til <spiller>"
 
-#: src/commandhandler.cpp:241 src/commandhandler.cpp:260
+#: src/commandhandler.cpp:250 src/commandhandler.cpp:269
 #: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
-#: src/net/ea/gui/guildtab.cpp:75 src/net/ea/gui/partytab.cpp:75
+#: src/net/tmwa/gui/guildtab.cpp:75 src/net/tmwa/gui/partytab.cpp:75
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 "Hvis <spilller>  (altså spillerens navn) indeholder mellemrum, så kan du "
 "sætter gåseøjne (\")."
 
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:255
 msgid "Command: /query <nick>"
 msgstr "Kommando: /query <spilller>"
 
-#: src/commandhandler.cpp:247
+#: src/commandhandler.cpp:256
 msgid "Command: /q <nick>"
 msgstr "Kommando: /q <spiller>"
 
-#: src/commandhandler.cpp:248
+#: src/commandhandler.cpp:257
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
 "Denne kommando opretter en ny tab med privat samtale mellem dig og <nick>."
 
-#: src/commandhandler.cpp:253
+#: src/commandhandler.cpp:262
 #, fuzzy
 msgid "Command: /createparty <name>"
 msgstr "Kommando: /create <gruppe>"
 
-#: src/commandhandler.cpp:254
+#: src/commandhandler.cpp:263
 #, fuzzy
 msgid "This command creates a new party called <name>."
 msgstr "Disse kommandoer opretter en gruppe ved navn <gruppe>"
 
-#: src/commandhandler.cpp:258
+#: src/commandhandler.cpp:267
 msgid "Command: /party <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:259 src/net/ea/gui/partytab.cpp:74
+#: src/commandhandler.cpp:268 src/net/tmwa/gui/partytab.cpp:74
 msgid "This command invites <nick> to party with you."
 msgstr "Denne kommando inviterer <spiller> til din gruppe."
 
-#: src/commandhandler.cpp:265
+#: src/commandhandler.cpp:274
 msgid "Command: /present"
 msgstr "Kommando: /present"
 
-#: src/commandhandler.cpp:266
+#: src/commandhandler.cpp:275
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
@@ -338,29 +345,29 @@ msgstr ""
 "lytteradius, og sender listen til enten record loggen, hvis du optager, "
 "ellers er det chat loggen."
 
-#: src/commandhandler.cpp:272
+#: src/commandhandler.cpp:281
 msgid "Command: /record <filename>"
 msgstr "Kommando: /record <filnamn>"
 
-#: src/commandhandler.cpp:273
+#: src/commandhandler.cpp:282
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr ""
 "Denne kommando starter med at \"optage\" chat-loggen. Den gemmer en kopi i "
 "<filnavn>"
 
-#: src/commandhandler.cpp:275
+#: src/commandhandler.cpp:284
 msgid "Command: /record"
 msgstr "Kommando: /record"
 
-#: src/commandhandler.cpp:276
+#: src/commandhandler.cpp:285
 msgid "This command finishes a recording session."
 msgstr "Denne kommando stopper med at optage chatten."
 
-#: src/commandhandler.cpp:280
+#: src/commandhandler.cpp:289
 msgid "Command: /toggle <state>"
 msgstr "Kommando /toggle <tilstand>"
 
-#: src/commandhandler.cpp:281
+#: src/commandhandler.cpp:290
 msgid ""
 "This command sets whether the return key should toggle the chat log, or "
 "whether the chat log turns off automatically."
@@ -368,117 +375,125 @@ msgstr ""
 "Denne kommando bestemmer om retur, skal bruges til at fokusere på chat "
 "loggen, ellerom chat om chat loggen, automatisk skal slå fra."
 
-#: src/commandhandler.cpp:283
+#: src/commandhandler.cpp:292
 msgid ""
-"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
-"\", \"no\", \"false\" to turn the toggle off."
+"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
+"\"0\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 "<tilstand> kan være en ud af \"1\", \"yes\", \"true\" for at slå fokusering "
 "af chat vindue til, eller \"0\", \"no\", \"false\" for at slå fokusering af "
 "chat vindue fra."
 
-#: src/commandhandler.cpp:286
+#: src/commandhandler.cpp:295
 msgid "Command: /toggle"
 msgstr "Kommando: /toggle"
 
-#: src/commandhandler.cpp:287
+#: src/commandhandler.cpp:296
 msgid "This command displays the return toggle status."
 msgstr "Denne kommando viser fokusering af chat vinduets status."
 
-#: src/commandhandler.cpp:291 src/gui/widgets/whispertab.cpp:93
+#: src/commandhandler.cpp:300 src/gui/widgets/whispertab.cpp:95
 #, fuzzy
 msgid "Command: /unignore <player>"
 msgstr "Kommand: /item <regel>"
 
-#: src/commandhandler.cpp:292
+#: src/commandhandler.cpp:301
 msgid "This command stops ignoring the given player if they are being ignored"
 msgstr ""
 
-#: src/commandhandler.cpp:297
+#: src/commandhandler.cpp:306
 msgid "Command: /where"
 msgstr "kommando: /where"
 
-#: src/commandhandler.cpp:298
+#: src/commandhandler.cpp:307
 msgid "This command displays the name of the current map."
 msgstr "Denne kommando viser det nuværende bane navn."
 
-#: src/commandhandler.cpp:302
+#: src/commandhandler.cpp:311
 msgid "Command: /who"
 msgstr "Kommando: /who"
 
-#: src/commandhandler.cpp:303
+#: src/commandhandler.cpp:312
 msgid "This command displays the number of players currently online."
 msgstr ""
 "Denne kommando viser det antal af online brugere, der er online  lige nu."
 
-#: src/commandhandler.cpp:309
+#: src/commandhandler.cpp:318
 msgid "Type /help for a list of commands."
 msgstr "Skriv /help for at få en liste med kommandoer"
 
-#: src/commandhandler.cpp:375
+#: src/commandhandler.cpp:384
 msgid "Cannot send empty whispers!"
 msgstr "du kan ikke sende en hviskebesked uden tekst!"
 
-#: src/commandhandler.cpp:383
+#: src/commandhandler.cpp:392
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:397
+#: src/commandhandler.cpp:406
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:410 src/net/ea/gui/partytab.cpp:109
+#: src/commandhandler.cpp:419 src/net/tmwa/gui/partytab.cpp:109
 msgid "Party name is missing."
 msgstr "Du glemte at skrive et navn på dit party."
 
-#: src/commandhandler.cpp:423 src/commandhandler.cpp:471
-#: src/commandhandler.cpp:493
+#: src/commandhandler.cpp:432 src/commandhandler.cpp:509
+#: src/commandhandler.cpp:531
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:441
+#: src/commandhandler.cpp:450
 msgid "Return toggles chat."
 msgstr "Retur bringer focus på chatten."
 
-#: src/commandhandler.cpp:441
+#: src/commandhandler.cpp:450
 msgid "Message closes chat."
 msgstr "Besked lukker chat."
 
-#: src/commandhandler.cpp:450
+#: src/commandhandler.cpp:459
 msgid "Return now toggles chat."
 msgstr "Enter bringer nu focus på chatten."
 
-#: src/commandhandler.cpp:454
+#: src/commandhandler.cpp:463
 msgid "Message now closes chat."
 msgstr "Besked lukker nu chat."
 
-#: src/commandhandler.cpp:477
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:489
+msgid "Show IP: On"
+msgstr ""
+
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:485
+msgid "Show IP: Off"
+msgstr ""
+
+#: src/commandhandler.cpp:515
 msgid "Player already ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:484
+#: src/commandhandler.cpp:522
 #, fuzzy
 msgid "Player successfully ignored!"
 msgstr "Du har nu oprettet gruppen."
 
-#: src/commandhandler.cpp:486
+#: src/commandhandler.cpp:524
 #, fuzzy
 msgid "Player could not be ignored!"
 msgstr "Beskeden blev ikke læst. Modtageren ignorerer den."
 
-#: src/commandhandler.cpp:501
+#: src/commandhandler.cpp:539
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:506
+#: src/commandhandler.cpp:544
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:508
+#: src/commandhandler.cpp:546
 #, fuzzy
 msgid "Player could not be unignored!"
 msgstr "Beskeden blev ikke læst. Modtageren ignorerer den."
@@ -492,43 +507,43 @@ msgstr ""
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:326
+#: src/game.cpp:342
 #, fuzzy
 msgid "Screenshot saved as "
 msgstr "Skærmbillede gemt under ~/"
 
-#: src/game.cpp:331
+#: src/game.cpp:347
 msgid "Saving screenshot failed!"
 msgstr "Gemningen af skærmbilledet fejlede!"
 
-#: src/game.cpp:355
+#: src/game.cpp:378
 #, fuzzy
 msgid "The connection to the server was lost."
 msgstr "Forbindelsen til serveren er tabt, programmet vil nu lukke"
 
-#: src/game.cpp:360
+#: src/game.cpp:382
 msgid "Network Error"
 msgstr "Netværksfejl"
 
-#: src/game.cpp:705
+#: src/game.cpp:721
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorerer indkomne handels anmodninger"
 
-#: src/game.cpp:712
+#: src/game.cpp:726
 msgid "Accepting incoming trade requests"
 msgstr "Accepterer indkomne handels anmodninger"
 
-#: src/game.cpp:946
+#: src/game.cpp:954
 #, fuzzy
 msgid "Could Not Load Map"
 msgstr "Kunne ikke loade kortet"
 
-#: src/game.cpp:947
+#: src/game.cpp:955
 #, c-format
 msgid "Error while loading %s"
 msgstr "Kunne ikke loade %s."
 
-#: src/gui/beingpopup.cpp:75
+#: src/gui/beingpopup.cpp:76
 #, fuzzy, c-format
 msgid "Party: %s"
 msgstr "Gruppe (%s)"
@@ -537,34 +552,34 @@ msgstr "Gruppe (%s)"
 msgid "Buy"
 msgstr "Køb"
 
-#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
-#: src/gui/sell.cpp:276
+#: src/gui/buy.cpp:69 src/gui/buy.cpp:261 src/gui/sell.cpp:71
+#: src/gui/sell.cpp:288
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Pris: %s / Total: %s"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:99 src/gui/npcdialog.cpp:100
-#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:404
+#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:112 src/gui/npcdialog.cpp:124
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:463
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:98 src/gui/npcdialog.cpp:101
-#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:416
+#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:111 src/gui/npcdialog.cpp:125
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:475
 msgid "-"
 msgstr ""
 
 #: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
-#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:152
-#: src/keyboardconfig.cpp:103
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:228
+#: src/keyboardconfig.cpp:102
 msgid "Quit"
 msgstr "Afslut"
 
-#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:333
-#: src/gui/statuswindow.cpp:403 src/gui/statuswindow.cpp:437
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:384
+#: src/gui/statuswindow.cpp:462 src/gui/statuswindow.cpp:496
 msgid "Max"
 msgstr "Maks"
 
@@ -578,11 +593,11 @@ msgstr "Sælg"
 
 #: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
 #: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
-#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:101
-#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:178
-#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:402
+#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:114
+#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:389
 #: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
-#: src/gui/socialwindow.cpp:243 src/gui/textdialog.cpp:39
+#: src/gui/socialwindow.cpp:275 src/gui/textdialog.cpp:40
 #: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr "Fortryd"
@@ -621,7 +636,7 @@ msgstr "Den nye  email-adresse eksisterer allerede."
 msgid "Change Password"
 msgstr "Skift adgangskode"
 
-#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:53
+#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:55
 #: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
 msgid "Password:"
 msgstr "Adgangskode:"
@@ -653,19 +668,19 @@ msgstr ""
 msgid "Create Character"
 msgstr "Lav en ny karakter."
 
-#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:52
+#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:54
 #: src/gui/register.cpp:67
 msgid "Name:"
 msgstr "Navn:"
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
 #: src/gui/outfitwindow.cpp:67
 msgid ">"
 msgstr ""
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
 #: src/gui/outfitwindow.cpp:66
@@ -682,8 +697,8 @@ msgstr "Hårfarve:"
 msgid "Hair style:"
 msgstr "Frisure:"
 
-#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:397
-#: src/gui/socialwindow.cpp:297
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:392
+#: src/gui/socialwindow.cpp:329
 msgid "Create"
 msgstr "Opret"
 
@@ -739,34 +754,34 @@ msgstr "Frameld"
 msgid "Change Email"
 msgstr "Skift e-mail adresse"
 
-#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:155
-#: src/gui/setup_players.cpp:230
+#: src/gui/charselectdialog.cpp:336 src/gui/serverdialog.cpp:231
+#: src/gui/setup_players.cpp:229
 msgid "Delete"
 msgstr "Slet"
 
-#: src/gui/charselectdialog.cpp:387
+#: src/gui/charselectdialog.cpp:380
 #, fuzzy
 msgid "Choose"
 msgstr "Luk"
 
-#: src/gui/charselectdialog.cpp:399 src/gui/charselectdialog.cpp:400
+#: src/gui/charselectdialog.cpp:394 src/gui/charselectdialog.cpp:395
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:77
+#: src/gui/chat.cpp:88
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chat.cpp:287
+#: src/gui/chat.cpp:311
 #, fuzzy, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Der er %d spillere til stede"
 
-#: src/gui/chat.cpp:305
+#: src/gui/chat.cpp:329
 msgid "Attendance written to record log."
 msgstr "Fremmøde skrives til loggen"
 
-#: src/gui/chat.cpp:469
+#: src/gui/chat.cpp:493
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Hvisker til %s: %s"
@@ -832,139 +847,170 @@ msgstr "Omgivende FX"
 msgid "Equipment"
 msgstr "Udstyr"
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:78
-#: src/gui/inventorywindow.cpp:80 src/gui/inventorywindow.cpp:291
-#: src/gui/popupmenu.cpp:372
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:89
+#: src/gui/inventorywindow.cpp:337 src/gui/popupmenu.cpp:359
 msgid "Unequip"
 msgstr "Tag af"
 
-#: src/gui/help.cpp:36
+#: src/gui/help.cpp:37
 msgid "Help"
 msgstr "Hjælp"
 
-#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:74
+#: src/gui/help.cpp:51 src/gui/npcdialog.cpp:50
 msgid "Close"
 msgstr "Luk"
 
-#: src/gui/inventorywindow.cpp:57 src/gui/windowmenu.cpp:56
+#: src/gui/inventorywindow.cpp:59 src/gui/windowmenu.cpp:56
 msgid "Inventory"
 msgstr "Inventarliste"
 
-#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:75
-#: src/gui/inventorywindow.cpp:293 src/gui/popupmenu.cpp:374
+#: src/gui/inventorywindow.cpp:59
+msgid "Storage"
+msgstr "Opbevaret"
+
+#: src/gui/inventorywindow.cpp:82
+msgid "Slots:"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:87 src/gui/inventorywindow.cpp:100
+#: src/gui/inventorywindow.cpp:339 src/gui/popupmenu.cpp:361
 msgid "Equip"
 msgstr "Tag på"
 
-#: src/gui/inventorywindow.cpp:74 src/gui/inventorywindow.cpp:75
-#: src/gui/inventorywindow.cpp:297 src/gui/popupmenu.cpp:377
+#: src/gui/inventorywindow.cpp:88
 msgid "Use"
 msgstr "Brug"
 
-#: src/gui/inventorywindow.cpp:84 src/gui/inventorywindow.cpp:301
-#: src/gui/popupmenu.cpp:380
+#: src/gui/inventorywindow.cpp:101 src/gui/popupmenu.cpp:364
+msgid "Activate"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:102 src/gui/inventorywindow.cpp:348
+#: src/gui/popupmenu.cpp:367
 #, fuzzy
 msgid "Drop..."
 msgstr "Smid"
 
-#: src/gui/inventorywindow.cpp:85 src/gui/popupmenu.cpp:386
+#: src/gui/inventorywindow.cpp:103 src/gui/popupmenu.cpp:373
 msgid "Split"
 msgstr "Opdel"
 
-#: src/gui/inventorywindow.cpp:86 src/gui/outfitwindow.cpp:51
+#: src/gui/inventorywindow.cpp:104 src/gui/outfitwindow.cpp:51
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:97 src/gui/storagewindow.cpp:84
-msgid "Slots:"
-msgstr ""
-
-#: src/gui/inventorywindow.cpp:98
+#: src/gui/inventorywindow.cpp:106
 msgid "Weight:"
 msgstr "Vægt:"
 
-#: src/gui/inventorywindow.cpp:303 src/gui/popupmenu.cpp:382
+#: src/gui/inventorywindow.cpp:124 src/gui/popupmenu.cpp:378
+msgid "Store"
+msgstr "Gem på lager"
+
+#: src/gui/inventorywindow.cpp:125 src/gui/popupmenu.cpp:385
+msgid "Retrieve"
+msgstr "Hent fra lager"
+
+#: src/gui/inventorywindow.cpp:350 src/gui/popupmenu.cpp:369
 msgid "Drop"
 msgstr "Smid"
 
-#: src/gui/itemamount.cpp:100 src/gui/okdialog.cpp:42
-#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:38 src/gui/trade.cpp:73
-#: src/gui/trade.cpp:75
+#: src/gui/itemamount.cpp:113 src/gui/okdialog.cpp:42
+#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:39 src/gui/trade.cpp:72
+#: src/gui/trade.cpp:74
 msgid "OK"
 msgstr "OK"
 
-#: src/gui/itemamount.cpp:102
+#: src/gui/itemamount.cpp:115
 msgid "All"
 msgstr "Alle"
 
-#: src/gui/itemamount.cpp:128
+#: src/gui/itemamount.cpp:141
 msgid "Select amount of items to trade."
 msgstr "Vælg hvor mange genstande du vil bytte."
 
-#: src/gui/itemamount.cpp:131
+#: src/gui/itemamount.cpp:144
 msgid "Select amount of items to drop."
 msgstr "Vælg hvor mange genstande du vil smide."
 
-#: src/gui/itemamount.cpp:134
+#: src/gui/itemamount.cpp:147
 msgid "Select amount of items to store."
 msgstr "Vælg hvor mange genstande du vil lagre"
 
-#: src/gui/itemamount.cpp:137
+#: src/gui/itemamount.cpp:150
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamount.cpp:140
+#: src/gui/itemamount.cpp:153
 msgid "Select amount of items to split."
 msgstr "Vælg hvor mange genstande du vil opdele."
 
-#: src/gui/itempopup.cpp:92
+#: src/gui/itempopup.cpp:137
 #, fuzzy, c-format
 msgid "Weight: %s"
 msgstr "Vægt: "
 
-#: src/gui/login.cpp:49 src/gui/login.cpp:61
+#: src/gui/login.cpp:51 src/gui/login.cpp:63
 msgid "Login"
 msgstr "Log Ind"
 
-#: src/gui/login.cpp:58
+#: src/gui/login.cpp:60
 #, fuzzy
 msgid "Remember username"
 msgstr "Husk Brugernavn"
 
-#: src/gui/login.cpp:59 src/gui/register.cpp:58 src/gui/register.cpp:73
+#: src/gui/login.cpp:61 src/gui/register.cpp:58 src/gui/register.cpp:73
 msgid "Register"
 msgstr "Registrer"
 
-#: src/gui/login.cpp:60
+#: src/gui/login.cpp:62
 #, fuzzy
 msgid "Change Server"
 msgstr "Server"
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
+#: src/gui/login.cpp:129
+#, fuzzy
+msgid "Registration disabled"
+msgstr "Fra nu af deler partyet ikke fundne ting."
+
+#: src/gui/login.cpp:129
+msgid "You need to use the website to register an account for this server."
+msgstr ""
+
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:86
 msgid "Map"
 msgstr "Kort"
 
-#: src/gui/npcdialog.cpp:44
+#: src/gui/ministatus.cpp:235
+msgid "Need"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:48
 msgid "Waiting for server"
 msgstr "Venter på serveren"
 
-#: src/gui/npcdialog.cpp:45
+#: src/gui/npcdialog.cpp:49
 msgid "Next"
 msgstr "Næste"
 
-#: src/gui/npcdialog.cpp:47
+#: src/gui/npcdialog.cpp:51
 msgid "Submit"
 msgstr "Send forespørgsel"
 
-#: src/gui/npcdialog.cpp:52 src/gui/npcpostdialog.cpp:41
+#: src/gui/npcdialog.cpp:73 src/gui/npcpostdialog.cpp:41
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:110
+#: src/gui/npcdialog.cpp:118
+msgid "Clear log"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:134
 msgid "Reset"
 msgstr "Nulstil"
 
 #. TRANSLATORS: Please leave the \n sequences intact.
-#: src/gui/npcdialog.cpp:171
+#: src/gui/npcdialog.cpp:208
 #, fuzzy
 msgid ""
 "\n"
@@ -979,7 +1025,7 @@ msgstr "Til:"
 msgid "Send"
 msgstr "Send"
 
-#: src/gui/npcpostdialog.cpp:96
+#: src/gui/npcpostdialog.cpp:99
 msgid "Failed to send as sender or letter invalid."
 msgstr "Kunne ikke sende brevet. Afsender eller brev er ugyldigt."
 
@@ -994,99 +1040,86 @@ msgstr ""
 msgid "Unequip first"
 msgstr "Tag af"
 
-#: src/gui/popupmenu.cpp:84
+#: src/gui/popupmenu.cpp:83
 #, fuzzy, c-format
 msgid "Trade with %s..."
 msgstr "Handler med %s"
 
-#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:161
+#: src/gui/popupmenu.cpp:87 src/gui/popupmenu.cpp:158
 #, fuzzy, c-format
 msgid "Attack %s"
 msgstr "Angreb %+d"
 
-#: src/gui/popupmenu.cpp:92
+#: src/gui/popupmenu.cpp:91
 #, fuzzy, c-format
 msgid "Whisper %s"
 msgstr "Hvisk"
 
-#: src/gui/popupmenu.cpp:101
+#: src/gui/popupmenu.cpp:100
 #, fuzzy, c-format
 msgid "Befriend %s"
 msgstr "@@friend|Bliv ven med %s@@"
 
-#: src/gui/popupmenu.cpp:106
+#: src/gui/popupmenu.cpp:105
 #, fuzzy, c-format
 msgid "Disregard %s"
 msgstr "Se bort fra"
 
-#: src/gui/popupmenu.cpp:109
+#: src/gui/popupmenu.cpp:108
 #, fuzzy, c-format
 msgid "Ignore %s"
 msgstr "Ignorer"
 
-#: src/gui/popupmenu.cpp:115 src/gui/popupmenu.cpp:124
+#: src/gui/popupmenu.cpp:114 src/gui/popupmenu.cpp:123
 #, c-format
 msgid "Unignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:118
+#: src/gui/popupmenu.cpp:117
 #, fuzzy, c-format
 msgid "Completely ignore %s"
 msgstr "@@ignore||Ignorer %s fuldstændigt@@"
 
 #: src/gui/popupmenu.cpp:130
-#, c-format
-msgid "Follow %s"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:133
 #, fuzzy, c-format
 msgid "Invite %s to join your guild"
 msgstr "@@guild|Inviter %s med i din guild@@"
 
-#: src/gui/popupmenu.cpp:137
+#: src/gui/popupmenu.cpp:134
 #, fuzzy, c-format
 msgid "Invite %s to join your party"
 msgstr "@@party|Inviter %s med i din gruppe@@"
 
-#: src/gui/popupmenu.cpp:144
+#: src/gui/popupmenu.cpp:141
 #, fuzzy
 msgid "Kick player"
 msgstr "Du kunne ikke sparke denne bruger af kanalen"
 
-#: src/gui/popupmenu.cpp:153
+#: src/gui/popupmenu.cpp:150
 #, fuzzy, c-format
 msgid "Talk to %s"
 msgstr "@@talk|Tal til %s@@"
 
-#: src/gui/popupmenu.cpp:166
+#: src/gui/popupmenu.cpp:163
 #, fuzzy
 msgid "Kick monster"
 msgstr "@@admin-kick|Spark monstret ud@@"
 
-#: src/gui/popupmenu.cpp:174
+#: src/gui/popupmenu.cpp:171
 #, fuzzy
 msgid "Add name to chat"
 msgstr "@@name|Tilføj navn til chat@@"
 
-#: src/gui/popupmenu.cpp:191
+#: src/gui/popupmenu.cpp:188
 #, fuzzy, c-format
 msgid "Pick up %s"
 msgstr "Saml op"
 
-#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:400
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:387
 #, fuzzy
 msgid "Add to chat"
 msgstr "@@chat|Tilføj til chat@@"
 
-#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:71
-msgid "Store"
-msgstr "Gem på lager"
-
-#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:72
-msgid "Retrieve"
-msgstr "Hent fra lager"
-
 #: src/gui/quitdialog.cpp:44
 msgid "Switch server"
 msgstr "Skift server"
@@ -1155,52 +1188,65 @@ msgstr "Adgangskoden skal være mindre end %d bogstaver langt."
 msgid "Passwords do not match."
 msgstr "De indtastede adgangskoder stemmer ikke overens."
 
-#: src/gui/serverdialog.cpp:124
+#: src/gui/serverdialog.cpp:197
 #, fuzzy
 msgid "Choose Your Server"
 msgstr "Vælg din server"
 
-#: src/gui/serverdialog.cpp:131 src/gui/widgets/chattab.cpp:139
+#: src/gui/serverdialog.cpp:206 src/gui/widgets/chattab.cpp:142
 msgid "Server:"
 msgstr "Server:"
 
-#: src/gui/serverdialog.cpp:132
+#: src/gui/serverdialog.cpp:207
 msgid "Port:"
 msgstr "Port:"
 
-#: src/gui/serverdialog.cpp:133
+#: src/gui/serverdialog.cpp:208
 #, fuzzy
 msgid "Server type:"
 msgstr "Server:"
 
-#: src/gui/serverdialog.cpp:153
+#: src/gui/serverdialog.cpp:229
 #, fuzzy
 msgid "Connect"
 msgstr "Opretter forbindelse..."
 
-#: src/gui/serverdialog.cpp:154
+#: src/gui/serverdialog.cpp:230
 #, fuzzy
 msgid "Custom Server"
 msgstr "Brugerdefineret cursor"
 
-#: src/gui/serverdialog.cpp:242
+#: src/gui/serverdialog.cpp:324
 msgid "Please type both the address and the port of a server."
 msgstr "Skriv både adressen og porten på serveren."
 
-#: src/gui/serverdialog.cpp:357
+#: src/gui/serverdialog.cpp:441
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:363
+#: src/gui/serverdialog.cpp:447
 #, fuzzy
 msgid "Waiting for server..."
 msgstr "Venter på serveren"
 
-#: src/gui/serverdialog.cpp:367
+#: src/gui/serverdialog.cpp:451
 msgid "Preparing download"
 msgstr ""
 
+#: src/gui/serverdialog.cpp:455
+msgid "Error retreiving server list!"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:550
+msgid "requires a newer version"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:552
+#, c-format
+msgid "requires v%s"
+msgstr ""
+
 #: src/gui/setup_audio.cpp:42
 msgid "Sound"
 msgstr "Lyd"
@@ -1234,54 +1280,54 @@ msgstr ""
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:45
+#: src/gui/setup_colors.cpp:46
 msgid "This is what the color looks like"
 msgstr "Sådan ser farven ud."
 
-#: src/gui/setup_colors.cpp:50
+#: src/gui/setup_colors.cpp:51
 msgid "Colors"
 msgstr "Farver"
 
-#: src/gui/setup_colors.cpp:71
+#: src/gui/setup_colors.cpp:72
 #, fuzzy
 msgid "Type:"
 msgstr "Type: "
 
-#: src/gui/setup_colors.cpp:82 src/gui/setup_colors.cpp:330
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:331
 msgid "Static"
 msgstr "Fastlåst"
 
-#: src/gui/setup_colors.cpp:84 src/gui/setup_colors.cpp:85
-#: src/gui/setup_colors.cpp:331
+#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
+#: src/gui/setup_colors.cpp:332
 msgid "Pulse"
 msgstr "Pulserende"
 
-#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:87
-#: src/gui/setup_colors.cpp:332
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
+#: src/gui/setup_colors.cpp:333
 msgid "Rainbow"
 msgstr "Regnbuefarvet"
 
-#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
-#: src/gui/setup_colors.cpp:332
+#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
+#: src/gui/setup_colors.cpp:333
 msgid "Spectrum"
 msgstr "Spektrum"
 
-#: src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:94
 #, fuzzy
 msgid "Delay:"
 msgstr "Forsinkelse: "
 
-#: src/gui/setup_colors.cpp:108
+#: src/gui/setup_colors.cpp:109
 #, fuzzy
 msgid "Red:"
 msgstr "Rød: "
 
-#: src/gui/setup_colors.cpp:123
+#: src/gui/setup_colors.cpp:124
 #, fuzzy
 msgid "Green:"
 msgstr "Grøn: "
 
-#: src/gui/setup_colors.cpp:138
+#: src/gui/setup_colors.cpp:139
 #, fuzzy
 msgid "Blue:"
 msgstr "Blå: "
@@ -1339,592 +1385,594 @@ msgstr "Standard"
 msgid "Key Conflict(s) Detected."
 msgstr "Tast Konfikt(er) Opdaget."
 
-#: src/gui/setup_players.cpp:57
+#: src/gui/setup_players.cpp:58
 msgid "Name"
 msgstr "Navn"
 
-#: src/gui/setup_players.cpp:58
+#: src/gui/setup_players.cpp:59
 msgid "Relation"
 msgstr "Relation"
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:64
 msgid "Neutral"
 msgstr "Neutral"
 
-#: src/gui/setup_players.cpp:64
+#: src/gui/setup_players.cpp:65
 msgid "Friend"
 msgstr "Ven"
 
-#: src/gui/setup_players.cpp:65
+#: src/gui/setup_players.cpp:66
 msgid "Disregarded"
 msgstr "Se bort fra"
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_players.cpp:67
 msgid "Ignored"
 msgstr "Ignorer"
 
-#: src/gui/setup_players.cpp:208 src/gui/setup_video.cpp:132
+#: src/gui/setup_players.cpp:206 src/gui/setup_video.cpp:153
 msgid "???"
 msgstr "???"
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_players.cpp:225
 msgid "Allow trading"
 msgstr "Tillad handel"
 
-#: src/gui/setup_players.cpp:228
+#: src/gui/setup_players.cpp:227
 msgid "Allow whispers"
 msgstr "Tillad hviskere"
 
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:231
 msgid "Put all whispers in tabs"
 msgstr "Placer alle hviskesamtaler i en tab"
 
-#: src/gui/setup_players.cpp:234
+#: src/gui/setup_players.cpp:233
 #, fuzzy
 msgid "Show gender"
 msgstr "Vis navn"
 
-#: src/gui/setup_players.cpp:236
+#: src/gui/setup_players.cpp:235
+#, fuzzy
+msgid "Enable Chat log"
+msgstr "Kunne ikke sælge."
+
+#: src/gui/setup_players.cpp:237
 msgid "Players"
 msgstr "Brugere"
 
-#: src/gui/setup_players.cpp:261
+#: src/gui/setup_players.cpp:262
 msgid "When ignoring:"
 msgstr "Når ignorer:"
 
-#: src/gui/setup_video.cpp:113
+#: src/gui/setup_video.cpp:134
 msgid "Tiny"
 msgstr "Meget lille"
 
-#: src/gui/setup_video.cpp:114
+#: src/gui/setup_video.cpp:135
 msgid "Small"
 msgstr "Lille"
 
-#: src/gui/setup_video.cpp:115
+#: src/gui/setup_video.cpp:136
 msgid "Medium"
 msgstr "Middel"
 
-#: src/gui/setup_video.cpp:116
+#: src/gui/setup_video.cpp:137
 msgid "Large"
 msgstr "Stor"
 
-#: src/gui/setup_video.cpp:142
+#: src/gui/setup_video.cpp:163
 msgid "No text"
 msgstr "Ingen tekst"
 
-#: src/gui/setup_video.cpp:143
+#: src/gui/setup_video.cpp:164
 msgid "Text"
 msgstr "Tekst"
 
-#: src/gui/setup_video.cpp:144
+#: src/gui/setup_video.cpp:165
 msgid "Bubbles, no names"
 msgstr "Bobler uden navne"
 
-#: src/gui/setup_video.cpp:145
+#: src/gui/setup_video.cpp:166
 msgid "Bubbles with names"
 msgstr "Bobler med navne"
 
-#: src/gui/setup_video.cpp:157
+#: src/gui/setup_video.cpp:178
 msgid "off"
 msgstr "deaktiveret"
 
-#: src/gui/setup_video.cpp:158 src/gui/setup_video.cpp:171
+#: src/gui/setup_video.cpp:179 src/gui/setup_video.cpp:192
 msgid "low"
 msgstr "lav"
 
-#: src/gui/setup_video.cpp:159 src/gui/setup_video.cpp:173
+#: src/gui/setup_video.cpp:180 src/gui/setup_video.cpp:194
 msgid "high"
 msgstr "høj"
 
-#: src/gui/setup_video.cpp:172
+#: src/gui/setup_video.cpp:193
 msgid "medium"
 msgstr "mellem"
 
-#: src/gui/setup_video.cpp:174
+#: src/gui/setup_video.cpp:195
 msgid "max"
 msgstr "maks"
 
-#: src/gui/setup_video.cpp:196
+#: src/gui/setup_video.cpp:217
 msgid "Full screen"
 msgstr "Fuld Skærm"
 
-#: src/gui/setup_video.cpp:197
+#: src/gui/setup_video.cpp:218
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:198
+#: src/gui/setup_video.cpp:219
 msgid "Custom cursor"
 msgstr "Brugerdefineret cursor"
 
-#: src/gui/setup_video.cpp:200
+#: src/gui/setup_video.cpp:221
 msgid "Visible names"
 msgstr "Synlige navne"
 
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:223
 msgid "Particle effects"
 msgstr "Partikeleffekter"
 
-#: src/gui/setup_video.cpp:204
+#: src/gui/setup_video.cpp:225
 #, fuzzy
 msgid "Show own name"
 msgstr "Vis navn"
 
-#: src/gui/setup_video.cpp:205
+#: src/gui/setup_video.cpp:226
+msgid "Log NPC dialogue"
+msgstr ""
+
+#: src/gui/setup_video.cpp:227
 msgid "Show pickup notification"
 msgstr "Vis besked når noget samles op"
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:207
+#. TRANSLATORS: Refers to "Show pickup notification"
+#: src/gui/setup_video.cpp:229
 msgid "in chat"
 msgstr "i chat"
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:209
+#. TRANSLATORS: Refers to "Show pickup notification"
+#: src/gui/setup_video.cpp:231
 msgid "as particle"
 msgstr "som partikeleffekt"
 
-#: src/gui/setup_video.cpp:214
+#: src/gui/setup_video.cpp:236
 #, fuzzy
 msgid "FPS limit:"
 msgstr "FPS-grænse:"
 
-#: src/gui/setup_video.cpp:225
+#: src/gui/setup_video.cpp:247
+msgid "Disable transparency (Low CPU mode)"
+msgstr ""
+
+#: src/gui/setup_video.cpp:250
 msgid "Video"
 msgstr "Video"
 
-#: src/gui/setup_video.cpp:227
+#: src/gui/setup_video.cpp:252
 #, fuzzy
-msgid "Show monster damage"
+msgid "Show damage"
 msgstr "Vis navn"
 
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:258
 msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:259
 msgid "Gui opacity"
 msgstr "Gennemsigtighed"
 
-#: src/gui/setup_video.cpp:235
+#: src/gui/setup_video.cpp:260
 msgid "Ambient FX"
 msgstr "Omgivende FX"
 
-#: src/gui/setup_video.cpp:236
+#: src/gui/setup_video.cpp:261
 #, fuzzy
 msgid "Particle detail"
 msgstr "Partikeldetaljer"
 
-#: src/gui/setup_video.cpp:237
+#: src/gui/setup_video.cpp:262
 msgid "Font size"
 msgstr "Skriftstørrelse"
 
-#: src/gui/setup_video.cpp:251 src/gui/setup_video.cpp:454
-#: src/gui/setup_video.cpp:568
+#: src/gui/setup_video.cpp:277 src/gui/setup_video.cpp:532
+#: src/gui/setup_video.cpp:662
 #, fuzzy
 msgid "None"
 msgstr "Nej"
 
-#: src/gui/setup_video.cpp:381
+#: src/gui/setup_video.cpp:426
 #, fuzzy
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr "opsætning og genoprettelse af gammel opsætning fejlede også!"
 
-#: src/gui/setup_video.cpp:387
+#: src/gui/setup_video.cpp:432
 #, fuzzy
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr "opsætning og genoprettelse af gammel opsætning fejlede også!"
 
-#: src/gui/setup_video.cpp:398
+#: src/gui/setup_video.cpp:443
 #, fuzzy
 msgid "Switching to Full Screen"
 msgstr "Skifter til fuld skærm"
 
-#: src/gui/setup_video.cpp:399
+#: src/gui/setup_video.cpp:444
 msgid "Restart needed for changes to take effect."
 msgstr "Ændringerne kræver at du genstarter klienten."
 
-#: src/gui/setup_video.cpp:411
+#: src/gui/setup_video.cpp:458
 #, fuzzy
 msgid "Changing to OpenGL"
 msgstr "Skrifter til OpenGL"
 
-#: src/gui/setup_video.cpp:412
+#: src/gui/setup_video.cpp:459
+msgid ""
+"Applying change to OpenGL requires restart. In case OpenGL messes up your "
+"game graphics, restart the game with the command line option \"--no-opengl\"."
+msgstr ""
+
+#: src/gui/setup_video.cpp:466
+msgid "Deactivating OpenGL"
+msgstr ""
+
+#: src/gui/setup_video.cpp:467
 msgid "Applying change to OpenGL requires restart."
 msgstr "Ændringerne til OpenGL kræver at du genstarter klienten."
 
-#: src/gui/setup_video.cpp:486 src/gui/setup_video.cpp:491
+#: src/gui/setup_video.cpp:475
+#, fuzzy
+msgid "Transparency disabled"
+msgstr "Fra nu af deler gruppen ikke experience points."
+
+#: src/gui/setup_video.cpp:476 src/gui/setup_video.cpp:484
+msgid "You must restart to apply changes."
+msgstr ""
+
+#: src/gui/setup_video.cpp:483
+msgid "Transparency enabled"
+msgstr ""
+
+#: src/gui/setup_video.cpp:576 src/gui/setup_video.cpp:581
 #, fuzzy
 msgid "Screen Resolution Changed"
 msgstr "Skærmopløsning ændret"
 
-#: src/gui/setup_video.cpp:487 src/gui/setup_video.cpp:492
+#: src/gui/setup_video.cpp:577 src/gui/setup_video.cpp:582
 msgid "Restart your client for the change to take effect."
 msgstr "Ændringerne kræver at du genstarter klienten."
 
-#: src/gui/setup_video.cpp:489
+#: src/gui/setup_video.cpp:579
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:522
+#: src/gui/setup_video.cpp:612
 #, fuzzy
 msgid "Particle Effect Settings Changed."
 msgstr "Ændrede Partikeleffekter."
 
-#: src/gui/setup_video.cpp:523
+#: src/gui/setup_video.cpp:613
 msgid "Changes will take effect on map change."
 msgstr "Ændringerne træder i kraft når du er går til et nyt kort."
 
-#: src/gui/skilldialog.cpp:198 src/gui/windowmenu.cpp:59
+#: src/gui/skilldialog.cpp:212 src/gui/windowmenu.cpp:59
 msgid "Skills"
 msgstr "Færdigheder"
 
-#: src/gui/skilldialog.cpp:209
+#: src/gui/skilldialog.cpp:223
 msgid "Up"
 msgstr "Op"
 
-#: src/gui/skilldialog.cpp:263
+#: src/gui/skilldialog.cpp:269
 #, fuzzy, c-format
 msgid "Skill points available: %d"
 msgstr "Færdigheds-points: %d"
 
-#: src/gui/skilldialog.cpp:315
+#: src/gui/skilldialog.cpp:351
 #, fuzzy, c-format
 msgid "Skill Set %d"
 msgstr "Færdigheds-points: %d"
 
-#: src/gui/skilldialog.cpp:324
+#: src/gui/skilldialog.cpp:360
 #, fuzzy, c-format
 msgid "Skill %d"
 msgstr "Færdigheder"
 
-#: src/gui/skilldialog.cpp:406
+#: src/gui/skilldialog.cpp:442
 #, fuzzy, c-format
 msgid "Lvl: %d (%+d)"
 msgstr "Niveau: %d"
 
-#: src/gui/skilldialog.cpp:417
+#: src/gui/skilldialog.cpp:453
 #, fuzzy, c-format
 msgid "Lvl: %d"
 msgstr "Niveau: %d"
 
-#: src/gui/socialwindow.cpp:118
+#: src/gui/socialwindow.cpp:126
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:127
+#: src/gui/socialwindow.cpp:139
 #, fuzzy, c-format
 msgid "Guild %s quit requested."
 msgstr "Oprettede en ny guild"
 
-#: src/gui/socialwindow.cpp:137
+#: src/gui/socialwindow.cpp:153
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:138
+#: src/gui/socialwindow.cpp:154
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:147
+#: src/gui/socialwindow.cpp:163
 #, fuzzy
 msgid "Leave Guild?"
 msgstr "Opret en guild"
 
-#: src/gui/socialwindow.cpp:148
+#: src/gui/socialwindow.cpp:164
 #, fuzzy, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "ER du sikker på at du vil afslutte programmet?"
 
-#: src/gui/socialwindow.cpp:183
+#: src/gui/socialwindow.cpp:207 src/net/tmwa/partyhandler.cpp:330
 #, fuzzy, c-format
 msgid "Invited user %s to party."
 msgstr "/party > Inviter en spiller til din gruppe"
 
-#: src/gui/socialwindow.cpp:190
+#: src/gui/socialwindow.cpp:218
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:200
+#: src/gui/socialwindow.cpp:232
 #, fuzzy
 msgid "Member Invite to Party"
 msgstr "/party > Inviter en spiller til din gruppe"
 
-#: src/gui/socialwindow.cpp:201
+#: src/gui/socialwindow.cpp:233
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:210
+#: src/gui/socialwindow.cpp:242
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:211
+#: src/gui/socialwindow.cpp:243
 #, fuzzy, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "ER du sikker på at du vil afslutte programmet?"
 
-#: src/gui/socialwindow.cpp:240
+#: src/gui/socialwindow.cpp:272
 msgid "Create Guild"
 msgstr "Opret en guild"
 
-#: src/gui/socialwindow.cpp:241 src/gui/socialwindow.cpp:565
+#: src/gui/socialwindow.cpp:273 src/gui/socialwindow.cpp:620
 #, fuzzy
 msgid "Create Party"
 msgstr "Lav en ny karakter."
 
-#: src/gui/socialwindow.cpp:280 src/gui/windowmenu.cpp:64
+#: src/gui/socialwindow.cpp:312 src/gui/windowmenu.cpp:64
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:298
+#: src/gui/socialwindow.cpp:330
 #, fuzzy
 msgid "Invite"
 msgstr "Inviter en spiller"
 
-#: src/gui/socialwindow.cpp:299
+#: src/gui/socialwindow.cpp:331
 #, fuzzy
 msgid "Leave"
 msgstr "Stor"
 
-#: src/gui/socialwindow.cpp:395
+#: src/gui/socialwindow.cpp:443
 #, fuzzy, c-format
 msgid "Accepted party invite from %s."
 msgstr "Du har accepteret en invitation fra %s."
 
-#: src/gui/socialwindow.cpp:401
+#: src/gui/socialwindow.cpp:449
 #, fuzzy, c-format
 msgid "Rejected party invite from %s."
 msgstr "Du har ignoreret en invitation fra %s."
 
-#: src/gui/socialwindow.cpp:414
+#: src/gui/socialwindow.cpp:462
 #, fuzzy, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Du har accepteret en invitation fra %s."
 
-#: src/gui/socialwindow.cpp:420
+#: src/gui/socialwindow.cpp:468
 #, fuzzy, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Du har ignoreret en invitation fra %s."
 
-#: src/gui/socialwindow.cpp:464
+#: src/gui/socialwindow.cpp:497
+msgid "Creating guild failed, please choose a shorter name."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:504
 #, fuzzy, c-format
 msgid "Creating guild called %s."
 msgstr "Der opstod en fejl. Guilden kunne ikke oprettes"
 
-#: src/gui/socialwindow.cpp:478
+#: src/gui/socialwindow.cpp:520
+msgid "Creating party failed, please choose a shorter name."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:527
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:485
+#: src/gui/socialwindow.cpp:541
 #, fuzzy
 msgid "Guild Name"
 msgstr "Opret en guild"
 
-#: src/gui/socialwindow.cpp:486
+#: src/gui/socialwindow.cpp:542
 #, fuzzy
 msgid "Choose your guild's name."
 msgstr "Vælg din server"
 
-#: src/gui/socialwindow.cpp:498
+#: src/gui/socialwindow.cpp:554
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:503
+#: src/gui/socialwindow.cpp:559
 #, fuzzy, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s har inviteret med i %s's gruppe."
 
-#: src/gui/socialwindow.cpp:508
+#: src/gui/socialwindow.cpp:564
 #, fuzzy
 msgid "Accept Guild Invite"
 msgstr "Accepter invitationen"
 
-#: src/gui/socialwindow.cpp:520
+#: src/gui/socialwindow.cpp:576
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:530
+#: src/gui/socialwindow.cpp:585
 #, fuzzy
 msgid "You have been invited you to join a party."
 msgstr "%s har inviteret med i sin gruppe"
 
-#: src/gui/socialwindow.cpp:534
+#: src/gui/socialwindow.cpp:589
 #, fuzzy, c-format
 msgid "You have been invited to join the %s party."
 msgstr "%s har inviteret med i %s's gruppe."
 
-#: src/gui/socialwindow.cpp:542
+#: src/gui/socialwindow.cpp:597
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s har inviteret med i sin gruppe"
 
-#: src/gui/socialwindow.cpp:547
+#: src/gui/socialwindow.cpp:602
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s har inviteret med i %s's gruppe."
 
-#: src/gui/socialwindow.cpp:555
+#: src/gui/socialwindow.cpp:610
 msgid "Accept Party Invite"
 msgstr "Accepter invitationen"
 
-#: src/gui/socialwindow.cpp:566
+#: src/gui/socialwindow.cpp:621
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:571
+#: src/gui/socialwindow.cpp:626
 #, fuzzy
 msgid "Party Name"
 msgstr "Gruppe"
 
-#: src/gui/socialwindow.cpp:572
+#: src/gui/socialwindow.cpp:627
 #, fuzzy
 msgid "Choose your party's name."
 msgstr "Vælg din server"
 
-#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:62
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:62
 msgid "Specials"
 msgstr ""
 
-#: src/gui/specialswindow.cpp:174
-#, c-format
-msgid "Specials Set %d"
-msgstr ""
-
-#: src/gui/specialswindow.cpp:191
-#, c-format
-msgid "Special %d"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:247
+#: src/gui/statuswindow.cpp:113 src/gui/statuswindow.cpp:215
+#: src/gui/statuswindow.cpp:262
 #, c-format
 msgid "Level: %d"
 msgstr "Niveau: %d"
 
-#: src/gui/statuswindow.cpp:101 src/gui/statuswindow.cpp:211
+#: src/gui/statuswindow.cpp:114 src/gui/statuswindow.cpp:208
+#: src/gui/statuswindow.cpp:239
 #, c-format
 msgid "Money: %s"
 msgstr "Penge: %s"
 
-#: src/gui/statuswindow.cpp:104
+#: src/gui/statuswindow.cpp:117
 msgid "HP:"
 msgstr "HP:"
 
-#: src/gui/statuswindow.cpp:109
+#: src/gui/statuswindow.cpp:122
 msgid "Exp:"
 msgstr "Exp:"
 
-#: src/gui/statuswindow.cpp:114
+#: src/gui/statuswindow.cpp:130
 msgid "MP:"
 msgstr "MP:"
 
-#: src/gui/statuswindow.cpp:132 src/gui/statuswindow.cpp:219
+#: src/gui/statuswindow.cpp:158 src/gui/statuswindow.cpp:275
 #, c-format
 msgid "Job: %d"
 msgstr ""
 "Copy text   \t\r\n"
 "Job: %d"
 
-#: src/gui/statuswindow.cpp:133
+#: src/gui/statuswindow.cpp:159
 msgid "Job:"
 msgstr "Job:"
 
-#: src/gui/statuswindow.cpp:194
-#, fuzzy
-msgid "HP"
-msgstr "HP:"
-
-#: src/gui/statuswindow.cpp:200
-#, fuzzy
-msgid "MP"
-msgstr "MP:"
-
-#: src/gui/statuswindow.cpp:206
-#, fuzzy
-msgid "Exp"
-msgstr "Exp:"
-
-#: src/gui/statuswindow.cpp:215
-#, fuzzy
-msgid "Money"
-msgstr "Penge: %d"
-
-#: src/gui/statuswindow.cpp:225
-#, fuzzy
-msgid "Job"
-msgstr "Job:"
-
-#: src/gui/statuswindow.cpp:229
+#: src/gui/statuswindow.cpp:211 src/gui/statuswindow.cpp:247
 #, fuzzy, c-format
 msgid "Character points: %d"
 msgstr "Du har brugt alle dine points"
 
-#: src/gui/statuswindow.cpp:235
+#: src/gui/statuswindow.cpp:255
 #, fuzzy, c-format
 msgid "Correction points: %d"
 msgstr "Færdigheds-points: %d"
 
-#: src/gui/statuswindow.cpp:251
-#, fuzzy
-msgid "Level"
-msgstr "Niveau: %d"
-
-#: src/gui/storagewindow.cpp:59
-msgid "Storage"
-msgstr "Opbevaret"
-
-#: src/gui/trade.cpp:52
+#: src/gui/trade.cpp:53
 msgid "Propose trade"
 msgstr "Foreslå handel"
 
-#: src/gui/trade.cpp:53
+#: src/gui/trade.cpp:54
 msgid "Confirmed. Waiting..."
 msgstr "Bekræftet. Venter..."
 
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:55
 msgid "Agree trade"
 msgstr "Accepter handel"
 
-#: src/gui/trade.cpp:55
+#: src/gui/trade.cpp:56
 msgid "Agreed. Waiting..."
 msgstr "Godkendt. Venter..."
 
-#: src/gui/trade.cpp:58
+#: src/gui/trade.cpp:59
 msgid "Trade: You"
 msgstr "Handel: Dig"
 
-#: src/gui/trade.cpp:74 src/gui/trade.cpp:75
+#: src/gui/trade.cpp:73 src/gui/trade.cpp:74
 msgid "Trade"
 msgstr "Handl"
 
-#: src/gui/trade.cpp:77
+#: src/gui/trade.cpp:76
 msgid "Add"
 msgstr "Tilføj"
 
-#: src/gui/trade.cpp:99 src/gui/trade.cpp:135
+#: src/gui/trade.cpp:98 src/gui/trade.cpp:134
 #, fuzzy, c-format
 msgid "You get %s"
 msgstr "Du får %s."
 
-#: src/gui/trade.cpp:100
+#: src/gui/trade.cpp:99
 msgid "You give:"
 msgstr "Du giver:"
 
-#: src/gui/trade.cpp:104
+#: src/gui/trade.cpp:103
 msgid "Change"
 msgstr "Ændre"
 
-#: src/gui/trade.cpp:275
+#: src/gui/trade.cpp:262
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Fejlede i at tilføje genstand. Du kan ikke overlappe en slags genstand på "
 "vinduet."
 
-#: src/gui/trade.cpp:318
+#: src/gui/trade.cpp:304
 msgid "You don't have enough money."
 msgstr "Du har ikke penge nok."
 
@@ -1945,22 +1993,22 @@ msgstr "Opretter forbindelse..."
 msgid "Play"
 msgstr "Spil"
 
-#: src/gui/updatewindow.cpp:405
+#: src/gui/updatewindow.cpp:417
 msgid "##1  The update process is incomplete."
 msgstr "##1  Opdateringsprocessen er ikke færdiggjort"
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:407
+#: src/gui/updatewindow.cpp:419
 msgid "##1  It is strongly recommended that"
 msgstr "##1  Det er varmt anbefalet at"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:409
+#: src/gui/updatewindow.cpp:421
 #, fuzzy
 msgid "##1  you try again later."
 msgstr "##1  du prøver igen senere"
 
-#: src/gui/updatewindow.cpp:501
+#: src/gui/updatewindow.cpp:515
 msgid "Completed"
 msgstr "Udført"
 
@@ -2043,56 +2091,56 @@ msgid "Need a user to kick!"
 msgstr ""
 "Du glemte at skrive navnet på den bruger der skal sparkes ud af kanalen"
 
-#: src/gui/widgets/chattab.cpp:118
+#: src/gui/widgets/chattab.cpp:121
 msgid "Global announcement:"
 msgstr "Besked til alle."
 
-#: src/gui/widgets/chattab.cpp:124
+#: src/gui/widgets/chattab.cpp:127
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "Besked fra %s til alle:"
 
-#: src/gui/widgets/chattab.cpp:150
+#: src/gui/widgets/chattab.cpp:153
 #, fuzzy, c-format
 msgid "%s whispers: %s"
 msgstr "%s hvisker: "
 
-#: src/gui/widgets/whispertab.cpp:51
+#: src/gui/widgets/whispertab.cpp:53
 msgid "Cannot send empty chat!"
 msgstr "Du kan ikke sende en tom chat-besked"
 
-#: src/gui/widgets/whispertab.cpp:70
+#: src/gui/widgets/whispertab.cpp:72
 msgid "/ignore > Ignore the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:71
+#: src/gui/widgets/whispertab.cpp:73
 msgid "/unignore > Stop ignoring the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:72
+#: src/gui/widgets/whispertab.cpp:74
 msgid "/close > Close the whisper tab"
 msgstr "/close > Lukker hviskesamtale-tabben"
 
-#: src/gui/widgets/whispertab.cpp:82
+#: src/gui/widgets/whispertab.cpp:84
 msgid "Command: /close"
 msgstr "Kommando: /close"
 
-#: src/gui/widgets/whispertab.cpp:83
+#: src/gui/widgets/whispertab.cpp:85
 msgid "This command closes the current whisper tab."
 msgstr "Denne kommando lukker den aktuelle hviskesamtale-tab"
 
-#: src/gui/widgets/whispertab.cpp:87
+#: src/gui/widgets/whispertab.cpp:89
 #, fuzzy
 msgid "Command: /ignore"
 msgstr "Kommando: /item"
 
-#: src/gui/widgets/whispertab.cpp:88
+#: src/gui/widgets/whispertab.cpp:90
 #, fuzzy
 msgid "This command ignores the other player regardless of current relations."
 msgstr ""
 "Denne kommando viser det antal af online brugere, der er online  lige nu."
 
-#: src/gui/widgets/whispertab.cpp:94
+#: src/gui/widgets/whispertab.cpp:96
 #, fuzzy
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
@@ -2122,645 +2170,1005 @@ msgstr "Ændre"
 msgid "Choose World"
 msgstr "Vælg din server"
 
-#: src/keyboardconfig.cpp:40
+#: src/keyboardconfig.cpp:39
 msgid "Move Up"
 msgstr "Flyt op"
 
-#: src/keyboardconfig.cpp:41
+#: src/keyboardconfig.cpp:40
 msgid "Move Down"
 msgstr "Flyt ned"
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:41
 msgid "Move Left"
 msgstr "Flyt til venstre"
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:42
 msgid "Move Right"
 msgstr "Flyt til højre"
 
-#: src/keyboardconfig.cpp:44 src/net/ea/generalhandler.cpp:223
+#: src/keyboardconfig.cpp:43 src/net/tmwa/generalhandler.cpp:237
 msgid "Attack"
 msgstr "Angrib"
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:44
 msgid "Target & Attack"
 msgstr "Vælg modstander og angrib"
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:45
 msgid "Smilie"
 msgstr "Smiley"
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:46
 msgid "Talk"
 msgstr "Snak"
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:47
 msgid "Stop Attack"
 msgstr "Stop angreb"
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:48
 #, fuzzy
 msgid "Target Monster"
 msgstr "Vælg nærmeste monster som ny modstander"
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboardconfig.cpp:49
 msgid "Target NPC"
 msgstr "Vælg NPC som ny modstander"
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:50
 msgid "Target Player"
 msgstr "Vælg spiller som ny modstander"
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:51
 msgid "Pickup"
 msgstr "Saml op"
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:52
 msgid "Hide Windows"
 msgstr "Gem vinduer"
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:53
 msgid "Sit"
 msgstr "Sid"
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:54
 msgid "Screenshot"
 msgstr "Gem skærmbillede som fil"
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:55
 msgid "Enable/Disable Trading"
 msgstr "Slå handler fra/til"
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:56
 msgid "Find Path to Mouse"
 msgstr "Gå hen hvor musen peger"
 
-#: src/keyboardconfig.cpp:58 src/keyboardconfig.cpp:59
-#: src/keyboardconfig.cpp:60 src/keyboardconfig.cpp:61
-#: src/keyboardconfig.cpp:62 src/keyboardconfig.cpp:63
-#: src/keyboardconfig.cpp:64 src/keyboardconfig.cpp:65
-#: src/keyboardconfig.cpp:66 src/keyboardconfig.cpp:67
-#: src/keyboardconfig.cpp:68 src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:57 src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60
+#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62
+#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64
+#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68
 #, c-format
 msgid "Item Shortcut %d"
 msgstr "Shortcut %d"
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:69
 msgid "Help Window"
 msgstr "Hjælpevindue"
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:70
 msgid "Status Window"
 msgstr "Statsvindue"
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:71
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:72
 msgid "Equipment Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:73
 msgid "Skill Window"
 msgstr "Færdigheds-vindue"
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:74
 msgid "Minimap Window"
 msgstr "Minikort"
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:75
 msgid "Chat Window"
 msgstr "Chat-vindue"
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:76
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:77
 msgid "Setup Window"
 msgstr "Opsætnings-vindue"
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:78
 msgid "Debug Window"
 msgstr "Debug-vindue"
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:79
 #, fuzzy
 msgid "Social Window"
 msgstr "Færdigheds-vindue"
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:80
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:81
 #, fuzzy
 msgid "Outfits Window"
 msgstr "Statsvindue"
 
-#: src/keyboardconfig.cpp:83
+#: src/keyboardconfig.cpp:82
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:83
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86
-#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88
-#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90
-#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92
-#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:84 src/keyboardconfig.cpp:85
+#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:87
+#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:89
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:91
+#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:93
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:95
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:96
 msgid "Toggle Chat"
 msgstr "Slå chat til eller fra"
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:97
 msgid "Scroll Chat Up"
 msgstr "Scroll chat op"
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:98
 msgid "Scroll Chat Down"
 msgstr "Scroll chat ned"
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:99
 msgid "Previous Chat Tab"
 msgstr "Gå til sidste chat tab"
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:100
 msgid "Next Chat Tab"
 msgstr "Gå til næste chat tab"
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:101
 msgid "Select OK"
 msgstr "Vælg OK"
 
-#: src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:103
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:105
+#: src/keyboardconfig.cpp:104
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:184
+#: src/keyboardconfig.cpp:183
 #, fuzzy, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr "Løs problemet, ellers kan spillet risikere at opfører sig ustabilt."
 
-#: src/localplayer.cpp:914
+#: src/localplayer.cpp:985
 msgid "Unable to pick up item."
 msgstr ""
 
 #. TRANSLATORS: This sentence may be translated differently
 #. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:923
+#: src/localplayer.cpp:994
 #, fuzzy, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "Du samlede %s [@@%d|%s@@] op."
 msgstr[1] "Du samlede %s [@@%d|%s@@] op."
 
-#: src/main.cpp:43
+#: src/main.cpp:42
 msgid "mana [options] [mana-file]"
 msgstr ""
 
+#: src/main.cpp:43
+msgid "[mana-file] : The mana file is an XML file (.mana)"
+msgstr ""
+
 #: src/main.cpp:44
+msgid "              used to set custom parameters"
+msgstr ""
+
+#: src/main.cpp:45
+msgid "              to the mana client."
+msgstr ""
+
+#: src/main.cpp:47
 msgid "Options:"
 msgstr "Indstillinger:"
 
-#: src/main.cpp:45
+#: src/main.cpp:48
 #, fuzzy
 msgid "  -v --version        : Display the version"
 msgstr "  -v --version : Vis versionsnummer"
 
-#: src/main.cpp:46
+#: src/main.cpp:49
 #, fuzzy
 msgid "  -h --help           : Display this help"
 msgstr "  -h --help : Vis denne hjælpebesked"
 
-#: src/main.cpp:47
+#: src/main.cpp:50
 #, fuzzy
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr "  -C --config-file : Ønsket konfigurationsfil"
 
-#: src/main.cpp:48
+#: src/main.cpp:51
 #, fuzzy
 msgid "  -U --username       : Login with this username"
 msgstr "  -U --username : Anvend dette brugernavn"
 
-#: src/main.cpp:49
+#: src/main.cpp:52
 #, fuzzy
 msgid "  -P --password       : Login with this password"
 msgstr "  -P --password : Anvend dette password"
 
-#: src/main.cpp:50
+#: src/main.cpp:53
 #, fuzzy
 msgid "  -c --character      : Login with this character"
 msgstr "  -c --character : Log på som denne karakter"
 
-#: src/main.cpp:51
+#: src/main.cpp:54
 #, fuzzy
 msgid "  -s --server         : Login server name or IP"
 msgstr "  -s --server : Login server navn or IP"
 
-#: src/main.cpp:52
+#: src/main.cpp:55
 #, fuzzy
 msgid "  -p --port           : Login server port"
 msgstr "  -p --port : Login server port"
 
-#: src/main.cpp:53
+#: src/main.cpp:56
 #, fuzzy
 msgid "     --update-host    : Use this update host"
 msgstr "  -u --skip-update : Undlad at hente updateringer"
 
-#: src/main.cpp:54
+#: src/main.cpp:57
 #, fuzzy
 msgid "  -D --default        : Choose default character server and character"
 msgstr "  -D --default : Vælg karakter-server og karakter"
 
-#: src/main.cpp:56
+#: src/main.cpp:59
 #, fuzzy
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr "  -u --skip-update : Undlad at hente updateringer"
 
-#: src/main.cpp:57
+#: src/main.cpp:60
 #, fuzzy
 msgid "  -d --data           : Directory to load game data from"
 msgstr "  -d --data : Directory med data til spillet"
 
-#: src/main.cpp:58
+#: src/main.cpp:61
 #, fuzzy
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
+msgid "     --localdata-dir  : Directory to use as local data directory"
 msgstr "  -S --home-dir : Directory der skal bruges som hjemmekatalog"
 
-#: src/main.cpp:59
+#: src/main.cpp:62
+#, fuzzy
+msgid "     --chat-log-dir   : Chat log dir to use"
+msgstr "  -C --config-file : Ønsket konfigurationsfil"
+
+#: src/main.cpp:63
 #, fuzzy
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr "  -S --home-dir : Directory der skal bruges som hjemmekatalog"
 
-#: src/main.cpp:61
+#: src/main.cpp:65
 #, fuzzy
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr "  -O --no-opengl : Start mana uden OpenGL"
 
-#: src/net/ea/adminhandler.cpp:63
+#: src/net/manaserv/beinghandler.cpp:303 src/net/tmwa/playerhandler.cpp:94
+msgid "You are dead."
+msgstr "Du er død."
+
+#: src/net/manaserv/beinghandler.cpp:304 src/net/tmwa/playerhandler.cpp:95
+msgid "We regret to inform you that your character was killed in battle."
+msgstr ""
+"Vi beklager at måtte informere dig, om at din karakter var dræbt i kamp."
+
+#: src/net/manaserv/beinghandler.cpp:306 src/net/tmwa/playerhandler.cpp:97
+msgid "You are not that alive anymore."
+msgstr "Du er ikke så levende som du engang har været."
+
+#: src/net/manaserv/beinghandler.cpp:307 src/net/tmwa/playerhandler.cpp:98
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr "Manden med leen griber ud efter din sjæl."
+
+#: src/net/manaserv/beinghandler.cpp:308 src/net/tmwa/playerhandler.cpp:99
+msgid "Game Over!"
+msgstr "Game Over!"
+
+#: src/net/manaserv/beinghandler.cpp:309 src/net/tmwa/playerhandler.cpp:101
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+"Nej, børn. Din karakter døde ikke rigtigt. Den.. err... tog til et bedre "
+"sted."
+
+#: src/net/manaserv/beinghandler.cpp:311 src/net/tmwa/playerhandler.cpp:103
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr "Din plan om at smadre fjendens våben, ved at benytte din hals fejlede."
+
+#: src/net/manaserv/beinghandler.cpp:313 src/net/tmwa/playerhandler.cpp:105
+msgid "I guess this did not run too well."
+msgstr "Jeg går ud fra at dette ikke gik alt for godt."
+
+#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:107
+msgid "Do you want your possessions identified?"
+msgstr "Du vil gerne have dine ejendele identificeret?"
+
+#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:109
+msgid "Sadly, no trace of you was ever found..."
+msgstr "Desværre, blev der aldrig fundet noget spor efter dig..."
+
+#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:111
+msgid "Annihilated."
+msgstr "Udslettet."
+
+#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:113
+msgid "Looks like you got your head handed to you."
+msgstr "Det ser ud til at du fik du hoved udleveret til dig."
+
+#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:115
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr "Du kvajede dig igen, smid din krop ned i kloakken og find dig en ny."
+
+#: src/net/manaserv/beinghandler.cpp:323
+#, fuzzy
+msgid "Press OK to respawn."
+msgstr " Tryk OK for at genopstå"
+
+#: src/net/manaserv/beinghandler.cpp:324
+#, fuzzy
+msgid "You Died"
+msgstr "Du er død"
+
+#: src/net/manaserv/charhandler.cpp:138 src/net/manaserv/charhandler.cpp:209
+#, fuzzy
+msgid "Not logged in."
+msgstr "Allerede logget ind"
+
+#: src/net/manaserv/charhandler.cpp:141
+msgid "No empty slot."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:144
+msgid "Invalid name."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:147
+#, fuzzy
+msgid "Character's name already exists."
+msgstr "Brugernavnet er allerede benyttet af en anden bruger."
+
+#: src/net/manaserv/charhandler.cpp:150
+msgid "Invalid hairstyle."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:153
+msgid "Invalid hair color."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:156
+msgid "Invalid gender."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:159
+#, fuzzy
+msgid "Character's stats are too high."
+msgstr "Du har brugt alle dine points"
+
+#: src/net/manaserv/charhandler.cpp:162
+#, fuzzy
+msgid "Character's stats are too low."
+msgstr "Du har brugt alle dine points"
+
+#: src/net/manaserv/charhandler.cpp:165
+#, c-format
+msgid "At least one statis out of the permitted range: (%u - %u)."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:171 src/net/manaserv/loginhandler.cpp:96
+#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
+#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
+#: src/net/tmwa/loginhandler.cpp:95 src/net/tmwa/loginhandler.cpp:182
+#, fuzzy
+msgid "Unknown error."
+msgstr "Ukendt fejl"
+
+#: src/net/manaserv/charhandler.cpp:200 src/net/tmwa/charserverhandler.cpp:146
+msgid "Info"
+msgstr "Info"
+
+#: src/net/manaserv/charhandler.cpp:200
+#, fuzzy
+msgid "Player deleted."
+msgstr "Karakteren er slettet"
+
+#: src/net/manaserv/charhandler.cpp:212
+#, fuzzy
+msgid "Selection out of range."
+msgstr "Vælg hvor mange genstande du vil bytte."
+
+#: src/net/manaserv/charhandler.cpp:215
+#, fuzzy, c-format
+msgid "Unknown error (%d)."
+msgstr "Ukendt fejl"
+
+#: src/net/manaserv/charhandler.cpp:250
+msgid "No gameservers are available."
+msgstr "Der er ingen tilgængelige spilservere."
+
+#: src/net/manaserv/chathandler.cpp:187 src/net/manaserv/chathandler.cpp:313
+#: src/net/manaserv/guildhandler.cpp:260
+#, c-format
+msgid "Topic: %s"
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:274
+#, fuzzy
+msgid "Players in this channel:"
+msgstr "Spiller rammer monster"
+
+#: src/net/manaserv/chathandler.cpp:208
+#, fuzzy
+msgid "Error joining channel."
+msgstr "Kommando: : /join <chat-kanal>"
+
+#: src/net/manaserv/chathandler.cpp:214
+msgid "Listing channels."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:226
+msgid "End of channel list."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:303
+#, fuzzy, c-format
+msgid "%s entered the channel."
+msgstr "%s blev medlem af gruppen."
+
+#: src/net/manaserv/chathandler.cpp:308
+#, c-format
+msgid "%s left the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:324
+#, c-format
+msgid "%s has set mode %s on user %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:334
+#, c-format
+msgid "%s has kicked %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:339
+#, fuzzy
+msgid "Unknown channel event."
+msgstr "Ukendt kommando"
+
+#: src/net/manaserv/guildhandler.cpp:82
+msgid "Guild created."
+msgstr "Oprettede en ny guild"
+
+#: src/net/manaserv/guildhandler.cpp:87
+msgid "Error creating guild."
+msgstr "Der opstod en fejl. Guilden kunne ikke oprettes"
+
+#: src/net/manaserv/guildhandler.cpp:97
+msgid "Invite sent."
+msgstr "Invitationen er afsendt."
+
+#: src/net/manaserv/guildhandler.cpp:204
+msgid "Member was promoted successfully."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:209
+msgid "Failed to promote member."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:87
+#, fuzzy
+msgid "Wrong magic_token."
+msgstr "Forkert magic_token"
+
+#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
+#, fuzzy
+msgid "Already logged in."
+msgstr "Allerede logget ind"
+
+#: src/net/manaserv/loginhandler.cpp:93
+#, fuzzy
+msgid "Account banned."
+msgstr "Kontoen er slettet"
+
+#: src/net/manaserv/loginhandler.cpp:118
+#, fuzzy
+msgid "New password incorrect."
+msgstr "De nye password stemmer ikke overens."
+
+#: src/net/manaserv/loginhandler.cpp:121 src/net/tmwa/loginhandler.cpp:89
+#, fuzzy
+msgid "Old password incorrect."
+msgstr "Det gamle password var ikke korrekt."
+
+#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
+msgid "Account not connected. Please login first."
+msgstr "Kontoen er ikke tilsluttet. Du skal først logge ind."
+
+#: src/net/manaserv/loginhandler.cpp:149
+#, fuzzy
+msgid "New email address incorrect."
+msgstr "Den nye email-adresse er ikke gyldig."
+
+#: src/net/manaserv/loginhandler.cpp:152
+#, fuzzy
+msgid "Old email address incorrect."
+msgstr "Den gamle email-adresse er ikke gyldig."
+
+#: src/net/manaserv/loginhandler.cpp:158
+#, fuzzy
+msgid "The new email address already exists."
+msgstr "Den nye  email-adresse eksisterer allerede."
+
+#: src/net/manaserv/loginhandler.cpp:239
+msgid ""
+"Client registration is not allowed. Please contact server administration."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
+#, fuzzy
+msgid "Client version is too old."
+msgstr "Du bruger en for gammel version af klienten."
+
+#: src/net/manaserv/loginhandler.cpp:266
+#, fuzzy
+msgid "Wrong username or password."
+msgstr "Forkert brugernavn eller password"
+
+#: src/net/manaserv/loginhandler.cpp:272
+#, fuzzy
+msgid "Account banned"
+msgstr "Kontoen er slettet"
+
+#: src/net/manaserv/loginhandler.cpp:275
+msgid "Login attempt too soon after previous attempt."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:303
+#, fuzzy
+msgid "Wrong username, password or email address."
+msgstr "Forkert brugernavn, password eller email-adresse."
+
+#: src/net/manaserv/loginhandler.cpp:306
+#, fuzzy
+msgid "Username already exists."
+msgstr "Brugernavnet er allerede benyttet af en anden bruger."
+
+#: src/net/manaserv/loginhandler.cpp:309
+#, fuzzy
+msgid "Email address already exists."
+msgstr "email-adressen er allerede benyttet af en anden bruger."
+
+#: src/net/manaserv/loginhandler.cpp:312
+msgid "You took too long with the captcha or your response was incorrect."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:87
+msgid "Joined party."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:105
+#, c-format
+msgid "%s joined the party."
+msgstr "%s blev medlem af gruppen."
+
+#: src/net/manaserv/partyhandler.cpp:123
+#, fuzzy, c-format
+msgid "%s rejected your invite."
+msgstr "%s afviste din invitation."
+
+#: src/net/manaserv/tradehandler.cpp:95
+msgid "Accepting incoming trade requests."
+msgstr "Kan modtager anmodninger om byttehandler."
+
+#: src/net/manaserv/tradehandler.cpp:97
+msgid "Ignoring incoming trade requests."
+msgstr "Ignorerer anmodninger om byttehandler."
+
+#: src/net/manaserv/tradehandler.cpp:115 src/net/tmwa/tradehandler.cpp:109
+msgid "Request for Trade"
+msgstr "Anmodning om byttehandel."
+
+#: src/net/manaserv/tradehandler.cpp:116 src/net/tmwa/tradehandler.cpp:110
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
+msgstr "%s vil gerne handle med dig. Accepterer du?"
+
+#: src/net/manaserv/tradehandler.cpp:134
+#, c-format
+msgid "Trading with %s"
+msgstr "Handler med %s"
+
+#: src/net/manaserv/tradehandler.cpp:148 src/net/tmwa/tradehandler.cpp:224
+msgid "Trade canceled."
+msgstr "Handel annulleret."
+
+#: src/net/manaserv/tradehandler.cpp:155 src/net/tmwa/tradehandler.cpp:231
+msgid "Trade completed."
+msgstr "Handel er komplet."
+
+#: src/net/tmwa/adminhandler.cpp:64
 msgid "Kick failed!"
 msgstr "Du kunne ikke sparke denne bruger af kanalen"
 
-#: src/net/ea/adminhandler.cpp:65
+#: src/net/tmwa/adminhandler.cpp:66
 msgid "Kick succeeded!"
 msgstr "Brugeren er sparket ud af kanalen"
 
-#: src/net/ea/buysellhandler.cpp:110
+#: src/net/tmwa/buysellhandler.cpp:109
 msgid "Nothing to sell."
 msgstr "Du har intet at sælge."
 
-#: src/net/ea/buysellhandler.cpp:117
+#: src/net/tmwa/buysellhandler.cpp:116
 msgid "Thanks for buying."
 msgstr "Tak for købet."
 
-#: src/net/ea/buysellhandler.cpp:124
+#: src/net/tmwa/buysellhandler.cpp:123
 msgid "Unable to buy."
 msgstr "Du kan ikke købe."
 
-#: src/net/ea/buysellhandler.cpp:130
+#: src/net/tmwa/buysellhandler.cpp:129
 msgid "Thanks for selling."
 msgstr "Tak for en god handel."
 
-#: src/net/ea/buysellhandler.cpp:132
+#: src/net/tmwa/buysellhandler.cpp:131
 msgid "Unable to sell."
 msgstr "Kunne ikke sælge."
 
-#: src/net/ea/charserverhandler.cpp:103
-#, fuzzy
-msgid "Access denied."
-msgstr "Adgang nægtet"
+#: src/net/tmwa/charserverhandler.cpp:103
+msgid "Access denied. Most likely, there are too many players on this server."
+msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:106
+#: src/net/tmwa/charserverhandler.cpp:107
 #, fuzzy
 msgid "Cannot use this ID."
 msgstr "Kan ikke bruge denne ID"
 
-#: src/net/ea/charserverhandler.cpp:109
+#: src/net/tmwa/charserverhandler.cpp:110
 #, fuzzy
-msgid "Unknown failure to select character."
-msgstr "Der opstod en ukendt fejl da du valgte karakter"
+msgid "Unknown char-server failure."
+msgstr "Ukendt fejl"
 
-#: src/net/ea/charserverhandler.cpp:135
+#: src/net/tmwa/charserverhandler.cpp:134
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr "Karakteren kunne ikke oprettes. Måske er navnet allerede brug."
 
-#: src/net/ea/charserverhandler.cpp:147 src/net/manaserv/charhandler.cpp:187
-msgid "Info"
-msgstr "Info"
-
-#: src/net/ea/charserverhandler.cpp:147
+#: src/net/tmwa/charserverhandler.cpp:146
 msgid "Character deleted."
 msgstr "Karakteren er slettet"
 
-#: src/net/ea/charserverhandler.cpp:152
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Failed to delete character."
 msgstr "Kunne ikke slette karakteren."
 
-#: src/net/ea/charserverhandler.cpp:237 src/net/manaserv/charhandler.cpp:263
+#: src/net/tmwa/charserverhandler.cpp:266
 msgid "Strength:"
 msgstr "Styrke:"
 
-#: src/net/ea/charserverhandler.cpp:238 src/net/manaserv/charhandler.cpp:264
+#: src/net/tmwa/charserverhandler.cpp:267
 msgid "Agility:"
 msgstr "Adræthed:"
 
-#: src/net/ea/charserverhandler.cpp:239 src/net/manaserv/charhandler.cpp:266
+#: src/net/tmwa/charserverhandler.cpp:268
 msgid "Vitality:"
 msgstr "Helbred:"
 
-#: src/net/ea/charserverhandler.cpp:240 src/net/manaserv/charhandler.cpp:267
+#: src/net/tmwa/charserverhandler.cpp:269
 msgid "Intelligence:"
 msgstr "Intelligens:"
 
-#: src/net/ea/charserverhandler.cpp:241 src/net/manaserv/charhandler.cpp:265
+#: src/net/tmwa/charserverhandler.cpp:270
 msgid "Dexterity:"
 msgstr "Behændighed:"
 
-#: src/net/ea/charserverhandler.cpp:242
+#: src/net/tmwa/charserverhandler.cpp:271
 msgid "Luck:"
 msgstr "Held:"
 
-#: src/net/ea/chathandler.cpp:80
-msgid "Whisper could not be sent, user is offline."
+#: src/net/tmwa/chathandler.cpp:87
+#, fuzzy, c-format
+msgid "Whisper could not be sent, %s is offline."
 msgstr "Beskeden kunne ikke sendes. Modtageren er ikke logget på."
 
-#: src/net/ea/chathandler.cpp:84
-msgid "Whisper could not be sent, ignored by user."
+#: src/net/tmwa/chathandler.cpp:96
+#, fuzzy, c-format
+msgid "Whisper could not be sent, ignored by %s."
 msgstr "Beskeden blev ikke læst. Modtageren ignorerer den."
 
-#: src/net/ea/chathandler.cpp:171
+#: src/net/tmwa/chathandler.cpp:230
 #, fuzzy
 msgid "MVP player."
 msgstr "Bruger"
 
-#: src/net/ea/chathandler.cpp:204 src/net/ea/chathandler.cpp:210
-#: src/net/ea/chathandler.cpp:215 src/net/ea/chathandler.cpp:220
-#: src/net/ea/chathandler.cpp:225 src/net/ea/chathandler.cpp:230
-#: src/net/ea/chathandler.cpp:235 src/net/ea/chathandler.cpp:240
+#: src/net/tmwa/chathandler.cpp:265 src/net/tmwa/chathandler.cpp:271
+#: src/net/tmwa/chathandler.cpp:276 src/net/tmwa/chathandler.cpp:281
+#: src/net/tmwa/chathandler.cpp:286 src/net/tmwa/chathandler.cpp:291
+#: src/net/tmwa/chathandler.cpp:296 src/net/tmwa/chathandler.cpp:301
 msgid "Channels are not supported!"
 msgstr "Serveren understøtter ikke kanaler!"
 
-#: src/net/ea/gamehandler.cpp:86
+#: src/net/tmwa/gamehandler.cpp:88
 #, c-format
 msgid "Online users: %d"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:100
+#: src/net/tmwa/gamehandler.cpp:101
 #, fuzzy
 msgid "Game"
 msgstr "Navn"
 
-#: src/net/ea/gamehandler.cpp:100
+#: src/net/tmwa/gamehandler.cpp:101
 #, fuzzy
 msgid "Request to quit denied!"
 msgstr "Anmodning om byttehandel."
 
-#: src/net/ea/generalhandler.cpp:102 src/net/manaserv/generalhandler.cpp:95
+#: src/net/tmwa/generalhandler.cpp:102
 #, c-format
 msgid "Strength %+d"
 msgstr "Styrke %+d"
 
-#: src/net/ea/generalhandler.cpp:103 src/net/manaserv/generalhandler.cpp:96
+#: src/net/tmwa/generalhandler.cpp:103
 #, c-format
 msgid "Agility %+d"
 msgstr "Adræthed %+d"
 
-#: src/net/ea/generalhandler.cpp:104 src/net/manaserv/generalhandler.cpp:98
+#: src/net/tmwa/generalhandler.cpp:104
 #, c-format
 msgid "Vitality %+d"
 msgstr "Helbred %+d"
 
-#: src/net/ea/generalhandler.cpp:105 src/net/manaserv/generalhandler.cpp:99
+#: src/net/tmwa/generalhandler.cpp:105
 #, c-format
 msgid "Intelligence %+d"
 msgstr "Intelligens %+d"
 
-#: src/net/ea/generalhandler.cpp:106 src/net/manaserv/generalhandler.cpp:97
+#: src/net/tmwa/generalhandler.cpp:106
 #, c-format
 msgid "Dexterity %+d"
 msgstr "Behændighed %+d"
 
-#: src/net/ea/generalhandler.cpp:107
+#: src/net/tmwa/generalhandler.cpp:107
 #, c-format
 msgid "Luck %+d"
 msgstr "Held %+d"
 
-#: src/net/ea/generalhandler.cpp:130
+#: src/net/tmwa/generalhandler.cpp:132
 #, fuzzy
 msgid "Authentication failed."
 msgstr "Godkendelse fejlede"
 
-#: src/net/ea/generalhandler.cpp:133
+#: src/net/tmwa/generalhandler.cpp:135
 #, fuzzy
 msgid "No servers available."
 msgstr "Der er ingen tilgængelige servere"
 
-#: src/net/ea/generalhandler.cpp:137
+#: src/net/tmwa/generalhandler.cpp:139
 #, fuzzy
 msgid "Someone else is trying to use this account."
 msgstr "En anden bruger forsøger at logge ind på denne brugerkonto"
 
-#: src/net/ea/generalhandler.cpp:140
+#: src/net/tmwa/generalhandler.cpp:142
 #, fuzzy
 msgid "This account is already logged in."
 msgstr "Der er allerede logget en bruger ind på denne  brugerkonto"
 
-#: src/net/ea/generalhandler.cpp:143
+#: src/net/tmwa/generalhandler.cpp:145
 #, fuzzy
 msgid "Speed hack detected."
 msgstr "Dit hastighedshack blev opdaget af serveren."
 
-#: src/net/ea/generalhandler.cpp:146
+#: src/net/tmwa/generalhandler.cpp:148
 msgid "Duplicated login."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:149
+#: src/net/tmwa/generalhandler.cpp:151
 #, fuzzy
 msgid "Unknown connection error."
 msgstr "Kunne ikke forbinde til serveren"
 
-#: src/net/ea/generalhandler.cpp:205
+#: src/net/tmwa/generalhandler.cpp:209
 msgid "Got disconnected from server!"
 msgstr "Blev smidt af serveren!"
 
-#: src/net/ea/generalhandler.cpp:216 src/net/manaserv/generalhandler.cpp:166
+#: src/net/tmwa/generalhandler.cpp:230
 msgid "Strength"
 msgstr "Styrke"
 
-#: src/net/ea/generalhandler.cpp:217 src/net/manaserv/generalhandler.cpp:167
+#: src/net/tmwa/generalhandler.cpp:231
 msgid "Agility"
 msgstr "Adræthed"
 
-#: src/net/ea/generalhandler.cpp:218 src/net/manaserv/generalhandler.cpp:169
+#: src/net/tmwa/generalhandler.cpp:232
 msgid "Vitality"
 msgstr "Helbred"
 
-#: src/net/ea/generalhandler.cpp:219 src/net/manaserv/generalhandler.cpp:170
+#: src/net/tmwa/generalhandler.cpp:233
 msgid "Intelligence"
 msgstr "Intelligens"
 
-#: src/net/ea/generalhandler.cpp:220 src/net/manaserv/generalhandler.cpp:168
+#: src/net/tmwa/generalhandler.cpp:234
 msgid "Dexterity"
 msgstr "Behændighed"
 
-#: src/net/ea/generalhandler.cpp:221
+#: src/net/tmwa/generalhandler.cpp:235
 msgid "Luck"
 msgstr "Held"
 
-#: src/net/ea/generalhandler.cpp:224
+#: src/net/tmwa/generalhandler.cpp:238
 #, fuzzy
 msgid "Defense"
 msgstr "Forsvar:"
 
-#: src/net/ea/generalhandler.cpp:225
+#: src/net/tmwa/generalhandler.cpp:239
 #, fuzzy
 msgid "M.Attack"
 msgstr "M.Angreb:"
 
-#: src/net/ea/generalhandler.cpp:226
+#: src/net/tmwa/generalhandler.cpp:240
 #, fuzzy
 msgid "M.Defense"
 msgstr "M.Forsvar:"
 
-#: src/net/ea/generalhandler.cpp:227
+#: src/net/tmwa/generalhandler.cpp:241
 #, fuzzy, c-format
 msgid "% Accuracy"
 msgstr "% præcission:"
 
-#: src/net/ea/generalhandler.cpp:228
+#: src/net/tmwa/generalhandler.cpp:242
 #, fuzzy, c-format
 msgid "% Evade"
 msgstr "% Undgå angreb."
 
-#: src/net/ea/generalhandler.cpp:229
+#: src/net/tmwa/generalhandler.cpp:243
 #, fuzzy, c-format
 msgid "% Critical"
 msgstr "Kritisk sår"
 
-#: src/net/ea/gui/guildtab.cpp:45
+#: src/net/tmwa/gui/guildtab.cpp:45
 msgid "Guild"
 msgstr "Opret en guild"
 
-#: src/net/ea/gui/guildtab.cpp:61 src/net/ea/gui/partytab.cpp:59
+#: src/net/tmwa/gui/guildtab.cpp:61 src/net/tmwa/gui/partytab.cpp:59
 msgid "/help > Display this help."
 msgstr "/help > Vis denne hjælpebesked."
 
-#: src/net/ea/gui/guildtab.cpp:62
+#: src/net/tmwa/gui/guildtab.cpp:62
 #, fuzzy
 msgid "/invite > Invite a player to your guild"
 msgstr "/invite > Inviter en spiller med i din gruppe"
 
-#: src/net/ea/gui/guildtab.cpp:63
+#: src/net/tmwa/gui/guildtab.cpp:63
 #, fuzzy
 msgid "/leave > Leave the guild you are in"
 msgstr "/invite > Forlad den gruppe du er med i"
 
-#: src/net/ea/gui/guildtab.cpp:64
+#: src/net/tmwa/gui/guildtab.cpp:64
 #, fuzzy
 msgid "/kick > Kick some one from the guild you are in"
 msgstr "/kick > Spark en spiller ud a din gruppe"
 
-#: src/net/ea/gui/guildtab.cpp:73 src/net/ea/gui/partytab.cpp:73
+#: src/net/tmwa/gui/guildtab.cpp:73 src/net/tmwa/gui/partytab.cpp:73
 msgid "Command: /invite <nick>"
 msgstr "Kommand: /invite <spiller>"
 
-#: src/net/ea/gui/guildtab.cpp:74
+#: src/net/tmwa/gui/guildtab.cpp:74
 #, fuzzy
 msgid "This command invites <nick> to the guild you're in."
 msgstr "Denne kommando inviterer <spiller> til din gruppe."
 
-#: src/net/ea/gui/guildtab.cpp:80 src/net/ea/gui/partytab.cpp:80
+#: src/net/tmwa/gui/guildtab.cpp:80 src/net/tmwa/gui/partytab.cpp:80
 msgid "Command: /leave"
 msgstr "Kommando: /leave"
 
-#: src/net/ea/gui/guildtab.cpp:81
+#: src/net/tmwa/gui/guildtab.cpp:81
 #, fuzzy
 msgid "This command causes the player to leave the guild."
 msgstr "Denne kommando får dig til at forlade din gruppe"
 
-#: src/net/ea/gui/guildtab.cpp:89
+#: src/net/tmwa/gui/guildtab.cpp:89
 #, fuzzy
 msgid "Guild name is missing."
 msgstr "Du glemte at skrive et navn på dit party."
 
-#: src/net/ea/guildhandler.cpp:293
+#: src/net/tmwa/guildhandler.cpp:296
 msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:298
+#: src/net/tmwa/guildhandler.cpp:301
 msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:303
+#: src/net/tmwa/guildhandler.cpp:306
 #, fuzzy
 msgid "User is now part of your guild."
 msgstr "%s er nu medlem af din gruppe."
 
-#: src/net/ea/guildhandler.cpp:308
+#: src/net/tmwa/guildhandler.cpp:311
 msgid "Your guild is full."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:313
+#: src/net/tmwa/guildhandler.cpp:316
 #, fuzzy
 msgid "Unknown guild invite response."
 msgstr "Ukendt invitations-svar fra %s."
 
-#: src/net/ea/guildhandler.cpp:390
+#: src/net/tmwa/guildhandler.cpp:393
 msgid "Guild creation isn't supported yet."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:43
+#: src/net/tmwa/gui/partytab.cpp:43
 msgid "Party"
 msgstr "Gruppe"
 
-#: src/net/ea/gui/partytab.cpp:60
+#: src/net/tmwa/gui/partytab.cpp:60
 msgid "/invite > Invite a player to your party"
 msgstr "/invite > Inviter en spiller med i din gruppe"
 
-#: src/net/ea/gui/partytab.cpp:61
+#: src/net/tmwa/gui/partytab.cpp:61
 msgid "/leave > Leave the party you are in"
 msgstr "/invite > Forlad den gruppe du er med i"
 
-#: src/net/ea/gui/partytab.cpp:62
+#: src/net/tmwa/gui/partytab.cpp:62
 msgid "/kick > Kick some one from the party you are in"
 msgstr "/kick > Spark en spiller ud a din gruppe"
 
-#: src/net/ea/gui/partytab.cpp:63
+#: src/net/tmwa/gui/partytab.cpp:63
 msgid "/item > Show/change party item sharing options"
 msgstr "/item > Vis/ret hvordan gruppen deler fundne tin"
 
-#: src/net/ea/gui/partytab.cpp:64
+#: src/net/tmwa/gui/partytab.cpp:64
 msgid "/exp > Show/change party experience sharing options"
 msgstr "/item > Vis/ret hvordan partyet deler exp"
 
-#: src/net/ea/gui/partytab.cpp:81
+#: src/net/tmwa/gui/partytab.cpp:81
 msgid "This command causes the player to leave the party."
 msgstr "Denne kommando får dig til at forlade din gruppe"
 
-#: src/net/ea/gui/partytab.cpp:85
+#: src/net/tmwa/gui/partytab.cpp:85
 msgid "Command: /item <policy>"
 msgstr "Kommand: /item <regel>"
 
-#: src/net/ea/gui/partytab.cpp:86
+#: src/net/tmwa/gui/partytab.cpp:86
 msgid "This command changes the party's item sharing policy."
 msgstr "Denne kommando ændrer hvordan gruppen deler fundne ting."
 
-#: src/net/ea/gui/partytab.cpp:87
+#: src/net/tmwa/gui/partytab.cpp:87
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
@@ -2768,23 +3176,23 @@ msgstr ""
 "Hvis <regel> er \"1\", \"yes\", eller \"true\" så deler gruppen alle fundne "
 "ting, men hvis <regel> er \"0\", \"no\", eller \"false\" deler gruppen ikke."
 
-#: src/net/ea/gui/partytab.cpp:90
+#: src/net/tmwa/gui/partytab.cpp:90
 msgid "Command: /item"
 msgstr "Kommando: /item"
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/tmwa/gui/partytab.cpp:91
 msgid "This command displays the party's current item sharing policy."
 msgstr "Denne kommando viser hvorvidt gruppen deler fundne ting."
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/tmwa/gui/partytab.cpp:95
 msgid "Command: /exp <policy>"
 msgstr "Kommando: /exp <regel>"
 
-#: src/net/ea/gui/partytab.cpp:96
+#: src/net/tmwa/gui/partytab.cpp:96
 msgid "This command changes the party's experience sharing policy."
 msgstr "Denne kommando viser hvorvidt gruppen deler experience points."
 
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/tmwa/gui/partytab.cpp:97
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
@@ -2793,109 +3201,96 @@ msgstr ""
 "men hvis <regel> er \"0\", \"no\", eller \"false\" deler gruppen ikke "
 "experience."
 
-#: src/net/ea/gui/partytab.cpp:100
+#: src/net/tmwa/gui/partytab.cpp:100
 msgid "Command: /exp"
 msgstr "Kommando: /exp"
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/tmwa/gui/partytab.cpp:101
 msgid "This command displays the party's current experience sharing policy."
 msgstr "Denne kommando hvorvidt gruppen deler experience points."
 
-#: src/net/ea/gui/partytab.cpp:132 src/net/ea/partyhandler.cpp:198
+#: src/net/tmwa/gui/partytab.cpp:132 src/net/tmwa/partyhandler.cpp:196
 msgid "Item sharing enabled."
 msgstr "Fra nu af deler partyet fundne ting."
 
-#: src/net/ea/gui/partytab.cpp:135 src/net/ea/partyhandler.cpp:204
+#: src/net/tmwa/gui/partytab.cpp:135 src/net/tmwa/partyhandler.cpp:202
 msgid "Item sharing disabled."
 msgstr "Fra nu af deler partyet ikke fundne ting."
 
-#: src/net/ea/gui/partytab.cpp:138 src/net/ea/partyhandler.cpp:210
+#: src/net/tmwa/gui/partytab.cpp:138 src/net/tmwa/partyhandler.cpp:208
 msgid "Item sharing not possible."
 msgstr "Deling af fundne ting kunne ikke slås til."
 
-#: src/net/ea/gui/partytab.cpp:141
+#: src/net/tmwa/gui/partytab.cpp:141
 #, fuzzy
 msgid "Item sharing unknown."
 msgstr "Fra nu af deler partyet fundne ting."
 
-#: src/net/ea/gui/partytab.cpp:167 src/net/ea/partyhandler.cpp:174
+#: src/net/tmwa/gui/partytab.cpp:167 src/net/tmwa/partyhandler.cpp:172
 msgid "Experience sharing enabled."
 msgstr "Fra nu af deler partyet experience points."
 
-#: src/net/ea/gui/partytab.cpp:170 src/net/ea/partyhandler.cpp:180
+#: src/net/tmwa/gui/partytab.cpp:170 src/net/tmwa/partyhandler.cpp:178
 msgid "Experience sharing disabled."
 msgstr "Fra nu af deler gruppen ikke experience points."
 
-#: src/net/ea/gui/partytab.cpp:173 src/net/ea/partyhandler.cpp:186
+#: src/net/tmwa/gui/partytab.cpp:173 src/net/tmwa/partyhandler.cpp:184
 msgid "Experience sharing not possible."
 msgstr "Deling af exp kunne ikke slås til."
 
-#: src/net/ea/gui/partytab.cpp:176
+#: src/net/tmwa/gui/partytab.cpp:176
 #, fuzzy
 msgid "Experience sharing unknown."
 msgstr "Fra nu af deler partyet experience points."
 
-#: src/net/ea/inventoryhandler.cpp:281
+#: src/net/tmwa/inventoryhandler.cpp:285
 msgid "Failed to use item."
 msgstr "Du kunne ikke bruge denne genstand."
 
-#: src/net/ea/inventoryhandler.cpp:391
+#: src/net/tmwa/inventoryhandler.cpp:399
 msgid "Unable to equip."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:402
+#: src/net/tmwa/inventoryhandler.cpp:410
 msgid "Unable to unequip."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:79
+#: src/net/tmwa/loginhandler.cpp:86
 msgid "Account was not found. Please re-login."
 msgstr "Brugernavnet eksisterer ikke. log venligst ind igen."
 
-#: src/net/ea/loginhandler.cpp:82 src/net/manaserv/loginhandler.cpp:121
-#, fuzzy
-msgid "Old password incorrect."
-msgstr "Det gamle password var ikke korrekt."
-
-#: src/net/ea/loginhandler.cpp:85
+#: src/net/tmwa/loginhandler.cpp:92
 #, fuzzy
 msgid "New password too short."
 msgstr "Det nye password er for kort."
 
-#: src/net/ea/loginhandler.cpp:88 src/net/ea/loginhandler.cpp:175
-#: src/net/manaserv/charhandler.cpp:158 src/net/manaserv/loginhandler.cpp:96
-#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
-#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
-#, fuzzy
-msgid "Unknown error."
-msgstr "Ukendt fejl"
-
-#: src/net/ea/loginhandler.cpp:149
+#: src/net/tmwa/loginhandler.cpp:156
 #, fuzzy
 msgid "Unregistered ID."
 msgstr "Frameld"
 
-#: src/net/ea/loginhandler.cpp:152
+#: src/net/tmwa/loginhandler.cpp:159
 #, fuzzy
 msgid "Wrong password."
 msgstr "Forkert brugernavn eller password"
 
-#: src/net/ea/loginhandler.cpp:155
+#: src/net/tmwa/loginhandler.cpp:162
 #, fuzzy
 msgid "Account expired."
 msgstr "Kontoen er slettet"
 
-#: src/net/ea/loginhandler.cpp:158
+#: src/net/tmwa/loginhandler.cpp:165
 #, fuzzy
 msgid "Rejected from server."
 msgstr "Adgang til serveren blev nægtet."
 
-#: src/net/ea/loginhandler.cpp:161
+#: src/net/tmwa/loginhandler.cpp:168
 #, fuzzy
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr "Du er blevet bandlyst permanent fra spillet. Kontakt en GM."
 
-#: src/net/ea/loginhandler.cpp:165
+#: src/net/tmwa/loginhandler.cpp:172
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -2904,667 +3299,368 @@ msgstr ""
 "Du er blevet bandlyst fra spillet indtil %s. Kontakt venligst en GM i "
 "forummet."
 
-#: src/net/ea/loginhandler.cpp:172
+#: src/net/tmwa/loginhandler.cpp:179
 #, fuzzy
 msgid "This user name is already taken."
 msgstr "Dette brugernavn er allerede taget."
 
-#: src/net/ea/network.cpp:145
+#: src/net/tmwa/network.cpp:145
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/ea/network.cpp:345
+#: src/net/tmwa/network.cpp:345
 #, fuzzy
 msgid "Unable to resolve host \""
 msgstr "Kunne ikke sælge."
 
-#: src/net/ea/network.cpp:414
+#: src/net/tmwa/network.cpp:414
 #, fuzzy
 msgid "Connection to server terminated. "
 msgstr "Opretter forbindelse til kort-serveren..."
 
-#: src/net/ea/partyhandler.cpp:81
+#: src/net/tmwa/partyhandler.cpp:82
 msgid "Could not create party."
 msgstr "Kunne ikke oprette gruppe."
 
-#: src/net/ea/partyhandler.cpp:84
+#: src/net/tmwa/partyhandler.cpp:84
 msgid "Party successfully created."
 msgstr "Du har nu oprettet gruppen."
 
-#: src/net/ea/partyhandler.cpp:118
+#: src/net/tmwa/partyhandler.cpp:119
 #, c-format
 msgid "%s is already a member of a party."
 msgstr "%s er allerede medlem af en gruppe."
 
-#: src/net/ea/partyhandler.cpp:122
+#: src/net/tmwa/partyhandler.cpp:123
 #, c-format
 msgid "%s refused your invitation."
 msgstr "%s afviste din invitation."
 
-#: src/net/ea/partyhandler.cpp:126
+#: src/net/tmwa/partyhandler.cpp:127
 #, c-format
 msgid "%s is now a member of your party."
 msgstr "%s er nu medlem af din gruppe."
 
-#: src/net/ea/partyhandler.cpp:130
+#: src/net/tmwa/partyhandler.cpp:131
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr "Ukendt invitations-svar fra %s."
 
-#: src/net/ea/partyhandler.cpp:238
+#: src/net/tmwa/partyhandler.cpp:236
 msgid "You have left the party."
 msgstr "Du har foradt gruppen."
 
-#: src/net/ea/partyhandler.cpp:249
+#: src/net/tmwa/partyhandler.cpp:246
 #, c-format
 msgid "%s has left your party."
 msgstr "%s har forladt gruppen."
 
-#: src/net/ea/partyhandler.cpp:301
+#: src/net/tmwa/partyhandler.cpp:299
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr "Et ukendt medlem forsøgte at sige: %s"
 
-#: src/net/ea/partyhandler.cpp:329
-msgid "Inviting like this isn't supported at the moment."
-msgstr "Serveren understøtter ikke denne type invitationer endnu."
+#: src/net/tmwa/partyhandler.cpp:335
+#, c-format
+msgid "Inviting failed, because you can't see a player called %s."
+msgstr ""
 
-#: src/net/ea/partyhandler.cpp:334
+#: src/net/tmwa/partyhandler.cpp:340
 msgid "You can only inivte when you are in a party!"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:365
+#: src/net/tmwa/partyhandler.cpp:368
 #, c-format
 msgid "%s is not in your party!"
 msgstr "%s er ikke medlem af din gruppe!"
 
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:304
-msgid "You are dead."
-msgstr "Du er død."
-
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:305
-msgid "We regret to inform you that your character was killed in battle."
-msgstr ""
-"Vi beklager at måtte informere dig, om at din karakter var dræbt i kamp."
-
-#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:307
-msgid "You are not that alive anymore."
-msgstr "Du er ikke så levende som du engang har været."
-
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:308
-msgid "The cold hands of the grim reaper are grabbing for your soul."
-msgstr "Manden med leen griber ud efter din sjæl."
-
-#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:309
-msgid "Game Over!"
-msgstr "Game Over!"
-
-#: src/net/ea/playerhandler.cpp:105
+#: src/net/tmwa/playerhandler.cpp:100
 msgid "Insert coin to continue."
 msgstr "Indsæt en mønt for at fortsætte."
 
-#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:310
-msgid ""
-"No, kids. Your character did not really die. It... err... went to a better "
-"place."
-msgstr ""
-"Nej, børn. Din karakter døde ikke rigtigt. Den.. err... tog til et bedre "
-"sted."
-
-#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:312
-msgid ""
-"Your plan of breaking your enemies weapon by bashing it with your throat "
-"failed."
-msgstr "Din plan om at smadre fjendens våben, ved at benytte din hals fejlede."
-
-#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:314
-msgid "I guess this did not run too well."
-msgstr "Jeg går ud fra at dette ikke gik alt for godt."
-
-#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:315
-msgid "Do you want your possessions identified?"
-msgstr "Du vil gerne have dine ejendele identificeret?"
-
-#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:316
-msgid "Sadly, no trace of you was ever found..."
-msgstr "Desværre, blev der aldrig fundet noget spor efter dig..."
-
-#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:317
-msgid "Annihilated."
-msgstr "Udslettet."
-
-#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:318
-msgid "Looks like you got your head handed to you."
-msgstr "Det ser ud til at du fik du hoved udleveret til dig."
-
-#: src/net/ea/playerhandler.cpp:120 src/net/manaserv/beinghandler.cpp:319
-msgid ""
-"You screwed up again, dump your body down the tubes and get you another one."
-msgstr "Du kvajede dig igen, smid din krop ned i kloakken og find dig en ny."
-
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/tmwa/playerhandler.cpp:118
 msgid "You're not dead yet. You're just resting."
 msgstr "Du er ikke død endnu. Du hviler dig bare."
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/tmwa/playerhandler.cpp:119
 msgid "You are no more."
 msgstr "Du er ikke mere."
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/tmwa/playerhandler.cpp:120
 msgid "You have ceased to be."
 msgstr "Du er holdt op med at være til."
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/tmwa/playerhandler.cpp:121
 msgid "You've expired and gone to meet your maker."
 msgstr "Du er udløbet og er gået hen for at møde din skaber."
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/tmwa/playerhandler.cpp:122
 msgid "You're a stiff."
 msgstr "Du er en hård nød at knække, men desværre død."
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/tmwa/playerhandler.cpp:123
 msgid "Bereft of life, you rest in peace."
 msgstr "Du siver langtsomt ud af din krop, du kan nu endelig slappe af."
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/tmwa/playerhandler.cpp:124
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 "Hvis det ikke var fordi du var så animeret, kunne du sikker imponere Chuck "
 "Norris."
 
-#: src/net/ea/playerhandler.cpp:130
+#: src/net/tmwa/playerhandler.cpp:125
 msgid "Your metabolic processes are now history."
 msgstr "Din tid er ovre."
 
-#: src/net/ea/playerhandler.cpp:131
+#: src/net/tmwa/playerhandler.cpp:126
 msgid "You're off the twig."
 msgstr "Drik noget syre."
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/tmwa/playerhandler.cpp:127
 msgid "You've kicked the bucket."
 msgstr "Du har stillet træskoene."
 
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/tmwa/playerhandler.cpp:128
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr "Du har spist af dødens pølse for den sidste gang."
 
-#: src/net/ea/playerhandler.cpp:135
+#: src/net/tmwa/playerhandler.cpp:130
 msgid "You are an ex-player."
 msgstr "Du er en forhenværende spiller."
 
-#: src/net/ea/playerhandler.cpp:136
+#: src/net/tmwa/playerhandler.cpp:131
 msgid "You're pining for the fjords."
 msgstr "Du er tabt bag en vogn."
 
-#: src/net/ea/playerhandler.cpp:249 src/net/ea/playerhandler.cpp:310
+#: src/net/tmwa/playerhandler.cpp:246 src/net/tmwa/playerhandler.cpp:285
 msgid "Message"
 msgstr "Besked"
 
-#: src/net/ea/playerhandler.cpp:250
+#: src/net/tmwa/playerhandler.cpp:247
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:333
+#: src/net/tmwa/playerhandler.cpp:313
 #, fuzzy, c-format
 msgid "You picked up %s."
 msgstr "Du samlede op "
 
-#: src/net/ea/playerhandler.cpp:369
+#: src/net/tmwa/playerhandler.cpp:348
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:532
+#: src/net/tmwa/playerhandler.cpp:488
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:147
+#: src/net/tmwa/specialhandler.cpp:144
 msgid "Trade failed!"
 msgstr "Handel fejlede!"
 
-#: src/net/ea/specialhandler.cpp:150
+#: src/net/tmwa/specialhandler.cpp:147
 msgid "Emote failed!"
 msgstr "Emote fejlede!"
 
-#: src/net/ea/specialhandler.cpp:153
+#: src/net/tmwa/specialhandler.cpp:150
 msgid "Sit failed!"
 msgstr "Sæt dig fejlede!"
 
-#: src/net/ea/specialhandler.cpp:156
+#: src/net/tmwa/specialhandler.cpp:153
 msgid "Chat creating failed!"
 msgstr "Det lykkedes ikke at starte en chat."
 
-#: src/net/ea/specialhandler.cpp:159
+#: src/net/tmwa/specialhandler.cpp:156
 msgid "Could not join party!"
 msgstr "Kunne ikke tilslutte sig gruppen!"
 
-#: src/net/ea/specialhandler.cpp:162
+#: src/net/tmwa/specialhandler.cpp:159
 msgid "Cannot shout!"
 msgstr "Kan ikke råbe!"
 
-#: src/net/ea/specialhandler.cpp:171
+#: src/net/tmwa/specialhandler.cpp:168
 msgid "You have not yet reached a high enough lvl!"
 msgstr "Du er ikke nået til det rette Niveau endnu!"
 
-#: src/net/ea/specialhandler.cpp:174
+#: src/net/tmwa/specialhandler.cpp:171
 msgid "Insufficient HP!"
 msgstr "Utilstrækkelig HP!"
 
-#: src/net/ea/specialhandler.cpp:177
+#: src/net/tmwa/specialhandler.cpp:174
 msgid "Insufficient SP!"
 msgstr "Utilstrækkelig SP!"
 
-#: src/net/ea/specialhandler.cpp:180
+#: src/net/tmwa/specialhandler.cpp:177
 msgid "You have no memos!"
 msgstr "Du har ingen memorandaer!"
 
-#: src/net/ea/specialhandler.cpp:183
+#: src/net/tmwa/specialhandler.cpp:180
 msgid "You cannot do that right now!"
 msgstr "Det kan du ikke gøre lige nu!"
 
-#: src/net/ea/specialhandler.cpp:186
+#: src/net/tmwa/specialhandler.cpp:183
 msgid "Seems you need more money... ;-)"
 msgstr "Det ser ud til at du ikke har nok penge... :-)"
 
-#: src/net/ea/specialhandler.cpp:189
+#: src/net/tmwa/specialhandler.cpp:186
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Du kan ikke bruge denne færdighed med dette slags våben!"
 
-#: src/net/ea/specialhandler.cpp:192
+#: src/net/tmwa/specialhandler.cpp:189
 msgid "You need another red gem!"
 msgstr "Du har behov for en rød krystal mere"
 
-#: src/net/ea/specialhandler.cpp:195
+#: src/net/tmwa/specialhandler.cpp:192
 msgid "You need another blue gem!"
 msgstr "Du har behov for en blå krystal mere"
 
-#: src/net/ea/specialhandler.cpp:198
+#: src/net/tmwa/specialhandler.cpp:195
 msgid "You're carrying to much to do this!"
 msgstr "Du har for meget på dig, til at kunne gøre dette"
 
-#: src/net/ea/specialhandler.cpp:201
+#: src/net/tmwa/specialhandler.cpp:198
 msgid "Huh? What's that?"
 msgstr "Hmm? Hvad er det?"
 
-#: src/net/ea/specialhandler.cpp:210
+#: src/net/tmwa/specialhandler.cpp:207
 msgid "Warp failed..."
 msgstr "Warp mislykkede..."
 
-#: src/net/ea/specialhandler.cpp:213
+#: src/net/tmwa/specialhandler.cpp:210
 msgid "Could not steal anything..."
 msgstr "Kunne ikke stjæle noget som helst..."
 
-#: src/net/ea/specialhandler.cpp:216
+#: src/net/tmwa/specialhandler.cpp:213
 msgid "Poison had no effect..."
 msgstr "Giften havde ingen effekt..."
 
-#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:116
-msgid "Request for Trade"
-msgstr "Anmodning om byttehandel."
-
-#: src/net/ea/tradehandler.cpp:108 src/net/manaserv/tradehandler.cpp:117
-#, c-format
-msgid "%s wants to trade with you, do you accept?"
-msgstr "%s vil gerne handle med dig. Accepterer du?"
-
-#: src/net/ea/tradehandler.cpp:124
+#: src/net/tmwa/tradehandler.cpp:126
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr "Du kan ikke handle. Handle partneren er for langt væk."
 
-#: src/net/ea/tradehandler.cpp:128
+#: src/net/tmwa/tradehandler.cpp:130
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr "Du kan ikke handle. Karakteren findes ikke."
 
-#: src/net/ea/tradehandler.cpp:132
+#: src/net/tmwa/tradehandler.cpp:134
 msgid "Trade cancelled due to an unknown reason."
 msgstr "Handlen blev annulleret af en ukendt grund."
 
-#: src/net/ea/tradehandler.cpp:137
+#: src/net/tmwa/tradehandler.cpp:139
 #, c-format
 msgid "Trade: You and %s"
 msgstr "Byttehandel: %s og dig."
 
-#: src/net/ea/tradehandler.cpp:144
+#: src/net/tmwa/tradehandler.cpp:146
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr "Byttehandel med %s blev afbrudt."
 
-#: src/net/ea/tradehandler.cpp:153
+#: src/net/tmwa/tradehandler.cpp:154
 msgid "Unhandled trade cancel packet."
 msgstr "En besked om at afbryde byttehandlen blev ikke opfattet."
 
-#: src/net/ea/tradehandler.cpp:202
+#: src/net/tmwa/tradehandler.cpp:202
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr "Fejlede i at tilføje genstand. Handels partneren bære på for meget."
 
-#: src/net/ea/tradehandler.cpp:207
+#: src/net/tmwa/tradehandler.cpp:207
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 "Fejlede i at tilføje genstand. Handels partneren har ikke flere frie pladser."
 
-#: src/net/ea/tradehandler.cpp:211
+#: src/net/tmwa/tradehandler.cpp:211
 msgid "Failed adding item for unknown reason."
 msgstr "Fejlede i at tilføje genstand af en ukendt grund."
 
-#: src/net/ea/tradehandler.cpp:224 src/net/manaserv/tradehandler.cpp:149
-msgid "Trade canceled."
-msgstr "Handel annulleret."
-
-#: src/net/ea/tradehandler.cpp:231 src/net/manaserv/tradehandler.cpp:156
-msgid "Trade completed."
-msgstr "Handel er komplet."
-
-#: src/net/manaserv/beinghandler.cpp:324
+#: src/playerrelations.cpp:310
 #, fuzzy
-msgid "Press OK to respawn."
-msgstr " Tryk OK for at genopstå"
-
-#: src/net/manaserv/beinghandler.cpp:325
-#, fuzzy
-msgid "You Died"
-msgstr "Du er død"
-
-#: src/net/manaserv/charhandler.cpp:128 src/net/manaserv/charhandler.cpp:196
-#, fuzzy
-msgid "Not logged in."
-msgstr "Allerede logget ind"
-
-#: src/net/manaserv/charhandler.cpp:131
-msgid "No empty slot."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:134
-msgid "Invalid name."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:137
-#, fuzzy
-msgid "Character's name already exists."
-msgstr "Brugernavnet er allerede benyttet af en anden bruger."
-
-#: src/net/manaserv/charhandler.cpp:140
-msgid "Invalid hairstyle."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:143
-msgid "Invalid hair color."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:146
-msgid "Invalid gender."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:149
-#, fuzzy
-msgid "Character's stats are too high."
-msgstr "Du har brugt alle dine points"
-
-#: src/net/manaserv/charhandler.cpp:152
-#, fuzzy
-msgid "Character's stats are too low."
-msgstr "Du har brugt alle dine points"
-
-#: src/net/manaserv/charhandler.cpp:155
-msgid "One stat is zero."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:187
-#, fuzzy
-msgid "Player deleted."
-msgstr "Karakteren er slettet"
-
-#: src/net/manaserv/charhandler.cpp:199
-#, fuzzy
-msgid "Selection out of range."
-msgstr "Vælg hvor mange genstande du vil bytte."
-
-#: src/net/manaserv/charhandler.cpp:202
-#, fuzzy, c-format
-msgid "Unknown error (%d)."
-msgstr "Ukendt fejl"
-
-#: src/net/manaserv/charhandler.cpp:242
-msgid "No gameservers are available."
-msgstr "Der er ingen tilgængelige spilservere."
-
-#: src/net/manaserv/charhandler.cpp:268
-msgid "Willpower:"
-msgstr "Viljestyrke:"
-
-#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
-#: src/net/manaserv/guildhandler.cpp:259
-#, c-format
-msgid "Topic: %s"
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
-#, fuzzy
-msgid "Players in this channel:"
-msgstr "Spiller rammer monster"
-
-#: src/net/manaserv/chathandler.cpp:201
-#, fuzzy
-msgid "Error joining channel."
-msgstr "Kommando: : /join <chat-kanal>"
+msgid "Completely ignore"
+msgstr "@@ignore||Ignorer %s fuldstændigt@@"
 
-#: src/net/manaserv/chathandler.cpp:207
-msgid "Listing channels."
+#: src/playerrelations.cpp:324
+msgid "Print '...'"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:219
-msgid "End of channel list."
+#: src/playerrelations.cpp:340
+msgid "Blink name"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:291
-#, fuzzy, c-format
-msgid "%s entered the channel."
-msgstr "%s blev medlem af gruppen."
-
-#: src/net/manaserv/chathandler.cpp:296
+#: src/resources/itemdb.cpp:44
 #, c-format
-msgid "%s left the channel."
-msgstr ""
+msgid "Attack %+d"
+msgstr "Angreb %+d"
 
-#: src/net/manaserv/chathandler.cpp:312
+#: src/resources/itemdb.cpp:45
 #, c-format
-msgid "%s has set mode %s on user %s."
-msgstr ""
+msgid "Defense %+d"
+msgstr "Forsvar %+d"
 
-#: src/net/manaserv/chathandler.cpp:322
+#: src/resources/itemdb.cpp:46
 #, c-format
-msgid "%s has kicked %s."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:327
-#, fuzzy
-msgid "Unknown channel event."
-msgstr "Ukendt kommando"
+msgid "HP %+d"
+msgstr "HP %+d"
 
-#: src/net/manaserv/generalhandler.cpp:100
+#: src/resources/itemdb.cpp:47
 #, c-format
-msgid "Willpower %+d"
-msgstr ""
-
-#: src/net/manaserv/generalhandler.cpp:171
-#, fuzzy
-msgid "Willpower"
-msgstr "Viljestyrke:"
-
-#: src/net/manaserv/guildhandler.cpp:81
-msgid "Guild created."
-msgstr "Oprettede en ny guild"
-
-#: src/net/manaserv/guildhandler.cpp:86
-msgid "Error creating guild."
-msgstr "Der opstod en fejl. Guilden kunne ikke oprettes"
-
-#: src/net/manaserv/guildhandler.cpp:96
-msgid "Invite sent."
-msgstr "Invitationen er afsendt."
-
-#: src/net/manaserv/guildhandler.cpp:203
-msgid "Member was promoted successfully."
-msgstr ""
+msgid "MP %+d"
+msgstr "MP %+d"
 
-#: src/net/manaserv/guildhandler.cpp:208
-msgid "Failed to promote member."
-msgstr ""
+#: src/resources/itemdb.cpp:92
+msgid "Unknown item"
+msgstr "Ukendt genstand"
 
-#: src/net/manaserv/loginhandler.cpp:87
-#, fuzzy
-msgid "Wrong magic_token."
-msgstr "Forkert magic_token"
+#: src/resources/itemdb.cpp:135 src/resources/monsterdb.cpp:77
+msgid "unnamed"
+msgstr "unavngivet"
 
-#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
 #, fuzzy
-msgid "Already logged in."
-msgstr "Allerede logget ind"
+#~ msgid "HP"
+#~ msgstr "HP:"
 
-#: src/net/manaserv/loginhandler.cpp:93 src/net/manaserv/loginhandler.cpp:272
 #, fuzzy
-msgid "Server is full."
-msgstr "Serveren er fuld"
+#~ msgid "MP"
+#~ msgstr "MP:"
 
-#: src/net/manaserv/loginhandler.cpp:118
 #, fuzzy
-msgid "New password incorrect."
-msgstr "De nye password stemmer ikke overens."
-
-#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
-msgid "Account not connected. Please login first."
-msgstr "Kontoen er ikke tilsluttet. Du skal først logge ind."
+#~ msgid "Exp"
+#~ msgstr "Exp:"
 
-#: src/net/manaserv/loginhandler.cpp:149
 #, fuzzy
-msgid "New email address incorrect."
-msgstr "Den nye email-adresse er ikke gyldig."
+#~ msgid "Money"
+#~ msgstr "Penge: %d"
 
-#: src/net/manaserv/loginhandler.cpp:152
 #, fuzzy
-msgid "Old email address incorrect."
-msgstr "Den gamle email-adresse er ikke gyldig."
+#~ msgid "Job"
+#~ msgstr "Job:"
 
-#: src/net/manaserv/loginhandler.cpp:158
 #, fuzzy
-msgid "The new email address already exists."
-msgstr "Den nye  email-adresse eksisterer allerede."
-
-#: src/net/manaserv/loginhandler.cpp:239
-msgid ""
-"Client registration is not allowed. Please contact server administration."
-msgstr ""
+#~ msgid "Level"
+#~ msgstr "Niveau: %d"
 
-#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
 #, fuzzy
-msgid "Client version is too old."
-msgstr "Du bruger en for gammel version af klienten."
+#~ msgid "Access denied."
+#~ msgstr "Adgang nægtet"
 
-#: src/net/manaserv/loginhandler.cpp:266
 #, fuzzy
-msgid "Wrong username or password."
-msgstr "Forkert brugernavn eller password"
+#~ msgid "Unknown failure to select character."
+#~ msgstr "Der opstod en ukendt fejl da du valgte karakter"
 
-#: src/net/manaserv/loginhandler.cpp:275
-msgid "Login attempt too soon after previous attempt."
-msgstr ""
+#~ msgid "Inviting like this isn't supported at the moment."
+#~ msgstr "Serveren understøtter ikke denne type invitationer endnu."
 
-#: src/net/manaserv/loginhandler.cpp:303
-#, fuzzy
-msgid "Wrong username, password or email address."
-msgstr "Forkert brugernavn, password eller email-adresse."
+#~ msgid "Willpower:"
+#~ msgstr "Viljestyrke:"
 
-#: src/net/manaserv/loginhandler.cpp:306
 #, fuzzy
-msgid "Username already exists."
-msgstr "Brugernavnet er allerede benyttet af en anden bruger."
+#~ msgid "Willpower"
+#~ msgstr "Viljestyrke:"
 
-#: src/net/manaserv/loginhandler.cpp:309
 #, fuzzy
-msgid "Email address already exists."
-msgstr "email-adressen er allerede benyttet af en anden bruger."
-
-#: src/net/manaserv/loginhandler.cpp:312
-msgid "You took too long with the captcha or your response was incorrect."
-msgstr ""
-
-#: src/net/manaserv/partyhandler.cpp:88
-msgid "Joined party."
-msgstr ""
-
-#: src/net/manaserv/partyhandler.cpp:106
-#, c-format
-msgid "%s joined the party."
-msgstr "%s blev medlem af gruppen."
-
-#: src/net/manaserv/partyhandler.cpp:123
-#, fuzzy, c-format
-msgid "%s rejected your invite."
-msgstr "%s afviste din invitation."
-
-#: src/net/manaserv/tradehandler.cpp:96
-msgid "Accepting incoming trade requests."
-msgstr "Kan modtager anmodninger om byttehandler."
-
-#: src/net/manaserv/tradehandler.cpp:98
-msgid "Ignoring incoming trade requests."
-msgstr "Ignorerer anmodninger om byttehandler."
-
-#: src/net/manaserv/tradehandler.cpp:135
-#, c-format
-msgid "Trading with %s"
-msgstr "Handler med %s"
-
-#: src/playerrelations.cpp:304
-#, fuzzy
-msgid "Completely ignore"
-msgstr "@@ignore||Ignorer %s fuldstændigt@@"
-
-#: src/playerrelations.cpp:318
-msgid "Print '...'"
-msgstr ""
-
-#: src/playerrelations.cpp:334
-msgid "Blink name"
-msgstr ""
-
-#: src/playerrelations.cpp:371
-msgid "Floating '...' bubble"
-msgstr ""
-
-#: src/playerrelations.cpp:374
-msgid "Floating bubble"
-msgstr ""
-
-#: src/resources/itemdb.cpp:52
-#, c-format
-msgid "Attack %+d"
-msgstr "Angreb %+d"
-
-#: src/resources/itemdb.cpp:53
-#, c-format
-msgid "Defense %+d"
-msgstr "Forsvar %+d"
-
-#: src/resources/itemdb.cpp:54
-#, c-format
-msgid "HP %+d"
-msgstr "HP %+d"
-
-#: src/resources/itemdb.cpp:55
-#, c-format
-msgid "MP %+d"
-msgstr "MP %+d"
-
-#: src/resources/itemdb.cpp:114
-msgid "Unknown item"
-msgstr "Ukendt genstand"
-
-#: src/resources/itemdb.cpp:158 src/resources/monsterdb.cpp:45
-#: src/resources/monsterdb.cpp:69
-msgid "unnamed"
-msgstr "unavngivet"
+#~ msgid "Server is full."
+#~ msgstr "Serveren er fuld"
 
 #~ msgid "Text Shadow"
 #~ msgstr "Skygger"
diff --git a/po/de.po b/po/de.po
index 94b04e40..0dd54d06 100644
--- a/po/de.po
+++ b/po/de.po
@@ -11,10 +11,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Mana World 0.1.0\n"
 "Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2010-03-16 22:27+0100\n"
+"POT-Creation-Date: 2010-12-13 20:04+0100\n"
 "PO-Revision-Date: 2010-01-02 15:26+0000\n"
 "Last-Translator: Jonathan Raphael Joachim Kolberg\n"
 "Language-Team: Deutsch <kde-i18n-de@kde.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -23,318 +24,324 @@ msgstr ""
 "X-Generator: Lokalize 1.0\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: src/client.cpp:555 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
+#: src/client.cpp:598 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
 msgid "Setup"
 msgstr "Einstellungen"
 
-#: src/client.cpp:625
+#: src/client.cpp:679
 #, fuzzy
 msgid "Connecting to server"
 msgstr "Verbinde mit [Benutzerdatenserver]..."
 
-#: src/client.cpp:652
+#: src/client.cpp:706
 #, fuzzy
 msgid "Logging in"
 msgstr "Anmelden"
 
-#: src/client.cpp:685
+#: src/client.cpp:739
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:741
+#: src/client.cpp:804
 #, fuzzy
 msgid "Requesting characters"
 msgstr "Spielfigur auswählen"
 
-#: src/client.cpp:770
+#: src/client.cpp:833
 #, fuzzy
 msgid "Connecting to the game server"
 msgstr "Verbinde mit [Charakterserver]..."
 
-#: src/client.cpp:801 src/client.cpp:808 src/client.cpp:942
+#: src/client.cpp:843
+#, fuzzy
+msgid "Changing game servers"
+msgstr "Wechsle den Server"
+
+#: src/client.cpp:872 src/client.cpp:879 src/client.cpp:1014
 #: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
 #: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
-#: src/gui/serverdialog.cpp:241 src/gui/unregisterdialog.cpp:133
-#: src/net/ea/charserverhandler.cpp:135 src/net/ea/charserverhandler.cpp:152
-#: src/net/manaserv/charhandler.cpp:161 src/net/manaserv/charhandler.cpp:204
+#: src/gui/serverdialog.cpp:323 src/gui/unregisterdialog.cpp:133
+#: src/net/manaserv/charhandler.cpp:174 src/net/manaserv/charhandler.cpp:217
+#: src/net/tmwa/charserverhandler.cpp:134
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Error"
 msgstr "Fehler"
 
-#: src/client.cpp:817
+#: src/client.cpp:888
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:844
+#: src/client.cpp:915
 msgid "Password Change"
 msgstr "Passwort ändern:"
 
-#: src/client.cpp:845
+#: src/client.cpp:916
 msgid "Password changed successfully!"
 msgstr "Passwort erfolgreich geändert!"
 
-#: src/client.cpp:864
+#: src/client.cpp:935
 msgid "Email Change"
 msgstr "E-Mail ändern"
 
-#: src/client.cpp:865
+#: src/client.cpp:936
 #, fuzzy
 msgid "Email changed successfully!"
 msgstr "Mitglied wurde erfolgreich Befördert."
 
-#: src/client.cpp:885
+#: src/client.cpp:956
 #, fuzzy
 msgid "Unregister Successful"
 msgstr "Abmelden"
 
-#: src/client.cpp:886
+#: src/client.cpp:957
 msgid "Farewell, come back any time..."
 msgstr "Leb wohl und komme jeder Zeit wieder..."
 
-#: src/client.cpp:1009 src/client.cpp:1032
+#: src/client.cpp:1138 src/client.cpp:1161
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1121
+#: src/client.cpp:1281
 #, fuzzy, c-format
 msgid "Invalid update host: %s"
 msgstr "Ungültiger Updateserver: "
 
-#: src/client.cpp:1155 src/client.cpp:1161
+#: src/client.cpp:1315 src/client.cpp:1321
 msgid "Error creating updates directory!"
 msgstr "Fehler beim Erstellen des Verzeichnisses für Updates!"
 
-#: src/commandhandler.cpp:127 src/commandhandler.cpp:308
+#: src/commandhandler.cpp:131 src/commandhandler.cpp:317
 msgid "Unknown command."
 msgstr "Unbekannter Befehl."
 
-#: src/commandhandler.cpp:156
+#: src/commandhandler.cpp:160
 msgid "-- Help --"
 msgstr "-- Hilfe --"
 
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:161
 msgid "/help > Display this help"
 msgstr "/help > diese Hilfe anzeigen"
 
-#: src/commandhandler.cpp:159
+#: src/commandhandler.cpp:163
 msgid "/where > Display map name"
 msgstr "/where > Zeige den Namen der aktuellen Karte"
 
-#: src/commandhandler.cpp:160
+#: src/commandhandler.cpp:164
 msgid "/who > Display number of online users"
 msgstr "/who > Zeige Anzahl der angemeldeten Spieler"
 
-#: src/commandhandler.cpp:161
+#: src/commandhandler.cpp:165
 msgid "/me > Tell something about yourself"
 msgstr "/me > Erzähle etwas über Dich"
 
-#: src/commandhandler.cpp:163
+#: src/commandhandler.cpp:167
 msgid "/clear > Clears this window"
 msgstr "/clear > Löscht den Inhalt dieses Fensters"
 
-#: src/commandhandler.cpp:165
+#: src/commandhandler.cpp:169
 msgid "/msg > Send a private message to a user"
 msgstr "/msg > Sende eine private Nachricht an einen Benutzer"
 
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:170
 msgid "/whisper > Alias of msg"
 msgstr "/whisper > Ersatz für msg"
 
-#: src/commandhandler.cpp:167
+#: src/commandhandler.cpp:171
 msgid "/w > Alias of msg"
 msgstr "/w > Ersatz für msg"
 
-#: src/commandhandler.cpp:168
+#: src/commandhandler.cpp:172
 msgid "/query > Makes a tab for private messages with another user"
 msgstr ""
 "/query > Öffnet einen Tab für private Nachrichten mit einem anderen Benutzer"
 
-#: src/commandhandler.cpp:169
+#: src/commandhandler.cpp:174
 msgid "/q > Alias of query"
 msgstr "/q > Ersatz für query"
 
-#: src/commandhandler.cpp:171
+#: src/commandhandler.cpp:176
 msgid "/ignore > ignore a player"
 msgstr ""
 
-#: src/commandhandler.cpp:172
+#: src/commandhandler.cpp:177
 msgid "/unignore > stop ignoring a player"
 msgstr ""
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:179
 msgid "/list > Display all public channels"
 msgstr "/list > Zeige alle öffentlichen Kanäle"
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:180
 msgid "/join > Join or create a channel"
 msgstr "/join > Trete einem Kanal bei oder erstelle einen neuen Kanal"
 
-#: src/commandhandler.cpp:177
+#: src/commandhandler.cpp:182
 #, fuzzy
 msgid "/createparty > Create a new party"
 msgstr "/create > Erstelle eine neue Party"
 
-#: src/commandhandler.cpp:178
+#: src/commandhandler.cpp:183
 msgid "/party > Invite a user to party"
 msgstr "/party > Lade einen Benutzer zu deiner Party ein"
 
-#: src/commandhandler.cpp:180
+#: src/commandhandler.cpp:185
 msgid "/record > Start recording the chat to an external file"
 msgstr "/record > Starte die Aufzeichnung des Chats in eine Datei"
 
-#: src/commandhandler.cpp:181
+#: src/commandhandler.cpp:187
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr "/toggle > Entscheide, ob <return> den Chat-Dialog schließt"
 
-#: src/commandhandler.cpp:182
+#: src/commandhandler.cpp:189
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
 "/present > Liste anwesender Spieler (wird im Chat-log aufgezeichnet, falls "
 "das Log aktiviert ist)"
 
-#: src/commandhandler.cpp:184
+#: src/commandhandler.cpp:192
 msgid "/announce > Global announcement (GM only)"
 msgstr "/announce > Globale Ansage (Nur von GMs nutzbar)"
 
-#: src/commandhandler.cpp:188
+#: src/commandhandler.cpp:196
 msgid "For more information, type /help <command>."
 msgstr "Für mehr Informationen, gib /help <Befehl> ein."
 
-#: src/commandhandler.cpp:192
+#: src/commandhandler.cpp:200
 msgid "Command: /help"
 msgstr "Befehl: /help"
 
-#: src/commandhandler.cpp:193
+#: src/commandhandler.cpp:201
 msgid "This command displays a list of all commands available."
 msgstr "Dieser Befehl zeigt alle möglichen Befehle an"
 
-#: src/commandhandler.cpp:194
+#: src/commandhandler.cpp:203
 msgid "Command: /help <command>"
 msgstr "Befehl: /help <Befehl>"
 
-#: src/commandhandler.cpp:195
+#: src/commandhandler.cpp:204
 msgid "This command displays help on <command>."
 msgstr "Dieser Befehl zeigt die Hilfe für <Befehl>."
 
-#: src/commandhandler.cpp:203
+#: src/commandhandler.cpp:212
 msgid "Command: /announce <msg>"
 msgstr "Befehl: /announce <Nachricht>"
 
-#: src/commandhandler.cpp:204
+#: src/commandhandler.cpp:213
 msgid "*** only available to a GM ***"
 msgstr "*** Nur für GMs verfügbar ***"
 
-#: src/commandhandler.cpp:205
+#: src/commandhandler.cpp:214
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 "Dieser Befehl versendet die Nachricht <Nachricht> an alle Spieler die gerade "
 "online sind."
 
-#: src/commandhandler.cpp:210
+#: src/commandhandler.cpp:219
 msgid "Command: /clear"
 msgstr "Befehl: /clear"
 
-#: src/commandhandler.cpp:211
+#: src/commandhandler.cpp:220
 msgid "This command clears the chat log of previous chat."
 msgstr "Dieser Befehl bereinigt den Chatlog des vorherigen Chats."
 
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:224
 msgid "Command: /ignore <player>"
 msgstr "Befehl: /item <Wert>"
 
-#: src/commandhandler.cpp:216
+#: src/commandhandler.cpp:225
 msgid "This command ignores the given player regardless of current relations."
 msgstr "Dieser Befehl zeigt die Anzahl der Spieler an, die gerade online sind."
 
-#: src/commandhandler.cpp:221
+#: src/commandhandler.cpp:230
 msgid "Command: /join <channel>"
 msgstr "Befehl: /join <Kanal>"
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:231
 msgid "This command makes you enter <channel>."
 msgstr "Dieser Befehl lässt dich dem Kanal <Kanal> beitreten."
 
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:232
 msgid "If <channel> doesn't exist, it's created."
 msgstr "Falls Kanal <Kanal> nicht existiert, wird er erstellt."
 
-#: src/commandhandler.cpp:227
+#: src/commandhandler.cpp:236
 msgid "Command: /list"
 msgstr "Befehl: /list"
 
-#: src/commandhandler.cpp:228
+#: src/commandhandler.cpp:237
 msgid "This command shows a list of all channels."
 msgstr "Dieser Befehl zeigt eine liste aller Kanäle an."
 
-#: src/commandhandler.cpp:232
+#: src/commandhandler.cpp:241
 msgid "Command: /me <message>"
 msgstr "Befehl: /me <Nachricht>"
 
-#: src/commandhandler.cpp:233
+#: src/commandhandler.cpp:242
 msgid "This command tell others you are (doing) <msg>."
 msgstr "Dieser Befehl zeigt eine Aktion <Nachricht> an."
 
-#: src/commandhandler.cpp:237
+#: src/commandhandler.cpp:246
 msgid "Command: /msg <nick> <message>"
 msgstr "Befehl: /msg <Name> <Nachricht>"
 
-#: src/commandhandler.cpp:238
+#: src/commandhandler.cpp:247
 msgid "Command: /whisper <nick> <message>"
 msgstr "Befehl: /whisper <Name> <Nachricht>"
 
-#: src/commandhandler.cpp:239
+#: src/commandhandler.cpp:248
 msgid "Command: /w <nick> <message>"
 msgstr "Befehl: /w <Name> <Nachricht>"
 
-#: src/commandhandler.cpp:240
+#: src/commandhandler.cpp:249
 msgid "This command sends the text <message> to <nick>."
 msgstr "Dieser Befehl sendet den Text <Nachricht> an den Spieler <Name>."
 
-#: src/commandhandler.cpp:241 src/commandhandler.cpp:260
+#: src/commandhandler.cpp:250 src/commandhandler.cpp:269
 #: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
-#: src/net/ea/gui/guildtab.cpp:75 src/net/ea/gui/partytab.cpp:75
+#: src/net/tmwa/gui/guildtab.cpp:75 src/net/tmwa/gui/partytab.cpp:75
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 "Wenn im Namen <Name> Leerzeichen vorkommen, setze ihn in Anführungszeichen "
 "(\")."
 
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:255
 msgid "Command: /query <nick>"
 msgstr "Befehl: /query <Name>"
 
-#: src/commandhandler.cpp:247
+#: src/commandhandler.cpp:256
 msgid "Command: /q <nick>"
 msgstr "Befehl: /q <Name>"
 
-#: src/commandhandler.cpp:248
+#: src/commandhandler.cpp:257
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
 "Dieser Befehl erstellt einen neuen Tab für private Nachrichten zwischen Dir "
 "und Spieler <Name>."
 
-#: src/commandhandler.cpp:253
+#: src/commandhandler.cpp:262
 #, fuzzy
 msgid "Command: /createparty <name>"
 msgstr "Befehl: /create <Party-Name>"
 
-#: src/commandhandler.cpp:254
+#: src/commandhandler.cpp:263
 #, fuzzy
 msgid "This command creates a new party called <name>."
 msgstr "Dieser Befehl erstellt eine neue Party mit dem Namen <Party-Name>"
 
-#: src/commandhandler.cpp:258
+#: src/commandhandler.cpp:267
 msgid "Command: /party <nick>"
 msgstr "Befehl: /party <Name>"
 
-#: src/commandhandler.cpp:259 src/net/ea/gui/partytab.cpp:74
+#: src/commandhandler.cpp:268 src/net/tmwa/gui/partytab.cpp:74
 msgid "This command invites <nick> to party with you."
 msgstr "Dieser Befehl lädt Spieler <Name> zu einer Party mit Dir ein."
 
-#: src/commandhandler.cpp:265
+#: src/commandhandler.cpp:274
 msgid "Command: /present"
 msgstr "Befehl: /present"
 
-#: src/commandhandler.cpp:266
+#: src/commandhandler.cpp:275
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
@@ -343,29 +350,29 @@ msgstr ""
 "sendet sie entweder an das Chatlog, falls aktiviert, oder zeigt sie im "
 "Chatfenster an."
 
-#: src/commandhandler.cpp:272
+#: src/commandhandler.cpp:281
 msgid "Command: /record <filename>"
 msgstr "Befehl: /record <Dateiname>"
 
-#: src/commandhandler.cpp:273
+#: src/commandhandler.cpp:282
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr ""
 "Dieser Befehl startet den Mitschnitt des Chats (Chatlog) in die Datei "
 "<Dateiname>."
 
-#: src/commandhandler.cpp:275
+#: src/commandhandler.cpp:284
 msgid "Command: /record"
 msgstr "Befehl: /record"
 
-#: src/commandhandler.cpp:276
+#: src/commandhandler.cpp:285
 msgid "This command finishes a recording session."
 msgstr "Dieser Befehl beendet den Mitschnitt des Chats."
 
-#: src/commandhandler.cpp:280
+#: src/commandhandler.cpp:289
 msgid "Command: /toggle <state>"
 msgstr "Befehl: /toggle <Status>"
 
-#: src/commandhandler.cpp:281
+#: src/commandhandler.cpp:290
 msgid ""
 "This command sets whether the return key should toggle the chat log, or "
 "whether the chat log turns off automatically."
@@ -374,56 +381,56 @@ msgstr ""
 "eine Nachricht gesendet wurde, oder erst nachdem die Enter-Taste erneut "
 "gedrückt wurde."
 
-#: src/commandhandler.cpp:283
+#: src/commandhandler.cpp:292
 msgid ""
-"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
-"\", \"no\", \"false\" to turn the toggle off."
+"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
+"\"0\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 "<Status> \"1\",\"yes\",\"true\" aktiviert das Schließen durch Enter,  \"0\","
 "\"no\",\"false\" deaktiviert es."
 
-#: src/commandhandler.cpp:286
+#: src/commandhandler.cpp:295
 msgid "Command: /toggle"
 msgstr "Befehl: /toggle"
 
-#: src/commandhandler.cpp:287
+#: src/commandhandler.cpp:296
 msgid "This command displays the return toggle status."
 msgstr "Dieser Befehl zeigt, wann sich die Chatzeile schließt."
 
-#: src/commandhandler.cpp:291 src/gui/widgets/whispertab.cpp:93
+#: src/commandhandler.cpp:300 src/gui/widgets/whispertab.cpp:95
 #, fuzzy
 msgid "Command: /unignore <player>"
 msgstr "Befehl: /item <Wert>"
 
-#: src/commandhandler.cpp:292
+#: src/commandhandler.cpp:301
 msgid "This command stops ignoring the given player if they are being ignored"
 msgstr ""
 
-#: src/commandhandler.cpp:297
+#: src/commandhandler.cpp:306
 msgid "Command: /where"
 msgstr "Befehl: /where"
 
-#: src/commandhandler.cpp:298
+#: src/commandhandler.cpp:307
 msgid "This command displays the name of the current map."
 msgstr "Dieser Befehl zeigt den Namen der aktuellen Karte an."
 
-#: src/commandhandler.cpp:302
+#: src/commandhandler.cpp:311
 msgid "Command: /who"
 msgstr "Befehl: /who"
 
-#: src/commandhandler.cpp:303
+#: src/commandhandler.cpp:312
 msgid "This command displays the number of players currently online."
 msgstr "Dieser Befehl zeigt die Anzahl der Spieler an, die gerade online sind."
 
-#: src/commandhandler.cpp:309
+#: src/commandhandler.cpp:318
 msgid "Type /help for a list of commands."
 msgstr "Gib /help ein, um eine Liste der Befehle zu erhalten."
 
-#: src/commandhandler.cpp:375
+#: src/commandhandler.cpp:384
 msgid "Cannot send empty whispers!"
 msgstr "Kann keine leeren Nachrichten versenden!"
 
-#: src/commandhandler.cpp:383
+#: src/commandhandler.cpp:392
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -432,60 +439,68 @@ msgstr ""
 "Kann keinen tab für Spieler \"%s\" erstellen! Entweder existiert bereits "
 "einer, oder der Spieler bist du."
 
-#: src/commandhandler.cpp:397
+#: src/commandhandler.cpp:406
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Erbitte Erlaubnis, Kanal %s betreten zu dürfen."
 
-#: src/commandhandler.cpp:410 src/net/ea/gui/partytab.cpp:109
+#: src/commandhandler.cpp:419 src/net/tmwa/gui/partytab.cpp:109
 msgid "Party name is missing."
 msgstr "Name der Party fehlt."
 
-#: src/commandhandler.cpp:423 src/commandhandler.cpp:471
-#: src/commandhandler.cpp:493
+#: src/commandhandler.cpp:432 src/commandhandler.cpp:509
+#: src/commandhandler.cpp:531
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:441
+#: src/commandhandler.cpp:450
 msgid "Return toggles chat."
 msgstr "Enter-Taste schließt Chatzeile."
 
-#: src/commandhandler.cpp:441
+#: src/commandhandler.cpp:450
 msgid "Message closes chat."
 msgstr "Nachricht schließt Chatzeile."
 
-#: src/commandhandler.cpp:450
+#: src/commandhandler.cpp:459
 msgid "Return now toggles chat."
 msgstr "Jetzt schließt Enter die Chatzeile."
 
-#: src/commandhandler.cpp:454
+#: src/commandhandler.cpp:463
 msgid "Message now closes chat."
 msgstr "Jetzt schließt jede Nachricht die Chatzeile."
 
-#: src/commandhandler.cpp:477
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:489
+msgid "Show IP: On"
+msgstr ""
+
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:485
+msgid "Show IP: Off"
+msgstr ""
+
+#: src/commandhandler.cpp:515
 msgid "Player already ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:484
+#: src/commandhandler.cpp:522
 #, fuzzy
 msgid "Player successfully ignored!"
 msgstr "Party erfolgreich erstellt."
 
-#: src/commandhandler.cpp:486
+#: src/commandhandler.cpp:524
 #, fuzzy
 msgid "Player could not be ignored!"
 msgstr ""
 "Nachricht konnte nicht gesendet werden, sie wurde vom Spieler ignoriert."
 
-#: src/commandhandler.cpp:501
+#: src/commandhandler.cpp:539
 msgid "Player wasn't ignored!"
 msgstr "Spieler wurde nicht ignoriert!"
 
-#: src/commandhandler.cpp:506
+#: src/commandhandler.cpp:544
 msgid "Player no longer ignored!"
 msgstr "Spieler wird nicht länger ignoriert!"
 
-#: src/commandhandler.cpp:508
+#: src/commandhandler.cpp:546
 #, fuzzy
 msgid "Player could not be unignored!"
 msgstr ""
@@ -501,44 +516,44 @@ msgstr ""
 msgid "General"
 msgstr "Öffentlich"
 
-#: src/game.cpp:326
+#: src/game.cpp:342
 #, fuzzy
 msgid "Screenshot saved as "
 msgstr "Bildschirmfoto wurde nach ~/ gespeichert."
 
-#: src/game.cpp:331
+#: src/game.cpp:347
 msgid "Saving screenshot failed!"
 msgstr "Bildschirmfoto konnte nicht gespeichert werden!"
 
-#: src/game.cpp:355
+#: src/game.cpp:378
 #, fuzzy
 msgid "The connection to the server was lost."
 msgstr ""
 "Die Verbindung zum Server wurde getrennt, das Programm wird jetzt beendet"
 
-#: src/game.cpp:360
+#: src/game.cpp:382
 msgid "Network Error"
 msgstr "Netzwerkfehler"
 
-#: src/game.cpp:705
+#: src/game.cpp:721
 msgid "Ignoring incoming trade requests"
 msgstr "Ignoriere eingehende Handelsanfragen"
 
-#: src/game.cpp:712
+#: src/game.cpp:726
 msgid "Accepting incoming trade requests"
 msgstr "Akzeptiere eingehende Handelsanfragen"
 
-#: src/game.cpp:946
+#: src/game.cpp:954
 #, fuzzy
 msgid "Could Not Load Map"
 msgstr "Karte konnte nicht geladen werden"
 
-#: src/game.cpp:947
+#: src/game.cpp:955
 #, c-format
 msgid "Error while loading %s"
 msgstr "Fehler beim Laden von %s"
 
-#: src/gui/beingpopup.cpp:75
+#: src/gui/beingpopup.cpp:76
 #, fuzzy, c-format
 msgid "Party: %s"
 msgstr "Party (%s)"
@@ -547,34 +562,34 @@ msgstr "Party (%s)"
 msgid "Buy"
 msgstr "Kaufen"
 
-#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
-#: src/gui/sell.cpp:276
+#: src/gui/buy.cpp:69 src/gui/buy.cpp:261 src/gui/sell.cpp:71
+#: src/gui/sell.cpp:288
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Preis: %s / Gesamt: %s"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:99 src/gui/npcdialog.cpp:100
-#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:404
+#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:112 src/gui/npcdialog.cpp:124
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:463
 msgid "+"
 msgstr "+"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:98 src/gui/npcdialog.cpp:101
-#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:416
+#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:111 src/gui/npcdialog.cpp:125
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:475
 msgid "-"
 msgstr "-"
 
 #: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
-#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:152
-#: src/keyboardconfig.cpp:103
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:228
+#: src/keyboardconfig.cpp:102
 msgid "Quit"
 msgstr "Beenden"
 
-#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:333
-#: src/gui/statuswindow.cpp:403 src/gui/statuswindow.cpp:437
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:384
+#: src/gui/statuswindow.cpp:462 src/gui/statuswindow.cpp:496
 msgid "Max"
 msgstr "Max"
 
@@ -588,11 +603,11 @@ msgstr "Verkaufen"
 
 #: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
 #: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
-#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:101
-#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:178
-#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:402
+#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:114
+#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:389
 #: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
-#: src/gui/socialwindow.cpp:243 src/gui/textdialog.cpp:39
+#: src/gui/socialwindow.cpp:275 src/gui/textdialog.cpp:40
 #: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr "Abbrechen"
@@ -629,7 +644,7 @@ msgstr "Die neuen E-Mailadresse stimmen nicht überein."
 msgid "Change Password"
 msgstr "Passwort ändern"
 
-#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:53
+#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:55
 #: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
 msgid "Password:"
 msgstr "Passwort:"
@@ -660,19 +675,19 @@ msgstr "Die neues Passwörter stimmen nicht überein."
 msgid "Create Character"
 msgstr "Charakter erstellen"
 
-#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:52
+#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:54
 #: src/gui/register.cpp:67
 msgid "Name:"
 msgstr "Name:"
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
 #: src/gui/outfitwindow.cpp:67
 msgid ">"
 msgstr ""
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
 #: src/gui/outfitwindow.cpp:66
@@ -687,8 +702,8 @@ msgstr "Haarfarbe:"
 msgid "Hair style:"
 msgstr "Frisur:"
 
-#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:397
-#: src/gui/socialwindow.cpp:297
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:392
+#: src/gui/socialwindow.cpp:329
 msgid "Create"
 msgstr "Erstellen"
 
@@ -743,33 +758,33 @@ msgstr "Abmelden"
 msgid "Change Email"
 msgstr "E-Mailadresse ändern"
 
-#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:155
-#: src/gui/setup_players.cpp:230
+#: src/gui/charselectdialog.cpp:336 src/gui/serverdialog.cpp:231
+#: src/gui/setup_players.cpp:229
 msgid "Delete"
 msgstr "Löschen"
 
-#: src/gui/charselectdialog.cpp:387
+#: src/gui/charselectdialog.cpp:380
 msgid "Choose"
 msgstr "Wähle"
 
-#: src/gui/charselectdialog.cpp:399 src/gui/charselectdialog.cpp:400
+#: src/gui/charselectdialog.cpp:394 src/gui/charselectdialog.cpp:395
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:77
+#: src/gui/chat.cpp:88
 msgid "Chat"
 msgstr "Chat"
 
-#: src/gui/chat.cpp:287
+#: src/gui/chat.cpp:311
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Anwesend: %s ;%d Spieler sind anwesend."
 
-#: src/gui/chat.cpp:305
+#: src/gui/chat.cpp:329
 msgid "Attendance written to record log."
 msgstr "Anwesenheitsliste wurde ins Chatprotokol geschrieben."
 
-#: src/gui/chat.cpp:469
+#: src/gui/chat.cpp:493
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Flüsternd zu %s: %s"
@@ -835,136 +850,167 @@ msgstr "Hintergrundeffekte: %s"
 msgid "Equipment"
 msgstr "Ausrüstung"
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:78
-#: src/gui/inventorywindow.cpp:80 src/gui/inventorywindow.cpp:291
-#: src/gui/popupmenu.cpp:372
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:89
+#: src/gui/inventorywindow.cpp:337 src/gui/popupmenu.cpp:359
 msgid "Unequip"
 msgstr "Ablegen"
 
-#: src/gui/help.cpp:36
+#: src/gui/help.cpp:37
 msgid "Help"
 msgstr "Hilfe"
 
-#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:74
+#: src/gui/help.cpp:51 src/gui/npcdialog.cpp:50
 msgid "Close"
 msgstr "Schließen"
 
-#: src/gui/inventorywindow.cpp:57 src/gui/windowmenu.cpp:56
+#: src/gui/inventorywindow.cpp:59 src/gui/windowmenu.cpp:56
 msgid "Inventory"
 msgstr "Inventar"
 
-#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:75
-#: src/gui/inventorywindow.cpp:293 src/gui/popupmenu.cpp:374
+#: src/gui/inventorywindow.cpp:59
+msgid "Storage"
+msgstr "Lager"
+
+#: src/gui/inventorywindow.cpp:82
+msgid "Slots:"
+msgstr "Plätze:"
+
+#: src/gui/inventorywindow.cpp:87 src/gui/inventorywindow.cpp:100
+#: src/gui/inventorywindow.cpp:339 src/gui/popupmenu.cpp:361
 msgid "Equip"
 msgstr "Ausrüsten"
 
-#: src/gui/inventorywindow.cpp:74 src/gui/inventorywindow.cpp:75
-#: src/gui/inventorywindow.cpp:297 src/gui/popupmenu.cpp:377
+#: src/gui/inventorywindow.cpp:88
 msgid "Use"
 msgstr "Benutzen"
 
-#: src/gui/inventorywindow.cpp:84 src/gui/inventorywindow.cpp:301
-#: src/gui/popupmenu.cpp:380
+#: src/gui/inventorywindow.cpp:101 src/gui/popupmenu.cpp:364
+msgid "Activate"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:102 src/gui/inventorywindow.cpp:348
+#: src/gui/popupmenu.cpp:367
 msgid "Drop..."
 msgstr "Wegwerfen"
 
-#: src/gui/inventorywindow.cpp:85 src/gui/popupmenu.cpp:386
+#: src/gui/inventorywindow.cpp:103 src/gui/popupmenu.cpp:373
 msgid "Split"
 msgstr "Aufteilen"
 
-#: src/gui/inventorywindow.cpp:86 src/gui/outfitwindow.cpp:51
+#: src/gui/inventorywindow.cpp:104 src/gui/outfitwindow.cpp:51
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:97 src/gui/storagewindow.cpp:84
-msgid "Slots:"
-msgstr "Plätze:"
-
-#: src/gui/inventorywindow.cpp:98
+#: src/gui/inventorywindow.cpp:106
 msgid "Weight:"
 msgstr "Gewicht:"
 
-#: src/gui/inventorywindow.cpp:303 src/gui/popupmenu.cpp:382
+#: src/gui/inventorywindow.cpp:124 src/gui/popupmenu.cpp:378
+msgid "Store"
+msgstr "Einlagern"
+
+#: src/gui/inventorywindow.cpp:125 src/gui/popupmenu.cpp:385
+msgid "Retrieve"
+msgstr "Abholen"
+
+#: src/gui/inventorywindow.cpp:350 src/gui/popupmenu.cpp:369
 msgid "Drop"
 msgstr "Wegwerfen"
 
-#: src/gui/itemamount.cpp:100 src/gui/okdialog.cpp:42
-#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:38 src/gui/trade.cpp:73
-#: src/gui/trade.cpp:75
+#: src/gui/itemamount.cpp:113 src/gui/okdialog.cpp:42
+#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:39 src/gui/trade.cpp:72
+#: src/gui/trade.cpp:74
 msgid "OK"
 msgstr "Ok"
 
-#: src/gui/itemamount.cpp:102
+#: src/gui/itemamount.cpp:115
 msgid "All"
 msgstr "Alle"
 
-#: src/gui/itemamount.cpp:128
+#: src/gui/itemamount.cpp:141
 msgid "Select amount of items to trade."
 msgstr "Wähle aus, wie viele Gegenstände Du tauschen möchtest."
 
-#: src/gui/itemamount.cpp:131
+#: src/gui/itemamount.cpp:144
 msgid "Select amount of items to drop."
 msgstr "Wähle aus, wie viele Gegenstände Du wegwerfen möchtest."
 
-#: src/gui/itemamount.cpp:134
+#: src/gui/itemamount.cpp:147
 msgid "Select amount of items to store."
 msgstr "Wähle aus, wie viele Gegenstände Du einlagern möchtest."
 
-#: src/gui/itemamount.cpp:137
+#: src/gui/itemamount.cpp:150
 msgid "Select amount of items to retrieve."
 msgstr "Wähle aus, wie viele Gegenstände Du wieder haben möchtest."
 
-#: src/gui/itemamount.cpp:140
+#: src/gui/itemamount.cpp:153
 msgid "Select amount of items to split."
 msgstr "Wähle aus, wie viel Gegenstände Du aufteilen möchtest."
 
-#: src/gui/itempopup.cpp:92
+#: src/gui/itempopup.cpp:137
 #, c-format
 msgid "Weight: %s"
 msgstr "Gewicht: %s"
 
-#: src/gui/login.cpp:49 src/gui/login.cpp:61
+#: src/gui/login.cpp:51 src/gui/login.cpp:63
 msgid "Login"
 msgstr "Anmelden"
 
-#: src/gui/login.cpp:58
+#: src/gui/login.cpp:60
 msgid "Remember username"
 msgstr "Benutzername merken"
 
-#: src/gui/login.cpp:59 src/gui/register.cpp:58 src/gui/register.cpp:73
+#: src/gui/login.cpp:61 src/gui/register.cpp:58 src/gui/register.cpp:73
 msgid "Register"
 msgstr "Registrieren"
 
-#: src/gui/login.cpp:60
+#: src/gui/login.cpp:62
 msgid "Change Server"
 msgstr "Wechsle den Server"
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
+#: src/gui/login.cpp:129
+#, fuzzy
+msgid "Registration disabled"
+msgstr "Teilen von Gegenständen deaktiviert."
+
+#: src/gui/login.cpp:129
+msgid "You need to use the website to register an account for this server."
+msgstr ""
+
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:86
 msgid "Map"
 msgstr "Karte"
 
-#: src/gui/npcdialog.cpp:44
+#: src/gui/ministatus.cpp:235
+msgid "Need"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:48
 msgid "Waiting for server"
 msgstr "Warte auf den Server"
 
-#: src/gui/npcdialog.cpp:45
+#: src/gui/npcdialog.cpp:49
 msgid "Next"
 msgstr "Weiter"
 
-#: src/gui/npcdialog.cpp:47
+#: src/gui/npcdialog.cpp:51
 msgid "Submit"
 msgstr "Absenden"
 
-#: src/gui/npcdialog.cpp:52 src/gui/npcpostdialog.cpp:41
+#: src/gui/npcdialog.cpp:73 src/gui/npcpostdialog.cpp:41
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:110
+#: src/gui/npcdialog.cpp:118
+msgid "Clear log"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:134
 msgid "Reset"
 msgstr "Zurücksetzten"
 
 #. TRANSLATORS: Please leave the \n sequences intact.
-#: src/gui/npcdialog.cpp:171
+#: src/gui/npcdialog.cpp:208
 msgid ""
 "\n"
 "> Next\n"
@@ -980,7 +1026,7 @@ msgstr "Nach:"
 msgid "Send"
 msgstr "Senden"
 
-#: src/gui/npcpostdialog.cpp:96
+#: src/gui/npcpostdialog.cpp:99
 msgid "Failed to send as sender or letter invalid."
 msgstr "Es misslang den Brief zu senden oder er war ungültig."
 
@@ -994,95 +1040,82 @@ msgstr ""
 msgid "Unequip first"
 msgstr "erstes ausziehen"
 
-#: src/gui/popupmenu.cpp:84
+#: src/gui/popupmenu.cpp:83
 #, fuzzy, c-format
 msgid "Trade with %s..."
 msgstr "Handele mit %s"
 
-#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:161
+#: src/gui/popupmenu.cpp:87 src/gui/popupmenu.cpp:158
 #, fuzzy, c-format
 msgid "Attack %s"
 msgstr "Angriff %+d"
 
-#: src/gui/popupmenu.cpp:92
+#: src/gui/popupmenu.cpp:91
 #, c-format
 msgid "Whisper %s"
 msgstr "flüstere %s"
 
-#: src/gui/popupmenu.cpp:101
+#: src/gui/popupmenu.cpp:100
 #, c-format
 msgid "Befriend %s"
 msgstr "Sei Freund von %s"
 
-#: src/gui/popupmenu.cpp:106
+#: src/gui/popupmenu.cpp:105
 #, fuzzy, c-format
 msgid "Disregard %s"
 msgstr "Unbeachtet"
 
-#: src/gui/popupmenu.cpp:109
+#: src/gui/popupmenu.cpp:108
 #, c-format
 msgid "Ignore %s"
 msgstr "Ignoriere %s"
 
-#: src/gui/popupmenu.cpp:115 src/gui/popupmenu.cpp:124
+#: src/gui/popupmenu.cpp:114 src/gui/popupmenu.cpp:123
 #, c-format
 msgid "Unignore %s"
 msgstr "Ignoriere %s nicht mehr"
 
-#: src/gui/popupmenu.cpp:118
+#: src/gui/popupmenu.cpp:117
 #, c-format
 msgid "Completely ignore %s"
 msgstr "Ignoriere %s komplett"
 
 #: src/gui/popupmenu.cpp:130
 #, c-format
-msgid "Follow %s"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:133
-#, c-format
 msgid "Invite %s to join your guild"
 msgstr "Lade %s in deine Gilde ein"
 
-#: src/gui/popupmenu.cpp:137
+#: src/gui/popupmenu.cpp:134
 #, c-format
 msgid "Invite %s to join your party"
 msgstr "Lade %s in deine Party ein"
 
-#: src/gui/popupmenu.cpp:144
+#: src/gui/popupmenu.cpp:141
 msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:153
+#: src/gui/popupmenu.cpp:150
 #, c-format
 msgid "Talk to %s"
 msgstr "Rede mit %s"
 
-#: src/gui/popupmenu.cpp:166
+#: src/gui/popupmenu.cpp:163
 msgid "Kick monster"
 msgstr "Monster töten"
 
-#: src/gui/popupmenu.cpp:174
+#: src/gui/popupmenu.cpp:171
 msgid "Add name to chat"
 msgstr "Füge Namen zu Chat hinzu"
 
-#: src/gui/popupmenu.cpp:191
+#: src/gui/popupmenu.cpp:188
 #, c-format
 msgid "Pick up %s"
 msgstr "Hebe %s auf"
 
-#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:400
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:387
 msgid "Add to chat"
 msgstr "Zu Chat hinzufügen"
 
-#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:71
-msgid "Store"
-msgstr "Einlagern"
-
-#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:72
-msgid "Retrieve"
-msgstr "Abholen"
-
 #: src/gui/quitdialog.cpp:44
 msgid "Switch server"
 msgstr "Server wechseln"
@@ -1151,49 +1184,63 @@ msgstr "Das Passwort muss kürzer als %d Zeichen sein."
 msgid "Passwords do not match."
 msgstr "Passwörter stimmen nicht überein."
 
-#: src/gui/serverdialog.cpp:124
+#: src/gui/serverdialog.cpp:197
 msgid "Choose Your Server"
 msgstr "Wähle deinen Server"
 
-#: src/gui/serverdialog.cpp:131 src/gui/widgets/chattab.cpp:139
+#: src/gui/serverdialog.cpp:206 src/gui/widgets/chattab.cpp:142
 msgid "Server:"
 msgstr "Server:"
 
-#: src/gui/serverdialog.cpp:132
+#: src/gui/serverdialog.cpp:207
 msgid "Port:"
 msgstr "Port:"
 
-#: src/gui/serverdialog.cpp:133
+#: src/gui/serverdialog.cpp:208
 #, fuzzy
 msgid "Server type:"
 msgstr "Server:"
 
-#: src/gui/serverdialog.cpp:153
+#: src/gui/serverdialog.cpp:229
 msgid "Connect"
 msgstr "Verbinde..."
 
-#: src/gui/serverdialog.cpp:154
+#: src/gui/serverdialog.cpp:230
 #, fuzzy
 msgid "Custom Server"
 msgstr "Benutzerdefinierter Zeiger"
 
-#: src/gui/serverdialog.cpp:242
+#: src/gui/serverdialog.cpp:324
 msgid "Please type both the address and the port of a server."
 msgstr "Bitte die Adresse und den Port eines Servers eingeben."
 
-#: src/gui/serverdialog.cpp:357
+#: src/gui/serverdialog.cpp:441
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Lade Serverliste herunter...%2.2f%%"
 
-#: src/gui/serverdialog.cpp:363
+#: src/gui/serverdialog.cpp:447
 msgid "Waiting for server..."
 msgstr "Warte auf den Server"
 
-#: src/gui/serverdialog.cpp:367
+#: src/gui/serverdialog.cpp:451
 msgid "Preparing download"
 msgstr "Download wird vorbereitet"
 
+#: src/gui/serverdialog.cpp:455
+#, fuzzy
+msgid "Error retreiving server list!"
+msgstr "Fehler beim empfangen der Serverliste: %s\n"
+
+#: src/gui/serverdialog.cpp:550
+msgid "requires a newer version"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:552
+#, c-format
+msgid "requires v%s"
+msgstr ""
+
 #: src/gui/setup_audio.cpp:42
 msgid "Sound"
 msgstr "Ton"
@@ -1229,50 +1276,50 @@ msgstr ""
 msgid "Sound Engine"
 msgstr "Soundengine"
 
-#: src/gui/setup_colors.cpp:45
+#: src/gui/setup_colors.cpp:46
 msgid "This is what the color looks like"
 msgstr "So wird die Farbe aussehen"
 
-#: src/gui/setup_colors.cpp:50
+#: src/gui/setup_colors.cpp:51
 msgid "Colors"
 msgstr "Farben"
 
-#: src/gui/setup_colors.cpp:71
+#: src/gui/setup_colors.cpp:72
 msgid "Type:"
 msgstr "Typ: "
 
-#: src/gui/setup_colors.cpp:82 src/gui/setup_colors.cpp:330
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:331
 msgid "Static"
 msgstr "Statisch"
 
-#: src/gui/setup_colors.cpp:84 src/gui/setup_colors.cpp:85
-#: src/gui/setup_colors.cpp:331
+#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
+#: src/gui/setup_colors.cpp:332
 msgid "Pulse"
 msgstr "Pulsierend"
 
-#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:87
-#: src/gui/setup_colors.cpp:332
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
+#: src/gui/setup_colors.cpp:333
 msgid "Rainbow"
 msgstr "Regenbogen"
 
-#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
-#: src/gui/setup_colors.cpp:332
+#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
+#: src/gui/setup_colors.cpp:333
 msgid "Spectrum"
 msgstr "Spektrum"
 
-#: src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:94
 msgid "Delay:"
 msgstr "Verzögerung: "
 
-#: src/gui/setup_colors.cpp:108
+#: src/gui/setup_colors.cpp:109
 msgid "Red:"
 msgstr "Rot: "
 
-#: src/gui/setup_colors.cpp:123
+#: src/gui/setup_colors.cpp:124
 msgid "Green:"
 msgstr "Grün: "
 
-#: src/gui/setup_colors.cpp:138
+#: src/gui/setup_colors.cpp:139
 msgid "Blue:"
 msgstr "Blau: "
 
@@ -1330,594 +1377,596 @@ msgstr "Standard"
 msgid "Key Conflict(s) Detected."
 msgstr "Tastenkonflikte entdeckt."
 
-#: src/gui/setup_players.cpp:57
+#: src/gui/setup_players.cpp:58
 msgid "Name"
 msgstr "Name"
 
-#: src/gui/setup_players.cpp:58
+#: src/gui/setup_players.cpp:59
 msgid "Relation"
 msgstr "Beziehung"
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:64
 msgid "Neutral"
 msgstr "Neutral"
 
-#: src/gui/setup_players.cpp:64
+#: src/gui/setup_players.cpp:65
 msgid "Friend"
 msgstr "Freund"
 
-#: src/gui/setup_players.cpp:65
+#: src/gui/setup_players.cpp:66
 msgid "Disregarded"
 msgstr "Unbeachtet"
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_players.cpp:67
 msgid "Ignored"
 msgstr "Ignoriert"
 
-#: src/gui/setup_players.cpp:208 src/gui/setup_video.cpp:132
+#: src/gui/setup_players.cpp:206 src/gui/setup_video.cpp:153
 msgid "???"
 msgstr "???"
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_players.cpp:225
 msgid "Allow trading"
 msgstr "Handeln erlauben"
 
-#: src/gui/setup_players.cpp:228
+#: src/gui/setup_players.cpp:227
 msgid "Allow whispers"
 msgstr "Flüstern erlauben"
 
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:231
 msgid "Put all whispers in tabs"
 msgstr "Alle privaten Nachrichten in Tabs öffnen"
 
-#: src/gui/setup_players.cpp:234
+#: src/gui/setup_players.cpp:233
 #, fuzzy
 msgid "Show gender"
 msgstr "Geschlecht"
 
-#: src/gui/setup_players.cpp:236
+#: src/gui/setup_players.cpp:235
+#, fuzzy
+msgid "Enable Chat log"
+msgstr "Verkauf fehlgeschlagen."
+
+#: src/gui/setup_players.cpp:237
 msgid "Players"
 msgstr "Spieler"
 
-#: src/gui/setup_players.cpp:261
+#: src/gui/setup_players.cpp:262
 msgid "When ignoring:"
 msgstr "Wenn ignorierend:"
 
-#: src/gui/setup_video.cpp:113
+#: src/gui/setup_video.cpp:134
 msgid "Tiny"
 msgstr "Winzig"
 
-#: src/gui/setup_video.cpp:114
+#: src/gui/setup_video.cpp:135
 msgid "Small"
 msgstr "Klein"
 
-#: src/gui/setup_video.cpp:115
+#: src/gui/setup_video.cpp:136
 msgid "Medium"
 msgstr "Mittel"
 
-#: src/gui/setup_video.cpp:116
+#: src/gui/setup_video.cpp:137
 msgid "Large"
 msgstr "Groß"
 
-#: src/gui/setup_video.cpp:142
+#: src/gui/setup_video.cpp:163
 msgid "No text"
 msgstr "Kein Text"
 
-#: src/gui/setup_video.cpp:143
+#: src/gui/setup_video.cpp:164
 msgid "Text"
 msgstr "Text"
 
-#: src/gui/setup_video.cpp:144
+#: src/gui/setup_video.cpp:165
 msgid "Bubbles, no names"
 msgstr "Blasen, keine Namen"
 
-#: src/gui/setup_video.cpp:145
+#: src/gui/setup_video.cpp:166
 msgid "Bubbles with names"
 msgstr "Blasen mit Namen"
 
-#: src/gui/setup_video.cpp:157
+#: src/gui/setup_video.cpp:178
 msgid "off"
 msgstr "Aus"
 
-#: src/gui/setup_video.cpp:158 src/gui/setup_video.cpp:171
+#: src/gui/setup_video.cpp:179 src/gui/setup_video.cpp:192
 msgid "low"
 msgstr "Niedrig"
 
-#: src/gui/setup_video.cpp:159 src/gui/setup_video.cpp:173
+#: src/gui/setup_video.cpp:180 src/gui/setup_video.cpp:194
 msgid "high"
 msgstr "Hoch"
 
-#: src/gui/setup_video.cpp:172
+#: src/gui/setup_video.cpp:193
 msgid "medium"
 msgstr "Mittel"
 
-#: src/gui/setup_video.cpp:174
+#: src/gui/setup_video.cpp:195
 msgid "max"
 msgstr "Maximal"
 
-#: src/gui/setup_video.cpp:196
+#: src/gui/setup_video.cpp:217
 msgid "Full screen"
 msgstr "Vollbild"
 
-#: src/gui/setup_video.cpp:197
+#: src/gui/setup_video.cpp:218
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:198
+#: src/gui/setup_video.cpp:219
 msgid "Custom cursor"
 msgstr "Benutzerdefinierter Zeiger"
 
-#: src/gui/setup_video.cpp:200
+#: src/gui/setup_video.cpp:221
 msgid "Visible names"
 msgstr "Sichtbare Namen"
 
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:223
 msgid "Particle effects"
 msgstr "Partikeleffekte"
 
-#: src/gui/setup_video.cpp:204
+#: src/gui/setup_video.cpp:225
 #, fuzzy
 msgid "Show own name"
 msgstr "Eigener Name"
 
-#: src/gui/setup_video.cpp:205
+#: src/gui/setup_video.cpp:226
+msgid "Log NPC dialogue"
+msgstr ""
+
+#: src/gui/setup_video.cpp:227
 msgid "Show pickup notification"
 msgstr "Benachrichtigung beim Aufheben"
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:207
+#. TRANSLATORS: Refers to "Show pickup notification"
+#: src/gui/setup_video.cpp:229
 msgid "in chat"
 msgstr "im Chatfenster"
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:209
+#. TRANSLATORS: Refers to "Show pickup notification"
+#: src/gui/setup_video.cpp:231
 msgid "as particle"
 msgstr "als Partikeleffekt"
 
-#: src/gui/setup_video.cpp:214
+#: src/gui/setup_video.cpp:236
 #, fuzzy
 msgid "FPS limit:"
 msgstr "FPS-Limit:"
 
-#: src/gui/setup_video.cpp:225
+#: src/gui/setup_video.cpp:247
+msgid "Disable transparency (Low CPU mode)"
+msgstr ""
+
+#: src/gui/setup_video.cpp:250
 msgid "Video"
 msgstr "Video"
 
-#: src/gui/setup_video.cpp:227
+#: src/gui/setup_video.cpp:252
 #, fuzzy
-msgid "Show monster damage"
+msgid "Show damage"
 msgstr "Eigener Name"
 
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:258
 msgid "Overhead text"
 msgstr "Chat über Spielern"
 
-#: src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:259
 msgid "Gui opacity"
 msgstr "GUI-Transparenz"
 
-#: src/gui/setup_video.cpp:235
+#: src/gui/setup_video.cpp:260
 msgid "Ambient FX"
 msgstr "Hintergrundeffekte"
 
-#: src/gui/setup_video.cpp:236
+#: src/gui/setup_video.cpp:261
 #, fuzzy
 msgid "Particle detail"
 msgstr "Partikeldetail"
 
-#: src/gui/setup_video.cpp:237
+#: src/gui/setup_video.cpp:262
 msgid "Font size"
 msgstr "Schriftgröße"
 
-#: src/gui/setup_video.cpp:251 src/gui/setup_video.cpp:454
-#: src/gui/setup_video.cpp:568
+#: src/gui/setup_video.cpp:277 src/gui/setup_video.cpp:532
+#: src/gui/setup_video.cpp:662
 #, fuzzy
 msgid "None"
 msgstr "Nein"
 
-#: src/gui/setup_video.cpp:381
+#: src/gui/setup_video.cpp:426
 #, fuzzy
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr "Auflösung und Wiederherstellung der alten Auflösung schlug fehl!"
 
-#: src/gui/setup_video.cpp:387
+#: src/gui/setup_video.cpp:432
 #, fuzzy
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr "Auflösung und Wiederherstellung der alten Auflösung schlug fehl!"
 
-#: src/gui/setup_video.cpp:398
+#: src/gui/setup_video.cpp:443
 #, fuzzy
 msgid "Switching to Full Screen"
 msgstr "Wechsle zum Vollbildmodus"
 
-#: src/gui/setup_video.cpp:399
+#: src/gui/setup_video.cpp:444
 msgid "Restart needed for changes to take effect."
 msgstr "Änderungen treten erst nach einem Neustart des Programms in Kraft."
 
-#: src/gui/setup_video.cpp:411
+#: src/gui/setup_video.cpp:458
 #, fuzzy
 msgid "Changing to OpenGL"
 msgstr "Ändere OpenGL"
 
-#: src/gui/setup_video.cpp:412
+#: src/gui/setup_video.cpp:459
+msgid ""
+"Applying change to OpenGL requires restart. In case OpenGL messes up your "
+"game graphics, restart the game with the command line option \"--no-opengl\"."
+msgstr ""
+
+#: src/gui/setup_video.cpp:466
+msgid "Deactivating OpenGL"
+msgstr ""
+
+#: src/gui/setup_video.cpp:467
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 "Änderungen an OpenGL werden erst nach einem Neustart der Anwendung "
 "übernommen."
 
-#: src/gui/setup_video.cpp:486 src/gui/setup_video.cpp:491
+#: src/gui/setup_video.cpp:475
+#, fuzzy
+msgid "Transparency disabled"
+msgstr "Teilen der Erfahrungspunkte deaktiviert."
+
+#: src/gui/setup_video.cpp:476 src/gui/setup_video.cpp:484
+msgid "You must restart to apply changes."
+msgstr ""
+
+#: src/gui/setup_video.cpp:483
+msgid "Transparency enabled"
+msgstr ""
+
+#: src/gui/setup_video.cpp:576 src/gui/setup_video.cpp:581
 #, fuzzy
 msgid "Screen Resolution Changed"
 msgstr "Auflösung geändert"
 
-#: src/gui/setup_video.cpp:487 src/gui/setup_video.cpp:492
+#: src/gui/setup_video.cpp:577 src/gui/setup_video.cpp:582
 msgid "Restart your client for the change to take effect."
 msgstr "Starte das Spiel neu um die Änderungen zu übernehmen."
 
-#: src/gui/setup_video.cpp:489
+#: src/gui/setup_video.cpp:579
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 "Einige Fenster können verschoben werden um sich an die geänderte Auflösung "
 "anzupassen."
 
-#: src/gui/setup_video.cpp:522
+#: src/gui/setup_video.cpp:612
 #, fuzzy
 msgid "Particle Effect Settings Changed."
 msgstr "Partikeleffekteinstellungen geändert."
 
-#: src/gui/setup_video.cpp:523
+#: src/gui/setup_video.cpp:613
 msgid "Changes will take effect on map change."
 msgstr "Änderung werden beim nächsten Kartenwechsel übernommen."
 
-#: src/gui/skilldialog.cpp:198 src/gui/windowmenu.cpp:59
+#: src/gui/skilldialog.cpp:212 src/gui/windowmenu.cpp:59
 msgid "Skills"
 msgstr "Fertigkeiten"
 
-#: src/gui/skilldialog.cpp:209
+#: src/gui/skilldialog.cpp:223
 msgid "Up"
 msgstr "Erhöhen"
 
-#: src/gui/skilldialog.cpp:263
+#: src/gui/skilldialog.cpp:269
 #, fuzzy, c-format
 msgid "Skill points available: %d"
 msgstr "Fähigkeitspunkte: %d"
 
-#: src/gui/skilldialog.cpp:315
+#: src/gui/skilldialog.cpp:351
 #, fuzzy, c-format
 msgid "Skill Set %d"
 msgstr "Fähigkeitspunkte: %d"
 
-#: src/gui/skilldialog.cpp:324
+#: src/gui/skilldialog.cpp:360
 #, fuzzy, c-format
 msgid "Skill %d"
 msgstr "Fertigkeiten"
 
-#: src/gui/skilldialog.cpp:406
+#: src/gui/skilldialog.cpp:442
 #, fuzzy, c-format
 msgid "Lvl: %d (%+d)"
 msgstr "Stufe: %d"
 
-#: src/gui/skilldialog.cpp:417
+#: src/gui/skilldialog.cpp:453
 #, fuzzy, c-format
 msgid "Lvl: %d"
 msgstr "Stufe: %d"
 
-#: src/gui/socialwindow.cpp:118
+#: src/gui/socialwindow.cpp:126
 #, fuzzy, c-format
 msgid "Invited user %s to guild %s."
 msgstr "Spieler %s einladen"
 
-#: src/gui/socialwindow.cpp:127
+#: src/gui/socialwindow.cpp:139
 #, fuzzy, c-format
 msgid "Guild %s quit requested."
 msgstr "Gilde %s wurde aufgelöst."
 
-#: src/gui/socialwindow.cpp:137
+#: src/gui/socialwindow.cpp:153
 #, fuzzy
 msgid "Member Invite to Guild"
 msgstr "Spieler einladen"
 
-#: src/gui/socialwindow.cpp:138
+#: src/gui/socialwindow.cpp:154
 #, fuzzy, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr "Wen möchtest du einladen?"
 
-#: src/gui/socialwindow.cpp:147
+#: src/gui/socialwindow.cpp:163
 #, fuzzy
 msgid "Leave Guild?"
 msgstr "Gilde erstellen"
 
-#: src/gui/socialwindow.cpp:148
+#: src/gui/socialwindow.cpp:164
 #, fuzzy, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Bist Du sicher, dass Du das Spiel verlassen möchtest?"
 
-#: src/gui/socialwindow.cpp:183
+#: src/gui/socialwindow.cpp:207 src/net/tmwa/partyhandler.cpp:330
 #, fuzzy, c-format
 msgid "Invited user %s to party."
 msgstr "Spieler %s einladen"
 
-#: src/gui/socialwindow.cpp:190
+#: src/gui/socialwindow.cpp:218
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:200
+#: src/gui/socialwindow.cpp:232
 #, fuzzy
 msgid "Member Invite to Party"
 msgstr "Spieler einladen"
 
-#: src/gui/socialwindow.cpp:201
+#: src/gui/socialwindow.cpp:233
 #, fuzzy, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr "Wen möchtest du einladen?"
 
-#: src/gui/socialwindow.cpp:210
+#: src/gui/socialwindow.cpp:242
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:211
+#: src/gui/socialwindow.cpp:243
 #, fuzzy, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Bist Du sicher, dass Du das Spiel verlassen möchtest?"
 
-#: src/gui/socialwindow.cpp:240
+#: src/gui/socialwindow.cpp:272
 msgid "Create Guild"
 msgstr "Gilde erstellen"
 
-#: src/gui/socialwindow.cpp:241 src/gui/socialwindow.cpp:565
+#: src/gui/socialwindow.cpp:273 src/gui/socialwindow.cpp:620
 #, fuzzy
 msgid "Create Party"
 msgstr "Charakter erstellen"
 
-#: src/gui/socialwindow.cpp:280 src/gui/windowmenu.cpp:64
+#: src/gui/socialwindow.cpp:312 src/gui/windowmenu.cpp:64
 #, fuzzy
 msgid "Social"
 msgstr "Special"
 
-#: src/gui/socialwindow.cpp:298
+#: src/gui/socialwindow.cpp:330
 #, fuzzy
 msgid "Invite"
 msgstr "einladen"
 
-#: src/gui/socialwindow.cpp:299
+#: src/gui/socialwindow.cpp:331
 #, fuzzy
 msgid "Leave"
 msgstr "Stufe: %d"
 
-#: src/gui/socialwindow.cpp:395
+#: src/gui/socialwindow.cpp:443
 #, fuzzy, c-format
 msgid "Accepted party invite from %s."
 msgstr "Partyeinladung von %s angenommen."
 
-#: src/gui/socialwindow.cpp:401
+#: src/gui/socialwindow.cpp:449
 #, fuzzy, c-format
 msgid "Rejected party invite from %s."
 msgstr "Partyeinladung von %s abgelehnt."
 
-#: src/gui/socialwindow.cpp:414
+#: src/gui/socialwindow.cpp:462
 #, fuzzy, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Partyeinladung von %s angenommen."
 
-#: src/gui/socialwindow.cpp:420
+#: src/gui/socialwindow.cpp:468
 #, fuzzy, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Partyeinladung von %s abgelehnt."
 
-#: src/gui/socialwindow.cpp:464
+#: src/gui/socialwindow.cpp:497
+msgid "Creating guild failed, please choose a shorter name."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:504
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Erstelle der Gilde %s."
 
-#: src/gui/socialwindow.cpp:478
+#: src/gui/socialwindow.cpp:520
+msgid "Creating party failed, please choose a shorter name."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:527
 #, fuzzy, c-format
 msgid "Creating party called %s."
 msgstr "Erstelle der Gilde %s."
 
-#: src/gui/socialwindow.cpp:485
+#: src/gui/socialwindow.cpp:541
 msgid "Guild Name"
 msgstr "Gildenname"
 
-#: src/gui/socialwindow.cpp:486
+#: src/gui/socialwindow.cpp:542
 msgid "Choose your guild's name."
 msgstr "Wähle den Namen deiner Gilde"
 
-#: src/gui/socialwindow.cpp:498
+#: src/gui/socialwindow.cpp:554
 #, fuzzy
 msgid "Received guild request, but one already exists."
 msgstr "Anfrage für eine Party erhalten, aber du bist bereits in einer Party."
 
-#: src/gui/socialwindow.cpp:503
+#: src/gui/socialwindow.cpp:559
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s hat Dich eingeladen, seiner Gilde %s beizutreten."
 
-#: src/gui/socialwindow.cpp:508
+#: src/gui/socialwindow.cpp:564
 msgid "Accept Guild Invite"
 msgstr "Nehme Gildeneinladung an"
 
-#: src/gui/socialwindow.cpp:520
+#: src/gui/socialwindow.cpp:576
 msgid "Received party request, but one already exists."
 msgstr "Anfrage für eine Party erhalten, aber du bist bereits in einer Party."
 
-#: src/gui/socialwindow.cpp:530
+#: src/gui/socialwindow.cpp:585
 #, fuzzy
 msgid "You have been invited you to join a party."
 msgstr "%s hat dich in seine Party eingeladen."
 
-#: src/gui/socialwindow.cpp:534
+#: src/gui/socialwindow.cpp:589
 #, fuzzy, c-format
 msgid "You have been invited to join the %s party."
 msgstr "%s hat dich eingeladen, an der Party %s teilzunehmen."
 
-#: src/gui/socialwindow.cpp:542
+#: src/gui/socialwindow.cpp:597
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s hat dich in seine Party eingeladen."
 
-#: src/gui/socialwindow.cpp:547
+#: src/gui/socialwindow.cpp:602
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s hat dich eingeladen, an der Party %s teilzunehmen."
 
-#: src/gui/socialwindow.cpp:555
+#: src/gui/socialwindow.cpp:610
 msgid "Accept Party Invite"
 msgstr "Nehme Partyeinladung an"
 
-#: src/gui/socialwindow.cpp:566
+#: src/gui/socialwindow.cpp:621
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:571
+#: src/gui/socialwindow.cpp:626
 #, fuzzy
 msgid "Party Name"
 msgstr "Party"
 
-#: src/gui/socialwindow.cpp:572
+#: src/gui/socialwindow.cpp:627
 #, fuzzy
 msgid "Choose your party's name."
 msgstr "Wähle den Namen deiner Gilde"
 
-#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:62
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:62
 msgid "Specials"
 msgstr "Special"
 
-#: src/gui/specialswindow.cpp:174
-#, c-format
-msgid "Specials Set %d"
-msgstr ""
-
-#: src/gui/specialswindow.cpp:191
-#, c-format
-msgid "Special %d"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:247
+#: src/gui/statuswindow.cpp:113 src/gui/statuswindow.cpp:215
+#: src/gui/statuswindow.cpp:262
 #, c-format
 msgid "Level: %d"
 msgstr "Stufe: %d"
 
-#: src/gui/statuswindow.cpp:101 src/gui/statuswindow.cpp:211
+#: src/gui/statuswindow.cpp:114 src/gui/statuswindow.cpp:208
+#: src/gui/statuswindow.cpp:239
 #, c-format
 msgid "Money: %s"
 msgstr "Geld: %s"
 
-#: src/gui/statuswindow.cpp:104
+#: src/gui/statuswindow.cpp:117
 msgid "HP:"
 msgstr "HP:"
 
-#: src/gui/statuswindow.cpp:109
+#: src/gui/statuswindow.cpp:122
 msgid "Exp:"
 msgstr "Exp:"
 
-#: src/gui/statuswindow.cpp:114
+#: src/gui/statuswindow.cpp:130
 msgid "MP:"
 msgstr "MP:"
 
-#: src/gui/statuswindow.cpp:132 src/gui/statuswindow.cpp:219
+#: src/gui/statuswindow.cpp:158 src/gui/statuswindow.cpp:275
 #, c-format
 msgid "Job: %d"
 msgstr "Beruf: %d"
 
-#: src/gui/statuswindow.cpp:133
+#: src/gui/statuswindow.cpp:159
 msgid "Job:"
 msgstr "Beruf:"
 
-#: src/gui/statuswindow.cpp:194
-#, fuzzy
-msgid "HP"
-msgstr "HP:"
-
-#: src/gui/statuswindow.cpp:200
-#, fuzzy
-msgid "MP"
-msgstr "MP:"
-
-#: src/gui/statuswindow.cpp:206
-#, fuzzy
-msgid "Exp"
-msgstr "Exp:"
-
-#: src/gui/statuswindow.cpp:215
-#, fuzzy
-msgid "Money"
-msgstr "Geld: %d"
-
-#: src/gui/statuswindow.cpp:225
-#, fuzzy
-msgid "Job"
-msgstr "Job:"
-
-#: src/gui/statuswindow.cpp:229
+#: src/gui/statuswindow.cpp:211 src/gui/statuswindow.cpp:247
 #, fuzzy, c-format
 msgid "Character points: %d"
 msgstr "Spielfigurattribute OK"
 
-#: src/gui/statuswindow.cpp:235
+#: src/gui/statuswindow.cpp:255
 #, fuzzy, c-format
 msgid "Correction points: %d"
 msgstr "Fähigkeitspunkte: %d"
 
-#: src/gui/statuswindow.cpp:251
-#, fuzzy
-msgid "Level"
-msgstr "Stufe: %d"
-
-#: src/gui/storagewindow.cpp:59
-msgid "Storage"
-msgstr "Lager"
-
-#: src/gui/trade.cpp:52
+#: src/gui/trade.cpp:53
 msgid "Propose trade"
 msgstr "Handel vorschlagen"
 
-#: src/gui/trade.cpp:53
+#: src/gui/trade.cpp:54
 msgid "Confirmed. Waiting..."
 msgstr "Bestätigt. Warten..."
 
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:55
 msgid "Agree trade"
 msgstr "Handel zustimmen"
 
-#: src/gui/trade.cpp:55
+#: src/gui/trade.cpp:56
 msgid "Agreed. Waiting..."
 msgstr "Zugestimmt. Warten..."
 
-#: src/gui/trade.cpp:58
+#: src/gui/trade.cpp:59
 msgid "Trade: You"
 msgstr "Handel: Du"
 
-#: src/gui/trade.cpp:74 src/gui/trade.cpp:75
+#: src/gui/trade.cpp:73 src/gui/trade.cpp:74
 msgid "Trade"
 msgstr "Handeln"
 
-#: src/gui/trade.cpp:77
+#: src/gui/trade.cpp:76
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: src/gui/trade.cpp:99 src/gui/trade.cpp:135
+#: src/gui/trade.cpp:98 src/gui/trade.cpp:134
 #, fuzzy, c-format
 msgid "You get %s"
 msgstr "Du erhältst %s."
 
-#: src/gui/trade.cpp:100
+#: src/gui/trade.cpp:99
 msgid "You give:"
 msgstr "Du gibst:"
 
-#: src/gui/trade.cpp:104
+#: src/gui/trade.cpp:103
 msgid "Change"
 msgstr "Ändern"
 
-#: src/gui/trade.cpp:275
+#: src/gui/trade.cpp:262
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Gegenstand konnte nicht hinzugefügt werden. Du kannst keinen weiteren dieser "
 "Gegenstände hinzufügen."
 
-#: src/gui/trade.cpp:318
+#: src/gui/trade.cpp:304
 msgid "You don't have enough money."
 msgstr "Du hast nicht genügend Geld."
 
@@ -1938,22 +1987,22 @@ msgstr "Verbinde..."
 msgid "Play"
 msgstr "Los!"
 
-#: src/gui/updatewindow.cpp:405
+#: src/gui/updatewindow.cpp:417
 msgid "##1  The update process is incomplete."
 msgstr "##1 Update wurde nicht erfolgreich abgeschlossen."
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:407
+#: src/gui/updatewindow.cpp:419
 msgid "##1  It is strongly recommended that"
 msgstr "##1 Es wird dringend empfohlen,"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:409
+#: src/gui/updatewindow.cpp:421
 #, fuzzy
 msgid "##1  you try again later."
 msgstr "##1 es später erneut zu versuchen."
 
-#: src/gui/updatewindow.cpp:501
+#: src/gui/updatewindow.cpp:515
 msgid "Completed"
 msgstr "Fertig"
 
@@ -2035,55 +2084,55 @@ msgstr "Gib einen Spieler an, der Moderator werden soll!"
 msgid "Need a user to kick!"
 msgstr "Gib einen Spieler an, der aus dem Kanal geworfen werden soll"
 
-#: src/gui/widgets/chattab.cpp:118
+#: src/gui/widgets/chattab.cpp:121
 msgid "Global announcement:"
 msgstr "Globale Ansage:"
 
-#: src/gui/widgets/chattab.cpp:124
+#: src/gui/widgets/chattab.cpp:127
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "Globale Ansage von %s:"
 
-#: src/gui/widgets/chattab.cpp:150
+#: src/gui/widgets/chattab.cpp:153
 #, fuzzy, c-format
 msgid "%s whispers: %s"
 msgstr "%s flüstert: "
 
-#: src/gui/widgets/whispertab.cpp:51
+#: src/gui/widgets/whispertab.cpp:53
 msgid "Cannot send empty chat!"
 msgstr "Kann keine leere Nachricht senden!"
 
-#: src/gui/widgets/whispertab.cpp:70
+#: src/gui/widgets/whispertab.cpp:72
 msgid "/ignore > Ignore the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:71
+#: src/gui/widgets/whispertab.cpp:73
 msgid "/unignore > Stop ignoring the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:72
+#: src/gui/widgets/whispertab.cpp:74
 msgid "/close > Close the whisper tab"
 msgstr "/close > Schließe einen privaten Tab"
 
-#: src/gui/widgets/whispertab.cpp:82
+#: src/gui/widgets/whispertab.cpp:84
 msgid "Command: /close"
 msgstr "Befehl: /close"
 
-#: src/gui/widgets/whispertab.cpp:83
+#: src/gui/widgets/whispertab.cpp:85
 msgid "This command closes the current whisper tab."
 msgstr "Dieser Befehl schließt den aktuellen privaten Tab."
 
-#: src/gui/widgets/whispertab.cpp:87
+#: src/gui/widgets/whispertab.cpp:89
 #, fuzzy
 msgid "Command: /ignore"
 msgstr "Befehl: /item"
 
-#: src/gui/widgets/whispertab.cpp:88
+#: src/gui/widgets/whispertab.cpp:90
 #, fuzzy
 msgid "This command ignores the other player regardless of current relations."
 msgstr "Dieser Befehl zeigt die Anzahl der Spieler an, die gerade online sind."
 
-#: src/gui/widgets/whispertab.cpp:94
+#: src/gui/widgets/whispertab.cpp:96
 #, fuzzy
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
@@ -2113,633 +2162,979 @@ msgstr "Ändern"
 msgid "Choose World"
 msgstr "Wähle deinen Server"
 
-#: src/keyboardconfig.cpp:40
+#: src/keyboardconfig.cpp:39
 msgid "Move Up"
 msgstr "Laufe Hoch"
 
-#: src/keyboardconfig.cpp:41
+#: src/keyboardconfig.cpp:40
 msgid "Move Down"
 msgstr "Laufe Runter"
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:41
 msgid "Move Left"
 msgstr "Laufe nach Links"
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:42
 msgid "Move Right"
 msgstr "Laufe nach Rechts"
 
-#: src/keyboardconfig.cpp:44 src/net/ea/generalhandler.cpp:223
+#: src/keyboardconfig.cpp:43 src/net/tmwa/generalhandler.cpp:237
 msgid "Attack"
 msgstr "Angriff"
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:44
 msgid "Target & Attack"
 msgstr "Zielen & Angreifen"
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:45
 msgid "Smilie"
 msgstr "Grinsen"
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:46
 msgid "Talk"
 msgstr "Sprechen"
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:47
 msgid "Stop Attack"
 msgstr "Angriff abbrechen"
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:48
 #, fuzzy
 msgid "Target Monster"
 msgstr "Nächstes Ziel anvisieren"
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboardconfig.cpp:49
 msgid "Target NPC"
 msgstr "NPC anvisieren"
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:50
 msgid "Target Player"
 msgstr "Spieler anvisieren"
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:51
 msgid "Pickup"
 msgstr "Aufheben"
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:52
 msgid "Hide Windows"
 msgstr "Fenster ausblenden"
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:53
 msgid "Sit"
 msgstr "Sitzen"
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:54
 msgid "Screenshot"
 msgstr "Bildschirmfoto"
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:55
 msgid "Enable/Disable Trading"
 msgstr "Handeln erlauben/verbieten"
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:56
 msgid "Find Path to Mouse"
 msgstr "Finde Weg zum Mauszeiger"
 
-#: src/keyboardconfig.cpp:58 src/keyboardconfig.cpp:59
-#: src/keyboardconfig.cpp:60 src/keyboardconfig.cpp:61
-#: src/keyboardconfig.cpp:62 src/keyboardconfig.cpp:63
-#: src/keyboardconfig.cpp:64 src/keyboardconfig.cpp:65
-#: src/keyboardconfig.cpp:66 src/keyboardconfig.cpp:67
-#: src/keyboardconfig.cpp:68 src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:57 src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60
+#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62
+#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64
+#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68
 #, c-format
 msgid "Item Shortcut %d"
 msgstr "Kurztaste %d"
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:69
 msgid "Help Window"
 msgstr "Hilfefenster"
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:70
 msgid "Status Window"
 msgstr "Statusfenster"
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:71
 msgid "Inventory Window"
 msgstr "Inventarfenster"
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:72
 msgid "Equipment Window"
 msgstr "Ausrüstungsfenster"
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:73
 msgid "Skill Window"
 msgstr "Fertigkeitenfenster"
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:74
 msgid "Minimap Window"
 msgstr "Kartenfenster"
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:75
 msgid "Chat Window"
 msgstr "Chatfenster"
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:76
 msgid "Item Shortcut Window"
 msgstr "Kurztastenfenster"
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:77
 msgid "Setup Window"
 msgstr "Einstellungen"
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:78
 msgid "Debug Window"
 msgstr "Debugfenster"
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:79
 #, fuzzy
 msgid "Social Window"
 msgstr "Fertigkeitenfenster"
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:80
 msgid "Emote Shortcut Window"
 msgstr "Kurztasten für Gefühle"
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:81
 #, fuzzy
 msgid "Outfits Window"
 msgstr "Statusfenster"
 
-#: src/keyboardconfig.cpp:83
+#: src/keyboardconfig.cpp:82
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:83
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86
-#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88
-#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90
-#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92
-#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:84 src/keyboardconfig.cpp:85
+#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:87
+#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:89
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:91
+#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:93
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:95
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "Gefühlstaste %d"
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:96
 msgid "Toggle Chat"
 msgstr "Chat ein/aus"
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:97
 msgid "Scroll Chat Up"
 msgstr "Im Chat hochscrollen"
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:98
 msgid "Scroll Chat Down"
 msgstr "Im Chat runter scrollen"
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:99
 msgid "Previous Chat Tab"
 msgstr "Voriger Tab"
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:100
 msgid "Next Chat Tab"
 msgstr "Nächster Tab"
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:101
 msgid "Select OK"
 msgstr "OK auswählen"
 
-#: src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:103
 msgid "Ignore input 1"
 msgstr "Ignoriere Eingabe 1"
 
-#: src/keyboardconfig.cpp:105
+#: src/keyboardconfig.cpp:104
 msgid "Ignore input 2"
 msgstr "Ignoriere Eingabe 2"
 
-#: src/keyboardconfig.cpp:184
+#: src/keyboardconfig.cpp:183
 #, fuzzy, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr "Bitte beheben, oder es wird zu merkwürdigem Verhalten im Spiel kommen."
 
-#: src/localplayer.cpp:914
+#: src/localplayer.cpp:985
 msgid "Unable to pick up item."
 msgstr "Kann Gegenstand nicht aufheben."
 
 #. TRANSLATORS: This sentence may be translated differently
 #. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:923
+#: src/localplayer.cpp:994
 #, fuzzy, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "Du hast %s [@@%d|%s@@] aufgehoben."
 msgstr[1] "Du hast %s [@@%d|%s@@] aufgehoben."
 
-#: src/main.cpp:43
+#: src/main.cpp:42
 msgid "mana [options] [mana-file]"
 msgstr ""
 
+#: src/main.cpp:43
+msgid "[mana-file] : The mana file is an XML file (.mana)"
+msgstr ""
+
 #: src/main.cpp:44
+msgid "              used to set custom parameters"
+msgstr ""
+
+#: src/main.cpp:45
+msgid "              to the mana client."
+msgstr ""
+
+#: src/main.cpp:47
 msgid "Options:"
 msgstr "Optionen:"
 
-#: src/main.cpp:45
+#: src/main.cpp:48
 msgid "  -v --version        : Display the version"
 msgstr "  -v --version        : Die Version des Spieles anzeigen"
 
-#: src/main.cpp:46
+#: src/main.cpp:49
 msgid "  -h --help           : Display this help"
 msgstr "  - --help           : Zeigt diesen Hilfstext an"
 
-#: src/main.cpp:47
+#: src/main.cpp:50
 #, fuzzy
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr "  -C --config-file     : zu benutzende Konfigurationsdatei"
 
-#: src/main.cpp:48
+#: src/main.cpp:51
 msgid "  -U --username       : Login with this username"
 msgstr "  -U --username       : Mit angegebenem Benutzernamen anmelden"
 
-#: src/main.cpp:49
+#: src/main.cpp:52
 msgid "  -P --password       : Login with this password"
 msgstr "  -P --password       : Angegebenes Passwort benutzen"
 
-#: src/main.cpp:50
+#: src/main.cpp:53
 msgid "  -c --character      : Login with this character"
 msgstr "  -c --charakter      : Mit angegebenem Spieler anmelden"
 
-#: src/main.cpp:51
+#: src/main.cpp:54
 msgid "  -s --server         : Login server name or IP"
 msgstr "  -s --server         : Name oder IP-Adresse des Loginservers"
 
-#: src/main.cpp:52
+#: src/main.cpp:55
 msgid "  -p --port           : Login server port"
 msgstr "  -p --port           : Port des Loginservers"
 
-#: src/main.cpp:53
+#: src/main.cpp:56
 #, fuzzy
 msgid "     --update-host    : Use this update host"
 msgstr "  -H --update-host    : Benutze angegebenen Updateserver"
 
-#: src/main.cpp:54
+#: src/main.cpp:57
 msgid "  -D --default        : Choose default character server and character"
 msgstr "  -D --default        : Wähle zuletzt benutzten Server und Spieler aus"
 
-#: src/main.cpp:56
+#: src/main.cpp:59
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr "  -u --skip-update    : Überspringe das Herunterladen von Updates"
 
-#: src/main.cpp:57
+#: src/main.cpp:60
 msgid "  -d --data           : Directory to load game data from"
-msgstr "  -d --data           : Datenverzeichnis, aus dem das Spiel geladen werden soll"
+msgstr ""
+"  -d --data           : Datenverzeichnis, aus dem das Spiel geladen werden "
+"soll"
 
-#: src/main.cpp:58
+#: src/main.cpp:61
 #, fuzzy
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
+msgid "     --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 "  -S --home-dir : Verzeichnis, das als Heimatverzeichnis benutzt werden soll"
 
-#: src/main.cpp:59
+#: src/main.cpp:62
+#, fuzzy
+msgid "     --chat-log-dir   : Chat log dir to use"
+msgstr "  -C --config-file     : zu benutzende Konfigurationsdatei"
+
+#: src/main.cpp:63
 #, fuzzy
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 "  -S --home-dir : Verzeichnis, das als Heimatverzeichnis benutzt werden soll"
 
-#: src/main.cpp:61
+#: src/main.cpp:65
 #, fuzzy
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr "  -O --no-opengl      : OpenGL-Erweiterungen deaktivieren"
 
-#: src/net/ea/adminhandler.cpp:63
+#: src/net/manaserv/beinghandler.cpp:303 src/net/tmwa/playerhandler.cpp:94
+msgid "You are dead."
+msgstr "Ach ja: Du bist Tot."
+
+#: src/net/manaserv/beinghandler.cpp:304 src/net/tmwa/playerhandler.cpp:95
+msgid "We regret to inform you that your character was killed in battle."
+msgstr ""
+"Es tut uns Leid, Euch mitteilen zu müssen, dass Ihr im Kampfe gefallen seid."
+
+#: src/net/manaserv/beinghandler.cpp:306 src/net/tmwa/playerhandler.cpp:97
+msgid "You are not that alive anymore."
+msgstr "Du bist nicht länger lebendig."
+
+#: src/net/manaserv/beinghandler.cpp:307 src/net/tmwa/playerhandler.cpp:98
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr "Die kalten Hände des Sensenmanns greifen nach Deiner Seele."
+
+#: src/net/manaserv/beinghandler.cpp:308 src/net/tmwa/playerhandler.cpp:99
+msgid "Game Over!"
+msgstr "Game Over!"
+
+#: src/net/manaserv/beinghandler.cpp:309 src/net/tmwa/playerhandler.cpp:101
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+"Nein, Kinder. Euer Charakter ist nicht tot. Er... ähm... ist zu einem "
+"besserem Ort gegangen."
+
+#: src/net/manaserv/beinghandler.cpp:311 src/net/tmwa/playerhandler.cpp:103
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr ""
+"Dein Plan, die Waffe deines Feindes mit Deinem Hals zu zerstören, war leider "
+"nicht ganz so genial, wie Du dachtest..."
+
+#: src/net/manaserv/beinghandler.cpp:313 src/net/tmwa/playerhandler.cpp:105
+msgid "I guess this did not run too well."
+msgstr "Ich glaube, das war nicht so gut."
+
+#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:107
+msgid "Do you want your possessions identified?"
+msgstr "Möchtest du eine Auflistung Deiner Verletzungen?"
+
+#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:109
+msgid "Sadly, no trace of you was ever found..."
+msgstr "Leider wurde niemals eine Spur von Dir gefunden..."
+
+#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:111
+msgid "Annihilated."
+msgstr "Vernichtet."
+
+#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:113
+msgid "Looks like you got your head handed to you."
+msgstr "Sieht aus, als würde Dein Kopf Dich anschauen."
+
+#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:115
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr ""
+"Du hast schon wieder versagt. Spül Deine Überreste hinunter und hol Dir "
+"einen paar Neue."
+
+#: src/net/manaserv/beinghandler.cpp:323
+msgid "Press OK to respawn."
+msgstr "Drücke \"OK\" um neu anzufangen."
+
+#: src/net/manaserv/beinghandler.cpp:324
+msgid "You Died"
+msgstr "Du bist tot."
+
+#: src/net/manaserv/charhandler.cpp:138 src/net/manaserv/charhandler.cpp:209
+msgid "Not logged in."
+msgstr "nicht angemeldet"
+
+#: src/net/manaserv/charhandler.cpp:141
+msgid "No empty slot."
+msgstr "Kein freier Slot."
+
+#: src/net/manaserv/charhandler.cpp:144
+msgid "Invalid name."
+msgstr "Ungültiger Name."
+
+#: src/net/manaserv/charhandler.cpp:147
+msgid "Character's name already exists."
+msgstr "Benutzername bereits vorhanden"
+
+#: src/net/manaserv/charhandler.cpp:150
+msgid "Invalid hairstyle."
+msgstr "Ungültiger Haarstil."
+
+#: src/net/manaserv/charhandler.cpp:153
+msgid "Invalid hair color."
+msgstr "Ungültige Haarfarbe."
+
+#: src/net/manaserv/charhandler.cpp:156
+msgid "Invalid gender."
+msgstr "Ungültiges Geschlecht."
+
+#: src/net/manaserv/charhandler.cpp:159
+msgid "Character's stats are too high."
+msgstr "Spielfigurattribute sind zu groß."
+
+#: src/net/manaserv/charhandler.cpp:162
+msgid "Character's stats are too low."
+msgstr "Spielfigurattribute sind zu klein"
+
+#: src/net/manaserv/charhandler.cpp:165
+#, c-format
+msgid "At least one statis out of the permitted range: (%u - %u)."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:171 src/net/manaserv/loginhandler.cpp:96
+#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
+#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
+#: src/net/tmwa/loginhandler.cpp:95 src/net/tmwa/loginhandler.cpp:182
+msgid "Unknown error."
+msgstr "Unbekannter Fehler"
+
+#: src/net/manaserv/charhandler.cpp:200 src/net/tmwa/charserverhandler.cpp:146
+msgid "Info"
+msgstr "Info"
+
+#: src/net/manaserv/charhandler.cpp:200
+msgid "Player deleted."
+msgstr "Spieler gelöscht"
+
+#: src/net/manaserv/charhandler.cpp:212
+#, fuzzy
+msgid "Selection out of range."
+msgstr "Wähle aus, wie viele Gegenstände Du tauschen möchtest."
+
+#: src/net/manaserv/charhandler.cpp:215
+#, fuzzy, c-format
+msgid "Unknown error (%d)."
+msgstr "Unbekannter Fehler"
+
+#: src/net/manaserv/charhandler.cpp:250
+msgid "No gameservers are available."
+msgstr "Kein Server verfügbar"
+
+#: src/net/manaserv/chathandler.cpp:187 src/net/manaserv/chathandler.cpp:313
+#: src/net/manaserv/guildhandler.cpp:260
+#, c-format
+msgid "Topic: %s"
+msgstr "Thema: %s"
+
+#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:274
+msgid "Players in this channel:"
+msgstr "Spieler im Kanal:"
+
+#: src/net/manaserv/chathandler.cpp:208
+msgid "Error joining channel."
+msgstr "Fehler beim Betreten des Kanals."
+
+#: src/net/manaserv/chathandler.cpp:214
+msgid "Listing channels."
+msgstr "Liste Kanäle"
+
+#: src/net/manaserv/chathandler.cpp:226
+msgid "End of channel list."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:303
+#, c-format
+msgid "%s entered the channel."
+msgstr "%s ist dem Kanal beigetreten."
+
+#: src/net/manaserv/chathandler.cpp:308
+#, c-format
+msgid "%s left the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:324
+#, c-format
+msgid "%s has set mode %s on user %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:334
+#, c-format
+msgid "%s has kicked %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:339
+#, fuzzy
+msgid "Unknown channel event."
+msgstr "Unbekannter Befehl."
+
+#: src/net/manaserv/guildhandler.cpp:82
+msgid "Guild created."
+msgstr "Gilde erstellt."
+
+#: src/net/manaserv/guildhandler.cpp:87
+msgid "Error creating guild."
+msgstr "Fehler beim Erstellen der Gilde."
+
+#: src/net/manaserv/guildhandler.cpp:97
+msgid "Invite sent."
+msgstr "Einladung gesendet."
+
+#: src/net/manaserv/guildhandler.cpp:204
+msgid "Member was promoted successfully."
+msgstr "Mitglied wurde erfolgreich befördert."
+
+#: src/net/manaserv/guildhandler.cpp:209
+msgid "Failed to promote member."
+msgstr "Beförderung des Mitglieds gescheitert."
+
+#: src/net/manaserv/loginhandler.cpp:87
+msgid "Wrong magic_token."
+msgstr "Fehlerhaftes Magiemerkmal"
+
+#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
+msgid "Already logged in."
+msgstr "Bereits angemeldet"
+
+#: src/net/manaserv/loginhandler.cpp:93
+#, fuzzy
+msgid "Account banned."
+msgstr "Account abgelaufen"
+
+#: src/net/manaserv/loginhandler.cpp:118
+msgid "New password incorrect."
+msgstr "Neues Passwort fehlerhaft"
+
+#: src/net/manaserv/loginhandler.cpp:121 src/net/tmwa/loginhandler.cpp:89
+msgid "Old password incorrect."
+msgstr "Altes Passwort fehlerhaft"
+
+#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
+msgid "Account not connected. Please login first."
+msgstr "Account nicht verbunden. Bitte melde Dich zuerst an."
+
+#: src/net/manaserv/loginhandler.cpp:149
+msgid "New email address incorrect."
+msgstr "Neue E-Mailadresse ist fehlerhaft"
+
+#: src/net/manaserv/loginhandler.cpp:152
+msgid "Old email address incorrect."
+msgstr "Alte E-Mailadresse ist fehlerhaft"
+
+#: src/net/manaserv/loginhandler.cpp:158
+msgid "The new email address already exists."
+msgstr "Die neue E-Mailadresse ist bereits vorhanden."
+
+#: src/net/manaserv/loginhandler.cpp:239
+msgid ""
+"Client registration is not allowed. Please contact server administration."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
+msgid "Client version is too old."
+msgstr "Die Version des Spiels ist zu alt"
+
+#: src/net/manaserv/loginhandler.cpp:266
+msgid "Wrong username or password."
+msgstr "Benutzername oder Passwort falsch"
+
+#: src/net/manaserv/loginhandler.cpp:272
+#, fuzzy
+msgid "Account banned"
+msgstr "Account abgelaufen"
+
+#: src/net/manaserv/loginhandler.cpp:275
+msgid "Login attempt too soon after previous attempt."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:303
+msgid "Wrong username, password or email address."
+msgstr "Benutzername, Passwort oder E-Mailadresse falsch"
+
+#: src/net/manaserv/loginhandler.cpp:306
+msgid "Username already exists."
+msgstr "Benutzername bereits vorhanden"
+
+#: src/net/manaserv/loginhandler.cpp:309
+msgid "Email address already exists."
+msgstr "E-Mailadresse bereits vorhanden"
+
+#: src/net/manaserv/loginhandler.cpp:312
+msgid "You took too long with the captcha or your response was incorrect."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:87
+msgid "Joined party."
+msgstr "Der Party beigetreten."
+
+#: src/net/manaserv/partyhandler.cpp:105
+#, c-format
+msgid "%s joined the party."
+msgstr "%s ist der Party beigetreten."
+
+#: src/net/manaserv/partyhandler.cpp:123
+#, c-format
+msgid "%s rejected your invite."
+msgstr "%s hat Deine Einladung zurückgewiesen."
+
+#: src/net/manaserv/tradehandler.cpp:95
+msgid "Accepting incoming trade requests."
+msgstr "Akzeptiere eingehende Handelsanfragen."
+
+#: src/net/manaserv/tradehandler.cpp:97
+msgid "Ignoring incoming trade requests."
+msgstr "Ignoriere eingehende Handelsanfragen."
+
+#: src/net/manaserv/tradehandler.cpp:115 src/net/tmwa/tradehandler.cpp:109
+msgid "Request for Trade"
+msgstr "Erbitte einen Handel"
+
+#: src/net/manaserv/tradehandler.cpp:116 src/net/tmwa/tradehandler.cpp:110
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
+msgstr "%s möchte mit dir handeln, stimmst Du zu?"
+
+#: src/net/manaserv/tradehandler.cpp:134
+#, c-format
+msgid "Trading with %s"
+msgstr "Handele mit %s"
+
+#: src/net/manaserv/tradehandler.cpp:148 src/net/tmwa/tradehandler.cpp:224
+msgid "Trade canceled."
+msgstr "Handel abgebrochen."
+
+#: src/net/manaserv/tradehandler.cpp:155 src/net/tmwa/tradehandler.cpp:231
+msgid "Trade completed."
+msgstr "Handel abgeschlossen."
+
+#: src/net/tmwa/adminhandler.cpp:64
 msgid "Kick failed!"
 msgstr "Spieler konnte nicht aus dem Kanal geworfen werden!"
 
-#: src/net/ea/adminhandler.cpp:65
+#: src/net/tmwa/adminhandler.cpp:66
 msgid "Kick succeeded!"
 msgstr "Spieler aus dem Kanal geworfen!"
 
-#: src/net/ea/buysellhandler.cpp:110
+#: src/net/tmwa/buysellhandler.cpp:109
 msgid "Nothing to sell."
 msgstr "Du hast nichts zu verkaufen."
 
-#: src/net/ea/buysellhandler.cpp:117
+#: src/net/tmwa/buysellhandler.cpp:116
 msgid "Thanks for buying."
 msgstr "Vielen Dank für den Einkauf."
 
-#: src/net/ea/buysellhandler.cpp:124
+#: src/net/tmwa/buysellhandler.cpp:123
 msgid "Unable to buy."
 msgstr "Kauf fehlgeschlagen."
 
-#: src/net/ea/buysellhandler.cpp:130
+#: src/net/tmwa/buysellhandler.cpp:129
 msgid "Thanks for selling."
 msgstr "Vielen Dank für den Verkauf."
 
-#: src/net/ea/buysellhandler.cpp:132
+#: src/net/tmwa/buysellhandler.cpp:131
 msgid "Unable to sell."
 msgstr "Verkauf fehlgeschlagen."
 
-#: src/net/ea/charserverhandler.cpp:103
-msgid "Access denied."
-msgstr "Zugang verweigert"
+#: src/net/tmwa/charserverhandler.cpp:103
+msgid "Access denied. Most likely, there are too many players on this server."
+msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:106
+#: src/net/tmwa/charserverhandler.cpp:107
 msgid "Cannot use this ID."
 msgstr "Kann diese ID nicht benutzen"
 
-#: src/net/ea/charserverhandler.cpp:109
-msgid "Unknown failure to select character."
-msgstr "Unbekannter Fehler bei Auswahl des Charakters"
+#: src/net/tmwa/charserverhandler.cpp:110
+#, fuzzy
+msgid "Unknown char-server failure."
+msgstr "Unbekannter Fehler"
 
-#: src/net/ea/charserverhandler.cpp:135
+#: src/net/tmwa/charserverhandler.cpp:134
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 "Charakter konnte nicht erstellt werden. Wahrscheinlich ist der Name bereits "
 "vergeben."
 
-#: src/net/ea/charserverhandler.cpp:147 src/net/manaserv/charhandler.cpp:187
-msgid "Info"
-msgstr "Info"
-
-#: src/net/ea/charserverhandler.cpp:147
+#: src/net/tmwa/charserverhandler.cpp:146
 msgid "Character deleted."
 msgstr "Spieler gelöscht."
 
-#: src/net/ea/charserverhandler.cpp:152
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Failed to delete character."
 msgstr "Spieler konnte nicht gelöscht werden."
 
-#: src/net/ea/charserverhandler.cpp:237 src/net/manaserv/charhandler.cpp:263
+#: src/net/tmwa/charserverhandler.cpp:266
 msgid "Strength:"
 msgstr "Stärke:"
 
-#: src/net/ea/charserverhandler.cpp:238 src/net/manaserv/charhandler.cpp:264
+#: src/net/tmwa/charserverhandler.cpp:267
 msgid "Agility:"
 msgstr "Agilität:"
 
-#: src/net/ea/charserverhandler.cpp:239 src/net/manaserv/charhandler.cpp:266
+#: src/net/tmwa/charserverhandler.cpp:268
 msgid "Vitality:"
 msgstr "Vitalität:"
 
-#: src/net/ea/charserverhandler.cpp:240 src/net/manaserv/charhandler.cpp:267
+#: src/net/tmwa/charserverhandler.cpp:269
 msgid "Intelligence:"
 msgstr "Intelligenz:"
 
-#: src/net/ea/charserverhandler.cpp:241 src/net/manaserv/charhandler.cpp:265
+#: src/net/tmwa/charserverhandler.cpp:270
 msgid "Dexterity:"
 msgstr "Geschicklichkeit:"
 
-#: src/net/ea/charserverhandler.cpp:242
+#: src/net/tmwa/charserverhandler.cpp:271
 msgid "Luck:"
 msgstr "Glück:"
 
-#: src/net/ea/chathandler.cpp:80
-msgid "Whisper could not be sent, user is offline."
+#: src/net/tmwa/chathandler.cpp:87
+#, fuzzy, c-format
+msgid "Whisper could not be sent, %s is offline."
 msgstr "Nachricht konnte nicht gesendet werden, Spieler ist offline."
 
-#: src/net/ea/chathandler.cpp:84
-msgid "Whisper could not be sent, ignored by user."
+#: src/net/tmwa/chathandler.cpp:96
+#, fuzzy, c-format
+msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 "Nachricht konnte nicht gesendet werden, sie wurde vom Spieler ignoriert."
 
-#: src/net/ea/chathandler.cpp:171
+#: src/net/tmwa/chathandler.cpp:230
 msgid "MVP player."
 msgstr "Spieler"
 
-#: src/net/ea/chathandler.cpp:204 src/net/ea/chathandler.cpp:210
-#: src/net/ea/chathandler.cpp:215 src/net/ea/chathandler.cpp:220
-#: src/net/ea/chathandler.cpp:225 src/net/ea/chathandler.cpp:230
-#: src/net/ea/chathandler.cpp:235 src/net/ea/chathandler.cpp:240
+#: src/net/tmwa/chathandler.cpp:265 src/net/tmwa/chathandler.cpp:271
+#: src/net/tmwa/chathandler.cpp:276 src/net/tmwa/chathandler.cpp:281
+#: src/net/tmwa/chathandler.cpp:286 src/net/tmwa/chathandler.cpp:291
+#: src/net/tmwa/chathandler.cpp:296 src/net/tmwa/chathandler.cpp:301
 msgid "Channels are not supported!"
 msgstr "Kanäle werden nicht unterstützt!"
 
-#: src/net/ea/gamehandler.cpp:86
+#: src/net/tmwa/gamehandler.cpp:88
 #, c-format
 msgid "Online users: %d"
 msgstr "Benutzer online: %d"
 
-#: src/net/ea/gamehandler.cpp:100
+#: src/net/tmwa/gamehandler.cpp:101
 msgid "Game"
 msgstr "Spiel"
 
-#: src/net/ea/gamehandler.cpp:100
+#: src/net/tmwa/gamehandler.cpp:101
 #, fuzzy
 msgid "Request to quit denied!"
 msgstr "Erbitte einen Handel"
 
-#: src/net/ea/generalhandler.cpp:102 src/net/manaserv/generalhandler.cpp:95
+#: src/net/tmwa/generalhandler.cpp:102
 #, c-format
 msgid "Strength %+d"
 msgstr "Stärke %+d"
 
-#: src/net/ea/generalhandler.cpp:103 src/net/manaserv/generalhandler.cpp:96
+#: src/net/tmwa/generalhandler.cpp:103
 #, c-format
 msgid "Agility %+d"
 msgstr "Beweglichkeit %+d"
 
-#: src/net/ea/generalhandler.cpp:104 src/net/manaserv/generalhandler.cpp:98
+#: src/net/tmwa/generalhandler.cpp:104
 #, c-format
 msgid "Vitality %+d"
 msgstr "Gesundheit %+d"
 
-#: src/net/ea/generalhandler.cpp:105 src/net/manaserv/generalhandler.cpp:99
+#: src/net/tmwa/generalhandler.cpp:105
 #, c-format
 msgid "Intelligence %+d"
 msgstr "Intelligenz %+d"
 
-#: src/net/ea/generalhandler.cpp:106 src/net/manaserv/generalhandler.cpp:97
+#: src/net/tmwa/generalhandler.cpp:106
 #, c-format
 msgid "Dexterity %+d"
 msgstr "Ausdauer %+d"
 
-#: src/net/ea/generalhandler.cpp:107
+#: src/net/tmwa/generalhandler.cpp:107
 #, c-format
 msgid "Luck %+d"
 msgstr "Glück %+d"
 
-#: src/net/ea/generalhandler.cpp:130
+#: src/net/tmwa/generalhandler.cpp:132
 msgid "Authentication failed."
 msgstr "Authentifizierung fehlgeschlagen"
 
-#: src/net/ea/generalhandler.cpp:133
+#: src/net/tmwa/generalhandler.cpp:135
 msgid "No servers available."
 msgstr "Keine Server verfügbar"
 
-#: src/net/ea/generalhandler.cpp:137
+#: src/net/tmwa/generalhandler.cpp:139
 msgid "Someone else is trying to use this account."
 msgstr "Jemand anderes versucht diesen Account zu benutzen"
 
-#: src/net/ea/generalhandler.cpp:140
+#: src/net/tmwa/generalhandler.cpp:142
 msgid "This account is already logged in."
 msgstr "Dieser Account ist bereits angemeldet"
 
-#: src/net/ea/generalhandler.cpp:143
+#: src/net/tmwa/generalhandler.cpp:145
 msgid "Speed hack detected."
 msgstr "Geschwindigkeitsproblem festgestellt"
 
-#: src/net/ea/generalhandler.cpp:146
+#: src/net/tmwa/generalhandler.cpp:148
 msgid "Duplicated login."
 msgstr "Mehrfache Anmeldung"
 
-#: src/net/ea/generalhandler.cpp:149
+#: src/net/tmwa/generalhandler.cpp:151
 msgid "Unknown connection error."
 msgstr "Unbekannter Verbindungsfehler"
 
-#: src/net/ea/generalhandler.cpp:205
+#: src/net/tmwa/generalhandler.cpp:209
 msgid "Got disconnected from server!"
 msgstr "Verbindung zum Server unterbrochen!"
 
-#: src/net/ea/generalhandler.cpp:216 src/net/manaserv/generalhandler.cpp:166
+#: src/net/tmwa/generalhandler.cpp:230
 msgid "Strength"
 msgstr "Stärke"
 
-#: src/net/ea/generalhandler.cpp:217 src/net/manaserv/generalhandler.cpp:167
+#: src/net/tmwa/generalhandler.cpp:231
 msgid "Agility"
 msgstr "Beweglichkeit"
 
-#: src/net/ea/generalhandler.cpp:218 src/net/manaserv/generalhandler.cpp:169
+#: src/net/tmwa/generalhandler.cpp:232
 msgid "Vitality"
 msgstr "Gesundheit"
 
-#: src/net/ea/generalhandler.cpp:219 src/net/manaserv/generalhandler.cpp:170
+#: src/net/tmwa/generalhandler.cpp:233
 msgid "Intelligence"
 msgstr "Intelligenz"
 
-#: src/net/ea/generalhandler.cpp:220 src/net/manaserv/generalhandler.cpp:168
+#: src/net/tmwa/generalhandler.cpp:234
 msgid "Dexterity"
 msgstr "Ausdauer"
 
-#: src/net/ea/generalhandler.cpp:221
+#: src/net/tmwa/generalhandler.cpp:235
 msgid "Luck"
 msgstr "Glück"
 
-#: src/net/ea/generalhandler.cpp:224
+#: src/net/tmwa/generalhandler.cpp:238
 msgid "Defense"
 msgstr "Verteidigung:"
 
-#: src/net/ea/generalhandler.cpp:225
+#: src/net/tmwa/generalhandler.cpp:239
 msgid "M.Attack"
 msgstr "M.Angriff:"
 
-#: src/net/ea/generalhandler.cpp:226
+#: src/net/tmwa/generalhandler.cpp:240
 msgid "M.Defense"
 msgstr "M.Verteidigung:"
 
-#: src/net/ea/generalhandler.cpp:227
+#: src/net/tmwa/generalhandler.cpp:241
 #, c-format
 msgid "% Accuracy"
 msgstr "% Accuracy"
 
-#: src/net/ea/generalhandler.cpp:228
+#: src/net/tmwa/generalhandler.cpp:242
 #, c-format
 msgid "% Evade"
 msgstr "% Evade"
 
-#: src/net/ea/generalhandler.cpp:229
+#: src/net/tmwa/generalhandler.cpp:243
 #, c-format
 msgid "% Critical"
 msgstr "% Critical"
 
-#: src/net/ea/gui/guildtab.cpp:45
+#: src/net/tmwa/gui/guildtab.cpp:45
 msgid "Guild"
 msgstr "Gilde"
 
-#: src/net/ea/gui/guildtab.cpp:61 src/net/ea/gui/partytab.cpp:59
+#: src/net/tmwa/gui/guildtab.cpp:61 src/net/tmwa/gui/partytab.cpp:59
 msgid "/help > Display this help."
 msgstr "/help > Diese Hilfe anzeigen"
 
-#: src/net/ea/gui/guildtab.cpp:62
+#: src/net/tmwa/gui/guildtab.cpp:62
 #, fuzzy
 msgid "/invite > Invite a player to your guild"
 msgstr "/invite > Lade einen Spieler zu Deiner Party ein"
 
-#: src/net/ea/gui/guildtab.cpp:63
+#: src/net/tmwa/gui/guildtab.cpp:63
 #, fuzzy
 msgid "/leave > Leave the guild you are in"
 msgstr "/leave > Verlasse die Party, in der Du Mitglied bist"
 
-#: src/net/ea/gui/guildtab.cpp:64
+#: src/net/tmwa/gui/guildtab.cpp:64
 #, fuzzy
 msgid "/kick > Kick some one from the guild you are in"
 msgstr "/kick > Werfe jemanden aus Deiner Party"
 
-#: src/net/ea/gui/guildtab.cpp:73 src/net/ea/gui/partytab.cpp:73
+#: src/net/tmwa/gui/guildtab.cpp:73 src/net/tmwa/gui/partytab.cpp:73
 msgid "Command: /invite <nick>"
 msgstr "Befehl: /invite <Name>"
 
-#: src/net/ea/gui/guildtab.cpp:74
+#: src/net/tmwa/gui/guildtab.cpp:74
 #, fuzzy
 msgid "This command invites <nick> to the guild you're in."
 msgstr "Dieser Befehl lädt Spieler <Name> zu einer Party mit Dir ein."
 
-#: src/net/ea/gui/guildtab.cpp:80 src/net/ea/gui/partytab.cpp:80
+#: src/net/tmwa/gui/guildtab.cpp:80 src/net/tmwa/gui/partytab.cpp:80
 msgid "Command: /leave"
 msgstr "Befehl: /leave"
 
-#: src/net/ea/gui/guildtab.cpp:81
+#: src/net/tmwa/gui/guildtab.cpp:81
 #, fuzzy
 msgid "This command causes the player to leave the guild."
 msgstr "Dieser Befehl lässt Dich die Party verlassen"
 
-#: src/net/ea/gui/guildtab.cpp:89
+#: src/net/tmwa/gui/guildtab.cpp:89
 #, fuzzy
 msgid "Guild name is missing."
 msgstr "Name der Party fehlt."
 
-#: src/net/ea/guildhandler.cpp:293
+#: src/net/tmwa/guildhandler.cpp:296
 msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:298
+#: src/net/tmwa/guildhandler.cpp:301
 #, fuzzy
 msgid "User rejected guild invite."
 msgstr "%s hat Deine Einladung zurückgewiesen."
 
-#: src/net/ea/guildhandler.cpp:303
+#: src/net/tmwa/guildhandler.cpp:306
 #, fuzzy
 msgid "User is now part of your guild."
 msgstr "%s ist nun Mitglied Deiner Party."
 
-#: src/net/ea/guildhandler.cpp:308
+#: src/net/tmwa/guildhandler.cpp:311
 msgid "Your guild is full."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:313
+#: src/net/tmwa/guildhandler.cpp:316
 #, fuzzy
 msgid "Unknown guild invite response."
 msgstr "Unbekannte Reaktion auf die Einladung von %s."
 
-#: src/net/ea/guildhandler.cpp:390
+#: src/net/tmwa/guildhandler.cpp:393
 msgid "Guild creation isn't supported yet."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:43
+#: src/net/tmwa/gui/partytab.cpp:43
 msgid "Party"
 msgstr "Party"
 
-#: src/net/ea/gui/partytab.cpp:60
+#: src/net/tmwa/gui/partytab.cpp:60
 msgid "/invite > Invite a player to your party"
 msgstr "/invite > Lade einen Spieler zu Deiner Party ein"
 
-#: src/net/ea/gui/partytab.cpp:61
+#: src/net/tmwa/gui/partytab.cpp:61
 msgid "/leave > Leave the party you are in"
 msgstr "/leave > Verlasse die Party, in der Du Mitglied bist"
 
-#: src/net/ea/gui/partytab.cpp:62
+#: src/net/tmwa/gui/partytab.cpp:62
 msgid "/kick > Kick some one from the party you are in"
 msgstr "/kick > Werfe jemanden aus Deiner Party"
 
-#: src/net/ea/gui/partytab.cpp:63
+#: src/net/tmwa/gui/partytab.cpp:63
 msgid "/item > Show/change party item sharing options"
 msgstr ""
 "/item > Zeige oder ändere die Optionen zum Teilen der Gegenstände in der "
 "Party"
 
-#: src/net/ea/gui/partytab.cpp:64
+#: src/net/tmwa/gui/partytab.cpp:64
 msgid "/exp > Show/change party experience sharing options"
 msgstr ""
 "/exp > Zeige oder ändere die Optionen zum Teilen der Erfahrungspunkte in der "
 "Party"
 
-#: src/net/ea/gui/partytab.cpp:81
+#: src/net/tmwa/gui/partytab.cpp:81
 msgid "This command causes the player to leave the party."
 msgstr "Dieser Befehl lässt Dich die Party verlassen"
 
-#: src/net/ea/gui/partytab.cpp:85
+#: src/net/tmwa/gui/partytab.cpp:85
 msgid "Command: /item <policy>"
 msgstr "Befehl: /item <Wert>"
 
-#: src/net/ea/gui/partytab.cpp:86
+#: src/net/tmwa/gui/partytab.cpp:86
 msgid "This command changes the party's item sharing policy."
 msgstr ""
 "Dieser Befehl ändert die Einstellungen zum Teilen von Gegenständen in einer "
 "Party."
 
-#: src/net/ea/gui/partytab.cpp:87
+#: src/net/tmwa/gui/partytab.cpp:87
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
@@ -2747,25 +3142,25 @@ msgstr ""
 "<Wert> darf enthalten: \"1\",\"yes\" oder \"true\" um das Teilen von "
 "Gegenständen zu erlauben, \"0\",\"no\" oder \"false\" um es zu verbieten."
 
-#: src/net/ea/gui/partytab.cpp:90
+#: src/net/tmwa/gui/partytab.cpp:90
 msgid "Command: /item"
 msgstr "Befehl: /item"
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/tmwa/gui/partytab.cpp:91
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 "Dieser Befehl zeigt an, ob Gegenstände in der Party geteilt werden, oder "
 "nicht."
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/tmwa/gui/partytab.cpp:95
 msgid "Command: /exp <policy>"
 msgstr "Befehl: /exp <Wert>"
 
-#: src/net/ea/gui/partytab.cpp:96
+#: src/net/tmwa/gui/partytab.cpp:96
 msgid "This command changes the party's experience sharing policy."
 msgstr "Dieser Befehl ändert das Teilen der Erfahrungspunkte in einer Party."
 
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/tmwa/gui/partytab.cpp:97
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
@@ -2773,105 +3168,94 @@ msgstr ""
 "Gültige Werte für <Wert> sind: \"1\",\"yes\",\"true\" um das Teilen zu "
 "erlauben, \"0\",\"no\",\"false\" verbieten es."
 
-#: src/net/ea/gui/partytab.cpp:100
+#: src/net/tmwa/gui/partytab.cpp:100
 msgid "Command: /exp"
 msgstr "Befehl: /exp"
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/tmwa/gui/partytab.cpp:101
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 "Dieser Befehl zeigt an, ob das Teilen von Erfahrungspunkten in der Party "
 "aktiviert ist."
 
-#: src/net/ea/gui/partytab.cpp:132 src/net/ea/partyhandler.cpp:198
+#: src/net/tmwa/gui/partytab.cpp:132 src/net/tmwa/partyhandler.cpp:196
 msgid "Item sharing enabled."
 msgstr "Teilen von Gegenständen aktiviert."
 
-#: src/net/ea/gui/partytab.cpp:135 src/net/ea/partyhandler.cpp:204
+#: src/net/tmwa/gui/partytab.cpp:135 src/net/tmwa/partyhandler.cpp:202
 msgid "Item sharing disabled."
 msgstr "Teilen von Gegenständen deaktiviert."
 
-#: src/net/ea/gui/partytab.cpp:138 src/net/ea/partyhandler.cpp:210
+#: src/net/tmwa/gui/partytab.cpp:138 src/net/tmwa/partyhandler.cpp:208
 msgid "Item sharing not possible."
 msgstr "Teilen von Gegenständen nicht möglich."
 
-#: src/net/ea/gui/partytab.cpp:141
+#: src/net/tmwa/gui/partytab.cpp:141
 #, fuzzy
 msgid "Item sharing unknown."
 msgstr "Teilen von Gegenständen aktiviert."
 
-#: src/net/ea/gui/partytab.cpp:167 src/net/ea/partyhandler.cpp:174
+#: src/net/tmwa/gui/partytab.cpp:167 src/net/tmwa/partyhandler.cpp:172
 msgid "Experience sharing enabled."
 msgstr "Teilen der Erfahrungspunkte aktiviert."
 
-#: src/net/ea/gui/partytab.cpp:170 src/net/ea/partyhandler.cpp:180
+#: src/net/tmwa/gui/partytab.cpp:170 src/net/tmwa/partyhandler.cpp:178
 msgid "Experience sharing disabled."
 msgstr "Teilen der Erfahrungspunkte deaktiviert."
 
-#: src/net/ea/gui/partytab.cpp:173 src/net/ea/partyhandler.cpp:186
+#: src/net/tmwa/gui/partytab.cpp:173 src/net/tmwa/partyhandler.cpp:184
 msgid "Experience sharing not possible."
 msgstr "Teilen der Erfahrungspunkte nicht möglich."
 
-#: src/net/ea/gui/partytab.cpp:176
+#: src/net/tmwa/gui/partytab.cpp:176
 #, fuzzy
 msgid "Experience sharing unknown."
 msgstr "Teilen der Erfahrungspunkte aktiviert."
 
-#: src/net/ea/inventoryhandler.cpp:281
+#: src/net/tmwa/inventoryhandler.cpp:285
 msgid "Failed to use item."
 msgstr "Gegenstand konnte nicht benutzt werden."
 
-#: src/net/ea/inventoryhandler.cpp:391
+#: src/net/tmwa/inventoryhandler.cpp:399
 msgid "Unable to equip."
 msgstr "Kann Gegenstand nicht ausrüsten."
 
-#: src/net/ea/inventoryhandler.cpp:402
+#: src/net/tmwa/inventoryhandler.cpp:410
 msgid "Unable to unequip."
 msgstr "Kann Gegenstand nicht ablegen."
 
-#: src/net/ea/loginhandler.cpp:79
+#: src/net/tmwa/loginhandler.cpp:86
 msgid "Account was not found. Please re-login."
 msgstr "Account konnte nicht gefunden werden. Bitte melde dich erneut an."
 
-#: src/net/ea/loginhandler.cpp:82 src/net/manaserv/loginhandler.cpp:121
-msgid "Old password incorrect."
-msgstr "Altes Passwort fehlerhaft"
-
-#: src/net/ea/loginhandler.cpp:85
+#: src/net/tmwa/loginhandler.cpp:92
 msgid "New password too short."
 msgstr "Das neue Passwort ist zu kurz"
 
-#: src/net/ea/loginhandler.cpp:88 src/net/ea/loginhandler.cpp:175
-#: src/net/manaserv/charhandler.cpp:158 src/net/manaserv/loginhandler.cpp:96
-#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
-#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
-msgid "Unknown error."
-msgstr "Unbekannter Fehler"
-
-#: src/net/ea/loginhandler.cpp:149
+#: src/net/tmwa/loginhandler.cpp:156
 msgid "Unregistered ID."
 msgstr "Unbekannte ID"
 
-#: src/net/ea/loginhandler.cpp:152
+#: src/net/tmwa/loginhandler.cpp:159
 msgid "Wrong password."
 msgstr "Falsches Passwort"
 
-#: src/net/ea/loginhandler.cpp:155
+#: src/net/tmwa/loginhandler.cpp:162
 msgid "Account expired."
 msgstr "Account abgelaufen"
 
-#: src/net/ea/loginhandler.cpp:158
+#: src/net/tmwa/loginhandler.cpp:165
 msgid "Rejected from server."
 msgstr "Vom Server zurückgewiesen"
 
-#: src/net/ea/loginhandler.cpp:161
+#: src/net/tmwa/loginhandler.cpp:168
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 "Du wurdest permanent vom Spiel ausgeschlossen. Bitte wende Dich an das GM-"
 "Team."
 
-#: src/net/ea/loginhandler.cpp:165
+#: src/net/tmwa/loginhandler.cpp:172
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -2880,188 +3264,125 @@ msgstr ""
 "Du wurdest zeitweise, bis %s vom Spiel ausgeschlossen.\n"
 "Bitte wende dich mittels des Forums an das GM-Team."
 
-#: src/net/ea/loginhandler.cpp:172
+#: src/net/tmwa/loginhandler.cpp:179
 msgid "This user name is already taken."
 msgstr "Dieser Spielername ist bereits vergeben"
 
-#: src/net/ea/network.cpp:145
+#: src/net/tmwa/network.cpp:145
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/ea/network.cpp:345
+#: src/net/tmwa/network.cpp:345
 msgid "Unable to resolve host \""
 msgstr "Nicht möglich den host \" aufzulösen"
 
-#: src/net/ea/network.cpp:414
+#: src/net/tmwa/network.cpp:414
 msgid "Connection to server terminated. "
 msgstr "Verbindung mit Server abgebrochen. "
 
-#: src/net/ea/partyhandler.cpp:81
+#: src/net/tmwa/partyhandler.cpp:82
 msgid "Could not create party."
 msgstr "Konnte Party nicht erstellen."
 
-#: src/net/ea/partyhandler.cpp:84
+#: src/net/tmwa/partyhandler.cpp:84
 msgid "Party successfully created."
 msgstr "Party erfolgreich erstellt."
 
-#: src/net/ea/partyhandler.cpp:118
+#: src/net/tmwa/partyhandler.cpp:119
 #, c-format
 msgid "%s is already a member of a party."
 msgstr "%s ist bereits Mitglied einer Party."
 
-#: src/net/ea/partyhandler.cpp:122
+#: src/net/tmwa/partyhandler.cpp:123
 #, c-format
 msgid "%s refused your invitation."
 msgstr "%s hat Deine Einladung zurückgewiesen."
 
-#: src/net/ea/partyhandler.cpp:126
+#: src/net/tmwa/partyhandler.cpp:127
 #, c-format
 msgid "%s is now a member of your party."
 msgstr "%s ist nun Mitglied Deiner Party."
 
-#: src/net/ea/partyhandler.cpp:130
+#: src/net/tmwa/partyhandler.cpp:131
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr "Unbekannte Reaktion auf die Einladung von %s."
 
-#: src/net/ea/partyhandler.cpp:238
+#: src/net/tmwa/partyhandler.cpp:236
 msgid "You have left the party."
 msgstr "Du hast die Party verlassen."
 
-#: src/net/ea/partyhandler.cpp:249
+#: src/net/tmwa/partyhandler.cpp:246
 #, c-format
 msgid "%s has left your party."
 msgstr "%s hat Deine Party verlassen."
 
-#: src/net/ea/partyhandler.cpp:301
+#: src/net/tmwa/partyhandler.cpp:299
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr "Ein unbekanntes Mitglied hat versucht, \"%s\" zu sagen."
 
-#: src/net/ea/partyhandler.cpp:329
-msgid "Inviting like this isn't supported at the moment."
-msgstr "Einladungen auf diesem Weg werden im Moment nicht unterstützt."
+#: src/net/tmwa/partyhandler.cpp:335
+#, c-format
+msgid "Inviting failed, because you can't see a player called %s."
+msgstr ""
 
-#: src/net/ea/partyhandler.cpp:334
+#: src/net/tmwa/partyhandler.cpp:340
 msgid "You can only inivte when you are in a party!"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:365
+#: src/net/tmwa/partyhandler.cpp:368
 #, c-format
 msgid "%s is not in your party!"
 msgstr "%s ist nicht in Deiner Party!"
 
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:304
-msgid "You are dead."
-msgstr "Ach ja: Du bist Tot."
-
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:305
-msgid "We regret to inform you that your character was killed in battle."
-msgstr ""
-"Es tut uns Leid, Euch mitteilen zu müssen, dass Ihr im Kampfe gefallen seid."
-
-#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:307
-msgid "You are not that alive anymore."
-msgstr "Du bist nicht länger lebendig."
-
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:308
-msgid "The cold hands of the grim reaper are grabbing for your soul."
-msgstr "Die kalten Hände des Sensenmanns greifen nach Deiner Seele."
-
-#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:309
-msgid "Game Over!"
-msgstr "Game Over!"
-
-#: src/net/ea/playerhandler.cpp:105
+#: src/net/tmwa/playerhandler.cpp:100
 msgid "Insert coin to continue."
 msgstr "Gib eine Münze ein um weiter zuspielen."
 
-#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:310
-msgid ""
-"No, kids. Your character did not really die. It... err... went to a better "
-"place."
-msgstr ""
-"Nein, Kinder. Euer Charakter ist nicht tot. Er... ähm... ist zu einem "
-"besserem Ort gegangen."
-
-#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:312
-msgid ""
-"Your plan of breaking your enemies weapon by bashing it with your throat "
-"failed."
-msgstr ""
-"Dein Plan, die Waffe deines Feindes mit Deinem Hals zu zerstören, war leider "
-"nicht ganz so genial, wie Du dachtest..."
-
-#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:314
-msgid "I guess this did not run too well."
-msgstr "Ich glaube, das war nicht so gut."
-
-#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:315
-msgid "Do you want your possessions identified?"
-msgstr "Möchtest du eine Auflistung Deiner Verletzungen?"
-
-#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:316
-msgid "Sadly, no trace of you was ever found..."
-msgstr "Leider wurde niemals eine Spur von Dir gefunden..."
-
-#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:317
-msgid "Annihilated."
-msgstr "Vernichtet."
-
-#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:318
-msgid "Looks like you got your head handed to you."
-msgstr "Sieht aus, als würde Dein Kopf Dich anschauen."
-
-#: src/net/ea/playerhandler.cpp:120 src/net/manaserv/beinghandler.cpp:319
-msgid ""
-"You screwed up again, dump your body down the tubes and get you another one."
-msgstr ""
-"Du hast schon wieder versagt. Spül Deine Überreste hinunter und hol Dir einen "
-"paar Neue."
-
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/tmwa/playerhandler.cpp:118
 msgid "You're not dead yet. You're just resting."
 msgstr "Du bist nicht tot. Du erholst Dich bloß."
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/tmwa/playerhandler.cpp:119
 msgid "You are no more."
 msgstr "Du bist nicht mehr."
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/tmwa/playerhandler.cpp:120
 msgid "You have ceased to be."
 msgstr "Du hast Dich entschieden, dem Irdischen zu entsagen."
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/tmwa/playerhandler.cpp:121
 msgid "You've expired and gone to meet your maker."
 msgstr "Deine Zeit ist abgelaufen. Zeit, deinem Schöpfer gegenüberzutreten."
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/tmwa/playerhandler.cpp:122
 msgid "You're a stiff."
 msgstr "Du bist ein wenig steif."
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/tmwa/playerhandler.cpp:123
 msgid "Bereft of life, you rest in peace."
 msgstr "Des Lebens beraubt ruhst Du in Frieden."
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/tmwa/playerhandler.cpp:124
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 "Wenn Du nicht so lebendig wärst, könntest Du die Gänseblümchen von unten "
 "sehen."
 
-#: src/net/ea/playerhandler.cpp:130
+#: src/net/tmwa/playerhandler.cpp:125
 msgid "Your metabolic processes are now history."
 msgstr "Deine Körperfunktionen sind nun Geschichte."
 
-#: src/net/ea/playerhandler.cpp:131
+#: src/net/tmwa/playerhandler.cpp:126
 msgid "You're off the twig."
 msgstr "Du kriegst nichts mehr mit."
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/tmwa/playerhandler.cpp:127
 msgid "You've kicked the bucket."
 msgstr "Jetzt passt Du in 'nen Eimer."
 
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/tmwa/playerhandler.cpp:128
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
@@ -3069,463 +3390,244 @@ msgstr ""
 "Du hast Deine sterbliche Hülle abgelegt, der Schleier legt sich über Dich "
 "und Du trittst dem Chor der blutenden Unsichtbaren bei."
 
-#: src/net/ea/playerhandler.cpp:135
+#: src/net/tmwa/playerhandler.cpp:130
 msgid "You are an ex-player."
 msgstr "Du warst einmal ein Spieler."
 
-#: src/net/ea/playerhandler.cpp:136
+#: src/net/tmwa/playerhandler.cpp:131
 msgid "You're pining for the fjords."
 msgstr "Du schmachtest nach den Fjorden."
 
-#: src/net/ea/playerhandler.cpp:249 src/net/ea/playerhandler.cpp:310
+#: src/net/tmwa/playerhandler.cpp:246 src/net/tmwa/playerhandler.cpp:285
 msgid "Message"
 msgstr "Nachricht"
 
-#: src/net/ea/playerhandler.cpp:250
+#: src/net/tmwa/playerhandler.cpp:247
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 "Du trägst mehr als die Hälfte Deiner Tragkraft. Du kannst Dich nicht mehr "
 "heilen."
 
-#: src/net/ea/playerhandler.cpp:333
+#: src/net/tmwa/playerhandler.cpp:313
 #, c-format
 msgid "You picked up %s."
 msgstr "Du hast %s aufgehoben "
 
-#: src/net/ea/playerhandler.cpp:369
+#: src/net/tmwa/playerhandler.cpp:348
 msgid "Cannot raise skill!"
 msgstr "Kann Skill nicht erhöhen!"
 
-#: src/net/ea/playerhandler.cpp:532
+#: src/net/tmwa/playerhandler.cpp:488
 msgid "Equip arrows first."
 msgstr "Rüste dich zuerst mit Pfeilen aus."
 
-#: src/net/ea/specialhandler.cpp:147
+#: src/net/tmwa/specialhandler.cpp:144
 msgid "Trade failed!"
 msgstr "Handel fehlgeschlagen!"
 
-#: src/net/ea/specialhandler.cpp:150
+#: src/net/tmwa/specialhandler.cpp:147
 msgid "Emote failed!"
 msgstr "Gefühl fehlgeschlagen!"
 
-#: src/net/ea/specialhandler.cpp:153
+#: src/net/tmwa/specialhandler.cpp:150
 msgid "Sit failed!"
 msgstr "Sitzen fehlgeschlagen!"
 
-#: src/net/ea/specialhandler.cpp:156
+#: src/net/tmwa/specialhandler.cpp:153
 msgid "Chat creating failed!"
 msgstr "Chat-Erstellung fehlgeschlagen!"
 
-#: src/net/ea/specialhandler.cpp:159
+#: src/net/tmwa/specialhandler.cpp:156
 msgid "Could not join party!"
 msgstr "Kann der Gruppe nicht beitreten!"
 
-#: src/net/ea/specialhandler.cpp:162
+#: src/net/tmwa/specialhandler.cpp:159
 msgid "Cannot shout!"
 msgstr "Kann nicht rufen!"
 
-#: src/net/ea/specialhandler.cpp:171
+#: src/net/tmwa/specialhandler.cpp:168
 msgid "You have not yet reached a high enough lvl!"
 msgstr "Dein Level ist noch nicht hoch genug!"
 
-#: src/net/ea/specialhandler.cpp:174
+#: src/net/tmwa/specialhandler.cpp:171
 msgid "Insufficient HP!"
 msgstr "Nicht genug HP!"
 
-#: src/net/ea/specialhandler.cpp:177
+#: src/net/tmwa/specialhandler.cpp:174
 msgid "Insufficient SP!"
 msgstr "Nicht genug SP!"
 
-#: src/net/ea/specialhandler.cpp:180
+#: src/net/tmwa/specialhandler.cpp:177
 msgid "You have no memos!"
 msgstr "Keine Memos vorhanden!"
 
-#: src/net/ea/specialhandler.cpp:183
+#: src/net/tmwa/specialhandler.cpp:180
 msgid "You cannot do that right now!"
 msgstr "Du kannst dies momentan nicht tun!"
 
-#: src/net/ea/specialhandler.cpp:186
+#: src/net/tmwa/specialhandler.cpp:183
 msgid "Seems you need more money... ;-)"
 msgstr "Es scheint, als bräuchtest Du mehr Geld... ;-)"
 
-#: src/net/ea/specialhandler.cpp:189
+#: src/net/tmwa/specialhandler.cpp:186
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Du kannst diese Fähigkeit nicht mit dieser Waffenart benutzen!"
 
-#: src/net/ea/specialhandler.cpp:192
+#: src/net/tmwa/specialhandler.cpp:189
 msgid "You need another red gem!"
 msgstr "Du brauchst noch einen roten Edelstein!"
 
-#: src/net/ea/specialhandler.cpp:195
+#: src/net/tmwa/specialhandler.cpp:192
 msgid "You need another blue gem!"
 msgstr "Du brauchst noch einen blauen Edelstein!"
 
-#: src/net/ea/specialhandler.cpp:198
+#: src/net/tmwa/specialhandler.cpp:195
 msgid "You're carrying to much to do this!"
 msgstr "Du schleppst zu viel herum, um das zu machen!"
 
-#: src/net/ea/specialhandler.cpp:201
+#: src/net/tmwa/specialhandler.cpp:198
 msgid "Huh? What's that?"
 msgstr "Huch? Was ist das?"
 
-#: src/net/ea/specialhandler.cpp:210
+#: src/net/tmwa/specialhandler.cpp:207
 msgid "Warp failed..."
 msgstr "Warp fehlgeschlagen..."
 
-#: src/net/ea/specialhandler.cpp:213
+#: src/net/tmwa/specialhandler.cpp:210
 msgid "Could not steal anything..."
 msgstr "Konnte nichts stehlen..."
 
-#: src/net/ea/specialhandler.cpp:216
+#: src/net/tmwa/specialhandler.cpp:213
 msgid "Poison had no effect..."
 msgstr "Das Gift hatte keine Wirkung..."
 
-#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:116
-msgid "Request for Trade"
-msgstr "Erbitte einen Handel"
-
-#: src/net/ea/tradehandler.cpp:108 src/net/manaserv/tradehandler.cpp:117
-#, c-format
-msgid "%s wants to trade with you, do you accept?"
-msgstr "%s möchte mit dir handeln, stimmst Du zu?"
-
-#: src/net/ea/tradehandler.cpp:124
+#: src/net/tmwa/tradehandler.cpp:126
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr "Handel nicht möglich. Handelspartner ist zu weit weg."
 
-#: src/net/ea/tradehandler.cpp:128
+#: src/net/tmwa/tradehandler.cpp:130
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr "Handel nicht möglich. Spieler existiert nicht."
 
-#: src/net/ea/tradehandler.cpp:132
+#: src/net/tmwa/tradehandler.cpp:134
 msgid "Trade cancelled due to an unknown reason."
 msgstr "Handel aus unbekanntem Grund abgebrochen"
 
-#: src/net/ea/tradehandler.cpp:137
+#: src/net/tmwa/tradehandler.cpp:139
 #, c-format
 msgid "Trade: You and %s"
 msgstr "Handel: Du und %s"
 
-#: src/net/ea/tradehandler.cpp:144
+#: src/net/tmwa/tradehandler.cpp:146
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr "Handel mit %s abgebrochen."
 
-#: src/net/ea/tradehandler.cpp:153
+#: src/net/tmwa/tradehandler.cpp:154
 msgid "Unhandled trade cancel packet."
 msgstr "Übergangenes Handelsabbruchspaket."
 
-#: src/net/ea/tradehandler.cpp:202
+#: src/net/tmwa/tradehandler.cpp:202
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 "Gegenstand konnte nicht hinzugefügt werden. Handelspartner ist überladen."
 
-#: src/net/ea/tradehandler.cpp:207
+#: src/net/tmwa/tradehandler.cpp:207
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 "Gegenstand konnte nicht hinzugefügt werden. Handelspartner hat keinen freien "
 "Platz mehr."
 
-#: src/net/ea/tradehandler.cpp:211
+#: src/net/tmwa/tradehandler.cpp:211
 msgid "Failed adding item for unknown reason."
 msgstr "Gegenstand konnte nicht hinzugefügt werden. Unbekannter Fehler."
 
-#: src/net/ea/tradehandler.cpp:224 src/net/manaserv/tradehandler.cpp:149
-msgid "Trade canceled."
-msgstr "Handel abgebrochen."
-
-#: src/net/ea/tradehandler.cpp:231 src/net/manaserv/tradehandler.cpp:156
-msgid "Trade completed."
-msgstr "Handel abgeschlossen."
-
-#: src/net/manaserv/beinghandler.cpp:324
-msgid "Press OK to respawn."
-msgstr "Drücke \"OK\" um neu anzufangen."
-
-#: src/net/manaserv/beinghandler.cpp:325
-msgid "You Died"
-msgstr "Du bist tot."
-
-#: src/net/manaserv/charhandler.cpp:128 src/net/manaserv/charhandler.cpp:196
-msgid "Not logged in."
-msgstr "nicht angemeldet"
-
-#: src/net/manaserv/charhandler.cpp:131
-msgid "No empty slot."
-msgstr "Kein freier Slot."
-
-#: src/net/manaserv/charhandler.cpp:134
-msgid "Invalid name."
-msgstr "Ungültiger Name."
-
-#: src/net/manaserv/charhandler.cpp:137
-msgid "Character's name already exists."
-msgstr "Benutzername bereits vorhanden"
-
-#: src/net/manaserv/charhandler.cpp:140
-msgid "Invalid hairstyle."
-msgstr "Ungültiger Haarstil."
-
-#: src/net/manaserv/charhandler.cpp:143
-msgid "Invalid hair color."
-msgstr "Ungültige Haarfarbe."
-
-#: src/net/manaserv/charhandler.cpp:146
-msgid "Invalid gender."
-msgstr "Ungültiges Geschlecht."
-
-#: src/net/manaserv/charhandler.cpp:149
-msgid "Character's stats are too high."
-msgstr "Spielfigurattribute sind zu groß."
-
-#: src/net/manaserv/charhandler.cpp:152
-msgid "Character's stats are too low."
-msgstr "Spielfigurattribute sind zu klein"
-
-#: src/net/manaserv/charhandler.cpp:155
-msgid "One stat is zero."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:187
-msgid "Player deleted."
-msgstr "Spieler gelöscht"
-
-#: src/net/manaserv/charhandler.cpp:199
-#, fuzzy
-msgid "Selection out of range."
-msgstr "Wähle aus, wie viele Gegenstände Du tauschen möchtest."
-
-#: src/net/manaserv/charhandler.cpp:202
-#, fuzzy, c-format
-msgid "Unknown error (%d)."
-msgstr "Unbekannter Fehler"
-
-#: src/net/manaserv/charhandler.cpp:242
-msgid "No gameservers are available."
-msgstr "Kein Server verfügbar"
-
-#: src/net/manaserv/charhandler.cpp:268
-msgid "Willpower:"
-msgstr "Willenskraft:"
-
-#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
-#: src/net/manaserv/guildhandler.cpp:259
-#, c-format
-msgid "Topic: %s"
-msgstr "Thema: %s"
-
-#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
-msgid "Players in this channel:"
-msgstr "Spieler im Kanal:"
-
-#: src/net/manaserv/chathandler.cpp:201
-msgid "Error joining channel."
-msgstr "Fehler beim Betreten des Kanals."
-
-#: src/net/manaserv/chathandler.cpp:207
-msgid "Listing channels."
-msgstr "Liste Kanäle"
-
-#: src/net/manaserv/chathandler.cpp:219
-msgid "End of channel list."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:291
-#, c-format
-msgid "%s entered the channel."
-msgstr "%s ist dem Kanal beigetreten."
-
-#: src/net/manaserv/chathandler.cpp:296
-#, c-format
-msgid "%s left the channel."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:312
-#, c-format
-msgid "%s has set mode %s on user %s."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:322
-#, c-format
-msgid "%s has kicked %s."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:327
-#, fuzzy
-msgid "Unknown channel event."
-msgstr "Unbekannter Befehl."
-
-#: src/net/manaserv/generalhandler.cpp:100
-#, c-format
-msgid "Willpower %+d"
-msgstr "Willensstärke %+d"
-
-#: src/net/manaserv/generalhandler.cpp:171
-msgid "Willpower"
-msgstr "Willenskraft:"
-
-#: src/net/manaserv/guildhandler.cpp:81
-msgid "Guild created."
-msgstr "Gilde erstellt."
-
-#: src/net/manaserv/guildhandler.cpp:86
-msgid "Error creating guild."
-msgstr "Fehler beim Erstellen der Gilde."
-
-#: src/net/manaserv/guildhandler.cpp:96
-msgid "Invite sent."
-msgstr "Einladung gesendet."
-
-#: src/net/manaserv/guildhandler.cpp:203
-msgid "Member was promoted successfully."
-msgstr "Mitglied wurde erfolgreich befördert."
-
-#: src/net/manaserv/guildhandler.cpp:208
-msgid "Failed to promote member."
-msgstr "Beförderung des Mitglieds gescheitert."
-
-#: src/net/manaserv/loginhandler.cpp:87
-msgid "Wrong magic_token."
-msgstr "Fehlerhaftes Magiemerkmal"
-
-#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
-msgid "Already logged in."
-msgstr "Bereits angemeldet"
-
-#: src/net/manaserv/loginhandler.cpp:93 src/net/manaserv/loginhandler.cpp:272
-msgid "Server is full."
-msgstr "Server ist voll"
-
-#: src/net/manaserv/loginhandler.cpp:118
-msgid "New password incorrect."
-msgstr "Neues Passwort fehlerhaft"
-
-#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
-msgid "Account not connected. Please login first."
-msgstr "Account nicht verbunden. Bitte melde Dich zuerst an."
-
-#: src/net/manaserv/loginhandler.cpp:149
-msgid "New email address incorrect."
-msgstr "Neue E-Mailadresse ist fehlerhaft"
-
-#: src/net/manaserv/loginhandler.cpp:152
-msgid "Old email address incorrect."
-msgstr "Alte E-Mailadresse ist fehlerhaft"
-
-#: src/net/manaserv/loginhandler.cpp:158
-msgid "The new email address already exists."
-msgstr "Die neue E-Mailadresse ist bereits vorhanden."
-
-#: src/net/manaserv/loginhandler.cpp:239
-msgid ""
-"Client registration is not allowed. Please contact server administration."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
-msgid "Client version is too old."
-msgstr "Die Version des Spiels ist zu alt"
-
-#: src/net/manaserv/loginhandler.cpp:266
-msgid "Wrong username or password."
-msgstr "Benutzername oder Passwort falsch"
-
-#: src/net/manaserv/loginhandler.cpp:275
-msgid "Login attempt too soon after previous attempt."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:303
-msgid "Wrong username, password or email address."
-msgstr "Benutzername, Passwort oder E-Mailadresse falsch"
-
-#: src/net/manaserv/loginhandler.cpp:306
-msgid "Username already exists."
-msgstr "Benutzername bereits vorhanden"
-
-#: src/net/manaserv/loginhandler.cpp:309
-msgid "Email address already exists."
-msgstr "E-Mailadresse bereits vorhanden"
-
-#: src/net/manaserv/loginhandler.cpp:312
-msgid "You took too long with the captcha or your response was incorrect."
-msgstr ""
-
-#: src/net/manaserv/partyhandler.cpp:88
-msgid "Joined party."
-msgstr "Der Party beigetreten."
-
-#: src/net/manaserv/partyhandler.cpp:106
-#, c-format
-msgid "%s joined the party."
-msgstr "%s ist der Party beigetreten."
-
-#: src/net/manaserv/partyhandler.cpp:123
-#, c-format
-msgid "%s rejected your invite."
-msgstr "%s hat Deine Einladung zurückgewiesen."
-
-#: src/net/manaserv/tradehandler.cpp:96
-msgid "Accepting incoming trade requests."
-msgstr "Akzeptiere eingehende Handelsanfragen."
-
-#: src/net/manaserv/tradehandler.cpp:98
-msgid "Ignoring incoming trade requests."
-msgstr "Ignoriere eingehende Handelsanfragen."
-
-#: src/net/manaserv/tradehandler.cpp:135
-#, c-format
-msgid "Trading with %s"
-msgstr "Handele mit %s"
-
-#: src/playerrelations.cpp:304
+#: src/playerrelations.cpp:310
 msgid "Completely ignore"
 msgstr "@@ignore|Ignoriere %s komplett@@"
 
-#: src/playerrelations.cpp:318
+#: src/playerrelations.cpp:324
 msgid "Print '...'"
 msgstr ""
 
-#: src/playerrelations.cpp:334
+#: src/playerrelations.cpp:340
 msgid "Blink name"
 msgstr ""
 
-#: src/playerrelations.cpp:371
-msgid "Floating '...' bubble"
-msgstr ""
-
-#: src/playerrelations.cpp:374
-msgid "Floating bubble"
-msgstr ""
-
-#: src/resources/itemdb.cpp:52
+#: src/resources/itemdb.cpp:44
 #, c-format
 msgid "Attack %+d"
 msgstr "Angriff %+d"
 
-#: src/resources/itemdb.cpp:53
+#: src/resources/itemdb.cpp:45
 #, c-format
 msgid "Defense %+d"
 msgstr "Verteidigung %+d"
 
-#: src/resources/itemdb.cpp:54
+#: src/resources/itemdb.cpp:46
 #, c-format
 msgid "HP %+d"
 msgstr "HP %+d"
 
-#: src/resources/itemdb.cpp:55
+#: src/resources/itemdb.cpp:47
 #, c-format
 msgid "MP %+d"
 msgstr "MP %+d"
 
-#: src/resources/itemdb.cpp:114
+#: src/resources/itemdb.cpp:92
 msgid "Unknown item"
 msgstr "Unbekannter Gegenstand"
 
-#: src/resources/itemdb.cpp:158 src/resources/monsterdb.cpp:45
-#: src/resources/monsterdb.cpp:69
+#: src/resources/itemdb.cpp:135 src/resources/monsterdb.cpp:77
 msgid "unnamed"
 msgstr "unbenannt"
 
+#, fuzzy
+#~ msgid "HP"
+#~ msgstr "HP:"
+
+#, fuzzy
+#~ msgid "MP"
+#~ msgstr "MP:"
+
+#, fuzzy
+#~ msgid "Exp"
+#~ msgstr "Exp:"
+
+#, fuzzy
+#~ msgid "Money"
+#~ msgstr "Geld: %d"
+
+#, fuzzy
+#~ msgid "Job"
+#~ msgstr "Job:"
+
+#, fuzzy
+#~ msgid "Level"
+#~ msgstr "Stufe: %d"
+
+#~ msgid "Access denied."
+#~ msgstr "Zugang verweigert"
+
+#~ msgid "Unknown failure to select character."
+#~ msgstr "Unbekannter Fehler bei Auswahl des Charakters"
+
+#~ msgid "Inviting like this isn't supported at the moment."
+#~ msgstr "Einladungen auf diesem Weg werden im Moment nicht unterstützt."
+
+#~ msgid "Willpower:"
+#~ msgstr "Willenskraft:"
+
+#~ msgid "Willpower %+d"
+#~ msgstr "Willensstärke %+d"
+
+#~ msgid "Willpower"
+#~ msgstr "Willenskraft:"
+
+#~ msgid "Server is full."
+#~ msgstr "Server ist voll"
+
 #~ msgid "Text Shadow"
 #~ msgstr "Textschatten"
 
@@ -4002,9 +4104,6 @@ msgstr "unbenannt"
 #~ msgid "port"
 #~ msgstr "Port:"
 
-#~ msgid "Error retreiving server list: %s\n"
-#~ msgstr "Fehler beim empfangen der Serverliste: %s\n"
-
 #~ msgid "musicVolume"
 #~ msgstr "Lautstärke der Musik"
 
diff --git a/po/en_GB.po b/po/en_GB.po
index b0aa3024..b43b85da 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2010-03-16 22:27+0100\n"
+"POT-Creation-Date: 2010-12-13 20:04+0100\n"
 "PO-Revision-Date: 2010-03-04 21:01+0000\n"
 "Last-Translator: issyl0 <isabell121@gmail.com>\n"
 "Language-Team: English (United Kingdom) <en_GB@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,313 +19,319 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/client.cpp:555 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
+#: src/client.cpp:598 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
 msgid "Setup"
 msgstr "Setup"
 
-#: src/client.cpp:625
+#: src/client.cpp:679
 #, fuzzy
 msgid "Connecting to server"
 msgstr "Connecting to map server..."
 
-#: src/client.cpp:652
+#: src/client.cpp:706
 #, fuzzy
 msgid "Logging in"
 msgstr "Login"
 
-#: src/client.cpp:685
+#: src/client.cpp:739
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:741
+#: src/client.cpp:804
 #, fuzzy
 msgid "Requesting characters"
 msgstr "Select Character"
 
-#: src/client.cpp:770
+#: src/client.cpp:833
 #, fuzzy
 msgid "Connecting to the game server"
 msgstr "Connecting to map server..."
 
-#: src/client.cpp:801 src/client.cpp:808 src/client.cpp:942
+#: src/client.cpp:843
+#, fuzzy
+msgid "Changing game servers"
+msgstr "Server"
+
+#: src/client.cpp:872 src/client.cpp:879 src/client.cpp:1014
 #: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
 #: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
-#: src/gui/serverdialog.cpp:241 src/gui/unregisterdialog.cpp:133
-#: src/net/ea/charserverhandler.cpp:135 src/net/ea/charserverhandler.cpp:152
-#: src/net/manaserv/charhandler.cpp:161 src/net/manaserv/charhandler.cpp:204
+#: src/gui/serverdialog.cpp:323 src/gui/unregisterdialog.cpp:133
+#: src/net/manaserv/charhandler.cpp:174 src/net/manaserv/charhandler.cpp:217
+#: src/net/tmwa/charserverhandler.cpp:134
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Error"
 msgstr "Error"
 
-#: src/client.cpp:817
+#: src/client.cpp:888
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:844
+#: src/client.cpp:915
 #, fuzzy
 msgid "Password Change"
 msgstr "Password:"
 
-#: src/client.cpp:845
+#: src/client.cpp:916
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:864
+#: src/client.cpp:935
 #, fuzzy
 msgid "Email Change"
 msgstr "Change"
 
-#: src/client.cpp:865
+#: src/client.cpp:936
 #, fuzzy
 msgid "Email changed successfully!"
 msgstr "Member was promoted successfully."
 
-#: src/client.cpp:885
+#: src/client.cpp:956
 #, fuzzy
 msgid "Unregister Successful"
 msgstr "Unregister"
 
-#: src/client.cpp:886
+#: src/client.cpp:957
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1009 src/client.cpp:1032
+#: src/client.cpp:1138 src/client.cpp:1161
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1121
+#: src/client.cpp:1281
 #, fuzzy, c-format
 msgid "Invalid update host: %s"
 msgstr "Invalid update host: "
 
-#: src/client.cpp:1155 src/client.cpp:1161
+#: src/client.cpp:1315 src/client.cpp:1321
 msgid "Error creating updates directory!"
 msgstr "Error creating updates directory!"
 
-#: src/commandhandler.cpp:127 src/commandhandler.cpp:308
+#: src/commandhandler.cpp:131 src/commandhandler.cpp:317
 msgid "Unknown command."
 msgstr "Unknown command."
 
-#: src/commandhandler.cpp:156
+#: src/commandhandler.cpp:160
 msgid "-- Help --"
 msgstr "-- Help --"
 
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:161
 msgid "/help > Display this help"
 msgstr "/help > Display this help"
 
-#: src/commandhandler.cpp:159
+#: src/commandhandler.cpp:163
 msgid "/where > Display map name"
 msgstr "/where > Display map name"
 
-#: src/commandhandler.cpp:160
+#: src/commandhandler.cpp:164
 msgid "/who > Display number of online users"
 msgstr "/who > Display number of online users"
 
-#: src/commandhandler.cpp:161
+#: src/commandhandler.cpp:165
 msgid "/me > Tell something about yourself"
 msgstr "/me > Tell something about yourself"
 
-#: src/commandhandler.cpp:163
+#: src/commandhandler.cpp:167
 msgid "/clear > Clears this window"
 msgstr "/clear > Clears this window"
 
-#: src/commandhandler.cpp:165
+#: src/commandhandler.cpp:169
 msgid "/msg > Send a private message to a user"
 msgstr "/msg > Send a private message to a user"
 
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:170
 msgid "/whisper > Alias of msg"
 msgstr "/whisper > Alias of msg"
 
-#: src/commandhandler.cpp:167
+#: src/commandhandler.cpp:171
 msgid "/w > Alias of msg"
 msgstr "/w > Alias of msg"
 
-#: src/commandhandler.cpp:168
+#: src/commandhandler.cpp:172
 msgid "/query > Makes a tab for private messages with another user"
 msgstr "/query > Makes a tab for private messages with another user"
 
-#: src/commandhandler.cpp:169
+#: src/commandhandler.cpp:174
 msgid "/q > Alias of query"
 msgstr "/q > Alias of query"
 
-#: src/commandhandler.cpp:171
+#: src/commandhandler.cpp:176
 msgid "/ignore > ignore a player"
 msgstr ""
 
-#: src/commandhandler.cpp:172
+#: src/commandhandler.cpp:177
 msgid "/unignore > stop ignoring a player"
 msgstr ""
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:179
 msgid "/list > Display all public channels"
 msgstr "/list > Display all public channels"
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:180
 msgid "/join > Join or create a channel"
 msgstr "/join > Join or create a channel"
 
-#: src/commandhandler.cpp:177
+#: src/commandhandler.cpp:182
 #, fuzzy
 msgid "/createparty > Create a new party"
 msgstr "/create > Create a new party"
 
-#: src/commandhandler.cpp:178
+#: src/commandhandler.cpp:183
 msgid "/party > Invite a user to party"
 msgstr "/party > Invite a user to party"
 
-#: src/commandhandler.cpp:180
+#: src/commandhandler.cpp:185
 msgid "/record > Start recording the chat to an external file"
 msgstr "/record > Start recording the chat to an external file"
 
-#: src/commandhandler.cpp:181
+#: src/commandhandler.cpp:187
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr "/toggle > Determine whether <return> toggles the chat log"
 
-#: src/commandhandler.cpp:182
+#: src/commandhandler.cpp:189
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr "/present > Get list of players present (sent to chat log, if logging)"
 
-#: src/commandhandler.cpp:184
+#: src/commandhandler.cpp:192
 msgid "/announce > Global announcement (GM only)"
 msgstr "/announce > Global announcement (GM only)"
 
-#: src/commandhandler.cpp:188
+#: src/commandhandler.cpp:196
 msgid "For more information, type /help <command>."
 msgstr "For more information, type /help <command>."
 
-#: src/commandhandler.cpp:192
+#: src/commandhandler.cpp:200
 msgid "Command: /help"
 msgstr "Command: /help"
 
-#: src/commandhandler.cpp:193
+#: src/commandhandler.cpp:201
 msgid "This command displays a list of all commands available."
 msgstr "This command displays a list of all commands available."
 
-#: src/commandhandler.cpp:194
+#: src/commandhandler.cpp:203
 msgid "Command: /help <command>"
 msgstr "Command: /help <command>"
 
-#: src/commandhandler.cpp:195
+#: src/commandhandler.cpp:204
 msgid "This command displays help on <command>."
 msgstr "This command displays help on <command>."
 
-#: src/commandhandler.cpp:203
+#: src/commandhandler.cpp:212
 msgid "Command: /announce <msg>"
 msgstr "Command: /announce <msg>"
 
-#: src/commandhandler.cpp:204
+#: src/commandhandler.cpp:213
 msgid "*** only available to a GM ***"
 msgstr "*** only available to a GM ***"
 
-#: src/commandhandler.cpp:205
+#: src/commandhandler.cpp:214
 msgid "This command sends the message <msg> to all players currently online."
 msgstr "This command sends the message <msg> to all players currently online."
 
-#: src/commandhandler.cpp:210
+#: src/commandhandler.cpp:219
 msgid "Command: /clear"
 msgstr "Command: /clear"
 
-#: src/commandhandler.cpp:211
+#: src/commandhandler.cpp:220
 msgid "This command clears the chat log of previous chat."
 msgstr "This command clears the chat log of previous chat."
 
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:224
 #, fuzzy
 msgid "Command: /ignore <player>"
 msgstr "Command: /item <policy>"
 
-#: src/commandhandler.cpp:216
+#: src/commandhandler.cpp:225
 #, fuzzy
 msgid "This command ignores the given player regardless of current relations."
 msgstr "This command displays the number of players currently online."
 
-#: src/commandhandler.cpp:221
+#: src/commandhandler.cpp:230
 msgid "Command: /join <channel>"
 msgstr "Command: /join <channel>"
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:231
 msgid "This command makes you enter <channel>."
 msgstr "This command makes you enter <channel>."
 
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:232
 msgid "If <channel> doesn't exist, it's created."
 msgstr "If <channel> doesn't exist, it's created."
 
-#: src/commandhandler.cpp:227
+#: src/commandhandler.cpp:236
 msgid "Command: /list"
 msgstr "Command: /list"
 
-#: src/commandhandler.cpp:228
+#: src/commandhandler.cpp:237
 msgid "This command shows a list of all channels."
 msgstr "This command shows a list of all channels."
 
-#: src/commandhandler.cpp:232
+#: src/commandhandler.cpp:241
 msgid "Command: /me <message>"
 msgstr "Command: /me <message>"
 
-#: src/commandhandler.cpp:233
+#: src/commandhandler.cpp:242
 msgid "This command tell others you are (doing) <msg>."
 msgstr "This command tell others you are (doing) <msg>."
 
-#: src/commandhandler.cpp:237
+#: src/commandhandler.cpp:246
 msgid "Command: /msg <nick> <message>"
 msgstr "Command: /msg <nick> <message>"
 
-#: src/commandhandler.cpp:238
+#: src/commandhandler.cpp:247
 msgid "Command: /whisper <nick> <message>"
 msgstr "Command: /whisper <nick> <message>"
 
-#: src/commandhandler.cpp:239
+#: src/commandhandler.cpp:248
 msgid "Command: /w <nick> <message>"
 msgstr "Command: /w <nick> <message>"
 
-#: src/commandhandler.cpp:240
+#: src/commandhandler.cpp:249
 msgid "This command sends the text <message> to <nick>."
 msgstr "This command sends the text <message> to <nick>."
 
-#: src/commandhandler.cpp:241 src/commandhandler.cpp:260
+#: src/commandhandler.cpp:250 src/commandhandler.cpp:269
 #: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
-#: src/net/ea/gui/guildtab.cpp:75 src/net/ea/gui/partytab.cpp:75
+#: src/net/tmwa/gui/guildtab.cpp:75 src/net/tmwa/gui/partytab.cpp:75
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr "If the <nick> has spaces in it, enclose it in double quotes (\")."
 
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:255
 msgid "Command: /query <nick>"
 msgstr "Command: /query <nick>"
 
-#: src/commandhandler.cpp:247
+#: src/commandhandler.cpp:256
 msgid "Command: /q <nick>"
 msgstr "Command: /q <nick>"
 
-#: src/commandhandler.cpp:248
+#: src/commandhandler.cpp:257
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr "This command tries to make a tab for whispers between you and <nick>."
 
-#: src/commandhandler.cpp:253
+#: src/commandhandler.cpp:262
 #, fuzzy
 msgid "Command: /createparty <name>"
 msgstr "Command: /create <party-name>"
 
-#: src/commandhandler.cpp:254
+#: src/commandhandler.cpp:263
 #, fuzzy
 msgid "This command creates a new party called <name>."
 msgstr "These commands create a new party called <party-name>."
 
-#: src/commandhandler.cpp:258
+#: src/commandhandler.cpp:267
 msgid "Command: /party <nick>"
 msgstr "Command: /party <nick>"
 
-#: src/commandhandler.cpp:259 src/net/ea/gui/partytab.cpp:74
+#: src/commandhandler.cpp:268 src/net/tmwa/gui/partytab.cpp:74
 msgid "This command invites <nick> to party with you."
 msgstr "This command invites <nick> to party with you."
 
-#: src/commandhandler.cpp:265
+#: src/commandhandler.cpp:274
 msgid "Command: /present"
 msgstr "Command: /present"
 
-#: src/commandhandler.cpp:266
+#: src/commandhandler.cpp:275
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
@@ -332,27 +339,27 @@ msgstr ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 
-#: src/commandhandler.cpp:272
+#: src/commandhandler.cpp:281
 msgid "Command: /record <filename>"
 msgstr "Command: /record <filename>"
 
-#: src/commandhandler.cpp:273
+#: src/commandhandler.cpp:282
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr "This command starts recording the chat log to the file <filename>."
 
-#: src/commandhandler.cpp:275
+#: src/commandhandler.cpp:284
 msgid "Command: /record"
 msgstr "Command: /record"
 
-#: src/commandhandler.cpp:276
+#: src/commandhandler.cpp:285
 msgid "This command finishes a recording session."
 msgstr "This command finishes a recording session."
 
-#: src/commandhandler.cpp:280
+#: src/commandhandler.cpp:289
 msgid "Command: /toggle <state>"
 msgstr "Command: /toggle <state>"
 
-#: src/commandhandler.cpp:281
+#: src/commandhandler.cpp:290
 msgid ""
 "This command sets whether the return key should toggle the chat log, or "
 "whether the chat log turns off automatically."
@@ -360,56 +367,56 @@ msgstr ""
 "This command sets whether the return key should toggle the chat log, or "
 "whether the chat log turns off automatically."
 
-#: src/commandhandler.cpp:283
+#: src/commandhandler.cpp:292
 msgid ""
-"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
-"\", \"no\", \"false\" to turn the toggle off."
+"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
+"\"0\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
-"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
-"\", \"no\", \"false\" to turn the toggle off."
+"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
+"\"0\", \"no\", \"false\" to turn the toggle off."
 
-#: src/commandhandler.cpp:286
+#: src/commandhandler.cpp:295
 msgid "Command: /toggle"
 msgstr "Command: /toggle"
 
-#: src/commandhandler.cpp:287
+#: src/commandhandler.cpp:296
 msgid "This command displays the return toggle status."
 msgstr "This command displays the return toggle status."
 
-#: src/commandhandler.cpp:291 src/gui/widgets/whispertab.cpp:93
+#: src/commandhandler.cpp:300 src/gui/widgets/whispertab.cpp:95
 #, fuzzy
 msgid "Command: /unignore <player>"
 msgstr "Command: /item <policy>"
 
-#: src/commandhandler.cpp:292
+#: src/commandhandler.cpp:301
 msgid "This command stops ignoring the given player if they are being ignored"
 msgstr ""
 
-#: src/commandhandler.cpp:297
+#: src/commandhandler.cpp:306
 msgid "Command: /where"
 msgstr "Command: /where"
 
-#: src/commandhandler.cpp:298
+#: src/commandhandler.cpp:307
 msgid "This command displays the name of the current map."
 msgstr "This command displays the name of the current map."
 
-#: src/commandhandler.cpp:302
+#: src/commandhandler.cpp:311
 msgid "Command: /who"
 msgstr "Command: /who"
 
-#: src/commandhandler.cpp:303
+#: src/commandhandler.cpp:312
 msgid "This command displays the number of players currently online."
 msgstr "This command displays the number of players currently online."
 
-#: src/commandhandler.cpp:309
+#: src/commandhandler.cpp:318
 msgid "Type /help for a list of commands."
 msgstr "Type /help for a list of commands."
 
-#: src/commandhandler.cpp:375
+#: src/commandhandler.cpp:384
 msgid "Cannot send empty whispers!"
 msgstr "Cannot send empty whispers!"
 
-#: src/commandhandler.cpp:383
+#: src/commandhandler.cpp:392
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -418,59 +425,67 @@ msgstr ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 
-#: src/commandhandler.cpp:397
+#: src/commandhandler.cpp:406
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Requesting to join channel %s."
 
-#: src/commandhandler.cpp:410 src/net/ea/gui/partytab.cpp:109
+#: src/commandhandler.cpp:419 src/net/tmwa/gui/partytab.cpp:109
 msgid "Party name is missing."
 msgstr "Party name is missing."
 
-#: src/commandhandler.cpp:423 src/commandhandler.cpp:471
-#: src/commandhandler.cpp:493
+#: src/commandhandler.cpp:432 src/commandhandler.cpp:509
+#: src/commandhandler.cpp:531
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:441
+#: src/commandhandler.cpp:450
 msgid "Return toggles chat."
 msgstr "Return toggles chat."
 
-#: src/commandhandler.cpp:441
+#: src/commandhandler.cpp:450
 msgid "Message closes chat."
 msgstr "Message closes chat."
 
-#: src/commandhandler.cpp:450
+#: src/commandhandler.cpp:459
 msgid "Return now toggles chat."
 msgstr "Return now toggles chat."
 
-#: src/commandhandler.cpp:454
+#: src/commandhandler.cpp:463
 msgid "Message now closes chat."
 msgstr "Message now closes chat."
 
-#: src/commandhandler.cpp:477
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:489
+msgid "Show IP: On"
+msgstr ""
+
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:485
+msgid "Show IP: Off"
+msgstr ""
+
+#: src/commandhandler.cpp:515
 msgid "Player already ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:484
+#: src/commandhandler.cpp:522
 #, fuzzy
 msgid "Player successfully ignored!"
 msgstr "Party successfully created."
 
-#: src/commandhandler.cpp:486
+#: src/commandhandler.cpp:524
 #, fuzzy
 msgid "Player could not be ignored!"
 msgstr "Whisper could not be sent, ignored by user."
 
-#: src/commandhandler.cpp:501
+#: src/commandhandler.cpp:539
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:506
+#: src/commandhandler.cpp:544
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:508
+#: src/commandhandler.cpp:546
 #, fuzzy
 msgid "Player could not be unignored!"
 msgstr "Whisper could not be sent, ignored by user."
@@ -484,43 +499,43 @@ msgstr "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgid "General"
 msgstr "General"
 
-#: src/game.cpp:326
+#: src/game.cpp:342
 #, fuzzy
 msgid "Screenshot saved as "
 msgstr "Screenshot saved to ~/"
 
-#: src/game.cpp:331
+#: src/game.cpp:347
 msgid "Saving screenshot failed!"
 msgstr "Saving screenshot failed!"
 
-#: src/game.cpp:355
+#: src/game.cpp:378
 #, fuzzy
 msgid "The connection to the server was lost."
 msgstr "The connection to the server was lost, the program will now quit."
 
-#: src/game.cpp:360
+#: src/game.cpp:382
 msgid "Network Error"
 msgstr "Network Error"
 
-#: src/game.cpp:705
+#: src/game.cpp:721
 msgid "Ignoring incoming trade requests"
 msgstr "Ignoring incoming trade requests"
 
-#: src/game.cpp:712
+#: src/game.cpp:726
 msgid "Accepting incoming trade requests"
 msgstr "Accepting incoming trade requests"
 
-#: src/game.cpp:946
+#: src/game.cpp:954
 #, fuzzy
 msgid "Could Not Load Map"
 msgstr "Could not load map"
 
-#: src/game.cpp:947
+#: src/game.cpp:955
 #, c-format
 msgid "Error while loading %s"
 msgstr "Error while loading %s"
 
-#: src/gui/beingpopup.cpp:75
+#: src/gui/beingpopup.cpp:76
 #, fuzzy, c-format
 msgid "Party: %s"
 msgstr "Party (%s)"
@@ -529,34 +544,34 @@ msgstr "Party (%s)"
 msgid "Buy"
 msgstr "Buy"
 
-#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
-#: src/gui/sell.cpp:276
+#: src/gui/buy.cpp:69 src/gui/buy.cpp:261 src/gui/sell.cpp:71
+#: src/gui/sell.cpp:288
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Price: %s / Total: %s"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:99 src/gui/npcdialog.cpp:100
-#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:404
+#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:112 src/gui/npcdialog.cpp:124
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:463
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:98 src/gui/npcdialog.cpp:101
-#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:416
+#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:111 src/gui/npcdialog.cpp:125
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:475
 msgid "-"
 msgstr ""
 
 #: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
-#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:152
-#: src/keyboardconfig.cpp:103
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:228
+#: src/keyboardconfig.cpp:102
 msgid "Quit"
 msgstr "Exit"
 
-#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:333
-#: src/gui/statuswindow.cpp:403 src/gui/statuswindow.cpp:437
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:384
+#: src/gui/statuswindow.cpp:462 src/gui/statuswindow.cpp:496
 msgid "Max"
 msgstr "Max"
 
@@ -570,11 +585,11 @@ msgstr "Sell"
 
 #: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
 #: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
-#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:101
-#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:178
-#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:402
+#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:114
+#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:389
 #: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
-#: src/gui/socialwindow.cpp:243 src/gui/textdialog.cpp:39
+#: src/gui/socialwindow.cpp:275 src/gui/textdialog.cpp:40
 #: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr "Cancel"
@@ -613,7 +628,7 @@ msgstr "The new Email Address already exists."
 msgid "Change Password"
 msgstr "Change Password"
 
-#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:53
+#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:55
 #: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
 msgid "Password:"
 msgstr "Password:"
@@ -645,19 +660,19 @@ msgstr ""
 msgid "Create Character"
 msgstr "Create Character"
 
-#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:52
+#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:54
 #: src/gui/register.cpp:67
 msgid "Name:"
 msgstr "Name:"
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
 #: src/gui/outfitwindow.cpp:67
 msgid ">"
 msgstr ""
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
 #: src/gui/outfitwindow.cpp:66
@@ -674,8 +689,8 @@ msgstr "Hair Colour:"
 msgid "Hair style:"
 msgstr "Hair Style:"
 
-#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:397
-#: src/gui/socialwindow.cpp:297
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:392
+#: src/gui/socialwindow.cpp:329
 msgid "Create"
 msgstr "Create"
 
@@ -731,34 +746,34 @@ msgstr "Unregister"
 msgid "Change Email"
 msgstr "Change Email Address"
 
-#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:155
-#: src/gui/setup_players.cpp:230
+#: src/gui/charselectdialog.cpp:336 src/gui/serverdialog.cpp:231
+#: src/gui/setup_players.cpp:229
 msgid "Delete"
 msgstr "Delete"
 
-#: src/gui/charselectdialog.cpp:387
+#: src/gui/charselectdialog.cpp:380
 #, fuzzy
 msgid "Choose"
 msgstr "Close"
 
-#: src/gui/charselectdialog.cpp:399 src/gui/charselectdialog.cpp:400
+#: src/gui/charselectdialog.cpp:394 src/gui/charselectdialog.cpp:395
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:77
+#: src/gui/chat.cpp:88
 msgid "Chat"
 msgstr "Chat"
 
-#: src/gui/chat.cpp:287
+#: src/gui/chat.cpp:311
 #, fuzzy, c-format
 msgid "Present: %s; %d players are present."
 msgstr "%d players are present."
 
-#: src/gui/chat.cpp:305
+#: src/gui/chat.cpp:329
 msgid "Attendance written to record log."
 msgstr "Attendance written to record log."
 
-#: src/gui/chat.cpp:469
+#: src/gui/chat.cpp:493
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Whispering to %s: %s"
@@ -824,139 +839,170 @@ msgstr "Ambient FX"
 msgid "Equipment"
 msgstr "Equipment"
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:78
-#: src/gui/inventorywindow.cpp:80 src/gui/inventorywindow.cpp:291
-#: src/gui/popupmenu.cpp:372
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:89
+#: src/gui/inventorywindow.cpp:337 src/gui/popupmenu.cpp:359
 msgid "Unequip"
 msgstr "Unequip"
 
-#: src/gui/help.cpp:36
+#: src/gui/help.cpp:37
 msgid "Help"
 msgstr "Help"
 
-#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:74
+#: src/gui/help.cpp:51 src/gui/npcdialog.cpp:50
 msgid "Close"
 msgstr "Close"
 
-#: src/gui/inventorywindow.cpp:57 src/gui/windowmenu.cpp:56
+#: src/gui/inventorywindow.cpp:59 src/gui/windowmenu.cpp:56
 msgid "Inventory"
 msgstr "Inventory"
 
-#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:75
-#: src/gui/inventorywindow.cpp:293 src/gui/popupmenu.cpp:374
+#: src/gui/inventorywindow.cpp:59
+msgid "Storage"
+msgstr "Storage"
+
+#: src/gui/inventorywindow.cpp:82
+msgid "Slots:"
+msgstr "Slots:"
+
+#: src/gui/inventorywindow.cpp:87 src/gui/inventorywindow.cpp:100
+#: src/gui/inventorywindow.cpp:339 src/gui/popupmenu.cpp:361
 msgid "Equip"
 msgstr "Equip"
 
-#: src/gui/inventorywindow.cpp:74 src/gui/inventorywindow.cpp:75
-#: src/gui/inventorywindow.cpp:297 src/gui/popupmenu.cpp:377
+#: src/gui/inventorywindow.cpp:88
 msgid "Use"
 msgstr "Use"
 
-#: src/gui/inventorywindow.cpp:84 src/gui/inventorywindow.cpp:301
-#: src/gui/popupmenu.cpp:380
+#: src/gui/inventorywindow.cpp:101 src/gui/popupmenu.cpp:364
+msgid "Activate"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:102 src/gui/inventorywindow.cpp:348
+#: src/gui/popupmenu.cpp:367
 #, fuzzy
 msgid "Drop..."
 msgstr "Drop"
 
-#: src/gui/inventorywindow.cpp:85 src/gui/popupmenu.cpp:386
+#: src/gui/inventorywindow.cpp:103 src/gui/popupmenu.cpp:373
 msgid "Split"
 msgstr "Split"
 
-#: src/gui/inventorywindow.cpp:86 src/gui/outfitwindow.cpp:51
+#: src/gui/inventorywindow.cpp:104 src/gui/outfitwindow.cpp:51
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:97 src/gui/storagewindow.cpp:84
-msgid "Slots:"
-msgstr "Slots:"
-
-#: src/gui/inventorywindow.cpp:98
+#: src/gui/inventorywindow.cpp:106
 msgid "Weight:"
 msgstr "Weight:"
 
-#: src/gui/inventorywindow.cpp:303 src/gui/popupmenu.cpp:382
+#: src/gui/inventorywindow.cpp:124 src/gui/popupmenu.cpp:378
+msgid "Store"
+msgstr "Store"
+
+#: src/gui/inventorywindow.cpp:125 src/gui/popupmenu.cpp:385
+msgid "Retrieve"
+msgstr "Retrieve"
+
+#: src/gui/inventorywindow.cpp:350 src/gui/popupmenu.cpp:369
 msgid "Drop"
 msgstr "Drop"
 
-#: src/gui/itemamount.cpp:100 src/gui/okdialog.cpp:42
-#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:38 src/gui/trade.cpp:73
-#: src/gui/trade.cpp:75
+#: src/gui/itemamount.cpp:113 src/gui/okdialog.cpp:42
+#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:39 src/gui/trade.cpp:72
+#: src/gui/trade.cpp:74
 msgid "OK"
 msgstr "OK"
 
-#: src/gui/itemamount.cpp:102
+#: src/gui/itemamount.cpp:115
 msgid "All"
 msgstr "All"
 
-#: src/gui/itemamount.cpp:128
+#: src/gui/itemamount.cpp:141
 msgid "Select amount of items to trade."
 msgstr "Select amount of items to trade."
 
-#: src/gui/itemamount.cpp:131
+#: src/gui/itemamount.cpp:144
 msgid "Select amount of items to drop."
 msgstr "Select amount of items to drop."
 
-#: src/gui/itemamount.cpp:134
+#: src/gui/itemamount.cpp:147
 msgid "Select amount of items to store."
 msgstr "Select amount of items to store."
 
-#: src/gui/itemamount.cpp:137
+#: src/gui/itemamount.cpp:150
 msgid "Select amount of items to retrieve."
 msgstr "Select amount of items to retrieve."
 
-#: src/gui/itemamount.cpp:140
+#: src/gui/itemamount.cpp:153
 msgid "Select amount of items to split."
 msgstr "Select amount of items to split."
 
-#: src/gui/itempopup.cpp:92
+#: src/gui/itempopup.cpp:137
 #, fuzzy, c-format
 msgid "Weight: %s"
 msgstr "Weight: "
 
-#: src/gui/login.cpp:49 src/gui/login.cpp:61
+#: src/gui/login.cpp:51 src/gui/login.cpp:63
 msgid "Login"
 msgstr "Login"
 
-#: src/gui/login.cpp:58
+#: src/gui/login.cpp:60
 #, fuzzy
 msgid "Remember username"
 msgstr "Remember Username"
 
-#: src/gui/login.cpp:59 src/gui/register.cpp:58 src/gui/register.cpp:73
+#: src/gui/login.cpp:61 src/gui/register.cpp:58 src/gui/register.cpp:73
 msgid "Register"
 msgstr "Register"
 
-#: src/gui/login.cpp:60
+#: src/gui/login.cpp:62
 #, fuzzy
 msgid "Change Server"
 msgstr "Server"
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
+#: src/gui/login.cpp:129
+#, fuzzy
+msgid "Registration disabled"
+msgstr "Item sharing disabled."
+
+#: src/gui/login.cpp:129
+msgid "You need to use the website to register an account for this server."
+msgstr ""
+
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:86
 msgid "Map"
 msgstr "Map"
 
-#: src/gui/npcdialog.cpp:44
+#: src/gui/ministatus.cpp:235
+msgid "Need"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:48
 msgid "Waiting for server"
 msgstr "Waiting for server"
 
-#: src/gui/npcdialog.cpp:45
+#: src/gui/npcdialog.cpp:49
 msgid "Next"
 msgstr "Next"
 
-#: src/gui/npcdialog.cpp:47
+#: src/gui/npcdialog.cpp:51
 msgid "Submit"
 msgstr "Submit"
 
-#: src/gui/npcdialog.cpp:52 src/gui/npcpostdialog.cpp:41
+#: src/gui/npcdialog.cpp:73 src/gui/npcpostdialog.cpp:41
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:110
+#: src/gui/npcdialog.cpp:118
+msgid "Clear log"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:134
 msgid "Reset"
 msgstr "Reset"
 
 #. TRANSLATORS: Please leave the \n sequences intact.
-#: src/gui/npcdialog.cpp:171
+#: src/gui/npcdialog.cpp:208
 #, fuzzy
 msgid ""
 "\n"
@@ -971,7 +1017,7 @@ msgstr "To:"
 msgid "Send"
 msgstr "Send"
 
-#: src/gui/npcpostdialog.cpp:96
+#: src/gui/npcpostdialog.cpp:99
 msgid "Failed to send as sender or letter invalid."
 msgstr "Failed to send as sender or letter invalid."
 
@@ -986,99 +1032,86 @@ msgstr ""
 msgid "Unequip first"
 msgstr "Unequip"
 
-#: src/gui/popupmenu.cpp:84
+#: src/gui/popupmenu.cpp:83
 #, fuzzy, c-format
 msgid "Trade with %s..."
 msgstr "Trading with %s"
 
-#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:161
+#: src/gui/popupmenu.cpp:87 src/gui/popupmenu.cpp:158
 #, fuzzy, c-format
 msgid "Attack %s"
 msgstr "Attack %+d"
 
-#: src/gui/popupmenu.cpp:92
+#: src/gui/popupmenu.cpp:91
 #, fuzzy, c-format
 msgid "Whisper %s"
 msgstr "Whisper"
 
-#: src/gui/popupmenu.cpp:101
+#: src/gui/popupmenu.cpp:100
 #, fuzzy, c-format
 msgid "Befriend %s"
 msgstr "@@friend|Befriend %s@@"
 
-#: src/gui/popupmenu.cpp:106
+#: src/gui/popupmenu.cpp:105
 #, fuzzy, c-format
 msgid "Disregard %s"
 msgstr "Disregarded"
 
-#: src/gui/popupmenu.cpp:109
+#: src/gui/popupmenu.cpp:108
 #, fuzzy, c-format
 msgid "Ignore %s"
 msgstr "Ignored"
 
-#: src/gui/popupmenu.cpp:115 src/gui/popupmenu.cpp:124
+#: src/gui/popupmenu.cpp:114 src/gui/popupmenu.cpp:123
 #, c-format
 msgid "Unignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:118
+#: src/gui/popupmenu.cpp:117
 #, fuzzy, c-format
 msgid "Completely ignore %s"
 msgstr "@@ignore|Completely ignore %s@@"
 
 #: src/gui/popupmenu.cpp:130
-#, c-format
-msgid "Follow %s"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:133
 #, fuzzy, c-format
 msgid "Invite %s to join your guild"
 msgstr "@@guild|Invite %s to join your guild@@"
 
-#: src/gui/popupmenu.cpp:137
+#: src/gui/popupmenu.cpp:134
 #, fuzzy, c-format
 msgid "Invite %s to join your party"
 msgstr "@@party|Invite %s to join your party@@"
 
-#: src/gui/popupmenu.cpp:144
+#: src/gui/popupmenu.cpp:141
 #, fuzzy
 msgid "Kick player"
 msgstr "Kick failed!"
 
-#: src/gui/popupmenu.cpp:153
+#: src/gui/popupmenu.cpp:150
 #, fuzzy, c-format
 msgid "Talk to %s"
 msgstr "@@talk|Talk To %s@@"
 
-#: src/gui/popupmenu.cpp:166
+#: src/gui/popupmenu.cpp:163
 #, fuzzy
 msgid "Kick monster"
 msgstr "@@admin-kick|Kick monster@@"
 
-#: src/gui/popupmenu.cpp:174
+#: src/gui/popupmenu.cpp:171
 #, fuzzy
 msgid "Add name to chat"
 msgstr "@@name|Add name to chat@@"
 
-#: src/gui/popupmenu.cpp:191
+#: src/gui/popupmenu.cpp:188
 #, fuzzy, c-format
 msgid "Pick up %s"
 msgstr "Pick up"
 
-#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:400
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:387
 #, fuzzy
 msgid "Add to chat"
 msgstr "@@chat|Add to chat@@"
 
-#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:71
-msgid "Store"
-msgstr "Store"
-
-#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:72
-msgid "Retrieve"
-msgstr "Retrieve"
-
 #: src/gui/quitdialog.cpp:44
 msgid "Switch server"
 msgstr "Switch server"
@@ -1147,52 +1180,65 @@ msgstr "The password needs to be less than %d characters long."
 msgid "Passwords do not match."
 msgstr "Passwords do not match."
 
-#: src/gui/serverdialog.cpp:124
+#: src/gui/serverdialog.cpp:197
 #, fuzzy
 msgid "Choose Your Server"
 msgstr "Choose your server"
 
-#: src/gui/serverdialog.cpp:131 src/gui/widgets/chattab.cpp:139
+#: src/gui/serverdialog.cpp:206 src/gui/widgets/chattab.cpp:142
 msgid "Server:"
 msgstr "Server:"
 
-#: src/gui/serverdialog.cpp:132
+#: src/gui/serverdialog.cpp:207
 msgid "Port:"
 msgstr "Port:"
 
-#: src/gui/serverdialog.cpp:133
+#: src/gui/serverdialog.cpp:208
 #, fuzzy
 msgid "Server type:"
 msgstr "Server:"
 
-#: src/gui/serverdialog.cpp:153
+#: src/gui/serverdialog.cpp:229
 #, fuzzy
 msgid "Connect"
 msgstr "Connecting..."
 
-#: src/gui/serverdialog.cpp:154
+#: src/gui/serverdialog.cpp:230
 #, fuzzy
 msgid "Custom Server"
 msgstr "Custom cursor"
 
-#: src/gui/serverdialog.cpp:242
+#: src/gui/serverdialog.cpp:324
 msgid "Please type both the address and the port of a server."
 msgstr "Please type both the address and the port of a server."
 
-#: src/gui/serverdialog.cpp:357
+#: src/gui/serverdialog.cpp:441
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:363
+#: src/gui/serverdialog.cpp:447
 #, fuzzy
 msgid "Waiting for server..."
 msgstr "Waiting for server"
 
-#: src/gui/serverdialog.cpp:367
+#: src/gui/serverdialog.cpp:451
 msgid "Preparing download"
 msgstr ""
 
+#: src/gui/serverdialog.cpp:455
+msgid "Error retreiving server list!"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:550
+msgid "requires a newer version"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:552
+#, c-format
+msgid "requires v%s"
+msgstr ""
+
 #: src/gui/setup_audio.cpp:42
 msgid "Sound"
 msgstr "Sound"
@@ -1226,54 +1272,54 @@ msgstr ""
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:45
+#: src/gui/setup_colors.cpp:46
 msgid "This is what the color looks like"
 msgstr "This is what the colour looks like"
 
-#: src/gui/setup_colors.cpp:50
+#: src/gui/setup_colors.cpp:51
 msgid "Colors"
 msgstr "Colours"
 
-#: src/gui/setup_colors.cpp:71
+#: src/gui/setup_colors.cpp:72
 #, fuzzy
 msgid "Type:"
 msgstr "Type: "
 
-#: src/gui/setup_colors.cpp:82 src/gui/setup_colors.cpp:330
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:331
 msgid "Static"
 msgstr "Static"
 
-#: src/gui/setup_colors.cpp:84 src/gui/setup_colors.cpp:85
-#: src/gui/setup_colors.cpp:331
+#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
+#: src/gui/setup_colors.cpp:332
 msgid "Pulse"
 msgstr "Pulse"
 
-#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:87
-#: src/gui/setup_colors.cpp:332
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
+#: src/gui/setup_colors.cpp:333
 msgid "Rainbow"
 msgstr "Rainbow"
 
-#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
-#: src/gui/setup_colors.cpp:332
+#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
+#: src/gui/setup_colors.cpp:333
 msgid "Spectrum"
 msgstr "Spectrum"
 
-#: src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:94
 #, fuzzy
 msgid "Delay:"
 msgstr "Delay: "
 
-#: src/gui/setup_colors.cpp:108
+#: src/gui/setup_colors.cpp:109
 #, fuzzy
 msgid "Red:"
 msgstr "Red: "
 
-#: src/gui/setup_colors.cpp:123
+#: src/gui/setup_colors.cpp:124
 #, fuzzy
 msgid "Green:"
 msgstr "Green: "
 
-#: src/gui/setup_colors.cpp:138
+#: src/gui/setup_colors.cpp:139
 #, fuzzy
 msgid "Blue:"
 msgstr "Blue: "
@@ -1331,590 +1377,592 @@ msgstr "Default"
 msgid "Key Conflict(s) Detected."
 msgstr "Key Conflict(s) Detected."
 
-#: src/gui/setup_players.cpp:57
+#: src/gui/setup_players.cpp:58
 msgid "Name"
 msgstr "Name"
 
-#: src/gui/setup_players.cpp:58
+#: src/gui/setup_players.cpp:59
 msgid "Relation"
 msgstr "Relation"
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:64
 msgid "Neutral"
 msgstr "Neutral"
 
-#: src/gui/setup_players.cpp:64
+#: src/gui/setup_players.cpp:65
 msgid "Friend"
 msgstr "Friend"
 
-#: src/gui/setup_players.cpp:65
+#: src/gui/setup_players.cpp:66
 msgid "Disregarded"
 msgstr "Disregarded"
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_players.cpp:67
 msgid "Ignored"
 msgstr "Ignored"
 
-#: src/gui/setup_players.cpp:208 src/gui/setup_video.cpp:132
+#: src/gui/setup_players.cpp:206 src/gui/setup_video.cpp:153
 msgid "???"
 msgstr "???"
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_players.cpp:225
 msgid "Allow trading"
 msgstr "Allow trading"
 
-#: src/gui/setup_players.cpp:228
+#: src/gui/setup_players.cpp:227
 msgid "Allow whispers"
 msgstr "Allow whispers"
 
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:231
 msgid "Put all whispers in tabs"
 msgstr "Put all whispers in tabs"
 
-#: src/gui/setup_players.cpp:234
+#: src/gui/setup_players.cpp:233
 #, fuzzy
 msgid "Show gender"
 msgstr "Show name"
 
-#: src/gui/setup_players.cpp:236
+#: src/gui/setup_players.cpp:235
+#, fuzzy
+msgid "Enable Chat log"
+msgstr "Unable to sell."
+
+#: src/gui/setup_players.cpp:237
 msgid "Players"
 msgstr "Players"
 
-#: src/gui/setup_players.cpp:261
+#: src/gui/setup_players.cpp:262
 msgid "When ignoring:"
 msgstr "When ignoring:"
 
-#: src/gui/setup_video.cpp:113
+#: src/gui/setup_video.cpp:134
 msgid "Tiny"
 msgstr "Tiny"
 
-#: src/gui/setup_video.cpp:114
+#: src/gui/setup_video.cpp:135
 msgid "Small"
 msgstr "Small"
 
-#: src/gui/setup_video.cpp:115
+#: src/gui/setup_video.cpp:136
 msgid "Medium"
 msgstr "Medium"
 
-#: src/gui/setup_video.cpp:116
+#: src/gui/setup_video.cpp:137
 msgid "Large"
 msgstr "Large"
 
-#: src/gui/setup_video.cpp:142
+#: src/gui/setup_video.cpp:163
 msgid "No text"
 msgstr "No text"
 
-#: src/gui/setup_video.cpp:143
+#: src/gui/setup_video.cpp:164
 msgid "Text"
 msgstr "Text"
 
-#: src/gui/setup_video.cpp:144
+#: src/gui/setup_video.cpp:165
 msgid "Bubbles, no names"
 msgstr "Bubbles, no names"
 
-#: src/gui/setup_video.cpp:145
+#: src/gui/setup_video.cpp:166
 msgid "Bubbles with names"
 msgstr "Bubbles with names"
 
-#: src/gui/setup_video.cpp:157
+#: src/gui/setup_video.cpp:178
 msgid "off"
 msgstr "off"
 
-#: src/gui/setup_video.cpp:158 src/gui/setup_video.cpp:171
+#: src/gui/setup_video.cpp:179 src/gui/setup_video.cpp:192
 msgid "low"
 msgstr "low"
 
-#: src/gui/setup_video.cpp:159 src/gui/setup_video.cpp:173
+#: src/gui/setup_video.cpp:180 src/gui/setup_video.cpp:194
 msgid "high"
 msgstr "high"
 
-#: src/gui/setup_video.cpp:172
+#: src/gui/setup_video.cpp:193
 msgid "medium"
 msgstr "medium"
 
-#: src/gui/setup_video.cpp:174
+#: src/gui/setup_video.cpp:195
 msgid "max"
 msgstr "max"
 
-#: src/gui/setup_video.cpp:196
+#: src/gui/setup_video.cpp:217
 msgid "Full screen"
 msgstr "Full screen"
 
-#: src/gui/setup_video.cpp:197
+#: src/gui/setup_video.cpp:218
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:198
+#: src/gui/setup_video.cpp:219
 msgid "Custom cursor"
 msgstr "Custom cursor"
 
-#: src/gui/setup_video.cpp:200
+#: src/gui/setup_video.cpp:221
 msgid "Visible names"
 msgstr "Visible names"
 
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:223
 msgid "Particle effects"
 msgstr "Particle effects"
 
-#: src/gui/setup_video.cpp:204
+#: src/gui/setup_video.cpp:225
 #, fuzzy
 msgid "Show own name"
 msgstr "Show name"
 
-#: src/gui/setup_video.cpp:205
+#: src/gui/setup_video.cpp:226
+msgid "Log NPC dialogue"
+msgstr ""
+
+#: src/gui/setup_video.cpp:227
 msgid "Show pickup notification"
 msgstr "Show pickup notification"
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:207
+#. TRANSLATORS: Refers to "Show pickup notification"
+#: src/gui/setup_video.cpp:229
 msgid "in chat"
 msgstr "in chat"
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:209
+#. TRANSLATORS: Refers to "Show pickup notification"
+#: src/gui/setup_video.cpp:231
 msgid "as particle"
 msgstr "as particle"
 
-#: src/gui/setup_video.cpp:214
+#: src/gui/setup_video.cpp:236
 #, fuzzy
 msgid "FPS limit:"
 msgstr "FPS Limit:"
 
-#: src/gui/setup_video.cpp:225
+#: src/gui/setup_video.cpp:247
+msgid "Disable transparency (Low CPU mode)"
+msgstr ""
+
+#: src/gui/setup_video.cpp:250
 msgid "Video"
 msgstr "Video"
 
-#: src/gui/setup_video.cpp:227
+#: src/gui/setup_video.cpp:252
 #, fuzzy
-msgid "Show monster damage"
+msgid "Show damage"
 msgstr "Show name"
 
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:258
 msgid "Overhead text"
 msgstr "Overhead text"
 
-#: src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:259
 msgid "Gui opacity"
 msgstr "Gui opacity"
 
-#: src/gui/setup_video.cpp:235
+#: src/gui/setup_video.cpp:260
 msgid "Ambient FX"
 msgstr "Ambient FX"
 
-#: src/gui/setup_video.cpp:236
+#: src/gui/setup_video.cpp:261
 #, fuzzy
 msgid "Particle detail"
 msgstr "Particle Detail"
 
-#: src/gui/setup_video.cpp:237
+#: src/gui/setup_video.cpp:262
 msgid "Font size"
 msgstr "Font size"
 
-#: src/gui/setup_video.cpp:251 src/gui/setup_video.cpp:454
-#: src/gui/setup_video.cpp:568
+#: src/gui/setup_video.cpp:277 src/gui/setup_video.cpp:532
+#: src/gui/setup_video.cpp:662
 #, fuzzy
 msgid "None"
 msgstr "No"
 
-#: src/gui/setup_video.cpp:381
+#: src/gui/setup_video.cpp:426
 #, fuzzy
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr "mode and restoration of old mode also failed!"
 
-#: src/gui/setup_video.cpp:387
+#: src/gui/setup_video.cpp:432
 #, fuzzy
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr "mode and restoration of old mode also failed!"
 
-#: src/gui/setup_video.cpp:398
+#: src/gui/setup_video.cpp:443
 #, fuzzy
 msgid "Switching to Full Screen"
 msgstr "Switching to full screen"
 
-#: src/gui/setup_video.cpp:399
+#: src/gui/setup_video.cpp:444
 msgid "Restart needed for changes to take effect."
 msgstr "Restart needed for changes to take effect."
 
-#: src/gui/setup_video.cpp:411
+#: src/gui/setup_video.cpp:458
 #, fuzzy
 msgid "Changing to OpenGL"
 msgstr "Changing OpenGL"
 
-#: src/gui/setup_video.cpp:412
+#: src/gui/setup_video.cpp:459
+msgid ""
+"Applying change to OpenGL requires restart. In case OpenGL messes up your "
+"game graphics, restart the game with the command line option \"--no-opengl\"."
+msgstr ""
+
+#: src/gui/setup_video.cpp:466
+msgid "Deactivating OpenGL"
+msgstr ""
+
+#: src/gui/setup_video.cpp:467
 msgid "Applying change to OpenGL requires restart."
 msgstr "Applying change to OpenGL requires restart."
 
-#: src/gui/setup_video.cpp:486 src/gui/setup_video.cpp:491
+#: src/gui/setup_video.cpp:475
+#, fuzzy
+msgid "Transparency disabled"
+msgstr "Experience sharing disabled."
+
+#: src/gui/setup_video.cpp:476 src/gui/setup_video.cpp:484
+msgid "You must restart to apply changes."
+msgstr ""
+
+#: src/gui/setup_video.cpp:483
+msgid "Transparency enabled"
+msgstr ""
+
+#: src/gui/setup_video.cpp:576 src/gui/setup_video.cpp:581
 #, fuzzy
 msgid "Screen Resolution Changed"
 msgstr "Screen resolution changed"
 
-#: src/gui/setup_video.cpp:487 src/gui/setup_video.cpp:492
+#: src/gui/setup_video.cpp:577 src/gui/setup_video.cpp:582
 msgid "Restart your client for the change to take effect."
 msgstr "Restart your client for the change to take effect."
 
-#: src/gui/setup_video.cpp:489
+#: src/gui/setup_video.cpp:579
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:522
+#: src/gui/setup_video.cpp:612
 #, fuzzy
 msgid "Particle Effect Settings Changed."
 msgstr "Particle effect settings changed."
 
-#: src/gui/setup_video.cpp:523
+#: src/gui/setup_video.cpp:613
 msgid "Changes will take effect on map change."
 msgstr "Changes will take effect on map change."
 
-#: src/gui/skilldialog.cpp:198 src/gui/windowmenu.cpp:59
+#: src/gui/skilldialog.cpp:212 src/gui/windowmenu.cpp:59
 msgid "Skills"
 msgstr "Skills"
 
-#: src/gui/skilldialog.cpp:209
+#: src/gui/skilldialog.cpp:223
 msgid "Up"
 msgstr "Up"
 
-#: src/gui/skilldialog.cpp:263
+#: src/gui/skilldialog.cpp:269
 #, fuzzy, c-format
 msgid "Skill points available: %d"
 msgstr "Skill points: %d"
 
-#: src/gui/skilldialog.cpp:315
+#: src/gui/skilldialog.cpp:351
 #, fuzzy, c-format
 msgid "Skill Set %d"
 msgstr "Skill points: %d"
 
-#: src/gui/skilldialog.cpp:324
+#: src/gui/skilldialog.cpp:360
 #, fuzzy, c-format
 msgid "Skill %d"
 msgstr "Skills"
 
-#: src/gui/skilldialog.cpp:406
+#: src/gui/skilldialog.cpp:442
 #, fuzzy, c-format
 msgid "Lvl: %d (%+d)"
 msgstr "Level: %d"
 
-#: src/gui/skilldialog.cpp:417
+#: src/gui/skilldialog.cpp:453
 #, fuzzy, c-format
 msgid "Lvl: %d"
 msgstr "Level: %d"
 
-#: src/gui/socialwindow.cpp:118
+#: src/gui/socialwindow.cpp:126
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:127
+#: src/gui/socialwindow.cpp:139
 #, fuzzy, c-format
 msgid "Guild %s quit requested."
 msgstr "Guild created."
 
-#: src/gui/socialwindow.cpp:137
+#: src/gui/socialwindow.cpp:153
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:138
+#: src/gui/socialwindow.cpp:154
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:147
+#: src/gui/socialwindow.cpp:163
 #, fuzzy
 msgid "Leave Guild?"
 msgstr "Create Guild"
 
-#: src/gui/socialwindow.cpp:148
+#: src/gui/socialwindow.cpp:164
 #, fuzzy, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Are you sure you want to quit?"
 
-#: src/gui/socialwindow.cpp:183
+#: src/gui/socialwindow.cpp:207 src/net/tmwa/partyhandler.cpp:330
 #, fuzzy, c-format
 msgid "Invited user %s to party."
 msgstr "/party > Invite a user to party"
 
-#: src/gui/socialwindow.cpp:190
+#: src/gui/socialwindow.cpp:218
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:200
+#: src/gui/socialwindow.cpp:232
 #, fuzzy
 msgid "Member Invite to Party"
 msgstr "/party > Invite a user to party"
 
-#: src/gui/socialwindow.cpp:201
+#: src/gui/socialwindow.cpp:233
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:210
+#: src/gui/socialwindow.cpp:242
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:211
+#: src/gui/socialwindow.cpp:243
 #, fuzzy, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Are you sure you want to quit?"
 
-#: src/gui/socialwindow.cpp:240
+#: src/gui/socialwindow.cpp:272
 msgid "Create Guild"
 msgstr "Create Guild"
 
-#: src/gui/socialwindow.cpp:241 src/gui/socialwindow.cpp:565
+#: src/gui/socialwindow.cpp:273 src/gui/socialwindow.cpp:620
 #, fuzzy
 msgid "Create Party"
 msgstr "Create Character"
 
-#: src/gui/socialwindow.cpp:280 src/gui/windowmenu.cpp:64
+#: src/gui/socialwindow.cpp:312 src/gui/windowmenu.cpp:64
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:298
+#: src/gui/socialwindow.cpp:330
 #, fuzzy
 msgid "Invite"
 msgstr "Invite User"
 
-#: src/gui/socialwindow.cpp:299
+#: src/gui/socialwindow.cpp:331
 #, fuzzy
 msgid "Leave"
 msgstr "Large"
 
-#: src/gui/socialwindow.cpp:395
+#: src/gui/socialwindow.cpp:443
 #, fuzzy, c-format
 msgid "Accepted party invite from %s."
 msgstr "Accepted invite from %s."
 
-#: src/gui/socialwindow.cpp:401
+#: src/gui/socialwindow.cpp:449
 #, fuzzy, c-format
 msgid "Rejected party invite from %s."
 msgstr "Rejected invite from %s."
 
-#: src/gui/socialwindow.cpp:414
+#: src/gui/socialwindow.cpp:462
 #, fuzzy, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Accepted invite from %s."
 
-#: src/gui/socialwindow.cpp:420
+#: src/gui/socialwindow.cpp:468
 #, fuzzy, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Rejected invite from %s."
 
-#: src/gui/socialwindow.cpp:464
+#: src/gui/socialwindow.cpp:497
+msgid "Creating guild failed, please choose a shorter name."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:504
 #, fuzzy, c-format
 msgid "Creating guild called %s."
 msgstr "Error creating guild."
 
-#: src/gui/socialwindow.cpp:478
+#: src/gui/socialwindow.cpp:520
+msgid "Creating party failed, please choose a shorter name."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:527
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:485
+#: src/gui/socialwindow.cpp:541
 #, fuzzy
 msgid "Guild Name"
 msgstr "Guild"
 
-#: src/gui/socialwindow.cpp:486
+#: src/gui/socialwindow.cpp:542
 #, fuzzy
 msgid "Choose your guild's name."
 msgstr "Choose your server"
 
-#: src/gui/socialwindow.cpp:498
+#: src/gui/socialwindow.cpp:554
 #, fuzzy
 msgid "Received guild request, but one already exists."
 msgstr "Received party request, but one already exists."
 
-#: src/gui/socialwindow.cpp:503
+#: src/gui/socialwindow.cpp:559
 #, fuzzy, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s has invited you to join the %s party."
 
-#: src/gui/socialwindow.cpp:508
+#: src/gui/socialwindow.cpp:564
 #, fuzzy
 msgid "Accept Guild Invite"
 msgstr "Accept Party Invite"
 
-#: src/gui/socialwindow.cpp:520
+#: src/gui/socialwindow.cpp:576
 msgid "Received party request, but one already exists."
 msgstr "Received party request, but one already exists."
 
-#: src/gui/socialwindow.cpp:530
+#: src/gui/socialwindow.cpp:585
 #, fuzzy
 msgid "You have been invited you to join a party."
 msgstr "%s has invited you to join their party."
 
-#: src/gui/socialwindow.cpp:534
+#: src/gui/socialwindow.cpp:589
 #, fuzzy, c-format
 msgid "You have been invited to join the %s party."
 msgstr "%s has invited you to join the %s party."
 
-#: src/gui/socialwindow.cpp:542
+#: src/gui/socialwindow.cpp:597
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s has invited you to join their party."
 
-#: src/gui/socialwindow.cpp:547
+#: src/gui/socialwindow.cpp:602
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s has invited you to join the %s party."
 
-#: src/gui/socialwindow.cpp:555
+#: src/gui/socialwindow.cpp:610
 msgid "Accept Party Invite"
 msgstr "Accept Party Invite"
 
-#: src/gui/socialwindow.cpp:566
+#: src/gui/socialwindow.cpp:621
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:571
+#: src/gui/socialwindow.cpp:626
 #, fuzzy
 msgid "Party Name"
 msgstr "Party"
 
-#: src/gui/socialwindow.cpp:572
+#: src/gui/socialwindow.cpp:627
 #, fuzzy
 msgid "Choose your party's name."
 msgstr "Choose your server"
 
-#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:62
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:62
 msgid "Specials"
 msgstr ""
 
-#: src/gui/specialswindow.cpp:174
-#, c-format
-msgid "Specials Set %d"
-msgstr ""
-
-#: src/gui/specialswindow.cpp:191
-#, c-format
-msgid "Special %d"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:247
+#: src/gui/statuswindow.cpp:113 src/gui/statuswindow.cpp:215
+#: src/gui/statuswindow.cpp:262
 #, c-format
 msgid "Level: %d"
 msgstr "Level: %d"
 
-#: src/gui/statuswindow.cpp:101 src/gui/statuswindow.cpp:211
+#: src/gui/statuswindow.cpp:114 src/gui/statuswindow.cpp:208
+#: src/gui/statuswindow.cpp:239
 #, c-format
 msgid "Money: %s"
 msgstr "Money: %s"
 
-#: src/gui/statuswindow.cpp:104
+#: src/gui/statuswindow.cpp:117
 msgid "HP:"
 msgstr "HP:"
 
-#: src/gui/statuswindow.cpp:109
+#: src/gui/statuswindow.cpp:122
 msgid "Exp:"
 msgstr "Exp:"
 
-#: src/gui/statuswindow.cpp:114
+#: src/gui/statuswindow.cpp:130
 msgid "MP:"
 msgstr "MP:"
 
-#: src/gui/statuswindow.cpp:132 src/gui/statuswindow.cpp:219
+#: src/gui/statuswindow.cpp:158 src/gui/statuswindow.cpp:275
 #, c-format
 msgid "Job: %d"
 msgstr "Job: %d"
 
-#: src/gui/statuswindow.cpp:133
+#: src/gui/statuswindow.cpp:159
 msgid "Job:"
 msgstr "Job:"
 
-#: src/gui/statuswindow.cpp:194
-#, fuzzy
-msgid "HP"
-msgstr "HP:"
-
-#: src/gui/statuswindow.cpp:200
-#, fuzzy
-msgid "MP"
-msgstr "MP:"
-
-#: src/gui/statuswindow.cpp:206
-#, fuzzy
-msgid "Exp"
-msgstr "Exp:"
-
-#: src/gui/statuswindow.cpp:215
-#, fuzzy
-msgid "Money"
-msgstr "Money: %d"
-
-#: src/gui/statuswindow.cpp:225
-#, fuzzy
-msgid "Job"
-msgstr "Job:"
-
-#: src/gui/statuswindow.cpp:229
+#: src/gui/statuswindow.cpp:211 src/gui/statuswindow.cpp:247
 #, fuzzy, c-format
 msgid "Character points: %d"
 msgstr "Character stats OK"
 
-#: src/gui/statuswindow.cpp:235
+#: src/gui/statuswindow.cpp:255
 #, fuzzy, c-format
 msgid "Correction points: %d"
 msgstr "Skill points: %d"
 
-#: src/gui/statuswindow.cpp:251
-#, fuzzy
-msgid "Level"
-msgstr "Level: %d"
-
-#: src/gui/storagewindow.cpp:59
-msgid "Storage"
-msgstr "Storage"
-
-#: src/gui/trade.cpp:52
+#: src/gui/trade.cpp:53
 msgid "Propose trade"
 msgstr "Propose trade"
 
-#: src/gui/trade.cpp:53
+#: src/gui/trade.cpp:54
 msgid "Confirmed. Waiting..."
 msgstr "Confirmed. Waiting..."
 
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:55
 msgid "Agree trade"
 msgstr "Agree trade"
 
-#: src/gui/trade.cpp:55
+#: src/gui/trade.cpp:56
 msgid "Agreed. Waiting..."
 msgstr "Agreed. Waiting..."
 
-#: src/gui/trade.cpp:58
+#: src/gui/trade.cpp:59
 msgid "Trade: You"
 msgstr "Trade: You"
 
-#: src/gui/trade.cpp:74 src/gui/trade.cpp:75
+#: src/gui/trade.cpp:73 src/gui/trade.cpp:74
 msgid "Trade"
 msgstr "Trade"
 
-#: src/gui/trade.cpp:77
+#: src/gui/trade.cpp:76
 msgid "Add"
 msgstr "Add"
 
-#: src/gui/trade.cpp:99 src/gui/trade.cpp:135
+#: src/gui/trade.cpp:98 src/gui/trade.cpp:134
 #, fuzzy, c-format
 msgid "You get %s"
 msgstr "You get %s."
 
-#: src/gui/trade.cpp:100
+#: src/gui/trade.cpp:99
 msgid "You give:"
 msgstr "You give:"
 
-#: src/gui/trade.cpp:104
+#: src/gui/trade.cpp:103
 msgid "Change"
 msgstr "Change"
 
-#: src/gui/trade.cpp:275
+#: src/gui/trade.cpp:262
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Failed adding item. You can not overlap one kind of item on the window."
 
-#: src/gui/trade.cpp:318
+#: src/gui/trade.cpp:304
 msgid "You don't have enough money."
 msgstr "You don't have enough money."
 
@@ -1935,22 +1983,22 @@ msgstr "Connecting..."
 msgid "Play"
 msgstr "Play"
 
-#: src/gui/updatewindow.cpp:405
+#: src/gui/updatewindow.cpp:417
 msgid "##1  The update process is incomplete."
 msgstr "##1  The update process is incomplete."
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:407
+#: src/gui/updatewindow.cpp:419
 msgid "##1  It is strongly recommended that"
 msgstr "##1  It is strongly recommended that"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:409
+#: src/gui/updatewindow.cpp:421
 #, fuzzy
 msgid "##1  you try again later."
 msgstr "##1  you try again later"
 
-#: src/gui/updatewindow.cpp:501
+#: src/gui/updatewindow.cpp:515
 msgid "Completed"
 msgstr "Completed"
 
@@ -2030,55 +2078,55 @@ msgstr "Need a user to op!"
 msgid "Need a user to kick!"
 msgstr "Need a user to kick!"
 
-#: src/gui/widgets/chattab.cpp:118
+#: src/gui/widgets/chattab.cpp:121
 msgid "Global announcement:"
 msgstr "Global announcement:"
 
-#: src/gui/widgets/chattab.cpp:124
+#: src/gui/widgets/chattab.cpp:127
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "Global announcement from %s:"
 
-#: src/gui/widgets/chattab.cpp:150
+#: src/gui/widgets/chattab.cpp:153
 #, fuzzy, c-format
 msgid "%s whispers: %s"
 msgstr "%s whispers: "
 
-#: src/gui/widgets/whispertab.cpp:51
+#: src/gui/widgets/whispertab.cpp:53
 msgid "Cannot send empty chat!"
 msgstr "Cannot send empty chat!"
 
-#: src/gui/widgets/whispertab.cpp:70
+#: src/gui/widgets/whispertab.cpp:72
 msgid "/ignore > Ignore the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:71
+#: src/gui/widgets/whispertab.cpp:73
 msgid "/unignore > Stop ignoring the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:72
+#: src/gui/widgets/whispertab.cpp:74
 msgid "/close > Close the whisper tab"
 msgstr "/close > Close the whisper tab"
 
-#: src/gui/widgets/whispertab.cpp:82
+#: src/gui/widgets/whispertab.cpp:84
 msgid "Command: /close"
 msgstr "Command: /close"
 
-#: src/gui/widgets/whispertab.cpp:83
+#: src/gui/widgets/whispertab.cpp:85
 msgid "This command closes the current whisper tab."
 msgstr "This command closes the current whisper tab."
 
-#: src/gui/widgets/whispertab.cpp:87
+#: src/gui/widgets/whispertab.cpp:89
 #, fuzzy
 msgid "Command: /ignore"
 msgstr "Command: /item"
 
-#: src/gui/widgets/whispertab.cpp:88
+#: src/gui/widgets/whispertab.cpp:90
 #, fuzzy
 msgid "This command ignores the other player regardless of current relations."
 msgstr "This command displays the number of players currently online."
 
-#: src/gui/widgets/whispertab.cpp:94
+#: src/gui/widgets/whispertab.cpp:96
 #, fuzzy
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr "This command starts recording the chat log to the file <filename>."
@@ -2106,646 +2154,1010 @@ msgstr "Change"
 msgid "Choose World"
 msgstr "Choose your server"
 
-#: src/keyboardconfig.cpp:40
+#: src/keyboardconfig.cpp:39
 msgid "Move Up"
 msgstr "Move Up"
 
-#: src/keyboardconfig.cpp:41
+#: src/keyboardconfig.cpp:40
 msgid "Move Down"
 msgstr "Move Down"
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:41
 msgid "Move Left"
 msgstr "Move Left"
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:42
 msgid "Move Right"
 msgstr "Move Right"
 
-#: src/keyboardconfig.cpp:44 src/net/ea/generalhandler.cpp:223
+#: src/keyboardconfig.cpp:43 src/net/tmwa/generalhandler.cpp:237
 msgid "Attack"
 msgstr "Attack"
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:44
 msgid "Target & Attack"
 msgstr "Target & Attack"
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:45
 msgid "Smilie"
 msgstr "Smiley"
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:46
 msgid "Talk"
 msgstr "Talk"
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:47
 msgid "Stop Attack"
 msgstr "Stop Attack"
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:48
 #, fuzzy
 msgid "Target Monster"
 msgstr "Target Closest"
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboardconfig.cpp:49
 msgid "Target NPC"
 msgstr "Target NPC"
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:50
 msgid "Target Player"
 msgstr "Target Player"
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:51
 msgid "Pickup"
 msgstr "Pick up"
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:52
 msgid "Hide Windows"
 msgstr "Hide Windows"
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:53
 msgid "Sit"
 msgstr "Sit"
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:54
 msgid "Screenshot"
 msgstr "Screenshot"
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:55
 msgid "Enable/Disable Trading"
 msgstr "Allow/Disallow Trading"
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:56
 msgid "Find Path to Mouse"
 msgstr "Find Path to Mouse"
 
-#: src/keyboardconfig.cpp:58 src/keyboardconfig.cpp:59
-#: src/keyboardconfig.cpp:60 src/keyboardconfig.cpp:61
-#: src/keyboardconfig.cpp:62 src/keyboardconfig.cpp:63
-#: src/keyboardconfig.cpp:64 src/keyboardconfig.cpp:65
-#: src/keyboardconfig.cpp:66 src/keyboardconfig.cpp:67
-#: src/keyboardconfig.cpp:68 src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:57 src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60
+#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62
+#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64
+#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68
 #, c-format
 msgid "Item Shortcut %d"
 msgstr "Item Shortcut %d"
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:69
 msgid "Help Window"
 msgstr "Help Window"
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:70
 msgid "Status Window"
 msgstr "Status Window"
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:71
 msgid "Inventory Window"
 msgstr "Inventory Window"
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:72
 msgid "Equipment Window"
 msgstr "Equipment Window"
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:73
 msgid "Skill Window"
 msgstr "Skill Window"
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:74
 msgid "Minimap Window"
 msgstr "Minimap Window"
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:75
 msgid "Chat Window"
 msgstr "Chat Window"
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:76
 msgid "Item Shortcut Window"
 msgstr "Item Shortcut Window"
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:77
 msgid "Setup Window"
 msgstr "Setup Window"
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:78
 msgid "Debug Window"
 msgstr "Debug Window"
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:79
 #, fuzzy
 msgid "Social Window"
 msgstr "Skill Window"
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:80
 msgid "Emote Shortcut Window"
 msgstr "Emote Shortcut Window"
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:81
 #, fuzzy
 msgid "Outfits Window"
 msgstr "Status Window"
 
-#: src/keyboardconfig.cpp:83
+#: src/keyboardconfig.cpp:82
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:83
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86
-#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88
-#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90
-#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92
-#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:84 src/keyboardconfig.cpp:85
+#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:87
+#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:89
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:91
+#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:93
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:95
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "Emote Shortcut %d"
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:96
 msgid "Toggle Chat"
 msgstr "Toggle Chat"
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:97
 msgid "Scroll Chat Up"
 msgstr "Scroll Chat Up"
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:98
 msgid "Scroll Chat Down"
 msgstr "Scroll Chat Down"
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:99
 msgid "Previous Chat Tab"
 msgstr "Previous Chat Tab"
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:100
 msgid "Next Chat Tab"
 msgstr "Next Chat Tab"
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:101
 msgid "Select OK"
 msgstr "Select OK"
 
-#: src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:103
 msgid "Ignore input 1"
 msgstr "Ignore input 1"
 
-#: src/keyboardconfig.cpp:105
+#: src/keyboardconfig.cpp:104
 msgid "Ignore input 2"
 msgstr "Ignore input 2"
 
-#: src/keyboardconfig.cpp:184
+#: src/keyboardconfig.cpp:183
 #, fuzzy, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr "Resolve them, or gameplay may result in strange behaviour."
 
-#: src/localplayer.cpp:914
+#: src/localplayer.cpp:985
 msgid "Unable to pick up item."
 msgstr "Unable to pick up item."
 
 #. TRANSLATORS: This sentence may be translated differently
 #. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:923
+#: src/localplayer.cpp:994
 #, fuzzy, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "You picked up %s [@@%d|%s@@]."
 msgstr[1] "You picked up %s [@@%d|%s@@]."
 
-#: src/main.cpp:43
+#: src/main.cpp:42
 msgid "mana [options] [mana-file]"
 msgstr ""
 
+#: src/main.cpp:43
+msgid "[mana-file] : The mana file is an XML file (.mana)"
+msgstr ""
+
 #: src/main.cpp:44
+msgid "              used to set custom parameters"
+msgstr ""
+
+#: src/main.cpp:45
+msgid "              to the mana client."
+msgstr ""
+
+#: src/main.cpp:47
 msgid "Options:"
 msgstr "Options:"
 
-#: src/main.cpp:45
+#: src/main.cpp:48
 #, fuzzy
 msgid "  -v --version        : Display the version"
 msgstr "  -v --version     : Display the version"
 
-#: src/main.cpp:46
+#: src/main.cpp:49
 #, fuzzy
 msgid "  -h --help           : Display this help"
 msgstr "  -h --help        : Display this help"
 
-#: src/main.cpp:47
+#: src/main.cpp:50
 #, fuzzy
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr "  -C --config-file : Configuration file to use"
 
-#: src/main.cpp:48
+#: src/main.cpp:51
 #, fuzzy
 msgid "  -U --username       : Login with this username"
 msgstr "  -U --username    : Login with this username"
 
-#: src/main.cpp:49
+#: src/main.cpp:52
 #, fuzzy
 msgid "  -P --password       : Login with this password"
 msgstr "  -P --password    : Login with this password"
 
-#: src/main.cpp:50
+#: src/main.cpp:53
 #, fuzzy
 msgid "  -c --character      : Login with this character"
 msgstr "  -c --character   : Login with this character"
 
-#: src/main.cpp:51
+#: src/main.cpp:54
 #, fuzzy
 msgid "  -s --server         : Login server name or IP"
 msgstr "  -s --server      : Login server name or IP"
 
-#: src/main.cpp:52
+#: src/main.cpp:55
 #, fuzzy
 msgid "  -p --port           : Login server port"
 msgstr "  -p --port        : Login server port"
 
-#: src/main.cpp:53
+#: src/main.cpp:56
 #, fuzzy
 msgid "     --update-host    : Use this update host"
 msgstr "  -H --update-host : Use this update host"
 
-#: src/main.cpp:54
+#: src/main.cpp:57
 #, fuzzy
 msgid "  -D --default        : Choose default character server and character"
 msgstr "  -D --default     : Choose default character server and character"
 
-#: src/main.cpp:56
+#: src/main.cpp:59
 #, fuzzy
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr "  -u --skip-update : Skip the update downloads"
 
-#: src/main.cpp:57
+#: src/main.cpp:60
 #, fuzzy
 msgid "  -d --data           : Directory to load game data from"
 msgstr "  -d --data        : Directory to load game data from"
 
-#: src/main.cpp:58
+#: src/main.cpp:61
 #, fuzzy
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
+msgid "     --localdata-dir  : Directory to use as local data directory"
 msgstr "  -S --home-dir    : Directory to use as home directory"
 
-#: src/main.cpp:59
+#: src/main.cpp:62
+#, fuzzy
+msgid "     --chat-log-dir   : Chat log dir to use"
+msgstr "  -C --config-file : Configuration file to use"
+
+#: src/main.cpp:63
 #, fuzzy
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr "  -S --home-dir    : Directory to use as home directory"
 
-#: src/main.cpp:61
+#: src/main.cpp:65
 #, fuzzy
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr "  -O --no-opengl   : Disable OpenGL for this session"
 
-#: src/net/ea/adminhandler.cpp:63
+#: src/net/manaserv/beinghandler.cpp:303 src/net/tmwa/playerhandler.cpp:94
+msgid "You are dead."
+msgstr "You are dead."
+
+#: src/net/manaserv/beinghandler.cpp:304 src/net/tmwa/playerhandler.cpp:95
+msgid "We regret to inform you that your character was killed in battle."
+msgstr "We regret to inform you that your character was killed in battle."
+
+#: src/net/manaserv/beinghandler.cpp:306 src/net/tmwa/playerhandler.cpp:97
+msgid "You are not that alive anymore."
+msgstr "You are not that alive anymore."
+
+#: src/net/manaserv/beinghandler.cpp:307 src/net/tmwa/playerhandler.cpp:98
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr "The cold hands of the grim reaper are grasping for your soul."
+
+#: src/net/manaserv/beinghandler.cpp:308 src/net/tmwa/playerhandler.cpp:99
+msgid "Game Over!"
+msgstr "Game Over!"
+
+#: src/net/manaserv/beinghandler.cpp:309 src/net/tmwa/playerhandler.cpp:101
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+
+#: src/net/manaserv/beinghandler.cpp:311 src/net/tmwa/playerhandler.cpp:103
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr ""
+"Your plan of breaking your enemy's weapon by bashing it with your throat "
+"failed."
+
+#: src/net/manaserv/beinghandler.cpp:313 src/net/tmwa/playerhandler.cpp:105
+msgid "I guess this did not run too well."
+msgstr "I guess this did not run too well."
+
+#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:107
+msgid "Do you want your possessions identified?"
+msgstr "Do you want your possessions identified?"
+
+#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:109
+msgid "Sadly, no trace of you was ever found..."
+msgstr "Sadly, no trace of you was ever found..."
+
+#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:111
+msgid "Annihilated."
+msgstr "Annihilated."
+
+#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:113
+msgid "Looks like you got your head handed to you."
+msgstr "Looks like you got your head handed to you."
+
+#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:115
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr ""
+"You screwed up again, dump your body down the tubes and get yourself another "
+"one."
+
+#: src/net/manaserv/beinghandler.cpp:323
+#, fuzzy
+msgid "Press OK to respawn."
+msgstr " Press OK to respawn"
+
+#: src/net/manaserv/beinghandler.cpp:324
+#, fuzzy
+msgid "You Died"
+msgstr "You died"
+
+#: src/net/manaserv/charhandler.cpp:138 src/net/manaserv/charhandler.cpp:209
+#, fuzzy
+msgid "Not logged in."
+msgstr "Already logged in"
+
+#: src/net/manaserv/charhandler.cpp:141
+msgid "No empty slot."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:144
+msgid "Invalid name."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:147
+#, fuzzy
+msgid "Character's name already exists."
+msgstr "Username already exists"
+
+#: src/net/manaserv/charhandler.cpp:150
+msgid "Invalid hairstyle."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:153
+msgid "Invalid hair color."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:156
+msgid "Invalid gender."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:159
+#, fuzzy
+msgid "Character's stats are too high."
+msgstr "Character stats OK"
+
+#: src/net/manaserv/charhandler.cpp:162
+#, fuzzy
+msgid "Character's stats are too low."
+msgstr "Character stats OK"
+
+#: src/net/manaserv/charhandler.cpp:165
+#, c-format
+msgid "At least one statis out of the permitted range: (%u - %u)."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:171 src/net/manaserv/loginhandler.cpp:96
+#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
+#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
+#: src/net/tmwa/loginhandler.cpp:95 src/net/tmwa/loginhandler.cpp:182
+#, fuzzy
+msgid "Unknown error."
+msgstr "Unknown error"
+
+#: src/net/manaserv/charhandler.cpp:200 src/net/tmwa/charserverhandler.cpp:146
+msgid "Info"
+msgstr "Info"
+
+#: src/net/manaserv/charhandler.cpp:200
+#, fuzzy
+msgid "Player deleted."
+msgstr "Character deleted."
+
+#: src/net/manaserv/charhandler.cpp:212
+#, fuzzy
+msgid "Selection out of range."
+msgstr "Select amount of items to trade."
+
+#: src/net/manaserv/charhandler.cpp:215
+#, fuzzy, c-format
+msgid "Unknown error (%d)."
+msgstr "Unknown error"
+
+#: src/net/manaserv/charhandler.cpp:250
+msgid "No gameservers are available."
+msgstr "No gameservers are available."
+
+#: src/net/manaserv/chathandler.cpp:187 src/net/manaserv/chathandler.cpp:313
+#: src/net/manaserv/guildhandler.cpp:260
+#, c-format
+msgid "Topic: %s"
+msgstr "Topic: %s"
+
+#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:274
+#, fuzzy
+msgid "Players in this channel:"
+msgstr "Player hits Monster"
+
+#: src/net/manaserv/chathandler.cpp:208
+#, fuzzy
+msgid "Error joining channel."
+msgstr "Command: /join <channel>"
+
+#: src/net/manaserv/chathandler.cpp:214
+#, fuzzy
+msgid "Listing channels."
+msgstr "Requesting to join channel %s."
+
+#: src/net/manaserv/chathandler.cpp:226
+msgid "End of channel list."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:303
+#, fuzzy, c-format
+msgid "%s entered the channel."
+msgstr "%s joined the party."
+
+#: src/net/manaserv/chathandler.cpp:308
+#, c-format
+msgid "%s left the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:324
+#, c-format
+msgid "%s has set mode %s on user %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:334
+#, c-format
+msgid "%s has kicked %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:339
+#, fuzzy
+msgid "Unknown channel event."
+msgstr "Unknown command."
+
+#: src/net/manaserv/guildhandler.cpp:82
+msgid "Guild created."
+msgstr "Guild created."
+
+#: src/net/manaserv/guildhandler.cpp:87
+msgid "Error creating guild."
+msgstr "Error creating guild."
+
+#: src/net/manaserv/guildhandler.cpp:97
+msgid "Invite sent."
+msgstr "Invite sent."
+
+#: src/net/manaserv/guildhandler.cpp:204
+msgid "Member was promoted successfully."
+msgstr "Member was promoted successfully."
+
+#: src/net/manaserv/guildhandler.cpp:209
+msgid "Failed to promote member."
+msgstr "Failed to promote member."
+
+#: src/net/manaserv/loginhandler.cpp:87
+#, fuzzy
+msgid "Wrong magic_token."
+msgstr "Wrong magic_token"
+
+#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
+#, fuzzy
+msgid "Already logged in."
+msgstr "Already logged in"
+
+#: src/net/manaserv/loginhandler.cpp:93
+#, fuzzy
+msgid "Account banned."
+msgstr "Account expired"
+
+#: src/net/manaserv/loginhandler.cpp:118
+#, fuzzy
+msgid "New password incorrect."
+msgstr "New password incorrect"
+
+#: src/net/manaserv/loginhandler.cpp:121 src/net/tmwa/loginhandler.cpp:89
+#, fuzzy
+msgid "Old password incorrect."
+msgstr "Old password incorrect"
+
+#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
+msgid "Account not connected. Please login first."
+msgstr "Account not connected. Please login first."
+
+#: src/net/manaserv/loginhandler.cpp:149
+#, fuzzy
+msgid "New email address incorrect."
+msgstr "New email address incorrect"
+
+#: src/net/manaserv/loginhandler.cpp:152
+#, fuzzy
+msgid "Old email address incorrect."
+msgstr "Old email address incorrect"
+
+#: src/net/manaserv/loginhandler.cpp:158
+#, fuzzy
+msgid "The new email address already exists."
+msgstr "The new Email Address already exists."
+
+#: src/net/manaserv/loginhandler.cpp:239
+msgid ""
+"Client registration is not allowed. Please contact server administration."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
+#, fuzzy
+msgid "Client version is too old."
+msgstr "Client version is too old"
+
+#: src/net/manaserv/loginhandler.cpp:266
+#, fuzzy
+msgid "Wrong username or password."
+msgstr "Wrong username or password"
+
+#: src/net/manaserv/loginhandler.cpp:272
+#, fuzzy
+msgid "Account banned"
+msgstr "Account expired"
+
+#: src/net/manaserv/loginhandler.cpp:275
+msgid "Login attempt too soon after previous attempt."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:303
+#, fuzzy
+msgid "Wrong username, password or email address."
+msgstr "Wrong username, password or email address"
+
+#: src/net/manaserv/loginhandler.cpp:306
+#, fuzzy
+msgid "Username already exists."
+msgstr "Username already exists"
+
+#: src/net/manaserv/loginhandler.cpp:309
+#, fuzzy
+msgid "Email address already exists."
+msgstr "Email address already exists"
+
+#: src/net/manaserv/loginhandler.cpp:312
+msgid "You took too long with the captcha or your response was incorrect."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:87
+msgid "Joined party."
+msgstr "Joined party."
+
+#: src/net/manaserv/partyhandler.cpp:105
+#, c-format
+msgid "%s joined the party."
+msgstr "%s joined the party."
+
+#: src/net/manaserv/partyhandler.cpp:123
+#, fuzzy, c-format
+msgid "%s rejected your invite."
+msgstr "%s refused your invitation."
+
+#: src/net/manaserv/tradehandler.cpp:95
+msgid "Accepting incoming trade requests."
+msgstr "Accepting incoming trade requests."
+
+#: src/net/manaserv/tradehandler.cpp:97
+msgid "Ignoring incoming trade requests."
+msgstr "Ignoring incoming trade requests."
+
+#: src/net/manaserv/tradehandler.cpp:115 src/net/tmwa/tradehandler.cpp:109
+msgid "Request for Trade"
+msgstr "Request for Trade"
+
+#: src/net/manaserv/tradehandler.cpp:116 src/net/tmwa/tradehandler.cpp:110
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
+msgstr "%s wants to trade with you, do you accept?"
+
+#: src/net/manaserv/tradehandler.cpp:134
+#, c-format
+msgid "Trading with %s"
+msgstr "Trading with %s"
+
+#: src/net/manaserv/tradehandler.cpp:148 src/net/tmwa/tradehandler.cpp:224
+msgid "Trade canceled."
+msgstr "Trade canceled."
+
+#: src/net/manaserv/tradehandler.cpp:155 src/net/tmwa/tradehandler.cpp:231
+msgid "Trade completed."
+msgstr "Trade completed."
+
+#: src/net/tmwa/adminhandler.cpp:64
 msgid "Kick failed!"
 msgstr "Kick failed!"
 
-#: src/net/ea/adminhandler.cpp:65
+#: src/net/tmwa/adminhandler.cpp:66
 msgid "Kick succeeded!"
 msgstr "Kick succeeded!"
 
-#: src/net/ea/buysellhandler.cpp:110
+#: src/net/tmwa/buysellhandler.cpp:109
 msgid "Nothing to sell."
 msgstr "Nothing to sell."
 
-#: src/net/ea/buysellhandler.cpp:117
+#: src/net/tmwa/buysellhandler.cpp:116
 msgid "Thanks for buying."
 msgstr "Thanks for buying."
 
-#: src/net/ea/buysellhandler.cpp:124
+#: src/net/tmwa/buysellhandler.cpp:123
 msgid "Unable to buy."
 msgstr "Unable to buy."
 
-#: src/net/ea/buysellhandler.cpp:130
+#: src/net/tmwa/buysellhandler.cpp:129
 msgid "Thanks for selling."
 msgstr "Thanks for selling."
 
-#: src/net/ea/buysellhandler.cpp:132
+#: src/net/tmwa/buysellhandler.cpp:131
 msgid "Unable to sell."
 msgstr "Unable to sell."
 
-#: src/net/ea/charserverhandler.cpp:103
-#, fuzzy
-msgid "Access denied."
-msgstr "Access denied"
+#: src/net/tmwa/charserverhandler.cpp:103
+msgid "Access denied. Most likely, there are too many players on this server."
+msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:106
+#: src/net/tmwa/charserverhandler.cpp:107
 #, fuzzy
 msgid "Cannot use this ID."
 msgstr "Cannot use this ID"
 
-#: src/net/ea/charserverhandler.cpp:109
+#: src/net/tmwa/charserverhandler.cpp:110
 #, fuzzy
-msgid "Unknown failure to select character."
-msgstr "Unknown failure to select character"
+msgid "Unknown char-server failure."
+msgstr "Unknown error"
 
-#: src/net/ea/charserverhandler.cpp:135
+#: src/net/tmwa/charserverhandler.cpp:134
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr "Failed to create character. Most likely the name is already taken."
 
-#: src/net/ea/charserverhandler.cpp:147 src/net/manaserv/charhandler.cpp:187
-msgid "Info"
-msgstr "Info"
-
-#: src/net/ea/charserverhandler.cpp:147
+#: src/net/tmwa/charserverhandler.cpp:146
 msgid "Character deleted."
 msgstr "Character deleted."
 
-#: src/net/ea/charserverhandler.cpp:152
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Failed to delete character."
 msgstr "Failed to delete character."
 
-#: src/net/ea/charserverhandler.cpp:237 src/net/manaserv/charhandler.cpp:263
+#: src/net/tmwa/charserverhandler.cpp:266
 msgid "Strength:"
 msgstr "Strength:"
 
-#: src/net/ea/charserverhandler.cpp:238 src/net/manaserv/charhandler.cpp:264
+#: src/net/tmwa/charserverhandler.cpp:267
 msgid "Agility:"
 msgstr "Agility:"
 
-#: src/net/ea/charserverhandler.cpp:239 src/net/manaserv/charhandler.cpp:266
+#: src/net/tmwa/charserverhandler.cpp:268
 msgid "Vitality:"
 msgstr "Vitality:"
 
-#: src/net/ea/charserverhandler.cpp:240 src/net/manaserv/charhandler.cpp:267
+#: src/net/tmwa/charserverhandler.cpp:269
 msgid "Intelligence:"
 msgstr "Intelligence:"
 
-#: src/net/ea/charserverhandler.cpp:241 src/net/manaserv/charhandler.cpp:265
+#: src/net/tmwa/charserverhandler.cpp:270
 msgid "Dexterity:"
 msgstr "Dexterity:"
 
-#: src/net/ea/charserverhandler.cpp:242
+#: src/net/tmwa/charserverhandler.cpp:271
 msgid "Luck:"
 msgstr "Luck:"
 
-#: src/net/ea/chathandler.cpp:80
-msgid "Whisper could not be sent, user is offline."
+#: src/net/tmwa/chathandler.cpp:87
+#, fuzzy, c-format
+msgid "Whisper could not be sent, %s is offline."
 msgstr "Whisper could not be sent, user is offline."
 
-#: src/net/ea/chathandler.cpp:84
-msgid "Whisper could not be sent, ignored by user."
+#: src/net/tmwa/chathandler.cpp:96
+#, fuzzy, c-format
+msgid "Whisper could not be sent, ignored by %s."
 msgstr "Whisper could not be sent, ignored by user."
 
-#: src/net/ea/chathandler.cpp:171
+#: src/net/tmwa/chathandler.cpp:230
 #, fuzzy
 msgid "MVP player."
 msgstr "Player"
 
-#: src/net/ea/chathandler.cpp:204 src/net/ea/chathandler.cpp:210
-#: src/net/ea/chathandler.cpp:215 src/net/ea/chathandler.cpp:220
-#: src/net/ea/chathandler.cpp:225 src/net/ea/chathandler.cpp:230
-#: src/net/ea/chathandler.cpp:235 src/net/ea/chathandler.cpp:240
+#: src/net/tmwa/chathandler.cpp:265 src/net/tmwa/chathandler.cpp:271
+#: src/net/tmwa/chathandler.cpp:276 src/net/tmwa/chathandler.cpp:281
+#: src/net/tmwa/chathandler.cpp:286 src/net/tmwa/chathandler.cpp:291
+#: src/net/tmwa/chathandler.cpp:296 src/net/tmwa/chathandler.cpp:301
 msgid "Channels are not supported!"
 msgstr "Channels are not supported!"
 
-#: src/net/ea/gamehandler.cpp:86
+#: src/net/tmwa/gamehandler.cpp:88
 #, c-format
 msgid "Online users: %d"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:100
+#: src/net/tmwa/gamehandler.cpp:101
 #, fuzzy
 msgid "Game"
 msgstr "Name"
 
-#: src/net/ea/gamehandler.cpp:100
+#: src/net/tmwa/gamehandler.cpp:101
 #, fuzzy
 msgid "Request to quit denied!"
 msgstr "Request for Trade"
 
-#: src/net/ea/generalhandler.cpp:102 src/net/manaserv/generalhandler.cpp:95
+#: src/net/tmwa/generalhandler.cpp:102
 #, c-format
 msgid "Strength %+d"
 msgstr "Strength %+d"
 
-#: src/net/ea/generalhandler.cpp:103 src/net/manaserv/generalhandler.cpp:96
+#: src/net/tmwa/generalhandler.cpp:103
 #, c-format
 msgid "Agility %+d"
 msgstr "Agility %+d"
 
-#: src/net/ea/generalhandler.cpp:104 src/net/manaserv/generalhandler.cpp:98
+#: src/net/tmwa/generalhandler.cpp:104
 #, c-format
 msgid "Vitality %+d"
 msgstr "Vitality %+d"
 
-#: src/net/ea/generalhandler.cpp:105 src/net/manaserv/generalhandler.cpp:99
+#: src/net/tmwa/generalhandler.cpp:105
 #, c-format
 msgid "Intelligence %+d"
 msgstr "Intelligence %+d"
 
-#: src/net/ea/generalhandler.cpp:106 src/net/manaserv/generalhandler.cpp:97
+#: src/net/tmwa/generalhandler.cpp:106
 #, c-format
 msgid "Dexterity %+d"
 msgstr "Dexterity %+d"
 
-#: src/net/ea/generalhandler.cpp:107
+#: src/net/tmwa/generalhandler.cpp:107
 #, c-format
 msgid "Luck %+d"
 msgstr "Luck %+d"
 
-#: src/net/ea/generalhandler.cpp:130
+#: src/net/tmwa/generalhandler.cpp:132
 #, fuzzy
 msgid "Authentication failed."
 msgstr "Authentication failed"
 
-#: src/net/ea/generalhandler.cpp:133
+#: src/net/tmwa/generalhandler.cpp:135
 #, fuzzy
 msgid "No servers available."
 msgstr "No servers available"
 
-#: src/net/ea/generalhandler.cpp:137
+#: src/net/tmwa/generalhandler.cpp:139
 #, fuzzy
 msgid "Someone else is trying to use this account."
 msgstr "Someone else is trying to use this account"
 
-#: src/net/ea/generalhandler.cpp:140
+#: src/net/tmwa/generalhandler.cpp:142
 #, fuzzy
 msgid "This account is already logged in."
 msgstr "This account is already logged in"
 
-#: src/net/ea/generalhandler.cpp:143
+#: src/net/tmwa/generalhandler.cpp:145
 #, fuzzy
 msgid "Speed hack detected."
 msgstr "Speed hack detected"
 
-#: src/net/ea/generalhandler.cpp:146
+#: src/net/tmwa/generalhandler.cpp:148
 #, fuzzy
 msgid "Duplicated login."
 msgstr "Duplicated login"
 
-#: src/net/ea/generalhandler.cpp:149
+#: src/net/tmwa/generalhandler.cpp:151
 #, fuzzy
 msgid "Unknown connection error."
 msgstr "Unknown connection error"
 
-#: src/net/ea/generalhandler.cpp:205
+#: src/net/tmwa/generalhandler.cpp:209
 msgid "Got disconnected from server!"
 msgstr "Disconnected from server!"
 
-#: src/net/ea/generalhandler.cpp:216 src/net/manaserv/generalhandler.cpp:166
+#: src/net/tmwa/generalhandler.cpp:230
 msgid "Strength"
 msgstr "Strength"
 
-#: src/net/ea/generalhandler.cpp:217 src/net/manaserv/generalhandler.cpp:167
+#: src/net/tmwa/generalhandler.cpp:231
 msgid "Agility"
 msgstr "Agility"
 
-#: src/net/ea/generalhandler.cpp:218 src/net/manaserv/generalhandler.cpp:169
+#: src/net/tmwa/generalhandler.cpp:232
 msgid "Vitality"
 msgstr "Vitality"
 
-#: src/net/ea/generalhandler.cpp:219 src/net/manaserv/generalhandler.cpp:170
+#: src/net/tmwa/generalhandler.cpp:233
 msgid "Intelligence"
 msgstr "Intelligence"
 
-#: src/net/ea/generalhandler.cpp:220 src/net/manaserv/generalhandler.cpp:168
+#: src/net/tmwa/generalhandler.cpp:234
 msgid "Dexterity"
 msgstr "Dexterity"
 
-#: src/net/ea/generalhandler.cpp:221
+#: src/net/tmwa/generalhandler.cpp:235
 msgid "Luck"
 msgstr "Luck"
 
-#: src/net/ea/generalhandler.cpp:224
+#: src/net/tmwa/generalhandler.cpp:238
 #, fuzzy
 msgid "Defense"
 msgstr "Defense:"
 
-#: src/net/ea/generalhandler.cpp:225
+#: src/net/tmwa/generalhandler.cpp:239
 #, fuzzy
 msgid "M.Attack"
 msgstr "M.Attack:"
 
-#: src/net/ea/generalhandler.cpp:226
+#: src/net/tmwa/generalhandler.cpp:240
 #, fuzzy
 msgid "M.Defense"
 msgstr "M.Defense:"
 
-#: src/net/ea/generalhandler.cpp:227
+#: src/net/tmwa/generalhandler.cpp:241
 #, fuzzy, c-format
 msgid "% Accuracy"
 msgstr "% Accuracy:"
 
-#: src/net/ea/generalhandler.cpp:228
+#: src/net/tmwa/generalhandler.cpp:242
 #, fuzzy, c-format
 msgid "% Evade"
 msgstr "% Evade:"
 
-#: src/net/ea/generalhandler.cpp:229
+#: src/net/tmwa/generalhandler.cpp:243
 #, fuzzy, c-format
 msgid "% Critical"
 msgstr "Critical Hit"
 
-#: src/net/ea/gui/guildtab.cpp:45
+#: src/net/tmwa/gui/guildtab.cpp:45
 msgid "Guild"
 msgstr "Guild"
 
-#: src/net/ea/gui/guildtab.cpp:61 src/net/ea/gui/partytab.cpp:59
+#: src/net/tmwa/gui/guildtab.cpp:61 src/net/tmwa/gui/partytab.cpp:59
 msgid "/help > Display this help."
 msgstr "/help > Display this help."
 
-#: src/net/ea/gui/guildtab.cpp:62
+#: src/net/tmwa/gui/guildtab.cpp:62
 #, fuzzy
 msgid "/invite > Invite a player to your guild"
 msgstr "/invite > Invite a player to your party"
 
-#: src/net/ea/gui/guildtab.cpp:63
+#: src/net/tmwa/gui/guildtab.cpp:63
 #, fuzzy
 msgid "/leave > Leave the guild you are in"
 msgstr "/leave > Leave the party you are in"
 
-#: src/net/ea/gui/guildtab.cpp:64
+#: src/net/tmwa/gui/guildtab.cpp:64
 #, fuzzy
 msgid "/kick > Kick some one from the guild you are in"
 msgstr "/kick > Kick some one from the party you are in"
 
-#: src/net/ea/gui/guildtab.cpp:73 src/net/ea/gui/partytab.cpp:73
+#: src/net/tmwa/gui/guildtab.cpp:73 src/net/tmwa/gui/partytab.cpp:73
 msgid "Command: /invite <nick>"
 msgstr "Command: /invite <nick>"
 
-#: src/net/ea/gui/guildtab.cpp:74
+#: src/net/tmwa/gui/guildtab.cpp:74
 #, fuzzy
 msgid "This command invites <nick> to the guild you're in."
 msgstr "This command invites <nick> to party with you."
 
-#: src/net/ea/gui/guildtab.cpp:80 src/net/ea/gui/partytab.cpp:80
+#: src/net/tmwa/gui/guildtab.cpp:80 src/net/tmwa/gui/partytab.cpp:80
 msgid "Command: /leave"
 msgstr "Command: /leave"
 
-#: src/net/ea/gui/guildtab.cpp:81
+#: src/net/tmwa/gui/guildtab.cpp:81
 #, fuzzy
 msgid "This command causes the player to leave the guild."
 msgstr "This command causes the player to leave the party."
 
-#: src/net/ea/gui/guildtab.cpp:89
+#: src/net/tmwa/gui/guildtab.cpp:89
 #, fuzzy
 msgid "Guild name is missing."
 msgstr "Party name is missing."
 
-#: src/net/ea/guildhandler.cpp:293
+#: src/net/tmwa/guildhandler.cpp:296
 msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:298
+#: src/net/tmwa/guildhandler.cpp:301
 msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:303
+#: src/net/tmwa/guildhandler.cpp:306
 #, fuzzy
 msgid "User is now part of your guild."
 msgstr "%s is now a member of your party."
 
-#: src/net/ea/guildhandler.cpp:308
+#: src/net/tmwa/guildhandler.cpp:311
 msgid "Your guild is full."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:313
+#: src/net/tmwa/guildhandler.cpp:316
 #, fuzzy
 msgid "Unknown guild invite response."
 msgstr "Unknown invite response for %s."
 
-#: src/net/ea/guildhandler.cpp:390
+#: src/net/tmwa/guildhandler.cpp:393
 msgid "Guild creation isn't supported yet."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:43
+#: src/net/tmwa/gui/partytab.cpp:43
 msgid "Party"
 msgstr "Party"
 
-#: src/net/ea/gui/partytab.cpp:60
+#: src/net/tmwa/gui/partytab.cpp:60
 msgid "/invite > Invite a player to your party"
 msgstr "/invite > Invite a player to your party"
 
-#: src/net/ea/gui/partytab.cpp:61
+#: src/net/tmwa/gui/partytab.cpp:61
 msgid "/leave > Leave the party you are in"
 msgstr "/leave > Leave the party you are in"
 
-#: src/net/ea/gui/partytab.cpp:62
+#: src/net/tmwa/gui/partytab.cpp:62
 msgid "/kick > Kick some one from the party you are in"
 msgstr "/kick > Kick some one from the party you are in"
 
-#: src/net/ea/gui/partytab.cpp:63
+#: src/net/tmwa/gui/partytab.cpp:63
 msgid "/item > Show/change party item sharing options"
 msgstr "/item > Show/change party item sharing options"
 
-#: src/net/ea/gui/partytab.cpp:64
+#: src/net/tmwa/gui/partytab.cpp:64
 msgid "/exp > Show/change party experience sharing options"
 msgstr "/exp > Show/change party experience sharing options"
 
-#: src/net/ea/gui/partytab.cpp:81
+#: src/net/tmwa/gui/partytab.cpp:81
 msgid "This command causes the player to leave the party."
 msgstr "This command causes the player to leave the party."
 
-#: src/net/ea/gui/partytab.cpp:85
+#: src/net/tmwa/gui/partytab.cpp:85
 msgid "Command: /item <policy>"
 msgstr "Command: /item <policy>"
 
-#: src/net/ea/gui/partytab.cpp:86
+#: src/net/tmwa/gui/partytab.cpp:86
 msgid "This command changes the party's item sharing policy."
 msgstr "This command changes the party's item sharing policy."
 
-#: src/net/ea/gui/partytab.cpp:87
+#: src/net/tmwa/gui/partytab.cpp:87
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
@@ -2753,23 +3165,23 @@ msgstr ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
 
-#: src/net/ea/gui/partytab.cpp:90
+#: src/net/tmwa/gui/partytab.cpp:90
 msgid "Command: /item"
 msgstr "Command: /item"
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/tmwa/gui/partytab.cpp:91
 msgid "This command displays the party's current item sharing policy."
 msgstr "This command displays the party's current item sharing policy."
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/tmwa/gui/partytab.cpp:95
 msgid "Command: /exp <policy>"
 msgstr "Command: /exp <policy>"
 
-#: src/net/ea/gui/partytab.cpp:96
+#: src/net/tmwa/gui/partytab.cpp:96
 msgid "This command changes the party's experience sharing policy."
 msgstr "This command changes the party's experience sharing policy."
 
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/tmwa/gui/partytab.cpp:97
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
@@ -2777,110 +3189,97 @@ msgstr ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 
-#: src/net/ea/gui/partytab.cpp:100
+#: src/net/tmwa/gui/partytab.cpp:100
 msgid "Command: /exp"
 msgstr "Command: /exp"
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/tmwa/gui/partytab.cpp:101
 msgid "This command displays the party's current experience sharing policy."
 msgstr "This command displays the party's current experience sharing policy."
 
-#: src/net/ea/gui/partytab.cpp:132 src/net/ea/partyhandler.cpp:198
+#: src/net/tmwa/gui/partytab.cpp:132 src/net/tmwa/partyhandler.cpp:196
 msgid "Item sharing enabled."
 msgstr "Item sharing enabled."
 
-#: src/net/ea/gui/partytab.cpp:135 src/net/ea/partyhandler.cpp:204
+#: src/net/tmwa/gui/partytab.cpp:135 src/net/tmwa/partyhandler.cpp:202
 msgid "Item sharing disabled."
 msgstr "Item sharing disabled."
 
-#: src/net/ea/gui/partytab.cpp:138 src/net/ea/partyhandler.cpp:210
+#: src/net/tmwa/gui/partytab.cpp:138 src/net/tmwa/partyhandler.cpp:208
 msgid "Item sharing not possible."
 msgstr "Item sharing not possible."
 
-#: src/net/ea/gui/partytab.cpp:141
+#: src/net/tmwa/gui/partytab.cpp:141
 #, fuzzy
 msgid "Item sharing unknown."
 msgstr "Item sharing enabled."
 
-#: src/net/ea/gui/partytab.cpp:167 src/net/ea/partyhandler.cpp:174
+#: src/net/tmwa/gui/partytab.cpp:167 src/net/tmwa/partyhandler.cpp:172
 msgid "Experience sharing enabled."
 msgstr "Experience sharing enabled."
 
-#: src/net/ea/gui/partytab.cpp:170 src/net/ea/partyhandler.cpp:180
+#: src/net/tmwa/gui/partytab.cpp:170 src/net/tmwa/partyhandler.cpp:178
 msgid "Experience sharing disabled."
 msgstr "Experience sharing disabled."
 
-#: src/net/ea/gui/partytab.cpp:173 src/net/ea/partyhandler.cpp:186
+#: src/net/tmwa/gui/partytab.cpp:173 src/net/tmwa/partyhandler.cpp:184
 msgid "Experience sharing not possible."
 msgstr "Experience sharing not possible."
 
-#: src/net/ea/gui/partytab.cpp:176
+#: src/net/tmwa/gui/partytab.cpp:176
 #, fuzzy
 msgid "Experience sharing unknown."
 msgstr "Experience sharing enabled."
 
-#: src/net/ea/inventoryhandler.cpp:281
+#: src/net/tmwa/inventoryhandler.cpp:285
 msgid "Failed to use item."
 msgstr "Failed to use item."
 
-#: src/net/ea/inventoryhandler.cpp:391
+#: src/net/tmwa/inventoryhandler.cpp:399
 msgid "Unable to equip."
 msgstr "Unable to equip."
 
-#: src/net/ea/inventoryhandler.cpp:402
+#: src/net/tmwa/inventoryhandler.cpp:410
 msgid "Unable to unequip."
 msgstr "Unable to unequip."
 
-#: src/net/ea/loginhandler.cpp:79
+#: src/net/tmwa/loginhandler.cpp:86
 msgid "Account was not found. Please re-login."
 msgstr "Account was not found. Please re-login."
 
-#: src/net/ea/loginhandler.cpp:82 src/net/manaserv/loginhandler.cpp:121
-#, fuzzy
-msgid "Old password incorrect."
-msgstr "Old password incorrect"
-
-#: src/net/ea/loginhandler.cpp:85
+#: src/net/tmwa/loginhandler.cpp:92
 #, fuzzy
 msgid "New password too short."
 msgstr "New password too short"
 
-#: src/net/ea/loginhandler.cpp:88 src/net/ea/loginhandler.cpp:175
-#: src/net/manaserv/charhandler.cpp:158 src/net/manaserv/loginhandler.cpp:96
-#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
-#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
-#, fuzzy
-msgid "Unknown error."
-msgstr "Unknown error"
-
-#: src/net/ea/loginhandler.cpp:149
+#: src/net/tmwa/loginhandler.cpp:156
 #, fuzzy
 msgid "Unregistered ID."
 msgstr "Unregistered ID"
 
-#: src/net/ea/loginhandler.cpp:152
+#: src/net/tmwa/loginhandler.cpp:159
 #, fuzzy
 msgid "Wrong password."
 msgstr "Wrong password"
 
-#: src/net/ea/loginhandler.cpp:155
+#: src/net/tmwa/loginhandler.cpp:162
 #, fuzzy
 msgid "Account expired."
 msgstr "Account expired"
 
-#: src/net/ea/loginhandler.cpp:158
+#: src/net/tmwa/loginhandler.cpp:165
 #, fuzzy
 msgid "Rejected from server."
 msgstr "Rejected from server"
 
-#: src/net/ea/loginhandler.cpp:161
+#: src/net/tmwa/loginhandler.cpp:168
 #, fuzzy
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 "You have been permanently banned from the game. Please contact the GM Team."
 
-#: src/net/ea/loginhandler.cpp:165
+#: src/net/tmwa/loginhandler.cpp:172
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -2889,188 +3288,126 @@ msgstr ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
 
-#: src/net/ea/loginhandler.cpp:172
+#: src/net/tmwa/loginhandler.cpp:179
 #, fuzzy
 msgid "This user name is already taken."
 msgstr "This user name is already taken"
 
-#: src/net/ea/network.cpp:145
+#: src/net/tmwa/network.cpp:145
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/ea/network.cpp:345
+#: src/net/tmwa/network.cpp:345
 #, fuzzy
 msgid "Unable to resolve host \""
 msgstr "Unable to sell."
 
-#: src/net/ea/network.cpp:414
+#: src/net/tmwa/network.cpp:414
 #, fuzzy
 msgid "Connection to server terminated. "
 msgstr "Connecting to map server..."
 
-#: src/net/ea/partyhandler.cpp:81
+#: src/net/tmwa/partyhandler.cpp:82
 msgid "Could not create party."
 msgstr "Could not create party."
 
-#: src/net/ea/partyhandler.cpp:84
+#: src/net/tmwa/partyhandler.cpp:84
 msgid "Party successfully created."
 msgstr "Party successfully created."
 
-#: src/net/ea/partyhandler.cpp:118
+#: src/net/tmwa/partyhandler.cpp:119
 #, c-format
 msgid "%s is already a member of a party."
 msgstr "%s is already a member of a party."
 
-#: src/net/ea/partyhandler.cpp:122
+#: src/net/tmwa/partyhandler.cpp:123
 #, c-format
 msgid "%s refused your invitation."
 msgstr "%s refused your invitation."
 
-#: src/net/ea/partyhandler.cpp:126
+#: src/net/tmwa/partyhandler.cpp:127
 #, c-format
 msgid "%s is now a member of your party."
 msgstr "%s is now a member of your party."
 
-#: src/net/ea/partyhandler.cpp:130
+#: src/net/tmwa/partyhandler.cpp:131
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr "Unknown invite response for %s."
 
-#: src/net/ea/partyhandler.cpp:238
+#: src/net/tmwa/partyhandler.cpp:236
 msgid "You have left the party."
 msgstr "You have left the party."
 
-#: src/net/ea/partyhandler.cpp:249
+#: src/net/tmwa/partyhandler.cpp:246
 #, c-format
 msgid "%s has left your party."
 msgstr "%s has left your party."
 
-#: src/net/ea/partyhandler.cpp:301
+#: src/net/tmwa/partyhandler.cpp:299
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr "An unknown member tried to say: %s"
 
-#: src/net/ea/partyhandler.cpp:329
-msgid "Inviting like this isn't supported at the moment."
-msgstr "Inviting like this isn't supported at the moment."
+#: src/net/tmwa/partyhandler.cpp:335
+#, c-format
+msgid "Inviting failed, because you can't see a player called %s."
+msgstr ""
 
-#: src/net/ea/partyhandler.cpp:334
+#: src/net/tmwa/partyhandler.cpp:340
 msgid "You can only inivte when you are in a party!"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:365
+#: src/net/tmwa/partyhandler.cpp:368
 #, c-format
 msgid "%s is not in your party!"
 msgstr "%s is not in your party!"
 
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:304
-msgid "You are dead."
-msgstr "You are dead."
-
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:305
-msgid "We regret to inform you that your character was killed in battle."
-msgstr "We regret to inform you that your character was killed in battle."
-
-#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:307
-msgid "You are not that alive anymore."
-msgstr "You are not that alive anymore."
-
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:308
-msgid "The cold hands of the grim reaper are grabbing for your soul."
-msgstr "The cold hands of the grim reaper are grasping for your soul."
-
-#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:309
-msgid "Game Over!"
-msgstr "Game Over!"
-
-#: src/net/ea/playerhandler.cpp:105
+#: src/net/tmwa/playerhandler.cpp:100
 msgid "Insert coin to continue."
 msgstr "Insert coin to continue."
 
-#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:310
-msgid ""
-"No, kids. Your character did not really die. It... err... went to a better "
-"place."
-msgstr ""
-"No, kids. Your character did not really die. It... err... went to a better "
-"place."
-
-#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:312
-msgid ""
-"Your plan of breaking your enemies weapon by bashing it with your throat "
-"failed."
-msgstr ""
-"Your plan of breaking your enemy's weapon by bashing it with your throat "
-"failed."
-
-#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:314
-msgid "I guess this did not run too well."
-msgstr "I guess this did not run too well."
-
-#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:315
-msgid "Do you want your possessions identified?"
-msgstr "Do you want your possessions identified?"
-
-#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:316
-msgid "Sadly, no trace of you was ever found..."
-msgstr "Sadly, no trace of you was ever found..."
-
-#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:317
-msgid "Annihilated."
-msgstr "Annihilated."
-
-#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:318
-msgid "Looks like you got your head handed to you."
-msgstr "Looks like you got your head handed to you."
-
-#: src/net/ea/playerhandler.cpp:120 src/net/manaserv/beinghandler.cpp:319
-msgid ""
-"You screwed up again, dump your body down the tubes and get you another one."
-msgstr ""
-"You screwed up again, dump your body down the tubes and get yourself another "
-"one."
-
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/tmwa/playerhandler.cpp:118
 msgid "You're not dead yet. You're just resting."
 msgstr "You're not dead yet. You're just resting."
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/tmwa/playerhandler.cpp:119
 msgid "You are no more."
 msgstr "You are no more."
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/tmwa/playerhandler.cpp:120
 msgid "You have ceased to be."
 msgstr "You have ceased to be."
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/tmwa/playerhandler.cpp:121
 msgid "You've expired and gone to meet your maker."
 msgstr "You've expired and gone to meet your maker."
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/tmwa/playerhandler.cpp:122
 msgid "You're a stiff."
 msgstr "You're a stiff."
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/tmwa/playerhandler.cpp:123
 msgid "Bereft of life, you rest in peace."
 msgstr "Bereft of life, you rest in peace."
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/tmwa/playerhandler.cpp:124
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr "If you weren't so animated, you'd be pushing up the daisies."
 
-#: src/net/ea/playerhandler.cpp:130
+#: src/net/tmwa/playerhandler.cpp:125
 msgid "Your metabolic processes are now history."
 msgstr "Your metabolic processes are now history."
 
-#: src/net/ea/playerhandler.cpp:131
+#: src/net/tmwa/playerhandler.cpp:126
 msgid "You're off the twig."
 msgstr "You're off the twig."
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/tmwa/playerhandler.cpp:127
 msgid "You've kicked the bucket."
 msgstr "You've kicked the bucket."
 
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/tmwa/playerhandler.cpp:128
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
@@ -3078,483 +3415,245 @@ msgstr ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 
-#: src/net/ea/playerhandler.cpp:135
+#: src/net/tmwa/playerhandler.cpp:130
 msgid "You are an ex-player."
 msgstr "You are an ex-player."
 
-#: src/net/ea/playerhandler.cpp:136
+#: src/net/tmwa/playerhandler.cpp:131
 msgid "You're pining for the fjords."
 msgstr "You're pining for the fjords."
 
-#: src/net/ea/playerhandler.cpp:249 src/net/ea/playerhandler.cpp:310
+#: src/net/tmwa/playerhandler.cpp:246 src/net/tmwa/playerhandler.cpp:285
 msgid "Message"
 msgstr "Message"
 
-#: src/net/ea/playerhandler.cpp:250
+#: src/net/tmwa/playerhandler.cpp:247
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 "You are carrying more than half your maximum load. You are unable to "
 "automatically regain health."
 
-#: src/net/ea/playerhandler.cpp:333
+#: src/net/tmwa/playerhandler.cpp:313
 #, fuzzy, c-format
 msgid "You picked up %s."
 msgstr "You picked up "
 
-#: src/net/ea/playerhandler.cpp:369
+#: src/net/tmwa/playerhandler.cpp:348
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:532
+#: src/net/tmwa/playerhandler.cpp:488
 msgid "Equip arrows first."
 msgstr "Equip arrows first."
 
-#: src/net/ea/specialhandler.cpp:147
+#: src/net/tmwa/specialhandler.cpp:144
 msgid "Trade failed!"
 msgstr "Trade failed!"
 
-#: src/net/ea/specialhandler.cpp:150
+#: src/net/tmwa/specialhandler.cpp:147
 msgid "Emote failed!"
 msgstr "Emote failed!"
 
-#: src/net/ea/specialhandler.cpp:153
+#: src/net/tmwa/specialhandler.cpp:150
 msgid "Sit failed!"
 msgstr "Sit failed!"
 
-#: src/net/ea/specialhandler.cpp:156
+#: src/net/tmwa/specialhandler.cpp:153
 msgid "Chat creating failed!"
 msgstr "Failed to create channel!"
 
-#: src/net/ea/specialhandler.cpp:159
+#: src/net/tmwa/specialhandler.cpp:156
 msgid "Could not join party!"
 msgstr "Could not join party!"
 
-#: src/net/ea/specialhandler.cpp:162
+#: src/net/tmwa/specialhandler.cpp:159
 msgid "Cannot shout!"
 msgstr "Can not shout!"
 
-#: src/net/ea/specialhandler.cpp:171
+#: src/net/tmwa/specialhandler.cpp:168
 msgid "You have not yet reached a high enough lvl!"
 msgstr "You have not yet reached a high enough level!"
 
-#: src/net/ea/specialhandler.cpp:174
+#: src/net/tmwa/specialhandler.cpp:171
 msgid "Insufficient HP!"
 msgstr "Insufficient HP!"
 
-#: src/net/ea/specialhandler.cpp:177
+#: src/net/tmwa/specialhandler.cpp:174
 msgid "Insufficient SP!"
 msgstr "Insufficient SP!"
 
-#: src/net/ea/specialhandler.cpp:180
+#: src/net/tmwa/specialhandler.cpp:177
 msgid "You have no memos!"
 msgstr "You have no memos!"
 
-#: src/net/ea/specialhandler.cpp:183
+#: src/net/tmwa/specialhandler.cpp:180
 msgid "You cannot do that right now!"
 msgstr "You can not do that right now!"
 
-#: src/net/ea/specialhandler.cpp:186
+#: src/net/tmwa/specialhandler.cpp:183
 msgid "Seems you need more money... ;-)"
 msgstr "Seems you need more money... ;-)"
 
-#: src/net/ea/specialhandler.cpp:189
+#: src/net/tmwa/specialhandler.cpp:186
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "You cannot use this skill with that kind of weapon!"
 
-#: src/net/ea/specialhandler.cpp:192
+#: src/net/tmwa/specialhandler.cpp:189
 msgid "You need another red gem!"
 msgstr "You need another red gem!"
 
-#: src/net/ea/specialhandler.cpp:195
+#: src/net/tmwa/specialhandler.cpp:192
 msgid "You need another blue gem!"
 msgstr "You need another blue gem!"
 
-#: src/net/ea/specialhandler.cpp:198
+#: src/net/tmwa/specialhandler.cpp:195
 msgid "You're carrying to much to do this!"
 msgstr "You're carrying to much to do this!"
 
-#: src/net/ea/specialhandler.cpp:201
+#: src/net/tmwa/specialhandler.cpp:198
 msgid "Huh? What's that?"
 msgstr "Huh? What's that?"
 
-#: src/net/ea/specialhandler.cpp:210
+#: src/net/tmwa/specialhandler.cpp:207
 msgid "Warp failed..."
 msgstr "Warp failed..."
 
-#: src/net/ea/specialhandler.cpp:213
+#: src/net/tmwa/specialhandler.cpp:210
 msgid "Could not steal anything..."
 msgstr "Could not steal anything..."
 
-#: src/net/ea/specialhandler.cpp:216
+#: src/net/tmwa/specialhandler.cpp:213
 msgid "Poison had no effect..."
 msgstr "Poison had no effect..."
 
-#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:116
-msgid "Request for Trade"
-msgstr "Request for Trade"
-
-#: src/net/ea/tradehandler.cpp:108 src/net/manaserv/tradehandler.cpp:117
-#, c-format
-msgid "%s wants to trade with you, do you accept?"
-msgstr "%s wants to trade with you, do you accept?"
-
-#: src/net/ea/tradehandler.cpp:124
+#: src/net/tmwa/tradehandler.cpp:126
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr "Trading isn't possible. Trade partner is too far away."
 
-#: src/net/ea/tradehandler.cpp:128
+#: src/net/tmwa/tradehandler.cpp:130
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr "Trading isn't possible. Character doesn't exist."
 
-#: src/net/ea/tradehandler.cpp:132
+#: src/net/tmwa/tradehandler.cpp:134
 msgid "Trade cancelled due to an unknown reason."
 msgstr "Trade cancelled due to an unknown reason."
 
-#: src/net/ea/tradehandler.cpp:137
+#: src/net/tmwa/tradehandler.cpp:139
 #, c-format
 msgid "Trade: You and %s"
 msgstr "Trade: You and %s"
 
-#: src/net/ea/tradehandler.cpp:144
+#: src/net/tmwa/tradehandler.cpp:146
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr "Trade with %s cancelled."
 
-#: src/net/ea/tradehandler.cpp:153
+#: src/net/tmwa/tradehandler.cpp:154
 msgid "Unhandled trade cancel packet."
 msgstr "Unhandled trade cancel packet."
 
-#: src/net/ea/tradehandler.cpp:202
+#: src/net/tmwa/tradehandler.cpp:202
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr "Failed to add item. Trade partner is over weighted."
 
-#: src/net/ea/tradehandler.cpp:207
+#: src/net/tmwa/tradehandler.cpp:207
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr "Failed to add item. Trade partner has no free slot."
 
-#: src/net/ea/tradehandler.cpp:211
+#: src/net/tmwa/tradehandler.cpp:211
 msgid "Failed adding item for unknown reason."
 msgstr "Failed to add item for unknown reason."
 
-#: src/net/ea/tradehandler.cpp:224 src/net/manaserv/tradehandler.cpp:149
-msgid "Trade canceled."
-msgstr "Trade canceled."
-
-#: src/net/ea/tradehandler.cpp:231 src/net/manaserv/tradehandler.cpp:156
-msgid "Trade completed."
-msgstr "Trade completed."
-
-#: src/net/manaserv/beinghandler.cpp:324
-#, fuzzy
-msgid "Press OK to respawn."
-msgstr " Press OK to respawn"
-
-#: src/net/manaserv/beinghandler.cpp:325
-#, fuzzy
-msgid "You Died"
-msgstr "You died"
-
-#: src/net/manaserv/charhandler.cpp:128 src/net/manaserv/charhandler.cpp:196
-#, fuzzy
-msgid "Not logged in."
-msgstr "Already logged in"
-
-#: src/net/manaserv/charhandler.cpp:131
-msgid "No empty slot."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:134
-msgid "Invalid name."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:137
-#, fuzzy
-msgid "Character's name already exists."
-msgstr "Username already exists"
-
-#: src/net/manaserv/charhandler.cpp:140
-msgid "Invalid hairstyle."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:143
-msgid "Invalid hair color."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:146
-msgid "Invalid gender."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:149
+#: src/playerrelations.cpp:310
 #, fuzzy
-msgid "Character's stats are too high."
-msgstr "Character stats OK"
-
-#: src/net/manaserv/charhandler.cpp:152
-#, fuzzy
-msgid "Character's stats are too low."
-msgstr "Character stats OK"
+msgid "Completely ignore"
+msgstr "@@ignore|Completely ignore %s@@"
 
-#: src/net/manaserv/charhandler.cpp:155
-msgid "One stat is zero."
+#: src/playerrelations.cpp:324
+msgid "Print '...'"
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:187
-#, fuzzy
-msgid "Player deleted."
-msgstr "Character deleted."
-
-#: src/net/manaserv/charhandler.cpp:199
-#, fuzzy
-msgid "Selection out of range."
-msgstr "Select amount of items to trade."
-
-#: src/net/manaserv/charhandler.cpp:202
-#, fuzzy, c-format
-msgid "Unknown error (%d)."
-msgstr "Unknown error"
-
-#: src/net/manaserv/charhandler.cpp:242
-msgid "No gameservers are available."
-msgstr "No gameservers are available."
-
-#: src/net/manaserv/charhandler.cpp:268
-msgid "Willpower:"
-msgstr "Willpower:"
-
-#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
-#: src/net/manaserv/guildhandler.cpp:259
-#, c-format
-msgid "Topic: %s"
-msgstr "Topic: %s"
-
-#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
-#, fuzzy
-msgid "Players in this channel:"
-msgstr "Player hits Monster"
-
-#: src/net/manaserv/chathandler.cpp:201
-#, fuzzy
-msgid "Error joining channel."
-msgstr "Command: /join <channel>"
-
-#: src/net/manaserv/chathandler.cpp:207
-#, fuzzy
-msgid "Listing channels."
-msgstr "Requesting to join channel %s."
-
-#: src/net/manaserv/chathandler.cpp:219
-msgid "End of channel list."
+#: src/playerrelations.cpp:340
+msgid "Blink name"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:291
-#, fuzzy, c-format
-msgid "%s entered the channel."
-msgstr "%s joined the party."
-
-#: src/net/manaserv/chathandler.cpp:296
+#: src/resources/itemdb.cpp:44
 #, c-format
-msgid "%s left the channel."
-msgstr ""
+msgid "Attack %+d"
+msgstr "Attack %+d"
 
-#: src/net/manaserv/chathandler.cpp:312
+#: src/resources/itemdb.cpp:45
 #, c-format
-msgid "%s has set mode %s on user %s."
-msgstr ""
+msgid "Defense %+d"
+msgstr "Defense %+d"
 
-#: src/net/manaserv/chathandler.cpp:322
+#: src/resources/itemdb.cpp:46
 #, c-format
-msgid "%s has kicked %s."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:327
-#, fuzzy
-msgid "Unknown channel event."
-msgstr "Unknown command."
+msgid "HP %+d"
+msgstr "HP %+d"
 
-#: src/net/manaserv/generalhandler.cpp:100
+#: src/resources/itemdb.cpp:47
 #, c-format
-msgid "Willpower %+d"
-msgstr "Willpower %+d"
-
-#: src/net/manaserv/generalhandler.cpp:171
-#, fuzzy
-msgid "Willpower"
-msgstr "Willpower:"
-
-#: src/net/manaserv/guildhandler.cpp:81
-msgid "Guild created."
-msgstr "Guild created."
-
-#: src/net/manaserv/guildhandler.cpp:86
-msgid "Error creating guild."
-msgstr "Error creating guild."
-
-#: src/net/manaserv/guildhandler.cpp:96
-msgid "Invite sent."
-msgstr "Invite sent."
-
-#: src/net/manaserv/guildhandler.cpp:203
-msgid "Member was promoted successfully."
-msgstr "Member was promoted successfully."
+msgid "MP %+d"
+msgstr "MP %+d"
 
-#: src/net/manaserv/guildhandler.cpp:208
-msgid "Failed to promote member."
-msgstr "Failed to promote member."
+#: src/resources/itemdb.cpp:92
+msgid "Unknown item"
+msgstr "Unknown item"
 
-#: src/net/manaserv/loginhandler.cpp:87
-#, fuzzy
-msgid "Wrong magic_token."
-msgstr "Wrong magic_token"
+#: src/resources/itemdb.cpp:135 src/resources/monsterdb.cpp:77
+msgid "unnamed"
+msgstr "unnamed"
 
-#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
 #, fuzzy
-msgid "Already logged in."
-msgstr "Already logged in"
+#~ msgid "HP"
+#~ msgstr "HP:"
 
-#: src/net/manaserv/loginhandler.cpp:93 src/net/manaserv/loginhandler.cpp:272
 #, fuzzy
-msgid "Server is full."
-msgstr "Server is full"
+#~ msgid "MP"
+#~ msgstr "MP:"
 
-#: src/net/manaserv/loginhandler.cpp:118
 #, fuzzy
-msgid "New password incorrect."
-msgstr "New password incorrect"
-
-#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
-msgid "Account not connected. Please login first."
-msgstr "Account not connected. Please login first."
+#~ msgid "Exp"
+#~ msgstr "Exp:"
 
-#: src/net/manaserv/loginhandler.cpp:149
 #, fuzzy
-msgid "New email address incorrect."
-msgstr "New email address incorrect"
+#~ msgid "Money"
+#~ msgstr "Money: %d"
 
-#: src/net/manaserv/loginhandler.cpp:152
 #, fuzzy
-msgid "Old email address incorrect."
-msgstr "Old email address incorrect"
+#~ msgid "Job"
+#~ msgstr "Job:"
 
-#: src/net/manaserv/loginhandler.cpp:158
 #, fuzzy
-msgid "The new email address already exists."
-msgstr "The new Email Address already exists."
+#~ msgid "Level"
+#~ msgstr "Level: %d"
 
-#: src/net/manaserv/loginhandler.cpp:239
-msgid ""
-"Client registration is not allowed. Please contact server administration."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
 #, fuzzy
-msgid "Client version is too old."
-msgstr "Client version is too old"
+#~ msgid "Access denied."
+#~ msgstr "Access denied"
 
-#: src/net/manaserv/loginhandler.cpp:266
 #, fuzzy
-msgid "Wrong username or password."
-msgstr "Wrong username or password"
+#~ msgid "Unknown failure to select character."
+#~ msgstr "Unknown failure to select character"
 
-#: src/net/manaserv/loginhandler.cpp:275
-msgid "Login attempt too soon after previous attempt."
-msgstr ""
+#~ msgid "Inviting like this isn't supported at the moment."
+#~ msgstr "Inviting like this isn't supported at the moment."
 
-#: src/net/manaserv/loginhandler.cpp:303
-#, fuzzy
-msgid "Wrong username, password or email address."
-msgstr "Wrong username, password or email address"
+#~ msgid "Willpower:"
+#~ msgstr "Willpower:"
 
-#: src/net/manaserv/loginhandler.cpp:306
-#, fuzzy
-msgid "Username already exists."
-msgstr "Username already exists"
+#~ msgid "Willpower %+d"
+#~ msgstr "Willpower %+d"
 
-#: src/net/manaserv/loginhandler.cpp:309
 #, fuzzy
-msgid "Email address already exists."
-msgstr "Email address already exists"
-
-#: src/net/manaserv/loginhandler.cpp:312
-msgid "You took too long with the captcha or your response was incorrect."
-msgstr ""
-
-#: src/net/manaserv/partyhandler.cpp:88
-msgid "Joined party."
-msgstr "Joined party."
-
-#: src/net/manaserv/partyhandler.cpp:106
-#, c-format
-msgid "%s joined the party."
-msgstr "%s joined the party."
-
-#: src/net/manaserv/partyhandler.cpp:123
-#, fuzzy, c-format
-msgid "%s rejected your invite."
-msgstr "%s refused your invitation."
-
-#: src/net/manaserv/tradehandler.cpp:96
-msgid "Accepting incoming trade requests."
-msgstr "Accepting incoming trade requests."
+#~ msgid "Willpower"
+#~ msgstr "Willpower:"
 
-#: src/net/manaserv/tradehandler.cpp:98
-msgid "Ignoring incoming trade requests."
-msgstr "Ignoring incoming trade requests."
-
-#: src/net/manaserv/tradehandler.cpp:135
-#, c-format
-msgid "Trading with %s"
-msgstr "Trading with %s"
-
-#: src/playerrelations.cpp:304
 #, fuzzy
-msgid "Completely ignore"
-msgstr "@@ignore|Completely ignore %s@@"
-
-#: src/playerrelations.cpp:318
-msgid "Print '...'"
-msgstr ""
-
-#: src/playerrelations.cpp:334
-msgid "Blink name"
-msgstr ""
-
-#: src/playerrelations.cpp:371
-msgid "Floating '...' bubble"
-msgstr ""
-
-#: src/playerrelations.cpp:374
-msgid "Floating bubble"
-msgstr ""
-
-#: src/resources/itemdb.cpp:52
-#, c-format
-msgid "Attack %+d"
-msgstr "Attack %+d"
-
-#: src/resources/itemdb.cpp:53
-#, c-format
-msgid "Defense %+d"
-msgstr "Defense %+d"
-
-#: src/resources/itemdb.cpp:54
-#, c-format
-msgid "HP %+d"
-msgstr "HP %+d"
-
-#: src/resources/itemdb.cpp:55
-#, c-format
-msgid "MP %+d"
-msgstr "MP %+d"
-
-#: src/resources/itemdb.cpp:114
-msgid "Unknown item"
-msgstr "Unknown item"
-
-#: src/resources/itemdb.cpp:158 src/resources/monsterdb.cpp:45
-#: src/resources/monsterdb.cpp:69
-msgid "unnamed"
-msgstr "unnamed"
+#~ msgid "Server is full."
+#~ msgstr "Server is full"
 
 #~ msgid "Text Shadow"
 #~ msgstr "Text Shadow"
diff --git a/po/eo.po b/po/eo.po
index d428a011..881cd6e3 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2010-03-05 21:52+0100\n"
+"POT-Creation-Date: 2010-12-13 20:04+0100\n"
 "PO-Revision-Date: 2009-09-10 13:30+0000\n"
 "Last-Translator: Yamiharu <yamiharu84@gmail.com>\n"
 "Language-Team: Esperanto <eo@li.org>\n"
+"Language: eo\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,435 +19,448 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/client.cpp:553 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:62
+#: src/client.cpp:598 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
 msgid "Setup"
 msgstr ""
 
-#: src/client.cpp:623
+#: src/client.cpp:679
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:650
+#: src/client.cpp:706
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:683
+#: src/client.cpp:739
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:739
+#: src/client.cpp:804
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:768
+#: src/client.cpp:833
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:799 src/client.cpp:806 src/client.cpp:940
+#: src/client.cpp:843
+msgid "Changing game servers"
+msgstr ""
+
+#: src/client.cpp:872 src/client.cpp:879 src/client.cpp:1014
 #: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
 #: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
-#: src/gui/serverdialog.cpp:261 src/gui/unregisterdialog.cpp:133
-#: src/net/ea/charserverhandler.cpp:135 src/net/ea/charserverhandler.cpp:152
-#: src/net/manaserv/charhandler.cpp:161 src/net/manaserv/charhandler.cpp:204
+#: src/gui/serverdialog.cpp:323 src/gui/unregisterdialog.cpp:133
+#: src/net/manaserv/charhandler.cpp:174 src/net/manaserv/charhandler.cpp:217
+#: src/net/tmwa/charserverhandler.cpp:134
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Error"
 msgstr ""
 
-#: src/client.cpp:815
+#: src/client.cpp:888
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:842
+#: src/client.cpp:915
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:843
+#: src/client.cpp:916
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:862
+#: src/client.cpp:935
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:863
+#: src/client.cpp:936
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:883
+#: src/client.cpp:956
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:884
+#: src/client.cpp:957
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1007 src/client.cpp:1030
+#: src/client.cpp:1138 src/client.cpp:1161
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1119
+#: src/client.cpp:1281
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1153 src/client.cpp:1159
+#: src/client.cpp:1315 src/client.cpp:1321
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/commandhandler.cpp:127 src/commandhandler.cpp:308
+#: src/commandhandler.cpp:131 src/commandhandler.cpp:317
 msgid "Unknown command."
 msgstr ""
 
-#: src/commandhandler.cpp:156
+#: src/commandhandler.cpp:160
 msgid "-- Help --"
 msgstr "--Helpo--"
 
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:161
 msgid "/help > Display this help"
 msgstr ""
 
-#: src/commandhandler.cpp:159
+#: src/commandhandler.cpp:163
 msgid "/where > Display map name"
 msgstr ""
 
-#: src/commandhandler.cpp:160
+#: src/commandhandler.cpp:164
 msgid "/who > Display number of online users"
 msgstr ""
 
-#: src/commandhandler.cpp:161
+#: src/commandhandler.cpp:165
 msgid "/me > Tell something about yourself"
 msgstr ""
 
-#: src/commandhandler.cpp:163
+#: src/commandhandler.cpp:167
 msgid "/clear > Clears this window"
 msgstr ""
 
-#: src/commandhandler.cpp:165
+#: src/commandhandler.cpp:169
 msgid "/msg > Send a private message to a user"
 msgstr ""
 
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:170
 msgid "/whisper > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:167
+#: src/commandhandler.cpp:171
 msgid "/w > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:168
+#: src/commandhandler.cpp:172
 msgid "/query > Makes a tab for private messages with another user"
 msgstr ""
 
-#: src/commandhandler.cpp:169
+#: src/commandhandler.cpp:174
 msgid "/q > Alias of query"
 msgstr ""
 
-#: src/commandhandler.cpp:171
+#: src/commandhandler.cpp:176
 msgid "/ignore > ignore a player"
 msgstr ""
 
-#: src/commandhandler.cpp:172
+#: src/commandhandler.cpp:177
 msgid "/unignore > stop ignoring a player"
 msgstr ""
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:179
 msgid "/list > Display all public channels"
 msgstr ""
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:180
 msgid "/join > Join or create a channel"
 msgstr ""
 
-#: src/commandhandler.cpp:177
+#: src/commandhandler.cpp:182
 msgid "/createparty > Create a new party"
 msgstr ""
 
-#: src/commandhandler.cpp:178
+#: src/commandhandler.cpp:183
 msgid "/party > Invite a user to party"
 msgstr ""
 
-#: src/commandhandler.cpp:180
+#: src/commandhandler.cpp:185
 msgid "/record > Start recording the chat to an external file"
 msgstr ""
 
-#: src/commandhandler.cpp:181
+#: src/commandhandler.cpp:187
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr ""
 
-#: src/commandhandler.cpp:182
+#: src/commandhandler.cpp:189
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
 
-#: src/commandhandler.cpp:184
+#: src/commandhandler.cpp:192
 msgid "/announce > Global announcement (GM only)"
 msgstr ""
 
-#: src/commandhandler.cpp:188
+#: src/commandhandler.cpp:196
 msgid "For more information, type /help <command>."
 msgstr ""
 
-#: src/commandhandler.cpp:192
+#: src/commandhandler.cpp:200
 msgid "Command: /help"
 msgstr ""
 
-#: src/commandhandler.cpp:193
+#: src/commandhandler.cpp:201
 msgid "This command displays a list of all commands available."
 msgstr "Tiu komando monstras la liston de uzeblaj komandoj"
 
-#: src/commandhandler.cpp:194
+#: src/commandhandler.cpp:203
 msgid "Command: /help <command>"
 msgstr ""
 
-#: src/commandhandler.cpp:195
+#: src/commandhandler.cpp:204
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/commandhandler.cpp:203
+#: src/commandhandler.cpp:212
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: src/commandhandler.cpp:204
+#: src/commandhandler.cpp:213
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/commandhandler.cpp:205
+#: src/commandhandler.cpp:214
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:210
+#: src/commandhandler.cpp:219
 msgid "Command: /clear"
 msgstr ""
 
-#: src/commandhandler.cpp:211
+#: src/commandhandler.cpp:220
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:224
 msgid "Command: /ignore <player>"
 msgstr ""
 
-#: src/commandhandler.cpp:216
+#: src/commandhandler.cpp:225
 msgid "This command ignores the given player regardless of current relations."
 msgstr ""
 
-#: src/commandhandler.cpp:221
+#: src/commandhandler.cpp:230
 msgid "Command: /join <channel>"
 msgstr ""
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:231
 msgid "This command makes you enter <channel>."
 msgstr ""
 
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:232
 msgid "If <channel> doesn't exist, it's created."
 msgstr ""
 
-#: src/commandhandler.cpp:227
+#: src/commandhandler.cpp:236
 msgid "Command: /list"
 msgstr ""
 
-#: src/commandhandler.cpp:228
+#: src/commandhandler.cpp:237
 msgid "This command shows a list of all channels."
 msgstr ""
 
-#: src/commandhandler.cpp:232
+#: src/commandhandler.cpp:241
 msgid "Command: /me <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:233
+#: src/commandhandler.cpp:242
 msgid "This command tell others you are (doing) <msg>."
 msgstr ""
 
-#: src/commandhandler.cpp:237
+#: src/commandhandler.cpp:246
 msgid "Command: /msg <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:238
+#: src/commandhandler.cpp:247
 msgid "Command: /whisper <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:239
+#: src/commandhandler.cpp:248
 msgid "Command: /w <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:240
+#: src/commandhandler.cpp:249
 msgid "This command sends the text <message> to <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:241 src/commandhandler.cpp:260
+#: src/commandhandler.cpp:250 src/commandhandler.cpp:269
 #: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
-#: src/net/ea/gui/guildtab.cpp:75 src/net/ea/gui/partytab.cpp:75
+#: src/net/tmwa/gui/guildtab.cpp:75 src/net/tmwa/gui/partytab.cpp:75
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:255
 msgid "Command: /query <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:247
+#: src/commandhandler.cpp:256
 msgid "Command: /q <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:248
+#: src/commandhandler.cpp:257
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:253
+#: src/commandhandler.cpp:262
 msgid "Command: /createparty <name>"
 msgstr ""
 
-#: src/commandhandler.cpp:254
+#: src/commandhandler.cpp:263
 msgid "This command creates a new party called <name>."
 msgstr ""
 
-#: src/commandhandler.cpp:258
+#: src/commandhandler.cpp:267
 msgid "Command: /party <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:259 src/net/ea/gui/partytab.cpp:74
+#: src/commandhandler.cpp:268 src/net/tmwa/gui/partytab.cpp:74
 msgid "This command invites <nick> to party with you."
 msgstr ""
 
-#: src/commandhandler.cpp:265
+#: src/commandhandler.cpp:274
 msgid "Command: /present"
 msgstr ""
 
-#: src/commandhandler.cpp:266
+#: src/commandhandler.cpp:275
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: src/commandhandler.cpp:272
+#: src/commandhandler.cpp:281
 msgid "Command: /record <filename>"
 msgstr ""
 
-#: src/commandhandler.cpp:273
+#: src/commandhandler.cpp:282
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr ""
 
-#: src/commandhandler.cpp:275
+#: src/commandhandler.cpp:284
 msgid "Command: /record"
 msgstr ""
 
-#: src/commandhandler.cpp:276
+#: src/commandhandler.cpp:285
 msgid "This command finishes a recording session."
 msgstr ""
 
-#: src/commandhandler.cpp:280
+#: src/commandhandler.cpp:289
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: src/commandhandler.cpp:281
+#: src/commandhandler.cpp:290
 msgid ""
 "This command sets whether the return key should toggle the chat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: src/commandhandler.cpp:283
+#: src/commandhandler.cpp:292
 msgid ""
-"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
-"\", \"no\", \"false\" to turn the toggle off."
+"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
+"\"0\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: src/commandhandler.cpp:286
+#: src/commandhandler.cpp:295
 msgid "Command: /toggle"
 msgstr ""
 
-#: src/commandhandler.cpp:287
+#: src/commandhandler.cpp:296
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: src/commandhandler.cpp:291 src/gui/widgets/whispertab.cpp:93
+#: src/commandhandler.cpp:300 src/gui/widgets/whispertab.cpp:95
 msgid "Command: /unignore <player>"
 msgstr ""
 
-#: src/commandhandler.cpp:292
+#: src/commandhandler.cpp:301
 msgid "This command stops ignoring the given player if they are being ignored"
 msgstr ""
 
-#: src/commandhandler.cpp:297
+#: src/commandhandler.cpp:306
 msgid "Command: /where"
 msgstr ""
 
-#: src/commandhandler.cpp:298
+#: src/commandhandler.cpp:307
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: src/commandhandler.cpp:302
+#: src/commandhandler.cpp:311
 msgid "Command: /who"
 msgstr ""
 
-#: src/commandhandler.cpp:303
+#: src/commandhandler.cpp:312
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:309
+#: src/commandhandler.cpp:318
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: src/commandhandler.cpp:375
+#: src/commandhandler.cpp:384
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:383
+#: src/commandhandler.cpp:392
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:397
+#: src/commandhandler.cpp:406
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:410 src/net/ea/gui/partytab.cpp:109
+#: src/commandhandler.cpp:419 src/net/tmwa/gui/partytab.cpp:109
 msgid "Party name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:423 src/commandhandler.cpp:471
-#: src/commandhandler.cpp:493
+#: src/commandhandler.cpp:432 src/commandhandler.cpp:509
+#: src/commandhandler.cpp:531
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:441
+#: src/commandhandler.cpp:450
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:441
+#: src/commandhandler.cpp:450
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:450
+#: src/commandhandler.cpp:459
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:454
+#: src/commandhandler.cpp:463
 msgid "Message now closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:477
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:489
+msgid "Show IP: On"
+msgstr ""
+
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:485
+msgid "Show IP: Off"
+msgstr ""
+
+#: src/commandhandler.cpp:515
 msgid "Player already ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:484
+#: src/commandhandler.cpp:522
 msgid "Player successfully ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:486
+#: src/commandhandler.cpp:524
 msgid "Player could not be ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:501
+#: src/commandhandler.cpp:539
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:506
+#: src/commandhandler.cpp:544
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:508
+#: src/commandhandler.cpp:546
 msgid "Player could not be unignored!"
 msgstr ""
 
@@ -459,41 +473,41 @@ msgstr ""
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:326
+#: src/game.cpp:342
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:331
+#: src/game.cpp:347
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:355
+#: src/game.cpp:378
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:360
+#: src/game.cpp:382
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:705
+#: src/game.cpp:721
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:712
+#: src/game.cpp:726
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:946
+#: src/game.cpp:954
 #, fuzzy
 msgid "Could Not Load Map"
 msgstr "La mapo ne sxa"
 
-#: src/game.cpp:947
+#: src/game.cpp:955
 #, c-format
 msgid "Error while loading %s"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:75
+#: src/gui/beingpopup.cpp:76
 #, c-format
 msgid "Party: %s"
 msgstr ""
@@ -502,34 +516,34 @@ msgstr ""
 msgid "Buy"
 msgstr ""
 
-#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
-#: src/gui/sell.cpp:276
+#: src/gui/buy.cpp:69 src/gui/buy.cpp:261 src/gui/sell.cpp:71
+#: src/gui/sell.cpp:288
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:99 src/gui/npcdialog.cpp:100
-#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:479
+#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:112 src/gui/npcdialog.cpp:124
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:463
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:98 src/gui/npcdialog.cpp:101
-#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:491
+#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:111 src/gui/npcdialog.cpp:125
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:475
 msgid "-"
 msgstr ""
 
 #: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
-#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:182
-#: src/keyboardconfig.cpp:103
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:228
+#: src/keyboardconfig.cpp:102
 msgid "Quit"
 msgstr ""
 
-#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:408
-#: src/gui/statuswindow.cpp:478 src/gui/statuswindow.cpp:512
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:384
+#: src/gui/statuswindow.cpp:462 src/gui/statuswindow.cpp:496
 msgid "Max"
 msgstr ""
 
@@ -543,11 +557,11 @@ msgstr ""
 
 #: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
 #: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
-#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:101
-#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:178
-#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:402
+#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:114
+#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:389
 #: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
-#: src/gui/socialwindow.cpp:242 src/gui/textdialog.cpp:39
+#: src/gui/socialwindow.cpp:275 src/gui/textdialog.cpp:40
 #: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr ""
@@ -584,7 +598,7 @@ msgstr ""
 msgid "Change Password"
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:53
+#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:55
 #: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
 msgid "Password:"
 msgstr ""
@@ -615,19 +629,19 @@ msgstr ""
 msgid "Create Character"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:52
+#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:54
 #: src/gui/register.cpp:67
 msgid "Name:"
 msgstr ""
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
 #: src/gui/outfitwindow.cpp:67
 msgid ">"
 msgstr ""
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
 #: src/gui/outfitwindow.cpp:66
@@ -642,8 +656,8 @@ msgstr ""
 msgid "Hair style:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:397
-#: src/gui/socialwindow.cpp:296
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:392
+#: src/gui/socialwindow.cpp:329
 msgid "Create"
 msgstr ""
 
@@ -698,33 +712,33 @@ msgstr ""
 msgid "Change Email"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:185
-#: src/gui/setup_players.cpp:230
+#: src/gui/charselectdialog.cpp:336 src/gui/serverdialog.cpp:231
+#: src/gui/setup_players.cpp:229
 msgid "Delete"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:387
+#: src/gui/charselectdialog.cpp:380
 msgid "Choose"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:399 src/gui/charselectdialog.cpp:400
+#: src/gui/charselectdialog.cpp:394 src/gui/charselectdialog.cpp:395
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:77 src/gui/palette.cpp:96
+#: src/gui/chat.cpp:88
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chat.cpp:287
+#: src/gui/chat.cpp:311
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:305
+#: src/gui/chat.cpp:329
 msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:469
+#: src/gui/chat.cpp:493
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -786,140 +800,170 @@ msgstr ""
 msgid "Ambient FX: %s"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:56
+#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:55
 msgid "Equipment"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:77
-#: src/gui/inventorywindow.cpp:79 src/gui/inventorywindow.cpp:298
-#: src/gui/popupmenu.cpp:372
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:89
+#: src/gui/inventorywindow.cpp:337 src/gui/popupmenu.cpp:359
 msgid "Unequip"
 msgstr ""
 
-#: src/gui/help.cpp:36
+#: src/gui/help.cpp:37
 msgid "Help"
 msgstr ""
 
-#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:73
+#: src/gui/help.cpp:51 src/gui/npcdialog.cpp:50
 msgid "Close"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:56 src/gui/windowmenu.cpp:57
+#: src/gui/inventorywindow.cpp:59 src/gui/windowmenu.cpp:56
 msgid "Inventory"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:72 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:300 src/gui/popupmenu.cpp:374
+#: src/gui/inventorywindow.cpp:59
+msgid "Storage"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:82
+msgid "Slots:"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:87 src/gui/inventorywindow.cpp:100
+#: src/gui/inventorywindow.cpp:339 src/gui/popupmenu.cpp:361
 msgid "Equip"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:304 src/gui/popupmenu.cpp:377
+#: src/gui/inventorywindow.cpp:88
 msgid "Use"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:83 src/gui/inventorywindow.cpp:308
-#: src/gui/popupmenu.cpp:380
+#: src/gui/inventorywindow.cpp:101 src/gui/popupmenu.cpp:364
+msgid "Activate"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:102 src/gui/inventorywindow.cpp:348
+#: src/gui/popupmenu.cpp:367
 msgid "Drop..."
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:84 src/gui/popupmenu.cpp:386
+#: src/gui/inventorywindow.cpp:103 src/gui/popupmenu.cpp:373
 msgid "Split"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:85 src/gui/outfitwindow.cpp:51
+#: src/gui/inventorywindow.cpp:104 src/gui/outfitwindow.cpp:51
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:96 src/gui/storagewindow.cpp:83
-msgid "Slots:"
+#: src/gui/inventorywindow.cpp:106
+msgid "Weight:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:97
-msgid "Weight:"
+#: src/gui/inventorywindow.cpp:124 src/gui/popupmenu.cpp:378
+msgid "Store"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:310 src/gui/popupmenu.cpp:382
+#: src/gui/inventorywindow.cpp:125 src/gui/popupmenu.cpp:385
+msgid "Retrieve"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:350 src/gui/popupmenu.cpp:369
 msgid "Drop"
 msgstr ""
 
-#: src/gui/itemamount.cpp:100 src/gui/okdialog.cpp:42
-#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:38 src/gui/trade.cpp:73
-#: src/gui/trade.cpp:75
+#: src/gui/itemamount.cpp:113 src/gui/okdialog.cpp:42
+#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:39 src/gui/trade.cpp:72
+#: src/gui/trade.cpp:74
 msgid "OK"
 msgstr ""
 
-#: src/gui/itemamount.cpp:102
+#: src/gui/itemamount.cpp:115
 msgid "All"
 msgstr ""
 
-#: src/gui/itemamount.cpp:128
+#: src/gui/itemamount.cpp:141
 msgid "Select amount of items to trade."
 msgstr ""
 
-#: src/gui/itemamount.cpp:131
+#: src/gui/itemamount.cpp:144
 msgid "Select amount of items to drop."
 msgstr ""
 
-#: src/gui/itemamount.cpp:134
+#: src/gui/itemamount.cpp:147
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/itemamount.cpp:137
+#: src/gui/itemamount.cpp:150
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamount.cpp:140
+#: src/gui/itemamount.cpp:153
 msgid "Select amount of items to split."
 msgstr ""
 
-#: src/gui/itempopup.cpp:92
+#: src/gui/itempopup.cpp:137
 #, c-format
 msgid "Weight: %s"
 msgstr ""
 
-#: src/gui/login.cpp:49 src/gui/login.cpp:61
+#: src/gui/login.cpp:51 src/gui/login.cpp:63
 msgid "Login"
 msgstr ""
 
-#: src/gui/login.cpp:58
+#: src/gui/login.cpp:60
 msgid "Remember username"
 msgstr ""
 
-#: src/gui/login.cpp:59 src/gui/register.cpp:58 src/gui/register.cpp:73
+#: src/gui/login.cpp:61 src/gui/register.cpp:58 src/gui/register.cpp:73
 msgid "Register"
 msgstr ""
 
-#: src/gui/login.cpp:60
+#: src/gui/login.cpp:62
 msgid "Change Server"
 msgstr ""
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
+#: src/gui/login.cpp:129
+msgid "Registration disabled"
+msgstr ""
+
+#: src/gui/login.cpp:129
+msgid "You need to use the website to register an account for this server."
+msgstr ""
+
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:86
 msgid "Map"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:44
+#: src/gui/ministatus.cpp:235
+msgid "Need"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:48
 msgid "Waiting for server"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:45
+#: src/gui/npcdialog.cpp:49
 msgid "Next"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:47
+#: src/gui/npcdialog.cpp:51
 msgid "Submit"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:52 src/gui/npcpostdialog.cpp:41
+#: src/gui/npcdialog.cpp:73 src/gui/npcpostdialog.cpp:41
 msgid "NPC"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:110
+#: src/gui/npcdialog.cpp:118
+msgid "Clear log"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:134
 msgid "Reset"
 msgstr ""
 
 #. TRANSLATORS: Please leave the \n sequences intact.
-#: src/gui/npcdialog.cpp:171
+#: src/gui/npcdialog.cpp:208
 msgid ""
 "\n"
 "> Next\n"
@@ -933,7 +977,7 @@ msgstr ""
 msgid "Send"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:96
+#: src/gui/npcpostdialog.cpp:99
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
@@ -947,303 +991,82 @@ msgstr ""
 msgid "Unequip first"
 msgstr ""
 
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:143
-msgid "Text"
-msgstr ""
-
-#: src/gui/palette.cpp:82
-msgid "Text Shadow"
-msgstr ""
-
-#: src/gui/palette.cpp:83
-msgid "Text Outline"
-msgstr ""
-
-#: src/gui/palette.cpp:84
-msgid "Progress Bar Labels"
-msgstr ""
-
-#: src/gui/palette.cpp:85
-msgid "Buttons"
-msgstr ""
-
-#: src/gui/palette.cpp:86
-msgid "Disabled Buttons"
-msgstr ""
-
-#: src/gui/palette.cpp:87
-msgid "Tabs"
-msgstr ""
-
-#: src/gui/palette.cpp:89
-msgid "Background"
-msgstr ""
-
-#: src/gui/palette.cpp:91
-msgid "Highlight"
-msgstr ""
-
-#: src/gui/palette.cpp:92
-msgid "Tab Highlight"
-msgstr ""
-
-#: src/gui/palette.cpp:93
-msgid "Item Too Expensive"
-msgstr ""
-
-#: src/gui/palette.cpp:94
-msgid "Item Is Equipped"
-msgstr ""
-
-#: src/gui/palette.cpp:97
-msgid "GM"
-msgstr ""
-
-#: src/gui/palette.cpp:98
-msgid "Player"
-msgstr ""
-
-#: src/gui/palette.cpp:99
-msgid "Whisper"
-msgstr ""
-
-#: src/gui/palette.cpp:100
-msgid "Is"
-msgstr ""
-
-#: src/gui/palette.cpp:101 src/net/ea/gui/partytab.cpp:43
-msgid "Party"
-msgstr ""
-
-#: src/gui/palette.cpp:102 src/net/ea/gui/guildtab.cpp:45
-msgid "Guild"
-msgstr ""
-
-#: src/gui/palette.cpp:103
-msgid "Server"
-msgstr ""
-
-#: src/gui/palette.cpp:104
-msgid "Logger"
-msgstr ""
-
-#: src/gui/palette.cpp:105
-msgid "Hyperlink"
-msgstr ""
-
-#: src/gui/palette.cpp:107
-msgid "Being"
-msgstr ""
-
-#: src/gui/palette.cpp:108
-msgid "Other Players' Names"
-msgstr ""
-
-#: src/gui/palette.cpp:109
-msgid "Own Name"
-msgstr ""
-
-#: src/gui/palette.cpp:110
-msgid "GM Names"
-msgstr ""
-
-#: src/gui/palette.cpp:111
-msgid "NPCs"
-msgstr ""
-
-#: src/gui/palette.cpp:112
-msgid "Monsters"
-msgstr ""
-
-#: src/gui/palette.cpp:114
-msgid "Unknown Item Type"
-msgstr ""
-
-#: src/gui/palette.cpp:115
-msgid "Generics"
-msgstr ""
-
-#: src/gui/palette.cpp:116
-msgid "Hats"
-msgstr ""
-
-#: src/gui/palette.cpp:117
-msgid "Usables"
-msgstr ""
-
-#: src/gui/palette.cpp:118
-msgid "Shirts"
-msgstr ""
-
-#: src/gui/palette.cpp:119
-msgid "One Handed Weapons"
-msgstr ""
-
-#: src/gui/palette.cpp:120
-msgid "Pants"
-msgstr ""
-
-#: src/gui/palette.cpp:121
-msgid "Shoes"
-msgstr ""
-
-#: src/gui/palette.cpp:122
-msgid "Two Handed Weapons"
-msgstr ""
-
-#: src/gui/palette.cpp:123
-msgid "Shields"
-msgstr ""
-
-#: src/gui/palette.cpp:124
-msgid "Rings"
-msgstr ""
-
-#: src/gui/palette.cpp:125
-msgid "Necklaces"
-msgstr ""
-
-#: src/gui/palette.cpp:126
-msgid "Arms"
-msgstr ""
-
-#: src/gui/palette.cpp:127
-msgid "Ammo"
-msgstr ""
-
-#: src/gui/palette.cpp:129
-msgid "Particle Effects"
-msgstr ""
-
-#: src/gui/palette.cpp:130
-msgid "Pickup Notification"
-msgstr ""
-
-#: src/gui/palette.cpp:131
-msgid "Exp Notification"
-msgstr ""
-
-#: src/gui/palette.cpp:133
-msgid "Player Hits Monster"
-msgstr ""
-
-#: src/gui/palette.cpp:135
-msgid "Monster Hits Player"
-msgstr ""
-
-#: src/gui/palette.cpp:136
-msgid "Critical Hit"
-msgstr ""
-
-#: src/gui/palette.cpp:137
-msgid "Misses"
-msgstr ""
-
-#: src/gui/palette.cpp:139
-msgid "HP Bar"
-msgstr ""
-
-#: src/gui/palette.cpp:140
-msgid "3/4 HP Bar"
-msgstr ""
-
-#: src/gui/palette.cpp:141
-msgid "1/2 HP Bar"
-msgstr ""
-
-#: src/gui/palette.cpp:142
-msgid "1/4 HP Bar"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:84
+#: src/gui/popupmenu.cpp:83
 #, c-format
 msgid "Trade with %s..."
 msgstr ""
 
-#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:161
+#: src/gui/popupmenu.cpp:87 src/gui/popupmenu.cpp:158
 #, c-format
 msgid "Attack %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:92
+#: src/gui/popupmenu.cpp:91
 #, c-format
 msgid "Whisper %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:101
+#: src/gui/popupmenu.cpp:100
 #, c-format
 msgid "Befriend %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:106
+#: src/gui/popupmenu.cpp:105
 #, c-format
 msgid "Disregard %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:109
+#: src/gui/popupmenu.cpp:108
 #, c-format
 msgid "Ignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:115 src/gui/popupmenu.cpp:124
+#: src/gui/popupmenu.cpp:114 src/gui/popupmenu.cpp:123
 #, c-format
 msgid "Unignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:118
+#: src/gui/popupmenu.cpp:117
 #, c-format
 msgid "Completely ignore %s"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:130
 #, c-format
-msgid "Follow %s"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:133
-#, c-format
 msgid "Invite %s to join your guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:137
+#: src/gui/popupmenu.cpp:134
 #, c-format
 msgid "Invite %s to join your party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144
+#: src/gui/popupmenu.cpp:141
 msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:153
+#: src/gui/popupmenu.cpp:150
 #, c-format
 msgid "Talk to %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:166
+#: src/gui/popupmenu.cpp:163
 msgid "Kick monster"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:174
+#: src/gui/popupmenu.cpp:171
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:191
+#: src/gui/popupmenu.cpp:188
 #, c-format
 msgid "Pick up %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:400
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:387
 msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:70
-msgid "Store"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:71
-msgid "Retrieve"
-msgstr ""
-
 #: src/gui/quitdialog.cpp:44
 msgid "Switch server"
 msgstr ""
@@ -1312,47 +1135,60 @@ msgstr ""
 msgid "Passwords do not match."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:134
+#: src/gui/serverdialog.cpp:197
 msgid "Choose Your Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:141 src/gui/widgets/chattab.cpp:139
+#: src/gui/serverdialog.cpp:206 src/gui/widgets/chattab.cpp:142
 msgid "Server:"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:142
+#: src/gui/serverdialog.cpp:207
 msgid "Port:"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:143
+#: src/gui/serverdialog.cpp:208
 msgid "Server type:"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:183
+#: src/gui/serverdialog.cpp:229
 msgid "Connect"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:184
+#: src/gui/serverdialog.cpp:230
 msgid "Custom Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:262
+#: src/gui/serverdialog.cpp:324
 msgid "Please type both the address and the port of a server."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:411
+#: src/gui/serverdialog.cpp:441
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:417
+#: src/gui/serverdialog.cpp:447
 msgid "Waiting for server..."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:421
+#: src/gui/serverdialog.cpp:451
 msgid "Preparing download"
 msgstr ""
 
+#: src/gui/serverdialog.cpp:455
+msgid "Error retreiving server list!"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:550
+msgid "requires a newer version"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:552
+#, c-format
+msgid "requires v%s"
+msgstr ""
+
 #: src/gui/setup_audio.cpp:42
 msgid "Sound"
 msgstr ""
@@ -1385,50 +1221,50 @@ msgstr ""
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:44
+#: src/gui/setup_colors.cpp:46
 msgid "This is what the color looks like"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:49
+#: src/gui/setup_colors.cpp:51
 msgid "Colors"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:70
+#: src/gui/setup_colors.cpp:72
 msgid "Type:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:81 src/gui/setup_colors.cpp:433
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:331
 msgid "Static"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:84
-#: src/gui/setup_colors.cpp:434
+#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
+#: src/gui/setup_colors.cpp:332
 msgid "Pulse"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
+#: src/gui/setup_colors.cpp:333
 msgid "Rainbow"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
+#: src/gui/setup_colors.cpp:333
 msgid "Spectrum"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:92
+#: src/gui/setup_colors.cpp:94
 msgid "Delay:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:107
+#: src/gui/setup_colors.cpp:109
 msgid "Red:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:122
+#: src/gui/setup_colors.cpp:124
 msgid "Green:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:137
+#: src/gui/setup_colors.cpp:139
 msgid "Blue:"
 msgstr ""
 
@@ -1473,562 +1309,576 @@ msgid "Assign"
 msgstr ""
 
 #: src/gui/setup_keyboard.cpp:90
+msgid "Unassign"
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:94
 msgid "Default"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:119
+#: src/gui/setup_keyboard.cpp:125
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_players.cpp:57
+#: src/gui/setup_players.cpp:58
 msgid "Name"
 msgstr ""
 
-#: src/gui/setup_players.cpp:58
+#: src/gui/setup_players.cpp:59
 msgid "Relation"
 msgstr ""
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:64
 msgid "Neutral"
 msgstr ""
 
-#: src/gui/setup_players.cpp:64
+#: src/gui/setup_players.cpp:65
 msgid "Friend"
 msgstr ""
 
-#: src/gui/setup_players.cpp:65
+#: src/gui/setup_players.cpp:66
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_players.cpp:67
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_players.cpp:208 src/gui/setup_video.cpp:132
+#: src/gui/setup_players.cpp:206 src/gui/setup_video.cpp:153
 msgid "???"
 msgstr ""
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_players.cpp:225
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_players.cpp:228
+#: src/gui/setup_players.cpp:227
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:231
 msgid "Put all whispers in tabs"
 msgstr ""
 
-#: src/gui/setup_players.cpp:234
+#: src/gui/setup_players.cpp:233
 msgid "Show gender"
 msgstr ""
 
-#: src/gui/setup_players.cpp:236
+#: src/gui/setup_players.cpp:235
+msgid "Enable Chat log"
+msgstr ""
+
+#: src/gui/setup_players.cpp:237
 msgid "Players"
 msgstr ""
 
-#: src/gui/setup_players.cpp:261
+#: src/gui/setup_players.cpp:262
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:113
+#: src/gui/setup_video.cpp:134
 msgid "Tiny"
 msgstr ""
 
-#: src/gui/setup_video.cpp:114
+#: src/gui/setup_video.cpp:135
 msgid "Small"
 msgstr ""
 
-#: src/gui/setup_video.cpp:115
+#: src/gui/setup_video.cpp:136
 msgid "Medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:116
+#: src/gui/setup_video.cpp:137
 msgid "Large"
 msgstr ""
 
-#: src/gui/setup_video.cpp:142
+#: src/gui/setup_video.cpp:163
 msgid "No text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:144
+#: src/gui/setup_video.cpp:164
+msgid "Text"
+msgstr ""
+
+#: src/gui/setup_video.cpp:165
 msgid "Bubbles, no names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:145
+#: src/gui/setup_video.cpp:166
 msgid "Bubbles with names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:157
+#: src/gui/setup_video.cpp:178
 msgid "off"
 msgstr ""
 
-#: src/gui/setup_video.cpp:158 src/gui/setup_video.cpp:171
+#: src/gui/setup_video.cpp:179 src/gui/setup_video.cpp:192
 msgid "low"
 msgstr ""
 
-#: src/gui/setup_video.cpp:159 src/gui/setup_video.cpp:173
+#: src/gui/setup_video.cpp:180 src/gui/setup_video.cpp:194
 msgid "high"
 msgstr ""
 
-#: src/gui/setup_video.cpp:172
+#: src/gui/setup_video.cpp:193
 msgid "medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:174
+#: src/gui/setup_video.cpp:195
 msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:196
+#: src/gui/setup_video.cpp:217
 msgid "Full screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:197
+#: src/gui/setup_video.cpp:218
 msgid "OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:198
+#: src/gui/setup_video.cpp:219
 msgid "Custom cursor"
 msgstr ""
 
-#: src/gui/setup_video.cpp:200
+#: src/gui/setup_video.cpp:221
 msgid "Visible names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:223
 msgid "Particle effects"
 msgstr ""
 
-#: src/gui/setup_video.cpp:204
+#: src/gui/setup_video.cpp:225
 msgid "Show own name"
 msgstr ""
 
-#: src/gui/setup_video.cpp:205
+#: src/gui/setup_video.cpp:226
+msgid "Log NPC dialogue"
+msgstr ""
+
+#: src/gui/setup_video.cpp:227
 msgid "Show pickup notification"
 msgstr ""
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:207
+#. TRANSLATORS: Refers to "Show pickup notification"
+#: src/gui/setup_video.cpp:229
 msgid "in chat"
 msgstr ""
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:209
+#. TRANSLATORS: Refers to "Show pickup notification"
+#: src/gui/setup_video.cpp:231
 msgid "as particle"
 msgstr ""
 
-#: src/gui/setup_video.cpp:214
+#: src/gui/setup_video.cpp:236
 msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:225
+#: src/gui/setup_video.cpp:247
+msgid "Disable transparency (Low CPU mode)"
+msgstr ""
+
+#: src/gui/setup_video.cpp:250
 msgid "Video"
 msgstr ""
 
-#: src/gui/setup_video.cpp:227
-msgid "Show monster damage"
+#: src/gui/setup_video.cpp:252
+msgid "Show damage"
 msgstr ""
 
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:258
 msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:259
 msgid "Gui opacity"
 msgstr ""
 
-#: src/gui/setup_video.cpp:235
+#: src/gui/setup_video.cpp:260
 msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_video.cpp:236
+#: src/gui/setup_video.cpp:261
 msgid "Particle detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237
+#: src/gui/setup_video.cpp:262
 msgid "Font size"
 msgstr ""
 
-#: src/gui/setup_video.cpp:251 src/gui/setup_video.cpp:454
-#: src/gui/setup_video.cpp:568
+#: src/gui/setup_video.cpp:277 src/gui/setup_video.cpp:532
+#: src/gui/setup_video.cpp:662
 msgid "None"
 msgstr ""
 
-#: src/gui/setup_video.cpp:381
+#: src/gui/setup_video.cpp:426
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:387
+#: src/gui/setup_video.cpp:432
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:398
+#: src/gui/setup_video.cpp:443
 msgid "Switching to Full Screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:399
+#: src/gui/setup_video.cpp:444
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:411
+#: src/gui/setup_video.cpp:458
 msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:412
+#: src/gui/setup_video.cpp:459
+msgid ""
+"Applying change to OpenGL requires restart. In case OpenGL messes up your "
+"game graphics, restart the game with the command line option \"--no-opengl\"."
+msgstr ""
+
+#: src/gui/setup_video.cpp:466
+msgid "Deactivating OpenGL"
+msgstr ""
+
+#: src/gui/setup_video.cpp:467
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#: src/gui/setup_video.cpp:486 src/gui/setup_video.cpp:491
+#: src/gui/setup_video.cpp:475
+msgid "Transparency disabled"
+msgstr ""
+
+#: src/gui/setup_video.cpp:476 src/gui/setup_video.cpp:484
+msgid "You must restart to apply changes."
+msgstr ""
+
+#: src/gui/setup_video.cpp:483
+msgid "Transparency enabled"
+msgstr ""
+
+#: src/gui/setup_video.cpp:576 src/gui/setup_video.cpp:581
 msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:487 src/gui/setup_video.cpp:492
+#: src/gui/setup_video.cpp:577 src/gui/setup_video.cpp:582
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:489
+#: src/gui/setup_video.cpp:579
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:522
+#: src/gui/setup_video.cpp:612
 msgid "Particle Effect Settings Changed."
 msgstr ""
 
-#: src/gui/setup_video.cpp:523
+#: src/gui/setup_video.cpp:613
 msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skilldialog.cpp:197 src/gui/windowmenu.cpp:58
+#: src/gui/skilldialog.cpp:212 src/gui/windowmenu.cpp:59
 msgid "Skills"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:208
+#: src/gui/skilldialog.cpp:223
 msgid "Up"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:262
+#: src/gui/skilldialog.cpp:269
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:314
+#: src/gui/skilldialog.cpp:351
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:323
+#: src/gui/skilldialog.cpp:360
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:405
+#: src/gui/skilldialog.cpp:442
 #, c-format
 msgid "Lvl: %d (%+d)"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:416
+#: src/gui/skilldialog.cpp:453
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:117
+#: src/gui/socialwindow.cpp:126
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:126
+#: src/gui/socialwindow.cpp:139
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:136
+#: src/gui/socialwindow.cpp:153
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:137
+#: src/gui/socialwindow.cpp:154
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:146
+#: src/gui/socialwindow.cpp:163
 msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:147
+#: src/gui/socialwindow.cpp:164
 #, fuzzy, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Ĉu vi vere volas fini la programon?"
 
-#: src/gui/socialwindow.cpp:182
+#: src/gui/socialwindow.cpp:207 src/net/tmwa/partyhandler.cpp:330
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:218
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:199
+#: src/gui/socialwindow.cpp:232
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:200
+#: src/gui/socialwindow.cpp:233
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:209
+#: src/gui/socialwindow.cpp:242
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:210
+#: src/gui/socialwindow.cpp:243
 #, fuzzy, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Ĉu vi vere volas fini la programon?"
 
-#: src/gui/socialwindow.cpp:239
+#: src/gui/socialwindow.cpp:272
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:240 src/gui/socialwindow.cpp:564
+#: src/gui/socialwindow.cpp:273 src/gui/socialwindow.cpp:620
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:279 src/gui/windowmenu.cpp:60
+#: src/gui/socialwindow.cpp:312 src/gui/windowmenu.cpp:64
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:297
+#: src/gui/socialwindow.cpp:330
 msgid "Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:298
+#: src/gui/socialwindow.cpp:331
 msgid "Leave"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:394
+#: src/gui/socialwindow.cpp:443
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:400
+#: src/gui/socialwindow.cpp:449
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:413
+#: src/gui/socialwindow.cpp:462
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:419
+#: src/gui/socialwindow.cpp:468
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:463
+#: src/gui/socialwindow.cpp:497
+msgid "Creating guild failed, please choose a shorter name."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:504
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:477
+#: src/gui/socialwindow.cpp:520
+msgid "Creating party failed, please choose a shorter name."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:527
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:484
+#: src/gui/socialwindow.cpp:541
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:485
+#: src/gui/socialwindow.cpp:542
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:497
+#: src/gui/socialwindow.cpp:554
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:502
+#: src/gui/socialwindow.cpp:559
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:507
+#: src/gui/socialwindow.cpp:564
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:519
+#: src/gui/socialwindow.cpp:576
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:529
+#: src/gui/socialwindow.cpp:585
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:533
+#: src/gui/socialwindow.cpp:589
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:541
+#: src/gui/socialwindow.cpp:597
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:546
+#: src/gui/socialwindow.cpp:602
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:554
+#: src/gui/socialwindow.cpp:610
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:565
+#: src/gui/socialwindow.cpp:621
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:570
+#: src/gui/socialwindow.cpp:626
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:571
+#: src/gui/socialwindow.cpp:627
 msgid "Choose your party's name."
 msgstr ""
 
-#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:59
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:62
 msgid "Specials"
 msgstr ""
 
-#: src/gui/specialswindow.cpp:174
-#, c-format
-msgid "Specials Set %d"
-msgstr ""
-
-#: src/gui/specialswindow.cpp:191
-#, c-format
-msgid "Special %d"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:99 src/gui/statuswindow.cpp:247
+#: src/gui/statuswindow.cpp:113 src/gui/statuswindow.cpp:215
+#: src/gui/statuswindow.cpp:262
 #, c-format
 msgid "Level: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:211
+#: src/gui/statuswindow.cpp:114 src/gui/statuswindow.cpp:208
+#: src/gui/statuswindow.cpp:239
 #, c-format
 msgid "Money: %s"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:102
+#: src/gui/statuswindow.cpp:117
 msgid "HP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:107
+#: src/gui/statuswindow.cpp:122
 msgid "Exp:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:112
+#: src/gui/statuswindow.cpp:130
 msgid "MP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:132 src/gui/statuswindow.cpp:219
+#: src/gui/statuswindow.cpp:158 src/gui/statuswindow.cpp:275
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:133
+#: src/gui/statuswindow.cpp:159
 msgid "Job:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:194
-msgid "HP"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:200
-msgid "MP"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:206
-msgid "Exp"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:215
-msgid "Money"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:225
-msgid "Job"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:229
+#: src/gui/statuswindow.cpp:211 src/gui/statuswindow.cpp:247
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:235
+#: src/gui/statuswindow.cpp:255
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:251
-msgid "Level"
-msgstr ""
-
-#: src/gui/storagewindow.cpp:58
-msgid "Storage"
-msgstr ""
-
-#: src/gui/trade.cpp:52
+#: src/gui/trade.cpp:53
 msgid "Propose trade"
 msgstr ""
 
-#: src/gui/trade.cpp:53
+#: src/gui/trade.cpp:54
 msgid "Confirmed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:55
 msgid "Agree trade"
 msgstr ""
 
-#: src/gui/trade.cpp:55
+#: src/gui/trade.cpp:56
 msgid "Agreed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:58
+#: src/gui/trade.cpp:59
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/trade.cpp:74 src/gui/trade.cpp:75
+#: src/gui/trade.cpp:73 src/gui/trade.cpp:74
 msgid "Trade"
 msgstr ""
 
-#: src/gui/trade.cpp:77
+#: src/gui/trade.cpp:76
 msgid "Add"
 msgstr ""
 
-#: src/gui/trade.cpp:99 src/gui/trade.cpp:135
+#: src/gui/trade.cpp:98 src/gui/trade.cpp:134
 #, c-format
 msgid "You get %s"
 msgstr ""
 
-#: src/gui/trade.cpp:100
+#: src/gui/trade.cpp:99
 msgid "You give:"
 msgstr ""
 
-#: src/gui/trade.cpp:104
+#: src/gui/trade.cpp:103
 msgid "Change"
 msgstr ""
 
-#: src/gui/trade.cpp:275
+#: src/gui/trade.cpp:262
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/trade.cpp:318
+#: src/gui/trade.cpp:304
 msgid "You don't have enough money."
 msgstr ""
 
@@ -2049,21 +1899,21 @@ msgstr ""
 msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:405
+#: src/gui/updatewindow.cpp:417
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:407
+#: src/gui/updatewindow.cpp:419
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:409
+#: src/gui/updatewindow.cpp:421
 msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:501
+#: src/gui/updatewindow.cpp:515
 msgid "Completed"
 msgstr ""
 
@@ -2143,61 +1993,61 @@ msgstr ""
 msgid "Need a user to kick!"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:118
+#: src/gui/widgets/chattab.cpp:121
 msgid "Global announcement:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:124
+#: src/gui/widgets/chattab.cpp:127
 #, c-format
 msgid "Global announcement from %s:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:150
+#: src/gui/widgets/chattab.cpp:153
 #, c-format
 msgid "%s whispers: %s"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:51
+#: src/gui/widgets/whispertab.cpp:53
 msgid "Cannot send empty chat!"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:70
+#: src/gui/widgets/whispertab.cpp:72
 msgid "/ignore > Ignore the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:71
+#: src/gui/widgets/whispertab.cpp:73
 msgid "/unignore > Stop ignoring the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:72
+#: src/gui/widgets/whispertab.cpp:74
 msgid "/close > Close the whisper tab"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:82
+#: src/gui/widgets/whispertab.cpp:84
 msgid "Command: /close"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:83
+#: src/gui/widgets/whispertab.cpp:85
 msgid "This command closes the current whisper tab."
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:87
+#: src/gui/widgets/whispertab.cpp:89
 msgid "Command: /ignore"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:88
+#: src/gui/widgets/whispertab.cpp:90
 msgid "This command ignores the other player regardless of current relations."
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:94
+#: src/gui/widgets/whispertab.cpp:96
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:55
+#: src/gui/windowmenu.cpp:54
 msgid "Status"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:61
+#: src/gui/windowmenu.cpp:65
 msgid "Shortcut"
 msgstr ""
 
@@ -2213,1347 +2063,1357 @@ msgstr ""
 msgid "Choose World"
 msgstr ""
 
-#: src/keyboardconfig.cpp:40
+#: src/keyboardconfig.cpp:39
 msgid "Move Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:41
+#: src/keyboardconfig.cpp:40
 msgid "Move Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:41
 msgid "Move Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:42
 msgid "Move Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:44 src/net/ea/generalhandler.cpp:223
+#: src/keyboardconfig.cpp:43 src/net/tmwa/generalhandler.cpp:237
 msgid "Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:44
 msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:45
 msgid "Smilie"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:46
 msgid "Talk"
 msgstr ""
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:47
 msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:48
 msgid "Target Monster"
 msgstr ""
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboardconfig.cpp:49
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:50
 msgid "Target Player"
 msgstr ""
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:51
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:52
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:53
 msgid "Sit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:54
 msgid "Screenshot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:55
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:56
 msgid "Find Path to Mouse"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58 src/keyboardconfig.cpp:59
-#: src/keyboardconfig.cpp:60 src/keyboardconfig.cpp:61
-#: src/keyboardconfig.cpp:62 src/keyboardconfig.cpp:63
-#: src/keyboardconfig.cpp:64 src/keyboardconfig.cpp:65
-#: src/keyboardconfig.cpp:66 src/keyboardconfig.cpp:67
-#: src/keyboardconfig.cpp:68 src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:57 src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60
+#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62
+#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64
+#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68
 #, c-format
 msgid "Item Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:69
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:70
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:71
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:72
 msgid "Equipment Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:73
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:74
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:75
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:76
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:77
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:78
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:79
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:80
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:81
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:83
+#: src/keyboardconfig.cpp:82
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:83
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86
-#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88
-#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90
-#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92
-#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:84 src/keyboardconfig.cpp:85
+#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:87
+#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:89
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:91
+#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:93
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:95
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:96
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:97
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:98
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:99
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:100
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:101
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:103
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:105
+#: src/keyboardconfig.cpp:104
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:178
+#: src/keyboardconfig.cpp:183
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:913
+#: src/localplayer.cpp:985
 msgid "Unable to pick up item."
 msgstr ""
 
 #. TRANSLATORS: This sentence may be translated differently
 #. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:922
+#: src/localplayer.cpp:994
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/main.cpp:43
+#: src/main.cpp:42
 msgid "mana [options] [mana-file]"
 msgstr ""
 
+#: src/main.cpp:43
+msgid "[mana-file] : The mana file is an XML file (.mana)"
+msgstr ""
+
 #: src/main.cpp:44
-msgid "Options:"
+msgid "              used to set custom parameters"
 msgstr ""
 
 #: src/main.cpp:45
+msgid "              to the mana client."
+msgstr ""
+
+#: src/main.cpp:47
+msgid "Options:"
+msgstr ""
+
+#: src/main.cpp:48
 msgid "  -v --version        : Display the version"
 msgstr ""
 
-#: src/main.cpp:46
+#: src/main.cpp:49
 msgid "  -h --help           : Display this help"
 msgstr ""
 
-#: src/main.cpp:47
+#: src/main.cpp:50
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
-#: src/main.cpp:48
+#: src/main.cpp:51
 msgid "  -U --username       : Login with this username"
 msgstr ""
 
-#: src/main.cpp:49
+#: src/main.cpp:52
 msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/main.cpp:50
+#: src/main.cpp:53
 msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/main.cpp:51
+#: src/main.cpp:54
 msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:52
+#: src/main.cpp:55
 msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/main.cpp:53
+#: src/main.cpp:56
 msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/main.cpp:54
+#: src/main.cpp:57
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:56
+#: src/main.cpp:59
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:57
+#: src/main.cpp:60
 msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:58
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
+#: src/main.cpp:61
+msgid "     --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/main.cpp:59
+#: src/main.cpp:62
+msgid "     --chat-log-dir   : Chat log dir to use"
+msgstr ""
+
+#: src/main.cpp:63
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/main.cpp:61
+#: src/main.cpp:65
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:63
+#: src/net/manaserv/beinghandler.cpp:303 src/net/tmwa/playerhandler.cpp:94
+msgid "You are dead."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:304 src/net/tmwa/playerhandler.cpp:95
+msgid "We regret to inform you that your character was killed in battle."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:306 src/net/tmwa/playerhandler.cpp:97
+msgid "You are not that alive anymore."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:307 src/net/tmwa/playerhandler.cpp:98
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:308 src/net/tmwa/playerhandler.cpp:99
+msgid "Game Over!"
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:309 src/net/tmwa/playerhandler.cpp:101
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:311 src/net/tmwa/playerhandler.cpp:103
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:313 src/net/tmwa/playerhandler.cpp:105
+msgid "I guess this did not run too well."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:107
+msgid "Do you want your possessions identified?"
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:109
+msgid "Sadly, no trace of you was ever found..."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:111
+msgid "Annihilated."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:113
+msgid "Looks like you got your head handed to you."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:115
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:323
+msgid "Press OK to respawn."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:324
+msgid "You Died"
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:138 src/net/manaserv/charhandler.cpp:209
+msgid "Not logged in."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:141
+msgid "No empty slot."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:144
+msgid "Invalid name."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:147
+msgid "Character's name already exists."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:150
+msgid "Invalid hairstyle."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:153
+msgid "Invalid hair color."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:156
+msgid "Invalid gender."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:159
+msgid "Character's stats are too high."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:162
+msgid "Character's stats are too low."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:165
+#, c-format
+msgid "At least one statis out of the permitted range: (%u - %u)."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:171 src/net/manaserv/loginhandler.cpp:96
+#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
+#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
+#: src/net/tmwa/loginhandler.cpp:95 src/net/tmwa/loginhandler.cpp:182
+msgid "Unknown error."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:200 src/net/tmwa/charserverhandler.cpp:146
+msgid "Info"
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:200
+msgid "Player deleted."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:212
+msgid "Selection out of range."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:215
+#, c-format
+msgid "Unknown error (%d)."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:250
+msgid "No gameservers are available."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:187 src/net/manaserv/chathandler.cpp:313
+#: src/net/manaserv/guildhandler.cpp:260
+#, c-format
+msgid "Topic: %s"
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:274
+msgid "Players in this channel:"
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:208
+msgid "Error joining channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:214
+msgid "Listing channels."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:226
+msgid "End of channel list."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:303
+#, c-format
+msgid "%s entered the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:308
+#, c-format
+msgid "%s left the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:324
+#, c-format
+msgid "%s has set mode %s on user %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:334
+#, c-format
+msgid "%s has kicked %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:339
+msgid "Unknown channel event."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:82
+msgid "Guild created."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:87
+msgid "Error creating guild."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:97
+msgid "Invite sent."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:204
+msgid "Member was promoted successfully."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:209
+msgid "Failed to promote member."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:87
+msgid "Wrong magic_token."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
+msgid "Already logged in."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:93
+msgid "Account banned."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:118
+msgid "New password incorrect."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:121 src/net/tmwa/loginhandler.cpp:89
+msgid "Old password incorrect."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
+msgid "Account not connected. Please login first."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:149
+msgid "New email address incorrect."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:152
+msgid "Old email address incorrect."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:158
+msgid "The new email address already exists."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:239
+msgid ""
+"Client registration is not allowed. Please contact server administration."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
+msgid "Client version is too old."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:266
+msgid "Wrong username or password."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:272
+msgid "Account banned"
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:275
+msgid "Login attempt too soon after previous attempt."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:303
+msgid "Wrong username, password or email address."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:306
+msgid "Username already exists."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:309
+msgid "Email address already exists."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:312
+msgid "You took too long with the captcha or your response was incorrect."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:87
+msgid "Joined party."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:105
+#, c-format
+msgid "%s joined the party."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:123
+#, c-format
+msgid "%s rejected your invite."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:95
+msgid "Accepting incoming trade requests."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:97
+msgid "Ignoring incoming trade requests."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:115 src/net/tmwa/tradehandler.cpp:109
+msgid "Request for Trade"
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:116 src/net/tmwa/tradehandler.cpp:110
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:134
+#, c-format
+msgid "Trading with %s"
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:148 src/net/tmwa/tradehandler.cpp:224
+msgid "Trade canceled."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:155 src/net/tmwa/tradehandler.cpp:231
+msgid "Trade completed."
+msgstr ""
+
+#: src/net/tmwa/adminhandler.cpp:64
 msgid "Kick failed!"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:65
+#: src/net/tmwa/adminhandler.cpp:66
 msgid "Kick succeeded!"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:110
+#: src/net/tmwa/buysellhandler.cpp:109
 msgid "Nothing to sell."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:117
+#: src/net/tmwa/buysellhandler.cpp:116
 msgid "Thanks for buying."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:124
+#: src/net/tmwa/buysellhandler.cpp:123
 msgid "Unable to buy."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:130
+#: src/net/tmwa/buysellhandler.cpp:129
 msgid "Thanks for selling."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:132
+#: src/net/tmwa/buysellhandler.cpp:131
 msgid "Unable to sell."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:103
-msgid "Access denied."
+#: src/net/tmwa/charserverhandler.cpp:103
+msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:106
+#: src/net/tmwa/charserverhandler.cpp:107
 msgid "Cannot use this ID."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:109
-msgid "Unknown failure to select character."
+#: src/net/tmwa/charserverhandler.cpp:110
+msgid "Unknown char-server failure."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:135
+#: src/net/tmwa/charserverhandler.cpp:134
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:147 src/net/manaserv/charhandler.cpp:187
-msgid "Info"
-msgstr ""
-
-#: src/net/ea/charserverhandler.cpp:147
+#: src/net/tmwa/charserverhandler.cpp:146
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:152
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Failed to delete character."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:237 src/net/manaserv/charhandler.cpp:263
+#: src/net/tmwa/charserverhandler.cpp:266
 msgid "Strength:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:238 src/net/manaserv/charhandler.cpp:264
+#: src/net/tmwa/charserverhandler.cpp:267
 msgid "Agility:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:239 src/net/manaserv/charhandler.cpp:266
+#: src/net/tmwa/charserverhandler.cpp:268
 msgid "Vitality:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:240 src/net/manaserv/charhandler.cpp:267
+#: src/net/tmwa/charserverhandler.cpp:269
 msgid "Intelligence:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:241 src/net/manaserv/charhandler.cpp:265
+#: src/net/tmwa/charserverhandler.cpp:270
 msgid "Dexterity:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:242
+#: src/net/tmwa/charserverhandler.cpp:271
 msgid "Luck:"
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:80
-msgid "Whisper could not be sent, user is offline."
+#: src/net/tmwa/chathandler.cpp:87
+#, c-format
+msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:84
-msgid "Whisper could not be sent, ignored by user."
+#: src/net/tmwa/chathandler.cpp:96
+#, c-format
+msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:171
+#: src/net/tmwa/chathandler.cpp:230
 msgid "MVP player."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:204 src/net/ea/chathandler.cpp:210
-#: src/net/ea/chathandler.cpp:215 src/net/ea/chathandler.cpp:220
-#: src/net/ea/chathandler.cpp:225 src/net/ea/chathandler.cpp:230
-#: src/net/ea/chathandler.cpp:235 src/net/ea/chathandler.cpp:240
+#: src/net/tmwa/chathandler.cpp:265 src/net/tmwa/chathandler.cpp:271
+#: src/net/tmwa/chathandler.cpp:276 src/net/tmwa/chathandler.cpp:281
+#: src/net/tmwa/chathandler.cpp:286 src/net/tmwa/chathandler.cpp:291
+#: src/net/tmwa/chathandler.cpp:296 src/net/tmwa/chathandler.cpp:301
 msgid "Channels are not supported!"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:86
+#: src/net/tmwa/gamehandler.cpp:88
 #, c-format
 msgid "Online users: %d"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:100
+#: src/net/tmwa/gamehandler.cpp:101
 msgid "Game"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:100
+#: src/net/tmwa/gamehandler.cpp:101
 msgid "Request to quit denied!"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:102 src/net/manaserv/generalhandler.cpp:95
+#: src/net/tmwa/generalhandler.cpp:102
 #, c-format
 msgid "Strength %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:103 src/net/manaserv/generalhandler.cpp:96
+#: src/net/tmwa/generalhandler.cpp:103
 #, c-format
 msgid "Agility %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:104 src/net/manaserv/generalhandler.cpp:98
+#: src/net/tmwa/generalhandler.cpp:104
 #, c-format
 msgid "Vitality %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:105 src/net/manaserv/generalhandler.cpp:99
+#: src/net/tmwa/generalhandler.cpp:105
 #, c-format
 msgid "Intelligence %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:106 src/net/manaserv/generalhandler.cpp:97
+#: src/net/tmwa/generalhandler.cpp:106
 #, c-format
 msgid "Dexterity %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:107
+#: src/net/tmwa/generalhandler.cpp:107
 #, c-format
 msgid "Luck %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:130
+#: src/net/tmwa/generalhandler.cpp:132
 msgid "Authentication failed."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:133
+#: src/net/tmwa/generalhandler.cpp:135
 msgid "No servers available."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:137
+#: src/net/tmwa/generalhandler.cpp:139
 msgid "Someone else is trying to use this account."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:140
+#: src/net/tmwa/generalhandler.cpp:142
 msgid "This account is already logged in."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:143
+#: src/net/tmwa/generalhandler.cpp:145
 msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:146
+#: src/net/tmwa/generalhandler.cpp:148
 msgid "Duplicated login."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:149
+#: src/net/tmwa/generalhandler.cpp:151
 msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:205
+#: src/net/tmwa/generalhandler.cpp:209
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:216 src/net/manaserv/generalhandler.cpp:166
+#: src/net/tmwa/generalhandler.cpp:230
 msgid "Strength"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:217 src/net/manaserv/generalhandler.cpp:167
+#: src/net/tmwa/generalhandler.cpp:231
 msgid "Agility"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:218 src/net/manaserv/generalhandler.cpp:169
+#: src/net/tmwa/generalhandler.cpp:232
 msgid "Vitality"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:219 src/net/manaserv/generalhandler.cpp:170
+#: src/net/tmwa/generalhandler.cpp:233
 msgid "Intelligence"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:220 src/net/manaserv/generalhandler.cpp:168
+#: src/net/tmwa/generalhandler.cpp:234
 msgid "Dexterity"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:221
+#: src/net/tmwa/generalhandler.cpp:235
 msgid "Luck"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:224
+#: src/net/tmwa/generalhandler.cpp:238
 msgid "Defense"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:225
+#: src/net/tmwa/generalhandler.cpp:239
 msgid "M.Attack"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:226
+#: src/net/tmwa/generalhandler.cpp:240
 msgid "M.Defense"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:227
+#: src/net/tmwa/generalhandler.cpp:241
 #, c-format
 msgid "% Accuracy"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:228
+#: src/net/tmwa/generalhandler.cpp:242
 #, c-format
 msgid "% Evade"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:229
+#: src/net/tmwa/generalhandler.cpp:243
 #, c-format
 msgid "% Critical"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:61 src/net/ea/gui/partytab.cpp:59
+#: src/net/tmwa/gui/guildtab.cpp:45
+msgid "Guild"
+msgstr ""
+
+#: src/net/tmwa/gui/guildtab.cpp:61 src/net/tmwa/gui/partytab.cpp:59
 msgid "/help > Display this help."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:62
+#: src/net/tmwa/gui/guildtab.cpp:62
 msgid "/invite > Invite a player to your guild"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:63
+#: src/net/tmwa/gui/guildtab.cpp:63
 msgid "/leave > Leave the guild you are in"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:64
+#: src/net/tmwa/gui/guildtab.cpp:64
 msgid "/kick > Kick some one from the guild you are in"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:73 src/net/ea/gui/partytab.cpp:73
+#: src/net/tmwa/gui/guildtab.cpp:73 src/net/tmwa/gui/partytab.cpp:73
 msgid "Command: /invite <nick>"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:74
+#: src/net/tmwa/gui/guildtab.cpp:74
 msgid "This command invites <nick> to the guild you're in."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:80 src/net/ea/gui/partytab.cpp:80
+#: src/net/tmwa/gui/guildtab.cpp:80 src/net/tmwa/gui/partytab.cpp:80
 msgid "Command: /leave"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:81
+#: src/net/tmwa/gui/guildtab.cpp:81
 msgid "This command causes the player to leave the guild."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:89
+#: src/net/tmwa/gui/guildtab.cpp:89
 msgid "Guild name is missing."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:293
+#: src/net/tmwa/guildhandler.cpp:296
 msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:298
+#: src/net/tmwa/guildhandler.cpp:301
 msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:303
+#: src/net/tmwa/guildhandler.cpp:306
 msgid "User is now part of your guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:308
+#: src/net/tmwa/guildhandler.cpp:311
 msgid "Your guild is full."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:313
+#: src/net/tmwa/guildhandler.cpp:316
 msgid "Unknown guild invite response."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:390
+#: src/net/tmwa/guildhandler.cpp:393
 msgid "Guild creation isn't supported yet."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:60
+#: src/net/tmwa/gui/partytab.cpp:43
+msgid "Party"
+msgstr ""
+
+#: src/net/tmwa/gui/partytab.cpp:60
 msgid "/invite > Invite a player to your party"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:61
+#: src/net/tmwa/gui/partytab.cpp:61
 msgid "/leave > Leave the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:62
+#: src/net/tmwa/gui/partytab.cpp:62
 msgid "/kick > Kick some one from the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:63
+#: src/net/tmwa/gui/partytab.cpp:63
 msgid "/item > Show/change party item sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:64
+#: src/net/tmwa/gui/partytab.cpp:64
 msgid "/exp > Show/change party experience sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:81
+#: src/net/tmwa/gui/partytab.cpp:81
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:85
+#: src/net/tmwa/gui/partytab.cpp:85
 msgid "Command: /item <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:86
+#: src/net/tmwa/gui/partytab.cpp:86
 msgid "This command changes the party's item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:87
+#: src/net/tmwa/gui/partytab.cpp:87
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:90
+#: src/net/tmwa/gui/partytab.cpp:90
 msgid "Command: /item"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/tmwa/gui/partytab.cpp:91
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/tmwa/gui/partytab.cpp:95
 msgid "Command: /exp <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:96
+#: src/net/tmwa/gui/partytab.cpp:96
 msgid "This command changes the party's experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/tmwa/gui/partytab.cpp:97
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:100
+#: src/net/tmwa/gui/partytab.cpp:100
 msgid "Command: /exp"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/tmwa/gui/partytab.cpp:101
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:132 src/net/ea/partyhandler.cpp:198
+#: src/net/tmwa/gui/partytab.cpp:132 src/net/tmwa/partyhandler.cpp:196
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:135 src/net/ea/partyhandler.cpp:204
+#: src/net/tmwa/gui/partytab.cpp:135 src/net/tmwa/partyhandler.cpp:202
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:138 src/net/ea/partyhandler.cpp:210
+#: src/net/tmwa/gui/partytab.cpp:138 src/net/tmwa/partyhandler.cpp:208
 msgid "Item sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:141
+#: src/net/tmwa/gui/partytab.cpp:141
 msgid "Item sharing unknown."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:167 src/net/ea/partyhandler.cpp:174
+#: src/net/tmwa/gui/partytab.cpp:167 src/net/tmwa/partyhandler.cpp:172
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:170 src/net/ea/partyhandler.cpp:180
+#: src/net/tmwa/gui/partytab.cpp:170 src/net/tmwa/partyhandler.cpp:178
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:173 src/net/ea/partyhandler.cpp:186
+#: src/net/tmwa/gui/partytab.cpp:173 src/net/tmwa/partyhandler.cpp:184
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:176
+#: src/net/tmwa/gui/partytab.cpp:176
 msgid "Experience sharing unknown."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:281
+#: src/net/tmwa/inventoryhandler.cpp:285
 msgid "Failed to use item."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:391
+#: src/net/tmwa/inventoryhandler.cpp:399
 msgid "Unable to equip."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:402
+#: src/net/tmwa/inventoryhandler.cpp:410
 msgid "Unable to unequip."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:79
+#: src/net/tmwa/loginhandler.cpp:86
 msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:82 src/net/manaserv/loginhandler.cpp:121
-msgid "Old password incorrect."
-msgstr ""
-
-#: src/net/ea/loginhandler.cpp:85
+#: src/net/tmwa/loginhandler.cpp:92
 msgid "New password too short."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:88 src/net/ea/loginhandler.cpp:175
-#: src/net/manaserv/charhandler.cpp:158 src/net/manaserv/loginhandler.cpp:96
-#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
-#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
-msgid "Unknown error."
-msgstr ""
-
-#: src/net/ea/loginhandler.cpp:149
+#: src/net/tmwa/loginhandler.cpp:156
 msgid "Unregistered ID."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:152
+#: src/net/tmwa/loginhandler.cpp:159
 msgid "Wrong password."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:155
+#: src/net/tmwa/loginhandler.cpp:162
 msgid "Account expired."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:158
+#: src/net/tmwa/loginhandler.cpp:165
 msgid "Rejected from server."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:161
+#: src/net/tmwa/loginhandler.cpp:168
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:165
+#: src/net/tmwa/loginhandler.cpp:172
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:172
+#: src/net/tmwa/loginhandler.cpp:179
 msgid "This user name is already taken."
 msgstr ""
 
-#: src/net/ea/network.cpp:145
+#: src/net/tmwa/network.cpp:145
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/ea/network.cpp:345
+#: src/net/tmwa/network.cpp:345
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/ea/network.cpp:414
+#: src/net/tmwa/network.cpp:414
 msgid "Connection to server terminated. "
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:81
+#: src/net/tmwa/partyhandler.cpp:82
 msgid "Could not create party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:84
+#: src/net/tmwa/partyhandler.cpp:84
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:118
+#: src/net/tmwa/partyhandler.cpp:119
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:122
+#: src/net/tmwa/partyhandler.cpp:123
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:126
+#: src/net/tmwa/partyhandler.cpp:127
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:130
+#: src/net/tmwa/partyhandler.cpp:131
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:238
+#: src/net/tmwa/partyhandler.cpp:236
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:249
+#: src/net/tmwa/partyhandler.cpp:246
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:301
+#: src/net/tmwa/partyhandler.cpp:299
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:329
-msgid "Inviting like this isn't supported at the moment."
+#: src/net/tmwa/partyhandler.cpp:335
+#, c-format
+msgid "Inviting failed, because you can't see a player called %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:334
+#: src/net/tmwa/partyhandler.cpp:340
 msgid "You can only inivte when you are in a party!"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:365
+#: src/net/tmwa/partyhandler.cpp:368
 #, c-format
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:304
-msgid "You are dead."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:305
-msgid "We regret to inform you that your character was killed in battle."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:307
-msgid "You are not that alive anymore."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:308
-msgid "The cold hands of the grim reaper are grabbing for your soul."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:309
-msgid "Game Over!"
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:105
+#: src/net/tmwa/playerhandler.cpp:100
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:310
-msgid ""
-"No, kids. Your character did not really die. It... err... went to a better "
-"place."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:312
-msgid ""
-"Your plan of breaking your enemies weapon by bashing it with your throat "
-"failed."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:314
-msgid "I guess this did not run too well."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:315
-msgid "Do you want your possessions identified?"
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:316
-msgid "Sadly, no trace of you was ever found..."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:317
-msgid "Annihilated."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:318
-msgid "Looks like you got your head handed to you."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:120 src/net/manaserv/beinghandler.cpp:319
-msgid ""
-"You screwed up again, dump your body down the tubes and get you another one."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/tmwa/playerhandler.cpp:118
 msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/tmwa/playerhandler.cpp:119
 msgid "You are no more."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/tmwa/playerhandler.cpp:120
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/tmwa/playerhandler.cpp:121
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/tmwa/playerhandler.cpp:122
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/tmwa/playerhandler.cpp:123
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/tmwa/playerhandler.cpp:124
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:130
+#: src/net/tmwa/playerhandler.cpp:125
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:131
+#: src/net/tmwa/playerhandler.cpp:126
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/tmwa/playerhandler.cpp:127
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/tmwa/playerhandler.cpp:128
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:135
+#: src/net/tmwa/playerhandler.cpp:130
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:136
+#: src/net/tmwa/playerhandler.cpp:131
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:249 src/net/ea/playerhandler.cpp:310
+#: src/net/tmwa/playerhandler.cpp:246 src/net/tmwa/playerhandler.cpp:285
 msgid "Message"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:250
+#: src/net/tmwa/playerhandler.cpp:247
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:333
+#: src/net/tmwa/playerhandler.cpp:313
 #, c-format
 msgid "You picked up %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:369
+#: src/net/tmwa/playerhandler.cpp:348
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:532
+#: src/net/tmwa/playerhandler.cpp:488
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:147
+#: src/net/tmwa/specialhandler.cpp:144
 msgid "Trade failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:150
+#: src/net/tmwa/specialhandler.cpp:147
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:153
+#: src/net/tmwa/specialhandler.cpp:150
 msgid "Sit failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:156
+#: src/net/tmwa/specialhandler.cpp:153
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:159
+#: src/net/tmwa/specialhandler.cpp:156
 msgid "Could not join party!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:162
+#: src/net/tmwa/specialhandler.cpp:159
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:171
+#: src/net/tmwa/specialhandler.cpp:168
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:174
+#: src/net/tmwa/specialhandler.cpp:171
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:177
+#: src/net/tmwa/specialhandler.cpp:174
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:180
+#: src/net/tmwa/specialhandler.cpp:177
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:183
+#: src/net/tmwa/specialhandler.cpp:180
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:186
+#: src/net/tmwa/specialhandler.cpp:183
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:189
+#: src/net/tmwa/specialhandler.cpp:186
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:192
+#: src/net/tmwa/specialhandler.cpp:189
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:195
+#: src/net/tmwa/specialhandler.cpp:192
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:198
+#: src/net/tmwa/specialhandler.cpp:195
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:201
+#: src/net/tmwa/specialhandler.cpp:198
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:210
+#: src/net/tmwa/specialhandler.cpp:207
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:213
+#: src/net/tmwa/specialhandler.cpp:210
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:216
+#: src/net/tmwa/specialhandler.cpp:213
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:116
-msgid "Request for Trade"
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:108 src/net/manaserv/tradehandler.cpp:117
-#, c-format
-msgid "%s wants to trade with you, do you accept?"
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:124
+#: src/net/tmwa/tradehandler.cpp:126
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:128
+#: src/net/tmwa/tradehandler.cpp:130
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:132
+#: src/net/tmwa/tradehandler.cpp:134
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:137
+#: src/net/tmwa/tradehandler.cpp:139
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:144
+#: src/net/tmwa/tradehandler.cpp:146
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:153
+#: src/net/tmwa/tradehandler.cpp:154
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:202
+#: src/net/tmwa/tradehandler.cpp:202
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:207
+#: src/net/tmwa/tradehandler.cpp:207
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:211
+#: src/net/tmwa/tradehandler.cpp:211
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:224 src/net/manaserv/tradehandler.cpp:149
-msgid "Trade canceled."
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:231 src/net/manaserv/tradehandler.cpp:156
-msgid "Trade completed."
-msgstr ""
-
-#: src/net/manaserv/beinghandler.cpp:324
-msgid "Press OK to respawn."
-msgstr ""
-
-#: src/net/manaserv/beinghandler.cpp:325
-msgid "You Died"
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:128 src/net/manaserv/charhandler.cpp:196
-msgid "Not logged in."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:131
-msgid "No empty slot."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:134
-msgid "Invalid name."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:137
-msgid "Character's name already exists."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:140
-msgid "Invalid hairstyle."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:143
-msgid "Invalid hair color."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:146
-msgid "Invalid gender."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:149
-msgid "Character's stats are too high."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:152
-msgid "Character's stats are too low."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:155
-msgid "One stat is zero."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:187
-msgid "Player deleted."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:199
-msgid "Selection out of range."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:202
-#, c-format
-msgid "Unknown error (%d)."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:242
-msgid "No gameservers are available."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:268
-msgid "Willpower:"
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
-#: src/net/manaserv/guildhandler.cpp:259
-#, c-format
-msgid "Topic: %s"
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
-msgid "Players in this channel:"
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:201
-msgid "Error joining channel."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:207
-msgid "Listing channels."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:219
-msgid "End of channel list."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:291
-#, c-format
-msgid "%s entered the channel."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:296
-#, c-format
-msgid "%s left the channel."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:312
-#, c-format
-msgid "%s has set mode %s on user %s."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:322
-#, c-format
-msgid "%s has kicked %s."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:327
-msgid "Unknown channel event."
-msgstr ""
-
-#: src/net/manaserv/generalhandler.cpp:100
-#, c-format
-msgid "Willpower %+d"
-msgstr ""
-
-#: src/net/manaserv/generalhandler.cpp:171
-msgid "Willpower"
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:81
-msgid "Guild created."
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:86
-msgid "Error creating guild."
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:96
-msgid "Invite sent."
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:203
-msgid "Member was promoted successfully."
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:208
-msgid "Failed to promote member."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:87
-msgid "Wrong magic_token."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
-msgid "Already logged in."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:93 src/net/manaserv/loginhandler.cpp:272
-msgid "Server is full."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:118
-msgid "New password incorrect."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
-msgid "Account not connected. Please login first."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:149
-msgid "New email address incorrect."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:152
-msgid "Old email address incorrect."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:158
-msgid "The new email address already exists."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:239
-msgid ""
-"Client registration is not allowed. Please contact server administration."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
-msgid "Client version is too old."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:266
-msgid "Wrong username or password."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:275
-msgid "Login attempt too soon after previous attempt."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:303
-msgid "Wrong username, password or email address."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:306
-msgid "Username already exists."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:309
-msgid "Email address already exists."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:312
-msgid "You took too long with the captcha or your response was incorrect."
-msgstr ""
-
-#: src/net/manaserv/partyhandler.cpp:88
-msgid "Joined party."
-msgstr ""
-
-#: src/net/manaserv/partyhandler.cpp:106
-#, c-format
-msgid "%s joined the party."
-msgstr ""
-
-#: src/net/manaserv/partyhandler.cpp:123
-#, c-format
-msgid "%s rejected your invite."
-msgstr ""
-
-#: src/net/manaserv/tradehandler.cpp:96
-msgid "Accepting incoming trade requests."
-msgstr ""
-
-#: src/net/manaserv/tradehandler.cpp:98
-msgid "Ignoring incoming trade requests."
-msgstr ""
-
-#: src/net/manaserv/tradehandler.cpp:135
-#, c-format
-msgid "Trading with %s"
-msgstr ""
-
-#: src/playerrelations.cpp:304
+#: src/playerrelations.cpp:310
 msgid "Completely ignore"
 msgstr ""
 
-#: src/playerrelations.cpp:318
+#: src/playerrelations.cpp:324
 msgid "Print '...'"
 msgstr ""
 
-#: src/playerrelations.cpp:334
+#: src/playerrelations.cpp:340
 msgid "Blink name"
 msgstr ""
 
-#: src/playerrelations.cpp:371
-msgid "Floating '...' bubble"
-msgstr ""
-
-#: src/playerrelations.cpp:374
-msgid "Floating bubble"
-msgstr ""
-
-#: src/resources/itemdb.cpp:52
+#: src/resources/itemdb.cpp:44
 #, c-format
 msgid "Attack %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:53
+#: src/resources/itemdb.cpp:45
 #, c-format
 msgid "Defense %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:54
+#: src/resources/itemdb.cpp:46
 #, c-format
 msgid "HP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:55
+#: src/resources/itemdb.cpp:47
 #, c-format
 msgid "MP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:114
+#: src/resources/itemdb.cpp:92
 msgid "Unknown item"
 msgstr ""
 
-#: src/resources/itemdb.cpp:158 src/resources/monsterdb.cpp:45
-#: src/resources/monsterdb.cpp:67
+#: src/resources/itemdb.cpp:135 src/resources/monsterdb.cpp:77
 msgid "unnamed"
 msgstr "sennoma"
 
diff --git a/po/es.po b/po/es.po
index 3f7ed258..1d7939ab 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2010-03-16 22:27+0100\n"
+"POT-Creation-Date: 2010-12-13 20:04+0100\n"
 "PO-Revision-Date: 2010-02-24 20:55+0000\n"
 "Last-Translator: Miguel de Dios <tres.14159@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,319 +19,325 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/client.cpp:555 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
+#: src/client.cpp:598 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
 msgid "Setup"
 msgstr "Configuración"
 
-#: src/client.cpp:625
+#: src/client.cpp:679
 #, fuzzy
 msgid "Connecting to server"
 msgstr "conectando al servidor de mapas...."
 
-#: src/client.cpp:652
+#: src/client.cpp:706
 #, fuzzy
 msgid "Logging in"
 msgstr "Iniciar sesión"
 
-#: src/client.cpp:685
+#: src/client.cpp:739
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:741
+#: src/client.cpp:804
 #, fuzzy
 msgid "Requesting characters"
 msgstr "Seleccionar personaje"
 
-#: src/client.cpp:770
+#: src/client.cpp:833
 #, fuzzy
 msgid "Connecting to the game server"
 msgstr "conectando al servidor de mapas...."
 
-#: src/client.cpp:801 src/client.cpp:808 src/client.cpp:942
+#: src/client.cpp:843
+#, fuzzy
+msgid "Changing game servers"
+msgstr "Servidor"
+
+#: src/client.cpp:872 src/client.cpp:879 src/client.cpp:1014
 #: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
 #: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
-#: src/gui/serverdialog.cpp:241 src/gui/unregisterdialog.cpp:133
-#: src/net/ea/charserverhandler.cpp:135 src/net/ea/charserverhandler.cpp:152
-#: src/net/manaserv/charhandler.cpp:161 src/net/manaserv/charhandler.cpp:204
+#: src/gui/serverdialog.cpp:323 src/gui/unregisterdialog.cpp:133
+#: src/net/manaserv/charhandler.cpp:174 src/net/manaserv/charhandler.cpp:217
+#: src/net/tmwa/charserverhandler.cpp:134
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Error"
 msgstr "Error"
 
-#: src/client.cpp:817
+#: src/client.cpp:888
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:844
+#: src/client.cpp:915
 #, fuzzy
 msgid "Password Change"
 msgstr "Contraseña:"
 
-#: src/client.cpp:845
+#: src/client.cpp:916
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:864
+#: src/client.cpp:935
 #, fuzzy
 msgid "Email Change"
 msgstr "Modificar"
 
-#: src/client.cpp:865
+#: src/client.cpp:936
 #, fuzzy
 msgid "Email changed successfully!"
 msgstr "El miembro ha sido promovido con exito."
 
-#: src/client.cpp:885
+#: src/client.cpp:956
 #, fuzzy
 msgid "Unregister Successful"
 msgstr "Cancelar Cuenta"
 
-#: src/client.cpp:886
+#: src/client.cpp:957
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1009 src/client.cpp:1032
+#: src/client.cpp:1138 src/client.cpp:1161
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1121
+#: src/client.cpp:1281
 #, fuzzy, c-format
 msgid "Invalid update host: %s"
 msgstr "servidor de actualizaciones invalido: "
 
-#: src/client.cpp:1155 src/client.cpp:1161
+#: src/client.cpp:1315 src/client.cpp:1321
 msgid "Error creating updates directory!"
 msgstr "error al crear directorio de actualizaciones"
 
-#: src/commandhandler.cpp:127 src/commandhandler.cpp:308
+#: src/commandhandler.cpp:131 src/commandhandler.cpp:317
 msgid "Unknown command."
 msgstr "Comando desconocido."
 
-#: src/commandhandler.cpp:156
+#: src/commandhandler.cpp:160
 msgid "-- Help --"
 msgstr "--Ayuda--"
 
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:161
 msgid "/help > Display this help"
 msgstr "/help > Muestra esta ayuda"
 
-#: src/commandhandler.cpp:159
+#: src/commandhandler.cpp:163
 msgid "/where > Display map name"
 msgstr "/where > Muestra el nombre del mapa actual"
 
-#: src/commandhandler.cpp:160
+#: src/commandhandler.cpp:164
 msgid "/who > Display number of online users"
 msgstr "/who > Mostrar el número de usuarios en linea"
 
-#: src/commandhandler.cpp:161
+#: src/commandhandler.cpp:165
 msgid "/me > Tell something about yourself"
 msgstr "/me > Diga algo de usted"
 
-#: src/commandhandler.cpp:163
+#: src/commandhandler.cpp:167
 msgid "/clear > Clears this window"
 msgstr "/clear > Vacia la ventana"
 
-#: src/commandhandler.cpp:165
+#: src/commandhandler.cpp:169
 msgid "/msg > Send a private message to a user"
 msgstr "/msg > Enviar un mensaje privado a un usuario"
 
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:170
 msgid "/whisper > Alias of msg"
 msgstr "/whisper > Alias para un mensaje"
 
-#: src/commandhandler.cpp:167
+#: src/commandhandler.cpp:171
 msgid "/w > Alias of msg"
 msgstr "/w > Alias para un mensaje"
 
-#: src/commandhandler.cpp:168
+#: src/commandhandler.cpp:172
 msgid "/query > Makes a tab for private messages with another user"
 msgstr "/query > Crea una ventana para mensajes privados con otro jugador"
 
-#: src/commandhandler.cpp:169
+#: src/commandhandler.cpp:174
 msgid "/q > Alias of query"
 msgstr "/q > Alias para una demanda"
 
-#: src/commandhandler.cpp:171
+#: src/commandhandler.cpp:176
 msgid "/ignore > ignore a player"
 msgstr ""
 
-#: src/commandhandler.cpp:172
+#: src/commandhandler.cpp:177
 msgid "/unignore > stop ignoring a player"
 msgstr ""
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:179
 msgid "/list > Display all public channels"
 msgstr "/list > Muestra todos los canales Públicos"
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:180
 msgid "/join > Join or create a channel"
 msgstr "/join > Entrar o crear un canal"
 
-#: src/commandhandler.cpp:177
+#: src/commandhandler.cpp:182
 #, fuzzy
 msgid "/createparty > Create a new party"
 msgstr "/create > Crear un nuevo grupo"
 
-#: src/commandhandler.cpp:178
+#: src/commandhandler.cpp:183
 msgid "/party > Invite a user to party"
 msgstr "/party > Invita a un jugador a entrar en tu grupo"
 
-#: src/commandhandler.cpp:180
+#: src/commandhandler.cpp:185
 msgid "/record > Start recording the chat to an external file"
 msgstr "/record > Empieza a registrar el chat en un archivo externo"
 
-#: src/commandhandler.cpp:181
+#: src/commandhandler.cpp:187
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr "/toggle > Determinar si <enter> cambia el registro de chat"
 
-#: src/commandhandler.cpp:182
+#: src/commandhandler.cpp:189
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
 "/present > Obtener lista de jugadores presentes (enviar a registro de chat, "
 "si se guarda registro)"
 
-#: src/commandhandler.cpp:184
+#: src/commandhandler.cpp:192
 msgid "/announce > Global announcement (GM only)"
 msgstr "/announce > Anuncio global (Solo MJ's)"
 
-#: src/commandhandler.cpp:188
+#: src/commandhandler.cpp:196
 msgid "For more information, type /help <command>."
 msgstr "Para más información, ingrese /help <comando>"
 
-#: src/commandhandler.cpp:192
+#: src/commandhandler.cpp:200
 msgid "Command: /help"
 msgstr "Comando: /help"
 
-#: src/commandhandler.cpp:193
+#: src/commandhandler.cpp:201
 msgid "This command displays a list of all commands available."
 msgstr "Este comando muestra todos los comandos disponibles."
 
-#: src/commandhandler.cpp:194
+#: src/commandhandler.cpp:203
 msgid "Command: /help <command>"
 msgstr "Comando: /help <comando>"
 
-#: src/commandhandler.cpp:195
+#: src/commandhandler.cpp:204
 msgid "This command displays help on <command>."
 msgstr "Este comando muestra ayuda sobre <otro comando>"
 
-#: src/commandhandler.cpp:203
+#: src/commandhandler.cpp:212
 msgid "Command: /announce <msg>"
 msgstr "Comando: /announce <mensaje>"
 
-#: src/commandhandler.cpp:204
+#: src/commandhandler.cpp:213
 msgid "*** only available to a GM ***"
 msgstr "*** solo disponible a un GM ***"
 
-#: src/commandhandler.cpp:205
+#: src/commandhandler.cpp:214
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 "Este comando manda un mensaje a todos los jugadores que estén conectados."
 
-#: src/commandhandler.cpp:210
+#: src/commandhandler.cpp:219
 msgid "Command: /clear"
 msgstr "Comando: /clear"
 
-#: src/commandhandler.cpp:211
+#: src/commandhandler.cpp:220
 msgid "This command clears the chat log of previous chat."
 msgstr "Este comando limpia el historial de chat de la conversación anterior."
 
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:224
 #, fuzzy
 msgid "Command: /ignore <player>"
 msgstr "Command: /item <policy>"
 
-#: src/commandhandler.cpp:216
+#: src/commandhandler.cpp:225
 #, fuzzy
 msgid "This command ignores the given player regardless of current relations."
 msgstr ""
 "Este comando muestra el número de jugadores que actualmente están conectados."
 
-#: src/commandhandler.cpp:221
+#: src/commandhandler.cpp:230
 msgid "Command: /join <channel>"
 msgstr "Comando: /join <canal>"
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:231
 msgid "This command makes you enter <channel>."
 msgstr "Este comando sirve para ingresar a <canal>."
 
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:232
 msgid "If <channel> doesn't exist, it's created."
 msgstr "Si <Canal> no existe, lo crea."
 
-#: src/commandhandler.cpp:227
+#: src/commandhandler.cpp:236
 msgid "Command: /list"
 msgstr "Comando: /list"
 
-#: src/commandhandler.cpp:228
+#: src/commandhandler.cpp:237
 msgid "This command shows a list of all channels."
 msgstr "Este comando muestra la lista de canales disponibles."
 
-#: src/commandhandler.cpp:232
+#: src/commandhandler.cpp:241
 msgid "Command: /me <message>"
 msgstr "Comando: /me <mensaje>"
 
-#: src/commandhandler.cpp:233
+#: src/commandhandler.cpp:242
 msgid "This command tell others you are (doing) <msg>."
 msgstr "Este comando le dice a los demas que estas (haciendo) <mensaje>."
 
-#: src/commandhandler.cpp:237
+#: src/commandhandler.cpp:246
 msgid "Command: /msg <nick> <message>"
 msgstr "Comando: /msg <apodo> <mensaje>"
 
-#: src/commandhandler.cpp:238
+#: src/commandhandler.cpp:247
 msgid "Command: /whisper <nick> <message>"
 msgstr "Comando: /whisper <apodo> <mensaje>"
 
-#: src/commandhandler.cpp:239
+#: src/commandhandler.cpp:248
 msgid "Command: /w <nick> <message>"
 msgstr "Comando: /w <apodo> <mensaje>"
 
-#: src/commandhandler.cpp:240
+#: src/commandhandler.cpp:249
 msgid "This command sends the text <message> to <nick>."
 msgstr "Este comando le envia un <mensaje> a <apodo>."
 
-#: src/commandhandler.cpp:241 src/commandhandler.cpp:260
+#: src/commandhandler.cpp:250 src/commandhandler.cpp:269
 #: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
-#: src/net/ea/gui/guildtab.cpp:75 src/net/ea/gui/partytab.cpp:75
+#: src/net/tmwa/gui/guildtab.cpp:75 src/net/tmwa/gui/partytab.cpp:75
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr "Si el <apodo> incluye espacios, encierralos entre comillas (\")."
 
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:255
 msgid "Command: /query <nick>"
 msgstr "Comando: /query <apodo>"
 
-#: src/commandhandler.cpp:247
+#: src/commandhandler.cpp:256
 msgid "Command: /q <nick>"
 msgstr "Comando : /q <apodo>"
 
-#: src/commandhandler.cpp:248
+#: src/commandhandler.cpp:257
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
 "Este comando intenta crear una pestaña en el chat de susurros (mensajes "
 "privados)  entre <apodo> y tú."
 
-#: src/commandhandler.cpp:253
+#: src/commandhandler.cpp:262
 #, fuzzy
 msgid "Command: /createparty <name>"
 msgstr "Comando: /create <nombre>"
 
-#: src/commandhandler.cpp:254
+#: src/commandhandler.cpp:263
 #, fuzzy
 msgid "This command creates a new party called <name>."
 msgstr "estos comandos crean un grupo <nombre>"
 
-#: src/commandhandler.cpp:258
+#: src/commandhandler.cpp:267
 msgid "Command: /party <nick>"
 msgstr "Comando: /party <apodo>"
 
-#: src/commandhandler.cpp:259 src/net/ea/gui/partytab.cpp:74
+#: src/commandhandler.cpp:268 src/net/tmwa/gui/partytab.cpp:74
 msgid "This command invites <nick> to party with you."
 msgstr "Este comando invita a <apodo> a un grupo contigo"
 
-#: src/commandhandler.cpp:265
+#: src/commandhandler.cpp:274
 msgid "Command: /present"
 msgstr "Comando: /present"
 
-#: src/commandhandler.cpp:266
+#: src/commandhandler.cpp:275
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
@@ -338,28 +345,28 @@ msgstr ""
 "Este comando obtiene la lista de los jugadores a tu alcance y la envia al "
 "registro de grabaciones o bien al registro de chat."
 
-#: src/commandhandler.cpp:272
+#: src/commandhandler.cpp:281
 msgid "Command: /record <filename>"
 msgstr "Comando: /record <nombre de archivo>"
 
-#: src/commandhandler.cpp:273
+#: src/commandhandler.cpp:282
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr ""
 "Este comando graba el registro del chat en el archivo <nombre de archivo>."
 
-#: src/commandhandler.cpp:275
+#: src/commandhandler.cpp:284
 msgid "Command: /record"
 msgstr "Comando: /record"
 
-#: src/commandhandler.cpp:276
+#: src/commandhandler.cpp:285
 msgid "This command finishes a recording session."
 msgstr "Este comando termina la sesion de grabación."
 
-#: src/commandhandler.cpp:280
+#: src/commandhandler.cpp:289
 msgid "Command: /toggle <state>"
 msgstr "Comando: /toogle <estado>"
 
-#: src/commandhandler.cpp:281
+#: src/commandhandler.cpp:290
 msgid ""
 "This command sets whether the return key should toggle the chat log, or "
 "whether the chat log turns off automatically."
@@ -367,57 +374,57 @@ msgstr ""
 "Este comando decide si la tecla de retorno debe alternar el registro de chat "
 "o bien si el registro de chat se oculta de forma automática."
 
-#: src/commandhandler.cpp:283
+#: src/commandhandler.cpp:292
 msgid ""
-"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
-"\", \"no\", \"false\" to turn the toggle off."
+"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
+"\"0\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 "<estado> puede ser \"1\" , \"yes\" o\" true\" para activarlo o bien \"0\" , "
 "\"no\" , \"false\" para desactivarlo"
 
-#: src/commandhandler.cpp:286
+#: src/commandhandler.cpp:295
 msgid "Command: /toggle"
 msgstr "Comando: /toggle"
 
-#: src/commandhandler.cpp:287
+#: src/commandhandler.cpp:296
 msgid "This command displays the return toggle status."
 msgstr "Este comando muestra el estatus del botón alternar."
 
-#: src/commandhandler.cpp:291 src/gui/widgets/whispertab.cpp:93
+#: src/commandhandler.cpp:300 src/gui/widgets/whispertab.cpp:95
 #, fuzzy
 msgid "Command: /unignore <player>"
 msgstr "Command: /item <policy>"
 
-#: src/commandhandler.cpp:292
+#: src/commandhandler.cpp:301
 msgid "This command stops ignoring the given player if they are being ignored"
 msgstr ""
 
-#: src/commandhandler.cpp:297
+#: src/commandhandler.cpp:306
 msgid "Command: /where"
 msgstr "Comando: /where"
 
-#: src/commandhandler.cpp:298
+#: src/commandhandler.cpp:307
 msgid "This command displays the name of the current map."
 msgstr "Este comando muestra el nombre del mapa actual."
 
-#: src/commandhandler.cpp:302
+#: src/commandhandler.cpp:311
 msgid "Command: /who"
 msgstr "Comando: /who"
 
-#: src/commandhandler.cpp:303
+#: src/commandhandler.cpp:312
 msgid "This command displays the number of players currently online."
 msgstr ""
 "Este comando muestra el número de jugadores que actualmente están conectados."
 
-#: src/commandhandler.cpp:309
+#: src/commandhandler.cpp:318
 msgid "Type /help for a list of commands."
 msgstr "Ingrese /help para una obtener la lista de comandos."
 
-#: src/commandhandler.cpp:375
+#: src/commandhandler.cpp:384
 msgid "Cannot send empty whispers!"
 msgstr "No se pueden enviar susurros vacios."
 
-#: src/commandhandler.cpp:383
+#: src/commandhandler.cpp:392
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -426,59 +433,67 @@ msgstr ""
 "No se puede crear una ventana para el nick \"%s\"! Quizás ya existe o eres "
 "tú."
 
-#: src/commandhandler.cpp:397
+#: src/commandhandler.cpp:406
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Se te pide reunirte en el channel %s."
 
-#: src/commandhandler.cpp:410 src/net/ea/gui/partytab.cpp:109
+#: src/commandhandler.cpp:419 src/net/tmwa/gui/partytab.cpp:109
 msgid "Party name is missing."
 msgstr "Falta el nombre del grupo."
 
-#: src/commandhandler.cpp:423 src/commandhandler.cpp:471
-#: src/commandhandler.cpp:493
+#: src/commandhandler.cpp:432 src/commandhandler.cpp:509
+#: src/commandhandler.cpp:531
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:441
+#: src/commandhandler.cpp:450
 msgid "Return toggles chat."
 msgstr "la tecla de retorno alterna el chat"
 
-#: src/commandhandler.cpp:441
+#: src/commandhandler.cpp:450
 msgid "Message closes chat."
 msgstr "El mensaje cierra el chat."
 
-#: src/commandhandler.cpp:450
+#: src/commandhandler.cpp:459
 msgid "Return now toggles chat."
 msgstr "Ahora la tecla de retorno alterna el chat."
 
-#: src/commandhandler.cpp:454
+#: src/commandhandler.cpp:463
 msgid "Message now closes chat."
 msgstr "El mensaje ahora cierra el chat."
 
-#: src/commandhandler.cpp:477
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:489
+msgid "Show IP: On"
+msgstr ""
+
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:485
+msgid "Show IP: Off"
+msgstr ""
+
+#: src/commandhandler.cpp:515
 msgid "Player already ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:484
+#: src/commandhandler.cpp:522
 #, fuzzy
 msgid "Player successfully ignored!"
 msgstr "El grupo se creo con éxito."
 
-#: src/commandhandler.cpp:486
+#: src/commandhandler.cpp:524
 #, fuzzy
 msgid "Player could not be ignored!"
 msgstr "El mensaje privado no se pudo enviar, la persona lo ha ignorado."
 
-#: src/commandhandler.cpp:501
+#: src/commandhandler.cpp:539
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:506
+#: src/commandhandler.cpp:544
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:508
+#: src/commandhandler.cpp:546
 #, fuzzy
 msgid "Player could not be unignored!"
 msgstr "El mensaje privado no se pudo enviar, la persona lo ha ignorado."
@@ -493,43 +508,43 @@ msgstr ""
 msgid "General"
 msgstr "General"
 
-#: src/game.cpp:326
+#: src/game.cpp:342
 #, fuzzy
 msgid "Screenshot saved as "
 msgstr "Captura de pantalla guardada en ~/"
 
-#: src/game.cpp:331
+#: src/game.cpp:347
 msgid "Saving screenshot failed!"
 msgstr "¡No se pudo crear captura de pantalla!"
 
-#: src/game.cpp:355
+#: src/game.cpp:378
 #, fuzzy
 msgid "The connection to the server was lost."
 msgstr "La conexión con el servidor se perdió, se cerrara el programa"
 
-#: src/game.cpp:360
+#: src/game.cpp:382
 msgid "Network Error"
 msgstr "Error de red"
 
-#: src/game.cpp:705
+#: src/game.cpp:721
 msgid "Ignoring incoming trade requests"
 msgstr "Se están ignorando las peticiones de comercio recibidas"
 
-#: src/game.cpp:712
+#: src/game.cpp:726
 msgid "Accepting incoming trade requests"
 msgstr "Se están aceptando las peticiones de comercio"
 
-#: src/game.cpp:946
+#: src/game.cpp:954
 #, fuzzy
 msgid "Could Not Load Map"
 msgstr "No se pudo cargar el mapa"
 
-#: src/game.cpp:947
+#: src/game.cpp:955
 #, c-format
 msgid "Error while loading %s"
 msgstr "Error cargando %s"
 
-#: src/gui/beingpopup.cpp:75
+#: src/gui/beingpopup.cpp:76
 #, fuzzy, c-format
 msgid "Party: %s"
 msgstr "Grupo (%s)"
@@ -538,34 +553,34 @@ msgstr "Grupo (%s)"
 msgid "Buy"
 msgstr "Comprar"
 
-#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
-#: src/gui/sell.cpp:276
+#: src/gui/buy.cpp:69 src/gui/buy.cpp:261 src/gui/sell.cpp:71
+#: src/gui/sell.cpp:288
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Precio: %s / Total: %s"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:99 src/gui/npcdialog.cpp:100
-#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:404
+#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:112 src/gui/npcdialog.cpp:124
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:463
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:98 src/gui/npcdialog.cpp:101
-#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:416
+#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:111 src/gui/npcdialog.cpp:125
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:475
 msgid "-"
 msgstr ""
 
 #: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
-#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:152
-#: src/keyboardconfig.cpp:103
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:228
+#: src/keyboardconfig.cpp:102
 msgid "Quit"
 msgstr "Salir"
 
-#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:333
-#: src/gui/statuswindow.cpp:403 src/gui/statuswindow.cpp:437
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:384
+#: src/gui/statuswindow.cpp:462 src/gui/statuswindow.cpp:496
 msgid "Max"
 msgstr "Máx"
 
@@ -579,11 +594,11 @@ msgstr "Vender"
 
 #: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
 #: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
-#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:101
-#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:178
-#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:402
+#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:114
+#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:389
 #: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
-#: src/gui/socialwindow.cpp:243 src/gui/textdialog.cpp:39
+#: src/gui/socialwindow.cpp:275 src/gui/textdialog.cpp:40
 #: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr "Cancelar"
@@ -622,7 +637,7 @@ msgstr "La nueva dirección de E-mail ya existe"
 msgid "Change Password"
 msgstr "Cambiar Contraseña"
 
-#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:53
+#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:55
 #: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
 msgid "Password:"
 msgstr "Contraseña:"
@@ -654,19 +669,19 @@ msgstr ""
 msgid "Create Character"
 msgstr "Crear Personaje"
 
-#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:52
+#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:54
 #: src/gui/register.cpp:67
 msgid "Name:"
 msgstr "Nombre:"
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
 #: src/gui/outfitwindow.cpp:67
 msgid ">"
 msgstr ""
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
 #: src/gui/outfitwindow.cpp:66
@@ -683,8 +698,8 @@ msgstr "Color de pelo:"
 msgid "Hair style:"
 msgstr "Corte de pelo:"
 
-#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:397
-#: src/gui/socialwindow.cpp:297
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:392
+#: src/gui/socialwindow.cpp:329
 msgid "Create"
 msgstr "Crear"
 
@@ -740,34 +755,34 @@ msgstr "Cancelar Cuenta"
 msgid "Change Email"
 msgstr "Cambiar dirección de correo electrónico"
 
-#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:155
-#: src/gui/setup_players.cpp:230
+#: src/gui/charselectdialog.cpp:336 src/gui/serverdialog.cpp:231
+#: src/gui/setup_players.cpp:229
 msgid "Delete"
 msgstr "Eliminar"
 
-#: src/gui/charselectdialog.cpp:387
+#: src/gui/charselectdialog.cpp:380
 #, fuzzy
 msgid "Choose"
 msgstr "Cerrar"
 
-#: src/gui/charselectdialog.cpp:399 src/gui/charselectdialog.cpp:400
+#: src/gui/charselectdialog.cpp:394 src/gui/charselectdialog.cpp:395
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:77
+#: src/gui/chat.cpp:88
 msgid "Chat"
 msgstr "Chat"
 
-#: src/gui/chat.cpp:287
+#: src/gui/chat.cpp:311
 #, fuzzy, c-format
 msgid "Present: %s; %d players are present."
 msgstr "%d jugadores estan conectados."
 
-#: src/gui/chat.cpp:305
+#: src/gui/chat.cpp:329
 msgid "Attendance written to record log."
 msgstr "Asistencia grabada en el registro"
 
-#: src/gui/chat.cpp:469
+#: src/gui/chat.cpp:493
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Susurrando a %s: %s"
@@ -833,139 +848,170 @@ msgstr "Efectos ambientales"
 msgid "Equipment"
 msgstr "Equipo"
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:78
-#: src/gui/inventorywindow.cpp:80 src/gui/inventorywindow.cpp:291
-#: src/gui/popupmenu.cpp:372
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:89
+#: src/gui/inventorywindow.cpp:337 src/gui/popupmenu.cpp:359
 msgid "Unequip"
 msgstr "quitarselo"
 
-#: src/gui/help.cpp:36
+#: src/gui/help.cpp:37
 msgid "Help"
 msgstr "Ayuda"
 
-#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:74
+#: src/gui/help.cpp:51 src/gui/npcdialog.cpp:50
 msgid "Close"
 msgstr "Cerrar"
 
-#: src/gui/inventorywindow.cpp:57 src/gui/windowmenu.cpp:56
+#: src/gui/inventorywindow.cpp:59 src/gui/windowmenu.cpp:56
 msgid "Inventory"
 msgstr "Inventario"
 
-#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:75
-#: src/gui/inventorywindow.cpp:293 src/gui/popupmenu.cpp:374
+#: src/gui/inventorywindow.cpp:59
+msgid "Storage"
+msgstr "almacenamiento"
+
+#: src/gui/inventorywindow.cpp:82
+msgid "Slots:"
+msgstr "Ranuras:"
+
+#: src/gui/inventorywindow.cpp:87 src/gui/inventorywindow.cpp:100
+#: src/gui/inventorywindow.cpp:339 src/gui/popupmenu.cpp:361
 msgid "Equip"
 msgstr "Equipar"
 
-#: src/gui/inventorywindow.cpp:74 src/gui/inventorywindow.cpp:75
-#: src/gui/inventorywindow.cpp:297 src/gui/popupmenu.cpp:377
+#: src/gui/inventorywindow.cpp:88
 msgid "Use"
 msgstr "Usar"
 
-#: src/gui/inventorywindow.cpp:84 src/gui/inventorywindow.cpp:301
-#: src/gui/popupmenu.cpp:380
+#: src/gui/inventorywindow.cpp:101 src/gui/popupmenu.cpp:364
+msgid "Activate"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:102 src/gui/inventorywindow.cpp:348
+#: src/gui/popupmenu.cpp:367
 #, fuzzy
 msgid "Drop..."
 msgstr "Tirar"
 
-#: src/gui/inventorywindow.cpp:85 src/gui/popupmenu.cpp:386
+#: src/gui/inventorywindow.cpp:103 src/gui/popupmenu.cpp:373
 msgid "Split"
 msgstr "Dividir"
 
-#: src/gui/inventorywindow.cpp:86 src/gui/outfitwindow.cpp:51
+#: src/gui/inventorywindow.cpp:104 src/gui/outfitwindow.cpp:51
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:97 src/gui/storagewindow.cpp:84
-msgid "Slots:"
-msgstr "Ranuras:"
-
-#: src/gui/inventorywindow.cpp:98
+#: src/gui/inventorywindow.cpp:106
 msgid "Weight:"
 msgstr "Peso:"
 
-#: src/gui/inventorywindow.cpp:303 src/gui/popupmenu.cpp:382
+#: src/gui/inventorywindow.cpp:124 src/gui/popupmenu.cpp:378
+msgid "Store"
+msgstr "almacenar"
+
+#: src/gui/inventorywindow.cpp:125 src/gui/popupmenu.cpp:385
+msgid "Retrieve"
+msgstr "recuperar"
+
+#: src/gui/inventorywindow.cpp:350 src/gui/popupmenu.cpp:369
 msgid "Drop"
 msgstr "Tirar"
 
-#: src/gui/itemamount.cpp:100 src/gui/okdialog.cpp:42
-#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:38 src/gui/trade.cpp:73
-#: src/gui/trade.cpp:75
+#: src/gui/itemamount.cpp:113 src/gui/okdialog.cpp:42
+#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:39 src/gui/trade.cpp:72
+#: src/gui/trade.cpp:74
 msgid "OK"
 msgstr "Aceptar"
 
-#: src/gui/itemamount.cpp:102
+#: src/gui/itemamount.cpp:115
 msgid "All"
 msgstr "Todo"
 
-#: src/gui/itemamount.cpp:128
+#: src/gui/itemamount.cpp:141
 msgid "Select amount of items to trade."
 msgstr "Seleccione cantidad de objetos para comerciar."
 
-#: src/gui/itemamount.cpp:131
+#: src/gui/itemamount.cpp:144
 msgid "Select amount of items to drop."
 msgstr "Seleccione la cantidad de objetos para tirar."
 
-#: src/gui/itemamount.cpp:134
+#: src/gui/itemamount.cpp:147
 msgid "Select amount of items to store."
 msgstr "Seleccionar la cantidad de objetos a guardar."
 
-#: src/gui/itemamount.cpp:137
+#: src/gui/itemamount.cpp:150
 msgid "Select amount of items to retrieve."
 msgstr "Seleccionar la cantidad de objetos a recuperar."
 
-#: src/gui/itemamount.cpp:140
+#: src/gui/itemamount.cpp:153
 msgid "Select amount of items to split."
 msgstr "Seleccione objetos para dividir."
 
-#: src/gui/itempopup.cpp:92
+#: src/gui/itempopup.cpp:137
 #, fuzzy, c-format
 msgid "Weight: %s"
 msgstr "Peso: "
 
-#: src/gui/login.cpp:49 src/gui/login.cpp:61
+#: src/gui/login.cpp:51 src/gui/login.cpp:63
 msgid "Login"
 msgstr "Iniciar sesión"
 
-#: src/gui/login.cpp:58
+#: src/gui/login.cpp:60
 #, fuzzy
 msgid "Remember username"
 msgstr "Recordar nombre de usuario"
 
-#: src/gui/login.cpp:59 src/gui/register.cpp:58 src/gui/register.cpp:73
+#: src/gui/login.cpp:61 src/gui/register.cpp:58 src/gui/register.cpp:73
 msgid "Register"
 msgstr "Registrar"
 
-#: src/gui/login.cpp:60
+#: src/gui/login.cpp:62
 #, fuzzy
 msgid "Change Server"
 msgstr "Servidor"
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
+#: src/gui/login.cpp:129
+#, fuzzy
+msgid "Registration disabled"
+msgstr "No se permite compartir objetos"
+
+#: src/gui/login.cpp:129
+msgid "You need to use the website to register an account for this server."
+msgstr ""
+
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:86
 msgid "Map"
 msgstr "Mapa"
 
-#: src/gui/npcdialog.cpp:44
+#: src/gui/ministatus.cpp:235
+msgid "Need"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:48
 msgid "Waiting for server"
 msgstr "Esperando al servidor"
 
-#: src/gui/npcdialog.cpp:45
+#: src/gui/npcdialog.cpp:49
 msgid "Next"
 msgstr "Siguiente"
 
-#: src/gui/npcdialog.cpp:47
+#: src/gui/npcdialog.cpp:51
 msgid "Submit"
 msgstr "Enviar"
 
-#: src/gui/npcdialog.cpp:52 src/gui/npcpostdialog.cpp:41
+#: src/gui/npcdialog.cpp:73 src/gui/npcpostdialog.cpp:41
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:110
+#: src/gui/npcdialog.cpp:118
+msgid "Clear log"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:134
 msgid "Reset"
 msgstr "Reiniciar"
 
 #. TRANSLATORS: Please leave the \n sequences intact.
-#: src/gui/npcdialog.cpp:171
+#: src/gui/npcdialog.cpp:208
 #, fuzzy
 msgid ""
 "\n"
@@ -980,7 +1026,7 @@ msgstr "Para:"
 msgid "Send"
 msgstr "Enviar"
 
-#: src/gui/npcpostdialog.cpp:96
+#: src/gui/npcpostdialog.cpp:99
 msgid "Failed to send as sender or letter invalid."
 msgstr "No se pudo enviar puesto que el destino o la letra son invalidos."
 
@@ -995,99 +1041,86 @@ msgstr ""
 msgid "Unequip first"
 msgstr "quitarselo"
 
-#: src/gui/popupmenu.cpp:84
+#: src/gui/popupmenu.cpp:83
 #, fuzzy, c-format
 msgid "Trade with %s..."
 msgstr "Intercambiar con %s"
 
-#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:161
+#: src/gui/popupmenu.cpp:87 src/gui/popupmenu.cpp:158
 #, fuzzy, c-format
 msgid "Attack %s"
 msgstr "Ataque %+d"
 
-#: src/gui/popupmenu.cpp:92
+#: src/gui/popupmenu.cpp:91
 #, fuzzy, c-format
 msgid "Whisper %s"
 msgstr "Susurro"
 
-#: src/gui/popupmenu.cpp:101
+#: src/gui/popupmenu.cpp:100
 #, fuzzy, c-format
 msgid "Befriend %s"
 msgstr "@@friend|ser amigo de %s@@"
 
-#: src/gui/popupmenu.cpp:106
+#: src/gui/popupmenu.cpp:105
 #, fuzzy, c-format
 msgid "Disregard %s"
 msgstr "desestimado"
 
-#: src/gui/popupmenu.cpp:109
+#: src/gui/popupmenu.cpp:108
 #, fuzzy, c-format
 msgid "Ignore %s"
 msgstr "Ingnorado"
 
-#: src/gui/popupmenu.cpp:115 src/gui/popupmenu.cpp:124
+#: src/gui/popupmenu.cpp:114 src/gui/popupmenu.cpp:123
 #, c-format
 msgid "Unignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:118
+#: src/gui/popupmenu.cpp:117
 #, fuzzy, c-format
 msgid "Completely ignore %s"
 msgstr "@@ignore|ignorar al maximo %s@@"
 
 #: src/gui/popupmenu.cpp:130
-#, c-format
-msgid "Follow %s"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:133
 #, fuzzy, c-format
 msgid "Invite %s to join your guild"
 msgstr "@@guild|Invita a %s a unirse a tu clan@@"
 
-#: src/gui/popupmenu.cpp:137
+#: src/gui/popupmenu.cpp:134
 #, fuzzy, c-format
 msgid "Invite %s to join your party"
 msgstr "@@party|Invita a  %sa unirse a tu grupoy@@"
 
-#: src/gui/popupmenu.cpp:144
+#: src/gui/popupmenu.cpp:141
 #, fuzzy
 msgid "Kick player"
 msgstr "no se le pudo expulsar"
 
-#: src/gui/popupmenu.cpp:153
+#: src/gui/popupmenu.cpp:150
 #, fuzzy, c-format
 msgid "Talk to %s"
 msgstr "@@talk|Hablar a %s@@"
 
-#: src/gui/popupmenu.cpp:166
+#: src/gui/popupmenu.cpp:163
 #, fuzzy
 msgid "Kick monster"
 msgstr "@@admin-kick|expulsar monstruor@@"
 
-#: src/gui/popupmenu.cpp:174
+#: src/gui/popupmenu.cpp:171
 #, fuzzy
 msgid "Add name to chat"
 msgstr "@@name|añadir nombre al chatt@@"
 
-#: src/gui/popupmenu.cpp:191
+#: src/gui/popupmenu.cpp:188
 #, fuzzy, c-format
 msgid "Pick up %s"
 msgstr "recoger"
 
-#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:400
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:387
 #, fuzzy
 msgid "Add to chat"
 msgstr "@@chat|Añadir al chatt@@"
 
-#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:71
-msgid "Store"
-msgstr "almacenar"
-
-#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:72
-msgid "Retrieve"
-msgstr "recuperar"
-
 #: src/gui/quitdialog.cpp:44
 msgid "Switch server"
 msgstr "Cambiar servidor"
@@ -1156,52 +1189,65 @@ msgstr "La contraseña puede tener como máximo %d caracteres."
 msgid "Passwords do not match."
 msgstr "Las contraseñas no coinciden."
 
-#: src/gui/serverdialog.cpp:124
+#: src/gui/serverdialog.cpp:197
 #, fuzzy
 msgid "Choose Your Server"
 msgstr "elige tu servidor"
 
-#: src/gui/serverdialog.cpp:131 src/gui/widgets/chattab.cpp:139
+#: src/gui/serverdialog.cpp:206 src/gui/widgets/chattab.cpp:142
 msgid "Server:"
 msgstr "Servidor:"
 
-#: src/gui/serverdialog.cpp:132
+#: src/gui/serverdialog.cpp:207
 msgid "Port:"
 msgstr "Puerto:"
 
-#: src/gui/serverdialog.cpp:133
+#: src/gui/serverdialog.cpp:208
 #, fuzzy
 msgid "Server type:"
 msgstr "Servidor:"
 
-#: src/gui/serverdialog.cpp:153
+#: src/gui/serverdialog.cpp:229
 #, fuzzy
 msgid "Connect"
 msgstr "Conectando…"
 
-#: src/gui/serverdialog.cpp:154
+#: src/gui/serverdialog.cpp:230
 #, fuzzy
 msgid "Custom Server"
 msgstr "Cursor propio"
 
-#: src/gui/serverdialog.cpp:242
+#: src/gui/serverdialog.cpp:324
 msgid "Please type both the address and the port of a server."
 msgstr "Escriba la dirección y el puerto de un servidor."
 
-#: src/gui/serverdialog.cpp:357
+#: src/gui/serverdialog.cpp:441
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:363
+#: src/gui/serverdialog.cpp:447
 #, fuzzy
 msgid "Waiting for server..."
 msgstr "Esperando al servidor"
 
-#: src/gui/serverdialog.cpp:367
+#: src/gui/serverdialog.cpp:451
 msgid "Preparing download"
 msgstr ""
 
+#: src/gui/serverdialog.cpp:455
+msgid "Error retreiving server list!"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:550
+msgid "requires a newer version"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:552
+#, c-format
+msgid "requires v%s"
+msgstr ""
+
 #: src/gui/setup_audio.cpp:42
 msgid "Sound"
 msgstr "Sonido"
@@ -1235,54 +1281,54 @@ msgstr ""
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:45
+#: src/gui/setup_colors.cpp:46
 msgid "This is what the color looks like"
 msgstr "asi es  como queda el color"
 
-#: src/gui/setup_colors.cpp:50
+#: src/gui/setup_colors.cpp:51
 msgid "Colors"
 msgstr "colores"
 
-#: src/gui/setup_colors.cpp:71
+#: src/gui/setup_colors.cpp:72
 #, fuzzy
 msgid "Type:"
 msgstr "tipo: "
 
-#: src/gui/setup_colors.cpp:82 src/gui/setup_colors.cpp:330
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:331
 msgid "Static"
 msgstr "estatica"
 
-#: src/gui/setup_colors.cpp:84 src/gui/setup_colors.cpp:85
-#: src/gui/setup_colors.cpp:331
+#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
+#: src/gui/setup_colors.cpp:332
 msgid "Pulse"
 msgstr "pulso"
 
-#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:87
-#: src/gui/setup_colors.cpp:332
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
+#: src/gui/setup_colors.cpp:333
 msgid "Rainbow"
 msgstr "arcoiris"
 
-#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
-#: src/gui/setup_colors.cpp:332
+#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
+#: src/gui/setup_colors.cpp:333
 msgid "Spectrum"
 msgstr "espectro"
 
-#: src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:94
 #, fuzzy
 msgid "Delay:"
 msgstr "retraso: "
 
-#: src/gui/setup_colors.cpp:108
+#: src/gui/setup_colors.cpp:109
 #, fuzzy
 msgid "Red:"
 msgstr "rojo: "
 
-#: src/gui/setup_colors.cpp:123
+#: src/gui/setup_colors.cpp:124
 #, fuzzy
 msgid "Green:"
 msgstr "verde: "
 
-#: src/gui/setup_colors.cpp:138
+#: src/gui/setup_colors.cpp:139
 #, fuzzy
 msgid "Blue:"
 msgstr "azul: "
@@ -1340,591 +1386,593 @@ msgstr "Predeterminado"
 msgid "Key Conflict(s) Detected."
 msgstr "conflictos entre teclas detectados"
 
-#: src/gui/setup_players.cpp:57
+#: src/gui/setup_players.cpp:58
 msgid "Name"
 msgstr "Nombre:"
 
-#: src/gui/setup_players.cpp:58
+#: src/gui/setup_players.cpp:59
 msgid "Relation"
 msgstr "Relacion"
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:64
 msgid "Neutral"
 msgstr "Neutral"
 
-#: src/gui/setup_players.cpp:64
+#: src/gui/setup_players.cpp:65
 msgid "Friend"
 msgstr "Amigo"
 
-#: src/gui/setup_players.cpp:65
+#: src/gui/setup_players.cpp:66
 msgid "Disregarded"
 msgstr "desestimado"
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_players.cpp:67
 msgid "Ignored"
 msgstr "Ingnorado"
 
-#: src/gui/setup_players.cpp:208 src/gui/setup_video.cpp:132
+#: src/gui/setup_players.cpp:206 src/gui/setup_video.cpp:153
 msgid "???"
 msgstr "???"
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_players.cpp:225
 msgid "Allow trading"
 msgstr "permitir comercio"
 
-#: src/gui/setup_players.cpp:228
+#: src/gui/setup_players.cpp:227
 msgid "Allow whispers"
 msgstr "permitir susurros"
 
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:231
 msgid "Put all whispers in tabs"
 msgstr "poner susurros en pestañas"
 
-#: src/gui/setup_players.cpp:234
+#: src/gui/setup_players.cpp:233
 #, fuzzy
 msgid "Show gender"
 msgstr "mostrar nombre"
 
-#: src/gui/setup_players.cpp:236
+#: src/gui/setup_players.cpp:235
+#, fuzzy
+msgid "Enable Chat log"
+msgstr "Impossibile vender."
+
+#: src/gui/setup_players.cpp:237
 msgid "Players"
 msgstr "Jugadores"
 
-#: src/gui/setup_players.cpp:261
+#: src/gui/setup_players.cpp:262
 msgid "When ignoring:"
 msgstr "cuando ignorando"
 
-#: src/gui/setup_video.cpp:113
+#: src/gui/setup_video.cpp:134
 msgid "Tiny"
 msgstr "muy pequeño"
 
-#: src/gui/setup_video.cpp:114
+#: src/gui/setup_video.cpp:135
 msgid "Small"
 msgstr "pequeño"
 
-#: src/gui/setup_video.cpp:115
+#: src/gui/setup_video.cpp:136
 msgid "Medium"
 msgstr "mediano"
 
-#: src/gui/setup_video.cpp:116
+#: src/gui/setup_video.cpp:137
 msgid "Large"
 msgstr "grande"
 
-#: src/gui/setup_video.cpp:142
+#: src/gui/setup_video.cpp:163
 msgid "No text"
 msgstr "sin texto"
 
-#: src/gui/setup_video.cpp:143
+#: src/gui/setup_video.cpp:164
 msgid "Text"
 msgstr "Texto"
 
-#: src/gui/setup_video.cpp:144
+#: src/gui/setup_video.cpp:165
 msgid "Bubbles, no names"
 msgstr "burbujas sin nombres"
 
-#: src/gui/setup_video.cpp:145
+#: src/gui/setup_video.cpp:166
 msgid "Bubbles with names"
 msgstr "burbujas con nombres"
 
-#: src/gui/setup_video.cpp:157
+#: src/gui/setup_video.cpp:178
 msgid "off"
 msgstr "desactivado"
 
-#: src/gui/setup_video.cpp:158 src/gui/setup_video.cpp:171
+#: src/gui/setup_video.cpp:179 src/gui/setup_video.cpp:192
 msgid "low"
 msgstr "bajo"
 
-#: src/gui/setup_video.cpp:159 src/gui/setup_video.cpp:173
+#: src/gui/setup_video.cpp:180 src/gui/setup_video.cpp:194
 msgid "high"
 msgstr "alto"
 
-#: src/gui/setup_video.cpp:172
+#: src/gui/setup_video.cpp:193
 msgid "medium"
 msgstr "Medio"
 
-#: src/gui/setup_video.cpp:174
+#: src/gui/setup_video.cpp:195
 msgid "max"
 msgstr "max"
 
-#: src/gui/setup_video.cpp:196
+#: src/gui/setup_video.cpp:217
 msgid "Full screen"
 msgstr "Pantalla completa"
 
-#: src/gui/setup_video.cpp:197
+#: src/gui/setup_video.cpp:218
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:198
+#: src/gui/setup_video.cpp:219
 msgid "Custom cursor"
 msgstr "Cursor propio"
 
-#: src/gui/setup_video.cpp:200
+#: src/gui/setup_video.cpp:221
 msgid "Visible names"
 msgstr "nombres visibles"
 
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:223
 msgid "Particle effects"
 msgstr "efectos de particulas"
 
-#: src/gui/setup_video.cpp:204
+#: src/gui/setup_video.cpp:225
 #, fuzzy
 msgid "Show own name"
 msgstr "mostrar nombre"
 
-#: src/gui/setup_video.cpp:205
+#: src/gui/setup_video.cpp:226
+msgid "Log NPC dialogue"
+msgstr ""
+
+#: src/gui/setup_video.cpp:227
 msgid "Show pickup notification"
 msgstr "mostrar aviso de recogida"
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:207
+#. TRANSLATORS: Refers to "Show pickup notification"
+#: src/gui/setup_video.cpp:229
 msgid "in chat"
 msgstr "en chat"
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:209
+#. TRANSLATORS: Refers to "Show pickup notification"
+#: src/gui/setup_video.cpp:231
 msgid "as particle"
 msgstr "como particula"
 
-#: src/gui/setup_video.cpp:214
+#: src/gui/setup_video.cpp:236
 #, fuzzy
 msgid "FPS limit:"
 msgstr "Límite de FPS:"
 
-#: src/gui/setup_video.cpp:225
+#: src/gui/setup_video.cpp:247
+msgid "Disable transparency (Low CPU mode)"
+msgstr ""
+
+#: src/gui/setup_video.cpp:250
 msgid "Video"
 msgstr "Vídeo"
 
-#: src/gui/setup_video.cpp:227
+#: src/gui/setup_video.cpp:252
 #, fuzzy
-msgid "Show monster damage"
+msgid "Show damage"
 msgstr "mostrar nombre"
 
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:258
 msgid "Overhead text"
 msgstr "texto sobreoido"
 
-#: src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:259
 msgid "Gui opacity"
 msgstr "Transparencia menus"
 
-#: src/gui/setup_video.cpp:235
+#: src/gui/setup_video.cpp:260
 msgid "Ambient FX"
 msgstr "Efectos ambientales"
 
-#: src/gui/setup_video.cpp:236
+#: src/gui/setup_video.cpp:261
 #, fuzzy
 msgid "Particle detail"
 msgstr "detalle particulas"
 
-#: src/gui/setup_video.cpp:237
+#: src/gui/setup_video.cpp:262
 msgid "Font size"
 msgstr "tamaño de letra"
 
-#: src/gui/setup_video.cpp:251 src/gui/setup_video.cpp:454
-#: src/gui/setup_video.cpp:568
+#: src/gui/setup_video.cpp:277 src/gui/setup_video.cpp:532
+#: src/gui/setup_video.cpp:662
 #, fuzzy
 msgid "None"
 msgstr "No"
 
-#: src/gui/setup_video.cpp:381
+#: src/gui/setup_video.cpp:426
 #, fuzzy
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr "el modo y la restauracion del modo anterior fallaron"
 
-#: src/gui/setup_video.cpp:387
+#: src/gui/setup_video.cpp:432
 #, fuzzy
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr "el modo y la restauracion del modo anterior fallaron"
 
-#: src/gui/setup_video.cpp:398
+#: src/gui/setup_video.cpp:443
 #, fuzzy
 msgid "Switching to Full Screen"
 msgstr "Cambiar a pantalla completa"
 
-#: src/gui/setup_video.cpp:399
+#: src/gui/setup_video.cpp:444
 msgid "Restart needed for changes to take effect."
 msgstr "Se necesita reiniciar para aplicar los cambios."
 
-#: src/gui/setup_video.cpp:411
+#: src/gui/setup_video.cpp:458
 #, fuzzy
 msgid "Changing to OpenGL"
 msgstr "Cambiar a OpenGL"
 
-#: src/gui/setup_video.cpp:412
+#: src/gui/setup_video.cpp:459
+msgid ""
+"Applying change to OpenGL requires restart. In case OpenGL messes up your "
+"game graphics, restart the game with the command line option \"--no-opengl\"."
+msgstr ""
+
+#: src/gui/setup_video.cpp:466
+msgid "Deactivating OpenGL"
+msgstr ""
+
+#: src/gui/setup_video.cpp:467
 msgid "Applying change to OpenGL requires restart."
 msgstr "Se necesita reiniciar para aplicar los cambios hechos a OpenGL."
 
-#: src/gui/setup_video.cpp:486 src/gui/setup_video.cpp:491
+#: src/gui/setup_video.cpp:475
+#, fuzzy
+msgid "Transparency disabled"
+msgstr "Compartir experiencia desactivado."
+
+#: src/gui/setup_video.cpp:476 src/gui/setup_video.cpp:484
+msgid "You must restart to apply changes."
+msgstr ""
+
+#: src/gui/setup_video.cpp:483
+msgid "Transparency enabled"
+msgstr ""
+
+#: src/gui/setup_video.cpp:576 src/gui/setup_video.cpp:581
 #, fuzzy
 msgid "Screen Resolution Changed"
 msgstr "se cambio la resolucion de pantalla"
 
-#: src/gui/setup_video.cpp:487 src/gui/setup_video.cpp:492
+#: src/gui/setup_video.cpp:577 src/gui/setup_video.cpp:582
 msgid "Restart your client for the change to take effect."
 msgstr "para que el cambio tenga efecto reinicia el programa"
 
-#: src/gui/setup_video.cpp:489
+#: src/gui/setup_video.cpp:579
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:522
+#: src/gui/setup_video.cpp:612
 #, fuzzy
 msgid "Particle Effect Settings Changed."
 msgstr "efectos de particulas cambiados"
 
-#: src/gui/setup_video.cpp:523
+#: src/gui/setup_video.cpp:613
 msgid "Changes will take effect on map change."
 msgstr "los cambios tienen efecto en cuanto cambies de mapa"
 
-#: src/gui/skilldialog.cpp:198 src/gui/windowmenu.cpp:59
+#: src/gui/skilldialog.cpp:212 src/gui/windowmenu.cpp:59
 msgid "Skills"
 msgstr "Habilidades"
 
-#: src/gui/skilldialog.cpp:209
+#: src/gui/skilldialog.cpp:223
 msgid "Up"
 msgstr "Arriba"
 
-#: src/gui/skilldialog.cpp:263
+#: src/gui/skilldialog.cpp:269
 #, fuzzy, c-format
 msgid "Skill points available: %d"
 msgstr "puntos de habilidad: %d"
 
-#: src/gui/skilldialog.cpp:315
+#: src/gui/skilldialog.cpp:351
 #, fuzzy, c-format
 msgid "Skill Set %d"
 msgstr "puntos de habilidad: %d"
 
-#: src/gui/skilldialog.cpp:324
+#: src/gui/skilldialog.cpp:360
 #, fuzzy, c-format
 msgid "Skill %d"
 msgstr "Habilidades"
 
-#: src/gui/skilldialog.cpp:406
+#: src/gui/skilldialog.cpp:442
 #, fuzzy, c-format
 msgid "Lvl: %d (%+d)"
 msgstr "Nivel: %d"
 
-#: src/gui/skilldialog.cpp:417
+#: src/gui/skilldialog.cpp:453
 #, fuzzy, c-format
 msgid "Lvl: %d"
 msgstr "Nivel: %d"
 
-#: src/gui/socialwindow.cpp:118
+#: src/gui/socialwindow.cpp:126
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:127
+#: src/gui/socialwindow.cpp:139
 #, fuzzy, c-format
 msgid "Guild %s quit requested."
 msgstr "Guild créada."
 
-#: src/gui/socialwindow.cpp:137
+#: src/gui/socialwindow.cpp:153
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:138
+#: src/gui/socialwindow.cpp:154
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:147
+#: src/gui/socialwindow.cpp:163
 #, fuzzy
 msgid "Leave Guild?"
 msgstr "Crear clan"
 
-#: src/gui/socialwindow.cpp:148
+#: src/gui/socialwindow.cpp:164
 #, fuzzy, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "¿Está seguro que desea salir?"
 
-#: src/gui/socialwindow.cpp:183
+#: src/gui/socialwindow.cpp:207 src/net/tmwa/partyhandler.cpp:330
 #, fuzzy, c-format
 msgid "Invited user %s to party."
 msgstr "/party > Invita a un jugador a entrar en tu grupo"
 
-#: src/gui/socialwindow.cpp:190
+#: src/gui/socialwindow.cpp:218
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:200
+#: src/gui/socialwindow.cpp:232
 #, fuzzy
 msgid "Member Invite to Party"
 msgstr "/party > Invita a un jugador a entrar en tu grupo"
 
-#: src/gui/socialwindow.cpp:201
+#: src/gui/socialwindow.cpp:233
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:210
+#: src/gui/socialwindow.cpp:242
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:211
+#: src/gui/socialwindow.cpp:243
 #, fuzzy, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "¿Está seguro que desea salir?"
 
-#: src/gui/socialwindow.cpp:240
+#: src/gui/socialwindow.cpp:272
 msgid "Create Guild"
 msgstr "Crear clan"
 
-#: src/gui/socialwindow.cpp:241 src/gui/socialwindow.cpp:565
+#: src/gui/socialwindow.cpp:273 src/gui/socialwindow.cpp:620
 #, fuzzy
 msgid "Create Party"
 msgstr "Crear Personaje"
 
-#: src/gui/socialwindow.cpp:280 src/gui/windowmenu.cpp:64
+#: src/gui/socialwindow.cpp:312 src/gui/windowmenu.cpp:64
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:298
+#: src/gui/socialwindow.cpp:330
 #, fuzzy
 msgid "Invite"
 msgstr "Invitar a jugador"
 
-#: src/gui/socialwindow.cpp:299
+#: src/gui/socialwindow.cpp:331
 #, fuzzy
 msgid "Leave"
 msgstr "grande"
 
-#: src/gui/socialwindow.cpp:395
+#: src/gui/socialwindow.cpp:443
 #, fuzzy, c-format
 msgid "Accepted party invite from %s."
 msgstr "Invitacion acceptada de %s."
 
-#: src/gui/socialwindow.cpp:401
+#: src/gui/socialwindow.cpp:449
 #, fuzzy, c-format
 msgid "Rejected party invite from %s."
 msgstr "Rechazada la invitacion de %s."
 
-#: src/gui/socialwindow.cpp:414
+#: src/gui/socialwindow.cpp:462
 #, fuzzy, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Invitacion acceptada de %s."
 
-#: src/gui/socialwindow.cpp:420
+#: src/gui/socialwindow.cpp:468
 #, fuzzy, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Rechazada la invitacion de %s."
 
-#: src/gui/socialwindow.cpp:464
+#: src/gui/socialwindow.cpp:497
+msgid "Creating guild failed, please choose a shorter name."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:504
 #, fuzzy, c-format
 msgid "Creating guild called %s."
 msgstr "Eror al crear la guild."
 
-#: src/gui/socialwindow.cpp:478
+#: src/gui/socialwindow.cpp:520
+msgid "Creating party failed, please choose a shorter name."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:527
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:485
+#: src/gui/socialwindow.cpp:541
 #, fuzzy
 msgid "Guild Name"
 msgstr "Clan"
 
-#: src/gui/socialwindow.cpp:486
+#: src/gui/socialwindow.cpp:542
 #, fuzzy
 msgid "Choose your guild's name."
 msgstr "elige tu servidor"
 
-#: src/gui/socialwindow.cpp:498
+#: src/gui/socialwindow.cpp:554
 #, fuzzy
 msgid "Received guild request, but one already exists."
 msgstr "Has recibido una invitation para un grupo, pero uno existe ya."
 
-#: src/gui/socialwindow.cpp:503
+#: src/gui/socialwindow.cpp:559
 #, fuzzy, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s te invita a unirte al grupo %s."
 
-#: src/gui/socialwindow.cpp:508
+#: src/gui/socialwindow.cpp:564
 #, fuzzy
 msgid "Accept Guild Invite"
 msgstr "Aceptar invitaciones a grupos"
 
-#: src/gui/socialwindow.cpp:520
+#: src/gui/socialwindow.cpp:576
 msgid "Received party request, but one already exists."
 msgstr "Has recibido una invitation para un grupo, pero uno existe ya."
 
-#: src/gui/socialwindow.cpp:530
+#: src/gui/socialwindow.cpp:585
 #, fuzzy
 msgid "You have been invited you to join a party."
 msgstr "%s te invita a unirte a su grupo."
 
-#: src/gui/socialwindow.cpp:534
+#: src/gui/socialwindow.cpp:589
 #, fuzzy, c-format
 msgid "You have been invited to join the %s party."
 msgstr "%s te invita a unirte al grupo %s."
 
-#: src/gui/socialwindow.cpp:542
+#: src/gui/socialwindow.cpp:597
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s te invita a unirte a su grupo."
 
-#: src/gui/socialwindow.cpp:547
+#: src/gui/socialwindow.cpp:602
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s te invita a unirte al grupo %s."
 
-#: src/gui/socialwindow.cpp:555
+#: src/gui/socialwindow.cpp:610
 msgid "Accept Party Invite"
 msgstr "Aceptar invitaciones a grupos"
 
-#: src/gui/socialwindow.cpp:566
+#: src/gui/socialwindow.cpp:621
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:571
+#: src/gui/socialwindow.cpp:626
 #, fuzzy
 msgid "Party Name"
 msgstr "Grupo"
 
-#: src/gui/socialwindow.cpp:572
+#: src/gui/socialwindow.cpp:627
 #, fuzzy
 msgid "Choose your party's name."
 msgstr "elige tu servidor"
 
-#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:62
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:62
 msgid "Specials"
 msgstr ""
 
-#: src/gui/specialswindow.cpp:174
-#, c-format
-msgid "Specials Set %d"
-msgstr ""
-
-#: src/gui/specialswindow.cpp:191
-#, c-format
-msgid "Special %d"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:247
+#: src/gui/statuswindow.cpp:113 src/gui/statuswindow.cpp:215
+#: src/gui/statuswindow.cpp:262
 #, c-format
 msgid "Level: %d"
 msgstr "Nivel: %d"
 
-#: src/gui/statuswindow.cpp:101 src/gui/statuswindow.cpp:211
+#: src/gui/statuswindow.cpp:114 src/gui/statuswindow.cpp:208
+#: src/gui/statuswindow.cpp:239
 #, c-format
 msgid "Money: %s"
 msgstr "Dinero: %s"
 
-#: src/gui/statuswindow.cpp:104
+#: src/gui/statuswindow.cpp:117
 msgid "HP:"
 msgstr "PV:"
 
-#: src/gui/statuswindow.cpp:109
+#: src/gui/statuswindow.cpp:122
 msgid "Exp:"
 msgstr "EXP:"
 
-#: src/gui/statuswindow.cpp:114
+#: src/gui/statuswindow.cpp:130
 msgid "MP:"
 msgstr "PM:"
 
-#: src/gui/statuswindow.cpp:132 src/gui/statuswindow.cpp:219
+#: src/gui/statuswindow.cpp:158 src/gui/statuswindow.cpp:275
 #, c-format
 msgid "Job: %d"
 msgstr "trabajo : %d"
 
-#: src/gui/statuswindow.cpp:133
+#: src/gui/statuswindow.cpp:159
 msgid "Job:"
 msgstr "trabajo:"
 
-#: src/gui/statuswindow.cpp:194
-#, fuzzy
-msgid "HP"
-msgstr "PV:"
-
-#: src/gui/statuswindow.cpp:200
-#, fuzzy
-msgid "MP"
-msgstr "PM:"
-
-#: src/gui/statuswindow.cpp:206
-#, fuzzy
-msgid "Exp"
-msgstr "EXP:"
-
-#: src/gui/statuswindow.cpp:215
-#, fuzzy
-msgid "Money"
-msgstr "Dinero: %d"
-
-#: src/gui/statuswindow.cpp:225
-#, fuzzy
-msgid "Job"
-msgstr "trabajo:"
-
-#: src/gui/statuswindow.cpp:229
+#: src/gui/statuswindow.cpp:211 src/gui/statuswindow.cpp:247
 #, fuzzy, c-format
 msgid "Character points: %d"
 msgstr "Estadisticas del personaje OK"
 
-#: src/gui/statuswindow.cpp:235
+#: src/gui/statuswindow.cpp:255
 #, fuzzy, c-format
 msgid "Correction points: %d"
 msgstr "puntos de habilidad: %d"
 
-#: src/gui/statuswindow.cpp:251
-#, fuzzy
-msgid "Level"
-msgstr "Nivel: %d"
-
-#: src/gui/storagewindow.cpp:59
-msgid "Storage"
-msgstr "almacenamiento"
-
-#: src/gui/trade.cpp:52
+#: src/gui/trade.cpp:53
 msgid "Propose trade"
 msgstr "Proponer"
 
-#: src/gui/trade.cpp:53
+#: src/gui/trade.cpp:54
 msgid "Confirmed. Waiting..."
 msgstr "confirmado ... esperando"
 
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:55
 msgid "Agree trade"
 msgstr "aceptar trato"
 
-#: src/gui/trade.cpp:55
+#: src/gui/trade.cpp:56
 msgid "Agreed. Waiting..."
 msgstr "aceptado esperando..."
 
-#: src/gui/trade.cpp:58
+#: src/gui/trade.cpp:59
 msgid "Trade: You"
 msgstr "intercambiar: tu"
 
-#: src/gui/trade.cpp:74 src/gui/trade.cpp:75
+#: src/gui/trade.cpp:73 src/gui/trade.cpp:74
 msgid "Trade"
 msgstr "Comercio"
 
-#: src/gui/trade.cpp:77
+#: src/gui/trade.cpp:76
 msgid "Add"
 msgstr "Añadir"
 
-#: src/gui/trade.cpp:99 src/gui/trade.cpp:135
+#: src/gui/trade.cpp:98 src/gui/trade.cpp:134
 #, fuzzy, c-format
 msgid "You get %s"
 msgstr "tu recibes %s"
 
-#: src/gui/trade.cpp:100
+#: src/gui/trade.cpp:99
 msgid "You give:"
 msgstr "Tu das:"
 
-#: src/gui/trade.cpp:104
+#: src/gui/trade.cpp:103
 msgid "Change"
 msgstr "Modificar"
 
-#: src/gui/trade.cpp:275
+#: src/gui/trade.cpp:262
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "no se pudo añadir objeto: No puedes sobreponer un tipo de objeto en la "
 "ventana"
 
-#: src/gui/trade.cpp:318
+#: src/gui/trade.cpp:304
 msgid "You don't have enough money."
 msgstr "No tienes suficiente dinero."
 
@@ -1945,22 +1993,22 @@ msgstr "Conectando…"
 msgid "Play"
 msgstr "Jugar"
 
-#: src/gui/updatewindow.cpp:405
+#: src/gui/updatewindow.cpp:417
 msgid "##1  The update process is incomplete."
 msgstr "##1 el proceso de actualizacion esta incompleto"
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:407
+#: src/gui/updatewindow.cpp:419
 msgid "##1  It is strongly recommended that"
 msgstr "##1 se recomienda que"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:409
+#: src/gui/updatewindow.cpp:421
 #, fuzzy
 msgid "##1  you try again later."
 msgstr "##1 lo intentes de nuevo mas tarde"
 
-#: src/gui/updatewindow.cpp:501
+#: src/gui/updatewindow.cpp:515
 msgid "Completed"
 msgstr "Terminado"
 
@@ -2042,56 +2090,56 @@ msgstr "necesitas a un usuario para op"
 msgid "Need a user to kick!"
 msgstr "hace falta un usuario para echarle"
 
-#: src/gui/widgets/chattab.cpp:118
+#: src/gui/widgets/chattab.cpp:121
 msgid "Global announcement:"
 msgstr "Anuncio Global"
 
-#: src/gui/widgets/chattab.cpp:124
+#: src/gui/widgets/chattab.cpp:127
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "Anuncio global de %s"
 
-#: src/gui/widgets/chattab.cpp:150
+#: src/gui/widgets/chattab.cpp:153
 #, fuzzy, c-format
 msgid "%s whispers: %s"
 msgstr "%s susurra: "
 
-#: src/gui/widgets/whispertab.cpp:51
+#: src/gui/widgets/whispertab.cpp:53
 msgid "Cannot send empty chat!"
 msgstr "no se pude enviar un chat vacio!!"
 
-#: src/gui/widgets/whispertab.cpp:70
+#: src/gui/widgets/whispertab.cpp:72
 msgid "/ignore > Ignore the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:71
+#: src/gui/widgets/whispertab.cpp:73
 msgid "/unignore > Stop ignoring the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:72
+#: src/gui/widgets/whispertab.cpp:74
 msgid "/close > Close the whisper tab"
 msgstr "/close > Cierra la pestaña de susurros"
 
-#: src/gui/widgets/whispertab.cpp:82
+#: src/gui/widgets/whispertab.cpp:84
 msgid "Command: /close"
 msgstr "Comando: /close"
 
-#: src/gui/widgets/whispertab.cpp:83
+#: src/gui/widgets/whispertab.cpp:85
 msgid "This command closes the current whisper tab."
 msgstr "cierra la pestaña actual"
 
-#: src/gui/widgets/whispertab.cpp:87
+#: src/gui/widgets/whispertab.cpp:89
 #, fuzzy
 msgid "Command: /ignore"
 msgstr "Comando: /item"
 
-#: src/gui/widgets/whispertab.cpp:88
+#: src/gui/widgets/whispertab.cpp:90
 #, fuzzy
 msgid "This command ignores the other player regardless of current relations."
 msgstr ""
 "Este comando muestra el número de jugadores que actualmente están conectados."
 
-#: src/gui/widgets/whispertab.cpp:94
+#: src/gui/widgets/whispertab.cpp:96
 #, fuzzy
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
@@ -2120,646 +2168,1009 @@ msgstr "Modificar"
 msgid "Choose World"
 msgstr "elige tu servidor"
 
-#: src/keyboardconfig.cpp:40
+#: src/keyboardconfig.cpp:39
 msgid "Move Up"
 msgstr "mover arriba"
 
-#: src/keyboardconfig.cpp:41
+#: src/keyboardconfig.cpp:40
 msgid "Move Down"
 msgstr "mover abajo"
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:41
 msgid "Move Left"
 msgstr "mover a la izquierda"
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:42
 msgid "Move Right"
 msgstr "mover a la derecha"
 
-#: src/keyboardconfig.cpp:44 src/net/ea/generalhandler.cpp:223
+#: src/keyboardconfig.cpp:43 src/net/tmwa/generalhandler.cpp:237
 msgid "Attack"
 msgstr "ataque"
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:44
 msgid "Target & Attack"
 msgstr "objetivo y ataque"
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:45
 msgid "Smilie"
 msgstr "emoticono"
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:46
 msgid "Talk"
 msgstr "hablar"
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:47
 msgid "Stop Attack"
 msgstr "dejar de atacar"
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:48
 #, fuzzy
 msgid "Target Monster"
 msgstr "objetivo cercano"
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboardconfig.cpp:49
 msgid "Target NPC"
 msgstr "objetivo PNJ"
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:50
 msgid "Target Player"
 msgstr "objetivo jugador"
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:51
 msgid "Pickup"
 msgstr "recoger"
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:52
 msgid "Hide Windows"
 msgstr "ocultar ventanas"
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:53
 msgid "Sit"
 msgstr "sentarse"
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:54
 msgid "Screenshot"
 msgstr "foto de pantalla"
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:55
 msgid "Enable/Disable Trading"
 msgstr "admitir /bloquear intercambios"
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:56
 msgid "Find Path to Mouse"
 msgstr "encontrar ruta del raton"
 
-#: src/keyboardconfig.cpp:58 src/keyboardconfig.cpp:59
-#: src/keyboardconfig.cpp:60 src/keyboardconfig.cpp:61
-#: src/keyboardconfig.cpp:62 src/keyboardconfig.cpp:63
-#: src/keyboardconfig.cpp:64 src/keyboardconfig.cpp:65
-#: src/keyboardconfig.cpp:66 src/keyboardconfig.cpp:67
-#: src/keyboardconfig.cpp:68 src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:57 src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60
+#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62
+#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64
+#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68
 #, c-format
 msgid "Item Shortcut %d"
 msgstr "atajo al objeto %d"
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:69
 msgid "Help Window"
 msgstr "ventana de ayuda"
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:70
 msgid "Status Window"
 msgstr "ventana de estado"
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:71
 msgid "Inventory Window"
 msgstr "ventana del inventorio"
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:72
 msgid "Equipment Window"
 msgstr "Ventana de equipamiento"
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:73
 msgid "Skill Window"
 msgstr "ventana de habilidades"
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:74
 msgid "Minimap Window"
 msgstr "ventana del minimapa"
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:75
 msgid "Chat Window"
 msgstr "ventana del chat"
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:76
 msgid "Item Shortcut Window"
 msgstr "ventana de atajos a objetos"
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:77
 msgid "Setup Window"
 msgstr "ventana de configuracion"
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:78
 msgid "Debug Window"
 msgstr "ventana de depuracion"
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:79
 #, fuzzy
 msgid "Social Window"
 msgstr "ventana de habilidades"
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:80
 msgid "Emote Shortcut Window"
 msgstr "ventana de atajos a emoticones"
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:81
 #, fuzzy
 msgid "Outfits Window"
 msgstr "ventana de estado"
 
-#: src/keyboardconfig.cpp:83
+#: src/keyboardconfig.cpp:82
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:83
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86
-#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88
-#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90
-#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92
-#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:84 src/keyboardconfig.cpp:85
+#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:87
+#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:89
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:91
+#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:93
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:95
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "atajo a emoticon %d"
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:96
 msgid "Toggle Chat"
 msgstr "cambiar chat"
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:97
 msgid "Scroll Chat Up"
 msgstr "chat arriba"
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:98
 msgid "Scroll Chat Down"
 msgstr "chat abajo"
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:99
 msgid "Previous Chat Tab"
 msgstr "chat anterior"
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:100
 msgid "Next Chat Tab"
 msgstr "chat siguiente"
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:101
 msgid "Select OK"
 msgstr "seleccionar OK"
 
-#: src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:103
 msgid "Ignore input 1"
 msgstr "ignorar entrada 1"
 
-#: src/keyboardconfig.cpp:105
+#: src/keyboardconfig.cpp:104
 msgid "Ignore input 2"
 msgstr "ignorar entrada 2"
 
-#: src/keyboardconfig.cpp:184
+#: src/keyboardconfig.cpp:183
 #, fuzzy, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr "resuelvelo , o el juego puede comportarse de manera extraña"
 
-#: src/localplayer.cpp:914
+#: src/localplayer.cpp:985
 msgid "Unable to pick up item."
 msgstr "Imposible tomar objeto."
 
 #. TRANSLATORS: This sentence may be translated differently
 #. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:923
+#: src/localplayer.cpp:994
 #, fuzzy, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "Ha recogido un(a) %s [@@%d|%s@@]."
 msgstr[1] "Ha recogido un(a) %s [@@%d|%s@@]."
 
-#: src/main.cpp:43
+#: src/main.cpp:42
 msgid "mana [options] [mana-file]"
 msgstr ""
 
+#: src/main.cpp:43
+msgid "[mana-file] : The mana file is an XML file (.mana)"
+msgstr ""
+
 #: src/main.cpp:44
+msgid "              used to set custom parameters"
+msgstr ""
+
+#: src/main.cpp:45
+msgid "              to the mana client."
+msgstr ""
+
+#: src/main.cpp:47
 msgid "Options:"
 msgstr "Opciones:"
 
-#: src/main.cpp:45
+#: src/main.cpp:48
 #, fuzzy
 msgid "  -v --version        : Display the version"
 msgstr "  -v --version : muestra la version"
 
-#: src/main.cpp:46
+#: src/main.cpp:49
 #, fuzzy
 msgid "  -h --help           : Display this help"
 msgstr "  -h --help : muestra esta ayuda"
 
-#: src/main.cpp:47
+#: src/main.cpp:50
 #, fuzzy
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr "  -C --config-file : archivo de configuracion a usar"
 
-#: src/main.cpp:48
+#: src/main.cpp:51
 #, fuzzy
 msgid "  -U --username       : Login with this username"
 msgstr "  -U --username : conectarse con este nombre se usuario"
 
-#: src/main.cpp:49
+#: src/main.cpp:52
 #, fuzzy
 msgid "  -P --password       : Login with this password"
 msgstr "  -P --password : entrar con esta contraseña"
 
-#: src/main.cpp:50
+#: src/main.cpp:53
 #, fuzzy
 msgid "  -c --character      : Login with this character"
 msgstr "  -c --character : conectarse con este personaje"
 
-#: src/main.cpp:51
+#: src/main.cpp:54
 #, fuzzy
 msgid "  -s --server         : Login server name or IP"
 msgstr "  -s --server : nombre o IP del servidor de conexion"
 
-#: src/main.cpp:52
+#: src/main.cpp:55
 #, fuzzy
 msgid "  -p --port           : Login server port"
 msgstr "  -p --port : Puerto del Servidor de conexion"
 
-#: src/main.cpp:53
+#: src/main.cpp:56
 #, fuzzy
 msgid "     --update-host    : Use this update host"
 msgstr "  -H --update-host : Usar este servidor de actualizaciones"
 
-#: src/main.cpp:54
+#: src/main.cpp:57
 #, fuzzy
 msgid "  -D --default        : Choose default character server and character"
 msgstr "  -D --default : elige un servidor y personaje por defecto"
 
-#: src/main.cpp:56
+#: src/main.cpp:59
 #, fuzzy
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr "  -u --skip-update : saltarse bajar las actualizaciones"
 
-#: src/main.cpp:57
+#: src/main.cpp:60
 #, fuzzy
 msgid "  -d --data           : Directory to load game data from"
 msgstr "  -d --data : Directorio para cargar archivos del juego"
 
-#: src/main.cpp:58
+#: src/main.cpp:61
 #, fuzzy
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
+msgid "     --localdata-dir  : Directory to use as local data directory"
 msgstr "  -S --home-dir : Directorio a usar como directorio raiz"
 
-#: src/main.cpp:59
+#: src/main.cpp:62
+#, fuzzy
+msgid "     --chat-log-dir   : Chat log dir to use"
+msgstr "  -C --config-file : archivo de configuracion a usar"
+
+#: src/main.cpp:63
 #, fuzzy
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr "  -S --home-dir : Directorio a usar como directorio raiz"
 
-#: src/main.cpp:61
+#: src/main.cpp:65
 #, fuzzy
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr "  -O --no-opengl : des habilitar OpenGl para esta sesion"
 
-#: src/net/ea/adminhandler.cpp:63
+#: src/net/manaserv/beinghandler.cpp:303 src/net/tmwa/playerhandler.cpp:94
+msgid "You are dead."
+msgstr "Estás muerto."
+
+#: src/net/manaserv/beinghandler.cpp:304 src/net/tmwa/playerhandler.cpp:95
+msgid "We regret to inform you that your character was killed in battle."
+msgstr "Sentimos informarte de que tu personaje ha muerto en batalla."
+
+#: src/net/manaserv/beinghandler.cpp:306 src/net/tmwa/playerhandler.cpp:97
+msgid "You are not that alive anymore."
+msgstr "Te quedaste sin vida."
+
+#: src/net/manaserv/beinghandler.cpp:307 src/net/tmwa/playerhandler.cpp:98
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr "Las manos heladas de la muerte se llevaron tu alma."
+
+#: src/net/manaserv/beinghandler.cpp:308 src/net/tmwa/playerhandler.cpp:99
+msgid "Game Over!"
+msgstr "¡Fin del juego!"
+
+#: src/net/manaserv/beinghandler.cpp:309 src/net/tmwa/playerhandler.cpp:101
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+"No, niños. Tu personaje no murió realmente. Él... eeh... se marchó a un "
+"lugar mejor."
+
+#: src/net/manaserv/beinghandler.cpp:311 src/net/tmwa/playerhandler.cpp:103
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr ""
+"Falló tu plan de romper el arma de tus enemigos golpeándola con tu garganta."
+
+#: src/net/manaserv/beinghandler.cpp:313 src/net/tmwa/playerhandler.cpp:105
+msgid "I guess this did not run too well."
+msgstr "Creo que esto no funcionó muy bien."
+
+#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:107
+msgid "Do you want your possessions identified?"
+msgstr "¿Quieres que tus posesiones sean identificadas?"
+
+#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:109
+msgid "Sadly, no trace of you was ever found..."
+msgstr "Lamentablemente, ningún rastro tuyo fue encontrado nunca."
+
+#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:111
+msgid "Annihilated."
+msgstr "Aniquilado."
+
+#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:113
+msgid "Looks like you got your head handed to you."
+msgstr "Parce que te volaron la cabeza."
+
+#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:115
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr ""
+"Ya la has cagado otra vez, pon en tierra ese cuerpo por ahi en los tuneles y "
+"cogete otro."
+
+#: src/net/manaserv/beinghandler.cpp:323
+#, fuzzy
+msgid "Press OK to respawn."
+msgstr " Pulsa OK para volver a la vida"
+
+#: src/net/manaserv/beinghandler.cpp:324
+#, fuzzy
+msgid "You Died"
+msgstr "Has muerto"
+
+#: src/net/manaserv/charhandler.cpp:138 src/net/manaserv/charhandler.cpp:209
+#, fuzzy
+msgid "Not logged in."
+msgstr "Ya estas conectado"
+
+#: src/net/manaserv/charhandler.cpp:141
+msgid "No empty slot."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:144
+msgid "Invalid name."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:147
+#, fuzzy
+msgid "Character's name already exists."
+msgstr "El nombre de usuario ya existe"
+
+#: src/net/manaserv/charhandler.cpp:150
+msgid "Invalid hairstyle."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:153
+msgid "Invalid hair color."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:156
+msgid "Invalid gender."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:159
+#, fuzzy
+msgid "Character's stats are too high."
+msgstr "Estadisticas del personaje OK"
+
+#: src/net/manaserv/charhandler.cpp:162
+#, fuzzy
+msgid "Character's stats are too low."
+msgstr "Estadisticas del personaje OK"
+
+#: src/net/manaserv/charhandler.cpp:165
+#, c-format
+msgid "At least one statis out of the permitted range: (%u - %u)."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:171 src/net/manaserv/loginhandler.cpp:96
+#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
+#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
+#: src/net/tmwa/loginhandler.cpp:95 src/net/tmwa/loginhandler.cpp:182
+#, fuzzy
+msgid "Unknown error."
+msgstr "Error desconocido."
+
+#: src/net/manaserv/charhandler.cpp:200 src/net/tmwa/charserverhandler.cpp:146
+msgid "Info"
+msgstr "informacion"
+
+#: src/net/manaserv/charhandler.cpp:200
+#, fuzzy
+msgid "Player deleted."
+msgstr "personaje borrado"
+
+#: src/net/manaserv/charhandler.cpp:212
+#, fuzzy
+msgid "Selection out of range."
+msgstr "Seleccione cantidad de objetos para comerciar."
+
+#: src/net/manaserv/charhandler.cpp:215
+#, fuzzy, c-format
+msgid "Unknown error (%d)."
+msgstr "Error desconocido."
+
+#: src/net/manaserv/charhandler.cpp:250
+msgid "No gameservers are available."
+msgstr "No hay servidores de juego disponibles."
+
+#: src/net/manaserv/chathandler.cpp:187 src/net/manaserv/chathandler.cpp:313
+#: src/net/manaserv/guildhandler.cpp:260
+#, c-format
+msgid "Topic: %s"
+msgstr "Tema: %s"
+
+#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:274
+#, fuzzy
+msgid "Players in this channel:"
+msgstr "Jugador golpea al monstruo"
+
+#: src/net/manaserv/chathandler.cpp:208
+#, fuzzy
+msgid "Error joining channel."
+msgstr "Comando: /join <canal>"
+
+#: src/net/manaserv/chathandler.cpp:214
+#, fuzzy
+msgid "Listing channels."
+msgstr "Se te pide reunirte en el channel %s."
+
+#: src/net/manaserv/chathandler.cpp:226
+msgid "End of channel list."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:303
+#, fuzzy, c-format
+msgid "%s entered the channel."
+msgstr "%s se ha unido al grupo."
+
+#: src/net/manaserv/chathandler.cpp:308
+#, c-format
+msgid "%s left the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:324
+#, c-format
+msgid "%s has set mode %s on user %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:334
+#, c-format
+msgid "%s has kicked %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:339
+#, fuzzy
+msgid "Unknown channel event."
+msgstr "Comando desconocido."
+
+#: src/net/manaserv/guildhandler.cpp:82
+msgid "Guild created."
+msgstr "Guild créada."
+
+#: src/net/manaserv/guildhandler.cpp:87
+msgid "Error creating guild."
+msgstr "Eror al crear la guild."
+
+#: src/net/manaserv/guildhandler.cpp:97
+msgid "Invite sent."
+msgstr "Invitacion enviada."
+
+#: src/net/manaserv/guildhandler.cpp:204
+msgid "Member was promoted successfully."
+msgstr "El miembro ha sido promovido con exito."
+
+#: src/net/manaserv/guildhandler.cpp:209
+msgid "Failed to promote member."
+msgstr "Fallo al promover el miembro."
+
+#: src/net/manaserv/loginhandler.cpp:87
+#, fuzzy
+msgid "Wrong magic_token."
+msgstr "Ficha de magia erronea"
+
+#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
+#, fuzzy
+msgid "Already logged in."
+msgstr "Ya estas conectado"
+
+#: src/net/manaserv/loginhandler.cpp:93
+#, fuzzy
+msgid "Account banned."
+msgstr "Cuenta expirada."
+
+#: src/net/manaserv/loginhandler.cpp:118
+#, fuzzy
+msgid "New password incorrect."
+msgstr "La nueva contraseña es incorrecta"
+
+#: src/net/manaserv/loginhandler.cpp:121 src/net/tmwa/loginhandler.cpp:89
+#, fuzzy
+msgid "Old password incorrect."
+msgstr "La contraseña antigua es incorrecta"
+
+#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
+msgid "Account not connected. Please login first."
+msgstr "Cuenta no conectada. Conectate primero"
+
+#: src/net/manaserv/loginhandler.cpp:149
+#, fuzzy
+msgid "New email address incorrect."
+msgstr "La nueva dirección de E-mail es incorrecta"
+
+#: src/net/manaserv/loginhandler.cpp:152
+#, fuzzy
+msgid "Old email address incorrect."
+msgstr "La antigua dirección de E-mail es incorrecta"
+
+#: src/net/manaserv/loginhandler.cpp:158
+#, fuzzy
+msgid "The new email address already exists."
+msgstr "La nueva dirección de E-mail ya existe"
+
+#: src/net/manaserv/loginhandler.cpp:239
+msgid ""
+"Client registration is not allowed. Please contact server administration."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
+#, fuzzy
+msgid "Client version is too old."
+msgstr "La version de tu cliente es demasiado antigua"
+
+#: src/net/manaserv/loginhandler.cpp:266
+#, fuzzy
+msgid "Wrong username or password."
+msgstr "Nombre de usuario o contraseña incorrectos"
+
+#: src/net/manaserv/loginhandler.cpp:272
+#, fuzzy
+msgid "Account banned"
+msgstr "Cuenta expirada."
+
+#: src/net/manaserv/loginhandler.cpp:275
+msgid "Login attempt too soon after previous attempt."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:303
+#, fuzzy
+msgid "Wrong username, password or email address."
+msgstr "Nombre de usuario, contraseña o dirección de email incorrectos"
+
+#: src/net/manaserv/loginhandler.cpp:306
+#, fuzzy
+msgid "Username already exists."
+msgstr "El nombre de usuario ya existe"
+
+#: src/net/manaserv/loginhandler.cpp:309
+#, fuzzy
+msgid "Email address already exists."
+msgstr "La dirección de email ya existe"
+
+#: src/net/manaserv/loginhandler.cpp:312
+msgid "You took too long with the captcha or your response was incorrect."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:87
+msgid "Joined party."
+msgstr "Unido al grupo."
+
+#: src/net/manaserv/partyhandler.cpp:105
+#, c-format
+msgid "%s joined the party."
+msgstr "%s se ha unido al grupo."
+
+#: src/net/manaserv/partyhandler.cpp:123
+#, fuzzy, c-format
+msgid "%s rejected your invite."
+msgstr "%s rechazó tu invitación."
+
+#: src/net/manaserv/tradehandler.cpp:95
+msgid "Accepting incoming trade requests."
+msgstr "Se aceptan peticiones de intercambio."
+
+#: src/net/manaserv/tradehandler.cpp:97
+msgid "Ignoring incoming trade requests."
+msgstr "Se ignoran peticiones de intercambio."
+
+#: src/net/manaserv/tradehandler.cpp:115 src/net/tmwa/tradehandler.cpp:109
+msgid "Request for Trade"
+msgstr "Solicitud de intercambio"
+
+#: src/net/manaserv/tradehandler.cpp:116 src/net/tmwa/tradehandler.cpp:110
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
+msgstr "%s desea realizar un intercambio con usted, acepta?"
+
+#: src/net/manaserv/tradehandler.cpp:134
+#, c-format
+msgid "Trading with %s"
+msgstr "Intercambiar con %s"
+
+#: src/net/manaserv/tradehandler.cpp:148 src/net/tmwa/tradehandler.cpp:224
+msgid "Trade canceled."
+msgstr "Comercio cancelado."
+
+#: src/net/manaserv/tradehandler.cpp:155 src/net/tmwa/tradehandler.cpp:231
+msgid "Trade completed."
+msgstr "Comercio completado."
+
+#: src/net/tmwa/adminhandler.cpp:64
 msgid "Kick failed!"
 msgstr "no se le pudo expulsar"
 
-#: src/net/ea/adminhandler.cpp:65
+#: src/net/tmwa/adminhandler.cpp:66
 msgid "Kick succeeded!"
 msgstr "se le expulso"
 
-#: src/net/ea/buysellhandler.cpp:110
+#: src/net/tmwa/buysellhandler.cpp:109
 msgid "Nothing to sell."
 msgstr "Nada para vender."
 
-#: src/net/ea/buysellhandler.cpp:117
+#: src/net/tmwa/buysellhandler.cpp:116
 msgid "Thanks for buying."
 msgstr "Gracias por comprar."
 
-#: src/net/ea/buysellhandler.cpp:124
+#: src/net/tmwa/buysellhandler.cpp:123
 msgid "Unable to buy."
 msgstr "Imposible comprar."
 
-#: src/net/ea/buysellhandler.cpp:130
+#: src/net/tmwa/buysellhandler.cpp:129
 msgid "Thanks for selling."
 msgstr "Gravias por vender."
 
-#: src/net/ea/buysellhandler.cpp:132
+#: src/net/tmwa/buysellhandler.cpp:131
 msgid "Unable to sell."
 msgstr "Impossibile vender."
 
-#: src/net/ea/charserverhandler.cpp:103
-#, fuzzy
-msgid "Access denied."
-msgstr "acceso denegado"
+#: src/net/tmwa/charserverhandler.cpp:103
+msgid "Access denied. Most likely, there are too many players on this server."
+msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:106
+#: src/net/tmwa/charserverhandler.cpp:107
 #, fuzzy
 msgid "Cannot use this ID."
 msgstr "no se pude usar esta ID"
 
-#: src/net/ea/charserverhandler.cpp:109
+#: src/net/tmwa/charserverhandler.cpp:110
 #, fuzzy
-msgid "Unknown failure to select character."
-msgstr "fallo desconocido al seleccionar personaje"
+msgid "Unknown char-server failure."
+msgstr "Error desconocido."
 
-#: src/net/ea/charserverhandler.cpp:135
+#: src/net/tmwa/charserverhandler.cpp:134
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr "no se pudo crear personaje. probablemente el nombre este cogido"
 
-#: src/net/ea/charserverhandler.cpp:147 src/net/manaserv/charhandler.cpp:187
-msgid "Info"
-msgstr "informacion"
-
-#: src/net/ea/charserverhandler.cpp:147
+#: src/net/tmwa/charserverhandler.cpp:146
 msgid "Character deleted."
 msgstr "Personaje suprimido."
 
-#: src/net/ea/charserverhandler.cpp:152
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Failed to delete character."
 msgstr "no se pudo borrar personaje"
 
-#: src/net/ea/charserverhandler.cpp:237 src/net/manaserv/charhandler.cpp:263
+#: src/net/tmwa/charserverhandler.cpp:266
 msgid "Strength:"
 msgstr "Fuerza:"
 
-#: src/net/ea/charserverhandler.cpp:238 src/net/manaserv/charhandler.cpp:264
+#: src/net/tmwa/charserverhandler.cpp:267
 msgid "Agility:"
 msgstr "Agilidad:"
 
-#: src/net/ea/charserverhandler.cpp:239 src/net/manaserv/charhandler.cpp:266
+#: src/net/tmwa/charserverhandler.cpp:268
 msgid "Vitality:"
 msgstr "Vitalidad:"
 
-#: src/net/ea/charserverhandler.cpp:240 src/net/manaserv/charhandler.cpp:267
+#: src/net/tmwa/charserverhandler.cpp:269
 msgid "Intelligence:"
 msgstr "Inteligencia:"
 
-#: src/net/ea/charserverhandler.cpp:241 src/net/manaserv/charhandler.cpp:265
+#: src/net/tmwa/charserverhandler.cpp:270
 msgid "Dexterity:"
 msgstr "Destreza:"
 
-#: src/net/ea/charserverhandler.cpp:242
+#: src/net/tmwa/charserverhandler.cpp:271
 msgid "Luck:"
 msgstr "suerte:"
 
-#: src/net/ea/chathandler.cpp:80
-msgid "Whisper could not be sent, user is offline."
+#: src/net/tmwa/chathandler.cpp:87
+#, fuzzy, c-format
+msgid "Whisper could not be sent, %s is offline."
 msgstr "El mensaje privado no se pudo enviar, la persona no esta conectada."
 
-#: src/net/ea/chathandler.cpp:84
-msgid "Whisper could not be sent, ignored by user."
+#: src/net/tmwa/chathandler.cpp:96
+#, fuzzy, c-format
+msgid "Whisper could not be sent, ignored by %s."
 msgstr "El mensaje privado no se pudo enviar, la persona lo ha ignorado."
 
-#: src/net/ea/chathandler.cpp:171
+#: src/net/tmwa/chathandler.cpp:230
 #, fuzzy
 msgid "MVP player."
 msgstr "Jugador"
 
-#: src/net/ea/chathandler.cpp:204 src/net/ea/chathandler.cpp:210
-#: src/net/ea/chathandler.cpp:215 src/net/ea/chathandler.cpp:220
-#: src/net/ea/chathandler.cpp:225 src/net/ea/chathandler.cpp:230
-#: src/net/ea/chathandler.cpp:235 src/net/ea/chathandler.cpp:240
+#: src/net/tmwa/chathandler.cpp:265 src/net/tmwa/chathandler.cpp:271
+#: src/net/tmwa/chathandler.cpp:276 src/net/tmwa/chathandler.cpp:281
+#: src/net/tmwa/chathandler.cpp:286 src/net/tmwa/chathandler.cpp:291
+#: src/net/tmwa/chathandler.cpp:296 src/net/tmwa/chathandler.cpp:301
 msgid "Channels are not supported!"
 msgstr "no se soportan canales!!"
 
-#: src/net/ea/gamehandler.cpp:86
+#: src/net/tmwa/gamehandler.cpp:88
 #, c-format
 msgid "Online users: %d"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:100
+#: src/net/tmwa/gamehandler.cpp:101
 #, fuzzy
 msgid "Game"
 msgstr "Nombre:"
 
-#: src/net/ea/gamehandler.cpp:100
+#: src/net/tmwa/gamehandler.cpp:101
 #, fuzzy
 msgid "Request to quit denied!"
 msgstr "Solicitud de intercambio"
 
-#: src/net/ea/generalhandler.cpp:102 src/net/manaserv/generalhandler.cpp:95
+#: src/net/tmwa/generalhandler.cpp:102
 #, c-format
 msgid "Strength %+d"
 msgstr "fuerza %+d"
 
-#: src/net/ea/generalhandler.cpp:103 src/net/manaserv/generalhandler.cpp:96
+#: src/net/tmwa/generalhandler.cpp:103
 #, c-format
 msgid "Agility %+d"
 msgstr "agilidad %+d"
 
-#: src/net/ea/generalhandler.cpp:104 src/net/manaserv/generalhandler.cpp:98
+#: src/net/tmwa/generalhandler.cpp:104
 #, c-format
 msgid "Vitality %+d"
 msgstr "vitalidad %+d"
 
-#: src/net/ea/generalhandler.cpp:105 src/net/manaserv/generalhandler.cpp:99
+#: src/net/tmwa/generalhandler.cpp:105
 #, c-format
 msgid "Intelligence %+d"
 msgstr "inteligencia %+d"
 
-#: src/net/ea/generalhandler.cpp:106 src/net/manaserv/generalhandler.cpp:97
+#: src/net/tmwa/generalhandler.cpp:106
 #, c-format
 msgid "Dexterity %+d"
 msgstr "Destreza %+d"
 
-#: src/net/ea/generalhandler.cpp:107
+#: src/net/tmwa/generalhandler.cpp:107
 #, c-format
 msgid "Luck %+d"
 msgstr "suerte %+d"
 
-#: src/net/ea/generalhandler.cpp:130
+#: src/net/tmwa/generalhandler.cpp:132
 #, fuzzy
 msgid "Authentication failed."
 msgstr "autenticacion fallida"
 
-#: src/net/ea/generalhandler.cpp:133
+#: src/net/tmwa/generalhandler.cpp:135
 #, fuzzy
 msgid "No servers available."
 msgstr "no hay servidores disponibles"
 
-#: src/net/ea/generalhandler.cpp:137
+#: src/net/tmwa/generalhandler.cpp:139
 #, fuzzy
 msgid "Someone else is trying to use this account."
 msgstr "alguien mas esta tratando de usar esta cuenta"
 
-#: src/net/ea/generalhandler.cpp:140
+#: src/net/tmwa/generalhandler.cpp:142
 #, fuzzy
 msgid "This account is already logged in."
 msgstr "esta cuenta ya esta conectada"
 
-#: src/net/ea/generalhandler.cpp:143
+#: src/net/tmwa/generalhandler.cpp:145
 #, fuzzy
 msgid "Speed hack detected."
 msgstr "se detecto hack de velocidad"
 
-#: src/net/ea/generalhandler.cpp:146
+#: src/net/tmwa/generalhandler.cpp:148
 #, fuzzy
 msgid "Duplicated login."
 msgstr "conexion duplicada"
 
-#: src/net/ea/generalhandler.cpp:149
+#: src/net/tmwa/generalhandler.cpp:151
 #, fuzzy
 msgid "Unknown connection error."
 msgstr "error de conexion desconocido"
 
-#: src/net/ea/generalhandler.cpp:205
+#: src/net/tmwa/generalhandler.cpp:209
 msgid "Got disconnected from server!"
 msgstr "fuiste desconectado del servidor!!"
 
-#: src/net/ea/generalhandler.cpp:216 src/net/manaserv/generalhandler.cpp:166
+#: src/net/tmwa/generalhandler.cpp:230
 msgid "Strength"
 msgstr "Fuerza"
 
-#: src/net/ea/generalhandler.cpp:217 src/net/manaserv/generalhandler.cpp:167
+#: src/net/tmwa/generalhandler.cpp:231
 msgid "Agility"
 msgstr "agilidad2"
 
-#: src/net/ea/generalhandler.cpp:218 src/net/manaserv/generalhandler.cpp:169
+#: src/net/tmwa/generalhandler.cpp:232
 msgid "Vitality"
 msgstr "vitalidad"
 
-#: src/net/ea/generalhandler.cpp:219 src/net/manaserv/generalhandler.cpp:170
+#: src/net/tmwa/generalhandler.cpp:233
 msgid "Intelligence"
 msgstr "inteligencia"
 
-#: src/net/ea/generalhandler.cpp:220 src/net/manaserv/generalhandler.cpp:168
+#: src/net/tmwa/generalhandler.cpp:234
 msgid "Dexterity"
 msgstr "Destreza"
 
-#: src/net/ea/generalhandler.cpp:221
+#: src/net/tmwa/generalhandler.cpp:235
 msgid "Luck"
 msgstr "Suerte"
 
-#: src/net/ea/generalhandler.cpp:224
+#: src/net/tmwa/generalhandler.cpp:238
 #, fuzzy
 msgid "Defense"
 msgstr "defensa"
 
-#: src/net/ea/generalhandler.cpp:225
+#: src/net/tmwa/generalhandler.cpp:239
 #, fuzzy
 msgid "M.Attack"
 msgstr "ataque magico"
 
-#: src/net/ea/generalhandler.cpp:226
+#: src/net/tmwa/generalhandler.cpp:240
 #, fuzzy
 msgid "M.Defense"
 msgstr "defensa magica"
 
-#: src/net/ea/generalhandler.cpp:227
+#: src/net/tmwa/generalhandler.cpp:241
 #, fuzzy, c-format
 msgid "% Accuracy"
 msgstr "% AcPunteria"
 
-#: src/net/ea/generalhandler.cpp:228
+#: src/net/tmwa/generalhandler.cpp:242
 #, fuzzy, c-format
 msgid "% Evade"
 msgstr "% agilidad"
 
-#: src/net/ea/generalhandler.cpp:229
+#: src/net/tmwa/generalhandler.cpp:243
 #, fuzzy, c-format
 msgid "% Critical"
 msgstr "Golpe Critico"
 
-#: src/net/ea/gui/guildtab.cpp:45
+#: src/net/tmwa/gui/guildtab.cpp:45
 msgid "Guild"
 msgstr "Clan"
 
-#: src/net/ea/gui/guildtab.cpp:61 src/net/ea/gui/partytab.cpp:59
+#: src/net/tmwa/gui/guildtab.cpp:61 src/net/tmwa/gui/partytab.cpp:59
 msgid "/help > Display this help."
 msgstr "/help > Mostrar la ayuda"
 
-#: src/net/ea/gui/guildtab.cpp:62
+#: src/net/tmwa/gui/guildtab.cpp:62
 #, fuzzy
 msgid "/invite > Invite a player to your guild"
 msgstr "/invite > Invitar a un jugador a tu grupo"
 
-#: src/net/ea/gui/guildtab.cpp:63
+#: src/net/tmwa/gui/guildtab.cpp:63
 #, fuzzy
 msgid "/leave > Leave the guild you are in"
 msgstr "/leave > abandonar tu grupo"
 
-#: src/net/ea/gui/guildtab.cpp:64
+#: src/net/tmwa/gui/guildtab.cpp:64
 #, fuzzy
 msgid "/kick > Kick some one from the guild you are in"
 msgstr "/kick > expulsar a alguien de tu grupo"
 
-#: src/net/ea/gui/guildtab.cpp:73 src/net/ea/gui/partytab.cpp:73
+#: src/net/tmwa/gui/guildtab.cpp:73 src/net/tmwa/gui/partytab.cpp:73
 msgid "Command: /invite <nick>"
 msgstr "Command: /invite <nick>"
 
-#: src/net/ea/gui/guildtab.cpp:74
+#: src/net/tmwa/gui/guildtab.cpp:74
 #, fuzzy
 msgid "This command invites <nick> to the guild you're in."
 msgstr "Este comando invita a <apodo> a un grupo contigo"
 
-#: src/net/ea/gui/guildtab.cpp:80 src/net/ea/gui/partytab.cpp:80
+#: src/net/tmwa/gui/guildtab.cpp:80 src/net/tmwa/gui/partytab.cpp:80
 msgid "Command: /leave"
 msgstr "Command: /leave"
 
-#: src/net/ea/gui/guildtab.cpp:81
+#: src/net/tmwa/gui/guildtab.cpp:81
 #, fuzzy
 msgid "This command causes the player to leave the guild."
 msgstr "Este comando hace que el jugador deje el grupo."
 
-#: src/net/ea/gui/guildtab.cpp:89
+#: src/net/tmwa/gui/guildtab.cpp:89
 #, fuzzy
 msgid "Guild name is missing."
 msgstr "Falta el nombre del grupo."
 
-#: src/net/ea/guildhandler.cpp:293
+#: src/net/tmwa/guildhandler.cpp:296
 msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:298
+#: src/net/tmwa/guildhandler.cpp:301
 msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:303
+#: src/net/tmwa/guildhandler.cpp:306
 #, fuzzy
 msgid "User is now part of your guild."
 msgstr "%s es ahora miembro de tu grupo."
 
-#: src/net/ea/guildhandler.cpp:308
+#: src/net/tmwa/guildhandler.cpp:311
 msgid "Your guild is full."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:313
+#: src/net/tmwa/guildhandler.cpp:316
 #, fuzzy
 msgid "Unknown guild invite response."
 msgstr "Respuesta a invitacion desconocida para %s."
 
-#: src/net/ea/guildhandler.cpp:390
+#: src/net/tmwa/guildhandler.cpp:393
 msgid "Guild creation isn't supported yet."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:43
+#: src/net/tmwa/gui/partytab.cpp:43
 msgid "Party"
 msgstr "Grupo"
 
-#: src/net/ea/gui/partytab.cpp:60
+#: src/net/tmwa/gui/partytab.cpp:60
 msgid "/invite > Invite a player to your party"
 msgstr "/invite > Invitar a un jugador a tu grupo"
 
-#: src/net/ea/gui/partytab.cpp:61
+#: src/net/tmwa/gui/partytab.cpp:61
 msgid "/leave > Leave the party you are in"
 msgstr "/leave > abandonar tu grupo"
 
-#: src/net/ea/gui/partytab.cpp:62
+#: src/net/tmwa/gui/partytab.cpp:62
 msgid "/kick > Kick some one from the party you are in"
 msgstr "/kick > expulsar a alguien de tu grupo"
 
-#: src/net/ea/gui/partytab.cpp:63
+#: src/net/tmwa/gui/partytab.cpp:63
 msgid "/item > Show/change party item sharing options"
 msgstr "/item > mostrar/cambiar opciones de compartir objetos del grupo"
 
-#: src/net/ea/gui/partytab.cpp:64
+#: src/net/tmwa/gui/partytab.cpp:64
 msgid "/exp > Show/change party experience sharing options"
 msgstr "/exp > mostrar/cambiar opciones para compartir experiencia en el grupo"
 
-#: src/net/ea/gui/partytab.cpp:81
+#: src/net/tmwa/gui/partytab.cpp:81
 msgid "This command causes the player to leave the party."
 msgstr "Este comando hace que el jugador deje el grupo."
 
-#: src/net/ea/gui/partytab.cpp:85
+#: src/net/tmwa/gui/partytab.cpp:85
 msgid "Command: /item <policy>"
 msgstr "Command: /item <policy>"
 
-#: src/net/ea/gui/partytab.cpp:86
+#: src/net/tmwa/gui/partytab.cpp:86
 msgid "This command changes the party's item sharing policy."
 msgstr "cambia el compartir objetos dentro de un grupo"
 
-#: src/net/ea/gui/partytab.cpp:87
+#: src/net/tmwa/gui/partytab.cpp:87
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
@@ -2767,24 +3178,24 @@ msgstr ""
 "<policy> puede ser  \"1\", \"yes\", \"true\" para compartir, o  \"0\", \"no"
 "\", \"false\" para no compartir"
 
-#: src/net/ea/gui/partytab.cpp:90
+#: src/net/tmwa/gui/partytab.cpp:90
 msgid "Command: /item"
 msgstr "Comando: /item"
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/tmwa/gui/partytab.cpp:91
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 "Este mando permite enseñar la politica de intercambio de objetos en el grupo"
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/tmwa/gui/partytab.cpp:95
 msgid "Command: /exp <policy>"
 msgstr "Comando: /exp <policy>"
 
-#: src/net/ea/gui/partytab.cpp:96
+#: src/net/tmwa/gui/partytab.cpp:96
 msgid "This command changes the party's experience sharing policy."
 msgstr "esta orden cambia si el grupo comparte o no la experiencia"
 
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/tmwa/gui/partytab.cpp:97
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
@@ -2792,103 +3203,90 @@ msgstr ""
 "<policy> puede ser \"1\", \"yes\", \"true\" para activar el intercambio de "
 "experiencia o \"0\", \"no\", \"false\" para desactivarla."
 
-#: src/net/ea/gui/partytab.cpp:100
+#: src/net/tmwa/gui/partytab.cpp:100
 msgid "Command: /exp"
 msgstr "Comando: /exp"
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/tmwa/gui/partytab.cpp:101
 msgid "This command displays the party's current experience sharing policy."
 msgstr "Esta orden muestra si el grupo deja compartir experiencia."
 
-#: src/net/ea/gui/partytab.cpp:132 src/net/ea/partyhandler.cpp:198
+#: src/net/tmwa/gui/partytab.cpp:132 src/net/tmwa/partyhandler.cpp:196
 msgid "Item sharing enabled."
 msgstr "Se permite compartir objetos"
 
-#: src/net/ea/gui/partytab.cpp:135 src/net/ea/partyhandler.cpp:204
+#: src/net/tmwa/gui/partytab.cpp:135 src/net/tmwa/partyhandler.cpp:202
 msgid "Item sharing disabled."
 msgstr "No se permite compartir objetos"
 
-#: src/net/ea/gui/partytab.cpp:138 src/net/ea/partyhandler.cpp:210
+#: src/net/tmwa/gui/partytab.cpp:138 src/net/tmwa/partyhandler.cpp:208
 msgid "Item sharing not possible."
 msgstr "Imposible compartir ítem."
 
-#: src/net/ea/gui/partytab.cpp:141
+#: src/net/tmwa/gui/partytab.cpp:141
 #, fuzzy
 msgid "Item sharing unknown."
 msgstr "Se permite compartir objetos"
 
-#: src/net/ea/gui/partytab.cpp:167 src/net/ea/partyhandler.cpp:174
+#: src/net/tmwa/gui/partytab.cpp:167 src/net/tmwa/partyhandler.cpp:172
 msgid "Experience sharing enabled."
 msgstr "Compartir experiencia activado."
 
-#: src/net/ea/gui/partytab.cpp:170 src/net/ea/partyhandler.cpp:180
+#: src/net/tmwa/gui/partytab.cpp:170 src/net/tmwa/partyhandler.cpp:178
 msgid "Experience sharing disabled."
 msgstr "Compartir experiencia desactivado."
 
-#: src/net/ea/gui/partytab.cpp:173 src/net/ea/partyhandler.cpp:186
+#: src/net/tmwa/gui/partytab.cpp:173 src/net/tmwa/partyhandler.cpp:184
 msgid "Experience sharing not possible."
 msgstr "Imposible compartir experiencia."
 
-#: src/net/ea/gui/partytab.cpp:176
+#: src/net/tmwa/gui/partytab.cpp:176
 #, fuzzy
 msgid "Experience sharing unknown."
 msgstr "Compartir experiencia activado."
 
-#: src/net/ea/inventoryhandler.cpp:281
+#: src/net/tmwa/inventoryhandler.cpp:285
 msgid "Failed to use item."
 msgstr "No se pudo utilzar el objeto."
 
-#: src/net/ea/inventoryhandler.cpp:391
+#: src/net/tmwa/inventoryhandler.cpp:399
 msgid "Unable to equip."
 msgstr "no se pudo equipar"
 
-#: src/net/ea/inventoryhandler.cpp:402
+#: src/net/tmwa/inventoryhandler.cpp:410
 msgid "Unable to unequip."
 msgstr "no se pudo desequipar"
 
-#: src/net/ea/loginhandler.cpp:79
+#: src/net/tmwa/loginhandler.cpp:86
 msgid "Account was not found. Please re-login."
 msgstr "La cuenta no se encontro. Por favor conectese de nuevo."
 
-#: src/net/ea/loginhandler.cpp:82 src/net/manaserv/loginhandler.cpp:121
-#, fuzzy
-msgid "Old password incorrect."
-msgstr "La contraseña antigua es incorrecta"
-
-#: src/net/ea/loginhandler.cpp:85
+#: src/net/tmwa/loginhandler.cpp:92
 #, fuzzy
 msgid "New password too short."
 msgstr "La nueva contraseña es demasiada corta"
 
-#: src/net/ea/loginhandler.cpp:88 src/net/ea/loginhandler.cpp:175
-#: src/net/manaserv/charhandler.cpp:158 src/net/manaserv/loginhandler.cpp:96
-#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
-#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
-#, fuzzy
-msgid "Unknown error."
-msgstr "Error desconocido."
-
-#: src/net/ea/loginhandler.cpp:149
+#: src/net/tmwa/loginhandler.cpp:156
 #, fuzzy
 msgid "Unregistered ID."
 msgstr "ID sin registrar."
 
-#: src/net/ea/loginhandler.cpp:152
+#: src/net/tmwa/loginhandler.cpp:159
 #, fuzzy
 msgid "Wrong password."
 msgstr "Contraseña incorrecta."
 
-#: src/net/ea/loginhandler.cpp:155
+#: src/net/tmwa/loginhandler.cpp:162
 #, fuzzy
 msgid "Account expired."
 msgstr "Cuenta expirada."
 
-#: src/net/ea/loginhandler.cpp:158
+#: src/net/tmwa/loginhandler.cpp:165
 #, fuzzy
 msgid "Rejected from server."
 msgstr "Rechazado por el servidor."
 
-#: src/net/ea/loginhandler.cpp:161
+#: src/net/tmwa/loginhandler.cpp:168
 #, fuzzy
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
@@ -2896,7 +3294,7 @@ msgstr ""
 "Has sido bloqueado permanentemente del juego. Por favor, contacta al Equipo "
 "GM."
 
-#: src/net/ea/loginhandler.cpp:165
+#: src/net/tmwa/loginhandler.cpp:172
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -2905,187 +3303,126 @@ msgstr ""
 "Usted ha estado prohibido temporalmente el acceso al juego hasta %s.\n"
 "Por favor pongase en contacto con el equipo de GM a traves del forum.."
 
-#: src/net/ea/loginhandler.cpp:172
+#: src/net/tmwa/loginhandler.cpp:179
 #, fuzzy
 msgid "This user name is already taken."
 msgstr "Este nombre de usuario ya está tomado."
 
-#: src/net/ea/network.cpp:145
+#: src/net/tmwa/network.cpp:145
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/ea/network.cpp:345
+#: src/net/tmwa/network.cpp:345
 #, fuzzy
 msgid "Unable to resolve host \""
 msgstr "Impossibile vender."
 
-#: src/net/ea/network.cpp:414
+#: src/net/tmwa/network.cpp:414
 #, fuzzy
 msgid "Connection to server terminated. "
 msgstr "conectando al servidor de mapas...."
 
-#: src/net/ea/partyhandler.cpp:81
+#: src/net/tmwa/partyhandler.cpp:82
 msgid "Could not create party."
 msgstr "No se ha podido crear el grupo."
 
-#: src/net/ea/partyhandler.cpp:84
+#: src/net/tmwa/partyhandler.cpp:84
 msgid "Party successfully created."
 msgstr "El grupo se creo con éxito."
 
-#: src/net/ea/partyhandler.cpp:118
+#: src/net/tmwa/partyhandler.cpp:119
 #, c-format
 msgid "%s is already a member of a party."
 msgstr "%s ya forma parte del grupo."
 
-#: src/net/ea/partyhandler.cpp:122
+#: src/net/tmwa/partyhandler.cpp:123
 #, c-format
 msgid "%s refused your invitation."
 msgstr "%s rechazó tu invitación."
 
-#: src/net/ea/partyhandler.cpp:126
+#: src/net/tmwa/partyhandler.cpp:127
 #, c-format
 msgid "%s is now a member of your party."
 msgstr "%s es ahora miembro de tu grupo."
 
-#: src/net/ea/partyhandler.cpp:130
+#: src/net/tmwa/partyhandler.cpp:131
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr "Respuesta a invitacion desconocida para %s."
 
-#: src/net/ea/partyhandler.cpp:238
+#: src/net/tmwa/partyhandler.cpp:236
 msgid "You have left the party."
 msgstr "Acaba de dejar al grupo."
 
-#: src/net/ea/partyhandler.cpp:249
+#: src/net/tmwa/partyhandler.cpp:246
 #, c-format
 msgid "%s has left your party."
 msgstr "%s ha dejado el grupo."
 
-#: src/net/ea/partyhandler.cpp:301
+#: src/net/tmwa/partyhandler.cpp:299
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr "Un miembro desconocido intentó decir: %s"
 
-#: src/net/ea/partyhandler.cpp:329
-msgid "Inviting like this isn't supported at the moment."
-msgstr "Por el momento no está soportado invitar de esta forma."
+#: src/net/tmwa/partyhandler.cpp:335
+#, c-format
+msgid "Inviting failed, because you can't see a player called %s."
+msgstr ""
 
-#: src/net/ea/partyhandler.cpp:334
+#: src/net/tmwa/partyhandler.cpp:340
 msgid "You can only inivte when you are in a party!"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:365
+#: src/net/tmwa/partyhandler.cpp:368
 #, c-format
 msgid "%s is not in your party!"
 msgstr "%s no es de su grupo !"
 
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:304
-msgid "You are dead."
-msgstr "Estás muerto."
-
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:305
-msgid "We regret to inform you that your character was killed in battle."
-msgstr "Sentimos informarte de que tu personaje ha muerto en batalla."
-
-#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:307
-msgid "You are not that alive anymore."
-msgstr "Te quedaste sin vida."
-
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:308
-msgid "The cold hands of the grim reaper are grabbing for your soul."
-msgstr "Las manos heladas de la muerte se llevaron tu alma."
-
-#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:309
-msgid "Game Over!"
-msgstr "¡Fin del juego!"
-
-#: src/net/ea/playerhandler.cpp:105
+#: src/net/tmwa/playerhandler.cpp:100
 msgid "Insert coin to continue."
 msgstr "Inserta una moneda para continuar."
 
-#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:310
-msgid ""
-"No, kids. Your character did not really die. It... err... went to a better "
-"place."
-msgstr ""
-"No, niños. Tu personaje no murió realmente. Él... eeh... se marchó a un "
-"lugar mejor."
-
-#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:312
-msgid ""
-"Your plan of breaking your enemies weapon by bashing it with your throat "
-"failed."
-msgstr ""
-"Falló tu plan de romper el arma de tus enemigos golpeándola con tu garganta."
-
-#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:314
-msgid "I guess this did not run too well."
-msgstr "Creo que esto no funcionó muy bien."
-
-#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:315
-msgid "Do you want your possessions identified?"
-msgstr "¿Quieres que tus posesiones sean identificadas?"
-
-#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:316
-msgid "Sadly, no trace of you was ever found..."
-msgstr "Lamentablemente, ningún rastro tuyo fue encontrado nunca."
-
-#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:317
-msgid "Annihilated."
-msgstr "Aniquilado."
-
-#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:318
-msgid "Looks like you got your head handed to you."
-msgstr "Parce que te volaron la cabeza."
-
-#: src/net/ea/playerhandler.cpp:120 src/net/manaserv/beinghandler.cpp:319
-msgid ""
-"You screwed up again, dump your body down the tubes and get you another one."
-msgstr ""
-"Ya la has cagado otra vez, pon en tierra ese cuerpo por ahi en los tuneles y "
-"cogete otro."
-
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/tmwa/playerhandler.cpp:118
 msgid "You're not dead yet. You're just resting."
 msgstr "No estás muerto aún. Sólo estás descansando."
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/tmwa/playerhandler.cpp:119
 msgid "You are no more."
 msgstr "Tú ya no existes más."
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/tmwa/playerhandler.cpp:120
 msgid "You have ceased to be."
 msgstr "Has dejado de existir."
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/tmwa/playerhandler.cpp:121
 msgid "You've expired and gone to meet your maker."
 msgstr "Has expirado e ido a encontrarte con tu creador."
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/tmwa/playerhandler.cpp:122
 msgid "You're a stiff."
 msgstr "Eres un tieso."
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/tmwa/playerhandler.cpp:123
 msgid "Bereft of life, you rest in peace."
 msgstr "Sin vida, descanza en paz."
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/tmwa/playerhandler.cpp:124
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr "Si estuvieras con mas animo, no estarias comiendo las raices."
 
-#: src/net/ea/playerhandler.cpp:130
+#: src/net/tmwa/playerhandler.cpp:125
 msgid "Your metabolic processes are now history."
 msgstr "Tus procesos metabólicos ya son historia."
 
-#: src/net/ea/playerhandler.cpp:131
+#: src/net/tmwa/playerhandler.cpp:126
 msgid "You're off the twig."
 msgstr "Estas al borde de la ramita."
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/tmwa/playerhandler.cpp:127
 msgid "You've kicked the bucket."
 msgstr "Has tocado el fondo."
 
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/tmwa/playerhandler.cpp:128
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
@@ -3093,483 +3430,245 @@ msgstr ""
 "Has terminado de barajar tu vida, has corrido debajo de la cortina y te has "
 "unido al sangriento coro invisible."
 
-#: src/net/ea/playerhandler.cpp:135
+#: src/net/tmwa/playerhandler.cpp:130
 msgid "You are an ex-player."
 msgstr "Eres un ex-jugador."
 
-#: src/net/ea/playerhandler.cpp:136
+#: src/net/tmwa/playerhandler.cpp:131
 msgid "You're pining for the fjords."
 msgstr "Estas ganando puntos para acabar en los fiordos."
 
-#: src/net/ea/playerhandler.cpp:249 src/net/ea/playerhandler.cpp:310
+#: src/net/tmwa/playerhandler.cpp:246 src/net/tmwa/playerhandler.cpp:285
 msgid "Message"
 msgstr "Mensaje"
 
-#: src/net/ea/playerhandler.cpp:250
+#: src/net/tmwa/playerhandler.cpp:247
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr "Estás cargando más de la mitad de tu peso. No puedes recuperar salud."
 
-#: src/net/ea/playerhandler.cpp:333
+#: src/net/tmwa/playerhandler.cpp:313
 #, fuzzy, c-format
 msgid "You picked up %s."
 msgstr "Has cogido "
 
-#: src/net/ea/playerhandler.cpp:369
+#: src/net/tmwa/playerhandler.cpp:348
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:532
+#: src/net/tmwa/playerhandler.cpp:488
 msgid "Equip arrows first."
 msgstr "Equipar primero las flechas."
 
-#: src/net/ea/specialhandler.cpp:147
+#: src/net/tmwa/specialhandler.cpp:144
 msgid "Trade failed!"
 msgstr "Ha fallado el comercio"
 
-#: src/net/ea/specialhandler.cpp:150
+#: src/net/tmwa/specialhandler.cpp:147
 msgid "Emote failed!"
 msgstr "Emoticon fallido!"
 
-#: src/net/ea/specialhandler.cpp:153
+#: src/net/tmwa/specialhandler.cpp:150
 msgid "Sit failed!"
 msgstr "Sentarse fallido!"
 
-#: src/net/ea/specialhandler.cpp:156
+#: src/net/tmwa/specialhandler.cpp:153
 msgid "Chat creating failed!"
 msgstr "Creación de conversación fallida!"
 
-#: src/net/ea/specialhandler.cpp:159
+#: src/net/tmwa/specialhandler.cpp:156
 msgid "Could not join party!"
 msgstr "No pusidiste unirte al grupo!"
 
-#: src/net/ea/specialhandler.cpp:162
+#: src/net/tmwa/specialhandler.cpp:159
 msgid "Cannot shout!"
 msgstr "No puedes gritar!"
 
-#: src/net/ea/specialhandler.cpp:171
+#: src/net/tmwa/specialhandler.cpp:168
 msgid "You have not yet reached a high enough lvl!"
 msgstr "No has alcazado un nivel suficientemente alto!"
 
-#: src/net/ea/specialhandler.cpp:174
+#: src/net/tmwa/specialhandler.cpp:171
 msgid "Insufficient HP!"
 msgstr "Puntos de vidas insuficientes!"
 
-#: src/net/ea/specialhandler.cpp:177
+#: src/net/tmwa/specialhandler.cpp:174
 msgid "Insufficient SP!"
 msgstr "insuficiente SP!"
 
-#: src/net/ea/specialhandler.cpp:180
+#: src/net/tmwa/specialhandler.cpp:177
 msgid "You have no memos!"
 msgstr "No tienes ningun memo!"
 
-#: src/net/ea/specialhandler.cpp:183
+#: src/net/tmwa/specialhandler.cpp:180
 msgid "You cannot do that right now!"
 msgstr "No puedes hacer eso!"
 
-#: src/net/ea/specialhandler.cpp:186
+#: src/net/tmwa/specialhandler.cpp:183
 msgid "Seems you need more money... ;-)"
 msgstr "Parece que necesitas más dinero... ;-)"
 
-#: src/net/ea/specialhandler.cpp:189
+#: src/net/tmwa/specialhandler.cpp:186
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "No puedes usar esa habilidad con ese tipo de arma!"
 
-#: src/net/ea/specialhandler.cpp:192
+#: src/net/tmwa/specialhandler.cpp:189
 msgid "You need another red gem!"
 msgstr "Necesitas otra gema roja!"
 
-#: src/net/ea/specialhandler.cpp:195
+#: src/net/tmwa/specialhandler.cpp:192
 msgid "You need another blue gem!"
 msgstr "Necesitas otra gema azul!"
 
-#: src/net/ea/specialhandler.cpp:198
+#: src/net/tmwa/specialhandler.cpp:195
 msgid "You're carrying to much to do this!"
 msgstr "Estas cargando demasiado para hacer esto!"
 
-#: src/net/ea/specialhandler.cpp:201
+#: src/net/tmwa/specialhandler.cpp:198
 msgid "Huh? What's that?"
 msgstr "¿eh? que es eso?"
 
-#: src/net/ea/specialhandler.cpp:210
+#: src/net/tmwa/specialhandler.cpp:207
 msgid "Warp failed..."
 msgstr "Teletransporte fallido..."
 
-#: src/net/ea/specialhandler.cpp:213
+#: src/net/tmwa/specialhandler.cpp:210
 msgid "Could not steal anything..."
 msgstr "No pudiste robar nada..."
 
-#: src/net/ea/specialhandler.cpp:216
+#: src/net/tmwa/specialhandler.cpp:213
 msgid "Poison had no effect..."
 msgstr "El veneno no tuvo efecto..."
 
-#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:116
-msgid "Request for Trade"
-msgstr "Solicitud de intercambio"
-
-#: src/net/ea/tradehandler.cpp:108 src/net/manaserv/tradehandler.cpp:117
-#, c-format
-msgid "%s wants to trade with you, do you accept?"
-msgstr "%s desea realizar un intercambio con usted, acepta?"
-
-#: src/net/ea/tradehandler.cpp:124
+#: src/net/tmwa/tradehandler.cpp:126
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 "No se puede comerciar. La persona con quién se desea comerciar se encuentra "
 "demasiado lejos."
 
-#: src/net/ea/tradehandler.cpp:128
+#: src/net/tmwa/tradehandler.cpp:130
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr "Intercambio imposible. El personaje no existe."
 
-#: src/net/ea/tradehandler.cpp:132
+#: src/net/tmwa/tradehandler.cpp:134
 msgid "Trade cancelled due to an unknown reason."
 msgstr "Intercambio anulado por razones desconocidas."
 
-#: src/net/ea/tradehandler.cpp:137
+#: src/net/tmwa/tradehandler.cpp:139
 #, c-format
 msgid "Trade: You and %s"
 msgstr "Intercambio: Usted y %s"
 
-#: src/net/ea/tradehandler.cpp:144
+#: src/net/tmwa/tradehandler.cpp:146
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr "Intercambio con %s anulado."
 
-#: src/net/ea/tradehandler.cpp:153
+#: src/net/tmwa/tradehandler.cpp:154
 msgid "Unhandled trade cancel packet."
 msgstr "Orden de cancelar intercambio descontrolado."
 
-#: src/net/ea/tradehandler.cpp:202
+#: src/net/tmwa/tradehandler.cpp:202
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr "No se pudo añadir el objeto. Tu compañero lleva demasiado peso encima."
 
-#: src/net/ea/tradehandler.cpp:207
+#: src/net/tmwa/tradehandler.cpp:207
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr "No se pudo añadir el objeto. Tu compañero no tiene espacio."
 
-#: src/net/ea/tradehandler.cpp:211
+#: src/net/tmwa/tradehandler.cpp:211
 msgid "Failed adding item for unknown reason."
 msgstr "No se pudo añadir el objeto, razon desconocida"
 
-#: src/net/ea/tradehandler.cpp:224 src/net/manaserv/tradehandler.cpp:149
-msgid "Trade canceled."
-msgstr "Comercio cancelado."
-
-#: src/net/ea/tradehandler.cpp:231 src/net/manaserv/tradehandler.cpp:156
-msgid "Trade completed."
-msgstr "Comercio completado."
-
-#: src/net/manaserv/beinghandler.cpp:324
-#, fuzzy
-msgid "Press OK to respawn."
-msgstr " Pulsa OK para volver a la vida"
-
-#: src/net/manaserv/beinghandler.cpp:325
+#: src/playerrelations.cpp:310
 #, fuzzy
-msgid "You Died"
-msgstr "Has muerto"
-
-#: src/net/manaserv/charhandler.cpp:128 src/net/manaserv/charhandler.cpp:196
-#, fuzzy
-msgid "Not logged in."
-msgstr "Ya estas conectado"
-
-#: src/net/manaserv/charhandler.cpp:131
-msgid "No empty slot."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:134
-msgid "Invalid name."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:137
-#, fuzzy
-msgid "Character's name already exists."
-msgstr "El nombre de usuario ya existe"
-
-#: src/net/manaserv/charhandler.cpp:140
-msgid "Invalid hairstyle."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:143
-msgid "Invalid hair color."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:146
-msgid "Invalid gender."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:149
-#, fuzzy
-msgid "Character's stats are too high."
-msgstr "Estadisticas del personaje OK"
-
-#: src/net/manaserv/charhandler.cpp:152
-#, fuzzy
-msgid "Character's stats are too low."
-msgstr "Estadisticas del personaje OK"
+msgid "Completely ignore"
+msgstr "@@ignore|ignorar al maximo %s@@"
 
-#: src/net/manaserv/charhandler.cpp:155
-msgid "One stat is zero."
+#: src/playerrelations.cpp:324
+msgid "Print '...'"
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:187
-#, fuzzy
-msgid "Player deleted."
-msgstr "personaje borrado"
-
-#: src/net/manaserv/charhandler.cpp:199
-#, fuzzy
-msgid "Selection out of range."
-msgstr "Seleccione cantidad de objetos para comerciar."
-
-#: src/net/manaserv/charhandler.cpp:202
-#, fuzzy, c-format
-msgid "Unknown error (%d)."
-msgstr "Error desconocido."
-
-#: src/net/manaserv/charhandler.cpp:242
-msgid "No gameservers are available."
-msgstr "No hay servidores de juego disponibles."
-
-#: src/net/manaserv/charhandler.cpp:268
-msgid "Willpower:"
-msgstr "Fuerza de voluntad:"
-
-#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
-#: src/net/manaserv/guildhandler.cpp:259
-#, c-format
-msgid "Topic: %s"
-msgstr "Tema: %s"
-
-#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
-#, fuzzy
-msgid "Players in this channel:"
-msgstr "Jugador golpea al monstruo"
-
-#: src/net/manaserv/chathandler.cpp:201
-#, fuzzy
-msgid "Error joining channel."
-msgstr "Comando: /join <canal>"
-
-#: src/net/manaserv/chathandler.cpp:207
-#, fuzzy
-msgid "Listing channels."
-msgstr "Se te pide reunirte en el channel %s."
-
-#: src/net/manaserv/chathandler.cpp:219
-msgid "End of channel list."
+#: src/playerrelations.cpp:340
+msgid "Blink name"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:291
-#, fuzzy, c-format
-msgid "%s entered the channel."
-msgstr "%s se ha unido al grupo."
-
-#: src/net/manaserv/chathandler.cpp:296
+#: src/resources/itemdb.cpp:44
 #, c-format
-msgid "%s left the channel."
-msgstr ""
+msgid "Attack %+d"
+msgstr "Ataque %+d"
 
-#: src/net/manaserv/chathandler.cpp:312
+#: src/resources/itemdb.cpp:45
 #, c-format
-msgid "%s has set mode %s on user %s."
-msgstr ""
+msgid "Defense %+d"
+msgstr "Defensa %+d"
 
-#: src/net/manaserv/chathandler.cpp:322
+#: src/resources/itemdb.cpp:46
 #, c-format
-msgid "%s has kicked %s."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:327
-#, fuzzy
-msgid "Unknown channel event."
-msgstr "Comando desconocido."
+msgid "HP %+d"
+msgstr "HP %+d"
 
-#: src/net/manaserv/generalhandler.cpp:100
+#: src/resources/itemdb.cpp:47
 #, c-format
-msgid "Willpower %+d"
-msgstr "Fuerza de voluntad: %+d"
-
-#: src/net/manaserv/generalhandler.cpp:171
-#, fuzzy
-msgid "Willpower"
-msgstr "Fuerza de voluntad:"
-
-#: src/net/manaserv/guildhandler.cpp:81
-msgid "Guild created."
-msgstr "Guild créada."
-
-#: src/net/manaserv/guildhandler.cpp:86
-msgid "Error creating guild."
-msgstr "Eror al crear la guild."
-
-#: src/net/manaserv/guildhandler.cpp:96
-msgid "Invite sent."
-msgstr "Invitacion enviada."
-
-#: src/net/manaserv/guildhandler.cpp:203
-msgid "Member was promoted successfully."
-msgstr "El miembro ha sido promovido con exito."
+msgid "MP %+d"
+msgstr "MP %+d"
 
-#: src/net/manaserv/guildhandler.cpp:208
-msgid "Failed to promote member."
-msgstr "Fallo al promover el miembro."
+#: src/resources/itemdb.cpp:92
+msgid "Unknown item"
+msgstr "Objeto desconocido"
 
-#: src/net/manaserv/loginhandler.cpp:87
-#, fuzzy
-msgid "Wrong magic_token."
-msgstr "Ficha de magia erronea"
+#: src/resources/itemdb.cpp:135 src/resources/monsterdb.cpp:77
+msgid "unnamed"
+msgstr "Sin nombre"
 
-#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
 #, fuzzy
-msgid "Already logged in."
-msgstr "Ya estas conectado"
+#~ msgid "HP"
+#~ msgstr "PV:"
 
-#: src/net/manaserv/loginhandler.cpp:93 src/net/manaserv/loginhandler.cpp:272
 #, fuzzy
-msgid "Server is full."
-msgstr "El servidor esta lleno"
+#~ msgid "MP"
+#~ msgstr "PM:"
 
-#: src/net/manaserv/loginhandler.cpp:118
 #, fuzzy
-msgid "New password incorrect."
-msgstr "La nueva contraseña es incorrecta"
-
-#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
-msgid "Account not connected. Please login first."
-msgstr "Cuenta no conectada. Conectate primero"
+#~ msgid "Exp"
+#~ msgstr "EXP:"
 
-#: src/net/manaserv/loginhandler.cpp:149
 #, fuzzy
-msgid "New email address incorrect."
-msgstr "La nueva dirección de E-mail es incorrecta"
+#~ msgid "Money"
+#~ msgstr "Dinero: %d"
 
-#: src/net/manaserv/loginhandler.cpp:152
 #, fuzzy
-msgid "Old email address incorrect."
-msgstr "La antigua dirección de E-mail es incorrecta"
+#~ msgid "Job"
+#~ msgstr "trabajo:"
 
-#: src/net/manaserv/loginhandler.cpp:158
 #, fuzzy
-msgid "The new email address already exists."
-msgstr "La nueva dirección de E-mail ya existe"
+#~ msgid "Level"
+#~ msgstr "Nivel: %d"
 
-#: src/net/manaserv/loginhandler.cpp:239
-msgid ""
-"Client registration is not allowed. Please contact server administration."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
 #, fuzzy
-msgid "Client version is too old."
-msgstr "La version de tu cliente es demasiado antigua"
+#~ msgid "Access denied."
+#~ msgstr "acceso denegado"
 
-#: src/net/manaserv/loginhandler.cpp:266
 #, fuzzy
-msgid "Wrong username or password."
-msgstr "Nombre de usuario o contraseña incorrectos"
+#~ msgid "Unknown failure to select character."
+#~ msgstr "fallo desconocido al seleccionar personaje"
 
-#: src/net/manaserv/loginhandler.cpp:275
-msgid "Login attempt too soon after previous attempt."
-msgstr ""
+#~ msgid "Inviting like this isn't supported at the moment."
+#~ msgstr "Por el momento no está soportado invitar de esta forma."
 
-#: src/net/manaserv/loginhandler.cpp:303
-#, fuzzy
-msgid "Wrong username, password or email address."
-msgstr "Nombre de usuario, contraseña o dirección de email incorrectos"
+#~ msgid "Willpower:"
+#~ msgstr "Fuerza de voluntad:"
 
-#: src/net/manaserv/loginhandler.cpp:306
-#, fuzzy
-msgid "Username already exists."
-msgstr "El nombre de usuario ya existe"
+#~ msgid "Willpower %+d"
+#~ msgstr "Fuerza de voluntad: %+d"
 
-#: src/net/manaserv/loginhandler.cpp:309
 #, fuzzy
-msgid "Email address already exists."
-msgstr "La dirección de email ya existe"
-
-#: src/net/manaserv/loginhandler.cpp:312
-msgid "You took too long with the captcha or your response was incorrect."
-msgstr ""
-
-#: src/net/manaserv/partyhandler.cpp:88
-msgid "Joined party."
-msgstr "Unido al grupo."
-
-#: src/net/manaserv/partyhandler.cpp:106
-#, c-format
-msgid "%s joined the party."
-msgstr "%s se ha unido al grupo."
-
-#: src/net/manaserv/partyhandler.cpp:123
-#, fuzzy, c-format
-msgid "%s rejected your invite."
-msgstr "%s rechazó tu invitación."
-
-#: src/net/manaserv/tradehandler.cpp:96
-msgid "Accepting incoming trade requests."
-msgstr "Se aceptan peticiones de intercambio."
+#~ msgid "Willpower"
+#~ msgstr "Fuerza de voluntad:"
 
-#: src/net/manaserv/tradehandler.cpp:98
-msgid "Ignoring incoming trade requests."
-msgstr "Se ignoran peticiones de intercambio."
-
-#: src/net/manaserv/tradehandler.cpp:135
-#, c-format
-msgid "Trading with %s"
-msgstr "Intercambiar con %s"
-
-#: src/playerrelations.cpp:304
 #, fuzzy
-msgid "Completely ignore"
-msgstr "@@ignore|ignorar al maximo %s@@"
-
-#: src/playerrelations.cpp:318
-msgid "Print '...'"
-msgstr ""
-
-#: src/playerrelations.cpp:334
-msgid "Blink name"
-msgstr ""
-
-#: src/playerrelations.cpp:371
-msgid "Floating '...' bubble"
-msgstr ""
-
-#: src/playerrelations.cpp:374
-msgid "Floating bubble"
-msgstr ""
-
-#: src/resources/itemdb.cpp:52
-#, c-format
-msgid "Attack %+d"
-msgstr "Ataque %+d"
-
-#: src/resources/itemdb.cpp:53
-#, c-format
-msgid "Defense %+d"
-msgstr "Defensa %+d"
-
-#: src/resources/itemdb.cpp:54
-#, c-format
-msgid "HP %+d"
-msgstr "HP %+d"
-
-#: src/resources/itemdb.cpp:55
-#, c-format
-msgid "MP %+d"
-msgstr "MP %+d"
-
-#: src/resources/itemdb.cpp:114
-msgid "Unknown item"
-msgstr "Objeto desconocido"
-
-#: src/resources/itemdb.cpp:158 src/resources/monsterdb.cpp:45
-#: src/resources/monsterdb.cpp:69
-msgid "unnamed"
-msgstr "Sin nombre"
+#~ msgid "Server is full."
+#~ msgstr "El servidor esta lleno"
 
 #~ msgid "Text Shadow"
 #~ msgstr "Sombra del texto"
diff --git a/po/et.po b/po/et.po
index 977b2375..319fbb2a 100644
--- a/po/et.po
+++ b/po/et.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2010-03-05 21:52+0100\n"
+"POT-Creation-Date: 2010-12-13 20:04+0100\n"
 "PO-Revision-Date: 2010-01-26 08:47+0000\n"
 "Last-Translator: Kerdo <Unknown>\n"
 "Language-Team: Estonian <et@li.org>\n"
+"Language: et\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,435 +19,448 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/client.cpp:553 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:62
+#: src/client.cpp:598 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
 msgid "Setup"
 msgstr ""
 
-#: src/client.cpp:623
+#: src/client.cpp:679
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:650
+#: src/client.cpp:706
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:683
+#: src/client.cpp:739
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:739
+#: src/client.cpp:804
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:768
+#: src/client.cpp:833
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:799 src/client.cpp:806 src/client.cpp:940
+#: src/client.cpp:843
+msgid "Changing game servers"
+msgstr ""
+
+#: src/client.cpp:872 src/client.cpp:879 src/client.cpp:1014
 #: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
 #: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
-#: src/gui/serverdialog.cpp:261 src/gui/unregisterdialog.cpp:133
-#: src/net/ea/charserverhandler.cpp:135 src/net/ea/charserverhandler.cpp:152
-#: src/net/manaserv/charhandler.cpp:161 src/net/manaserv/charhandler.cpp:204
+#: src/gui/serverdialog.cpp:323 src/gui/unregisterdialog.cpp:133
+#: src/net/manaserv/charhandler.cpp:174 src/net/manaserv/charhandler.cpp:217
+#: src/net/tmwa/charserverhandler.cpp:134
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Error"
 msgstr "Viga"
 
-#: src/client.cpp:815
+#: src/client.cpp:888
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:842
+#: src/client.cpp:915
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:843
+#: src/client.cpp:916
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:862
+#: src/client.cpp:935
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:863
+#: src/client.cpp:936
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:883
+#: src/client.cpp:956
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:884
+#: src/client.cpp:957
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1007 src/client.cpp:1030
+#: src/client.cpp:1138 src/client.cpp:1161
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1119
+#: src/client.cpp:1281
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1153 src/client.cpp:1159
+#: src/client.cpp:1315 src/client.cpp:1321
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/commandhandler.cpp:127 src/commandhandler.cpp:308
+#: src/commandhandler.cpp:131 src/commandhandler.cpp:317
 msgid "Unknown command."
 msgstr ""
 
-#: src/commandhandler.cpp:156
+#: src/commandhandler.cpp:160
 msgid "-- Help --"
 msgstr ""
 
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:161
 msgid "/help > Display this help"
 msgstr ""
 
-#: src/commandhandler.cpp:159
+#: src/commandhandler.cpp:163
 msgid "/where > Display map name"
 msgstr ""
 
-#: src/commandhandler.cpp:160
+#: src/commandhandler.cpp:164
 msgid "/who > Display number of online users"
 msgstr ""
 
-#: src/commandhandler.cpp:161
+#: src/commandhandler.cpp:165
 msgid "/me > Tell something about yourself"
 msgstr ""
 
-#: src/commandhandler.cpp:163
+#: src/commandhandler.cpp:167
 msgid "/clear > Clears this window"
 msgstr ""
 
-#: src/commandhandler.cpp:165
+#: src/commandhandler.cpp:169
 msgid "/msg > Send a private message to a user"
 msgstr ""
 
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:170
 msgid "/whisper > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:167
+#: src/commandhandler.cpp:171
 msgid "/w > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:168
+#: src/commandhandler.cpp:172
 msgid "/query > Makes a tab for private messages with another user"
 msgstr ""
 
-#: src/commandhandler.cpp:169
+#: src/commandhandler.cpp:174
 msgid "/q > Alias of query"
 msgstr ""
 
-#: src/commandhandler.cpp:171
+#: src/commandhandler.cpp:176
 msgid "/ignore > ignore a player"
 msgstr ""
 
-#: src/commandhandler.cpp:172
+#: src/commandhandler.cpp:177
 msgid "/unignore > stop ignoring a player"
 msgstr ""
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:179
 msgid "/list > Display all public channels"
 msgstr ""
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:180
 msgid "/join > Join or create a channel"
 msgstr ""
 
-#: src/commandhandler.cpp:177
+#: src/commandhandler.cpp:182
 msgid "/createparty > Create a new party"
 msgstr ""
 
-#: src/commandhandler.cpp:178
+#: src/commandhandler.cpp:183
 msgid "/party > Invite a user to party"
 msgstr ""
 
-#: src/commandhandler.cpp:180
+#: src/commandhandler.cpp:185
 msgid "/record > Start recording the chat to an external file"
 msgstr ""
 
-#: src/commandhandler.cpp:181
+#: src/commandhandler.cpp:187
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr ""
 
-#: src/commandhandler.cpp:182
+#: src/commandhandler.cpp:189
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
 
-#: src/commandhandler.cpp:184
+#: src/commandhandler.cpp:192
 msgid "/announce > Global announcement (GM only)"
 msgstr ""
 
-#: src/commandhandler.cpp:188
+#: src/commandhandler.cpp:196
 msgid "For more information, type /help <command>."
 msgstr ""
 
-#: src/commandhandler.cpp:192
+#: src/commandhandler.cpp:200
 msgid "Command: /help"
 msgstr ""
 
-#: src/commandhandler.cpp:193
+#: src/commandhandler.cpp:201
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: src/commandhandler.cpp:194
+#: src/commandhandler.cpp:203
 msgid "Command: /help <command>"
 msgstr ""
 
-#: src/commandhandler.cpp:195
+#: src/commandhandler.cpp:204
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/commandhandler.cpp:203
+#: src/commandhandler.cpp:212
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: src/commandhandler.cpp:204
+#: src/commandhandler.cpp:213
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/commandhandler.cpp:205
+#: src/commandhandler.cpp:214
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:210
+#: src/commandhandler.cpp:219
 msgid "Command: /clear"
 msgstr ""
 
-#: src/commandhandler.cpp:211
+#: src/commandhandler.cpp:220
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:224
 msgid "Command: /ignore <player>"
 msgstr ""
 
-#: src/commandhandler.cpp:216
+#: src/commandhandler.cpp:225
 msgid "This command ignores the given player regardless of current relations."
 msgstr ""
 
-#: src/commandhandler.cpp:221
+#: src/commandhandler.cpp:230
 msgid "Command: /join <channel>"
 msgstr ""
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:231
 msgid "This command makes you enter <channel>."
 msgstr ""
 
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:232
 msgid "If <channel> doesn't exist, it's created."
 msgstr ""
 
-#: src/commandhandler.cpp:227
+#: src/commandhandler.cpp:236
 msgid "Command: /list"
 msgstr ""
 
-#: src/commandhandler.cpp:228
+#: src/commandhandler.cpp:237
 msgid "This command shows a list of all channels."
 msgstr ""
 
-#: src/commandhandler.cpp:232
+#: src/commandhandler.cpp:241
 msgid "Command: /me <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:233
+#: src/commandhandler.cpp:242
 msgid "This command tell others you are (doing) <msg>."
 msgstr ""
 
-#: src/commandhandler.cpp:237
+#: src/commandhandler.cpp:246
 msgid "Command: /msg <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:238
+#: src/commandhandler.cpp:247
 msgid "Command: /whisper <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:239
+#: src/commandhandler.cpp:248
 msgid "Command: /w <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:240
+#: src/commandhandler.cpp:249
 msgid "This command sends the text <message> to <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:241 src/commandhandler.cpp:260
+#: src/commandhandler.cpp:250 src/commandhandler.cpp:269
 #: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
-#: src/net/ea/gui/guildtab.cpp:75 src/net/ea/gui/partytab.cpp:75
+#: src/net/tmwa/gui/guildtab.cpp:75 src/net/tmwa/gui/partytab.cpp:75
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:255
 msgid "Command: /query <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:247
+#: src/commandhandler.cpp:256
 msgid "Command: /q <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:248
+#: src/commandhandler.cpp:257
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:253
+#: src/commandhandler.cpp:262
 msgid "Command: /createparty <name>"
 msgstr ""
 
-#: src/commandhandler.cpp:254
+#: src/commandhandler.cpp:263
 msgid "This command creates a new party called <name>."
 msgstr ""
 
-#: src/commandhandler.cpp:258
+#: src/commandhandler.cpp:267
 msgid "Command: /party <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:259 src/net/ea/gui/partytab.cpp:74
+#: src/commandhandler.cpp:268 src/net/tmwa/gui/partytab.cpp:74
 msgid "This command invites <nick> to party with you."
 msgstr ""
 
-#: src/commandhandler.cpp:265
+#: src/commandhandler.cpp:274
 msgid "Command: /present"
 msgstr ""
 
-#: src/commandhandler.cpp:266
+#: src/commandhandler.cpp:275
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: src/commandhandler.cpp:272
+#: src/commandhandler.cpp:281
 msgid "Command: /record <filename>"
 msgstr ""
 
-#: src/commandhandler.cpp:273
+#: src/commandhandler.cpp:282
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr ""
 
-#: src/commandhandler.cpp:275
+#: src/commandhandler.cpp:284
 msgid "Command: /record"
 msgstr ""
 
-#: src/commandhandler.cpp:276
+#: src/commandhandler.cpp:285
 msgid "This command finishes a recording session."
 msgstr ""
 
-#: src/commandhandler.cpp:280
+#: src/commandhandler.cpp:289
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: src/commandhandler.cpp:281
+#: src/commandhandler.cpp:290
 msgid ""
 "This command sets whether the return key should toggle the chat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: src/commandhandler.cpp:283
+#: src/commandhandler.cpp:292
 msgid ""
-"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
-"\", \"no\", \"false\" to turn the toggle off."
+"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
+"\"0\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: src/commandhandler.cpp:286
+#: src/commandhandler.cpp:295
 msgid "Command: /toggle"
 msgstr ""
 
-#: src/commandhandler.cpp:287
+#: src/commandhandler.cpp:296
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: src/commandhandler.cpp:291 src/gui/widgets/whispertab.cpp:93
+#: src/commandhandler.cpp:300 src/gui/widgets/whispertab.cpp:95
 msgid "Command: /unignore <player>"
 msgstr ""
 
-#: src/commandhandler.cpp:292
+#: src/commandhandler.cpp:301
 msgid "This command stops ignoring the given player if they are being ignored"
 msgstr ""
 
-#: src/commandhandler.cpp:297
+#: src/commandhandler.cpp:306
 msgid "Command: /where"
 msgstr ""
 
-#: src/commandhandler.cpp:298
+#: src/commandhandler.cpp:307
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: src/commandhandler.cpp:302
+#: src/commandhandler.cpp:311
 msgid "Command: /who"
 msgstr ""
 
-#: src/commandhandler.cpp:303
+#: src/commandhandler.cpp:312
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:309
+#: src/commandhandler.cpp:318
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: src/commandhandler.cpp:375
+#: src/commandhandler.cpp:384
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:383
+#: src/commandhandler.cpp:392
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:397
+#: src/commandhandler.cpp:406
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:410 src/net/ea/gui/partytab.cpp:109
+#: src/commandhandler.cpp:419 src/net/tmwa/gui/partytab.cpp:109
 msgid "Party name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:423 src/commandhandler.cpp:471
-#: src/commandhandler.cpp:493
+#: src/commandhandler.cpp:432 src/commandhandler.cpp:509
+#: src/commandhandler.cpp:531
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:441
+#: src/commandhandler.cpp:450
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:441
+#: src/commandhandler.cpp:450
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:450
+#: src/commandhandler.cpp:459
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:454
+#: src/commandhandler.cpp:463
 msgid "Message now closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:477
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:489
+msgid "Show IP: On"
+msgstr ""
+
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:485
+msgid "Show IP: Off"
+msgstr ""
+
+#: src/commandhandler.cpp:515
 msgid "Player already ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:484
+#: src/commandhandler.cpp:522
 msgid "Player successfully ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:486
+#: src/commandhandler.cpp:524
 msgid "Player could not be ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:501
+#: src/commandhandler.cpp:539
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:506
+#: src/commandhandler.cpp:544
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:508
+#: src/commandhandler.cpp:546
 msgid "Player could not be unignored!"
 msgstr ""
 
@@ -459,40 +473,40 @@ msgstr ""
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:326
+#: src/game.cpp:342
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:331
+#: src/game.cpp:347
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:355
+#: src/game.cpp:378
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:360
+#: src/game.cpp:382
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:705
+#: src/game.cpp:721
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:712
+#: src/game.cpp:726
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:946
+#: src/game.cpp:954
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:947
+#: src/game.cpp:955
 #, c-format
 msgid "Error while loading %s"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:75
+#: src/gui/beingpopup.cpp:76
 #, c-format
 msgid "Party: %s"
 msgstr ""
@@ -501,34 +515,34 @@ msgstr ""
 msgid "Buy"
 msgstr ""
 
-#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
-#: src/gui/sell.cpp:276
+#: src/gui/buy.cpp:69 src/gui/buy.cpp:261 src/gui/sell.cpp:71
+#: src/gui/sell.cpp:288
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:99 src/gui/npcdialog.cpp:100
-#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:479
+#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:112 src/gui/npcdialog.cpp:124
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:463
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:98 src/gui/npcdialog.cpp:101
-#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:491
+#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:111 src/gui/npcdialog.cpp:125
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:475
 msgid "-"
 msgstr ""
 
 #: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
-#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:182
-#: src/keyboardconfig.cpp:103
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:228
+#: src/keyboardconfig.cpp:102
 msgid "Quit"
 msgstr ""
 
-#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:408
-#: src/gui/statuswindow.cpp:478 src/gui/statuswindow.cpp:512
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:384
+#: src/gui/statuswindow.cpp:462 src/gui/statuswindow.cpp:496
 msgid "Max"
 msgstr ""
 
@@ -542,11 +556,11 @@ msgstr ""
 
 #: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
 #: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
-#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:101
-#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:178
-#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:402
+#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:114
+#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:389
 #: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
-#: src/gui/socialwindow.cpp:242 src/gui/textdialog.cpp:39
+#: src/gui/socialwindow.cpp:275 src/gui/textdialog.cpp:40
 #: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr ""
@@ -583,7 +597,7 @@ msgstr ""
 msgid "Change Password"
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:53
+#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:55
 #: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
 msgid "Password:"
 msgstr ""
@@ -614,19 +628,19 @@ msgstr ""
 msgid "Create Character"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:52
+#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:54
 #: src/gui/register.cpp:67
 msgid "Name:"
 msgstr ""
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
 #: src/gui/outfitwindow.cpp:67
 msgid ">"
 msgstr ""
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
 #: src/gui/outfitwindow.cpp:66
@@ -641,8 +655,8 @@ msgstr ""
 msgid "Hair style:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:397
-#: src/gui/socialwindow.cpp:296
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:392
+#: src/gui/socialwindow.cpp:329
 msgid "Create"
 msgstr ""
 
@@ -697,34 +711,34 @@ msgstr ""
 msgid "Change Email"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:185
-#: src/gui/setup_players.cpp:230
+#: src/gui/charselectdialog.cpp:336 src/gui/serverdialog.cpp:231
+#: src/gui/setup_players.cpp:229
 msgid "Delete"
 msgstr "Kustuta"
 
-#: src/gui/charselectdialog.cpp:387
+#: src/gui/charselectdialog.cpp:380
 #, fuzzy
 msgid "Choose"
 msgstr "Sulge"
 
-#: src/gui/charselectdialog.cpp:399 src/gui/charselectdialog.cpp:400
+#: src/gui/charselectdialog.cpp:394 src/gui/charselectdialog.cpp:395
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:77 src/gui/palette.cpp:96
+#: src/gui/chat.cpp:88
 msgid "Chat"
 msgstr "Vestlus"
 
-#: src/gui/chat.cpp:287
+#: src/gui/chat.cpp:311
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:305
+#: src/gui/chat.cpp:329
 msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:469
+#: src/gui/chat.cpp:493
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -786,140 +800,170 @@ msgstr ""
 msgid "Ambient FX: %s"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:56
+#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:55
 msgid "Equipment"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:77
-#: src/gui/inventorywindow.cpp:79 src/gui/inventorywindow.cpp:298
-#: src/gui/popupmenu.cpp:372
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:89
+#: src/gui/inventorywindow.cpp:337 src/gui/popupmenu.cpp:359
 msgid "Unequip"
 msgstr ""
 
-#: src/gui/help.cpp:36
+#: src/gui/help.cpp:37
 msgid "Help"
 msgstr "Abi"
 
-#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:73
+#: src/gui/help.cpp:51 src/gui/npcdialog.cpp:50
 msgid "Close"
 msgstr "Sulge"
 
-#: src/gui/inventorywindow.cpp:56 src/gui/windowmenu.cpp:57
+#: src/gui/inventorywindow.cpp:59 src/gui/windowmenu.cpp:56
 msgid "Inventory"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:72 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:300 src/gui/popupmenu.cpp:374
+#: src/gui/inventorywindow.cpp:59
+msgid "Storage"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:82
+msgid "Slots:"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:87 src/gui/inventorywindow.cpp:100
+#: src/gui/inventorywindow.cpp:339 src/gui/popupmenu.cpp:361
 msgid "Equip"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:304 src/gui/popupmenu.cpp:377
+#: src/gui/inventorywindow.cpp:88
 msgid "Use"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:83 src/gui/inventorywindow.cpp:308
-#: src/gui/popupmenu.cpp:380
+#: src/gui/inventorywindow.cpp:101 src/gui/popupmenu.cpp:364
+msgid "Activate"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:102 src/gui/inventorywindow.cpp:348
+#: src/gui/popupmenu.cpp:367
 msgid "Drop..."
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:84 src/gui/popupmenu.cpp:386
+#: src/gui/inventorywindow.cpp:103 src/gui/popupmenu.cpp:373
 msgid "Split"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:85 src/gui/outfitwindow.cpp:51
+#: src/gui/inventorywindow.cpp:104 src/gui/outfitwindow.cpp:51
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:96 src/gui/storagewindow.cpp:83
-msgid "Slots:"
+#: src/gui/inventorywindow.cpp:106
+msgid "Weight:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:97
-msgid "Weight:"
+#: src/gui/inventorywindow.cpp:124 src/gui/popupmenu.cpp:378
+msgid "Store"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:310 src/gui/popupmenu.cpp:382
+#: src/gui/inventorywindow.cpp:125 src/gui/popupmenu.cpp:385
+msgid "Retrieve"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:350 src/gui/popupmenu.cpp:369
 msgid "Drop"
 msgstr ""
 
-#: src/gui/itemamount.cpp:100 src/gui/okdialog.cpp:42
-#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:38 src/gui/trade.cpp:73
-#: src/gui/trade.cpp:75
+#: src/gui/itemamount.cpp:113 src/gui/okdialog.cpp:42
+#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:39 src/gui/trade.cpp:72
+#: src/gui/trade.cpp:74
 msgid "OK"
 msgstr ""
 
-#: src/gui/itemamount.cpp:102
+#: src/gui/itemamount.cpp:115
 msgid "All"
 msgstr ""
 
-#: src/gui/itemamount.cpp:128
+#: src/gui/itemamount.cpp:141
 msgid "Select amount of items to trade."
 msgstr ""
 
-#: src/gui/itemamount.cpp:131
+#: src/gui/itemamount.cpp:144
 msgid "Select amount of items to drop."
 msgstr ""
 
-#: src/gui/itemamount.cpp:134
+#: src/gui/itemamount.cpp:147
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/itemamount.cpp:137
+#: src/gui/itemamount.cpp:150
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamount.cpp:140
+#: src/gui/itemamount.cpp:153
 msgid "Select amount of items to split."
 msgstr ""
 
-#: src/gui/itempopup.cpp:92
+#: src/gui/itempopup.cpp:137
 #, c-format
 msgid "Weight: %s"
 msgstr ""
 
-#: src/gui/login.cpp:49 src/gui/login.cpp:61
+#: src/gui/login.cpp:51 src/gui/login.cpp:63
 msgid "Login"
 msgstr ""
 
-#: src/gui/login.cpp:58
+#: src/gui/login.cpp:60
 msgid "Remember username"
 msgstr ""
 
-#: src/gui/login.cpp:59 src/gui/register.cpp:58 src/gui/register.cpp:73
+#: src/gui/login.cpp:61 src/gui/register.cpp:58 src/gui/register.cpp:73
 msgid "Register"
 msgstr ""
 
-#: src/gui/login.cpp:60
+#: src/gui/login.cpp:62
 msgid "Change Server"
 msgstr ""
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
+#: src/gui/login.cpp:129
+msgid "Registration disabled"
+msgstr ""
+
+#: src/gui/login.cpp:129
+msgid "You need to use the website to register an account for this server."
+msgstr ""
+
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:86
 msgid "Map"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:44
+#: src/gui/ministatus.cpp:235
+msgid "Need"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:48
 msgid "Waiting for server"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:45
+#: src/gui/npcdialog.cpp:49
 msgid "Next"
 msgstr "Järgmine"
 
-#: src/gui/npcdialog.cpp:47
+#: src/gui/npcdialog.cpp:51
 msgid "Submit"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:52 src/gui/npcpostdialog.cpp:41
+#: src/gui/npcdialog.cpp:73 src/gui/npcpostdialog.cpp:41
 msgid "NPC"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:110
+#: src/gui/npcdialog.cpp:118
+msgid "Clear log"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:134
 msgid "Reset"
 msgstr ""
 
 #. TRANSLATORS: Please leave the \n sequences intact.
-#: src/gui/npcdialog.cpp:171
+#: src/gui/npcdialog.cpp:208
 #, fuzzy
 msgid ""
 "\n"
@@ -934,7 +978,7 @@ msgstr ""
 msgid "Send"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:96
+#: src/gui/npcpostdialog.cpp:99
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
@@ -948,303 +992,82 @@ msgstr ""
 msgid "Unequip first"
 msgstr ""
 
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:143
-msgid "Text"
-msgstr ""
-
-#: src/gui/palette.cpp:82
-msgid "Text Shadow"
-msgstr ""
-
-#: src/gui/palette.cpp:83
-msgid "Text Outline"
-msgstr ""
-
-#: src/gui/palette.cpp:84
-msgid "Progress Bar Labels"
-msgstr ""
-
-#: src/gui/palette.cpp:85
-msgid "Buttons"
-msgstr ""
-
-#: src/gui/palette.cpp:86
-msgid "Disabled Buttons"
-msgstr ""
-
-#: src/gui/palette.cpp:87
-msgid "Tabs"
-msgstr ""
-
-#: src/gui/palette.cpp:89
-msgid "Background"
-msgstr ""
-
-#: src/gui/palette.cpp:91
-msgid "Highlight"
-msgstr ""
-
-#: src/gui/palette.cpp:92
-msgid "Tab Highlight"
-msgstr ""
-
-#: src/gui/palette.cpp:93
-msgid "Item Too Expensive"
-msgstr ""
-
-#: src/gui/palette.cpp:94
-msgid "Item Is Equipped"
-msgstr ""
-
-#: src/gui/palette.cpp:97
-msgid "GM"
-msgstr ""
-
-#: src/gui/palette.cpp:98
-msgid "Player"
-msgstr ""
-
-#: src/gui/palette.cpp:99
-msgid "Whisper"
-msgstr ""
-
-#: src/gui/palette.cpp:100
-msgid "Is"
-msgstr ""
-
-#: src/gui/palette.cpp:101 src/net/ea/gui/partytab.cpp:43
-msgid "Party"
-msgstr ""
-
-#: src/gui/palette.cpp:102 src/net/ea/gui/guildtab.cpp:45
-msgid "Guild"
-msgstr ""
-
-#: src/gui/palette.cpp:103
-msgid "Server"
-msgstr ""
-
-#: src/gui/palette.cpp:104
-msgid "Logger"
-msgstr ""
-
-#: src/gui/palette.cpp:105
-msgid "Hyperlink"
-msgstr ""
-
-#: src/gui/palette.cpp:107
-msgid "Being"
-msgstr ""
-
-#: src/gui/palette.cpp:108
-msgid "Other Players' Names"
-msgstr ""
-
-#: src/gui/palette.cpp:109
-msgid "Own Name"
-msgstr ""
-
-#: src/gui/palette.cpp:110
-msgid "GM Names"
-msgstr ""
-
-#: src/gui/palette.cpp:111
-msgid "NPCs"
-msgstr ""
-
-#: src/gui/palette.cpp:112
-msgid "Monsters"
-msgstr ""
-
-#: src/gui/palette.cpp:114
-msgid "Unknown Item Type"
-msgstr ""
-
-#: src/gui/palette.cpp:115
-msgid "Generics"
-msgstr ""
-
-#: src/gui/palette.cpp:116
-msgid "Hats"
-msgstr ""
-
-#: src/gui/palette.cpp:117
-msgid "Usables"
-msgstr ""
-
-#: src/gui/palette.cpp:118
-msgid "Shirts"
-msgstr ""
-
-#: src/gui/palette.cpp:119
-msgid "One Handed Weapons"
-msgstr ""
-
-#: src/gui/palette.cpp:120
-msgid "Pants"
-msgstr ""
-
-#: src/gui/palette.cpp:121
-msgid "Shoes"
-msgstr ""
-
-#: src/gui/palette.cpp:122
-msgid "Two Handed Weapons"
-msgstr ""
-
-#: src/gui/palette.cpp:123
-msgid "Shields"
-msgstr ""
-
-#: src/gui/palette.cpp:124
-msgid "Rings"
-msgstr ""
-
-#: src/gui/palette.cpp:125
-msgid "Necklaces"
-msgstr ""
-
-#: src/gui/palette.cpp:126
-msgid "Arms"
-msgstr ""
-
-#: src/gui/palette.cpp:127
-msgid "Ammo"
-msgstr ""
-
-#: src/gui/palette.cpp:129
-msgid "Particle Effects"
-msgstr ""
-
-#: src/gui/palette.cpp:130
-msgid "Pickup Notification"
-msgstr ""
-
-#: src/gui/palette.cpp:131
-msgid "Exp Notification"
-msgstr ""
-
-#: src/gui/palette.cpp:133
-msgid "Player Hits Monster"
-msgstr ""
-
-#: src/gui/palette.cpp:135
-msgid "Monster Hits Player"
-msgstr ""
-
-#: src/gui/palette.cpp:136
-msgid "Critical Hit"
-msgstr ""
-
-#: src/gui/palette.cpp:137
-msgid "Misses"
-msgstr ""
-
-#: src/gui/palette.cpp:139
-msgid "HP Bar"
-msgstr ""
-
-#: src/gui/palette.cpp:140
-msgid "3/4 HP Bar"
-msgstr ""
-
-#: src/gui/palette.cpp:141
-msgid "1/2 HP Bar"
-msgstr ""
-
-#: src/gui/palette.cpp:142
-msgid "1/4 HP Bar"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:84
+#: src/gui/popupmenu.cpp:83
 #, c-format
 msgid "Trade with %s..."
 msgstr ""
 
-#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:161
+#: src/gui/popupmenu.cpp:87 src/gui/popupmenu.cpp:158
 #, c-format
 msgid "Attack %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:92
+#: src/gui/popupmenu.cpp:91
 #, c-format
 msgid "Whisper %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:101
+#: src/gui/popupmenu.cpp:100
 #, c-format
 msgid "Befriend %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:106
+#: src/gui/popupmenu.cpp:105
 #, c-format
 msgid "Disregard %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:109
+#: src/gui/popupmenu.cpp:108
 #, c-format
 msgid "Ignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:115 src/gui/popupmenu.cpp:124
+#: src/gui/popupmenu.cpp:114 src/gui/popupmenu.cpp:123
 #, c-format
 msgid "Unignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:118
+#: src/gui/popupmenu.cpp:117
 #, c-format
 msgid "Completely ignore %s"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:130
 #, c-format
-msgid "Follow %s"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:133
-#, c-format
 msgid "Invite %s to join your guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:137
+#: src/gui/popupmenu.cpp:134
 #, c-format
 msgid "Invite %s to join your party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144
+#: src/gui/popupmenu.cpp:141
 msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:153
+#: src/gui/popupmenu.cpp:150
 #, c-format
 msgid "Talk to %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:166
+#: src/gui/popupmenu.cpp:163
 msgid "Kick monster"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:174
+#: src/gui/popupmenu.cpp:171
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:191
+#: src/gui/popupmenu.cpp:188
 #, c-format
 msgid "Pick up %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:400
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:387
 msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:70
-msgid "Store"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:71
-msgid "Retrieve"
-msgstr ""
-
 #: src/gui/quitdialog.cpp:44
 msgid "Switch server"
 msgstr ""
@@ -1313,47 +1136,60 @@ msgstr ""
 msgid "Passwords do not match."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:134
+#: src/gui/serverdialog.cpp:197
 msgid "Choose Your Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:141 src/gui/widgets/chattab.cpp:139
+#: src/gui/serverdialog.cpp:206 src/gui/widgets/chattab.cpp:142
 msgid "Server:"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:142
+#: src/gui/serverdialog.cpp:207
 msgid "Port:"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:143
+#: src/gui/serverdialog.cpp:208
 msgid "Server type:"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:183
+#: src/gui/serverdialog.cpp:229
 msgid "Connect"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:184
+#: src/gui/serverdialog.cpp:230
 msgid "Custom Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:262
+#: src/gui/serverdialog.cpp:324
 msgid "Please type both the address and the port of a server."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:411
+#: src/gui/serverdialog.cpp:441
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:417
+#: src/gui/serverdialog.cpp:447
 msgid "Waiting for server..."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:421
+#: src/gui/serverdialog.cpp:451
 msgid "Preparing download"
 msgstr ""
 
+#: src/gui/serverdialog.cpp:455
+msgid "Error retreiving server list!"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:550
+msgid "requires a newer version"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:552
+#, c-format
+msgid "requires v%s"
+msgstr ""
+
 #: src/gui/setup_audio.cpp:42
 msgid "Sound"
 msgstr ""
@@ -1386,50 +1222,50 @@ msgstr ""
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:44
+#: src/gui/setup_colors.cpp:46
 msgid "This is what the color looks like"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:49
+#: src/gui/setup_colors.cpp:51
 msgid "Colors"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:70
+#: src/gui/setup_colors.cpp:72
 msgid "Type:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:81 src/gui/setup_colors.cpp:433
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:331
 msgid "Static"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:84
-#: src/gui/setup_colors.cpp:434
+#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
+#: src/gui/setup_colors.cpp:332
 msgid "Pulse"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
+#: src/gui/setup_colors.cpp:333
 msgid "Rainbow"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
+#: src/gui/setup_colors.cpp:333
 msgid "Spectrum"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:92
+#: src/gui/setup_colors.cpp:94
 msgid "Delay:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:107
+#: src/gui/setup_colors.cpp:109
 msgid "Red:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:122
+#: src/gui/setup_colors.cpp:124
 msgid "Green:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:137
+#: src/gui/setup_colors.cpp:139
 msgid "Blue:"
 msgstr ""
 
@@ -1474,564 +1310,577 @@ msgid "Assign"
 msgstr ""
 
 #: src/gui/setup_keyboard.cpp:90
+msgid "Unassign"
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:94
 msgid "Default"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:119
+#: src/gui/setup_keyboard.cpp:125
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_players.cpp:57
+#: src/gui/setup_players.cpp:58
 msgid "Name"
 msgstr ""
 
-#: src/gui/setup_players.cpp:58
+#: src/gui/setup_players.cpp:59
 msgid "Relation"
 msgstr ""
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:64
 msgid "Neutral"
 msgstr ""
 
-#: src/gui/setup_players.cpp:64
+#: src/gui/setup_players.cpp:65
 msgid "Friend"
 msgstr ""
 
-#: src/gui/setup_players.cpp:65
+#: src/gui/setup_players.cpp:66
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_players.cpp:67
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_players.cpp:208 src/gui/setup_video.cpp:132
+#: src/gui/setup_players.cpp:206 src/gui/setup_video.cpp:153
 msgid "???"
 msgstr ""
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_players.cpp:225
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_players.cpp:228
+#: src/gui/setup_players.cpp:227
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:231
 msgid "Put all whispers in tabs"
 msgstr ""
 
-#: src/gui/setup_players.cpp:234
+#: src/gui/setup_players.cpp:233
 msgid "Show gender"
 msgstr ""
 
-#: src/gui/setup_players.cpp:236
+#: src/gui/setup_players.cpp:235
+msgid "Enable Chat log"
+msgstr ""
+
+#: src/gui/setup_players.cpp:237
 msgid "Players"
 msgstr ""
 
-#: src/gui/setup_players.cpp:261
+#: src/gui/setup_players.cpp:262
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:113
+#: src/gui/setup_video.cpp:134
 msgid "Tiny"
 msgstr ""
 
-#: src/gui/setup_video.cpp:114
+#: src/gui/setup_video.cpp:135
 msgid "Small"
 msgstr ""
 
-#: src/gui/setup_video.cpp:115
+#: src/gui/setup_video.cpp:136
 msgid "Medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:116
+#: src/gui/setup_video.cpp:137
 msgid "Large"
 msgstr ""
 
-#: src/gui/setup_video.cpp:142
+#: src/gui/setup_video.cpp:163
 msgid "No text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:144
+#: src/gui/setup_video.cpp:164
+msgid "Text"
+msgstr ""
+
+#: src/gui/setup_video.cpp:165
 msgid "Bubbles, no names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:145
+#: src/gui/setup_video.cpp:166
 msgid "Bubbles with names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:157
+#: src/gui/setup_video.cpp:178
 msgid "off"
 msgstr ""
 
-#: src/gui/setup_video.cpp:158 src/gui/setup_video.cpp:171
+#: src/gui/setup_video.cpp:179 src/gui/setup_video.cpp:192
 msgid "low"
 msgstr ""
 
-#: src/gui/setup_video.cpp:159 src/gui/setup_video.cpp:173
+#: src/gui/setup_video.cpp:180 src/gui/setup_video.cpp:194
 msgid "high"
 msgstr ""
 
-#: src/gui/setup_video.cpp:172
+#: src/gui/setup_video.cpp:193
 msgid "medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:174
+#: src/gui/setup_video.cpp:195
 msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:196
+#: src/gui/setup_video.cpp:217
 msgid "Full screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:197
+#: src/gui/setup_video.cpp:218
 msgid "OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:198
+#: src/gui/setup_video.cpp:219
 msgid "Custom cursor"
 msgstr ""
 
-#: src/gui/setup_video.cpp:200
+#: src/gui/setup_video.cpp:221
 msgid "Visible names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:223
 msgid "Particle effects"
 msgstr ""
 
-#: src/gui/setup_video.cpp:204
+#: src/gui/setup_video.cpp:225
 msgid "Show own name"
 msgstr ""
 
-#: src/gui/setup_video.cpp:205
+#: src/gui/setup_video.cpp:226
+msgid "Log NPC dialogue"
+msgstr ""
+
+#: src/gui/setup_video.cpp:227
 msgid "Show pickup notification"
 msgstr ""
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:207
+#. TRANSLATORS: Refers to "Show pickup notification"
+#: src/gui/setup_video.cpp:229
 msgid "in chat"
 msgstr ""
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:209
+#. TRANSLATORS: Refers to "Show pickup notification"
+#: src/gui/setup_video.cpp:231
 msgid "as particle"
 msgstr ""
 
-#: src/gui/setup_video.cpp:214
+#: src/gui/setup_video.cpp:236
 msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:225
+#: src/gui/setup_video.cpp:247
+msgid "Disable transparency (Low CPU mode)"
+msgstr ""
+
+#: src/gui/setup_video.cpp:250
 msgid "Video"
 msgstr ""
 
-#: src/gui/setup_video.cpp:227
-msgid "Show monster damage"
+#: src/gui/setup_video.cpp:252
+msgid "Show damage"
 msgstr ""
 
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:258
 msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:259
 msgid "Gui opacity"
 msgstr ""
 
-#: src/gui/setup_video.cpp:235
+#: src/gui/setup_video.cpp:260
 msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_video.cpp:236
+#: src/gui/setup_video.cpp:261
 msgid "Particle detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237
+#: src/gui/setup_video.cpp:262
 msgid "Font size"
 msgstr ""
 
-#: src/gui/setup_video.cpp:251 src/gui/setup_video.cpp:454
-#: src/gui/setup_video.cpp:568
+#: src/gui/setup_video.cpp:277 src/gui/setup_video.cpp:532
+#: src/gui/setup_video.cpp:662
 #, fuzzy
 msgid "None"
 msgstr "Ei"
 
-#: src/gui/setup_video.cpp:381
+#: src/gui/setup_video.cpp:426
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:387
+#: src/gui/setup_video.cpp:432
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:398
+#: src/gui/setup_video.cpp:443
 msgid "Switching to Full Screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:399
+#: src/gui/setup_video.cpp:444
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:411
+#: src/gui/setup_video.cpp:458
 msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:412
+#: src/gui/setup_video.cpp:459
+msgid ""
+"Applying change to OpenGL requires restart. In case OpenGL messes up your "
+"game graphics, restart the game with the command line option \"--no-opengl\"."
+msgstr ""
+
+#: src/gui/setup_video.cpp:466
+msgid "Deactivating OpenGL"
+msgstr ""
+
+#: src/gui/setup_video.cpp:467
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#: src/gui/setup_video.cpp:486 src/gui/setup_video.cpp:491
+#: src/gui/setup_video.cpp:475
+msgid "Transparency disabled"
+msgstr ""
+
+#: src/gui/setup_video.cpp:476 src/gui/setup_video.cpp:484
+msgid "You must restart to apply changes."
+msgstr ""
+
+#: src/gui/setup_video.cpp:483
+msgid "Transparency enabled"
+msgstr ""
+
+#: src/gui/setup_video.cpp:576 src/gui/setup_video.cpp:581
 msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:487 src/gui/setup_video.cpp:492
+#: src/gui/setup_video.cpp:577 src/gui/setup_video.cpp:582
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:489
+#: src/gui/setup_video.cpp:579
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:522
+#: src/gui/setup_video.cpp:612
 msgid "Particle Effect Settings Changed."
 msgstr ""
 
-#: src/gui/setup_video.cpp:523
+#: src/gui/setup_video.cpp:613
 msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skilldialog.cpp:197 src/gui/windowmenu.cpp:58
+#: src/gui/skilldialog.cpp:212 src/gui/windowmenu.cpp:59
 msgid "Skills"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:208
+#: src/gui/skilldialog.cpp:223
 msgid "Up"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:262
+#: src/gui/skilldialog.cpp:269
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:314
+#: src/gui/skilldialog.cpp:351
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:323
+#: src/gui/skilldialog.cpp:360
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:405
+#: src/gui/skilldialog.cpp:442
 #, c-format
 msgid "Lvl: %d (%+d)"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:416
+#: src/gui/skilldialog.cpp:453
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:117
+#: src/gui/socialwindow.cpp:126
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:126
+#: src/gui/socialwindow.cpp:139
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:136
+#: src/gui/socialwindow.cpp:153
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:137
+#: src/gui/socialwindow.cpp:154
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:146
+#: src/gui/socialwindow.cpp:163
 msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:147
+#: src/gui/socialwindow.cpp:164
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:182
+#: src/gui/socialwindow.cpp:207 src/net/tmwa/partyhandler.cpp:330
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:218
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:199
+#: src/gui/socialwindow.cpp:232
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:200
+#: src/gui/socialwindow.cpp:233
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:209
+#: src/gui/socialwindow.cpp:242
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:210
+#: src/gui/socialwindow.cpp:243
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:239
+#: src/gui/socialwindow.cpp:272
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:240 src/gui/socialwindow.cpp:564
+#: src/gui/socialwindow.cpp:273 src/gui/socialwindow.cpp:620
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:279 src/gui/windowmenu.cpp:60
+#: src/gui/socialwindow.cpp:312 src/gui/windowmenu.cpp:64
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:297
+#: src/gui/socialwindow.cpp:330
 msgid "Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:298
+#: src/gui/socialwindow.cpp:331
 msgid "Leave"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:394
+#: src/gui/socialwindow.cpp:443
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:400
+#: src/gui/socialwindow.cpp:449
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:413
+#: src/gui/socialwindow.cpp:462
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:419
+#: src/gui/socialwindow.cpp:468
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:463
+#: src/gui/socialwindow.cpp:497
+msgid "Creating guild failed, please choose a shorter name."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:504
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:477
+#: src/gui/socialwindow.cpp:520
+msgid "Creating party failed, please choose a shorter name."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:527
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:484
+#: src/gui/socialwindow.cpp:541
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:485
+#: src/gui/socialwindow.cpp:542
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:497
+#: src/gui/socialwindow.cpp:554
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:502
+#: src/gui/socialwindow.cpp:559
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:507
+#: src/gui/socialwindow.cpp:564
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:519
+#: src/gui/socialwindow.cpp:576
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:529
+#: src/gui/socialwindow.cpp:585
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:533
+#: src/gui/socialwindow.cpp:589
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:541
+#: src/gui/socialwindow.cpp:597
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:546
+#: src/gui/socialwindow.cpp:602
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:554
+#: src/gui/socialwindow.cpp:610
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:565
+#: src/gui/socialwindow.cpp:621
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:570
+#: src/gui/socialwindow.cpp:626
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:571
+#: src/gui/socialwindow.cpp:627
 msgid "Choose your party's name."
 msgstr ""
 
-#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:59
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:62
 msgid "Specials"
 msgstr ""
 
-#: src/gui/specialswindow.cpp:174
-#, c-format
-msgid "Specials Set %d"
-msgstr ""
-
-#: src/gui/specialswindow.cpp:191
-#, c-format
-msgid "Special %d"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:99 src/gui/statuswindow.cpp:247
+#: src/gui/statuswindow.cpp:113 src/gui/statuswindow.cpp:215
+#: src/gui/statuswindow.cpp:262
 #, c-format
 msgid "Level: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:211
+#: src/gui/statuswindow.cpp:114 src/gui/statuswindow.cpp:208
+#: src/gui/statuswindow.cpp:239
 #, c-format
 msgid "Money: %s"
 msgstr "Raha: %s"
 
-#: src/gui/statuswindow.cpp:102
+#: src/gui/statuswindow.cpp:117
 msgid "HP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:107
+#: src/gui/statuswindow.cpp:122
 msgid "Exp:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:112
+#: src/gui/statuswindow.cpp:130
 msgid "MP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:132 src/gui/statuswindow.cpp:219
+#: src/gui/statuswindow.cpp:158 src/gui/statuswindow.cpp:275
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:133
+#: src/gui/statuswindow.cpp:159
 msgid "Job:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:194
-msgid "HP"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:200
-msgid "MP"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:206
-msgid "Exp"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:215
-#, fuzzy
-msgid "Money"
-msgstr "Raha: %d"
-
-#: src/gui/statuswindow.cpp:225
-msgid "Job"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:229
+#: src/gui/statuswindow.cpp:211 src/gui/statuswindow.cpp:247
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:235
+#: src/gui/statuswindow.cpp:255
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:251
-msgid "Level"
-msgstr ""
-
-#: src/gui/storagewindow.cpp:58
-msgid "Storage"
-msgstr ""
-
-#: src/gui/trade.cpp:52
+#: src/gui/trade.cpp:53
 msgid "Propose trade"
 msgstr ""
 
-#: src/gui/trade.cpp:53
+#: src/gui/trade.cpp:54
 msgid "Confirmed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:55
 msgid "Agree trade"
 msgstr ""
 
-#: src/gui/trade.cpp:55
+#: src/gui/trade.cpp:56
 msgid "Agreed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:58
+#: src/gui/trade.cpp:59
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/trade.cpp:74 src/gui/trade.cpp:75
+#: src/gui/trade.cpp:73 src/gui/trade.cpp:74
 msgid "Trade"
 msgstr ""
 
-#: src/gui/trade.cpp:77
+#: src/gui/trade.cpp:76
 msgid "Add"
 msgstr ""
 
-#: src/gui/trade.cpp:99 src/gui/trade.cpp:135
+#: src/gui/trade.cpp:98 src/gui/trade.cpp:134
 #, c-format
 msgid "You get %s"
 msgstr ""
 
-#: src/gui/trade.cpp:100
+#: src/gui/trade.cpp:99
 msgid "You give:"
 msgstr ""
 
-#: src/gui/trade.cpp:104
+#: src/gui/trade.cpp:103
 msgid "Change"
 msgstr ""
 
-#: src/gui/trade.cpp:275
+#: src/gui/trade.cpp:262
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/trade.cpp:318
+#: src/gui/trade.cpp:304
 msgid "You don't have enough money."
 msgstr ""
 
@@ -2052,21 +1901,21 @@ msgstr ""
 msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:405
+#: src/gui/updatewindow.cpp:417
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:407
+#: src/gui/updatewindow.cpp:419
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:409
+#: src/gui/updatewindow.cpp:421
 msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:501
+#: src/gui/updatewindow.cpp:515
 msgid "Completed"
 msgstr ""
 
@@ -2146,61 +1995,61 @@ msgstr ""
 msgid "Need a user to kick!"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:118
+#: src/gui/widgets/chattab.cpp:121
 msgid "Global announcement:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:124
+#: src/gui/widgets/chattab.cpp:127
 #, c-format
 msgid "Global announcement from %s:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:150
+#: src/gui/widgets/chattab.cpp:153
 #, c-format
 msgid "%s whispers: %s"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:51
+#: src/gui/widgets/whispertab.cpp:53
 msgid "Cannot send empty chat!"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:70
+#: src/gui/widgets/whispertab.cpp:72
 msgid "/ignore > Ignore the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:71
+#: src/gui/widgets/whispertab.cpp:73
 msgid "/unignore > Stop ignoring the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:72
+#: src/gui/widgets/whispertab.cpp:74
 msgid "/close > Close the whisper tab"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:82
+#: src/gui/widgets/whispertab.cpp:84
 msgid "Command: /close"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:83
+#: src/gui/widgets/whispertab.cpp:85
 msgid "This command closes the current whisper tab."
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:87
+#: src/gui/widgets/whispertab.cpp:89
 msgid "Command: /ignore"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:88
+#: src/gui/widgets/whispertab.cpp:90
 msgid "This command ignores the other player regardless of current relations."
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:94
+#: src/gui/widgets/whispertab.cpp:96
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:55
+#: src/gui/windowmenu.cpp:54
 msgid "Status"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:61
+#: src/gui/windowmenu.cpp:65
 msgid "Shortcut"
 msgstr ""
 
@@ -2216,1351 +2065,1365 @@ msgstr ""
 msgid "Choose World"
 msgstr ""
 
-#: src/keyboardconfig.cpp:40
+#: src/keyboardconfig.cpp:39
 msgid "Move Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:41
+#: src/keyboardconfig.cpp:40
 msgid "Move Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:41
 msgid "Move Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:42
 msgid "Move Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:44 src/net/ea/generalhandler.cpp:223
+#: src/keyboardconfig.cpp:43 src/net/tmwa/generalhandler.cpp:237
 msgid "Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:44
 msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:45
 msgid "Smilie"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:46
 msgid "Talk"
 msgstr ""
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:47
 msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:48
 msgid "Target Monster"
 msgstr ""
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboardconfig.cpp:49
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:50
 msgid "Target Player"
 msgstr ""
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:51
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:52
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:53
 msgid "Sit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:54
 msgid "Screenshot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:55
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:56
 msgid "Find Path to Mouse"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58 src/keyboardconfig.cpp:59
-#: src/keyboardconfig.cpp:60 src/keyboardconfig.cpp:61
-#: src/keyboardconfig.cpp:62 src/keyboardconfig.cpp:63
-#: src/keyboardconfig.cpp:64 src/keyboardconfig.cpp:65
-#: src/keyboardconfig.cpp:66 src/keyboardconfig.cpp:67
-#: src/keyboardconfig.cpp:68 src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:57 src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60
+#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62
+#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64
+#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68
 #, c-format
 msgid "Item Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:69
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:70
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:71
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:72
 msgid "Equipment Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:73
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:74
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:75
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:76
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:77
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:78
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:79
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:80
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:81
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:83
+#: src/keyboardconfig.cpp:82
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:83
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86
-#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88
-#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90
-#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92
-#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:84 src/keyboardconfig.cpp:85
+#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:87
+#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:89
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:91
+#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:93
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:95
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:96
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:97
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:98
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:99
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:100
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:101
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:103
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:105
+#: src/keyboardconfig.cpp:104
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:178
+#: src/keyboardconfig.cpp:183
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:913
+#: src/localplayer.cpp:985
 msgid "Unable to pick up item."
 msgstr ""
 
 #. TRANSLATORS: This sentence may be translated differently
 #. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:922
+#: src/localplayer.cpp:994
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/main.cpp:43
+#: src/main.cpp:42
 msgid "mana [options] [mana-file]"
 msgstr ""
 
+#: src/main.cpp:43
+msgid "[mana-file] : The mana file is an XML file (.mana)"
+msgstr ""
+
 #: src/main.cpp:44
-msgid "Options:"
+msgid "              used to set custom parameters"
 msgstr ""
 
 #: src/main.cpp:45
+msgid "              to the mana client."
+msgstr ""
+
+#: src/main.cpp:47
+msgid "Options:"
+msgstr ""
+
+#: src/main.cpp:48
 msgid "  -v --version        : Display the version"
 msgstr ""
 
-#: src/main.cpp:46
+#: src/main.cpp:49
 msgid "  -h --help           : Display this help"
 msgstr ""
 
-#: src/main.cpp:47
+#: src/main.cpp:50
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
-#: src/main.cpp:48
+#: src/main.cpp:51
 msgid "  -U --username       : Login with this username"
 msgstr ""
 
-#: src/main.cpp:49
+#: src/main.cpp:52
 msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/main.cpp:50
+#: src/main.cpp:53
 msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/main.cpp:51
+#: src/main.cpp:54
 msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:52
+#: src/main.cpp:55
 msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/main.cpp:53
+#: src/main.cpp:56
 msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/main.cpp:54
+#: src/main.cpp:57
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:56
+#: src/main.cpp:59
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:57
+#: src/main.cpp:60
 msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:58
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
+#: src/main.cpp:61
+msgid "     --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/main.cpp:59
+#: src/main.cpp:62
+msgid "     --chat-log-dir   : Chat log dir to use"
+msgstr ""
+
+#: src/main.cpp:63
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/main.cpp:61
+#: src/main.cpp:65
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:63
+#: src/net/manaserv/beinghandler.cpp:303 src/net/tmwa/playerhandler.cpp:94
+msgid "You are dead."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:304 src/net/tmwa/playerhandler.cpp:95
+msgid "We regret to inform you that your character was killed in battle."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:306 src/net/tmwa/playerhandler.cpp:97
+msgid "You are not that alive anymore."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:307 src/net/tmwa/playerhandler.cpp:98
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:308 src/net/tmwa/playerhandler.cpp:99
+msgid "Game Over!"
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:309 src/net/tmwa/playerhandler.cpp:101
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:311 src/net/tmwa/playerhandler.cpp:103
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:313 src/net/tmwa/playerhandler.cpp:105
+msgid "I guess this did not run too well."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:107
+msgid "Do you want your possessions identified?"
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:109
+msgid "Sadly, no trace of you was ever found..."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:111
+msgid "Annihilated."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:113
+msgid "Looks like you got your head handed to you."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:115
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:323
+msgid "Press OK to respawn."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:324
+msgid "You Died"
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:138 src/net/manaserv/charhandler.cpp:209
+msgid "Not logged in."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:141
+msgid "No empty slot."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:144
+msgid "Invalid name."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:147
+msgid "Character's name already exists."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:150
+msgid "Invalid hairstyle."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:153
+msgid "Invalid hair color."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:156
+msgid "Invalid gender."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:159
+msgid "Character's stats are too high."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:162
+msgid "Character's stats are too low."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:165
+#, c-format
+msgid "At least one statis out of the permitted range: (%u - %u)."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:171 src/net/manaserv/loginhandler.cpp:96
+#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
+#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
+#: src/net/tmwa/loginhandler.cpp:95 src/net/tmwa/loginhandler.cpp:182
+msgid "Unknown error."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:200 src/net/tmwa/charserverhandler.cpp:146
+msgid "Info"
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:200
+msgid "Player deleted."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:212
+msgid "Selection out of range."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:215
+#, c-format
+msgid "Unknown error (%d)."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:250
+msgid "No gameservers are available."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:187 src/net/manaserv/chathandler.cpp:313
+#: src/net/manaserv/guildhandler.cpp:260
+#, c-format
+msgid "Topic: %s"
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:274
+msgid "Players in this channel:"
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:208
+msgid "Error joining channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:214
+msgid "Listing channels."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:226
+msgid "End of channel list."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:303
+#, c-format
+msgid "%s entered the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:308
+#, c-format
+msgid "%s left the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:324
+#, c-format
+msgid "%s has set mode %s on user %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:334
+#, c-format
+msgid "%s has kicked %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:339
+msgid "Unknown channel event."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:82
+msgid "Guild created."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:87
+msgid "Error creating guild."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:97
+msgid "Invite sent."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:204
+msgid "Member was promoted successfully."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:209
+msgid "Failed to promote member."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:87
+msgid "Wrong magic_token."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
+msgid "Already logged in."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:93
+msgid "Account banned."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:118
+msgid "New password incorrect."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:121 src/net/tmwa/loginhandler.cpp:89
+msgid "Old password incorrect."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
+msgid "Account not connected. Please login first."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:149
+msgid "New email address incorrect."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:152
+msgid "Old email address incorrect."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:158
+msgid "The new email address already exists."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:239
+msgid ""
+"Client registration is not allowed. Please contact server administration."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
+msgid "Client version is too old."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:266
+msgid "Wrong username or password."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:272
+msgid "Account banned"
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:275
+msgid "Login attempt too soon after previous attempt."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:303
+msgid "Wrong username, password or email address."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:306
+msgid "Username already exists."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:309
+msgid "Email address already exists."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:312
+msgid "You took too long with the captcha or your response was incorrect."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:87
+msgid "Joined party."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:105
+#, c-format
+msgid "%s joined the party."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:123
+#, c-format
+msgid "%s rejected your invite."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:95
+msgid "Accepting incoming trade requests."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:97
+msgid "Ignoring incoming trade requests."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:115 src/net/tmwa/tradehandler.cpp:109
+msgid "Request for Trade"
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:116 src/net/tmwa/tradehandler.cpp:110
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:134
+#, c-format
+msgid "Trading with %s"
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:148 src/net/tmwa/tradehandler.cpp:224
+msgid "Trade canceled."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:155 src/net/tmwa/tradehandler.cpp:231
+msgid "Trade completed."
+msgstr ""
+
+#: src/net/tmwa/adminhandler.cpp:64
 msgid "Kick failed!"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:65
+#: src/net/tmwa/adminhandler.cpp:66
 msgid "Kick succeeded!"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:110
+#: src/net/tmwa/buysellhandler.cpp:109
 msgid "Nothing to sell."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:117
+#: src/net/tmwa/buysellhandler.cpp:116
 msgid "Thanks for buying."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:124
+#: src/net/tmwa/buysellhandler.cpp:123
 msgid "Unable to buy."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:130
+#: src/net/tmwa/buysellhandler.cpp:129
 msgid "Thanks for selling."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:132
+#: src/net/tmwa/buysellhandler.cpp:131
 msgid "Unable to sell."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:103
-msgid "Access denied."
+#: src/net/tmwa/charserverhandler.cpp:103
+msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:106
+#: src/net/tmwa/charserverhandler.cpp:107
 msgid "Cannot use this ID."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:109
-msgid "Unknown failure to select character."
+#: src/net/tmwa/charserverhandler.cpp:110
+msgid "Unknown char-server failure."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:135
+#: src/net/tmwa/charserverhandler.cpp:134
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:147 src/net/manaserv/charhandler.cpp:187
-msgid "Info"
-msgstr ""
-
-#: src/net/ea/charserverhandler.cpp:147
+#: src/net/tmwa/charserverhandler.cpp:146
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:152
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Failed to delete character."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:237 src/net/manaserv/charhandler.cpp:263
+#: src/net/tmwa/charserverhandler.cpp:266
 msgid "Strength:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:238 src/net/manaserv/charhandler.cpp:264
+#: src/net/tmwa/charserverhandler.cpp:267
 msgid "Agility:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:239 src/net/manaserv/charhandler.cpp:266
+#: src/net/tmwa/charserverhandler.cpp:268
 msgid "Vitality:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:240 src/net/manaserv/charhandler.cpp:267
+#: src/net/tmwa/charserverhandler.cpp:269
 msgid "Intelligence:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:241 src/net/manaserv/charhandler.cpp:265
+#: src/net/tmwa/charserverhandler.cpp:270
 msgid "Dexterity:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:242
+#: src/net/tmwa/charserverhandler.cpp:271
 msgid "Luck:"
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:80
-msgid "Whisper could not be sent, user is offline."
+#: src/net/tmwa/chathandler.cpp:87
+#, c-format
+msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:84
-msgid "Whisper could not be sent, ignored by user."
+#: src/net/tmwa/chathandler.cpp:96
+#, c-format
+msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:171
+#: src/net/tmwa/chathandler.cpp:230
 msgid "MVP player."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:204 src/net/ea/chathandler.cpp:210
-#: src/net/ea/chathandler.cpp:215 src/net/ea/chathandler.cpp:220
-#: src/net/ea/chathandler.cpp:225 src/net/ea/chathandler.cpp:230
-#: src/net/ea/chathandler.cpp:235 src/net/ea/chathandler.cpp:240
+#: src/net/tmwa/chathandler.cpp:265 src/net/tmwa/chathandler.cpp:271
+#: src/net/tmwa/chathandler.cpp:276 src/net/tmwa/chathandler.cpp:281
+#: src/net/tmwa/chathandler.cpp:286 src/net/tmwa/chathandler.cpp:291
+#: src/net/tmwa/chathandler.cpp:296 src/net/tmwa/chathandler.cpp:301
 msgid "Channels are not supported!"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:86
+#: src/net/tmwa/gamehandler.cpp:88
 #, c-format
 msgid "Online users: %d"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:100
+#: src/net/tmwa/gamehandler.cpp:101
 msgid "Game"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:100
+#: src/net/tmwa/gamehandler.cpp:101
 msgid "Request to quit denied!"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:102 src/net/manaserv/generalhandler.cpp:95
+#: src/net/tmwa/generalhandler.cpp:102
 #, c-format
 msgid "Strength %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:103 src/net/manaserv/generalhandler.cpp:96
+#: src/net/tmwa/generalhandler.cpp:103
 #, c-format
 msgid "Agility %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:104 src/net/manaserv/generalhandler.cpp:98
+#: src/net/tmwa/generalhandler.cpp:104
 #, c-format
 msgid "Vitality %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:105 src/net/manaserv/generalhandler.cpp:99
+#: src/net/tmwa/generalhandler.cpp:105
 #, c-format
 msgid "Intelligence %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:106 src/net/manaserv/generalhandler.cpp:97
+#: src/net/tmwa/generalhandler.cpp:106
 #, c-format
 msgid "Dexterity %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:107
+#: src/net/tmwa/generalhandler.cpp:107
 #, c-format
 msgid "Luck %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:130
+#: src/net/tmwa/generalhandler.cpp:132
 msgid "Authentication failed."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:133
+#: src/net/tmwa/generalhandler.cpp:135
 msgid "No servers available."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:137
+#: src/net/tmwa/generalhandler.cpp:139
 msgid "Someone else is trying to use this account."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:140
+#: src/net/tmwa/generalhandler.cpp:142
 msgid "This account is already logged in."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:143
+#: src/net/tmwa/generalhandler.cpp:145
 msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:146
+#: src/net/tmwa/generalhandler.cpp:148
 msgid "Duplicated login."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:149
+#: src/net/tmwa/generalhandler.cpp:151
 msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:205
+#: src/net/tmwa/generalhandler.cpp:209
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:216 src/net/manaserv/generalhandler.cpp:166
+#: src/net/tmwa/generalhandler.cpp:230
 msgid "Strength"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:217 src/net/manaserv/generalhandler.cpp:167
+#: src/net/tmwa/generalhandler.cpp:231
 msgid "Agility"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:218 src/net/manaserv/generalhandler.cpp:169
+#: src/net/tmwa/generalhandler.cpp:232
 msgid "Vitality"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:219 src/net/manaserv/generalhandler.cpp:170
+#: src/net/tmwa/generalhandler.cpp:233
 msgid "Intelligence"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:220 src/net/manaserv/generalhandler.cpp:168
+#: src/net/tmwa/generalhandler.cpp:234
 msgid "Dexterity"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:221
+#: src/net/tmwa/generalhandler.cpp:235
 msgid "Luck"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:224
+#: src/net/tmwa/generalhandler.cpp:238
 #, fuzzy
 msgid "Defense"
 msgstr "Kustuta"
 
-#: src/net/ea/generalhandler.cpp:225
+#: src/net/tmwa/generalhandler.cpp:239
 msgid "M.Attack"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:226
+#: src/net/tmwa/generalhandler.cpp:240
 msgid "M.Defense"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:227
+#: src/net/tmwa/generalhandler.cpp:241
 #, c-format
 msgid "% Accuracy"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:228
+#: src/net/tmwa/generalhandler.cpp:242
 #, c-format
 msgid "% Evade"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:229
+#: src/net/tmwa/generalhandler.cpp:243
 #, c-format
 msgid "% Critical"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:61 src/net/ea/gui/partytab.cpp:59
+#: src/net/tmwa/gui/guildtab.cpp:45
+msgid "Guild"
+msgstr ""
+
+#: src/net/tmwa/gui/guildtab.cpp:61 src/net/tmwa/gui/partytab.cpp:59
 msgid "/help > Display this help."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:62
+#: src/net/tmwa/gui/guildtab.cpp:62
 msgid "/invite > Invite a player to your guild"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:63
+#: src/net/tmwa/gui/guildtab.cpp:63
 msgid "/leave > Leave the guild you are in"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:64
+#: src/net/tmwa/gui/guildtab.cpp:64
 msgid "/kick > Kick some one from the guild you are in"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:73 src/net/ea/gui/partytab.cpp:73
+#: src/net/tmwa/gui/guildtab.cpp:73 src/net/tmwa/gui/partytab.cpp:73
 msgid "Command: /invite <nick>"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:74
+#: src/net/tmwa/gui/guildtab.cpp:74
 msgid "This command invites <nick> to the guild you're in."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:80 src/net/ea/gui/partytab.cpp:80
+#: src/net/tmwa/gui/guildtab.cpp:80 src/net/tmwa/gui/partytab.cpp:80
 msgid "Command: /leave"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:81
+#: src/net/tmwa/gui/guildtab.cpp:81
 msgid "This command causes the player to leave the guild."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:89
+#: src/net/tmwa/gui/guildtab.cpp:89
 msgid "Guild name is missing."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:293
+#: src/net/tmwa/guildhandler.cpp:296
 msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:298
+#: src/net/tmwa/guildhandler.cpp:301
 msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:303
+#: src/net/tmwa/guildhandler.cpp:306
 msgid "User is now part of your guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:308
+#: src/net/tmwa/guildhandler.cpp:311
 msgid "Your guild is full."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:313
+#: src/net/tmwa/guildhandler.cpp:316
 msgid "Unknown guild invite response."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:390
+#: src/net/tmwa/guildhandler.cpp:393
 msgid "Guild creation isn't supported yet."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:60
+#: src/net/tmwa/gui/partytab.cpp:43
+msgid "Party"
+msgstr ""
+
+#: src/net/tmwa/gui/partytab.cpp:60
 msgid "/invite > Invite a player to your party"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:61
+#: src/net/tmwa/gui/partytab.cpp:61
 msgid "/leave > Leave the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:62
+#: src/net/tmwa/gui/partytab.cpp:62
 msgid "/kick > Kick some one from the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:63
+#: src/net/tmwa/gui/partytab.cpp:63
 msgid "/item > Show/change party item sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:64
+#: src/net/tmwa/gui/partytab.cpp:64
 msgid "/exp > Show/change party experience sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:81
+#: src/net/tmwa/gui/partytab.cpp:81
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:85
+#: src/net/tmwa/gui/partytab.cpp:85
 msgid "Command: /item <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:86
+#: src/net/tmwa/gui/partytab.cpp:86
 msgid "This command changes the party's item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:87
+#: src/net/tmwa/gui/partytab.cpp:87
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:90
+#: src/net/tmwa/gui/partytab.cpp:90
 msgid "Command: /item"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/tmwa/gui/partytab.cpp:91
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/tmwa/gui/partytab.cpp:95
 msgid "Command: /exp <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:96
+#: src/net/tmwa/gui/partytab.cpp:96
 msgid "This command changes the party's experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/tmwa/gui/partytab.cpp:97
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:100
+#: src/net/tmwa/gui/partytab.cpp:100
 msgid "Command: /exp"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/tmwa/gui/partytab.cpp:101
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:132 src/net/ea/partyhandler.cpp:198
+#: src/net/tmwa/gui/partytab.cpp:132 src/net/tmwa/partyhandler.cpp:196
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:135 src/net/ea/partyhandler.cpp:204
+#: src/net/tmwa/gui/partytab.cpp:135 src/net/tmwa/partyhandler.cpp:202
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:138 src/net/ea/partyhandler.cpp:210
+#: src/net/tmwa/gui/partytab.cpp:138 src/net/tmwa/partyhandler.cpp:208
 msgid "Item sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:141
+#: src/net/tmwa/gui/partytab.cpp:141
 msgid "Item sharing unknown."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:167 src/net/ea/partyhandler.cpp:174
+#: src/net/tmwa/gui/partytab.cpp:167 src/net/tmwa/partyhandler.cpp:172
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:170 src/net/ea/partyhandler.cpp:180
+#: src/net/tmwa/gui/partytab.cpp:170 src/net/tmwa/partyhandler.cpp:178
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:173 src/net/ea/partyhandler.cpp:186
+#: src/net/tmwa/gui/partytab.cpp:173 src/net/tmwa/partyhandler.cpp:184
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:176
+#: src/net/tmwa/gui/partytab.cpp:176
 msgid "Experience sharing unknown."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:281
+#: src/net/tmwa/inventoryhandler.cpp:285
 msgid "Failed to use item."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:391
+#: src/net/tmwa/inventoryhandler.cpp:399
 msgid "Unable to equip."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:402
+#: src/net/tmwa/inventoryhandler.cpp:410
 msgid "Unable to unequip."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:79
+#: src/net/tmwa/loginhandler.cpp:86
 msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:82 src/net/manaserv/loginhandler.cpp:121
-msgid "Old password incorrect."
-msgstr ""
-
-#: src/net/ea/loginhandler.cpp:85
+#: src/net/tmwa/loginhandler.cpp:92
 msgid "New password too short."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:88 src/net/ea/loginhandler.cpp:175
-#: src/net/manaserv/charhandler.cpp:158 src/net/manaserv/loginhandler.cpp:96
-#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
-#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
-msgid "Unknown error."
-msgstr ""
-
-#: src/net/ea/loginhandler.cpp:149
+#: src/net/tmwa/loginhandler.cpp:156
 msgid "Unregistered ID."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:152
+#: src/net/tmwa/loginhandler.cpp:159
 msgid "Wrong password."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:155
+#: src/net/tmwa/loginhandler.cpp:162
 msgid "Account expired."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:158
+#: src/net/tmwa/loginhandler.cpp:165
 msgid "Rejected from server."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:161
+#: src/net/tmwa/loginhandler.cpp:168
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:165
+#: src/net/tmwa/loginhandler.cpp:172
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:172
+#: src/net/tmwa/loginhandler.cpp:179
 msgid "This user name is already taken."
 msgstr ""
 
-#: src/net/ea/network.cpp:145
+#: src/net/tmwa/network.cpp:145
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/ea/network.cpp:345
+#: src/net/tmwa/network.cpp:345
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/ea/network.cpp:414
+#: src/net/tmwa/network.cpp:414
 msgid "Connection to server terminated. "
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:81
+#: src/net/tmwa/partyhandler.cpp:82
 msgid "Could not create party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:84
+#: src/net/tmwa/partyhandler.cpp:84
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:118
+#: src/net/tmwa/partyhandler.cpp:119
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:122
+#: src/net/tmwa/partyhandler.cpp:123
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:126
+#: src/net/tmwa/partyhandler.cpp:127
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:130
+#: src/net/tmwa/partyhandler.cpp:131
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:238
+#: src/net/tmwa/partyhandler.cpp:236
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:249
+#: src/net/tmwa/partyhandler.cpp:246
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:301
+#: src/net/tmwa/partyhandler.cpp:299
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:329
-msgid "Inviting like this isn't supported at the moment."
+#: src/net/tmwa/partyhandler.cpp:335
+#, c-format
+msgid "Inviting failed, because you can't see a player called %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:334
+#: src/net/tmwa/partyhandler.cpp:340
 msgid "You can only inivte when you are in a party!"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:365
+#: src/net/tmwa/partyhandler.cpp:368
 #, c-format
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:304
-msgid "You are dead."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:305
-msgid "We regret to inform you that your character was killed in battle."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:307
-msgid "You are not that alive anymore."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:308
-msgid "The cold hands of the grim reaper are grabbing for your soul."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:309
-msgid "Game Over!"
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:105
+#: src/net/tmwa/playerhandler.cpp:100
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:310
-msgid ""
-"No, kids. Your character did not really die. It... err... went to a better "
-"place."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:312
-msgid ""
-"Your plan of breaking your enemies weapon by bashing it with your throat "
-"failed."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:314
-msgid "I guess this did not run too well."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:315
-msgid "Do you want your possessions identified?"
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:316
-msgid "Sadly, no trace of you was ever found..."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:317
-msgid "Annihilated."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:318
-msgid "Looks like you got your head handed to you."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:120 src/net/manaserv/beinghandler.cpp:319
-msgid ""
-"You screwed up again, dump your body down the tubes and get you another one."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/tmwa/playerhandler.cpp:118
 msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/tmwa/playerhandler.cpp:119
 msgid "You are no more."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/tmwa/playerhandler.cpp:120
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/tmwa/playerhandler.cpp:121
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/tmwa/playerhandler.cpp:122
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/tmwa/playerhandler.cpp:123
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/tmwa/playerhandler.cpp:124
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:130
+#: src/net/tmwa/playerhandler.cpp:125
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:131
+#: src/net/tmwa/playerhandler.cpp:126
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/tmwa/playerhandler.cpp:127
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/tmwa/playerhandler.cpp:128
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:135
+#: src/net/tmwa/playerhandler.cpp:130
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:136
+#: src/net/tmwa/playerhandler.cpp:131
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:249 src/net/ea/playerhandler.cpp:310
+#: src/net/tmwa/playerhandler.cpp:246 src/net/tmwa/playerhandler.cpp:285
 msgid "Message"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:250
+#: src/net/tmwa/playerhandler.cpp:247
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:333
+#: src/net/tmwa/playerhandler.cpp:313
 #, c-format
 msgid "You picked up %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:369
+#: src/net/tmwa/playerhandler.cpp:348
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:532
+#: src/net/tmwa/playerhandler.cpp:488
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:147
+#: src/net/tmwa/specialhandler.cpp:144
 msgid "Trade failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:150
+#: src/net/tmwa/specialhandler.cpp:147
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:153
+#: src/net/tmwa/specialhandler.cpp:150
 msgid "Sit failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:156
+#: src/net/tmwa/specialhandler.cpp:153
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:159
+#: src/net/tmwa/specialhandler.cpp:156
 msgid "Could not join party!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:162
+#: src/net/tmwa/specialhandler.cpp:159
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:171
+#: src/net/tmwa/specialhandler.cpp:168
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:174
+#: src/net/tmwa/specialhandler.cpp:171
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:177
+#: src/net/tmwa/specialhandler.cpp:174
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:180
+#: src/net/tmwa/specialhandler.cpp:177
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:183
+#: src/net/tmwa/specialhandler.cpp:180
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:186
+#: src/net/tmwa/specialhandler.cpp:183
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:189
+#: src/net/tmwa/specialhandler.cpp:186
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:192
+#: src/net/tmwa/specialhandler.cpp:189
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:195
+#: src/net/tmwa/specialhandler.cpp:192
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:198
+#: src/net/tmwa/specialhandler.cpp:195
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:201
+#: src/net/tmwa/specialhandler.cpp:198
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:210
+#: src/net/tmwa/specialhandler.cpp:207
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:213
+#: src/net/tmwa/specialhandler.cpp:210
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:216
+#: src/net/tmwa/specialhandler.cpp:213
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:116
-msgid "Request for Trade"
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:108 src/net/manaserv/tradehandler.cpp:117
-#, c-format
-msgid "%s wants to trade with you, do you accept?"
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:124
+#: src/net/tmwa/tradehandler.cpp:126
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:128
+#: src/net/tmwa/tradehandler.cpp:130
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:132
+#: src/net/tmwa/tradehandler.cpp:134
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:137
+#: src/net/tmwa/tradehandler.cpp:139
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:144
+#: src/net/tmwa/tradehandler.cpp:146
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:153
+#: src/net/tmwa/tradehandler.cpp:154
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:202
+#: src/net/tmwa/tradehandler.cpp:202
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:207
+#: src/net/tmwa/tradehandler.cpp:207
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:211
+#: src/net/tmwa/tradehandler.cpp:211
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:224 src/net/manaserv/tradehandler.cpp:149
-msgid "Trade canceled."
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:231 src/net/manaserv/tradehandler.cpp:156
-msgid "Trade completed."
-msgstr ""
-
-#: src/net/manaserv/beinghandler.cpp:324
-msgid "Press OK to respawn."
-msgstr ""
-
-#: src/net/manaserv/beinghandler.cpp:325
-msgid "You Died"
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:128 src/net/manaserv/charhandler.cpp:196
-msgid "Not logged in."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:131
-msgid "No empty slot."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:134
-msgid "Invalid name."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:137
-msgid "Character's name already exists."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:140
-msgid "Invalid hairstyle."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:143
-msgid "Invalid hair color."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:146
-msgid "Invalid gender."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:149
-msgid "Character's stats are too high."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:152
-msgid "Character's stats are too low."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:155
-msgid "One stat is zero."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:187
-msgid "Player deleted."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:199
-msgid "Selection out of range."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:202
-#, c-format
-msgid "Unknown error (%d)."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:242
-msgid "No gameservers are available."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:268
-msgid "Willpower:"
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
-#: src/net/manaserv/guildhandler.cpp:259
-#, c-format
-msgid "Topic: %s"
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
-msgid "Players in this channel:"
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:201
-msgid "Error joining channel."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:207
-msgid "Listing channels."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:219
-msgid "End of channel list."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:291
-#, c-format
-msgid "%s entered the channel."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:296
-#, c-format
-msgid "%s left the channel."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:312
-#, c-format
-msgid "%s has set mode %s on user %s."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:322
-#, c-format
-msgid "%s has kicked %s."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:327
-msgid "Unknown channel event."
-msgstr ""
-
-#: src/net/manaserv/generalhandler.cpp:100
-#, c-format
-msgid "Willpower %+d"
-msgstr ""
-
-#: src/net/manaserv/generalhandler.cpp:171
-msgid "Willpower"
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:81
-msgid "Guild created."
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:86
-msgid "Error creating guild."
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:96
-msgid "Invite sent."
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:203
-msgid "Member was promoted successfully."
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:208
-msgid "Failed to promote member."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:87
-msgid "Wrong magic_token."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
-msgid "Already logged in."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:93 src/net/manaserv/loginhandler.cpp:272
-msgid "Server is full."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:118
-msgid "New password incorrect."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
-msgid "Account not connected. Please login first."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:149
-msgid "New email address incorrect."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:152
-msgid "Old email address incorrect."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:158
-msgid "The new email address already exists."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:239
-msgid ""
-"Client registration is not allowed. Please contact server administration."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
-msgid "Client version is too old."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:266
-msgid "Wrong username or password."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:275
-msgid "Login attempt too soon after previous attempt."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:303
-msgid "Wrong username, password or email address."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:306
-msgid "Username already exists."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:309
-msgid "Email address already exists."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:312
-msgid "You took too long with the captcha or your response was incorrect."
-msgstr ""
-
-#: src/net/manaserv/partyhandler.cpp:88
-msgid "Joined party."
-msgstr ""
-
-#: src/net/manaserv/partyhandler.cpp:106
-#, c-format
-msgid "%s joined the party."
-msgstr ""
-
-#: src/net/manaserv/partyhandler.cpp:123
-#, c-format
-msgid "%s rejected your invite."
-msgstr ""
-
-#: src/net/manaserv/tradehandler.cpp:96
-msgid "Accepting incoming trade requests."
-msgstr ""
-
-#: src/net/manaserv/tradehandler.cpp:98
-msgid "Ignoring incoming trade requests."
-msgstr ""
-
-#: src/net/manaserv/tradehandler.cpp:135
-#, c-format
-msgid "Trading with %s"
-msgstr ""
-
-#: src/playerrelations.cpp:304
+#: src/playerrelations.cpp:310
 msgid "Completely ignore"
 msgstr ""
 
-#: src/playerrelations.cpp:318
+#: src/playerrelations.cpp:324
 msgid "Print '...'"
 msgstr ""
 
-#: src/playerrelations.cpp:334
+#: src/playerrelations.cpp:340
 msgid "Blink name"
 msgstr ""
 
-#: src/playerrelations.cpp:371
-msgid "Floating '...' bubble"
-msgstr ""
-
-#: src/playerrelations.cpp:374
-msgid "Floating bubble"
-msgstr ""
-
-#: src/resources/itemdb.cpp:52
+#: src/resources/itemdb.cpp:44
 #, c-format
 msgid "Attack %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:53
+#: src/resources/itemdb.cpp:45
 #, c-format
 msgid "Defense %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:54
+#: src/resources/itemdb.cpp:46
 #, c-format
 msgid "HP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:55
+#: src/resources/itemdb.cpp:47
 #, c-format
 msgid "MP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:114
+#: src/resources/itemdb.cpp:92
 msgid "Unknown item"
 msgstr ""
 
-#: src/resources/itemdb.cpp:158 src/resources/monsterdb.cpp:45
-#: src/resources/monsterdb.cpp:67
+#: src/resources/itemdb.cpp:135 src/resources/monsterdb.cpp:77
 msgid "unnamed"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Money"
+#~ msgstr "Raha: %d"
+
 #~ msgid "Previous"
 #~ msgstr "Eelmine"
 
diff --git a/po/fa.po b/po/fa.po
index c85fa485..f8d7f741 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2010-03-05 21:52+0100\n"
+"POT-Creation-Date: 2010-12-13 20:04+0100\n"
 "PO-Revision-Date: 2009-07-24 18:21+0000\n"
 "Last-Translator: kasra5004 <kasra5004@yahoo.com>\n"
 "Language-Team: Persian <fa@li.org>\n"
+"Language: fa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,440 +19,454 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/client.cpp:553 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:62
+#: src/client.cpp:598 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
 msgid "Setup"
 msgstr ""
 
-#: src/client.cpp:623
+#: src/client.cpp:679
 #, fuzzy
 msgid "Connecting to server"
 msgstr "در حال اتصال..."
 
-#: src/client.cpp:650
+#: src/client.cpp:706
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:683
+#: src/client.cpp:739
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:739
+#: src/client.cpp:804
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:768
+#: src/client.cpp:833
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:799 src/client.cpp:806 src/client.cpp:940
+#: src/client.cpp:843
+#, fuzzy
+msgid "Changing game servers"
+msgstr "در حال اتصال..."
+
+#: src/client.cpp:872 src/client.cpp:879 src/client.cpp:1014
 #: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
 #: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
-#: src/gui/serverdialog.cpp:261 src/gui/unregisterdialog.cpp:133
-#: src/net/ea/charserverhandler.cpp:135 src/net/ea/charserverhandler.cpp:152
-#: src/net/manaserv/charhandler.cpp:161 src/net/manaserv/charhandler.cpp:204
+#: src/gui/serverdialog.cpp:323 src/gui/unregisterdialog.cpp:133
+#: src/net/manaserv/charhandler.cpp:174 src/net/manaserv/charhandler.cpp:217
+#: src/net/tmwa/charserverhandler.cpp:134
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Error"
 msgstr "خطا"
 
-#: src/client.cpp:815
+#: src/client.cpp:888
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:842
+#: src/client.cpp:915
 #, fuzzy
 msgid "Password Change"
 msgstr "گذرواژه:"
 
-#: src/client.cpp:843
+#: src/client.cpp:916
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:862
+#: src/client.cpp:935
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:863
+#: src/client.cpp:936
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:883
+#: src/client.cpp:956
 #, fuzzy
 msgid "Unregister Successful"
 msgstr "ثبت نام نشده"
 
-#: src/client.cpp:884
+#: src/client.cpp:957
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1007 src/client.cpp:1030
+#: src/client.cpp:1138 src/client.cpp:1161
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1119
+#: src/client.cpp:1281
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1153 src/client.cpp:1159
+#: src/client.cpp:1315 src/client.cpp:1321
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/commandhandler.cpp:127 src/commandhandler.cpp:308
+#: src/commandhandler.cpp:131 src/commandhandler.cpp:317
 msgid "Unknown command."
 msgstr "چنین دستور وجود ندارد"
 
-#: src/commandhandler.cpp:156
+#: src/commandhandler.cpp:160
 msgid "-- Help --"
 msgstr "رهنما"
 
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:161
 msgid "/help > Display this help"
 msgstr "صفحه ی راهنما را نشان می دهد"
 
-#: src/commandhandler.cpp:159
+#: src/commandhandler.cpp:163
 msgid "/where > Display map name"
 msgstr "نام نقشه ی حاضر را نشان می دهد"
 
-#: src/commandhandler.cpp:160
+#: src/commandhandler.cpp:164
 msgid "/who > Display number of online users"
 msgstr "تعداد افراد آنلاین را نشان می دهد"
 
-#: src/commandhandler.cpp:161
+#: src/commandhandler.cpp:165
 msgid "/me > Tell something about yourself"
 msgstr "با این فرمان می توانید به سایرین چیزی در مورد خودتان بگویید"
 
-#: src/commandhandler.cpp:163
+#: src/commandhandler.cpp:167
 msgid "/clear > Clears this window"
 msgstr "صفحه را پاک می کند"
 
-#: src/commandhandler.cpp:165
+#: src/commandhandler.cpp:169
 msgid "/msg > Send a private message to a user"
 msgstr "می توانید با این فرمان پیغام خصوصی بفرستید"
 
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:170
 msgid "/whisper > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:167
+#: src/commandhandler.cpp:171
 msgid "/w > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:168
+#: src/commandhandler.cpp:172
 msgid "/query > Makes a tab for private messages with another user"
 msgstr ""
 "با این دستور می توانید یک شاخه برای پیغام های خصوصی  کاربری دیگر ، درست کنید"
 
-#: src/commandhandler.cpp:169
+#: src/commandhandler.cpp:174
 msgid "/q > Alias of query"
 msgstr ""
 
-#: src/commandhandler.cpp:171
+#: src/commandhandler.cpp:176
 msgid "/ignore > ignore a player"
 msgstr ""
 
-#: src/commandhandler.cpp:172
+#: src/commandhandler.cpp:177
 msgid "/unignore > stop ignoring a player"
 msgstr ""
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:179
 msgid "/list > Display all public channels"
 msgstr "تمامی کانال های عمومی را نشان می دهد"
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:180
 msgid "/join > Join or create a channel"
 msgstr "با این دستور می توانید به یک کانال بپیوندید یا یکی درست کنید"
 
-#: src/commandhandler.cpp:177
+#: src/commandhandler.cpp:182
 #, fuzzy
 msgid "/createparty > Create a new party"
 msgstr "می توانید با این دستور کاربری دیگر را به گروه خود دعوت کنید"
 
-#: src/commandhandler.cpp:178
+#: src/commandhandler.cpp:183
 msgid "/party > Invite a user to party"
 msgstr "می توانید با این دستور کاربری دیگر را به گروه خود دعوت کنید"
 
-#: src/commandhandler.cpp:180
+#: src/commandhandler.cpp:185
 msgid "/record > Start recording the chat to an external file"
 msgstr "می توانید به وسیله ی آن از چت خود، یک کپی خروجی بگیرید"
 
-#: src/commandhandler.cpp:181
+#: src/commandhandler.cpp:187
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr ""
 
-#: src/commandhandler.cpp:182
+#: src/commandhandler.cpp:189
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
 
-#: src/commandhandler.cpp:184
+#: src/commandhandler.cpp:192
 msgid "/announce > Global announcement (GM only)"
 msgstr "اعلام سراسری( تنها مسئولان بازی می توانند از آن استفاده کنند.)"
 
-#: src/commandhandler.cpp:188
+#: src/commandhandler.cpp:196
 msgid "For more information, type /help <command>."
 msgstr "برای اطلاعات بیشتر ،  <دستور مورد نظر> help/   را تایپ کنید"
 
-#: src/commandhandler.cpp:192
+#: src/commandhandler.cpp:200
 msgid "Command: /help"
 msgstr ""
 
-#: src/commandhandler.cpp:193
+#: src/commandhandler.cpp:201
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: src/commandhandler.cpp:194
+#: src/commandhandler.cpp:203
 msgid "Command: /help <command>"
 msgstr ""
 
-#: src/commandhandler.cpp:195
+#: src/commandhandler.cpp:204
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/commandhandler.cpp:203
+#: src/commandhandler.cpp:212
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: src/commandhandler.cpp:204
+#: src/commandhandler.cpp:213
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/commandhandler.cpp:205
+#: src/commandhandler.cpp:214
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:210
+#: src/commandhandler.cpp:219
 msgid "Command: /clear"
 msgstr ""
 
-#: src/commandhandler.cpp:211
+#: src/commandhandler.cpp:220
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:224
 msgid "Command: /ignore <player>"
 msgstr ""
 
-#: src/commandhandler.cpp:216
+#: src/commandhandler.cpp:225
 msgid "This command ignores the given player regardless of current relations."
 msgstr ""
 
-#: src/commandhandler.cpp:221
+#: src/commandhandler.cpp:230
 msgid "Command: /join <channel>"
 msgstr ""
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:231
 msgid "This command makes you enter <channel>."
 msgstr ""
 
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:232
 msgid "If <channel> doesn't exist, it's created."
 msgstr ""
 
-#: src/commandhandler.cpp:227
+#: src/commandhandler.cpp:236
 msgid "Command: /list"
 msgstr ""
 
-#: src/commandhandler.cpp:228
+#: src/commandhandler.cpp:237
 msgid "This command shows a list of all channels."
 msgstr ""
 
-#: src/commandhandler.cpp:232
+#: src/commandhandler.cpp:241
 msgid "Command: /me <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:233
+#: src/commandhandler.cpp:242
 msgid "This command tell others you are (doing) <msg>."
 msgstr ""
 
-#: src/commandhandler.cpp:237
+#: src/commandhandler.cpp:246
 msgid "Command: /msg <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:238
+#: src/commandhandler.cpp:247
 msgid "Command: /whisper <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:239
+#: src/commandhandler.cpp:248
 msgid "Command: /w <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:240
+#: src/commandhandler.cpp:249
 msgid "This command sends the text <message> to <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:241 src/commandhandler.cpp:260
+#: src/commandhandler.cpp:250 src/commandhandler.cpp:269
 #: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
-#: src/net/ea/gui/guildtab.cpp:75 src/net/ea/gui/partytab.cpp:75
+#: src/net/tmwa/gui/guildtab.cpp:75 src/net/tmwa/gui/partytab.cpp:75
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:255
 msgid "Command: /query <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:247
+#: src/commandhandler.cpp:256
 msgid "Command: /q <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:248
+#: src/commandhandler.cpp:257
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:253
+#: src/commandhandler.cpp:262
 msgid "Command: /createparty <name>"
 msgstr ""
 
-#: src/commandhandler.cpp:254
+#: src/commandhandler.cpp:263
 msgid "This command creates a new party called <name>."
 msgstr ""
 
-#: src/commandhandler.cpp:258
+#: src/commandhandler.cpp:267
 msgid "Command: /party <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:259 src/net/ea/gui/partytab.cpp:74
+#: src/commandhandler.cpp:268 src/net/tmwa/gui/partytab.cpp:74
 msgid "This command invites <nick> to party with you."
 msgstr ""
 
-#: src/commandhandler.cpp:265
+#: src/commandhandler.cpp:274
 msgid "Command: /present"
 msgstr ""
 
-#: src/commandhandler.cpp:266
+#: src/commandhandler.cpp:275
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: src/commandhandler.cpp:272
+#: src/commandhandler.cpp:281
 msgid "Command: /record <filename>"
 msgstr ""
 
-#: src/commandhandler.cpp:273
+#: src/commandhandler.cpp:282
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr ""
 
-#: src/commandhandler.cpp:275
+#: src/commandhandler.cpp:284
 msgid "Command: /record"
 msgstr ""
 
-#: src/commandhandler.cpp:276
+#: src/commandhandler.cpp:285
 msgid "This command finishes a recording session."
 msgstr ""
 
-#: src/commandhandler.cpp:280
+#: src/commandhandler.cpp:289
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: src/commandhandler.cpp:281
+#: src/commandhandler.cpp:290
 msgid ""
 "This command sets whether the return key should toggle the chat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: src/commandhandler.cpp:283
+#: src/commandhandler.cpp:292
 msgid ""
-"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
-"\", \"no\", \"false\" to turn the toggle off."
+"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
+"\"0\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: src/commandhandler.cpp:286
+#: src/commandhandler.cpp:295
 msgid "Command: /toggle"
 msgstr ""
 
-#: src/commandhandler.cpp:287
+#: src/commandhandler.cpp:296
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: src/commandhandler.cpp:291 src/gui/widgets/whispertab.cpp:93
+#: src/commandhandler.cpp:300 src/gui/widgets/whispertab.cpp:95
 msgid "Command: /unignore <player>"
 msgstr ""
 
-#: src/commandhandler.cpp:292
+#: src/commandhandler.cpp:301
 msgid "This command stops ignoring the given player if they are being ignored"
 msgstr ""
 
-#: src/commandhandler.cpp:297
+#: src/commandhandler.cpp:306
 msgid "Command: /where"
 msgstr ""
 
-#: src/commandhandler.cpp:298
+#: src/commandhandler.cpp:307
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: src/commandhandler.cpp:302
+#: src/commandhandler.cpp:311
 msgid "Command: /who"
 msgstr ""
 
-#: src/commandhandler.cpp:303
+#: src/commandhandler.cpp:312
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:309
+#: src/commandhandler.cpp:318
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: src/commandhandler.cpp:375
+#: src/commandhandler.cpp:384
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:383
+#: src/commandhandler.cpp:392
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:397
+#: src/commandhandler.cpp:406
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:410 src/net/ea/gui/partytab.cpp:109
+#: src/commandhandler.cpp:419 src/net/tmwa/gui/partytab.cpp:109
 msgid "Party name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:423 src/commandhandler.cpp:471
-#: src/commandhandler.cpp:493
+#: src/commandhandler.cpp:432 src/commandhandler.cpp:509
+#: src/commandhandler.cpp:531
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:441
+#: src/commandhandler.cpp:450
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:441
+#: src/commandhandler.cpp:450
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:450
+#: src/commandhandler.cpp:459
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:454
+#: src/commandhandler.cpp:463
 msgid "Message now closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:477
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:489
+msgid "Show IP: On"
+msgstr ""
+
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:485
+msgid "Show IP: Off"
+msgstr ""
+
+#: src/commandhandler.cpp:515
 msgid "Player already ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:484
+#: src/commandhandler.cpp:522
 msgid "Player successfully ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:486
+#: src/commandhandler.cpp:524
 msgid "Player could not be ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:501
+#: src/commandhandler.cpp:539
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:506
+#: src/commandhandler.cpp:544
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:508
+#: src/commandhandler.cpp:546
 msgid "Player could not be unignored!"
 msgstr ""
 
@@ -464,40 +479,40 @@ msgstr ""
 msgid "General"
 msgstr "کلی"
 
-#: src/game.cpp:326
+#: src/game.cpp:342
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:331
+#: src/game.cpp:347
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:355
+#: src/game.cpp:378
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:360
+#: src/game.cpp:382
 msgid "Network Error"
 msgstr "خطای شبکه"
 
-#: src/game.cpp:705
+#: src/game.cpp:721
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:712
+#: src/game.cpp:726
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:946
+#: src/game.cpp:954
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:947
+#: src/game.cpp:955
 #, c-format
 msgid "Error while loading %s"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:75
+#: src/gui/beingpopup.cpp:76
 #, c-format
 msgid "Party: %s"
 msgstr ""
@@ -506,34 +521,34 @@ msgstr ""
 msgid "Buy"
 msgstr ""
 
-#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
-#: src/gui/sell.cpp:276
+#: src/gui/buy.cpp:69 src/gui/buy.cpp:261 src/gui/sell.cpp:71
+#: src/gui/sell.cpp:288
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:99 src/gui/npcdialog.cpp:100
-#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:479
+#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:112 src/gui/npcdialog.cpp:124
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:463
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:98 src/gui/npcdialog.cpp:101
-#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:491
+#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:111 src/gui/npcdialog.cpp:125
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:475
 msgid "-"
 msgstr ""
 
 #: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
-#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:182
-#: src/keyboardconfig.cpp:103
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:228
+#: src/keyboardconfig.cpp:102
 msgid "Quit"
 msgstr "خروج"
 
-#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:408
-#: src/gui/statuswindow.cpp:478 src/gui/statuswindow.cpp:512
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:384
+#: src/gui/statuswindow.cpp:462 src/gui/statuswindow.cpp:496
 msgid "Max"
 msgstr "حداکثر"
 
@@ -547,11 +562,11 @@ msgstr ""
 
 #: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
 #: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
-#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:101
-#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:178
-#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:402
+#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:114
+#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:389
 #: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
-#: src/gui/socialwindow.cpp:242 src/gui/textdialog.cpp:39
+#: src/gui/socialwindow.cpp:275 src/gui/textdialog.cpp:40
 #: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr "انصراف"
@@ -588,7 +603,7 @@ msgstr ""
 msgid "Change Password"
 msgstr "تغییر گذرواژه"
 
-#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:53
+#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:55
 #: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
 msgid "Password:"
 msgstr "گذرواژه:"
@@ -619,19 +634,19 @@ msgstr ""
 msgid "Create Character"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:52
+#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:54
 #: src/gui/register.cpp:67
 msgid "Name:"
 msgstr "نام"
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
 #: src/gui/outfitwindow.cpp:67
 msgid ">"
 msgstr ""
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
 #: src/gui/outfitwindow.cpp:66
@@ -648,8 +663,8 @@ msgstr "رنگ مو"
 msgid "Hair style:"
 msgstr "مدل مو"
 
-#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:397
-#: src/gui/socialwindow.cpp:296
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:392
+#: src/gui/socialwindow.cpp:329
 msgid "Create"
 msgstr "بساز"
 
@@ -704,33 +719,33 @@ msgstr "ثبت نام نشده"
 msgid "Change Email"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:185
-#: src/gui/setup_players.cpp:230
+#: src/gui/charselectdialog.cpp:336 src/gui/serverdialog.cpp:231
+#: src/gui/setup_players.cpp:229
 msgid "Delete"
 msgstr "حذف"
 
-#: src/gui/charselectdialog.cpp:387
+#: src/gui/charselectdialog.cpp:380
 msgid "Choose"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:399 src/gui/charselectdialog.cpp:400
+#: src/gui/charselectdialog.cpp:394 src/gui/charselectdialog.cpp:395
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:77 src/gui/palette.cpp:96
+#: src/gui/chat.cpp:88
 msgid "Chat"
 msgstr "چت"
 
-#: src/gui/chat.cpp:287
+#: src/gui/chat.cpp:311
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:305
+#: src/gui/chat.cpp:329
 msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:469
+#: src/gui/chat.cpp:493
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -792,140 +807,170 @@ msgstr ""
 msgid "Ambient FX: %s"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:56
+#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:55
 msgid "Equipment"
 msgstr "تجهیزات"
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:77
-#: src/gui/inventorywindow.cpp:79 src/gui/inventorywindow.cpp:298
-#: src/gui/popupmenu.cpp:372
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:89
+#: src/gui/inventorywindow.cpp:337 src/gui/popupmenu.cpp:359
 msgid "Unequip"
 msgstr ""
 
-#: src/gui/help.cpp:36
+#: src/gui/help.cpp:37
 msgid "Help"
 msgstr ""
 
-#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:73
+#: src/gui/help.cpp:51 src/gui/npcdialog.cpp:50
 msgid "Close"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:56 src/gui/windowmenu.cpp:57
+#: src/gui/inventorywindow.cpp:59 src/gui/windowmenu.cpp:56
 msgid "Inventory"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:72 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:300 src/gui/popupmenu.cpp:374
+#: src/gui/inventorywindow.cpp:59
+msgid "Storage"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:82
+msgid "Slots:"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:87 src/gui/inventorywindow.cpp:100
+#: src/gui/inventorywindow.cpp:339 src/gui/popupmenu.cpp:361
 msgid "Equip"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:304 src/gui/popupmenu.cpp:377
+#: src/gui/inventorywindow.cpp:88
 msgid "Use"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:83 src/gui/inventorywindow.cpp:308
-#: src/gui/popupmenu.cpp:380
+#: src/gui/inventorywindow.cpp:101 src/gui/popupmenu.cpp:364
+msgid "Activate"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:102 src/gui/inventorywindow.cpp:348
+#: src/gui/popupmenu.cpp:367
 msgid "Drop..."
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:84 src/gui/popupmenu.cpp:386
+#: src/gui/inventorywindow.cpp:103 src/gui/popupmenu.cpp:373
 msgid "Split"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:85 src/gui/outfitwindow.cpp:51
+#: src/gui/inventorywindow.cpp:104 src/gui/outfitwindow.cpp:51
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:96 src/gui/storagewindow.cpp:83
-msgid "Slots:"
+#: src/gui/inventorywindow.cpp:106
+msgid "Weight:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:97
-msgid "Weight:"
+#: src/gui/inventorywindow.cpp:124 src/gui/popupmenu.cpp:378
+msgid "Store"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:310 src/gui/popupmenu.cpp:382
+#: src/gui/inventorywindow.cpp:125 src/gui/popupmenu.cpp:385
+msgid "Retrieve"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:350 src/gui/popupmenu.cpp:369
 msgid "Drop"
 msgstr ""
 
-#: src/gui/itemamount.cpp:100 src/gui/okdialog.cpp:42
-#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:38 src/gui/trade.cpp:73
-#: src/gui/trade.cpp:75
+#: src/gui/itemamount.cpp:113 src/gui/okdialog.cpp:42
+#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:39 src/gui/trade.cpp:72
+#: src/gui/trade.cpp:74
 msgid "OK"
 msgstr "تایید"
 
-#: src/gui/itemamount.cpp:102
+#: src/gui/itemamount.cpp:115
 msgid "All"
 msgstr ""
 
-#: src/gui/itemamount.cpp:128
+#: src/gui/itemamount.cpp:141
 msgid "Select amount of items to trade."
 msgstr ""
 
-#: src/gui/itemamount.cpp:131
+#: src/gui/itemamount.cpp:144
 msgid "Select amount of items to drop."
 msgstr ""
 
-#: src/gui/itemamount.cpp:134
+#: src/gui/itemamount.cpp:147
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/itemamount.cpp:137
+#: src/gui/itemamount.cpp:150
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamount.cpp:140
+#: src/gui/itemamount.cpp:153
 msgid "Select amount of items to split."
 msgstr ""
 
-#: src/gui/itempopup.cpp:92
+#: src/gui/itempopup.cpp:137
 #, c-format
 msgid "Weight: %s"
 msgstr ""
 
-#: src/gui/login.cpp:49 src/gui/login.cpp:61
+#: src/gui/login.cpp:51 src/gui/login.cpp:63
 msgid "Login"
 msgstr ""
 
-#: src/gui/login.cpp:58
+#: src/gui/login.cpp:60
 msgid "Remember username"
 msgstr ""
 
-#: src/gui/login.cpp:59 src/gui/register.cpp:58 src/gui/register.cpp:73
+#: src/gui/login.cpp:61 src/gui/register.cpp:58 src/gui/register.cpp:73
 msgid "Register"
 msgstr ""
 
-#: src/gui/login.cpp:60
+#: src/gui/login.cpp:62
 msgid "Change Server"
 msgstr ""
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
+#: src/gui/login.cpp:129
+msgid "Registration disabled"
+msgstr ""
+
+#: src/gui/login.cpp:129
+msgid "You need to use the website to register an account for this server."
+msgstr ""
+
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:86
 msgid "Map"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:44
+#: src/gui/ministatus.cpp:235
+msgid "Need"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:48
 msgid "Waiting for server"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:45
+#: src/gui/npcdialog.cpp:49
 msgid "Next"
 msgstr "بعدی"
 
-#: src/gui/npcdialog.cpp:47
+#: src/gui/npcdialog.cpp:51
 msgid "Submit"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:52 src/gui/npcpostdialog.cpp:41
+#: src/gui/npcdialog.cpp:73 src/gui/npcpostdialog.cpp:41
 msgid "NPC"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:110
+#: src/gui/npcdialog.cpp:118
+msgid "Clear log"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:134
 msgid "Reset"
 msgstr ""
 
 #. TRANSLATORS: Please leave the \n sequences intact.
-#: src/gui/npcdialog.cpp:171
+#: src/gui/npcdialog.cpp:208
 #, fuzzy
 msgid ""
 "\n"
@@ -940,7 +985,7 @@ msgstr ""
 msgid "Send"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:96
+#: src/gui/npcpostdialog.cpp:99
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
@@ -954,303 +999,82 @@ msgstr ""
 msgid "Unequip first"
 msgstr ""
 
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:143
-msgid "Text"
-msgstr ""
-
-#: src/gui/palette.cpp:82
-msgid "Text Shadow"
-msgstr ""
-
-#: src/gui/palette.cpp:83
-msgid "Text Outline"
-msgstr ""
-
-#: src/gui/palette.cpp:84
-msgid "Progress Bar Labels"
-msgstr ""
-
-#: src/gui/palette.cpp:85
-msgid "Buttons"
-msgstr ""
-
-#: src/gui/palette.cpp:86
-msgid "Disabled Buttons"
-msgstr ""
-
-#: src/gui/palette.cpp:87
-msgid "Tabs"
-msgstr ""
-
-#: src/gui/palette.cpp:89
-msgid "Background"
-msgstr ""
-
-#: src/gui/palette.cpp:91
-msgid "Highlight"
-msgstr ""
-
-#: src/gui/palette.cpp:92
-msgid "Tab Highlight"
-msgstr ""
-
-#: src/gui/palette.cpp:93
-msgid "Item Too Expensive"
-msgstr ""
-
-#: src/gui/palette.cpp:94
-msgid "Item Is Equipped"
-msgstr ""
-
-#: src/gui/palette.cpp:97
-msgid "GM"
-msgstr ""
-
-#: src/gui/palette.cpp:98
-msgid "Player"
-msgstr ""
-
-#: src/gui/palette.cpp:99
-msgid "Whisper"
-msgstr ""
-
-#: src/gui/palette.cpp:100
-msgid "Is"
-msgstr ""
-
-#: src/gui/palette.cpp:101 src/net/ea/gui/partytab.cpp:43
-msgid "Party"
-msgstr ""
-
-#: src/gui/palette.cpp:102 src/net/ea/gui/guildtab.cpp:45
-msgid "Guild"
-msgstr ""
-
-#: src/gui/palette.cpp:103
-msgid "Server"
-msgstr ""
-
-#: src/gui/palette.cpp:104
-msgid "Logger"
-msgstr ""
-
-#: src/gui/palette.cpp:105
-msgid "Hyperlink"
-msgstr ""
-
-#: src/gui/palette.cpp:107
-msgid "Being"
-msgstr ""
-
-#: src/gui/palette.cpp:108
-msgid "Other Players' Names"
-msgstr ""
-
-#: src/gui/palette.cpp:109
-msgid "Own Name"
-msgstr ""
-
-#: src/gui/palette.cpp:110
-msgid "GM Names"
-msgstr ""
-
-#: src/gui/palette.cpp:111
-msgid "NPCs"
-msgstr ""
-
-#: src/gui/palette.cpp:112
-msgid "Monsters"
-msgstr ""
-
-#: src/gui/palette.cpp:114
-msgid "Unknown Item Type"
-msgstr ""
-
-#: src/gui/palette.cpp:115
-msgid "Generics"
-msgstr ""
-
-#: src/gui/palette.cpp:116
-msgid "Hats"
-msgstr ""
-
-#: src/gui/palette.cpp:117
-msgid "Usables"
-msgstr ""
-
-#: src/gui/palette.cpp:118
-msgid "Shirts"
-msgstr ""
-
-#: src/gui/palette.cpp:119
-msgid "One Handed Weapons"
-msgstr ""
-
-#: src/gui/palette.cpp:120
-msgid "Pants"
-msgstr ""
-
-#: src/gui/palette.cpp:121
-msgid "Shoes"
-msgstr ""
-
-#: src/gui/palette.cpp:122
-msgid "Two Handed Weapons"
-msgstr ""
-
-#: src/gui/palette.cpp:123
-msgid "Shields"
-msgstr ""
-
-#: src/gui/palette.cpp:124
-msgid "Rings"
-msgstr ""
-
-#: src/gui/palette.cpp:125
-msgid "Necklaces"
-msgstr ""
-
-#: src/gui/palette.cpp:126
-msgid "Arms"
-msgstr ""
-
-#: src/gui/palette.cpp:127
-msgid "Ammo"
-msgstr ""
-
-#: src/gui/palette.cpp:129
-msgid "Particle Effects"
-msgstr ""
-
-#: src/gui/palette.cpp:130
-msgid "Pickup Notification"
-msgstr ""
-
-#: src/gui/palette.cpp:131
-msgid "Exp Notification"
-msgstr ""
-
-#: src/gui/palette.cpp:133
-msgid "Player Hits Monster"
-msgstr ""
-
-#: src/gui/palette.cpp:135
-msgid "Monster Hits Player"
-msgstr ""
-
-#: src/gui/palette.cpp:136
-msgid "Critical Hit"
-msgstr ""
-
-#: src/gui/palette.cpp:137
-msgid "Misses"
-msgstr ""
-
-#: src/gui/palette.cpp:139
-msgid "HP Bar"
-msgstr ""
-
-#: src/gui/palette.cpp:140
-msgid "3/4 HP Bar"
-msgstr ""
-
-#: src/gui/palette.cpp:141
-msgid "1/2 HP Bar"
-msgstr ""
-
-#: src/gui/palette.cpp:142
-msgid "1/4 HP Bar"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:84
+#: src/gui/popupmenu.cpp:83
 #, c-format
 msgid "Trade with %s..."
 msgstr ""
 
-#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:161
+#: src/gui/popupmenu.cpp:87 src/gui/popupmenu.cpp:158
 #, c-format
 msgid "Attack %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:92
+#: src/gui/popupmenu.cpp:91
 #, c-format
 msgid "Whisper %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:101
+#: src/gui/popupmenu.cpp:100
 #, c-format
 msgid "Befriend %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:106
+#: src/gui/popupmenu.cpp:105
 #, c-format
 msgid "Disregard %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:109
+#: src/gui/popupmenu.cpp:108
 #, c-format
 msgid "Ignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:115 src/gui/popupmenu.cpp:124
+#: src/gui/popupmenu.cpp:114 src/gui/popupmenu.cpp:123
 #, c-format
 msgid "Unignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:118
+#: src/gui/popupmenu.cpp:117
 #, c-format
 msgid "Completely ignore %s"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:130
 #, c-format
-msgid "Follow %s"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:133
-#, c-format
 msgid "Invite %s to join your guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:137
+#: src/gui/popupmenu.cpp:134
 #, c-format
 msgid "Invite %s to join your party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144
+#: src/gui/popupmenu.cpp:141
 msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:153
+#: src/gui/popupmenu.cpp:150
 #, c-format
 msgid "Talk to %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:166
+#: src/gui/popupmenu.cpp:163
 msgid "Kick monster"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:174
+#: src/gui/popupmenu.cpp:171
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:191
+#: src/gui/popupmenu.cpp:188
 #, c-format
 msgid "Pick up %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:400
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:387
 msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:70
-msgid "Store"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:71
-msgid "Retrieve"
-msgstr ""
-
 #: src/gui/quitdialog.cpp:44
 msgid "Switch server"
 msgstr ""
@@ -1319,48 +1143,61 @@ msgstr ""
 msgid "Passwords do not match."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:134
+#: src/gui/serverdialog.cpp:197
 msgid "Choose Your Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:141 src/gui/widgets/chattab.cpp:139
+#: src/gui/serverdialog.cpp:206 src/gui/widgets/chattab.cpp:142
 msgid "Server:"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:142
+#: src/gui/serverdialog.cpp:207
 msgid "Port:"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:143
+#: src/gui/serverdialog.cpp:208
 msgid "Server type:"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:183
+#: src/gui/serverdialog.cpp:229
 #, fuzzy
 msgid "Connect"
 msgstr "در حال اتصال..."
 
-#: src/gui/serverdialog.cpp:184
+#: src/gui/serverdialog.cpp:230
 msgid "Custom Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:262
+#: src/gui/serverdialog.cpp:324
 msgid "Please type both the address and the port of a server."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:411
+#: src/gui/serverdialog.cpp:441
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:417
+#: src/gui/serverdialog.cpp:447
 msgid "Waiting for server..."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:421
+#: src/gui/serverdialog.cpp:451
 msgid "Preparing download"
 msgstr ""
 
+#: src/gui/serverdialog.cpp:455
+msgid "Error retreiving server list!"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:550
+msgid "requires a newer version"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:552
+#, c-format
+msgid "requires v%s"
+msgstr ""
+
 #: src/gui/setup_audio.cpp:42
 msgid "Sound"
 msgstr ""
@@ -1393,50 +1230,50 @@ msgstr ""
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:44
+#: src/gui/setup_colors.cpp:46
 msgid "This is what the color looks like"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:49
+#: src/gui/setup_colors.cpp:51
 msgid "Colors"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:70
+#: src/gui/setup_colors.cpp:72
 msgid "Type:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:81 src/gui/setup_colors.cpp:433
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:331
 msgid "Static"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:84
-#: src/gui/setup_colors.cpp:434
+#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
+#: src/gui/setup_colors.cpp:332
 msgid "Pulse"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
+#: src/gui/setup_colors.cpp:333
 msgid "Rainbow"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
+#: src/gui/setup_colors.cpp:333
 msgid "Spectrum"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:92
+#: src/gui/setup_colors.cpp:94
 msgid "Delay:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:107
+#: src/gui/setup_colors.cpp:109
 msgid "Red:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:122
+#: src/gui/setup_colors.cpp:124
 msgid "Green:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:137
+#: src/gui/setup_colors.cpp:139
 msgid "Blue:"
 msgstr ""
 
@@ -1481,564 +1318,578 @@ msgid "Assign"
 msgstr ""
 
 #: src/gui/setup_keyboard.cpp:90
+msgid "Unassign"
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:94
 msgid "Default"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:119
+#: src/gui/setup_keyboard.cpp:125
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_players.cpp:57
+#: src/gui/setup_players.cpp:58
 msgid "Name"
 msgstr ""
 
-#: src/gui/setup_players.cpp:58
+#: src/gui/setup_players.cpp:59
 msgid "Relation"
 msgstr ""
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:64
 msgid "Neutral"
 msgstr ""
 
-#: src/gui/setup_players.cpp:64
+#: src/gui/setup_players.cpp:65
 msgid "Friend"
 msgstr ""
 
-#: src/gui/setup_players.cpp:65
+#: src/gui/setup_players.cpp:66
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_players.cpp:67
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_players.cpp:208 src/gui/setup_video.cpp:132
+#: src/gui/setup_players.cpp:206 src/gui/setup_video.cpp:153
 msgid "???"
 msgstr ""
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_players.cpp:225
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_players.cpp:228
+#: src/gui/setup_players.cpp:227
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:231
 msgid "Put all whispers in tabs"
 msgstr ""
 
-#: src/gui/setup_players.cpp:234
+#: src/gui/setup_players.cpp:233
 msgid "Show gender"
 msgstr ""
 
-#: src/gui/setup_players.cpp:236
+#: src/gui/setup_players.cpp:235
+msgid "Enable Chat log"
+msgstr ""
+
+#: src/gui/setup_players.cpp:237
 msgid "Players"
 msgstr ""
 
-#: src/gui/setup_players.cpp:261
+#: src/gui/setup_players.cpp:262
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:113
+#: src/gui/setup_video.cpp:134
 msgid "Tiny"
 msgstr ""
 
-#: src/gui/setup_video.cpp:114
+#: src/gui/setup_video.cpp:135
 msgid "Small"
 msgstr ""
 
-#: src/gui/setup_video.cpp:115
+#: src/gui/setup_video.cpp:136
 msgid "Medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:116
+#: src/gui/setup_video.cpp:137
 msgid "Large"
 msgstr ""
 
-#: src/gui/setup_video.cpp:142
+#: src/gui/setup_video.cpp:163
 msgid "No text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:144
+#: src/gui/setup_video.cpp:164
+msgid "Text"
+msgstr ""
+
+#: src/gui/setup_video.cpp:165
 msgid "Bubbles, no names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:145
+#: src/gui/setup_video.cpp:166
 msgid "Bubbles with names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:157
+#: src/gui/setup_video.cpp:178
 msgid "off"
 msgstr ""
 
-#: src/gui/setup_video.cpp:158 src/gui/setup_video.cpp:171
+#: src/gui/setup_video.cpp:179 src/gui/setup_video.cpp:192
 msgid "low"
 msgstr ""
 
-#: src/gui/setup_video.cpp:159 src/gui/setup_video.cpp:173
+#: src/gui/setup_video.cpp:180 src/gui/setup_video.cpp:194
 msgid "high"
 msgstr ""
 
-#: src/gui/setup_video.cpp:172
+#: src/gui/setup_video.cpp:193
 msgid "medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:174
+#: src/gui/setup_video.cpp:195
 msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:196
+#: src/gui/setup_video.cpp:217
 msgid "Full screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:197
+#: src/gui/setup_video.cpp:218
 msgid "OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:198
+#: src/gui/setup_video.cpp:219
 msgid "Custom cursor"
 msgstr ""
 
-#: src/gui/setup_video.cpp:200
+#: src/gui/setup_video.cpp:221
 msgid "Visible names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:223
 msgid "Particle effects"
 msgstr ""
 
-#: src/gui/setup_video.cpp:204
+#: src/gui/setup_video.cpp:225
 msgid "Show own name"
 msgstr ""
 
-#: src/gui/setup_video.cpp:205
+#: src/gui/setup_video.cpp:226
+msgid "Log NPC dialogue"
+msgstr ""
+
+#: src/gui/setup_video.cpp:227
 msgid "Show pickup notification"
 msgstr ""
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:207
+#. TRANSLATORS: Refers to "Show pickup notification"
+#: src/gui/setup_video.cpp:229
 msgid "in chat"
 msgstr ""
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:209
+#. TRANSLATORS: Refers to "Show pickup notification"
+#: src/gui/setup_video.cpp:231
 msgid "as particle"
 msgstr ""
 
-#: src/gui/setup_video.cpp:214
+#: src/gui/setup_video.cpp:236
 msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:225
+#: src/gui/setup_video.cpp:247
+msgid "Disable transparency (Low CPU mode)"
+msgstr ""
+
+#: src/gui/setup_video.cpp:250
 msgid "Video"
 msgstr ""
 
-#: src/gui/setup_video.cpp:227
-msgid "Show monster damage"
+#: src/gui/setup_video.cpp:252
+msgid "Show damage"
 msgstr ""
 
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:258
 msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:259
 msgid "Gui opacity"
 msgstr ""
 
-#: src/gui/setup_video.cpp:235
+#: src/gui/setup_video.cpp:260
 msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_video.cpp:236
+#: src/gui/setup_video.cpp:261
 msgid "Particle detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237
+#: src/gui/setup_video.cpp:262
 msgid "Font size"
 msgstr ""
 
-#: src/gui/setup_video.cpp:251 src/gui/setup_video.cpp:454
-#: src/gui/setup_video.cpp:568
+#: src/gui/setup_video.cpp:277 src/gui/setup_video.cpp:532
+#: src/gui/setup_video.cpp:662
 msgid "None"
 msgstr ""
 
-#: src/gui/setup_video.cpp:381
+#: src/gui/setup_video.cpp:426
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:387
+#: src/gui/setup_video.cpp:432
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:398
+#: src/gui/setup_video.cpp:443
 msgid "Switching to Full Screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:399
+#: src/gui/setup_video.cpp:444
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:411
+#: src/gui/setup_video.cpp:458
 msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:412
+#: src/gui/setup_video.cpp:459
+msgid ""
+"Applying change to OpenGL requires restart. In case OpenGL messes up your "
+"game graphics, restart the game with the command line option \"--no-opengl\"."
+msgstr ""
+
+#: src/gui/setup_video.cpp:466
+msgid "Deactivating OpenGL"
+msgstr ""
+
+#: src/gui/setup_video.cpp:467
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#: src/gui/setup_video.cpp:486 src/gui/setup_video.cpp:491
+#: src/gui/setup_video.cpp:475
+msgid "Transparency disabled"
+msgstr ""
+
+#: src/gui/setup_video.cpp:476 src/gui/setup_video.cpp:484
+msgid "You must restart to apply changes."
+msgstr ""
+
+#: src/gui/setup_video.cpp:483
+msgid "Transparency enabled"
+msgstr ""
+
+#: src/gui/setup_video.cpp:576 src/gui/setup_video.cpp:581
 msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:487 src/gui/setup_video.cpp:492
+#: src/gui/setup_video.cpp:577 src/gui/setup_video.cpp:582
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:489
+#: src/gui/setup_video.cpp:579
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:522
+#: src/gui/setup_video.cpp:612
 msgid "Particle Effect Settings Changed."
 msgstr ""
 
-#: src/gui/setup_video.cpp:523
+#: src/gui/setup_video.cpp:613
 msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skilldialog.cpp:197 src/gui/windowmenu.cpp:58
+#: src/gui/skilldialog.cpp:212 src/gui/windowmenu.cpp:59
 msgid "Skills"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:208
+#: src/gui/skilldialog.cpp:223
 msgid "Up"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:262
+#: src/gui/skilldialog.cpp:269
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:314
+#: src/gui/skilldialog.cpp:351
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:323
+#: src/gui/skilldialog.cpp:360
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:405
+#: src/gui/skilldialog.cpp:442
 #, c-format
 msgid "Lvl: %d (%+d)"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:416
+#: src/gui/skilldialog.cpp:453
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:117
+#: src/gui/socialwindow.cpp:126
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:126
+#: src/gui/socialwindow.cpp:139
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:136
+#: src/gui/socialwindow.cpp:153
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:137
+#: src/gui/socialwindow.cpp:154
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:146
+#: src/gui/socialwindow.cpp:163
 msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:147
+#: src/gui/socialwindow.cpp:164
 #, fuzzy, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "آیا مطمئن هستید که می‌خواهید خارج شوید؟"
 
-#: src/gui/socialwindow.cpp:182
+#: src/gui/socialwindow.cpp:207 src/net/tmwa/partyhandler.cpp:330
 #, fuzzy, c-format
 msgid "Invited user %s to party."
 msgstr "می توانید با این دستور کاربری دیگر را به گروه خود دعوت کنید"
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:218
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:199
+#: src/gui/socialwindow.cpp:232
 #, fuzzy
 msgid "Member Invite to Party"
 msgstr "می توانید با این دستور کاربری دیگر را به گروه خود دعوت کنید"
 
-#: src/gui/socialwindow.cpp:200
+#: src/gui/socialwindow.cpp:233
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:209
+#: src/gui/socialwindow.cpp:242
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:210
+#: src/gui/socialwindow.cpp:243
 #, fuzzy, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "آیا مطمئن هستید که می‌خواهید خارج شوید؟"
 
-#: src/gui/socialwindow.cpp:239
+#: src/gui/socialwindow.cpp:272
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:240 src/gui/socialwindow.cpp:564
+#: src/gui/socialwindow.cpp:273 src/gui/socialwindow.cpp:620
 #, fuzzy
 msgid "Create Party"
 msgstr "بساز"
 
-#: src/gui/socialwindow.cpp:279 src/gui/windowmenu.cpp:60
+#: src/gui/socialwindow.cpp:312 src/gui/windowmenu.cpp:64
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:297
+#: src/gui/socialwindow.cpp:330
 msgid "Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:298
+#: src/gui/socialwindow.cpp:331
 msgid "Leave"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:394
+#: src/gui/socialwindow.cpp:443
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:400
+#: src/gui/socialwindow.cpp:449
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:413
+#: src/gui/socialwindow.cpp:462
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:419
+#: src/gui/socialwindow.cpp:468
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:463
+#: src/gui/socialwindow.cpp:497
+msgid "Creating guild failed, please choose a shorter name."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:504
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:477
+#: src/gui/socialwindow.cpp:520
+msgid "Creating party failed, please choose a shorter name."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:527
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:484
+#: src/gui/socialwindow.cpp:541
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:485
+#: src/gui/socialwindow.cpp:542
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:497
+#: src/gui/socialwindow.cpp:554
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:502
+#: src/gui/socialwindow.cpp:559
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:507
+#: src/gui/socialwindow.cpp:564
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:519
+#: src/gui/socialwindow.cpp:576
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:529
+#: src/gui/socialwindow.cpp:585
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:533
+#: src/gui/socialwindow.cpp:589
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:541
+#: src/gui/socialwindow.cpp:597
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:546
+#: src/gui/socialwindow.cpp:602
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:554
+#: src/gui/socialwindow.cpp:610
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:565
+#: src/gui/socialwindow.cpp:621
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:570
+#: src/gui/socialwindow.cpp:626
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:571
+#: src/gui/socialwindow.cpp:627
 msgid "Choose your party's name."
 msgstr ""
 
-#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:59
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:62
 msgid "Specials"
 msgstr ""
 
-#: src/gui/specialswindow.cpp:174
-#, c-format
-msgid "Specials Set %d"
-msgstr ""
-
-#: src/gui/specialswindow.cpp:191
-#, c-format
-msgid "Special %d"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:99 src/gui/statuswindow.cpp:247
+#: src/gui/statuswindow.cpp:113 src/gui/statuswindow.cpp:215
+#: src/gui/statuswindow.cpp:262
 #, c-format
 msgid "Level: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:211
+#: src/gui/statuswindow.cpp:114 src/gui/statuswindow.cpp:208
+#: src/gui/statuswindow.cpp:239
 #, c-format
 msgid "Money: %s"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:102
+#: src/gui/statuswindow.cpp:117
 msgid "HP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:107
+#: src/gui/statuswindow.cpp:122
 msgid "Exp:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:112
+#: src/gui/statuswindow.cpp:130
 msgid "MP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:132 src/gui/statuswindow.cpp:219
+#: src/gui/statuswindow.cpp:158 src/gui/statuswindow.cpp:275
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:133
+#: src/gui/statuswindow.cpp:159
 msgid "Job:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:194
-msgid "HP"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:200
-msgid "MP"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:206
-msgid "Exp"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:215
-msgid "Money"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:225
-msgid "Job"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:229
+#: src/gui/statuswindow.cpp:211 src/gui/statuswindow.cpp:247
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:235
+#: src/gui/statuswindow.cpp:255
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:251
-msgid "Level"
-msgstr ""
-
-#: src/gui/storagewindow.cpp:58
-msgid "Storage"
-msgstr ""
-
-#: src/gui/trade.cpp:52
+#: src/gui/trade.cpp:53
 msgid "Propose trade"
 msgstr ""
 
-#: src/gui/trade.cpp:53
+#: src/gui/trade.cpp:54
 msgid "Confirmed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:55
 msgid "Agree trade"
 msgstr ""
 
-#: src/gui/trade.cpp:55
+#: src/gui/trade.cpp:56
 msgid "Agreed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:58
+#: src/gui/trade.cpp:59
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/trade.cpp:74 src/gui/trade.cpp:75
+#: src/gui/trade.cpp:73 src/gui/trade.cpp:74
 msgid "Trade"
 msgstr ""
 
-#: src/gui/trade.cpp:77
+#: src/gui/trade.cpp:76
 msgid "Add"
 msgstr ""
 
-#: src/gui/trade.cpp:99 src/gui/trade.cpp:135
+#: src/gui/trade.cpp:98 src/gui/trade.cpp:134
 #, c-format
 msgid "You get %s"
 msgstr ""
 
-#: src/gui/trade.cpp:100
+#: src/gui/trade.cpp:99
 msgid "You give:"
 msgstr ""
 
-#: src/gui/trade.cpp:104
+#: src/gui/trade.cpp:103
 msgid "Change"
 msgstr ""
 
-#: src/gui/trade.cpp:275
+#: src/gui/trade.cpp:262
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/trade.cpp:318
+#: src/gui/trade.cpp:304
 msgid "You don't have enough money."
 msgstr ""
 
@@ -2059,21 +1910,21 @@ msgstr "در حال اتصال..."
 msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:405
+#: src/gui/updatewindow.cpp:417
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:407
+#: src/gui/updatewindow.cpp:419
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:409
+#: src/gui/updatewindow.cpp:421
 msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:501
+#: src/gui/updatewindow.cpp:515
 msgid "Completed"
 msgstr ""
 
@@ -2153,61 +2004,61 @@ msgstr ""
 msgid "Need a user to kick!"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:118
+#: src/gui/widgets/chattab.cpp:121
 msgid "Global announcement:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:124
+#: src/gui/widgets/chattab.cpp:127
 #, c-format
 msgid "Global announcement from %s:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:150
+#: src/gui/widgets/chattab.cpp:153
 #, c-format
 msgid "%s whispers: %s"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:51
+#: src/gui/widgets/whispertab.cpp:53
 msgid "Cannot send empty chat!"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:70
+#: src/gui/widgets/whispertab.cpp:72
 msgid "/ignore > Ignore the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:71
+#: src/gui/widgets/whispertab.cpp:73
 msgid "/unignore > Stop ignoring the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:72
+#: src/gui/widgets/whispertab.cpp:74
 msgid "/close > Close the whisper tab"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:82
+#: src/gui/widgets/whispertab.cpp:84
 msgid "Command: /close"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:83
+#: src/gui/widgets/whispertab.cpp:85
 msgid "This command closes the current whisper tab."
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:87
+#: src/gui/widgets/whispertab.cpp:89
 msgid "Command: /ignore"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:88
+#: src/gui/widgets/whispertab.cpp:90
 msgid "This command ignores the other player regardless of current relations."
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:94
+#: src/gui/widgets/whispertab.cpp:96
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:55
+#: src/gui/windowmenu.cpp:54
 msgid "Status"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:61
+#: src/gui/windowmenu.cpp:65
 msgid "Shortcut"
 msgstr ""
 
@@ -2223,1355 +2074,1366 @@ msgstr ""
 msgid "Choose World"
 msgstr ""
 
-#: src/keyboardconfig.cpp:40
+#: src/keyboardconfig.cpp:39
 msgid "Move Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:41
+#: src/keyboardconfig.cpp:40
 msgid "Move Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:41
 msgid "Move Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:42
 msgid "Move Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:44 src/net/ea/generalhandler.cpp:223
+#: src/keyboardconfig.cpp:43 src/net/tmwa/generalhandler.cpp:237
 msgid "Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:44
 msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:45
 msgid "Smilie"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:46
 msgid "Talk"
 msgstr ""
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:47
 msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:48
 msgid "Target Monster"
 msgstr ""
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboardconfig.cpp:49
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:50
 msgid "Target Player"
 msgstr ""
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:51
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:52
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:53
 msgid "Sit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:54
 msgid "Screenshot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:55
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:56
 msgid "Find Path to Mouse"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58 src/keyboardconfig.cpp:59
-#: src/keyboardconfig.cpp:60 src/keyboardconfig.cpp:61
-#: src/keyboardconfig.cpp:62 src/keyboardconfig.cpp:63
-#: src/keyboardconfig.cpp:64 src/keyboardconfig.cpp:65
-#: src/keyboardconfig.cpp:66 src/keyboardconfig.cpp:67
-#: src/keyboardconfig.cpp:68 src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:57 src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60
+#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62
+#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64
+#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68
 #, c-format
 msgid "Item Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:69
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:70
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:71
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:72
 msgid "Equipment Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:73
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:74
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:75
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:76
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:77
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:78
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:79
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:80
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:81
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:83
+#: src/keyboardconfig.cpp:82
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:83
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86
-#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88
-#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90
-#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92
-#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:84 src/keyboardconfig.cpp:85
+#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:87
+#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:89
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:91
+#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:93
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:95
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:96
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:97
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:98
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:99
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:100
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:101
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:103
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:105
+#: src/keyboardconfig.cpp:104
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:178
+#: src/keyboardconfig.cpp:183
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:913
+#: src/localplayer.cpp:985
 msgid "Unable to pick up item."
 msgstr ""
 
 #. TRANSLATORS: This sentence may be translated differently
 #. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:922
+#: src/localplayer.cpp:994
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/main.cpp:43
+#: src/main.cpp:42
 msgid "mana [options] [mana-file]"
 msgstr ""
 
+#: src/main.cpp:43
+msgid "[mana-file] : The mana file is an XML file (.mana)"
+msgstr ""
+
 #: src/main.cpp:44
-msgid "Options:"
+msgid "              used to set custom parameters"
 msgstr ""
 
 #: src/main.cpp:45
+msgid "              to the mana client."
+msgstr ""
+
+#: src/main.cpp:47
+msgid "Options:"
+msgstr ""
+
+#: src/main.cpp:48
 msgid "  -v --version        : Display the version"
 msgstr ""
 
-#: src/main.cpp:46
+#: src/main.cpp:49
 #, fuzzy
 msgid "  -h --help           : Display this help"
 msgstr "صفحه ی راهنما را نشان می دهد"
 
-#: src/main.cpp:47
+#: src/main.cpp:50
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
-#: src/main.cpp:48
+#: src/main.cpp:51
 msgid "  -U --username       : Login with this username"
 msgstr ""
 
-#: src/main.cpp:49
+#: src/main.cpp:52
 msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/main.cpp:50
+#: src/main.cpp:53
 msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/main.cpp:51
+#: src/main.cpp:54
 msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:52
+#: src/main.cpp:55
 msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/main.cpp:53
+#: src/main.cpp:56
 msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/main.cpp:54
+#: src/main.cpp:57
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:56
+#: src/main.cpp:59
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:57
+#: src/main.cpp:60
 msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:58
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
+#: src/main.cpp:61
+msgid "     --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/main.cpp:59
+#: src/main.cpp:62
+msgid "     --chat-log-dir   : Chat log dir to use"
+msgstr ""
+
+#: src/main.cpp:63
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/main.cpp:61
+#: src/main.cpp:65
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:63
+#: src/net/manaserv/beinghandler.cpp:303 src/net/tmwa/playerhandler.cpp:94
+msgid "You are dead."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:304 src/net/tmwa/playerhandler.cpp:95
+msgid "We regret to inform you that your character was killed in battle."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:306 src/net/tmwa/playerhandler.cpp:97
+msgid "You are not that alive anymore."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:307 src/net/tmwa/playerhandler.cpp:98
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:308 src/net/tmwa/playerhandler.cpp:99
+msgid "Game Over!"
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:309 src/net/tmwa/playerhandler.cpp:101
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:311 src/net/tmwa/playerhandler.cpp:103
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:313 src/net/tmwa/playerhandler.cpp:105
+msgid "I guess this did not run too well."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:107
+msgid "Do you want your possessions identified?"
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:109
+msgid "Sadly, no trace of you was ever found..."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:111
+msgid "Annihilated."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:113
+msgid "Looks like you got your head handed to you."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:115
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:323
+msgid "Press OK to respawn."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:324
+msgid "You Died"
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:138 src/net/manaserv/charhandler.cpp:209
+msgid "Not logged in."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:141
+msgid "No empty slot."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:144
+msgid "Invalid name."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:147
+msgid "Character's name already exists."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:150
+msgid "Invalid hairstyle."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:153
+msgid "Invalid hair color."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:156
+msgid "Invalid gender."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:159
+msgid "Character's stats are too high."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:162
+msgid "Character's stats are too low."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:165
+#, c-format
+msgid "At least one statis out of the permitted range: (%u - %u)."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:171 src/net/manaserv/loginhandler.cpp:96
+#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
+#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
+#: src/net/tmwa/loginhandler.cpp:95 src/net/tmwa/loginhandler.cpp:182
+#, fuzzy
+msgid "Unknown error."
+msgstr "چنین دستور وجود ندارد"
+
+#: src/net/manaserv/charhandler.cpp:200 src/net/tmwa/charserverhandler.cpp:146
+msgid "Info"
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:200
+msgid "Player deleted."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:212
+msgid "Selection out of range."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:215
+#, fuzzy, c-format
+msgid "Unknown error (%d)."
+msgstr "چنین دستور وجود ندارد"
+
+#: src/net/manaserv/charhandler.cpp:250
+msgid "No gameservers are available."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:187 src/net/manaserv/chathandler.cpp:313
+#: src/net/manaserv/guildhandler.cpp:260
+#, c-format
+msgid "Topic: %s"
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:274
+msgid "Players in this channel:"
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:208
+msgid "Error joining channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:214
+msgid "Listing channels."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:226
+msgid "End of channel list."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:303
+#, c-format
+msgid "%s entered the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:308
+#, c-format
+msgid "%s left the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:324
+#, c-format
+msgid "%s has set mode %s on user %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:334
+#, c-format
+msgid "%s has kicked %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:339
+#, fuzzy
+msgid "Unknown channel event."
+msgstr "چنین دستور وجود ندارد"
+
+#: src/net/manaserv/guildhandler.cpp:82
+msgid "Guild created."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:87
+msgid "Error creating guild."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:97
+msgid "Invite sent."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:204
+msgid "Member was promoted successfully."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:209
+msgid "Failed to promote member."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:87
+msgid "Wrong magic_token."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
+msgid "Already logged in."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:93
+msgid "Account banned."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:118
+msgid "New password incorrect."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:121 src/net/tmwa/loginhandler.cpp:89
+msgid "Old password incorrect."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
+msgid "Account not connected. Please login first."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:149
+msgid "New email address incorrect."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:152
+msgid "Old email address incorrect."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:158
+msgid "The new email address already exists."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:239
+msgid ""
+"Client registration is not allowed. Please contact server administration."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
+msgid "Client version is too old."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:266
+msgid "Wrong username or password."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:272
+msgid "Account banned"
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:275
+msgid "Login attempt too soon after previous attempt."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:303
+msgid "Wrong username, password or email address."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:306
+msgid "Username already exists."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:309
+msgid "Email address already exists."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:312
+msgid "You took too long with the captcha or your response was incorrect."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:87
+msgid "Joined party."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:105
+#, c-format
+msgid "%s joined the party."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:123
+#, c-format
+msgid "%s rejected your invite."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:95
+msgid "Accepting incoming trade requests."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:97
+msgid "Ignoring incoming trade requests."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:115 src/net/tmwa/tradehandler.cpp:109
+msgid "Request for Trade"
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:116 src/net/tmwa/tradehandler.cpp:110
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:134
+#, c-format
+msgid "Trading with %s"
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:148 src/net/tmwa/tradehandler.cpp:224
+msgid "Trade canceled."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:155 src/net/tmwa/tradehandler.cpp:231
+msgid "Trade completed."
+msgstr ""
+
+#: src/net/tmwa/adminhandler.cpp:64
 msgid "Kick failed!"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:65
+#: src/net/tmwa/adminhandler.cpp:66
 msgid "Kick succeeded!"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:110
+#: src/net/tmwa/buysellhandler.cpp:109
 msgid "Nothing to sell."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:117
+#: src/net/tmwa/buysellhandler.cpp:116
 msgid "Thanks for buying."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:124
+#: src/net/tmwa/buysellhandler.cpp:123
 msgid "Unable to buy."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:130
+#: src/net/tmwa/buysellhandler.cpp:129
 msgid "Thanks for selling."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:132
+#: src/net/tmwa/buysellhandler.cpp:131
 msgid "Unable to sell."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:103
-msgid "Access denied."
+#: src/net/tmwa/charserverhandler.cpp:103
+msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:106
+#: src/net/tmwa/charserverhandler.cpp:107
 msgid "Cannot use this ID."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:109
-msgid "Unknown failure to select character."
-msgstr ""
+#: src/net/tmwa/charserverhandler.cpp:110
+#, fuzzy
+msgid "Unknown char-server failure."
+msgstr "چنین دستور وجود ندارد"
 
-#: src/net/ea/charserverhandler.cpp:135
+#: src/net/tmwa/charserverhandler.cpp:134
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:147 src/net/manaserv/charhandler.cpp:187
-msgid "Info"
-msgstr ""
-
-#: src/net/ea/charserverhandler.cpp:147
+#: src/net/tmwa/charserverhandler.cpp:146
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:152
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Failed to delete character."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:237 src/net/manaserv/charhandler.cpp:263
+#: src/net/tmwa/charserverhandler.cpp:266
 msgid "Strength:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:238 src/net/manaserv/charhandler.cpp:264
+#: src/net/tmwa/charserverhandler.cpp:267
 msgid "Agility:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:239 src/net/manaserv/charhandler.cpp:266
+#: src/net/tmwa/charserverhandler.cpp:268
 msgid "Vitality:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:240 src/net/manaserv/charhandler.cpp:267
+#: src/net/tmwa/charserverhandler.cpp:269
 msgid "Intelligence:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:241 src/net/manaserv/charhandler.cpp:265
+#: src/net/tmwa/charserverhandler.cpp:270
 msgid "Dexterity:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:242
+#: src/net/tmwa/charserverhandler.cpp:271
 msgid "Luck:"
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:80
-msgid "Whisper could not be sent, user is offline."
+#: src/net/tmwa/chathandler.cpp:87
+#, c-format
+msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:84
-msgid "Whisper could not be sent, ignored by user."
+#: src/net/tmwa/chathandler.cpp:96
+#, c-format
+msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:171
+#: src/net/tmwa/chathandler.cpp:230
 msgid "MVP player."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:204 src/net/ea/chathandler.cpp:210
-#: src/net/ea/chathandler.cpp:215 src/net/ea/chathandler.cpp:220
-#: src/net/ea/chathandler.cpp:225 src/net/ea/chathandler.cpp:230
-#: src/net/ea/chathandler.cpp:235 src/net/ea/chathandler.cpp:240
+#: src/net/tmwa/chathandler.cpp:265 src/net/tmwa/chathandler.cpp:271
+#: src/net/tmwa/chathandler.cpp:276 src/net/tmwa/chathandler.cpp:281
+#: src/net/tmwa/chathandler.cpp:286 src/net/tmwa/chathandler.cpp:291
+#: src/net/tmwa/chathandler.cpp:296 src/net/tmwa/chathandler.cpp:301
 msgid "Channels are not supported!"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:86
+#: src/net/tmwa/gamehandler.cpp:88
 #, c-format
 msgid "Online users: %d"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:100
+#: src/net/tmwa/gamehandler.cpp:101
 #, fuzzy
 msgid "Game"
 msgstr "نام"
 
-#: src/net/ea/gamehandler.cpp:100
+#: src/net/tmwa/gamehandler.cpp:101
 msgid "Request to quit denied!"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:102 src/net/manaserv/generalhandler.cpp:95
+#: src/net/tmwa/generalhandler.cpp:102
 #, c-format
 msgid "Strength %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:103 src/net/manaserv/generalhandler.cpp:96
+#: src/net/tmwa/generalhandler.cpp:103
 #, c-format
 msgid "Agility %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:104 src/net/manaserv/generalhandler.cpp:98
+#: src/net/tmwa/generalhandler.cpp:104
 #, c-format
 msgid "Vitality %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:105 src/net/manaserv/generalhandler.cpp:99
+#: src/net/tmwa/generalhandler.cpp:105
 #, c-format
 msgid "Intelligence %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:106 src/net/manaserv/generalhandler.cpp:97
+#: src/net/tmwa/generalhandler.cpp:106
 #, c-format
 msgid "Dexterity %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:107
+#: src/net/tmwa/generalhandler.cpp:107
 #, c-format
 msgid "Luck %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:130
+#: src/net/tmwa/generalhandler.cpp:132
 msgid "Authentication failed."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:133
+#: src/net/tmwa/generalhandler.cpp:135
 msgid "No servers available."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:137
+#: src/net/tmwa/generalhandler.cpp:139
 msgid "Someone else is trying to use this account."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:140
+#: src/net/tmwa/generalhandler.cpp:142
 msgid "This account is already logged in."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:143
+#: src/net/tmwa/generalhandler.cpp:145
 msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:146
+#: src/net/tmwa/generalhandler.cpp:148
 msgid "Duplicated login."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:149
+#: src/net/tmwa/generalhandler.cpp:151
 msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:205
+#: src/net/tmwa/generalhandler.cpp:209
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:216 src/net/manaserv/generalhandler.cpp:166
+#: src/net/tmwa/generalhandler.cpp:230
 msgid "Strength"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:217 src/net/manaserv/generalhandler.cpp:167
+#: src/net/tmwa/generalhandler.cpp:231
 msgid "Agility"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:218 src/net/manaserv/generalhandler.cpp:169
+#: src/net/tmwa/generalhandler.cpp:232
 msgid "Vitality"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:219 src/net/manaserv/generalhandler.cpp:170
+#: src/net/tmwa/generalhandler.cpp:233
 msgid "Intelligence"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:220 src/net/manaserv/generalhandler.cpp:168
+#: src/net/tmwa/generalhandler.cpp:234
 msgid "Dexterity"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:221
+#: src/net/tmwa/generalhandler.cpp:235
 msgid "Luck"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:224
+#: src/net/tmwa/generalhandler.cpp:238
 #, fuzzy
 msgid "Defense"
 msgstr "حذف"
 
-#: src/net/ea/generalhandler.cpp:225
+#: src/net/tmwa/generalhandler.cpp:239
 msgid "M.Attack"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:226
+#: src/net/tmwa/generalhandler.cpp:240
 msgid "M.Defense"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:227
+#: src/net/tmwa/generalhandler.cpp:241
 #, c-format
 msgid "% Accuracy"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:228
+#: src/net/tmwa/generalhandler.cpp:242
 #, c-format
 msgid "% Evade"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:229
+#: src/net/tmwa/generalhandler.cpp:243
 #, c-format
 msgid "% Critical"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:61 src/net/ea/gui/partytab.cpp:59
+#: src/net/tmwa/gui/guildtab.cpp:45
+msgid "Guild"
+msgstr ""
+
+#: src/net/tmwa/gui/guildtab.cpp:61 src/net/tmwa/gui/partytab.cpp:59
 msgid "/help > Display this help."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:62
+#: src/net/tmwa/gui/guildtab.cpp:62
 #, fuzzy
 msgid "/invite > Invite a player to your guild"
 msgstr "می توانید با این دستور کاربری دیگر را به گروه خود دعوت کنید"
 
-#: src/net/ea/gui/guildtab.cpp:63
+#: src/net/tmwa/gui/guildtab.cpp:63
 msgid "/leave > Leave the guild you are in"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:64
+#: src/net/tmwa/gui/guildtab.cpp:64
 msgid "/kick > Kick some one from the guild you are in"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:73 src/net/ea/gui/partytab.cpp:73
+#: src/net/tmwa/gui/guildtab.cpp:73 src/net/tmwa/gui/partytab.cpp:73
 msgid "Command: /invite <nick>"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:74
+#: src/net/tmwa/gui/guildtab.cpp:74
 msgid "This command invites <nick> to the guild you're in."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:80 src/net/ea/gui/partytab.cpp:80
+#: src/net/tmwa/gui/guildtab.cpp:80 src/net/tmwa/gui/partytab.cpp:80
 msgid "Command: /leave"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:81
+#: src/net/tmwa/gui/guildtab.cpp:81
 msgid "This command causes the player to leave the guild."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:89
+#: src/net/tmwa/gui/guildtab.cpp:89
 msgid "Guild name is missing."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:293
+#: src/net/tmwa/guildhandler.cpp:296
 msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:298
+#: src/net/tmwa/guildhandler.cpp:301
 msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:303
+#: src/net/tmwa/guildhandler.cpp:306
 msgid "User is now part of your guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:308
+#: src/net/tmwa/guildhandler.cpp:311
 msgid "Your guild is full."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:313
+#: src/net/tmwa/guildhandler.cpp:316
 msgid "Unknown guild invite response."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:390
+#: src/net/tmwa/guildhandler.cpp:393
 msgid "Guild creation isn't supported yet."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:60
+#: src/net/tmwa/gui/partytab.cpp:43
+msgid "Party"
+msgstr ""
+
+#: src/net/tmwa/gui/partytab.cpp:60
 msgid "/invite > Invite a player to your party"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:61
+#: src/net/tmwa/gui/partytab.cpp:61
 msgid "/leave > Leave the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:62
+#: src/net/tmwa/gui/partytab.cpp:62
 msgid "/kick > Kick some one from the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:63
+#: src/net/tmwa/gui/partytab.cpp:63
 msgid "/item > Show/change party item sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:64
+#: src/net/tmwa/gui/partytab.cpp:64
 msgid "/exp > Show/change party experience sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:81
+#: src/net/tmwa/gui/partytab.cpp:81
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:85
+#: src/net/tmwa/gui/partytab.cpp:85
 msgid "Command: /item <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:86
+#: src/net/tmwa/gui/partytab.cpp:86
 msgid "This command changes the party's item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:87
+#: src/net/tmwa/gui/partytab.cpp:87
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:90
+#: src/net/tmwa/gui/partytab.cpp:90
 msgid "Command: /item"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/tmwa/gui/partytab.cpp:91
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/tmwa/gui/partytab.cpp:95
 msgid "Command: /exp <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:96
+#: src/net/tmwa/gui/partytab.cpp:96
 msgid "This command changes the party's experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/tmwa/gui/partytab.cpp:97
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:100
+#: src/net/tmwa/gui/partytab.cpp:100
 msgid "Command: /exp"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/tmwa/gui/partytab.cpp:101
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:132 src/net/ea/partyhandler.cpp:198
+#: src/net/tmwa/gui/partytab.cpp:132 src/net/tmwa/partyhandler.cpp:196
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:135 src/net/ea/partyhandler.cpp:204
+#: src/net/tmwa/gui/partytab.cpp:135 src/net/tmwa/partyhandler.cpp:202
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:138 src/net/ea/partyhandler.cpp:210
+#: src/net/tmwa/gui/partytab.cpp:138 src/net/tmwa/partyhandler.cpp:208
 msgid "Item sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:141
+#: src/net/tmwa/gui/partytab.cpp:141
 msgid "Item sharing unknown."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:167 src/net/ea/partyhandler.cpp:174
+#: src/net/tmwa/gui/partytab.cpp:167 src/net/tmwa/partyhandler.cpp:172
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:170 src/net/ea/partyhandler.cpp:180
+#: src/net/tmwa/gui/partytab.cpp:170 src/net/tmwa/partyhandler.cpp:178
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:173 src/net/ea/partyhandler.cpp:186
+#: src/net/tmwa/gui/partytab.cpp:173 src/net/tmwa/partyhandler.cpp:184
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:176
+#: src/net/tmwa/gui/partytab.cpp:176
 msgid "Experience sharing unknown."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:281
+#: src/net/tmwa/inventoryhandler.cpp:285
 msgid "Failed to use item."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:391
+#: src/net/tmwa/inventoryhandler.cpp:399
 msgid "Unable to equip."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:402
+#: src/net/tmwa/inventoryhandler.cpp:410
 msgid "Unable to unequip."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:79
+#: src/net/tmwa/loginhandler.cpp:86
 msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:82 src/net/manaserv/loginhandler.cpp:121
-msgid "Old password incorrect."
-msgstr ""
-
-#: src/net/ea/loginhandler.cpp:85
+#: src/net/tmwa/loginhandler.cpp:92
 msgid "New password too short."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:88 src/net/ea/loginhandler.cpp:175
-#: src/net/manaserv/charhandler.cpp:158 src/net/manaserv/loginhandler.cpp:96
-#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
-#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
-#, fuzzy
-msgid "Unknown error."
-msgstr "چنین دستور وجود ندارد"
-
-#: src/net/ea/loginhandler.cpp:149
+#: src/net/tmwa/loginhandler.cpp:156
 #, fuzzy
 msgid "Unregistered ID."
 msgstr "ثبت نام نشده"
 
-#: src/net/ea/loginhandler.cpp:152
+#: src/net/tmwa/loginhandler.cpp:159
 #, fuzzy
 msgid "Wrong password."
 msgstr "تغییر گذرواژه"
 
-#: src/net/ea/loginhandler.cpp:155
+#: src/net/tmwa/loginhandler.cpp:162
 msgid "Account expired."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:158
+#: src/net/tmwa/loginhandler.cpp:165
 msgid "Rejected from server."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:161
+#: src/net/tmwa/loginhandler.cpp:168
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:165
+#: src/net/tmwa/loginhandler.cpp:172
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:172
+#: src/net/tmwa/loginhandler.cpp:179
 msgid "This user name is already taken."
 msgstr ""
 
-#: src/net/ea/network.cpp:145
+#: src/net/tmwa/network.cpp:145
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/ea/network.cpp:345
+#: src/net/tmwa/network.cpp:345
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/ea/network.cpp:414
+#: src/net/tmwa/network.cpp:414
 msgid "Connection to server terminated. "
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:81
+#: src/net/tmwa/partyhandler.cpp:82
 msgid "Could not create party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:84
+#: src/net/tmwa/partyhandler.cpp:84
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:118
+#: src/net/tmwa/partyhandler.cpp:119
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:122
+#: src/net/tmwa/partyhandler.cpp:123
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:126
+#: src/net/tmwa/partyhandler.cpp:127
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:130
+#: src/net/tmwa/partyhandler.cpp:131
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:238
+#: src/net/tmwa/partyhandler.cpp:236
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:249
+#: src/net/tmwa/partyhandler.cpp:246
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:301
+#: src/net/tmwa/partyhandler.cpp:299
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:329
-msgid "Inviting like this isn't supported at the moment."
+#: src/net/tmwa/partyhandler.cpp:335
+#, c-format
+msgid "Inviting failed, because you can't see a player called %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:334
+#: src/net/tmwa/partyhandler.cpp:340
 msgid "You can only inivte when you are in a party!"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:365
+#: src/net/tmwa/partyhandler.cpp:368
 #, c-format
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:304
-msgid "You are dead."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:305
-msgid "We regret to inform you that your character was killed in battle."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:307
-msgid "You are not that alive anymore."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:308
-msgid "The cold hands of the grim reaper are grabbing for your soul."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:309
-msgid "Game Over!"
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:105
+#: src/net/tmwa/playerhandler.cpp:100
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:310
-msgid ""
-"No, kids. Your character did not really die. It... err... went to a better "
-"place."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:312
-msgid ""
-"Your plan of breaking your enemies weapon by bashing it with your throat "
-"failed."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:314
-msgid "I guess this did not run too well."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:315
-msgid "Do you want your possessions identified?"
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:316
-msgid "Sadly, no trace of you was ever found..."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:317
-msgid "Annihilated."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:318
-msgid "Looks like you got your head handed to you."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:120 src/net/manaserv/beinghandler.cpp:319
-msgid ""
-"You screwed up again, dump your body down the tubes and get you another one."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/tmwa/playerhandler.cpp:118
 msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/tmwa/playerhandler.cpp:119
 msgid "You are no more."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/tmwa/playerhandler.cpp:120
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/tmwa/playerhandler.cpp:121
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/tmwa/playerhandler.cpp:122
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/tmwa/playerhandler.cpp:123
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/tmwa/playerhandler.cpp:124
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:130
+#: src/net/tmwa/playerhandler.cpp:125
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:131
+#: src/net/tmwa/playerhandler.cpp:126
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/tmwa/playerhandler.cpp:127
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/tmwa/playerhandler.cpp:128
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:135
+#: src/net/tmwa/playerhandler.cpp:130
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:136
+#: src/net/tmwa/playerhandler.cpp:131
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:249 src/net/ea/playerhandler.cpp:310
+#: src/net/tmwa/playerhandler.cpp:246 src/net/tmwa/playerhandler.cpp:285
 msgid "Message"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:250
+#: src/net/tmwa/playerhandler.cpp:247
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:333
+#: src/net/tmwa/playerhandler.cpp:313
 #, c-format
 msgid "You picked up %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:369
+#: src/net/tmwa/playerhandler.cpp:348
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:532
+#: src/net/tmwa/playerhandler.cpp:488
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:147
+#: src/net/tmwa/specialhandler.cpp:144
 msgid "Trade failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:150
+#: src/net/tmwa/specialhandler.cpp:147
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:153
+#: src/net/tmwa/specialhandler.cpp:150
 msgid "Sit failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:156
+#: src/net/tmwa/specialhandler.cpp:153
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:159
+#: src/net/tmwa/specialhandler.cpp:156
 msgid "Could not join party!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:162
+#: src/net/tmwa/specialhandler.cpp:159
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:171
+#: src/net/tmwa/specialhandler.cpp:168
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:174
+#: src/net/tmwa/specialhandler.cpp:171
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:177
+#: src/net/tmwa/specialhandler.cpp:174
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:180
+#: src/net/tmwa/specialhandler.cpp:177
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:183
+#: src/net/tmwa/specialhandler.cpp:180
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:186
+#: src/net/tmwa/specialhandler.cpp:183
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:189
+#: src/net/tmwa/specialhandler.cpp:186
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:192
+#: src/net/tmwa/specialhandler.cpp:189
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:195
+#: src/net/tmwa/specialhandler.cpp:192
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:198
+#: src/net/tmwa/specialhandler.cpp:195
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:201
+#: src/net/tmwa/specialhandler.cpp:198
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:210
+#: src/net/tmwa/specialhandler.cpp:207
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:213
+#: src/net/tmwa/specialhandler.cpp:210
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:216
+#: src/net/tmwa/specialhandler.cpp:213
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:116
-msgid "Request for Trade"
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:108 src/net/manaserv/tradehandler.cpp:117
-#, c-format
-msgid "%s wants to trade with you, do you accept?"
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:124
+#: src/net/tmwa/tradehandler.cpp:126
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:128
+#: src/net/tmwa/tradehandler.cpp:130
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:132
+#: src/net/tmwa/tradehandler.cpp:134
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:137
+#: src/net/tmwa/tradehandler.cpp:139
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:144
+#: src/net/tmwa/tradehandler.cpp:146
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:153
+#: src/net/tmwa/tradehandler.cpp:154
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:202
+#: src/net/tmwa/tradehandler.cpp:202
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:207
+#: src/net/tmwa/tradehandler.cpp:207
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:211
+#: src/net/tmwa/tradehandler.cpp:211
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:224 src/net/manaserv/tradehandler.cpp:149
-msgid "Trade canceled."
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:231 src/net/manaserv/tradehandler.cpp:156
-msgid "Trade completed."
-msgstr ""
-
-#: src/net/manaserv/beinghandler.cpp:324
-msgid "Press OK to respawn."
-msgstr ""
-
-#: src/net/manaserv/beinghandler.cpp:325
-msgid "You Died"
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:128 src/net/manaserv/charhandler.cpp:196
-msgid "Not logged in."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:131
-msgid "No empty slot."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:134
-msgid "Invalid name."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:137
-msgid "Character's name already exists."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:140
-msgid "Invalid hairstyle."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:143
-msgid "Invalid hair color."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:146
-msgid "Invalid gender."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:149
-msgid "Character's stats are too high."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:152
-msgid "Character's stats are too low."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:155
-msgid "One stat is zero."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:187
-msgid "Player deleted."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:199
-msgid "Selection out of range."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:202
-#, fuzzy, c-format
-msgid "Unknown error (%d)."
-msgstr "چنین دستور وجود ندارد"
-
-#: src/net/manaserv/charhandler.cpp:242
-msgid "No gameservers are available."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:268
-msgid "Willpower:"
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
-#: src/net/manaserv/guildhandler.cpp:259
-#, c-format
-msgid "Topic: %s"
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
-msgid "Players in this channel:"
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:201
-msgid "Error joining channel."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:207
-msgid "Listing channels."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:219
-msgid "End of channel list."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:291
-#, c-format
-msgid "%s entered the channel."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:296
-#, c-format
-msgid "%s left the channel."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:312
-#, c-format
-msgid "%s has set mode %s on user %s."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:322
-#, c-format
-msgid "%s has kicked %s."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:327
-#, fuzzy
-msgid "Unknown channel event."
-msgstr "چنین دستور وجود ندارد"
-
-#: src/net/manaserv/generalhandler.cpp:100
-#, c-format
-msgid "Willpower %+d"
-msgstr ""
-
-#: src/net/manaserv/generalhandler.cpp:171
-msgid "Willpower"
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:81
-msgid "Guild created."
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:86
-msgid "Error creating guild."
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:96
-msgid "Invite sent."
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:203
-msgid "Member was promoted successfully."
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:208
-msgid "Failed to promote member."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:87
-msgid "Wrong magic_token."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
-msgid "Already logged in."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:93 src/net/manaserv/loginhandler.cpp:272
-msgid "Server is full."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:118
-msgid "New password incorrect."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
-msgid "Account not connected. Please login first."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:149
-msgid "New email address incorrect."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:152
-msgid "Old email address incorrect."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:158
-msgid "The new email address already exists."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:239
-msgid ""
-"Client registration is not allowed. Please contact server administration."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
-msgid "Client version is too old."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:266
-msgid "Wrong username or password."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:275
-msgid "Login attempt too soon after previous attempt."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:303
-msgid "Wrong username, password or email address."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:306
-msgid "Username already exists."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:309
-msgid "Email address already exists."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:312
-msgid "You took too long with the captcha or your response was incorrect."
-msgstr ""
-
-#: src/net/manaserv/partyhandler.cpp:88
-msgid "Joined party."
-msgstr ""
-
-#: src/net/manaserv/partyhandler.cpp:106
-#, c-format
-msgid "%s joined the party."
-msgstr ""
-
-#: src/net/manaserv/partyhandler.cpp:123
-#, c-format
-msgid "%s rejected your invite."
-msgstr ""
-
-#: src/net/manaserv/tradehandler.cpp:96
-msgid "Accepting incoming trade requests."
-msgstr ""
-
-#: src/net/manaserv/tradehandler.cpp:98
-msgid "Ignoring incoming trade requests."
-msgstr ""
-
-#: src/net/manaserv/tradehandler.cpp:135
-#, c-format
-msgid "Trading with %s"
-msgstr ""
-
-#: src/playerrelations.cpp:304
+#: src/playerrelations.cpp:310
 msgid "Completely ignore"
 msgstr ""
 
-#: src/playerrelations.cpp:318
+#: src/playerrelations.cpp:324
 msgid "Print '...'"
 msgstr ""
 
-#: src/playerrelations.cpp:334
+#: src/playerrelations.cpp:340
 msgid "Blink name"
 msgstr ""
 
-#: src/playerrelations.cpp:371
-msgid "Floating '...' bubble"
-msgstr ""
-
-#: src/playerrelations.cpp:374
-msgid "Floating bubble"
-msgstr ""
-
-#: src/resources/itemdb.cpp:52
+#: src/resources/itemdb.cpp:44
 #, c-format
 msgid "Attack %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:53
+#: src/resources/itemdb.cpp:45
 #, c-format
 msgid "Defense %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:54
+#: src/resources/itemdb.cpp:46
 #, c-format
 msgid "HP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:55
+#: src/resources/itemdb.cpp:47
 #, c-format
 msgid "MP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:114
+#: src/resources/itemdb.cpp:92
 msgid "Unknown item"
 msgstr ""
 
-#: src/resources/itemdb.cpp:158 src/resources/monsterdb.cpp:45
-#: src/resources/monsterdb.cpp:67
+#: src/resources/itemdb.cpp:135 src/resources/monsterdb.cpp:77
 msgid "unnamed"
 msgstr ""
 
diff --git a/po/fi.po b/po/fi.po
index faab4cb3..7cb15b8e 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2010-03-05 21:52+0100\n"
+"POT-Creation-Date: 2010-12-13 20:04+0100\n"
 "PO-Revision-Date: 2009-07-25 15:42+0000\n"
 "Last-Translator: gemis <vienamo@mbnet.fi>\n"
 "Language-Team: Finnish <fi@li.org>\n"
+"Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,444 +19,458 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/client.cpp:553 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:62
+#: src/client.cpp:598 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
 msgid "Setup"
 msgstr "Asetukset"
 
-#: src/client.cpp:623
+#: src/client.cpp:679
 #, fuzzy
 msgid "Connecting to server"
 msgstr "Yhdistetään kartta palvelimelle"
 
-#: src/client.cpp:650
+#: src/client.cpp:706
 #, fuzzy
 msgid "Logging in"
 msgstr "Kirjaudu sisään"
 
-#: src/client.cpp:683
+#: src/client.cpp:739
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:739
+#: src/client.cpp:804
 #, fuzzy
 msgid "Requesting characters"
 msgstr "Valitse hahmo"
 
-#: src/client.cpp:768
+#: src/client.cpp:833
 #, fuzzy
 msgid "Connecting to the game server"
 msgstr "Yhdistetään kartta palvelimelle"
 
-#: src/client.cpp:799 src/client.cpp:806 src/client.cpp:940
+#: src/client.cpp:843
+#, fuzzy
+msgid "Changing game servers"
+msgstr "Palvelin:"
+
+#: src/client.cpp:872 src/client.cpp:879 src/client.cpp:1014
 #: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
 #: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
-#: src/gui/serverdialog.cpp:261 src/gui/unregisterdialog.cpp:133
-#: src/net/ea/charserverhandler.cpp:135 src/net/ea/charserverhandler.cpp:152
-#: src/net/manaserv/charhandler.cpp:161 src/net/manaserv/charhandler.cpp:204
+#: src/gui/serverdialog.cpp:323 src/gui/unregisterdialog.cpp:133
+#: src/net/manaserv/charhandler.cpp:174 src/net/manaserv/charhandler.cpp:217
+#: src/net/tmwa/charserverhandler.cpp:134
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Error"
 msgstr "Virhe"
 
-#: src/client.cpp:815
+#: src/client.cpp:888
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:842
+#: src/client.cpp:915
 #, fuzzy
 msgid "Password Change"
 msgstr "Salasana:"
 
-#: src/client.cpp:843
+#: src/client.cpp:916
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:862
+#: src/client.cpp:935
 #, fuzzy
 msgid "Email Change"
 msgstr "Muuta"
 
-#: src/client.cpp:863
+#: src/client.cpp:936
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:883
+#: src/client.cpp:956
 #, fuzzy
 msgid "Unregister Successful"
 msgstr "Poista palvelimelta"
 
-#: src/client.cpp:884
+#: src/client.cpp:957
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1007 src/client.cpp:1030
+#: src/client.cpp:1138 src/client.cpp:1161
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1119
+#: src/client.cpp:1281
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1153 src/client.cpp:1159
+#: src/client.cpp:1315 src/client.cpp:1321
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/commandhandler.cpp:127 src/commandhandler.cpp:308
+#: src/commandhandler.cpp:131 src/commandhandler.cpp:317
 msgid "Unknown command."
 msgstr "Tuntematon komento."
 
-#: src/commandhandler.cpp:156
+#: src/commandhandler.cpp:160
 msgid "-- Help --"
 msgstr "--Apua--"
 
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:161
 msgid "/help > Display this help"
 msgstr "/help > Näyttää tämän apu tekstin"
 
-#: src/commandhandler.cpp:159
+#: src/commandhandler.cpp:163
 msgid "/where > Display map name"
 msgstr "/where > Näytä kartan nimi"
 
-#: src/commandhandler.cpp:160
+#: src/commandhandler.cpp:164
 msgid "/who > Display number of online users"
 msgstr "/who > Näytä paikalla olevien pelaajien määrä"
 
-#: src/commandhandler.cpp:161
+#: src/commandhandler.cpp:165
 msgid "/me > Tell something about yourself"
 msgstr "/me > Kerro jotain itsestäsi"
 
-#: src/commandhandler.cpp:163
+#: src/commandhandler.cpp:167
 msgid "/clear > Clears this window"
 msgstr "/clear > Tyhjennä ikkuna"
 
-#: src/commandhandler.cpp:165
+#: src/commandhandler.cpp:169
 msgid "/msg > Send a private message to a user"
 msgstr "/msg > Lähetä yksityis viesti käyttäjälle"
 
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:170
 msgid "/whisper > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:167
+#: src/commandhandler.cpp:171
 msgid "/w > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:168
+#: src/commandhandler.cpp:172
 msgid "/query > Makes a tab for private messages with another user"
 msgstr "/query > Tekee välilehden toisen käyttäjän yksityisviestejä varten."
 
-#: src/commandhandler.cpp:169
+#: src/commandhandler.cpp:174
 msgid "/q > Alias of query"
 msgstr ""
 
-#: src/commandhandler.cpp:171
+#: src/commandhandler.cpp:176
 msgid "/ignore > ignore a player"
 msgstr ""
 
-#: src/commandhandler.cpp:172
+#: src/commandhandler.cpp:177
 msgid "/unignore > stop ignoring a player"
 msgstr ""
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:179
 msgid "/list > Display all public channels"
 msgstr "/list > Näytä kaikki julkiset kanavat"
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:180
 msgid "/join > Join or create a channel"
 msgstr "/join > Liity tai luo kanava"
 
-#: src/commandhandler.cpp:177
+#: src/commandhandler.cpp:182
 msgid "/createparty > Create a new party"
 msgstr ""
 
-#: src/commandhandler.cpp:178
+#: src/commandhandler.cpp:183
 msgid "/party > Invite a user to party"
 msgstr ""
 
-#: src/commandhandler.cpp:180
+#: src/commandhandler.cpp:185
 msgid "/record > Start recording the chat to an external file"
 msgstr "/record > Aloita keskustelun nauhoitus ulkoiseen tiedostoon"
 
-#: src/commandhandler.cpp:181
+#: src/commandhandler.cpp:187
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr ""
 
-#: src/commandhandler.cpp:182
+#: src/commandhandler.cpp:189
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
 
-#: src/commandhandler.cpp:184
+#: src/commandhandler.cpp:192
 msgid "/announce > Global announcement (GM only)"
 msgstr ""
 
-#: src/commandhandler.cpp:188
+#: src/commandhandler.cpp:196
 msgid "For more information, type /help <command>."
 msgstr ""
 
-#: src/commandhandler.cpp:192
+#: src/commandhandler.cpp:200
 msgid "Command: /help"
 msgstr ""
 
-#: src/commandhandler.cpp:193
+#: src/commandhandler.cpp:201
 msgid "This command displays a list of all commands available."
 msgstr "Tämä komento näyttää listan kaikista komennoista."
 
-#: src/commandhandler.cpp:194
+#: src/commandhandler.cpp:203
 msgid "Command: /help <command>"
 msgstr ""
 
-#: src/commandhandler.cpp:195
+#: src/commandhandler.cpp:204
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/commandhandler.cpp:203
+#: src/commandhandler.cpp:212
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: src/commandhandler.cpp:204
+#: src/commandhandler.cpp:213
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/commandhandler.cpp:205
+#: src/commandhandler.cpp:214
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:210
+#: src/commandhandler.cpp:219
 msgid "Command: /clear"
 msgstr ""
 
-#: src/commandhandler.cpp:211
+#: src/commandhandler.cpp:220
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:224
 msgid "Command: /ignore <player>"
 msgstr ""
 
-#: src/commandhandler.cpp:216
+#: src/commandhandler.cpp:225
 #, fuzzy
 msgid "This command ignores the given player regardless of current relations."
 msgstr "Tämä komento näyttää paikalla olevien pelaajien määrän."
 
-#: src/commandhandler.cpp:221
+#: src/commandhandler.cpp:230
 msgid "Command: /join <channel>"
 msgstr ""
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:231
 msgid "This command makes you enter <channel>."
 msgstr ""
 
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:232
 msgid "If <channel> doesn't exist, it's created."
 msgstr "Jos kanavaa <cannel> ei ole, se luodaan."
 
-#: src/commandhandler.cpp:227
+#: src/commandhandler.cpp:236
 msgid "Command: /list"
 msgstr ""
 
-#: src/commandhandler.cpp:228
+#: src/commandhandler.cpp:237
 msgid "This command shows a list of all channels."
 msgstr "Tämä komento näyttää listan kaikista kanavista"
 
-#: src/commandhandler.cpp:232
+#: src/commandhandler.cpp:241
 msgid "Command: /me <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:233
+#: src/commandhandler.cpp:242
 msgid "This command tell others you are (doing) <msg>."
 msgstr ""
 
-#: src/commandhandler.cpp:237
+#: src/commandhandler.cpp:246
 msgid "Command: /msg <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:238
+#: src/commandhandler.cpp:247
 msgid "Command: /whisper <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:239
+#: src/commandhandler.cpp:248
 msgid "Command: /w <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:240
+#: src/commandhandler.cpp:249
 msgid "This command sends the text <message> to <nick>."
 msgstr "Tämä komento lähettää tekstin <message> käyttäjälle <nick>."
 
-#: src/commandhandler.cpp:241 src/commandhandler.cpp:260
+#: src/commandhandler.cpp:250 src/commandhandler.cpp:269
 #: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
-#: src/net/ea/gui/guildtab.cpp:75 src/net/ea/gui/partytab.cpp:75
+#: src/net/tmwa/gui/guildtab.cpp:75 src/net/tmwa/gui/partytab.cpp:75
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:255
 msgid "Command: /query <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:247
+#: src/commandhandler.cpp:256
 msgid "Command: /q <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:248
+#: src/commandhandler.cpp:257
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:253
+#: src/commandhandler.cpp:262
 msgid "Command: /createparty <name>"
 msgstr ""
 
-#: src/commandhandler.cpp:254
+#: src/commandhandler.cpp:263
 #, fuzzy
 msgid "This command creates a new party called <name>."
 msgstr "Tällä komennolla poistut kanvalta."
 
-#: src/commandhandler.cpp:258
+#: src/commandhandler.cpp:267
 msgid "Command: /party <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:259 src/net/ea/gui/partytab.cpp:74
+#: src/commandhandler.cpp:268 src/net/tmwa/gui/partytab.cpp:74
 msgid "This command invites <nick> to party with you."
 msgstr ""
 
-#: src/commandhandler.cpp:265
+#: src/commandhandler.cpp:274
 msgid "Command: /present"
 msgstr ""
 
-#: src/commandhandler.cpp:266
+#: src/commandhandler.cpp:275
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: src/commandhandler.cpp:272
+#: src/commandhandler.cpp:281
 msgid "Command: /record <filename>"
 msgstr ""
 
-#: src/commandhandler.cpp:273
+#: src/commandhandler.cpp:282
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr "Tämä komento aloittaa keskustelun nauhoituksen tiedostoon <filename>."
 
-#: src/commandhandler.cpp:275
+#: src/commandhandler.cpp:284
 msgid "Command: /record"
 msgstr ""
 
-#: src/commandhandler.cpp:276
+#: src/commandhandler.cpp:285
 msgid "This command finishes a recording session."
 msgstr ""
 
-#: src/commandhandler.cpp:280
+#: src/commandhandler.cpp:289
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: src/commandhandler.cpp:281
+#: src/commandhandler.cpp:290
 msgid ""
 "This command sets whether the return key should toggle the chat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: src/commandhandler.cpp:283
+#: src/commandhandler.cpp:292
 msgid ""
-"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
-"\", \"no\", \"false\" to turn the toggle off."
+"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
+"\"0\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: src/commandhandler.cpp:286
+#: src/commandhandler.cpp:295
 msgid "Command: /toggle"
 msgstr ""
 
-#: src/commandhandler.cpp:287
+#: src/commandhandler.cpp:296
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: src/commandhandler.cpp:291 src/gui/widgets/whispertab.cpp:93
+#: src/commandhandler.cpp:300 src/gui/widgets/whispertab.cpp:95
 msgid "Command: /unignore <player>"
 msgstr ""
 
-#: src/commandhandler.cpp:292
+#: src/commandhandler.cpp:301
 msgid "This command stops ignoring the given player if they are being ignored"
 msgstr ""
 
-#: src/commandhandler.cpp:297
+#: src/commandhandler.cpp:306
 msgid "Command: /where"
 msgstr ""
 
-#: src/commandhandler.cpp:298
+#: src/commandhandler.cpp:307
 msgid "This command displays the name of the current map."
 msgstr "Tämä komento näyttää nykyisen kartan nimen"
 
-#: src/commandhandler.cpp:302
+#: src/commandhandler.cpp:311
 msgid "Command: /who"
 msgstr ""
 
-#: src/commandhandler.cpp:303
+#: src/commandhandler.cpp:312
 msgid "This command displays the number of players currently online."
 msgstr "Tämä komento näyttää paikalla olevien pelaajien määrän."
 
-#: src/commandhandler.cpp:309
+#: src/commandhandler.cpp:318
 msgid "Type /help for a list of commands."
 msgstr "Kirjoita /help jotta näkisit listan komennoista."
 
-#: src/commandhandler.cpp:375
+#: src/commandhandler.cpp:384
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:383
+#: src/commandhandler.cpp:392
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:397
+#: src/commandhandler.cpp:406
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:410 src/net/ea/gui/partytab.cpp:109
+#: src/commandhandler.cpp:419 src/net/tmwa/gui/partytab.cpp:109
 msgid "Party name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:423 src/commandhandler.cpp:471
-#: src/commandhandler.cpp:493
+#: src/commandhandler.cpp:432 src/commandhandler.cpp:509
+#: src/commandhandler.cpp:531
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:441
+#: src/commandhandler.cpp:450
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:441
+#: src/commandhandler.cpp:450
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:450
+#: src/commandhandler.cpp:459
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:454
+#: src/commandhandler.cpp:463
 msgid "Message now closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:477
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:489
+msgid "Show IP: On"
+msgstr ""
+
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:485
+msgid "Show IP: Off"
+msgstr ""
+
+#: src/commandhandler.cpp:515
 msgid "Player already ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:484
+#: src/commandhandler.cpp:522
 msgid "Player successfully ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:486
+#: src/commandhandler.cpp:524
 msgid "Player could not be ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:501
+#: src/commandhandler.cpp:539
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:506
+#: src/commandhandler.cpp:544
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:508
+#: src/commandhandler.cpp:546
 msgid "Player could not be unignored!"
 msgstr ""
 
@@ -468,43 +483,43 @@ msgstr ""
 msgid "General"
 msgstr "Yleiset"
 
-#: src/game.cpp:326
+#: src/game.cpp:342
 #, fuzzy
 msgid "Screenshot saved as "
 msgstr "Ruutukaappaus tallennettu ~/"
 
-#: src/game.cpp:331
+#: src/game.cpp:347
 msgid "Saving screenshot failed!"
 msgstr "Ruutukaappauksen tallentaminen epäonnistui!"
 
-#: src/game.cpp:355
+#: src/game.cpp:378
 #, fuzzy
 msgid "The connection to the server was lost."
 msgstr "Yhteys palvelimeen katkesi, ohjelma sulkeutuu nyt"
 
-#: src/game.cpp:360
+#: src/game.cpp:382
 msgid "Network Error"
 msgstr "Verkkovirhe"
 
-#: src/game.cpp:705
+#: src/game.cpp:721
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:712
+#: src/game.cpp:726
 msgid "Accepting incoming trade requests"
 msgstr "Hyväksy kauppa pyyntö"
 
-#: src/game.cpp:946
+#: src/game.cpp:954
 #, fuzzy
 msgid "Could Not Load Map"
 msgstr "Karttaa ei voi ladata"
 
-#: src/game.cpp:947
+#: src/game.cpp:955
 #, c-format
 msgid "Error while loading %s"
 msgstr "Ongelma ladatessa %s"
 
-#: src/gui/beingpopup.cpp:75
+#: src/gui/beingpopup.cpp:76
 #, c-format
 msgid "Party: %s"
 msgstr ""
@@ -513,34 +528,34 @@ msgstr ""
 msgid "Buy"
 msgstr "Osta"
 
-#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
-#: src/gui/sell.cpp:276
+#: src/gui/buy.cpp:69 src/gui/buy.cpp:261 src/gui/sell.cpp:71
+#: src/gui/sell.cpp:288
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:99 src/gui/npcdialog.cpp:100
-#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:479
+#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:112 src/gui/npcdialog.cpp:124
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:463
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:98 src/gui/npcdialog.cpp:101
-#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:491
+#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:111 src/gui/npcdialog.cpp:125
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:475
 msgid "-"
 msgstr ""
 
 #: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
-#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:182
-#: src/keyboardconfig.cpp:103
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:228
+#: src/keyboardconfig.cpp:102
 msgid "Quit"
 msgstr "Sulje"
 
-#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:408
-#: src/gui/statuswindow.cpp:478 src/gui/statuswindow.cpp:512
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:384
+#: src/gui/statuswindow.cpp:462 src/gui/statuswindow.cpp:496
 msgid "Max"
 msgstr "Max"
 
@@ -554,11 +569,11 @@ msgstr "Myy"
 
 #: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
 #: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
-#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:101
-#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:178
-#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:402
+#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:114
+#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:389
 #: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
-#: src/gui/socialwindow.cpp:242 src/gui/textdialog.cpp:39
+#: src/gui/socialwindow.cpp:275 src/gui/textdialog.cpp:40
 #: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr "Peru"
@@ -596,7 +611,7 @@ msgstr ""
 msgid "Change Password"
 msgstr "Vaihda salasana"
 
-#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:53
+#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:55
 #: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
 msgid "Password:"
 msgstr "Salasana:"
@@ -628,19 +643,19 @@ msgstr ""
 msgid "Create Character"
 msgstr "Luo hahmo"
 
-#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:52
+#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:54
 #: src/gui/register.cpp:67
 msgid "Name:"
 msgstr "Nimi:"
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
 #: src/gui/outfitwindow.cpp:67
 msgid ">"
 msgstr ""
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
 #: src/gui/outfitwindow.cpp:66
@@ -657,8 +672,8 @@ msgstr "Hiusten väri:"
 msgid "Hair style:"
 msgstr "Hiustyyli:"
 
-#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:397
-#: src/gui/socialwindow.cpp:296
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:392
+#: src/gui/socialwindow.cpp:329
 msgid "Create"
 msgstr "Luo"
 
@@ -714,34 +729,34 @@ msgstr "Poista palvelimelta"
 msgid "Change Email"
 msgstr "Vaihda sähköpostiosoite"
 
-#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:185
-#: src/gui/setup_players.cpp:230
+#: src/gui/charselectdialog.cpp:336 src/gui/serverdialog.cpp:231
+#: src/gui/setup_players.cpp:229
 msgid "Delete"
 msgstr "Poista"
 
-#: src/gui/charselectdialog.cpp:387
+#: src/gui/charselectdialog.cpp:380
 #, fuzzy
 msgid "Choose"
 msgstr "Sulje"
 
-#: src/gui/charselectdialog.cpp:399 src/gui/charselectdialog.cpp:400
+#: src/gui/charselectdialog.cpp:394 src/gui/charselectdialog.cpp:395
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:77 src/gui/palette.cpp:96
+#: src/gui/chat.cpp:88
 msgid "Chat"
 msgstr "Keskustelu"
 
-#: src/gui/chat.cpp:287
+#: src/gui/chat.cpp:311
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:305
+#: src/gui/chat.cpp:329
 msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:469
+#: src/gui/chat.cpp:493
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -803,143 +818,173 @@ msgstr "Hiukkas tehosteet"
 msgid "Ambient FX: %s"
 msgstr "Taustaäänet"
 
-#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:56
+#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:55
 msgid "Equipment"
 msgstr "Varusteet"
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:77
-#: src/gui/inventorywindow.cpp:79 src/gui/inventorywindow.cpp:298
-#: src/gui/popupmenu.cpp:372
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:89
+#: src/gui/inventorywindow.cpp:337 src/gui/popupmenu.cpp:359
 msgid "Unequip"
 msgstr "Poista varuste käytöstä"
 
-#: src/gui/help.cpp:36
+#: src/gui/help.cpp:37
 msgid "Help"
 msgstr "Apua"
 
-#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:73
+#: src/gui/help.cpp:51 src/gui/npcdialog.cpp:50
 msgid "Close"
 msgstr "Sulje"
 
-#: src/gui/inventorywindow.cpp:56 src/gui/windowmenu.cpp:57
+#: src/gui/inventorywindow.cpp:59 src/gui/windowmenu.cpp:56
 msgid "Inventory"
 msgstr "Varusteluettelo"
 
-#: src/gui/inventorywindow.cpp:72 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:300 src/gui/popupmenu.cpp:374
+#: src/gui/inventorywindow.cpp:59
+msgid "Storage"
+msgstr "Varasto"
+
+#: src/gui/inventorywindow.cpp:82
+msgid "Slots:"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:87 src/gui/inventorywindow.cpp:100
+#: src/gui/inventorywindow.cpp:339 src/gui/popupmenu.cpp:361
 msgid "Equip"
 msgstr "Ota käyttöön"
 
-#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:304 src/gui/popupmenu.cpp:377
+#: src/gui/inventorywindow.cpp:88
 msgid "Use"
 msgstr "Käytä"
 
-#: src/gui/inventorywindow.cpp:83 src/gui/inventorywindow.cpp:308
-#: src/gui/popupmenu.cpp:380
+#: src/gui/inventorywindow.cpp:101 src/gui/popupmenu.cpp:364
+msgid "Activate"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:102 src/gui/inventorywindow.cpp:348
+#: src/gui/popupmenu.cpp:367
 #, fuzzy
 msgid "Drop..."
 msgstr "Pudota"
 
-#: src/gui/inventorywindow.cpp:84 src/gui/popupmenu.cpp:386
+#: src/gui/inventorywindow.cpp:103 src/gui/popupmenu.cpp:373
 msgid "Split"
 msgstr "Jaa"
 
-#: src/gui/inventorywindow.cpp:85 src/gui/outfitwindow.cpp:51
+#: src/gui/inventorywindow.cpp:104 src/gui/outfitwindow.cpp:51
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:96 src/gui/storagewindow.cpp:83
-msgid "Slots:"
-msgstr ""
-
-#: src/gui/inventorywindow.cpp:97
+#: src/gui/inventorywindow.cpp:106
 msgid "Weight:"
 msgstr "Paino:"
 
-#: src/gui/inventorywindow.cpp:310 src/gui/popupmenu.cpp:382
+#: src/gui/inventorywindow.cpp:124 src/gui/popupmenu.cpp:378
+msgid "Store"
+msgstr "Talleta"
+
+#: src/gui/inventorywindow.cpp:125 src/gui/popupmenu.cpp:385
+msgid "Retrieve"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:350 src/gui/popupmenu.cpp:369
 msgid "Drop"
 msgstr "Pudota"
 
-#: src/gui/itemamount.cpp:100 src/gui/okdialog.cpp:42
-#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:38 src/gui/trade.cpp:73
-#: src/gui/trade.cpp:75
+#: src/gui/itemamount.cpp:113 src/gui/okdialog.cpp:42
+#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:39 src/gui/trade.cpp:72
+#: src/gui/trade.cpp:74
 msgid "OK"
 msgstr "Ok"
 
-#: src/gui/itemamount.cpp:102
+#: src/gui/itemamount.cpp:115
 msgid "All"
 msgstr "Kaikki"
 
-#: src/gui/itemamount.cpp:128
+#: src/gui/itemamount.cpp:141
 msgid "Select amount of items to trade."
 msgstr "Anna vaihdettavien tavaroiden määrä."
 
-#: src/gui/itemamount.cpp:131
+#: src/gui/itemamount.cpp:144
 msgid "Select amount of items to drop."
 msgstr "Anna pudotettavien tavaroiden määrä."
 
-#: src/gui/itemamount.cpp:134
+#: src/gui/itemamount.cpp:147
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/itemamount.cpp:137
+#: src/gui/itemamount.cpp:150
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamount.cpp:140
+#: src/gui/itemamount.cpp:153
 msgid "Select amount of items to split."
 msgstr "Anna eri pinoon jaettavien tavaroiden määrä."
 
-#: src/gui/itempopup.cpp:92
+#: src/gui/itempopup.cpp:137
 #, fuzzy, c-format
 msgid "Weight: %s"
 msgstr "Paino: "
 
-#: src/gui/login.cpp:49 src/gui/login.cpp:61
+#: src/gui/login.cpp:51 src/gui/login.cpp:63
 msgid "Login"
 msgstr "Kirjaudu sisään"
 
-#: src/gui/login.cpp:58
+#: src/gui/login.cpp:60
 #, fuzzy
 msgid "Remember username"
 msgstr "Muista käyttäjätunnus"
 
-#: src/gui/login.cpp:59 src/gui/register.cpp:58 src/gui/register.cpp:73
+#: src/gui/login.cpp:61 src/gui/register.cpp:58 src/gui/register.cpp:73
 msgid "Register"
 msgstr "Rekisteröidy"
 
-#: src/gui/login.cpp:60
+#: src/gui/login.cpp:62
 #, fuzzy
 msgid "Change Server"
 msgstr "Palvelin:"
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
+#: src/gui/login.cpp:129
+msgid "Registration disabled"
+msgstr ""
+
+#: src/gui/login.cpp:129
+msgid "You need to use the website to register an account for this server."
+msgstr ""
+
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:86
 msgid "Map"
 msgstr "Kartta"
 
-#: src/gui/npcdialog.cpp:44
+#: src/gui/ministatus.cpp:235
+msgid "Need"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:48
 msgid "Waiting for server"
 msgstr "Odotetaan palvelinta"
 
-#: src/gui/npcdialog.cpp:45
+#: src/gui/npcdialog.cpp:49
 msgid "Next"
 msgstr "Seuraava"
 
-#: src/gui/npcdialog.cpp:47
+#: src/gui/npcdialog.cpp:51
 msgid "Submit"
 msgstr "Lähetä"
 
-#: src/gui/npcdialog.cpp:52 src/gui/npcpostdialog.cpp:41
+#: src/gui/npcdialog.cpp:73 src/gui/npcpostdialog.cpp:41
 msgid "NPC"
 msgstr "Epäpelattava hahmo"
 
-#: src/gui/npcdialog.cpp:110
+#: src/gui/npcdialog.cpp:118
+msgid "Clear log"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:134
 msgid "Reset"
 msgstr "Nollaa"
 
 #. TRANSLATORS: Please leave the \n sequences intact.
-#: src/gui/npcdialog.cpp:171
+#: src/gui/npcdialog.cpp:208
 #, fuzzy
 msgid ""
 "\n"
@@ -954,7 +999,7 @@ msgstr ""
 msgid "Send"
 msgstr "Lähetä"
 
-#: src/gui/npcpostdialog.cpp:96
+#: src/gui/npcpostdialog.cpp:99
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
@@ -969,305 +1014,83 @@ msgstr ""
 msgid "Unequip first"
 msgstr "Poista varuste käytöstä"
 
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:143
-msgid "Text"
-msgstr "Teksti"
-
-#: src/gui/palette.cpp:82
-msgid "Text Shadow"
-msgstr "Tekstin varjo"
-
-#: src/gui/palette.cpp:83
-msgid "Text Outline"
-msgstr ""
-
-#: src/gui/palette.cpp:84
-msgid "Progress Bar Labels"
-msgstr ""
-
-#: src/gui/palette.cpp:85
-msgid "Buttons"
-msgstr ""
-
-#: src/gui/palette.cpp:86
-msgid "Disabled Buttons"
-msgstr ""
-
-#: src/gui/palette.cpp:87
-msgid "Tabs"
-msgstr ""
-
-#: src/gui/palette.cpp:89
-msgid "Background"
-msgstr "Tausta"
-
-#: src/gui/palette.cpp:91
-msgid "Highlight"
-msgstr "Korostus"
-
-#: src/gui/palette.cpp:92
-msgid "Tab Highlight"
-msgstr ""
-
-#: src/gui/palette.cpp:93
-#, fuzzy
-msgid "Item Too Expensive"
-msgstr "Esine on liian kallis"
-
-#: src/gui/palette.cpp:94
-msgid "Item Is Equipped"
-msgstr ""
-
-#: src/gui/palette.cpp:97
-msgid "GM"
-msgstr ""
-
-#: src/gui/palette.cpp:98
-msgid "Player"
-msgstr "Pelaaja"
-
-#: src/gui/palette.cpp:99
-msgid "Whisper"
-msgstr ""
-
-#: src/gui/palette.cpp:100
-msgid "Is"
-msgstr ""
-
-#: src/gui/palette.cpp:101 src/net/ea/gui/partytab.cpp:43
-msgid "Party"
-msgstr ""
-
-#: src/gui/palette.cpp:102 src/net/ea/gui/guildtab.cpp:45
-msgid "Guild"
-msgstr ""
-
-#: src/gui/palette.cpp:103
-msgid "Server"
-msgstr "Palvelin:"
-
-#: src/gui/palette.cpp:104
-msgid "Logger"
-msgstr ""
-
-#: src/gui/palette.cpp:105
-msgid "Hyperlink"
-msgstr "Hyperlinkki"
-
-#: src/gui/palette.cpp:107
-msgid "Being"
-msgstr ""
-
-#: src/gui/palette.cpp:108
-msgid "Other Players' Names"
-msgstr "Muiden pelaajien nimet"
-
-#: src/gui/palette.cpp:109
-msgid "Own Name"
-msgstr "Oma nimi"
-
-#: src/gui/palette.cpp:110
-msgid "GM Names"
-msgstr "T"
-
-#: src/gui/palette.cpp:111
-msgid "NPCs"
-msgstr "NPCt"
-
-#: src/gui/palette.cpp:112
-msgid "Monsters"
-msgstr "Hirviöt"
-
-#: src/gui/palette.cpp:114
-msgid "Unknown Item Type"
-msgstr "Tuntematon esine tyyppi"
-
-#: src/gui/palette.cpp:115
-msgid "Generics"
-msgstr ""
-
-#: src/gui/palette.cpp:116
-msgid "Hats"
-msgstr "Hatut"
-
-#: src/gui/palette.cpp:117
-msgid "Usables"
-msgstr ""
-
-#: src/gui/palette.cpp:118
-msgid "Shirts"
-msgstr "Paidat"
-
-#: src/gui/palette.cpp:119
-msgid "One Handed Weapons"
-msgstr ""
-
-#: src/gui/palette.cpp:120
-msgid "Pants"
-msgstr "Housut"
-
-#: src/gui/palette.cpp:121
-msgid "Shoes"
-msgstr "Kengät"
-
-#: src/gui/palette.cpp:122
-msgid "Two Handed Weapons"
-msgstr ""
-
-#: src/gui/palette.cpp:123
-msgid "Shields"
-msgstr "Kilvet"
-
-#: src/gui/palette.cpp:124
-msgid "Rings"
-msgstr "Sormukset"
-
-#: src/gui/palette.cpp:125
-msgid "Necklaces"
-msgstr "Kaulanauhat"
-
-#: src/gui/palette.cpp:126
-msgid "Arms"
-msgstr ""
-
-#: src/gui/palette.cpp:127
-msgid "Ammo"
-msgstr "Panokset"
-
-#: src/gui/palette.cpp:129
-msgid "Particle Effects"
-msgstr ""
-
-#: src/gui/palette.cpp:130
-msgid "Pickup Notification"
-msgstr ""
-
-#: src/gui/palette.cpp:131
-msgid "Exp Notification"
-msgstr ""
-
-#: src/gui/palette.cpp:133
-msgid "Player Hits Monster"
-msgstr ""
-
-#: src/gui/palette.cpp:135
-msgid "Monster Hits Player"
-msgstr ""
-
-#: src/gui/palette.cpp:136
-msgid "Critical Hit"
-msgstr ""
-
-#: src/gui/palette.cpp:137
-msgid "Misses"
-msgstr ""
-
-#: src/gui/palette.cpp:139
-msgid "HP Bar"
-msgstr ""
-
-#: src/gui/palette.cpp:140
-msgid "3/4 HP Bar"
-msgstr ""
-
-#: src/gui/palette.cpp:141
-msgid "1/2 HP Bar"
-msgstr ""
-
-#: src/gui/palette.cpp:142
-msgid "1/4 HP Bar"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:84
+#: src/gui/popupmenu.cpp:83
 #, fuzzy, c-format
 msgid "Trade with %s..."
 msgstr "@@trade|Tee kauppaa %s kanssa@@"
 
-#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:161
+#: src/gui/popupmenu.cpp:87 src/gui/popupmenu.cpp:158
 #, fuzzy, c-format
 msgid "Attack %s"
 msgstr "Hyökkäys %+d"
 
-#: src/gui/popupmenu.cpp:92
+#: src/gui/popupmenu.cpp:91
 #, c-format
 msgid "Whisper %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:101
+#: src/gui/popupmenu.cpp:100
 #, c-format
 msgid "Befriend %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:106
+#: src/gui/popupmenu.cpp:105
 #, c-format
 msgid "Disregard %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:109
+#: src/gui/popupmenu.cpp:108
 #, fuzzy, c-format
 msgid "Ignore %s"
 msgstr "ohitettu"
 
-#: src/gui/popupmenu.cpp:115 src/gui/popupmenu.cpp:124
+#: src/gui/popupmenu.cpp:114 src/gui/popupmenu.cpp:123
 #, c-format
 msgid "Unignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:118
+#: src/gui/popupmenu.cpp:117
 #, c-format
 msgid "Completely ignore %s"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:130
-#, c-format
-msgid "Follow %s"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:133
 #, fuzzy, c-format
 msgid "Invite %s to join your guild"
 msgstr "@@party|Kutsu %s mukaan ryhmääsi@@"
 
-#: src/gui/popupmenu.cpp:137
+#: src/gui/popupmenu.cpp:134
 #, fuzzy, c-format
 msgid "Invite %s to join your party"
 msgstr "@@party|Kutsu %s mukaan ryhmääsi@@"
 
-#: src/gui/popupmenu.cpp:144
+#: src/gui/popupmenu.cpp:141
 msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:153
+#: src/gui/popupmenu.cpp:150
 #, c-format
 msgid "Talk to %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:166
+#: src/gui/popupmenu.cpp:163
 #, fuzzy
 msgid "Kick monster"
 msgstr "Hirviöt"
 
-#: src/gui/popupmenu.cpp:174
+#: src/gui/popupmenu.cpp:171
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:191
+#: src/gui/popupmenu.cpp:188
 #, c-format
 msgid "Pick up %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:400
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:387
 msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:70
-msgid "Store"
-msgstr "Talleta"
-
-#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:71
-msgid "Retrieve"
-msgstr ""
-
 #: src/gui/quitdialog.cpp:44
 msgid "Switch server"
 msgstr "Vaihda palvelinta"
@@ -1336,52 +1159,65 @@ msgstr "Salasanan tulee olla alle %d merkkiä pitkä."
 msgid "Passwords do not match."
 msgstr "Salasanat eivät täsmää."
 
-#: src/gui/serverdialog.cpp:134
+#: src/gui/serverdialog.cpp:197
 #, fuzzy
 msgid "Choose Your Server"
 msgstr "Valitse palvelin"
 
-#: src/gui/serverdialog.cpp:141 src/gui/widgets/chattab.cpp:139
+#: src/gui/serverdialog.cpp:206 src/gui/widgets/chattab.cpp:142
 msgid "Server:"
 msgstr "Palvelin:"
 
-#: src/gui/serverdialog.cpp:142
+#: src/gui/serverdialog.cpp:207
 msgid "Port:"
 msgstr "Portti:"
 
-#: src/gui/serverdialog.cpp:143
+#: src/gui/serverdialog.cpp:208
 #, fuzzy
 msgid "Server type:"
 msgstr "Palvelin:"
 
-#: src/gui/serverdialog.cpp:183
+#: src/gui/serverdialog.cpp:229
 #, fuzzy
 msgid "Connect"
 msgstr "Yhdistetään..."
 
-#: src/gui/serverdialog.cpp:184
+#: src/gui/serverdialog.cpp:230
 #, fuzzy
 msgid "Custom Server"
 msgstr "Tyylitelty hiiren osoitin"
 
-#: src/gui/serverdialog.cpp:262
+#: src/gui/serverdialog.cpp:324
 msgid "Please type both the address and the port of a server."
 msgstr "Kirjoita kenttiin sekä palvelimen osoite että portti"
 
-#: src/gui/serverdialog.cpp:411
+#: src/gui/serverdialog.cpp:441
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:417
+#: src/gui/serverdialog.cpp:447
 #, fuzzy
 msgid "Waiting for server..."
 msgstr "Odotetaan palvelinta"
 
-#: src/gui/serverdialog.cpp:421
+#: src/gui/serverdialog.cpp:451
 msgid "Preparing download"
 msgstr ""
 
+#: src/gui/serverdialog.cpp:455
+msgid "Error retreiving server list!"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:550
+msgid "requires a newer version"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:552
+#, c-format
+msgid "requires v%s"
+msgstr ""
+
 #: src/gui/setup_audio.cpp:42
 msgid "Sound"
 msgstr "Ääni"
@@ -1415,50 +1251,50 @@ msgstr ""
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:44
+#: src/gui/setup_colors.cpp:46
 msgid "This is what the color looks like"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:49
+#: src/gui/setup_colors.cpp:51
 msgid "Colors"
 msgstr "Värit"
 
-#: src/gui/setup_colors.cpp:70
+#: src/gui/setup_colors.cpp:72
 msgid "Type:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:81 src/gui/setup_colors.cpp:433
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:331
 msgid "Static"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:84
-#: src/gui/setup_colors.cpp:434
+#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
+#: src/gui/setup_colors.cpp:332
 msgid "Pulse"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
+#: src/gui/setup_colors.cpp:333
 msgid "Rainbow"
 msgstr "Sateenkaari"
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
+#: src/gui/setup_colors.cpp:333
 msgid "Spectrum"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:92
+#: src/gui/setup_colors.cpp:94
 msgid "Delay:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:107
+#: src/gui/setup_colors.cpp:109
 msgid "Red:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:122
+#: src/gui/setup_colors.cpp:124
 msgid "Green:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:137
+#: src/gui/setup_colors.cpp:139
 msgid "Blue:"
 msgstr ""
 
@@ -1503,580 +1339,592 @@ msgid "Assign"
 msgstr ""
 
 #: src/gui/setup_keyboard.cpp:90
+msgid "Unassign"
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:94
 msgid "Default"
 msgstr "Oletus"
 
-#: src/gui/setup_keyboard.cpp:119
+#: src/gui/setup_keyboard.cpp:125
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_players.cpp:57
+#: src/gui/setup_players.cpp:58
 msgid "Name"
 msgstr "Nimi"
 
-#: src/gui/setup_players.cpp:58
+#: src/gui/setup_players.cpp:59
 msgid "Relation"
 msgstr "Relaatio"
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:64
 msgid "Neutral"
 msgstr "Neutraali"
 
-#: src/gui/setup_players.cpp:64
+#: src/gui/setup_players.cpp:65
 msgid "Friend"
 msgstr "Ystävä"
 
-#: src/gui/setup_players.cpp:65
+#: src/gui/setup_players.cpp:66
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_players.cpp:67
 msgid "Ignored"
 msgstr "ohitettu"
 
-#: src/gui/setup_players.cpp:208 src/gui/setup_video.cpp:132
+#: src/gui/setup_players.cpp:206 src/gui/setup_video.cpp:153
 msgid "???"
 msgstr "???"
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_players.cpp:225
 msgid "Allow trading"
 msgstr "Salli kaupakäynti"
 
-#: src/gui/setup_players.cpp:228
+#: src/gui/setup_players.cpp:227
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:231
 msgid "Put all whispers in tabs"
 msgstr ""
 
-#: src/gui/setup_players.cpp:234
+#: src/gui/setup_players.cpp:233
 #, fuzzy
 msgid "Show gender"
 msgstr "Näytä nimi"
 
-#: src/gui/setup_players.cpp:236
+#: src/gui/setup_players.cpp:235
+msgid "Enable Chat log"
+msgstr ""
+
+#: src/gui/setup_players.cpp:237
 msgid "Players"
 msgstr "Pelaajat"
 
-#: src/gui/setup_players.cpp:261
+#: src/gui/setup_players.cpp:262
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:113
+#: src/gui/setup_video.cpp:134
 msgid "Tiny"
 msgstr "Pikkuruinen"
 
-#: src/gui/setup_video.cpp:114
+#: src/gui/setup_video.cpp:135
 msgid "Small"
 msgstr "Pieni"
 
-#: src/gui/setup_video.cpp:115
+#: src/gui/setup_video.cpp:136
 msgid "Medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:116
+#: src/gui/setup_video.cpp:137
 msgid "Large"
 msgstr "Suuri"
 
-#: src/gui/setup_video.cpp:142
+#: src/gui/setup_video.cpp:163
 msgid "No text"
 msgstr "Ei tekstiä"
 
-#: src/gui/setup_video.cpp:144
+#: src/gui/setup_video.cpp:164
+msgid "Text"
+msgstr "Teksti"
+
+#: src/gui/setup_video.cpp:165
 msgid "Bubbles, no names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:145
+#: src/gui/setup_video.cpp:166
 msgid "Bubbles with names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:157
+#: src/gui/setup_video.cpp:178
 msgid "off"
 msgstr "pois päältä"
 
-#: src/gui/setup_video.cpp:158 src/gui/setup_video.cpp:171
+#: src/gui/setup_video.cpp:179 src/gui/setup_video.cpp:192
 msgid "low"
 msgstr "matala"
 
-#: src/gui/setup_video.cpp:159 src/gui/setup_video.cpp:173
+#: src/gui/setup_video.cpp:180 src/gui/setup_video.cpp:194
 msgid "high"
 msgstr "korkea"
 
-#: src/gui/setup_video.cpp:172
+#: src/gui/setup_video.cpp:193
 msgid "medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:174
+#: src/gui/setup_video.cpp:195
 msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:196
+#: src/gui/setup_video.cpp:217
 msgid "Full screen"
 msgstr "Kokoruututila"
 
-#: src/gui/setup_video.cpp:197
+#: src/gui/setup_video.cpp:218
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:198
+#: src/gui/setup_video.cpp:219
 msgid "Custom cursor"
 msgstr "Tyylitelty hiiren osoitin"
 
-#: src/gui/setup_video.cpp:200
+#: src/gui/setup_video.cpp:221
 msgid "Visible names"
 msgstr "Näytä nimet"
 
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:223
 msgid "Particle effects"
 msgstr "Hiukkas tehosteet"
 
-#: src/gui/setup_video.cpp:204
+#: src/gui/setup_video.cpp:225
 #, fuzzy
 msgid "Show own name"
 msgstr "Näytä nimi"
 
-#: src/gui/setup_video.cpp:205
+#: src/gui/setup_video.cpp:226
+msgid "Log NPC dialogue"
+msgstr ""
+
+#: src/gui/setup_video.cpp:227
 msgid "Show pickup notification"
 msgstr ""
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:207
+#. TRANSLATORS: Refers to "Show pickup notification"
+#: src/gui/setup_video.cpp:229
 msgid "in chat"
 msgstr ""
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:209
+#. TRANSLATORS: Refers to "Show pickup notification"
+#: src/gui/setup_video.cpp:231
 msgid "as particle"
 msgstr ""
 
-#: src/gui/setup_video.cpp:214
+#: src/gui/setup_video.cpp:236
 #, fuzzy
 msgid "FPS limit:"
 msgstr "Piirtonopeusrajoitin (kuvaa / sekunti)"
 
-#: src/gui/setup_video.cpp:225
+#: src/gui/setup_video.cpp:247
+msgid "Disable transparency (Low CPU mode)"
+msgstr ""
+
+#: src/gui/setup_video.cpp:250
 msgid "Video"
 msgstr "Kuva"
 
-#: src/gui/setup_video.cpp:227
+#: src/gui/setup_video.cpp:252
 #, fuzzy
-msgid "Show monster damage"
+msgid "Show damage"
 msgstr "Näytä nimi"
 
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:258
 msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:259
 msgid "Gui opacity"
 msgstr "Käyttöliittymän läpinäkyvyys"
 
-#: src/gui/setup_video.cpp:235
+#: src/gui/setup_video.cpp:260
 msgid "Ambient FX"
 msgstr "Taustaäänet"
 
-#: src/gui/setup_video.cpp:236
+#: src/gui/setup_video.cpp:261
 #, fuzzy
 msgid "Particle detail"
 msgstr "Hiukkas tehosteet"
 
-#: src/gui/setup_video.cpp:237
+#: src/gui/setup_video.cpp:262
 msgid "Font size"
 msgstr "Kirjasimen koko"
 
-#: src/gui/setup_video.cpp:251 src/gui/setup_video.cpp:454
-#: src/gui/setup_video.cpp:568
+#: src/gui/setup_video.cpp:277 src/gui/setup_video.cpp:532
+#: src/gui/setup_video.cpp:662
 #, fuzzy
 msgid "None"
 msgstr "Ei"
 
-#: src/gui/setup_video.cpp:381
+#: src/gui/setup_video.cpp:426
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:387
+#: src/gui/setup_video.cpp:432
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:398
+#: src/gui/setup_video.cpp:443
 #, fuzzy
 msgid "Switching to Full Screen"
 msgstr "Kokoruututilaan siirtyminen"
 
-#: src/gui/setup_video.cpp:399
+#: src/gui/setup_video.cpp:444
 msgid "Restart needed for changes to take effect."
 msgstr "Ohjelma pitää käynnistää uudelleen, jotta muutokset astuvat voimaan."
 
-#: src/gui/setup_video.cpp:411
+#: src/gui/setup_video.cpp:458
 #, fuzzy
 msgid "Changing to OpenGL"
 msgstr "Vaihdetaan OpenGL -toimintatilaan"
 
-#: src/gui/setup_video.cpp:412
+#: src/gui/setup_video.cpp:459
+msgid ""
+"Applying change to OpenGL requires restart. In case OpenGL messes up your "
+"game graphics, restart the game with the command line option \"--no-opengl\"."
+msgstr ""
+
+#: src/gui/setup_video.cpp:466
+msgid "Deactivating OpenGL"
+msgstr ""
+
+#: src/gui/setup_video.cpp:467
 msgid "Applying change to OpenGL requires restart."
 msgstr "OpenGL -asetusten muutokset vaativat ohjelman uudelleenkäynnistyksen"
 
-#: src/gui/setup_video.cpp:486 src/gui/setup_video.cpp:491
+#: src/gui/setup_video.cpp:475
+msgid "Transparency disabled"
+msgstr ""
+
+#: src/gui/setup_video.cpp:476 src/gui/setup_video.cpp:484
+msgid "You must restart to apply changes."
+msgstr ""
+
+#: src/gui/setup_video.cpp:483
+msgid "Transparency enabled"
+msgstr ""
+
+#: src/gui/setup_video.cpp:576 src/gui/setup_video.cpp:581
 #, fuzzy
 msgid "Screen Resolution Changed"
 msgstr "Näytön resoluutio vaihdettu"
 
-#: src/gui/setup_video.cpp:487 src/gui/setup_video.cpp:492
+#: src/gui/setup_video.cpp:577 src/gui/setup_video.cpp:582
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:489
+#: src/gui/setup_video.cpp:579
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:522
+#: src/gui/setup_video.cpp:612
 #, fuzzy
 msgid "Particle Effect Settings Changed."
 msgstr "Hiukkas tehoste asetukset vaihdettu."
 
-#: src/gui/setup_video.cpp:523
+#: src/gui/setup_video.cpp:613
 msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skilldialog.cpp:197 src/gui/windowmenu.cpp:58
+#: src/gui/skilldialog.cpp:212 src/gui/windowmenu.cpp:59
 msgid "Skills"
 msgstr "Taidot"
 
-#: src/gui/skilldialog.cpp:208
+#: src/gui/skilldialog.cpp:223
 msgid "Up"
 msgstr "Ylös"
 
-#: src/gui/skilldialog.cpp:262
+#: src/gui/skilldialog.cpp:269
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:314
+#: src/gui/skilldialog.cpp:351
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:323
+#: src/gui/skilldialog.cpp:360
 #, fuzzy, c-format
 msgid "Skill %d"
 msgstr "Taidot"
 
-#: src/gui/skilldialog.cpp:405
+#: src/gui/skilldialog.cpp:442
 #, fuzzy, c-format
 msgid "Lvl: %d (%+d)"
 msgstr "Taso: %d"
 
-#: src/gui/skilldialog.cpp:416
+#: src/gui/skilldialog.cpp:453
 #, fuzzy, c-format
 msgid "Lvl: %d"
 msgstr "Taso: %d"
 
-#: src/gui/socialwindow.cpp:117
+#: src/gui/socialwindow.cpp:126
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:126
+#: src/gui/socialwindow.cpp:139
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:136
+#: src/gui/socialwindow.cpp:153
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:137
+#: src/gui/socialwindow.cpp:154
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:146
+#: src/gui/socialwindow.cpp:163
 msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:147
+#: src/gui/socialwindow.cpp:164
 #, fuzzy, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Haluatko varmasti lopettaa?"
 
-#: src/gui/socialwindow.cpp:182
+#: src/gui/socialwindow.cpp:207 src/net/tmwa/partyhandler.cpp:330
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:218
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:199
+#: src/gui/socialwindow.cpp:232
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:200
+#: src/gui/socialwindow.cpp:233
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:209
+#: src/gui/socialwindow.cpp:242
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:210
+#: src/gui/socialwindow.cpp:243
 #, fuzzy, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Haluatko varmasti lopettaa?"
 
-#: src/gui/socialwindow.cpp:239
+#: src/gui/socialwindow.cpp:272
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:240 src/gui/socialwindow.cpp:564
+#: src/gui/socialwindow.cpp:273 src/gui/socialwindow.cpp:620
 #, fuzzy
 msgid "Create Party"
 msgstr "Luo hahmo"
 
-#: src/gui/socialwindow.cpp:279 src/gui/windowmenu.cpp:60
+#: src/gui/socialwindow.cpp:312 src/gui/windowmenu.cpp:64
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:297
+#: src/gui/socialwindow.cpp:330
 #, fuzzy
 msgid "Invite"
 msgstr "Kutsu käyttäjä"
 
-#: src/gui/socialwindow.cpp:298
+#: src/gui/socialwindow.cpp:331
 #, fuzzy
 msgid "Leave"
 msgstr "Suuri"
 
-#: src/gui/socialwindow.cpp:394
+#: src/gui/socialwindow.cpp:443
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:400
+#: src/gui/socialwindow.cpp:449
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:413
+#: src/gui/socialwindow.cpp:462
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:419
+#: src/gui/socialwindow.cpp:468
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:463
+#: src/gui/socialwindow.cpp:497
+msgid "Creating guild failed, please choose a shorter name."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:504
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:477
+#: src/gui/socialwindow.cpp:520
+msgid "Creating party failed, please choose a shorter name."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:527
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:484
+#: src/gui/socialwindow.cpp:541
 #, fuzzy
 msgid "Guild Name"
 msgstr "T"
 
-#: src/gui/socialwindow.cpp:485
+#: src/gui/socialwindow.cpp:542
 #, fuzzy
 msgid "Choose your guild's name."
 msgstr "Valitse palvelin"
 
-#: src/gui/socialwindow.cpp:497
+#: src/gui/socialwindow.cpp:554
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:502
+#: src/gui/socialwindow.cpp:559
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:507
+#: src/gui/socialwindow.cpp:564
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:519
+#: src/gui/socialwindow.cpp:576
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:529
+#: src/gui/socialwindow.cpp:585
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:533
+#: src/gui/socialwindow.cpp:589
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:541
+#: src/gui/socialwindow.cpp:597
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:546
+#: src/gui/socialwindow.cpp:602
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:554
+#: src/gui/socialwindow.cpp:610
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:565
+#: src/gui/socialwindow.cpp:621
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:570
+#: src/gui/socialwindow.cpp:626
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:571
+#: src/gui/socialwindow.cpp:627
 #, fuzzy
 msgid "Choose your party's name."
 msgstr "Valitse palvelin"
 
-#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:59
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:62
 msgid "Specials"
 msgstr ""
 
-#: src/gui/specialswindow.cpp:174
-#, c-format
-msgid "Specials Set %d"
-msgstr ""
-
-#: src/gui/specialswindow.cpp:191
-#, c-format
-msgid "Special %d"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:99 src/gui/statuswindow.cpp:247
+#: src/gui/statuswindow.cpp:113 src/gui/statuswindow.cpp:215
+#: src/gui/statuswindow.cpp:262
 #, c-format
 msgid "Level: %d"
 msgstr "Taso: %d"
 
-#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:211
+#: src/gui/statuswindow.cpp:114 src/gui/statuswindow.cpp:208
+#: src/gui/statuswindow.cpp:239
 #, c-format
 msgid "Money: %s"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:102
+#: src/gui/statuswindow.cpp:117
 msgid "HP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:107
+#: src/gui/statuswindow.cpp:122
 msgid "Exp:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:112
+#: src/gui/statuswindow.cpp:130
 msgid "MP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:132 src/gui/statuswindow.cpp:219
+#: src/gui/statuswindow.cpp:158 src/gui/statuswindow.cpp:275
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:133
+#: src/gui/statuswindow.cpp:159
 msgid "Job:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:194
-msgid "HP"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:200
-msgid "MP"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:206
-msgid "Exp"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:215
-#, fuzzy
-msgid "Money"
-msgstr "Rahatilanne: %d"
-
-#: src/gui/statuswindow.cpp:225
-msgid "Job"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:229
+#: src/gui/statuswindow.cpp:211 src/gui/statuswindow.cpp:247
 #, fuzzy, c-format
 msgid "Character points: %d"
 msgstr "Hahmon pistejako OK"
 
-#: src/gui/statuswindow.cpp:235
+#: src/gui/statuswindow.cpp:255
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:251
-#, fuzzy
-msgid "Level"
-msgstr "Taso: %d"
-
-#: src/gui/storagewindow.cpp:58
-msgid "Storage"
-msgstr "Varasto"
-
-#: src/gui/trade.cpp:52
+#: src/gui/trade.cpp:53
 msgid "Propose trade"
 msgstr "Ehdota vaihtokauppaa"
 
-#: src/gui/trade.cpp:53
+#: src/gui/trade.cpp:54
 msgid "Confirmed. Waiting..."
 msgstr "Varmistettu. Odotetaan..."
 
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:55
 msgid "Agree trade"
 msgstr "Hyväksy kauppa"
 
-#: src/gui/trade.cpp:55
+#: src/gui/trade.cpp:56
 msgid "Agreed. Waiting..."
 msgstr "Hyväksytty. Odotetaan..."
 
-#: src/gui/trade.cpp:58
+#: src/gui/trade.cpp:59
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/trade.cpp:74 src/gui/trade.cpp:75
+#: src/gui/trade.cpp:73 src/gui/trade.cpp:74
 msgid "Trade"
 msgstr ""
 
-#: src/gui/trade.cpp:77
+#: src/gui/trade.cpp:76
 msgid "Add"
 msgstr "Lisää"
 
-#: src/gui/trade.cpp:99 src/gui/trade.cpp:135
+#: src/gui/trade.cpp:98 src/gui/trade.cpp:134
 #, fuzzy, c-format
 msgid "You get %s"
 msgstr "Annat:"
 
-#: src/gui/trade.cpp:100
+#: src/gui/trade.cpp:99
 msgid "You give:"
 msgstr "Annat:"
 
-#: src/gui/trade.cpp:104
+#: src/gui/trade.cpp:103
 msgid "Change"
 msgstr "Muuta"
 
-#: src/gui/trade.cpp:275
+#: src/gui/trade.cpp:262
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/trade.cpp:318
+#: src/gui/trade.cpp:304
 msgid "You don't have enough money."
 msgstr "Sinulla ei ole tarpeeksi rahaa."
 
@@ -2097,22 +1945,22 @@ msgstr "Yhdistetään..."
 msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:405
+#: src/gui/updatewindow.cpp:417
 msgid "##1  The update process is incomplete."
 msgstr "##1  Päivitys prosessi keskeytyi"
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:407
+#: src/gui/updatewindow.cpp:419
 msgid "##1  It is strongly recommended that"
 msgstr "##1  On vahvasti suositeltavaa että"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:409
+#: src/gui/updatewindow.cpp:421
 #, fuzzy
 msgid "##1  you try again later."
 msgstr "##1  yrität myöhemmin uudelleen"
 
-#: src/gui/updatewindow.cpp:501
+#: src/gui/updatewindow.cpp:515
 msgid "Completed"
 msgstr "Valmis"
 
@@ -2194,63 +2042,63 @@ msgstr ""
 msgid "Need a user to kick!"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:118
+#: src/gui/widgets/chattab.cpp:121
 msgid "Global announcement:"
 msgstr "Globaali ilmoitus:"
 
-#: src/gui/widgets/chattab.cpp:124
+#: src/gui/widgets/chattab.cpp:127
 #, c-format
 msgid "Global announcement from %s:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:150
+#: src/gui/widgets/chattab.cpp:153
 #, c-format
 msgid "%s whispers: %s"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:51
+#: src/gui/widgets/whispertab.cpp:53
 msgid "Cannot send empty chat!"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:70
+#: src/gui/widgets/whispertab.cpp:72
 msgid "/ignore > Ignore the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:71
+#: src/gui/widgets/whispertab.cpp:73
 msgid "/unignore > Stop ignoring the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:72
+#: src/gui/widgets/whispertab.cpp:74
 msgid "/close > Close the whisper tab"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:82
+#: src/gui/widgets/whispertab.cpp:84
 msgid "Command: /close"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:83
+#: src/gui/widgets/whispertab.cpp:85
 msgid "This command closes the current whisper tab."
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:87
+#: src/gui/widgets/whispertab.cpp:89
 msgid "Command: /ignore"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:88
+#: src/gui/widgets/whispertab.cpp:90
 #, fuzzy
 msgid "This command ignores the other player regardless of current relations."
 msgstr "Tämä komento näyttää paikalla olevien pelaajien määrän."
 
-#: src/gui/widgets/whispertab.cpp:94
+#: src/gui/widgets/whispertab.cpp:96
 #, fuzzy
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr "Tämä komento aloittaa keskustelun nauhoituksen tiedostoon <filename>."
 
-#: src/gui/windowmenu.cpp:55
+#: src/gui/windowmenu.cpp:54
 msgid "Status"
 msgstr "Hahmon tiedot"
 
-#: src/gui/windowmenu.cpp:61
+#: src/gui/windowmenu.cpp:65
 msgid "Shortcut"
 msgstr "Pikavalinnat"
 
@@ -2269,735 +2117,1081 @@ msgstr "Muuta"
 msgid "Choose World"
 msgstr "Valitse palvelin"
 
-#: src/keyboardconfig.cpp:40
+#: src/keyboardconfig.cpp:39
 msgid "Move Up"
 msgstr "Ylöspäin"
 
-#: src/keyboardconfig.cpp:41
+#: src/keyboardconfig.cpp:40
 msgid "Move Down"
 msgstr "Alaspäin"
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:41
 msgid "Move Left"
 msgstr "Vasemmalle"
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:42
 msgid "Move Right"
 msgstr "Oikealle"
 
-#: src/keyboardconfig.cpp:44 src/net/ea/generalhandler.cpp:223
+#: src/keyboardconfig.cpp:43 src/net/tmwa/generalhandler.cpp:237
 msgid "Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:44
 msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:45
 msgid "Smilie"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:46
 msgid "Talk"
 msgstr ""
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:47
 msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:48
 #, fuzzy
 msgid "Target Monster"
 msgstr "Hirviöt"
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboardconfig.cpp:49
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:50
 msgid "Target Player"
 msgstr ""
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:51
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:52
 msgid "Hide Windows"
 msgstr "Piilota ikkunat"
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:53
 msgid "Sit"
 msgstr "Istu"
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:54
 msgid "Screenshot"
 msgstr "Kuvankaappaus"
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:55
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:56
 msgid "Find Path to Mouse"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58 src/keyboardconfig.cpp:59
-#: src/keyboardconfig.cpp:60 src/keyboardconfig.cpp:61
-#: src/keyboardconfig.cpp:62 src/keyboardconfig.cpp:63
-#: src/keyboardconfig.cpp:64 src/keyboardconfig.cpp:65
-#: src/keyboardconfig.cpp:66 src/keyboardconfig.cpp:67
-#: src/keyboardconfig.cpp:68 src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:57 src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60
+#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62
+#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64
+#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68
 #, c-format
 msgid "Item Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:69
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:70
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:71
 msgid "Inventory Window"
 msgstr "Inventaario Ikkuna"
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:72
 msgid "Equipment Window"
 msgstr "Varuste ikkuna"
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:73
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:74
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:75
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:76
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:77
 msgid "Setup Window"
 msgstr "Asetus ikkuna"
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:78
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:79
 #, fuzzy
 msgid "Social Window"
 msgstr "Piilota ikkunat"
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:80
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:81
 #, fuzzy
 msgid "Outfits Window"
 msgstr "Varuste ikkuna"
 
-#: src/keyboardconfig.cpp:83
+#: src/keyboardconfig.cpp:82
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:83
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86
-#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88
-#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90
-#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92
-#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:84 src/keyboardconfig.cpp:85
+#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:87
+#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:89
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:91
+#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:93
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:95
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:96
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:97
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:98
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:99
 msgid "Previous Chat Tab"
 msgstr "Edellinen keskustelu välilehti"
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:100
 msgid "Next Chat Tab"
 msgstr "Seuraava keskustelu välilehti"
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:101
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:103
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:105
+#: src/keyboardconfig.cpp:104
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:178
+#: src/keyboardconfig.cpp:183
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:913
+#: src/localplayer.cpp:985
 msgid "Unable to pick up item."
 msgstr ""
 
 #. TRANSLATORS: This sentence may be translated differently
 #. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:922
+#: src/localplayer.cpp:994
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/main.cpp:43
+#: src/main.cpp:42
 msgid "mana [options] [mana-file]"
 msgstr ""
 
+#: src/main.cpp:43
+msgid "[mana-file] : The mana file is an XML file (.mana)"
+msgstr ""
+
 #: src/main.cpp:44
+msgid "              used to set custom parameters"
+msgstr ""
+
+#: src/main.cpp:45
+msgid "              to the mana client."
+msgstr ""
+
+#: src/main.cpp:47
 msgid "Options:"
 msgstr "Asetukset:"
 
-#: src/main.cpp:45
+#: src/main.cpp:48
 msgid "  -v --version        : Display the version"
 msgstr ""
 
-#: src/main.cpp:46
+#: src/main.cpp:49
 #, fuzzy
 msgid "  -h --help           : Display this help"
 msgstr "/help > Näyttää tämän apu tekstin"
 
-#: src/main.cpp:47
+#: src/main.cpp:50
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
-#: src/main.cpp:48
+#: src/main.cpp:51
 msgid "  -U --username       : Login with this username"
 msgstr ""
 
-#: src/main.cpp:49
+#: src/main.cpp:52
 msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/main.cpp:50
+#: src/main.cpp:53
 msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/main.cpp:51
+#: src/main.cpp:54
 msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:52
+#: src/main.cpp:55
 msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/main.cpp:53
+#: src/main.cpp:56
 msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/main.cpp:54
+#: src/main.cpp:57
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:56
+#: src/main.cpp:59
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:57
+#: src/main.cpp:60
 msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:58
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
+#: src/main.cpp:61
+msgid "     --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/main.cpp:59
+#: src/main.cpp:62
+msgid "     --chat-log-dir   : Chat log dir to use"
+msgstr ""
+
+#: src/main.cpp:63
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/main.cpp:61
+#: src/main.cpp:65
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:63
+#: src/net/manaserv/beinghandler.cpp:303 src/net/tmwa/playerhandler.cpp:94
+msgid "You are dead."
+msgstr "Sinä olet kuollut."
+
+#: src/net/manaserv/beinghandler.cpp:304 src/net/tmwa/playerhandler.cpp:95
+msgid "We regret to inform you that your character was killed in battle."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:306 src/net/tmwa/playerhandler.cpp:97
+msgid "You are not that alive anymore."
+msgstr "Et ole enää elossa."
+
+#: src/net/manaserv/beinghandler.cpp:307 src/net/tmwa/playerhandler.cpp:98
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:308 src/net/tmwa/playerhandler.cpp:99
+msgid "Game Over!"
+msgstr "Peli Loppu!"
+
+#: src/net/manaserv/beinghandler.cpp:309 src/net/tmwa/playerhandler.cpp:101
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+"Ei, lapset. Teidän hahmonne ei oikeasti kuollut. Se... öhm... meni parempaan "
+"paikkaan."
+
+#: src/net/manaserv/beinghandler.cpp:311 src/net/tmwa/playerhandler.cpp:103
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr ""
+"Suunnitelmasi rikkoa vastustajiesi aseet iskemällä ne omaan kurkkuusi "
+"epäonnistui."
+
+#: src/net/manaserv/beinghandler.cpp:313 src/net/tmwa/playerhandler.cpp:105
+msgid "I guess this did not run too well."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:107
+msgid "Do you want your possessions identified?"
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:109
+msgid "Sadly, no trace of you was ever found..."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:111
+msgid "Annihilated."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:113
+msgid "Looks like you got your head handed to you."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:115
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:323
+msgid "Press OK to respawn."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:324
+#, fuzzy
+msgid "You Died"
+msgstr "Annat:"
+
+#: src/net/manaserv/charhandler.cpp:138 src/net/manaserv/charhandler.cpp:209
+msgid "Not logged in."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:141
+msgid "No empty slot."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:144
+msgid "Invalid name."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:147
+#, fuzzy
+msgid "Character's name already exists."
+msgstr "Hahmo poistettu"
+
+#: src/net/manaserv/charhandler.cpp:150
+msgid "Invalid hairstyle."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:153
+msgid "Invalid hair color."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:156
+msgid "Invalid gender."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:159
+#, fuzzy
+msgid "Character's stats are too high."
+msgstr "Hahmon pistejako OK"
+
+#: src/net/manaserv/charhandler.cpp:162
+#, fuzzy
+msgid "Character's stats are too low."
+msgstr "Hahmon pistejako OK"
+
+#: src/net/manaserv/charhandler.cpp:165
+#, c-format
+msgid "At least one statis out of the permitted range: (%u - %u)."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:171 src/net/manaserv/loginhandler.cpp:96
+#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
+#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
+#: src/net/tmwa/loginhandler.cpp:95 src/net/tmwa/loginhandler.cpp:182
+#, fuzzy
+msgid "Unknown error."
+msgstr "Tuntematon virhe"
+
+#: src/net/manaserv/charhandler.cpp:200 src/net/tmwa/charserverhandler.cpp:146
+msgid "Info"
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:200
+#, fuzzy
+msgid "Player deleted."
+msgstr "Hahmo poistettu"
+
+#: src/net/manaserv/charhandler.cpp:212
+#, fuzzy
+msgid "Selection out of range."
+msgstr "Anna vaihdettavien tavaroiden määrä."
+
+#: src/net/manaserv/charhandler.cpp:215
+#, fuzzy, c-format
+msgid "Unknown error (%d)."
+msgstr "Tuntematon virhe"
+
+#: src/net/manaserv/charhandler.cpp:250
+msgid "No gameservers are available."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:187 src/net/manaserv/chathandler.cpp:313
+#: src/net/manaserv/guildhandler.cpp:260
+#, c-format
+msgid "Topic: %s"
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:274
+msgid "Players in this channel:"
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:208
+msgid "Error joining channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:214
+msgid "Listing channels."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:226
+msgid "End of channel list."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:303
+#, c-format
+msgid "%s entered the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:308
+#, c-format
+msgid "%s left the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:324
+#, c-format
+msgid "%s has set mode %s on user %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:334
+#, c-format
+msgid "%s has kicked %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:339
+#, fuzzy
+msgid "Unknown channel event."
+msgstr "Tuntematon komento."
+
+#: src/net/manaserv/guildhandler.cpp:82
+msgid "Guild created."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:87
+msgid "Error creating guild."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:97
+msgid "Invite sent."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:204
+msgid "Member was promoted successfully."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:209
+msgid "Failed to promote member."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:87
+msgid "Wrong magic_token."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
+#, fuzzy
+msgid "Already logged in."
+msgstr "Tällä tunnuksella on jo kirjauduttu"
+
+#: src/net/manaserv/loginhandler.cpp:93
+#, fuzzy
+msgid "Account banned."
+msgstr "Tili: %s"
+
+#: src/net/manaserv/loginhandler.cpp:118
+#, fuzzy
+msgid "New password incorrect."
+msgstr "Vanha salsana on väärin."
+
+#: src/net/manaserv/loginhandler.cpp:121 src/net/tmwa/loginhandler.cpp:89
+#, fuzzy
+msgid "Old password incorrect."
+msgstr "Vanha salsana on väärin."
+
+#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
+msgid "Account not connected. Please login first."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:149
+#, fuzzy
+msgid "New email address incorrect."
+msgstr "Kirjoita  uusi sähköposti osoite toisen kerran:"
+
+#: src/net/manaserv/loginhandler.cpp:152
+#, fuzzy
+msgid "Old email address incorrect."
+msgstr "Vanha salsana on väärin."
+
+#: src/net/manaserv/loginhandler.cpp:158
+msgid "The new email address already exists."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:239
+msgid ""
+"Client registration is not allowed. Please contact server administration."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
+msgid "Client version is too old."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:266
+#, fuzzy
+msgid "Wrong username or password."
+msgstr "Väärä salasana"
+
+#: src/net/manaserv/loginhandler.cpp:272
+#, fuzzy
+msgid "Account banned"
+msgstr "Tili: %s"
+
+#: src/net/manaserv/loginhandler.cpp:275
+msgid "Login attempt too soon after previous attempt."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:303
+msgid "Wrong username, password or email address."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:306
+#, fuzzy
+msgid "Username already exists."
+msgstr "Käyttäjänimi on jo käytössä"
+
+#: src/net/manaserv/loginhandler.cpp:309
+msgid "Email address already exists."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:312
+msgid "You took too long with the captcha or your response was incorrect."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:87
+msgid "Joined party."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:105
+#, c-format
+msgid "%s joined the party."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:123
+#, c-format
+msgid "%s rejected your invite."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:95
+msgid "Accepting incoming trade requests."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:97
+msgid "Ignoring incoming trade requests."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:115 src/net/tmwa/tradehandler.cpp:109
+msgid "Request for Trade"
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:116 src/net/tmwa/tradehandler.cpp:110
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
+msgstr "%s haluaa käydäkauppaa kanssasi, hyväksytkö pyynnön?"
+
+#: src/net/manaserv/tradehandler.cpp:134
+#, c-format
+msgid "Trading with %s"
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:148 src/net/tmwa/tradehandler.cpp:224
+msgid "Trade canceled."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:155 src/net/tmwa/tradehandler.cpp:231
+msgid "Trade completed."
+msgstr ""
+
+#: src/net/tmwa/adminhandler.cpp:64
 msgid "Kick failed!"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:65
+#: src/net/tmwa/adminhandler.cpp:66
 msgid "Kick succeeded!"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:110
+#: src/net/tmwa/buysellhandler.cpp:109
 msgid "Nothing to sell."
 msgstr "Ei mitään myytävää"
 
-#: src/net/ea/buysellhandler.cpp:117
+#: src/net/tmwa/buysellhandler.cpp:116
 msgid "Thanks for buying."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:124
+#: src/net/tmwa/buysellhandler.cpp:123
 msgid "Unable to buy."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:130
+#: src/net/tmwa/buysellhandler.cpp:129
 msgid "Thanks for selling."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:132
+#: src/net/tmwa/buysellhandler.cpp:131
 msgid "Unable to sell."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:103
-#, fuzzy
-msgid "Access denied."
-msgstr "Pääsy evätty"
+#: src/net/tmwa/charserverhandler.cpp:103
+msgid "Access denied. Most likely, there are too many players on this server."
+msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:106
+#: src/net/tmwa/charserverhandler.cpp:107
 msgid "Cannot use this ID."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:109
+#: src/net/tmwa/charserverhandler.cpp:110
 #, fuzzy
-msgid "Unknown failure to select character."
-msgstr "Hahmon poisto epäonnistui"
+msgid "Unknown char-server failure."
+msgstr "Tuntematon virhe"
 
-#: src/net/ea/charserverhandler.cpp:135
+#: src/net/tmwa/charserverhandler.cpp:134
 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ä."
 
-#: src/net/ea/charserverhandler.cpp:147 src/net/manaserv/charhandler.cpp:187
-msgid "Info"
-msgstr ""
-
-#: src/net/ea/charserverhandler.cpp:147
+#: src/net/tmwa/charserverhandler.cpp:146
 msgid "Character deleted."
 msgstr "Hahmo poistettu"
 
-#: src/net/ea/charserverhandler.cpp:152
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Failed to delete character."
 msgstr "Hahmon poisto epäonnistui"
 
-#: src/net/ea/charserverhandler.cpp:237 src/net/manaserv/charhandler.cpp:263
+#: src/net/tmwa/charserverhandler.cpp:266
 msgid "Strength:"
 msgstr "Voima:"
 
-#: src/net/ea/charserverhandler.cpp:238 src/net/manaserv/charhandler.cpp:264
+#: src/net/tmwa/charserverhandler.cpp:267
 msgid "Agility:"
 msgstr "Ketteryys:"
 
-#: src/net/ea/charserverhandler.cpp:239 src/net/manaserv/charhandler.cpp:266
+#: src/net/tmwa/charserverhandler.cpp:268
 msgid "Vitality:"
 msgstr "Elinvoima:"
 
-#: src/net/ea/charserverhandler.cpp:240 src/net/manaserv/charhandler.cpp:267
+#: src/net/tmwa/charserverhandler.cpp:269
 msgid "Intelligence:"
 msgstr "Älykkyys:"
 
-#: src/net/ea/charserverhandler.cpp:241 src/net/manaserv/charhandler.cpp:265
+#: src/net/tmwa/charserverhandler.cpp:270
 msgid "Dexterity:"
 msgstr "Näppäryys:"
 
-#: src/net/ea/charserverhandler.cpp:242
+#: src/net/tmwa/charserverhandler.cpp:271
 msgid "Luck:"
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:80
-msgid "Whisper could not be sent, user is offline."
+#: src/net/tmwa/chathandler.cpp:87
+#, c-format
+msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:84
-msgid "Whisper could not be sent, ignored by user."
+#: src/net/tmwa/chathandler.cpp:96
+#, c-format
+msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:171
+#: src/net/tmwa/chathandler.cpp:230
 #, fuzzy
 msgid "MVP player."
 msgstr "Pelaaja"
 
-#: src/net/ea/chathandler.cpp:204 src/net/ea/chathandler.cpp:210
-#: src/net/ea/chathandler.cpp:215 src/net/ea/chathandler.cpp:220
-#: src/net/ea/chathandler.cpp:225 src/net/ea/chathandler.cpp:230
-#: src/net/ea/chathandler.cpp:235 src/net/ea/chathandler.cpp:240
+#: src/net/tmwa/chathandler.cpp:265 src/net/tmwa/chathandler.cpp:271
+#: src/net/tmwa/chathandler.cpp:276 src/net/tmwa/chathandler.cpp:281
+#: src/net/tmwa/chathandler.cpp:286 src/net/tmwa/chathandler.cpp:291
+#: src/net/tmwa/chathandler.cpp:296 src/net/tmwa/chathandler.cpp:301
 msgid "Channels are not supported!"
 msgstr "Kanavia ei tueta!"
 
-#: src/net/ea/gamehandler.cpp:86
+#: src/net/tmwa/gamehandler.cpp:88
 #, c-format
 msgid "Online users: %d"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:100
+#: src/net/tmwa/gamehandler.cpp:101
 #, fuzzy
 msgid "Game"
 msgstr "Nimi"
 
-#: src/net/ea/gamehandler.cpp:100
+#: src/net/tmwa/gamehandler.cpp:101
 msgid "Request to quit denied!"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:102 src/net/manaserv/generalhandler.cpp:95
+#: src/net/tmwa/generalhandler.cpp:102
 #, c-format
 msgid "Strength %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:103 src/net/manaserv/generalhandler.cpp:96
+#: src/net/tmwa/generalhandler.cpp:103
 #, c-format
 msgid "Agility %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:104 src/net/manaserv/generalhandler.cpp:98
+#: src/net/tmwa/generalhandler.cpp:104
 #, c-format
 msgid "Vitality %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:105 src/net/manaserv/generalhandler.cpp:99
+#: src/net/tmwa/generalhandler.cpp:105
 #, c-format
 msgid "Intelligence %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:106 src/net/manaserv/generalhandler.cpp:97
+#: src/net/tmwa/generalhandler.cpp:106
 #, c-format
 msgid "Dexterity %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:107
+#: src/net/tmwa/generalhandler.cpp:107
 #, c-format
 msgid "Luck %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:130
+#: src/net/tmwa/generalhandler.cpp:132
 #, fuzzy
 msgid "Authentication failed."
 msgstr "Tunnistus epäonnistui"
 
-#: src/net/ea/generalhandler.cpp:133
+#: src/net/tmwa/generalhandler.cpp:135
 #, fuzzy
 msgid "No servers available."
 msgstr "Palvelimia ei saatavilla"
 
-#: src/net/ea/generalhandler.cpp:137
+#: src/net/tmwa/generalhandler.cpp:139
 #, fuzzy
 msgid "Someone else is trying to use this account."
 msgstr "Joku muu yrittää käyttää tätä tunnusta"
 
-#: src/net/ea/generalhandler.cpp:140
+#: src/net/tmwa/generalhandler.cpp:142
 #, fuzzy
 msgid "This account is already logged in."
 msgstr "Tällä tunnuksella on jo kirjauduttu"
 
-#: src/net/ea/generalhandler.cpp:143
+#: src/net/tmwa/generalhandler.cpp:145
 msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:146
+#: src/net/tmwa/generalhandler.cpp:148
 msgid "Duplicated login."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:149
+#: src/net/tmwa/generalhandler.cpp:151
 #, fuzzy
 msgid "Unknown connection error."
 msgstr "Tuntematon yhteys ongelma"
 
-#: src/net/ea/generalhandler.cpp:205
+#: src/net/tmwa/generalhandler.cpp:209
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:216 src/net/manaserv/generalhandler.cpp:166
+#: src/net/tmwa/generalhandler.cpp:230
 msgid "Strength"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:217 src/net/manaserv/generalhandler.cpp:167
+#: src/net/tmwa/generalhandler.cpp:231
 msgid "Agility"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:218 src/net/manaserv/generalhandler.cpp:169
+#: src/net/tmwa/generalhandler.cpp:232
 msgid "Vitality"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:219 src/net/manaserv/generalhandler.cpp:170
+#: src/net/tmwa/generalhandler.cpp:233
 msgid "Intelligence"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:220 src/net/manaserv/generalhandler.cpp:168
+#: src/net/tmwa/generalhandler.cpp:234
 msgid "Dexterity"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:221
+#: src/net/tmwa/generalhandler.cpp:235
 msgid "Luck"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:224
+#: src/net/tmwa/generalhandler.cpp:238
 #, fuzzy
 msgid "Defense"
 msgstr "Puolustus %+d"
 
-#: src/net/ea/generalhandler.cpp:225
+#: src/net/tmwa/generalhandler.cpp:239
 #, fuzzy
 msgid "M.Attack"
 msgstr "Hyökkäys %+d"
 
-#: src/net/ea/generalhandler.cpp:226
+#: src/net/tmwa/generalhandler.cpp:240
 #, fuzzy
 msgid "M.Defense"
 msgstr "Puolustus %+d"
 
-#: src/net/ea/generalhandler.cpp:227
+#: src/net/tmwa/generalhandler.cpp:241
 #, fuzzy, c-format
 msgid "% Accuracy"
 msgstr "% Tarkkuus:"
 
-#: src/net/ea/generalhandler.cpp:228
+#: src/net/tmwa/generalhandler.cpp:242
 #, c-format
 msgid "% Evade"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:229
+#: src/net/tmwa/generalhandler.cpp:243
 #, c-format
 msgid "% Critical"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:61 src/net/ea/gui/partytab.cpp:59
+#: src/net/tmwa/gui/guildtab.cpp:45
+msgid "Guild"
+msgstr ""
+
+#: src/net/tmwa/gui/guildtab.cpp:61 src/net/tmwa/gui/partytab.cpp:59
 msgid "/help > Display this help."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:62
+#: src/net/tmwa/gui/guildtab.cpp:62
 msgid "/invite > Invite a player to your guild"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:63
+#: src/net/tmwa/gui/guildtab.cpp:63
 msgid "/leave > Leave the guild you are in"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:64
+#: src/net/tmwa/gui/guildtab.cpp:64
 #, fuzzy
 msgid "/kick > Kick some one from the guild you are in"
 msgstr "/kick > Poista käyttäjä kanavalta"
 
-#: src/net/ea/gui/guildtab.cpp:73 src/net/ea/gui/partytab.cpp:73
+#: src/net/tmwa/gui/guildtab.cpp:73 src/net/tmwa/gui/partytab.cpp:73
 msgid "Command: /invite <nick>"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:74
+#: src/net/tmwa/gui/guildtab.cpp:74
 #, fuzzy
 msgid "This command invites <nick> to the guild you're in."
 msgstr "Tämä komento tekee <nick> operaattorin."
 
-#: src/net/ea/gui/guildtab.cpp:80 src/net/ea/gui/partytab.cpp:80
+#: src/net/tmwa/gui/guildtab.cpp:80 src/net/tmwa/gui/partytab.cpp:80
 msgid "Command: /leave"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:81
+#: src/net/tmwa/gui/guildtab.cpp:81
 #, fuzzy
 msgid "This command causes the player to leave the guild."
 msgstr "Tämä komento lähettää tekstin <message> käyttäjälle <nick>."
 
-#: src/net/ea/gui/guildtab.cpp:89
+#: src/net/tmwa/gui/guildtab.cpp:89
 msgid "Guild name is missing."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:293
+#: src/net/tmwa/guildhandler.cpp:296
 msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:298
+#: src/net/tmwa/guildhandler.cpp:301
 msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:303
+#: src/net/tmwa/guildhandler.cpp:306
 msgid "User is now part of your guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:308
+#: src/net/tmwa/guildhandler.cpp:311
 msgid "Your guild is full."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:313
+#: src/net/tmwa/guildhandler.cpp:316
 msgid "Unknown guild invite response."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:390
+#: src/net/tmwa/guildhandler.cpp:393
 msgid "Guild creation isn't supported yet."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:60
+#: src/net/tmwa/gui/partytab.cpp:43
+msgid "Party"
+msgstr ""
+
+#: src/net/tmwa/gui/partytab.cpp:60
 msgid "/invite > Invite a player to your party"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:61
+#: src/net/tmwa/gui/partytab.cpp:61
 msgid "/leave > Leave the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:62
+#: src/net/tmwa/gui/partytab.cpp:62
 msgid "/kick > Kick some one from the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:63
+#: src/net/tmwa/gui/partytab.cpp:63
 msgid "/item > Show/change party item sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:64
+#: src/net/tmwa/gui/partytab.cpp:64
 msgid "/exp > Show/change party experience sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:81
+#: src/net/tmwa/gui/partytab.cpp:81
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:85
+#: src/net/tmwa/gui/partytab.cpp:85
 msgid "Command: /item <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:86
+#: src/net/tmwa/gui/partytab.cpp:86
 msgid "This command changes the party's item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:87
+#: src/net/tmwa/gui/partytab.cpp:87
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:90
+#: src/net/tmwa/gui/partytab.cpp:90
 msgid "Command: /item"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/tmwa/gui/partytab.cpp:91
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/tmwa/gui/partytab.cpp:95
 msgid "Command: /exp <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:96
+#: src/net/tmwa/gui/partytab.cpp:96
 msgid "This command changes the party's experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/tmwa/gui/partytab.cpp:97
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:100
+#: src/net/tmwa/gui/partytab.cpp:100
 msgid "Command: /exp"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/tmwa/gui/partytab.cpp:101
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:132 src/net/ea/partyhandler.cpp:198
+#: src/net/tmwa/gui/partytab.cpp:132 src/net/tmwa/partyhandler.cpp:196
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:135 src/net/ea/partyhandler.cpp:204
+#: src/net/tmwa/gui/partytab.cpp:135 src/net/tmwa/partyhandler.cpp:202
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:138 src/net/ea/partyhandler.cpp:210
+#: src/net/tmwa/gui/partytab.cpp:138 src/net/tmwa/partyhandler.cpp:208
 msgid "Item sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:141
+#: src/net/tmwa/gui/partytab.cpp:141
 msgid "Item sharing unknown."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:167 src/net/ea/partyhandler.cpp:174
+#: src/net/tmwa/gui/partytab.cpp:167 src/net/tmwa/partyhandler.cpp:172
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:170 src/net/ea/partyhandler.cpp:180
+#: src/net/tmwa/gui/partytab.cpp:170 src/net/tmwa/partyhandler.cpp:178
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:173 src/net/ea/partyhandler.cpp:186
+#: src/net/tmwa/gui/partytab.cpp:173 src/net/tmwa/partyhandler.cpp:184
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:176
+#: src/net/tmwa/gui/partytab.cpp:176
 msgid "Experience sharing unknown."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:281
+#: src/net/tmwa/inventoryhandler.cpp:285
 msgid "Failed to use item."
 msgstr "Esineen käyttö epä-onnistui"
 
-#: src/net/ea/inventoryhandler.cpp:391
+#: src/net/tmwa/inventoryhandler.cpp:399
 msgid "Unable to equip."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:402
+#: src/net/tmwa/inventoryhandler.cpp:410
 msgid "Unable to unequip."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:79
+#: src/net/tmwa/loginhandler.cpp:86
 msgid "Account was not found. Please re-login."
 msgstr "Tunnusta ei löytynyt. Yritä uudelleen."
 
-#: src/net/ea/loginhandler.cpp:82 src/net/manaserv/loginhandler.cpp:121
-#, fuzzy
-msgid "Old password incorrect."
-msgstr "Vanha salsana on väärin."
-
-#: src/net/ea/loginhandler.cpp:85
+#: src/net/tmwa/loginhandler.cpp:92
 #, fuzzy
 msgid "New password too short."
 msgstr "Uusi salasana on liian lyhyt."
 
-#: src/net/ea/loginhandler.cpp:88 src/net/ea/loginhandler.cpp:175
-#: src/net/manaserv/charhandler.cpp:158 src/net/manaserv/loginhandler.cpp:96
-#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
-#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
-#, fuzzy
-msgid "Unknown error."
-msgstr "Tuntematon virhe"
-
-#: src/net/ea/loginhandler.cpp:149
+#: src/net/tmwa/loginhandler.cpp:156
 #, fuzzy
 msgid "Unregistered ID."
 msgstr "Poista palvelimelta"
 
-#: src/net/ea/loginhandler.cpp:152
+#: src/net/tmwa/loginhandler.cpp:159
 #, fuzzy
 msgid "Wrong password."
 msgstr "Väärä salasana"
 
-#: src/net/ea/loginhandler.cpp:155
+#: src/net/tmwa/loginhandler.cpp:162
 msgid "Account expired."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:158
+#: src/net/tmwa/loginhandler.cpp:165
 msgid "Rejected from server."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:161
+#: src/net/tmwa/loginhandler.cpp:168
 #, fuzzy
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
@@ -3005,7 +3199,7 @@ msgstr ""
 "Sinun pääsysi peliin on väliaikaisesti estetty %s asti\n"
 "Ota yhteyttä GM tiimiin foorumeilla."
 
-#: src/net/ea/loginhandler.cpp:165
+#: src/net/tmwa/loginhandler.cpp:172
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -3014,654 +3208,405 @@ msgstr ""
 "Sinun pääsysi peliin on väliaikaisesti estetty %s asti\n"
 "Ota yhteyttä GM tiimiin foorumeilla."
 
-#: src/net/ea/loginhandler.cpp:172
+#: src/net/tmwa/loginhandler.cpp:179
 #, fuzzy
 msgid "This user name is already taken."
 msgstr "Käyttäjänimi on jo käytössä"
 
-#: src/net/ea/network.cpp:145
+#: src/net/tmwa/network.cpp:145
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/ea/network.cpp:345
+#: src/net/tmwa/network.cpp:345
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/ea/network.cpp:414
+#: src/net/tmwa/network.cpp:414
 #, fuzzy
 msgid "Connection to server terminated. "
 msgstr "Yhdistetään kartta palvelimelle"
 
-#: src/net/ea/partyhandler.cpp:81
+#: src/net/tmwa/partyhandler.cpp:82
 msgid "Could not create party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:84
+#: src/net/tmwa/partyhandler.cpp:84
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:118
+#: src/net/tmwa/partyhandler.cpp:119
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:122
+#: src/net/tmwa/partyhandler.cpp:123
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:126
+#: src/net/tmwa/partyhandler.cpp:127
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:130
+#: src/net/tmwa/partyhandler.cpp:131
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:238
+#: src/net/tmwa/partyhandler.cpp:236
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:249
+#: src/net/tmwa/partyhandler.cpp:246
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:301
+#: src/net/tmwa/partyhandler.cpp:299
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:329
-msgid "Inviting like this isn't supported at the moment."
+#: src/net/tmwa/partyhandler.cpp:335
+#, c-format
+msgid "Inviting failed, because you can't see a player called %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:334
+#: src/net/tmwa/partyhandler.cpp:340
 msgid "You can only inivte when you are in a party!"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:365
+#: src/net/tmwa/partyhandler.cpp:368
 #, c-format
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:304
-msgid "You are dead."
-msgstr "Sinä olet kuollut."
-
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:305
-msgid "We regret to inform you that your character was killed in battle."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:307
-msgid "You are not that alive anymore."
-msgstr "Et ole enää elossa."
-
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:308
-msgid "The cold hands of the grim reaper are grabbing for your soul."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:309
-msgid "Game Over!"
-msgstr "Peli Loppu!"
-
-#: src/net/ea/playerhandler.cpp:105
+#: src/net/tmwa/playerhandler.cpp:100
 msgid "Insert coin to continue."
 msgstr "Syötä kolikko jatkaaksesi."
 
-#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:310
-msgid ""
-"No, kids. Your character did not really die. It... err... went to a better "
-"place."
-msgstr ""
-"Ei, lapset. Teidän hahmonne ei oikeasti kuollut. Se... öhm... meni parempaan "
-"paikkaan."
-
-#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:312
-msgid ""
-"Your plan of breaking your enemies weapon by bashing it with your throat "
-"failed."
-msgstr ""
-"Suunnitelmasi rikkoa vastustajiesi aseet iskemällä ne omaan kurkkuusi "
-"epäonnistui."
-
-#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:314
-msgid "I guess this did not run too well."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:315
-msgid "Do you want your possessions identified?"
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:316
-msgid "Sadly, no trace of you was ever found..."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:317
-msgid "Annihilated."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:318
-msgid "Looks like you got your head handed to you."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:120 src/net/manaserv/beinghandler.cpp:319
-msgid ""
-"You screwed up again, dump your body down the tubes and get you another one."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/tmwa/playerhandler.cpp:118
 msgid "You're not dead yet. You're just resting."
 msgstr "Sinä et ole kuollut vielä. olet vain lepäämässä."
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/tmwa/playerhandler.cpp:119
 msgid "You are no more."
 msgstr "Sinä et ole enään."
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/tmwa/playerhandler.cpp:120
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/tmwa/playerhandler.cpp:121
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/tmwa/playerhandler.cpp:122
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/tmwa/playerhandler.cpp:123
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/tmwa/playerhandler.cpp:124
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:130
+#: src/net/tmwa/playerhandler.cpp:125
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:131
+#: src/net/tmwa/playerhandler.cpp:126
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/tmwa/playerhandler.cpp:127
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/tmwa/playerhandler.cpp:128
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:135
+#: src/net/tmwa/playerhandler.cpp:130
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:136
+#: src/net/tmwa/playerhandler.cpp:131
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:249 src/net/ea/playerhandler.cpp:310
+#: src/net/tmwa/playerhandler.cpp:246 src/net/tmwa/playerhandler.cpp:285
 msgid "Message"
 msgstr "Viesti"
 
-#: src/net/ea/playerhandler.cpp:250
+#: src/net/tmwa/playerhandler.cpp:247
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr "Painat yli puolet painostasi. Et voi saavuttaa terveyttä enää."
 
-#: src/net/ea/playerhandler.cpp:333
+#: src/net/tmwa/playerhandler.cpp:313
 #, c-format
 msgid "You picked up %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:369
+#: src/net/tmwa/playerhandler.cpp:348
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:532
+#: src/net/tmwa/playerhandler.cpp:488
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:147
+#: src/net/tmwa/specialhandler.cpp:144
 msgid "Trade failed!"
 msgstr "Kauppa epäonnistui!"
 
-#: src/net/ea/specialhandler.cpp:150
+#: src/net/tmwa/specialhandler.cpp:147
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:153
+#: src/net/tmwa/specialhandler.cpp:150
 msgid "Sit failed!"
 msgstr "Istuminen epäonnistui!"
 
-#: src/net/ea/specialhandler.cpp:156
+#: src/net/tmwa/specialhandler.cpp:153
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:159
+#: src/net/tmwa/specialhandler.cpp:156
 msgid "Could not join party!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:162
+#: src/net/tmwa/specialhandler.cpp:159
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:171
+#: src/net/tmwa/specialhandler.cpp:168
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:174
+#: src/net/tmwa/specialhandler.cpp:171
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:177
+#: src/net/tmwa/specialhandler.cpp:174
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:180
+#: src/net/tmwa/specialhandler.cpp:177
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:183
+#: src/net/tmwa/specialhandler.cpp:180
 msgid "You cannot do that right now!"
 msgstr "Et voi tehdä sitä juuri nyt!"
 
-#: src/net/ea/specialhandler.cpp:186
+#: src/net/tmwa/specialhandler.cpp:183
 msgid "Seems you need more money... ;-)"
 msgstr "Näyttää siltä että tarvitset lisää rahaa."
 
-#: src/net/ea/specialhandler.cpp:189
+#: src/net/tmwa/specialhandler.cpp:186
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Et voi käyttää tätä taitoa tuollaisen aseen kanssa."
 
-#: src/net/ea/specialhandler.cpp:192
+#: src/net/tmwa/specialhandler.cpp:189
 msgid "You need another red gem!"
 msgstr "Tarvitset toisen punaisen helmen."
 
-#: src/net/ea/specialhandler.cpp:195
+#: src/net/tmwa/specialhandler.cpp:192
 msgid "You need another blue gem!"
 msgstr "Tarvitset toisen sinisen helmen."
 
-#: src/net/ea/specialhandler.cpp:198
+#: src/net/tmwa/specialhandler.cpp:195
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:201
+#: src/net/tmwa/specialhandler.cpp:198
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:210
+#: src/net/tmwa/specialhandler.cpp:207
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:213
+#: src/net/tmwa/specialhandler.cpp:210
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:216
+#: src/net/tmwa/specialhandler.cpp:213
 msgid "Poison had no effect..."
 msgstr "Myrkyllä ei ollut vaikutusta..."
 
-#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:116
-msgid "Request for Trade"
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:108 src/net/manaserv/tradehandler.cpp:117
-#, c-format
-msgid "%s wants to trade with you, do you accept?"
-msgstr "%s haluaa käydäkauppaa kanssasi, hyväksytkö pyynnön?"
-
-#: src/net/ea/tradehandler.cpp:124
+#: src/net/tmwa/tradehandler.cpp:126
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr "Kaupankäynti ei ole mahdollista. kauppa kumppani on liian kaukana."
 
-#: src/net/ea/tradehandler.cpp:128
+#: src/net/tmwa/tradehandler.cpp:130
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr "Kaupankäynti ei ole mahdollista. Hahmoa ei ole."
 
-#: src/net/ea/tradehandler.cpp:132
+#: src/net/tmwa/tradehandler.cpp:134
 msgid "Trade cancelled due to an unknown reason."
 msgstr "Kauppa keskeytyi tuntemattomasta syystä."
 
-#: src/net/ea/tradehandler.cpp:137
+#: src/net/tmwa/tradehandler.cpp:139
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:144
+#: src/net/tmwa/tradehandler.cpp:146
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:153
+#: src/net/tmwa/tradehandler.cpp:154
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:202
+#: src/net/tmwa/tradehandler.cpp:202
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:207
+#: src/net/tmwa/tradehandler.cpp:207
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:211
+#: src/net/tmwa/tradehandler.cpp:211
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:224 src/net/manaserv/tradehandler.cpp:149
-msgid "Trade canceled."
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:231 src/net/manaserv/tradehandler.cpp:156
-msgid "Trade completed."
-msgstr ""
-
-#: src/net/manaserv/beinghandler.cpp:324
-msgid "Press OK to respawn."
-msgstr ""
-
-#: src/net/manaserv/beinghandler.cpp:325
-#, fuzzy
-msgid "You Died"
-msgstr "Annat:"
-
-#: src/net/manaserv/charhandler.cpp:128 src/net/manaserv/charhandler.cpp:196
-msgid "Not logged in."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:131
-msgid "No empty slot."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:134
-msgid "Invalid name."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:137
-#, fuzzy
-msgid "Character's name already exists."
-msgstr "Hahmo poistettu"
-
-#: src/net/manaserv/charhandler.cpp:140
-msgid "Invalid hairstyle."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:143
-msgid "Invalid hair color."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:146
-msgid "Invalid gender."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:149
-#, fuzzy
-msgid "Character's stats are too high."
-msgstr "Hahmon pistejako OK"
-
-#: src/net/manaserv/charhandler.cpp:152
-#, fuzzy
-msgid "Character's stats are too low."
-msgstr "Hahmon pistejako OK"
-
-#: src/net/manaserv/charhandler.cpp:155
-msgid "One stat is zero."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:187
+#: src/playerrelations.cpp:310
 #, fuzzy
-msgid "Player deleted."
-msgstr "Hahmo poistettu"
-
-#: src/net/manaserv/charhandler.cpp:199
-#, fuzzy
-msgid "Selection out of range."
-msgstr "Anna vaihdettavien tavaroiden määrä."
-
-#: src/net/manaserv/charhandler.cpp:202
-#, fuzzy, c-format
-msgid "Unknown error (%d)."
-msgstr "Tuntematon virhe"
-
-#: src/net/manaserv/charhandler.cpp:242
-msgid "No gameservers are available."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:268
-msgid "Willpower:"
-msgstr "Tahdonvoima:"
-
-#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
-#: src/net/manaserv/guildhandler.cpp:259
-#, c-format
-msgid "Topic: %s"
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
-msgid "Players in this channel:"
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:201
-msgid "Error joining channel."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:207
-msgid "Listing channels."
-msgstr ""
+msgid "Completely ignore"
+msgstr "Valmis"
 
-#: src/net/manaserv/chathandler.cpp:219
-msgid "End of channel list."
+#: src/playerrelations.cpp:324
+msgid "Print '...'"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:291
-#, c-format
-msgid "%s entered the channel."
+#: src/playerrelations.cpp:340
+msgid "Blink name"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:296
+#: src/resources/itemdb.cpp:44
 #, c-format
-msgid "%s left the channel."
-msgstr ""
+msgid "Attack %+d"
+msgstr "Hyökkäys %+d"
 
-#: src/net/manaserv/chathandler.cpp:312
+#: src/resources/itemdb.cpp:45
 #, c-format
-msgid "%s has set mode %s on user %s."
-msgstr ""
+msgid "Defense %+d"
+msgstr "Puolustus %+d"
 
-#: src/net/manaserv/chathandler.cpp:322
+#: src/resources/itemdb.cpp:46
 #, c-format
-msgid "%s has kicked %s."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:327
-#, fuzzy
-msgid "Unknown channel event."
-msgstr "Tuntematon komento."
+msgid "HP %+d"
+msgstr "Iskupisteet %+d"
 
-#: src/net/manaserv/generalhandler.cpp:100
+#: src/resources/itemdb.cpp:47
 #, c-format
-msgid "Willpower %+d"
-msgstr ""
-
-#: src/net/manaserv/generalhandler.cpp:171
-#, fuzzy
-msgid "Willpower"
-msgstr "Tahdonvoima:"
-
-#: src/net/manaserv/guildhandler.cpp:81
-msgid "Guild created."
-msgstr ""
+msgid "MP %+d"
+msgstr "Taikapisteet %+d"
 
-#: src/net/manaserv/guildhandler.cpp:86
-msgid "Error creating guild."
+#: src/resources/itemdb.cpp:92
+msgid "Unknown item"
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:96
-msgid "Invite sent."
+#: src/resources/itemdb.cpp:135 src/resources/monsterdb.cpp:77
+msgid "unnamed"
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:203
-msgid "Member was promoted successfully."
-msgstr ""
+#~ msgid "Text Shadow"
+#~ msgstr "Tekstin varjo"
 
-#: src/net/manaserv/guildhandler.cpp:208
-msgid "Failed to promote member."
-msgstr ""
+#~ msgid "Background"
+#~ msgstr "Tausta"
 
-#: src/net/manaserv/loginhandler.cpp:87
-msgid "Wrong magic_token."
-msgstr ""
+#~ msgid "Highlight"
+#~ msgstr "Korostus"
 
-#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
 #, fuzzy
-msgid "Already logged in."
-msgstr "Tällä tunnuksella on jo kirjauduttu"
+#~ msgid "Item Too Expensive"
+#~ msgstr "Esine on liian kallis"
 
-#: src/net/manaserv/loginhandler.cpp:93 src/net/manaserv/loginhandler.cpp:272
-msgid "Server is full."
-msgstr ""
+#~ msgid "Player"
+#~ msgstr "Pelaaja"
 
-#: src/net/manaserv/loginhandler.cpp:118
-#, fuzzy
-msgid "New password incorrect."
-msgstr "Vanha salsana on väärin."
+#~ msgid "Server"
+#~ msgstr "Palvelin:"
 
-#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
-msgid "Account not connected. Please login first."
-msgstr ""
+#~ msgid "Hyperlink"
+#~ msgstr "Hyperlinkki"
 
-#: src/net/manaserv/loginhandler.cpp:149
-#, fuzzy
-msgid "New email address incorrect."
-msgstr "Kirjoita  uusi sähköposti osoite toisen kerran:"
+#~ msgid "Other Players' Names"
+#~ msgstr "Muiden pelaajien nimet"
 
-#: src/net/manaserv/loginhandler.cpp:152
-#, fuzzy
-msgid "Old email address incorrect."
-msgstr "Vanha salsana on väärin."
+#~ msgid "Own Name"
+#~ msgstr "Oma nimi"
 
-#: src/net/manaserv/loginhandler.cpp:158
-msgid "The new email address already exists."
-msgstr ""
+#~ msgid "GM Names"
+#~ msgstr "T"
 
-#: src/net/manaserv/loginhandler.cpp:239
-msgid ""
-"Client registration is not allowed. Please contact server administration."
-msgstr ""
+#~ msgid "NPCs"
+#~ msgstr "NPCt"
 
-#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
-msgid "Client version is too old."
-msgstr ""
+#~ msgid "Monsters"
+#~ msgstr "Hirviöt"
 
-#: src/net/manaserv/loginhandler.cpp:266
-#, fuzzy
-msgid "Wrong username or password."
-msgstr "Väärä salasana"
+#~ msgid "Unknown Item Type"
+#~ msgstr "Tuntematon esine tyyppi"
 
-#: src/net/manaserv/loginhandler.cpp:275
-msgid "Login attempt too soon after previous attempt."
-msgstr ""
+#~ msgid "Hats"
+#~ msgstr "Hatut"
 
-#: src/net/manaserv/loginhandler.cpp:303
-msgid "Wrong username, password or email address."
-msgstr ""
+#~ msgid "Shirts"
+#~ msgstr "Paidat"
 
-#: src/net/manaserv/loginhandler.cpp:306
-#, fuzzy
-msgid "Username already exists."
-msgstr "Käyttäjänimi on jo käytössä"
-
-#: src/net/manaserv/loginhandler.cpp:309
-msgid "Email address already exists."
-msgstr ""
+#~ msgid "Pants"
+#~ msgstr "Housut"
 
-#: src/net/manaserv/loginhandler.cpp:312
-msgid "You took too long with the captcha or your response was incorrect."
-msgstr ""
-
-#: src/net/manaserv/partyhandler.cpp:88
-msgid "Joined party."
-msgstr ""
-
-#: src/net/manaserv/partyhandler.cpp:106
-#, c-format
-msgid "%s joined the party."
-msgstr ""
+#~ msgid "Shoes"
+#~ msgstr "Kengät"
 
-#: src/net/manaserv/partyhandler.cpp:123
-#, c-format
-msgid "%s rejected your invite."
-msgstr ""
+#~ msgid "Shields"
+#~ msgstr "Kilvet"
 
-#: src/net/manaserv/tradehandler.cpp:96
-msgid "Accepting incoming trade requests."
-msgstr ""
+#~ msgid "Rings"
+#~ msgstr "Sormukset"
 
-#: src/net/manaserv/tradehandler.cpp:98
-msgid "Ignoring incoming trade requests."
-msgstr ""
+#~ msgid "Necklaces"
+#~ msgstr "Kaulanauhat"
 
-#: src/net/manaserv/tradehandler.cpp:135
-#, c-format
-msgid "Trading with %s"
-msgstr ""
+#~ msgid "Ammo"
+#~ msgstr "Panokset"
 
-#: src/playerrelations.cpp:304
 #, fuzzy
-msgid "Completely ignore"
-msgstr "Valmis"
+#~ msgid "Money"
+#~ msgstr "Rahatilanne: %d"
 
-#: src/playerrelations.cpp:318
-msgid "Print '...'"
-msgstr ""
-
-#: src/playerrelations.cpp:334
-msgid "Blink name"
-msgstr ""
-
-#: src/playerrelations.cpp:371
-msgid "Floating '...' bubble"
-msgstr ""
-
-#: src/playerrelations.cpp:374
-msgid "Floating bubble"
-msgstr ""
-
-#: src/resources/itemdb.cpp:52
-#, c-format
-msgid "Attack %+d"
-msgstr "Hyökkäys %+d"
-
-#: src/resources/itemdb.cpp:53
-#, c-format
-msgid "Defense %+d"
-msgstr "Puolustus %+d"
+#, fuzzy
+#~ msgid "Level"
+#~ msgstr "Taso: %d"
 
-#: src/resources/itemdb.cpp:54
-#, c-format
-msgid "HP %+d"
-msgstr "Iskupisteet %+d"
+#, fuzzy
+#~ msgid "Access denied."
+#~ msgstr "Pääsy evätty"
 
-#: src/resources/itemdb.cpp:55
-#, c-format
-msgid "MP %+d"
-msgstr "Taikapisteet %+d"
+#, fuzzy
+#~ msgid "Unknown failure to select character."
+#~ msgstr "Hahmon poisto epäonnistui"
 
-#: src/resources/itemdb.cpp:114
-msgid "Unknown item"
-msgstr ""
+#~ msgid "Willpower:"
+#~ msgstr "Tahdonvoima:"
 
-#: src/resources/itemdb.cpp:158 src/resources/monsterdb.cpp:45
-#: src/resources/monsterdb.cpp:67
-msgid "unnamed"
-msgstr ""
+#, fuzzy
+#~ msgid "Willpower"
+#~ msgstr "Tahdonvoima:"
 
 #~ msgid "no"
 #~ msgstr "ei"
diff --git a/po/fr.po b/po/fr.po
index ff1c4546..3710c64d 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Mana World 0.1.0\n"
 "Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2010-03-16 22:27+0100\n"
+"POT-Creation-Date: 2010-12-13 20:04+0100\n"
 "PO-Revision-Date: 2010-01-27 21:27+0000\n"
 "Last-Translator: JVC <Unknown>\n"
 "Language-Team: French\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,324 +20,330 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/client.cpp:555 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
+#: src/client.cpp:598 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
 msgid "Setup"
 msgstr "Configuration"
 
-#: src/client.cpp:625
+#: src/client.cpp:679
 #, fuzzy
 msgid "Connecting to server"
 msgstr "Connexion au serveur de cartes..."
 
-#: src/client.cpp:652
+#: src/client.cpp:706
 #, fuzzy
 msgid "Logging in"
 msgstr "Connexion"
 
-#: src/client.cpp:685
+#: src/client.cpp:739
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:741
+#: src/client.cpp:804
 #, fuzzy
 msgid "Requesting characters"
 msgstr "Sélectionner votre personnnage"
 
-#: src/client.cpp:770
+#: src/client.cpp:833
 #, fuzzy
 msgid "Connecting to the game server"
 msgstr "Connexion au serveur de cartes..."
 
-#: src/client.cpp:801 src/client.cpp:808 src/client.cpp:942
+#: src/client.cpp:843
+#, fuzzy
+msgid "Changing game servers"
+msgstr "Serveur"
+
+#: src/client.cpp:872 src/client.cpp:879 src/client.cpp:1014
 #: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
 #: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
-#: src/gui/serverdialog.cpp:241 src/gui/unregisterdialog.cpp:133
-#: src/net/ea/charserverhandler.cpp:135 src/net/ea/charserverhandler.cpp:152
-#: src/net/manaserv/charhandler.cpp:161 src/net/manaserv/charhandler.cpp:204
+#: src/gui/serverdialog.cpp:323 src/gui/unregisterdialog.cpp:133
+#: src/net/manaserv/charhandler.cpp:174 src/net/manaserv/charhandler.cpp:217
+#: src/net/tmwa/charserverhandler.cpp:134
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Error"
 msgstr "Erreur"
 
-#: src/client.cpp:817
+#: src/client.cpp:888
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:844
+#: src/client.cpp:915
 #, fuzzy
 msgid "Password Change"
 msgstr "Mot de passe :"
 
-#: src/client.cpp:845
+#: src/client.cpp:916
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:864
+#: src/client.cpp:935
 #, fuzzy
 msgid "Email Change"
 msgstr "Changer"
 
-#: src/client.cpp:865
+#: src/client.cpp:936
 #, fuzzy
 msgid "Email changed successfully!"
 msgstr "La promotion de ce membre a réussie."
 
-#: src/client.cpp:885
+#: src/client.cpp:956
 #, fuzzy
 msgid "Unregister Successful"
 msgstr "Se désinscrire"
 
-#: src/client.cpp:886
+#: src/client.cpp:957
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1009 src/client.cpp:1032
+#: src/client.cpp:1138 src/client.cpp:1161
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1121
+#: src/client.cpp:1281
 #, fuzzy, c-format
 msgid "Invalid update host: %s"
 msgstr "Hôte de mise à jour incorrect : "
 
-#: src/client.cpp:1155 src/client.cpp:1161
+#: src/client.cpp:1315 src/client.cpp:1321
 msgid "Error creating updates directory!"
 msgstr "Impossible de créer le dossier de mise à jour !"
 
-#: src/commandhandler.cpp:127 src/commandhandler.cpp:308
+#: src/commandhandler.cpp:131 src/commandhandler.cpp:317
 msgid "Unknown command."
 msgstr "Commande inconnue."
 
-#: src/commandhandler.cpp:156
+#: src/commandhandler.cpp:160
 msgid "-- Help --"
 msgstr "-- Aide --"
 
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:161
 msgid "/help > Display this help"
 msgstr "/help > Montre l'aide"
 
-#: src/commandhandler.cpp:159
+#: src/commandhandler.cpp:163
 msgid "/where > Display map name"
 msgstr "/where > Affiche le nom de la carte"
 
-#: src/commandhandler.cpp:160
+#: src/commandhandler.cpp:164
 msgid "/who > Display number of online users"
 msgstr "/who > Affiche le nombre d'utilisateurs en ligne"
 
-#: src/commandhandler.cpp:161
+#: src/commandhandler.cpp:165
 msgid "/me > Tell something about yourself"
 msgstr "/me > Dire quelque chose à votre propos"
 
-#: src/commandhandler.cpp:163
+#: src/commandhandler.cpp:167
 msgid "/clear > Clears this window"
 msgstr "/clear > Vide cette fenêtre"
 
-#: src/commandhandler.cpp:165
+#: src/commandhandler.cpp:169
 msgid "/msg > Send a private message to a user"
 msgstr "/msg > Envoie un message privé à un utilisateur"
 
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:170
 msgid "/whisper > Alias of msg"
 msgstr "/whisper > Alias de msg"
 
-#: src/commandhandler.cpp:167
+#: src/commandhandler.cpp:171
 msgid "/w > Alias of msg"
 msgstr "/w > Alias de msg"
 
-#: src/commandhandler.cpp:168
+#: src/commandhandler.cpp:172
 msgid "/query > Makes a tab for private messages with another user"
 msgstr ""
 "/query > Crée un nouvel onglet pour vos messages privés avec un autre "
 "utilisateur"
 
-#: src/commandhandler.cpp:169
+#: src/commandhandler.cpp:174
 msgid "/q > Alias of query"
 msgstr "/q > Alias de query"
 
-#: src/commandhandler.cpp:171
+#: src/commandhandler.cpp:176
 msgid "/ignore > ignore a player"
 msgstr ""
 
-#: src/commandhandler.cpp:172
+#: src/commandhandler.cpp:177
 msgid "/unignore > stop ignoring a player"
 msgstr ""
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:179
 msgid "/list > Display all public channels"
 msgstr "/list > Affiche une liste de tous les salons publics"
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:180
 msgid "/join > Join or create a channel"
 msgstr "/join > Rejoindre ou créer un salon."
 
-#: src/commandhandler.cpp:177
+#: src/commandhandler.cpp:182
 #, fuzzy
 msgid "/createparty > Create a new party"
 msgstr "/create > Créer un nouveau groupe"
 
-#: src/commandhandler.cpp:178
+#: src/commandhandler.cpp:183
 msgid "/party > Invite a user to party"
 msgstr "/party > Invite un utilisateur dans un groupe"
 
-#: src/commandhandler.cpp:180
+#: src/commandhandler.cpp:185
 msgid "/record > Start recording the chat to an external file"
 msgstr ""
 "/record > Commence à enregistrer la conversation dans un fichier externe"
 
-#: src/commandhandler.cpp:181
+#: src/commandhandler.cpp:187
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr ""
 "/toggle > Détermine si la touche <entrée> bascule l'historique du tchat"
 
-#: src/commandhandler.cpp:182
+#: src/commandhandler.cpp:189
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
 "/present > Obtiens la liste des joueurs présents (envoyée dans l'historique "
 "du tchat s'il a été activé)"
 
-#: src/commandhandler.cpp:184
+#: src/commandhandler.cpp:192
 msgid "/announce > Global announcement (GM only)"
 msgstr "/announce > Annonce globale (MJ uniquement)"
 
-#: src/commandhandler.cpp:188
+#: src/commandhandler.cpp:196
 msgid "For more information, type /help <command>."
 msgstr "Pour plus d'informations, taper /help <command>"
 
-#: src/commandhandler.cpp:192
+#: src/commandhandler.cpp:200
 msgid "Command: /help"
 msgstr "Commande : /help"
 
-#: src/commandhandler.cpp:193
+#: src/commandhandler.cpp:201
 msgid "This command displays a list of all commands available."
 msgstr "Cette commande affiche une liste de toutes les commandes disponibles."
 
-#: src/commandhandler.cpp:194
+#: src/commandhandler.cpp:203
 msgid "Command: /help <command>"
 msgstr "Commande : /help <commande>"
 
-#: src/commandhandler.cpp:195
+#: src/commandhandler.cpp:204
 msgid "This command displays help on <command>."
 msgstr "Cette commande affiche une aide sur la commande <command>."
 
-#: src/commandhandler.cpp:203
+#: src/commandhandler.cpp:212
 msgid "Command: /announce <msg>"
 msgstr "Commande : /announce <msg>"
 
-#: src/commandhandler.cpp:204
+#: src/commandhandler.cpp:213
 msgid "*** only available to a GM ***"
 msgstr "*** uniquement disponible pour les MJ ***"
 
-#: src/commandhandler.cpp:205
+#: src/commandhandler.cpp:214
 msgid "This command sends the message <msg> to all players currently online."
 msgstr "Cette commande envoie le message <msg> à tous les joueurs en ligne."
 
-#: src/commandhandler.cpp:210
+#: src/commandhandler.cpp:219
 msgid "Command: /clear"
 msgstr "Commande : /clear"
 
-#: src/commandhandler.cpp:211
+#: src/commandhandler.cpp:220
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 "Cette commande vide l'historique de conversation de la conversation "
 "précédente."
 
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:224
 #, fuzzy
 msgid "Command: /ignore <player>"
 msgstr "Commande : /item <policy>"
 
-#: src/commandhandler.cpp:216
+#: src/commandhandler.cpp:225
 #, fuzzy
 msgid "This command ignores the given player regardless of current relations."
 msgstr "Cette commande affiche le nombre de joueurs actuellement connectés."
 
-#: src/commandhandler.cpp:221
+#: src/commandhandler.cpp:230
 msgid "Command: /join <channel>"
 msgstr "Commande : /join <channel>"
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:231
 msgid "This command makes you enter <channel>."
 msgstr "Cette commande vous fait rentrer dans le salon <channel>."
 
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:232
 msgid "If <channel> doesn't exist, it's created."
 msgstr "Si <channel> n'existe pas, il sera créé."
 
-#: src/commandhandler.cpp:227
+#: src/commandhandler.cpp:236
 msgid "Command: /list"
 msgstr "Commande : /list"
 
-#: src/commandhandler.cpp:228
+#: src/commandhandler.cpp:237
 msgid "This command shows a list of all channels."
 msgstr "Cette commande affiche une liste de tous les salons publics."
 
-#: src/commandhandler.cpp:232
+#: src/commandhandler.cpp:241
 msgid "Command: /me <message>"
 msgstr "Commande : /me <message>"
 
-#: src/commandhandler.cpp:233
+#: src/commandhandler.cpp:242
 msgid "This command tell others you are (doing) <msg>."
 msgstr "Cette commande informe les autres joueurs que vous faites <msg>."
 
-#: src/commandhandler.cpp:237
+#: src/commandhandler.cpp:246
 msgid "Command: /msg <nick> <message>"
 msgstr "Commande : /msg <nick> <message>"
 
-#: src/commandhandler.cpp:238
+#: src/commandhandler.cpp:247
 msgid "Command: /whisper <nick> <message>"
 msgstr "Commande : /whisper <nick> <message>"
 
-#: src/commandhandler.cpp:239
+#: src/commandhandler.cpp:248
 msgid "Command: /w <nick> <message>"
 msgstr "Commande : /w <nick> <message>"
 
-#: src/commandhandler.cpp:240
+#: src/commandhandler.cpp:249
 msgid "This command sends the text <message> to <nick>."
 msgstr "Cette commande envoie le texte <message> au joueur <nick>"
 
-#: src/commandhandler.cpp:241 src/commandhandler.cpp:260
+#: src/commandhandler.cpp:250 src/commandhandler.cpp:269
 #: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
-#: src/net/ea/gui/guildtab.cpp:75 src/net/ea/gui/partytab.cpp:75
+#: src/net/tmwa/gui/guildtab.cpp:75 src/net/tmwa/gui/partytab.cpp:75
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 "Si le <nick> contient des espaces, entourez le de guillemets (exemple : \"ni "
 "ck\")."
 
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:255
 msgid "Command: /query <nick>"
 msgstr "Commande : /query <nick>"
 
-#: src/commandhandler.cpp:247
+#: src/commandhandler.cpp:256
 msgid "Command: /q <nick>"
 msgstr "Commande : /q <nick>"
 
-#: src/commandhandler.cpp:248
+#: src/commandhandler.cpp:257
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
 "Cette commande essaye de créer une fenêtre de dialogue entre vous et <nick>"
 
-#: src/commandhandler.cpp:253
+#: src/commandhandler.cpp:262
 #, fuzzy
 msgid "Command: /createparty <name>"
 msgstr "Commande : /create <party-name>"
 
-#: src/commandhandler.cpp:254
+#: src/commandhandler.cpp:263
 #, fuzzy
 msgid "This command creates a new party called <name>."
 msgstr "Cette commande crée un nouveau groupe appelé <party-name>"
 
-#: src/commandhandler.cpp:258
+#: src/commandhandler.cpp:267
 msgid "Command: /party <nick>"
 msgstr "Commande : /party <nick>"
 
-#: src/commandhandler.cpp:259 src/net/ea/gui/partytab.cpp:74
+#: src/commandhandler.cpp:268 src/net/tmwa/gui/partytab.cpp:74
 msgid "This command invites <nick> to party with you."
 msgstr "Cette commande invite <nick> à rejoindre votre groupe."
 
-#: src/commandhandler.cpp:265
+#: src/commandhandler.cpp:274
 msgid "Command: /present"
 msgstr "Commande : /present"
 
-#: src/commandhandler.cpp:266
+#: src/commandhandler.cpp:275
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
@@ -345,29 +352,29 @@ msgstr ""
 "dans le fichier d'enregistrement s'il est activé, ou dans l'enregistrement "
 "de la conversation."
 
-#: src/commandhandler.cpp:272
+#: src/commandhandler.cpp:281
 msgid "Command: /record <filename>"
 msgstr "Commande : /record <filename>"
 
-#: src/commandhandler.cpp:273
+#: src/commandhandler.cpp:282
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr ""
 "Cette commande active l'enregistrement de la conversation dans le fichier "
 "<filename>."
 
-#: src/commandhandler.cpp:275
+#: src/commandhandler.cpp:284
 msgid "Command: /record"
 msgstr "Commande : /record"
 
-#: src/commandhandler.cpp:276
+#: src/commandhandler.cpp:285
 msgid "This command finishes a recording session."
 msgstr "Cette commande termine une session d'enregistrement."
 
-#: src/commandhandler.cpp:280
+#: src/commandhandler.cpp:289
 msgid "Command: /toggle <state>"
 msgstr "Command: /toggle <state>"
 
-#: src/commandhandler.cpp:281
+#: src/commandhandler.cpp:290
 msgid ""
 "This command sets whether the return key should toggle the chat log, or "
 "whether the chat log turns off automatically."
@@ -376,56 +383,56 @@ msgstr ""
 "d'enregistrement de la conversation ou si celui-ci se fermera "
 "automatiquement."
 
-#: src/commandhandler.cpp:283
+#: src/commandhandler.cpp:292
 msgid ""
-"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
-"\", \"no\", \"false\" to turn the toggle off."
+"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
+"\"0\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 "<state> peut être en position \"1\", \"yes\", \"true\" pour activer le "
 "bouton sur marche, ou \"0\", \"no\", \"false\" pour désactiver le bouton."
 
-#: src/commandhandler.cpp:286
+#: src/commandhandler.cpp:295
 msgid "Command: /toggle"
 msgstr "Commande : /toggle"
 
-#: src/commandhandler.cpp:287
+#: src/commandhandler.cpp:296
 msgid "This command displays the return toggle status."
 msgstr "Cette commande vous affiche le status du toggle courant."
 
-#: src/commandhandler.cpp:291 src/gui/widgets/whispertab.cpp:93
+#: src/commandhandler.cpp:300 src/gui/widgets/whispertab.cpp:95
 #, fuzzy
 msgid "Command: /unignore <player>"
 msgstr "Commande : /item <policy>"
 
-#: src/commandhandler.cpp:292
+#: src/commandhandler.cpp:301
 msgid "This command stops ignoring the given player if they are being ignored"
 msgstr ""
 
-#: src/commandhandler.cpp:297
+#: src/commandhandler.cpp:306
 msgid "Command: /where"
 msgstr "Commande : /where"
 
-#: src/commandhandler.cpp:298
+#: src/commandhandler.cpp:307
 msgid "This command displays the name of the current map."
 msgstr "Cette commande affiche le nom de la carte où vous vous trouvez."
 
-#: src/commandhandler.cpp:302
+#: src/commandhandler.cpp:311
 msgid "Command: /who"
 msgstr "Commande : /who"
 
-#: src/commandhandler.cpp:303
+#: src/commandhandler.cpp:312
 msgid "This command displays the number of players currently online."
 msgstr "Cette commande affiche le nombre de joueurs actuellement connectés."
 
-#: src/commandhandler.cpp:309
+#: src/commandhandler.cpp:318
 msgid "Type /help for a list of commands."
 msgstr "Entrer /help pour obtenir une liste des commandes disponibles."
 
-#: src/commandhandler.cpp:375
+#: src/commandhandler.cpp:384
 msgid "Cannot send empty whispers!"
 msgstr "Vous ne pouvez pas envoyer des messages privés vides !"
 
-#: src/commandhandler.cpp:383
+#: src/commandhandler.cpp:392
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -434,59 +441,67 @@ msgstr ""
 "Il ne peut être créer une fenêtre de conversation avec nick \"%s\" ! Elle "
 "existe déjà ou il s'agit de vous même."
 
-#: src/commandhandler.cpp:397
+#: src/commandhandler.cpp:406
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Il vous est demandé de rejoindre le chan %s."
 
-#: src/commandhandler.cpp:410 src/net/ea/gui/partytab.cpp:109
+#: src/commandhandler.cpp:419 src/net/tmwa/gui/partytab.cpp:109
 msgid "Party name is missing."
 msgstr "Indiquez un nom de groupe."
 
-#: src/commandhandler.cpp:423 src/commandhandler.cpp:471
-#: src/commandhandler.cpp:493
+#: src/commandhandler.cpp:432 src/commandhandler.cpp:509
+#: src/commandhandler.cpp:531
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:441
+#: src/commandhandler.cpp:450
 msgid "Return toggles chat."
 msgstr "La touche enter ferme maintenant la ligne d'entrée du chat."
 
-#: src/commandhandler.cpp:441
+#: src/commandhandler.cpp:450
 msgid "Message closes chat."
 msgstr "Ce message ferme la conversation."
 
-#: src/commandhandler.cpp:450
+#: src/commandhandler.cpp:459
 msgid "Return now toggles chat."
 msgstr "La touche enter ferme la ligne d'entrée de la conversation."
 
-#: src/commandhandler.cpp:454
+#: src/commandhandler.cpp:463
 msgid "Message now closes chat."
 msgstr "Ce message ferme maintenant la conversation."
 
-#: src/commandhandler.cpp:477
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:489
+msgid "Show IP: On"
+msgstr ""
+
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:485
+msgid "Show IP: Off"
+msgstr ""
+
+#: src/commandhandler.cpp:515
 msgid "Player already ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:484
+#: src/commandhandler.cpp:522
 #, fuzzy
 msgid "Player successfully ignored!"
 msgstr "Création du groupe réussie."
 
-#: src/commandhandler.cpp:486
+#: src/commandhandler.cpp:524
 #, fuzzy
 msgid "Player could not be ignored!"
 msgstr "Le message privé n'a pu être envoyé, le destinataire l'a ignoré."
 
-#: src/commandhandler.cpp:501
+#: src/commandhandler.cpp:539
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:506
+#: src/commandhandler.cpp:544
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:508
+#: src/commandhandler.cpp:546
 #, fuzzy
 msgid "Player could not be unignored!"
 msgstr "Le message privé n'a pu être envoyé, le destinataire l'a ignoré."
@@ -502,44 +517,44 @@ msgstr ""
 msgid "General"
 msgstr "Général"
 
-#: src/game.cpp:326
+#: src/game.cpp:342
 #, fuzzy
 msgid "Screenshot saved as "
 msgstr "Capture d'écran sauvegardée dans ~/"
 
-#: src/game.cpp:331
+#: src/game.cpp:347
 msgid "Saving screenshot failed!"
 msgstr "Impossible de sauvegarder la capture d'écran !"
 
-#: src/game.cpp:355
+#: src/game.cpp:378
 #, fuzzy
 msgid "The connection to the server was lost."
 msgstr ""
 "La connexion au serveur a été coupée, le programme va maintenant se fermer."
 
-#: src/game.cpp:360
+#: src/game.cpp:382
 msgid "Network Error"
 msgstr "Erreur Réseau"
 
-#: src/game.cpp:705
+#: src/game.cpp:721
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorer les requêtes d'échanges entrantes"
 
-#: src/game.cpp:712
+#: src/game.cpp:726
 msgid "Accepting incoming trade requests"
 msgstr "Accepter les requêtes d'échanges entrantes"
 
-#: src/game.cpp:946
+#: src/game.cpp:954
 #, fuzzy
 msgid "Could Not Load Map"
 msgstr "La localisation géographique n'a pu être chargé"
 
-#: src/game.cpp:947
+#: src/game.cpp:955
 #, c-format
 msgid "Error while loading %s"
 msgstr "Erreur durant le chargement %s"
 
-#: src/gui/beingpopup.cpp:75
+#: src/gui/beingpopup.cpp:76
 #, fuzzy, c-format
 msgid "Party: %s"
 msgstr "Groupe (%s)"
@@ -548,34 +563,34 @@ msgstr "Groupe (%s)"
 msgid "Buy"
 msgstr "Acheter"
 
-#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
-#: src/gui/sell.cpp:276
+#: src/gui/buy.cpp:69 src/gui/buy.cpp:261 src/gui/sell.cpp:71
+#: src/gui/sell.cpp:288
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Prix : %s / Total : %s"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:99 src/gui/npcdialog.cpp:100
-#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:404
+#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:112 src/gui/npcdialog.cpp:124
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:463
 msgid "+"
 msgstr "+"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:98 src/gui/npcdialog.cpp:101
-#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:416
+#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:111 src/gui/npcdialog.cpp:125
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:475
 msgid "-"
 msgstr "-"
 
 #: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
-#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:152
-#: src/keyboardconfig.cpp:103
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:228
+#: src/keyboardconfig.cpp:102
 msgid "Quit"
 msgstr "Quitter"
 
-#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:333
-#: src/gui/statuswindow.cpp:403 src/gui/statuswindow.cpp:437
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:384
+#: src/gui/statuswindow.cpp:462 src/gui/statuswindow.cpp:496
 msgid "Max"
 msgstr "Max."
 
@@ -589,11 +604,11 @@ msgstr "Vendre"
 
 #: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
 #: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
-#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:101
-#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:178
-#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:402
+#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:114
+#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:389
 #: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
-#: src/gui/socialwindow.cpp:243 src/gui/textdialog.cpp:39
+#: src/gui/socialwindow.cpp:275 src/gui/textdialog.cpp:40
 #: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr "Annuler"
@@ -632,7 +647,7 @@ msgstr "Cette nouvelle adresse email existe déjà."
 msgid "Change Password"
 msgstr "Changer le mot de passe"
 
-#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:53
+#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:55
 #: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
 msgid "Password:"
 msgstr "Mot de passe :"
@@ -664,19 +679,19 @@ msgstr ""
 msgid "Create Character"
 msgstr "Création du personnage"
 
-#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:52
+#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:54
 #: src/gui/register.cpp:67
 msgid "Name:"
 msgstr "Nom :"
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
 #: src/gui/outfitwindow.cpp:67
 msgid ">"
 msgstr ""
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
 #: src/gui/outfitwindow.cpp:66
@@ -693,8 +708,8 @@ msgstr "Couleur des cheveux :"
 msgid "Hair style:"
 msgstr "Coupe :"
 
-#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:397
-#: src/gui/socialwindow.cpp:297
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:392
+#: src/gui/socialwindow.cpp:329
 msgid "Create"
 msgstr "Créer"
 
@@ -750,34 +765,34 @@ msgstr "Se désinscrire"
 msgid "Change Email"
 msgstr "Modifier l'adresse mail"
 
-#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:155
-#: src/gui/setup_players.cpp:230
+#: src/gui/charselectdialog.cpp:336 src/gui/serverdialog.cpp:231
+#: src/gui/setup_players.cpp:229
 msgid "Delete"
 msgstr "Supprimer"
 
-#: src/gui/charselectdialog.cpp:387
+#: src/gui/charselectdialog.cpp:380
 #, fuzzy
 msgid "Choose"
 msgstr "Fermer"
 
-#: src/gui/charselectdialog.cpp:399 src/gui/charselectdialog.cpp:400
+#: src/gui/charselectdialog.cpp:394 src/gui/charselectdialog.cpp:395
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:77
+#: src/gui/chat.cpp:88
 msgid "Chat"
 msgstr "Conversation"
 
-#: src/gui/chat.cpp:287
+#: src/gui/chat.cpp:311
 #, fuzzy, c-format
 msgid "Present: %s; %d players are present."
 msgstr "%d joueurs sont présents."
 
-#: src/gui/chat.cpp:305
+#: src/gui/chat.cpp:329
 msgid "Attendance written to record log."
 msgstr "Présence inscrite dans le fichier d'enregistrement."
 
-#: src/gui/chat.cpp:469
+#: src/gui/chat.cpp:493
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Message privé envoyé à %s : %s"
@@ -843,139 +858,170 @@ msgstr "Effets ambiants"
 msgid "Equipment"
 msgstr "Équipement"
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:78
-#: src/gui/inventorywindow.cpp:80 src/gui/inventorywindow.cpp:291
-#: src/gui/popupmenu.cpp:372
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:89
+#: src/gui/inventorywindow.cpp:337 src/gui/popupmenu.cpp:359
 msgid "Unequip"
 msgstr "Retirer"
 
-#: src/gui/help.cpp:36
+#: src/gui/help.cpp:37
 msgid "Help"
 msgstr "Aide"
 
-#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:74
+#: src/gui/help.cpp:51 src/gui/npcdialog.cpp:50
 msgid "Close"
 msgstr "Fermer"
 
-#: src/gui/inventorywindow.cpp:57 src/gui/windowmenu.cpp:56
+#: src/gui/inventorywindow.cpp:59 src/gui/windowmenu.cpp:56
 msgid "Inventory"
 msgstr "Inventaire"
 
-#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:75
-#: src/gui/inventorywindow.cpp:293 src/gui/popupmenu.cpp:374
+#: src/gui/inventorywindow.cpp:59
+msgid "Storage"
+msgstr "Stockage"
+
+#: src/gui/inventorywindow.cpp:82
+msgid "Slots:"
+msgstr "Cases :"
+
+#: src/gui/inventorywindow.cpp:87 src/gui/inventorywindow.cpp:100
+#: src/gui/inventorywindow.cpp:339 src/gui/popupmenu.cpp:361
 msgid "Equip"
 msgstr "Équiper"
 
-#: src/gui/inventorywindow.cpp:74 src/gui/inventorywindow.cpp:75
-#: src/gui/inventorywindow.cpp:297 src/gui/popupmenu.cpp:377
+#: src/gui/inventorywindow.cpp:88
 msgid "Use"
 msgstr "Utiliser"
 
-#: src/gui/inventorywindow.cpp:84 src/gui/inventorywindow.cpp:301
-#: src/gui/popupmenu.cpp:380
+#: src/gui/inventorywindow.cpp:101 src/gui/popupmenu.cpp:364
+msgid "Activate"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:102 src/gui/inventorywindow.cpp:348
+#: src/gui/popupmenu.cpp:367
 #, fuzzy
 msgid "Drop..."
 msgstr "Jeter"
 
-#: src/gui/inventorywindow.cpp:85 src/gui/popupmenu.cpp:386
+#: src/gui/inventorywindow.cpp:103 src/gui/popupmenu.cpp:373
 msgid "Split"
 msgstr "Partager"
 
-#: src/gui/inventorywindow.cpp:86 src/gui/outfitwindow.cpp:51
+#: src/gui/inventorywindow.cpp:104 src/gui/outfitwindow.cpp:51
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:97 src/gui/storagewindow.cpp:84
-msgid "Slots:"
-msgstr "Cases :"
-
-#: src/gui/inventorywindow.cpp:98
+#: src/gui/inventorywindow.cpp:106
 msgid "Weight:"
 msgstr "Poids :"
 
-#: src/gui/inventorywindow.cpp:303 src/gui/popupmenu.cpp:382
+#: src/gui/inventorywindow.cpp:124 src/gui/popupmenu.cpp:378
+msgid "Store"
+msgstr "Entreposer"
+
+#: src/gui/inventorywindow.cpp:125 src/gui/popupmenu.cpp:385
+msgid "Retrieve"
+msgstr "Récupérer"
+
+#: src/gui/inventorywindow.cpp:350 src/gui/popupmenu.cpp:369
 msgid "Drop"
 msgstr "Jeter"
 
-#: src/gui/itemamount.cpp:100 src/gui/okdialog.cpp:42
-#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:38 src/gui/trade.cpp:73
-#: src/gui/trade.cpp:75
+#: src/gui/itemamount.cpp:113 src/gui/okdialog.cpp:42
+#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:39 src/gui/trade.cpp:72
+#: src/gui/trade.cpp:74
 msgid "OK"
 msgstr "Ok"
 
-#: src/gui/itemamount.cpp:102
+#: src/gui/itemamount.cpp:115
 msgid "All"
 msgstr "Tout"
 
-#: src/gui/itemamount.cpp:128
+#: src/gui/itemamount.cpp:141
 msgid "Select amount of items to trade."
 msgstr "Choisissez le nombre d'objets à troquer."
 
-#: src/gui/itemamount.cpp:131
+#: src/gui/itemamount.cpp:144
 msgid "Select amount of items to drop."
 msgstr "Choisissez le nombre d'objets à jeter."
 
-#: src/gui/itemamount.cpp:134
+#: src/gui/itemamount.cpp:147
 msgid "Select amount of items to store."
 msgstr "Sélectionnez le nombre d'objets à stocker."
 
-#: src/gui/itemamount.cpp:137
+#: src/gui/itemamount.cpp:150
 msgid "Select amount of items to retrieve."
 msgstr "Sélectionnez le nombre d'objet à reprendre"
 
-#: src/gui/itemamount.cpp:140
+#: src/gui/itemamount.cpp:153
 msgid "Select amount of items to split."
 msgstr "Choisissez le nombre d'objets à déplacer."
 
-#: src/gui/itempopup.cpp:92
+#: src/gui/itempopup.cpp:137
 #, fuzzy, c-format
 msgid "Weight: %s"
 msgstr "Poids : "
 
-#: src/gui/login.cpp:49 src/gui/login.cpp:61
+#: src/gui/login.cpp:51 src/gui/login.cpp:63
 msgid "Login"
 msgstr "Connexion"
 
-#: src/gui/login.cpp:58
+#: src/gui/login.cpp:60
 #, fuzzy
 msgid "Remember username"
 msgstr "Se souvenir du nom d'utilisateur"
 
-#: src/gui/login.cpp:59 src/gui/register.cpp:58 src/gui/register.cpp:73
+#: src/gui/login.cpp:61 src/gui/register.cpp:58 src/gui/register.cpp:73
 msgid "Register"
 msgstr "S'inscrire"
 
-#: src/gui/login.cpp:60
+#: src/gui/login.cpp:62
 #, fuzzy
 msgid "Change Server"
 msgstr "Serveur"
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
+#: src/gui/login.cpp:129
+#, fuzzy
+msgid "Registration disabled"
+msgstr "Partage d'objet desactivé."
+
+#: src/gui/login.cpp:129
+msgid "You need to use the website to register an account for this server."
+msgstr ""
+
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:86
 msgid "Map"
 msgstr "Plan"
 
-#: src/gui/npcdialog.cpp:44
+#: src/gui/ministatus.cpp:235
+msgid "Need"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:48
 msgid "Waiting for server"
 msgstr "Attente du serveur"
 
-#: src/gui/npcdialog.cpp:45
+#: src/gui/npcdialog.cpp:49
 msgid "Next"
 msgstr "Suivant"
 
-#: src/gui/npcdialog.cpp:47
+#: src/gui/npcdialog.cpp:51
 msgid "Submit"
 msgstr "Soumettre"
 
-#: src/gui/npcdialog.cpp:52 src/gui/npcpostdialog.cpp:41
+#: src/gui/npcdialog.cpp:73 src/gui/npcpostdialog.cpp:41
 msgid "NPC"
 msgstr "PNJ"
 
-#: src/gui/npcdialog.cpp:110
+#: src/gui/npcdialog.cpp:118
+msgid "Clear log"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:134
 msgid "Reset"
 msgstr "Réinitialiser"
 
 #. TRANSLATORS: Please leave the \n sequences intact.
-#: src/gui/npcdialog.cpp:171
+#: src/gui/npcdialog.cpp:208
 #, fuzzy
 msgid ""
 "\n"
@@ -990,7 +1036,7 @@ msgstr "A :"
 msgid "Send"
 msgstr "Envoyer"
 
-#: src/gui/npcpostdialog.cpp:96
+#: src/gui/npcpostdialog.cpp:99
 msgid "Failed to send as sender or letter invalid."
 msgstr "Echec de l'envoi comme émetteur ou caractère invalide."
 
@@ -1005,99 +1051,86 @@ msgstr ""
 msgid "Unequip first"
 msgstr "Retirer"
 
-#: src/gui/popupmenu.cpp:84
+#: src/gui/popupmenu.cpp:83
 #, fuzzy, c-format
 msgid "Trade with %s..."
 msgstr "Echange avec %s"
 
-#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:161
+#: src/gui/popupmenu.cpp:87 src/gui/popupmenu.cpp:158
 #, fuzzy, c-format
 msgid "Attack %s"
 msgstr "Attaque %+d"
 
-#: src/gui/popupmenu.cpp:92
+#: src/gui/popupmenu.cpp:91
 #, fuzzy, c-format
 msgid "Whisper %s"
 msgstr "Message privé"
 
-#: src/gui/popupmenu.cpp:101
+#: src/gui/popupmenu.cpp:100
 #, fuzzy, c-format
 msgid "Befriend %s"
 msgstr "@@friend|Être ami avec %s@@"
 
-#: src/gui/popupmenu.cpp:106
+#: src/gui/popupmenu.cpp:105
 #, fuzzy, c-format
 msgid "Disregard %s"
 msgstr "Négligé"
 
-#: src/gui/popupmenu.cpp:109
+#: src/gui/popupmenu.cpp:108
 #, fuzzy, c-format
 msgid "Ignore %s"
 msgstr "Ignoré"
 
-#: src/gui/popupmenu.cpp:115 src/gui/popupmenu.cpp:124
+#: src/gui/popupmenu.cpp:114 src/gui/popupmenu.cpp:123
 #, c-format
 msgid "Unignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:118
+#: src/gui/popupmenu.cpp:117
 #, fuzzy, c-format
 msgid "Completely ignore %s"
 msgstr "@@ignore|Complètement ignorer %s@@"
 
 #: src/gui/popupmenu.cpp:130
-#, c-format
-msgid "Follow %s"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:133
 #, fuzzy, c-format
 msgid "Invite %s to join your guild"
 msgstr "@@guild|Inviter %s à rejoindre votre guilde@@"
 
-#: src/gui/popupmenu.cpp:137
+#: src/gui/popupmenu.cpp:134
 #, fuzzy, c-format
 msgid "Invite %s to join your party"
 msgstr "@@party|Invitation de %s à joindre votre groupe@@"
 
-#: src/gui/popupmenu.cpp:144
+#: src/gui/popupmenu.cpp:141
 #, fuzzy
 msgid "Kick player"
 msgstr "Impossible de sortir la personne !"
 
-#: src/gui/popupmenu.cpp:153
+#: src/gui/popupmenu.cpp:150
 #, fuzzy, c-format
 msgid "Talk to %s"
 msgstr "@@talk|Parler à %s@@"
 
-#: src/gui/popupmenu.cpp:166
+#: src/gui/popupmenu.cpp:163
 #, fuzzy
 msgid "Kick monster"
 msgstr "@@admin-kick|Kick monster@@"
 
-#: src/gui/popupmenu.cpp:174
+#: src/gui/popupmenu.cpp:171
 #, fuzzy
 msgid "Add name to chat"
 msgstr "@@name|Ajouter le nom dans la conversation@@"
 
-#: src/gui/popupmenu.cpp:191
+#: src/gui/popupmenu.cpp:188
 #, fuzzy, c-format
 msgid "Pick up %s"
 msgstr "Ramasser"
 
-#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:400
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:387
 #, fuzzy
 msgid "Add to chat"
 msgstr "@@chat|Ajouter à la conversation@@"
 
-#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:71
-msgid "Store"
-msgstr "Entreposer"
-
-#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:72
-msgid "Retrieve"
-msgstr "Récupérer"
-
 #: src/gui/quitdialog.cpp:44
 msgid "Switch server"
 msgstr "Changer de serveur"
@@ -1166,52 +1199,65 @@ msgstr "Le mot de passe doit faire moins de %d caractères."
 msgid "Passwords do not match."
 msgstr "Les deux mots de passe sont différents"
 
-#: src/gui/serverdialog.cpp:124
+#: src/gui/serverdialog.cpp:197
 #, fuzzy
 msgid "Choose Your Server"
 msgstr "Choisissez le serveur"
 
-#: src/gui/serverdialog.cpp:131 src/gui/widgets/chattab.cpp:139
+#: src/gui/serverdialog.cpp:206 src/gui/widgets/chattab.cpp:142
 msgid "Server:"
 msgstr "Serveur :"
 
-#: src/gui/serverdialog.cpp:132
+#: src/gui/serverdialog.cpp:207
 msgid "Port:"
 msgstr "Port :"
 
-#: src/gui/serverdialog.cpp:133
+#: src/gui/serverdialog.cpp:208
 #, fuzzy
 msgid "Server type:"
 msgstr "Serveur :"
 
-#: src/gui/serverdialog.cpp:153
+#: src/gui/serverdialog.cpp:229
 #, fuzzy
 msgid "Connect"
 msgstr "Connexion..."
 
-#: src/gui/serverdialog.cpp:154
+#: src/gui/serverdialog.cpp:230
 #, fuzzy
 msgid "Custom Server"
 msgstr "Curseur personnalisé"
 
-#: src/gui/serverdialog.cpp:242
+#: src/gui/serverdialog.cpp:324
 msgid "Please type both the address and the port of a server."
 msgstr "Veuillez entrer l'adresse et le port du serveur."
 
-#: src/gui/serverdialog.cpp:357
+#: src/gui/serverdialog.cpp:441
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:363
+#: src/gui/serverdialog.cpp:447
 #, fuzzy
 msgid "Waiting for server..."
 msgstr "Attente du serveur"
 
-#: src/gui/serverdialog.cpp:367
+#: src/gui/serverdialog.cpp:451
 msgid "Preparing download"
 msgstr ""
 
+#: src/gui/serverdialog.cpp:455
+msgid "Error retreiving server list!"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:550
+msgid "requires a newer version"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:552
+#, c-format
+msgid "requires v%s"
+msgstr ""
+
 #: src/gui/setup_audio.cpp:42
 msgid "Sound"
 msgstr "Son"
@@ -1245,54 +1291,54 @@ msgstr ""
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:45
+#: src/gui/setup_colors.cpp:46
 msgid "This is what the color looks like"
 msgstr "Voilà à quoi ressemble cette couleur"
 
-#: src/gui/setup_colors.cpp:50
+#: src/gui/setup_colors.cpp:51
 msgid "Colors"
 msgstr "Couleurs"
 
-#: src/gui/setup_colors.cpp:71
+#: src/gui/setup_colors.cpp:72
 #, fuzzy
 msgid "Type:"
 msgstr "Type : "
 
-#: src/gui/setup_colors.cpp:82 src/gui/setup_colors.cpp:330
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:331
 msgid "Static"
 msgstr "Statique"
 
-#: src/gui/setup_colors.cpp:84 src/gui/setup_colors.cpp:85
-#: src/gui/setup_colors.cpp:331
+#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
+#: src/gui/setup_colors.cpp:332
 msgid "Pulse"
 msgstr "Impulsion"
 
-#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:87
-#: src/gui/setup_colors.cpp:332
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
+#: src/gui/setup_colors.cpp:333
 msgid "Rainbow"
 msgstr "Arc-en-ciel"
 
-#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
-#: src/gui/setup_colors.cpp:332
+#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
+#: src/gui/setup_colors.cpp:333
 msgid "Spectrum"
 msgstr "Spectre"
 
-#: src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:94
 #, fuzzy
 msgid "Delay:"
 msgstr "Retardé : "
 
-#: src/gui/setup_colors.cpp:108
+#: src/gui/setup_colors.cpp:109
 #, fuzzy
 msgid "Red:"
 msgstr "Rouge : "
 
-#: src/gui/setup_colors.cpp:123
+#: src/gui/setup_colors.cpp:124
 #, fuzzy
 msgid "Green:"
 msgstr "Vert : "
 
-#: src/gui/setup_colors.cpp:138
+#: src/gui/setup_colors.cpp:139
 #, fuzzy
 msgid "Blue:"
 msgstr "Bleu : "
@@ -1350,595 +1396,597 @@ msgstr "Par défaut"
 msgid "Key Conflict(s) Detected."
 msgstr "Conflit(s) de touche détecté"
 
-#: src/gui/setup_players.cpp:57
+#: src/gui/setup_players.cpp:58
 msgid "Name"
 msgstr "Nom"
 
-#: src/gui/setup_players.cpp:58
+#: src/gui/setup_players.cpp:59
 msgid "Relation"
 msgstr "Relation"
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:64
 msgid "Neutral"
 msgstr "Neutre"
 
-#: src/gui/setup_players.cpp:64
+#: src/gui/setup_players.cpp:65
 msgid "Friend"
 msgstr "Ami"
 
-#: src/gui/setup_players.cpp:65
+#: src/gui/setup_players.cpp:66
 msgid "Disregarded"
 msgstr "Négligé"
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_players.cpp:67
 msgid "Ignored"
 msgstr "Ignoré"
 
-#: src/gui/setup_players.cpp:208 src/gui/setup_video.cpp:132
+#: src/gui/setup_players.cpp:206 src/gui/setup_video.cpp:153
 msgid "???"
 msgstr "???"
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_players.cpp:225
 msgid "Allow trading"
 msgstr "Autoriser les échanges"
 
-#: src/gui/setup_players.cpp:228
+#: src/gui/setup_players.cpp:227
 msgid "Allow whispers"
 msgstr "Autoriser les messages privés"
 
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:231
 msgid "Put all whispers in tabs"
 msgstr "Placer tous les messages privés dans des onglets"
 
-#: src/gui/setup_players.cpp:234
+#: src/gui/setup_players.cpp:233
 #, fuzzy
 msgid "Show gender"
 msgstr "Afficher le nom"
 
-#: src/gui/setup_players.cpp:236
+#: src/gui/setup_players.cpp:235
+#, fuzzy
+msgid "Enable Chat log"
+msgstr "Impossible de vendre."
+
+#: src/gui/setup_players.cpp:237
 msgid "Players"
 msgstr "Joueurs"
 
-#: src/gui/setup_players.cpp:261
+#: src/gui/setup_players.cpp:262
 msgid "When ignoring:"
 msgstr "Quand ignoré :"
 
-#: src/gui/setup_video.cpp:113
+#: src/gui/setup_video.cpp:134
 msgid "Tiny"
 msgstr "fin"
 
-#: src/gui/setup_video.cpp:114
+#: src/gui/setup_video.cpp:135
 msgid "Small"
 msgstr "Petit"
 
-#: src/gui/setup_video.cpp:115
+#: src/gui/setup_video.cpp:136
 msgid "Medium"
 msgstr "Medium"
 
-#: src/gui/setup_video.cpp:116
+#: src/gui/setup_video.cpp:137
 msgid "Large"
 msgstr "Grand"
 
-#: src/gui/setup_video.cpp:142
+#: src/gui/setup_video.cpp:163
 msgid "No text"
 msgstr "Pas de texte"
 
-#: src/gui/setup_video.cpp:143
+#: src/gui/setup_video.cpp:164
 msgid "Text"
 msgstr "Texte"
 
-#: src/gui/setup_video.cpp:144
+#: src/gui/setup_video.cpp:165
 msgid "Bubbles, no names"
 msgstr "Bulles, sans noms"
 
-#: src/gui/setup_video.cpp:145
+#: src/gui/setup_video.cpp:166
 msgid "Bubbles with names"
 msgstr "Bulles avec noms"
 
-#: src/gui/setup_video.cpp:157
+#: src/gui/setup_video.cpp:178
 msgid "off"
 msgstr "aucun"
 
-#: src/gui/setup_video.cpp:158 src/gui/setup_video.cpp:171
+#: src/gui/setup_video.cpp:179 src/gui/setup_video.cpp:192
 msgid "low"
 msgstr "léger"
 
-#: src/gui/setup_video.cpp:159 src/gui/setup_video.cpp:173
+#: src/gui/setup_video.cpp:180 src/gui/setup_video.cpp:194
 msgid "high"
 msgstr "élevé"
 
-#: src/gui/setup_video.cpp:172
+#: src/gui/setup_video.cpp:193
 msgid "medium"
 msgstr "moyen"
 
-#: src/gui/setup_video.cpp:174
+#: src/gui/setup_video.cpp:195
 msgid "max"
 msgstr "max"
 
-#: src/gui/setup_video.cpp:196
+#: src/gui/setup_video.cpp:217
 msgid "Full screen"
 msgstr "Plein écran"
 
-#: src/gui/setup_video.cpp:197
+#: src/gui/setup_video.cpp:218
 msgid "OpenGL"
 msgstr "Ouvrir GL"
 
-#: src/gui/setup_video.cpp:198
+#: src/gui/setup_video.cpp:219
 msgid "Custom cursor"
 msgstr "Curseur personnalisé"
 
-#: src/gui/setup_video.cpp:200
+#: src/gui/setup_video.cpp:221
 msgid "Visible names"
 msgstr "Afficher les noms"
 
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:223
 msgid "Particle effects"
 msgstr "Effets de particules"
 
-#: src/gui/setup_video.cpp:204
+#: src/gui/setup_video.cpp:225
 #, fuzzy
 msgid "Show own name"
 msgstr "Afficher le nom"
 
-#: src/gui/setup_video.cpp:205
+#: src/gui/setup_video.cpp:226
+msgid "Log NPC dialogue"
+msgstr ""
+
+#: src/gui/setup_video.cpp:227
 msgid "Show pickup notification"
 msgstr "Afficher les messages de ramassage"
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:207
+#. TRANSLATORS: Refers to "Show pickup notification"
+#: src/gui/setup_video.cpp:229
 msgid "in chat"
 msgstr "dans la conversation"
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:209
+#. TRANSLATORS: Refers to "Show pickup notification"
+#: src/gui/setup_video.cpp:231
 msgid "as particle"
 msgstr "avec des particules"
 
-#: src/gui/setup_video.cpp:214
+#: src/gui/setup_video.cpp:236
 #, fuzzy
 msgid "FPS limit:"
 msgstr "Limite FPS :"
 
-#: src/gui/setup_video.cpp:225
+#: src/gui/setup_video.cpp:247
+msgid "Disable transparency (Low CPU mode)"
+msgstr ""
+
+#: src/gui/setup_video.cpp:250
 msgid "Video"
 msgstr "Vidéo"
 
-#: src/gui/setup_video.cpp:227
+#: src/gui/setup_video.cpp:252
 #, fuzzy
-msgid "Show monster damage"
+msgid "Show damage"
 msgstr "Afficher le nom"
 
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:258
 msgid "Overhead text"
 msgstr "Texte aérien"
 
-#: src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:259
 msgid "Gui opacity"
 msgstr "Opacité de l'interface"
 
-#: src/gui/setup_video.cpp:235
+#: src/gui/setup_video.cpp:260
 msgid "Ambient FX"
 msgstr "Effets ambiants"
 
-#: src/gui/setup_video.cpp:236
+#: src/gui/setup_video.cpp:261
 #, fuzzy
 msgid "Particle detail"
 msgstr "Détail des particules"
 
-#: src/gui/setup_video.cpp:237
+#: src/gui/setup_video.cpp:262
 msgid "Font size"
 msgstr "Taille de police"
 
-#: src/gui/setup_video.cpp:251 src/gui/setup_video.cpp:454
-#: src/gui/setup_video.cpp:568
+#: src/gui/setup_video.cpp:277 src/gui/setup_video.cpp:532
+#: src/gui/setup_video.cpp:662
 #, fuzzy
 msgid "None"
 msgstr "Non"
 
-#: src/gui/setup_video.cpp:381
+#: src/gui/setup_video.cpp:426
 #, fuzzy
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr "le mode et la restauration du vieux mode ont également échoué !"
 
-#: src/gui/setup_video.cpp:387
+#: src/gui/setup_video.cpp:432
 #, fuzzy
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr "le mode et la restauration du vieux mode ont également échoué !"
 
-#: src/gui/setup_video.cpp:398
+#: src/gui/setup_video.cpp:443
 #, fuzzy
 msgid "Switching to Full Screen"
 msgstr "Passage en plein écran"
 
-#: src/gui/setup_video.cpp:399
+#: src/gui/setup_video.cpp:444
 msgid "Restart needed for changes to take effect."
 msgstr ""
 "Les changements ne seront pris en compte qu'au prochain démarrage du jeu."
 
-#: src/gui/setup_video.cpp:411
+#: src/gui/setup_video.cpp:458
 #, fuzzy
 msgid "Changing to OpenGL"
 msgstr "Changement OpenGL"
 
-#: src/gui/setup_video.cpp:412
+#: src/gui/setup_video.cpp:459
+msgid ""
+"Applying change to OpenGL requires restart. In case OpenGL messes up your "
+"game graphics, restart the game with the command line option \"--no-opengl\"."
+msgstr ""
+
+#: src/gui/setup_video.cpp:466
+msgid "Deactivating OpenGL"
+msgstr ""
+
+#: src/gui/setup_video.cpp:467
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 "Le changement OpenGL ne sera pris en compte qu'au prochain démarrage du jeu."
 
-#: src/gui/setup_video.cpp:486 src/gui/setup_video.cpp:491
+#: src/gui/setup_video.cpp:475
+#, fuzzy
+msgid "Transparency disabled"
+msgstr "Partage d'expérience non authorisé."
+
+#: src/gui/setup_video.cpp:476 src/gui/setup_video.cpp:484
+msgid "You must restart to apply changes."
+msgstr ""
+
+#: src/gui/setup_video.cpp:483
+msgid "Transparency enabled"
+msgstr ""
+
+#: src/gui/setup_video.cpp:576 src/gui/setup_video.cpp:581
 #, fuzzy
 msgid "Screen Resolution Changed"
 msgstr "Résolution de l'écran changée"
 
-#: src/gui/setup_video.cpp:487 src/gui/setup_video.cpp:492
+#: src/gui/setup_video.cpp:577 src/gui/setup_video.cpp:582
 msgid "Restart your client for the change to take effect."
 msgstr "Redémarrez le jeu pour que les changements soient appliqués."
 
-#: src/gui/setup_video.cpp:489
+#: src/gui/setup_video.cpp:579
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:522
+#: src/gui/setup_video.cpp:612
 #, fuzzy
 msgid "Particle Effect Settings Changed."
 msgstr "Paramètres d'effet de particules changés."
 
-#: src/gui/setup_video.cpp:523
+#: src/gui/setup_video.cpp:613
 msgid "Changes will take effect on map change."
 msgstr "Les changements seront appliqués au changement de carte."
 
-#: src/gui/skilldialog.cpp:198 src/gui/windowmenu.cpp:59
+#: src/gui/skilldialog.cpp:212 src/gui/windowmenu.cpp:59
 msgid "Skills"
 msgstr "Compétences"
 
-#: src/gui/skilldialog.cpp:209
+#: src/gui/skilldialog.cpp:223
 msgid "Up"
 msgstr "Augmenter"
 
-#: src/gui/skilldialog.cpp:263
+#: src/gui/skilldialog.cpp:269
 #, fuzzy, c-format
 msgid "Skill points available: %d"
 msgstr "Points de compétences : %d"
 
-#: src/gui/skilldialog.cpp:315
+#: src/gui/skilldialog.cpp:351
 #, fuzzy, c-format
 msgid "Skill Set %d"
 msgstr "Points de compétences : %d"
 
-#: src/gui/skilldialog.cpp:324
+#: src/gui/skilldialog.cpp:360
 #, fuzzy, c-format
 msgid "Skill %d"
 msgstr "Compétences"
 
-#: src/gui/skilldialog.cpp:406
+#: src/gui/skilldialog.cpp:442
 #, fuzzy, c-format
 msgid "Lvl: %d (%+d)"
 msgstr "Niveau : %d"
 
-#: src/gui/skilldialog.cpp:417
+#: src/gui/skilldialog.cpp:453
 #, fuzzy, c-format
 msgid "Lvl: %d"
 msgstr "Niveau : %d"
 
-#: src/gui/socialwindow.cpp:118
+#: src/gui/socialwindow.cpp:126
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:127
+#: src/gui/socialwindow.cpp:139
 #, fuzzy, c-format
 msgid "Guild %s quit requested."
 msgstr "Guilde créée."
 
-#: src/gui/socialwindow.cpp:137
+#: src/gui/socialwindow.cpp:153
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:138
+#: src/gui/socialwindow.cpp:154
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:147
+#: src/gui/socialwindow.cpp:163
 #, fuzzy
 msgid "Leave Guild?"
 msgstr "Créer une Guilde"
 
-#: src/gui/socialwindow.cpp:148
+#: src/gui/socialwindow.cpp:164
 #, fuzzy, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Êtes-vous sûr de vouloir sortir ?"
 
-#: src/gui/socialwindow.cpp:183
+#: src/gui/socialwindow.cpp:207 src/net/tmwa/partyhandler.cpp:330
 #, fuzzy, c-format
 msgid "Invited user %s to party."
 msgstr "/party > Invite un utilisateur dans un groupe"
 
-#: src/gui/socialwindow.cpp:190
+#: src/gui/socialwindow.cpp:218
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:200
+#: src/gui/socialwindow.cpp:232
 #, fuzzy
 msgid "Member Invite to Party"
 msgstr "/party > Invite un utilisateur dans un groupe"
 
-#: src/gui/socialwindow.cpp:201
+#: src/gui/socialwindow.cpp:233
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:210
+#: src/gui/socialwindow.cpp:242
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:211
+#: src/gui/socialwindow.cpp:243
 #, fuzzy, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Êtes-vous sûr de vouloir sortir ?"
 
-#: src/gui/socialwindow.cpp:240
+#: src/gui/socialwindow.cpp:272
 msgid "Create Guild"
 msgstr "Créer une Guilde"
 
-#: src/gui/socialwindow.cpp:241 src/gui/socialwindow.cpp:565
+#: src/gui/socialwindow.cpp:273 src/gui/socialwindow.cpp:620
 #, fuzzy
 msgid "Create Party"
 msgstr "Création du personnage"
 
-#: src/gui/socialwindow.cpp:280 src/gui/windowmenu.cpp:64
+#: src/gui/socialwindow.cpp:312 src/gui/windowmenu.cpp:64
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:298
+#: src/gui/socialwindow.cpp:330
 #, fuzzy
 msgid "Invite"
 msgstr "Inviter un utilisateur"
 
-#: src/gui/socialwindow.cpp:299
+#: src/gui/socialwindow.cpp:331
 #, fuzzy
 msgid "Leave"
 msgstr "Grand"
 
-#: src/gui/socialwindow.cpp:395
+#: src/gui/socialwindow.cpp:443
 #, fuzzy, c-format
 msgid "Accepted party invite from %s."
 msgstr "Invitation acceptée de la part de %s."
 
-#: src/gui/socialwindow.cpp:401
+#: src/gui/socialwindow.cpp:449
 #, fuzzy, c-format
 msgid "Rejected party invite from %s."
 msgstr "Invitation refusée de la part de %s."
 
-#: src/gui/socialwindow.cpp:414
+#: src/gui/socialwindow.cpp:462
 #, fuzzy, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Invitation acceptée de la part de %s."
 
-#: src/gui/socialwindow.cpp:420
+#: src/gui/socialwindow.cpp:468
 #, fuzzy, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Invitation refusée de la part de %s."
 
-#: src/gui/socialwindow.cpp:464
+#: src/gui/socialwindow.cpp:497
+msgid "Creating guild failed, please choose a shorter name."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:504
 #, fuzzy, c-format
 msgid "Creating guild called %s."
 msgstr "Erreur lors de la création de la guilde."
 
-#: src/gui/socialwindow.cpp:478
+#: src/gui/socialwindow.cpp:520
+msgid "Creating party failed, please choose a shorter name."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:527
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:485
+#: src/gui/socialwindow.cpp:541
 #, fuzzy
 msgid "Guild Name"
 msgstr "Guilde"
 
-#: src/gui/socialwindow.cpp:486
+#: src/gui/socialwindow.cpp:542
 #, fuzzy
 msgid "Choose your guild's name."
 msgstr "Choisissez le serveur"
 
-#: src/gui/socialwindow.cpp:498
+#: src/gui/socialwindow.cpp:554
 #, fuzzy
 msgid "Received guild request, but one already exists."
 msgstr ""
 "Vous avez reçu une demande de rejoindre un groupe, mais il en existe déjà un."
 
-#: src/gui/socialwindow.cpp:503
+#: src/gui/socialwindow.cpp:559
 #, fuzzy, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s vous a invité à rejoindre le groupe %s."
 
-#: src/gui/socialwindow.cpp:508
+#: src/gui/socialwindow.cpp:564
 #, fuzzy
 msgid "Accept Guild Invite"
 msgstr "Accepter l'invitation pour ce groupe"
 
-#: src/gui/socialwindow.cpp:520
+#: src/gui/socialwindow.cpp:576
 msgid "Received party request, but one already exists."
 msgstr ""
 "Vous avez reçu une demande de rejoindre un groupe, mais il en existe déjà un."
 
-#: src/gui/socialwindow.cpp:530
+#: src/gui/socialwindow.cpp:585
 #, fuzzy
 msgid "You have been invited you to join a party."
 msgstr "%s vous a invité à rejoindre son groupe."
 
-#: src/gui/socialwindow.cpp:534
+#: src/gui/socialwindow.cpp:589
 #, fuzzy, c-format
 msgid "You have been invited to join the %s party."
 msgstr "%s vous a invité à rejoindre le groupe %s."
 
-#: src/gui/socialwindow.cpp:542
+#: src/gui/socialwindow.cpp:597
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s vous a invité à rejoindre son groupe."
 
-#: src/gui/socialwindow.cpp:547
+#: src/gui/socialwindow.cpp:602
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s vous a invité à rejoindre le groupe %s."
 
-#: src/gui/socialwindow.cpp:555
+#: src/gui/socialwindow.cpp:610
 msgid "Accept Party Invite"
 msgstr "Accepter l'invitation pour ce groupe"
 
-#: src/gui/socialwindow.cpp:566
+#: src/gui/socialwindow.cpp:621
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:571
+#: src/gui/socialwindow.cpp:626
 #, fuzzy
 msgid "Party Name"
 msgstr "Groupe"
 
-#: src/gui/socialwindow.cpp:572
+#: src/gui/socialwindow.cpp:627
 #, fuzzy
 msgid "Choose your party's name."
 msgstr "Choisissez le serveur"
 
-#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:62
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:62
 msgid "Specials"
 msgstr ""
 
-#: src/gui/specialswindow.cpp:174
-#, c-format
-msgid "Specials Set %d"
-msgstr ""
-
-#: src/gui/specialswindow.cpp:191
-#, c-format
-msgid "Special %d"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:247
+#: src/gui/statuswindow.cpp:113 src/gui/statuswindow.cpp:215
+#: src/gui/statuswindow.cpp:262
 #, c-format
 msgid "Level: %d"
 msgstr "Niveau : %d"
 
-#: src/gui/statuswindow.cpp:101 src/gui/statuswindow.cpp:211
+#: src/gui/statuswindow.cpp:114 src/gui/statuswindow.cpp:208
+#: src/gui/statuswindow.cpp:239
 #, c-format
 msgid "Money: %s"
 msgstr "Argent : %s"
 
-#: src/gui/statuswindow.cpp:104
+#: src/gui/statuswindow.cpp:117
 msgid "HP:"
 msgstr "Vie :"
 
-#: src/gui/statuswindow.cpp:109
+#: src/gui/statuswindow.cpp:122
 msgid "Exp:"
 msgstr "Exp :"
 
-#: src/gui/statuswindow.cpp:114
+#: src/gui/statuswindow.cpp:130
 msgid "MP:"
 msgstr "PM :"
 
-#: src/gui/statuswindow.cpp:132 src/gui/statuswindow.cpp:219
+#: src/gui/statuswindow.cpp:158 src/gui/statuswindow.cpp:275
 #, c-format
 msgid "Job: %d"
 msgstr "Metier : %d"
 
-#: src/gui/statuswindow.cpp:133
+#: src/gui/statuswindow.cpp:159
 msgid "Job:"
 msgstr "Habilité :"
 
-#: src/gui/statuswindow.cpp:194
-#, fuzzy
-msgid "HP"
-msgstr "Vie :"
-
-#: src/gui/statuswindow.cpp:200
-#, fuzzy
-msgid "MP"
-msgstr "PM :"
-
-#: src/gui/statuswindow.cpp:206
-#, fuzzy
-msgid "Exp"
-msgstr "Exp :"
-
-#: src/gui/statuswindow.cpp:215
-#, fuzzy
-msgid "Money"
-msgstr "Argent : %d"
-
-#: src/gui/statuswindow.cpp:225
-#, fuzzy
-msgid "Job"
-msgstr "Habilité :"
-
-#: src/gui/statuswindow.cpp:229
+#: src/gui/statuswindow.cpp:211 src/gui/statuswindow.cpp:247
 #, fuzzy, c-format
 msgid "Character points: %d"
 msgstr "Caractéristiques du personnage Ok"
 
-#: src/gui/statuswindow.cpp:235
+#: src/gui/statuswindow.cpp:255
 #, fuzzy, c-format
 msgid "Correction points: %d"
 msgstr "Points de compétences : %d"
 
-#: src/gui/statuswindow.cpp:251
-#, fuzzy
-msgid "Level"
-msgstr "Niveau : %d"
-
-#: src/gui/storagewindow.cpp:59
-msgid "Storage"
-msgstr "Stockage"
-
-#: src/gui/trade.cpp:52
+#: src/gui/trade.cpp:53
 msgid "Propose trade"
 msgstr "Proposer un troc"
 
-#: src/gui/trade.cpp:53
+#: src/gui/trade.cpp:54
 msgid "Confirmed. Waiting..."
 msgstr "Confirmé. En attente..."
 
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:55
 msgid "Agree trade"
 msgstr "Accepter l'échange"
 
-#: src/gui/trade.cpp:55
+#: src/gui/trade.cpp:56
 msgid "Agreed. Waiting..."
 msgstr "Accepté. En attente..."
 
-#: src/gui/trade.cpp:58
+#: src/gui/trade.cpp:59
 msgid "Trade: You"
 msgstr "Échange : Vous"
 
-#: src/gui/trade.cpp:74 src/gui/trade.cpp:75
+#: src/gui/trade.cpp:73 src/gui/trade.cpp:74
 msgid "Trade"
 msgstr "Échange"
 
-#: src/gui/trade.cpp:77
+#: src/gui/trade.cpp:76
 msgid "Add"
 msgstr "Ajouter"
 
-#: src/gui/trade.cpp:99 src/gui/trade.cpp:135
+#: src/gui/trade.cpp:98 src/gui/trade.cpp:134
 #, fuzzy, c-format
 msgid "You get %s"
 msgstr "Vous recevez %s."
 
-#: src/gui/trade.cpp:100
+#: src/gui/trade.cpp:99
 msgid "You give:"
 msgstr "Vous donnez :"
 
-#: src/gui/trade.cpp:104
+#: src/gui/trade.cpp:103
 msgid "Change"
 msgstr "Changer"
 
-#: src/gui/trade.cpp:275
+#: src/gui/trade.cpp:262
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "L'objet ne peux être ajouté. Vous ne pouvez ajouter deux fois le même objet "
 "dans cette fenêtre."
 
-#: src/gui/trade.cpp:318
+#: src/gui/trade.cpp:304
 msgid "You don't have enough money."
 msgstr "Vous n'avez pas assez d'argent."
 
@@ -1959,22 +2007,22 @@ msgstr "Connexion..."
 msgid "Play"
 msgstr "Jouer"
 
-#: src/gui/updatewindow.cpp:405
+#: src/gui/updatewindow.cpp:417
 msgid "##1  The update process is incomplete."
 msgstr "##1 Le processus de mise à jour n'est pas achevé"
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:407
+#: src/gui/updatewindow.cpp:419
 msgid "##1  It is strongly recommended that"
 msgstr "##1 Il est fortement recommandé que"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:409
+#: src/gui/updatewindow.cpp:421
 #, fuzzy
 msgid "##1  you try again later."
 msgstr "##1 vous réessayez plus tard"
 
-#: src/gui/updatewindow.cpp:501
+#: src/gui/updatewindow.cpp:515
 msgid "Completed"
 msgstr "Terminé"
 
@@ -2057,55 +2105,55 @@ msgstr "Indiquez à quel utilisateur donner les droit d'opérateur !"
 msgid "Need a user to kick!"
 msgstr "Indiquez quel utilisateur sortir !"
 
-#: src/gui/widgets/chattab.cpp:118
+#: src/gui/widgets/chattab.cpp:121
 msgid "Global announcement:"
 msgstr "Annonce globale :"
 
-#: src/gui/widgets/chattab.cpp:124
+#: src/gui/widgets/chattab.cpp:127
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "Annonce globale de %s :"
 
-#: src/gui/widgets/chattab.cpp:150
+#: src/gui/widgets/chattab.cpp:153
 #, fuzzy, c-format
 msgid "%s whispers: %s"
 msgstr "Message privé de %s : "
 
-#: src/gui/widgets/whispertab.cpp:51
+#: src/gui/widgets/whispertab.cpp:53
 msgid "Cannot send empty chat!"
 msgstr "Impossible d'envoyer une conversation vide !"
 
-#: src/gui/widgets/whispertab.cpp:70
+#: src/gui/widgets/whispertab.cpp:72
 msgid "/ignore > Ignore the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:71
+#: src/gui/widgets/whispertab.cpp:73
 msgid "/unignore > Stop ignoring the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:72
+#: src/gui/widgets/whispertab.cpp:74
 msgid "/close > Close the whisper tab"
 msgstr "/close > Ferme l'onglet de conversation privée"
 
-#: src/gui/widgets/whispertab.cpp:82
+#: src/gui/widgets/whispertab.cpp:84
 msgid "Command: /close"
 msgstr "Commande : /close"
 
-#: src/gui/widgets/whispertab.cpp:83
+#: src/gui/widgets/whispertab.cpp:85
 msgid "This command closes the current whisper tab."
 msgstr "Cette commande ferme l'onglet courant de conversation privée."
 
-#: src/gui/widgets/whispertab.cpp:87
+#: src/gui/widgets/whispertab.cpp:89
 #, fuzzy
 msgid "Command: /ignore"
 msgstr "Commande : /item"
 
-#: src/gui/widgets/whispertab.cpp:88
+#: src/gui/widgets/whispertab.cpp:90
 #, fuzzy
 msgid "This command ignores the other player regardless of current relations."
 msgstr "Cette commande affiche le nombre de joueurs actuellement connectés."
 
-#: src/gui/widgets/whispertab.cpp:94
+#: src/gui/widgets/whispertab.cpp:96
 #, fuzzy
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
@@ -2135,194 +2183,194 @@ msgstr "Changer"
 msgid "Choose World"
 msgstr "Choisissez le serveur"
 
-#: src/keyboardconfig.cpp:40
+#: src/keyboardconfig.cpp:39
 msgid "Move Up"
 msgstr "Monter"
 
-#: src/keyboardconfig.cpp:41
+#: src/keyboardconfig.cpp:40
 msgid "Move Down"
 msgstr "Descendre"
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:41
 msgid "Move Left"
 msgstr "Aller à gauche"
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:42
 msgid "Move Right"
 msgstr "Aller à droite"
 
-#: src/keyboardconfig.cpp:44 src/net/ea/generalhandler.cpp:223
+#: src/keyboardconfig.cpp:43 src/net/tmwa/generalhandler.cpp:237
 msgid "Attack"
 msgstr "Attaquer"
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:44
 msgid "Target & Attack"
 msgstr "Cibler et Attaquer"
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:45
 msgid "Smilie"
 msgstr "Smilie"
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:46
 msgid "Talk"
 msgstr "Parler"
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:47
 msgid "Stop Attack"
 msgstr "Arrêter d'attaquer"
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:48
 #, fuzzy
 msgid "Target Monster"
 msgstr "Cible la plus proche"
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboardconfig.cpp:49
 msgid "Target NPC"
 msgstr "Cibler le PNJ"
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:50
 msgid "Target Player"
 msgstr "Cibler le Joueur"
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:51
 msgid "Pickup"
 msgstr "Ramasser"
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:52
 msgid "Hide Windows"
 msgstr "Cacher les fenêtres"
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:53
 msgid "Sit"
 msgstr "S'assoir"
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:54
 msgid "Screenshot"
 msgstr "Capture d'écran"
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:55
 msgid "Enable/Disable Trading"
 msgstr "Activer / Désactiver les échanges"
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:56
 msgid "Find Path to Mouse"
 msgstr "Trouver le chemin vers la souris"
 
-#: src/keyboardconfig.cpp:58 src/keyboardconfig.cpp:59
-#: src/keyboardconfig.cpp:60 src/keyboardconfig.cpp:61
-#: src/keyboardconfig.cpp:62 src/keyboardconfig.cpp:63
-#: src/keyboardconfig.cpp:64 src/keyboardconfig.cpp:65
-#: src/keyboardconfig.cpp:66 src/keyboardconfig.cpp:67
-#: src/keyboardconfig.cpp:68 src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:57 src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60
+#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62
+#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64
+#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68
 #, c-format
 msgid "Item Shortcut %d"
 msgstr "Raccourci Objet %d"
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:69
 msgid "Help Window"
 msgstr "Fenêtre d'Aide"
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:70
 msgid "Status Window"
 msgstr "Fenêtre d'état"
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:71
 msgid "Inventory Window"
 msgstr "Fenêtre de l'inventaire"
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:72
 msgid "Equipment Window"
 msgstr "Fenêtre d'équipements."
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:73
 msgid "Skill Window"
 msgstr "Fenêtre de compétences"
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:74
 msgid "Minimap Window"
 msgstr "Fenêtre du plan"
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:75
 msgid "Chat Window"
 msgstr "Fenêtre de conversation"
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:76
 msgid "Item Shortcut Window"
 msgstr "Fenêtre de raccourci objet"
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:77
 msgid "Setup Window"
 msgstr "Fenêtre de configuration"
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:78
 msgid "Debug Window"
 msgstr "Fenêtre de debug"
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:79
 #, fuzzy
 msgid "Social Window"
 msgstr "Fenêtre de compétences"
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:80
 msgid "Emote Shortcut Window"
 msgstr "Fenêtre de raccourcis d'emote"
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:81
 #, fuzzy
 msgid "Outfits Window"
 msgstr "Fenêtre d'état"
 
-#: src/keyboardconfig.cpp:83
+#: src/keyboardconfig.cpp:82
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:83
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86
-#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88
-#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90
-#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92
-#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:84 src/keyboardconfig.cpp:85
+#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:87
+#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:89
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:91
+#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:93
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:95
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "Raccourci d'emote %d"
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:96
 msgid "Toggle Chat"
 msgstr "Activer / Désactiver la conversation"
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:97
 msgid "Scroll Chat Up"
 msgstr "Défiler la conversation (haut)"
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:98
 msgid "Scroll Chat Down"
 msgstr "Défiler la conversation (bas)"
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:99
 msgid "Previous Chat Tab"
 msgstr "Onglet de la conversation précédente"
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:100
 msgid "Next Chat Tab"
 msgstr "Onglet de la conversation suivante"
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:101
 msgid "Select OK"
 msgstr "Sélectionner OK"
 
-#: src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:103
 msgid "Ignore input 1"
 msgstr "Ignorer l'entrée 1"
 
-#: src/keyboardconfig.cpp:105
+#: src/keyboardconfig.cpp:104
 msgid "Ignore input 2"
 msgstr "Ignorer l'entrée 2"
 
-#: src/keyboardconfig.cpp:184
+#: src/keyboardconfig.cpp:183
 #, fuzzy, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -2330,459 +2378,825 @@ msgid ""
 msgstr ""
 "Trouver une solution ou des choses étranges se produiront pendant la partie."
 
-#: src/localplayer.cpp:914
+#: src/localplayer.cpp:985
 msgid "Unable to pick up item."
 msgstr "Impossible de ramasser l'objet."
 
 #. TRANSLATORS: This sentence may be translated differently
 #. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:923
+#: src/localplayer.cpp:994
 #, fuzzy, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "vous avez ramassé %s [@@%d|%s@@]."
 msgstr[1] "vous avez ramassé %s [@@%d|%s@@]."
 
-#: src/main.cpp:43
+#: src/main.cpp:42
 msgid "mana [options] [mana-file]"
 msgstr ""
 
+#: src/main.cpp:43
+msgid "[mana-file] : The mana file is an XML file (.mana)"
+msgstr ""
+
 #: src/main.cpp:44
+msgid "              used to set custom parameters"
+msgstr ""
+
+#: src/main.cpp:45
+msgid "              to the mana client."
+msgstr ""
+
+#: src/main.cpp:47
 msgid "Options:"
 msgstr "Options :"
 
-#: src/main.cpp:45
+#: src/main.cpp:48
 #, fuzzy
 msgid "  -v --version        : Display the version"
 msgstr "  -v --version : Affiche la version"
 
-#: src/main.cpp:46
+#: src/main.cpp:49
 #, fuzzy
 msgid "  -h --help           : Display this help"
 msgstr "  -h --help : Montre cette aide"
 
-#: src/main.cpp:47
+#: src/main.cpp:50
 #, fuzzy
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr "  -C --config-file : Fichier de configuration à utiliser"
 
-#: src/main.cpp:48
+#: src/main.cpp:51
 #, fuzzy
 msgid "  -U --username       : Login with this username"
 msgstr "  -U --username : Se connecter avec ce nom d'utilisateur"
 
-#: src/main.cpp:49
+#: src/main.cpp:52
 #, fuzzy
 msgid "  -P --password       : Login with this password"
 msgstr "  -P --password : Se connecter avec ce mot de passe"
 
-#: src/main.cpp:50
+#: src/main.cpp:53
 #, fuzzy
 msgid "  -c --character      : Login with this character"
 msgstr "  -c --character : Se connecter avec ce personnage"
 
-#: src/main.cpp:51
+#: src/main.cpp:54
 #, fuzzy
 msgid "  -s --server         : Login server name or IP"
 msgstr "  -s --server : Nom du serveur pour la connexion ou IP"
 
-#: src/main.cpp:52
+#: src/main.cpp:55
 #, fuzzy
 msgid "  -p --port           : Login server port"
 msgstr "  -p --port : Port de connexion au serveur"
 
-#: src/main.cpp:53
+#: src/main.cpp:56
 #, fuzzy
 msgid "     --update-host    : Use this update host"
 msgstr "  -H --update-host : Utilise cette mise à jour d'Hôte"
 
-#: src/main.cpp:54
+#: src/main.cpp:57
 #, fuzzy
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 "  -D --default : Choisir le serveur de personnages et le personnage par "
 "défaut"
 
-#: src/main.cpp:56
+#: src/main.cpp:59
 #, fuzzy
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr "  -u --skip-update : Passer les téléchargements de mise à jour"
 
-#: src/main.cpp:57
+#: src/main.cpp:60
 #, fuzzy
 msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 "  -d --data : Répertoire dans lequel les données du jeu se trouvent et "
 "seront chargées"
 
-#: src/main.cpp:58
+#: src/main.cpp:61
 #, fuzzy
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
+msgid "     --localdata-dir  : Directory to use as local data directory"
 msgstr "  -S --home-dir : Répertoire à utiliser comme répertoire principal"
 
-#: src/main.cpp:59
+#: src/main.cpp:62
+#, fuzzy
+msgid "     --chat-log-dir   : Chat log dir to use"
+msgstr "  -C --config-file : Fichier de configuration à utiliser"
+
+#: src/main.cpp:63
 #, fuzzy
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr "  -S --home-dir : Répertoire à utiliser comme répertoire principal"
 
-#: src/main.cpp:61
+#: src/main.cpp:65
 #, fuzzy
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr "  -O --no-opengl : Désactive OpenGL pour cette session"
 
-#: src/net/ea/adminhandler.cpp:63
+#: src/net/manaserv/beinghandler.cpp:303 src/net/tmwa/playerhandler.cpp:94
+msgid "You are dead."
+msgstr "Vous êtes mort."
+
+#: src/net/manaserv/beinghandler.cpp:304 src/net/tmwa/playerhandler.cpp:95
+msgid "We regret to inform you that your character was killed in battle."
+msgstr ""
+"Nous avons le regret de vous informer que votre personnage est mort sur le "
+"champ de bataille."
+
+#: src/net/manaserv/beinghandler.cpp:306 src/net/tmwa/playerhandler.cpp:97
+msgid "You are not that alive anymore."
+msgstr "Vous n'êtes plus vraiment en vie."
+
+#: src/net/manaserv/beinghandler.cpp:307 src/net/tmwa/playerhandler.cpp:98
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr "Les mains gelées de la faucheuse viennent réclamer votre âme."
+
+#: src/net/manaserv/beinghandler.cpp:308 src/net/tmwa/playerhandler.cpp:99
+msgid "Game Over!"
+msgstr "Fin de la partie !"
+
+#: src/net/manaserv/beinghandler.cpp:309 src/net/tmwa/playerhandler.cpp:101
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+"Non, les  enfants. Ton personnage n'est pas vraiment mort... Il... enfin,.. "
+"il... est parti dans un monde meilleur."
+
+#: src/net/manaserv/beinghandler.cpp:311 src/net/tmwa/playerhandler.cpp:103
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr ""
+"Votre tentative de casser l'arme de votre ennemi en la frappant avec votre "
+"gorge a échoué."
+
+#: src/net/manaserv/beinghandler.cpp:313 src/net/tmwa/playerhandler.cpp:105
+msgid "I guess this did not run too well."
+msgstr "J'ai la sensation que cela ne s'est pas aussi bien passé que prévu."
+
+#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:107
+msgid "Do you want your possessions identified?"
+msgstr "Voulez-vous que vos biens soient identifiés ?"
+
+#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:109
+msgid "Sadly, no trace of you was ever found..."
+msgstr "Tristement, aucune trace de vous ne fut jamais retrouvée..."
+
+#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:111
+msgid "Annihilated."
+msgstr "Vaporisé."
+
+#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:113
+msgid "Looks like you got your head handed to you."
+msgstr "Il semble que l'on vous ait rendu votre tête."
+
+#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:115
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr ""
+"Vous avez encore échoué, jetez votre corps aux oubliettes et prenez en un "
+"autre."
+
+#: src/net/manaserv/beinghandler.cpp:323
+#, fuzzy
+msgid "Press OK to respawn."
+msgstr " Cliquer sur OK pour ressuciter"
+
+#: src/net/manaserv/beinghandler.cpp:324
+#, fuzzy
+msgid "You Died"
+msgstr "Vous êtes mort"
+
+#: src/net/manaserv/charhandler.cpp:138 src/net/manaserv/charhandler.cpp:209
+#, fuzzy
+msgid "Not logged in."
+msgstr "Déjà connecté"
+
+#: src/net/manaserv/charhandler.cpp:141
+msgid "No empty slot."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:144
+msgid "Invalid name."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:147
+#, fuzzy
+msgid "Character's name already exists."
+msgstr "Ce nom d'utilisateur existe déjà"
+
+#: src/net/manaserv/charhandler.cpp:150
+msgid "Invalid hairstyle."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:153
+msgid "Invalid hair color."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:156
+msgid "Invalid gender."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:159
+#, fuzzy
+msgid "Character's stats are too high."
+msgstr "Caractéristiques du personnage Ok"
+
+#: src/net/manaserv/charhandler.cpp:162
+#, fuzzy
+msgid "Character's stats are too low."
+msgstr "Caractéristiques du personnage Ok"
+
+#: src/net/manaserv/charhandler.cpp:165
+#, c-format
+msgid "At least one statis out of the permitted range: (%u - %u)."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:171 src/net/manaserv/loginhandler.cpp:96
+#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
+#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
+#: src/net/tmwa/loginhandler.cpp:95 src/net/tmwa/loginhandler.cpp:182
+#, fuzzy
+msgid "Unknown error."
+msgstr "Erreur inconnue"
+
+#: src/net/manaserv/charhandler.cpp:200 src/net/tmwa/charserverhandler.cpp:146
+msgid "Info"
+msgstr "Informations"
+
+#: src/net/manaserv/charhandler.cpp:200
+#, fuzzy
+msgid "Player deleted."
+msgstr "Personnage supprimé"
+
+#: src/net/manaserv/charhandler.cpp:212
+#, fuzzy
+msgid "Selection out of range."
+msgstr "Choisissez le nombre d'objets à troquer."
+
+#: src/net/manaserv/charhandler.cpp:215
+#, fuzzy, c-format
+msgid "Unknown error (%d)."
+msgstr "Erreur inconnue"
+
+#: src/net/manaserv/charhandler.cpp:250
+msgid "No gameservers are available."
+msgstr "Pas de serveur de jeu disponible."
+
+#: src/net/manaserv/chathandler.cpp:187 src/net/manaserv/chathandler.cpp:313
+#: src/net/manaserv/guildhandler.cpp:260
+#, c-format
+msgid "Topic: %s"
+msgstr "Sujet : %s"
+
+#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:274
+#, fuzzy
+msgid "Players in this channel:"
+msgstr "Le joueur touche le monstre"
+
+#: src/net/manaserv/chathandler.cpp:208
+#, fuzzy
+msgid "Error joining channel."
+msgstr "Commande : /join <channel>"
+
+#: src/net/manaserv/chathandler.cpp:214
+#, fuzzy
+msgid "Listing channels."
+msgstr "Il vous est demandé de rejoindre le chan %s."
+
+#: src/net/manaserv/chathandler.cpp:226
+msgid "End of channel list."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:303
+#, fuzzy, c-format
+msgid "%s entered the channel."
+msgstr "%s a rejoind le groupe."
+
+#: src/net/manaserv/chathandler.cpp:308
+#, c-format
+msgid "%s left the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:324
+#, c-format
+msgid "%s has set mode %s on user %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:334
+#, c-format
+msgid "%s has kicked %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:339
+#, fuzzy
+msgid "Unknown channel event."
+msgstr "Commande inconnue."
+
+#: src/net/manaserv/guildhandler.cpp:82
+msgid "Guild created."
+msgstr "Guilde créée."
+
+#: src/net/manaserv/guildhandler.cpp:87
+msgid "Error creating guild."
+msgstr "Erreur lors de la création de la guilde."
+
+#: src/net/manaserv/guildhandler.cpp:97
+msgid "Invite sent."
+msgstr "Invitation envoyée."
+
+#: src/net/manaserv/guildhandler.cpp:204
+msgid "Member was promoted successfully."
+msgstr "La promotion de ce membre a réussie."
+
+#: src/net/manaserv/guildhandler.cpp:209
+msgid "Failed to promote member."
+msgstr "Echec lors de la promotion du membre"
+
+#: src/net/manaserv/loginhandler.cpp:87
+#, fuzzy
+msgid "Wrong magic_token."
+msgstr "Mauvaise empreinte magique"
+
+#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
+#, fuzzy
+msgid "Already logged in."
+msgstr "Déjà connecté"
+
+#: src/net/manaserv/loginhandler.cpp:93
+#, fuzzy
+msgid "Account banned."
+msgstr "Compte expiré"
+
+#: src/net/manaserv/loginhandler.cpp:118
+#, fuzzy
+msgid "New password incorrect."
+msgstr "Nouveau mot de passe incorrect"
+
+#: src/net/manaserv/loginhandler.cpp:121 src/net/tmwa/loginhandler.cpp:89
+#, fuzzy
+msgid "Old password incorrect."
+msgstr "Ancien mot de passe incorrect"
+
+#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
+msgid "Account not connected. Please login first."
+msgstr "Compte non connecté. Identifiez-vous tout d'abord."
+
+#: src/net/manaserv/loginhandler.cpp:149
+#, fuzzy
+msgid "New email address incorrect."
+msgstr "Nouvelle adresse email incorrecte"
+
+#: src/net/manaserv/loginhandler.cpp:152
+#, fuzzy
+msgid "Old email address incorrect."
+msgstr "Ancienne adresse email incorrecte"
+
+#: src/net/manaserv/loginhandler.cpp:158
+#, fuzzy
+msgid "The new email address already exists."
+msgstr "Cette nouvelle adresse email existe déjà."
+
+#: src/net/manaserv/loginhandler.cpp:239
+msgid ""
+"Client registration is not allowed. Please contact server administration."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
+#, fuzzy
+msgid "Client version is too old."
+msgstr "La version de votre client est trop ancienne."
+
+#: src/net/manaserv/loginhandler.cpp:266
+#, fuzzy
+msgid "Wrong username or password."
+msgstr "Mauvais nom d'utilisateur ou mot de passe."
+
+#: src/net/manaserv/loginhandler.cpp:272
+#, fuzzy
+msgid "Account banned"
+msgstr "Compte expiré"
+
+#: src/net/manaserv/loginhandler.cpp:275
+msgid "Login attempt too soon after previous attempt."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:303
+#, fuzzy
+msgid "Wrong username, password or email address."
+msgstr "Mauvais nom d'utilisateur, mot de passe ou adrese email."
+
+#: src/net/manaserv/loginhandler.cpp:306
+#, fuzzy
+msgid "Username already exists."
+msgstr "Ce nom d'utilisateur existe déjà"
+
+#: src/net/manaserv/loginhandler.cpp:309
+#, fuzzy
+msgid "Email address already exists."
+msgstr "Cette adresse email existe déjà"
+
+#: src/net/manaserv/loginhandler.cpp:312
+msgid "You took too long with the captcha or your response was incorrect."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:87
+msgid "Joined party."
+msgstr "Groupe rejoind."
+
+#: src/net/manaserv/partyhandler.cpp:105
+#, c-format
+msgid "%s joined the party."
+msgstr "%s a rejoind le groupe."
+
+#: src/net/manaserv/partyhandler.cpp:123
+#, fuzzy, c-format
+msgid "%s rejected your invite."
+msgstr "%s a refusé votre invitation."
+
+#: src/net/manaserv/tradehandler.cpp:95
+msgid "Accepting incoming trade requests."
+msgstr "Accepter les demandes d'échanges."
+
+#: src/net/manaserv/tradehandler.cpp:97
+msgid "Ignoring incoming trade requests."
+msgstr "Ignorer les demandes d'échanges."
+
+#: src/net/manaserv/tradehandler.cpp:115 src/net/tmwa/tradehandler.cpp:109
+msgid "Request for Trade"
+msgstr "Demande d'échange"
+
+#: src/net/manaserv/tradehandler.cpp:116 src/net/tmwa/tradehandler.cpp:110
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
+msgstr "%s souhaite réaliser un échange avec vous. Acceptez-vous ?"
+
+#: src/net/manaserv/tradehandler.cpp:134
+#, c-format
+msgid "Trading with %s"
+msgstr "Echange avec %s"
+
+#: src/net/manaserv/tradehandler.cpp:148 src/net/tmwa/tradehandler.cpp:224
+msgid "Trade canceled."
+msgstr "Echange annulé."
+
+#: src/net/manaserv/tradehandler.cpp:155 src/net/tmwa/tradehandler.cpp:231
+msgid "Trade completed."
+msgstr "Echange finalisé."
+
+#: src/net/tmwa/adminhandler.cpp:64
 msgid "Kick failed!"
 msgstr "Impossible de sortir la personne !"
 
-#: src/net/ea/adminhandler.cpp:65
+#: src/net/tmwa/adminhandler.cpp:66
 msgid "Kick succeeded!"
 msgstr "Sortie de la personne effectuée avec succès !"
 
-#: src/net/ea/buysellhandler.cpp:110
+#: src/net/tmwa/buysellhandler.cpp:109
 msgid "Nothing to sell."
 msgstr "Rien à vendre."
 
-#: src/net/ea/buysellhandler.cpp:117
+#: src/net/tmwa/buysellhandler.cpp:116
 msgid "Thanks for buying."
 msgstr "Merci pour votre achat."
 
-#: src/net/ea/buysellhandler.cpp:124
+#: src/net/tmwa/buysellhandler.cpp:123
 msgid "Unable to buy."
 msgstr "Impossible d'acheter."
 
-#: src/net/ea/buysellhandler.cpp:130
+#: src/net/tmwa/buysellhandler.cpp:129
 msgid "Thanks for selling."
 msgstr "Merci pour votre vente."
 
-#: src/net/ea/buysellhandler.cpp:132
+#: src/net/tmwa/buysellhandler.cpp:131
 msgid "Unable to sell."
 msgstr "Impossible de vendre."
 
-#: src/net/ea/charserverhandler.cpp:103
-#, fuzzy
-msgid "Access denied."
-msgstr "Accès refusé"
+#: src/net/tmwa/charserverhandler.cpp:103
+msgid "Access denied. Most likely, there are too many players on this server."
+msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:106
+#: src/net/tmwa/charserverhandler.cpp:107
 #, fuzzy
 msgid "Cannot use this ID."
 msgstr "Impossible d'utiliser cet ID"
 
-#: src/net/ea/charserverhandler.cpp:109
+#: src/net/tmwa/charserverhandler.cpp:110
 #, fuzzy
-msgid "Unknown failure to select character."
-msgstr "Problème inconnu lors de la séléction du personnage"
+msgid "Unknown char-server failure."
+msgstr "Erreur inconnue"
 
-#: src/net/ea/charserverhandler.cpp:135
+#: src/net/tmwa/charserverhandler.cpp:134
 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é."
 
-#: src/net/ea/charserverhandler.cpp:147 src/net/manaserv/charhandler.cpp:187
-msgid "Info"
-msgstr "Informations"
-
-#: src/net/ea/charserverhandler.cpp:147
+#: src/net/tmwa/charserverhandler.cpp:146
 msgid "Character deleted."
 msgstr "Personnage supprimé."
 
-#: src/net/ea/charserverhandler.cpp:152
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Failed to delete character."
 msgstr "La suppresion du personnage n'a pu s\"effectuer."
 
-#: src/net/ea/charserverhandler.cpp:237 src/net/manaserv/charhandler.cpp:263
+#: src/net/tmwa/charserverhandler.cpp:266
 msgid "Strength:"
 msgstr "Force :"
 
-#: src/net/ea/charserverhandler.cpp:238 src/net/manaserv/charhandler.cpp:264
+#: src/net/tmwa/charserverhandler.cpp:267
 msgid "Agility:"
 msgstr "Agilité :"
 
-#: src/net/ea/charserverhandler.cpp:239 src/net/manaserv/charhandler.cpp:266
+#: src/net/tmwa/charserverhandler.cpp:268
 msgid "Vitality:"
 msgstr "Vitalité :"
 
-#: src/net/ea/charserverhandler.cpp:240 src/net/manaserv/charhandler.cpp:267
+#: src/net/tmwa/charserverhandler.cpp:269
 msgid "Intelligence:"
 msgstr "Intelligence :"
 
-#: src/net/ea/charserverhandler.cpp:241 src/net/manaserv/charhandler.cpp:265
+#: src/net/tmwa/charserverhandler.cpp:270
 msgid "Dexterity:"
 msgstr "Dextérité :"
 
-#: src/net/ea/charserverhandler.cpp:242
+#: src/net/tmwa/charserverhandler.cpp:271
 msgid "Luck:"
 msgstr "Chance :"
 
-#: src/net/ea/chathandler.cpp:80
-msgid "Whisper could not be sent, user is offline."
+#: src/net/tmwa/chathandler.cpp:87
+#, fuzzy, c-format
+msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 "Le message privé n'a pu être envoyé, le destinataire n'est pas connecté."
 
-#: src/net/ea/chathandler.cpp:84
-msgid "Whisper could not be sent, ignored by user."
+#: src/net/tmwa/chathandler.cpp:96
+#, fuzzy, c-format
+msgid "Whisper could not be sent, ignored by %s."
 msgstr "Le message privé n'a pu être envoyé, le destinataire l'a ignoré."
 
-#: src/net/ea/chathandler.cpp:171
+#: src/net/tmwa/chathandler.cpp:230
 #, fuzzy
 msgid "MVP player."
 msgstr "Joueur"
 
-#: src/net/ea/chathandler.cpp:204 src/net/ea/chathandler.cpp:210
-#: src/net/ea/chathandler.cpp:215 src/net/ea/chathandler.cpp:220
-#: src/net/ea/chathandler.cpp:225 src/net/ea/chathandler.cpp:230
-#: src/net/ea/chathandler.cpp:235 src/net/ea/chathandler.cpp:240
+#: src/net/tmwa/chathandler.cpp:265 src/net/tmwa/chathandler.cpp:271
+#: src/net/tmwa/chathandler.cpp:276 src/net/tmwa/chathandler.cpp:281
+#: src/net/tmwa/chathandler.cpp:286 src/net/tmwa/chathandler.cpp:291
+#: src/net/tmwa/chathandler.cpp:296 src/net/tmwa/chathandler.cpp:301
 msgid "Channels are not supported!"
 msgstr "Les salons ne sont pas gérés !"
 
-#: src/net/ea/gamehandler.cpp:86
+#: src/net/tmwa/gamehandler.cpp:88
 #, c-format
 msgid "Online users: %d"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:100
+#: src/net/tmwa/gamehandler.cpp:101
 #, fuzzy
 msgid "Game"
 msgstr "Nom"
 
-#: src/net/ea/gamehandler.cpp:100
+#: src/net/tmwa/gamehandler.cpp:101
 #, fuzzy
 msgid "Request to quit denied!"
 msgstr "Demande d'échange"
 
-#: src/net/ea/generalhandler.cpp:102 src/net/manaserv/generalhandler.cpp:95
+#: src/net/tmwa/generalhandler.cpp:102
 #, c-format
 msgid "Strength %+d"
 msgstr "Force %+d"
 
-#: src/net/ea/generalhandler.cpp:103 src/net/manaserv/generalhandler.cpp:96
+#: src/net/tmwa/generalhandler.cpp:103
 #, c-format
 msgid "Agility %+d"
 msgstr "Agilité %+d"
 
-#: src/net/ea/generalhandler.cpp:104 src/net/manaserv/generalhandler.cpp:98
+#: src/net/tmwa/generalhandler.cpp:104
 #, c-format
 msgid "Vitality %+d"
 msgstr "Vitalité %+d"
 
-#: src/net/ea/generalhandler.cpp:105 src/net/manaserv/generalhandler.cpp:99
+#: src/net/tmwa/generalhandler.cpp:105
 #, c-format
 msgid "Intelligence %+d"
 msgstr "Intelligence %+d"
 
-#: src/net/ea/generalhandler.cpp:106 src/net/manaserv/generalhandler.cpp:97
+#: src/net/tmwa/generalhandler.cpp:106
 #, c-format
 msgid "Dexterity %+d"
 msgstr "Dextérité %+d"
 
-#: src/net/ea/generalhandler.cpp:107
+#: src/net/tmwa/generalhandler.cpp:107
 #, c-format
 msgid "Luck %+d"
 msgstr "Chance %+d"
 
-#: src/net/ea/generalhandler.cpp:130
+#: src/net/tmwa/generalhandler.cpp:132
 #, fuzzy
 msgid "Authentication failed."
 msgstr "Échec de l'indentification"
 
-#: src/net/ea/generalhandler.cpp:133
+#: src/net/tmwa/generalhandler.cpp:135
 #, fuzzy
 msgid "No servers available."
 msgstr "Aucun serveur n'est disponible"
 
-#: src/net/ea/generalhandler.cpp:137
+#: src/net/tmwa/generalhandler.cpp:139
 #, fuzzy
 msgid "Someone else is trying to use this account."
 msgstr "Quelqu'un d'autre essaye d'utiliser ce compte"
 
-#: src/net/ea/generalhandler.cpp:140
+#: src/net/tmwa/generalhandler.cpp:142
 #, fuzzy
 msgid "This account is already logged in."
 msgstr "Ce compte est déjà connecté"
 
-#: src/net/ea/generalhandler.cpp:143
+#: src/net/tmwa/generalhandler.cpp:145
 #, fuzzy
 msgid "Speed hack detected."
 msgstr "Speed hack detecté"
 
-#: src/net/ea/generalhandler.cpp:146
+#: src/net/tmwa/generalhandler.cpp:148
 #, fuzzy
 msgid "Duplicated login."
 msgstr "Identification dupliquée"
 
-#: src/net/ea/generalhandler.cpp:149
+#: src/net/tmwa/generalhandler.cpp:151
 #, fuzzy
 msgid "Unknown connection error."
 msgstr "Erreur de connexion inconnue"
 
-#: src/net/ea/generalhandler.cpp:205
+#: src/net/tmwa/generalhandler.cpp:209
 msgid "Got disconnected from server!"
 msgstr "Vous avez été déconnecté du serveur !"
 
-#: src/net/ea/generalhandler.cpp:216 src/net/manaserv/generalhandler.cpp:166
+#: src/net/tmwa/generalhandler.cpp:230
 msgid "Strength"
 msgstr "Force"
 
-#: src/net/ea/generalhandler.cpp:217 src/net/manaserv/generalhandler.cpp:167
+#: src/net/tmwa/generalhandler.cpp:231
 msgid "Agility"
 msgstr "Agilité"
 
-#: src/net/ea/generalhandler.cpp:218 src/net/manaserv/generalhandler.cpp:169
+#: src/net/tmwa/generalhandler.cpp:232
 msgid "Vitality"
 msgstr "Vitalité"
 
-#: src/net/ea/generalhandler.cpp:219 src/net/manaserv/generalhandler.cpp:170
+#: src/net/tmwa/generalhandler.cpp:233
 msgid "Intelligence"
 msgstr "Intelligence"
 
-#: src/net/ea/generalhandler.cpp:220 src/net/manaserv/generalhandler.cpp:168
+#: src/net/tmwa/generalhandler.cpp:234
 msgid "Dexterity"
 msgstr "Dextérité"
 
-#: src/net/ea/generalhandler.cpp:221
+#: src/net/tmwa/generalhandler.cpp:235
 msgid "Luck"
 msgstr "Chance"
 
-#: src/net/ea/generalhandler.cpp:224
+#: src/net/tmwa/generalhandler.cpp:238
 #, fuzzy
 msgid "Defense"
 msgstr "Défense :"
 
-#: src/net/ea/generalhandler.cpp:225
+#: src/net/tmwa/generalhandler.cpp:239
 #, fuzzy
 msgid "M.Attack"
 msgstr "Attaque M. :"
 
-#: src/net/ea/generalhandler.cpp:226
+#: src/net/tmwa/generalhandler.cpp:240
 #, fuzzy
 msgid "M.Defense"
 msgstr "Défense M. :"
 
-#: src/net/ea/generalhandler.cpp:227
+#: src/net/tmwa/generalhandler.cpp:241
 #, fuzzy, c-format
 msgid "% Accuracy"
 msgstr "% Précision :"
 
-#: src/net/ea/generalhandler.cpp:228
+#: src/net/tmwa/generalhandler.cpp:242
 #, fuzzy, c-format
 msgid "% Evade"
 msgstr "% Esquive :"
 
-#: src/net/ea/generalhandler.cpp:229
+#: src/net/tmwa/generalhandler.cpp:243
 #, fuzzy, c-format
 msgid "% Critical"
 msgstr "Coup critique"
 
-#: src/net/ea/gui/guildtab.cpp:45
+#: src/net/tmwa/gui/guildtab.cpp:45
 msgid "Guild"
 msgstr "Guilde"
 
-#: src/net/ea/gui/guildtab.cpp:61 src/net/ea/gui/partytab.cpp:59
+#: src/net/tmwa/gui/guildtab.cpp:61 src/net/tmwa/gui/partytab.cpp:59
 msgid "/help > Display this help."
 msgstr "/help > Affiche cette aide."
 
-#: src/net/ea/gui/guildtab.cpp:62
+#: src/net/tmwa/gui/guildtab.cpp:62
 #, fuzzy
 msgid "/invite > Invite a player to your guild"
 msgstr "/invite > Invite un joueur à rejoindre votre groupe"
 
-#: src/net/ea/gui/guildtab.cpp:63
+#: src/net/tmwa/gui/guildtab.cpp:63
 #, fuzzy
 msgid "/leave > Leave the guild you are in"
 msgstr "/leave > Quitte le groupe dans lequel vous vous trouvez"
 
-#: src/net/ea/gui/guildtab.cpp:64
+#: src/net/tmwa/gui/guildtab.cpp:64
 #, fuzzy
 msgid "/kick > Kick some one from the guild you are in"
 msgstr "/kick > Sortir quelqu'un du groupe dont vous faites partie"
 
-#: src/net/ea/gui/guildtab.cpp:73 src/net/ea/gui/partytab.cpp:73
+#: src/net/tmwa/gui/guildtab.cpp:73 src/net/tmwa/gui/partytab.cpp:73
 msgid "Command: /invite <nick>"
 msgstr "Commande : /invite <nick>"
 
-#: src/net/ea/gui/guildtab.cpp:74
+#: src/net/tmwa/gui/guildtab.cpp:74
 #, fuzzy
 msgid "This command invites <nick> to the guild you're in."
 msgstr "Cette commande invite <nick> à rejoindre votre groupe."
 
-#: src/net/ea/gui/guildtab.cpp:80 src/net/ea/gui/partytab.cpp:80
+#: src/net/tmwa/gui/guildtab.cpp:80 src/net/tmwa/gui/partytab.cpp:80
 msgid "Command: /leave"
 msgstr "Commande : /leave"
 
-#: src/net/ea/gui/guildtab.cpp:81
+#: src/net/tmwa/gui/guildtab.cpp:81
 #, fuzzy
 msgid "This command causes the player to leave the guild."
 msgstr "Cette commande vous fait quitter votre groupe actuel."
 
-#: src/net/ea/gui/guildtab.cpp:89
+#: src/net/tmwa/gui/guildtab.cpp:89
 #, fuzzy
 msgid "Guild name is missing."
 msgstr "Indiquez un nom de groupe."
 
-#: src/net/ea/guildhandler.cpp:293
+#: src/net/tmwa/guildhandler.cpp:296
 msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:298
+#: src/net/tmwa/guildhandler.cpp:301
 msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:303
+#: src/net/tmwa/guildhandler.cpp:306
 #, fuzzy
 msgid "User is now part of your guild."
 msgstr "%s est maintenant membre de votre groupe."
 
-#: src/net/ea/guildhandler.cpp:308
+#: src/net/tmwa/guildhandler.cpp:311
 msgid "Your guild is full."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:313
+#: src/net/tmwa/guildhandler.cpp:316
 #, fuzzy
 msgid "Unknown guild invite response."
 msgstr "Réponse d'invitation de %s inconnue."
 
-#: src/net/ea/guildhandler.cpp:390
+#: src/net/tmwa/guildhandler.cpp:393
 msgid "Guild creation isn't supported yet."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:43
+#: src/net/tmwa/gui/partytab.cpp:43
 msgid "Party"
 msgstr "Groupe"
 
-#: src/net/ea/gui/partytab.cpp:60
+#: src/net/tmwa/gui/partytab.cpp:60
 msgid "/invite > Invite a player to your party"
 msgstr "/invite > Invite un joueur à rejoindre votre groupe"
 
-#: src/net/ea/gui/partytab.cpp:61
+#: src/net/tmwa/gui/partytab.cpp:61
 msgid "/leave > Leave the party you are in"
 msgstr "/leave > Quitte le groupe dans lequel vous vous trouvez"
 
-#: src/net/ea/gui/partytab.cpp:62
+#: src/net/tmwa/gui/partytab.cpp:62
 msgid "/kick > Kick some one from the party you are in"
 msgstr "/kick > Sortir quelqu'un du groupe dont vous faites partie"
 
-#: src/net/ea/gui/partytab.cpp:63
+#: src/net/tmwa/gui/partytab.cpp:63
 msgid "/item > Show/change party item sharing options"
 msgstr "/item > Affiche / Modifie les préférences d'échange d'objet du groupe"
 
-#: src/net/ea/gui/partytab.cpp:64
+#: src/net/tmwa/gui/partytab.cpp:64
 msgid "/exp > Show/change party experience sharing options"
 msgstr "/exp > Affiche / Modifie les préférences d'expérience du groupe"
 
-#: src/net/ea/gui/partytab.cpp:81
+#: src/net/tmwa/gui/partytab.cpp:81
 msgid "This command causes the player to leave the party."
 msgstr "Cette commande vous fait quitter votre groupe actuel."
 
-#: src/net/ea/gui/partytab.cpp:85
+#: src/net/tmwa/gui/partytab.cpp:85
 msgid "Command: /item <policy>"
 msgstr "Commande : /item <policy>"
 
-#: src/net/ea/gui/partytab.cpp:86
+#: src/net/tmwa/gui/partytab.cpp:86
 msgid "This command changes the party's item sharing policy."
 msgstr "Cette commande change les préférences d'échange d'objet du groupe."
 
-#: src/net/ea/gui/partytab.cpp:87
+#: src/net/tmwa/gui/partytab.cpp:87
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
@@ -2790,26 +3204,26 @@ msgstr ""
 "<préférences> peut être \"1\", \"yes\", \"true\" pour activer l'échange "
 "d'objet, ou \"0\", \"no\", \"false\" pour le désactiver."
 
-#: src/net/ea/gui/partytab.cpp:90
+#: src/net/tmwa/gui/partytab.cpp:90
 msgid "Command: /item"
 msgstr "Commande : /item"
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/tmwa/gui/partytab.cpp:91
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 "Cette commande affiche les préférences actuelles du groupe sur le partage "
 "d'objet."
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/tmwa/gui/partytab.cpp:95
 msgid "Command: /exp <policy>"
 msgstr "Commande : /exp <policy>"
 
-#: src/net/ea/gui/partytab.cpp:96
+#: src/net/tmwa/gui/partytab.cpp:96
 msgid "This command changes the party's experience sharing policy."
 msgstr ""
 "Cette commande change les préférences du groupe sur le partage d'expérience."
 
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/tmwa/gui/partytab.cpp:97
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
@@ -2817,105 +3231,92 @@ msgstr ""
 "<préférences> peut être \"1\", \"yes\", \"true\" pour activer le partage "
 "d'expérience, ou \"0\", \"no\", \"false\" pour le désactiver."
 
-#: src/net/ea/gui/partytab.cpp:100
+#: src/net/tmwa/gui/partytab.cpp:100
 msgid "Command: /exp"
 msgstr "Commande : /exp"
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/tmwa/gui/partytab.cpp:101
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 "Cette commande affiche les préférences actuelles du groupe sur le partage "
 "d'expérience."
 
-#: src/net/ea/gui/partytab.cpp:132 src/net/ea/partyhandler.cpp:198
+#: src/net/tmwa/gui/partytab.cpp:132 src/net/tmwa/partyhandler.cpp:196
 msgid "Item sharing enabled."
 msgstr "Partage d'objet activé."
 
-#: src/net/ea/gui/partytab.cpp:135 src/net/ea/partyhandler.cpp:204
+#: src/net/tmwa/gui/partytab.cpp:135 src/net/tmwa/partyhandler.cpp:202
 msgid "Item sharing disabled."
 msgstr "Partage d'objet desactivé."
 
-#: src/net/ea/gui/partytab.cpp:138 src/net/ea/partyhandler.cpp:210
+#: src/net/tmwa/gui/partytab.cpp:138 src/net/tmwa/partyhandler.cpp:208
 msgid "Item sharing not possible."
 msgstr "Partage d'objet impossible."
 
-#: src/net/ea/gui/partytab.cpp:141
+#: src/net/tmwa/gui/partytab.cpp:141
 #, fuzzy
 msgid "Item sharing unknown."
 msgstr "Partage d'objet activé."
 
-#: src/net/ea/gui/partytab.cpp:167 src/net/ea/partyhandler.cpp:174
+#: src/net/tmwa/gui/partytab.cpp:167 src/net/tmwa/partyhandler.cpp:172
 msgid "Experience sharing enabled."
 msgstr "Partage d'expérience authorisé."
 
-#: src/net/ea/gui/partytab.cpp:170 src/net/ea/partyhandler.cpp:180
+#: src/net/tmwa/gui/partytab.cpp:170 src/net/tmwa/partyhandler.cpp:178
 msgid "Experience sharing disabled."
 msgstr "Partage d'expérience non authorisé."
 
-#: src/net/ea/gui/partytab.cpp:173 src/net/ea/partyhandler.cpp:186
+#: src/net/tmwa/gui/partytab.cpp:173 src/net/tmwa/partyhandler.cpp:184
 msgid "Experience sharing not possible."
 msgstr "Partage d'expérience impossible."
 
-#: src/net/ea/gui/partytab.cpp:176
+#: src/net/tmwa/gui/partytab.cpp:176
 #, fuzzy
 msgid "Experience sharing unknown."
 msgstr "Partage d'expérience authorisé."
 
-#: src/net/ea/inventoryhandler.cpp:281
+#: src/net/tmwa/inventoryhandler.cpp:285
 msgid "Failed to use item."
 msgstr "Impossible d'utiliser l'objet."
 
-#: src/net/ea/inventoryhandler.cpp:391
+#: src/net/tmwa/inventoryhandler.cpp:399
 msgid "Unable to equip."
 msgstr "Impossible d'équiper cet objet."
 
-#: src/net/ea/inventoryhandler.cpp:402
+#: src/net/tmwa/inventoryhandler.cpp:410
 msgid "Unable to unequip."
 msgstr "Impossible de deséquiper cet objet."
 
-#: src/net/ea/loginhandler.cpp:79
+#: src/net/tmwa/loginhandler.cpp:86
 msgid "Account was not found. Please re-login."
 msgstr "Le compte n'a pas été trouvé. Reconnectez vous svp."
 
-#: src/net/ea/loginhandler.cpp:82 src/net/manaserv/loginhandler.cpp:121
-#, fuzzy
-msgid "Old password incorrect."
-msgstr "Ancien mot de passe incorrect"
-
-#: src/net/ea/loginhandler.cpp:85
+#: src/net/tmwa/loginhandler.cpp:92
 #, fuzzy
 msgid "New password too short."
 msgstr "Nouveau mot de passe trop court"
 
-#: src/net/ea/loginhandler.cpp:88 src/net/ea/loginhandler.cpp:175
-#: src/net/manaserv/charhandler.cpp:158 src/net/manaserv/loginhandler.cpp:96
-#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
-#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
-#, fuzzy
-msgid "Unknown error."
-msgstr "Erreur inconnue"
-
-#: src/net/ea/loginhandler.cpp:149
+#: src/net/tmwa/loginhandler.cpp:156
 #, fuzzy
 msgid "Unregistered ID."
 msgstr "ID non enregistrée"
 
-#: src/net/ea/loginhandler.cpp:152
+#: src/net/tmwa/loginhandler.cpp:159
 #, fuzzy
 msgid "Wrong password."
 msgstr "Mauvais mot de passe"
 
-#: src/net/ea/loginhandler.cpp:155
+#: src/net/tmwa/loginhandler.cpp:162
 #, fuzzy
 msgid "Account expired."
 msgstr "Compte expiré"
 
-#: src/net/ea/loginhandler.cpp:158
+#: src/net/tmwa/loginhandler.cpp:165
 #, fuzzy
 msgid "Rejected from server."
 msgstr "Rejeté par le server"
 
-#: src/net/ea/loginhandler.cpp:161
+#: src/net/tmwa/loginhandler.cpp:168
 #, fuzzy
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
@@ -2923,7 +3324,7 @@ msgstr ""
 "Vous avez été banni de façon permanente du jeu. Merci de vous mettre en "
 "contact avec l'équipe des MJ."
 
-#: src/net/ea/loginhandler.cpp:165
+#: src/net/tmwa/loginhandler.cpp:172
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -2932,192 +3333,128 @@ msgstr ""
 "Vous avez été banni temporairement du jeu depuis %s.\n"
 "Merci de contacter un MJ par le forum."
 
-#: src/net/ea/loginhandler.cpp:172
+#: src/net/tmwa/loginhandler.cpp:179
 #, fuzzy
 msgid "This user name is already taken."
 msgstr "Ce nom d'utilisateur est déjà utilisé"
 
-#: src/net/ea/network.cpp:145
+#: src/net/tmwa/network.cpp:145
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/ea/network.cpp:345
+#: src/net/tmwa/network.cpp:345
 #, fuzzy
 msgid "Unable to resolve host \""
 msgstr "Impossible de vendre."
 
-#: src/net/ea/network.cpp:414
+#: src/net/tmwa/network.cpp:414
 #, fuzzy
 msgid "Connection to server terminated. "
 msgstr "Connexion au serveur de cartes..."
 
-#: src/net/ea/partyhandler.cpp:81
+#: src/net/tmwa/partyhandler.cpp:82
 msgid "Could not create party."
 msgstr "Le groupe n'a pu être créé."
 
-#: src/net/ea/partyhandler.cpp:84
+#: src/net/tmwa/partyhandler.cpp:84
 msgid "Party successfully created."
 msgstr "Création du groupe réussie."
 
-#: src/net/ea/partyhandler.cpp:118
+#: src/net/tmwa/partyhandler.cpp:119
 #, c-format
 msgid "%s is already a member of a party."
 msgstr "%s est déjà membre du groupe."
 
-#: src/net/ea/partyhandler.cpp:122
+#: src/net/tmwa/partyhandler.cpp:123
 #, c-format
 msgid "%s refused your invitation."
 msgstr "%s a refusé votre invitation."
 
-#: src/net/ea/partyhandler.cpp:126
+#: src/net/tmwa/partyhandler.cpp:127
 #, c-format
 msgid "%s is now a member of your party."
 msgstr "%s est maintenant membre de votre groupe."
 
-#: src/net/ea/partyhandler.cpp:130
+#: src/net/tmwa/partyhandler.cpp:131
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr "Réponse d'invitation de %s inconnue."
 
-#: src/net/ea/partyhandler.cpp:238
+#: src/net/tmwa/partyhandler.cpp:236
 msgid "You have left the party."
 msgstr "vous avez quitté le groupe."
 
-#: src/net/ea/partyhandler.cpp:249
+#: src/net/tmwa/partyhandler.cpp:246
 #, c-format
 msgid "%s has left your party."
 msgstr "%s a quitté le groupe."
 
-#: src/net/ea/partyhandler.cpp:301
+#: src/net/tmwa/partyhandler.cpp:299
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr "Un membre inconnu a essayé de dire : %s"
 
-#: src/net/ea/partyhandler.cpp:329
-msgid "Inviting like this isn't supported at the moment."
-msgstr "Cette manière d'inviter n'est pas en place actuellement."
+#: src/net/tmwa/partyhandler.cpp:335
+#, c-format
+msgid "Inviting failed, because you can't see a player called %s."
+msgstr ""
 
-#: src/net/ea/partyhandler.cpp:334
+#: src/net/tmwa/partyhandler.cpp:340
 msgid "You can only inivte when you are in a party!"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:365
+#: src/net/tmwa/partyhandler.cpp:368
 #, c-format
 msgid "%s is not in your party!"
 msgstr "%s n'est pas membre de votre groupe !"
 
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:304
-msgid "You are dead."
-msgstr "Vous êtes mort."
-
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:305
-msgid "We regret to inform you that your character was killed in battle."
-msgstr ""
-"Nous avons le regret de vous informer que votre personnage est mort sur le "
-"champ de bataille."
-
-#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:307
-msgid "You are not that alive anymore."
-msgstr "Vous n'êtes plus vraiment en vie."
-
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:308
-msgid "The cold hands of the grim reaper are grabbing for your soul."
-msgstr "Les mains gelées de la faucheuse viennent réclamer votre âme."
-
-#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:309
-msgid "Game Over!"
-msgstr "Fin de la partie !"
-
-#: src/net/ea/playerhandler.cpp:105
+#: src/net/tmwa/playerhandler.cpp:100
 msgid "Insert coin to continue."
 msgstr "veuillez insérer une pièce pour continuer."
 
-#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:310
-msgid ""
-"No, kids. Your character did not really die. It... err... went to a better "
-"place."
-msgstr ""
-"Non, les  enfants. Ton personnage n'est pas vraiment mort... Il... enfin,.. "
-"il... est parti dans un monde meilleur."
-
-#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:312
-msgid ""
-"Your plan of breaking your enemies weapon by bashing it with your throat "
-"failed."
-msgstr ""
-"Votre tentative de casser l'arme de votre ennemi en la frappant avec votre "
-"gorge a échoué."
-
-#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:314
-msgid "I guess this did not run too well."
-msgstr "J'ai la sensation que cela ne s'est pas aussi bien passé que prévu."
-
-#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:315
-msgid "Do you want your possessions identified?"
-msgstr "Voulez-vous que vos biens soient identifiés ?"
-
-#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:316
-msgid "Sadly, no trace of you was ever found..."
-msgstr "Tristement, aucune trace de vous ne fut jamais retrouvée..."
-
-#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:317
-msgid "Annihilated."
-msgstr "Vaporisé."
-
-#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:318
-msgid "Looks like you got your head handed to you."
-msgstr "Il semble que l'on vous ait rendu votre tête."
-
-#: src/net/ea/playerhandler.cpp:120 src/net/manaserv/beinghandler.cpp:319
-msgid ""
-"You screwed up again, dump your body down the tubes and get you another one."
-msgstr ""
-"Vous avez encore échoué, jetez votre corps aux oubliettes et prenez en un "
-"autre."
-
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/tmwa/playerhandler.cpp:118
 msgid "You're not dead yet. You're just resting."
 msgstr "Vous n'êtes pas encore mort. Vous vous reposez seulement."
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/tmwa/playerhandler.cpp:119
 msgid "You are no more."
 msgstr "Vous n'existez plus."
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/tmwa/playerhandler.cpp:120
 msgid "You have ceased to be."
 msgstr "Vous avez cessez d'exister."
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/tmwa/playerhandler.cpp:121
 msgid "You've expired and gone to meet your maker."
 msgstr "Tu es fini. Tu es parti retrouver ton créateur."
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/tmwa/playerhandler.cpp:122
 msgid "You're a stiff."
 msgstr "Tu es un dur."
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/tmwa/playerhandler.cpp:123
 msgid "Bereft of life, you rest in peace."
 msgstr "Privé de toute essence de vie, vous reposez en paix."
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/tmwa/playerhandler.cpp:124
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 "Si tu n'étais pas autant en forme, tu serais en train de manger les "
 "pissenlits par la racine."
 
-#: src/net/ea/playerhandler.cpp:130
+#: src/net/tmwa/playerhandler.cpp:125
 msgid "Your metabolic processes are now history."
 msgstr "Vos processus métaboliques appartiennent au passé maintenant."
 
-#: src/net/ea/playerhandler.cpp:131
+#: src/net/tmwa/playerhandler.cpp:126
 msgid "You're off the twig."
 msgstr "Tu es en dehors des clous"
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/tmwa/playerhandler.cpp:127
 msgid "You've kicked the bucket."
 msgstr "Tu viens de toucher le fond."
 
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/tmwa/playerhandler.cpp:128
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
@@ -3125,487 +3462,249 @@ msgstr ""
 "Vous êtes sorti de votre enveloppe charnelle et mortelle. Vous avez rejoint "
 "l'armée de l'ombre."
 
-#: src/net/ea/playerhandler.cpp:135
+#: src/net/tmwa/playerhandler.cpp:130
 msgid "You are an ex-player."
 msgstr "Tu n'es plus qu'un ancien joueur sans intérêt."
 
-#: src/net/ea/playerhandler.cpp:136
+#: src/net/tmwa/playerhandler.cpp:131
 msgid "You're pining for the fjords."
 msgstr "Tu reposes au fond de l'eau."
 
-#: src/net/ea/playerhandler.cpp:249 src/net/ea/playerhandler.cpp:310
+#: src/net/tmwa/playerhandler.cpp:246 src/net/tmwa/playerhandler.cpp:285
 msgid "Message"
 msgstr "Message"
 
-#: src/net/ea/playerhandler.cpp:250
+#: src/net/tmwa/playerhandler.cpp:247
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 "Vous portez plus de la moitié du poids de votre inventaire. Vous n'êtes plus "
 "en mesure de regagner vos points de vie."
 
-#: src/net/ea/playerhandler.cpp:333
+#: src/net/tmwa/playerhandler.cpp:313
 #, fuzzy, c-format
 msgid "You picked up %s."
 msgstr "Vous avez ramassé "
 
-#: src/net/ea/playerhandler.cpp:369
+#: src/net/tmwa/playerhandler.cpp:348
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:532
+#: src/net/tmwa/playerhandler.cpp:488
 msgid "Equip arrows first."
 msgstr "Equiper en premier les flèches"
 
-#: src/net/ea/specialhandler.cpp:147
+#: src/net/tmwa/specialhandler.cpp:144
 msgid "Trade failed!"
 msgstr "Echange non réalisé !"
 
-#: src/net/ea/specialhandler.cpp:150
+#: src/net/tmwa/specialhandler.cpp:147
 msgid "Emote failed!"
 msgstr "Emote non realisé !"
 
-#: src/net/ea/specialhandler.cpp:153
+#: src/net/tmwa/specialhandler.cpp:150
 msgid "Sit failed!"
 msgstr "Vous n'avez pas pu vous assoir !"
 
-#: src/net/ea/specialhandler.cpp:156
+#: src/net/tmwa/specialhandler.cpp:153
 msgid "Chat creating failed!"
 msgstr "Vous n'avez pas pu créer la conversation !"
 
-#: src/net/ea/specialhandler.cpp:159
+#: src/net/tmwa/specialhandler.cpp:156
 msgid "Could not join party!"
 msgstr "Vous n'avez pas pu rejoindre le groupe !"
 
-#: src/net/ea/specialhandler.cpp:162
+#: src/net/tmwa/specialhandler.cpp:159
 msgid "Cannot shout!"
 msgstr "Vous ne pouvez pas crier !"
 
-#: src/net/ea/specialhandler.cpp:171
+#: src/net/tmwa/specialhandler.cpp:168
 msgid "You have not yet reached a high enough lvl!"
 msgstr "Vous n'avez pas encore atteind le niveau requis !"
 
-#: src/net/ea/specialhandler.cpp:174
+#: src/net/tmwa/specialhandler.cpp:171
 msgid "Insufficient HP!"
 msgstr "Pas assez de vie !"
 
-#: src/net/ea/specialhandler.cpp:177
+#: src/net/tmwa/specialhandler.cpp:174
 msgid "Insufficient SP!"
 msgstr "PV insuffisant !"
 
-#: src/net/ea/specialhandler.cpp:180
+#: src/net/tmwa/specialhandler.cpp:177
 msgid "You have no memos!"
 msgstr "Vous n'avez pas de messages !"
 
-#: src/net/ea/specialhandler.cpp:183
+#: src/net/tmwa/specialhandler.cpp:180
 msgid "You cannot do that right now!"
 msgstr "Vous ne pouvez faire cela maintenant !"
 
-#: src/net/ea/specialhandler.cpp:186
+#: src/net/tmwa/specialhandler.cpp:183
 msgid "Seems you need more money... ;-)"
 msgstr "Il semblerait que vous ayez besoin de plus d'argent... ;)"
 
-#: src/net/ea/specialhandler.cpp:189
+#: src/net/tmwa/specialhandler.cpp:186
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Vous ne pouvez utiliser ce pouvoir avec ce type d'arme !"
 
-#: src/net/ea/specialhandler.cpp:192
+#: src/net/tmwa/specialhandler.cpp:189
 msgid "You need another red gem!"
 msgstr "Vous avez besoin d'une autre pierre précieuse rouge !"
 
-#: src/net/ea/specialhandler.cpp:195
+#: src/net/tmwa/specialhandler.cpp:192
 msgid "You need another blue gem!"
 msgstr "Vous avez besoin d'une autre pierre précieuse bleue !"
 
-#: src/net/ea/specialhandler.cpp:198
+#: src/net/tmwa/specialhandler.cpp:195
 msgid "You're carrying to much to do this!"
 msgstr "Vous portez trop de choses pour pouvoir faire cela !"
 
-#: src/net/ea/specialhandler.cpp:201
+#: src/net/tmwa/specialhandler.cpp:198
 msgid "Huh? What's that?"
 msgstr "Hé ? Qu'est-ce donc que cela ?"
 
-#: src/net/ea/specialhandler.cpp:210
+#: src/net/tmwa/specialhandler.cpp:207
 msgid "Warp failed..."
 msgstr "Enchainement échoué..."
 
-#: src/net/ea/specialhandler.cpp:213
+#: src/net/tmwa/specialhandler.cpp:210
 msgid "Could not steal anything..."
 msgstr "Vous n'avez rien pu voler..."
 
-#: src/net/ea/specialhandler.cpp:216
+#: src/net/tmwa/specialhandler.cpp:213
 msgid "Poison had no effect..."
 msgstr "Le poison fut sans effet..."
 
-#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:116
-msgid "Request for Trade"
-msgstr "Demande d'échange"
-
-#: src/net/ea/tradehandler.cpp:108 src/net/manaserv/tradehandler.cpp:117
-#, c-format
-msgid "%s wants to trade with you, do you accept?"
-msgstr "%s souhaite réaliser un échange avec vous. Acceptez-vous ?"
-
-#: src/net/ea/tradehandler.cpp:124
+#: src/net/tmwa/tradehandler.cpp:126
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr "L'échange est impossible. Votre partenaire est trop éloigné."
 
-#: src/net/ea/tradehandler.cpp:128
+#: src/net/tmwa/tradehandler.cpp:130
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr "Echange impossible. Ce personnage n'existe pas."
 
-#: src/net/ea/tradehandler.cpp:132
+#: src/net/tmwa/tradehandler.cpp:134
 msgid "Trade cancelled due to an unknown reason."
 msgstr "Echange annulé pour une raison inconnue."
 
-#: src/net/ea/tradehandler.cpp:137
+#: src/net/tmwa/tradehandler.cpp:139
 #, c-format
 msgid "Trade: You and %s"
 msgstr "Echange : Vous et %s"
 
-#: src/net/ea/tradehandler.cpp:144
+#: src/net/tmwa/tradehandler.cpp:146
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr "Echange avec %s annulé."
 
-#: src/net/ea/tradehandler.cpp:153
+#: src/net/tmwa/tradehandler.cpp:154
 msgid "Unhandled trade cancel packet."
 msgstr "Echange non pris en compte."
 
-#: src/net/ea/tradehandler.cpp:202
+#: src/net/tmwa/tradehandler.cpp:202
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 "Impossible de rajouter un objet. Votre partenaire pour cet échange est "
 "surchargé."
 
-#: src/net/ea/tradehandler.cpp:207
+#: src/net/tmwa/tradehandler.cpp:207
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 "Impossible de rajouter un objet. Votre partenaire pour cet échange n'a plus "
 "de place libre."
 
-#: src/net/ea/tradehandler.cpp:211
+#: src/net/tmwa/tradehandler.cpp:211
 msgid "Failed adding item for unknown reason."
 msgstr "Impossible de rajouter un objet pour une raison inconnue."
 
-#: src/net/ea/tradehandler.cpp:224 src/net/manaserv/tradehandler.cpp:149
-msgid "Trade canceled."
-msgstr "Echange annulé."
-
-#: src/net/ea/tradehandler.cpp:231 src/net/manaserv/tradehandler.cpp:156
-msgid "Trade completed."
-msgstr "Echange finalisé."
-
-#: src/net/manaserv/beinghandler.cpp:324
-#, fuzzy
-msgid "Press OK to respawn."
-msgstr " Cliquer sur OK pour ressuciter"
-
-#: src/net/manaserv/beinghandler.cpp:325
-#, fuzzy
-msgid "You Died"
-msgstr "Vous êtes mort"
-
-#: src/net/manaserv/charhandler.cpp:128 src/net/manaserv/charhandler.cpp:196
-#, fuzzy
-msgid "Not logged in."
-msgstr "Déjà connecté"
-
-#: src/net/manaserv/charhandler.cpp:131
-msgid "No empty slot."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:134
-msgid "Invalid name."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:137
-#, fuzzy
-msgid "Character's name already exists."
-msgstr "Ce nom d'utilisateur existe déjà"
-
-#: src/net/manaserv/charhandler.cpp:140
-msgid "Invalid hairstyle."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:143
-msgid "Invalid hair color."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:146
-msgid "Invalid gender."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:149
+#: src/playerrelations.cpp:310
 #, fuzzy
-msgid "Character's stats are too high."
-msgstr "Caractéristiques du personnage Ok"
-
-#: src/net/manaserv/charhandler.cpp:152
-#, fuzzy
-msgid "Character's stats are too low."
-msgstr "Caractéristiques du personnage Ok"
+msgid "Completely ignore"
+msgstr "@@ignore|Complètement ignorer %s@@"
 
-#: src/net/manaserv/charhandler.cpp:155
-msgid "One stat is zero."
+#: src/playerrelations.cpp:324
+msgid "Print '...'"
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:187
-#, fuzzy
-msgid "Player deleted."
-msgstr "Personnage supprimé"
-
-#: src/net/manaserv/charhandler.cpp:199
-#, fuzzy
-msgid "Selection out of range."
-msgstr "Choisissez le nombre d'objets à troquer."
-
-#: src/net/manaserv/charhandler.cpp:202
-#, fuzzy, c-format
-msgid "Unknown error (%d)."
-msgstr "Erreur inconnue"
-
-#: src/net/manaserv/charhandler.cpp:242
-msgid "No gameservers are available."
-msgstr "Pas de serveur de jeu disponible."
-
-#: src/net/manaserv/charhandler.cpp:268
-msgid "Willpower:"
-msgstr "Volonté :"
-
-#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
-#: src/net/manaserv/guildhandler.cpp:259
-#, c-format
-msgid "Topic: %s"
-msgstr "Sujet : %s"
-
-#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
-#, fuzzy
-msgid "Players in this channel:"
-msgstr "Le joueur touche le monstre"
-
-#: src/net/manaserv/chathandler.cpp:201
-#, fuzzy
-msgid "Error joining channel."
-msgstr "Commande : /join <channel>"
-
-#: src/net/manaserv/chathandler.cpp:207
-#, fuzzy
-msgid "Listing channels."
-msgstr "Il vous est demandé de rejoindre le chan %s."
-
-#: src/net/manaserv/chathandler.cpp:219
-msgid "End of channel list."
+#: src/playerrelations.cpp:340
+msgid "Blink name"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:291
-#, fuzzy, c-format
-msgid "%s entered the channel."
-msgstr "%s a rejoind le groupe."
-
-#: src/net/manaserv/chathandler.cpp:296
+#: src/resources/itemdb.cpp:44
 #, c-format
-msgid "%s left the channel."
-msgstr ""
+msgid "Attack %+d"
+msgstr "Attaque %+d"
 
-#: src/net/manaserv/chathandler.cpp:312
+#: src/resources/itemdb.cpp:45
 #, c-format
-msgid "%s has set mode %s on user %s."
-msgstr ""
+msgid "Defense %+d"
+msgstr "Défense %+d"
 
-#: src/net/manaserv/chathandler.cpp:322
+#: src/resources/itemdb.cpp:46
 #, c-format
-msgid "%s has kicked %s."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:327
-#, fuzzy
-msgid "Unknown channel event."
-msgstr "Commande inconnue."
+msgid "HP %+d"
+msgstr "PV %+d"
 
-#: src/net/manaserv/generalhandler.cpp:100
+#: src/resources/itemdb.cpp:47
 #, c-format
-msgid "Willpower %+d"
-msgstr "Volonté %+d"
-
-#: src/net/manaserv/generalhandler.cpp:171
-#, fuzzy
-msgid "Willpower"
-msgstr "Volonté :"
-
-#: src/net/manaserv/guildhandler.cpp:81
-msgid "Guild created."
-msgstr "Guilde créée."
-
-#: src/net/manaserv/guildhandler.cpp:86
-msgid "Error creating guild."
-msgstr "Erreur lors de la création de la guilde."
-
-#: src/net/manaserv/guildhandler.cpp:96
-msgid "Invite sent."
-msgstr "Invitation envoyée."
-
-#: src/net/manaserv/guildhandler.cpp:203
-msgid "Member was promoted successfully."
-msgstr "La promotion de ce membre a réussie."
+msgid "MP %+d"
+msgstr "PM %+d"
 
-#: src/net/manaserv/guildhandler.cpp:208
-msgid "Failed to promote member."
-msgstr "Echec lors de la promotion du membre"
+#: src/resources/itemdb.cpp:92
+msgid "Unknown item"
+msgstr "Objet inconnu"
 
-#: src/net/manaserv/loginhandler.cpp:87
-#, fuzzy
-msgid "Wrong magic_token."
-msgstr "Mauvaise empreinte magique"
+#: src/resources/itemdb.cpp:135 src/resources/monsterdb.cpp:77
+msgid "unnamed"
+msgstr "anonyme"
 
-#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
 #, fuzzy
-msgid "Already logged in."
-msgstr "Déjà connecté"
+#~ msgid "HP"
+#~ msgstr "Vie :"
 
-#: src/net/manaserv/loginhandler.cpp:93 src/net/manaserv/loginhandler.cpp:272
 #, fuzzy
-msgid "Server is full."
-msgstr "Le serveur est plein"
+#~ msgid "MP"
+#~ msgstr "PM :"
 
-#: src/net/manaserv/loginhandler.cpp:118
 #, fuzzy
-msgid "New password incorrect."
-msgstr "Nouveau mot de passe incorrect"
-
-#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
-msgid "Account not connected. Please login first."
-msgstr "Compte non connecté. Identifiez-vous tout d'abord."
+#~ msgid "Exp"
+#~ msgstr "Exp :"
 
-#: src/net/manaserv/loginhandler.cpp:149
 #, fuzzy
-msgid "New email address incorrect."
-msgstr "Nouvelle adresse email incorrecte"
+#~ msgid "Money"
+#~ msgstr "Argent : %d"
 
-#: src/net/manaserv/loginhandler.cpp:152
 #, fuzzy
-msgid "Old email address incorrect."
-msgstr "Ancienne adresse email incorrecte"
+#~ msgid "Job"
+#~ msgstr "Habilité :"
 
-#: src/net/manaserv/loginhandler.cpp:158
 #, fuzzy
-msgid "The new email address already exists."
-msgstr "Cette nouvelle adresse email existe déjà."
-
-#: src/net/manaserv/loginhandler.cpp:239
-msgid ""
-"Client registration is not allowed. Please contact server administration."
-msgstr ""
+#~ msgid "Level"
+#~ msgstr "Niveau : %d"
 
-#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
 #, fuzzy
-msgid "Client version is too old."
-msgstr "La version de votre client est trop ancienne."
+#~ msgid "Access denied."
+#~ msgstr "Accès refusé"
 
-#: src/net/manaserv/loginhandler.cpp:266
 #, fuzzy
-msgid "Wrong username or password."
-msgstr "Mauvais nom d'utilisateur ou mot de passe."
+#~ msgid "Unknown failure to select character."
+#~ msgstr "Problème inconnu lors de la séléction du personnage"
 
-#: src/net/manaserv/loginhandler.cpp:275
-msgid "Login attempt too soon after previous attempt."
-msgstr ""
+#~ msgid "Inviting like this isn't supported at the moment."
+#~ msgstr "Cette manière d'inviter n'est pas en place actuellement."
 
-#: src/net/manaserv/loginhandler.cpp:303
-#, fuzzy
-msgid "Wrong username, password or email address."
-msgstr "Mauvais nom d'utilisateur, mot de passe ou adrese email."
+#~ msgid "Willpower:"
+#~ msgstr "Volonté :"
 
-#: src/net/manaserv/loginhandler.cpp:306
-#, fuzzy
-msgid "Username already exists."
-msgstr "Ce nom d'utilisateur existe déjà"
+#~ msgid "Willpower %+d"
+#~ msgstr "Volonté %+d"
 
-#: src/net/manaserv/loginhandler.cpp:309
 #, fuzzy
-msgid "Email address already exists."
-msgstr "Cette adresse email existe déjà"
+#~ msgid "Willpower"
+#~ msgstr "Volonté :"
 
-#: src/net/manaserv/loginhandler.cpp:312
-msgid "You took too long with the captcha or your response was incorrect."
-msgstr ""
-
-#: src/net/manaserv/partyhandler.cpp:88
-msgid "Joined party."
-msgstr "Groupe rejoind."
-
-#: src/net/manaserv/partyhandler.cpp:106
-#, c-format
-msgid "%s joined the party."
-msgstr "%s a rejoind le groupe."
-
-#: src/net/manaserv/partyhandler.cpp:123
-#, fuzzy, c-format
-msgid "%s rejected your invite."
-msgstr "%s a refusé votre invitation."
-
-#: src/net/manaserv/tradehandler.cpp:96
-msgid "Accepting incoming trade requests."
-msgstr "Accepter les demandes d'échanges."
-
-#: src/net/manaserv/tradehandler.cpp:98
-msgid "Ignoring incoming trade requests."
-msgstr "Ignorer les demandes d'échanges."
-
-#: src/net/manaserv/tradehandler.cpp:135
-#, c-format
-msgid "Trading with %s"
-msgstr "Echange avec %s"
-
-#: src/playerrelations.cpp:304
 #, fuzzy
-msgid "Completely ignore"
-msgstr "@@ignore|Complètement ignorer %s@@"
-
-#: src/playerrelations.cpp:318
-msgid "Print '...'"
-msgstr ""
-
-#: src/playerrelations.cpp:334
-msgid "Blink name"
-msgstr ""
-
-#: src/playerrelations.cpp:371
-msgid "Floating '...' bubble"
-msgstr ""
-
-#: src/playerrelations.cpp:374
-msgid "Floating bubble"
-msgstr ""
-
-#: src/resources/itemdb.cpp:52
-#, c-format
-msgid "Attack %+d"
-msgstr "Attaque %+d"
-
-#: src/resources/itemdb.cpp:53
-#, c-format
-msgid "Defense %+d"
-msgstr "Défense %+d"
-
-#: src/resources/itemdb.cpp:54
-#, c-format
-msgid "HP %+d"
-msgstr "PV %+d"
-
-#: src/resources/itemdb.cpp:55
-#, c-format
-msgid "MP %+d"
-msgstr "PM %+d"
-
-#: src/resources/itemdb.cpp:114
-msgid "Unknown item"
-msgstr "Objet inconnu"
-
-#: src/resources/itemdb.cpp:158 src/resources/monsterdb.cpp:45
-#: src/resources/monsterdb.cpp:69
-msgid "unnamed"
-msgstr "anonyme"
+#~ msgid "Server is full."
+#~ msgstr "Le serveur est plein"
 
 #~ msgid "Text Shadow"
 #~ msgstr "Ombre du texte"
diff --git a/po/he.po b/po/he.po
index 9d671e82..c4d183d8 100644
--- a/po/he.po
+++ b/po/he.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2010-03-05 21:52+0100\n"
+"POT-Creation-Date: 2010-12-13 20:04+0100\n"
 "PO-Revision-Date: 2010-01-09 11:27+0000\n"
 "Last-Translator: hewhohasalongname <Unknown>\n"
 "Language-Team: Hebrew <he@li.org>\n"
+"Language: he\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,315 +19,321 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/client.cpp:553 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:62
+#: src/client.cpp:598 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
 msgid "Setup"
 msgstr "הגדרות"
 
-#: src/client.cpp:623
+#: src/client.cpp:679
 #, fuzzy
 msgid "Connecting to server"
 msgstr "מתחבר לשרת המפה..."
 
-#: src/client.cpp:650
+#: src/client.cpp:706
 #, fuzzy
 msgid "Logging in"
 msgstr "התחברות"
 
-#: src/client.cpp:683
+#: src/client.cpp:739
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:739
+#: src/client.cpp:804
 #, fuzzy
 msgid "Requesting characters"
 msgstr "בחר שחקן"
 
-#: src/client.cpp:768
+#: src/client.cpp:833
 #, fuzzy
 msgid "Connecting to the game server"
 msgstr "מתחבר לשרת המפה..."
 
-#: src/client.cpp:799 src/client.cpp:806 src/client.cpp:940
+#: src/client.cpp:843
+#, fuzzy
+msgid "Changing game servers"
+msgstr "שרת"
+
+#: src/client.cpp:872 src/client.cpp:879 src/client.cpp:1014
 #: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
 #: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
-#: src/gui/serverdialog.cpp:261 src/gui/unregisterdialog.cpp:133
-#: src/net/ea/charserverhandler.cpp:135 src/net/ea/charserverhandler.cpp:152
-#: src/net/manaserv/charhandler.cpp:161 src/net/manaserv/charhandler.cpp:204
+#: src/gui/serverdialog.cpp:323 src/gui/unregisterdialog.cpp:133
+#: src/net/manaserv/charhandler.cpp:174 src/net/manaserv/charhandler.cpp:217
+#: src/net/tmwa/charserverhandler.cpp:134
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Error"
 msgstr "שגיאה"
 
-#: src/client.cpp:815
+#: src/client.cpp:888
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:842
+#: src/client.cpp:915
 #, fuzzy
 msgid "Password Change"
 msgstr "סיסמה:"
 
-#: src/client.cpp:843
+#: src/client.cpp:916
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:862
+#: src/client.cpp:935
 #, fuzzy
 msgid "Email Change"
 msgstr "שנה"
 
-#: src/client.cpp:863
+#: src/client.cpp:936
 #, fuzzy
 msgid "Email changed successfully!"
 msgstr "החבר קודם בהצלחה."
 
-#: src/client.cpp:883
+#: src/client.cpp:956
 #, fuzzy
 msgid "Unregister Successful"
 msgstr "בטל רישום"
 
-#: src/client.cpp:884
+#: src/client.cpp:957
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1007 src/client.cpp:1030
+#: src/client.cpp:1138 src/client.cpp:1161
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1119
+#: src/client.cpp:1281
 #, fuzzy, c-format
 msgid "Invalid update host: %s"
 msgstr "שרת עדכון פגום: "
 
-#: src/client.cpp:1153 src/client.cpp:1159
+#: src/client.cpp:1315 src/client.cpp:1321
 msgid "Error creating updates directory!"
 msgstr "שגיאה ביצירת ספריית העדכונים!"
 
-#: src/commandhandler.cpp:127 src/commandhandler.cpp:308
+#: src/commandhandler.cpp:131 src/commandhandler.cpp:317
 msgid "Unknown command."
 msgstr "פקודה לא מוכרת."
 
-#: src/commandhandler.cpp:156
+#: src/commandhandler.cpp:160
 msgid "-- Help --"
 msgstr "-- עזרה --"
 
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:161
 msgid "/help > Display this help"
 msgstr "הצג תפריט עזרה זה <help/"
 
-#: src/commandhandler.cpp:159
+#: src/commandhandler.cpp:163
 msgid "/where > Display map name"
 msgstr "הצג את שם המפה <where/"
 
-#: src/commandhandler.cpp:160
+#: src/commandhandler.cpp:164
 msgid "/who > Display number of online users"
 msgstr "הצג את כמות המשתמשים המחוברים <who/"
 
-#: src/commandhandler.cpp:161
+#: src/commandhandler.cpp:165
 msgid "/me > Tell something about yourself"
 msgstr "ספר על עצמך <me/"
 
-#: src/commandhandler.cpp:163
+#: src/commandhandler.cpp:167
 msgid "/clear > Clears this window"
 msgstr "נקה את החלון <clear/"
 
-#: src/commandhandler.cpp:165
+#: src/commandhandler.cpp:169
 msgid "/msg > Send a private message to a user"
 msgstr "שלח הודעה פרטית למשתמש < msg/"
 
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:170
 msgid "/whisper > Alias of msg"
 msgstr "נמען ההודעה < whisper/"
 
-#: src/commandhandler.cpp:167
+#: src/commandhandler.cpp:171
 msgid "/w > Alias of msg"
 msgstr "נמען ההודעה  <w/"
 
-#: src/commandhandler.cpp:168
+#: src/commandhandler.cpp:172
 msgid "/query > Makes a tab for private messages with another user"
 msgstr "/query > יוצר לשונית עבור הודעות פרטיות עם משתמש אחר"
 
-#: src/commandhandler.cpp:169
+#: src/commandhandler.cpp:174
 msgid "/q > Alias of query"
 msgstr "/q > שם נוסף ל-query"
 
-#: src/commandhandler.cpp:171
+#: src/commandhandler.cpp:176
 msgid "/ignore > ignore a player"
 msgstr ""
 
-#: src/commandhandler.cpp:172
+#: src/commandhandler.cpp:177
 msgid "/unignore > stop ignoring a player"
 msgstr ""
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:179
 msgid "/list > Display all public channels"
 msgstr "/list > הצג את כל החדרים הציבוריים"
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:180
 msgid "/join > Join or create a channel"
 msgstr "/join > צור או הצטרף לחדר"
 
-#: src/commandhandler.cpp:177
+#: src/commandhandler.cpp:182
 #, fuzzy
 msgid "/createparty > Create a new party"
 msgstr "/create > צור חבורה חדשה"
 
-#: src/commandhandler.cpp:178
+#: src/commandhandler.cpp:183
 msgid "/party > Invite a user to party"
 msgstr "/party > הזמן משתמש לחבורה"
 
-#: src/commandhandler.cpp:180
+#: src/commandhandler.cpp:185
 msgid "/record > Start recording the chat to an external file"
 msgstr "/record > התחל להקליט את השיחה לקובץ חיצוני"
 
-#: src/commandhandler.cpp:181
+#: src/commandhandler.cpp:187
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr "/toggle > קובע אם <אנטר> סוגר את תיבת הטקסט של הצ'אט"
 
-#: src/commandhandler.cpp:182
+#: src/commandhandler.cpp:189
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr "/present > קבל את רשימת הנמצאים (ישלח לרישום, אם פעיל)"
 
-#: src/commandhandler.cpp:184
+#: src/commandhandler.cpp:192
 msgid "/announce > Global announcement (GM only)"
 msgstr "/announce > הודעה גלובאלית (GM בלבד)"
 
-#: src/commandhandler.cpp:188
+#: src/commandhandler.cpp:196
 msgid "For more information, type /help <command>."
 msgstr "למידע נוסף, הקלד /help <command>."
 
-#: src/commandhandler.cpp:192
+#: src/commandhandler.cpp:200
 msgid "Command: /help"
 msgstr "פקודה: /help"
 
-#: src/commandhandler.cpp:193
+#: src/commandhandler.cpp:201
 msgid "This command displays a list of all commands available."
 msgstr "פקודה זו מציגה רשימה של כל הפקודות האפשריות."
 
-#: src/commandhandler.cpp:194
+#: src/commandhandler.cpp:203
 msgid "Command: /help <command>"
 msgstr "פקודה: /help <command>"
 
-#: src/commandhandler.cpp:195
+#: src/commandhandler.cpp:204
 msgid "This command displays help on <command>."
 msgstr "פקודה זו מציגה עזרה על <command>."
 
-#: src/commandhandler.cpp:203
+#: src/commandhandler.cpp:212
 msgid "Command: /announce <msg>"
 msgstr "פקודה: /announce <msg>"
 
-#: src/commandhandler.cpp:204
+#: src/commandhandler.cpp:213
 msgid "*** only available to a GM ***"
 msgstr "*** זמין ל-GM בלבד ***"
 
-#: src/commandhandler.cpp:205
+#: src/commandhandler.cpp:214
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 "This command sends the message <msg> to all players currently online.\r\n"
 "פקודה זו שולחת את ההודעה <msg> לכל השחקנים המחוברים."
 
-#: src/commandhandler.cpp:210
+#: src/commandhandler.cpp:219
 msgid "Command: /clear"
 msgstr "פקודה: /clear"
 
-#: src/commandhandler.cpp:211
+#: src/commandhandler.cpp:220
 msgid "This command clears the chat log of previous chat."
 msgstr "פקודה זו מנקה את רישום השיחה הקודמת."
 
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:224
 #, fuzzy
 msgid "Command: /ignore <player>"
 msgstr "פקודה: /item <policy>"
 
-#: src/commandhandler.cpp:216
+#: src/commandhandler.cpp:225
 #, fuzzy
 msgid "This command ignores the given player regardless of current relations."
 msgstr "פקודה זו מציגה את מספר השחקנים המחוברים כרגע."
 
-#: src/commandhandler.cpp:221
+#: src/commandhandler.cpp:230
 msgid "Command: /join <channel>"
 msgstr "פקודה: /join <channel>"
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:231
 msgid "This command makes you enter <channel>."
 msgstr "פקודה זו מכניסה אותך אל <channel>."
 
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:232
 msgid "If <channel> doesn't exist, it's created."
 msgstr "אם <channel> אינו קיים, הוא נוצר."
 
-#: src/commandhandler.cpp:227
+#: src/commandhandler.cpp:236
 msgid "Command: /list"
 msgstr "פקודה: /list"
 
-#: src/commandhandler.cpp:228
+#: src/commandhandler.cpp:237
 msgid "This command shows a list of all channels."
 msgstr "פקודה זו מציגה את רשימת כל החדרים."
 
-#: src/commandhandler.cpp:232
+#: src/commandhandler.cpp:241
 msgid "Command: /me <message>"
 msgstr "פקודה: /me <message>"
 
-#: src/commandhandler.cpp:233
+#: src/commandhandler.cpp:242
 msgid "This command tell others you are (doing) <msg>."
 msgstr "פקודה זו תאמר לאחרים שאתה (עושה) <msg>."
 
-#: src/commandhandler.cpp:237
+#: src/commandhandler.cpp:246
 msgid "Command: /msg <nick> <message>"
 msgstr "פקודה: /msg <nick> <message>"
 
-#: src/commandhandler.cpp:238
+#: src/commandhandler.cpp:247
 msgid "Command: /whisper <nick> <message>"
 msgstr "פקודה: /whisper <nick> <message>"
 
-#: src/commandhandler.cpp:239
+#: src/commandhandler.cpp:248
 msgid "Command: /w <nick> <message>"
 msgstr "פקודה: /w <nick> <message>"
 
-#: src/commandhandler.cpp:240
+#: src/commandhandler.cpp:249
 msgid "This command sends the text <message> to <nick>."
 msgstr "פקודה זו שולחת את הטקסט <message> אל <nick>."
 
-#: src/commandhandler.cpp:241 src/commandhandler.cpp:260
+#: src/commandhandler.cpp:250 src/commandhandler.cpp:269
 #: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
-#: src/net/ea/gui/guildtab.cpp:75 src/net/ea/gui/partytab.cpp:75
+#: src/net/tmwa/gui/guildtab.cpp:75 src/net/tmwa/gui/partytab.cpp:75
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr "אם <nick> מכיל רווחים בתוכו, תחום אותו במרכאות כפולות (\")."
 
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:255
 msgid "Command: /query <nick>"
 msgstr "פקודה: /query <nick>"
 
-#: src/commandhandler.cpp:247
+#: src/commandhandler.cpp:256
 msgid "Command: /q <nick>"
 msgstr "פקודה: /q <nick>"
 
-#: src/commandhandler.cpp:248
+#: src/commandhandler.cpp:257
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr "הפקודה מנסה ליצור לשונית עבור מסרים בינך לבין <nick>."
 
-#: src/commandhandler.cpp:253
+#: src/commandhandler.cpp:262
 #, fuzzy
 msgid "Command: /createparty <name>"
 msgstr "פקודה: /create <party-name>"
 
-#: src/commandhandler.cpp:254
+#: src/commandhandler.cpp:263
 #, fuzzy
 msgid "This command creates a new party called <name>."
 msgstr "פקודות אלה יוצרות חבורה בשם <party-name>."
 
-#: src/commandhandler.cpp:258
+#: src/commandhandler.cpp:267
 msgid "Command: /party <nick>"
 msgstr "פקודה: /party <nick>"
 
-#: src/commandhandler.cpp:259 src/net/ea/gui/partytab.cpp:74
+#: src/commandhandler.cpp:268 src/net/tmwa/gui/partytab.cpp:74
 msgid "This command invites <nick> to party with you."
 msgstr "פקודה זו מזמינה את <nick> להיות בחבורתך."
 
-#: src/commandhandler.cpp:265
+#: src/commandhandler.cpp:274
 msgid "Command: /present"
 msgstr "פקודה: /present"
 
-#: src/commandhandler.cpp:266
+#: src/commandhandler.cpp:275
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
@@ -334,27 +341,27 @@ msgstr ""
 "פקודה זו מקבלת את רשימת המשתמשים המופיעים על המסך, ושולח אותה לרישום, אם "
 "הינך מקליט רישום, או אל השיחה."
 
-#: src/commandhandler.cpp:272
+#: src/commandhandler.cpp:281
 msgid "Command: /record <filename>"
 msgstr "פקודה: /record <filename>"
 
-#: src/commandhandler.cpp:273
+#: src/commandhandler.cpp:282
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr "פקודה זו מתחילה להקליט רישום שיחה לקובץ <filename>."
 
-#: src/commandhandler.cpp:275
+#: src/commandhandler.cpp:284
 msgid "Command: /record"
 msgstr "פקודה: /record"
 
-#: src/commandhandler.cpp:276
+#: src/commandhandler.cpp:285
 msgid "This command finishes a recording session."
 msgstr "פקודה זו מסיימת תהליך הקלטה."
 
-#: src/commandhandler.cpp:280
+#: src/commandhandler.cpp:289
 msgid "Command: /toggle <state>"
 msgstr "פקודה: /toggle <state>"
 
-#: src/commandhandler.cpp:281
+#: src/commandhandler.cpp:290
 msgid ""
 "This command sets whether the return key should toggle the chat log, or "
 "whether the chat log turns off automatically."
@@ -362,56 +369,56 @@ msgstr ""
 "הפקודה קובעת אם מקש האנטר יסגור את תיבת הטקסט של הצ'אט או שהוא ייסגר באופן "
 "אוטומטי."
 
-#: src/commandhandler.cpp:283
+#: src/commandhandler.cpp:292
 msgid ""
-"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
-"\", \"no\", \"false\" to turn the toggle off."
+"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
+"\"0\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 "<state> יכול להיות אחד משני משני מצבים. \"1\", \"yes\", \"ture\" כדי לשנות "
 "למצב פעיל, או \"0\", no\", falst\" כדי לשנות למצב כבוי."
 
-#: src/commandhandler.cpp:286
+#: src/commandhandler.cpp:295
 msgid "Command: /toggle"
 msgstr "פקודה: /toggle"
 
-#: src/commandhandler.cpp:287
+#: src/commandhandler.cpp:296
 msgid "This command displays the return toggle status."
 msgstr "הפקודה מציגה את מצב סגירת הטקסט האוטומטית."
 
-#: src/commandhandler.cpp:291 src/gui/widgets/whispertab.cpp:93
+#: src/commandhandler.cpp:300 src/gui/widgets/whispertab.cpp:95
 #, fuzzy
 msgid "Command: /unignore <player>"
 msgstr "פקודה: /item <policy>"
 
-#: src/commandhandler.cpp:292
+#: src/commandhandler.cpp:301
 msgid "This command stops ignoring the given player if they are being ignored"
 msgstr ""
 
-#: src/commandhandler.cpp:297
+#: src/commandhandler.cpp:306
 msgid "Command: /where"
 msgstr "פקודה: /where"
 
-#: src/commandhandler.cpp:298
+#: src/commandhandler.cpp:307
 msgid "This command displays the name of the current map."
 msgstr "פקודה זו מציגה את שם המפה הנוכחית."
 
-#: src/commandhandler.cpp:302
+#: src/commandhandler.cpp:311
 msgid "Command: /who"
 msgstr "פקודה: /who"
 
-#: src/commandhandler.cpp:303
+#: src/commandhandler.cpp:312
 msgid "This command displays the number of players currently online."
 msgstr "פקודה זו מציגה את מספר השחקנים המחוברים כרגע."
 
-#: src/commandhandler.cpp:309
+#: src/commandhandler.cpp:318
 msgid "Type /help for a list of commands."
 msgstr "הקלד /help לרשימת הפקודות."
 
-#: src/commandhandler.cpp:375
+#: src/commandhandler.cpp:384
 msgid "Cannot send empty whispers!"
 msgstr "לא ניתן לשלוח לחישות ריקות!"
 
-#: src/commandhandler.cpp:383
+#: src/commandhandler.cpp:392
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -420,59 +427,67 @@ msgstr ""
 "לא ניתן ליצור לשונית לחישות עבור הכינוי \"%s\"! הלשונית כבר קיימת או שמדובר "
 "בך."
 
-#: src/commandhandler.cpp:397
+#: src/commandhandler.cpp:406
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "מבקש להצטרף לחדר %s."
 
-#: src/commandhandler.cpp:410 src/net/ea/gui/partytab.cpp:109
+#: src/commandhandler.cpp:419 src/net/tmwa/gui/partytab.cpp:109
 msgid "Party name is missing."
 msgstr "שם חבורה חסר."
 
-#: src/commandhandler.cpp:423 src/commandhandler.cpp:471
-#: src/commandhandler.cpp:493
+#: src/commandhandler.cpp:432 src/commandhandler.cpp:509
+#: src/commandhandler.cpp:531
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:441
+#: src/commandhandler.cpp:450
 msgid "Return toggles chat."
 msgstr "סגירת תיבת הטקסט האוטומטית."
 
-#: src/commandhandler.cpp:441
+#: src/commandhandler.cpp:450
 msgid "Message closes chat."
 msgstr "ההודעה סוגרת את תיבת הטקסט."
 
-#: src/commandhandler.cpp:450
+#: src/commandhandler.cpp:459
 msgid "Return now toggles chat."
 msgstr "מקש האנטר כעת סוגר את תיבת הטקסט."
 
-#: src/commandhandler.cpp:454
+#: src/commandhandler.cpp:463
 msgid "Message now closes chat."
 msgstr "ההודעה כעת סוגרת את תיבת הטקסט."
 
-#: src/commandhandler.cpp:477
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:489
+msgid "Show IP: On"
+msgstr ""
+
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:485
+msgid "Show IP: Off"
+msgstr ""
+
+#: src/commandhandler.cpp:515
 msgid "Player already ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:484
+#: src/commandhandler.cpp:522
 #, fuzzy
 msgid "Player successfully ignored!"
 msgstr "חבורה נוצרה בהצלחה."
 
-#: src/commandhandler.cpp:486
+#: src/commandhandler.cpp:524
 #, fuzzy
 msgid "Player could not be ignored!"
 msgstr "הלחישה לא יכלה להשלח, מהמשתמש מתעלם."
 
-#: src/commandhandler.cpp:501
+#: src/commandhandler.cpp:539
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:506
+#: src/commandhandler.cpp:544
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:508
+#: src/commandhandler.cpp:546
 #, fuzzy
 msgid "Player could not be unignored!"
 msgstr "הלחישה לא יכלה להשלח, מהמשתמש מתעלם."
@@ -487,43 +502,43 @@ msgstr ""
 msgid "General"
 msgstr "כללי"
 
-#: src/game.cpp:326
+#: src/game.cpp:342
 #, fuzzy
 msgid "Screenshot saved as "
 msgstr "תמונת־מסך נשמרה במיקום ~/"
 
-#: src/game.cpp:331
+#: src/game.cpp:347
 msgid "Saving screenshot failed!"
 msgstr "שמירת תמונת־מסך נכשלה"
 
-#: src/game.cpp:355
+#: src/game.cpp:378
 #, fuzzy
 msgid "The connection to the server was lost."
 msgstr "החיבור לשרת נכשל, התוכנה תסגר כעת"
 
-#: src/game.cpp:360
+#: src/game.cpp:382
 msgid "Network Error"
 msgstr "שגיאת רשת"
 
-#: src/game.cpp:705
+#: src/game.cpp:721
 msgid "Ignoring incoming trade requests"
 msgstr "מתעלם מהצעות סחר נכנסות"
 
-#: src/game.cpp:712
+#: src/game.cpp:726
 msgid "Accepting incoming trade requests"
 msgstr "מאשר הצעות סחר נכנסות"
 
-#: src/game.cpp:946
+#: src/game.cpp:954
 #, fuzzy
 msgid "Could Not Load Map"
 msgstr "לא ניתן לטעון את המפה"
 
-#: src/game.cpp:947
+#: src/game.cpp:955
 #, c-format
 msgid "Error while loading %s"
 msgstr "שגיאה בעת טעינת %s"
 
-#: src/gui/beingpopup.cpp:75
+#: src/gui/beingpopup.cpp:76
 #, fuzzy, c-format
 msgid "Party: %s"
 msgstr "חבורה (%s)"
@@ -532,34 +547,34 @@ msgstr "חבורה (%s)"
 msgid "Buy"
 msgstr "קנה"
 
-#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
-#: src/gui/sell.cpp:276
+#: src/gui/buy.cpp:69 src/gui/buy.cpp:261 src/gui/sell.cpp:71
+#: src/gui/sell.cpp:288
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "מחיר: %s / סה\"כ: %s"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:99 src/gui/npcdialog.cpp:100
-#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:479
+#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:112 src/gui/npcdialog.cpp:124
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:463
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:98 src/gui/npcdialog.cpp:101
-#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:491
+#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:111 src/gui/npcdialog.cpp:125
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:475
 msgid "-"
 msgstr ""
 
 #: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
-#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:182
-#: src/keyboardconfig.cpp:103
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:228
+#: src/keyboardconfig.cpp:102
 msgid "Quit"
 msgstr "יציאה"
 
-#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:408
-#: src/gui/statuswindow.cpp:478 src/gui/statuswindow.cpp:512
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:384
+#: src/gui/statuswindow.cpp:462 src/gui/statuswindow.cpp:496
 msgid "Max"
 msgstr "מקסימום"
 
@@ -573,11 +588,11 @@ msgstr "מכר"
 
 #: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
 #: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
-#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:101
-#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:178
-#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:402
+#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:114
+#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:389
 #: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
-#: src/gui/socialwindow.cpp:242 src/gui/textdialog.cpp:39
+#: src/gui/socialwindow.cpp:275 src/gui/textdialog.cpp:40
 #: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr "בטל"
@@ -616,7 +631,7 @@ msgstr "כתובת הדוא\"ל החדשה כבר בשימוש."
 msgid "Change Password"
 msgstr "שנה סיסמה"
 
-#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:53
+#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:55
 #: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
 msgid "Password:"
 msgstr "סיסמה:"
@@ -648,19 +663,19 @@ msgstr ""
 msgid "Create Character"
 msgstr "צור שחקן"
 
-#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:52
+#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:54
 #: src/gui/register.cpp:67
 msgid "Name:"
 msgstr "שם:"
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
 #: src/gui/outfitwindow.cpp:67
 msgid ">"
 msgstr ""
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
 #: src/gui/outfitwindow.cpp:66
@@ -677,8 +692,8 @@ msgstr "צבע שיער:"
 msgid "Hair style:"
 msgstr "תיספורת:"
 
-#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:397
-#: src/gui/socialwindow.cpp:296
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:392
+#: src/gui/socialwindow.cpp:329
 msgid "Create"
 msgstr "צור"
 
@@ -734,34 +749,34 @@ msgstr "בטל רישום"
 msgid "Change Email"
 msgstr "שנה כתובת דואר אלקטרוני"
 
-#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:185
-#: src/gui/setup_players.cpp:230
+#: src/gui/charselectdialog.cpp:336 src/gui/serverdialog.cpp:231
+#: src/gui/setup_players.cpp:229
 msgid "Delete"
 msgstr "מחק"
 
-#: src/gui/charselectdialog.cpp:387
+#: src/gui/charselectdialog.cpp:380
 #, fuzzy
 msgid "Choose"
 msgstr "סגור"
 
-#: src/gui/charselectdialog.cpp:399 src/gui/charselectdialog.cpp:400
+#: src/gui/charselectdialog.cpp:394 src/gui/charselectdialog.cpp:395
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:77 src/gui/palette.cpp:96
+#: src/gui/chat.cpp:88
 msgid "Chat"
 msgstr "שיחה"
 
-#: src/gui/chat.cpp:287
+#: src/gui/chat.cpp:311
 #, fuzzy, c-format
 msgid "Present: %s; %d players are present."
 msgstr "%d משתמשים נוכחים."
 
-#: src/gui/chat.cpp:305
+#: src/gui/chat.cpp:329
 msgid "Attendance written to record log."
 msgstr "מקליט שמות נוכחים לרישום."
 
-#: src/gui/chat.cpp:469
+#: src/gui/chat.cpp:493
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "לוחש אל %s: %s"
@@ -823,143 +838,174 @@ msgstr "מידע חלקי"
 msgid "Ambient FX: %s"
 msgstr "אופף FX"
 
-#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:56
+#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:55
 msgid "Equipment"
 msgstr "לבוש"
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:77
-#: src/gui/inventorywindow.cpp:79 src/gui/inventorywindow.cpp:298
-#: src/gui/popupmenu.cpp:372
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:89
+#: src/gui/inventorywindow.cpp:337 src/gui/popupmenu.cpp:359
 msgid "Unequip"
 msgstr "הורד"
 
-#: src/gui/help.cpp:36
+#: src/gui/help.cpp:37
 msgid "Help"
 msgstr "עזרה"
 
-#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:73
+#: src/gui/help.cpp:51 src/gui/npcdialog.cpp:50
 msgid "Close"
 msgstr "סגור"
 
-#: src/gui/inventorywindow.cpp:56 src/gui/windowmenu.cpp:57
+#: src/gui/inventorywindow.cpp:59 src/gui/windowmenu.cpp:56
 msgid "Inventory"
 msgstr "ציוד"
 
-#: src/gui/inventorywindow.cpp:72 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:300 src/gui/popupmenu.cpp:374
+#: src/gui/inventorywindow.cpp:59
+msgid "Storage"
+msgstr "איחסון"
+
+#: src/gui/inventorywindow.cpp:82
+msgid "Slots:"
+msgstr "בשימוש:"
+
+#: src/gui/inventorywindow.cpp:87 src/gui/inventorywindow.cpp:100
+#: src/gui/inventorywindow.cpp:339 src/gui/popupmenu.cpp:361
 msgid "Equip"
 msgstr "השתמש"
 
-#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:304 src/gui/popupmenu.cpp:377
+#: src/gui/inventorywindow.cpp:88
 msgid "Use"
 msgstr "השתמש"
 
-#: src/gui/inventorywindow.cpp:83 src/gui/inventorywindow.cpp:308
-#: src/gui/popupmenu.cpp:380
+#: src/gui/inventorywindow.cpp:101 src/gui/popupmenu.cpp:364
+msgid "Activate"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:102 src/gui/inventorywindow.cpp:348
+#: src/gui/popupmenu.cpp:367
 #, fuzzy
 msgid "Drop..."
 msgstr "השלך"
 
-#: src/gui/inventorywindow.cpp:84 src/gui/popupmenu.cpp:386
+#: src/gui/inventorywindow.cpp:103 src/gui/popupmenu.cpp:373
 msgid "Split"
 msgstr "פצל"
 
-#: src/gui/inventorywindow.cpp:85 src/gui/outfitwindow.cpp:51
+#: src/gui/inventorywindow.cpp:104 src/gui/outfitwindow.cpp:51
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:96 src/gui/storagewindow.cpp:83
-msgid "Slots:"
-msgstr "בשימוש:"
-
-#: src/gui/inventorywindow.cpp:97
+#: src/gui/inventorywindow.cpp:106
 msgid "Weight:"
 msgstr "משקל:"
 
-#: src/gui/inventorywindow.cpp:310 src/gui/popupmenu.cpp:382
+#: src/gui/inventorywindow.cpp:124 src/gui/popupmenu.cpp:378
+msgid "Store"
+msgstr "אחסן"
+
+#: src/gui/inventorywindow.cpp:125 src/gui/popupmenu.cpp:385
+msgid "Retrieve"
+msgstr "החזר"
+
+#: src/gui/inventorywindow.cpp:350 src/gui/popupmenu.cpp:369
 msgid "Drop"
 msgstr "השלך"
 
-#: src/gui/itemamount.cpp:100 src/gui/okdialog.cpp:42
-#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:38 src/gui/trade.cpp:73
-#: src/gui/trade.cpp:75
+#: src/gui/itemamount.cpp:113 src/gui/okdialog.cpp:42
+#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:39 src/gui/trade.cpp:72
+#: src/gui/trade.cpp:74
 msgid "OK"
 msgstr "אישור"
 
-#: src/gui/itemamount.cpp:102
+#: src/gui/itemamount.cpp:115
 msgid "All"
 msgstr "הכל"
 
-#: src/gui/itemamount.cpp:128
+#: src/gui/itemamount.cpp:141
 msgid "Select amount of items to trade."
 msgstr "בחר כמות חפצים לסחור."
 
-#: src/gui/itemamount.cpp:131
+#: src/gui/itemamount.cpp:144
 msgid "Select amount of items to drop."
 msgstr "בחר כמות חפצים להשליך."
 
-#: src/gui/itemamount.cpp:134
+#: src/gui/itemamount.cpp:147
 msgid "Select amount of items to store."
 msgstr "בחר כמות חפצים לאחסן."
 
-#: src/gui/itemamount.cpp:137
+#: src/gui/itemamount.cpp:150
 msgid "Select amount of items to retrieve."
 msgstr "בחר כמות חפצים להחזיר."
 
-#: src/gui/itemamount.cpp:140
+#: src/gui/itemamount.cpp:153
 msgid "Select amount of items to split."
 msgstr "בחר כמות חפצים לפצל."
 
-#: src/gui/itempopup.cpp:92
+#: src/gui/itempopup.cpp:137
 #, fuzzy, c-format
 msgid "Weight: %s"
 msgstr "משקל: "
 
-#: src/gui/login.cpp:49 src/gui/login.cpp:61
+#: src/gui/login.cpp:51 src/gui/login.cpp:63
 msgid "Login"
 msgstr "התחברות"
 
-#: src/gui/login.cpp:58
+#: src/gui/login.cpp:60
 #, fuzzy
 msgid "Remember username"
 msgstr "זכור שם משתמש"
 
-#: src/gui/login.cpp:59 src/gui/register.cpp:58 src/gui/register.cpp:73
+#: src/gui/login.cpp:61 src/gui/register.cpp:58 src/gui/register.cpp:73
 msgid "Register"
 msgstr "הרשם"
 
-#: src/gui/login.cpp:60
+#: src/gui/login.cpp:62
 #, fuzzy
 msgid "Change Server"
 msgstr "שרת"
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
+#: src/gui/login.cpp:129
+#, fuzzy
+msgid "Registration disabled"
+msgstr "שיתוף חפצים מבוטל."
+
+#: src/gui/login.cpp:129
+msgid "You need to use the website to register an account for this server."
+msgstr ""
+
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:86
 msgid "Map"
 msgstr "מפה"
 
-#: src/gui/npcdialog.cpp:44
+#: src/gui/ministatus.cpp:235
+msgid "Need"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:48
 msgid "Waiting for server"
 msgstr "ממתין לשרת"
 
-#: src/gui/npcdialog.cpp:45
+#: src/gui/npcdialog.cpp:49
 msgid "Next"
 msgstr "הבא"
 
-#: src/gui/npcdialog.cpp:47
+#: src/gui/npcdialog.cpp:51
 msgid "Submit"
 msgstr "שלח"
 
-#: src/gui/npcdialog.cpp:52 src/gui/npcpostdialog.cpp:41
+#: src/gui/npcdialog.cpp:73 src/gui/npcpostdialog.cpp:41
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:110
+#: src/gui/npcdialog.cpp:118
+msgid "Clear log"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:134
 msgid "Reset"
 msgstr "אפס"
 
 #. TRANSLATORS: Please leave the \n sequences intact.
-#: src/gui/npcdialog.cpp:171
+#: src/gui/npcdialog.cpp:208
 #, fuzzy
 msgid ""
 "\n"
@@ -974,7 +1020,7 @@ msgstr "אל:"
 msgid "Send"
 msgstr "שלח"
 
-#: src/gui/npcpostdialog.cpp:96
+#: src/gui/npcpostdialog.cpp:99
 msgid "Failed to send as sender or letter invalid."
 msgstr "נכשלה השליחה מכיוון והשולח או המכתב בעלי שגיאה."
 
@@ -989,313 +1035,86 @@ msgstr ""
 msgid "Unequip first"
 msgstr "הורד"
 
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:143
-msgid "Text"
-msgstr "טקסט"
-
-#: src/gui/palette.cpp:82
-msgid "Text Shadow"
-msgstr "הצללת טקסט"
-
-#: src/gui/palette.cpp:83
-msgid "Text Outline"
-msgstr "מתאר הטקסט"
-
-#: src/gui/palette.cpp:84
-msgid "Progress Bar Labels"
-msgstr "תוויות סרגל התקדמות"
-
-#: src/gui/palette.cpp:85
-msgid "Buttons"
-msgstr ""
-
-#: src/gui/palette.cpp:86
-msgid "Disabled Buttons"
-msgstr ""
-
-#: src/gui/palette.cpp:87
-msgid "Tabs"
-msgstr ""
-
-#: src/gui/palette.cpp:89
-msgid "Background"
-msgstr "רקע"
-
-#: src/gui/palette.cpp:91
-msgid "Highlight"
-msgstr "הדגשה"
-
-#: src/gui/palette.cpp:92
-msgid "Tab Highlight"
-msgstr "לשונית הדגשה"
-
-#: src/gui/palette.cpp:93
-#, fuzzy
-msgid "Item Too Expensive"
-msgstr "החפץ יקר מדי"
-
-#: src/gui/palette.cpp:94
-#, fuzzy
-msgid "Item Is Equipped"
-msgstr "החפץ בשימוש"
-
-#: src/gui/palette.cpp:97
-msgid "GM"
-msgstr "GM"
-
-#: src/gui/palette.cpp:98
-msgid "Player"
-msgstr "שחקן"
-
-#: src/gui/palette.cpp:99
-msgid "Whisper"
-msgstr "לחישה"
-
-#: src/gui/palette.cpp:100
-msgid "Is"
-msgstr "הינו"
-
-#: src/gui/palette.cpp:101 src/net/ea/gui/partytab.cpp:43
-msgid "Party"
-msgstr "חבורה"
-
-#: src/gui/palette.cpp:102 src/net/ea/gui/guildtab.cpp:45
-msgid "Guild"
-msgstr "גילדה"
-
-#: src/gui/palette.cpp:103
-msgid "Server"
-msgstr "שרת"
-
-#: src/gui/palette.cpp:104
-msgid "Logger"
-msgstr "רישום"
-
-#: src/gui/palette.cpp:105
-msgid "Hyperlink"
-msgstr "קישור"
-
-#: src/gui/palette.cpp:107
-msgid "Being"
-msgstr "נהיה"
-
-#: src/gui/palette.cpp:108
-msgid "Other Players' Names"
-msgstr "שמות המשתמשים האחרים"
-
-#: src/gui/palette.cpp:109
-msgid "Own Name"
-msgstr "השם שלך"
-
-#: src/gui/palette.cpp:110
-msgid "GM Names"
-msgstr "שמות המנהלים"
-
-#: src/gui/palette.cpp:111
-msgid "NPCs"
-msgstr "דמויות"
-
-#: src/gui/palette.cpp:112
-msgid "Monsters"
-msgstr "מפלצות"
-
-#: src/gui/palette.cpp:114
-msgid "Unknown Item Type"
-msgstr "סוג חפץ לא ידוע"
-
-#: src/gui/palette.cpp:115
-msgid "Generics"
-msgstr "כלליים"
-
-#: src/gui/palette.cpp:116
-msgid "Hats"
-msgstr "כובעים"
-
-#: src/gui/palette.cpp:117
-msgid "Usables"
-msgstr "שימושיים"
-
-#: src/gui/palette.cpp:118
-msgid "Shirts"
-msgstr "חולצות"
-
-#: src/gui/palette.cpp:119
-#, fuzzy
-msgid "One Handed Weapons"
-msgstr "נשקים ליד אחת"
-
-#: src/gui/palette.cpp:120
-msgid "Pants"
-msgstr "מכנסיים"
-
-#: src/gui/palette.cpp:121
-msgid "Shoes"
-msgstr "נעליים"
-
-#: src/gui/palette.cpp:122
-#, fuzzy
-msgid "Two Handed Weapons"
-msgstr "נשקים ליד אחת"
-
-#: src/gui/palette.cpp:123
-msgid "Shields"
-msgstr "מגנים"
-
-#: src/gui/palette.cpp:124
-msgid "Rings"
-msgstr "טבעות"
-
-#: src/gui/palette.cpp:125
-msgid "Necklaces"
-msgstr "שרשראות"
-
-#: src/gui/palette.cpp:126
-msgid "Arms"
-msgstr "ידיים"
-
-#: src/gui/palette.cpp:127
-msgid "Ammo"
-msgstr "תחמושת"
-
-#: src/gui/palette.cpp:129
-msgid "Particle Effects"
-msgstr "אפקטים חלקיים"
-
-#: src/gui/palette.cpp:130
-msgid "Pickup Notification"
-msgstr "הודעה על לקיחה"
-
-#: src/gui/palette.cpp:131
-msgid "Exp Notification"
-msgstr "הודעה על נק' נסיון"
-
-#: src/gui/palette.cpp:133
-#, fuzzy
-msgid "Player Hits Monster"
-msgstr "משתמש מכה מפלצת"
-
-#: src/gui/palette.cpp:135
-#, fuzzy
-msgid "Monster Hits Player"
-msgstr "משתמש מכה משתמש"
-
-#: src/gui/palette.cpp:136
-msgid "Critical Hit"
-msgstr "מכה קריטית"
-
-#: src/gui/palette.cpp:137
-msgid "Misses"
-msgstr "פספוס"
-
-#: src/gui/palette.cpp:139
-msgid "HP Bar"
-msgstr "סרגל חיים"
-
-#: src/gui/palette.cpp:140
-msgid "3/4 HP Bar"
-msgstr "3/4 סרגל חיים"
-
-#: src/gui/palette.cpp:141
-msgid "1/2 HP Bar"
-msgstr "1/2 סרגל חיים"
-
-#: src/gui/palette.cpp:142
-msgid "1/4 HP Bar"
-msgstr "1/4 סרגל חיים"
-
-#: src/gui/popupmenu.cpp:84
+#: src/gui/popupmenu.cpp:83
 #, fuzzy, c-format
 msgid "Trade with %s..."
 msgstr "סוחר עם%s"
 
-#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:161
+#: src/gui/popupmenu.cpp:87 src/gui/popupmenu.cpp:158
 #, fuzzy, c-format
 msgid "Attack %s"
 msgstr "התקפה %+d"
 
-#: src/gui/popupmenu.cpp:92
+#: src/gui/popupmenu.cpp:91
 #, fuzzy, c-format
 msgid "Whisper %s"
 msgstr "לחישה"
 
-#: src/gui/popupmenu.cpp:101
+#: src/gui/popupmenu.cpp:100
 #, fuzzy, c-format
 msgid "Befriend %s"
 msgstr "@@friend|הצע חברות %s@@"
 
-#: src/gui/popupmenu.cpp:106
+#: src/gui/popupmenu.cpp:105
 #, fuzzy, c-format
 msgid "Disregard %s"
 msgstr "מזלזל"
 
-#: src/gui/popupmenu.cpp:109
+#: src/gui/popupmenu.cpp:108
 #, fuzzy, c-format
 msgid "Ignore %s"
 msgstr "מתעלם"
 
-#: src/gui/popupmenu.cpp:115 src/gui/popupmenu.cpp:124
+#: src/gui/popupmenu.cpp:114 src/gui/popupmenu.cpp:123
 #, c-format
 msgid "Unignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:118
+#: src/gui/popupmenu.cpp:117
 #, fuzzy, c-format
 msgid "Completely ignore %s"
 msgstr "@@ignore|התעלם לחלוטין %s@@"
 
 #: src/gui/popupmenu.cpp:130
-#, c-format
-msgid "Follow %s"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:133
 #, fuzzy, c-format
 msgid "Invite %s to join your guild"
 msgstr "@@guild|הזמן את %s להצטרף לגילדה@@"
 
-#: src/gui/popupmenu.cpp:137
+#: src/gui/popupmenu.cpp:134
 #, fuzzy, c-format
 msgid "Invite %s to join your party"
 msgstr "@@party|הזמן את %s להצטרף לחבורה@@"
 
-#: src/gui/popupmenu.cpp:144
+#: src/gui/popupmenu.cpp:141
 #, fuzzy
 msgid "Kick player"
 msgstr "העפה נכשלה!"
 
-#: src/gui/popupmenu.cpp:153
+#: src/gui/popupmenu.cpp:150
 #, fuzzy, c-format
 msgid "Talk to %s"
 msgstr "@@talk|דבר אל %s@@"
 
-#: src/gui/popupmenu.cpp:166
+#: src/gui/popupmenu.cpp:163
 #, fuzzy
 msgid "Kick monster"
 msgstr "@@admin-kick|העף מפלצת@@"
 
-#: src/gui/popupmenu.cpp:174
+#: src/gui/popupmenu.cpp:171
 #, fuzzy
 msgid "Add name to chat"
 msgstr "@@name|הוסף שם לשיחה@@"
 
-#: src/gui/popupmenu.cpp:191
+#: src/gui/popupmenu.cpp:188
 #, fuzzy, c-format
 msgid "Pick up %s"
 msgstr "הרם"
 
-#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:400
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:387
 #, fuzzy
 msgid "Add to chat"
 msgstr "@@chat|הוסף לשיחה@@"
 
-#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:70
-msgid "Store"
-msgstr "אחסן"
-
-#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:71
-msgid "Retrieve"
-msgstr "החזר"
-
 #: src/gui/quitdialog.cpp:44
 msgid "Switch server"
 msgstr "החלף שרת"
@@ -1364,52 +1183,65 @@ msgstr "הסיסמה חייבת להכיל פחות מ-%d תוים."
 msgid "Passwords do not match."
 msgstr "הסיסמאות אינן תואמות."
 
-#: src/gui/serverdialog.cpp:134
+#: src/gui/serverdialog.cpp:197
 #, fuzzy
 msgid "Choose Your Server"
 msgstr "בחר את השרת שלך"
 
-#: src/gui/serverdialog.cpp:141 src/gui/widgets/chattab.cpp:139
+#: src/gui/serverdialog.cpp:206 src/gui/widgets/chattab.cpp:142
 msgid "Server:"
 msgstr "שרת:"
 
-#: src/gui/serverdialog.cpp:142
+#: src/gui/serverdialog.cpp:207
 msgid "Port:"
 msgstr "פורט:"
 
-#: src/gui/serverdialog.cpp:143
+#: src/gui/serverdialog.cpp:208
 #, fuzzy
 msgid "Server type:"
 msgstr "שרת:"
 
-#: src/gui/serverdialog.cpp:183
+#: src/gui/serverdialog.cpp:229
 #, fuzzy
 msgid "Connect"
 msgstr "מתחבר..."
 
-#: src/gui/serverdialog.cpp:184
+#: src/gui/serverdialog.cpp:230
 #, fuzzy
 msgid "Custom Server"
 msgstr "סמן-עכבר מותאם"
 
-#: src/gui/serverdialog.cpp:262
+#: src/gui/serverdialog.cpp:324
 msgid "Please type both the address and the port of a server."
 msgstr "אנא הכנס גם את כתובת וגם את פורט השרת."
 
-#: src/gui/serverdialog.cpp:411
+#: src/gui/serverdialog.cpp:441
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:417
+#: src/gui/serverdialog.cpp:447
 #, fuzzy
 msgid "Waiting for server..."
 msgstr "ממתין לשרת"
 
-#: src/gui/serverdialog.cpp:421
+#: src/gui/serverdialog.cpp:451
 msgid "Preparing download"
 msgstr ""
 
+#: src/gui/serverdialog.cpp:455
+msgid "Error retreiving server list!"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:550
+msgid "requires a newer version"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:552
+#, c-format
+msgid "requires v%s"
+msgstr ""
+
 #: src/gui/setup_audio.cpp:42
 msgid "Sound"
 msgstr "צליל"
@@ -1443,54 +1275,54 @@ msgstr ""
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:44
+#: src/gui/setup_colors.cpp:46
 msgid "This is what the color looks like"
 msgstr "כך הצבע נראה"
 
-#: src/gui/setup_colors.cpp:49
+#: src/gui/setup_colors.cpp:51
 msgid "Colors"
 msgstr "צבעים"
 
-#: src/gui/setup_colors.cpp:70
+#: src/gui/setup_colors.cpp:72
 #, fuzzy
 msgid "Type:"
 msgstr "סוג: "
 
-#: src/gui/setup_colors.cpp:81 src/gui/setup_colors.cpp:433
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:331
 msgid "Static"
 msgstr "סטטי"
 
-#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:84
-#: src/gui/setup_colors.cpp:434
+#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
+#: src/gui/setup_colors.cpp:332
 msgid "Pulse"
 msgstr "פעימה"
 
-#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
+#: src/gui/setup_colors.cpp:333
 msgid "Rainbow"
 msgstr "קשת בענן"
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
+#: src/gui/setup_colors.cpp:333
 msgid "Spectrum"
 msgstr "מינסרה"
 
-#: src/gui/setup_colors.cpp:92
+#: src/gui/setup_colors.cpp:94
 #, fuzzy
 msgid "Delay:"
 msgstr "עיכוב: "
 
-#: src/gui/setup_colors.cpp:107
+#: src/gui/setup_colors.cpp:109
 #, fuzzy
 msgid "Red:"
 msgstr "אדום: "
 
-#: src/gui/setup_colors.cpp:122
+#: src/gui/setup_colors.cpp:124
 #, fuzzy
 msgid "Green:"
 msgstr "ירוק: "
 
-#: src/gui/setup_colors.cpp:137
+#: src/gui/setup_colors.cpp:139
 #, fuzzy
 msgid "Blue:"
 msgstr "כחול: "
@@ -1536,592 +1368,603 @@ msgid "Assign"
 msgstr "שנה"
 
 #: src/gui/setup_keyboard.cpp:90
+#, fuzzy
+msgid "Unassign"
+msgstr "שנה"
+
+#: src/gui/setup_keyboard.cpp:94
 msgid "Default"
 msgstr "ברירת מחדל"
 
-#: src/gui/setup_keyboard.cpp:119
+#: src/gui/setup_keyboard.cpp:125
 msgid "Key Conflict(s) Detected."
 msgstr "נמצאו קונפליקטי מקשים."
 
-#: src/gui/setup_players.cpp:57
+#: src/gui/setup_players.cpp:58
 msgid "Name"
 msgstr "שם"
 
-#: src/gui/setup_players.cpp:58
+#: src/gui/setup_players.cpp:59
 msgid "Relation"
 msgstr "התנהגות"
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:64
 msgid "Neutral"
 msgstr "ניטרלי"
 
-#: src/gui/setup_players.cpp:64
+#: src/gui/setup_players.cpp:65
 msgid "Friend"
 msgstr "חבר"
 
-#: src/gui/setup_players.cpp:65
+#: src/gui/setup_players.cpp:66
 msgid "Disregarded"
 msgstr "מזלזל"
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_players.cpp:67
 msgid "Ignored"
 msgstr "מתעלם"
 
-#: src/gui/setup_players.cpp:208 src/gui/setup_video.cpp:132
+#: src/gui/setup_players.cpp:206 src/gui/setup_video.cpp:153
 msgid "???"
 msgstr "???"
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_players.cpp:225
 msgid "Allow trading"
 msgstr "אפשר מסחר"
 
-#: src/gui/setup_players.cpp:228
+#: src/gui/setup_players.cpp:227
 msgid "Allow whispers"
 msgstr "אפשר לחישות"
 
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:231
 msgid "Put all whispers in tabs"
 msgstr "הכנס את כל הלחישות ללשוניות"
 
-#: src/gui/setup_players.cpp:234
+#: src/gui/setup_players.cpp:233
 #, fuzzy
 msgid "Show gender"
 msgstr "הצג שם"
 
-#: src/gui/setup_players.cpp:236
+#: src/gui/setup_players.cpp:235
+#, fuzzy
+msgid "Enable Chat log"
+msgstr "לא ניתן למכור."
+
+#: src/gui/setup_players.cpp:237
 msgid "Players"
 msgstr "שחקנים"
 
-#: src/gui/setup_players.cpp:261
+#: src/gui/setup_players.cpp:262
 msgid "When ignoring:"
 msgstr "כאשר מתעלם:"
 
-#: src/gui/setup_video.cpp:113
+#: src/gui/setup_video.cpp:134
 msgid "Tiny"
 msgstr "מזערי"
 
-#: src/gui/setup_video.cpp:114
+#: src/gui/setup_video.cpp:135
 msgid "Small"
 msgstr "קטן"
 
-#: src/gui/setup_video.cpp:115
+#: src/gui/setup_video.cpp:136
 msgid "Medium"
 msgstr "בינוני"
 
-#: src/gui/setup_video.cpp:116
+#: src/gui/setup_video.cpp:137
 msgid "Large"
 msgstr "גדול"
 
-#: src/gui/setup_video.cpp:142
+#: src/gui/setup_video.cpp:163
 msgid "No text"
 msgstr "ללא טקסט"
 
-#: src/gui/setup_video.cpp:144
+#: src/gui/setup_video.cpp:164
+msgid "Text"
+msgstr "טקסט"
+
+#: src/gui/setup_video.cpp:165
 msgid "Bubbles, no names"
 msgstr "בועות, ללא שמות"
 
-#: src/gui/setup_video.cpp:145
+#: src/gui/setup_video.cpp:166
 msgid "Bubbles with names"
 msgstr "בועות עם שמות"
 
-#: src/gui/setup_video.cpp:157
+#: src/gui/setup_video.cpp:178
 msgid "off"
 msgstr "כבוי"
 
-#: src/gui/setup_video.cpp:158 src/gui/setup_video.cpp:171
+#: src/gui/setup_video.cpp:179 src/gui/setup_video.cpp:192
 msgid "low"
 msgstr "נמוך"
 
-#: src/gui/setup_video.cpp:159 src/gui/setup_video.cpp:173
+#: src/gui/setup_video.cpp:180 src/gui/setup_video.cpp:194
 msgid "high"
 msgstr "גבוה"
 
-#: src/gui/setup_video.cpp:172
+#: src/gui/setup_video.cpp:193
 msgid "medium"
 msgstr "בינוני"
 
-#: src/gui/setup_video.cpp:174
+#: src/gui/setup_video.cpp:195
 msgid "max"
 msgstr "מקסימלי"
 
-#: src/gui/setup_video.cpp:196
+#: src/gui/setup_video.cpp:217
 msgid "Full screen"
 msgstr "מסך מלא"
 
-#: src/gui/setup_video.cpp:197
+#: src/gui/setup_video.cpp:218
 msgid "OpenGL"
 msgstr "‏OpenGL"
 
-#: src/gui/setup_video.cpp:198
+#: src/gui/setup_video.cpp:219
 msgid "Custom cursor"
 msgstr "סמן-עכבר מותאם"
 
-#: src/gui/setup_video.cpp:200
+#: src/gui/setup_video.cpp:221
 msgid "Visible names"
 msgstr "שמות גלויים"
 
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:223
 msgid "Particle effects"
 msgstr "אפקטים חלקיים"
 
-#: src/gui/setup_video.cpp:204
+#: src/gui/setup_video.cpp:225
 #, fuzzy
 msgid "Show own name"
 msgstr "הצג שם"
 
-#: src/gui/setup_video.cpp:205
+#: src/gui/setup_video.cpp:226
+msgid "Log NPC dialogue"
+msgstr ""
+
+#: src/gui/setup_video.cpp:227
 msgid "Show pickup notification"
 msgstr "הצג התרעת לקיחה"
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:207
+#. TRANSLATORS: Refers to "Show pickup notification"
+#: src/gui/setup_video.cpp:229
 msgid "in chat"
 msgstr "בשיחה"
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:209
+#. TRANSLATORS: Refers to "Show pickup notification"
+#: src/gui/setup_video.cpp:231
 msgid "as particle"
 msgstr "באופן חלקי"
 
-#: src/gui/setup_video.cpp:214
+#: src/gui/setup_video.cpp:236
 #, fuzzy
 msgid "FPS limit:"
 msgstr "הגבלת FPS:"
 
-#: src/gui/setup_video.cpp:225
+#: src/gui/setup_video.cpp:247
+msgid "Disable transparency (Low CPU mode)"
+msgstr ""
+
+#: src/gui/setup_video.cpp:250
 msgid "Video"
 msgstr "וידאו"
 
-#: src/gui/setup_video.cpp:227
+#: src/gui/setup_video.cpp:252
 #, fuzzy
-msgid "Show monster damage"
+msgid "Show damage"
 msgstr "הצג שם"
 
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:258
 msgid "Overhead text"
 msgstr "טקסט מעל הראש"
 
-#: src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:259
 msgid "Gui opacity"
 msgstr "אטימות Gui"
 
-#: src/gui/setup_video.cpp:235
+#: src/gui/setup_video.cpp:260
 msgid "Ambient FX"
 msgstr "אופף FX"
 
-#: src/gui/setup_video.cpp:236
+#: src/gui/setup_video.cpp:261
 #, fuzzy
 msgid "Particle detail"
 msgstr "מידע חלקי"
 
-#: src/gui/setup_video.cpp:237
+#: src/gui/setup_video.cpp:262
 msgid "Font size"
 msgstr "גודל הגופן"
 
-#: src/gui/setup_video.cpp:251 src/gui/setup_video.cpp:454
-#: src/gui/setup_video.cpp:568
+#: src/gui/setup_video.cpp:277 src/gui/setup_video.cpp:532
+#: src/gui/setup_video.cpp:662
 #, fuzzy
 msgid "None"
 msgstr "לא"
 
-#: src/gui/setup_video.cpp:381
+#: src/gui/setup_video.cpp:426
 #, fuzzy
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr "מצב ושיחזור מצב ישן נכשלו!"
 
-#: src/gui/setup_video.cpp:387
+#: src/gui/setup_video.cpp:432
 #, fuzzy
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr "מצב ושיחזור מצב ישן נכשלו!"
 
-#: src/gui/setup_video.cpp:398
+#: src/gui/setup_video.cpp:443
 #, fuzzy
 msgid "Switching to Full Screen"
 msgstr "מחליף למסך מלא"
 
-#: src/gui/setup_video.cpp:399
+#: src/gui/setup_video.cpp:444
 msgid "Restart needed for changes to take effect."
 msgstr "נדרש איתחול כדי שהשינויים יהיו ברי-תוקף."
 
-#: src/gui/setup_video.cpp:411
+#: src/gui/setup_video.cpp:458
 #, fuzzy
 msgid "Changing to OpenGL"
 msgstr "משנה OpenGL"
 
-#: src/gui/setup_video.cpp:412
+#: src/gui/setup_video.cpp:459
+msgid ""
+"Applying change to OpenGL requires restart. In case OpenGL messes up your "
+"game graphics, restart the game with the command line option \"--no-opengl\"."
+msgstr ""
+
+#: src/gui/setup_video.cpp:466
+msgid "Deactivating OpenGL"
+msgstr ""
+
+#: src/gui/setup_video.cpp:467
 msgid "Applying change to OpenGL requires restart."
 msgstr "אישור שינויים עבור OpenGL דורש איתחול."
 
-#: src/gui/setup_video.cpp:486 src/gui/setup_video.cpp:491
+#: src/gui/setup_video.cpp:475
+#, fuzzy
+msgid "Transparency disabled"
+msgstr "שיתוף נסיון מבוטל."
+
+#: src/gui/setup_video.cpp:476 src/gui/setup_video.cpp:484
+msgid "You must restart to apply changes."
+msgstr ""
+
+#: src/gui/setup_video.cpp:483
+msgid "Transparency enabled"
+msgstr ""
+
+#: src/gui/setup_video.cpp:576 src/gui/setup_video.cpp:581
 #, fuzzy
 msgid "Screen Resolution Changed"
 msgstr "רזולוצית המסך השתנתה"
 
-#: src/gui/setup_video.cpp:487 src/gui/setup_video.cpp:492
+#: src/gui/setup_video.cpp:577 src/gui/setup_video.cpp:582
 msgid "Restart your client for the change to take effect."
 msgstr "טען מחדש כדי שהשינוי יחול."
 
-#: src/gui/setup_video.cpp:489
+#: src/gui/setup_video.cpp:579
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:522
+#: src/gui/setup_video.cpp:612
 #, fuzzy
 msgid "Particle Effect Settings Changed."
 msgstr "הגדרות השינוי החלקי השתנו."
 
-#: src/gui/setup_video.cpp:523
+#: src/gui/setup_video.cpp:613
 msgid "Changes will take effect on map change."
 msgstr "השינויים יחולו על שינוי המפה."
 
-#: src/gui/skilldialog.cpp:197 src/gui/windowmenu.cpp:58
+#: src/gui/skilldialog.cpp:212 src/gui/windowmenu.cpp:59
 msgid "Skills"
 msgstr "כישורים"
 
-#: src/gui/skilldialog.cpp:208
+#: src/gui/skilldialog.cpp:223
 msgid "Up"
 msgstr "למעלה"
 
-#: src/gui/skilldialog.cpp:262
+#: src/gui/skilldialog.cpp:269
 #, fuzzy, c-format
 msgid "Skill points available: %d"
 msgstr "נקודות כישורים:  %d"
 
-#: src/gui/skilldialog.cpp:314
+#: src/gui/skilldialog.cpp:351
 #, fuzzy, c-format
 msgid "Skill Set %d"
 msgstr "נקודות כישורים:  %d"
 
-#: src/gui/skilldialog.cpp:323
+#: src/gui/skilldialog.cpp:360
 #, fuzzy, c-format
 msgid "Skill %d"
 msgstr "כישורים"
 
-#: src/gui/skilldialog.cpp:405
+#: src/gui/skilldialog.cpp:442
 #, fuzzy, c-format
 msgid "Lvl: %d (%+d)"
 msgstr "רמה: %d"
 
-#: src/gui/skilldialog.cpp:416
+#: src/gui/skilldialog.cpp:453
 #, fuzzy, c-format
 msgid "Lvl: %d"
 msgstr "רמה: %d"
 
-#: src/gui/socialwindow.cpp:117
+#: src/gui/socialwindow.cpp:126
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:126
+#: src/gui/socialwindow.cpp:139
 #, fuzzy, c-format
 msgid "Guild %s quit requested."
 msgstr "גילדה נוצרה."
 
-#: src/gui/socialwindow.cpp:136
+#: src/gui/socialwindow.cpp:153
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:137
+#: src/gui/socialwindow.cpp:154
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:146
+#: src/gui/socialwindow.cpp:163
 #, fuzzy
 msgid "Leave Guild?"
 msgstr "צור גילדה"
 
-#: src/gui/socialwindow.cpp:147
+#: src/gui/socialwindow.cpp:164
 #, fuzzy, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "האם אתה בטוח שברצונך לצאת?"
 
-#: src/gui/socialwindow.cpp:182
+#: src/gui/socialwindow.cpp:207 src/net/tmwa/partyhandler.cpp:330
 #, fuzzy, c-format
 msgid "Invited user %s to party."
 msgstr "/party > הזמן משתמש לחבורה"
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:218
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:199
+#: src/gui/socialwindow.cpp:232
 #, fuzzy
 msgid "Member Invite to Party"
 msgstr "/party > הזמן משתמש לחבורה"
 
-#: src/gui/socialwindow.cpp:200
+#: src/gui/socialwindow.cpp:233
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:209
+#: src/gui/socialwindow.cpp:242
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:210
+#: src/gui/socialwindow.cpp:243
 #, fuzzy, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "האם אתה בטוח שברצונך לצאת?"
 
-#: src/gui/socialwindow.cpp:239
+#: src/gui/socialwindow.cpp:272
 msgid "Create Guild"
 msgstr "צור גילדה"
 
-#: src/gui/socialwindow.cpp:240 src/gui/socialwindow.cpp:564
+#: src/gui/socialwindow.cpp:273 src/gui/socialwindow.cpp:620
 #, fuzzy
 msgid "Create Party"
 msgstr "צור שחקן"
 
-#: src/gui/socialwindow.cpp:279 src/gui/windowmenu.cpp:60
+#: src/gui/socialwindow.cpp:312 src/gui/windowmenu.cpp:64
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:297
+#: src/gui/socialwindow.cpp:330
 #, fuzzy
 msgid "Invite"
 msgstr "הזמן משתמש"
 
-#: src/gui/socialwindow.cpp:298
+#: src/gui/socialwindow.cpp:331
 #, fuzzy
 msgid "Leave"
 msgstr "גדול"
 
-#: src/gui/socialwindow.cpp:394
+#: src/gui/socialwindow.cpp:443
 #, fuzzy, c-format
 msgid "Accepted party invite from %s."
 msgstr "אשר את ההזמנה של %s."
 
-#: src/gui/socialwindow.cpp:400
+#: src/gui/socialwindow.cpp:449
 #, fuzzy, c-format
 msgid "Rejected party invite from %s."
 msgstr "דחה את ההזמנה של %s."
 
-#: src/gui/socialwindow.cpp:413
+#: src/gui/socialwindow.cpp:462
 #, fuzzy, c-format
 msgid "Accepted guild invite from %s."
 msgstr "אשר את ההזמנה של %s."
 
-#: src/gui/socialwindow.cpp:419
+#: src/gui/socialwindow.cpp:468
 #, fuzzy, c-format
 msgid "Rejected guild invite from %s."
 msgstr "דחה את ההזמנה של %s."
 
-#: src/gui/socialwindow.cpp:463
+#: src/gui/socialwindow.cpp:497
+msgid "Creating guild failed, please choose a shorter name."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:504
 #, fuzzy, c-format
 msgid "Creating guild called %s."
 msgstr "שגיאה ביצירת גילדה."
 
-#: src/gui/socialwindow.cpp:477
+#: src/gui/socialwindow.cpp:520
+msgid "Creating party failed, please choose a shorter name."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:527
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:484
+#: src/gui/socialwindow.cpp:541
 #, fuzzy
 msgid "Guild Name"
 msgstr "גילדה"
 
-#: src/gui/socialwindow.cpp:485
+#: src/gui/socialwindow.cpp:542
 #, fuzzy
 msgid "Choose your guild's name."
 msgstr "בחר את השרת שלך"
 
-#: src/gui/socialwindow.cpp:497
+#: src/gui/socialwindow.cpp:554
 #, fuzzy
 msgid "Received guild request, but one already exists."
 msgstr "התקבלה הזמנה לחבורה, אך הזמנה זהה כבר קיימת."
 
-#: src/gui/socialwindow.cpp:502
+#: src/gui/socialwindow.cpp:559
 #, fuzzy, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s הזמין אותך להצטרף לחבורת %s."
 
-#: src/gui/socialwindow.cpp:507
+#: src/gui/socialwindow.cpp:564
 #, fuzzy
 msgid "Accept Guild Invite"
 msgstr "אשר את הזמנת חבורה"
 
-#: src/gui/socialwindow.cpp:519
+#: src/gui/socialwindow.cpp:576
 msgid "Received party request, but one already exists."
 msgstr "התקבלה הזמנה לחבורה, אך הזמנה זהה כבר קיימת."
 
-#: src/gui/socialwindow.cpp:529
+#: src/gui/socialwindow.cpp:585
 #, fuzzy
 msgid "You have been invited you to join a party."
 msgstr "%s הזמין אותך לחבורה שלהם."
 
-#: src/gui/socialwindow.cpp:533
+#: src/gui/socialwindow.cpp:589
 #, fuzzy, c-format
 msgid "You have been invited to join the %s party."
 msgstr "%s הזמין אותך להצטרף לחבורת %s."
 
-#: src/gui/socialwindow.cpp:541
+#: src/gui/socialwindow.cpp:597
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s הזמין אותך לחבורה שלהם."
 
-#: src/gui/socialwindow.cpp:546
+#: src/gui/socialwindow.cpp:602
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s הזמין אותך להצטרף לחבורת %s."
 
-#: src/gui/socialwindow.cpp:554
+#: src/gui/socialwindow.cpp:610
 msgid "Accept Party Invite"
 msgstr "אשר את הזמנת חבורה"
 
-#: src/gui/socialwindow.cpp:565
+#: src/gui/socialwindow.cpp:621
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:570
+#: src/gui/socialwindow.cpp:626
 #, fuzzy
 msgid "Party Name"
 msgstr "חבורה"
 
-#: src/gui/socialwindow.cpp:571
+#: src/gui/socialwindow.cpp:627
 #, fuzzy
 msgid "Choose your party's name."
 msgstr "בחר את השרת שלך"
 
-#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:59
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:62
 msgid "Specials"
 msgstr ""
 
-#: src/gui/specialswindow.cpp:174
-#, c-format
-msgid "Specials Set %d"
-msgstr ""
-
-#: src/gui/specialswindow.cpp:191
-#, c-format
-msgid "Special %d"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:99 src/gui/statuswindow.cpp:247
+#: src/gui/statuswindow.cpp:113 src/gui/statuswindow.cpp:215
+#: src/gui/statuswindow.cpp:262
 #, c-format
 msgid "Level: %d"
 msgstr "רמה: %d"
 
-#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:211
+#: src/gui/statuswindow.cpp:114 src/gui/statuswindow.cpp:208
+#: src/gui/statuswindow.cpp:239
 #, c-format
 msgid "Money: %s"
 msgstr "כסף: %s"
 
-#: src/gui/statuswindow.cpp:102
+#: src/gui/statuswindow.cpp:117
 msgid "HP:"
 msgstr "חיים:"
 
-#: src/gui/statuswindow.cpp:107
+#: src/gui/statuswindow.cpp:122
 msgid "Exp:"
 msgstr "נסיון:"
 
-#: src/gui/statuswindow.cpp:112
+#: src/gui/statuswindow.cpp:130
 msgid "MP:"
 msgstr "קסם:"
 
-#: src/gui/statuswindow.cpp:132 src/gui/statuswindow.cpp:219
+#: src/gui/statuswindow.cpp:158 src/gui/statuswindow.cpp:275
 #, c-format
 msgid "Job: %d"
 msgstr "עבודה: %d"
 
-#: src/gui/statuswindow.cpp:133
+#: src/gui/statuswindow.cpp:159
 msgid "Job:"
 msgstr "עבודה:"
 
-#: src/gui/statuswindow.cpp:194
-#, fuzzy
-msgid "HP"
-msgstr "חיים:"
-
-#: src/gui/statuswindow.cpp:200
-#, fuzzy
-msgid "MP"
-msgstr "קסם:"
-
-#: src/gui/statuswindow.cpp:206
-#, fuzzy
-msgid "Exp"
-msgstr "נסיון:"
-
-#: src/gui/statuswindow.cpp:215
-#, fuzzy
-msgid "Money"
-msgstr "זהב: %d"
-
-#: src/gui/statuswindow.cpp:225
-#, fuzzy
-msgid "Job"
-msgstr "עבודה:"
-
-#: src/gui/statuswindow.cpp:229
+#: src/gui/statuswindow.cpp:211 src/gui/statuswindow.cpp:247
 #, fuzzy, c-format
 msgid "Character points: %d"
 msgstr "נתוני שחקן - אישור"
 
-#: src/gui/statuswindow.cpp:235
+#: src/gui/statuswindow.cpp:255
 #, fuzzy, c-format
 msgid "Correction points: %d"
 msgstr "נקודות כישורים:  %d"
 
-#: src/gui/statuswindow.cpp:251
-#, fuzzy
-msgid "Level"
-msgstr "רמה: %d"
-
-#: src/gui/storagewindow.cpp:58
-msgid "Storage"
-msgstr "איחסון"
-
-#: src/gui/trade.cpp:52
+#: src/gui/trade.cpp:53
 msgid "Propose trade"
 msgstr "מציע לחור"
 
-#: src/gui/trade.cpp:53
+#: src/gui/trade.cpp:54
 msgid "Confirmed. Waiting..."
 msgstr "אושר. ממתין..."
 
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:55
 msgid "Agree trade"
 msgstr "הסכם למסחר"
 
-#: src/gui/trade.cpp:55
+#: src/gui/trade.cpp:56
 msgid "Agreed. Waiting..."
 msgstr "מוסכם. ממתין..."
 
-#: src/gui/trade.cpp:58
+#: src/gui/trade.cpp:59
 msgid "Trade: You"
 msgstr "סחור: אתה"
 
-#: src/gui/trade.cpp:74 src/gui/trade.cpp:75
+#: src/gui/trade.cpp:73 src/gui/trade.cpp:74
 msgid "Trade"
 msgstr "סחרר"
 
-#: src/gui/trade.cpp:77
+#: src/gui/trade.cpp:76
 msgid "Add"
 msgstr "הוסף"
 
-#: src/gui/trade.cpp:99 src/gui/trade.cpp:135
+#: src/gui/trade.cpp:98 src/gui/trade.cpp:134
 #, fuzzy, c-format
 msgid "You get %s"
 msgstr "אתה מקבל %s."
 
-#: src/gui/trade.cpp:100
+#: src/gui/trade.cpp:99
 msgid "You give:"
 msgstr "אתה נותן:"
 
-#: src/gui/trade.cpp:104
+#: src/gui/trade.cpp:103
 msgid "Change"
 msgstr "שנה"
 
-#: src/gui/trade.cpp:275
+#: src/gui/trade.cpp:262
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr "הוספת הפריט נכשלה. לא ניתן להכניס מעל חפץ אחד לחלון."
 
-#: src/gui/trade.cpp:318
+#: src/gui/trade.cpp:304
 msgid "You don't have enough money."
 msgstr "אין לך מספיק כסף."
 
@@ -2142,22 +1985,22 @@ msgstr "מתחבר..."
 msgid "Play"
 msgstr "שחק"
 
-#: src/gui/updatewindow.cpp:405
+#: src/gui/updatewindow.cpp:417
 msgid "##1  The update process is incomplete."
 msgstr "##1  תהליך העדכון לא תם."
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:407
+#: src/gui/updatewindow.cpp:419
 msgid "##1  It is strongly recommended that"
 msgstr "##1  מומלץ ביותר שתנסה שוב מאוחר יותר"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:409
+#: src/gui/updatewindow.cpp:421
 #, fuzzy
 msgid "##1  you try again later."
 msgstr "-"
 
-#: src/gui/updatewindow.cpp:501
+#: src/gui/updatewindow.cpp:515
 msgid "Completed"
 msgstr "הסתיים"
 
@@ -2237,64 +2080,64 @@ msgstr "צריך משתמש שינהל!"
 msgid "Need a user to kick!"
 msgstr "צריך משתמש שיעיף!"
 
-#: src/gui/widgets/chattab.cpp:118
+#: src/gui/widgets/chattab.cpp:121
 msgid "Global announcement:"
 msgstr "הודעה גלובאלית:"
 
-#: src/gui/widgets/chattab.cpp:124
+#: src/gui/widgets/chattab.cpp:127
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "הודעה גלובאלית מאת %s:"
 
-#: src/gui/widgets/chattab.cpp:150
+#: src/gui/widgets/chattab.cpp:153
 #, fuzzy, c-format
 msgid "%s whispers: %s"
 msgstr "%s: לוחש: "
 
-#: src/gui/widgets/whispertab.cpp:51
+#: src/gui/widgets/whispertab.cpp:53
 msgid "Cannot send empty chat!"
 msgstr "לא ניתן לשלוח הודעה ריקה!"
 
-#: src/gui/widgets/whispertab.cpp:70
+#: src/gui/widgets/whispertab.cpp:72
 msgid "/ignore > Ignore the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:71
+#: src/gui/widgets/whispertab.cpp:73
 msgid "/unignore > Stop ignoring the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:72
+#: src/gui/widgets/whispertab.cpp:74
 msgid "/close > Close the whisper tab"
 msgstr "/close > סוגר את לשונית הלחישות"
 
-#: src/gui/widgets/whispertab.cpp:82
+#: src/gui/widgets/whispertab.cpp:84
 msgid "Command: /close"
 msgstr "פקודה: /close"
 
-#: src/gui/widgets/whispertab.cpp:83
+#: src/gui/widgets/whispertab.cpp:85
 msgid "This command closes the current whisper tab."
 msgstr "הפקודה סוגרת את לשונית הלחישות הנוכחית."
 
-#: src/gui/widgets/whispertab.cpp:87
+#: src/gui/widgets/whispertab.cpp:89
 #, fuzzy
 msgid "Command: /ignore"
 msgstr "פקודה: /item"
 
-#: src/gui/widgets/whispertab.cpp:88
+#: src/gui/widgets/whispertab.cpp:90
 #, fuzzy
 msgid "This command ignores the other player regardless of current relations."
 msgstr "פקודה זו מציגה את מספר השחקנים המחוברים כרגע."
 
-#: src/gui/widgets/whispertab.cpp:94
+#: src/gui/widgets/whispertab.cpp:96
 #, fuzzy
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr "פקודה זו מתחילה להקליט רישום שיחה לקובץ <filename>."
 
-#: src/gui/windowmenu.cpp:55
+#: src/gui/windowmenu.cpp:54
 msgid "Status"
 msgstr "מצב"
 
-#: src/gui/windowmenu.cpp:61
+#: src/gui/windowmenu.cpp:65
 msgid "Shortcut"
 msgstr "קיצור־דרך"
 
@@ -2313,638 +2156,1004 @@ msgstr "שנה"
 msgid "Choose World"
 msgstr "בחר את השרת שלך"
 
-#: src/keyboardconfig.cpp:40
+#: src/keyboardconfig.cpp:39
 msgid "Move Up"
 msgstr "הזז למעלה"
 
-#: src/keyboardconfig.cpp:41
+#: src/keyboardconfig.cpp:40
 msgid "Move Down"
 msgstr "הזז למטה"
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:41
 msgid "Move Left"
 msgstr "הזז שמאלה"
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:42
 msgid "Move Right"
 msgstr "הזז ימינה"
 
-#: src/keyboardconfig.cpp:44 src/net/ea/generalhandler.cpp:223
+#: src/keyboardconfig.cpp:43 src/net/tmwa/generalhandler.cpp:237
 msgid "Attack"
 msgstr "תקוף"
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:44
 msgid "Target & Attack"
 msgstr "כוון ותקוף"
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:45
 msgid "Smilie"
 msgstr "חייך"
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:46
 msgid "Talk"
 msgstr "דבר"
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:47
 msgid "Stop Attack"
 msgstr "הפסק לתקוף"
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:48
 #, fuzzy
 msgid "Target Monster"
 msgstr "כוון לקרוב ביותר"
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboardconfig.cpp:49
 msgid "Target NPC"
 msgstr "כוון לדמות"
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:50
 msgid "Target Player"
 msgstr "כוון לשחקן"
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:51
 msgid "Pickup"
 msgstr "הרם"
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:52
 msgid "Hide Windows"
 msgstr "הסתר חלונות"
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:53
 msgid "Sit"
 msgstr "שב"
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:54
 msgid "Screenshot"
 msgstr "תמונת־מסך"
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:55
 msgid "Enable/Disable Trading"
 msgstr "אפשר/בטל מסחר"
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:56
 msgid "Find Path to Mouse"
 msgstr "מצא נתיב לעכבר"
 
-#: src/keyboardconfig.cpp:58 src/keyboardconfig.cpp:59
-#: src/keyboardconfig.cpp:60 src/keyboardconfig.cpp:61
-#: src/keyboardconfig.cpp:62 src/keyboardconfig.cpp:63
-#: src/keyboardconfig.cpp:64 src/keyboardconfig.cpp:65
-#: src/keyboardconfig.cpp:66 src/keyboardconfig.cpp:67
-#: src/keyboardconfig.cpp:68 src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:57 src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60
+#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62
+#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64
+#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68
 #, c-format
 msgid "Item Shortcut %d"
 msgstr "קיצור־דרך לחפץ %d"
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:69
 msgid "Help Window"
 msgstr "חלון עזרה"
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:70
 msgid "Status Window"
 msgstr "חלון מצב"
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:71
 msgid "Inventory Window"
 msgstr "חלון ציוד"
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:72
 msgid "Equipment Window"
 msgstr "חלון לבוש"
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:73
 msgid "Skill Window"
 msgstr "חלון כישורים"
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:74
 msgid "Minimap Window"
 msgstr "חלון מיני מפה"
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:75
 msgid "Chat Window"
 msgstr "חלון שיחה"
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:76
 msgid "Item Shortcut Window"
 msgstr "חלון קיצור־דרך לחפץ"
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:77
 msgid "Setup Window"
 msgstr "חלון הגדרות"
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:78
 msgid "Debug Window"
 msgstr "חלון ניפוי"
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:79
 #, fuzzy
 msgid "Social Window"
 msgstr "חלון כישורים"
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:80
 msgid "Emote Shortcut Window"
 msgstr "חלון קיצור־דרך לרגישון"
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:81
 #, fuzzy
 msgid "Outfits Window"
 msgstr "חלון מצב"
 
-#: src/keyboardconfig.cpp:83
+#: src/keyboardconfig.cpp:82
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:83
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86
-#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88
-#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90
-#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92
-#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:84 src/keyboardconfig.cpp:85
+#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:87
+#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:89
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:91
+#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:93
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:95
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "קיצור־דרך לריגשון %d"
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:96
 msgid "Toggle Chat"
 msgstr "סגירת הצ'אט"
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:97
 msgid "Scroll Chat Up"
 msgstr "גלול שיחה למעלה"
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:98
 msgid "Scroll Chat Down"
 msgstr "גלול שיחה למטה"
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:99
 msgid "Previous Chat Tab"
 msgstr "לשונית השיחה הקודמת"
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:100
 msgid "Next Chat Tab"
 msgstr "לשונית השיחה הבאה"
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:101
 msgid "Select OK"
 msgstr "בחר אישור"
 
-#: src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:103
 msgid "Ignore input 1"
 msgstr "קלט התעלמות 1"
 
-#: src/keyboardconfig.cpp:105
+#: src/keyboardconfig.cpp:104
 msgid "Ignore input 2"
 msgstr "קלט התעלמות 2"
 
-#: src/keyboardconfig.cpp:178
+#: src/keyboardconfig.cpp:183
 #, fuzzy, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr "פתור אותם, אחרת המשחק עלול להתנהג באופן מוזר."
 
-#: src/localplayer.cpp:913
+#: src/localplayer.cpp:985
 msgid "Unable to pick up item."
 msgstr "לא ניתן להרים את החפץ."
 
 #. TRANSLATORS: This sentence may be translated differently
 #. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:922
+#: src/localplayer.cpp:994
 #, fuzzy, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "הרמת %s [@@%d|%s@@]."
 msgstr[1] "הרמת %s [@@%d|%s@@]."
 
-#: src/main.cpp:43
+#: src/main.cpp:42
 msgid "mana [options] [mana-file]"
 msgstr ""
 
+#: src/main.cpp:43
+msgid "[mana-file] : The mana file is an XML file (.mana)"
+msgstr ""
+
 #: src/main.cpp:44
+msgid "              used to set custom parameters"
+msgstr ""
+
+#: src/main.cpp:45
+msgid "              to the mana client."
+msgstr ""
+
+#: src/main.cpp:47
 msgid "Options:"
 msgstr "אפשרויות:"
 
-#: src/main.cpp:45
+#: src/main.cpp:48
 #, fuzzy
 msgid "  -v --version        : Display the version"
 msgstr "  -v --version     : Display the version"
 
-#: src/main.cpp:46
+#: src/main.cpp:49
 #, fuzzy
 msgid "  -h --help           : Display this help"
 msgstr "  -h --help        : Display this help"
 
-#: src/main.cpp:47
+#: src/main.cpp:50
 #, fuzzy
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr "  -C --config-file : Configuration file to use"
 
-#: src/main.cpp:48
+#: src/main.cpp:51
 #, fuzzy
 msgid "  -U --username       : Login with this username"
 msgstr "  -U --username    : Login with this username"
 
-#: src/main.cpp:49
+#: src/main.cpp:52
 #, fuzzy
 msgid "  -P --password       : Login with this password"
 msgstr "  -P --password    : Login with this password"
 
-#: src/main.cpp:50
+#: src/main.cpp:53
 #, fuzzy
 msgid "  -c --character      : Login with this character"
 msgstr "  -c --character   : Login with this character"
 
-#: src/main.cpp:51
+#: src/main.cpp:54
 #, fuzzy
 msgid "  -s --server         : Login server name or IP"
 msgstr "  -s --server      : Login server name or IP"
 
-#: src/main.cpp:52
+#: src/main.cpp:55
 #, fuzzy
 msgid "  -p --port           : Login server port"
 msgstr "  -p --port        : Login server port"
 
-#: src/main.cpp:53
+#: src/main.cpp:56
 #, fuzzy
 msgid "     --update-host    : Use this update host"
 msgstr "  -H --update-host : Use this update host"
 
-#: src/main.cpp:54
+#: src/main.cpp:57
 #, fuzzy
 msgid "  -D --default        : Choose default character server and character"
 msgstr "  -D --default     : Choose default character server and character"
 
-#: src/main.cpp:56
+#: src/main.cpp:59
 #, fuzzy
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr "  -u --skip-update : Skip the update downloads"
 
-#: src/main.cpp:57
+#: src/main.cpp:60
 #, fuzzy
 msgid "  -d --data           : Directory to load game data from"
 msgstr "  -d --data        : Directory to load game data from"
 
-#: src/main.cpp:58
+#: src/main.cpp:61
 #, fuzzy
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
+msgid "     --localdata-dir  : Directory to use as local data directory"
 msgstr "  -S --home-dir    : Directory to use as home directory"
 
-#: src/main.cpp:59
+#: src/main.cpp:62
+#, fuzzy
+msgid "     --chat-log-dir   : Chat log dir to use"
+msgstr "  -C --config-file : Configuration file to use"
+
+#: src/main.cpp:63
 #, fuzzy
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr "  -S --home-dir    : Directory to use as home directory"
 
-#: src/main.cpp:61
+#: src/main.cpp:65
 #, fuzzy
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr "  -O --no-opengl   : Disable OpenGL for this session"
 
-#: src/net/ea/adminhandler.cpp:63
+#: src/net/manaserv/beinghandler.cpp:303 src/net/tmwa/playerhandler.cpp:94
+msgid "You are dead."
+msgstr "אתה מת."
+
+#: src/net/manaserv/beinghandler.cpp:304 src/net/tmwa/playerhandler.cpp:95
+msgid "We regret to inform you that your character was killed in battle."
+msgstr "צר לנו לבשר לכם כי שחקנכם נהרג בקרב."
+
+#: src/net/manaserv/beinghandler.cpp:306 src/net/tmwa/playerhandler.cpp:97
+msgid "You are not that alive anymore."
+msgstr "אינך חי כל־כך כרגע."
+
+#: src/net/manaserv/beinghandler.cpp:307 src/net/tmwa/playerhandler.cpp:98
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr "קור ידיו של המוות הקודר אוחזים בנשמתך."
+
+#: src/net/manaserv/beinghandler.cpp:308 src/net/tmwa/playerhandler.cpp:99
+msgid "Game Over!"
+msgstr "המשחק נגמר!"
+
+#: src/net/manaserv/beinghandler.cpp:309 src/net/tmwa/playerhandler.cpp:101
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr "לא, ילדים. השחקן שלכם לא באמת מת. הוא... אה... הלך למקום טוב יותר."
+
+#: src/net/manaserv/beinghandler.cpp:311 src/net/tmwa/playerhandler.cpp:103
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr "תוכניתך לשבור את נשק האויב באמצות צווארך נכשלה."
+
+#: src/net/manaserv/beinghandler.cpp:313 src/net/tmwa/playerhandler.cpp:105
+msgid "I guess this did not run too well."
+msgstr "אני מניח שלא הלך לך כל־כך טוב."
+
+#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:107
+msgid "Do you want your possessions identified?"
+msgstr "האם ברצונך שיאתרו את חלקי גופתך?"
+
+#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:109
+msgid "Sadly, no trace of you was ever found..."
+msgstr "באופן מצער, מעולם לא נמצא זכר ממך..."
+
+#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:111
+msgid "Annihilated."
+msgstr "הושמדתך."
+
+#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:113
+msgid "Looks like you got your head handed to you."
+msgstr "נראה כאילו ראשך נמסר אליך."
+
+#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:115
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr "פישלת שוב, גופתך תיזרק לצינוק ותקבל אחת חדשה."
+
+#: src/net/manaserv/beinghandler.cpp:323
+#, fuzzy
+msgid "Press OK to respawn."
+msgstr " לחץ אישור כדי להשיב"
+
+#: src/net/manaserv/beinghandler.cpp:324
+#, fuzzy
+msgid "You Died"
+msgstr "נהרגת"
+
+#: src/net/manaserv/charhandler.cpp:138 src/net/manaserv/charhandler.cpp:209
+#, fuzzy
+msgid "Not logged in."
+msgstr "כבר מחובר"
+
+#: src/net/manaserv/charhandler.cpp:141
+msgid "No empty slot."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:144
+msgid "Invalid name."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:147
+#, fuzzy
+msgid "Character's name already exists."
+msgstr "שם המשתמש כבר בשימוש"
+
+#: src/net/manaserv/charhandler.cpp:150
+msgid "Invalid hairstyle."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:153
+msgid "Invalid hair color."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:156
+msgid "Invalid gender."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:159
+#, fuzzy
+msgid "Character's stats are too high."
+msgstr "נתוני שחקן - אישור"
+
+#: src/net/manaserv/charhandler.cpp:162
+#, fuzzy
+msgid "Character's stats are too low."
+msgstr "נתוני שחקן - אישור"
+
+#: src/net/manaserv/charhandler.cpp:165
+#, c-format
+msgid "At least one statis out of the permitted range: (%u - %u)."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:171 src/net/manaserv/loginhandler.cpp:96
+#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
+#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
+#: src/net/tmwa/loginhandler.cpp:95 src/net/tmwa/loginhandler.cpp:182
+#, fuzzy
+msgid "Unknown error."
+msgstr "שגיאה לא ידועה"
+
+#: src/net/manaserv/charhandler.cpp:200 src/net/tmwa/charserverhandler.cpp:146
+msgid "Info"
+msgstr "מידע"
+
+#: src/net/manaserv/charhandler.cpp:200
+#, fuzzy
+msgid "Player deleted."
+msgstr "השחקן נמחק."
+
+#: src/net/manaserv/charhandler.cpp:212
+#, fuzzy
+msgid "Selection out of range."
+msgstr "בחר כמות חפצים לסחור."
+
+#: src/net/manaserv/charhandler.cpp:215
+#, fuzzy, c-format
+msgid "Unknown error (%d)."
+msgstr "שגיאה לא ידועה"
+
+#: src/net/manaserv/charhandler.cpp:250
+msgid "No gameservers are available."
+msgstr "אין שרתי משחק זמינים."
+
+#: src/net/manaserv/chathandler.cpp:187 src/net/manaserv/chathandler.cpp:313
+#: src/net/manaserv/guildhandler.cpp:260
+#, c-format
+msgid "Topic: %s"
+msgstr "כותרת: %s"
+
+#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:274
+#, fuzzy
+msgid "Players in this channel:"
+msgstr "משתמש מכה מפלצת"
+
+#: src/net/manaserv/chathandler.cpp:208
+#, fuzzy
+msgid "Error joining channel."
+msgstr "פקודה: /join <channel>"
+
+#: src/net/manaserv/chathandler.cpp:214
+#, fuzzy
+msgid "Listing channels."
+msgstr "מבקש להצטרף לחדר %s."
+
+#: src/net/manaserv/chathandler.cpp:226
+msgid "End of channel list."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:303
+#, fuzzy, c-format
+msgid "%s entered the channel."
+msgstr "%s הצטרף לחבורה."
+
+#: src/net/manaserv/chathandler.cpp:308
+#, c-format
+msgid "%s left the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:324
+#, c-format
+msgid "%s has set mode %s on user %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:334
+#, c-format
+msgid "%s has kicked %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:339
+#, fuzzy
+msgid "Unknown channel event."
+msgstr "פקודה לא מוכרת."
+
+#: src/net/manaserv/guildhandler.cpp:82
+msgid "Guild created."
+msgstr "גילדה נוצרה."
+
+#: src/net/manaserv/guildhandler.cpp:87
+msgid "Error creating guild."
+msgstr "שגיאה ביצירת גילדה."
+
+#: src/net/manaserv/guildhandler.cpp:97
+msgid "Invite sent."
+msgstr "הזמנה נשלחה."
+
+#: src/net/manaserv/guildhandler.cpp:204
+msgid "Member was promoted successfully."
+msgstr "החבר קודם בהצלחה."
+
+#: src/net/manaserv/guildhandler.cpp:209
+msgid "Failed to promote member."
+msgstr "נכשל בקידום החבר."
+
+#: src/net/manaserv/loginhandler.cpp:87
+#, fuzzy
+msgid "Wrong magic_token."
+msgstr "magic_token שגוי"
+
+#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
+#, fuzzy
+msgid "Already logged in."
+msgstr "כבר מחובר"
+
+#: src/net/manaserv/loginhandler.cpp:93
+#, fuzzy
+msgid "Account banned."
+msgstr "המשתמש מושהה"
+
+#: src/net/manaserv/loginhandler.cpp:118
+#, fuzzy
+msgid "New password incorrect."
+msgstr "הסיסמה החדשה שגויה"
+
+#: src/net/manaserv/loginhandler.cpp:121 src/net/tmwa/loginhandler.cpp:89
+#, fuzzy
+msgid "Old password incorrect."
+msgstr "הסיסמה הישנה שגויה"
+
+#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
+msgid "Account not connected. Please login first."
+msgstr "החשבון אינו מחובר. אנא קודם־כל התחבר."
+
+#: src/net/manaserv/loginhandler.cpp:149
+#, fuzzy
+msgid "New email address incorrect."
+msgstr "כתובת דוא\"ל חדשה שגויה"
+
+#: src/net/manaserv/loginhandler.cpp:152
+#, fuzzy
+msgid "Old email address incorrect."
+msgstr "כתובת דוא\"ל ישנה שגויה"
+
+#: src/net/manaserv/loginhandler.cpp:158
+#, fuzzy
+msgid "The new email address already exists."
+msgstr "כתובת הדוא\"ל החדשה כבר בשימוש."
+
+#: src/net/manaserv/loginhandler.cpp:239
+msgid ""
+"Client registration is not allowed. Please contact server administration."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
+#, fuzzy
+msgid "Client version is too old."
+msgstr "גרסת הקליינט ישנה מדי"
+
+#: src/net/manaserv/loginhandler.cpp:266
+#, fuzzy
+msgid "Wrong username or password."
+msgstr "שם משתמש או סיסמה שגויים"
+
+#: src/net/manaserv/loginhandler.cpp:272
+#, fuzzy
+msgid "Account banned"
+msgstr "המשתמש מושהה"
+
+#: src/net/manaserv/loginhandler.cpp:275
+msgid "Login attempt too soon after previous attempt."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:303
+#, fuzzy
+msgid "Wrong username, password or email address."
+msgstr "שם משתמש, סיסמה או דוא\"ל שגויים"
+
+#: src/net/manaserv/loginhandler.cpp:306
+#, fuzzy
+msgid "Username already exists."
+msgstr "שם המשתמש כבר בשימוש"
+
+#: src/net/manaserv/loginhandler.cpp:309
+#, fuzzy
+msgid "Email address already exists."
+msgstr "כתובת הדוא\"ל כבר בשימוש"
+
+#: src/net/manaserv/loginhandler.cpp:312
+msgid "You took too long with the captcha or your response was incorrect."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:87
+msgid "Joined party."
+msgstr "הצטרפת לחבורה."
+
+#: src/net/manaserv/partyhandler.cpp:105
+#, c-format
+msgid "%s joined the party."
+msgstr "%s הצטרף לחבורה."
+
+#: src/net/manaserv/partyhandler.cpp:123
+#, fuzzy, c-format
+msgid "%s rejected your invite."
+msgstr "%s דחה את הזמנתך."
+
+#: src/net/manaserv/tradehandler.cpp:95
+msgid "Accepting incoming trade requests."
+msgstr "מקבל בקשות מסחר נכנסות."
+
+#: src/net/manaserv/tradehandler.cpp:97
+msgid "Ignoring incoming trade requests."
+msgstr "מתעלם מבקשות סחר נכנסות."
+
+#: src/net/manaserv/tradehandler.cpp:115 src/net/tmwa/tradehandler.cpp:109
+msgid "Request for Trade"
+msgstr "בקשה למסחר"
+
+#: src/net/manaserv/tradehandler.cpp:116 src/net/tmwa/tradehandler.cpp:110
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
+msgstr "%s מעוניין לסחור עימך, האם אתה מסכים?"
+
+#: src/net/manaserv/tradehandler.cpp:134
+#, c-format
+msgid "Trading with %s"
+msgstr "סוחר עם%s"
+
+#: src/net/manaserv/tradehandler.cpp:148 src/net/tmwa/tradehandler.cpp:224
+msgid "Trade canceled."
+msgstr "המסחר בוטל."
+
+#: src/net/manaserv/tradehandler.cpp:155 src/net/tmwa/tradehandler.cpp:231
+msgid "Trade completed."
+msgstr "המסחר הושלם."
+
+#: src/net/tmwa/adminhandler.cpp:64
 msgid "Kick failed!"
 msgstr "העפה נכשלה!"
 
-#: src/net/ea/adminhandler.cpp:65
+#: src/net/tmwa/adminhandler.cpp:66
 msgid "Kick succeeded!"
 msgstr "העפה הצליחה!"
 
-#: src/net/ea/buysellhandler.cpp:110
+#: src/net/tmwa/buysellhandler.cpp:109
 msgid "Nothing to sell."
 msgstr "אין מה למכור."
 
-#: src/net/ea/buysellhandler.cpp:117
+#: src/net/tmwa/buysellhandler.cpp:116
 msgid "Thanks for buying."
 msgstr "תודה על הקנייה."
 
-#: src/net/ea/buysellhandler.cpp:124
+#: src/net/tmwa/buysellhandler.cpp:123
 msgid "Unable to buy."
 msgstr "לא ניתן לקנות."
 
-#: src/net/ea/buysellhandler.cpp:130
+#: src/net/tmwa/buysellhandler.cpp:129
 msgid "Thanks for selling."
 msgstr "תודה על המכירה."
 
-#: src/net/ea/buysellhandler.cpp:132
+#: src/net/tmwa/buysellhandler.cpp:131
 msgid "Unable to sell."
 msgstr "לא ניתן למכור."
 
-#: src/net/ea/charserverhandler.cpp:103
-#, fuzzy
-msgid "Access denied."
-msgstr "הגישה נדחתה"
+#: src/net/tmwa/charserverhandler.cpp:103
+msgid "Access denied. Most likely, there are too many players on this server."
+msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:106
+#: src/net/tmwa/charserverhandler.cpp:107
 #, fuzzy
 msgid "Cannot use this ID."
 msgstr "לא ניתן להשתמש ב-ID זה."
 
-#: src/net/ea/charserverhandler.cpp:109
+#: src/net/tmwa/charserverhandler.cpp:110
 #, fuzzy
-msgid "Unknown failure to select character."
-msgstr "שגיאה לא ידועה בבחירת השחקן"
+msgid "Unknown char-server failure."
+msgstr "שגיאה לא ידועה"
 
-#: src/net/ea/charserverhandler.cpp:135
+#: src/net/tmwa/charserverhandler.cpp:134
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr "נכשל ביצירת השחקן. ייתכן כי שם זה כבר תפוס."
 
-#: src/net/ea/charserverhandler.cpp:147 src/net/manaserv/charhandler.cpp:187
-msgid "Info"
-msgstr "מידע"
-
-#: src/net/ea/charserverhandler.cpp:147
+#: src/net/tmwa/charserverhandler.cpp:146
 msgid "Character deleted."
 msgstr "השחקן נמחק."
 
-#: src/net/ea/charserverhandler.cpp:152
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Failed to delete character."
 msgstr "נכשל במחיקת השחקן."
 
-#: src/net/ea/charserverhandler.cpp:237 src/net/manaserv/charhandler.cpp:263
+#: src/net/tmwa/charserverhandler.cpp:266
 msgid "Strength:"
 msgstr "עוצמה:"
 
-#: src/net/ea/charserverhandler.cpp:238 src/net/manaserv/charhandler.cpp:264
+#: src/net/tmwa/charserverhandler.cpp:267
 msgid "Agility:"
 msgstr "זריזות:"
 
-#: src/net/ea/charserverhandler.cpp:239 src/net/manaserv/charhandler.cpp:266
+#: src/net/tmwa/charserverhandler.cpp:268
 msgid "Vitality:"
 msgstr "חיוניות:"
 
-#: src/net/ea/charserverhandler.cpp:240 src/net/manaserv/charhandler.cpp:267
+#: src/net/tmwa/charserverhandler.cpp:269
 msgid "Intelligence:"
 msgstr "תבונה:"
 
-#: src/net/ea/charserverhandler.cpp:241 src/net/manaserv/charhandler.cpp:265
+#: src/net/tmwa/charserverhandler.cpp:270
 msgid "Dexterity:"
 msgstr "מיומנות:"
 
-#: src/net/ea/charserverhandler.cpp:242
+#: src/net/tmwa/charserverhandler.cpp:271
 msgid "Luck:"
 msgstr "מזל:"
 
-#: src/net/ea/chathandler.cpp:80
-msgid "Whisper could not be sent, user is offline."
+#: src/net/tmwa/chathandler.cpp:87
+#, fuzzy, c-format
+msgid "Whisper could not be sent, %s is offline."
 msgstr "הלחישה לא יכלה להשלח, המשתמש אינו מחובר."
 
-#: src/net/ea/chathandler.cpp:84
-msgid "Whisper could not be sent, ignored by user."
+#: src/net/tmwa/chathandler.cpp:96
+#, fuzzy, c-format
+msgid "Whisper could not be sent, ignored by %s."
 msgstr "הלחישה לא יכלה להשלח, מהמשתמש מתעלם."
 
-#: src/net/ea/chathandler.cpp:171
+#: src/net/tmwa/chathandler.cpp:230
 #, fuzzy
 msgid "MVP player."
 msgstr "שחקן"
 
-#: src/net/ea/chathandler.cpp:204 src/net/ea/chathandler.cpp:210
-#: src/net/ea/chathandler.cpp:215 src/net/ea/chathandler.cpp:220
-#: src/net/ea/chathandler.cpp:225 src/net/ea/chathandler.cpp:230
-#: src/net/ea/chathandler.cpp:235 src/net/ea/chathandler.cpp:240
+#: src/net/tmwa/chathandler.cpp:265 src/net/tmwa/chathandler.cpp:271
+#: src/net/tmwa/chathandler.cpp:276 src/net/tmwa/chathandler.cpp:281
+#: src/net/tmwa/chathandler.cpp:286 src/net/tmwa/chathandler.cpp:291
+#: src/net/tmwa/chathandler.cpp:296 src/net/tmwa/chathandler.cpp:301
 msgid "Channels are not supported!"
 msgstr "חדרים אינם נתמכים!"
 
-#: src/net/ea/gamehandler.cpp:86
+#: src/net/tmwa/gamehandler.cpp:88
 #, c-format
 msgid "Online users: %d"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:100
+#: src/net/tmwa/gamehandler.cpp:101
 #, fuzzy
 msgid "Game"
 msgstr "שם"
 
-#: src/net/ea/gamehandler.cpp:100
+#: src/net/tmwa/gamehandler.cpp:101
 #, fuzzy
 msgid "Request to quit denied!"
 msgstr "בקשה למסחר"
 
-#: src/net/ea/generalhandler.cpp:102 src/net/manaserv/generalhandler.cpp:95
+#: src/net/tmwa/generalhandler.cpp:102
 #, c-format
 msgid "Strength %+d"
 msgstr "עוצמה %+d"
 
-#: src/net/ea/generalhandler.cpp:103 src/net/manaserv/generalhandler.cpp:96
+#: src/net/tmwa/generalhandler.cpp:103
 #, c-format
 msgid "Agility %+d"
 msgstr "זריזות %+d"
 
-#: src/net/ea/generalhandler.cpp:104 src/net/manaserv/generalhandler.cpp:98
+#: src/net/tmwa/generalhandler.cpp:104
 #, c-format
 msgid "Vitality %+d"
 msgstr "חיוניות %+d"
 
-#: src/net/ea/generalhandler.cpp:105 src/net/manaserv/generalhandler.cpp:99
+#: src/net/tmwa/generalhandler.cpp:105
 #, c-format
 msgid "Intelligence %+d"
 msgstr "תבונה %+d"
 
-#: src/net/ea/generalhandler.cpp:106 src/net/manaserv/generalhandler.cpp:97
+#: src/net/tmwa/generalhandler.cpp:106
 #, c-format
 msgid "Dexterity %+d"
 msgstr "מיומנות %+d"
 
-#: src/net/ea/generalhandler.cpp:107
+#: src/net/tmwa/generalhandler.cpp:107
 #, c-format
 msgid "Luck %+d"
 msgstr "מזל %+d"
 
-#: src/net/ea/generalhandler.cpp:130
+#: src/net/tmwa/generalhandler.cpp:132
 #, fuzzy
 msgid "Authentication failed."
 msgstr "האימות נכשל"
 
-#: src/net/ea/generalhandler.cpp:133
+#: src/net/tmwa/generalhandler.cpp:135
 #, fuzzy
 msgid "No servers available."
 msgstr "אין שרתים זמינים"
 
-#: src/net/ea/generalhandler.cpp:137
+#: src/net/tmwa/generalhandler.cpp:139
 #, fuzzy
 msgid "Someone else is trying to use this account."
 msgstr "אדם אחר מנסה להשתמש בחשבון זה"
 
-#: src/net/ea/generalhandler.cpp:140
+#: src/net/tmwa/generalhandler.cpp:142
 #, fuzzy
 msgid "This account is already logged in."
 msgstr "חשבון זה כבר מחובר"
 
-#: src/net/ea/generalhandler.cpp:143
+#: src/net/tmwa/generalhandler.cpp:145
 #, fuzzy
 msgid "Speed hack detected."
 msgstr "פריצת מהירות זוהתה"
 
-#: src/net/ea/generalhandler.cpp:146
+#: src/net/tmwa/generalhandler.cpp:148
 #, fuzzy
 msgid "Duplicated login."
 msgstr "התחברות כפולה"
 
-#: src/net/ea/generalhandler.cpp:149
+#: src/net/tmwa/generalhandler.cpp:151
 #, fuzzy
 msgid "Unknown connection error."
 msgstr "שגיאת חיבור לא ידועה"
 
-#: src/net/ea/generalhandler.cpp:205
+#: src/net/tmwa/generalhandler.cpp:209
 msgid "Got disconnected from server!"
 msgstr "נותקת מהשרת!"
 
-#: src/net/ea/generalhandler.cpp:216 src/net/manaserv/generalhandler.cpp:166
+#: src/net/tmwa/generalhandler.cpp:230
 msgid "Strength"
 msgstr "עוצמה"
 
-#: src/net/ea/generalhandler.cpp:217 src/net/manaserv/generalhandler.cpp:167
+#: src/net/tmwa/generalhandler.cpp:231
 msgid "Agility"
 msgstr "זריזות"
 
-#: src/net/ea/generalhandler.cpp:218 src/net/manaserv/generalhandler.cpp:169
+#: src/net/tmwa/generalhandler.cpp:232
 msgid "Vitality"
 msgstr "חיוניות"
 
-#: src/net/ea/generalhandler.cpp:219 src/net/manaserv/generalhandler.cpp:170
+#: src/net/tmwa/generalhandler.cpp:233
 msgid "Intelligence"
 msgstr "תבונה"
 
-#: src/net/ea/generalhandler.cpp:220 src/net/manaserv/generalhandler.cpp:168
+#: src/net/tmwa/generalhandler.cpp:234
 msgid "Dexterity"
 msgstr "מיומנות"
 
-#: src/net/ea/generalhandler.cpp:221
+#: src/net/tmwa/generalhandler.cpp:235
 msgid "Luck"
 msgstr "מזל"
 
-#: src/net/ea/generalhandler.cpp:224
+#: src/net/tmwa/generalhandler.cpp:238
 #, fuzzy
 msgid "Defense"
 msgstr "הגנה:"
 
-#: src/net/ea/generalhandler.cpp:225
+#: src/net/tmwa/generalhandler.cpp:239
 #, fuzzy
 msgid "M.Attack"
 msgstr "התקפת קסם:"
 
-#: src/net/ea/generalhandler.cpp:226
+#: src/net/tmwa/generalhandler.cpp:240
 #, fuzzy
 msgid "M.Defense"
 msgstr "הגנת קסם:"
 
-#: src/net/ea/generalhandler.cpp:227
+#: src/net/tmwa/generalhandler.cpp:241
 #, fuzzy, c-format
 msgid "% Accuracy"
 msgstr "% דיוק:"
 
-#: src/net/ea/generalhandler.cpp:228
+#: src/net/tmwa/generalhandler.cpp:242
 #, fuzzy, c-format
 msgid "% Evade"
 msgstr "% התחמקות:"
 
-#: src/net/ea/generalhandler.cpp:229
+#: src/net/tmwa/generalhandler.cpp:243
 #, fuzzy, c-format
 msgid "% Critical"
 msgstr "מכה קריטית"
 
-#: src/net/ea/gui/guildtab.cpp:61 src/net/ea/gui/partytab.cpp:59
+#: src/net/tmwa/gui/guildtab.cpp:45
+msgid "Guild"
+msgstr "גילדה"
+
+#: src/net/tmwa/gui/guildtab.cpp:61 src/net/tmwa/gui/partytab.cpp:59
 msgid "/help > Display this help."
 msgstr "/help > מציג עזרה זו."
 
-#: src/net/ea/gui/guildtab.cpp:62
+#: src/net/tmwa/gui/guildtab.cpp:62
 #, fuzzy
 msgid "/invite > Invite a player to your guild"
 msgstr "/invite > הזמן שחקן לחבורה שלך"
 
-#: src/net/ea/gui/guildtab.cpp:63
+#: src/net/tmwa/gui/guildtab.cpp:63
 #, fuzzy
 msgid "/leave > Leave the guild you are in"
 msgstr "/leave > עזוב את החבורה בה אתה נמצא"
 
-#: src/net/ea/gui/guildtab.cpp:64
+#: src/net/tmwa/gui/guildtab.cpp:64
 #, fuzzy
 msgid "/kick > Kick some one from the guild you are in"
 msgstr "/kick > העף מישהו מהחבורה בה אתה נמצא"
 
-#: src/net/ea/gui/guildtab.cpp:73 src/net/ea/gui/partytab.cpp:73
+#: src/net/tmwa/gui/guildtab.cpp:73 src/net/tmwa/gui/partytab.cpp:73
 msgid "Command: /invite <nick>"
 msgstr "פקודה: /invite <nick>"
 
-#: src/net/ea/gui/guildtab.cpp:74
+#: src/net/tmwa/gui/guildtab.cpp:74
 #, fuzzy
 msgid "This command invites <nick> to the guild you're in."
 msgstr "פקודה זו מזמינה את <nick> להיות בחבורתך."
 
-#: src/net/ea/gui/guildtab.cpp:80 src/net/ea/gui/partytab.cpp:80
+#: src/net/tmwa/gui/guildtab.cpp:80 src/net/tmwa/gui/partytab.cpp:80
 msgid "Command: /leave"
 msgstr "פקודה: /leave"
 
-#: src/net/ea/gui/guildtab.cpp:81
+#: src/net/tmwa/gui/guildtab.cpp:81
 #, fuzzy
 msgid "This command causes the player to leave the guild."
 msgstr "פקודה זו גורמת לשחקן לעזוב את החבורה."
 
-#: src/net/ea/gui/guildtab.cpp:89
+#: src/net/tmwa/gui/guildtab.cpp:89
 #, fuzzy
 msgid "Guild name is missing."
 msgstr "שם חבורה חסר."
 
-#: src/net/ea/guildhandler.cpp:293
+#: src/net/tmwa/guildhandler.cpp:296
 msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:298
+#: src/net/tmwa/guildhandler.cpp:301
 msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:303
+#: src/net/tmwa/guildhandler.cpp:306
 #, fuzzy
 msgid "User is now part of your guild."
 msgstr "%s הצטרף לחבורה."
 
-#: src/net/ea/guildhandler.cpp:308
+#: src/net/tmwa/guildhandler.cpp:311
 msgid "Your guild is full."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:313
+#: src/net/tmwa/guildhandler.cpp:316
 #, fuzzy
 msgid "Unknown guild invite response."
 msgstr "תגובה לא ידועה להזמנה עבור %s."
 
-#: src/net/ea/guildhandler.cpp:390
+#: src/net/tmwa/guildhandler.cpp:393
 msgid "Guild creation isn't supported yet."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:60
+#: src/net/tmwa/gui/partytab.cpp:43
+msgid "Party"
+msgstr "חבורה"
+
+#: src/net/tmwa/gui/partytab.cpp:60
 msgid "/invite > Invite a player to your party"
 msgstr "/invite > הזמן שחקן לחבורה שלך"
 
-#: src/net/ea/gui/partytab.cpp:61
+#: src/net/tmwa/gui/partytab.cpp:61
 msgid "/leave > Leave the party you are in"
 msgstr "/leave > עזוב את החבורה בה אתה נמצא"
 
-#: src/net/ea/gui/partytab.cpp:62
+#: src/net/tmwa/gui/partytab.cpp:62
 msgid "/kick > Kick some one from the party you are in"
 msgstr "/kick > העף מישהו מהחבורה בה אתה נמצא"
 
-#: src/net/ea/gui/partytab.cpp:63
+#: src/net/tmwa/gui/partytab.cpp:63
 msgid "/item > Show/change party item sharing options"
 msgstr "/item > הצג/שנה את אפשרויות השיתוף של חפץ בחבורה"
 
-#: src/net/ea/gui/partytab.cpp:64
+#: src/net/tmwa/gui/partytab.cpp:64
 msgid "/exp > Show/change party experience sharing options"
 msgstr "/exp > הצג/שנה את אפשרויות שיתוף הנסיון בחבורה"
 
-#: src/net/ea/gui/partytab.cpp:81
+#: src/net/tmwa/gui/partytab.cpp:81
 msgid "This command causes the player to leave the party."
 msgstr "פקודה זו גורמת לשחקן לעזוב את החבורה."
 
-#: src/net/ea/gui/partytab.cpp:85
+#: src/net/tmwa/gui/partytab.cpp:85
 msgid "Command: /item <policy>"
 msgstr "פקודה: /item <policy>"
 
-#: src/net/ea/gui/partytab.cpp:86
+#: src/net/tmwa/gui/partytab.cpp:86
 msgid "This command changes the party's item sharing policy."
 msgstr "הפקודה משנה את מדיניות השיתוף של חפצים בחבורה."
 
-#: src/net/ea/gui/partytab.cpp:87
+#: src/net/tmwa/gui/partytab.cpp:87
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
@@ -2952,133 +3161,120 @@ msgstr ""
 "<policy> יכול להיות אחד מ- \"1\", \"yes\", \"true\" כדי לאפשר שיתוף חפץ, או "
 "\"0\", \"no\", \"false\" כדי לבטל שיתוף חפץ."
 
-#: src/net/ea/gui/partytab.cpp:90
+#: src/net/tmwa/gui/partytab.cpp:90
 msgid "Command: /item"
 msgstr "פקודה: /item"
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/tmwa/gui/partytab.cpp:91
 msgid "This command displays the party's current item sharing policy."
 msgstr "הפקודה מציגה את מדיניות השיתוף של חפצים בחבורה."
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/tmwa/gui/partytab.cpp:95
 msgid "Command: /exp <policy>"
 msgstr "פקודה: /exp <policy>"
 
-#: src/net/ea/gui/partytab.cpp:96
+#: src/net/tmwa/gui/partytab.cpp:96
 msgid "This command changes the party's experience sharing policy."
 msgstr "פקודה זו משנה את מדיניות שיתוף הנסיון בחבורה."
 
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/tmwa/gui/partytab.cpp:97
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 msgstr ""
-"<policy> יכול להיות  \"1\", \"yes\", \"true\" כדי לאפשר שיתוף נסיון, או \"0"
-"\", \"no\", \"false\" כדי לבטל שיתוף נסיון."
+"<policy> יכול להיות  \"1\", \"yes\", \"true\" כדי לאפשר שיתוף נסיון, או "
+"\"0\", \"no\", \"false\" כדי לבטל שיתוף נסיון."
 
-#: src/net/ea/gui/partytab.cpp:100
+#: src/net/tmwa/gui/partytab.cpp:100
 msgid "Command: /exp"
 msgstr "פקודה: /exp"
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/tmwa/gui/partytab.cpp:101
 msgid "This command displays the party's current experience sharing policy."
 msgstr "פקודה זו מציגה את מדיניות שיתוף הנסיון הנוכחית בחבורה."
 
-#: src/net/ea/gui/partytab.cpp:132 src/net/ea/partyhandler.cpp:198
+#: src/net/tmwa/gui/partytab.cpp:132 src/net/tmwa/partyhandler.cpp:196
 msgid "Item sharing enabled."
 msgstr "שיתוף חפצים מאופשר."
 
-#: src/net/ea/gui/partytab.cpp:135 src/net/ea/partyhandler.cpp:204
+#: src/net/tmwa/gui/partytab.cpp:135 src/net/tmwa/partyhandler.cpp:202
 msgid "Item sharing disabled."
 msgstr "שיתוף חפצים מבוטל."
 
-#: src/net/ea/gui/partytab.cpp:138 src/net/ea/partyhandler.cpp:210
+#: src/net/tmwa/gui/partytab.cpp:138 src/net/tmwa/partyhandler.cpp:208
 msgid "Item sharing not possible."
 msgstr "שיתוף חפצים לא אפשרי."
 
-#: src/net/ea/gui/partytab.cpp:141
+#: src/net/tmwa/gui/partytab.cpp:141
 #, fuzzy
 msgid "Item sharing unknown."
 msgstr "שיתוף חפצים מאופשר."
 
-#: src/net/ea/gui/partytab.cpp:167 src/net/ea/partyhandler.cpp:174
+#: src/net/tmwa/gui/partytab.cpp:167 src/net/tmwa/partyhandler.cpp:172
 msgid "Experience sharing enabled."
 msgstr "שיתוף נסיון מאופשר."
 
-#: src/net/ea/gui/partytab.cpp:170 src/net/ea/partyhandler.cpp:180
+#: src/net/tmwa/gui/partytab.cpp:170 src/net/tmwa/partyhandler.cpp:178
 msgid "Experience sharing disabled."
 msgstr "שיתוף נסיון מבוטל."
 
-#: src/net/ea/gui/partytab.cpp:173 src/net/ea/partyhandler.cpp:186
+#: src/net/tmwa/gui/partytab.cpp:173 src/net/tmwa/partyhandler.cpp:184
 msgid "Experience sharing not possible."
 msgstr "שיתוף נסיון לא אפשרי."
 
-#: src/net/ea/gui/partytab.cpp:176
+#: src/net/tmwa/gui/partytab.cpp:176
 #, fuzzy
 msgid "Experience sharing unknown."
 msgstr "שיתוף נסיון מאופשר."
 
-#: src/net/ea/inventoryhandler.cpp:281
+#: src/net/tmwa/inventoryhandler.cpp:285
 msgid "Failed to use item."
 msgstr "נכשל בשימוש בחפץ."
 
-#: src/net/ea/inventoryhandler.cpp:391
+#: src/net/tmwa/inventoryhandler.cpp:399
 msgid "Unable to equip."
 msgstr "לא ניתן ללבוש."
 
-#: src/net/ea/inventoryhandler.cpp:402
+#: src/net/tmwa/inventoryhandler.cpp:410
 msgid "Unable to unequip."
 msgstr "לא ניתן להסיר."
 
-#: src/net/ea/loginhandler.cpp:79
+#: src/net/tmwa/loginhandler.cpp:86
 msgid "Account was not found. Please re-login."
 msgstr "החשבון לא נמצא. אנא נסה להתחבר שנית."
 
-#: src/net/ea/loginhandler.cpp:82 src/net/manaserv/loginhandler.cpp:121
-#, fuzzy
-msgid "Old password incorrect."
-msgstr "הסיסמה הישנה שגויה"
-
-#: src/net/ea/loginhandler.cpp:85
+#: src/net/tmwa/loginhandler.cpp:92
 #, fuzzy
 msgid "New password too short."
 msgstr "הסיסמה החדשה קצרה מדי"
 
-#: src/net/ea/loginhandler.cpp:88 src/net/ea/loginhandler.cpp:175
-#: src/net/manaserv/charhandler.cpp:158 src/net/manaserv/loginhandler.cpp:96
-#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
-#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
-#, fuzzy
-msgid "Unknown error."
-msgstr "שגיאה לא ידועה"
-
-#: src/net/ea/loginhandler.cpp:149
+#: src/net/tmwa/loginhandler.cpp:156
 #, fuzzy
 msgid "Unregistered ID."
 msgstr "ID לא רשום"
 
-#: src/net/ea/loginhandler.cpp:152
+#: src/net/tmwa/loginhandler.cpp:159
 #, fuzzy
 msgid "Wrong password."
 msgstr "סיסמה שגויה"
 
-#: src/net/ea/loginhandler.cpp:155
+#: src/net/tmwa/loginhandler.cpp:162
 #, fuzzy
 msgid "Account expired."
 msgstr "המשתמש מושהה"
 
-#: src/net/ea/loginhandler.cpp:158
+#: src/net/tmwa/loginhandler.cpp:165
 #, fuzzy
 msgid "Rejected from server."
 msgstr "הועפת מהשרת"
 
-#: src/net/ea/loginhandler.cpp:161
+#: src/net/tmwa/loginhandler.cpp:168
 #, fuzzy
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr "הורחקת לצמיתות מן המשחק. אנא צור קשר עם צוות המנהלים."
 
-#: src/net/ea/loginhandler.cpp:165
+#: src/net/tmwa/loginhandler.cpp:172
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -3087,662 +3283,512 @@ msgstr ""
 "הורחקת זמנית מן המשחק עד %s.\n"
 "אנא צור קשר עם צוות המנהלים באמצעות מערכת הפורומים."
 
-#: src/net/ea/loginhandler.cpp:172
+#: src/net/tmwa/loginhandler.cpp:179
 #, fuzzy
 msgid "This user name is already taken."
 msgstr "שם המשתמש כבר נלקח"
 
-#: src/net/ea/network.cpp:145
+#: src/net/tmwa/network.cpp:145
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/ea/network.cpp:345
+#: src/net/tmwa/network.cpp:345
 #, fuzzy
 msgid "Unable to resolve host \""
 msgstr "לא ניתן למכור."
 
-#: src/net/ea/network.cpp:414
+#: src/net/tmwa/network.cpp:414
 #, fuzzy
 msgid "Connection to server terminated. "
 msgstr "מתחבר לשרת המפה..."
 
-#: src/net/ea/partyhandler.cpp:81
+#: src/net/tmwa/partyhandler.cpp:82
 msgid "Could not create party."
 msgstr "לא היה ניתן ליצור חבורה."
 
-#: src/net/ea/partyhandler.cpp:84
+#: src/net/tmwa/partyhandler.cpp:84
 msgid "Party successfully created."
 msgstr "חבורה נוצרה בהצלחה."
 
-#: src/net/ea/partyhandler.cpp:118
+#: src/net/tmwa/partyhandler.cpp:119
 #, c-format
 msgid "%s is already a member of a party."
 msgstr "%s כבר חבר בחבורה."
 
-#: src/net/ea/partyhandler.cpp:122
+#: src/net/tmwa/partyhandler.cpp:123
 #, c-format
 msgid "%s refused your invitation."
 msgstr "%s דחה את הזמנתך."
 
-#: src/net/ea/partyhandler.cpp:126
+#: src/net/tmwa/partyhandler.cpp:127
 #, c-format
 msgid "%s is now a member of your party."
 msgstr "%s הצטרף לחבורה."
 
-#: src/net/ea/partyhandler.cpp:130
+#: src/net/tmwa/partyhandler.cpp:131
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr "תגובה לא ידועה להזמנה עבור %s."
 
-#: src/net/ea/partyhandler.cpp:238
+#: src/net/tmwa/partyhandler.cpp:236
 msgid "You have left the party."
 msgstr "עזבת את החבורה."
 
-#: src/net/ea/partyhandler.cpp:249
+#: src/net/tmwa/partyhandler.cpp:246
 #, c-format
 msgid "%s has left your party."
 msgstr "%s עזב את החבורה שלך."
 
-#: src/net/ea/partyhandler.cpp:301
+#: src/net/tmwa/partyhandler.cpp:299
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr "משתמש לא ידוע ניסה לומר: %s"
 
-#: src/net/ea/partyhandler.cpp:329
-msgid "Inviting like this isn't supported at the moment."
-msgstr "הזמנה בדרך זו אינה נתמכת כרגע."
+#: src/net/tmwa/partyhandler.cpp:335
+#, c-format
+msgid "Inviting failed, because you can't see a player called %s."
+msgstr ""
 
-#: src/net/ea/partyhandler.cpp:334
+#: src/net/tmwa/partyhandler.cpp:340
 msgid "You can only inivte when you are in a party!"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:365
+#: src/net/tmwa/partyhandler.cpp:368
 #, c-format
 msgid "%s is not in your party!"
 msgstr "%s אינו נמצא בחבורתך!"
 
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:304
-msgid "You are dead."
-msgstr "אתה מת."
-
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:305
-msgid "We regret to inform you that your character was killed in battle."
-msgstr "צר לנו לבשר לכם כי שחקנכם נהרג בקרב."
-
-#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:307
-msgid "You are not that alive anymore."
-msgstr "אינך חי כל־כך כרגע."
-
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:308
-msgid "The cold hands of the grim reaper are grabbing for your soul."
-msgstr "קור ידיו של המוות הקודר אוחזים בנשמתך."
-
-#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:309
-msgid "Game Over!"
-msgstr "המשחק נגמר!"
-
-#: src/net/ea/playerhandler.cpp:105
+#: src/net/tmwa/playerhandler.cpp:100
 msgid "Insert coin to continue."
 msgstr "הכנס מטבע כדי להמשיך."
 
-#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:310
-msgid ""
-"No, kids. Your character did not really die. It... err... went to a better "
-"place."
-msgstr "לא, ילדים. השחקן שלכם לא באמת מת. הוא... אה... הלך למקום טוב יותר."
-
-#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:312
-msgid ""
-"Your plan of breaking your enemies weapon by bashing it with your throat "
-"failed."
-msgstr "תוכניתך לשבור את נשק האויב באמצות צווארך נכשלה."
-
-#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:314
-msgid "I guess this did not run too well."
-msgstr "אני מניח שלא הלך לך כל־כך טוב."
-
-#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:315
-msgid "Do you want your possessions identified?"
-msgstr "האם ברצונך שיאתרו את חלקי גופתך?"
-
-#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:316
-msgid "Sadly, no trace of you was ever found..."
-msgstr "באופן מצער, מעולם לא נמצא זכר ממך..."
-
-#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:317
-msgid "Annihilated."
-msgstr "הושמדתך."
-
-#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:318
-msgid "Looks like you got your head handed to you."
-msgstr "נראה כאילו ראשך נמסר אליך."
-
-#: src/net/ea/playerhandler.cpp:120 src/net/manaserv/beinghandler.cpp:319
-msgid ""
-"You screwed up again, dump your body down the tubes and get you another one."
-msgstr "פישלת שוב, גופתך תיזרק לצינוק ותקבל אחת חדשה."
-
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/tmwa/playerhandler.cpp:118
 msgid "You're not dead yet. You're just resting."
 msgstr "אינך מת עדיין. אתה רק נח."
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/tmwa/playerhandler.cpp:119
 msgid "You are no more."
 msgstr "אינך יותר."
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/tmwa/playerhandler.cpp:120
 msgid "You have ceased to be."
 msgstr "חדלת מלהתקיים."
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/tmwa/playerhandler.cpp:121
 msgid "You've expired and gone to meet your maker."
 msgstr "התפוגגת ועברת לפגוש את הבורא."
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/tmwa/playerhandler.cpp:122
 msgid "You're a stiff."
 msgstr "אינך מת עדיין. אתה רק נח."
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/tmwa/playerhandler.cpp:123
 msgid "Bereft of life, you rest in peace."
 msgstr "נטול חיים, את נח על משכבך."
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/tmwa/playerhandler.cpp:124
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr "אתה לא מת עדיין! אה.. טוב, עכשיו כן."
 
-#: src/net/ea/playerhandler.cpp:130
+#: src/net/tmwa/playerhandler.cpp:125
 msgid "Your metabolic processes are now history."
 msgstr "חילוף החומרים שלך הפך להיסטוריה."
 
-#: src/net/ea/playerhandler.cpp:131
+#: src/net/tmwa/playerhandler.cpp:126
 msgid "You're off the twig."
 msgstr "אתה מכה כמו גופה."
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/tmwa/playerhandler.cpp:127
 msgid "You've kicked the bucket."
 msgstr "חדלת מלהתקיים."
 
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/tmwa/playerhandler.cpp:128
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr "התפוגגת ועברת לפגוש את הבורא."
 
-#: src/net/ea/playerhandler.cpp:135
+#: src/net/tmwa/playerhandler.cpp:130
 msgid "You are an ex-player."
 msgstr "הינך שחקן לשעבר."
 
-#: src/net/ea/playerhandler.cpp:136
+#: src/net/tmwa/playerhandler.cpp:131
 msgid "You're pining for the fjords."
 msgstr "אתה מת. טוב שיש חברת ביטוח..."
 
-#: src/net/ea/playerhandler.cpp:249 src/net/ea/playerhandler.cpp:310
+#: src/net/tmwa/playerhandler.cpp:246 src/net/tmwa/playerhandler.cpp:285
 msgid "Message"
 msgstr "הודעה"
 
-#: src/net/ea/playerhandler.cpp:250
+#: src/net/tmwa/playerhandler.cpp:247
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr "אתה סוחב יותר מחצי ממשקלך. אינך יכול לאחות את החיים."
 
-#: src/net/ea/playerhandler.cpp:333
+#: src/net/tmwa/playerhandler.cpp:313
 #, fuzzy, c-format
 msgid "You picked up %s."
 msgstr "הרמת "
 
-#: src/net/ea/playerhandler.cpp:369
+#: src/net/tmwa/playerhandler.cpp:348
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:532
+#: src/net/tmwa/playerhandler.cpp:488
 msgid "Equip arrows first."
 msgstr "הצטייד בחצים תחילה."
 
-#: src/net/ea/specialhandler.cpp:147
+#: src/net/tmwa/specialhandler.cpp:144
 msgid "Trade failed!"
 msgstr "המסחר נכשל!"
 
-#: src/net/ea/specialhandler.cpp:150
+#: src/net/tmwa/specialhandler.cpp:147
 msgid "Emote failed!"
 msgstr "הבעה נכשלה!"
 
-#: src/net/ea/specialhandler.cpp:153
+#: src/net/tmwa/specialhandler.cpp:150
 msgid "Sit failed!"
 msgstr "הישיבה נכשלה!"
 
-#: src/net/ea/specialhandler.cpp:156
+#: src/net/tmwa/specialhandler.cpp:153
 msgid "Chat creating failed!"
 msgstr "יצירת שיחה נכשלה!"
 
-#: src/net/ea/specialhandler.cpp:159
+#: src/net/tmwa/specialhandler.cpp:156
 msgid "Could not join party!"
 msgstr "לא היה ניתן להצטרף לחגיגה!"
 
-#: src/net/ea/specialhandler.cpp:162
+#: src/net/tmwa/specialhandler.cpp:159
 msgid "Cannot shout!"
 msgstr "לא ניתן לצעוק!"
 
-#: src/net/ea/specialhandler.cpp:171
+#: src/net/tmwa/specialhandler.cpp:168
 msgid "You have not yet reached a high enough lvl!"
 msgstr "לא הגעת לרמה גבוהה מספיק!"
 
-#: src/net/ea/specialhandler.cpp:174
+#: src/net/tmwa/specialhandler.cpp:171
 msgid "Insufficient HP!"
 msgstr "לא נותרו נק' חיים!"
 
-#: src/net/ea/specialhandler.cpp:177
+#: src/net/tmwa/specialhandler.cpp:174
 msgid "Insufficient SP!"
 msgstr "לא נותרו נק' קסם!"
 
-#: src/net/ea/specialhandler.cpp:180
+#: src/net/tmwa/specialhandler.cpp:177
 msgid "You have no memos!"
 msgstr "אין תזכירים!"
 
-#: src/net/ea/specialhandler.cpp:183
+#: src/net/tmwa/specialhandler.cpp:180
 msgid "You cannot do that right now!"
 msgstr "אינך יכול לעשות זאת כרגע!"
 
-#: src/net/ea/specialhandler.cpp:186
+#: src/net/tmwa/specialhandler.cpp:183
 msgid "Seems you need more money... ;-)"
 msgstr "נראה שאתה צריך עוד כסף... ;-)"
 
-#: src/net/ea/specialhandler.cpp:189
+#: src/net/tmwa/specialhandler.cpp:186
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "אינך יכול להשתמש בכישור עם נשק זה!"
 
-#: src/net/ea/specialhandler.cpp:192
+#: src/net/tmwa/specialhandler.cpp:189
 msgid "You need another red gem!"
 msgstr "אתה צריך עוד אבן אדומה!"
 
-#: src/net/ea/specialhandler.cpp:195
+#: src/net/tmwa/specialhandler.cpp:192
 msgid "You need another blue gem!"
 msgstr "אתה צריך עוד אבן כחולה!"
 
-#: src/net/ea/specialhandler.cpp:198
+#: src/net/tmwa/specialhandler.cpp:195
 msgid "You're carrying to much to do this!"
 msgstr "אתה סוחב יותר מדי בכדי לעשות זאת!"
 
-#: src/net/ea/specialhandler.cpp:201
+#: src/net/tmwa/specialhandler.cpp:198
 msgid "Huh? What's that?"
 msgstr "הא? מה זה?"
 
-#: src/net/ea/specialhandler.cpp:210
+#: src/net/tmwa/specialhandler.cpp:207
 msgid "Warp failed..."
 msgstr "הפיתול נכשל...."
 
-#: src/net/ea/specialhandler.cpp:213
+#: src/net/tmwa/specialhandler.cpp:210
 msgid "Could not steal anything..."
 msgstr "לא היה ניתן לגנוב דבר..."
 
-#: src/net/ea/specialhandler.cpp:216
+#: src/net/tmwa/specialhandler.cpp:213
 msgid "Poison had no effect..."
 msgstr "לרעל לא הייתה כל השפעה..."
 
-#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:116
-msgid "Request for Trade"
-msgstr "בקשה למסחר"
-
-#: src/net/ea/tradehandler.cpp:108 src/net/manaserv/tradehandler.cpp:117
-#, c-format
-msgid "%s wants to trade with you, do you accept?"
-msgstr "%s מעוניין לסחור עימך, האם אתה מסכים?"
-
-#: src/net/ea/tradehandler.cpp:124
+#: src/net/tmwa/tradehandler.cpp:126
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr "מסחר אינו אפשרי. השותף למסחר רחוק מדי."
 
-#: src/net/ea/tradehandler.cpp:128
+#: src/net/tmwa/tradehandler.cpp:130
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr "מסחר אינו אפשרי. השחקן אינו קיים."
 
-#: src/net/ea/tradehandler.cpp:132
+#: src/net/tmwa/tradehandler.cpp:134
 msgid "Trade cancelled due to an unknown reason."
 msgstr "המסחר בוטל מסיבה לא ידועה."
 
-#: src/net/ea/tradehandler.cpp:137
+#: src/net/tmwa/tradehandler.cpp:139
 #, c-format
 msgid "Trade: You and %s"
 msgstr "מסחר: אתה ו-%s"
 
-#: src/net/ea/tradehandler.cpp:144
+#: src/net/tmwa/tradehandler.cpp:146
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr "המסחר עם %s בוטל."
 
-#: src/net/ea/tradehandler.cpp:153
+#: src/net/tmwa/tradehandler.cpp:154
 msgid "Unhandled trade cancel packet."
 msgstr "המסחר נכשל"
 
-#: src/net/ea/tradehandler.cpp:202
+#: src/net/tmwa/tradehandler.cpp:202
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr "נכשל בהוספת חפץ. השותף למסחר שוקל יותר מדי."
 
-#: src/net/ea/tradehandler.cpp:207
+#: src/net/tmwa/tradehandler.cpp:207
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr "נכשל בהוספת חפץ. לשותף למסחר אין מקומות פנויים."
 
-#: src/net/ea/tradehandler.cpp:211
+#: src/net/tmwa/tradehandler.cpp:211
 msgid "Failed adding item for unknown reason."
 msgstr "נכשל בהוספת חפץ מסיבה לא ידועה."
 
-#: src/net/ea/tradehandler.cpp:224 src/net/manaserv/tradehandler.cpp:149
-msgid "Trade canceled."
-msgstr "המסחר בוטל."
-
-#: src/net/ea/tradehandler.cpp:231 src/net/manaserv/tradehandler.cpp:156
-msgid "Trade completed."
-msgstr "המסחר הושלם."
-
-#: src/net/manaserv/beinghandler.cpp:324
-#, fuzzy
-msgid "Press OK to respawn."
-msgstr " לחץ אישור כדי להשיב"
-
-#: src/net/manaserv/beinghandler.cpp:325
+#: src/playerrelations.cpp:310
 #, fuzzy
-msgid "You Died"
-msgstr "נהרגת"
-
-#: src/net/manaserv/charhandler.cpp:128 src/net/manaserv/charhandler.cpp:196
-#, fuzzy
-msgid "Not logged in."
-msgstr "כבר מחובר"
+msgid "Completely ignore"
+msgstr "@@ignore|התעלם לחלוטין %s@@"
 
-#: src/net/manaserv/charhandler.cpp:131
-msgid "No empty slot."
+#: src/playerrelations.cpp:324
+msgid "Print '...'"
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:134
-msgid "Invalid name."
+#: src/playerrelations.cpp:340
+msgid "Blink name"
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:137
-#, fuzzy
-msgid "Character's name already exists."
-msgstr "שם המשתמש כבר בשימוש"
-
-#: src/net/manaserv/charhandler.cpp:140
-msgid "Invalid hairstyle."
-msgstr ""
+#: src/resources/itemdb.cpp:44
+#, c-format
+msgid "Attack %+d"
+msgstr "התקפה %+d"
 
-#: src/net/manaserv/charhandler.cpp:143
-msgid "Invalid hair color."
-msgstr ""
+#: src/resources/itemdb.cpp:45
+#, c-format
+msgid "Defense %+d"
+msgstr "הגנה %+d"
 
-#: src/net/manaserv/charhandler.cpp:146
-msgid "Invalid gender."
-msgstr ""
+#: src/resources/itemdb.cpp:46
+#, c-format
+msgid "HP %+d"
+msgstr "חיים %+d"
 
-#: src/net/manaserv/charhandler.cpp:149
-#, fuzzy
-msgid "Character's stats are too high."
-msgstr "נתוני שחקן - אישור"
+#: src/resources/itemdb.cpp:47
+#, c-format
+msgid "MP %+d"
+msgstr "MP %+d"
 
-#: src/net/manaserv/charhandler.cpp:152
-#, fuzzy
-msgid "Character's stats are too low."
-msgstr "נתוני שחקן - אישור"
+#: src/resources/itemdb.cpp:92
+msgid "Unknown item"
+msgstr "חפץ לא ידוע"
 
-#: src/net/manaserv/charhandler.cpp:155
-msgid "One stat is zero."
-msgstr ""
+#: src/resources/itemdb.cpp:135 src/resources/monsterdb.cpp:77
+msgid "unnamed"
+msgstr "ללא שם"
 
-#: src/net/manaserv/charhandler.cpp:187
-#, fuzzy
-msgid "Player deleted."
-msgstr "השחקן נמחק."
+#~ msgid "Text Shadow"
+#~ msgstr "הצללת טקסט"
 
-#: src/net/manaserv/charhandler.cpp:199
-#, fuzzy
-msgid "Selection out of range."
-msgstr "בחר כמות חפצים לסחור."
+#~ msgid "Text Outline"
+#~ msgstr "מתאר הטקסט"
 
-#: src/net/manaserv/charhandler.cpp:202
-#, fuzzy, c-format
-msgid "Unknown error (%d)."
-msgstr "שגיאה לא ידועה"
+#~ msgid "Progress Bar Labels"
+#~ msgstr "תוויות סרגל התקדמות"
 
-#: src/net/manaserv/charhandler.cpp:242
-msgid "No gameservers are available."
-msgstr "אין שרתי משחק זמינים."
+#~ msgid "Background"
+#~ msgstr "רקע"
 
-#: src/net/manaserv/charhandler.cpp:268
-msgid "Willpower:"
-msgstr "כח רצון:"
+#~ msgid "Highlight"
+#~ msgstr "הדגשה"
 
-#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
-#: src/net/manaserv/guildhandler.cpp:259
-#, c-format
-msgid "Topic: %s"
-msgstr "כותרת: %s"
+#~ msgid "Tab Highlight"
+#~ msgstr "לשונית הדגשה"
 
-#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
 #, fuzzy
-msgid "Players in this channel:"
-msgstr "משתמש מכה מפלצת"
+#~ msgid "Item Too Expensive"
+#~ msgstr "החפץ יקר מדי"
 
-#: src/net/manaserv/chathandler.cpp:201
 #, fuzzy
-msgid "Error joining channel."
-msgstr "פקודה: /join <channel>"
+#~ msgid "Item Is Equipped"
+#~ msgstr "החפץ בשימוש"
 
-#: src/net/manaserv/chathandler.cpp:207
-#, fuzzy
-msgid "Listing channels."
-msgstr "מבקש להצטרף לחדר %s."
+#~ msgid "GM"
+#~ msgstr "GM"
 
-#: src/net/manaserv/chathandler.cpp:219
-msgid "End of channel list."
-msgstr ""
+#~ msgid "Player"
+#~ msgstr "שחקן"
 
-#: src/net/manaserv/chathandler.cpp:291
-#, fuzzy, c-format
-msgid "%s entered the channel."
-msgstr "%s הצטרף לחבורה."
+#~ msgid "Whisper"
+#~ msgstr "לחישה"
 
-#: src/net/manaserv/chathandler.cpp:296
-#, c-format
-msgid "%s left the channel."
-msgstr ""
+#~ msgid "Is"
+#~ msgstr "הינו"
 
-#: src/net/manaserv/chathandler.cpp:312
-#, c-format
-msgid "%s has set mode %s on user %s."
-msgstr ""
+#~ msgid "Server"
+#~ msgstr "שרת"
 
-#: src/net/manaserv/chathandler.cpp:322
-#, c-format
-msgid "%s has kicked %s."
-msgstr ""
+#~ msgid "Logger"
+#~ msgstr "רישום"
 
-#: src/net/manaserv/chathandler.cpp:327
-#, fuzzy
-msgid "Unknown channel event."
-msgstr "פקודה לא מוכרת."
+#~ msgid "Hyperlink"
+#~ msgstr "קישור"
 
-#: src/net/manaserv/generalhandler.cpp:100
-#, c-format
-msgid "Willpower %+d"
-msgstr "כח רצון %+d"
+#~ msgid "Being"
+#~ msgstr "נהיה"
 
-#: src/net/manaserv/generalhandler.cpp:171
-#, fuzzy
-msgid "Willpower"
-msgstr "כח רצון:"
+#~ msgid "Other Players' Names"
+#~ msgstr "שמות המשתמשים האחרים"
 
-#: src/net/manaserv/guildhandler.cpp:81
-msgid "Guild created."
-msgstr "גילדה נוצרה."
+#~ msgid "Own Name"
+#~ msgstr "השם שלך"
 
-#: src/net/manaserv/guildhandler.cpp:86
-msgid "Error creating guild."
-msgstr "שגיאה ביצירת גילדה."
+#~ msgid "GM Names"
+#~ msgstr "שמות המנהלים"
 
-#: src/net/manaserv/guildhandler.cpp:96
-msgid "Invite sent."
-msgstr "הזמנה נשלחה."
+#~ msgid "NPCs"
+#~ msgstr "דמויות"
 
-#: src/net/manaserv/guildhandler.cpp:203
-msgid "Member was promoted successfully."
-msgstr "החבר קודם בהצלחה."
+#~ msgid "Monsters"
+#~ msgstr "מפלצות"
 
-#: src/net/manaserv/guildhandler.cpp:208
-msgid "Failed to promote member."
-msgstr "נכשל בקידום החבר."
+#~ msgid "Unknown Item Type"
+#~ msgstr "סוג חפץ לא ידוע"
 
-#: src/net/manaserv/loginhandler.cpp:87
-#, fuzzy
-msgid "Wrong magic_token."
-msgstr "magic_token שגוי"
+#~ msgid "Generics"
+#~ msgstr "כלליים"
 
-#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
-#, fuzzy
-msgid "Already logged in."
-msgstr "כבר מחובר"
+#~ msgid "Hats"
+#~ msgstr "כובעים"
 
-#: src/net/manaserv/loginhandler.cpp:93 src/net/manaserv/loginhandler.cpp:272
-#, fuzzy
-msgid "Server is full."
-msgstr "השרת מלא"
+#~ msgid "Usables"
+#~ msgstr "שימושיים"
+
+#~ msgid "Shirts"
+#~ msgstr "חולצות"
 
-#: src/net/manaserv/loginhandler.cpp:118
 #, fuzzy
-msgid "New password incorrect."
-msgstr "הסיסמה החדשה שגויה"
+#~ msgid "One Handed Weapons"
+#~ msgstr "נשקים ליד אחת"
 
-#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
-msgid "Account not connected. Please login first."
-msgstr "החשבון אינו מחובר. אנא קודם־כל התחבר."
+#~ msgid "Pants"
+#~ msgstr "מכנסיים"
 
-#: src/net/manaserv/loginhandler.cpp:149
-#, fuzzy
-msgid "New email address incorrect."
-msgstr "כתובת דוא\"ל חדשה שגויה"
+#~ msgid "Shoes"
+#~ msgstr "נעליים"
 
-#: src/net/manaserv/loginhandler.cpp:152
 #, fuzzy
-msgid "Old email address incorrect."
-msgstr "כתובת דוא\"ל ישנה שגויה"
+#~ msgid "Two Handed Weapons"
+#~ msgstr "נשקים ליד אחת"
 
-#: src/net/manaserv/loginhandler.cpp:158
-#, fuzzy
-msgid "The new email address already exists."
-msgstr "כתובת הדוא\"ל החדשה כבר בשימוש."
+#~ msgid "Shields"
+#~ msgstr "מגנים"
 
-#: src/net/manaserv/loginhandler.cpp:239
-msgid ""
-"Client registration is not allowed. Please contact server administration."
-msgstr ""
+#~ msgid "Rings"
+#~ msgstr "טבעות"
 
-#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
-#, fuzzy
-msgid "Client version is too old."
-msgstr "גרסת הקליינט ישנה מדי"
+#~ msgid "Necklaces"
+#~ msgstr "שרשראות"
 
-#: src/net/manaserv/loginhandler.cpp:266
-#, fuzzy
-msgid "Wrong username or password."
-msgstr "שם משתמש או סיסמה שגויים"
+#~ msgid "Arms"
+#~ msgstr "ידיים"
 
-#: src/net/manaserv/loginhandler.cpp:275
-msgid "Login attempt too soon after previous attempt."
-msgstr ""
+#~ msgid "Ammo"
+#~ msgstr "תחמושת"
 
-#: src/net/manaserv/loginhandler.cpp:303
-#, fuzzy
-msgid "Wrong username, password or email address."
-msgstr "שם משתמש, סיסמה או דוא\"ל שגויים"
+#~ msgid "Particle Effects"
+#~ msgstr "אפקטים חלקיים"
+
+#~ msgid "Pickup Notification"
+#~ msgstr "הודעה על לקיחה"
+
+#~ msgid "Exp Notification"
+#~ msgstr "הודעה על נק' נסיון"
 
-#: src/net/manaserv/loginhandler.cpp:306
 #, fuzzy
-msgid "Username already exists."
-msgstr "שם המשתמש כבר בשימוש"
+#~ msgid "Player Hits Monster"
+#~ msgstr "משתמש מכה מפלצת"
 
-#: src/net/manaserv/loginhandler.cpp:309
 #, fuzzy
-msgid "Email address already exists."
-msgstr "כתובת הדוא\"ל כבר בשימוש"
+#~ msgid "Monster Hits Player"
+#~ msgstr "משתמש מכה משתמש"
 
-#: src/net/manaserv/loginhandler.cpp:312
-msgid "You took too long with the captcha or your response was incorrect."
-msgstr ""
+#~ msgid "Critical Hit"
+#~ msgstr "מכה קריטית"
 
-#: src/net/manaserv/partyhandler.cpp:88
-msgid "Joined party."
-msgstr "הצטרפת לחבורה."
+#~ msgid "Misses"
+#~ msgstr "פספוס"
 
-#: src/net/manaserv/partyhandler.cpp:106
-#, c-format
-msgid "%s joined the party."
-msgstr "%s הצטרף לחבורה."
+#~ msgid "HP Bar"
+#~ msgstr "סרגל חיים"
 
-#: src/net/manaserv/partyhandler.cpp:123
-#, fuzzy, c-format
-msgid "%s rejected your invite."
-msgstr "%s דחה את הזמנתך."
+#~ msgid "3/4 HP Bar"
+#~ msgstr "3/4 סרגל חיים"
 
-#: src/net/manaserv/tradehandler.cpp:96
-msgid "Accepting incoming trade requests."
-msgstr "מקבל בקשות מסחר נכנסות."
+#~ msgid "1/2 HP Bar"
+#~ msgstr "1/2 סרגל חיים"
 
-#: src/net/manaserv/tradehandler.cpp:98
-msgid "Ignoring incoming trade requests."
-msgstr "מתעלם מבקשות סחר נכנסות."
+#~ msgid "1/4 HP Bar"
+#~ msgstr "1/4 סרגל חיים"
 
-#: src/net/manaserv/tradehandler.cpp:135
-#, c-format
-msgid "Trading with %s"
-msgstr "סוחר עם%s"
+#, fuzzy
+#~ msgid "HP"
+#~ msgstr "חיים:"
 
-#: src/playerrelations.cpp:304
 #, fuzzy
-msgid "Completely ignore"
-msgstr "@@ignore|התעלם לחלוטין %s@@"
+#~ msgid "MP"
+#~ msgstr "קסם:"
 
-#: src/playerrelations.cpp:318
-msgid "Print '...'"
-msgstr ""
+#, fuzzy
+#~ msgid "Exp"
+#~ msgstr "נסיון:"
 
-#: src/playerrelations.cpp:334
-msgid "Blink name"
-msgstr ""
+#, fuzzy
+#~ msgid "Money"
+#~ msgstr "זהב: %d"
 
-#: src/playerrelations.cpp:371
-msgid "Floating '...' bubble"
-msgstr ""
+#, fuzzy
+#~ msgid "Job"
+#~ msgstr "עבודה:"
 
-#: src/playerrelations.cpp:374
-msgid "Floating bubble"
-msgstr ""
+#, fuzzy
+#~ msgid "Level"
+#~ msgstr "רמה: %d"
 
-#: src/resources/itemdb.cpp:52
-#, c-format
-msgid "Attack %+d"
-msgstr "התקפה %+d"
+#, fuzzy
+#~ msgid "Access denied."
+#~ msgstr "הגישה נדחתה"
 
-#: src/resources/itemdb.cpp:53
-#, c-format
-msgid "Defense %+d"
-msgstr "הגנה %+d"
+#, fuzzy
+#~ msgid "Unknown failure to select character."
+#~ msgstr "שגיאה לא ידועה בבחירת השחקן"
 
-#: src/resources/itemdb.cpp:54
-#, c-format
-msgid "HP %+d"
-msgstr "חיים %+d"
+#~ msgid "Inviting like this isn't supported at the moment."
+#~ msgstr "הזמנה בדרך זו אינה נתמכת כרגע."
 
-#: src/resources/itemdb.cpp:55
-#, c-format
-msgid "MP %+d"
-msgstr "MP %+d"
+#~ msgid "Willpower:"
+#~ msgstr "כח רצון:"
 
-#: src/resources/itemdb.cpp:114
-msgid "Unknown item"
-msgstr "חפץ לא ידוע"
+#~ msgid "Willpower %+d"
+#~ msgstr "כח רצון %+d"
 
-#: src/resources/itemdb.cpp:158 src/resources/monsterdb.cpp:45
-#: src/resources/monsterdb.cpp:67
-msgid "unnamed"
-msgstr "ללא שם"
+#, fuzzy
+#~ msgid "Willpower"
+#~ msgstr "כח רצון:"
+
+#, fuzzy
+#~ msgid "Server is full."
+#~ msgstr "השרת מלא"
 
 #~ msgid "no"
 #~ msgstr "לא"
diff --git a/po/hr.po b/po/hr.po
index 9a2e3881..2baccbe9 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -7,406 +7,413 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2010-03-16 22:27+0100\n"
+"POT-Creation-Date: 2010-12-13 20:04+0100\n"
 "PO-Revision-Date: 2009-12-13 09:30+0000\n"
 "Last-Translator: nafterburner <nafterburner@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
+"Language: hr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/client.cpp:555 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
+#: src/client.cpp:598 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
 msgid "Setup"
 msgstr "Podešavanje"
 
-#: src/client.cpp:625
+#: src/client.cpp:679
 #, fuzzy
 msgid "Connecting to server"
 msgstr "Spajanje na poslužitelja karti..."
 
-#: src/client.cpp:652
+#: src/client.cpp:706
 #, fuzzy
 msgid "Logging in"
 msgstr "Korisničko ime"
 
-#: src/client.cpp:685
+#: src/client.cpp:739
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:741
+#: src/client.cpp:804
 #, fuzzy
 msgid "Requesting characters"
 msgstr "Odaberi lika"
 
-#: src/client.cpp:770
+#: src/client.cpp:833
 #, fuzzy
 msgid "Connecting to the game server"
 msgstr "Spajanje na poslužitelja karti..."
 
-#: src/client.cpp:801 src/client.cpp:808 src/client.cpp:942
+#: src/client.cpp:843
+#, fuzzy
+msgid "Changing game servers"
+msgstr "Server"
+
+#: src/client.cpp:872 src/client.cpp:879 src/client.cpp:1014
 #: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
 #: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
-#: src/gui/serverdialog.cpp:241 src/gui/unregisterdialog.cpp:133
-#: src/net/ea/charserverhandler.cpp:135 src/net/ea/charserverhandler.cpp:152
-#: src/net/manaserv/charhandler.cpp:161 src/net/manaserv/charhandler.cpp:204
+#: src/gui/serverdialog.cpp:323 src/gui/unregisterdialog.cpp:133
+#: src/net/manaserv/charhandler.cpp:174 src/net/manaserv/charhandler.cpp:217
+#: src/net/tmwa/charserverhandler.cpp:134
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Error"
 msgstr "Greška"
 
-#: src/client.cpp:817
+#: src/client.cpp:888
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:844
+#: src/client.cpp:915
 #, fuzzy
 msgid "Password Change"
 msgstr "Lozinka"
 
-#: src/client.cpp:845
+#: src/client.cpp:916
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:864
+#: src/client.cpp:935
 #, fuzzy
 msgid "Email Change"
 msgstr "Izmijeni"
 
-#: src/client.cpp:865
+#: src/client.cpp:936
 #, fuzzy
 msgid "Email changed successfully!"
 msgstr "Član je uspješno unaprijeđen."
 
-#: src/client.cpp:885
+#: src/client.cpp:956
 #, fuzzy
 msgid "Unregister Successful"
 msgstr "Odjavi"
 
-#: src/client.cpp:886
+#: src/client.cpp:957
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1009 src/client.cpp:1032
+#: src/client.cpp:1138 src/client.cpp:1161
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1121
+#: src/client.cpp:1281
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1155 src/client.cpp:1161
+#: src/client.cpp:1315 src/client.cpp:1321
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/commandhandler.cpp:127 src/commandhandler.cpp:308
+#: src/commandhandler.cpp:131 src/commandhandler.cpp:317
 msgid "Unknown command."
 msgstr "Nepoznata naredba."
 
-#: src/commandhandler.cpp:156
+#: src/commandhandler.cpp:160
 msgid "-- Help --"
 msgstr "-- Pomoć --"
 
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:161
 msgid "/help > Display this help"
 msgstr "/help > Prikaži ovu pomoć"
 
-#: src/commandhandler.cpp:159
+#: src/commandhandler.cpp:163
 msgid "/where > Display map name"
 msgstr "/where > Prikaži ime karte"
 
-#: src/commandhandler.cpp:160
+#: src/commandhandler.cpp:164
 msgid "/who > Display number of online users"
 msgstr "/who > Prikaži broj trenutno prijavljenih korisnika"
 
-#: src/commandhandler.cpp:161
+#: src/commandhandler.cpp:165
 msgid "/me > Tell something about yourself"
 msgstr "/me > Recite nešto o sebi"
 
-#: src/commandhandler.cpp:163
+#: src/commandhandler.cpp:167
 msgid "/clear > Clears this window"
 msgstr "/clear > Očisti ovaj prozor"
 
-#: src/commandhandler.cpp:165
+#: src/commandhandler.cpp:169
 msgid "/msg > Send a private message to a user"
 msgstr "/msg > Pošaljite privatnu poruku korisniku"
 
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:170
 msgid "/whisper > Alias of msg"
 msgstr "/whisper > Alias za msg"
 
-#: src/commandhandler.cpp:167
+#: src/commandhandler.cpp:171
 msgid "/w > Alias of msg"
 msgstr "/w > Alias za msg"
 
-#: src/commandhandler.cpp:168
+#: src/commandhandler.cpp:172
 msgid "/query > Makes a tab for private messages with another user"
 msgstr "/query > Čini karticu za privatne poruke s drugim korisnikom"
 
-#: src/commandhandler.cpp:169
+#: src/commandhandler.cpp:174
 msgid "/q > Alias of query"
 msgstr "/q > Alias od query"
 
-#: src/commandhandler.cpp:171
+#: src/commandhandler.cpp:176
 msgid "/ignore > ignore a player"
 msgstr ""
 
-#: src/commandhandler.cpp:172
+#: src/commandhandler.cpp:177
 msgid "/unignore > stop ignoring a player"
 msgstr ""
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:179
 msgid "/list > Display all public channels"
 msgstr "/list > Prikaži sve javne kanale"
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:180
 msgid "/join > Join or create a channel"
 msgstr "/join > Pridruži se ili napravi kanal"
 
-#: src/commandhandler.cpp:177
+#: src/commandhandler.cpp:182
 #, fuzzy
 msgid "/createparty > Create a new party"
 msgstr "/create > Napravi novu partiju"
 
-#: src/commandhandler.cpp:178
+#: src/commandhandler.cpp:183
 msgid "/party > Invite a user to party"
 msgstr "/party > Pozovite korisnike na partiju"
 
-#: src/commandhandler.cpp:180
+#: src/commandhandler.cpp:185
 msgid "/record > Start recording the chat to an external file"
 msgstr "/record > Započni snimanje chat-a u eksternoj datoteci"
 
-#: src/commandhandler.cpp:181
+#: src/commandhandler.cpp:187
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr ""
 
-#: src/commandhandler.cpp:182
+#: src/commandhandler.cpp:189
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
 
-#: src/commandhandler.cpp:184
+#: src/commandhandler.cpp:192
 msgid "/announce > Global announcement (GM only)"
 msgstr "/announce > Globalna obavijest (samo GM)"
 
-#: src/commandhandler.cpp:188
+#: src/commandhandler.cpp:196
 msgid "For more information, type /help <command>."
 msgstr "Za više informacija, utipkajte /pomoć <naredba>."
 
-#: src/commandhandler.cpp:192
+#: src/commandhandler.cpp:200
 msgid "Command: /help"
 msgstr "Naredba: /pomoć"
 
-#: src/commandhandler.cpp:193
+#: src/commandhandler.cpp:201
 msgid "This command displays a list of all commands available."
 msgstr "Ova naredba prikazuje listu svih raspoloživih naredbi."
 
-#: src/commandhandler.cpp:194
+#: src/commandhandler.cpp:203
 msgid "Command: /help <command>"
 msgstr "Naredba: /pomoć <naredba>"
 
-#: src/commandhandler.cpp:195
+#: src/commandhandler.cpp:204
 msgid "This command displays help on <command>."
 msgstr "Ova naredba prikazuje pomoć pri <naredba>."
 
-#: src/commandhandler.cpp:203
+#: src/commandhandler.cpp:212
 msgid "Command: /announce <msg>"
 msgstr "Command: /announce <msg>"
 
-#: src/commandhandler.cpp:204
+#: src/commandhandler.cpp:213
 msgid "*** only available to a GM ***"
 msgstr "*** dostupno samo za GM ***"
 
-#: src/commandhandler.cpp:205
+#: src/commandhandler.cpp:214
 msgid "This command sends the message <msg> to all players currently online."
 msgstr "Ova naredba šalje poruku <msg> svim igračima trenutno online."
 
-#: src/commandhandler.cpp:210
+#: src/commandhandler.cpp:219
 msgid "Command: /clear"
 msgstr "Naredba: /clear"
 
-#: src/commandhandler.cpp:211
+#: src/commandhandler.cpp:220
 msgid "This command clears the chat log of previous chat."
 msgstr "Ova naredba briše chat log prethodnog chata."
 
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:224
 #, fuzzy
 msgid "Command: /ignore <player>"
 msgstr "Naredba: /item <policy>"
 
-#: src/commandhandler.cpp:216
+#: src/commandhandler.cpp:225
 #, fuzzy
 msgid "This command ignores the given player regardless of current relations."
 msgstr "Ova naredba prikazuje broj igrača trenutno online."
 
-#: src/commandhandler.cpp:221
+#: src/commandhandler.cpp:230
 msgid "Command: /join <channel>"
 msgstr "Naredba: /join <channel>"
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:231
 msgid "This command makes you enter <channel>."
 msgstr "Ova naredba vas unaša u <channel>."
 
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:232
 msgid "If <channel> doesn't exist, it's created."
 msgstr "Ako <channel> ne postoji, onda je napravljen."
 
-#: src/commandhandler.cpp:227
+#: src/commandhandler.cpp:236
 msgid "Command: /list"
 msgstr "Naredba: /list"
 
-#: src/commandhandler.cpp:228
+#: src/commandhandler.cpp:237
 msgid "This command shows a list of all channels."
 msgstr "Ova naredba prikazuje listu svih kanala."
 
-#: src/commandhandler.cpp:232
+#: src/commandhandler.cpp:241
 msgid "Command: /me <message>"
 msgstr "Naredba: /me <message>"
 
-#: src/commandhandler.cpp:233
+#: src/commandhandler.cpp:242
 msgid "This command tell others you are (doing) <msg>."
 msgstr "Ova naredba govori drugima da vi (radite) <msg>."
 
-#: src/commandhandler.cpp:237
+#: src/commandhandler.cpp:246
 msgid "Command: /msg <nick> <message>"
 msgstr "Naredba: /msg <nick> <message>"
 
-#: src/commandhandler.cpp:238
+#: src/commandhandler.cpp:247
 msgid "Command: /whisper <nick> <message>"
 msgstr "Naredba: /whisper <nick> <message>"
 
-#: src/commandhandler.cpp:239
+#: src/commandhandler.cpp:248
 msgid "Command: /w <nick> <message>"
 msgstr "Naredba: /w <nick> <message>"
 
-#: src/commandhandler.cpp:240
+#: src/commandhandler.cpp:249
 msgid "This command sends the text <message> to <nick>."
 msgstr "Ova naredba šalje tekst <message> za <nick>."
 
-#: src/commandhandler.cpp:241 src/commandhandler.cpp:260
+#: src/commandhandler.cpp:250 src/commandhandler.cpp:269
 #: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
-#: src/net/ea/gui/guildtab.cpp:75 src/net/ea/gui/partytab.cpp:75
+#: src/net/tmwa/gui/guildtab.cpp:75 src/net/tmwa/gui/partytab.cpp:75
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 "Ako <nick> ima razmake u sebi, zatvoriti ga u dvostrukim navodnicima (\")."
 
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:255
 msgid "Command: /query <nick>"
 msgstr "Naredba: /query <nick>"
 
-#: src/commandhandler.cpp:247
+#: src/commandhandler.cpp:256
 msgid "Command: /q <nick>"
 msgstr "Naredba: /q <nick>"
 
-#: src/commandhandler.cpp:248
+#: src/commandhandler.cpp:257
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
 "Ova naredba pokušava napraviti karticu za šaptanje između vas i <nick>."
 
-#: src/commandhandler.cpp:253
+#: src/commandhandler.cpp:262
 #, fuzzy
 msgid "Command: /createparty <name>"
 msgstr "Naredba: /create <ime-partije>"
 
-#: src/commandhandler.cpp:254
+#: src/commandhandler.cpp:263
 #, fuzzy
 msgid "This command creates a new party called <name>."
 msgstr "Ove naredbe kreira novu partiju zvanu <party-name>."
 
-#: src/commandhandler.cpp:258
+#: src/commandhandler.cpp:267
 msgid "Command: /party <nick>"
 msgstr "Naredba: /party <nick>"
 
-#: src/commandhandler.cpp:259 src/net/ea/gui/partytab.cpp:74
+#: src/commandhandler.cpp:268 src/net/tmwa/gui/partytab.cpp:74
 msgid "This command invites <nick> to party with you."
 msgstr "Ova naredba poziva <nick> na partiju sa vama."
 
-#: src/commandhandler.cpp:265
+#: src/commandhandler.cpp:274
 msgid "Command: /present"
 msgstr "Naredba: /present"
 
-#: src/commandhandler.cpp:266
+#: src/commandhandler.cpp:275
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: src/commandhandler.cpp:272
+#: src/commandhandler.cpp:281
 msgid "Command: /record <filename>"
 msgstr "Naredba: /record <filename>"
 
-#: src/commandhandler.cpp:273
+#: src/commandhandler.cpp:282
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr "Ova naredba započinje snimanje chat log-a u datoteku <filename>."
 
-#: src/commandhandler.cpp:275
+#: src/commandhandler.cpp:284
 msgid "Command: /record"
 msgstr "Naredba: /record"
 
-#: src/commandhandler.cpp:276
+#: src/commandhandler.cpp:285
 msgid "This command finishes a recording session."
 msgstr "Ova naredba završava sesiju snimanja."
 
-#: src/commandhandler.cpp:280
+#: src/commandhandler.cpp:289
 msgid "Command: /toggle <state>"
 msgstr "Naredba: /toggle <state>"
 
-#: src/commandhandler.cpp:281
+#: src/commandhandler.cpp:290
 msgid ""
 "This command sets whether the return key should toggle the chat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: src/commandhandler.cpp:283
+#: src/commandhandler.cpp:292
 msgid ""
-"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
-"\", \"no\", \"false\" to turn the toggle off."
+"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
+"\"0\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: src/commandhandler.cpp:286
+#: src/commandhandler.cpp:295
 msgid "Command: /toggle"
 msgstr "Naredba: /toggle"
 
-#: src/commandhandler.cpp:287
+#: src/commandhandler.cpp:296
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: src/commandhandler.cpp:291 src/gui/widgets/whispertab.cpp:93
+#: src/commandhandler.cpp:300 src/gui/widgets/whispertab.cpp:95
 #, fuzzy
 msgid "Command: /unignore <player>"
 msgstr "Naredba: /item <policy>"
 
-#: src/commandhandler.cpp:292
+#: src/commandhandler.cpp:301
 msgid "This command stops ignoring the given player if they are being ignored"
 msgstr ""
 
-#: src/commandhandler.cpp:297
+#: src/commandhandler.cpp:306
 msgid "Command: /where"
 msgstr "Naredba: /where"
 
-#: src/commandhandler.cpp:298
+#: src/commandhandler.cpp:307
 msgid "This command displays the name of the current map."
 msgstr "Ova naredba prikazuje naziv trenutne karte."
 
-#: src/commandhandler.cpp:302
+#: src/commandhandler.cpp:311
 msgid "Command: /who"
 msgstr "Naredba: /who"
 
-#: src/commandhandler.cpp:303
+#: src/commandhandler.cpp:312
 msgid "This command displays the number of players currently online."
 msgstr "Ova naredba prikazuje broj igrača trenutno online."
 
-#: src/commandhandler.cpp:309
+#: src/commandhandler.cpp:318
 msgid "Type /help for a list of commands."
 msgstr "Upišite /help za listu svih naredbi."
 
-#: src/commandhandler.cpp:375
+#: src/commandhandler.cpp:384
 msgid "Cannot send empty whispers!"
 msgstr "Ne mogu poslati prazan šapate!"
 
-#: src/commandhandler.cpp:383
+#: src/commandhandler.cpp:392
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -415,59 +422,67 @@ msgstr ""
 "Ne mogu stvoriti šapat karticu za nadimak \"%s\"! To već postoji ili ste to "
 "vi."
 
-#: src/commandhandler.cpp:397
+#: src/commandhandler.cpp:406
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Zahtjev za pridruživanje kanalu %s."
 
-#: src/commandhandler.cpp:410 src/net/ea/gui/partytab.cpp:109
+#: src/commandhandler.cpp:419 src/net/tmwa/gui/partytab.cpp:109
 msgid "Party name is missing."
 msgstr "Ime partije nedostaje."
 
-#: src/commandhandler.cpp:423 src/commandhandler.cpp:471
-#: src/commandhandler.cpp:493
+#: src/commandhandler.cpp:432 src/commandhandler.cpp:509
+#: src/commandhandler.cpp:531
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:441
+#: src/commandhandler.cpp:450
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:441
+#: src/commandhandler.cpp:450
 msgid "Message closes chat."
 msgstr "Poruka zatvara chat."
 
-#: src/commandhandler.cpp:450
+#: src/commandhandler.cpp:459
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:454
+#: src/commandhandler.cpp:463
 msgid "Message now closes chat."
 msgstr "Poruka sada zatvara chat."
 
-#: src/commandhandler.cpp:477
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:489
+msgid "Show IP: On"
+msgstr ""
+
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:485
+msgid "Show IP: Off"
+msgstr ""
+
+#: src/commandhandler.cpp:515
 msgid "Player already ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:484
+#: src/commandhandler.cpp:522
 #, fuzzy
 msgid "Player successfully ignored!"
 msgstr "Partija je uspješno kreirana."
 
-#: src/commandhandler.cpp:486
+#: src/commandhandler.cpp:524
 #, fuzzy
 msgid "Player could not be ignored!"
 msgstr "Šapat nije mogao biti poslan, ignorirani ste od strane korisnika."
 
-#: src/commandhandler.cpp:501
+#: src/commandhandler.cpp:539
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:506
+#: src/commandhandler.cpp:544
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:508
+#: src/commandhandler.cpp:546
 #, fuzzy
 msgid "Player could not be unignored!"
 msgstr "Šapat nije mogao biti poslan, ignorirani ste od strane korisnika."
@@ -481,43 +496,43 @@ msgstr "Opcije za /%s su \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgid "General"
 msgstr "Općenito"
 
-#: src/game.cpp:326
+#: src/game.cpp:342
 #, fuzzy
 msgid "Screenshot saved as "
 msgstr "Screenshot spremljen u ~/"
 
-#: src/game.cpp:331
+#: src/game.cpp:347
 msgid "Saving screenshot failed!"
 msgstr "Spremanje screenshot-a nije uspjelo!"
 
-#: src/game.cpp:355
+#: src/game.cpp:378
 #, fuzzy
 msgid "The connection to the server was lost."
 msgstr "Veza s poslužiteljem je bila izgubljena, program će se sada zatvoriti"
 
-#: src/game.cpp:360
+#: src/game.cpp:382
 msgid "Network Error"
 msgstr "Mreža Greška"
 
-#: src/game.cpp:705
+#: src/game.cpp:721
 msgid "Ignoring incoming trade requests"
 msgstr "Ignoriranje dolaznih zahtjeva za trgovanje"
 
-#: src/game.cpp:712
+#: src/game.cpp:726
 msgid "Accepting incoming trade requests"
 msgstr "Prihvaćanje dolaznih zahtjeva za trgovanje"
 
-#: src/game.cpp:946
+#: src/game.cpp:954
 #, fuzzy
 msgid "Could Not Load Map"
 msgstr "Ne mogu učitati karte"
 
-#: src/game.cpp:947
+#: src/game.cpp:955
 #, c-format
 msgid "Error while loading %s"
 msgstr "Greška prilikom učitavanja %s"
 
-#: src/gui/beingpopup.cpp:75
+#: src/gui/beingpopup.cpp:76
 #, fuzzy, c-format
 msgid "Party: %s"
 msgstr "Partija (%s)"
@@ -526,34 +541,34 @@ msgstr "Partija (%s)"
 msgid "Buy"
 msgstr "Kupi"
 
-#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
-#: src/gui/sell.cpp:276
+#: src/gui/buy.cpp:69 src/gui/buy.cpp:261 src/gui/sell.cpp:71
+#: src/gui/sell.cpp:288
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Cijena: %s / Ukupno: %s"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:99 src/gui/npcdialog.cpp:100
-#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:404
+#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:112 src/gui/npcdialog.cpp:124
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:463
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:98 src/gui/npcdialog.cpp:101
-#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:416
+#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:111 src/gui/npcdialog.cpp:125
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:475
 msgid "-"
 msgstr ""
 
 #: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
-#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:152
-#: src/keyboardconfig.cpp:103
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:228
+#: src/keyboardconfig.cpp:102
 msgid "Quit"
 msgstr "Izlaz"
 
-#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:333
-#: src/gui/statuswindow.cpp:403 src/gui/statuswindow.cpp:437
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:384
+#: src/gui/statuswindow.cpp:462 src/gui/statuswindow.cpp:496
 msgid "Max"
 msgstr "Max"
 
@@ -567,11 +582,11 @@ msgstr "Prodaj"
 
 #: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
 #: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
-#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:101
-#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:178
-#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:402
+#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:114
+#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:389
 #: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
-#: src/gui/socialwindow.cpp:243 src/gui/textdialog.cpp:39
+#: src/gui/socialwindow.cpp:275 src/gui/textdialog.cpp:40
 #: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr "Poništi"
@@ -610,7 +625,7 @@ msgstr "Nova E-mail Adresa već postoji."
 msgid "Change Password"
 msgstr "Promijeni Lozinku"
 
-#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:53
+#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:55
 #: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
 msgid "Password:"
 msgstr "Lozinka"
@@ -642,19 +657,19 @@ msgstr ""
 msgid "Create Character"
 msgstr "Stvori Lika"
 
-#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:52
+#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:54
 #: src/gui/register.cpp:67
 msgid "Name:"
 msgstr "Ime:"
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
 #: src/gui/outfitwindow.cpp:67
 msgid ">"
 msgstr ""
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
 #: src/gui/outfitwindow.cpp:66
@@ -671,8 +686,8 @@ msgstr "Boja kose:"
 msgid "Hair style:"
 msgstr "Frizura:"
 
-#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:397
-#: src/gui/socialwindow.cpp:297
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:392
+#: src/gui/socialwindow.cpp:329
 msgid "Create"
 msgstr "Stvori"
 
@@ -728,34 +743,34 @@ msgstr "Odjavi"
 msgid "Change Email"
 msgstr "Promijeni Email Adresu"
 
-#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:155
-#: src/gui/setup_players.cpp:230
+#: src/gui/charselectdialog.cpp:336 src/gui/serverdialog.cpp:231
+#: src/gui/setup_players.cpp:229
 msgid "Delete"
 msgstr "Obriši"
 
-#: src/gui/charselectdialog.cpp:387
+#: src/gui/charselectdialog.cpp:380
 #, fuzzy
 msgid "Choose"
 msgstr "Zatvori"
 
-#: src/gui/charselectdialog.cpp:399 src/gui/charselectdialog.cpp:400
+#: src/gui/charselectdialog.cpp:394 src/gui/charselectdialog.cpp:395
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:77
+#: src/gui/chat.cpp:88
 msgid "Chat"
 msgstr "Chat"
 
-#: src/gui/chat.cpp:287
+#: src/gui/chat.cpp:311
 #, fuzzy, c-format
 msgid "Present: %s; %d players are present."
 msgstr "%d igrača je prisutno."
 
-#: src/gui/chat.cpp:305
+#: src/gui/chat.cpp:329
 msgid "Attendance written to record log."
 msgstr "Prisutnost zapisana u evidentni dnevnik."
 
-#: src/gui/chat.cpp:469
+#: src/gui/chat.cpp:493
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Šaptaj prema %s: %s"
@@ -821,139 +836,170 @@ msgstr "Efekti okruženja"
 msgid "Equipment"
 msgstr "Oprema"
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:78
-#: src/gui/inventorywindow.cpp:80 src/gui/inventorywindow.cpp:291
-#: src/gui/popupmenu.cpp:372
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:89
+#: src/gui/inventorywindow.cpp:337 src/gui/popupmenu.cpp:359
 msgid "Unequip"
 msgstr "Skini opremu"
 
-#: src/gui/help.cpp:36
+#: src/gui/help.cpp:37
 msgid "Help"
 msgstr "Pomoć"
 
-#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:74
+#: src/gui/help.cpp:51 src/gui/npcdialog.cpp:50
 msgid "Close"
 msgstr "Zatvori"
 
-#: src/gui/inventorywindow.cpp:57 src/gui/windowmenu.cpp:56
+#: src/gui/inventorywindow.cpp:59 src/gui/windowmenu.cpp:56
 msgid "Inventory"
 msgstr "Zalihe"
 
-#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:75
-#: src/gui/inventorywindow.cpp:293 src/gui/popupmenu.cpp:374
+#: src/gui/inventorywindow.cpp:59
+msgid "Storage"
+msgstr "Pohrana"
+
+#: src/gui/inventorywindow.cpp:82
+msgid "Slots:"
+msgstr "Mjesta:"
+
+#: src/gui/inventorywindow.cpp:87 src/gui/inventorywindow.cpp:100
+#: src/gui/inventorywindow.cpp:339 src/gui/popupmenu.cpp:361
 msgid "Equip"
 msgstr "Opremi"
 
-#: src/gui/inventorywindow.cpp:74 src/gui/inventorywindow.cpp:75
-#: src/gui/inventorywindow.cpp:297 src/gui/popupmenu.cpp:377
+#: src/gui/inventorywindow.cpp:88
 msgid "Use"
 msgstr "Upotrijebi"
 
-#: src/gui/inventorywindow.cpp:84 src/gui/inventorywindow.cpp:301
-#: src/gui/popupmenu.cpp:380
+#: src/gui/inventorywindow.cpp:101 src/gui/popupmenu.cpp:364
+msgid "Activate"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:102 src/gui/inventorywindow.cpp:348
+#: src/gui/popupmenu.cpp:367
 #, fuzzy
 msgid "Drop..."
 msgstr "Ispusti"
 
-#: src/gui/inventorywindow.cpp:85 src/gui/popupmenu.cpp:386
+#: src/gui/inventorywindow.cpp:103 src/gui/popupmenu.cpp:373
 msgid "Split"
 msgstr "Razdvoji"
 
-#: src/gui/inventorywindow.cpp:86 src/gui/outfitwindow.cpp:51
+#: src/gui/inventorywindow.cpp:104 src/gui/outfitwindow.cpp:51
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:97 src/gui/storagewindow.cpp:84
-msgid "Slots:"
-msgstr "Mjesta:"
-
-#: src/gui/inventorywindow.cpp:98
+#: src/gui/inventorywindow.cpp:106
 msgid "Weight:"
 msgstr "Težina:"
 
-#: src/gui/inventorywindow.cpp:303 src/gui/popupmenu.cpp:382
+#: src/gui/inventorywindow.cpp:124 src/gui/popupmenu.cpp:378
+msgid "Store"
+msgstr "Pohrani"
+
+#: src/gui/inventorywindow.cpp:125 src/gui/popupmenu.cpp:385
+msgid "Retrieve"
+msgstr "Preuzmi"
+
+#: src/gui/inventorywindow.cpp:350 src/gui/popupmenu.cpp:369
 msgid "Drop"
 msgstr "Ispusti"
 
-#: src/gui/itemamount.cpp:100 src/gui/okdialog.cpp:42
-#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:38 src/gui/trade.cpp:73
-#: src/gui/trade.cpp:75
+#: src/gui/itemamount.cpp:113 src/gui/okdialog.cpp:42
+#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:39 src/gui/trade.cpp:72
+#: src/gui/trade.cpp:74
 msgid "OK"
 msgstr "U redu"
 
-#: src/gui/itemamount.cpp:102
+#: src/gui/itemamount.cpp:115
 msgid "All"
 msgstr "Sve"
 
-#: src/gui/itemamount.cpp:128
+#: src/gui/itemamount.cpp:141
 msgid "Select amount of items to trade."
 msgstr "Odaberi količinu predmeta za razmjenu."
 
-#: src/gui/itemamount.cpp:131
+#: src/gui/itemamount.cpp:144
 msgid "Select amount of items to drop."
 msgstr "Odaberi količinu predmeta za ispuštanje."
 
-#: src/gui/itemamount.cpp:134
+#: src/gui/itemamount.cpp:147
 msgid "Select amount of items to store."
 msgstr "Odaberite količinu predmeta za spremanje."
 
-#: src/gui/itemamount.cpp:137
+#: src/gui/itemamount.cpp:150
 msgid "Select amount of items to retrieve."
 msgstr "Odaberite iznos predmeta za preuzimanje."
 
-#: src/gui/itemamount.cpp:140
+#: src/gui/itemamount.cpp:153
 msgid "Select amount of items to split."
 msgstr "Odaberi količinu predmeta za razdvajanje."
 
-#: src/gui/itempopup.cpp:92
+#: src/gui/itempopup.cpp:137
 #, fuzzy, c-format
 msgid "Weight: %s"
 msgstr "Težina: "
 
-#: src/gui/login.cpp:49 src/gui/login.cpp:61
+#: src/gui/login.cpp:51 src/gui/login.cpp:63
 msgid "Login"
 msgstr "Korisničko ime"
 
-#: src/gui/login.cpp:58
+#: src/gui/login.cpp:60
 #, fuzzy
 msgid "Remember username"
 msgstr "Zapamti korisničko ime"
 
-#: src/gui/login.cpp:59 src/gui/register.cpp:58 src/gui/register.cpp:73
+#: src/gui/login.cpp:61 src/gui/register.cpp:58 src/gui/register.cpp:73
 msgid "Register"
 msgstr "Registriraj se"
 
-#: src/gui/login.cpp:60
+#: src/gui/login.cpp:62
 #, fuzzy
 msgid "Change Server"
 msgstr "Server"
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
+#: src/gui/login.cpp:129
+#, fuzzy
+msgid "Registration disabled"
+msgstr "Dijeljenje predmeta je onemogućeno."
+
+#: src/gui/login.cpp:129
+msgid "You need to use the website to register an account for this server."
+msgstr ""
+
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:86
 msgid "Map"
 msgstr "Karta"
 
-#: src/gui/npcdialog.cpp:44
+#: src/gui/ministatus.cpp:235
+msgid "Need"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:48
 msgid "Waiting for server"
 msgstr "Čekanje servera"
 
-#: src/gui/npcdialog.cpp:45
+#: src/gui/npcdialog.cpp:49
 msgid "Next"
 msgstr "Slijedeći"
 
-#: src/gui/npcdialog.cpp:47
+#: src/gui/npcdialog.cpp:51
 msgid "Submit"
 msgstr "Dostavi"
 
-#: src/gui/npcdialog.cpp:52 src/gui/npcpostdialog.cpp:41
+#: src/gui/npcdialog.cpp:73 src/gui/npcpostdialog.cpp:41
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:110
+#: src/gui/npcdialog.cpp:118
+msgid "Clear log"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:134
 msgid "Reset"
 msgstr "Poništi"
 
 #. TRANSLATORS: Please leave the \n sequences intact.
-#: src/gui/npcdialog.cpp:171
+#: src/gui/npcdialog.cpp:208
 #, fuzzy
 msgid ""
 "\n"
@@ -968,7 +1014,7 @@ msgstr "Za:"
 msgid "Send"
 msgstr "Pošalji"
 
-#: src/gui/npcpostdialog.cpp:96
+#: src/gui/npcpostdialog.cpp:99
 msgid "Failed to send as sender or letter invalid."
 msgstr "Neuspjelo slanje kao pošiljatelj ili nevažeće pismo."
 
@@ -983,99 +1029,86 @@ msgstr ""
 msgid "Unequip first"
 msgstr "Skini opremu"
 
-#: src/gui/popupmenu.cpp:84
+#: src/gui/popupmenu.cpp:83
 #, fuzzy, c-format
 msgid "Trade with %s..."
 msgstr "Trgovanje s %s"
 
-#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:161
+#: src/gui/popupmenu.cpp:87 src/gui/popupmenu.cpp:158
 #, fuzzy, c-format
 msgid "Attack %s"
 msgstr "Napad %+d"
 
-#: src/gui/popupmenu.cpp:92
+#: src/gui/popupmenu.cpp:91
 #, fuzzy, c-format
 msgid "Whisper %s"
 msgstr "Šapat"
 
-#: src/gui/popupmenu.cpp:101
+#: src/gui/popupmenu.cpp:100
 #, fuzzy, c-format
 msgid "Befriend %s"
 msgstr "@@friend|Budi prijatelj %s@@"
 
-#: src/gui/popupmenu.cpp:106
+#: src/gui/popupmenu.cpp:105
 #, fuzzy, c-format
 msgid "Disregard %s"
 msgstr "Zanemareno"
 
-#: src/gui/popupmenu.cpp:109
+#: src/gui/popupmenu.cpp:108
 #, fuzzy, c-format
 msgid "Ignore %s"
 msgstr "Ignorirano"
 
-#: src/gui/popupmenu.cpp:115 src/gui/popupmenu.cpp:124
+#: src/gui/popupmenu.cpp:114 src/gui/popupmenu.cpp:123
 #, c-format
 msgid "Unignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:118
+#: src/gui/popupmenu.cpp:117
 #, fuzzy, c-format
 msgid "Completely ignore %s"
 msgstr "@@ignore|Potpuno ignoriraj %s@@"
 
 #: src/gui/popupmenu.cpp:130
-#, c-format
-msgid "Follow %s"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:133
 #, fuzzy, c-format
 msgid "Invite %s to join your guild"
 msgstr "@@guild|Pozovi %s da se pridrži tvom cehu@@"
 
-#: src/gui/popupmenu.cpp:137
+#: src/gui/popupmenu.cpp:134
 #, fuzzy, c-format
 msgid "Invite %s to join your party"
 msgstr "@@party|Pozovi %s da se pridruži tvojoj skupini@@"
 
-#: src/gui/popupmenu.cpp:144
+#: src/gui/popupmenu.cpp:141
 #, fuzzy
 msgid "Kick player"
 msgstr "Šut nije uspio!"
 
-#: src/gui/popupmenu.cpp:153
+#: src/gui/popupmenu.cpp:150
 #, fuzzy, c-format
 msgid "Talk to %s"
 msgstr "@@talk|Govori S %s@@"
 
-#: src/gui/popupmenu.cpp:166
+#: src/gui/popupmenu.cpp:163
 #, fuzzy
 msgid "Kick monster"
 msgstr "@@admin-kick|Šutni čudovište@@"
 
-#: src/gui/popupmenu.cpp:174
+#: src/gui/popupmenu.cpp:171
 #, fuzzy
 msgid "Add name to chat"
 msgstr "@@name|Dodaj ime u chat@@"
 
-#: src/gui/popupmenu.cpp:191
+#: src/gui/popupmenu.cpp:188
 #, fuzzy, c-format
 msgid "Pick up %s"
 msgstr "Pokupi"
 
-#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:400
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:387
 #, fuzzy
 msgid "Add to chat"
 msgstr "@@chat|Dudaj u chat@@"
 
-#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:71
-msgid "Store"
-msgstr "Pohrani"
-
-#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:72
-msgid "Retrieve"
-msgstr "Preuzmi"
-
 #: src/gui/quitdialog.cpp:44
 msgid "Switch server"
 msgstr "Promijeni poslužitelj"
@@ -1144,52 +1177,65 @@ msgstr "Lozinka mora biti kraća od %d znakova."
 msgid "Passwords do not match."
 msgstr "Lozinke se ne podudaraju."
 
-#: src/gui/serverdialog.cpp:124
+#: src/gui/serverdialog.cpp:197
 #, fuzzy
 msgid "Choose Your Server"
 msgstr "Izaberite vaš server"
 
-#: src/gui/serverdialog.cpp:131 src/gui/widgets/chattab.cpp:139
+#: src/gui/serverdialog.cpp:206 src/gui/widgets/chattab.cpp:142
 msgid "Server:"
 msgstr "Poslužitelj:"
 
-#: src/gui/serverdialog.cpp:132
+#: src/gui/serverdialog.cpp:207
 msgid "Port:"
 msgstr "Port:"
 
-#: src/gui/serverdialog.cpp:133
+#: src/gui/serverdialog.cpp:208
 #, fuzzy
 msgid "Server type:"
 msgstr "Poslužitelj:"
 
-#: src/gui/serverdialog.cpp:153
+#: src/gui/serverdialog.cpp:229
 #, fuzzy
 msgid "Connect"
 msgstr "Spajanje..."
 
-#: src/gui/serverdialog.cpp:154
+#: src/gui/serverdialog.cpp:230
 #, fuzzy
 msgid "Custom Server"
 msgstr "Vlastiti kursor"
 
-#: src/gui/serverdialog.cpp:242
+#: src/gui/serverdialog.cpp:324
 msgid "Please type both the address and the port of a server."
 msgstr "Molimo upišite adresu poslužitelja i port poslužitelja."
 
-#: src/gui/serverdialog.cpp:357
+#: src/gui/serverdialog.cpp:441
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:363
+#: src/gui/serverdialog.cpp:447
 #, fuzzy
 msgid "Waiting for server..."
 msgstr "Čekanje servera"
 
-#: src/gui/serverdialog.cpp:367
+#: src/gui/serverdialog.cpp:451
 msgid "Preparing download"
 msgstr ""
 
+#: src/gui/serverdialog.cpp:455
+msgid "Error retreiving server list!"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:550
+msgid "requires a newer version"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:552
+#, c-format
+msgid "requires v%s"
+msgstr ""
+
 #: src/gui/setup_audio.cpp:42
 msgid "Sound"
 msgstr "Zvuk"
@@ -1223,54 +1269,54 @@ msgstr ""
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:45
+#: src/gui/setup_colors.cpp:46
 msgid "This is what the color looks like"
 msgstr "Ovako izgleda boja"
 
-#: src/gui/setup_colors.cpp:50
+#: src/gui/setup_colors.cpp:51
 msgid "Colors"
 msgstr "Boje"
 
-#: src/gui/setup_colors.cpp:71
+#: src/gui/setup_colors.cpp:72
 #, fuzzy
 msgid "Type:"
 msgstr "Tip: "
 
-#: src/gui/setup_colors.cpp:82 src/gui/setup_colors.cpp:330
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:331
 msgid "Static"
 msgstr "Statično"
 
-#: src/gui/setup_colors.cpp:84 src/gui/setup_colors.cpp:85
-#: src/gui/setup_colors.cpp:331
+#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
+#: src/gui/setup_colors.cpp:332
 msgid "Pulse"
 msgstr "Pulsiranje"
 
-#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:87
-#: src/gui/setup_colors.cpp:332
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
+#: src/gui/setup_colors.cpp:333
 msgid "Rainbow"
 msgstr "Duga"
 
-#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
-#: src/gui/setup_colors.cpp:332
+#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
+#: src/gui/setup_colors.cpp:333
 msgid "Spectrum"
 msgstr "Spektar"
 
-#: src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:94
 #, fuzzy
 msgid "Delay:"
 msgstr "Odgoda: "
 
-#: src/gui/setup_colors.cpp:108
+#: src/gui/setup_colors.cpp:109
 #, fuzzy
 msgid "Red:"
 msgstr "Crvena: "
 
-#: src/gui/setup_colors.cpp:123
+#: src/gui/setup_colors.cpp:124
 #, fuzzy
 msgid "Green:"
 msgstr "Zelena: "
 
-#: src/gui/setup_colors.cpp:138
+#: src/gui/setup_colors.cpp:139
 #, fuzzy
 msgid "Blue:"
 msgstr "Plava: "
@@ -1328,587 +1374,589 @@ msgstr "Zadano"
 msgid "Key Conflict(s) Detected."
 msgstr "Otkriven je Konflikt(i) Tipki."
 
-#: src/gui/setup_players.cpp:57
+#: src/gui/setup_players.cpp:58
 msgid "Name"
 msgstr "Ime"
 
-#: src/gui/setup_players.cpp:58
+#: src/gui/setup_players.cpp:59
 msgid "Relation"
 msgstr "Odnos"
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:64
 msgid "Neutral"
 msgstr "Neutralno"
 
-#: src/gui/setup_players.cpp:64
+#: src/gui/setup_players.cpp:65
 msgid "Friend"
 msgstr "Prijatelj"
 
-#: src/gui/setup_players.cpp:65
+#: src/gui/setup_players.cpp:66
 msgid "Disregarded"
 msgstr "Zanemareno"
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_players.cpp:67
 msgid "Ignored"
 msgstr "Ignorirano"
 
-#: src/gui/setup_players.cpp:208 src/gui/setup_video.cpp:132
+#: src/gui/setup_players.cpp:206 src/gui/setup_video.cpp:153
 msgid "???"
 msgstr "???"
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_players.cpp:225
 msgid "Allow trading"
 msgstr "Dozvoli trgovanje"
 
-#: src/gui/setup_players.cpp:228
+#: src/gui/setup_players.cpp:227
 msgid "Allow whispers"
 msgstr "Dozvoli šapate"
 
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:231
 msgid "Put all whispers in tabs"
 msgstr "Stavi sve šapate u kartice"
 
-#: src/gui/setup_players.cpp:234
+#: src/gui/setup_players.cpp:233
 #, fuzzy
 msgid "Show gender"
 msgstr "Prikaži ime"
 
-#: src/gui/setup_players.cpp:236
+#: src/gui/setup_players.cpp:235
+#, fuzzy
+msgid "Enable Chat log"
+msgstr "Nije moguće prodati."
+
+#: src/gui/setup_players.cpp:237
 msgid "Players"
 msgstr "Igrači"
 
-#: src/gui/setup_players.cpp:261
+#: src/gui/setup_players.cpp:262
 msgid "When ignoring:"
 msgstr "Kad ignorira:"
 
-#: src/gui/setup_video.cpp:113
+#: src/gui/setup_video.cpp:134
 msgid "Tiny"
 msgstr "Sićušno"
 
-#: src/gui/setup_video.cpp:114
+#: src/gui/setup_video.cpp:135
 msgid "Small"
 msgstr "Maleno"
 
-#: src/gui/setup_video.cpp:115
+#: src/gui/setup_video.cpp:136
 msgid "Medium"
 msgstr "Srednje"
 
-#: src/gui/setup_video.cpp:116
+#: src/gui/setup_video.cpp:137
 msgid "Large"
 msgstr "Veliko"
 
-#: src/gui/setup_video.cpp:142
+#: src/gui/setup_video.cpp:163
 msgid "No text"
 msgstr "Nema teksta"
 
-#: src/gui/setup_video.cpp:143
+#: src/gui/setup_video.cpp:164
 msgid "Text"
 msgstr "Tekst"
 
-#: src/gui/setup_video.cpp:144
+#: src/gui/setup_video.cpp:165
 msgid "Bubbles, no names"
 msgstr "Mjehurići, bez imena"
 
-#: src/gui/setup_video.cpp:145
+#: src/gui/setup_video.cpp:166
 msgid "Bubbles with names"
 msgstr "Mjehurići s imenima"
 
-#: src/gui/setup_video.cpp:157
+#: src/gui/setup_video.cpp:178
 msgid "off"
 msgstr "isključeno"
 
-#: src/gui/setup_video.cpp:158 src/gui/setup_video.cpp:171
+#: src/gui/setup_video.cpp:179 src/gui/setup_video.cpp:192
 msgid "low"
 msgstr "nisko"
 
-#: src/gui/setup_video.cpp:159 src/gui/setup_video.cpp:173
+#: src/gui/setup_video.cpp:180 src/gui/setup_video.cpp:194
 msgid "high"
 msgstr "visoko"
 
-#: src/gui/setup_video.cpp:172
+#: src/gui/setup_video.cpp:193
 msgid "medium"
 msgstr "srednje"
 
-#: src/gui/setup_video.cpp:174
+#: src/gui/setup_video.cpp:195
 msgid "max"
 msgstr "max"
 
-#: src/gui/setup_video.cpp:196
+#: src/gui/setup_video.cpp:217
 msgid "Full screen"
 msgstr "Pregled na čitavom ekranu"
 
-#: src/gui/setup_video.cpp:197
+#: src/gui/setup_video.cpp:218
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:198
+#: src/gui/setup_video.cpp:219
 msgid "Custom cursor"
 msgstr "Vlastiti kursor"
 
-#: src/gui/setup_video.cpp:200
+#: src/gui/setup_video.cpp:221
 msgid "Visible names"
 msgstr "Vidljiva imena"
 
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:223
 msgid "Particle effects"
 msgstr "Efekt čestica"
 
-#: src/gui/setup_video.cpp:204
+#: src/gui/setup_video.cpp:225
 #, fuzzy
 msgid "Show own name"
 msgstr "Prikaži ime"
 
-#: src/gui/setup_video.cpp:205
+#: src/gui/setup_video.cpp:226
+msgid "Log NPC dialogue"
+msgstr ""
+
+#: src/gui/setup_video.cpp:227
 msgid "Show pickup notification"
 msgstr "Prikaži obavijesti o prikupljanju."
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:207
+#. TRANSLATORS: Refers to "Show pickup notification"
+#: src/gui/setup_video.cpp:229
 msgid "in chat"
 msgstr "u chat-u"
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:209
+#. TRANSLATORS: Refers to "Show pickup notification"
+#: src/gui/setup_video.cpp:231
 msgid "as particle"
 msgstr "kao čestica"
 
-#: src/gui/setup_video.cpp:214
+#: src/gui/setup_video.cpp:236
 #, fuzzy
 msgid "FPS limit:"
 msgstr "Ograničenje sličica u sekundi"
 
-#: src/gui/setup_video.cpp:225
+#: src/gui/setup_video.cpp:247
+msgid "Disable transparency (Low CPU mode)"
+msgstr ""
+
+#: src/gui/setup_video.cpp:250
 msgid "Video"
 msgstr "Slika"
 
-#: src/gui/setup_video.cpp:227
+#: src/gui/setup_video.cpp:252
 #, fuzzy
-msgid "Show monster damage"
+msgid "Show damage"
 msgstr "Prikaži ime"
 
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:258
 msgid "Overhead text"
 msgstr "Tekst iznad glave"
 
-#: src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:259
 msgid "Gui opacity"
 msgstr "Prozirnost sučelja"
 
-#: src/gui/setup_video.cpp:235
+#: src/gui/setup_video.cpp:260
 msgid "Ambient FX"
 msgstr "Efekti okruženja"
 
-#: src/gui/setup_video.cpp:236
+#: src/gui/setup_video.cpp:261
 #, fuzzy
 msgid "Particle detail"
 msgstr "Detalji Čestica"
 
-#: src/gui/setup_video.cpp:237
+#: src/gui/setup_video.cpp:262
 msgid "Font size"
 msgstr "Veličina fonta"
 
-#: src/gui/setup_video.cpp:251 src/gui/setup_video.cpp:454
-#: src/gui/setup_video.cpp:568
+#: src/gui/setup_video.cpp:277 src/gui/setup_video.cpp:532
+#: src/gui/setup_video.cpp:662
 #, fuzzy
 msgid "None"
 msgstr "Ne"
 
-#: src/gui/setup_video.cpp:381
+#: src/gui/setup_video.cpp:426
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:387
+#: src/gui/setup_video.cpp:432
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:398
+#: src/gui/setup_video.cpp:443
 #, fuzzy
 msgid "Switching to Full Screen"
 msgstr "Prebacivanje u pregled na čitavom ekranu"
 
-#: src/gui/setup_video.cpp:399
+#: src/gui/setup_video.cpp:444
 msgid "Restart needed for changes to take effect."
 msgstr "Potrebno je ponovno pokrenuti klijent za izvršavanje promjena."
 
-#: src/gui/setup_video.cpp:411
+#: src/gui/setup_video.cpp:458
 #, fuzzy
 msgid "Changing to OpenGL"
 msgstr "Promjena OpenGL-a"
 
-#: src/gui/setup_video.cpp:412
+#: src/gui/setup_video.cpp:459
+msgid ""
+"Applying change to OpenGL requires restart. In case OpenGL messes up your "
+"game graphics, restart the game with the command line option \"--no-opengl\"."
+msgstr ""
+
+#: src/gui/setup_video.cpp:466
+msgid "Deactivating OpenGL"
+msgstr ""
+
+#: src/gui/setup_video.cpp:467
 msgid "Applying change to OpenGL requires restart."
 msgstr "Izmjene OpenGL-a zahtjevaju ponovno pokretanje klijenta."
 
-#: src/gui/setup_video.cpp:486 src/gui/setup_video.cpp:491
+#: src/gui/setup_video.cpp:475
+#, fuzzy
+msgid "Transparency disabled"
+msgstr "Dijeljenje predmeta je onemogućeno."
+
+#: src/gui/setup_video.cpp:476 src/gui/setup_video.cpp:484
+msgid "You must restart to apply changes."
+msgstr ""
+
+#: src/gui/setup_video.cpp:483
+msgid "Transparency enabled"
+msgstr ""
+
+#: src/gui/setup_video.cpp:576 src/gui/setup_video.cpp:581
 #, fuzzy
 msgid "Screen Resolution Changed"
 msgstr "Rezolucija Ekrana promijenjena"
 
-#: src/gui/setup_video.cpp:487 src/gui/setup_video.cpp:492
+#: src/gui/setup_video.cpp:577 src/gui/setup_video.cpp:582
 msgid "Restart your client for the change to take effect."
 msgstr "Ponovo pokrenite klijent da bi promjene bile efektne."
 
-#: src/gui/setup_video.cpp:489
+#: src/gui/setup_video.cpp:579
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:522
+#: src/gui/setup_video.cpp:612
 #, fuzzy
 msgid "Particle Effect Settings Changed."
 msgstr "Postavke efekta čestica su promijenjene."
 
-#: src/gui/setup_video.cpp:523
+#: src/gui/setup_video.cpp:613
 msgid "Changes will take effect on map change."
 msgstr "Promjene će stupiti na snagu na promjeni karte."
 
-#: src/gui/skilldialog.cpp:198 src/gui/windowmenu.cpp:59
+#: src/gui/skilldialog.cpp:212 src/gui/windowmenu.cpp:59
 msgid "Skills"
 msgstr "Vještine"
 
-#: src/gui/skilldialog.cpp:209
+#: src/gui/skilldialog.cpp:223
 msgid "Up"
 msgstr "Gore"
 
-#: src/gui/skilldialog.cpp:263
+#: src/gui/skilldialog.cpp:269
 #, fuzzy, c-format
 msgid "Skill points available: %d"
 msgstr "Bodovi vještine: %d"
 
-#: src/gui/skilldialog.cpp:315
+#: src/gui/skilldialog.cpp:351
 #, fuzzy, c-format
 msgid "Skill Set %d"
 msgstr "Bodovi vještine: %d"
 
-#: src/gui/skilldialog.cpp:324
+#: src/gui/skilldialog.cpp:360
 #, fuzzy, c-format
 msgid "Skill %d"
 msgstr "Vještine"
 
-#: src/gui/skilldialog.cpp:406
+#: src/gui/skilldialog.cpp:442
 #, fuzzy, c-format
 msgid "Lvl: %d (%+d)"
 msgstr "Nivo: %d"
 
-#: src/gui/skilldialog.cpp:417
+#: src/gui/skilldialog.cpp:453
 #, fuzzy, c-format
 msgid "Lvl: %d"
 msgstr "Nivo: %d"
 
-#: src/gui/socialwindow.cpp:118
+#: src/gui/socialwindow.cpp:126
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:127
+#: src/gui/socialwindow.cpp:139
 #, fuzzy, c-format
 msgid "Guild %s quit requested."
 msgstr "Ceh, ustanovljen."
 
-#: src/gui/socialwindow.cpp:137
+#: src/gui/socialwindow.cpp:153
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:138
+#: src/gui/socialwindow.cpp:154
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:147
+#: src/gui/socialwindow.cpp:163
 #, fuzzy
 msgid "Leave Guild?"
 msgstr "Formiraj Ceh"
 
-#: src/gui/socialwindow.cpp:148
+#: src/gui/socialwindow.cpp:164
 #, fuzzy, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Jeste li sigurni da želite odustati?"
 
-#: src/gui/socialwindow.cpp:183
+#: src/gui/socialwindow.cpp:207 src/net/tmwa/partyhandler.cpp:330
 #, fuzzy, c-format
 msgid "Invited user %s to party."
 msgstr "/party > Pozovite korisnike na partiju"
 
-#: src/gui/socialwindow.cpp:190
+#: src/gui/socialwindow.cpp:218
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:200
+#: src/gui/socialwindow.cpp:232
 #, fuzzy
 msgid "Member Invite to Party"
 msgstr "/party > Pozovite korisnike na partiju"
 
-#: src/gui/socialwindow.cpp:201
+#: src/gui/socialwindow.cpp:233
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:210
+#: src/gui/socialwindow.cpp:242
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:211
+#: src/gui/socialwindow.cpp:243
 #, fuzzy, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Jeste li sigurni da želite odustati?"
 
-#: src/gui/socialwindow.cpp:240
+#: src/gui/socialwindow.cpp:272
 msgid "Create Guild"
 msgstr "Formiraj Ceh"
 
-#: src/gui/socialwindow.cpp:241 src/gui/socialwindow.cpp:565
+#: src/gui/socialwindow.cpp:273 src/gui/socialwindow.cpp:620
 #, fuzzy
 msgid "Create Party"
 msgstr "Stvori Lika"
 
-#: src/gui/socialwindow.cpp:280 src/gui/windowmenu.cpp:64
+#: src/gui/socialwindow.cpp:312 src/gui/windowmenu.cpp:64
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:298
+#: src/gui/socialwindow.cpp:330
 #, fuzzy
 msgid "Invite"
 msgstr "Pozovi Korisnika"
 
-#: src/gui/socialwindow.cpp:299
+#: src/gui/socialwindow.cpp:331
 #, fuzzy
 msgid "Leave"
 msgstr "Veliko"
 
-#: src/gui/socialwindow.cpp:395
+#: src/gui/socialwindow.cpp:443
 #, fuzzy, c-format
 msgid "Accepted party invite from %s."
 msgstr "Prihvaćen poziv od %s."
 
-#: src/gui/socialwindow.cpp:401
+#: src/gui/socialwindow.cpp:449
 #, fuzzy, c-format
 msgid "Rejected party invite from %s."
 msgstr "Odbijen poziv od %s."
 
-#: src/gui/socialwindow.cpp:414
+#: src/gui/socialwindow.cpp:462
 #, fuzzy, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Prihvaćen poziv od %s."
 
-#: src/gui/socialwindow.cpp:420
+#: src/gui/socialwindow.cpp:468
 #, fuzzy, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Odbijen poziv od %s."
 
-#: src/gui/socialwindow.cpp:464
+#: src/gui/socialwindow.cpp:497
+msgid "Creating guild failed, please choose a shorter name."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:504
 #, fuzzy, c-format
 msgid "Creating guild called %s."
 msgstr "Pogreška pri ustanovljavanju ceha."
 
-#: src/gui/socialwindow.cpp:478
+#: src/gui/socialwindow.cpp:520
+msgid "Creating party failed, please choose a shorter name."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:527
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:485
+#: src/gui/socialwindow.cpp:541
 #, fuzzy
 msgid "Guild Name"
 msgstr "Ceh"
 
-#: src/gui/socialwindow.cpp:486
+#: src/gui/socialwindow.cpp:542
 #, fuzzy
 msgid "Choose your guild's name."
 msgstr "Izaberite vaš server"
 
-#: src/gui/socialwindow.cpp:498
+#: src/gui/socialwindow.cpp:554
 #, fuzzy
 msgid "Received guild request, but one already exists."
 msgstr "Primljen zahtjev za partiju, ali ona već postoji."
 
-#: src/gui/socialwindow.cpp:503
+#: src/gui/socialwindow.cpp:559
 #, fuzzy, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s vas je pozvao/la da se pridružite %s partiji."
 
-#: src/gui/socialwindow.cpp:508
+#: src/gui/socialwindow.cpp:564
 #, fuzzy
 msgid "Accept Guild Invite"
 msgstr "Prihvati Pozivnicu za Partiju"
 
-#: src/gui/socialwindow.cpp:520
+#: src/gui/socialwindow.cpp:576
 msgid "Received party request, but one already exists."
 msgstr "Primljen zahtjev za partiju, ali ona već postoji."
 
-#: src/gui/socialwindow.cpp:530
+#: src/gui/socialwindow.cpp:585
 #, fuzzy
 msgid "You have been invited you to join a party."
 msgstr "%s vas je pozvao/la da se pridružite njihovoj partiji."
 
-#: src/gui/socialwindow.cpp:534
+#: src/gui/socialwindow.cpp:589
 #, fuzzy, c-format
 msgid "You have been invited to join the %s party."
 msgstr "%s vas je pozvao/la da se pridružite %s partiji."
 
-#: src/gui/socialwindow.cpp:542
+#: src/gui/socialwindow.cpp:597
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s vas je pozvao/la da se pridružite njihovoj partiji."
 
-#: src/gui/socialwindow.cpp:547
+#: src/gui/socialwindow.cpp:602
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s vas je pozvao/la da se pridružite %s partiji."
 
-#: src/gui/socialwindow.cpp:555
+#: src/gui/socialwindow.cpp:610
 msgid "Accept Party Invite"
 msgstr "Prihvati Pozivnicu za Partiju"
 
-#: src/gui/socialwindow.cpp:566
+#: src/gui/socialwindow.cpp:621
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:571
+#: src/gui/socialwindow.cpp:626
 #, fuzzy
 msgid "Party Name"
 msgstr "Partija"
 
-#: src/gui/socialwindow.cpp:572
+#: src/gui/socialwindow.cpp:627
 #, fuzzy
 msgid "Choose your party's name."
 msgstr "Izaberite vaš server"
 
-#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:62
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:62
 msgid "Specials"
 msgstr ""
 
-#: src/gui/specialswindow.cpp:174
-#, c-format
-msgid "Specials Set %d"
-msgstr ""
-
-#: src/gui/specialswindow.cpp:191
-#, c-format
-msgid "Special %d"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:247
+#: src/gui/statuswindow.cpp:113 src/gui/statuswindow.cpp:215
+#: src/gui/statuswindow.cpp:262
 #, c-format
 msgid "Level: %d"
 msgstr "Nivo: %d"
 
-#: src/gui/statuswindow.cpp:101 src/gui/statuswindow.cpp:211
+#: src/gui/statuswindow.cpp:114 src/gui/statuswindow.cpp:208
+#: src/gui/statuswindow.cpp:239
 #, c-format
 msgid "Money: %s"
 msgstr "Novac: %s"
 
-#: src/gui/statuswindow.cpp:104
+#: src/gui/statuswindow.cpp:117
 msgid "HP:"
 msgstr "HP:"
 
-#: src/gui/statuswindow.cpp:109
+#: src/gui/statuswindow.cpp:122
 msgid "Exp:"
 msgstr "Exp:"
 
-#: src/gui/statuswindow.cpp:114
+#: src/gui/statuswindow.cpp:130
 msgid "MP:"
 msgstr "MP:"
 
-#: src/gui/statuswindow.cpp:132 src/gui/statuswindow.cpp:219
+#: src/gui/statuswindow.cpp:158 src/gui/statuswindow.cpp:275
 #, c-format
 msgid "Job: %d"
 msgstr "Zadatak: %d"
 
-#: src/gui/statuswindow.cpp:133
+#: src/gui/statuswindow.cpp:159
 msgid "Job:"
 msgstr "Zadatak:"
 
-#: src/gui/statuswindow.cpp:194
-#, fuzzy
-msgid "HP"
-msgstr "HP:"
-
-#: src/gui/statuswindow.cpp:200
-#, fuzzy
-msgid "MP"
-msgstr "MP:"
-
-#: src/gui/statuswindow.cpp:206
-#, fuzzy
-msgid "Exp"
-msgstr "Exp:"
-
-#: src/gui/statuswindow.cpp:215
-#, fuzzy
-msgid "Money"
-msgstr "Novac: %d"
-
-#: src/gui/statuswindow.cpp:225
-#, fuzzy
-msgid "Job"
-msgstr "Zadatak:"
-
-#: src/gui/statuswindow.cpp:229
+#: src/gui/statuswindow.cpp:211 src/gui/statuswindow.cpp:247
 #, fuzzy, c-format
 msgid "Character points: %d"
 msgstr "Podaci lika su u redu"
 
-#: src/gui/statuswindow.cpp:235
+#: src/gui/statuswindow.cpp:255
 #, fuzzy, c-format
 msgid "Correction points: %d"
 msgstr "Bodovi vještine: %d"
 
-#: src/gui/statuswindow.cpp:251
-#, fuzzy
-msgid "Level"
-msgstr "Nivo: %d"
-
-#: src/gui/storagewindow.cpp:59
-msgid "Storage"
-msgstr "Pohrana"
-
-#: src/gui/trade.cpp:52
+#: src/gui/trade.cpp:53
 msgid "Propose trade"
 msgstr "Predloži razmjenu"
 
-#: src/gui/trade.cpp:53
+#: src/gui/trade.cpp:54
 msgid "Confirmed. Waiting..."
 msgstr "Potvrđeno. Čekanje..."
 
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:55
 msgid "Agree trade"
 msgstr "Složi se za trgovanje"
 
-#: src/gui/trade.cpp:55
+#: src/gui/trade.cpp:56
 msgid "Agreed. Waiting..."
 msgstr "Dogovoreno. Čekanje..."
 
-#: src/gui/trade.cpp:58
+#: src/gui/trade.cpp:59
 msgid "Trade: You"
 msgstr "Trgovanje: Vi"
 
-#: src/gui/trade.cpp:74 src/gui/trade.cpp:75
+#: src/gui/trade.cpp:73 src/gui/trade.cpp:74
 msgid "Trade"
 msgstr "Trgovanje"
 
-#: src/gui/trade.cpp:77
+#: src/gui/trade.cpp:76
 msgid "Add"
 msgstr "Dodaj"
 
-#: src/gui/trade.cpp:99 src/gui/trade.cpp:135
+#: src/gui/trade.cpp:98 src/gui/trade.cpp:134
 #, fuzzy, c-format
 msgid "You get %s"
 msgstr "Vi dobijete %s."
 
-#: src/gui/trade.cpp:100
+#: src/gui/trade.cpp:99
 msgid "You give:"
 msgstr "Daješ:"
 
-#: src/gui/trade.cpp:104
+#: src/gui/trade.cpp:103
 msgid "Change"
 msgstr "Izmijeni"
 
-#: src/gui/trade.cpp:275
+#: src/gui/trade.cpp:262
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/trade.cpp:318
+#: src/gui/trade.cpp:304
 msgid "You don't have enough money."
 msgstr "Nemate dovoljno novca."
 
@@ -1929,22 +1977,22 @@ msgstr "Spajanje..."
 msgid "Play"
 msgstr "Igraj"
 
-#: src/gui/updatewindow.cpp:405
+#: src/gui/updatewindow.cpp:417
 msgid "##1  The update process is incomplete."
 msgstr "##1  Proces ažuriranja je nepotpun."
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:407
+#: src/gui/updatewindow.cpp:419
 msgid "##1  It is strongly recommended that"
 msgstr "##1  Vrlo je preporučljivo da"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:409
+#: src/gui/updatewindow.cpp:421
 #, fuzzy
 msgid "##1  you try again later."
 msgstr "##1  pokušate ponovno kasnije"
 
-#: src/gui/updatewindow.cpp:501
+#: src/gui/updatewindow.cpp:515
 msgid "Completed"
 msgstr "Dovršeno"
 
@@ -2024,55 +2072,55 @@ msgstr "Trebate korisnika za op!"
 msgid "Need a user to kick!"
 msgstr "Trebate korisnika za kick!"
 
-#: src/gui/widgets/chattab.cpp:118
+#: src/gui/widgets/chattab.cpp:121
 msgid "Global announcement:"
 msgstr "Javna obavijest:"
 
-#: src/gui/widgets/chattab.cpp:124
+#: src/gui/widgets/chattab.cpp:127
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "Javna obavijest od %s:"
 
-#: src/gui/widgets/chattab.cpp:150
+#: src/gui/widgets/chattab.cpp:153
 #, fuzzy, c-format
 msgid "%s whispers: %s"
 msgstr "%s šaptanje: "
 
-#: src/gui/widgets/whispertab.cpp:51
+#: src/gui/widgets/whispertab.cpp:53
 msgid "Cannot send empty chat!"
 msgstr "Ne mogu poslati prazan chat!"
 
-#: src/gui/widgets/whispertab.cpp:70
+#: src/gui/widgets/whispertab.cpp:72
 msgid "/ignore > Ignore the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:71
+#: src/gui/widgets/whispertab.cpp:73
 msgid "/unignore > Stop ignoring the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:72
+#: src/gui/widgets/whispertab.cpp:74
 msgid "/close > Close the whisper tab"
 msgstr "/close > Zatvara karticu za šaptaje"
 
-#: src/gui/widgets/whispertab.cpp:82
+#: src/gui/widgets/whispertab.cpp:84
 msgid "Command: /close"
 msgstr "Naredba: /close"
 
-#: src/gui/widgets/whispertab.cpp:83
+#: src/gui/widgets/whispertab.cpp:85
 msgid "This command closes the current whisper tab."
 msgstr "Ova naredba zatvara trenutnu karticu za šaptaje."
 
-#: src/gui/widgets/whispertab.cpp:87
+#: src/gui/widgets/whispertab.cpp:89
 #, fuzzy
 msgid "Command: /ignore"
 msgstr "Naredba: /item"
 
-#: src/gui/widgets/whispertab.cpp:88
+#: src/gui/widgets/whispertab.cpp:90
 #, fuzzy
 msgid "This command ignores the other player regardless of current relations."
 msgstr "Ova naredba prikazuje broj igrača trenutno online."
 
-#: src/gui/widgets/whispertab.cpp:94
+#: src/gui/widgets/whispertab.cpp:96
 #, fuzzy
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr "Ova naredba započinje snimanje chat log-a u datoteku <filename>."
@@ -2100,1439 +2148,1487 @@ msgstr "Izmijeni"
 msgid "Choose World"
 msgstr "Izaberite vaš server"
 
-#: src/keyboardconfig.cpp:40
+#: src/keyboardconfig.cpp:39
 msgid "Move Up"
 msgstr "Pomakni Gore"
 
-#: src/keyboardconfig.cpp:41
+#: src/keyboardconfig.cpp:40
 msgid "Move Down"
 msgstr "Pomakni Dolje"
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:41
 msgid "Move Left"
 msgstr "Pomakni Ulijevo"
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:42
 msgid "Move Right"
 msgstr "Pomakni Udesno"
 
-#: src/keyboardconfig.cpp:44 src/net/ea/generalhandler.cpp:223
+#: src/keyboardconfig.cpp:43 src/net/tmwa/generalhandler.cpp:237
 msgid "Attack"
 msgstr "Napad"
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:44
 msgid "Target & Attack"
 msgstr "Meta i Napad"
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:45
 msgid "Smilie"
 msgstr "Smajlić"
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:46
 msgid "Talk"
 msgstr "Govori"
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:47
 msgid "Stop Attack"
 msgstr "Prekini Napad"
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:48
 #, fuzzy
 msgid "Target Monster"
 msgstr "Ciljaj Najbližeg"
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboardconfig.cpp:49
 msgid "Target NPC"
 msgstr "Ciljaj NPC"
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:50
 msgid "Target Player"
 msgstr "Ciljaj Igrača"
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:51
 msgid "Pickup"
 msgstr "Pokupi"
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:52
 msgid "Hide Windows"
 msgstr "Skrij Prozore"
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:53
 msgid "Sit"
 msgstr "Sjedni"
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:54
 msgid "Screenshot"
 msgstr "Snimak zaslona"
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:55
 msgid "Enable/Disable Trading"
 msgstr "Omogući/Onemogući Trgovanje"
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:56
 msgid "Find Path to Mouse"
 msgstr "Pronađi Put do Miša"
 
-#: src/keyboardconfig.cpp:58 src/keyboardconfig.cpp:59
-#: src/keyboardconfig.cpp:60 src/keyboardconfig.cpp:61
-#: src/keyboardconfig.cpp:62 src/keyboardconfig.cpp:63
-#: src/keyboardconfig.cpp:64 src/keyboardconfig.cpp:65
-#: src/keyboardconfig.cpp:66 src/keyboardconfig.cpp:67
-#: src/keyboardconfig.cpp:68 src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:57 src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60
+#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62
+#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64
+#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68
 #, c-format
 msgid "Item Shortcut %d"
 msgstr "Prečac do Predmeta %d"
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:69
 msgid "Help Window"
 msgstr "Prozor za Pomoć"
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:70
 msgid "Status Window"
 msgstr "Prozor Statusa"
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:71
 msgid "Inventory Window"
 msgstr "Prozor Inventara"
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:72
 msgid "Equipment Window"
 msgstr "Prozor Opreme"
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:73
 msgid "Skill Window"
 msgstr "Prozor Vještine"
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:74
 msgid "Minimap Window"
 msgstr "Prozor Minikarte"
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:75
 msgid "Chat Window"
 msgstr "Chat Prozor"
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:76
 msgid "Item Shortcut Window"
 msgstr "Prozor za Prečice do Predmeta"
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:77
 msgid "Setup Window"
 msgstr "Prozor za Postavke"
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:78
 msgid "Debug Window"
 msgstr "Debug Prozor"
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:79
 #, fuzzy
 msgid "Social Window"
 msgstr "Prozor Vještine"
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:80
 msgid "Emote Shortcut Window"
 msgstr "Prozor Prečica za Ispoljavanje emocija"
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:81
 #, fuzzy
 msgid "Outfits Window"
 msgstr "Prozor Statusa"
 
-#: src/keyboardconfig.cpp:83
+#: src/keyboardconfig.cpp:82
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:83
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86
-#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88
-#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90
-#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92
-#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:84 src/keyboardconfig.cpp:85
+#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:87
+#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:89
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:91
+#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:93
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:95
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "Prečica za Ispoljavanje emocija %d"
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:96
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:97
 msgid "Scroll Chat Up"
 msgstr "Pomakni Chat Gore"
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:98
 msgid "Scroll Chat Down"
 msgstr "Pomakni Chat Dolje"
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:99
 msgid "Previous Chat Tab"
 msgstr "Prethodna Chat Kartica"
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:100
 msgid "Next Chat Tab"
 msgstr "Sljedeća Chat Kartica"
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:101
 msgid "Select OK"
 msgstr "Odaberite OK"
 
-#: src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:103
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:105
+#: src/keyboardconfig.cpp:104
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:184
+#: src/keyboardconfig.cpp:183
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:914
+#: src/localplayer.cpp:985
 msgid "Unable to pick up item."
 msgstr ""
 
 #. TRANSLATORS: This sentence may be translated differently
 #. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:923
+#: src/localplayer.cpp:994
 #, fuzzy, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "Pokupili ste %s [@@%d|%s@@]."
 msgstr[1] "Pokupili ste %s [@@%d|%s@@]."
 
-#: src/main.cpp:43
+#: src/main.cpp:42
 msgid "mana [options] [mana-file]"
 msgstr ""
 
+#: src/main.cpp:43
+msgid "[mana-file] : The mana file is an XML file (.mana)"
+msgstr ""
+
 #: src/main.cpp:44
+msgid "              used to set custom parameters"
+msgstr ""
+
+#: src/main.cpp:45
+msgid "              to the mana client."
+msgstr ""
+
+#: src/main.cpp:47
 msgid "Options:"
 msgstr "Opcije:"
 
-#: src/main.cpp:45
+#: src/main.cpp:48
 #, fuzzy
 msgid "  -v --version        : Display the version"
 msgstr "  -v --version     : Prikaži verziju"
 
-#: src/main.cpp:46
+#: src/main.cpp:49
 #, fuzzy
 msgid "  -h --help           : Display this help"
 msgstr "  -h --help        : Prikaži ovu pomoć"
 
-#: src/main.cpp:47
+#: src/main.cpp:50
 #, fuzzy
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr "  -C --config-file : Konfiguracijska datoteka za korištenje"
 
-#: src/main.cpp:48
+#: src/main.cpp:51
 #, fuzzy
 msgid "  -U --username       : Login with this username"
 msgstr "  -U --username    : Prijava s ovim korisničkim imenom"
 
-#: src/main.cpp:49
+#: src/main.cpp:52
 #, fuzzy
 msgid "  -P --password       : Login with this password"
 msgstr "  -P --password    : Prijava s ovom lozinkom"
 
-#: src/main.cpp:50
+#: src/main.cpp:53
 #, fuzzy
 msgid "  -c --character      : Login with this character"
 msgstr "  -c --character   : Ulaz s tim likom"
 
-#: src/main.cpp:51
+#: src/main.cpp:54
 #, fuzzy
 msgid "  -s --server         : Login server name or IP"
 msgstr "  -U --username    : Prijava s ovim korisničkim imenom"
 
-#: src/main.cpp:52
+#: src/main.cpp:55
 #, fuzzy
 msgid "  -p --port           : Login server port"
 msgstr "  -P --password    : Prijava s ovom lozinkom"
 
-#: src/main.cpp:53
+#: src/main.cpp:56
 #, fuzzy
 msgid "     --update-host    : Use this update host"
 msgstr "  -u --skip-update : Preskoči preuzimanje ažuriranja"
 
-#: src/main.cpp:54
+#: src/main.cpp:57
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:56
+#: src/main.cpp:59
 #, fuzzy
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr "  -u --skip-update : Preskoči preuzimanje ažuriranja"
 
-#: src/main.cpp:57
+#: src/main.cpp:60
 #, fuzzy
 msgid "  -d --data           : Directory to load game data from"
 msgstr "  -d --data        : Direktorij iz kojeg se učitavaju podaci igre"
 
-#: src/main.cpp:58
+#: src/main.cpp:61
 #, fuzzy
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
+msgid "     --localdata-dir  : Directory to use as local data directory"
 msgstr "  -S --home-dir    : Direktorij koristiti kao home direktorij"
 
-#: src/main.cpp:59
+#: src/main.cpp:62
+#, fuzzy
+msgid "     --chat-log-dir   : Chat log dir to use"
+msgstr "  -C --config-file : Konfiguracijska datoteka za korištenje"
+
+#: src/main.cpp:63
 #, fuzzy
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr "  -S --home-dir    : Direktorij koristiti kao home direktorij"
 
-#: src/main.cpp:61
+#: src/main.cpp:65
 #, fuzzy
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr "  -O --no-opengl   : Onemogući OpenGL za ovu sesiju"
 
-#: src/net/ea/adminhandler.cpp:63
+#: src/net/manaserv/beinghandler.cpp:303 src/net/tmwa/playerhandler.cpp:94
+msgid "You are dead."
+msgstr "Vi ste mrtvi."
+
+#: src/net/manaserv/beinghandler.cpp:304 src/net/tmwa/playerhandler.cpp:95
+msgid "We regret to inform you that your character was killed in battle."
+msgstr "Žao nam je obavijestiti vas da je vaš lik je bio ubijen u borbi."
+
+#: src/net/manaserv/beinghandler.cpp:306 src/net/tmwa/playerhandler.cpp:97
+msgid "You are not that alive anymore."
+msgstr "Niste više tako živi."
+
+#: src/net/manaserv/beinghandler.cpp:307 src/net/tmwa/playerhandler.cpp:98
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:308 src/net/tmwa/playerhandler.cpp:99
+msgid "Game Over!"
+msgstr "Kraj Igre!"
+
+#: src/net/manaserv/beinghandler.cpp:309 src/net/tmwa/playerhandler.cpp:101
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+"Ne, djeco. Vaš lik zapravo nije umro. On... err... je otišao na bolje mjesto."
+
+#: src/net/manaserv/beinghandler.cpp:311 src/net/tmwa/playerhandler.cpp:103
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:313 src/net/tmwa/playerhandler.cpp:105
+msgid "I guess this did not run too well."
+msgstr "Predpostavljam da ovo nije išlo previše dobro."
+
+#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:107
+msgid "Do you want your possessions identified?"
+msgstr "Želite li svoju imovinu identificirati?"
+
+#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:109
+msgid "Sadly, no trace of you was ever found..."
+msgstr "Nažalost, ni traga od vas nije nikada pronađeno ..."
+
+#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:111
+msgid "Annihilated."
+msgstr "Uništen."
+
+#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:113
+msgid "Looks like you got your head handed to you."
+msgstr "Izgleda da su vam predali vašu glavu."
+
+#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:115
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr ""
+"Uprskali ste opet, odbacite svoje tijelo u kanalizaciju i nabavite novo."
+
+#: src/net/manaserv/beinghandler.cpp:323
+msgid "Press OK to respawn."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:324
+#, fuzzy
+msgid "You Died"
+msgstr "Umrli ste"
+
+#: src/net/manaserv/charhandler.cpp:138 src/net/manaserv/charhandler.cpp:209
+#, fuzzy
+msgid "Not logged in."
+msgstr "Već prijavljeni"
+
+#: src/net/manaserv/charhandler.cpp:141
+msgid "No empty slot."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:144
+msgid "Invalid name."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:147
+#, fuzzy
+msgid "Character's name already exists."
+msgstr "Korisničko ime već postoji"
+
+#: src/net/manaserv/charhandler.cpp:150
+msgid "Invalid hairstyle."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:153
+msgid "Invalid hair color."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:156
+msgid "Invalid gender."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:159
+#, fuzzy
+msgid "Character's stats are too high."
+msgstr "Podaci lika su u redu"
+
+#: src/net/manaserv/charhandler.cpp:162
+#, fuzzy
+msgid "Character's stats are too low."
+msgstr "Podaci lika su u redu"
+
+#: src/net/manaserv/charhandler.cpp:165
+#, c-format
+msgid "At least one statis out of the permitted range: (%u - %u)."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:171 src/net/manaserv/loginhandler.cpp:96
+#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
+#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
+#: src/net/tmwa/loginhandler.cpp:95 src/net/tmwa/loginhandler.cpp:182
+#, fuzzy
+msgid "Unknown error."
+msgstr "Nepoznata greška"
+
+#: src/net/manaserv/charhandler.cpp:200 src/net/tmwa/charserverhandler.cpp:146
+msgid "Info"
+msgstr "Info"
+
+#: src/net/manaserv/charhandler.cpp:200
+#, fuzzy
+msgid "Player deleted."
+msgstr "Lik izbrisan."
+
+#: src/net/manaserv/charhandler.cpp:212
+#, fuzzy
+msgid "Selection out of range."
+msgstr "Odaberi količinu predmeta za razmjenu."
+
+#: src/net/manaserv/charhandler.cpp:215
+#, fuzzy, c-format
+msgid "Unknown error (%d)."
+msgstr "Nepoznata greška"
+
+#: src/net/manaserv/charhandler.cpp:250
+msgid "No gameservers are available."
+msgstr "Nijedan od servera igre nije dostupan."
+
+#: src/net/manaserv/chathandler.cpp:187 src/net/manaserv/chathandler.cpp:313
+#: src/net/manaserv/guildhandler.cpp:260
+#, c-format
+msgid "Topic: %s"
+msgstr "Tema: %s"
+
+#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:274
+#, fuzzy
+msgid "Players in this channel:"
+msgstr "Igrač pogađa Čudovište"
+
+#: src/net/manaserv/chathandler.cpp:208
+#, fuzzy
+msgid "Error joining channel."
+msgstr "Naredba: /join <channel>"
+
+#: src/net/manaserv/chathandler.cpp:214
+#, fuzzy
+msgid "Listing channels."
+msgstr "Zahtjev za pridruživanje kanalu %s."
+
+#: src/net/manaserv/chathandler.cpp:226
+msgid "End of channel list."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:303
+#, fuzzy, c-format
+msgid "%s entered the channel."
+msgstr "%s se pridružio partiji."
+
+#: src/net/manaserv/chathandler.cpp:308
+#, c-format
+msgid "%s left the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:324
+#, c-format
+msgid "%s has set mode %s on user %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:334
+#, c-format
+msgid "%s has kicked %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:339
+#, fuzzy
+msgid "Unknown channel event."
+msgstr "Nepoznata naredba."
+
+#: src/net/manaserv/guildhandler.cpp:82
+msgid "Guild created."
+msgstr "Ceh, ustanovljen."
+
+#: src/net/manaserv/guildhandler.cpp:87
+msgid "Error creating guild."
+msgstr "Pogreška pri ustanovljavanju ceha."
+
+#: src/net/manaserv/guildhandler.cpp:97
+msgid "Invite sent."
+msgstr "Pozivnica je poslana."
+
+#: src/net/manaserv/guildhandler.cpp:204
+msgid "Member was promoted successfully."
+msgstr "Član je uspješno unaprijeđen."
+
+#: src/net/manaserv/guildhandler.cpp:209
+msgid "Failed to promote member."
+msgstr "Neuspješno promicanje člana."
+
+#: src/net/manaserv/loginhandler.cpp:87
+#, fuzzy
+msgid "Wrong magic_token."
+msgstr "Pogrešan magični_simbol"
+
+#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
+#, fuzzy
+msgid "Already logged in."
+msgstr "Već prijavljeni"
+
+#: src/net/manaserv/loginhandler.cpp:93
+#, fuzzy
+msgid "Account banned."
+msgstr "Račun je istekao"
+
+#: src/net/manaserv/loginhandler.cpp:118
+#, fuzzy
+msgid "New password incorrect."
+msgstr "Nova lozinka je netočna"
+
+#: src/net/manaserv/loginhandler.cpp:121 src/net/tmwa/loginhandler.cpp:89
+#, fuzzy
+msgid "Old password incorrect."
+msgstr "Stara lozinka je netočna"
+
+#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
+msgid "Account not connected. Please login first."
+msgstr "Račun nije priključen. Molimo prvo se prijavite."
+
+#: src/net/manaserv/loginhandler.cpp:149
+#, fuzzy
+msgid "New email address incorrect."
+msgstr "Nova e-mail adresa netočna"
+
+#: src/net/manaserv/loginhandler.cpp:152
+#, fuzzy
+msgid "Old email address incorrect."
+msgstr "Stara e-mail adresa netočna"
+
+#: src/net/manaserv/loginhandler.cpp:158
+#, fuzzy
+msgid "The new email address already exists."
+msgstr "Nova E-mail Adresa već postoji."
+
+#: src/net/manaserv/loginhandler.cpp:239
+msgid ""
+"Client registration is not allowed. Please contact server administration."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
+#, fuzzy
+msgid "Client version is too old."
+msgstr "Verzija klijenta je prestara"
+
+#: src/net/manaserv/loginhandler.cpp:266
+#, fuzzy
+msgid "Wrong username or password."
+msgstr "Pogrešno korisničko ime ili lozinka"
+
+#: src/net/manaserv/loginhandler.cpp:272
+#, fuzzy
+msgid "Account banned"
+msgstr "Račun je istekao"
+
+#: src/net/manaserv/loginhandler.cpp:275
+msgid "Login attempt too soon after previous attempt."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:303
+#, fuzzy
+msgid "Wrong username, password or email address."
+msgstr "Pogrešno korisničko ime, lozinka ili email adresa"
+
+#: src/net/manaserv/loginhandler.cpp:306
+#, fuzzy
+msgid "Username already exists."
+msgstr "Korisničko ime već postoji"
+
+#: src/net/manaserv/loginhandler.cpp:309
+#, fuzzy
+msgid "Email address already exists."
+msgstr "Email adresa već postoji"
+
+#: src/net/manaserv/loginhandler.cpp:312
+msgid "You took too long with the captcha or your response was incorrect."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:87
+msgid "Joined party."
+msgstr "Pridružen pertiji."
+
+#: src/net/manaserv/partyhandler.cpp:105
+#, c-format
+msgid "%s joined the party."
+msgstr "%s se pridružio partiji."
+
+#: src/net/manaserv/partyhandler.cpp:123
+#, fuzzy, c-format
+msgid "%s rejected your invite."
+msgstr "%s je odbio vašu pozivnicu."
+
+#: src/net/manaserv/tradehandler.cpp:95
+msgid "Accepting incoming trade requests."
+msgstr "Prihvaćanje dolaznih zahtjeva za trgovanje."
+
+#: src/net/manaserv/tradehandler.cpp:97
+msgid "Ignoring incoming trade requests."
+msgstr "Ignoriranje nadolazećih zahtjeva za trgovanje."
+
+#: src/net/manaserv/tradehandler.cpp:115 src/net/tmwa/tradehandler.cpp:109
+msgid "Request for Trade"
+msgstr "Zahtjev za Trgovanje"
+
+#: src/net/manaserv/tradehandler.cpp:116 src/net/tmwa/tradehandler.cpp:110
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
+msgstr "%s želi trgovati s vama, prihvaćate li?"
+
+#: src/net/manaserv/tradehandler.cpp:134
+#, c-format
+msgid "Trading with %s"
+msgstr "Trgovanje s %s"
+
+#: src/net/manaserv/tradehandler.cpp:148 src/net/tmwa/tradehandler.cpp:224
+msgid "Trade canceled."
+msgstr "Otkazano trgovanje."
+
+#: src/net/manaserv/tradehandler.cpp:155 src/net/tmwa/tradehandler.cpp:231
+msgid "Trade completed."
+msgstr "Trgovanje je završeno."
+
+#: src/net/tmwa/adminhandler.cpp:64
 msgid "Kick failed!"
 msgstr "Šut nije uspio!"
 
-#: src/net/ea/adminhandler.cpp:65
+#: src/net/tmwa/adminhandler.cpp:66
 msgid "Kick succeeded!"
 msgstr "Šut uspio!"
 
-#: src/net/ea/buysellhandler.cpp:110
+#: src/net/tmwa/buysellhandler.cpp:109
 msgid "Nothing to sell."
 msgstr "Ništa za prodati."
 
-#: src/net/ea/buysellhandler.cpp:117
+#: src/net/tmwa/buysellhandler.cpp:116
 msgid "Thanks for buying."
 msgstr "Hvala za kupnju."
 
-#: src/net/ea/buysellhandler.cpp:124
+#: src/net/tmwa/buysellhandler.cpp:123
 msgid "Unable to buy."
 msgstr "Ne može se kupiti"
 
-#: src/net/ea/buysellhandler.cpp:130
+#: src/net/tmwa/buysellhandler.cpp:129
 msgid "Thanks for selling."
 msgstr "Hvala za prodaju."
 
-#: src/net/ea/buysellhandler.cpp:132
+#: src/net/tmwa/buysellhandler.cpp:131
 msgid "Unable to sell."
 msgstr "Nije moguće prodati."
 
-#: src/net/ea/charserverhandler.cpp:103
-#, fuzzy
-msgid "Access denied."
-msgstr "Pristup odbijen"
+#: src/net/tmwa/charserverhandler.cpp:103
+msgid "Access denied. Most likely, there are too many players on this server."
+msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:106
+#: src/net/tmwa/charserverhandler.cpp:107
 #, fuzzy
 msgid "Cannot use this ID."
 msgstr "Ne mogu koristiti ovaj ID"
 
-#: src/net/ea/charserverhandler.cpp:109
+#: src/net/tmwa/charserverhandler.cpp:110
 #, fuzzy
-msgid "Unknown failure to select character."
-msgstr "Nepoznata greška pri odabiru lika"
+msgid "Unknown char-server failure."
+msgstr "Nepoznata greška"
 
-#: src/net/ea/charserverhandler.cpp:135
+#: src/net/tmwa/charserverhandler.cpp:134
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr "Ne mogu stvoriti lik. Najvjerojatnije je ime već zauzeto."
 
-#: src/net/ea/charserverhandler.cpp:147 src/net/manaserv/charhandler.cpp:187
-msgid "Info"
-msgstr "Info"
-
-#: src/net/ea/charserverhandler.cpp:147
+#: src/net/tmwa/charserverhandler.cpp:146
 msgid "Character deleted."
 msgstr "Lik izbrisan."
 
-#: src/net/ea/charserverhandler.cpp:152
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Failed to delete character."
 msgstr "Neuspješno brisanje znaka."
 
-#: src/net/ea/charserverhandler.cpp:237 src/net/manaserv/charhandler.cpp:263
+#: src/net/tmwa/charserverhandler.cpp:266
 msgid "Strength:"
 msgstr "Snaga:"
 
-#: src/net/ea/charserverhandler.cpp:238 src/net/manaserv/charhandler.cpp:264
+#: src/net/tmwa/charserverhandler.cpp:267
 msgid "Agility:"
 msgstr "Okretnost:"
 
-#: src/net/ea/charserverhandler.cpp:239 src/net/manaserv/charhandler.cpp:266
+#: src/net/tmwa/charserverhandler.cpp:268
 msgid "Vitality:"
 msgstr "Vitalnost:"
 
-#: src/net/ea/charserverhandler.cpp:240 src/net/manaserv/charhandler.cpp:267
+#: src/net/tmwa/charserverhandler.cpp:269
 msgid "Intelligence:"
 msgstr "Inteligencija:"
 
-#: src/net/ea/charserverhandler.cpp:241 src/net/manaserv/charhandler.cpp:265
+#: src/net/tmwa/charserverhandler.cpp:270
 msgid "Dexterity:"
 msgstr "Spretnost:"
 
-#: src/net/ea/charserverhandler.cpp:242
+#: src/net/tmwa/charserverhandler.cpp:271
 msgid "Luck:"
 msgstr "Sreća:"
 
-#: src/net/ea/chathandler.cpp:80
-msgid "Whisper could not be sent, user is offline."
+#: src/net/tmwa/chathandler.cpp:87
+#, fuzzy, c-format
+msgid "Whisper could not be sent, %s is offline."
 msgstr "Šapat nije mogao biti poslan, korisnik je offline."
 
-#: src/net/ea/chathandler.cpp:84
-msgid "Whisper could not be sent, ignored by user."
+#: src/net/tmwa/chathandler.cpp:96
+#, fuzzy, c-format
+msgid "Whisper could not be sent, ignored by %s."
 msgstr "Šapat nije mogao biti poslan, ignorirani ste od strane korisnika."
 
-#: src/net/ea/chathandler.cpp:171
+#: src/net/tmwa/chathandler.cpp:230
 #, fuzzy
 msgid "MVP player."
 msgstr "Igrač"
 
-#: src/net/ea/chathandler.cpp:204 src/net/ea/chathandler.cpp:210
-#: src/net/ea/chathandler.cpp:215 src/net/ea/chathandler.cpp:220
-#: src/net/ea/chathandler.cpp:225 src/net/ea/chathandler.cpp:230
-#: src/net/ea/chathandler.cpp:235 src/net/ea/chathandler.cpp:240
+#: src/net/tmwa/chathandler.cpp:265 src/net/tmwa/chathandler.cpp:271
+#: src/net/tmwa/chathandler.cpp:276 src/net/tmwa/chathandler.cpp:281
+#: src/net/tmwa/chathandler.cpp:286 src/net/tmwa/chathandler.cpp:291
+#: src/net/tmwa/chathandler.cpp:296 src/net/tmwa/chathandler.cpp:301
 msgid "Channels are not supported!"
 msgstr "Kanali nisu podržani!"
 
-#: src/net/ea/gamehandler.cpp:86
+#: src/net/tmwa/gamehandler.cpp:88
 #, c-format
 msgid "Online users: %d"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:100
+#: src/net/tmwa/gamehandler.cpp:101
 #, fuzzy
 msgid "Game"
 msgstr "Ime"
 
-#: src/net/ea/gamehandler.cpp:100
+#: src/net/tmwa/gamehandler.cpp:101
 #, fuzzy
 msgid "Request to quit denied!"
 msgstr "Zahtjev za Trgovanje"
 
-#: src/net/ea/generalhandler.cpp:102 src/net/manaserv/generalhandler.cpp:95
+#: src/net/tmwa/generalhandler.cpp:102
 #, c-format
 msgid "Strength %+d"
 msgstr "Snaga %+d"
 
-#: src/net/ea/generalhandler.cpp:103 src/net/manaserv/generalhandler.cpp:96
+#: src/net/tmwa/generalhandler.cpp:103
 #, c-format
 msgid "Agility %+d"
 msgstr "Okretnost %+d"
 
-#: src/net/ea/generalhandler.cpp:104 src/net/manaserv/generalhandler.cpp:98
+#: src/net/tmwa/generalhandler.cpp:104
 #, c-format
 msgid "Vitality %+d"
 msgstr "Vitalnost %+d"
 
-#: src/net/ea/generalhandler.cpp:105 src/net/manaserv/generalhandler.cpp:99
+#: src/net/tmwa/generalhandler.cpp:105
 #, c-format
 msgid "Intelligence %+d"
 msgstr "Inteligencija %+d"
 
-#: src/net/ea/generalhandler.cpp:106 src/net/manaserv/generalhandler.cpp:97
+#: src/net/tmwa/generalhandler.cpp:106
 #, c-format
 msgid "Dexterity %+d"
 msgstr "Spretnost %+d"
 
-#: src/net/ea/generalhandler.cpp:107
+#: src/net/tmwa/generalhandler.cpp:107
 #, c-format
 msgid "Luck %+d"
 msgstr "Sreća %+d"
 
-#: src/net/ea/generalhandler.cpp:130
+#: src/net/tmwa/generalhandler.cpp:132
 #, fuzzy
 msgid "Authentication failed."
 msgstr "Autentikacija nije uspjela"
 
-#: src/net/ea/generalhandler.cpp:133
+#: src/net/tmwa/generalhandler.cpp:135
 #, fuzzy
 msgid "No servers available."
 msgstr "Nema dostupnih poslužitelji"
 
-#: src/net/ea/generalhandler.cpp:137
+#: src/net/tmwa/generalhandler.cpp:139
 #, fuzzy
 msgid "Someone else is trying to use this account."
 msgstr "Netko drugi pokušava korištiti ovaj račun"
 
-#: src/net/ea/generalhandler.cpp:140
+#: src/net/tmwa/generalhandler.cpp:142
 #, fuzzy
 msgid "This account is already logged in."
 msgstr "Ovaj korisnički račun je već prijavljen"
 
-#: src/net/ea/generalhandler.cpp:143
+#: src/net/tmwa/generalhandler.cpp:145
 #, fuzzy
 msgid "Speed hack detected."
 msgstr "Otkrit brzi hack"
 
-#: src/net/ea/generalhandler.cpp:146
+#: src/net/tmwa/generalhandler.cpp:148
 #, fuzzy
 msgid "Duplicated login."
 msgstr "Dvostruka prijava"
 
-#: src/net/ea/generalhandler.cpp:149
+#: src/net/tmwa/generalhandler.cpp:151
 #, fuzzy
 msgid "Unknown connection error."
 msgstr "Nepoznata pogreška veze"
 
-#: src/net/ea/generalhandler.cpp:205
+#: src/net/tmwa/generalhandler.cpp:209
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:216 src/net/manaserv/generalhandler.cpp:166
+#: src/net/tmwa/generalhandler.cpp:230
 msgid "Strength"
 msgstr "Snaga"
 
-#: src/net/ea/generalhandler.cpp:217 src/net/manaserv/generalhandler.cpp:167
+#: src/net/tmwa/generalhandler.cpp:231
 msgid "Agility"
 msgstr "Okretnost"
 
-#: src/net/ea/generalhandler.cpp:218 src/net/manaserv/generalhandler.cpp:169
+#: src/net/tmwa/generalhandler.cpp:232
 msgid "Vitality"
 msgstr "Vitalnost"
 
-#: src/net/ea/generalhandler.cpp:219 src/net/manaserv/generalhandler.cpp:170
+#: src/net/tmwa/generalhandler.cpp:233
 msgid "Intelligence"
 msgstr "Inteligencija"
 
-#: src/net/ea/generalhandler.cpp:220 src/net/manaserv/generalhandler.cpp:168
+#: src/net/tmwa/generalhandler.cpp:234
 msgid "Dexterity"
 msgstr "Spretnost"
 
-#: src/net/ea/generalhandler.cpp:221
+#: src/net/tmwa/generalhandler.cpp:235
 msgid "Luck"
 msgstr "Sreća"
 
-#: src/net/ea/generalhandler.cpp:224
+#: src/net/tmwa/generalhandler.cpp:238
 #, fuzzy
 msgid "Defense"
 msgstr "Obrana:"
 
-#: src/net/ea/generalhandler.cpp:225
+#: src/net/tmwa/generalhandler.cpp:239
 #, fuzzy
 msgid "M.Attack"
 msgstr "M.Napad:"
 
-#: src/net/ea/generalhandler.cpp:226
+#: src/net/tmwa/generalhandler.cpp:240
 #, fuzzy
 msgid "M.Defense"
 msgstr "M.Obrana:"
 
-#: src/net/ea/generalhandler.cpp:227
+#: src/net/tmwa/generalhandler.cpp:241
 #, fuzzy, c-format
 msgid "% Accuracy"
 msgstr "% Preciznost:"
 
-#: src/net/ea/generalhandler.cpp:228
+#: src/net/tmwa/generalhandler.cpp:242
 #, fuzzy, c-format
 msgid "% Evade"
 msgstr "% Izbjegavanje:"
 
-#: src/net/ea/generalhandler.cpp:229
+#: src/net/tmwa/generalhandler.cpp:243
 #, fuzzy, c-format
 msgid "% Critical"
 msgstr "Kritični Udarac"
 
-#: src/net/ea/gui/guildtab.cpp:45
+#: src/net/tmwa/gui/guildtab.cpp:45
 msgid "Guild"
 msgstr "Ceh"
 
-#: src/net/ea/gui/guildtab.cpp:61 src/net/ea/gui/partytab.cpp:59
+#: src/net/tmwa/gui/guildtab.cpp:61 src/net/tmwa/gui/partytab.cpp:59
 msgid "/help > Display this help."
 msgstr "/help > Prikaži ovu pomoć."
 
-#: src/net/ea/gui/guildtab.cpp:62
+#: src/net/tmwa/gui/guildtab.cpp:62
 #, fuzzy
 msgid "/invite > Invite a player to your guild"
 msgstr "/invite > Pozovite igrače na vašu partiju"
 
-#: src/net/ea/gui/guildtab.cpp:63
+#: src/net/tmwa/gui/guildtab.cpp:63
 #, fuzzy
 msgid "/leave > Leave the guild you are in"
 msgstr "/leave > Napustite partiju u kojoj ste"
 
-#: src/net/ea/gui/guildtab.cpp:64
+#: src/net/tmwa/gui/guildtab.cpp:64
 #, fuzzy
 msgid "/kick > Kick some one from the guild you are in"
 msgstr "/kick > Šutnite nekog iz partije u kojoj ste"
 
-#: src/net/ea/gui/guildtab.cpp:73 src/net/ea/gui/partytab.cpp:73
+#: src/net/tmwa/gui/guildtab.cpp:73 src/net/tmwa/gui/partytab.cpp:73
 msgid "Command: /invite <nick>"
 msgstr "Naredba: /invite <nick>"
 
-#: src/net/ea/gui/guildtab.cpp:74
+#: src/net/tmwa/gui/guildtab.cpp:74
 #, fuzzy
 msgid "This command invites <nick> to the guild you're in."
 msgstr "Ova naredba poziva <nick> na partiju sa vama."
 
-#: src/net/ea/gui/guildtab.cpp:80 src/net/ea/gui/partytab.cpp:80
+#: src/net/tmwa/gui/guildtab.cpp:80 src/net/tmwa/gui/partytab.cpp:80
 msgid "Command: /leave"
 msgstr "Naredba: /leave"
 
-#: src/net/ea/gui/guildtab.cpp:81
+#: src/net/tmwa/gui/guildtab.cpp:81
 #, fuzzy
 msgid "This command causes the player to leave the guild."
 msgstr "Ova naredba postavlja temu za <message>."
 
-#: src/net/ea/gui/guildtab.cpp:89
+#: src/net/tmwa/gui/guildtab.cpp:89
 #, fuzzy
 msgid "Guild name is missing."
 msgstr "Ime partije nedostaje."
 
-#: src/net/ea/guildhandler.cpp:293
+#: src/net/tmwa/guildhandler.cpp:296
 msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:298
+#: src/net/tmwa/guildhandler.cpp:301
 msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:303
+#: src/net/tmwa/guildhandler.cpp:306
 #, fuzzy
 msgid "User is now part of your guild."
 msgstr "%s je sada član vaše partije."
 
-#: src/net/ea/guildhandler.cpp:308
+#: src/net/tmwa/guildhandler.cpp:311
 msgid "Your guild is full."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:313
+#: src/net/tmwa/guildhandler.cpp:316
 msgid "Unknown guild invite response."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:390
+#: src/net/tmwa/guildhandler.cpp:393
 msgid "Guild creation isn't supported yet."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:43
+#: src/net/tmwa/gui/partytab.cpp:43
 msgid "Party"
 msgstr "Partija"
 
-#: src/net/ea/gui/partytab.cpp:60
+#: src/net/tmwa/gui/partytab.cpp:60
 msgid "/invite > Invite a player to your party"
 msgstr "/invite > Pozovite igrače na vašu partiju"
 
-#: src/net/ea/gui/partytab.cpp:61
+#: src/net/tmwa/gui/partytab.cpp:61
 msgid "/leave > Leave the party you are in"
 msgstr "/leave > Napustite partiju u kojoj ste"
 
-#: src/net/ea/gui/partytab.cpp:62
+#: src/net/tmwa/gui/partytab.cpp:62
 msgid "/kick > Kick some one from the party you are in"
 msgstr "/kick > Šutnite nekog iz partije u kojoj ste"
 
-#: src/net/ea/gui/partytab.cpp:63
+#: src/net/tmwa/gui/partytab.cpp:63
 msgid "/item > Show/change party item sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:64
+#: src/net/tmwa/gui/partytab.cpp:64
 msgid "/exp > Show/change party experience sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:81
+#: src/net/tmwa/gui/partytab.cpp:81
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:85
+#: src/net/tmwa/gui/partytab.cpp:85
 msgid "Command: /item <policy>"
 msgstr "Naredba: /item <policy>"
 
-#: src/net/ea/gui/partytab.cpp:86
+#: src/net/tmwa/gui/partytab.cpp:86
 msgid "This command changes the party's item sharing policy."
 msgstr ""
 "Ova naredba mijenja politiku korištenja zajedničkih predmete u partiji."
 
-#: src/net/ea/gui/partytab.cpp:87
+#: src/net/tmwa/gui/partytab.cpp:87
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:90
+#: src/net/tmwa/gui/partytab.cpp:90
 msgid "Command: /item"
 msgstr "Naredba: /item"
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/tmwa/gui/partytab.cpp:91
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/tmwa/gui/partytab.cpp:95
 msgid "Command: /exp <policy>"
 msgstr "Naredba: /exp <policy>"
 
-#: src/net/ea/gui/partytab.cpp:96
+#: src/net/tmwa/gui/partytab.cpp:96
 msgid "This command changes the party's experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/tmwa/gui/partytab.cpp:97
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:100
+#: src/net/tmwa/gui/partytab.cpp:100
 msgid "Command: /exp"
 msgstr "Naredba: /exp"
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/tmwa/gui/partytab.cpp:101
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:132 src/net/ea/partyhandler.cpp:198
+#: src/net/tmwa/gui/partytab.cpp:132 src/net/tmwa/partyhandler.cpp:196
 msgid "Item sharing enabled."
 msgstr "Dijeljenje predmeta je omogućeno.moguće."
 
-#: src/net/ea/gui/partytab.cpp:135 src/net/ea/partyhandler.cpp:204
+#: src/net/tmwa/gui/partytab.cpp:135 src/net/tmwa/partyhandler.cpp:202
 msgid "Item sharing disabled."
 msgstr "Dijeljenje predmeta je onemogućeno."
 
-#: src/net/ea/gui/partytab.cpp:138 src/net/ea/partyhandler.cpp:210
+#: src/net/tmwa/gui/partytab.cpp:138 src/net/tmwa/partyhandler.cpp:208
 msgid "Item sharing not possible."
 msgstr "Dijeljenje predmeta nije moguće."
 
-#: src/net/ea/gui/partytab.cpp:141
+#: src/net/tmwa/gui/partytab.cpp:141
 #, fuzzy
 msgid "Item sharing unknown."
 msgstr "Dijeljenje predmeta je omogućeno.moguće."
 
-#: src/net/ea/gui/partytab.cpp:167 src/net/ea/partyhandler.cpp:174
+#: src/net/tmwa/gui/partytab.cpp:167 src/net/tmwa/partyhandler.cpp:172
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:170 src/net/ea/partyhandler.cpp:180
+#: src/net/tmwa/gui/partytab.cpp:170 src/net/tmwa/partyhandler.cpp:178
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:173 src/net/ea/partyhandler.cpp:186
+#: src/net/tmwa/gui/partytab.cpp:173 src/net/tmwa/partyhandler.cpp:184
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:176
+#: src/net/tmwa/gui/partytab.cpp:176
 msgid "Experience sharing unknown."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:281
+#: src/net/tmwa/inventoryhandler.cpp:285
 msgid "Failed to use item."
 msgstr "Neuspješno korištenje predmeta."
 
-#: src/net/ea/inventoryhandler.cpp:391
+#: src/net/tmwa/inventoryhandler.cpp:399
 msgid "Unable to equip."
 msgstr "Nije moguće opremiti."
 
-#: src/net/ea/inventoryhandler.cpp:402
+#: src/net/tmwa/inventoryhandler.cpp:410
 msgid "Unable to unequip."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:79
+#: src/net/tmwa/loginhandler.cpp:86
 msgid "Account was not found. Please re-login."
 msgstr "Račun nije pronađen. Molimo, ponovno se prijavite."
 
-#: src/net/ea/loginhandler.cpp:82 src/net/manaserv/loginhandler.cpp:121
-#, fuzzy
-msgid "Old password incorrect."
-msgstr "Stara lozinka je netočna"
-
-#: src/net/ea/loginhandler.cpp:85
+#: src/net/tmwa/loginhandler.cpp:92
 #, fuzzy
 msgid "New password too short."
 msgstr "Nova lozinka je prekratka"
 
-#: src/net/ea/loginhandler.cpp:88 src/net/ea/loginhandler.cpp:175
-#: src/net/manaserv/charhandler.cpp:158 src/net/manaserv/loginhandler.cpp:96
-#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
-#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
-#, fuzzy
-msgid "Unknown error."
-msgstr "Nepoznata greška"
-
-#: src/net/ea/loginhandler.cpp:149
+#: src/net/tmwa/loginhandler.cpp:156
 #, fuzzy
 msgid "Unregistered ID."
 msgstr "Neregistriran ID"
 
-#: src/net/ea/loginhandler.cpp:152
+#: src/net/tmwa/loginhandler.cpp:159
 #, fuzzy
 msgid "Wrong password."
 msgstr "Pogrešna lozinka"
 
-#: src/net/ea/loginhandler.cpp:155
+#: src/net/tmwa/loginhandler.cpp:162
 #, fuzzy
 msgid "Account expired."
 msgstr "Račun je istekao"
 
-#: src/net/ea/loginhandler.cpp:158
+#: src/net/tmwa/loginhandler.cpp:165
 #, fuzzy
 msgid "Rejected from server."
 msgstr "Odbijeno od poslužitelja"
 
-#: src/net/ea/loginhandler.cpp:161
+#: src/net/tmwa/loginhandler.cpp:168
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:165
+#: src/net/tmwa/loginhandler.cpp:172
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:172
+#: src/net/tmwa/loginhandler.cpp:179
 #, fuzzy
 msgid "This user name is already taken."
 msgstr "Ovo korisničko ime je već zauzeto"
 
-#: src/net/ea/network.cpp:145
+#: src/net/tmwa/network.cpp:145
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/ea/network.cpp:345
+#: src/net/tmwa/network.cpp:345
 #, fuzzy
 msgid "Unable to resolve host \""
 msgstr "Nije moguće prodati."
 
-#: src/net/ea/network.cpp:414
+#: src/net/tmwa/network.cpp:414
 #, fuzzy
 msgid "Connection to server terminated. "
 msgstr "Spajanje na poslužitelja karti..."
 
-#: src/net/ea/partyhandler.cpp:81
+#: src/net/tmwa/partyhandler.cpp:82
 msgid "Could not create party."
 msgstr "Nije se mogla napraviti partija."
 
-#: src/net/ea/partyhandler.cpp:84
+#: src/net/tmwa/partyhandler.cpp:84
 msgid "Party successfully created."
 msgstr "Partija je uspješno kreirana."
 
-#: src/net/ea/partyhandler.cpp:118
+#: src/net/tmwa/partyhandler.cpp:119
 #, c-format
 msgid "%s is already a member of a party."
 msgstr "%s je već član partije."
 
-#: src/net/ea/partyhandler.cpp:122
+#: src/net/tmwa/partyhandler.cpp:123
 #, c-format
 msgid "%s refused your invitation."
 msgstr "%s je odbio vašu pozivnicu."
 
-#: src/net/ea/partyhandler.cpp:126
+#: src/net/tmwa/partyhandler.cpp:127
 #, c-format
 msgid "%s is now a member of your party."
 msgstr "%s je sada član vaše partije."
 
-#: src/net/ea/partyhandler.cpp:130
+#: src/net/tmwa/partyhandler.cpp:131
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:238
+#: src/net/tmwa/partyhandler.cpp:236
 msgid "You have left the party."
 msgstr "Napustili ste partiju."
 
-#: src/net/ea/partyhandler.cpp:249
+#: src/net/tmwa/partyhandler.cpp:246
 #, c-format
 msgid "%s has left your party."
 msgstr "%s je napustio/la vašu partiju."
 
-#: src/net/ea/partyhandler.cpp:301
+#: src/net/tmwa/partyhandler.cpp:299
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr "Nepoznati član pokušava reći: %s"
 
-#: src/net/ea/partyhandler.cpp:329
-msgid "Inviting like this isn't supported at the moment."
+#: src/net/tmwa/partyhandler.cpp:335
+#, c-format
+msgid "Inviting failed, because you can't see a player called %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:334
+#: src/net/tmwa/partyhandler.cpp:340
 msgid "You can only inivte when you are in a party!"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:365
+#: src/net/tmwa/partyhandler.cpp:368
 #, c-format
 msgid "%s is not in your party!"
 msgstr "%s nije u vašoj partiji!"
 
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:304
-msgid "You are dead."
-msgstr "Vi ste mrtvi."
-
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:305
-msgid "We regret to inform you that your character was killed in battle."
-msgstr "Žao nam je obavijestiti vas da je vaš lik je bio ubijen u borbi."
-
-#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:307
-msgid "You are not that alive anymore."
-msgstr "Niste više tako živi."
-
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:308
-msgid "The cold hands of the grim reaper are grabbing for your soul."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:309
-msgid "Game Over!"
-msgstr "Kraj Igre!"
-
-#: src/net/ea/playerhandler.cpp:105
+#: src/net/tmwa/playerhandler.cpp:100
 msgid "Insert coin to continue."
 msgstr "Ubacite žeton za nastavak."
 
-#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:310
-msgid ""
-"No, kids. Your character did not really die. It... err... went to a better "
-"place."
-msgstr ""
-"Ne, djeco. Vaš lik zapravo nije umro. On... err... je otišao na bolje mjesto."
-
-#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:312
-msgid ""
-"Your plan of breaking your enemies weapon by bashing it with your throat "
-"failed."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:314
-msgid "I guess this did not run too well."
-msgstr "Predpostavljam da ovo nije išlo previše dobro."
-
-#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:315
-msgid "Do you want your possessions identified?"
-msgstr "Želite li svoju imovinu identificirati?"
-
-#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:316
-msgid "Sadly, no trace of you was ever found..."
-msgstr "Nažalost, ni traga od vas nije nikada pronađeno ..."
-
-#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:317
-msgid "Annihilated."
-msgstr "Uništen."
-
-#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:318
-msgid "Looks like you got your head handed to you."
-msgstr "Izgleda da su vam predali vašu glavu."
-
-#: src/net/ea/playerhandler.cpp:120 src/net/manaserv/beinghandler.cpp:319
-msgid ""
-"You screwed up again, dump your body down the tubes and get you another one."
-msgstr ""
-"Uprskali ste opet, odbacite svoje tijelo u kanalizaciju i nabavite novo."
-
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/tmwa/playerhandler.cpp:118
 msgid "You're not dead yet. You're just resting."
 msgstr "Niste još mrtvi. Samo se odmarate."
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/tmwa/playerhandler.cpp:119
 msgid "You are no more."
 msgstr "Nema vas više."
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/tmwa/playerhandler.cpp:120
 msgid "You have ceased to be."
 msgstr "Prestali ste postojati."
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/tmwa/playerhandler.cpp:121
 msgid "You've expired and gone to meet your maker."
 msgstr "Istekao vam je rok i otišli ste upoznati svog stvoritelja."
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/tmwa/playerhandler.cpp:122
 msgid "You're a stiff."
 msgstr "Ukočili ste se."
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/tmwa/playerhandler.cpp:123
 msgid "Bereft of life, you rest in peace."
 msgstr "Lišeni života, počivate u miru."
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/tmwa/playerhandler.cpp:124
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr "Da niste bili toliko animirani sad bi podizali tratinčice."
 
-#: src/net/ea/playerhandler.cpp:130
+#: src/net/tmwa/playerhandler.cpp:125
 msgid "Your metabolic processes are now history."
 msgstr "Vaši metabolički procesi su sad povijest."
 
-#: src/net/ea/playerhandler.cpp:131
+#: src/net/tmwa/playerhandler.cpp:126
 msgid "You're off the twig."
 msgstr "Pali ste s grančice."
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/tmwa/playerhandler.cpp:127
 msgid "You've kicked the bucket."
 msgstr "Vi ste šutirali sić."
 
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/tmwa/playerhandler.cpp:128
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:135
+#: src/net/tmwa/playerhandler.cpp:130
 msgid "You are an ex-player."
 msgstr "Vi ste bivši igrač."
 
-#: src/net/ea/playerhandler.cpp:136
+#: src/net/tmwa/playerhandler.cpp:131
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:249 src/net/ea/playerhandler.cpp:310
+#: src/net/tmwa/playerhandler.cpp:246 src/net/tmwa/playerhandler.cpp:285
 msgid "Message"
 msgstr "Poruka"
 
-#: src/net/ea/playerhandler.cpp:250
+#: src/net/tmwa/playerhandler.cpp:247
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 "Nosite više od pola svoje težine. Niste u mogućnosti kako bi povratili "
 "zdravlje."
 
-#: src/net/ea/playerhandler.cpp:333
+#: src/net/tmwa/playerhandler.cpp:313
 #, fuzzy, c-format
 msgid "You picked up %s."
 msgstr "Pokupili ste "
 
-#: src/net/ea/playerhandler.cpp:369
+#: src/net/tmwa/playerhandler.cpp:348
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:532
+#: src/net/tmwa/playerhandler.cpp:488
 msgid "Equip arrows first."
 msgstr "Prvo se opremite strijelama."
 
-#: src/net/ea/specialhandler.cpp:147
+#: src/net/tmwa/specialhandler.cpp:144
 msgid "Trade failed!"
 msgstr "Neuspjela razmjena!"
 
-#: src/net/ea/specialhandler.cpp:150
+#: src/net/tmwa/specialhandler.cpp:147
 msgid "Emote failed!"
 msgstr "Neuspjelo korištenje emotea!"
 
-#: src/net/ea/specialhandler.cpp:153
+#: src/net/tmwa/specialhandler.cpp:150
 msgid "Sit failed!"
 msgstr "Neuspjelo sjedanje!"
 
-#: src/net/ea/specialhandler.cpp:156
+#: src/net/tmwa/specialhandler.cpp:153
 msgid "Chat creating failed!"
 msgstr "Neuspjelo stvaranje lika!"
 
-#: src/net/ea/specialhandler.cpp:159
+#: src/net/tmwa/specialhandler.cpp:156
 msgid "Could not join party!"
 msgstr "Neuspjelo priključivanje družini!"
 
-#: src/net/ea/specialhandler.cpp:162
+#: src/net/tmwa/specialhandler.cpp:159
 msgid "Cannot shout!"
 msgstr "Neuspjelo vikanje!"
 
-#: src/net/ea/specialhandler.cpp:171
+#: src/net/tmwa/specialhandler.cpp:168
 msgid "You have not yet reached a high enough lvl!"
 msgstr "Još nisi dosegao/la dovoljno visok nivo!"
 
-#: src/net/ea/specialhandler.cpp:174
+#: src/net/tmwa/specialhandler.cpp:171
 msgid "Insufficient HP!"
 msgstr "Nedovoljno zdravlja!"
 
-#: src/net/ea/specialhandler.cpp:177
+#: src/net/tmwa/specialhandler.cpp:174
 msgid "Insufficient SP!"
 msgstr "Nedovoljno SP-a!"
 
-#: src/net/ea/specialhandler.cpp:180
+#: src/net/tmwa/specialhandler.cpp:177
 msgid "You have no memos!"
 msgstr "Nemaš podsjetnika!"
 
-#: src/net/ea/specialhandler.cpp:183
+#: src/net/tmwa/specialhandler.cpp:180
 msgid "You cannot do that right now!"
 msgstr "Ne možeš to učiniti sad!"
 
-#: src/net/ea/specialhandler.cpp:186
+#: src/net/tmwa/specialhandler.cpp:183
 msgid "Seems you need more money... ;-)"
 msgstr "Čini se da trebate više novca... ;-)"
 
-#: src/net/ea/specialhandler.cpp:189
+#: src/net/tmwa/specialhandler.cpp:186
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Ne možeš koristiti tu vještinu s tim oružjem!"
 
-#: src/net/ea/specialhandler.cpp:192
+#: src/net/tmwa/specialhandler.cpp:189
 msgid "You need another red gem!"
 msgstr "Trebaš još jedan crveni dragulj!"
 
-#: src/net/ea/specialhandler.cpp:195
+#: src/net/tmwa/specialhandler.cpp:192
 msgid "You need another blue gem!"
 msgstr "Trebaš još jedan plavi dragulj!"
 
-#: src/net/ea/specialhandler.cpp:198
+#: src/net/tmwa/specialhandler.cpp:195
 msgid "You're carrying to much to do this!"
 msgstr "Nosiš previše predmeta da bi učinio to!"
 
-#: src/net/ea/specialhandler.cpp:201
+#: src/net/tmwa/specialhandler.cpp:198
 msgid "Huh? What's that?"
 msgstr "Ha? Što je to?"
 
-#: src/net/ea/specialhandler.cpp:210
+#: src/net/tmwa/specialhandler.cpp:207
 msgid "Warp failed..."
 msgstr "Skok nije uspio..."
 
-#: src/net/ea/specialhandler.cpp:213
+#: src/net/tmwa/specialhandler.cpp:210
 msgid "Could not steal anything..."
 msgstr "Krađa nije uspjela..."
 
-#: src/net/ea/specialhandler.cpp:216
+#: src/net/tmwa/specialhandler.cpp:213
 msgid "Poison had no effect..."
 msgstr "Otrov nije uspio..."
 
-#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:116
-msgid "Request for Trade"
-msgstr "Zahtjev za Trgovanje"
-
-#: src/net/ea/tradehandler.cpp:108 src/net/manaserv/tradehandler.cpp:117
-#, c-format
-msgid "%s wants to trade with you, do you accept?"
-msgstr "%s želi trgovati s vama, prihvaćate li?"
-
-#: src/net/ea/tradehandler.cpp:124
+#: src/net/tmwa/tradehandler.cpp:126
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr "Trgovanje nije moguće. Trgovački partner je predaleko."
 
-#: src/net/ea/tradehandler.cpp:128
+#: src/net/tmwa/tradehandler.cpp:130
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr "Trgovanje nije moguće. Lik ne postoji."
 
-#: src/net/ea/tradehandler.cpp:132
+#: src/net/tmwa/tradehandler.cpp:134
 msgid "Trade cancelled due to an unknown reason."
 msgstr "Trgovanje otkazano zbog nepoznatih razloga."
 
-#: src/net/ea/tradehandler.cpp:137
+#: src/net/tmwa/tradehandler.cpp:139
 #, c-format
 msgid "Trade: You and %s"
 msgstr "Trgujte: Vi i %s"
 
-#: src/net/ea/tradehandler.cpp:144
+#: src/net/tmwa/tradehandler.cpp:146
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr "Trgovanje s %s otkazano."
 
-#: src/net/ea/tradehandler.cpp:153
+#: src/net/tmwa/tradehandler.cpp:154
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:202
+#: src/net/tmwa/tradehandler.cpp:202
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr "Neuspješno dodavanje predmeta. Trgovinski partner je preopterećen."
 
-#: src/net/ea/tradehandler.cpp:207
+#: src/net/tmwa/tradehandler.cpp:207
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 "Neuspješno dodavanje predmeta. Trgovinski partner nema slobodnog prostora."
 
-#: src/net/ea/tradehandler.cpp:211
+#: src/net/tmwa/tradehandler.cpp:211
 msgid "Failed adding item for unknown reason."
 msgstr "Neuspješno dodavanje predmeta, iz nepoznatog razloga."
 
-#: src/net/ea/tradehandler.cpp:224 src/net/manaserv/tradehandler.cpp:149
-msgid "Trade canceled."
-msgstr "Otkazano trgovanje."
-
-#: src/net/ea/tradehandler.cpp:231 src/net/manaserv/tradehandler.cpp:156
-msgid "Trade completed."
-msgstr "Trgovanje je završeno."
-
-#: src/net/manaserv/beinghandler.cpp:324
-msgid "Press OK to respawn."
-msgstr ""
-
-#: src/net/manaserv/beinghandler.cpp:325
+#: src/playerrelations.cpp:310
 #, fuzzy
-msgid "You Died"
-msgstr "Umrli ste"
-
-#: src/net/manaserv/charhandler.cpp:128 src/net/manaserv/charhandler.cpp:196
-#, fuzzy
-msgid "Not logged in."
-msgstr "Već prijavljeni"
-
-#: src/net/manaserv/charhandler.cpp:131
-msgid "No empty slot."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:134
-msgid "Invalid name."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:137
-#, fuzzy
-msgid "Character's name already exists."
-msgstr "Korisničko ime već postoji"
-
-#: src/net/manaserv/charhandler.cpp:140
-msgid "Invalid hairstyle."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:143
-msgid "Invalid hair color."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:146
-msgid "Invalid gender."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:149
-#, fuzzy
-msgid "Character's stats are too high."
-msgstr "Podaci lika su u redu"
-
-#: src/net/manaserv/charhandler.cpp:152
-#, fuzzy
-msgid "Character's stats are too low."
-msgstr "Podaci lika su u redu"
+msgid "Completely ignore"
+msgstr "@@ignore|Potpuno ignoriraj %s@@"
 
-#: src/net/manaserv/charhandler.cpp:155
-msgid "One stat is zero."
+#: src/playerrelations.cpp:324
+msgid "Print '...'"
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:187
-#, fuzzy
-msgid "Player deleted."
-msgstr "Lik izbrisan."
-
-#: src/net/manaserv/charhandler.cpp:199
-#, fuzzy
-msgid "Selection out of range."
-msgstr "Odaberi količinu predmeta za razmjenu."
-
-#: src/net/manaserv/charhandler.cpp:202
-#, fuzzy, c-format
-msgid "Unknown error (%d)."
-msgstr "Nepoznata greška"
-
-#: src/net/manaserv/charhandler.cpp:242
-msgid "No gameservers are available."
-msgstr "Nijedan od servera igre nije dostupan."
-
-#: src/net/manaserv/charhandler.cpp:268
-msgid "Willpower:"
-msgstr "Snaga volje:"
-
-#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
-#: src/net/manaserv/guildhandler.cpp:259
-#, c-format
-msgid "Topic: %s"
-msgstr "Tema: %s"
-
-#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
-#, fuzzy
-msgid "Players in this channel:"
-msgstr "Igrač pogađa Čudovište"
-
-#: src/net/manaserv/chathandler.cpp:201
-#, fuzzy
-msgid "Error joining channel."
-msgstr "Naredba: /join <channel>"
-
-#: src/net/manaserv/chathandler.cpp:207
-#, fuzzy
-msgid "Listing channels."
-msgstr "Zahtjev za pridruživanje kanalu %s."
-
-#: src/net/manaserv/chathandler.cpp:219
-msgid "End of channel list."
+#: src/playerrelations.cpp:340
+msgid "Blink name"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:291
-#, fuzzy, c-format
-msgid "%s entered the channel."
-msgstr "%s se pridružio partiji."
-
-#: src/net/manaserv/chathandler.cpp:296
+#: src/resources/itemdb.cpp:44
 #, c-format
-msgid "%s left the channel."
-msgstr ""
+msgid "Attack %+d"
+msgstr "Napad %+d"
 
-#: src/net/manaserv/chathandler.cpp:312
+#: src/resources/itemdb.cpp:45
 #, c-format
-msgid "%s has set mode %s on user %s."
-msgstr ""
+msgid "Defense %+d"
+msgstr "Obrana %+d"
 
-#: src/net/manaserv/chathandler.cpp:322
+#: src/resources/itemdb.cpp:46
 #, c-format
-msgid "%s has kicked %s."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:327
-#, fuzzy
-msgid "Unknown channel event."
-msgstr "Nepoznata naredba."
+msgid "HP %+d"
+msgstr "Zdravlje %+d"
 
-#: src/net/manaserv/generalhandler.cpp:100
+#: src/resources/itemdb.cpp:47
 #, c-format
-msgid "Willpower %+d"
-msgstr "Snaga Volje %+d"
-
-#: src/net/manaserv/generalhandler.cpp:171
-#, fuzzy
-msgid "Willpower"
-msgstr "Snaga volje:"
-
-#: src/net/manaserv/guildhandler.cpp:81
-msgid "Guild created."
-msgstr "Ceh, ustanovljen."
-
-#: src/net/manaserv/guildhandler.cpp:86
-msgid "Error creating guild."
-msgstr "Pogreška pri ustanovljavanju ceha."
-
-#: src/net/manaserv/guildhandler.cpp:96
-msgid "Invite sent."
-msgstr "Pozivnica je poslana."
-
-#: src/net/manaserv/guildhandler.cpp:203
-msgid "Member was promoted successfully."
-msgstr "Član je uspješno unaprijeđen."
+msgid "MP %+d"
+msgstr "Mana %+d"
 
-#: src/net/manaserv/guildhandler.cpp:208
-msgid "Failed to promote member."
-msgstr "Neuspješno promicanje člana."
+#: src/resources/itemdb.cpp:92
+msgid "Unknown item"
+msgstr "Nepoznati predmet"
 
-#: src/net/manaserv/loginhandler.cpp:87
-#, fuzzy
-msgid "Wrong magic_token."
-msgstr "Pogrešan magični_simbol"
+#: src/resources/itemdb.cpp:135 src/resources/monsterdb.cpp:77
+msgid "unnamed"
+msgstr "neimenovano"
 
-#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
 #, fuzzy
-msgid "Already logged in."
-msgstr "Već prijavljeni"
+#~ msgid "HP"
+#~ msgstr "HP:"
 
-#: src/net/manaserv/loginhandler.cpp:93 src/net/manaserv/loginhandler.cpp:272
 #, fuzzy
-msgid "Server is full."
-msgstr "Server je pun"
+#~ msgid "MP"
+#~ msgstr "MP:"
 
-#: src/net/manaserv/loginhandler.cpp:118
 #, fuzzy
-msgid "New password incorrect."
-msgstr "Nova lozinka je netočna"
-
-#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
-msgid "Account not connected. Please login first."
-msgstr "Račun nije priključen. Molimo prvo se prijavite."
+#~ msgid "Exp"
+#~ msgstr "Exp:"
 
-#: src/net/manaserv/loginhandler.cpp:149
 #, fuzzy
-msgid "New email address incorrect."
-msgstr "Nova e-mail adresa netočna"
+#~ msgid "Money"
+#~ msgstr "Novac: %d"
 
-#: src/net/manaserv/loginhandler.cpp:152
 #, fuzzy
-msgid "Old email address incorrect."
-msgstr "Stara e-mail adresa netočna"
+#~ msgid "Job"
+#~ msgstr "Zadatak:"
 
-#: src/net/manaserv/loginhandler.cpp:158
 #, fuzzy
-msgid "The new email address already exists."
-msgstr "Nova E-mail Adresa već postoji."
-
-#: src/net/manaserv/loginhandler.cpp:239
-msgid ""
-"Client registration is not allowed. Please contact server administration."
-msgstr ""
+#~ msgid "Level"
+#~ msgstr "Nivo: %d"
 
-#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
 #, fuzzy
-msgid "Client version is too old."
-msgstr "Verzija klijenta je prestara"
+#~ msgid "Access denied."
+#~ msgstr "Pristup odbijen"
 
-#: src/net/manaserv/loginhandler.cpp:266
 #, fuzzy
-msgid "Wrong username or password."
-msgstr "Pogrešno korisničko ime ili lozinka"
+#~ msgid "Unknown failure to select character."
+#~ msgstr "Nepoznata greška pri odabiru lika"
 
-#: src/net/manaserv/loginhandler.cpp:275
-msgid "Login attempt too soon after previous attempt."
-msgstr ""
+#~ msgid "Willpower:"
+#~ msgstr "Snaga volje:"
 
-#: src/net/manaserv/loginhandler.cpp:303
-#, fuzzy
-msgid "Wrong username, password or email address."
-msgstr "Pogrešno korisničko ime, lozinka ili email adresa"
+#~ msgid "Willpower %+d"
+#~ msgstr "Snaga Volje %+d"
 
-#: src/net/manaserv/loginhandler.cpp:306
 #, fuzzy
-msgid "Username already exists."
-msgstr "Korisničko ime već postoji"
+#~ msgid "Willpower"
+#~ msgstr "Snaga volje:"
 
-#: src/net/manaserv/loginhandler.cpp:309
 #, fuzzy
-msgid "Email address already exists."
-msgstr "Email adresa već postoji"
-
-#: src/net/manaserv/loginhandler.cpp:312
-msgid "You took too long with the captcha or your response was incorrect."
-msgstr ""
-
-#: src/net/manaserv/partyhandler.cpp:88
-msgid "Joined party."
-msgstr "Pridružen pertiji."
-
-#: src/net/manaserv/partyhandler.cpp:106
-#, c-format
-msgid "%s joined the party."
-msgstr "%s se pridružio partiji."
-
-#: src/net/manaserv/partyhandler.cpp:123
-#, fuzzy, c-format
-msgid "%s rejected your invite."
-msgstr "%s je odbio vašu pozivnicu."
-
-#: src/net/manaserv/tradehandler.cpp:96
-msgid "Accepting incoming trade requests."
-msgstr "Prihvaćanje dolaznih zahtjeva za trgovanje."
-
-#: src/net/manaserv/tradehandler.cpp:98
-msgid "Ignoring incoming trade requests."
-msgstr "Ignoriranje nadolazećih zahtjeva za trgovanje."
-
-#: src/net/manaserv/tradehandler.cpp:135
-#, c-format
-msgid "Trading with %s"
-msgstr "Trgovanje s %s"
-
-#: src/playerrelations.cpp:304
-#, fuzzy
-msgid "Completely ignore"
-msgstr "@@ignore|Potpuno ignoriraj %s@@"
-
-#: src/playerrelations.cpp:318
-msgid "Print '...'"
-msgstr ""
-
-#: src/playerrelations.cpp:334
-msgid "Blink name"
-msgstr ""
-
-#: src/playerrelations.cpp:371
-msgid "Floating '...' bubble"
-msgstr ""
-
-#: src/playerrelations.cpp:374
-msgid "Floating bubble"
-msgstr ""
-
-#: src/resources/itemdb.cpp:52
-#, c-format
-msgid "Attack %+d"
-msgstr "Napad %+d"
-
-#: src/resources/itemdb.cpp:53
-#, c-format
-msgid "Defense %+d"
-msgstr "Obrana %+d"
-
-#: src/resources/itemdb.cpp:54
-#, c-format
-msgid "HP %+d"
-msgstr "Zdravlje %+d"
-
-#: src/resources/itemdb.cpp:55
-#, c-format
-msgid "MP %+d"
-msgstr "Mana %+d"
-
-#: src/resources/itemdb.cpp:114
-msgid "Unknown item"
-msgstr "Nepoznati predmet"
-
-#: src/resources/itemdb.cpp:158 src/resources/monsterdb.cpp:45
-#: src/resources/monsterdb.cpp:69
-msgid "unnamed"
-msgstr "neimenovano"
+#~ msgid "Server is full."
+#~ msgstr "Server je pun"
 
 #~ msgid "Text Shadow"
 #~ msgstr "Sjena Teksta"
diff --git a/po/hu.po b/po/hu.po
index 2a629598..c17e89a4 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2010-03-16 22:27+0100\n"
+"POT-Creation-Date: 2010-12-13 20:04+0100\n"
 "PO-Revision-Date: 2009-07-07 19:52+0000\n"
 "Last-Translator: Tatsukichi <artit91@gmail.com>\n"
 "Language-Team: Hungarian <hu@li.org>\n"
+"Language: hu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,323 +19,329 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/client.cpp:555 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
+#: src/client.cpp:598 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
 msgid "Setup"
 msgstr "Beállítások"
 
-#: src/client.cpp:625
+#: src/client.cpp:679
 #, fuzzy
 msgid "Connecting to server"
 msgstr "Csatlakozás a térkép szerverhez...."
 
-#: src/client.cpp:652
+#: src/client.cpp:706
 #, fuzzy
 msgid "Logging in"
 msgstr "Belépés"
 
-#: src/client.cpp:685
+#: src/client.cpp:739
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:741
+#: src/client.cpp:804
 #, fuzzy
 msgid "Requesting characters"
 msgstr "Kapcsolódási kérelem a %s nevű csatornába."
 
-#: src/client.cpp:770
+#: src/client.cpp:833
 #, fuzzy
 msgid "Connecting to the game server"
 msgstr "Csatlakozás a térkép szerverhez...."
 
-#: src/client.cpp:801 src/client.cpp:808 src/client.cpp:942
+#: src/client.cpp:843
+#, fuzzy
+msgid "Changing game servers"
+msgstr "Szerver"
+
+#: src/client.cpp:872 src/client.cpp:879 src/client.cpp:1014
 #: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
 #: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
-#: src/gui/serverdialog.cpp:241 src/gui/unregisterdialog.cpp:133
-#: src/net/ea/charserverhandler.cpp:135 src/net/ea/charserverhandler.cpp:152
-#: src/net/manaserv/charhandler.cpp:161 src/net/manaserv/charhandler.cpp:204
+#: src/gui/serverdialog.cpp:323 src/gui/unregisterdialog.cpp:133
+#: src/net/manaserv/charhandler.cpp:174 src/net/manaserv/charhandler.cpp:217
+#: src/net/tmwa/charserverhandler.cpp:134
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Error"
 msgstr "Hiba"
 
-#: src/client.cpp:817
+#: src/client.cpp:888
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:844
+#: src/client.cpp:915
 #, fuzzy
 msgid "Password Change"
 msgstr "Jelszó:"
 
-#: src/client.cpp:845
+#: src/client.cpp:916
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:864
+#: src/client.cpp:935
 #, fuzzy
 msgid "Email Change"
 msgstr "Változtatás"
 
-#: src/client.cpp:865
+#: src/client.cpp:936
 #, fuzzy
 msgid "Email changed successfully!"
 msgstr "A tag előléptetése sikeres."
 
-#: src/client.cpp:885
+#: src/client.cpp:956
 #, fuzzy
 msgid "Unregister Successful"
 msgstr "Regisztráció megszüntetése"
 
-#: src/client.cpp:886
+#: src/client.cpp:957
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1009 src/client.cpp:1032
+#: src/client.cpp:1138 src/client.cpp:1161
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1121
+#: src/client.cpp:1281
 #, fuzzy, c-format
 msgid "Invalid update host: %s"
 msgstr "Helytelen frissítési kiszolgáló: "
 
-#: src/client.cpp:1155 src/client.cpp:1161
+#: src/client.cpp:1315 src/client.cpp:1321
 msgid "Error creating updates directory!"
 msgstr "Hiba a frissítési könyvtár létrehozása közben!"
 
-#: src/commandhandler.cpp:127 src/commandhandler.cpp:308
+#: src/commandhandler.cpp:131 src/commandhandler.cpp:317
 msgid "Unknown command."
 msgstr "Ismeretlen parancs."
 
-#: src/commandhandler.cpp:156
+#: src/commandhandler.cpp:160
 msgid "-- Help --"
 msgstr "-- Segítség --"
 
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:161
 msgid "/help > Display this help"
 msgstr "/help > Megmutatja ezt a segítséget"
 
-#: src/commandhandler.cpp:159
+#: src/commandhandler.cpp:163
 msgid "/where > Display map name"
 msgstr "/where > Megmutatja a térkép nevét"
 
-#: src/commandhandler.cpp:160
+#: src/commandhandler.cpp:164
 msgid "/who > Display number of online users"
 msgstr "/who > Megmutatja az online felhasználókat"
 
-#: src/commandhandler.cpp:161
+#: src/commandhandler.cpp:165
 msgid "/me > Tell something about yourself"
 msgstr "/me > Mondasz valamit magadról"
 
-#: src/commandhandler.cpp:163
+#: src/commandhandler.cpp:167
 msgid "/clear > Clears this window"
 msgstr "/clear > Letörli ezt az ablakot"
 
-#: src/commandhandler.cpp:165
+#: src/commandhandler.cpp:169
 msgid "/msg > Send a private message to a user"
 msgstr "/msg > Privát üzenetet küld egy felhasználónak"
 
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:170
 msgid "/whisper > Alias of msg"
 msgstr "/whisper > msg megfelelője"
 
-#: src/commandhandler.cpp:167
+#: src/commandhandler.cpp:171
 msgid "/w > Alias of msg"
 msgstr "/w > msg megfelelője"
 
-#: src/commandhandler.cpp:168
+#: src/commandhandler.cpp:172
 msgid "/query > Makes a tab for private messages with another user"
 msgstr "/query > Fület hoz létre privát beszélgetéshez"
 
-#: src/commandhandler.cpp:169
+#: src/commandhandler.cpp:174
 msgid "/q > Alias of query"
 msgstr "/q > query megfelelője"
 
-#: src/commandhandler.cpp:171
+#: src/commandhandler.cpp:176
 msgid "/ignore > ignore a player"
 msgstr ""
 
-#: src/commandhandler.cpp:172
+#: src/commandhandler.cpp:177
 msgid "/unignore > stop ignoring a player"
 msgstr ""
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:179
 msgid "/list > Display all public channels"
 msgstr "/list > Publikus csatornák listázása"
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:180
 msgid "/join > Join or create a channel"
 msgstr "/join > Csatornához kapcsolódás/csatornát létrehoz"
 
-#: src/commandhandler.cpp:177
+#: src/commandhandler.cpp:182
 #, fuzzy
 msgid "/createparty > Create a new party"
 msgstr "/create > Új csapat létrehozása"
 
-#: src/commandhandler.cpp:178
+#: src/commandhandler.cpp:183
 msgid "/party > Invite a user to party"
 msgstr "/party > Felhasználó csapatba hívása"
 
-#: src/commandhandler.cpp:180
+#: src/commandhandler.cpp:185
 msgid "/record > Start recording the chat to an external file"
 msgstr "/record > Beszélgetés rögzítése külső fájlba"
 
-#: src/commandhandler.cpp:181
+#: src/commandhandler.cpp:187
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr ""
 "/toggle > Választható, hogy üres <enter> kell e az input panel bezárásához"
 
-#: src/commandhandler.cpp:182
+#: src/commandhandler.cpp:189
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr "/present > \"Hallható\" játékosok kilistázása"
 
-#: src/commandhandler.cpp:184
+#: src/commandhandler.cpp:192
 msgid "/announce > Global announcement (GM only)"
 msgstr "/announce > Globális üzenet (csak GM)"
 
-#: src/commandhandler.cpp:188
+#: src/commandhandler.cpp:196
 msgid "For more information, type /help <command>."
 msgstr "További információhoz gépeld be a /help <parancsnév> parancsot."
 
-#: src/commandhandler.cpp:192
+#: src/commandhandler.cpp:200
 msgid "Command: /help"
 msgstr "Parancs: /help"
 
-#: src/commandhandler.cpp:193
+#: src/commandhandler.cpp:201
 msgid "This command displays a list of all commands available."
 msgstr "Ez a parancs az elérhető parancsokat listázza."
 
-#: src/commandhandler.cpp:194
+#: src/commandhandler.cpp:203
 msgid "Command: /help <command>"
 msgstr "Parancs: /help <parancsnév>"
 
-#: src/commandhandler.cpp:195
+#: src/commandhandler.cpp:204
 msgid "This command displays help on <command>."
 msgstr ""
 "Ez a parancs segítséget nyújt a <parancsnév> alatt megadott parancshoz."
 
-#: src/commandhandler.cpp:203
+#: src/commandhandler.cpp:212
 msgid "Command: /announce <msg>"
 msgstr "Parancs: /announce <üzenet>"
 
-#: src/commandhandler.cpp:204
+#: src/commandhandler.cpp:213
 msgid "*** only available to a GM ***"
 msgstr "*** csak GM-nek elérhető ***"
 
-#: src/commandhandler.cpp:205
+#: src/commandhandler.cpp:214
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 "Ez a parancs az <üzenet>-en belül megadott szöveget elküldi az összes "
 "elérhető játékosnak."
 
-#: src/commandhandler.cpp:210
+#: src/commandhandler.cpp:219
 msgid "Command: /clear"
 msgstr "Parancs: /clear"
 
-#: src/commandhandler.cpp:211
+#: src/commandhandler.cpp:220
 msgid "This command clears the chat log of previous chat."
 msgstr "Törli a beszélgetés panel tartalmát."
 
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:224
 #, fuzzy
 msgid "Command: /ignore <player>"
 msgstr "Parancs: /item <szabály>"
 
-#: src/commandhandler.cpp:216
+#: src/commandhandler.cpp:225
 #, fuzzy
 msgid "This command ignores the given player regardless of current relations."
 msgstr "Ez a parancs megmutatja az online játékosok számát."
 
-#: src/commandhandler.cpp:221
+#: src/commandhandler.cpp:230
 msgid "Command: /join <channel>"
 msgstr "Parancs: /join <csatorna>"
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:231
 msgid "This command makes you enter <channel>."
 msgstr "Belépsz a <csatorna> helyen megadott beszélgetési csatornába."
 
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:232
 msgid "If <channel> doesn't exist, it's created."
 msgstr "Ha a <csatorna> helyen megadott csatorna nem létezik, létrehozod."
 
-#: src/commandhandler.cpp:227
+#: src/commandhandler.cpp:236
 msgid "Command: /list"
 msgstr "Parancs: /list"
 
-#: src/commandhandler.cpp:228
+#: src/commandhandler.cpp:237
 msgid "This command shows a list of all channels."
 msgstr "Kilistázza az összes csatornát."
 
-#: src/commandhandler.cpp:232
+#: src/commandhandler.cpp:241
 msgid "Command: /me <message>"
 msgstr "Parancs: /me <üzenet>"
 
-#: src/commandhandler.cpp:233
+#: src/commandhandler.cpp:242
 msgid "This command tell others you are (doing) <msg>."
 msgstr "Ezzel a paranccsal az állapotodat jelzed. Megjelenés: Név <üzenet>"
 
-#: src/commandhandler.cpp:237
+#: src/commandhandler.cpp:246
 msgid "Command: /msg <nick> <message>"
 msgstr "Parancs: /msg <név> <üzenet>"
 
-#: src/commandhandler.cpp:238
+#: src/commandhandler.cpp:247
 msgid "Command: /whisper <nick> <message>"
 msgstr "Parancs: /whisper <név> <üzenet>"
 
-#: src/commandhandler.cpp:239
+#: src/commandhandler.cpp:248
 msgid "Command: /w <nick> <message>"
 msgstr "Parancs: /w <név> <üzenet>"
 
-#: src/commandhandler.cpp:240
+#: src/commandhandler.cpp:249
 msgid "This command sends the text <message> to <nick>."
 msgstr ""
 "Ez a parancs elküldi az <üzenet> szövegét a <név> alatt megadott nevű "
 "játékosnak."
 
-#: src/commandhandler.cpp:241 src/commandhandler.cpp:260
+#: src/commandhandler.cpp:250 src/commandhandler.cpp:269
 #: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
-#: src/net/ea/gui/guildtab.cpp:75 src/net/ea/gui/partytab.cpp:75
+#: src/net/tmwa/gui/guildtab.cpp:75 src/net/tmwa/gui/partytab.cpp:75
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 "Ha a <név> alatt megadott név szóközt tartalmaz idézőjelbe kell tenni. (\")."
 
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:255
 msgid "Command: /query <nick>"
 msgstr "Parancs: /query <név>"
 
-#: src/commandhandler.cpp:247
+#: src/commandhandler.cpp:256
 msgid "Command: /q <nick>"
 msgstr "Parancs: /q <név>"
 
-#: src/commandhandler.cpp:248
+#: src/commandhandler.cpp:257
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
 "Ez a parancs egy új fület nyit beszélgetéseidhez a <név> alatt megadott nevű "
 "játékossal."
 
-#: src/commandhandler.cpp:253
+#: src/commandhandler.cpp:262
 #, fuzzy
 msgid "Command: /createparty <name>"
 msgstr "Parancs: /create <csapatnév>"
 
-#: src/commandhandler.cpp:254
+#: src/commandhandler.cpp:263
 #, fuzzy
 msgid "This command creates a new party called <name>."
 msgstr ""
 "Ezek a parancsok új csapatot hoznak létre a <csapatnév> alatt megadott néven."
 
-#: src/commandhandler.cpp:258
+#: src/commandhandler.cpp:267
 msgid "Command: /party <nick>"
 msgstr "Parancs: /party <név>"
 
-#: src/commandhandler.cpp:259 src/net/ea/gui/partytab.cpp:74
+#: src/commandhandler.cpp:268 src/net/tmwa/gui/partytab.cpp:74
 msgid "This command invites <nick> to party with you."
 msgstr "Ez a parancs csapatba hívja a <név> alatt megadott nevű játékost."
 
-#: src/commandhandler.cpp:265
+#: src/commandhandler.cpp:274
 msgid "Command: /present"
 msgstr "Parancs: /present"
 
-#: src/commandhandler.cpp:266
+#: src/commandhandler.cpp:275
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
@@ -342,84 +349,84 @@ msgstr ""
 "Ez a parancs megmutatja a \"hallható\" játékosok nevét és fájlba is rögzíti, "
 "ha éppen rögzítjük a beszélgetést."
 
-#: src/commandhandler.cpp:272
+#: src/commandhandler.cpp:281
 msgid "Command: /record <filename>"
 msgstr "parancs: /record <fájlnév>"
 
-#: src/commandhandler.cpp:273
+#: src/commandhandler.cpp:282
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr ""
 "Ez a parancs elkezdi felvenni a beszélgetést a <fájlnév> alatt megadott "
 "fájlba."
 
-#: src/commandhandler.cpp:275
+#: src/commandhandler.cpp:284
 msgid "Command: /record"
 msgstr "Parancs: /record"
 
-#: src/commandhandler.cpp:276
+#: src/commandhandler.cpp:285
 msgid "This command finishes a recording session."
 msgstr "Befejezi a beszélgetés rögzítését."
 
-#: src/commandhandler.cpp:280
+#: src/commandhandler.cpp:289
 msgid "Command: /toggle <state>"
 msgstr "Parancs: /toggle <állás>"
 
-#: src/commandhandler.cpp:281
+#: src/commandhandler.cpp:290
 msgid ""
 "This command sets whether the return key should toggle the chat log, or "
 "whether the chat log turns off automatically."
 msgstr "Ez a parancs beállítja az enter billentyű használatát a játékban."
 
-#: src/commandhandler.cpp:283
+#: src/commandhandler.cpp:292
 msgid ""
-"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
-"\", \"no\", \"false\" to turn the toggle off."
+"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
+"\"0\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 "<állás> lehet \"1\", \"yes\", \"true\" ha ki akarod kapcsolni a chat input "
 "automatikus eltűnését, \"0\", \"no\", \"false\"  ha nem."
 
-#: src/commandhandler.cpp:286
+#: src/commandhandler.cpp:295
 msgid "Command: /toggle"
 msgstr "Parancs: /toggle"
 
-#: src/commandhandler.cpp:287
+#: src/commandhandler.cpp:296
 msgid "This command displays the return toggle status."
 msgstr "A /toggle jelenlegi állását mutatja meg."
 
-#: src/commandhandler.cpp:291 src/gui/widgets/whispertab.cpp:93
+#: src/commandhandler.cpp:300 src/gui/widgets/whispertab.cpp:95
 #, fuzzy
 msgid "Command: /unignore <player>"
 msgstr "Parancs: /item <szabály>"
 
-#: src/commandhandler.cpp:292
+#: src/commandhandler.cpp:301
 msgid "This command stops ignoring the given player if they are being ignored"
 msgstr ""
 
-#: src/commandhandler.cpp:297
+#: src/commandhandler.cpp:306
 msgid "Command: /where"
 msgstr "Parancs: /where"
 
-#: src/commandhandler.cpp:298
+#: src/commandhandler.cpp:307
 msgid "This command displays the name of the current map."
 msgstr "Ez a parancs megmutatja az aktuális térkép nevét."
 
-#: src/commandhandler.cpp:302
+#: src/commandhandler.cpp:311
 msgid "Command: /who"
 msgstr "Parancs: /who"
 
-#: src/commandhandler.cpp:303
+#: src/commandhandler.cpp:312
 msgid "This command displays the number of players currently online."
 msgstr "Ez a parancs megmutatja az online játékosok számát."
 
-#: src/commandhandler.cpp:309
+#: src/commandhandler.cpp:318
 msgid "Type /help for a list of commands."
 msgstr "Parancsok listája: /help"
 
-#: src/commandhandler.cpp:375
+#: src/commandhandler.cpp:384
 msgid "Cannot send empty whispers!"
 msgstr "Nem küldhetsz üres üzenetet!"
 
-#: src/commandhandler.cpp:383
+#: src/commandhandler.cpp:392
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -427,59 +434,67 @@ msgid ""
 msgstr ""
 "Nem tudsz fület létrehozni \"%s\" számára! Létre van hozva, vagy te vagy az."
 
-#: src/commandhandler.cpp:397
+#: src/commandhandler.cpp:406
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Kapcsolódási kérelem a %s nevű csatornába."
 
-#: src/commandhandler.cpp:410 src/net/ea/gui/partytab.cpp:109
+#: src/commandhandler.cpp:419 src/net/tmwa/gui/partytab.cpp:109
 msgid "Party name is missing."
 msgstr "A csapatnév hiányzik."
 
-#: src/commandhandler.cpp:423 src/commandhandler.cpp:471
-#: src/commandhandler.cpp:493
+#: src/commandhandler.cpp:432 src/commandhandler.cpp:509
+#: src/commandhandler.cpp:531
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:441
+#: src/commandhandler.cpp:450
 msgid "Return toggles chat."
 msgstr "Az enter megnyitja a bevitelt."
 
-#: src/commandhandler.cpp:441
+#: src/commandhandler.cpp:450
 msgid "Message closes chat."
 msgstr "Az üzenet bezárja a bevitelt."
 
-#: src/commandhandler.cpp:450
+#: src/commandhandler.cpp:459
 msgid "Return now toggles chat."
 msgstr "Az enter mostantól megnyitja a bevitelt."
 
-#: src/commandhandler.cpp:454
+#: src/commandhandler.cpp:463
 msgid "Message now closes chat."
 msgstr "Az üzenet mostantól bezárja a bevitelt."
 
-#: src/commandhandler.cpp:477
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:489
+msgid "Show IP: On"
+msgstr ""
+
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:485
+msgid "Show IP: Off"
+msgstr ""
+
+#: src/commandhandler.cpp:515
 msgid "Player already ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:484
+#: src/commandhandler.cpp:522
 #, fuzzy
 msgid "Player successfully ignored!"
 msgstr "Csapat létrehozása sikeres."
 
-#: src/commandhandler.cpp:486
+#: src/commandhandler.cpp:524
 #, fuzzy
 msgid "Player could not be ignored!"
 msgstr "A privát üzenet nem lett elküldve, mert le lettél tiltva."
 
-#: src/commandhandler.cpp:501
+#: src/commandhandler.cpp:539
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:506
+#: src/commandhandler.cpp:544
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:508
+#: src/commandhandler.cpp:546
 #, fuzzy
 msgid "Player could not be unignored!"
 msgstr "A privát üzenet nem lett elküldve, mert le lettél tiltva."
@@ -495,43 +510,43 @@ msgstr ""
 msgid "General"
 msgstr "Általános"
 
-#: src/game.cpp:326
+#: src/game.cpp:342
 #, fuzzy
 msgid "Screenshot saved as "
 msgstr "Képernyőt mentettük a ~/ helyre"
 
-#: src/game.cpp:331
+#: src/game.cpp:347
 msgid "Saving screenshot failed!"
 msgstr "Hiba a képernyő mentése során!"
 
-#: src/game.cpp:355
+#: src/game.cpp:378
 #, fuzzy
 msgid "The connection to the server was lost."
 msgstr "A kapcsolat megszakadt a szerverrel, a program most kilép."
 
-#: src/game.cpp:360
+#: src/game.cpp:382
 msgid "Network Error"
 msgstr "Hálózati hiba"
 
-#: src/game.cpp:705
+#: src/game.cpp:721
 msgid "Ignoring incoming trade requests"
 msgstr "Kereskedési kérelmek elutasítása"
 
-#: src/game.cpp:712
+#: src/game.cpp:726
 msgid "Accepting incoming trade requests"
 msgstr "Kereskedési kérelmek elfogadása"
 
-#: src/game.cpp:946
+#: src/game.cpp:954
 #, fuzzy
 msgid "Could Not Load Map"
 msgstr "Nem lehet betölteni a térképet"
 
-#: src/game.cpp:947
+#: src/game.cpp:955
 #, c-format
 msgid "Error while loading %s"
 msgstr "Hiba %s betöltése közben"
 
-#: src/gui/beingpopup.cpp:75
+#: src/gui/beingpopup.cpp:76
 #, fuzzy, c-format
 msgid "Party: %s"
 msgstr "Csapat (%s)"
@@ -540,34 +555,34 @@ msgstr "Csapat (%s)"
 msgid "Buy"
 msgstr "Vétel"
 
-#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
-#: src/gui/sell.cpp:276
+#: src/gui/buy.cpp:69 src/gui/buy.cpp:261 src/gui/sell.cpp:71
+#: src/gui/sell.cpp:288
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Ár: %s / Teljes: %s"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:99 src/gui/npcdialog.cpp:100
-#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:404
+#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:112 src/gui/npcdialog.cpp:124
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:463
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:98 src/gui/npcdialog.cpp:101
-#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:416
+#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:111 src/gui/npcdialog.cpp:125
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:475
 msgid "-"
 msgstr ""
 
 #: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
-#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:152
-#: src/keyboardconfig.cpp:103
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:228
+#: src/keyboardconfig.cpp:102
 msgid "Quit"
 msgstr "Kilépés"
 
-#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:333
-#: src/gui/statuswindow.cpp:403 src/gui/statuswindow.cpp:437
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:384
+#: src/gui/statuswindow.cpp:462 src/gui/statuswindow.cpp:496
 msgid "Max"
 msgstr "Max."
 
@@ -581,11 +596,11 @@ msgstr "Eladás"
 
 #: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
 #: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
-#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:101
-#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:178
-#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:402
+#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:114
+#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:389
 #: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
-#: src/gui/socialwindow.cpp:243 src/gui/textdialog.cpp:39
+#: src/gui/socialwindow.cpp:275 src/gui/textdialog.cpp:40
 #: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr "Mégse"
@@ -624,7 +639,7 @@ msgstr "Az új email cím már foglalt."
 msgid "Change Password"
 msgstr "Jelszó módosítása"
 
-#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:53
+#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:55
 #: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
 msgid "Password:"
 msgstr "Jelszó:"
@@ -656,19 +671,19 @@ msgstr ""
 msgid "Create Character"
 msgstr "Karakter létrehozása"
 
-#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:52
+#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:54
 #: src/gui/register.cpp:67
 msgid "Name:"
 msgstr "Név:"
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
 #: src/gui/outfitwindow.cpp:67
 msgid ">"
 msgstr ""
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
 #: src/gui/outfitwindow.cpp:66
@@ -685,8 +700,8 @@ msgstr "Haj szín:"
 msgid "Hair style:"
 msgstr "Haj stílus:"
 
-#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:397
-#: src/gui/socialwindow.cpp:297
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:392
+#: src/gui/socialwindow.cpp:329
 msgid "Create"
 msgstr "Létrehozás"
 
@@ -742,34 +757,34 @@ msgstr "Regisztráció megszüntetése"
 msgid "Change Email"
 msgstr "Email cím módosírása"
 
-#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:155
-#: src/gui/setup_players.cpp:230
+#: src/gui/charselectdialog.cpp:336 src/gui/serverdialog.cpp:231
+#: src/gui/setup_players.cpp:229
 msgid "Delete"
 msgstr "Törlés"
 
-#: src/gui/charselectdialog.cpp:387
+#: src/gui/charselectdialog.cpp:380
 #, fuzzy
 msgid "Choose"
 msgstr "Bezár"
 
-#: src/gui/charselectdialog.cpp:399 src/gui/charselectdialog.cpp:400
+#: src/gui/charselectdialog.cpp:394 src/gui/charselectdialog.cpp:395
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:77
+#: src/gui/chat.cpp:88
 msgid "Chat"
 msgstr "Chat"
 
-#: src/gui/chat.cpp:287
+#: src/gui/chat.cpp:311
 #, fuzzy, c-format
 msgid "Present: %s; %d players are present."
 msgstr "%d játékos van a közeledben."
 
-#: src/gui/chat.cpp:305
+#: src/gui/chat.cpp:329
 msgid "Attendance written to record log."
 msgstr "A látogatottság rögzíve lessz."
 
-#: src/gui/chat.cpp:469
+#: src/gui/chat.cpp:493
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Üzenet %s számára: %s"
@@ -835,139 +850,170 @@ msgstr "Környezeti effektek"
 msgid "Equipment"
 msgstr "Felszerelés"
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:78
-#: src/gui/inventorywindow.cpp:80 src/gui/inventorywindow.cpp:291
-#: src/gui/popupmenu.cpp:372
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:89
+#: src/gui/inventorywindow.cpp:337 src/gui/popupmenu.cpp:359
 msgid "Unequip"
 msgstr "Nem használ"
 
-#: src/gui/help.cpp:36
+#: src/gui/help.cpp:37
 msgid "Help"
 msgstr "Súgó"
 
-#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:74
+#: src/gui/help.cpp:51 src/gui/npcdialog.cpp:50
 msgid "Close"
 msgstr "Bezár"
 
-#: src/gui/inventorywindow.cpp:57 src/gui/windowmenu.cpp:56
+#: src/gui/inventorywindow.cpp:59 src/gui/windowmenu.cpp:56
 msgid "Inventory"
 msgstr "Táska"
 
-#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:75
-#: src/gui/inventorywindow.cpp:293 src/gui/popupmenu.cpp:374
+#: src/gui/inventorywindow.cpp:59
+msgid "Storage"
+msgstr "Raktár"
+
+#: src/gui/inventorywindow.cpp:82
+msgid "Slots:"
+msgstr "Hely:"
+
+#: src/gui/inventorywindow.cpp:87 src/gui/inventorywindow.cpp:100
+#: src/gui/inventorywindow.cpp:339 src/gui/popupmenu.cpp:361
 msgid "Equip"
 msgstr "Használ"
 
-#: src/gui/inventorywindow.cpp:74 src/gui/inventorywindow.cpp:75
-#: src/gui/inventorywindow.cpp:297 src/gui/popupmenu.cpp:377
+#: src/gui/inventorywindow.cpp:88
 msgid "Use"
 msgstr "Bevet"
 
-#: src/gui/inventorywindow.cpp:84 src/gui/inventorywindow.cpp:301
-#: src/gui/popupmenu.cpp:380
+#: src/gui/inventorywindow.cpp:101 src/gui/popupmenu.cpp:364
+msgid "Activate"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:102 src/gui/inventorywindow.cpp:348
+#: src/gui/popupmenu.cpp:367
 #, fuzzy
 msgid "Drop..."
 msgstr "Eldob"
 
-#: src/gui/inventorywindow.cpp:85 src/gui/popupmenu.cpp:386
+#: src/gui/inventorywindow.cpp:103 src/gui/popupmenu.cpp:373
 msgid "Split"
 msgstr "Felosztás"
 
-#: src/gui/inventorywindow.cpp:86 src/gui/outfitwindow.cpp:51
+#: src/gui/inventorywindow.cpp:104 src/gui/outfitwindow.cpp:51
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:97 src/gui/storagewindow.cpp:84
-msgid "Slots:"
-msgstr "Hely:"
-
-#: src/gui/inventorywindow.cpp:98
+#: src/gui/inventorywindow.cpp:106
 msgid "Weight:"
 msgstr "Súly:"
 
-#: src/gui/inventorywindow.cpp:303 src/gui/popupmenu.cpp:382
+#: src/gui/inventorywindow.cpp:124 src/gui/popupmenu.cpp:378
+msgid "Store"
+msgstr "Raktároz"
+
+#: src/gui/inventorywindow.cpp:125 src/gui/popupmenu.cpp:385
+msgid "Retrieve"
+msgstr "Magához vesz"
+
+#: src/gui/inventorywindow.cpp:350 src/gui/popupmenu.cpp:369
 msgid "Drop"
 msgstr "Eldob"
 
-#: src/gui/itemamount.cpp:100 src/gui/okdialog.cpp:42
-#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:38 src/gui/trade.cpp:73
-#: src/gui/trade.cpp:75
+#: src/gui/itemamount.cpp:113 src/gui/okdialog.cpp:42
+#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:39 src/gui/trade.cpp:72
+#: src/gui/trade.cpp:74
 msgid "OK"
 msgstr "Ok"
 
-#: src/gui/itemamount.cpp:102
+#: src/gui/itemamount.cpp:115
 msgid "All"
 msgstr "Mind"
 
-#: src/gui/itemamount.cpp:128
+#: src/gui/itemamount.cpp:141
 msgid "Select amount of items to trade."
 msgstr "Válaszd ki mennyi tárggyal akarsz üzletelni."
 
-#: src/gui/itemamount.cpp:131
+#: src/gui/itemamount.cpp:144
 msgid "Select amount of items to drop."
 msgstr "Válaszd ki mennyit akarsz eldobni."
 
-#: src/gui/itemamount.cpp:134
+#: src/gui/itemamount.cpp:147
 msgid "Select amount of items to store."
 msgstr "Válaszd ki a raktározandó mennyiséget."
 
-#: src/gui/itemamount.cpp:137
+#: src/gui/itemamount.cpp:150
 msgid "Select amount of items to retrieve."
 msgstr "Válaszd ki mennyit veszel magadhoz."
 
-#: src/gui/itemamount.cpp:140
+#: src/gui/itemamount.cpp:153
 msgid "Select amount of items to split."
 msgstr "Válaszd ki az elosztandó mennyiséget."
 
-#: src/gui/itempopup.cpp:92
+#: src/gui/itempopup.cpp:137
 #, fuzzy, c-format
 msgid "Weight: %s"
 msgstr "Súly: "
 
-#: src/gui/login.cpp:49 src/gui/login.cpp:61
+#: src/gui/login.cpp:51 src/gui/login.cpp:63
 msgid "Login"
 msgstr "Belépés"
 
-#: src/gui/login.cpp:58
+#: src/gui/login.cpp:60
 #, fuzzy
 msgid "Remember username"
 msgstr "Felhasználónév megjegyzése"
 
-#: src/gui/login.cpp:59 src/gui/register.cpp:58 src/gui/register.cpp:73
+#: src/gui/login.cpp:61 src/gui/register.cpp:58 src/gui/register.cpp:73
 msgid "Register"
 msgstr "Regisztráció"
 
-#: src/gui/login.cpp:60
+#: src/gui/login.cpp:62
 #, fuzzy
 msgid "Change Server"
 msgstr "Szerver"
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
+#: src/gui/login.cpp:129
+#, fuzzy
+msgid "Registration disabled"
+msgstr "Tárgy megosztás tiltva."
+
+#: src/gui/login.cpp:129
+msgid "You need to use the website to register an account for this server."
+msgstr ""
+
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:86
 msgid "Map"
 msgstr "Térkép"
 
-#: src/gui/npcdialog.cpp:44
+#: src/gui/ministatus.cpp:235
+msgid "Need"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:48
 msgid "Waiting for server"
 msgstr "Várakozás a szerverre"
 
-#: src/gui/npcdialog.cpp:45
+#: src/gui/npcdialog.cpp:49
 msgid "Next"
 msgstr "Következő"
 
-#: src/gui/npcdialog.cpp:47
+#: src/gui/npcdialog.cpp:51
 msgid "Submit"
 msgstr "Küldés"
 
-#: src/gui/npcdialog.cpp:52 src/gui/npcpostdialog.cpp:41
+#: src/gui/npcdialog.cpp:73 src/gui/npcpostdialog.cpp:41
 msgid "NPC"
 msgstr "Gépjátékos"
 
-#: src/gui/npcdialog.cpp:110
+#: src/gui/npcdialog.cpp:118
+msgid "Clear log"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:134
 msgid "Reset"
 msgstr "Alaphelyzet"
 
 #. TRANSLATORS: Please leave the \n sequences intact.
-#: src/gui/npcdialog.cpp:171
+#: src/gui/npcdialog.cpp:208
 #, fuzzy
 msgid ""
 "\n"
@@ -982,7 +1028,7 @@ msgstr "Cél:"
 msgid "Send"
 msgstr "Küldés"
 
-#: src/gui/npcpostdialog.cpp:96
+#: src/gui/npcpostdialog.cpp:99
 msgid "Failed to send as sender or letter invalid."
 msgstr "A levél elküldése sikertelen. A feladó, vagy a címzett nem található."
 
@@ -997,99 +1043,86 @@ msgstr ""
 msgid "Unequip first"
 msgstr "Nem használ"
 
-#: src/gui/popupmenu.cpp:84
+#: src/gui/popupmenu.cpp:83
 #, fuzzy, c-format
 msgid "Trade with %s..."
 msgstr "Üzlet Te és %s között"
 
-#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:161
+#: src/gui/popupmenu.cpp:87 src/gui/popupmenu.cpp:158
 #, fuzzy, c-format
 msgid "Attack %s"
 msgstr "Támadás %+d"
 
-#: src/gui/popupmenu.cpp:92
+#: src/gui/popupmenu.cpp:91
 #, fuzzy, c-format
 msgid "Whisper %s"
 msgstr "Privát üzenet"
 
-#: src/gui/popupmenu.cpp:101
+#: src/gui/popupmenu.cpp:100
 #, fuzzy, c-format
 msgid "Befriend %s"
 msgstr "@@friend|Felvenni %s-t a barátok közé@@"
 
-#: src/gui/popupmenu.cpp:106
+#: src/gui/popupmenu.cpp:105
 #, fuzzy, c-format
 msgid "Disregard %s"
 msgstr "Semmibevett"
 
-#: src/gui/popupmenu.cpp:109
+#: src/gui/popupmenu.cpp:108
 #, fuzzy, c-format
 msgid "Ignore %s"
 msgstr "Tiltott"
 
-#: src/gui/popupmenu.cpp:115 src/gui/popupmenu.cpp:124
+#: src/gui/popupmenu.cpp:114 src/gui/popupmenu.cpp:123
 #, c-format
 msgid "Unignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:118
+#: src/gui/popupmenu.cpp:117
 #, fuzzy, c-format
 msgid "Completely ignore %s"
 msgstr "@@ignore|Teljesen letiltod %s-t@@"
 
 #: src/gui/popupmenu.cpp:130
-#, c-format
-msgid "Follow %s"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:133
 #, fuzzy, c-format
 msgid "Invite %s to join your guild"
 msgstr "@@guild|%s meghívása a klánodba@@"
 
-#: src/gui/popupmenu.cpp:137
+#: src/gui/popupmenu.cpp:134
 #, fuzzy, c-format
 msgid "Invite %s to join your party"
 msgstr "@@party|%s meghívása a csapatodba@@"
 
-#: src/gui/popupmenu.cpp:144
+#: src/gui/popupmenu.cpp:141
 #, fuzzy
 msgid "Kick player"
 msgstr "Kirúgás sikertelen!"
 
-#: src/gui/popupmenu.cpp:153
+#: src/gui/popupmenu.cpp:150
 #, fuzzy, c-format
 msgid "Talk to %s"
 msgstr "@@talk|Privát Te és %s között@@"
 
-#: src/gui/popupmenu.cpp:166
+#: src/gui/popupmenu.cpp:163
 #, fuzzy
 msgid "Kick monster"
 msgstr "@@admin-kick|Szörny kirúgása@@"
 
-#: src/gui/popupmenu.cpp:174
+#: src/gui/popupmenu.cpp:171
 #, fuzzy
 msgid "Add name to chat"
 msgstr "@@name|Neve hozzáadása a csevegéshez@@"
 
-#: src/gui/popupmenu.cpp:191
+#: src/gui/popupmenu.cpp:188
 #, fuzzy, c-format
 msgid "Pick up %s"
 msgstr "Felvesz"
 
-#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:400
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:387
 #, fuzzy
 msgid "Add to chat"
 msgstr "@@chat|Hozzáadás a chat-hez@@"
 
-#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:71
-msgid "Store"
-msgstr "Raktároz"
-
-#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:72
-msgid "Retrieve"
-msgstr "Magához vesz"
-
 #: src/gui/quitdialog.cpp:44
 msgid "Switch server"
 msgstr "Szerver változtatása"
@@ -1158,52 +1191,65 @@ msgstr "A jelszónak legfeljebb %d karakter hosszúnak kell lennie."
 msgid "Passwords do not match."
 msgstr "A jelszavak nem egyeznek."
 
-#: src/gui/serverdialog.cpp:124
+#: src/gui/serverdialog.cpp:197
 #, fuzzy
 msgid "Choose Your Server"
 msgstr "Válassz szervert"
 
-#: src/gui/serverdialog.cpp:131 src/gui/widgets/chattab.cpp:139
+#: src/gui/serverdialog.cpp:206 src/gui/widgets/chattab.cpp:142
 msgid "Server:"
 msgstr "Szerver:"
 
-#: src/gui/serverdialog.cpp:132
+#: src/gui/serverdialog.cpp:207
 msgid "Port:"
 msgstr "Port:"
 
-#: src/gui/serverdialog.cpp:133
+#: src/gui/serverdialog.cpp:208
 #, fuzzy
 msgid "Server type:"
 msgstr "Szerver:"
 
-#: src/gui/serverdialog.cpp:153
+#: src/gui/serverdialog.cpp:229
 #, fuzzy
 msgid "Connect"
 msgstr "Csatlakozás…"
 
-#: src/gui/serverdialog.cpp:154
+#: src/gui/serverdialog.cpp:230
 #, fuzzy
 msgid "Custom Server"
 msgstr "Egyéni kurzor"
 
-#: src/gui/serverdialog.cpp:242
+#: src/gui/serverdialog.cpp:324
 msgid "Please type both the address and the port of a server."
 msgstr "Kérlek írd be a szerver címét és portját egyaránt."
 
-#: src/gui/serverdialog.cpp:357
+#: src/gui/serverdialog.cpp:441
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:363
+#: src/gui/serverdialog.cpp:447
 #, fuzzy
 msgid "Waiting for server..."
 msgstr "Várakozás a szerverre"
 
-#: src/gui/serverdialog.cpp:367
+#: src/gui/serverdialog.cpp:451
 msgid "Preparing download"
 msgstr ""
 
+#: src/gui/serverdialog.cpp:455
+msgid "Error retreiving server list!"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:550
+msgid "requires a newer version"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:552
+#, c-format
+msgid "requires v%s"
+msgstr ""
+
 #: src/gui/setup_audio.cpp:42
 msgid "Sound"
 msgstr "Hang"
@@ -1237,54 +1283,54 @@ msgstr ""
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:45
+#: src/gui/setup_colors.cpp:46
 msgid "This is what the color looks like"
 msgstr "Így fog kinézni a felirat."
 
-#: src/gui/setup_colors.cpp:50
+#: src/gui/setup_colors.cpp:51
 msgid "Colors"
 msgstr "Színek"
 
-#: src/gui/setup_colors.cpp:71
+#: src/gui/setup_colors.cpp:72
 #, fuzzy
 msgid "Type:"
 msgstr "Típus: "
 
-#: src/gui/setup_colors.cpp:82 src/gui/setup_colors.cpp:330
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:331
 msgid "Static"
 msgstr "Statikus"
 
-#: src/gui/setup_colors.cpp:84 src/gui/setup_colors.cpp:85
-#: src/gui/setup_colors.cpp:331
+#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
+#: src/gui/setup_colors.cpp:332
 msgid "Pulse"
 msgstr "Pulzáló"
 
-#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:87
-#: src/gui/setup_colors.cpp:332
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
+#: src/gui/setup_colors.cpp:333
 msgid "Rainbow"
 msgstr "Szivárvány"
 
-#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
-#: src/gui/setup_colors.cpp:332
+#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
+#: src/gui/setup_colors.cpp:333
 msgid "Spectrum"
 msgstr "Színkép"
 
-#: src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:94
 #, fuzzy
 msgid "Delay:"
 msgstr "Várakozás "
 
-#: src/gui/setup_colors.cpp:108
+#: src/gui/setup_colors.cpp:109
 #, fuzzy
 msgid "Red:"
 msgstr "Vörös: "
 
-#: src/gui/setup_colors.cpp:123
+#: src/gui/setup_colors.cpp:124
 #, fuzzy
 msgid "Green:"
 msgstr "Zöld: "
 
-#: src/gui/setup_colors.cpp:138
+#: src/gui/setup_colors.cpp:139
 #, fuzzy
 msgid "Blue:"
 msgstr "Kék: "
@@ -1342,590 +1388,592 @@ msgstr "Alapértelmezett"
 msgid "Key Conflict(s) Detected."
 msgstr "Billentyű ütközés van."
 
-#: src/gui/setup_players.cpp:57
+#: src/gui/setup_players.cpp:58
 msgid "Name"
 msgstr "Név"
 
-#: src/gui/setup_players.cpp:58
+#: src/gui/setup_players.cpp:59
 msgid "Relation"
 msgstr "Kapcsolat"
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:64
 msgid "Neutral"
 msgstr "Semleges"
 
-#: src/gui/setup_players.cpp:64
+#: src/gui/setup_players.cpp:65
 msgid "Friend"
 msgstr "Barát"
 
-#: src/gui/setup_players.cpp:65
+#: src/gui/setup_players.cpp:66
 msgid "Disregarded"
 msgstr "Semmibevett"
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_players.cpp:67
 msgid "Ignored"
 msgstr "Tiltott"
 
-#: src/gui/setup_players.cpp:208 src/gui/setup_video.cpp:132
+#: src/gui/setup_players.cpp:206 src/gui/setup_video.cpp:153
 msgid "???"
 msgstr "???"
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_players.cpp:225
 msgid "Allow trading"
 msgstr "Üzletelés engedélyezése"
 
-#: src/gui/setup_players.cpp:228
+#: src/gui/setup_players.cpp:227
 msgid "Allow whispers"
 msgstr "Privát engedélyezése"
 
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:231
 msgid "Put all whispers in tabs"
 msgstr "Privátok fülekbe tétele"
 
-#: src/gui/setup_players.cpp:234
+#: src/gui/setup_players.cpp:233
 #, fuzzy
 msgid "Show gender"
 msgstr "A név mutatása"
 
-#: src/gui/setup_players.cpp:236
+#: src/gui/setup_players.cpp:235
+#, fuzzy
+msgid "Enable Chat log"
+msgstr "Nem tudod eladni."
+
+#: src/gui/setup_players.cpp:237
 msgid "Players"
 msgstr "Játékosok"
 
-#: src/gui/setup_players.cpp:261
+#: src/gui/setup_players.cpp:262
 msgid "When ignoring:"
 msgstr "Ha ignorolva van:"
 
-#: src/gui/setup_video.cpp:113
+#: src/gui/setup_video.cpp:134
 msgid "Tiny"
 msgstr "Apró"
 
-#: src/gui/setup_video.cpp:114
+#: src/gui/setup_video.cpp:135
 msgid "Small"
 msgstr "Kicsi"
 
-#: src/gui/setup_video.cpp:115
+#: src/gui/setup_video.cpp:136
 msgid "Medium"
 msgstr "Közepes"
 
-#: src/gui/setup_video.cpp:116
+#: src/gui/setup_video.cpp:137
 msgid "Large"
 msgstr "Nagy"
 
-#: src/gui/setup_video.cpp:142
+#: src/gui/setup_video.cpp:163
 msgid "No text"
 msgstr "Nincs szöveg"
 
-#: src/gui/setup_video.cpp:143
+#: src/gui/setup_video.cpp:164
 msgid "Text"
 msgstr "Szöveg"
 
-#: src/gui/setup_video.cpp:144
+#: src/gui/setup_video.cpp:165
 msgid "Bubbles, no names"
 msgstr "Buborékok, nincs név."
 
-#: src/gui/setup_video.cpp:145
+#: src/gui/setup_video.cpp:166
 msgid "Bubbles with names"
 msgstr "Buborékok nevekkel"
 
-#: src/gui/setup_video.cpp:157
+#: src/gui/setup_video.cpp:178
 msgid "off"
 msgstr "ki"
 
-#: src/gui/setup_video.cpp:158 src/gui/setup_video.cpp:171
+#: src/gui/setup_video.cpp:179 src/gui/setup_video.cpp:192
 msgid "low"
 msgstr "alacsony"
 
-#: src/gui/setup_video.cpp:159 src/gui/setup_video.cpp:173
+#: src/gui/setup_video.cpp:180 src/gui/setup_video.cpp:194
 msgid "high"
 msgstr "magas"
 
-#: src/gui/setup_video.cpp:172
+#: src/gui/setup_video.cpp:193
 msgid "medium"
 msgstr "közepes"
 
-#: src/gui/setup_video.cpp:174
+#: src/gui/setup_video.cpp:195
 msgid "max"
 msgstr "max."
 
-#: src/gui/setup_video.cpp:196
+#: src/gui/setup_video.cpp:217
 msgid "Full screen"
 msgstr "Teljes képernyő"
 
-#: src/gui/setup_video.cpp:197
+#: src/gui/setup_video.cpp:218
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:198
+#: src/gui/setup_video.cpp:219
 msgid "Custom cursor"
 msgstr "Egyéni kurzor"
 
-#: src/gui/setup_video.cpp:200
+#: src/gui/setup_video.cpp:221
 msgid "Visible names"
 msgstr "Látható nevek"
 
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:223
 msgid "Particle effects"
 msgstr "Játékbéli effektek"
 
-#: src/gui/setup_video.cpp:204
+#: src/gui/setup_video.cpp:225
 #, fuzzy
 msgid "Show own name"
 msgstr "A név mutatása"
 
-#: src/gui/setup_video.cpp:205
+#: src/gui/setup_video.cpp:226
+msgid "Log NPC dialogue"
+msgstr ""
+
+#: src/gui/setup_video.cpp:227
 msgid "Show pickup notification"
 msgstr "Értesítés tárgy felvételkor"
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:207
+#. TRANSLATORS: Refers to "Show pickup notification"
+#: src/gui/setup_video.cpp:229
 msgid "in chat"
 msgstr "Chat-en belül"
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:209
+#. TRANSLATORS: Refers to "Show pickup notification"
+#: src/gui/setup_video.cpp:231
 msgid "as particle"
 msgstr "Karakter felett"
 
-#: src/gui/setup_video.cpp:214
+#: src/gui/setup_video.cpp:236
 #, fuzzy
 msgid "FPS limit:"
 msgstr "FPS Limit:"
 
-#: src/gui/setup_video.cpp:225
+#: src/gui/setup_video.cpp:247
+msgid "Disable transparency (Low CPU mode)"
+msgstr ""
+
+#: src/gui/setup_video.cpp:250
 msgid "Video"
 msgstr "Videó"
 
-#: src/gui/setup_video.cpp:227
+#: src/gui/setup_video.cpp:252
 #, fuzzy
-msgid "Show monster damage"
+msgid "Show damage"
 msgstr "A név mutatása"
 
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:258
 msgid "Overhead text"
 msgstr "Fej feletti szöveg"
 
-#: src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:259
 msgid "Gui opacity"
 msgstr "Menük áttetszősége"
 
-#: src/gui/setup_video.cpp:235
+#: src/gui/setup_video.cpp:260
 msgid "Ambient FX"
 msgstr "Környezeti effektek"
 
-#: src/gui/setup_video.cpp:236
+#: src/gui/setup_video.cpp:261
 #, fuzzy
 msgid "Particle detail"
 msgstr "Effektek részletessége"
 
-#: src/gui/setup_video.cpp:237
+#: src/gui/setup_video.cpp:262
 msgid "Font size"
 msgstr "Betűméret"
 
-#: src/gui/setup_video.cpp:251 src/gui/setup_video.cpp:454
-#: src/gui/setup_video.cpp:568
+#: src/gui/setup_video.cpp:277 src/gui/setup_video.cpp:532
+#: src/gui/setup_video.cpp:662
 #, fuzzy
 msgid "None"
 msgstr "Nem"
 
-#: src/gui/setup_video.cpp:381
+#: src/gui/setup_video.cpp:426
 #, fuzzy
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr "Ez a mód és az előző mód visszaállítása sikertelen."
 
-#: src/gui/setup_video.cpp:387
+#: src/gui/setup_video.cpp:432
 #, fuzzy
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr "Ez a mód és az előző mód visszaállítása sikertelen."
 
-#: src/gui/setup_video.cpp:398
+#: src/gui/setup_video.cpp:443
 #, fuzzy
 msgid "Switching to Full Screen"
 msgstr "Átállás teljes képernyőre"
 
-#: src/gui/setup_video.cpp:399
+#: src/gui/setup_video.cpp:444
 msgid "Restart needed for changes to take effect."
 msgstr "A változások érvénybe lépéséhez a program újraindítása szükséges."
 
-#: src/gui/setup_video.cpp:411
+#: src/gui/setup_video.cpp:458
 #, fuzzy
 msgid "Changing to OpenGL"
 msgstr "OpenGL átállítása"
 
-#: src/gui/setup_video.cpp:412
+#: src/gui/setup_video.cpp:459
+msgid ""
+"Applying change to OpenGL requires restart. In case OpenGL messes up your "
+"game graphics, restart the game with the command line option \"--no-opengl\"."
+msgstr ""
+
+#: src/gui/setup_video.cpp:466
+msgid "Deactivating OpenGL"
+msgstr ""
+
+#: src/gui/setup_video.cpp:467
 msgid "Applying change to OpenGL requires restart."
 msgstr "A változások érvénybe lépéséhez a program újraindítása szükséges."
 
-#: src/gui/setup_video.cpp:486 src/gui/setup_video.cpp:491
+#: src/gui/setup_video.cpp:475
+#, fuzzy
+msgid "Transparency disabled"
+msgstr "Tapasztalat megosztás tiltva."
+
+#: src/gui/setup_video.cpp:476 src/gui/setup_video.cpp:484
+msgid "You must restart to apply changes."
+msgstr ""
+
+#: src/gui/setup_video.cpp:483
+msgid "Transparency enabled"
+msgstr ""
+
+#: src/gui/setup_video.cpp:576 src/gui/setup_video.cpp:581
 #, fuzzy
 msgid "Screen Resolution Changed"
 msgstr "A képernyő felbontása megváltozott"
 
-#: src/gui/setup_video.cpp:487 src/gui/setup_video.cpp:492
+#: src/gui/setup_video.cpp:577 src/gui/setup_video.cpp:582
 msgid "Restart your client for the change to take effect."
 msgstr "A változások érvénybe lépéséhez a program újraindítása szükséges."
 
-#: src/gui/setup_video.cpp:489
+#: src/gui/setup_video.cpp:579
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:522
+#: src/gui/setup_video.cpp:612
 #, fuzzy
 msgid "Particle Effect Settings Changed."
 msgstr "Effektek beállítása megváltozott."
 
-#: src/gui/setup_video.cpp:523
+#: src/gui/setup_video.cpp:613
 msgid "Changes will take effect on map change."
 msgstr "A változások érvénybe lépéséhez töltsön be egy új térképet."
 
-#: src/gui/skilldialog.cpp:198 src/gui/windowmenu.cpp:59
+#: src/gui/skilldialog.cpp:212 src/gui/windowmenu.cpp:59
 msgid "Skills"
 msgstr "Képességek"
 
-#: src/gui/skilldialog.cpp:209
+#: src/gui/skilldialog.cpp:223
 msgid "Up"
 msgstr "Fejleszt"
 
-#: src/gui/skilldialog.cpp:263
+#: src/gui/skilldialog.cpp:269
 #, fuzzy, c-format
 msgid "Skill points available: %d"
 msgstr "Képesség pontok: %d"
 
-#: src/gui/skilldialog.cpp:315
+#: src/gui/skilldialog.cpp:351
 #, fuzzy, c-format
 msgid "Skill Set %d"
 msgstr "Képesség pontok: %d"
 
-#: src/gui/skilldialog.cpp:324
+#: src/gui/skilldialog.cpp:360
 #, fuzzy, c-format
 msgid "Skill %d"
 msgstr "Képességek"
 
-#: src/gui/skilldialog.cpp:406
+#: src/gui/skilldialog.cpp:442
 #, fuzzy, c-format
 msgid "Lvl: %d (%+d)"
 msgstr "Szint: %d"
 
-#: src/gui/skilldialog.cpp:417
+#: src/gui/skilldialog.cpp:453
 #, fuzzy, c-format
 msgid "Lvl: %d"
 msgstr "Szint: %d"
 
-#: src/gui/socialwindow.cpp:118
+#: src/gui/socialwindow.cpp:126
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:127
+#: src/gui/socialwindow.cpp:139
 #, fuzzy, c-format
 msgid "Guild %s quit requested."
 msgstr "Klán létrehozva."
 
-#: src/gui/socialwindow.cpp:137
+#: src/gui/socialwindow.cpp:153
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:138
+#: src/gui/socialwindow.cpp:154
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:147
+#: src/gui/socialwindow.cpp:163
 #, fuzzy
 msgid "Leave Guild?"
 msgstr "Klán létrehozása"
 
-#: src/gui/socialwindow.cpp:148
+#: src/gui/socialwindow.cpp:164
 #, fuzzy, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Biztos, hogy ki szeretne lépni?"
 
-#: src/gui/socialwindow.cpp:183
+#: src/gui/socialwindow.cpp:207 src/net/tmwa/partyhandler.cpp:330
 #, fuzzy, c-format
 msgid "Invited user %s to party."
 msgstr "/party > Felhasználó csapatba hívása"
 
-#: src/gui/socialwindow.cpp:190
+#: src/gui/socialwindow.cpp:218
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:200
+#: src/gui/socialwindow.cpp:232
 #, fuzzy
 msgid "Member Invite to Party"
 msgstr "/party > Felhasználó csapatba hívása"
 
-#: src/gui/socialwindow.cpp:201
+#: src/gui/socialwindow.cpp:233
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:210
+#: src/gui/socialwindow.cpp:242
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:211
+#: src/gui/socialwindow.cpp:243
 #, fuzzy, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Biztos, hogy ki szeretne lépni?"
 
-#: src/gui/socialwindow.cpp:240
+#: src/gui/socialwindow.cpp:272
 msgid "Create Guild"
 msgstr "Klán létrehozása"
 
-#: src/gui/socialwindow.cpp:241 src/gui/socialwindow.cpp:565
+#: src/gui/socialwindow.cpp:273 src/gui/socialwindow.cpp:620
 #, fuzzy
 msgid "Create Party"
 msgstr "Karakter létrehozása"
 
-#: src/gui/socialwindow.cpp:280 src/gui/windowmenu.cpp:64
+#: src/gui/socialwindow.cpp:312 src/gui/windowmenu.cpp:64
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:298
+#: src/gui/socialwindow.cpp:330
 #, fuzzy
 msgid "Invite"
 msgstr "Felhasználó meghívása"
 
-#: src/gui/socialwindow.cpp:299
+#: src/gui/socialwindow.cpp:331
 #, fuzzy
 msgid "Leave"
 msgstr "Nagy"
 
-#: src/gui/socialwindow.cpp:395
+#: src/gui/socialwindow.cpp:443
 #, fuzzy, c-format
 msgid "Accepted party invite from %s."
 msgstr "Csapatba hívást elfogadta %s."
 
-#: src/gui/socialwindow.cpp:401
+#: src/gui/socialwindow.cpp:449
 #, fuzzy, c-format
 msgid "Rejected party invite from %s."
 msgstr "Csapatba hívást elutasította %s."
 
-#: src/gui/socialwindow.cpp:414
+#: src/gui/socialwindow.cpp:462
 #, fuzzy, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Csapatba hívást elfogadta %s."
 
-#: src/gui/socialwindow.cpp:420
+#: src/gui/socialwindow.cpp:468
 #, fuzzy, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Csapatba hívást elutasította %s."
 
-#: src/gui/socialwindow.cpp:464
+#: src/gui/socialwindow.cpp:497
+msgid "Creating guild failed, please choose a shorter name."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:504
 #, fuzzy, c-format
 msgid "Creating guild called %s."
 msgstr "Hiba a klán létrehozása közben."
 
-#: src/gui/socialwindow.cpp:478
+#: src/gui/socialwindow.cpp:520
+msgid "Creating party failed, please choose a shorter name."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:527
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:485
+#: src/gui/socialwindow.cpp:541
 #, fuzzy
 msgid "Guild Name"
 msgstr "Klán"
 
-#: src/gui/socialwindow.cpp:486
+#: src/gui/socialwindow.cpp:542
 #, fuzzy
 msgid "Choose your guild's name."
 msgstr "Válassz szervert"
 
-#: src/gui/socialwindow.cpp:498
+#: src/gui/socialwindow.cpp:554
 #, fuzzy
 msgid "Received guild request, but one already exists."
 msgstr "Csapatba hívtak, de neked van csapatod."
 
-#: src/gui/socialwindow.cpp:503
+#: src/gui/socialwindow.cpp:559
 #, fuzzy, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s behívott %s csapatába."
 
-#: src/gui/socialwindow.cpp:508
+#: src/gui/socialwindow.cpp:564
 #, fuzzy
 msgid "Accept Guild Invite"
 msgstr "Ajánlat elfogadása"
 
-#: src/gui/socialwindow.cpp:520
+#: src/gui/socialwindow.cpp:576
 msgid "Received party request, but one already exists."
 msgstr "Csapatba hívtak, de neked van csapatod."
 
-#: src/gui/socialwindow.cpp:530
+#: src/gui/socialwindow.cpp:585
 #, fuzzy
 msgid "You have been invited you to join a party."
 msgstr "%s a csapatába hívott."
 
-#: src/gui/socialwindow.cpp:534
+#: src/gui/socialwindow.cpp:589
 #, fuzzy, c-format
 msgid "You have been invited to join the %s party."
 msgstr "%s behívott %s csapatába."
 
-#: src/gui/socialwindow.cpp:542
+#: src/gui/socialwindow.cpp:597
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s a csapatába hívott."
 
-#: src/gui/socialwindow.cpp:547
+#: src/gui/socialwindow.cpp:602
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s behívott %s csapatába."
 
-#: src/gui/socialwindow.cpp:555
+#: src/gui/socialwindow.cpp:610
 msgid "Accept Party Invite"
 msgstr "Ajánlat elfogadása"
 
-#: src/gui/socialwindow.cpp:566
+#: src/gui/socialwindow.cpp:621
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:571
+#: src/gui/socialwindow.cpp:626
 #, fuzzy
 msgid "Party Name"
 msgstr "Csapat"
 
-#: src/gui/socialwindow.cpp:572
+#: src/gui/socialwindow.cpp:627
 #, fuzzy
 msgid "Choose your party's name."
 msgstr "Válassz szervert"
 
-#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:62
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:62
 msgid "Specials"
 msgstr ""
 
-#: src/gui/specialswindow.cpp:174
-#, c-format
-msgid "Specials Set %d"
-msgstr ""
-
-#: src/gui/specialswindow.cpp:191
-#, c-format
-msgid "Special %d"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:247
+#: src/gui/statuswindow.cpp:113 src/gui/statuswindow.cpp:215
+#: src/gui/statuswindow.cpp:262
 #, c-format
 msgid "Level: %d"
 msgstr "Szint: %d"
 
-#: src/gui/statuswindow.cpp:101 src/gui/statuswindow.cpp:211
+#: src/gui/statuswindow.cpp:114 src/gui/statuswindow.cpp:208
+#: src/gui/statuswindow.cpp:239
 #, c-format
 msgid "Money: %s"
 msgstr "Pénz: %s"
 
-#: src/gui/statuswindow.cpp:104
+#: src/gui/statuswindow.cpp:117
 msgid "HP:"
 msgstr "Élet:"
 
-#: src/gui/statuswindow.cpp:109
+#: src/gui/statuswindow.cpp:122
 msgid "Exp:"
 msgstr "TP:"
 
-#: src/gui/statuswindow.cpp:114
+#: src/gui/statuswindow.cpp:130
 msgid "MP:"
 msgstr "Varázserő:"
 
-#: src/gui/statuswindow.cpp:132 src/gui/statuswindow.cpp:219
+#: src/gui/statuswindow.cpp:158 src/gui/statuswindow.cpp:275
 #, c-format
 msgid "Job: %d"
 msgstr "Munka: %d"
 
-#: src/gui/statuswindow.cpp:133
+#: src/gui/statuswindow.cpp:159
 msgid "Job:"
 msgstr "Munka:"
 
-#: src/gui/statuswindow.cpp:194
-#, fuzzy
-msgid "HP"
-msgstr "Élet:"
-
-#: src/gui/statuswindow.cpp:200
-#, fuzzy
-msgid "MP"
-msgstr "Varázserő:"
-
-#: src/gui/statuswindow.cpp:206
-#, fuzzy
-msgid "Exp"
-msgstr "TP:"
-
-#: src/gui/statuswindow.cpp:215
-#, fuzzy
-msgid "Money"
-msgstr "Pénz: %d"
-
-#: src/gui/statuswindow.cpp:225
-#, fuzzy
-msgid "Job"
-msgstr "Munka:"
-
-#: src/gui/statuswindow.cpp:229
+#: src/gui/statuswindow.cpp:211 src/gui/statuswindow.cpp:247
 #, fuzzy, c-format
 msgid "Character points: %d"
 msgstr "Karakter statok rendben"
 
-#: src/gui/statuswindow.cpp:235
+#: src/gui/statuswindow.cpp:255
 #, fuzzy, c-format
 msgid "Correction points: %d"
 msgstr "Képesség pontok: %d"
 
-#: src/gui/statuswindow.cpp:251
-#, fuzzy
-msgid "Level"
-msgstr "Szint: %d"
-
-#: src/gui/storagewindow.cpp:59
-msgid "Storage"
-msgstr "Raktár"
-
-#: src/gui/trade.cpp:52
+#: src/gui/trade.cpp:53
 msgid "Propose trade"
 msgstr "Üzletet javasol"
 
-#: src/gui/trade.cpp:53
+#: src/gui/trade.cpp:54
 msgid "Confirmed. Waiting..."
 msgstr "Megerősítve. Vár..."
 
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:55
 msgid "Agree trade"
 msgstr "Üzlet elfogadása"
 
-#: src/gui/trade.cpp:55
+#: src/gui/trade.cpp:56
 msgid "Agreed. Waiting..."
 msgstr "Elfogadva. Vár..."
 
-#: src/gui/trade.cpp:58
+#: src/gui/trade.cpp:59
 msgid "Trade: You"
 msgstr "Üzlet: Te"
 
-#: src/gui/trade.cpp:74 src/gui/trade.cpp:75
+#: src/gui/trade.cpp:73 src/gui/trade.cpp:74
 msgid "Trade"
 msgstr "Üzlet"
 
-#: src/gui/trade.cpp:77
+#: src/gui/trade.cpp:76
 msgid "Add"
 msgstr "Hozzáad"
 
-#: src/gui/trade.cpp:99 src/gui/trade.cpp:135
+#: src/gui/trade.cpp:98 src/gui/trade.cpp:134
 #, fuzzy, c-format
 msgid "You get %s"
 msgstr "Kapott tárgy: %s."
 
-#: src/gui/trade.cpp:100
+#: src/gui/trade.cpp:99
 msgid "You give:"
 msgstr "Adott tárgyak:"
 
-#: src/gui/trade.cpp:104
+#: src/gui/trade.cpp:103
 msgid "Change"
 msgstr "Változtatás"
 
-#: src/gui/trade.cpp:275
+#: src/gui/trade.cpp:262
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Hiba a tárgy hozzáadásakor. Nem tudod rárakni az egyik tárgyat a másikra."
 
-#: src/gui/trade.cpp:318
+#: src/gui/trade.cpp:304
 msgid "You don't have enough money."
 msgstr "Nincs elég pénzed."
 
@@ -1946,22 +1994,22 @@ msgstr "Csatlakozás…"
 msgid "Play"
 msgstr "Játék"
 
-#: src/gui/updatewindow.cpp:405
+#: src/gui/updatewindow.cpp:417
 msgid "##1  The update process is incomplete."
 msgstr "##1 A frissítési folyamat befejezetlen"
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:407
+#: src/gui/updatewindow.cpp:419
 msgid "##1  It is strongly recommended that"
 msgstr "##1 Erősen ajánljuk, hogy"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:409
+#: src/gui/updatewindow.cpp:421
 #, fuzzy
 msgid "##1  you try again later."
 msgstr "##1 próbáld meg később"
 
-#: src/gui/updatewindow.cpp:501
+#: src/gui/updatewindow.cpp:515
 msgid "Completed"
 msgstr "Kész"
 
@@ -2042,55 +2090,55 @@ msgstr "Kell egy játékos az op parancshoz."
 msgid "Need a user to kick!"
 msgstr "Kell egy játékos a kick parancshoz."
 
-#: src/gui/widgets/chattab.cpp:118
+#: src/gui/widgets/chattab.cpp:121
 msgid "Global announcement:"
 msgstr "Globális bejelentés:"
 
-#: src/gui/widgets/chattab.cpp:124
+#: src/gui/widgets/chattab.cpp:127
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "Globális bejelentés (%s) :"
 
-#: src/gui/widgets/chattab.cpp:150
+#: src/gui/widgets/chattab.cpp:153
 #, fuzzy, c-format
 msgid "%s whispers: %s"
 msgstr "%s mondja: "
 
-#: src/gui/widgets/whispertab.cpp:51
+#: src/gui/widgets/whispertab.cpp:53
 msgid "Cannot send empty chat!"
 msgstr "Nem tudsz üres üzenetet küldeni!"
 
-#: src/gui/widgets/whispertab.cpp:70
+#: src/gui/widgets/whispertab.cpp:72
 msgid "/ignore > Ignore the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:71
+#: src/gui/widgets/whispertab.cpp:73
 msgid "/unignore > Stop ignoring the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:72
+#: src/gui/widgets/whispertab.cpp:74
 msgid "/close > Close the whisper tab"
 msgstr "/close > Bezárja a privát fület."
 
-#: src/gui/widgets/whispertab.cpp:82
+#: src/gui/widgets/whispertab.cpp:84
 msgid "Command: /close"
 msgstr "Parancs: /close"
 
-#: src/gui/widgets/whispertab.cpp:83
+#: src/gui/widgets/whispertab.cpp:85
 msgid "This command closes the current whisper tab."
 msgstr "Ez a parancs bezárja az aktuális privát fület."
 
-#: src/gui/widgets/whispertab.cpp:87
+#: src/gui/widgets/whispertab.cpp:89
 #, fuzzy
 msgid "Command: /ignore"
 msgstr "Parancs: /item"
 
-#: src/gui/widgets/whispertab.cpp:88
+#: src/gui/widgets/whispertab.cpp:90
 #, fuzzy
 msgid "This command ignores the other player regardless of current relations."
 msgstr "Ez a parancs megmutatja az online játékosok számát."
 
-#: src/gui/widgets/whispertab.cpp:94
+#: src/gui/widgets/whispertab.cpp:96
 #, fuzzy
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
@@ -2120,670 +2168,1032 @@ msgstr "Változtatás"
 msgid "Choose World"
 msgstr "Válassz szervert"
 
-#: src/keyboardconfig.cpp:40
+#: src/keyboardconfig.cpp:39
 msgid "Move Up"
 msgstr "Mozgás felfelé"
 
-#: src/keyboardconfig.cpp:41
+#: src/keyboardconfig.cpp:40
 msgid "Move Down"
 msgstr "Mozgás lefelé"
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:41
 msgid "Move Left"
 msgstr "Mozgás balra"
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:42
 msgid "Move Right"
 msgstr "Mozgás jobbra"
 
-#: src/keyboardconfig.cpp:44 src/net/ea/generalhandler.cpp:223
+#: src/keyboardconfig.cpp:43 src/net/tmwa/generalhandler.cpp:237
 msgid "Attack"
 msgstr "Támadás"
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:44
 msgid "Target & Attack"
 msgstr "Kijelöl és Támad"
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:45
 msgid "Smilie"
 msgstr "Hangulatjel"
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:46
 msgid "Talk"
 msgstr "Csevegés"
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:47
 msgid "Stop Attack"
 msgstr "Támadás Megszüntetése"
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:48
 #, fuzzy
 msgid "Target Monster"
 msgstr "Legközelebbit Kijelöl"
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboardconfig.cpp:49
 msgid "Target NPC"
 msgstr "Gépjátékost Kijelöl"
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:50
 msgid "Target Player"
 msgstr "Játékost Kijelöl"
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:51
 msgid "Pickup"
 msgstr "Felvesz"
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:52
 msgid "Hide Windows"
 msgstr "Ablakok Elrejtése"
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:53
 msgid "Sit"
 msgstr "Ülés"
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:54
 msgid "Screenshot"
 msgstr "Képernyőkép"
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:55
 msgid "Enable/Disable Trading"
 msgstr "Üzletelés Engedélyezése/Tiltása"
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:56
 msgid "Find Path to Mouse"
 msgstr "Útvonal Keresése a Kurzorig"
 
-#: src/keyboardconfig.cpp:58 src/keyboardconfig.cpp:59
-#: src/keyboardconfig.cpp:60 src/keyboardconfig.cpp:61
-#: src/keyboardconfig.cpp:62 src/keyboardconfig.cpp:63
-#: src/keyboardconfig.cpp:64 src/keyboardconfig.cpp:65
-#: src/keyboardconfig.cpp:66 src/keyboardconfig.cpp:67
-#: src/keyboardconfig.cpp:68 src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:57 src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60
+#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62
+#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64
+#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68
 #, c-format
 msgid "Item Shortcut %d"
 msgstr "Gyorsmenü %d"
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:69
 msgid "Help Window"
 msgstr "Súgó Ablak"
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:70
 msgid "Status Window"
 msgstr "Sztátusz Ablak"
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:71
 msgid "Inventory Window"
 msgstr "Táska Ablak"
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:72
 msgid "Equipment Window"
 msgstr "Felszerelés Ablak"
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:73
 msgid "Skill Window"
 msgstr "Képességek Ablak"
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:74
 msgid "Minimap Window"
 msgstr "Minitérkép Ablak"
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:75
 msgid "Chat Window"
 msgstr "Chat Ablak"
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:76
 msgid "Item Shortcut Window"
 msgstr "Gyorsmenü Ablak"
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:77
 msgid "Setup Window"
 msgstr "Beállítások Ablak"
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:78
 msgid "Debug Window"
 msgstr "Hibakereső Ablak"
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:79
 #, fuzzy
 msgid "Social Window"
 msgstr "Képességek Ablak"
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:80
 msgid "Emote Shortcut Window"
 msgstr "Hangulatjel Gyorsmenü Ablak"
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:81
 #, fuzzy
 msgid "Outfits Window"
 msgstr "Sztátusz Ablak"
 
-#: src/keyboardconfig.cpp:83
+#: src/keyboardconfig.cpp:82
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:83
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86
-#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88
-#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90
-#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92
-#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:84 src/keyboardconfig.cpp:85
+#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:87
+#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:89
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:91
+#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:93
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:95
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "Hangulatjel Gyorsmenü %d"
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:96
 msgid "Toggle Chat"
 msgstr "Chat Ki/Be Kapcsolása"
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:97
 msgid "Scroll Chat Up"
 msgstr "Csevej Felfele Görgetése"
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:98
 msgid "Scroll Chat Down"
 msgstr "Csevej Lefele Görgetése"
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:99
 msgid "Previous Chat Tab"
 msgstr "Előző Chat Fül"
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:100
 msgid "Next Chat Tab"
 msgstr "Következő Chat Fül"
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:101
 msgid "Select OK"
 msgstr "Ok Kiválasztása"
 
-#: src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:103
 msgid "Ignore input 1"
 msgstr "Ignore input 1"
 
-#: src/keyboardconfig.cpp:105
+#: src/keyboardconfig.cpp:104
 msgid "Ignore input 2"
 msgstr "Ignore input 2"
 
-#: src/keyboardconfig.cpp:184
+#: src/keyboardconfig.cpp:183
 #, fuzzy, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr "Állítsd át, vagy a játék érdekesen fog viselkedni."
 
-#: src/localplayer.cpp:914
+#: src/localplayer.cpp:985
 msgid "Unable to pick up item."
 msgstr "Nem tudod felvenni a tárgyat."
 
 #. TRANSLATORS: This sentence may be translated differently
 #. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:923
+#: src/localplayer.cpp:994
 #, fuzzy, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "Zsákmányod%s [@@%d|%s@@]."
 msgstr[1] "Zsákmányod%s [@@%d|%s@@]."
 
-#: src/main.cpp:43
+#: src/main.cpp:42
 msgid "mana [options] [mana-file]"
 msgstr ""
 
+#: src/main.cpp:43
+msgid "[mana-file] : The mana file is an XML file (.mana)"
+msgstr ""
+
 #: src/main.cpp:44
+msgid "              used to set custom parameters"
+msgstr ""
+
+#: src/main.cpp:45
+msgid "              to the mana client."
+msgstr ""
+
+#: src/main.cpp:47
 msgid "Options:"
 msgstr "Opciók:"
 
-#: src/main.cpp:45
+#: src/main.cpp:48
 #, fuzzy
 msgid "  -v --version        : Display the version"
 msgstr "  -v --version : Megmutatja a verziót"
 
-#: src/main.cpp:46
+#: src/main.cpp:49
 #, fuzzy
 msgid "  -h --help           : Display this help"
 msgstr "  -h --help : Megmutatja ezt a súgót"
 
-#: src/main.cpp:47
+#: src/main.cpp:50
 #, fuzzy
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr "  -C --config-file : Konfigurációs fájl használata"
 
-#: src/main.cpp:48
+#: src/main.cpp:51
 #, fuzzy
 msgid "  -U --username       : Login with this username"
 msgstr "  -U --username : Bejelentkezés ezzel a felhasználónévvel"
 
-#: src/main.cpp:49
+#: src/main.cpp:52
 #, fuzzy
 msgid "  -P --password       : Login with this password"
 msgstr "  -P --password : Bejelentkezés ezzel a jelszóval"
 
-#: src/main.cpp:50
+#: src/main.cpp:53
 #, fuzzy
 msgid "  -c --character      : Login with this character"
 msgstr "  -c --character : Bejelentkezés ezzel a karakterrel"
 
-#: src/main.cpp:51
+#: src/main.cpp:54
 #, fuzzy
 msgid "  -s --server         : Login server name or IP"
 msgstr "  -s --server : Szerver neve vagy IP címe"
 
-#: src/main.cpp:52
+#: src/main.cpp:55
 #, fuzzy
 msgid "  -p --port           : Login server port"
 msgstr "  -p --port : Bejelentkezési port"
 
-#: src/main.cpp:53
+#: src/main.cpp:56
 #, fuzzy
 msgid "     --update-host    : Use this update host"
 msgstr "  -H --update-host : A frissítési szerver kijelölésére használjuk"
 
-#: src/main.cpp:54
+#: src/main.cpp:57
 #, fuzzy
 msgid "  -D --default        : Choose default character server and character"
 msgstr "  -D --default : Válaszd ki az alapértelmezett szervert és karaktert"
 
-#: src/main.cpp:56
+#: src/main.cpp:59
 #, fuzzy
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr "  -u --skip-update :  Frissítés átugrása"
 
-#: src/main.cpp:57
+#: src/main.cpp:60
 #, fuzzy
 msgid "  -d --data           : Directory to load game data from"
 msgstr "  -d --data : Könyvtár ahonnan betöltöd a játékot"
 
-#: src/main.cpp:58
+#: src/main.cpp:61
 #, fuzzy
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
+msgid "     --localdata-dir  : Directory to use as local data directory"
 msgstr "  -S --home-dir : Könyvtár használata gyökérkönyvtárként"
 
-#: src/main.cpp:59
+#: src/main.cpp:62
+#, fuzzy
+msgid "     --chat-log-dir   : Chat log dir to use"
+msgstr "  -C --config-file : Konfigurációs fájl használata"
+
+#: src/main.cpp:63
 #, fuzzy
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr "  -S --home-dir : Könyvtár használata gyökérkönyvtárként"
 
-#: src/main.cpp:61
+#: src/main.cpp:65
 #, fuzzy
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr "  -O --no-opengl : OpenGL kikapcsolása erre az időszakra"
 
-#: src/net/ea/adminhandler.cpp:63
+#: src/net/manaserv/beinghandler.cpp:303 src/net/tmwa/playerhandler.cpp:94
+msgid "You are dead."
+msgstr "Meghaltál."
+
+#: src/net/manaserv/beinghandler.cpp:304 src/net/tmwa/playerhandler.cpp:95
+msgid "We regret to inform you that your character was killed in battle."
+msgstr "A karaktered elvérzett a csatában."
+
+#: src/net/manaserv/beinghandler.cpp:306 src/net/tmwa/playerhandler.cpp:97
+msgid "You are not that alive anymore."
+msgstr "Nem vagy már az élők sorában."
+
+#: src/net/manaserv/beinghandler.cpp:307 src/net/tmwa/playerhandler.cpp:98
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr "A kaszás eljött érted, hogy elvigye a lelked."
+
+#: src/net/manaserv/beinghandler.cpp:308 src/net/tmwa/playerhandler.cpp:99
+msgid "Game Over!"
+msgstr "Vége a játéknak!"
+
+#: src/net/manaserv/beinghandler.cpp:309 src/net/tmwa/playerhandler.cpp:101
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+"Nem, gyerekek. A karakter nem meghalt, ..ööö... hanem egy szebb világba "
+"került."
+
+#: src/net/manaserv/beinghandler.cpp:311 src/net/tmwa/playerhandler.cpp:103
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr ""
+"A tervet, amiben a torkoddal támadsz az ellenség kardjába sikertelennek "
+"bizonyult."
+
+#: src/net/manaserv/beinghandler.cpp:313 src/net/tmwa/playerhandler.cpp:105
+msgid "I guess this did not run too well."
+msgstr "Úgy látszik nem futottál túl gyorsan."
+
+#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:107
+msgid "Do you want your possessions identified?"
+msgstr "Meg akarod bánni a bűneid?"
+
+#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:109
+msgid "Sadly, no trace of you was ever found..."
+msgstr "Kövesd a fényt az alagút végén."
+
+#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:111
+msgid "Annihilated."
+msgstr "Megöltek."
+
+#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:113
+msgid "Looks like you got your head handed to you."
+msgstr "Kezedbe adták a fejed."
+
+#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:115
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr "Sikolyok közepette kerültél a másvilágra."
+
+#: src/net/manaserv/beinghandler.cpp:323
+#, fuzzy
+msgid "Press OK to respawn."
+msgstr " Nyomj Ok-t a feléledéshez"
+
+#: src/net/manaserv/beinghandler.cpp:324
+#, fuzzy
+msgid "You Died"
+msgstr "Meghaltál."
+
+#: src/net/manaserv/charhandler.cpp:138 src/net/manaserv/charhandler.cpp:209
+#, fuzzy
+msgid "Not logged in."
+msgstr "Már be van jelentkezve"
+
+#: src/net/manaserv/charhandler.cpp:141
+msgid "No empty slot."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:144
+msgid "Invalid name."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:147
+#, fuzzy
+msgid "Character's name already exists."
+msgstr "A felhasználónév foglalt"
+
+#: src/net/manaserv/charhandler.cpp:150
+msgid "Invalid hairstyle."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:153
+msgid "Invalid hair color."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:156
+msgid "Invalid gender."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:159
+#, fuzzy
+msgid "Character's stats are too high."
+msgstr "Karakter statok rendben"
+
+#: src/net/manaserv/charhandler.cpp:162
+#, fuzzy
+msgid "Character's stats are too low."
+msgstr "Karakter statok rendben"
+
+#: src/net/manaserv/charhandler.cpp:165
+#, c-format
+msgid "At least one statis out of the permitted range: (%u - %u)."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:171 src/net/manaserv/loginhandler.cpp:96
+#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
+#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
+#: src/net/tmwa/loginhandler.cpp:95 src/net/tmwa/loginhandler.cpp:182
+#, fuzzy
+msgid "Unknown error."
+msgstr "Ismeretlen hiba"
+
+#: src/net/manaserv/charhandler.cpp:200 src/net/tmwa/charserverhandler.cpp:146
+msgid "Info"
+msgstr "Infó"
+
+#: src/net/manaserv/charhandler.cpp:200
+#, fuzzy
+msgid "Player deleted."
+msgstr "Karakter törölve."
+
+#: src/net/manaserv/charhandler.cpp:212
+#, fuzzy
+msgid "Selection out of range."
+msgstr "Válaszd ki mennyi tárggyal akarsz üzletelni."
+
+#: src/net/manaserv/charhandler.cpp:215
+#, fuzzy, c-format
+msgid "Unknown error (%d)."
+msgstr "Ismeretlen hiba"
+
+#: src/net/manaserv/charhandler.cpp:250
+msgid "No gameservers are available."
+msgstr "Nincs elérhető játékszerver."
+
+#: src/net/manaserv/chathandler.cpp:187 src/net/manaserv/chathandler.cpp:313
+#: src/net/manaserv/guildhandler.cpp:260
+#, c-format
+msgid "Topic: %s"
+msgstr "Téma: %s"
+
+#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:274
+#, fuzzy
+msgid "Players in this channel:"
+msgstr "Sebzéskor"
+
+#: src/net/manaserv/chathandler.cpp:208
+#, fuzzy
+msgid "Error joining channel."
+msgstr "Parancs: /join <csatorna>"
+
+#: src/net/manaserv/chathandler.cpp:214
+#, fuzzy
+msgid "Listing channels."
+msgstr "Kapcsolódási kérelem a %s nevű csatornába."
+
+#: src/net/manaserv/chathandler.cpp:226
+msgid "End of channel list."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:303
+#, fuzzy, c-format
+msgid "%s entered the channel."
+msgstr "%s csatlakozott a csapathoz."
+
+#: src/net/manaserv/chathandler.cpp:308
+#, c-format
+msgid "%s left the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:324
+#, c-format
+msgid "%s has set mode %s on user %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:334
+#, c-format
+msgid "%s has kicked %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:339
+#, fuzzy
+msgid "Unknown channel event."
+msgstr "Ismeretlen parancs."
+
+#: src/net/manaserv/guildhandler.cpp:82
+msgid "Guild created."
+msgstr "Klán létrehozva."
+
+#: src/net/manaserv/guildhandler.cpp:87
+msgid "Error creating guild."
+msgstr "Hiba a klán létrehozása közben."
+
+#: src/net/manaserv/guildhandler.cpp:97
+msgid "Invite sent."
+msgstr "Meghívás elküldve."
+
+#: src/net/manaserv/guildhandler.cpp:204
+msgid "Member was promoted successfully."
+msgstr "A tag előléptetése sikeres."
+
+#: src/net/manaserv/guildhandler.cpp:209
+msgid "Failed to promote member."
+msgstr "A tag előléptetése sikertelen."
+
+#: src/net/manaserv/loginhandler.cpp:87
+#, fuzzy
+msgid "Wrong magic_token."
+msgstr "Helytelen magic_token"
+
+#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
+#, fuzzy
+msgid "Already logged in."
+msgstr "Már be van jelentkezve"
+
+#: src/net/manaserv/loginhandler.cpp:93
+#, fuzzy
+msgid "Account banned."
+msgstr "A fiók lejárt"
+
+#: src/net/manaserv/loginhandler.cpp:118
+#, fuzzy
+msgid "New password incorrect."
+msgstr "Az új jelszó hibás"
+
+#: src/net/manaserv/loginhandler.cpp:121 src/net/tmwa/loginhandler.cpp:89
+#, fuzzy
+msgid "Old password incorrect."
+msgstr "A régi jelszó hibás"
+
+#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
+msgid "Account not connected. Please login first."
+msgstr "A fiók nem kapcsolódott. Kérlek jelentkezz be előbb."
+
+#: src/net/manaserv/loginhandler.cpp:149
+#, fuzzy
+msgid "New email address incorrect."
+msgstr "Az új email cím hibás."
+
+#: src/net/manaserv/loginhandler.cpp:152
+#, fuzzy
+msgid "Old email address incorrect."
+msgstr "A régi email cím hibás."
+
+#: src/net/manaserv/loginhandler.cpp:158
+#, fuzzy
+msgid "The new email address already exists."
+msgstr "Az új email cím már foglalt."
+
+#: src/net/manaserv/loginhandler.cpp:239
+msgid ""
+"Client registration is not allowed. Please contact server administration."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
+#, fuzzy
+msgid "Client version is too old."
+msgstr "A kliens verziója túl régi"
+
+#: src/net/manaserv/loginhandler.cpp:266
+#, fuzzy
+msgid "Wrong username or password."
+msgstr "Hibás felhasználónév vagy jelszó"
+
+#: src/net/manaserv/loginhandler.cpp:272
+#, fuzzy
+msgid "Account banned"
+msgstr "A fiók lejárt"
+
+#: src/net/manaserv/loginhandler.cpp:275
+msgid "Login attempt too soon after previous attempt."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:303
+#, fuzzy
+msgid "Wrong username, password or email address."
+msgstr "Hibás felhasználónév, jelszó, vagy email cím"
+
+#: src/net/manaserv/loginhandler.cpp:306
+#, fuzzy
+msgid "Username already exists."
+msgstr "A felhasználónév foglalt"
+
+#: src/net/manaserv/loginhandler.cpp:309
+#, fuzzy
+msgid "Email address already exists."
+msgstr "Az email cím foglalt"
+
+#: src/net/manaserv/loginhandler.cpp:312
+msgid "You took too long with the captcha or your response was incorrect."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:87
+msgid "Joined party."
+msgstr "Csatlakoztál a csapathoz."
+
+#: src/net/manaserv/partyhandler.cpp:105
+#, c-format
+msgid "%s joined the party."
+msgstr "%s csatlakozott a csapathoz."
+
+#: src/net/manaserv/partyhandler.cpp:123
+#, fuzzy, c-format
+msgid "%s rejected your invite."
+msgstr "%s visszautasította a csapatba hívást."
+
+#: src/net/manaserv/tradehandler.cpp:95
+msgid "Accepting incoming trade requests."
+msgstr "Elfogadod a bejövő üzleti ajánlatokat."
+
+#: src/net/manaserv/tradehandler.cpp:97
+msgid "Ignoring incoming trade requests."
+msgstr "Elutasítod a bejövő üzleti ajánlatokat."
+
+#: src/net/manaserv/tradehandler.cpp:115 src/net/tmwa/tradehandler.cpp:109
+msgid "Request for Trade"
+msgstr "Üzleti ajánlat"
+
+#: src/net/manaserv/tradehandler.cpp:116 src/net/tmwa/tradehandler.cpp:110
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
+msgstr "%s üzletelni akar veled. Te akarsz vele?"
+
+#: src/net/manaserv/tradehandler.cpp:134
+#, c-format
+msgid "Trading with %s"
+msgstr "Üzlet Te és %s között"
+
+#: src/net/manaserv/tradehandler.cpp:148 src/net/tmwa/tradehandler.cpp:224
+msgid "Trade canceled."
+msgstr "Az üzlet megszakadt."
+
+#: src/net/manaserv/tradehandler.cpp:155 src/net/tmwa/tradehandler.cpp:231
+msgid "Trade completed."
+msgstr "Sikeres üzlet."
+
+#: src/net/tmwa/adminhandler.cpp:64
 msgid "Kick failed!"
 msgstr "Kirúgás sikertelen!"
 
-#: src/net/ea/adminhandler.cpp:65
+#: src/net/tmwa/adminhandler.cpp:66
 msgid "Kick succeeded!"
 msgstr "Kirúgás sikeres!"
 
-#: src/net/ea/buysellhandler.cpp:110
+#: src/net/tmwa/buysellhandler.cpp:109
 msgid "Nothing to sell."
 msgstr "Nincs mit eladni."
 
-#: src/net/ea/buysellhandler.cpp:117
+#: src/net/tmwa/buysellhandler.cpp:116
 msgid "Thanks for buying."
 msgstr "Öröm volt veled üzletet kötni!"
 
-#: src/net/ea/buysellhandler.cpp:124
+#: src/net/tmwa/buysellhandler.cpp:123
 msgid "Unable to buy."
 msgstr "Nem tudod megvenni."
 
-#: src/net/ea/buysellhandler.cpp:130
+#: src/net/tmwa/buysellhandler.cpp:129
 msgid "Thanks for selling."
 msgstr "Öröm volt veled üzletet kötni!"
 
-#: src/net/ea/buysellhandler.cpp:132
+#: src/net/tmwa/buysellhandler.cpp:131
 msgid "Unable to sell."
 msgstr "Nem tudod eladni."
 
-#: src/net/ea/charserverhandler.cpp:103
-#, fuzzy
-msgid "Access denied."
-msgstr "Hozzáférés megtagadva"
+#: src/net/tmwa/charserverhandler.cpp:103
+msgid "Access denied. Most likely, there are too many players on this server."
+msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:106
+#: src/net/tmwa/charserverhandler.cpp:107
 #, fuzzy
 msgid "Cannot use this ID."
 msgstr "Nem használhatod ez a nevet."
 
-#: src/net/ea/charserverhandler.cpp:109
+#: src/net/tmwa/charserverhandler.cpp:110
 #, fuzzy
-msgid "Unknown failure to select character."
-msgstr "Ismeretlen hiba a karakter választásnál."
+msgid "Unknown char-server failure."
+msgstr "Ismeretlen hiba"
 
-#: src/net/ea/charserverhandler.cpp:135
+#: src/net/tmwa/charserverhandler.cpp:134
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr "Nem tudod létrehozni a karaktert. Valószínű a neve használatban van."
 
-#: src/net/ea/charserverhandler.cpp:147 src/net/manaserv/charhandler.cpp:187
-msgid "Info"
-msgstr "Infó"
-
-#: src/net/ea/charserverhandler.cpp:147
+#: src/net/tmwa/charserverhandler.cpp:146
 msgid "Character deleted."
 msgstr "Karakter törölve."
 
-#: src/net/ea/charserverhandler.cpp:152
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Failed to delete character."
 msgstr "Karakter törlése sikertelen."
 
-#: src/net/ea/charserverhandler.cpp:237 src/net/manaserv/charhandler.cpp:263
+#: src/net/tmwa/charserverhandler.cpp:266
 msgid "Strength:"
 msgstr "Erő:"
 
-#: src/net/ea/charserverhandler.cpp:238 src/net/manaserv/charhandler.cpp:264
+#: src/net/tmwa/charserverhandler.cpp:267
 msgid "Agility:"
 msgstr "Mozgékonyság:"
 
-#: src/net/ea/charserverhandler.cpp:239 src/net/manaserv/charhandler.cpp:266
+#: src/net/tmwa/charserverhandler.cpp:268
 msgid "Vitality:"
 msgstr "Egészség:"
 
-#: src/net/ea/charserverhandler.cpp:240 src/net/manaserv/charhandler.cpp:267
+#: src/net/tmwa/charserverhandler.cpp:269
 msgid "Intelligence:"
 msgstr "Intelligencia:"
 
-#: src/net/ea/charserverhandler.cpp:241 src/net/manaserv/charhandler.cpp:265
+#: src/net/tmwa/charserverhandler.cpp:270
 msgid "Dexterity:"
 msgstr "Ügyesség:"
 
-#: src/net/ea/charserverhandler.cpp:242
+#: src/net/tmwa/charserverhandler.cpp:271
 msgid "Luck:"
 msgstr "Szerencse:"
 
-#: src/net/ea/chathandler.cpp:80
-msgid "Whisper could not be sent, user is offline."
+#: src/net/tmwa/chathandler.cpp:87
+#, fuzzy, c-format
+msgid "Whisper could not be sent, %s is offline."
 msgstr "A privát üzenet nem lett elküldve, mert a játékos nem elérhető."
 
-#: src/net/ea/chathandler.cpp:84
-msgid "Whisper could not be sent, ignored by user."
+#: src/net/tmwa/chathandler.cpp:96
+#, fuzzy, c-format
+msgid "Whisper could not be sent, ignored by %s."
 msgstr "A privát üzenet nem lett elküldve, mert le lettél tiltva."
 
-#: src/net/ea/chathandler.cpp:171
+#: src/net/tmwa/chathandler.cpp:230
 #, fuzzy
 msgid "MVP player."
 msgstr "Játékos"
 
-#: src/net/ea/chathandler.cpp:204 src/net/ea/chathandler.cpp:210
-#: src/net/ea/chathandler.cpp:215 src/net/ea/chathandler.cpp:220
-#: src/net/ea/chathandler.cpp:225 src/net/ea/chathandler.cpp:230
-#: src/net/ea/chathandler.cpp:235 src/net/ea/chathandler.cpp:240
+#: src/net/tmwa/chathandler.cpp:265 src/net/tmwa/chathandler.cpp:271
+#: src/net/tmwa/chathandler.cpp:276 src/net/tmwa/chathandler.cpp:281
+#: src/net/tmwa/chathandler.cpp:286 src/net/tmwa/chathandler.cpp:291
+#: src/net/tmwa/chathandler.cpp:296 src/net/tmwa/chathandler.cpp:301
 msgid "Channels are not supported!"
 msgstr "A csatornák le vannak tiltva!"
 
-#: src/net/ea/gamehandler.cpp:86
+#: src/net/tmwa/gamehandler.cpp:88
 #, c-format
 msgid "Online users: %d"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:100
+#: src/net/tmwa/gamehandler.cpp:101
 #, fuzzy
 msgid "Game"
 msgstr "Név"
 
-#: src/net/ea/gamehandler.cpp:100
+#: src/net/tmwa/gamehandler.cpp:101
 #, fuzzy
 msgid "Request to quit denied!"
 msgstr "Üzleti ajánlat"
 
-#: src/net/ea/generalhandler.cpp:102 src/net/manaserv/generalhandler.cpp:95
+#: src/net/tmwa/generalhandler.cpp:102
 #, c-format
 msgid "Strength %+d"
 msgstr "Erő %+d"
 
-#: src/net/ea/generalhandler.cpp:103 src/net/manaserv/generalhandler.cpp:96
+#: src/net/tmwa/generalhandler.cpp:103
 #, c-format
 msgid "Agility %+d"
 msgstr "Mozgékonyság %+d"
 
-#: src/net/ea/generalhandler.cpp:104 src/net/manaserv/generalhandler.cpp:98
+#: src/net/tmwa/generalhandler.cpp:104
 #, c-format
 msgid "Vitality %+d"
 msgstr "Egészség %+d"
 
-#: src/net/ea/generalhandler.cpp:105 src/net/manaserv/generalhandler.cpp:99
+#: src/net/tmwa/generalhandler.cpp:105
 #, c-format
 msgid "Intelligence %+d"
 msgstr "Intelligencia %+d"
 
-#: src/net/ea/generalhandler.cpp:106 src/net/manaserv/generalhandler.cpp:97
+#: src/net/tmwa/generalhandler.cpp:106
 #, c-format
 msgid "Dexterity %+d"
 msgstr "Ügyesség %+d"
 
-#: src/net/ea/generalhandler.cpp:107
+#: src/net/tmwa/generalhandler.cpp:107
 #, c-format
 msgid "Luck %+d"
 msgstr "Szerencse %+d"
 
-#: src/net/ea/generalhandler.cpp:130
+#: src/net/tmwa/generalhandler.cpp:132
 #, fuzzy
 msgid "Authentication failed."
 msgstr "Azonosítás sikertelen"
 
-#: src/net/ea/generalhandler.cpp:133
+#: src/net/tmwa/generalhandler.cpp:135
 #, fuzzy
 msgid "No servers available."
 msgstr "Nincs elérhető szerver"
 
-#: src/net/ea/generalhandler.cpp:137
+#: src/net/tmwa/generalhandler.cpp:139
 #, fuzzy
 msgid "Someone else is trying to use this account."
 msgstr "Valaki más megprobál belépni erre a fiókra"
 
-#: src/net/ea/generalhandler.cpp:140
+#: src/net/tmwa/generalhandler.cpp:142
 #, fuzzy
 msgid "This account is already logged in."
 msgstr "Ez a fiók már be van lépve"
 
-#: src/net/ea/generalhandler.cpp:143
+#: src/net/tmwa/generalhandler.cpp:145
 #, fuzzy
 msgid "Speed hack detected."
 msgstr "Speed hack észlelve"
 
-#: src/net/ea/generalhandler.cpp:146
+#: src/net/tmwa/generalhandler.cpp:148
 #, fuzzy
 msgid "Duplicated login."
 msgstr "Duplikált bejelentkezés"
 
-#: src/net/ea/generalhandler.cpp:149
+#: src/net/tmwa/generalhandler.cpp:151
 #, fuzzy
 msgid "Unknown connection error."
 msgstr "Ismeretlen kapcsolati hiba"
 
-#: src/net/ea/generalhandler.cpp:205
+#: src/net/tmwa/generalhandler.cpp:209
 msgid "Got disconnected from server!"
 msgstr "Lekapcsolódtál a szerverről!"
 
-#: src/net/ea/generalhandler.cpp:216 src/net/manaserv/generalhandler.cpp:166
+#: src/net/tmwa/generalhandler.cpp:230
 msgid "Strength"
 msgstr "Erő"
 
-#: src/net/ea/generalhandler.cpp:217 src/net/manaserv/generalhandler.cpp:167
+#: src/net/tmwa/generalhandler.cpp:231
 msgid "Agility"
 msgstr "Mozgékonyság"
 
-#: src/net/ea/generalhandler.cpp:218 src/net/manaserv/generalhandler.cpp:169
+#: src/net/tmwa/generalhandler.cpp:232
 msgid "Vitality"
 msgstr "Egészség"
 
-#: src/net/ea/generalhandler.cpp:219 src/net/manaserv/generalhandler.cpp:170
+#: src/net/tmwa/generalhandler.cpp:233
 msgid "Intelligence"
 msgstr "Intelligencia"
 
-#: src/net/ea/generalhandler.cpp:220 src/net/manaserv/generalhandler.cpp:168
+#: src/net/tmwa/generalhandler.cpp:234
 msgid "Dexterity"
 msgstr "Ügyesség"
 
-#: src/net/ea/generalhandler.cpp:221
+#: src/net/tmwa/generalhandler.cpp:235
 msgid "Luck"
 msgstr "Szerencse"
 
-#: src/net/ea/generalhandler.cpp:224
+#: src/net/tmwa/generalhandler.cpp:238
 #, fuzzy
 msgid "Defense"
 msgstr "Fizikális védelem:"
 
-#: src/net/ea/generalhandler.cpp:225
+#: src/net/tmwa/generalhandler.cpp:239
 #, fuzzy
 msgid "M.Attack"
 msgstr "Mágikus támadás:"
 
-#: src/net/ea/generalhandler.cpp:226
+#: src/net/tmwa/generalhandler.cpp:240
 #, fuzzy
 msgid "M.Defense"
 msgstr "Mágikus védelem:"
 
-#: src/net/ea/generalhandler.cpp:227
+#: src/net/tmwa/generalhandler.cpp:241
 #, fuzzy, c-format
 msgid "% Accuracy"
 msgstr "Találati esély (%):"
 
-#: src/net/ea/generalhandler.cpp:228
+#: src/net/tmwa/generalhandler.cpp:242
 #, fuzzy, c-format
 msgid "% Evade"
 msgstr "Kitérés (%):"
 
-#: src/net/ea/generalhandler.cpp:229
+#: src/net/tmwa/generalhandler.cpp:243
 #, fuzzy, c-format
 msgid "% Critical"
 msgstr "Kritikális ütéskor"
 
-#: src/net/ea/gui/guildtab.cpp:45
+#: src/net/tmwa/gui/guildtab.cpp:45
 msgid "Guild"
 msgstr "Klán"
 
-#: src/net/ea/gui/guildtab.cpp:61 src/net/ea/gui/partytab.cpp:59
+#: src/net/tmwa/gui/guildtab.cpp:61 src/net/tmwa/gui/partytab.cpp:59
 msgid "/help > Display this help."
 msgstr "/help > Megmutatja ezt a súgót."
 
-#: src/net/ea/gui/guildtab.cpp:62
+#: src/net/tmwa/gui/guildtab.cpp:62
 #, fuzzy
 msgid "/invite > Invite a player to your guild"
 msgstr "/invite > Játékos meghívása a csapatba"
 
-#: src/net/ea/gui/guildtab.cpp:63
+#: src/net/tmwa/gui/guildtab.cpp:63
 #, fuzzy
 msgid "/leave > Leave the guild you are in"
 msgstr "/leave > Jelenlegi csapat elhagyása"
 
-#: src/net/ea/gui/guildtab.cpp:64
+#: src/net/tmwa/gui/guildtab.cpp:64
 #, fuzzy
 msgid "/kick > Kick some one from the guild you are in"
 msgstr "/kick > Valaki kirúgása a csapatból"
 
-#: src/net/ea/gui/guildtab.cpp:73 src/net/ea/gui/partytab.cpp:73
+#: src/net/tmwa/gui/guildtab.cpp:73 src/net/tmwa/gui/partytab.cpp:73
 msgid "Command: /invite <nick>"
 msgstr "Parancs: /invite <név>"
 
-#: src/net/ea/gui/guildtab.cpp:74
+#: src/net/tmwa/gui/guildtab.cpp:74
 #, fuzzy
 msgid "This command invites <nick> to the guild you're in."
 msgstr "Ez a parancs csapatba hívja a <név> alatt megadott nevű játékost."
 
-#: src/net/ea/gui/guildtab.cpp:80 src/net/ea/gui/partytab.cpp:80
+#: src/net/tmwa/gui/guildtab.cpp:80 src/net/tmwa/gui/partytab.cpp:80
 msgid "Command: /leave"
 msgstr "Parancs: /leave"
 
-#: src/net/ea/gui/guildtab.cpp:81
+#: src/net/tmwa/gui/guildtab.cpp:81
 #, fuzzy
 msgid "This command causes the player to leave the guild."
 msgstr "Ezzel a paranccsal a játékos elhagyja a csapatát."
 
-#: src/net/ea/gui/guildtab.cpp:89
+#: src/net/tmwa/gui/guildtab.cpp:89
 #, fuzzy
 msgid "Guild name is missing."
 msgstr "A csapatnév hiányzik."
 
-#: src/net/ea/guildhandler.cpp:293
+#: src/net/tmwa/guildhandler.cpp:296
 msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:298
+#: src/net/tmwa/guildhandler.cpp:301
 msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:303
+#: src/net/tmwa/guildhandler.cpp:306
 #, fuzzy
 msgid "User is now part of your guild."
 msgstr "%s mostantól a csapatod tagja."
 
-#: src/net/ea/guildhandler.cpp:308
+#: src/net/tmwa/guildhandler.cpp:311
 msgid "Your guild is full."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:313
+#: src/net/tmwa/guildhandler.cpp:316
 #, fuzzy
 msgid "Unknown guild invite response."
 msgstr "%s részéről ismeretlen válasz a meghívásra."
 
-#: src/net/ea/guildhandler.cpp:390
+#: src/net/tmwa/guildhandler.cpp:393
 msgid "Guild creation isn't supported yet."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:43
+#: src/net/tmwa/gui/partytab.cpp:43
 msgid "Party"
 msgstr "Csapat"
 
-#: src/net/ea/gui/partytab.cpp:60
+#: src/net/tmwa/gui/partytab.cpp:60
 msgid "/invite > Invite a player to your party"
 msgstr "/invite > Játékos meghívása a csapatba"
 
-#: src/net/ea/gui/partytab.cpp:61
+#: src/net/tmwa/gui/partytab.cpp:61
 msgid "/leave > Leave the party you are in"
 msgstr "/leave > Jelenlegi csapat elhagyása"
 
-#: src/net/ea/gui/partytab.cpp:62
+#: src/net/tmwa/gui/partytab.cpp:62
 msgid "/kick > Kick some one from the party you are in"
 msgstr "/kick > Valaki kirúgása a csapatból"
 
-#: src/net/ea/gui/partytab.cpp:63
+#: src/net/tmwa/gui/partytab.cpp:63
 msgid "/item > Show/change party item sharing options"
 msgstr "/item > Tárgyak elosztását nézhetjük/átállíthatjuk vele"
 
-#: src/net/ea/gui/partytab.cpp:64
+#: src/net/tmwa/gui/partytab.cpp:64
 msgid "/exp > Show/change party experience sharing options"
 msgstr "/exp > Tapasztalat elosztását nézhetjük/átállíthatjuk vele"
 
-#: src/net/ea/gui/partytab.cpp:81
+#: src/net/tmwa/gui/partytab.cpp:81
 msgid "This command causes the player to leave the party."
 msgstr "Ezzel a paranccsal a játékos elhagyja a csapatát."
 
-#: src/net/ea/gui/partytab.cpp:85
+#: src/net/tmwa/gui/partytab.cpp:85
 msgid "Command: /item <policy>"
 msgstr "Parancs: /item <szabály>"
 
-#: src/net/ea/gui/partytab.cpp:86
+#: src/net/tmwa/gui/partytab.cpp:86
 msgid "This command changes the party's item sharing policy."
 msgstr "Ez a parancs a tárgyak megosztását szabályozza a csapaton belül."
 
-#: src/net/ea/gui/partytab.cpp:87
+#: src/net/tmwa/gui/partytab.cpp:87
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
 msgstr ""
-"<szabály> lehet \"1\", \"yes\", \"true\" a tárgyak megosztásához, vagy \"0"
-"\", \"no\", \"false\" a tárgyak megosztásának kikapcsolásához."
+"<szabály> lehet \"1\", \"yes\", \"true\" a tárgyak megosztásához, vagy "
+"\"0\", \"no\", \"false\" a tárgyak megosztásának kikapcsolásához."
 
-#: src/net/ea/gui/partytab.cpp:90
+#: src/net/tmwa/gui/partytab.cpp:90
 msgid "Command: /item"
 msgstr "Parancs: /item"
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/tmwa/gui/partytab.cpp:91
 msgid "This command displays the party's current item sharing policy."
 msgstr "Ez a parancs megmutatja a csapat jelenlegi tárgymegosztási-szabályát."
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/tmwa/gui/partytab.cpp:95
 msgid "Command: /exp <policy>"
 msgstr "Parancs: /exp <szabály>"
 
-#: src/net/ea/gui/partytab.cpp:96
+#: src/net/tmwa/gui/partytab.cpp:96
 msgid "This command changes the party's experience sharing policy."
 msgstr "Ez a parancs a tapasztalat megosztását szabályozza a csapaton belül."
 
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/tmwa/gui/partytab.cpp:97
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
@@ -2791,104 +3201,91 @@ msgstr ""
 "<szabály> lehet \"1\", \"yes\", \"true\" a tapasztalat megosztásához, vagy "
 "\"0\", \"no\", \"false\" a tapasztalat megosztásának kikapcsolásához."
 
-#: src/net/ea/gui/partytab.cpp:100
+#: src/net/tmwa/gui/partytab.cpp:100
 msgid "Command: /exp"
 msgstr "Parancs: /exp"
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/tmwa/gui/partytab.cpp:101
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 "Ez a parancs megmutatja a csapat jelenlegi tapasztalatmegosztási-szabályát."
 
-#: src/net/ea/gui/partytab.cpp:132 src/net/ea/partyhandler.cpp:198
+#: src/net/tmwa/gui/partytab.cpp:132 src/net/tmwa/partyhandler.cpp:196
 msgid "Item sharing enabled."
 msgstr "Tárgy megosztás engedélyezve."
 
-#: src/net/ea/gui/partytab.cpp:135 src/net/ea/partyhandler.cpp:204
+#: src/net/tmwa/gui/partytab.cpp:135 src/net/tmwa/partyhandler.cpp:202
 msgid "Item sharing disabled."
 msgstr "Tárgy megosztás tiltva."
 
-#: src/net/ea/gui/partytab.cpp:138 src/net/ea/partyhandler.cpp:210
+#: src/net/tmwa/gui/partytab.cpp:138 src/net/tmwa/partyhandler.cpp:208
 msgid "Item sharing not possible."
 msgstr "A tárgy megosztás nem lehetséges."
 
-#: src/net/ea/gui/partytab.cpp:141
+#: src/net/tmwa/gui/partytab.cpp:141
 #, fuzzy
 msgid "Item sharing unknown."
 msgstr "Tárgy megosztás engedélyezve."
 
-#: src/net/ea/gui/partytab.cpp:167 src/net/ea/partyhandler.cpp:174
+#: src/net/tmwa/gui/partytab.cpp:167 src/net/tmwa/partyhandler.cpp:172
 msgid "Experience sharing enabled."
 msgstr "Tapasztalat megosztás engedélyezve."
 
-#: src/net/ea/gui/partytab.cpp:170 src/net/ea/partyhandler.cpp:180
+#: src/net/tmwa/gui/partytab.cpp:170 src/net/tmwa/partyhandler.cpp:178
 msgid "Experience sharing disabled."
 msgstr "Tapasztalat megosztás tiltva."
 
-#: src/net/ea/gui/partytab.cpp:173 src/net/ea/partyhandler.cpp:186
+#: src/net/tmwa/gui/partytab.cpp:173 src/net/tmwa/partyhandler.cpp:184
 msgid "Experience sharing not possible."
 msgstr "A tapasztalat megosztás nem lehetséges."
 
-#: src/net/ea/gui/partytab.cpp:176
+#: src/net/tmwa/gui/partytab.cpp:176
 #, fuzzy
 msgid "Experience sharing unknown."
 msgstr "Tapasztalat megosztás engedélyezve."
 
-#: src/net/ea/inventoryhandler.cpp:281
+#: src/net/tmwa/inventoryhandler.cpp:285
 msgid "Failed to use item."
 msgstr "Nem tudod bevetni a tárgyat."
 
-#: src/net/ea/inventoryhandler.cpp:391
+#: src/net/tmwa/inventoryhandler.cpp:399
 msgid "Unable to equip."
 msgstr "Nem tudod használni."
 
-#: src/net/ea/inventoryhandler.cpp:402
+#: src/net/tmwa/inventoryhandler.cpp:410
 msgid "Unable to unequip."
 msgstr "Nem tudod eltenni."
 
-#: src/net/ea/loginhandler.cpp:79
+#: src/net/tmwa/loginhandler.cpp:86
 msgid "Account was not found. Please re-login."
 msgstr "Fiók nem található. Kérem jelentkezzen be újra."
 
-#: src/net/ea/loginhandler.cpp:82 src/net/manaserv/loginhandler.cpp:121
-#, fuzzy
-msgid "Old password incorrect."
-msgstr "A régi jelszó hibás"
-
-#: src/net/ea/loginhandler.cpp:85
+#: src/net/tmwa/loginhandler.cpp:92
 #, fuzzy
 msgid "New password too short."
 msgstr "Az új jelszó túl rövid"
 
-#: src/net/ea/loginhandler.cpp:88 src/net/ea/loginhandler.cpp:175
-#: src/net/manaserv/charhandler.cpp:158 src/net/manaserv/loginhandler.cpp:96
-#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
-#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
-#, fuzzy
-msgid "Unknown error."
-msgstr "Ismeretlen hiba"
-
-#: src/net/ea/loginhandler.cpp:149
+#: src/net/tmwa/loginhandler.cpp:156
 #, fuzzy
 msgid "Unregistered ID."
 msgstr "Az ID nincs regisztrálva"
 
-#: src/net/ea/loginhandler.cpp:152
+#: src/net/tmwa/loginhandler.cpp:159
 #, fuzzy
 msgid "Wrong password."
 msgstr "Hibás jelszó"
 
-#: src/net/ea/loginhandler.cpp:155
+#: src/net/tmwa/loginhandler.cpp:162
 #, fuzzy
 msgid "Account expired."
 msgstr "A fiók lejárt"
 
-#: src/net/ea/loginhandler.cpp:158
+#: src/net/tmwa/loginhandler.cpp:165
 #, fuzzy
 msgid "Rejected from server."
 msgstr "Visszautasított a szerver"
 
-#: src/net/ea/loginhandler.cpp:161
+#: src/net/tmwa/loginhandler.cpp:168
 #, fuzzy
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
@@ -2896,7 +3293,7 @@ msgstr ""
 "Véglegesen kitiltottak a szerverről. Kérlek vedd fel a kapcsolatot a GM "
 "csapattal."
 
-#: src/net/ea/loginhandler.cpp:165
+#: src/net/tmwa/loginhandler.cpp:172
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -2905,666 +3302,368 @@ msgstr ""
 "Ki vagy tiltva a szerverről hátralévő idő a feloldásig %s\n"
 "Kérlek vedd fel a kapcsolatot a GM csapattal."
 
-#: src/net/ea/loginhandler.cpp:172
+#: src/net/tmwa/loginhandler.cpp:179
 #, fuzzy
 msgid "This user name is already taken."
 msgstr "Ez a felhasználónév már foglalt."
 
-#: src/net/ea/network.cpp:145
+#: src/net/tmwa/network.cpp:145
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/ea/network.cpp:345
+#: src/net/tmwa/network.cpp:345
 #, fuzzy
 msgid "Unable to resolve host \""
 msgstr "Nem tudod eladni."
 
-#: src/net/ea/network.cpp:414
+#: src/net/tmwa/network.cpp:414
 #, fuzzy
 msgid "Connection to server terminated. "
 msgstr "Csatlakozás a térkép szerverhez...."
 
-#: src/net/ea/partyhandler.cpp:81
+#: src/net/tmwa/partyhandler.cpp:82
 msgid "Could not create party."
 msgstr "Nem tudtad a csapatot létrehozni."
 
-#: src/net/ea/partyhandler.cpp:84
+#: src/net/tmwa/partyhandler.cpp:84
 msgid "Party successfully created."
 msgstr "Csapat létrehozása sikeres."
 
-#: src/net/ea/partyhandler.cpp:118
+#: src/net/tmwa/partyhandler.cpp:119
 #, c-format
 msgid "%s is already a member of a party."
 msgstr "%s eleve tagja a csapatnak."
 
-#: src/net/ea/partyhandler.cpp:122
+#: src/net/tmwa/partyhandler.cpp:123
 #, c-format
 msgid "%s refused your invitation."
 msgstr "%s visszautasította a csapatba hívást."
 
-#: src/net/ea/partyhandler.cpp:126
+#: src/net/tmwa/partyhandler.cpp:127
 #, c-format
 msgid "%s is now a member of your party."
 msgstr "%s mostantól a csapatod tagja."
 
-#: src/net/ea/partyhandler.cpp:130
+#: src/net/tmwa/partyhandler.cpp:131
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr "%s részéről ismeretlen válasz a meghívásra."
 
-#: src/net/ea/partyhandler.cpp:238
+#: src/net/tmwa/partyhandler.cpp:236
 msgid "You have left the party."
 msgstr "Kiléptél a csapatból."
 
-#: src/net/ea/partyhandler.cpp:249
+#: src/net/tmwa/partyhandler.cpp:246
 #, c-format
 msgid "%s has left your party."
 msgstr "%s elhagyta a csapatot."
 
-#: src/net/ea/partyhandler.cpp:301
+#: src/net/tmwa/partyhandler.cpp:299
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr "Egy ismeretlen csapattárs mondja: %s"
 
-#: src/net/ea/partyhandler.cpp:329
-msgid "Inviting like this isn't supported at the moment."
-msgstr "Meghívás jelenleg nem lehetséges."
+#: src/net/tmwa/partyhandler.cpp:335
+#, c-format
+msgid "Inviting failed, because you can't see a player called %s."
+msgstr ""
 
-#: src/net/ea/partyhandler.cpp:334
+#: src/net/tmwa/partyhandler.cpp:340
 msgid "You can only inivte when you are in a party!"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:365
+#: src/net/tmwa/partyhandler.cpp:368
 #, c-format
 msgid "%s is not in your party!"
 msgstr "%s nincs a csapatodban!"
 
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:304
-msgid "You are dead."
-msgstr "Meghaltál."
-
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:305
-msgid "We regret to inform you that your character was killed in battle."
-msgstr "A karaktered elvérzett a csatában."
-
-#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:307
-msgid "You are not that alive anymore."
-msgstr "Nem vagy már az élők sorában."
-
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:308
-msgid "The cold hands of the grim reaper are grabbing for your soul."
-msgstr "A kaszás eljött érted, hogy elvigye a lelked."
-
-#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:309
-msgid "Game Over!"
-msgstr "Vége a játéknak!"
-
-#: src/net/ea/playerhandler.cpp:105
+#: src/net/tmwa/playerhandler.cpp:100
 msgid "Insert coin to continue."
 msgstr "Dobj be egy érmét a folytatáshoz."
 
-#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:310
-msgid ""
-"No, kids. Your character did not really die. It... err... went to a better "
-"place."
-msgstr ""
-"Nem, gyerekek. A karakter nem meghalt, ..ööö... hanem egy szebb világba "
-"került."
-
-#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:312
-msgid ""
-"Your plan of breaking your enemies weapon by bashing it with your throat "
-"failed."
-msgstr ""
-"A tervet, amiben a torkoddal támadsz az ellenség kardjába sikertelennek "
-"bizonyult."
-
-#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:314
-msgid "I guess this did not run too well."
-msgstr "Úgy látszik nem futottál túl gyorsan."
-
-#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:315
-msgid "Do you want your possessions identified?"
-msgstr "Meg akarod bánni a bűneid?"
-
-#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:316
-msgid "Sadly, no trace of you was ever found..."
-msgstr "Kövesd a fényt az alagút végén."
-
-#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:317
-msgid "Annihilated."
-msgstr "Megöltek."
-
-#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:318
-msgid "Looks like you got your head handed to you."
-msgstr "Kezedbe adták a fejed."
-
-#: src/net/ea/playerhandler.cpp:120 src/net/manaserv/beinghandler.cpp:319
-msgid ""
-"You screwed up again, dump your body down the tubes and get you another one."
-msgstr "Sikolyok közepette kerültél a másvilágra."
-
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/tmwa/playerhandler.cpp:118
 msgid "You're not dead yet. You're just resting."
 msgstr "Nem haltál meg...csak alszol..."
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/tmwa/playerhandler.cpp:119
 msgid "You are no more."
 msgstr "Nem létezel többé."
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/tmwa/playerhandler.cpp:120
 msgid "You have ceased to be."
 msgstr "Megszüntél létezni."
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/tmwa/playerhandler.cpp:121
 msgid "You've expired and gone to meet your maker."
 msgstr "Véged és elindultál találkozni a készítőddel."
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/tmwa/playerhandler.cpp:122
 msgid "You're a stiff."
 msgstr "Hulla vagy."
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/tmwa/playerhandler.cpp:123
 msgid "Bereft of life, you rest in peace."
 msgstr "Megfosztottak az életedtől. Nyugodj békében."
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/tmwa/playerhandler.cpp:124
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr "Szép vagy mikor alszol..."
 
-#: src/net/ea/playerhandler.cpp:130
+#: src/net/tmwa/playerhandler.cpp:125
 msgid "Your metabolic processes are now history."
 msgstr "Történelem vagy."
 
-#: src/net/ea/playerhandler.cpp:131
+#: src/net/tmwa/playerhandler.cpp:126
 msgid "You're off the twig."
 msgstr "Elég gallyul nézel ki."
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/tmwa/playerhandler.cpp:127
 msgid "You've kicked the bucket."
 msgstr "Feldobtad a talpad."
 
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/tmwa/playerhandler.cpp:128
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr "Megfulladtál a saját véredben."
 
-#: src/net/ea/playerhandler.cpp:135
+#: src/net/tmwa/playerhandler.cpp:130
 msgid "You are an ex-player."
 msgstr "Ex-játékos lettél."
 
-#: src/net/ea/playerhandler.cpp:136
+#: src/net/tmwa/playerhandler.cpp:131
 msgid "You're pining for the fjords."
 msgstr "Az örök búzamezőkön kaszálgatsz."
 
-#: src/net/ea/playerhandler.cpp:249 src/net/ea/playerhandler.cpp:310
+#: src/net/tmwa/playerhandler.cpp:246 src/net/tmwa/playerhandler.cpp:285
 msgid "Message"
 msgstr "Üzenet"
 
-#: src/net/ea/playerhandler.cpp:250
+#: src/net/tmwa/playerhandler.cpp:247
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr "Több tárgy van nálad mint a súlyod fele. Nem töltődik az életed."
 
-#: src/net/ea/playerhandler.cpp:333
+#: src/net/tmwa/playerhandler.cpp:313
 #, fuzzy, c-format
 msgid "You picked up %s."
 msgstr "Zsákmányod "
 
-#: src/net/ea/playerhandler.cpp:369
+#: src/net/tmwa/playerhandler.cpp:348
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:532
+#: src/net/tmwa/playerhandler.cpp:488
 msgid "Equip arrows first."
 msgstr "Előbb tegyél be nyílvesszőt."
 
-#: src/net/ea/specialhandler.cpp:147
+#: src/net/tmwa/specialhandler.cpp:144
 msgid "Trade failed!"
 msgstr "Üzlet sikertelen!"
 
-#: src/net/ea/specialhandler.cpp:150
+#: src/net/tmwa/specialhandler.cpp:147
 msgid "Emote failed!"
 msgstr "Hangulatjel küldése sikertelen!"
 
-#: src/net/ea/specialhandler.cpp:153
+#: src/net/tmwa/specialhandler.cpp:150
 msgid "Sit failed!"
 msgstr "Ülés sikertelen!"
 
-#: src/net/ea/specialhandler.cpp:156
+#: src/net/tmwa/specialhandler.cpp:153
 msgid "Chat creating failed!"
 msgstr "Beszélgetés létrehozása sikertelen."
 
-#: src/net/ea/specialhandler.cpp:159
+#: src/net/tmwa/specialhandler.cpp:156
 msgid "Could not join party!"
 msgstr "Nem tudsz csatlakozni a csapatba."
 
-#: src/net/ea/specialhandler.cpp:162
+#: src/net/tmwa/specialhandler.cpp:159
 msgid "Cannot shout!"
 msgstr "Nem tudsz ordítani!"
 
-#: src/net/ea/specialhandler.cpp:171
+#: src/net/tmwa/specialhandler.cpp:168
 msgid "You have not yet reached a high enough lvl!"
 msgstr "Nem érted még el a megfelelő szintet!"
 
-#: src/net/ea/specialhandler.cpp:174
+#: src/net/tmwa/specialhandler.cpp:171
 msgid "Insufficient HP!"
 msgstr "Kevés az életed!"
 
-#: src/net/ea/specialhandler.cpp:177
+#: src/net/tmwa/specialhandler.cpp:174
 msgid "Insufficient SP!"
 msgstr "Kimerültél."
 
-#: src/net/ea/specialhandler.cpp:180
+#: src/net/tmwa/specialhandler.cpp:177
 msgid "You have no memos!"
 msgstr "Nincs feljegyzésed."
 
-#: src/net/ea/specialhandler.cpp:183
+#: src/net/tmwa/specialhandler.cpp:180
 msgid "You cannot do that right now!"
 msgstr "Most nem csinálhatod!"
 
-#: src/net/ea/specialhandler.cpp:186
+#: src/net/tmwa/specialhandler.cpp:183
 msgid "Seems you need more money... ;-)"
 msgstr "Úgy néz ki több pénzre van szükséged... ;)"
 
-#: src/net/ea/specialhandler.cpp:189
+#: src/net/tmwa/specialhandler.cpp:186
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Ezzel a fegyverrel nem tudod ezt a képességet használni!"
 
-#: src/net/ea/specialhandler.cpp:192
+#: src/net/tmwa/specialhandler.cpp:189
 msgid "You need another red gem!"
 msgstr "Egy másik piros kőre van szükséged!"
 
-#: src/net/ea/specialhandler.cpp:195
+#: src/net/tmwa/specialhandler.cpp:192
 msgid "You need another blue gem!"
 msgstr "Egy másik kék kőre van szükséged!"
 
-#: src/net/ea/specialhandler.cpp:198
+#: src/net/tmwa/specialhandler.cpp:195
 msgid "You're carrying to much to do this!"
 msgstr "Túl sok dolgot cipelsz, hogy ezt csináld!"
 
-#: src/net/ea/specialhandler.cpp:201
+#: src/net/tmwa/specialhandler.cpp:198
 msgid "Huh? What's that?"
 msgstr "Huh? Mi volt ez?"
 
-#: src/net/ea/specialhandler.cpp:210
+#: src/net/tmwa/specialhandler.cpp:207
 msgid "Warp failed..."
 msgstr "Teleport sikertelen..."
 
-#: src/net/ea/specialhandler.cpp:213
+#: src/net/tmwa/specialhandler.cpp:210
 msgid "Could not steal anything..."
 msgstr "Nem tudsz semmit ellopni..."
 
-#: src/net/ea/specialhandler.cpp:216
+#: src/net/tmwa/specialhandler.cpp:213
 msgid "Poison had no effect..."
 msgstr "A méregnek nem volt hatása..."
 
-#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:116
-msgid "Request for Trade"
-msgstr "Üzleti ajánlat"
-
-#: src/net/ea/tradehandler.cpp:108 src/net/manaserv/tradehandler.cpp:117
-#, c-format
-msgid "%s wants to trade with you, do you accept?"
-msgstr "%s üzletelni akar veled. Te akarsz vele?"
-
-#: src/net/ea/tradehandler.cpp:124
+#: src/net/tmwa/tradehandler.cpp:126
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr "Az üzlet nem lehetséges. A partner túl messze van."
 
-#: src/net/ea/tradehandler.cpp:128
+#: src/net/tmwa/tradehandler.cpp:130
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr "Az üzlet nem lehetséges. A partner nem létezik."
 
-#: src/net/ea/tradehandler.cpp:132
+#: src/net/tmwa/tradehandler.cpp:134
 msgid "Trade cancelled due to an unknown reason."
 msgstr "Az üzlet ismeretlen okból megszakadt."
 
-#: src/net/ea/tradehandler.cpp:137
+#: src/net/tmwa/tradehandler.cpp:139
 #, c-format
 msgid "Trade: You and %s"
 msgstr "Üzlet: Te és %s"
 
-#: src/net/ea/tradehandler.cpp:144
+#: src/net/tmwa/tradehandler.cpp:146
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr "Te és %s üzlete megszakadt."
 
-#: src/net/ea/tradehandler.cpp:153
+#: src/net/tmwa/tradehandler.cpp:154
 msgid "Unhandled trade cancel packet."
 msgstr "Lekezeletlen üzlet elutasító csomag."
 
-#: src/net/ea/tradehandler.cpp:202
+#: src/net/tmwa/tradehandler.cpp:202
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr "Tárgy hozzáadása sikertelen. Az üzleti partner túl van terhelve."
 
-#: src/net/ea/tradehandler.cpp:207
+#: src/net/tmwa/tradehandler.cpp:207
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr "Tárgy hozzáadása sikertelen. Az üzleti partnernek nincs elég helye."
 
-#: src/net/ea/tradehandler.cpp:211
+#: src/net/tmwa/tradehandler.cpp:211
 msgid "Failed adding item for unknown reason."
 msgstr "Ismeretlen okból a tárgy hozzáadása sikertelen."
 
-#: src/net/ea/tradehandler.cpp:224 src/net/manaserv/tradehandler.cpp:149
-msgid "Trade canceled."
-msgstr "Az üzlet megszakadt."
-
-#: src/net/ea/tradehandler.cpp:231 src/net/manaserv/tradehandler.cpp:156
-msgid "Trade completed."
-msgstr "Sikeres üzlet."
-
-#: src/net/manaserv/beinghandler.cpp:324
-#, fuzzy
-msgid "Press OK to respawn."
-msgstr " Nyomj Ok-t a feléledéshez"
-
-#: src/net/manaserv/beinghandler.cpp:325
+#: src/playerrelations.cpp:310
 #, fuzzy
-msgid "You Died"
-msgstr "Meghaltál."
-
-#: src/net/manaserv/charhandler.cpp:128 src/net/manaserv/charhandler.cpp:196
-#, fuzzy
-msgid "Not logged in."
-msgstr "Már be van jelentkezve"
-
-#: src/net/manaserv/charhandler.cpp:131
-msgid "No empty slot."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:134
-msgid "Invalid name."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:137
-#, fuzzy
-msgid "Character's name already exists."
-msgstr "A felhasználónév foglalt"
-
-#: src/net/manaserv/charhandler.cpp:140
-msgid "Invalid hairstyle."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:143
-msgid "Invalid hair color."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:146
-msgid "Invalid gender."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:149
-#, fuzzy
-msgid "Character's stats are too high."
-msgstr "Karakter statok rendben"
-
-#: src/net/manaserv/charhandler.cpp:152
-#, fuzzy
-msgid "Character's stats are too low."
-msgstr "Karakter statok rendben"
+msgid "Completely ignore"
+msgstr "@@ignore|Teljesen letiltod %s-t@@"
 
-#: src/net/manaserv/charhandler.cpp:155
-msgid "One stat is zero."
+#: src/playerrelations.cpp:324
+msgid "Print '...'"
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:187
-#, fuzzy
-msgid "Player deleted."
-msgstr "Karakter törölve."
-
-#: src/net/manaserv/charhandler.cpp:199
-#, fuzzy
-msgid "Selection out of range."
-msgstr "Válaszd ki mennyi tárggyal akarsz üzletelni."
-
-#: src/net/manaserv/charhandler.cpp:202
-#, fuzzy, c-format
-msgid "Unknown error (%d)."
-msgstr "Ismeretlen hiba"
-
-#: src/net/manaserv/charhandler.cpp:242
-msgid "No gameservers are available."
-msgstr "Nincs elérhető játékszerver."
-
-#: src/net/manaserv/charhandler.cpp:268
-msgid "Willpower:"
-msgstr "Akaraterő:"
-
-#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
-#: src/net/manaserv/guildhandler.cpp:259
-#, c-format
-msgid "Topic: %s"
-msgstr "Téma: %s"
-
-#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
-#, fuzzy
-msgid "Players in this channel:"
-msgstr "Sebzéskor"
-
-#: src/net/manaserv/chathandler.cpp:201
-#, fuzzy
-msgid "Error joining channel."
-msgstr "Parancs: /join <csatorna>"
-
-#: src/net/manaserv/chathandler.cpp:207
-#, fuzzy
-msgid "Listing channels."
-msgstr "Kapcsolódási kérelem a %s nevű csatornába."
-
-#: src/net/manaserv/chathandler.cpp:219
-msgid "End of channel list."
+#: src/playerrelations.cpp:340
+msgid "Blink name"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:291
-#, fuzzy, c-format
-msgid "%s entered the channel."
-msgstr "%s csatlakozott a csapathoz."
-
-#: src/net/manaserv/chathandler.cpp:296
+#: src/resources/itemdb.cpp:44
 #, c-format
-msgid "%s left the channel."
-msgstr ""
+msgid "Attack %+d"
+msgstr "Támadás %+d"
 
-#: src/net/manaserv/chathandler.cpp:312
+#: src/resources/itemdb.cpp:45
 #, c-format
-msgid "%s has set mode %s on user %s."
-msgstr ""
+msgid "Defense %+d"
+msgstr "Védelem %+d"
 
-#: src/net/manaserv/chathandler.cpp:322
+#: src/resources/itemdb.cpp:46
 #, c-format
-msgid "%s has kicked %s."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:327
-#, fuzzy
-msgid "Unknown channel event."
-msgstr "Ismeretlen parancs."
+msgid "HP %+d"
+msgstr "Élet: %+d"
 
-#: src/net/manaserv/generalhandler.cpp:100
+#: src/resources/itemdb.cpp:47
 #, c-format
-msgid "Willpower %+d"
-msgstr "Akaraterő: %+d"
-
-#: src/net/manaserv/generalhandler.cpp:171
-#, fuzzy
-msgid "Willpower"
-msgstr "Akaraterő:"
-
-#: src/net/manaserv/guildhandler.cpp:81
-msgid "Guild created."
-msgstr "Klán létrehozva."
-
-#: src/net/manaserv/guildhandler.cpp:86
-msgid "Error creating guild."
-msgstr "Hiba a klán létrehozása közben."
-
-#: src/net/manaserv/guildhandler.cpp:96
-msgid "Invite sent."
-msgstr "Meghívás elküldve."
-
-#: src/net/manaserv/guildhandler.cpp:203
-msgid "Member was promoted successfully."
-msgstr "A tag előléptetése sikeres."
+msgid "MP %+d"
+msgstr "Varázserő %+d"
 
-#: src/net/manaserv/guildhandler.cpp:208
-msgid "Failed to promote member."
-msgstr "A tag előléptetése sikertelen."
+#: src/resources/itemdb.cpp:92
+msgid "Unknown item"
+msgstr "Ismeretlen tárgy"
 
-#: src/net/manaserv/loginhandler.cpp:87
-#, fuzzy
-msgid "Wrong magic_token."
-msgstr "Helytelen magic_token"
+#: src/resources/itemdb.cpp:135 src/resources/monsterdb.cpp:77
+msgid "unnamed"
+msgstr "Névtelen"
 
-#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
 #, fuzzy
-msgid "Already logged in."
-msgstr "Már be van jelentkezve"
+#~ msgid "HP"
+#~ msgstr "Élet:"
 
-#: src/net/manaserv/loginhandler.cpp:93 src/net/manaserv/loginhandler.cpp:272
 #, fuzzy
-msgid "Server is full."
-msgstr "A szerver tele van"
+#~ msgid "MP"
+#~ msgstr "Varázserő:"
 
-#: src/net/manaserv/loginhandler.cpp:118
 #, fuzzy
-msgid "New password incorrect."
-msgstr "Az új jelszó hibás"
-
-#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
-msgid "Account not connected. Please login first."
-msgstr "A fiók nem kapcsolódott. Kérlek jelentkezz be előbb."
+#~ msgid "Exp"
+#~ msgstr "TP:"
 
-#: src/net/manaserv/loginhandler.cpp:149
 #, fuzzy
-msgid "New email address incorrect."
-msgstr "Az új email cím hibás."
+#~ msgid "Money"
+#~ msgstr "Pénz: %d"
 
-#: src/net/manaserv/loginhandler.cpp:152
 #, fuzzy
-msgid "Old email address incorrect."
-msgstr "A régi email cím hibás."
+#~ msgid "Job"
+#~ msgstr "Munka:"
 
-#: src/net/manaserv/loginhandler.cpp:158
 #, fuzzy
-msgid "The new email address already exists."
-msgstr "Az új email cím már foglalt."
+#~ msgid "Level"
+#~ msgstr "Szint: %d"
 
-#: src/net/manaserv/loginhandler.cpp:239
-msgid ""
-"Client registration is not allowed. Please contact server administration."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
 #, fuzzy
-msgid "Client version is too old."
-msgstr "A kliens verziója túl régi"
+#~ msgid "Access denied."
+#~ msgstr "Hozzáférés megtagadva"
 
-#: src/net/manaserv/loginhandler.cpp:266
 #, fuzzy
-msgid "Wrong username or password."
-msgstr "Hibás felhasználónév vagy jelszó"
+#~ msgid "Unknown failure to select character."
+#~ msgstr "Ismeretlen hiba a karakter választásnál."
 
-#: src/net/manaserv/loginhandler.cpp:275
-msgid "Login attempt too soon after previous attempt."
-msgstr ""
+#~ msgid "Inviting like this isn't supported at the moment."
+#~ msgstr "Meghívás jelenleg nem lehetséges."
 
-#: src/net/manaserv/loginhandler.cpp:303
-#, fuzzy
-msgid "Wrong username, password or email address."
-msgstr "Hibás felhasználónév, jelszó, vagy email cím"
+#~ msgid "Willpower:"
+#~ msgstr "Akaraterő:"
 
-#: src/net/manaserv/loginhandler.cpp:306
-#, fuzzy
-msgid "Username already exists."
-msgstr "A felhasználónév foglalt"
+#~ msgid "Willpower %+d"
+#~ msgstr "Akaraterő: %+d"
 
-#: src/net/manaserv/loginhandler.cpp:309
 #, fuzzy
-msgid "Email address already exists."
-msgstr "Az email cím foglalt"
-
-#: src/net/manaserv/loginhandler.cpp:312
-msgid "You took too long with the captcha or your response was incorrect."
-msgstr ""
-
-#: src/net/manaserv/partyhandler.cpp:88
-msgid "Joined party."
-msgstr "Csatlakoztál a csapathoz."
-
-#: src/net/manaserv/partyhandler.cpp:106
-#, c-format
-msgid "%s joined the party."
-msgstr "%s csatlakozott a csapathoz."
-
-#: src/net/manaserv/partyhandler.cpp:123
-#, fuzzy, c-format
-msgid "%s rejected your invite."
-msgstr "%s visszautasította a csapatba hívást."
-
-#: src/net/manaserv/tradehandler.cpp:96
-msgid "Accepting incoming trade requests."
-msgstr "Elfogadod a bejövő üzleti ajánlatokat."
+#~ msgid "Willpower"
+#~ msgstr "Akaraterő:"
 
-#: src/net/manaserv/tradehandler.cpp:98
-msgid "Ignoring incoming trade requests."
-msgstr "Elutasítod a bejövő üzleti ajánlatokat."
-
-#: src/net/manaserv/tradehandler.cpp:135
-#, c-format
-msgid "Trading with %s"
-msgstr "Üzlet Te és %s között"
-
-#: src/playerrelations.cpp:304
 #, fuzzy
-msgid "Completely ignore"
-msgstr "@@ignore|Teljesen letiltod %s-t@@"
-
-#: src/playerrelations.cpp:318
-msgid "Print '...'"
-msgstr ""
-
-#: src/playerrelations.cpp:334
-msgid "Blink name"
-msgstr ""
-
-#: src/playerrelations.cpp:371
-msgid "Floating '...' bubble"
-msgstr ""
-
-#: src/playerrelations.cpp:374
-msgid "Floating bubble"
-msgstr ""
-
-#: src/resources/itemdb.cpp:52
-#, c-format
-msgid "Attack %+d"
-msgstr "Támadás %+d"
-
-#: src/resources/itemdb.cpp:53
-#, c-format
-msgid "Defense %+d"
-msgstr "Védelem %+d"
-
-#: src/resources/itemdb.cpp:54
-#, c-format
-msgid "HP %+d"
-msgstr "Élet: %+d"
-
-#: src/resources/itemdb.cpp:55
-#, c-format
-msgid "MP %+d"
-msgstr "Varázserő %+d"
-
-#: src/resources/itemdb.cpp:114
-msgid "Unknown item"
-msgstr "Ismeretlen tárgy"
-
-#: src/resources/itemdb.cpp:158 src/resources/monsterdb.cpp:45
-#: src/resources/monsterdb.cpp:69
-msgid "unnamed"
-msgstr "Névtelen"
+#~ msgid "Server is full."
+#~ msgstr "A szerver tele van"
 
 #~ msgid "Text Shadow"
 #~ msgstr "Szövegárnyék"
diff --git a/po/id.po b/po/id.po
index 457e0dfc..d7b9e01e 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2010-03-05 21:52+0100\n"
+"POT-Creation-Date: 2010-12-13 20:04+0100\n"
 "PO-Revision-Date: 2009-11-21 12:11+0000\n"
 "Last-Translator: Rainfeed <Unknown>\n"
 "Language-Team: Indonesian <id@li.org>\n"
+"Language: id\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,444 +19,458 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/client.cpp:553 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:62
+#: src/client.cpp:598 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
 msgid "Setup"
 msgstr "Atur"
 
-#: src/client.cpp:623
+#: src/client.cpp:679
 #, fuzzy
 msgid "Connecting to server"
 msgstr "Menyambung..."
 
-#: src/client.cpp:650
+#: src/client.cpp:706
 #, fuzzy
 msgid "Logging in"
 msgstr "Login"
 
-#: src/client.cpp:683
+#: src/client.cpp:739
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:739
+#: src/client.cpp:804
 #, fuzzy
 msgid "Requesting characters"
 msgstr "Pilih Karakter"
 
-#: src/client.cpp:768
+#: src/client.cpp:833
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:799 src/client.cpp:806 src/client.cpp:940
+#: src/client.cpp:843
+#, fuzzy
+msgid "Changing game servers"
+msgstr "Ubah"
+
+#: src/client.cpp:872 src/client.cpp:879 src/client.cpp:1014
 #: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
 #: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
-#: src/gui/serverdialog.cpp:261 src/gui/unregisterdialog.cpp:133
-#: src/net/ea/charserverhandler.cpp:135 src/net/ea/charserverhandler.cpp:152
-#: src/net/manaserv/charhandler.cpp:161 src/net/manaserv/charhandler.cpp:204
+#: src/gui/serverdialog.cpp:323 src/gui/unregisterdialog.cpp:133
+#: src/net/manaserv/charhandler.cpp:174 src/net/manaserv/charhandler.cpp:217
+#: src/net/tmwa/charserverhandler.cpp:134
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Error"
 msgstr "Kesalahan"
 
-#: src/client.cpp:815
+#: src/client.cpp:888
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:842
+#: src/client.cpp:915
 #, fuzzy
 msgid "Password Change"
 msgstr "Kata Sandi:"
 
-#: src/client.cpp:843
+#: src/client.cpp:916
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:862
+#: src/client.cpp:935
 #, fuzzy
 msgid "Email Change"
 msgstr "Ubah"
 
-#: src/client.cpp:863
+#: src/client.cpp:936
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:883
+#: src/client.cpp:956
 #, fuzzy
 msgid "Unregister Successful"
 msgstr "Tidak terdaftar"
 
-#: src/client.cpp:884
+#: src/client.cpp:957
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1007 src/client.cpp:1030
+#: src/client.cpp:1138 src/client.cpp:1161
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1119
+#: src/client.cpp:1281
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1153 src/client.cpp:1159
+#: src/client.cpp:1315 src/client.cpp:1321
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/commandhandler.cpp:127 src/commandhandler.cpp:308
+#: src/commandhandler.cpp:131 src/commandhandler.cpp:317
 msgid "Unknown command."
 msgstr "Perintah tidak dikenal."
 
-#: src/commandhandler.cpp:156
+#: src/commandhandler.cpp:160
 msgid "-- Help --"
 msgstr ""
 
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:161
 msgid "/help > Display this help"
 msgstr ""
 
-#: src/commandhandler.cpp:159
+#: src/commandhandler.cpp:163
 msgid "/where > Display map name"
 msgstr ""
 
-#: src/commandhandler.cpp:160
+#: src/commandhandler.cpp:164
 msgid "/who > Display number of online users"
 msgstr ""
 
-#: src/commandhandler.cpp:161
+#: src/commandhandler.cpp:165
 msgid "/me > Tell something about yourself"
 msgstr ""
 
-#: src/commandhandler.cpp:163
+#: src/commandhandler.cpp:167
 msgid "/clear > Clears this window"
 msgstr ""
 
-#: src/commandhandler.cpp:165
+#: src/commandhandler.cpp:169
 msgid "/msg > Send a private message to a user"
 msgstr ""
 
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:170
 msgid "/whisper > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:167
+#: src/commandhandler.cpp:171
 msgid "/w > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:168
+#: src/commandhandler.cpp:172
 msgid "/query > Makes a tab for private messages with another user"
 msgstr ""
 
-#: src/commandhandler.cpp:169
+#: src/commandhandler.cpp:174
 msgid "/q > Alias of query"
 msgstr ""
 
-#: src/commandhandler.cpp:171
+#: src/commandhandler.cpp:176
 msgid "/ignore > ignore a player"
 msgstr ""
 
-#: src/commandhandler.cpp:172
+#: src/commandhandler.cpp:177
 msgid "/unignore > stop ignoring a player"
 msgstr ""
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:179
 msgid "/list > Display all public channels"
 msgstr ""
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:180
 msgid "/join > Join or create a channel"
 msgstr ""
 
-#: src/commandhandler.cpp:177
+#: src/commandhandler.cpp:182
 msgid "/createparty > Create a new party"
 msgstr ""
 
-#: src/commandhandler.cpp:178
+#: src/commandhandler.cpp:183
 msgid "/party > Invite a user to party"
 msgstr ""
 
-#: src/commandhandler.cpp:180
+#: src/commandhandler.cpp:185
 msgid "/record > Start recording the chat to an external file"
 msgstr ""
 
-#: src/commandhandler.cpp:181
+#: src/commandhandler.cpp:187
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr ""
 
-#: src/commandhandler.cpp:182
+#: src/commandhandler.cpp:189
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
 
-#: src/commandhandler.cpp:184
+#: src/commandhandler.cpp:192
 msgid "/announce > Global announcement (GM only)"
 msgstr "/announce > Pengumuman global (khusus GM)"
 
-#: src/commandhandler.cpp:188
+#: src/commandhandler.cpp:196
 msgid "For more information, type /help <command>."
 msgstr ""
 
-#: src/commandhandler.cpp:192
+#: src/commandhandler.cpp:200
 msgid "Command: /help"
 msgstr "Perintah: /help"
 
-#: src/commandhandler.cpp:193
+#: src/commandhandler.cpp:201
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: src/commandhandler.cpp:194
+#: src/commandhandler.cpp:203
 msgid "Command: /help <command>"
 msgstr ""
 
-#: src/commandhandler.cpp:195
+#: src/commandhandler.cpp:204
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/commandhandler.cpp:203
+#: src/commandhandler.cpp:212
 msgid "Command: /announce <msg>"
 msgstr "Perintah: /announce <pesan>"
 
-#: src/commandhandler.cpp:204
+#: src/commandhandler.cpp:213
 msgid "*** only available to a GM ***"
 msgstr "*** hanya tersedia bagi GM ***"
 
-#: src/commandhandler.cpp:205
+#: src/commandhandler.cpp:214
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:210
+#: src/commandhandler.cpp:219
 msgid "Command: /clear"
 msgstr "Perintah: /clear"
 
-#: src/commandhandler.cpp:211
+#: src/commandhandler.cpp:220
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:224
 #, fuzzy
 msgid "Command: /ignore <player>"
 msgstr "Perintah: /announce <pesan>"
 
-#: src/commandhandler.cpp:216
+#: src/commandhandler.cpp:225
 msgid "This command ignores the given player regardless of current relations."
 msgstr ""
 
-#: src/commandhandler.cpp:221
+#: src/commandhandler.cpp:230
 msgid "Command: /join <channel>"
 msgstr ""
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:231
 msgid "This command makes you enter <channel>."
 msgstr ""
 
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:232
 msgid "If <channel> doesn't exist, it's created."
 msgstr ""
 
-#: src/commandhandler.cpp:227
+#: src/commandhandler.cpp:236
 msgid "Command: /list"
 msgstr ""
 
-#: src/commandhandler.cpp:228
+#: src/commandhandler.cpp:237
 msgid "This command shows a list of all channels."
 msgstr ""
 
-#: src/commandhandler.cpp:232
+#: src/commandhandler.cpp:241
 msgid "Command: /me <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:233
+#: src/commandhandler.cpp:242
 msgid "This command tell others you are (doing) <msg>."
 msgstr ""
 
-#: src/commandhandler.cpp:237
+#: src/commandhandler.cpp:246
 msgid "Command: /msg <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:238
+#: src/commandhandler.cpp:247
 msgid "Command: /whisper <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:239
+#: src/commandhandler.cpp:248
 msgid "Command: /w <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:240
+#: src/commandhandler.cpp:249
 msgid "This command sends the text <message> to <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:241 src/commandhandler.cpp:260
+#: src/commandhandler.cpp:250 src/commandhandler.cpp:269
 #: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
-#: src/net/ea/gui/guildtab.cpp:75 src/net/ea/gui/partytab.cpp:75
+#: src/net/tmwa/gui/guildtab.cpp:75 src/net/tmwa/gui/partytab.cpp:75
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:255
 msgid "Command: /query <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:247
+#: src/commandhandler.cpp:256
 msgid "Command: /q <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:248
+#: src/commandhandler.cpp:257
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:253
+#: src/commandhandler.cpp:262
 #, fuzzy
 msgid "Command: /createparty <name>"
 msgstr "Perintah: /clear"
 
-#: src/commandhandler.cpp:254
+#: src/commandhandler.cpp:263
 msgid "This command creates a new party called <name>."
 msgstr ""
 
-#: src/commandhandler.cpp:258
+#: src/commandhandler.cpp:267
 msgid "Command: /party <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:259 src/net/ea/gui/partytab.cpp:74
+#: src/commandhandler.cpp:268 src/net/tmwa/gui/partytab.cpp:74
 msgid "This command invites <nick> to party with you."
 msgstr ""
 
-#: src/commandhandler.cpp:265
+#: src/commandhandler.cpp:274
 msgid "Command: /present"
 msgstr ""
 
-#: src/commandhandler.cpp:266
+#: src/commandhandler.cpp:275
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: src/commandhandler.cpp:272
+#: src/commandhandler.cpp:281
 msgid "Command: /record <filename>"
 msgstr ""
 
-#: src/commandhandler.cpp:273
+#: src/commandhandler.cpp:282
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr ""
 
-#: src/commandhandler.cpp:275
+#: src/commandhandler.cpp:284
 msgid "Command: /record"
 msgstr ""
 
-#: src/commandhandler.cpp:276
+#: src/commandhandler.cpp:285
 msgid "This command finishes a recording session."
 msgstr ""
 
-#: src/commandhandler.cpp:280
+#: src/commandhandler.cpp:289
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: src/commandhandler.cpp:281
+#: src/commandhandler.cpp:290
 msgid ""
 "This command sets whether the return key should toggle the chat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: src/commandhandler.cpp:283
+#: src/commandhandler.cpp:292
 msgid ""
-"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
-"\", \"no\", \"false\" to turn the toggle off."
+"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
+"\"0\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: src/commandhandler.cpp:286
+#: src/commandhandler.cpp:295
 msgid "Command: /toggle"
 msgstr ""
 
-#: src/commandhandler.cpp:287
+#: src/commandhandler.cpp:296
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: src/commandhandler.cpp:291 src/gui/widgets/whispertab.cpp:93
+#: src/commandhandler.cpp:300 src/gui/widgets/whispertab.cpp:95
 #, fuzzy
 msgid "Command: /unignore <player>"
 msgstr "Perintah: /announce <pesan>"
 
-#: src/commandhandler.cpp:292
+#: src/commandhandler.cpp:301
 msgid "This command stops ignoring the given player if they are being ignored"
 msgstr ""
 
-#: src/commandhandler.cpp:297
+#: src/commandhandler.cpp:306
 msgid "Command: /where"
 msgstr ""
 
-#: src/commandhandler.cpp:298
+#: src/commandhandler.cpp:307
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: src/commandhandler.cpp:302
+#: src/commandhandler.cpp:311
 msgid "Command: /who"
 msgstr ""
 
-#: src/commandhandler.cpp:303
+#: src/commandhandler.cpp:312
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:309
+#: src/commandhandler.cpp:318
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: src/commandhandler.cpp:375
+#: src/commandhandler.cpp:384
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:383
+#: src/commandhandler.cpp:392
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:397
+#: src/commandhandler.cpp:406
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:410 src/net/ea/gui/partytab.cpp:109
+#: src/commandhandler.cpp:419 src/net/tmwa/gui/partytab.cpp:109
 msgid "Party name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:423 src/commandhandler.cpp:471
-#: src/commandhandler.cpp:493
+#: src/commandhandler.cpp:432 src/commandhandler.cpp:509
+#: src/commandhandler.cpp:531
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:441
+#: src/commandhandler.cpp:450
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:441
+#: src/commandhandler.cpp:450
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:450
+#: src/commandhandler.cpp:459
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:454
+#: src/commandhandler.cpp:463
 msgid "Message now closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:477
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:489
+msgid "Show IP: On"
+msgstr ""
+
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:485
+msgid "Show IP: Off"
+msgstr ""
+
+#: src/commandhandler.cpp:515
 msgid "Player already ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:484
+#: src/commandhandler.cpp:522
 msgid "Player successfully ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:486
+#: src/commandhandler.cpp:524
 msgid "Player could not be ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:501
+#: src/commandhandler.cpp:539
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:506
+#: src/commandhandler.cpp:544
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:508
+#: src/commandhandler.cpp:546
 msgid "Player could not be unignored!"
 msgstr ""
 
@@ -468,40 +483,40 @@ msgstr ""
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:326
+#: src/game.cpp:342
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:331
+#: src/game.cpp:347
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:355
+#: src/game.cpp:378
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:360
+#: src/game.cpp:382
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:705
+#: src/game.cpp:721
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:712
+#: src/game.cpp:726
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:946
+#: src/game.cpp:954
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:947
+#: src/game.cpp:955
 #, c-format
 msgid "Error while loading %s"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:75
+#: src/gui/beingpopup.cpp:76
 #, c-format
 msgid "Party: %s"
 msgstr ""
@@ -510,34 +525,34 @@ msgstr ""
 msgid "Buy"
 msgstr "Beli"
 
-#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
-#: src/gui/sell.cpp:276
+#: src/gui/buy.cpp:69 src/gui/buy.cpp:261 src/gui/sell.cpp:71
+#: src/gui/sell.cpp:288
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:99 src/gui/npcdialog.cpp:100
-#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:479
+#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:112 src/gui/npcdialog.cpp:124
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:463
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:98 src/gui/npcdialog.cpp:101
-#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:491
+#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:111 src/gui/npcdialog.cpp:125
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:475
 msgid "-"
 msgstr ""
 
 #: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
-#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:182
-#: src/keyboardconfig.cpp:103
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:228
+#: src/keyboardconfig.cpp:102
 msgid "Quit"
 msgstr "Keluar"
 
-#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:408
-#: src/gui/statuswindow.cpp:478 src/gui/statuswindow.cpp:512
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:384
+#: src/gui/statuswindow.cpp:462 src/gui/statuswindow.cpp:496
 msgid "Max"
 msgstr ""
 
@@ -551,11 +566,11 @@ msgstr "Jual"
 
 #: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
 #: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
-#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:101
-#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:178
-#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:402
+#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:114
+#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:389
 #: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
-#: src/gui/socialwindow.cpp:242 src/gui/textdialog.cpp:39
+#: src/gui/socialwindow.cpp:275 src/gui/textdialog.cpp:40
 #: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr "Batal"
@@ -592,7 +607,7 @@ msgstr ""
 msgid "Change Password"
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:53
+#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:55
 #: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
 msgid "Password:"
 msgstr "Kata Sandi:"
@@ -623,19 +638,19 @@ msgstr ""
 msgid "Create Character"
 msgstr "Buat Karakter"
 
-#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:52
+#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:54
 #: src/gui/register.cpp:67
 msgid "Name:"
 msgstr "Nama:"
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
 #: src/gui/outfitwindow.cpp:67
 msgid ">"
 msgstr ""
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
 #: src/gui/outfitwindow.cpp:66
@@ -652,8 +667,8 @@ msgstr "Warna Rambut:"
 msgid "Hair style:"
 msgstr "Gaya Rambut:"
 
-#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:397
-#: src/gui/socialwindow.cpp:296
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:392
+#: src/gui/socialwindow.cpp:329
 msgid "Create"
 msgstr "Buat"
 
@@ -709,33 +724,33 @@ msgstr "Tidak terdaftar"
 msgid "Change Email"
 msgstr "Ubah"
 
-#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:185
-#: src/gui/setup_players.cpp:230
+#: src/gui/charselectdialog.cpp:336 src/gui/serverdialog.cpp:231
+#: src/gui/setup_players.cpp:229
 msgid "Delete"
 msgstr "Hapus"
 
-#: src/gui/charselectdialog.cpp:387
+#: src/gui/charselectdialog.cpp:380
 msgid "Choose"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:399 src/gui/charselectdialog.cpp:400
+#: src/gui/charselectdialog.cpp:394 src/gui/charselectdialog.cpp:395
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:77 src/gui/palette.cpp:96
+#: src/gui/chat.cpp:88
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chat.cpp:287
+#: src/gui/chat.cpp:311
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:305
+#: src/gui/chat.cpp:329
 msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:469
+#: src/gui/chat.cpp:493
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -797,142 +812,172 @@ msgstr ""
 msgid "Ambient FX: %s"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:56
+#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:55
 msgid "Equipment"
 msgstr "Perlengkapan"
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:77
-#: src/gui/inventorywindow.cpp:79 src/gui/inventorywindow.cpp:298
-#: src/gui/popupmenu.cpp:372
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:89
+#: src/gui/inventorywindow.cpp:337 src/gui/popupmenu.cpp:359
 msgid "Unequip"
 msgstr ""
 
-#: src/gui/help.cpp:36
+#: src/gui/help.cpp:37
 msgid "Help"
 msgstr ""
 
-#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:73
+#: src/gui/help.cpp:51 src/gui/npcdialog.cpp:50
 msgid "Close"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:56 src/gui/windowmenu.cpp:57
+#: src/gui/inventorywindow.cpp:59 src/gui/windowmenu.cpp:56
 msgid "Inventory"
 msgstr "Inventaris"
 
-#: src/gui/inventorywindow.cpp:72 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:300 src/gui/popupmenu.cpp:374
+#: src/gui/inventorywindow.cpp:59
+msgid "Storage"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:82
+msgid "Slots:"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:87 src/gui/inventorywindow.cpp:100
+#: src/gui/inventorywindow.cpp:339 src/gui/popupmenu.cpp:361
 msgid "Equip"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:304 src/gui/popupmenu.cpp:377
+#: src/gui/inventorywindow.cpp:88
 msgid "Use"
 msgstr "Gunakan"
 
-#: src/gui/inventorywindow.cpp:83 src/gui/inventorywindow.cpp:308
-#: src/gui/popupmenu.cpp:380
+#: src/gui/inventorywindow.cpp:101 src/gui/popupmenu.cpp:364
+msgid "Activate"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:102 src/gui/inventorywindow.cpp:348
+#: src/gui/popupmenu.cpp:367
 #, fuzzy
 msgid "Drop..."
 msgstr "Jatuh"
 
-#: src/gui/inventorywindow.cpp:84 src/gui/popupmenu.cpp:386
+#: src/gui/inventorywindow.cpp:103 src/gui/popupmenu.cpp:373
 msgid "Split"
 msgstr "Pecah"
 
-#: src/gui/inventorywindow.cpp:85 src/gui/outfitwindow.cpp:51
+#: src/gui/inventorywindow.cpp:104 src/gui/outfitwindow.cpp:51
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:96 src/gui/storagewindow.cpp:83
-msgid "Slots:"
+#: src/gui/inventorywindow.cpp:106
+msgid "Weight:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:97
-msgid "Weight:"
+#: src/gui/inventorywindow.cpp:124 src/gui/popupmenu.cpp:378
+msgid "Store"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:125 src/gui/popupmenu.cpp:385
+msgid "Retrieve"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:310 src/gui/popupmenu.cpp:382
+#: src/gui/inventorywindow.cpp:350 src/gui/popupmenu.cpp:369
 msgid "Drop"
 msgstr "Jatuh"
 
-#: src/gui/itemamount.cpp:100 src/gui/okdialog.cpp:42
-#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:38 src/gui/trade.cpp:73
-#: src/gui/trade.cpp:75
+#: src/gui/itemamount.cpp:113 src/gui/okdialog.cpp:42
+#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:39 src/gui/trade.cpp:72
+#: src/gui/trade.cpp:74
 msgid "OK"
 msgstr ""
 
-#: src/gui/itemamount.cpp:102
+#: src/gui/itemamount.cpp:115
 msgid "All"
 msgstr ""
 
-#: src/gui/itemamount.cpp:128
+#: src/gui/itemamount.cpp:141
 msgid "Select amount of items to trade."
 msgstr "Pilih jumlah item yang mau di perdagangkan"
 
-#: src/gui/itemamount.cpp:131
+#: src/gui/itemamount.cpp:144
 msgid "Select amount of items to drop."
 msgstr "Pilih jumlah item yang mau di buang"
 
-#: src/gui/itemamount.cpp:134
+#: src/gui/itemamount.cpp:147
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/itemamount.cpp:137
+#: src/gui/itemamount.cpp:150
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamount.cpp:140
+#: src/gui/itemamount.cpp:153
 msgid "Select amount of items to split."
 msgstr "Pilih jumlah item yang mau di pisahkan"
 
-#: src/gui/itempopup.cpp:92
+#: src/gui/itempopup.cpp:137
 #, fuzzy, c-format
 msgid "Weight: %s"
 msgstr "Efek: %s"
 
-#: src/gui/login.cpp:49 src/gui/login.cpp:61
+#: src/gui/login.cpp:51 src/gui/login.cpp:63
 msgid "Login"
 msgstr "Login"
 
-#: src/gui/login.cpp:58
+#: src/gui/login.cpp:60
 msgid "Remember username"
 msgstr ""
 
-#: src/gui/login.cpp:59 src/gui/register.cpp:58 src/gui/register.cpp:73
+#: src/gui/login.cpp:61 src/gui/register.cpp:58 src/gui/register.cpp:73
 msgid "Register"
 msgstr "Mendaftar"
 
-#: src/gui/login.cpp:60
+#: src/gui/login.cpp:62
 #, fuzzy
 msgid "Change Server"
 msgstr "Ubah"
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
+#: src/gui/login.cpp:129
+msgid "Registration disabled"
+msgstr ""
+
+#: src/gui/login.cpp:129
+msgid "You need to use the website to register an account for this server."
+msgstr ""
+
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:86
 msgid "Map"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:44
+#: src/gui/ministatus.cpp:235
+msgid "Need"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:48
 msgid "Waiting for server"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:45
+#: src/gui/npcdialog.cpp:49
 msgid "Next"
 msgstr "Berikutnya"
 
-#: src/gui/npcdialog.cpp:47
+#: src/gui/npcdialog.cpp:51
 msgid "Submit"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:52 src/gui/npcpostdialog.cpp:41
+#: src/gui/npcdialog.cpp:73 src/gui/npcpostdialog.cpp:41
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:110
+#: src/gui/npcdialog.cpp:118
+msgid "Clear log"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:134
 msgid "Reset"
 msgstr ""
 
 #. TRANSLATORS: Please leave the \n sequences intact.
-#: src/gui/npcdialog.cpp:171
+#: src/gui/npcdialog.cpp:208
 #, fuzzy
 msgid ""
 "\n"
@@ -947,7 +992,7 @@ msgstr ""
 msgid "Send"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:96
+#: src/gui/npcpostdialog.cpp:99
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
@@ -961,303 +1006,82 @@ msgstr ""
 msgid "Unequip first"
 msgstr ""
 
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:143
-msgid "Text"
-msgstr ""
-
-#: src/gui/palette.cpp:82
-msgid "Text Shadow"
-msgstr ""
-
-#: src/gui/palette.cpp:83
-msgid "Text Outline"
-msgstr ""
-
-#: src/gui/palette.cpp:84
-msgid "Progress Bar Labels"
-msgstr ""
-
-#: src/gui/palette.cpp:85
-msgid "Buttons"
-msgstr ""
-
-#: src/gui/palette.cpp:86
-msgid "Disabled Buttons"
-msgstr ""
-
-#: src/gui/palette.cpp:87
-msgid "Tabs"
-msgstr ""
-
-#: src/gui/palette.cpp:89
-msgid "Background"
-msgstr ""
-
-#: src/gui/palette.cpp:91
-msgid "Highlight"
-msgstr ""
-
-#: src/gui/palette.cpp:92
-msgid "Tab Highlight"
-msgstr ""
-
-#: src/gui/palette.cpp:93
-msgid "Item Too Expensive"
-msgstr ""
-
-#: src/gui/palette.cpp:94
-msgid "Item Is Equipped"
-msgstr ""
-
-#: src/gui/palette.cpp:97
-msgid "GM"
-msgstr ""
-
-#: src/gui/palette.cpp:98
-msgid "Player"
-msgstr ""
-
-#: src/gui/palette.cpp:99
-msgid "Whisper"
-msgstr ""
-
-#: src/gui/palette.cpp:100
-msgid "Is"
-msgstr ""
-
-#: src/gui/palette.cpp:101 src/net/ea/gui/partytab.cpp:43
-msgid "Party"
-msgstr ""
-
-#: src/gui/palette.cpp:102 src/net/ea/gui/guildtab.cpp:45
-msgid "Guild"
-msgstr ""
-
-#: src/gui/palette.cpp:103
-msgid "Server"
-msgstr ""
-
-#: src/gui/palette.cpp:104
-msgid "Logger"
-msgstr ""
-
-#: src/gui/palette.cpp:105
-msgid "Hyperlink"
-msgstr ""
-
-#: src/gui/palette.cpp:107
-msgid "Being"
-msgstr ""
-
-#: src/gui/palette.cpp:108
-msgid "Other Players' Names"
-msgstr ""
-
-#: src/gui/palette.cpp:109
-msgid "Own Name"
-msgstr ""
-
-#: src/gui/palette.cpp:110
-msgid "GM Names"
-msgstr ""
-
-#: src/gui/palette.cpp:111
-msgid "NPCs"
-msgstr ""
-
-#: src/gui/palette.cpp:112
-msgid "Monsters"
-msgstr ""
-
-#: src/gui/palette.cpp:114
-msgid "Unknown Item Type"
-msgstr ""
-
-#: src/gui/palette.cpp:115
-msgid "Generics"
-msgstr ""
-
-#: src/gui/palette.cpp:116
-msgid "Hats"
-msgstr ""
-
-#: src/gui/palette.cpp:117
-msgid "Usables"
-msgstr ""
-
-#: src/gui/palette.cpp:118
-msgid "Shirts"
-msgstr ""
-
-#: src/gui/palette.cpp:119
-msgid "One Handed Weapons"
-msgstr ""
-
-#: src/gui/palette.cpp:120
-msgid "Pants"
-msgstr ""
-
-#: src/gui/palette.cpp:121
-msgid "Shoes"
-msgstr ""
-
-#: src/gui/palette.cpp:122
-msgid "Two Handed Weapons"
-msgstr ""
-
-#: src/gui/palette.cpp:123
-msgid "Shields"
-msgstr ""
-
-#: src/gui/palette.cpp:124
-msgid "Rings"
-msgstr ""
-
-#: src/gui/palette.cpp:125
-msgid "Necklaces"
-msgstr ""
-
-#: src/gui/palette.cpp:126
-msgid "Arms"
-msgstr ""
-
-#: src/gui/palette.cpp:127
-msgid "Ammo"
-msgstr ""
-
-#: src/gui/palette.cpp:129
-msgid "Particle Effects"
-msgstr ""
-
-#: src/gui/palette.cpp:130
-msgid "Pickup Notification"
-msgstr ""
-
-#: src/gui/palette.cpp:131
-msgid "Exp Notification"
-msgstr ""
-
-#: src/gui/palette.cpp:133
-msgid "Player Hits Monster"
-msgstr ""
-
-#: src/gui/palette.cpp:135
-msgid "Monster Hits Player"
-msgstr ""
-
-#: src/gui/palette.cpp:136
-msgid "Critical Hit"
-msgstr ""
-
-#: src/gui/palette.cpp:137
-msgid "Misses"
-msgstr ""
-
-#: src/gui/palette.cpp:139
-msgid "HP Bar"
-msgstr ""
-
-#: src/gui/palette.cpp:140
-msgid "3/4 HP Bar"
-msgstr ""
-
-#: src/gui/palette.cpp:141
-msgid "1/2 HP Bar"
-msgstr ""
-
-#: src/gui/palette.cpp:142
-msgid "1/4 HP Bar"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:84
+#: src/gui/popupmenu.cpp:83
 #, fuzzy, c-format
 msgid "Trade with %s..."
 msgstr "@@trade|Dagang Dengan %s@@"
 
-#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:161
+#: src/gui/popupmenu.cpp:87 src/gui/popupmenu.cpp:158
 #, fuzzy, c-format
 msgid "Attack %s"
 msgstr "Serangan %+d"
 
-#: src/gui/popupmenu.cpp:92
+#: src/gui/popupmenu.cpp:91
 #, c-format
 msgid "Whisper %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:101
+#: src/gui/popupmenu.cpp:100
 #, c-format
 msgid "Befriend %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:106
+#: src/gui/popupmenu.cpp:105
 #, c-format
 msgid "Disregard %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:109
+#: src/gui/popupmenu.cpp:108
 #, c-format
 msgid "Ignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:115 src/gui/popupmenu.cpp:124
+#: src/gui/popupmenu.cpp:114 src/gui/popupmenu.cpp:123
 #, c-format
 msgid "Unignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:118
+#: src/gui/popupmenu.cpp:117
 #, c-format
 msgid "Completely ignore %s"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:130
 #, c-format
-msgid "Follow %s"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:133
-#, c-format
 msgid "Invite %s to join your guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:137
+#: src/gui/popupmenu.cpp:134
 #, c-format
 msgid "Invite %s to join your party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144
+#: src/gui/popupmenu.cpp:141
 msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:153
+#: src/gui/popupmenu.cpp:150
 #, c-format
 msgid "Talk to %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:166
+#: src/gui/popupmenu.cpp:163
 msgid "Kick monster"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:174
+#: src/gui/popupmenu.cpp:171
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:191
+#: src/gui/popupmenu.cpp:188
 #, c-format
 msgid "Pick up %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:400
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:387
 msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:70
-msgid "Store"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:71
-msgid "Retrieve"
-msgstr ""
-
 #: src/gui/quitdialog.cpp:44
 msgid "Switch server"
 msgstr "Ganti Server"
@@ -1326,50 +1150,63 @@ msgstr ""
 msgid "Passwords do not match."
 msgstr "Kata sandi tidak sama."
 
-#: src/gui/serverdialog.cpp:134
+#: src/gui/serverdialog.cpp:197
 msgid "Choose Your Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:141 src/gui/widgets/chattab.cpp:139
+#: src/gui/serverdialog.cpp:206 src/gui/widgets/chattab.cpp:142
 msgid "Server:"
 msgstr "Server:"
 
-#: src/gui/serverdialog.cpp:142
+#: src/gui/serverdialog.cpp:207
 msgid "Port:"
 msgstr "Port:"
 
-#: src/gui/serverdialog.cpp:143
+#: src/gui/serverdialog.cpp:208
 #, fuzzy
 msgid "Server type:"
 msgstr "Server:"
 
-#: src/gui/serverdialog.cpp:183
+#: src/gui/serverdialog.cpp:229
 #, fuzzy
 msgid "Connect"
 msgstr "Menyambung..."
 
-#: src/gui/serverdialog.cpp:184
+#: src/gui/serverdialog.cpp:230
 #, fuzzy
 msgid "Custom Server"
 msgstr "Server:"
 
-#: src/gui/serverdialog.cpp:262
+#: src/gui/serverdialog.cpp:324
 msgid "Please type both the address and the port of a server."
 msgstr "Tolong tulis address dan port dari server"
 
-#: src/gui/serverdialog.cpp:411
+#: src/gui/serverdialog.cpp:441
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:417
+#: src/gui/serverdialog.cpp:447
 msgid "Waiting for server..."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:421
+#: src/gui/serverdialog.cpp:451
 msgid "Preparing download"
 msgstr ""
 
+#: src/gui/serverdialog.cpp:455
+msgid "Error retreiving server list!"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:550
+msgid "requires a newer version"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:552
+#, c-format
+msgid "requires v%s"
+msgstr ""
+
 #: src/gui/setup_audio.cpp:42
 msgid "Sound"
 msgstr "Suara"
@@ -1402,50 +1239,50 @@ msgstr ""
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:44
+#: src/gui/setup_colors.cpp:46
 msgid "This is what the color looks like"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:49
+#: src/gui/setup_colors.cpp:51
 msgid "Colors"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:70
+#: src/gui/setup_colors.cpp:72
 msgid "Type:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:81 src/gui/setup_colors.cpp:433
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:331
 msgid "Static"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:84
-#: src/gui/setup_colors.cpp:434
+#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
+#: src/gui/setup_colors.cpp:332
 msgid "Pulse"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
+#: src/gui/setup_colors.cpp:333
 msgid "Rainbow"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
+#: src/gui/setup_colors.cpp:333
 msgid "Spectrum"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:92
+#: src/gui/setup_colors.cpp:94
 msgid "Delay:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:107
+#: src/gui/setup_colors.cpp:109
 msgid "Red:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:122
+#: src/gui/setup_colors.cpp:124
 msgid "Green:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:137
+#: src/gui/setup_colors.cpp:139
 msgid "Blue:"
 msgstr ""
 
@@ -1490,569 +1327,581 @@ msgid "Assign"
 msgstr ""
 
 #: src/gui/setup_keyboard.cpp:90
+msgid "Unassign"
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:94
 msgid "Default"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:119
+#: src/gui/setup_keyboard.cpp:125
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_players.cpp:57
+#: src/gui/setup_players.cpp:58
 msgid "Name"
 msgstr ""
 
-#: src/gui/setup_players.cpp:58
+#: src/gui/setup_players.cpp:59
 msgid "Relation"
 msgstr ""
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:64
 msgid "Neutral"
 msgstr ""
 
-#: src/gui/setup_players.cpp:64
+#: src/gui/setup_players.cpp:65
 msgid "Friend"
 msgstr ""
 
-#: src/gui/setup_players.cpp:65
+#: src/gui/setup_players.cpp:66
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_players.cpp:67
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_players.cpp:208 src/gui/setup_video.cpp:132
+#: src/gui/setup_players.cpp:206 src/gui/setup_video.cpp:153
 msgid "???"
 msgstr ""
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_players.cpp:225
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_players.cpp:228
+#: src/gui/setup_players.cpp:227
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:231
 msgid "Put all whispers in tabs"
 msgstr ""
 
-#: src/gui/setup_players.cpp:234
+#: src/gui/setup_players.cpp:233
 msgid "Show gender"
 msgstr ""
 
-#: src/gui/setup_players.cpp:236
+#: src/gui/setup_players.cpp:235
+msgid "Enable Chat log"
+msgstr ""
+
+#: src/gui/setup_players.cpp:237
 msgid "Players"
 msgstr ""
 
-#: src/gui/setup_players.cpp:261
+#: src/gui/setup_players.cpp:262
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:113
+#: src/gui/setup_video.cpp:134
 msgid "Tiny"
 msgstr ""
 
-#: src/gui/setup_video.cpp:114
+#: src/gui/setup_video.cpp:135
 msgid "Small"
 msgstr ""
 
-#: src/gui/setup_video.cpp:115
+#: src/gui/setup_video.cpp:136
 msgid "Medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:116
+#: src/gui/setup_video.cpp:137
 msgid "Large"
 msgstr ""
 
-#: src/gui/setup_video.cpp:142
+#: src/gui/setup_video.cpp:163
 msgid "No text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:144
+#: src/gui/setup_video.cpp:164
+msgid "Text"
+msgstr ""
+
+#: src/gui/setup_video.cpp:165
 msgid "Bubbles, no names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:145
+#: src/gui/setup_video.cpp:166
 msgid "Bubbles with names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:157
+#: src/gui/setup_video.cpp:178
 msgid "off"
 msgstr "mati"
 
-#: src/gui/setup_video.cpp:158 src/gui/setup_video.cpp:171
+#: src/gui/setup_video.cpp:179 src/gui/setup_video.cpp:192
 msgid "low"
 msgstr "rendah"
 
-#: src/gui/setup_video.cpp:159 src/gui/setup_video.cpp:173
+#: src/gui/setup_video.cpp:180 src/gui/setup_video.cpp:194
 msgid "high"
 msgstr "tinggi"
 
-#: src/gui/setup_video.cpp:172
+#: src/gui/setup_video.cpp:193
 msgid "medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:174
+#: src/gui/setup_video.cpp:195
 msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:196
+#: src/gui/setup_video.cpp:217
 msgid "Full screen"
 msgstr "Layar penuh"
 
-#: src/gui/setup_video.cpp:197
+#: src/gui/setup_video.cpp:218
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:198
+#: src/gui/setup_video.cpp:219
 msgid "Custom cursor"
 msgstr ""
 
-#: src/gui/setup_video.cpp:200
+#: src/gui/setup_video.cpp:221
 msgid "Visible names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:223
 msgid "Particle effects"
 msgstr ""
 
-#: src/gui/setup_video.cpp:204
+#: src/gui/setup_video.cpp:225
 msgid "Show own name"
 msgstr ""
 
-#: src/gui/setup_video.cpp:205
+#: src/gui/setup_video.cpp:226
+msgid "Log NPC dialogue"
+msgstr ""
+
+#: src/gui/setup_video.cpp:227
 msgid "Show pickup notification"
 msgstr ""
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:207
+#. TRANSLATORS: Refers to "Show pickup notification"
+#: src/gui/setup_video.cpp:229
 msgid "in chat"
 msgstr ""
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:209
+#. TRANSLATORS: Refers to "Show pickup notification"
+#: src/gui/setup_video.cpp:231
 msgid "as particle"
 msgstr ""
 
-#: src/gui/setup_video.cpp:214
+#: src/gui/setup_video.cpp:236
 #, fuzzy
 msgid "FPS limit:"
 msgstr "Batas FPS"
 
-#: src/gui/setup_video.cpp:225
+#: src/gui/setup_video.cpp:247
+msgid "Disable transparency (Low CPU mode)"
+msgstr ""
+
+#: src/gui/setup_video.cpp:250
 msgid "Video"
 msgstr "Video"
 
-#: src/gui/setup_video.cpp:227
-msgid "Show monster damage"
+#: src/gui/setup_video.cpp:252
+msgid "Show damage"
 msgstr ""
 
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:258
 msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:259
 msgid "Gui opacity"
 msgstr ""
 
-#: src/gui/setup_video.cpp:235
+#: src/gui/setup_video.cpp:260
 msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_video.cpp:236
+#: src/gui/setup_video.cpp:261
 msgid "Particle detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237
+#: src/gui/setup_video.cpp:262
 msgid "Font size"
 msgstr ""
 
-#: src/gui/setup_video.cpp:251 src/gui/setup_video.cpp:454
-#: src/gui/setup_video.cpp:568
+#: src/gui/setup_video.cpp:277 src/gui/setup_video.cpp:532
+#: src/gui/setup_video.cpp:662
 #, fuzzy
 msgid "None"
 msgstr "Tidak"
 
-#: src/gui/setup_video.cpp:381
+#: src/gui/setup_video.cpp:426
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:387
+#: src/gui/setup_video.cpp:432
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:398
+#: src/gui/setup_video.cpp:443
 #, fuzzy
 msgid "Switching to Full Screen"
 msgstr "Mengganti ke layar penuh"
 
-#: src/gui/setup_video.cpp:399
+#: src/gui/setup_video.cpp:444
 msgid "Restart needed for changes to take effect."
 msgstr "Memulai dari awal di butuhkan untuk melihat efek"
 
-#: src/gui/setup_video.cpp:411
+#: src/gui/setup_video.cpp:458
 #, fuzzy
 msgid "Changing to OpenGL"
 msgstr "Mengubah OpenGL"
 
-#: src/gui/setup_video.cpp:412
+#: src/gui/setup_video.cpp:459
+msgid ""
+"Applying change to OpenGL requires restart. In case OpenGL messes up your "
+"game graphics, restart the game with the command line option \"--no-opengl\"."
+msgstr ""
+
+#: src/gui/setup_video.cpp:466
+msgid "Deactivating OpenGL"
+msgstr ""
+
+#: src/gui/setup_video.cpp:467
 msgid "Applying change to OpenGL requires restart."
 msgstr "Mendaftar perubahan ke OpenGL membutuhkan memulai dari awal"
 
-#: src/gui/setup_video.cpp:486 src/gui/setup_video.cpp:491
+#: src/gui/setup_video.cpp:475
+msgid "Transparency disabled"
+msgstr ""
+
+#: src/gui/setup_video.cpp:476 src/gui/setup_video.cpp:484
+msgid "You must restart to apply changes."
+msgstr ""
+
+#: src/gui/setup_video.cpp:483
+msgid "Transparency enabled"
+msgstr ""
+
+#: src/gui/setup_video.cpp:576 src/gui/setup_video.cpp:581
 msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:487 src/gui/setup_video.cpp:492
+#: src/gui/setup_video.cpp:577 src/gui/setup_video.cpp:582
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:489
+#: src/gui/setup_video.cpp:579
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:522
+#: src/gui/setup_video.cpp:612
 msgid "Particle Effect Settings Changed."
 msgstr ""
 
-#: src/gui/setup_video.cpp:523
+#: src/gui/setup_video.cpp:613
 msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skilldialog.cpp:197 src/gui/windowmenu.cpp:58
+#: src/gui/skilldialog.cpp:212 src/gui/windowmenu.cpp:59
 msgid "Skills"
 msgstr "Keahlian"
 
-#: src/gui/skilldialog.cpp:208
+#: src/gui/skilldialog.cpp:223
 msgid "Up"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:262
+#: src/gui/skilldialog.cpp:269
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:314
+#: src/gui/skilldialog.cpp:351
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:323
+#: src/gui/skilldialog.cpp:360
 #, fuzzy, c-format
 msgid "Skill %d"
 msgstr "Keahlian"
 
-#: src/gui/skilldialog.cpp:405
+#: src/gui/skilldialog.cpp:442
 #, fuzzy, c-format
 msgid "Lvl: %d (%+d)"
 msgstr "Tingkatan: %d"
 
-#: src/gui/skilldialog.cpp:416
+#: src/gui/skilldialog.cpp:453
 #, fuzzy, c-format
 msgid "Lvl: %d"
 msgstr "Tingkatan: %d"
 
-#: src/gui/socialwindow.cpp:117
+#: src/gui/socialwindow.cpp:126
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:126
+#: src/gui/socialwindow.cpp:139
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:136
+#: src/gui/socialwindow.cpp:153
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:137
+#: src/gui/socialwindow.cpp:154
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:146
+#: src/gui/socialwindow.cpp:163
 msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:147
+#: src/gui/socialwindow.cpp:164
 #, fuzzy, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Apakah anda bersungguh-sungguh ingin menghapus karakter ini?"
 
-#: src/gui/socialwindow.cpp:182
+#: src/gui/socialwindow.cpp:207 src/net/tmwa/partyhandler.cpp:330
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:218
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:199
+#: src/gui/socialwindow.cpp:232
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:200
+#: src/gui/socialwindow.cpp:233
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:209
+#: src/gui/socialwindow.cpp:242
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:210
+#: src/gui/socialwindow.cpp:243
 #, fuzzy, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Apakah anda bersungguh-sungguh ingin menghapus karakter ini?"
 
-#: src/gui/socialwindow.cpp:239
+#: src/gui/socialwindow.cpp:272
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:240 src/gui/socialwindow.cpp:564
+#: src/gui/socialwindow.cpp:273 src/gui/socialwindow.cpp:620
 #, fuzzy
 msgid "Create Party"
 msgstr "Buat Karakter"
 
-#: src/gui/socialwindow.cpp:279 src/gui/windowmenu.cpp:60
+#: src/gui/socialwindow.cpp:312 src/gui/windowmenu.cpp:64
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:297
+#: src/gui/socialwindow.cpp:330
 msgid "Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:298
+#: src/gui/socialwindow.cpp:331
 msgid "Leave"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:394
+#: src/gui/socialwindow.cpp:443
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:400
+#: src/gui/socialwindow.cpp:449
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:413
+#: src/gui/socialwindow.cpp:462
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:419
+#: src/gui/socialwindow.cpp:468
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:463
+#: src/gui/socialwindow.cpp:497
+msgid "Creating guild failed, please choose a shorter name."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:504
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:477
+#: src/gui/socialwindow.cpp:520
+msgid "Creating party failed, please choose a shorter name."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:527
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:484
+#: src/gui/socialwindow.cpp:541
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:485
+#: src/gui/socialwindow.cpp:542
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:497
+#: src/gui/socialwindow.cpp:554
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:502
+#: src/gui/socialwindow.cpp:559
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:507
+#: src/gui/socialwindow.cpp:564
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:519
+#: src/gui/socialwindow.cpp:576
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:529
+#: src/gui/socialwindow.cpp:585
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:533
+#: src/gui/socialwindow.cpp:589
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:541
+#: src/gui/socialwindow.cpp:597
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:546
+#: src/gui/socialwindow.cpp:602
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:554
+#: src/gui/socialwindow.cpp:610
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:565
+#: src/gui/socialwindow.cpp:621
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:570
+#: src/gui/socialwindow.cpp:626
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:571
+#: src/gui/socialwindow.cpp:627
 msgid "Choose your party's name."
 msgstr ""
 
-#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:59
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:62
 msgid "Specials"
 msgstr ""
 
-#: src/gui/specialswindow.cpp:174
-#, c-format
-msgid "Specials Set %d"
-msgstr ""
-
-#: src/gui/specialswindow.cpp:191
-#, c-format
-msgid "Special %d"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:99 src/gui/statuswindow.cpp:247
+#: src/gui/statuswindow.cpp:113 src/gui/statuswindow.cpp:215
+#: src/gui/statuswindow.cpp:262
 #, c-format
 msgid "Level: %d"
 msgstr "Tingkatan: %d"
 
-#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:211
+#: src/gui/statuswindow.cpp:114 src/gui/statuswindow.cpp:208
+#: src/gui/statuswindow.cpp:239
 #, c-format
 msgid "Money: %s"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:102
+#: src/gui/statuswindow.cpp:117
 msgid "HP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:107
+#: src/gui/statuswindow.cpp:122
 msgid "Exp:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:112
+#: src/gui/statuswindow.cpp:130
 msgid "MP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:132 src/gui/statuswindow.cpp:219
+#: src/gui/statuswindow.cpp:158 src/gui/statuswindow.cpp:275
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:133
+#: src/gui/statuswindow.cpp:159
 msgid "Job:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:194
-msgid "HP"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:200
-msgid "MP"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:206
-msgid "Exp"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:215
-#, fuzzy
-msgid "Money"
-msgstr "Uang: %d"
-
-#: src/gui/statuswindow.cpp:225
-msgid "Job"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:229
+#: src/gui/statuswindow.cpp:211 src/gui/statuswindow.cpp:247
 #, fuzzy, c-format
 msgid "Character points: %d"
 msgstr "Stats Karakter OK"
 
-#: src/gui/statuswindow.cpp:235
+#: src/gui/statuswindow.cpp:255
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:251
-#, fuzzy
-msgid "Level"
-msgstr "Tingkatan: %d"
-
-#: src/gui/storagewindow.cpp:58
-msgid "Storage"
-msgstr ""
-
-#: src/gui/trade.cpp:52
+#: src/gui/trade.cpp:53
 msgid "Propose trade"
 msgstr "Menawarkan tukar menukar"
 
-#: src/gui/trade.cpp:53
+#: src/gui/trade.cpp:54
 msgid "Confirmed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:55
 msgid "Agree trade"
 msgstr ""
 
-#: src/gui/trade.cpp:55
+#: src/gui/trade.cpp:56
 msgid "Agreed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:58
+#: src/gui/trade.cpp:59
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/trade.cpp:74 src/gui/trade.cpp:75
+#: src/gui/trade.cpp:73 src/gui/trade.cpp:74
 msgid "Trade"
 msgstr ""
 
-#: src/gui/trade.cpp:77
+#: src/gui/trade.cpp:76
 msgid "Add"
 msgstr "Tambah"
 
-#: src/gui/trade.cpp:99 src/gui/trade.cpp:135
+#: src/gui/trade.cpp:98 src/gui/trade.cpp:134
 #, fuzzy, c-format
 msgid "You get %s"
 msgstr "Anda memberikan:"
 
-#: src/gui/trade.cpp:100
+#: src/gui/trade.cpp:99
 msgid "You give:"
 msgstr "Anda memberikan:"
 
-#: src/gui/trade.cpp:104
+#: src/gui/trade.cpp:103
 msgid "Change"
 msgstr "Ubah"
 
-#: src/gui/trade.cpp:275
+#: src/gui/trade.cpp:262
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/trade.cpp:318
+#: src/gui/trade.cpp:304
 msgid "You don't have enough money."
 msgstr ""
 
@@ -2073,21 +1922,21 @@ msgstr "Menyambung..."
 msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:405
+#: src/gui/updatewindow.cpp:417
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:407
+#: src/gui/updatewindow.cpp:419
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:409
+#: src/gui/updatewindow.cpp:421
 msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:501
+#: src/gui/updatewindow.cpp:515
 msgid "Completed"
 msgstr ""
 
@@ -2167,62 +2016,62 @@ msgstr ""
 msgid "Need a user to kick!"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:118
+#: src/gui/widgets/chattab.cpp:121
 msgid "Global announcement:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:124
+#: src/gui/widgets/chattab.cpp:127
 #, c-format
 msgid "Global announcement from %s:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:150
+#: src/gui/widgets/chattab.cpp:153
 #, c-format
 msgid "%s whispers: %s"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:51
+#: src/gui/widgets/whispertab.cpp:53
 msgid "Cannot send empty chat!"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:70
+#: src/gui/widgets/whispertab.cpp:72
 msgid "/ignore > Ignore the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:71
+#: src/gui/widgets/whispertab.cpp:73
 msgid "/unignore > Stop ignoring the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:72
+#: src/gui/widgets/whispertab.cpp:74
 msgid "/close > Close the whisper tab"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:82
+#: src/gui/widgets/whispertab.cpp:84
 msgid "Command: /close"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:83
+#: src/gui/widgets/whispertab.cpp:85
 msgid "This command closes the current whisper tab."
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:87
+#: src/gui/widgets/whispertab.cpp:89
 #, fuzzy
 msgid "Command: /ignore"
 msgstr "Perintah: /help"
 
-#: src/gui/widgets/whispertab.cpp:88
+#: src/gui/widgets/whispertab.cpp:90
 msgid "This command ignores the other player regardless of current relations."
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:94
+#: src/gui/widgets/whispertab.cpp:96
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:55
+#: src/gui/windowmenu.cpp:54
 msgid "Status"
 msgstr "Status"
 
-#: src/gui/windowmenu.cpp:61
+#: src/gui/windowmenu.cpp:65
 msgid "Shortcut"
 msgstr "Tombol Singkat"
 
@@ -2239,1362 +2088,1387 @@ msgstr "Ubah"
 msgid "Choose World"
 msgstr ""
 
-#: src/keyboardconfig.cpp:40
+#: src/keyboardconfig.cpp:39
 msgid "Move Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:41
+#: src/keyboardconfig.cpp:40
 msgid "Move Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:41
 msgid "Move Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:42
 msgid "Move Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:44 src/net/ea/generalhandler.cpp:223
+#: src/keyboardconfig.cpp:43 src/net/tmwa/generalhandler.cpp:237
 msgid "Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:44
 msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:45
 msgid "Smilie"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:46
 msgid "Talk"
 msgstr ""
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:47
 msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:48
 msgid "Target Monster"
 msgstr ""
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboardconfig.cpp:49
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:50
 msgid "Target Player"
 msgstr ""
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:51
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:52
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:53
 msgid "Sit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:54
 msgid "Screenshot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:55
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:56
 msgid "Find Path to Mouse"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58 src/keyboardconfig.cpp:59
-#: src/keyboardconfig.cpp:60 src/keyboardconfig.cpp:61
-#: src/keyboardconfig.cpp:62 src/keyboardconfig.cpp:63
-#: src/keyboardconfig.cpp:64 src/keyboardconfig.cpp:65
-#: src/keyboardconfig.cpp:66 src/keyboardconfig.cpp:67
-#: src/keyboardconfig.cpp:68 src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:57 src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60
+#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62
+#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64
+#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68
 #, c-format
 msgid "Item Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:69
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:70
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:71
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:72
 msgid "Equipment Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:73
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:74
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:75
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:76
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:77
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:78
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:79
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:80
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:81
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:83
+#: src/keyboardconfig.cpp:82
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:83
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86
-#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88
-#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90
-#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92
-#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:84 src/keyboardconfig.cpp:85
+#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:87
+#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:89
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:91
+#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:93
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:95
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:96
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:97
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:98
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:99
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:100
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:101
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:103
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:105
+#: src/keyboardconfig.cpp:104
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:178
+#: src/keyboardconfig.cpp:183
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:913
+#: src/localplayer.cpp:985
 msgid "Unable to pick up item."
 msgstr ""
 
 #. TRANSLATORS: This sentence may be translated differently
 #. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:922
+#: src/localplayer.cpp:994
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/main.cpp:43
+#: src/main.cpp:42
 msgid "mana [options] [mana-file]"
 msgstr ""
 
+#: src/main.cpp:43
+msgid "[mana-file] : The mana file is an XML file (.mana)"
+msgstr ""
+
 #: src/main.cpp:44
-msgid "Options:"
+msgid "              used to set custom parameters"
 msgstr ""
 
 #: src/main.cpp:45
+msgid "              to the mana client."
+msgstr ""
+
+#: src/main.cpp:47
+msgid "Options:"
+msgstr ""
+
+#: src/main.cpp:48
 msgid "  -v --version        : Display the version"
 msgstr ""
 
-#: src/main.cpp:46
+#: src/main.cpp:49
 msgid "  -h --help           : Display this help"
 msgstr ""
 
-#: src/main.cpp:47
+#: src/main.cpp:50
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
-#: src/main.cpp:48
+#: src/main.cpp:51
 msgid "  -U --username       : Login with this username"
 msgstr ""
 
-#: src/main.cpp:49
+#: src/main.cpp:52
 msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/main.cpp:50
+#: src/main.cpp:53
 msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/main.cpp:51
+#: src/main.cpp:54
 msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:52
+#: src/main.cpp:55
 msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/main.cpp:53
+#: src/main.cpp:56
 msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/main.cpp:54
+#: src/main.cpp:57
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:56
+#: src/main.cpp:59
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:57
+#: src/main.cpp:60
 msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:58
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
+#: src/main.cpp:61
+msgid "     --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/main.cpp:59
+#: src/main.cpp:62
+msgid "     --chat-log-dir   : Chat log dir to use"
+msgstr ""
+
+#: src/main.cpp:63
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/main.cpp:61
+#: src/main.cpp:65
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:63
+#: src/net/manaserv/beinghandler.cpp:303 src/net/tmwa/playerhandler.cpp:94
+msgid "You are dead."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:304 src/net/tmwa/playerhandler.cpp:95
+msgid "We regret to inform you that your character was killed in battle."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:306 src/net/tmwa/playerhandler.cpp:97
+msgid "You are not that alive anymore."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:307 src/net/tmwa/playerhandler.cpp:98
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:308 src/net/tmwa/playerhandler.cpp:99
+msgid "Game Over!"
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:309 src/net/tmwa/playerhandler.cpp:101
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:311 src/net/tmwa/playerhandler.cpp:103
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:313 src/net/tmwa/playerhandler.cpp:105
+msgid "I guess this did not run too well."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:107
+msgid "Do you want your possessions identified?"
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:109
+msgid "Sadly, no trace of you was ever found..."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:111
+msgid "Annihilated."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:113
+msgid "Looks like you got your head handed to you."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:115
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:323
+msgid "Press OK to respawn."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:324
+#, fuzzy
+msgid "You Died"
+msgstr "Anda memberikan:"
+
+#: src/net/manaserv/charhandler.cpp:138 src/net/manaserv/charhandler.cpp:209
+msgid "Not logged in."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:141
+msgid "No empty slot."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:144
+msgid "Invalid name."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:147
+msgid "Character's name already exists."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:150
+msgid "Invalid hairstyle."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:153
+msgid "Invalid hair color."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:156
+msgid "Invalid gender."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:159
+#, fuzzy
+msgid "Character's stats are too high."
+msgstr "Stats Karakter OK"
+
+#: src/net/manaserv/charhandler.cpp:162
+#, fuzzy
+msgid "Character's stats are too low."
+msgstr "Stats Karakter OK"
+
+#: src/net/manaserv/charhandler.cpp:165
+#, c-format
+msgid "At least one statis out of the permitted range: (%u - %u)."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:171 src/net/manaserv/loginhandler.cpp:96
+#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
+#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
+#: src/net/tmwa/loginhandler.cpp:95 src/net/tmwa/loginhandler.cpp:182
+#, fuzzy
+msgid "Unknown error."
+msgstr "Perintah tidak dikenal."
+
+#: src/net/manaserv/charhandler.cpp:200 src/net/tmwa/charserverhandler.cpp:146
+msgid "Info"
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:200
+msgid "Player deleted."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:212
+#, fuzzy
+msgid "Selection out of range."
+msgstr "Pilih jumlah item yang mau di perdagangkan"
+
+#: src/net/manaserv/charhandler.cpp:215
+#, fuzzy, c-format
+msgid "Unknown error (%d)."
+msgstr "Perintah tidak dikenal."
+
+#: src/net/manaserv/charhandler.cpp:250
+msgid "No gameservers are available."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:187 src/net/manaserv/chathandler.cpp:313
+#: src/net/manaserv/guildhandler.cpp:260
+#, c-format
+msgid "Topic: %s"
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:274
+msgid "Players in this channel:"
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:208
+msgid "Error joining channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:214
+msgid "Listing channels."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:226
+msgid "End of channel list."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:303
+#, c-format
+msgid "%s entered the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:308
+#, c-format
+msgid "%s left the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:324
+#, c-format
+msgid "%s has set mode %s on user %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:334
+#, c-format
+msgid "%s has kicked %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:339
+#, fuzzy
+msgid "Unknown channel event."
+msgstr "Perintah tidak dikenal."
+
+#: src/net/manaserv/guildhandler.cpp:82
+msgid "Guild created."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:87
+msgid "Error creating guild."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:97
+msgid "Invite sent."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:204
+msgid "Member was promoted successfully."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:209
+msgid "Failed to promote member."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:87
+msgid "Wrong magic_token."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
+msgid "Already logged in."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:93
+msgid "Account banned."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:118
+msgid "New password incorrect."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:121 src/net/tmwa/loginhandler.cpp:89
+msgid "Old password incorrect."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
+msgid "Account not connected. Please login first."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:149
+msgid "New email address incorrect."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:152
+msgid "Old email address incorrect."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:158
+msgid "The new email address already exists."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:239
+msgid ""
+"Client registration is not allowed. Please contact server administration."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
+msgid "Client version is too old."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:266
+msgid "Wrong username or password."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:272
+msgid "Account banned"
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:275
+msgid "Login attempt too soon after previous attempt."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:303
+msgid "Wrong username, password or email address."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:306
+msgid "Username already exists."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:309
+msgid "Email address already exists."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:312
+msgid "You took too long with the captcha or your response was incorrect."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:87
+msgid "Joined party."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:105
+#, c-format
+msgid "%s joined the party."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:123
+#, c-format
+msgid "%s rejected your invite."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:95
+msgid "Accepting incoming trade requests."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:97
+msgid "Ignoring incoming trade requests."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:115 src/net/tmwa/tradehandler.cpp:109
+msgid "Request for Trade"
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:116 src/net/tmwa/tradehandler.cpp:110
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:134
+#, c-format
+msgid "Trading with %s"
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:148 src/net/tmwa/tradehandler.cpp:224
+msgid "Trade canceled."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:155 src/net/tmwa/tradehandler.cpp:231
+msgid "Trade completed."
+msgstr ""
+
+#: src/net/tmwa/adminhandler.cpp:64
 msgid "Kick failed!"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:65
+#: src/net/tmwa/adminhandler.cpp:66
 msgid "Kick succeeded!"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:110
+#: src/net/tmwa/buysellhandler.cpp:109
 msgid "Nothing to sell."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:117
+#: src/net/tmwa/buysellhandler.cpp:116
 msgid "Thanks for buying."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:124
+#: src/net/tmwa/buysellhandler.cpp:123
 msgid "Unable to buy."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:130
+#: src/net/tmwa/buysellhandler.cpp:129
 msgid "Thanks for selling."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:132
+#: src/net/tmwa/buysellhandler.cpp:131
 msgid "Unable to sell."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:103
-msgid "Access denied."
+#: src/net/tmwa/charserverhandler.cpp:103
+msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:106
+#: src/net/tmwa/charserverhandler.cpp:107
 msgid "Cannot use this ID."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:109
-msgid "Unknown failure to select character."
-msgstr ""
+#: src/net/tmwa/charserverhandler.cpp:110
+#, fuzzy
+msgid "Unknown char-server failure."
+msgstr "Perintah tidak dikenal."
 
-#: src/net/ea/charserverhandler.cpp:135
+#: src/net/tmwa/charserverhandler.cpp:134
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:147 src/net/manaserv/charhandler.cpp:187
-msgid "Info"
-msgstr ""
-
-#: src/net/ea/charserverhandler.cpp:147
+#: src/net/tmwa/charserverhandler.cpp:146
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:152
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Failed to delete character."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:237 src/net/manaserv/charhandler.cpp:263
+#: src/net/tmwa/charserverhandler.cpp:266
 msgid "Strength:"
 msgstr "Kekuatan"
 
-#: src/net/ea/charserverhandler.cpp:238 src/net/manaserv/charhandler.cpp:264
+#: src/net/tmwa/charserverhandler.cpp:267
 msgid "Agility:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:239 src/net/manaserv/charhandler.cpp:266
+#: src/net/tmwa/charserverhandler.cpp:268
 msgid "Vitality:"
 msgstr "Daya/Tenaga Hidup"
 
-#: src/net/ea/charserverhandler.cpp:240 src/net/manaserv/charhandler.cpp:267
+#: src/net/tmwa/charserverhandler.cpp:269
 msgid "Intelligence:"
 msgstr "Kecerdasan"
 
-#: src/net/ea/charserverhandler.cpp:241 src/net/manaserv/charhandler.cpp:265
+#: src/net/tmwa/charserverhandler.cpp:270
 msgid "Dexterity:"
 msgstr "Ketangkasan"
 
-#: src/net/ea/charserverhandler.cpp:242
+#: src/net/tmwa/charserverhandler.cpp:271
 msgid "Luck:"
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:80
-msgid "Whisper could not be sent, user is offline."
+#: src/net/tmwa/chathandler.cpp:87
+#, c-format
+msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:84
-msgid "Whisper could not be sent, ignored by user."
+#: src/net/tmwa/chathandler.cpp:96
+#, c-format
+msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:171
+#: src/net/tmwa/chathandler.cpp:230
 msgid "MVP player."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:204 src/net/ea/chathandler.cpp:210
-#: src/net/ea/chathandler.cpp:215 src/net/ea/chathandler.cpp:220
-#: src/net/ea/chathandler.cpp:225 src/net/ea/chathandler.cpp:230
-#: src/net/ea/chathandler.cpp:235 src/net/ea/chathandler.cpp:240
+#: src/net/tmwa/chathandler.cpp:265 src/net/tmwa/chathandler.cpp:271
+#: src/net/tmwa/chathandler.cpp:276 src/net/tmwa/chathandler.cpp:281
+#: src/net/tmwa/chathandler.cpp:286 src/net/tmwa/chathandler.cpp:291
+#: src/net/tmwa/chathandler.cpp:296 src/net/tmwa/chathandler.cpp:301
 msgid "Channels are not supported!"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:86
+#: src/net/tmwa/gamehandler.cpp:88
 #, c-format
 msgid "Online users: %d"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:100
+#: src/net/tmwa/gamehandler.cpp:101
 #, fuzzy
 msgid "Game"
 msgstr "Nama:"
 
-#: src/net/ea/gamehandler.cpp:100
+#: src/net/tmwa/gamehandler.cpp:101
 msgid "Request to quit denied!"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:102 src/net/manaserv/generalhandler.cpp:95
+#: src/net/tmwa/generalhandler.cpp:102
 #, c-format
 msgid "Strength %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:103 src/net/manaserv/generalhandler.cpp:96
+#: src/net/tmwa/generalhandler.cpp:103
 #, c-format
 msgid "Agility %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:104 src/net/manaserv/generalhandler.cpp:98
+#: src/net/tmwa/generalhandler.cpp:104
 #, c-format
 msgid "Vitality %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:105 src/net/manaserv/generalhandler.cpp:99
+#: src/net/tmwa/generalhandler.cpp:105
 #, c-format
 msgid "Intelligence %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:106 src/net/manaserv/generalhandler.cpp:97
+#: src/net/tmwa/generalhandler.cpp:106
 #, c-format
 msgid "Dexterity %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:107
+#: src/net/tmwa/generalhandler.cpp:107
 #, c-format
 msgid "Luck %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:130
+#: src/net/tmwa/generalhandler.cpp:132
 msgid "Authentication failed."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:133
+#: src/net/tmwa/generalhandler.cpp:135
 msgid "No servers available."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:137
+#: src/net/tmwa/generalhandler.cpp:139
 msgid "Someone else is trying to use this account."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:140
+#: src/net/tmwa/generalhandler.cpp:142
 msgid "This account is already logged in."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:143
+#: src/net/tmwa/generalhandler.cpp:145
 msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:146
+#: src/net/tmwa/generalhandler.cpp:148
 msgid "Duplicated login."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:149
+#: src/net/tmwa/generalhandler.cpp:151
 msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:205
+#: src/net/tmwa/generalhandler.cpp:209
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:216 src/net/manaserv/generalhandler.cpp:166
+#: src/net/tmwa/generalhandler.cpp:230
 msgid "Strength"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:217 src/net/manaserv/generalhandler.cpp:167
+#: src/net/tmwa/generalhandler.cpp:231
 msgid "Agility"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:218 src/net/manaserv/generalhandler.cpp:169
+#: src/net/tmwa/generalhandler.cpp:232
 msgid "Vitality"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:219 src/net/manaserv/generalhandler.cpp:170
+#: src/net/tmwa/generalhandler.cpp:233
 msgid "Intelligence"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:220 src/net/manaserv/generalhandler.cpp:168
+#: src/net/tmwa/generalhandler.cpp:234
 msgid "Dexterity"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:221
+#: src/net/tmwa/generalhandler.cpp:235
 msgid "Luck"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:224
+#: src/net/tmwa/generalhandler.cpp:238
 #, fuzzy
 msgid "Defense"
 msgstr "Pertahanan %+d"
 
-#: src/net/ea/generalhandler.cpp:225
+#: src/net/tmwa/generalhandler.cpp:239
 #, fuzzy
 msgid "M.Attack"
 msgstr "Serangan %+d"
 
-#: src/net/ea/generalhandler.cpp:226
+#: src/net/tmwa/generalhandler.cpp:240
 #, fuzzy
 msgid "M.Defense"
 msgstr "Pertahanan %+d"
 
-#: src/net/ea/generalhandler.cpp:227
+#: src/net/tmwa/generalhandler.cpp:241
 #, c-format
 msgid "% Accuracy"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:228
+#: src/net/tmwa/generalhandler.cpp:242
 #, c-format
 msgid "% Evade"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:229
+#: src/net/tmwa/generalhandler.cpp:243
 #, c-format
 msgid "% Critical"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:61 src/net/ea/gui/partytab.cpp:59
+#: src/net/tmwa/gui/guildtab.cpp:45
+msgid "Guild"
+msgstr ""
+
+#: src/net/tmwa/gui/guildtab.cpp:61 src/net/tmwa/gui/partytab.cpp:59
 msgid "/help > Display this help."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:62
+#: src/net/tmwa/gui/guildtab.cpp:62
 msgid "/invite > Invite a player to your guild"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:63
+#: src/net/tmwa/gui/guildtab.cpp:63
 msgid "/leave > Leave the guild you are in"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:64
+#: src/net/tmwa/gui/guildtab.cpp:64
 msgid "/kick > Kick some one from the guild you are in"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:73 src/net/ea/gui/partytab.cpp:73
+#: src/net/tmwa/gui/guildtab.cpp:73 src/net/tmwa/gui/partytab.cpp:73
 msgid "Command: /invite <nick>"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:74
+#: src/net/tmwa/gui/guildtab.cpp:74
 msgid "This command invites <nick> to the guild you're in."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:80 src/net/ea/gui/partytab.cpp:80
+#: src/net/tmwa/gui/guildtab.cpp:80 src/net/tmwa/gui/partytab.cpp:80
 msgid "Command: /leave"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:81
+#: src/net/tmwa/gui/guildtab.cpp:81
 msgid "This command causes the player to leave the guild."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:89
+#: src/net/tmwa/gui/guildtab.cpp:89
 msgid "Guild name is missing."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:293
+#: src/net/tmwa/guildhandler.cpp:296
 msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:298
+#: src/net/tmwa/guildhandler.cpp:301
 msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:303
+#: src/net/tmwa/guildhandler.cpp:306
 msgid "User is now part of your guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:308
+#: src/net/tmwa/guildhandler.cpp:311
 msgid "Your guild is full."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:313
+#: src/net/tmwa/guildhandler.cpp:316
 msgid "Unknown guild invite response."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:390
+#: src/net/tmwa/guildhandler.cpp:393
 msgid "Guild creation isn't supported yet."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:60
+#: src/net/tmwa/gui/partytab.cpp:43
+msgid "Party"
+msgstr ""
+
+#: src/net/tmwa/gui/partytab.cpp:60
 msgid "/invite > Invite a player to your party"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:61
+#: src/net/tmwa/gui/partytab.cpp:61
 msgid "/leave > Leave the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:62
+#: src/net/tmwa/gui/partytab.cpp:62
 msgid "/kick > Kick some one from the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:63
+#: src/net/tmwa/gui/partytab.cpp:63
 msgid "/item > Show/change party item sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:64
+#: src/net/tmwa/gui/partytab.cpp:64
 msgid "/exp > Show/change party experience sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:81
+#: src/net/tmwa/gui/partytab.cpp:81
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:85
+#: src/net/tmwa/gui/partytab.cpp:85
 msgid "Command: /item <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:86
+#: src/net/tmwa/gui/partytab.cpp:86
 msgid "This command changes the party's item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:87
+#: src/net/tmwa/gui/partytab.cpp:87
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:90
+#: src/net/tmwa/gui/partytab.cpp:90
 msgid "Command: /item"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/tmwa/gui/partytab.cpp:91
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/tmwa/gui/partytab.cpp:95
 msgid "Command: /exp <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:96
+#: src/net/tmwa/gui/partytab.cpp:96
 msgid "This command changes the party's experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/tmwa/gui/partytab.cpp:97
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:100
+#: src/net/tmwa/gui/partytab.cpp:100
 msgid "Command: /exp"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/tmwa/gui/partytab.cpp:101
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:132 src/net/ea/partyhandler.cpp:198
+#: src/net/tmwa/gui/partytab.cpp:132 src/net/tmwa/partyhandler.cpp:196
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:135 src/net/ea/partyhandler.cpp:204
+#: src/net/tmwa/gui/partytab.cpp:135 src/net/tmwa/partyhandler.cpp:202
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:138 src/net/ea/partyhandler.cpp:210
+#: src/net/tmwa/gui/partytab.cpp:138 src/net/tmwa/partyhandler.cpp:208
 msgid "Item sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:141
+#: src/net/tmwa/gui/partytab.cpp:141
 msgid "Item sharing unknown."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:167 src/net/ea/partyhandler.cpp:174
+#: src/net/tmwa/gui/partytab.cpp:167 src/net/tmwa/partyhandler.cpp:172
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:170 src/net/ea/partyhandler.cpp:180
+#: src/net/tmwa/gui/partytab.cpp:170 src/net/tmwa/partyhandler.cpp:178
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:173 src/net/ea/partyhandler.cpp:186
+#: src/net/tmwa/gui/partytab.cpp:173 src/net/tmwa/partyhandler.cpp:184
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:176
+#: src/net/tmwa/gui/partytab.cpp:176
 msgid "Experience sharing unknown."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:281
+#: src/net/tmwa/inventoryhandler.cpp:285
 msgid "Failed to use item."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:391
+#: src/net/tmwa/inventoryhandler.cpp:399
 msgid "Unable to equip."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:402
+#: src/net/tmwa/inventoryhandler.cpp:410
 msgid "Unable to unequip."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:79
+#: src/net/tmwa/loginhandler.cpp:86
 msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:82 src/net/manaserv/loginhandler.cpp:121
-msgid "Old password incorrect."
-msgstr ""
-
-#: src/net/ea/loginhandler.cpp:85
+#: src/net/tmwa/loginhandler.cpp:92
 msgid "New password too short."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:88 src/net/ea/loginhandler.cpp:175
-#: src/net/manaserv/charhandler.cpp:158 src/net/manaserv/loginhandler.cpp:96
-#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
-#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
-#, fuzzy
-msgid "Unknown error."
-msgstr "Perintah tidak dikenal."
-
-#: src/net/ea/loginhandler.cpp:149
+#: src/net/tmwa/loginhandler.cpp:156
 #, fuzzy
 msgid "Unregistered ID."
 msgstr "Tidak terdaftar"
 
-#: src/net/ea/loginhandler.cpp:152
+#: src/net/tmwa/loginhandler.cpp:159
 msgid "Wrong password."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:155
+#: src/net/tmwa/loginhandler.cpp:162
 msgid "Account expired."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:158
+#: src/net/tmwa/loginhandler.cpp:165
 msgid "Rejected from server."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:161
+#: src/net/tmwa/loginhandler.cpp:168
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:165
+#: src/net/tmwa/loginhandler.cpp:172
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:172
+#: src/net/tmwa/loginhandler.cpp:179
 msgid "This user name is already taken."
 msgstr ""
 
-#: src/net/ea/network.cpp:145
+#: src/net/tmwa/network.cpp:145
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/ea/network.cpp:345
+#: src/net/tmwa/network.cpp:345
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/ea/network.cpp:414
+#: src/net/tmwa/network.cpp:414
 msgid "Connection to server terminated. "
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:81
+#: src/net/tmwa/partyhandler.cpp:82
 msgid "Could not create party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:84
+#: src/net/tmwa/partyhandler.cpp:84
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:118
+#: src/net/tmwa/partyhandler.cpp:119
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:122
+#: src/net/tmwa/partyhandler.cpp:123
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:126
+#: src/net/tmwa/partyhandler.cpp:127
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:130
+#: src/net/tmwa/partyhandler.cpp:131
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:238
+#: src/net/tmwa/partyhandler.cpp:236
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:249
+#: src/net/tmwa/partyhandler.cpp:246
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:301
+#: src/net/tmwa/partyhandler.cpp:299
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:329
-msgid "Inviting like this isn't supported at the moment."
+#: src/net/tmwa/partyhandler.cpp:335
+#, c-format
+msgid "Inviting failed, because you can't see a player called %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:334
+#: src/net/tmwa/partyhandler.cpp:340
 msgid "You can only inivte when you are in a party!"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:365
+#: src/net/tmwa/partyhandler.cpp:368
 #, c-format
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:304
-msgid "You are dead."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:305
-msgid "We regret to inform you that your character was killed in battle."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:307
-msgid "You are not that alive anymore."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:308
-msgid "The cold hands of the grim reaper are grabbing for your soul."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:309
-msgid "Game Over!"
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:105
+#: src/net/tmwa/playerhandler.cpp:100
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:310
-msgid ""
-"No, kids. Your character did not really die. It... err... went to a better "
-"place."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:312
-msgid ""
-"Your plan of breaking your enemies weapon by bashing it with your throat "
-"failed."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:314
-msgid "I guess this did not run too well."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:315
-msgid "Do you want your possessions identified?"
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:316
-msgid "Sadly, no trace of you was ever found..."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:317
-msgid "Annihilated."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:318
-msgid "Looks like you got your head handed to you."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:120 src/net/manaserv/beinghandler.cpp:319
-msgid ""
-"You screwed up again, dump your body down the tubes and get you another one."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/tmwa/playerhandler.cpp:118
 msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/tmwa/playerhandler.cpp:119
 msgid "You are no more."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/tmwa/playerhandler.cpp:120
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/tmwa/playerhandler.cpp:121
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/tmwa/playerhandler.cpp:122
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/tmwa/playerhandler.cpp:123
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/tmwa/playerhandler.cpp:124
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:130
+#: src/net/tmwa/playerhandler.cpp:125
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:131
+#: src/net/tmwa/playerhandler.cpp:126
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/tmwa/playerhandler.cpp:127
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/tmwa/playerhandler.cpp:128
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:135
+#: src/net/tmwa/playerhandler.cpp:130
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:136
+#: src/net/tmwa/playerhandler.cpp:131
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:249 src/net/ea/playerhandler.cpp:310
+#: src/net/tmwa/playerhandler.cpp:246 src/net/tmwa/playerhandler.cpp:285
 msgid "Message"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:250
+#: src/net/tmwa/playerhandler.cpp:247
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:333
+#: src/net/tmwa/playerhandler.cpp:313
 #, c-format
 msgid "You picked up %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:369
+#: src/net/tmwa/playerhandler.cpp:348
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:532
+#: src/net/tmwa/playerhandler.cpp:488
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:147
+#: src/net/tmwa/specialhandler.cpp:144
 msgid "Trade failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:150
+#: src/net/tmwa/specialhandler.cpp:147
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:153
+#: src/net/tmwa/specialhandler.cpp:150
 msgid "Sit failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:156
+#: src/net/tmwa/specialhandler.cpp:153
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:159
+#: src/net/tmwa/specialhandler.cpp:156
 msgid "Could not join party!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:162
+#: src/net/tmwa/specialhandler.cpp:159
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:171
+#: src/net/tmwa/specialhandler.cpp:168
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:174
+#: src/net/tmwa/specialhandler.cpp:171
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:177
+#: src/net/tmwa/specialhandler.cpp:174
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:180
+#: src/net/tmwa/specialhandler.cpp:177
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:183
+#: src/net/tmwa/specialhandler.cpp:180
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:186
+#: src/net/tmwa/specialhandler.cpp:183
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:189
+#: src/net/tmwa/specialhandler.cpp:186
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:192
+#: src/net/tmwa/specialhandler.cpp:189
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:195
+#: src/net/tmwa/specialhandler.cpp:192
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:198
+#: src/net/tmwa/specialhandler.cpp:195
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:201
+#: src/net/tmwa/specialhandler.cpp:198
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:210
+#: src/net/tmwa/specialhandler.cpp:207
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:213
+#: src/net/tmwa/specialhandler.cpp:210
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:216
+#: src/net/tmwa/specialhandler.cpp:213
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:116
-msgid "Request for Trade"
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:108 src/net/manaserv/tradehandler.cpp:117
-#, c-format
-msgid "%s wants to trade with you, do you accept?"
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:124
+#: src/net/tmwa/tradehandler.cpp:126
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:128
+#: src/net/tmwa/tradehandler.cpp:130
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:132
+#: src/net/tmwa/tradehandler.cpp:134
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:137
+#: src/net/tmwa/tradehandler.cpp:139
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:144
+#: src/net/tmwa/tradehandler.cpp:146
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:153
+#: src/net/tmwa/tradehandler.cpp:154
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:202
+#: src/net/tmwa/tradehandler.cpp:202
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:207
+#: src/net/tmwa/tradehandler.cpp:207
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:211
+#: src/net/tmwa/tradehandler.cpp:211
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:224 src/net/manaserv/tradehandler.cpp:149
-msgid "Trade canceled."
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:231 src/net/manaserv/tradehandler.cpp:156
-msgid "Trade completed."
-msgstr ""
-
-#: src/net/manaserv/beinghandler.cpp:324
-msgid "Press OK to respawn."
-msgstr ""
-
-#: src/net/manaserv/beinghandler.cpp:325
-#, fuzzy
-msgid "You Died"
-msgstr "Anda memberikan:"
-
-#: src/net/manaserv/charhandler.cpp:128 src/net/manaserv/charhandler.cpp:196
-msgid "Not logged in."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:131
-msgid "No empty slot."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:134
-msgid "Invalid name."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:137
-msgid "Character's name already exists."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:140
-msgid "Invalid hairstyle."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:143
-msgid "Invalid hair color."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:146
-msgid "Invalid gender."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:149
-#, fuzzy
-msgid "Character's stats are too high."
-msgstr "Stats Karakter OK"
-
-#: src/net/manaserv/charhandler.cpp:152
-#, fuzzy
-msgid "Character's stats are too low."
-msgstr "Stats Karakter OK"
-
-#: src/net/manaserv/charhandler.cpp:155
-msgid "One stat is zero."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:187
-msgid "Player deleted."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:199
-#, fuzzy
-msgid "Selection out of range."
-msgstr "Pilih jumlah item yang mau di perdagangkan"
-
-#: src/net/manaserv/charhandler.cpp:202
-#, fuzzy, c-format
-msgid "Unknown error (%d)."
-msgstr "Perintah tidak dikenal."
-
-#: src/net/manaserv/charhandler.cpp:242
-msgid "No gameservers are available."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:268
-msgid "Willpower:"
-msgstr "Ketekunan"
-
-#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
-#: src/net/manaserv/guildhandler.cpp:259
-#, c-format
-msgid "Topic: %s"
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
-msgid "Players in this channel:"
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:201
-msgid "Error joining channel."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:207
-msgid "Listing channels."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:219
-msgid "End of channel list."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:291
-#, c-format
-msgid "%s entered the channel."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:296
-#, c-format
-msgid "%s left the channel."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:312
-#, c-format
-msgid "%s has set mode %s on user %s."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:322
-#, c-format
-msgid "%s has kicked %s."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:327
-#, fuzzy
-msgid "Unknown channel event."
-msgstr "Perintah tidak dikenal."
-
-#: src/net/manaserv/generalhandler.cpp:100
-#, c-format
-msgid "Willpower %+d"
-msgstr ""
-
-#: src/net/manaserv/generalhandler.cpp:171
-#, fuzzy
-msgid "Willpower"
-msgstr "Ketekunan"
-
-#: src/net/manaserv/guildhandler.cpp:81
-msgid "Guild created."
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:86
-msgid "Error creating guild."
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:96
-msgid "Invite sent."
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:203
-msgid "Member was promoted successfully."
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:208
-msgid "Failed to promote member."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:87
-msgid "Wrong magic_token."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
-msgid "Already logged in."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:93 src/net/manaserv/loginhandler.cpp:272
-msgid "Server is full."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:118
-msgid "New password incorrect."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
-msgid "Account not connected. Please login first."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:149
-msgid "New email address incorrect."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:152
-msgid "Old email address incorrect."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:158
-msgid "The new email address already exists."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:239
-msgid ""
-"Client registration is not allowed. Please contact server administration."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
-msgid "Client version is too old."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:266
-msgid "Wrong username or password."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:275
-msgid "Login attempt too soon after previous attempt."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:303
-msgid "Wrong username, password or email address."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:306
-msgid "Username already exists."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:309
-msgid "Email address already exists."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:312
-msgid "You took too long with the captcha or your response was incorrect."
-msgstr ""
-
-#: src/net/manaserv/partyhandler.cpp:88
-msgid "Joined party."
-msgstr ""
-
-#: src/net/manaserv/partyhandler.cpp:106
-#, c-format
-msgid "%s joined the party."
-msgstr ""
-
-#: src/net/manaserv/partyhandler.cpp:123
-#, c-format
-msgid "%s rejected your invite."
-msgstr ""
-
-#: src/net/manaserv/tradehandler.cpp:96
-msgid "Accepting incoming trade requests."
-msgstr ""
-
-#: src/net/manaserv/tradehandler.cpp:98
-msgid "Ignoring incoming trade requests."
-msgstr ""
-
-#: src/net/manaserv/tradehandler.cpp:135
-#, c-format
-msgid "Trading with %s"
-msgstr ""
-
-#: src/playerrelations.cpp:304
+#: src/playerrelations.cpp:310
 msgid "Completely ignore"
 msgstr ""
 
-#: src/playerrelations.cpp:318
+#: src/playerrelations.cpp:324
 msgid "Print '...'"
 msgstr ""
 
-#: src/playerrelations.cpp:334
+#: src/playerrelations.cpp:340
 msgid "Blink name"
 msgstr ""
 
-#: src/playerrelations.cpp:371
-msgid "Floating '...' bubble"
-msgstr ""
-
-#: src/playerrelations.cpp:374
-msgid "Floating bubble"
-msgstr ""
-
-#: src/resources/itemdb.cpp:52
+#: src/resources/itemdb.cpp:44
 #, c-format
 msgid "Attack %+d"
 msgstr "Serangan %+d"
 
-#: src/resources/itemdb.cpp:53
+#: src/resources/itemdb.cpp:45
 #, c-format
 msgid "Defense %+d"
 msgstr "Pertahanan %+d"
 
-#: src/resources/itemdb.cpp:54
+#: src/resources/itemdb.cpp:46
 #, c-format
 msgid "HP %+d"
 msgstr "HP %+d"
 
-#: src/resources/itemdb.cpp:55
+#: src/resources/itemdb.cpp:47
 #, c-format
 msgid "MP %+d"
 msgstr "MP %+d"
 
-#: src/resources/itemdb.cpp:114
+#: src/resources/itemdb.cpp:92
 msgid "Unknown item"
 msgstr ""
 
-#: src/resources/itemdb.cpp:158 src/resources/monsterdb.cpp:45
-#: src/resources/monsterdb.cpp:67
+#: src/resources/itemdb.cpp:135 src/resources/monsterdb.cpp:77
 msgid "unnamed"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Money"
+#~ msgstr "Uang: %d"
+
+#, fuzzy
+#~ msgid "Level"
+#~ msgstr "Tingkatan: %d"
+
+#~ msgid "Willpower:"
+#~ msgstr "Ketekunan"
+
+#, fuzzy
+#~ msgid "Willpower"
+#~ msgstr "Ketekunan"
+
 #~ msgid "Description: %s"
 #~ msgstr "Deskripsi: %s"
 
diff --git a/po/it.po b/po/it.po
index 50bbd61e..4da918d8 100644
--- a/po/it.po
+++ b/po/it.po
@@ -9,10 +9,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Mana World 0.1.0\n"
 "Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2010-03-16 22:27+0100\n"
+"POT-Creation-Date: 2010-12-13 20:04+0100\n"
 "PO-Revision-Date: 2010-02-18 14:01+0000\n"
 "Last-Translator: Gabriel Rota <gabriel.rota@gmail.com>\n"
 "Language-Team: Italian\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -20,316 +21,322 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/client.cpp:555 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
+#: src/client.cpp:598 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
 msgid "Setup"
 msgstr "Impostazioni"
 
-#: src/client.cpp:625
+#: src/client.cpp:679
 #, fuzzy
 msgid "Connecting to server"
 msgstr "Connessione al server della mappa..."
 
-#: src/client.cpp:652
+#: src/client.cpp:706
 #, fuzzy
 msgid "Logging in"
 msgstr "Autenticazione"
 
-#: src/client.cpp:685
+#: src/client.cpp:739
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:741
+#: src/client.cpp:804
 #, fuzzy
 msgid "Requesting characters"
 msgstr "Scelta Personaggio"
 
-#: src/client.cpp:770
+#: src/client.cpp:833
 #, fuzzy
 msgid "Connecting to the game server"
 msgstr "Connessione al server della mappa..."
 
-#: src/client.cpp:801 src/client.cpp:808 src/client.cpp:942
+#: src/client.cpp:843
+#, fuzzy
+msgid "Changing game servers"
+msgstr "Server"
+
+#: src/client.cpp:872 src/client.cpp:879 src/client.cpp:1014
 #: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
 #: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
-#: src/gui/serverdialog.cpp:241 src/gui/unregisterdialog.cpp:133
-#: src/net/ea/charserverhandler.cpp:135 src/net/ea/charserverhandler.cpp:152
-#: src/net/manaserv/charhandler.cpp:161 src/net/manaserv/charhandler.cpp:204
+#: src/gui/serverdialog.cpp:323 src/gui/unregisterdialog.cpp:133
+#: src/net/manaserv/charhandler.cpp:174 src/net/manaserv/charhandler.cpp:217
+#: src/net/tmwa/charserverhandler.cpp:134
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Error"
 msgstr "Errore"
 
-#: src/client.cpp:817
+#: src/client.cpp:888
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:844
+#: src/client.cpp:915
 #, fuzzy
 msgid "Password Change"
 msgstr "Password:"
 
-#: src/client.cpp:845
+#: src/client.cpp:916
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:864
+#: src/client.cpp:935
 #, fuzzy
 msgid "Email Change"
 msgstr "Cambia"
 
-#: src/client.cpp:865
+#: src/client.cpp:936
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:885
+#: src/client.cpp:956
 #, fuzzy
 msgid "Unregister Successful"
 msgstr "Cancella registrazione"
 
-#: src/client.cpp:886
+#: src/client.cpp:957
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1009 src/client.cpp:1032
+#: src/client.cpp:1138 src/client.cpp:1161
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1121
+#: src/client.cpp:1281
 #, fuzzy, c-format
 msgid "Invalid update host: %s"
 msgstr "Host di aggiornamento non valido: "
 
-#: src/client.cpp:1155 src/client.cpp:1161
+#: src/client.cpp:1315 src/client.cpp:1321
 msgid "Error creating updates directory!"
 msgstr "Errore durante la creazione della directory degli aggiornamenti"
 
-#: src/commandhandler.cpp:127 src/commandhandler.cpp:308
+#: src/commandhandler.cpp:131 src/commandhandler.cpp:317
 msgid "Unknown command."
 msgstr "Comando sconosciuto."
 
-#: src/commandhandler.cpp:156
+#: src/commandhandler.cpp:160
 msgid "-- Help --"
 msgstr "-- Aiuto --"
 
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:161
 msgid "/help > Display this help"
 msgstr "/help > Mostra questo aiuto"
 
-#: src/commandhandler.cpp:159
+#: src/commandhandler.cpp:163
 msgid "/where > Display map name"
 msgstr "/where > Mostra il nome della mappa"
 
-#: src/commandhandler.cpp:160
+#: src/commandhandler.cpp:164
 msgid "/who > Display number of online users"
 msgstr "/who > Mostra il numero di utenti in linea"
 
-#: src/commandhandler.cpp:161
+#: src/commandhandler.cpp:165
 msgid "/me > Tell something about yourself"
 msgstr "/me > Scrivi un messaggio riguardante te"
 
-#: src/commandhandler.cpp:163
+#: src/commandhandler.cpp:167
 msgid "/clear > Clears this window"
 msgstr "/clear > Pulisce questa finestra"
 
-#: src/commandhandler.cpp:165
+#: src/commandhandler.cpp:169
 msgid "/msg > Send a private message to a user"
 msgstr "/msg > Invia un messaggio privato ad un utente"
 
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:170
 msgid "/whisper > Alias of msg"
 msgstr "/whisper > Equivale a \"msg\""
 
-#: src/commandhandler.cpp:167
+#: src/commandhandler.cpp:171
 msgid "/w > Alias of msg"
 msgstr "/w > Equivale a \"msg\""
 
-#: src/commandhandler.cpp:168
+#: src/commandhandler.cpp:172
 msgid "/query > Makes a tab for private messages with another user"
 msgstr "/query > Apre una scheda per i messaggi privati con un altro utente"
 
-#: src/commandhandler.cpp:169
+#: src/commandhandler.cpp:174
 msgid "/q > Alias of query"
 msgstr "/q > Equivale a \"query\""
 
-#: src/commandhandler.cpp:171
+#: src/commandhandler.cpp:176
 msgid "/ignore > ignore a player"
 msgstr ""
 
-#: src/commandhandler.cpp:172
+#: src/commandhandler.cpp:177
 msgid "/unignore > stop ignoring a player"
 msgstr ""
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:179
 msgid "/list > Display all public channels"
 msgstr "/list > Mostra tutti i canali pubblici"
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:180
 msgid "/join > Join or create a channel"
 msgstr "/join > Partecipa o crea un canale"
 
-#: src/commandhandler.cpp:177
+#: src/commandhandler.cpp:182
 #, fuzzy
 msgid "/createparty > Create a new party"
 msgstr "/create > Crea un nuovo party"
 
-#: src/commandhandler.cpp:178
+#: src/commandhandler.cpp:183
 msgid "/party > Invite a user to party"
 msgstr "/party > Invita un utente nel party"
 
-#: src/commandhandler.cpp:180
+#: src/commandhandler.cpp:185
 msgid "/record > Start recording the chat to an external file"
 msgstr "/record> Inizia la registrazione della chat in un file esterno"
 
-#: src/commandhandler.cpp:181
+#: src/commandhandler.cpp:187
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr "/toggle > Determina se <invio> apre/chiude il registro della chat"
 
-#: src/commandhandler.cpp:182
+#: src/commandhandler.cpp:189
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
 "/present > Ottiene una lista dei giocatori presenti (inviato al registro di "
 "chat, se è attivo)"
 
-#: src/commandhandler.cpp:184
+#: src/commandhandler.cpp:192
 msgid "/announce > Global announcement (GM only)"
 msgstr "/announce > Annuncio globale (solo GM)"
 
-#: src/commandhandler.cpp:188
+#: src/commandhandler.cpp:196
 msgid "For more information, type /help <command>."
 msgstr "Per maggiori informazioni, digitare /help <comando>."
 
-#: src/commandhandler.cpp:192
+#: src/commandhandler.cpp:200
 msgid "Command: /help"
 msgstr "Comando: /help"
 
-#: src/commandhandler.cpp:193
+#: src/commandhandler.cpp:201
 msgid "This command displays a list of all commands available."
 msgstr "Questo comando mostra una lista di tutti i comandi disponibili."
 
-#: src/commandhandler.cpp:194
+#: src/commandhandler.cpp:203
 msgid "Command: /help <command>"
 msgstr "Comando: /help <comando>"
 
-#: src/commandhandler.cpp:195
+#: src/commandhandler.cpp:204
 msgid "This command displays help on <command>."
 msgstr "Questo comando mostra l'aiuto per <comando>."
 
-#: src/commandhandler.cpp:203
+#: src/commandhandler.cpp:212
 msgid "Command: /announce <msg>"
 msgstr "Comando: /announce <msg>"
 
-#: src/commandhandler.cpp:204
+#: src/commandhandler.cpp:213
 msgid "*** only available to a GM ***"
 msgstr "*** disponibile solo ai GM ***"
 
-#: src/commandhandler.cpp:205
+#: src/commandhandler.cpp:214
 msgid "This command sends the message <msg> to all players currently online."
 msgstr "Questo comando invia un messaggio <msg> a tutti i giocatori in linea."
 
-#: src/commandhandler.cpp:210
+#: src/commandhandler.cpp:219
 msgid "Command: /clear"
 msgstr "Comando: /clear"
 
-#: src/commandhandler.cpp:211
+#: src/commandhandler.cpp:220
 msgid "This command clears the chat log of previous chat."
 msgstr "Questo comando pulisce il registro della chat precedente"
 
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:224
 #, fuzzy
 msgid "Command: /ignore <player>"
 msgstr "Comando: /item <politica>"
 
-#: src/commandhandler.cpp:216
+#: src/commandhandler.cpp:225
 #, fuzzy
 msgid "This command ignores the given player regardless of current relations."
 msgstr "Questo comando mostra il numero dei giocatori attualmente connessi."
 
-#: src/commandhandler.cpp:221
+#: src/commandhandler.cpp:230
 msgid "Command: /join <channel>"
 msgstr "Comando: /join <canale>"
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:231
 msgid "This command makes you enter <channel>."
 msgstr "Questo comando effettua l'accesso al <canale> specificato."
 
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:232
 msgid "If <channel> doesn't exist, it's created."
 msgstr "Se il <canale> non esiste, viene creato."
 
-#: src/commandhandler.cpp:227
+#: src/commandhandler.cpp:236
 msgid "Command: /list"
 msgstr "Comando: /list"
 
-#: src/commandhandler.cpp:228
+#: src/commandhandler.cpp:237
 msgid "This command shows a list of all channels."
 msgstr "Questo comando mostra una lista di tutti i canali."
 
-#: src/commandhandler.cpp:232
+#: src/commandhandler.cpp:241
 msgid "Command: /me <message>"
 msgstr "Comando: /me <messaggio>"
 
-#: src/commandhandler.cpp:233
+#: src/commandhandler.cpp:242
 msgid "This command tell others you are (doing) <msg>."
 msgstr "Questo comando mostra agli altri ciò che stai <messaggio>."
 
-#: src/commandhandler.cpp:237
+#: src/commandhandler.cpp:246
 msgid "Command: /msg <nick> <message>"
 msgstr "Comando: /msg <nick> <messaggio>"
 
-#: src/commandhandler.cpp:238
+#: src/commandhandler.cpp:247
 msgid "Command: /whisper <nick> <message>"
 msgstr "Comando: /whisper <nick> <messaggio>"
 
-#: src/commandhandler.cpp:239
+#: src/commandhandler.cpp:248
 msgid "Command: /w <nick> <message>"
 msgstr "Comando: /w <nick> <messaggio>"
 
-#: src/commandhandler.cpp:240
+#: src/commandhandler.cpp:249
 msgid "This command sends the text <message> to <nick>."
 msgstr "Questo comando invia il testo <messaggio> all'utente <nick>."
 
-#: src/commandhandler.cpp:241 src/commandhandler.cpp:260
+#: src/commandhandler.cpp:250 src/commandhandler.cpp:269
 #: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
-#: src/net/ea/gui/guildtab.cpp:75 src/net/ea/gui/partytab.cpp:75
+#: src/net/tmwa/gui/guildtab.cpp:75 src/net/tmwa/gui/partytab.cpp:75
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr "Se il <nick> contiene spazi, racchiuderlo tra virgolette (\")."
 
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:255
 msgid "Command: /query <nick>"
 msgstr "Comando: /query <nick>"
 
-#: src/commandhandler.cpp:247
+#: src/commandhandler.cpp:256
 msgid "Command: /q <nick>"
 msgstr "Comando: /q <nick>"
 
-#: src/commandhandler.cpp:248
+#: src/commandhandler.cpp:257
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
 "Questo comando tenta di creare una scheda per i sussurri tra te e l'utente "
 "<nick>."
 
-#: src/commandhandler.cpp:253
+#: src/commandhandler.cpp:262
 #, fuzzy
 msgid "Command: /createparty <name>"
 msgstr "Comando: /create <nome-gruppo>"
 
-#: src/commandhandler.cpp:254
+#: src/commandhandler.cpp:263
 #, fuzzy
 msgid "This command creates a new party called <name>."
 msgstr "Questi comandi creano un nuovo gruppo chiamato <nome-gruppo>."
 
-#: src/commandhandler.cpp:258
+#: src/commandhandler.cpp:267
 msgid "Command: /party <nick>"
 msgstr "Comando: /party <nick>"
 
-#: src/commandhandler.cpp:259 src/net/ea/gui/partytab.cpp:74
+#: src/commandhandler.cpp:268 src/net/tmwa/gui/partytab.cpp:74
 msgid "This command invites <nick> to party with you."
 msgstr "Questo comando invita <nick> nel tuo party."
 
-#: src/commandhandler.cpp:265
+#: src/commandhandler.cpp:274
 msgid "Command: /present"
 msgstr "Comando: /present"
 
-#: src/commandhandler.cpp:266
+#: src/commandhandler.cpp:275
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
@@ -337,27 +344,27 @@ msgstr ""
 "Questo comando crea una lista dei giocatori che hai attorno e la invia o "
 "alla registrazione della chat se attivata, o alla chat altrimenti."
 
-#: src/commandhandler.cpp:272
+#: src/commandhandler.cpp:281
 msgid "Command: /record <filename>"
 msgstr "Comando: /record <nome file>"
 
-#: src/commandhandler.cpp:273
+#: src/commandhandler.cpp:282
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr "Questo comando attiva la registrazione della chat nel file <nome file>"
 
-#: src/commandhandler.cpp:275
+#: src/commandhandler.cpp:284
 msgid "Command: /record"
 msgstr "Comando: /record"
 
-#: src/commandhandler.cpp:276
+#: src/commandhandler.cpp:285
 msgid "This command finishes a recording session."
 msgstr "Questo comando termina la sessione di registrazione."
 
-#: src/commandhandler.cpp:280
+#: src/commandhandler.cpp:289
 msgid "Command: /toggle <state>"
 msgstr "Comando: /toggle <stato>"
 
-#: src/commandhandler.cpp:281
+#: src/commandhandler.cpp:290
 msgid ""
 "This command sets whether the return key should toggle the chat log, or "
 "whether the chat log turns off automatically."
@@ -365,56 +372,56 @@ msgstr ""
 "Questo comando imposta la chiusura del registro della conversazione premendo "
 "il tasto Invio oppure automaticamente."
 
-#: src/commandhandler.cpp:283
+#: src/commandhandler.cpp:292
 msgid ""
-"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
-"\", \"no\", \"false\" to turn the toggle off."
+"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
+"\"0\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 "<stato> può essere \"1\", \"yes\", \"true\" per attivarlo, oppure \"0\", \"no"
 "\", \"false\" per disattivarlo."
 
-#: src/commandhandler.cpp:286
+#: src/commandhandler.cpp:295
 msgid "Command: /toggle"
 msgstr "Comando: /toggle"
 
-#: src/commandhandler.cpp:287
+#: src/commandhandler.cpp:296
 msgid "This command displays the return toggle status."
 msgstr "Questo comando mostra se il tasto Invio è attivato o meno."
 
-#: src/commandhandler.cpp:291 src/gui/widgets/whispertab.cpp:93
+#: src/commandhandler.cpp:300 src/gui/widgets/whispertab.cpp:95
 #, fuzzy
 msgid "Command: /unignore <player>"
 msgstr "Comando: /item <politica>"
 
-#: src/commandhandler.cpp:292
+#: src/commandhandler.cpp:301
 msgid "This command stops ignoring the given player if they are being ignored"
 msgstr ""
 
-#: src/commandhandler.cpp:297
+#: src/commandhandler.cpp:306
 msgid "Command: /where"
 msgstr "Comando: /where"
 
-#: src/commandhandler.cpp:298
+#: src/commandhandler.cpp:307
 msgid "This command displays the name of the current map."
 msgstr "Questo comando mostra il nome della mappa attuale."
 
-#: src/commandhandler.cpp:302
+#: src/commandhandler.cpp:311
 msgid "Command: /who"
 msgstr "Comando: /who"
 
-#: src/commandhandler.cpp:303
+#: src/commandhandler.cpp:312
 msgid "This command displays the number of players currently online."
 msgstr "Questo comando mostra il numero dei giocatori attualmente connessi."
 
-#: src/commandhandler.cpp:309
+#: src/commandhandler.cpp:318
 msgid "Type /help for a list of commands."
 msgstr "Digitare /help per una lista dei comandi."
 
-#: src/commandhandler.cpp:375
+#: src/commandhandler.cpp:384
 msgid "Cannot send empty whispers!"
 msgstr "Impossibile inviare un sussurro vuoto!"
 
-#: src/commandhandler.cpp:383
+#: src/commandhandler.cpp:392
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -423,59 +430,67 @@ msgstr ""
 "Impossibile creare una scheda per sussurrare a \"%s\"! Esiste già, oppure "
 "sei tu."
 
-#: src/commandhandler.cpp:397
+#: src/commandhandler.cpp:406
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Richiesta per accedere al canale %s."
 
-#: src/commandhandler.cpp:410 src/net/ea/gui/partytab.cpp:109
+#: src/commandhandler.cpp:419 src/net/tmwa/gui/partytab.cpp:109
 msgid "Party name is missing."
 msgstr "Manca il nome del party."
 
-#: src/commandhandler.cpp:423 src/commandhandler.cpp:471
-#: src/commandhandler.cpp:493
+#: src/commandhandler.cpp:432 src/commandhandler.cpp:509
+#: src/commandhandler.cpp:531
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:441
+#: src/commandhandler.cpp:450
 msgid "Return toggles chat."
 msgstr "Invio attiva/disattiva la conversazione."
 
-#: src/commandhandler.cpp:441
+#: src/commandhandler.cpp:450
 msgid "Message closes chat."
 msgstr "I messaggi chiudono la conversazione."
 
-#: src/commandhandler.cpp:450
+#: src/commandhandler.cpp:459
 msgid "Return now toggles chat."
 msgstr "\"Invio\" adesso attiva/disattiva la conversazione."
 
-#: src/commandhandler.cpp:454
+#: src/commandhandler.cpp:463
 msgid "Message now closes chat."
 msgstr "I messaggi adesso chiudono la conversazione."
 
-#: src/commandhandler.cpp:477
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:489
+msgid "Show IP: On"
+msgstr ""
+
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:485
+msgid "Show IP: Off"
+msgstr ""
+
+#: src/commandhandler.cpp:515
 msgid "Player already ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:484
+#: src/commandhandler.cpp:522
 #, fuzzy
 msgid "Player successfully ignored!"
 msgstr "Party creato con successo."
 
-#: src/commandhandler.cpp:486
+#: src/commandhandler.cpp:524
 #, fuzzy
 msgid "Player could not be ignored!"
 msgstr "Il bisbiglio non può essere inviato, ignorato dall'utente."
 
-#: src/commandhandler.cpp:501
+#: src/commandhandler.cpp:539
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:506
+#: src/commandhandler.cpp:544
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:508
+#: src/commandhandler.cpp:546
 #, fuzzy
 msgid "Player could not be unignored!"
 msgstr "Il bisbiglio non può essere inviato, ignorato dall'utente."
@@ -491,43 +506,43 @@ msgstr ""
 msgid "General"
 msgstr "Generale"
 
-#: src/game.cpp:326
+#: src/game.cpp:342
 #, fuzzy
 msgid "Screenshot saved as "
 msgstr "Schermata salvata in ~/"
 
-#: src/game.cpp:331
+#: src/game.cpp:347
 msgid "Saving screenshot failed!"
 msgstr "Salvataggio della schermata fallito!"
 
-#: src/game.cpp:355
+#: src/game.cpp:378
 #, fuzzy
 msgid "The connection to the server was lost."
 msgstr "La connessione al server è caduta. Il programma sarà ora chiuso."
 
-#: src/game.cpp:360
+#: src/game.cpp:382
 msgid "Network Error"
 msgstr "Errore di rete"
 
-#: src/game.cpp:705
+#: src/game.cpp:721
 msgid "Ignoring incoming trade requests"
 msgstr "Le richieste di scambio in arrivo saranno ignorate"
 
-#: src/game.cpp:712
+#: src/game.cpp:726
 msgid "Accepting incoming trade requests"
 msgstr "Le richieste di scambio in arrivo saranno accettate"
 
-#: src/game.cpp:946
+#: src/game.cpp:954
 #, fuzzy
 msgid "Could Not Load Map"
 msgstr "Impossibile caricare la mappa"
 
-#: src/game.cpp:947
+#: src/game.cpp:955
 #, c-format
 msgid "Error while loading %s"
 msgstr "Errore durante il caricamento di %s"
 
-#: src/gui/beingpopup.cpp:75
+#: src/gui/beingpopup.cpp:76
 #, fuzzy, c-format
 msgid "Party: %s"
 msgstr "Party (%s)"
@@ -536,34 +551,34 @@ msgstr "Party (%s)"
 msgid "Buy"
 msgstr "Compra"
 
-#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
-#: src/gui/sell.cpp:276
+#: src/gui/buy.cpp:69 src/gui/buy.cpp:261 src/gui/sell.cpp:71
+#: src/gui/sell.cpp:288
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Prezzo: %s / Totale: %s"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:99 src/gui/npcdialog.cpp:100
-#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:404
+#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:112 src/gui/npcdialog.cpp:124
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:463
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:98 src/gui/npcdialog.cpp:101
-#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:416
+#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:111 src/gui/npcdialog.cpp:125
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:475
 msgid "-"
 msgstr ""
 
 #: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
-#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:152
-#: src/keyboardconfig.cpp:103
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:228
+#: src/keyboardconfig.cpp:102
 msgid "Quit"
 msgstr "Esci"
 
-#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:333
-#: src/gui/statuswindow.cpp:403 src/gui/statuswindow.cpp:437
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:384
+#: src/gui/statuswindow.cpp:462 src/gui/statuswindow.cpp:496
 msgid "Max"
 msgstr "Massimo"
 
@@ -577,11 +592,11 @@ msgstr "Vendi"
 
 #: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
 #: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
-#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:101
-#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:178
-#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:402
+#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:114
+#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:389
 #: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
-#: src/gui/socialwindow.cpp:243 src/gui/textdialog.cpp:39
+#: src/gui/socialwindow.cpp:275 src/gui/textdialog.cpp:40
 #: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr "Annulla"
@@ -620,7 +635,7 @@ msgstr "Il nuovo indirizzo e-mail esiste già."
 msgid "Change Password"
 msgstr "Cambia la Password"
 
-#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:53
+#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:55
 #: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
 msgid "Password:"
 msgstr "Password:"
@@ -652,19 +667,19 @@ msgstr ""
 msgid "Create Character"
 msgstr "Crea Personaggio"
 
-#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:52
+#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:54
 #: src/gui/register.cpp:67
 msgid "Name:"
 msgstr "Nome:"
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
 #: src/gui/outfitwindow.cpp:67
 msgid ">"
 msgstr ""
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
 #: src/gui/outfitwindow.cpp:66
@@ -681,8 +696,8 @@ msgstr "Colore Capelli:"
 msgid "Hair style:"
 msgstr "Stile Capelli:"
 
-#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:397
-#: src/gui/socialwindow.cpp:297
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:392
+#: src/gui/socialwindow.cpp:329
 msgid "Create"
 msgstr "Crea"
 
@@ -738,34 +753,34 @@ msgstr "Cancella registrazione"
 msgid "Change Email"
 msgstr "Cambia l'indirizzo Email"
 
-#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:155
-#: src/gui/setup_players.cpp:230
+#: src/gui/charselectdialog.cpp:336 src/gui/serverdialog.cpp:231
+#: src/gui/setup_players.cpp:229
 msgid "Delete"
 msgstr "Elimina"
 
-#: src/gui/charselectdialog.cpp:387
+#: src/gui/charselectdialog.cpp:380
 #, fuzzy
 msgid "Choose"
 msgstr "Chiudi"
 
-#: src/gui/charselectdialog.cpp:399 src/gui/charselectdialog.cpp:400
+#: src/gui/charselectdialog.cpp:394 src/gui/charselectdialog.cpp:395
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:77
+#: src/gui/chat.cpp:88
 msgid "Chat"
 msgstr "Chat"
 
-#: src/gui/chat.cpp:287
+#: src/gui/chat.cpp:311
 #, fuzzy, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Sono presenti %d giocatori."
 
-#: src/gui/chat.cpp:305
+#: src/gui/chat.cpp:329
 msgid "Attendance written to record log."
 msgstr "Numero dei presenti registrato."
 
-#: src/gui/chat.cpp:469
+#: src/gui/chat.cpp:493
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Sussurra a %s: %s"
@@ -831,139 +846,170 @@ msgstr "Suoni ambientali"
 msgid "Equipment"
 msgstr "Equipaggiamento"
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:78
-#: src/gui/inventorywindow.cpp:80 src/gui/inventorywindow.cpp:291
-#: src/gui/popupmenu.cpp:372
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:89
+#: src/gui/inventorywindow.cpp:337 src/gui/popupmenu.cpp:359
 msgid "Unequip"
 msgstr "Rimuovi"
 
-#: src/gui/help.cpp:36
+#: src/gui/help.cpp:37
 msgid "Help"
 msgstr "Aiuto"
 
-#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:74
+#: src/gui/help.cpp:51 src/gui/npcdialog.cpp:50
 msgid "Close"
 msgstr "Chiudi"
 
-#: src/gui/inventorywindow.cpp:57 src/gui/windowmenu.cpp:56
+#: src/gui/inventorywindow.cpp:59 src/gui/windowmenu.cpp:56
 msgid "Inventory"
 msgstr "Inventario"
 
-#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:75
-#: src/gui/inventorywindow.cpp:293 src/gui/popupmenu.cpp:374
+#: src/gui/inventorywindow.cpp:59
+msgid "Storage"
+msgstr "Storage"
+
+#: src/gui/inventorywindow.cpp:82
+msgid "Slots:"
+msgstr "Slot:"
+
+#: src/gui/inventorywindow.cpp:87 src/gui/inventorywindow.cpp:100
+#: src/gui/inventorywindow.cpp:339 src/gui/popupmenu.cpp:361
 msgid "Equip"
 msgstr "Equipaggia"
 
-#: src/gui/inventorywindow.cpp:74 src/gui/inventorywindow.cpp:75
-#: src/gui/inventorywindow.cpp:297 src/gui/popupmenu.cpp:377
+#: src/gui/inventorywindow.cpp:88
 msgid "Use"
 msgstr "Usa"
 
-#: src/gui/inventorywindow.cpp:84 src/gui/inventorywindow.cpp:301
-#: src/gui/popupmenu.cpp:380
+#: src/gui/inventorywindow.cpp:101 src/gui/popupmenu.cpp:364
+msgid "Activate"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:102 src/gui/inventorywindow.cpp:348
+#: src/gui/popupmenu.cpp:367
 #, fuzzy
 msgid "Drop..."
 msgstr "Lascia"
 
-#: src/gui/inventorywindow.cpp:85 src/gui/popupmenu.cpp:386
+#: src/gui/inventorywindow.cpp:103 src/gui/popupmenu.cpp:373
 msgid "Split"
 msgstr "Dividi"
 
-#: src/gui/inventorywindow.cpp:86 src/gui/outfitwindow.cpp:51
+#: src/gui/inventorywindow.cpp:104 src/gui/outfitwindow.cpp:51
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:97 src/gui/storagewindow.cpp:84
-msgid "Slots:"
-msgstr "Slot:"
-
-#: src/gui/inventorywindow.cpp:98
+#: src/gui/inventorywindow.cpp:106
 msgid "Weight:"
 msgstr "Peso:"
 
-#: src/gui/inventorywindow.cpp:303 src/gui/popupmenu.cpp:382
+#: src/gui/inventorywindow.cpp:124 src/gui/popupmenu.cpp:378
+msgid "Store"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:125 src/gui/popupmenu.cpp:385
+msgid "Retrieve"
+msgstr "Recupera"
+
+#: src/gui/inventorywindow.cpp:350 src/gui/popupmenu.cpp:369
 msgid "Drop"
 msgstr "Lascia"
 
-#: src/gui/itemamount.cpp:100 src/gui/okdialog.cpp:42
-#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:38 src/gui/trade.cpp:73
-#: src/gui/trade.cpp:75
+#: src/gui/itemamount.cpp:113 src/gui/okdialog.cpp:42
+#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:39 src/gui/trade.cpp:72
+#: src/gui/trade.cpp:74
 msgid "OK"
 msgstr "OK"
 
-#: src/gui/itemamount.cpp:102
+#: src/gui/itemamount.cpp:115
 msgid "All"
 msgstr "Tutti"
 
-#: src/gui/itemamount.cpp:128
+#: src/gui/itemamount.cpp:141
 msgid "Select amount of items to trade."
 msgstr "Seleziona la quantità di oggetti da scambiare."
 
-#: src/gui/itemamount.cpp:131
+#: src/gui/itemamount.cpp:144
 msgid "Select amount of items to drop."
 msgstr "Seleziona la quantità di oggetti da lasciare."
 
-#: src/gui/itemamount.cpp:134
+#: src/gui/itemamount.cpp:147
 msgid "Select amount of items to store."
 msgstr "Selezionare la quantità di oggetti da riporre."
 
-#: src/gui/itemamount.cpp:137
+#: src/gui/itemamount.cpp:150
 msgid "Select amount of items to retrieve."
 msgstr "Seleziona la quantità di oggetti da ritirare"
 
-#: src/gui/itemamount.cpp:140
+#: src/gui/itemamount.cpp:153
 msgid "Select amount of items to split."
 msgstr "Seleziona la quantità di oggetti da dividere."
 
-#: src/gui/itempopup.cpp:92
+#: src/gui/itempopup.cpp:137
 #, fuzzy, c-format
 msgid "Weight: %s"
 msgstr "Peso: "
 
-#: src/gui/login.cpp:49 src/gui/login.cpp:61
+#: src/gui/login.cpp:51 src/gui/login.cpp:63
 msgid "Login"
 msgstr "Autenticazione"
 
-#: src/gui/login.cpp:58
+#: src/gui/login.cpp:60
 #, fuzzy
 msgid "Remember username"
 msgstr "Ricorda nome utente"
 
-#: src/gui/login.cpp:59 src/gui/register.cpp:58 src/gui/register.cpp:73
+#: src/gui/login.cpp:61 src/gui/register.cpp:58 src/gui/register.cpp:73
 msgid "Register"
 msgstr "Registra"
 
-#: src/gui/login.cpp:60
+#: src/gui/login.cpp:62
 #, fuzzy
 msgid "Change Server"
 msgstr "Server"
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
+#: src/gui/login.cpp:129
+#, fuzzy
+msgid "Registration disabled"
+msgstr "Disabilitata la condivisione degli oggetti"
+
+#: src/gui/login.cpp:129
+msgid "You need to use the website to register an account for this server."
+msgstr ""
+
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:86
 msgid "Map"
 msgstr "Mappa"
 
-#: src/gui/npcdialog.cpp:44
+#: src/gui/ministatus.cpp:235
+msgid "Need"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:48
 msgid "Waiting for server"
 msgstr "In attesa del server"
 
-#: src/gui/npcdialog.cpp:45
+#: src/gui/npcdialog.cpp:49
 msgid "Next"
 msgstr "Prossimo"
 
-#: src/gui/npcdialog.cpp:47
+#: src/gui/npcdialog.cpp:51
 msgid "Submit"
 msgstr "Invia"
 
-#: src/gui/npcdialog.cpp:52 src/gui/npcpostdialog.cpp:41
+#: src/gui/npcdialog.cpp:73 src/gui/npcpostdialog.cpp:41
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:110
+#: src/gui/npcdialog.cpp:118
+msgid "Clear log"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:134
 msgid "Reset"
 msgstr "Reimposta"
 
 #. TRANSLATORS: Please leave the \n sequences intact.
-#: src/gui/npcdialog.cpp:171
+#: src/gui/npcdialog.cpp:208
 #, fuzzy
 msgid ""
 "\n"
@@ -978,7 +1024,7 @@ msgstr "A:"
 msgid "Send"
 msgstr "Invia"
 
-#: src/gui/npcpostdialog.cpp:96
+#: src/gui/npcpostdialog.cpp:99
 msgid "Failed to send as sender or letter invalid."
 msgstr "La lettera non è valida oppure non è stato possibile inviarla."
 
@@ -993,99 +1039,86 @@ msgstr ""
 msgid "Unequip first"
 msgstr "Rimuovi"
 
-#: src/gui/popupmenu.cpp:84
+#: src/gui/popupmenu.cpp:83
 #, fuzzy, c-format
 msgid "Trade with %s..."
 msgstr "Commerciando con %s"
 
-#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:161
+#: src/gui/popupmenu.cpp:87 src/gui/popupmenu.cpp:158
 #, fuzzy, c-format
 msgid "Attack %s"
 msgstr "Attacco %+d"
 
-#: src/gui/popupmenu.cpp:92
+#: src/gui/popupmenu.cpp:91
 #, fuzzy, c-format
 msgid "Whisper %s"
 msgstr "Sussurro"
 
-#: src/gui/popupmenu.cpp:101
+#: src/gui/popupmenu.cpp:100
 #, fuzzy, c-format
 msgid "Befriend %s"
 msgstr "@@friend|Amico con %s@@"
 
-#: src/gui/popupmenu.cpp:106
+#: src/gui/popupmenu.cpp:105
 #, fuzzy, c-format
 msgid "Disregard %s"
 msgstr "Disprezzato"
 
-#: src/gui/popupmenu.cpp:109
+#: src/gui/popupmenu.cpp:108
 #, fuzzy, c-format
 msgid "Ignore %s"
 msgstr "Ignorato"
 
-#: src/gui/popupmenu.cpp:115 src/gui/popupmenu.cpp:124
+#: src/gui/popupmenu.cpp:114 src/gui/popupmenu.cpp:123
 #, c-format
 msgid "Unignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:118
+#: src/gui/popupmenu.cpp:117
 #, fuzzy, c-format
 msgid "Completely ignore %s"
 msgstr "@@ignore|Ignora completamente %s@@"
 
 #: src/gui/popupmenu.cpp:130
-#, c-format
-msgid "Follow %s"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:133
 #, fuzzy, c-format
 msgid "Invite %s to join your guild"
 msgstr "@@guild|Invita %s ad entrare nella tua gilda@@"
 
-#: src/gui/popupmenu.cpp:137
+#: src/gui/popupmenu.cpp:134
 #, fuzzy, c-format
 msgid "Invite %s to join your party"
 msgstr "@@party|Invita %s ad entrare nel tuo party@@"
 
-#: src/gui/popupmenu.cpp:144
+#: src/gui/popupmenu.cpp:141
 #, fuzzy
 msgid "Kick player"
 msgstr "Espulsione fallita!"
 
-#: src/gui/popupmenu.cpp:153
+#: src/gui/popupmenu.cpp:150
 #, fuzzy, c-format
 msgid "Talk to %s"
 msgstr "@@talk|Parla a %s@@"
 
-#: src/gui/popupmenu.cpp:166
+#: src/gui/popupmenu.cpp:163
 #, fuzzy
 msgid "Kick monster"
 msgstr "@@admin-kick|Espelli mostro@@"
 
-#: src/gui/popupmenu.cpp:174
+#: src/gui/popupmenu.cpp:171
 #, fuzzy
 msgid "Add name to chat"
 msgstr "@@name|Aggiungi nome alla conversazione@@"
 
-#: src/gui/popupmenu.cpp:191
+#: src/gui/popupmenu.cpp:188
 #, fuzzy, c-format
 msgid "Pick up %s"
 msgstr "Raccogli"
 
-#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:400
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:387
 #, fuzzy
 msgid "Add to chat"
 msgstr "@@chat|Aggiungi alla chat@@"
 
-#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:71
-msgid "Store"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:72
-msgid "Retrieve"
-msgstr "Recupera"
-
 #: src/gui/quitdialog.cpp:44
 msgid "Switch server"
 msgstr "Cambia server"
@@ -1154,52 +1187,65 @@ msgstr "La password deve contenere meno di %d caratteri."
 msgid "Passwords do not match."
 msgstr "Le password non corrispondono."
 
-#: src/gui/serverdialog.cpp:124
+#: src/gui/serverdialog.cpp:197
 #, fuzzy
 msgid "Choose Your Server"
 msgstr "Scegliere il proprio server"
 
-#: src/gui/serverdialog.cpp:131 src/gui/widgets/chattab.cpp:139
+#: src/gui/serverdialog.cpp:206 src/gui/widgets/chattab.cpp:142
 msgid "Server:"
 msgstr "Server:"
 
-#: src/gui/serverdialog.cpp:132
+#: src/gui/serverdialog.cpp:207
 msgid "Port:"
 msgstr "Porta:"
 
-#: src/gui/serverdialog.cpp:133
+#: src/gui/serverdialog.cpp:208
 #, fuzzy
 msgid "Server type:"
 msgstr "Server:"
 
-#: src/gui/serverdialog.cpp:153
+#: src/gui/serverdialog.cpp:229
 #, fuzzy
 msgid "Connect"
 msgstr "Connessione..."
 
-#: src/gui/serverdialog.cpp:154
+#: src/gui/serverdialog.cpp:230
 #, fuzzy
 msgid "Custom Server"
 msgstr "Cursore personalizzato"
 
-#: src/gui/serverdialog.cpp:242
+#: src/gui/serverdialog.cpp:324
 msgid "Please type both the address and the port of a server."
 msgstr "Per favore inserisci l'indirizzo e la porta del server."
 
-#: src/gui/serverdialog.cpp:357
+#: src/gui/serverdialog.cpp:441
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:363
+#: src/gui/serverdialog.cpp:447
 #, fuzzy
 msgid "Waiting for server..."
 msgstr "In attesa del server"
 
-#: src/gui/serverdialog.cpp:367
+#: src/gui/serverdialog.cpp:451
 msgid "Preparing download"
 msgstr ""
 
+#: src/gui/serverdialog.cpp:455
+msgid "Error retreiving server list!"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:550
+msgid "requires a newer version"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:552
+#, c-format
+msgid "requires v%s"
+msgstr ""
+
 #: src/gui/setup_audio.cpp:42
 msgid "Sound"
 msgstr "Suono"
@@ -1233,54 +1279,54 @@ msgstr ""
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:45
+#: src/gui/setup_colors.cpp:46
 msgid "This is what the color looks like"
 msgstr "Come appaiono i colori"
 
-#: src/gui/setup_colors.cpp:50
+#: src/gui/setup_colors.cpp:51
 msgid "Colors"
 msgstr "Colori"
 
-#: src/gui/setup_colors.cpp:71
+#: src/gui/setup_colors.cpp:72
 #, fuzzy
 msgid "Type:"
 msgstr "Tipo: "
 
-#: src/gui/setup_colors.cpp:82 src/gui/setup_colors.cpp:330
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:331
 msgid "Static"
 msgstr "Statico"
 
-#: src/gui/setup_colors.cpp:84 src/gui/setup_colors.cpp:85
-#: src/gui/setup_colors.cpp:331
+#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
+#: src/gui/setup_colors.cpp:332
 msgid "Pulse"
 msgstr "Pulsazione"
 
-#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:87
-#: src/gui/setup_colors.cpp:332
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
+#: src/gui/setup_colors.cpp:333
 msgid "Rainbow"
 msgstr "Arcobaleno"
 
-#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
-#: src/gui/setup_colors.cpp:332
+#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
+#: src/gui/setup_colors.cpp:333
 msgid "Spectrum"
 msgstr "Gamma"
 
-#: src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:94
 #, fuzzy
 msgid "Delay:"
 msgstr "Ritardo: "
 
-#: src/gui/setup_colors.cpp:108
+#: src/gui/setup_colors.cpp:109
 #, fuzzy
 msgid "Red:"
 msgstr "Rosso: "
 
-#: src/gui/setup_colors.cpp:123
+#: src/gui/setup_colors.cpp:124
 #, fuzzy
 msgid "Green:"
 msgstr "Verde: "
 
-#: src/gui/setup_colors.cpp:138
+#: src/gui/setup_colors.cpp:139
 #, fuzzy
 msgid "Blue:"
 msgstr "Blu: "
@@ -1338,591 +1384,593 @@ msgstr "Predefinito"
 msgid "Key Conflict(s) Detected."
 msgstr "Sono stati rilevati conflitti nei tasti."
 
-#: src/gui/setup_players.cpp:57
+#: src/gui/setup_players.cpp:58
 msgid "Name"
 msgstr "Nome"
 
-#: src/gui/setup_players.cpp:58
+#: src/gui/setup_players.cpp:59
 msgid "Relation"
 msgstr "Relazione"
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:64
 msgid "Neutral"
 msgstr "Neutrale"
 
-#: src/gui/setup_players.cpp:64
+#: src/gui/setup_players.cpp:65
 msgid "Friend"
 msgstr "Amico"
 
-#: src/gui/setup_players.cpp:65
+#: src/gui/setup_players.cpp:66
 msgid "Disregarded"
 msgstr "Disprezzato"
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_players.cpp:67
 msgid "Ignored"
 msgstr "Ignorato"
 
-#: src/gui/setup_players.cpp:208 src/gui/setup_video.cpp:132
+#: src/gui/setup_players.cpp:206 src/gui/setup_video.cpp:153
 msgid "???"
 msgstr "???"
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_players.cpp:225
 msgid "Allow trading"
 msgstr "Permetti scambi"
 
-#: src/gui/setup_players.cpp:228
+#: src/gui/setup_players.cpp:227
 msgid "Allow whispers"
 msgstr "Permetti sussurri"
 
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:231
 msgid "Put all whispers in tabs"
 msgstr "Sposta tutti i sussurri in schede"
 
-#: src/gui/setup_players.cpp:234
+#: src/gui/setup_players.cpp:233
 #, fuzzy
 msgid "Show gender"
 msgstr "Mostra nomi"
 
-#: src/gui/setup_players.cpp:236
+#: src/gui/setup_players.cpp:235
+#, fuzzy
+msgid "Enable Chat log"
+msgstr "Impossibile vendere."
+
+#: src/gui/setup_players.cpp:237
 msgid "Players"
 msgstr "Giocatori"
 
-#: src/gui/setup_players.cpp:261
+#: src/gui/setup_players.cpp:262
 msgid "When ignoring:"
 msgstr "Quando si ignora:"
 
-#: src/gui/setup_video.cpp:113
+#: src/gui/setup_video.cpp:134
 msgid "Tiny"
 msgstr "Minuscolo"
 
-#: src/gui/setup_video.cpp:114
+#: src/gui/setup_video.cpp:135
 msgid "Small"
 msgstr "Piccolo"
 
-#: src/gui/setup_video.cpp:115
+#: src/gui/setup_video.cpp:136
 msgid "Medium"
 msgstr "Medio"
 
-#: src/gui/setup_video.cpp:116
+#: src/gui/setup_video.cpp:137
 msgid "Large"
 msgstr "Largo"
 
-#: src/gui/setup_video.cpp:142
+#: src/gui/setup_video.cpp:163
 msgid "No text"
 msgstr "Nessun testo"
 
-#: src/gui/setup_video.cpp:143
+#: src/gui/setup_video.cpp:164
 msgid "Text"
 msgstr "Testo"
 
-#: src/gui/setup_video.cpp:144
+#: src/gui/setup_video.cpp:165
 msgid "Bubbles, no names"
 msgstr "Nuvolette senza nomi"
 
-#: src/gui/setup_video.cpp:145
+#: src/gui/setup_video.cpp:166
 msgid "Bubbles with names"
 msgstr "Nuvolette con nomi"
 
-#: src/gui/setup_video.cpp:157
+#: src/gui/setup_video.cpp:178
 msgid "off"
 msgstr "Spento"
 
-#: src/gui/setup_video.cpp:158 src/gui/setup_video.cpp:171
+#: src/gui/setup_video.cpp:179 src/gui/setup_video.cpp:192
 msgid "low"
 msgstr "Basso"
 
-#: src/gui/setup_video.cpp:159 src/gui/setup_video.cpp:173
+#: src/gui/setup_video.cpp:180 src/gui/setup_video.cpp:194
 msgid "high"
 msgstr "Alto"
 
-#: src/gui/setup_video.cpp:172
+#: src/gui/setup_video.cpp:193
 msgid "medium"
 msgstr "medio"
 
-#: src/gui/setup_video.cpp:174
+#: src/gui/setup_video.cpp:195
 msgid "max"
 msgstr "massimo"
 
-#: src/gui/setup_video.cpp:196
+#: src/gui/setup_video.cpp:217
 msgid "Full screen"
 msgstr "Schermo intero"
 
-#: src/gui/setup_video.cpp:197
+#: src/gui/setup_video.cpp:218
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:198
+#: src/gui/setup_video.cpp:219
 msgid "Custom cursor"
 msgstr "Cursore personalizzato"
 
-#: src/gui/setup_video.cpp:200
+#: src/gui/setup_video.cpp:221
 msgid "Visible names"
 msgstr "Nomi visibili"
 
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:223
 msgid "Particle effects"
 msgstr "Effetti particelle"
 
-#: src/gui/setup_video.cpp:204
+#: src/gui/setup_video.cpp:225
 #, fuzzy
 msgid "Show own name"
 msgstr "Mostra nomi"
 
-#: src/gui/setup_video.cpp:205
+#: src/gui/setup_video.cpp:226
+msgid "Log NPC dialogue"
+msgstr ""
+
+#: src/gui/setup_video.cpp:227
 msgid "Show pickup notification"
 msgstr ""
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:207
+#. TRANSLATORS: Refers to "Show pickup notification"
+#: src/gui/setup_video.cpp:229
 msgid "in chat"
 msgstr "in chat"
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:209
+#. TRANSLATORS: Refers to "Show pickup notification"
+#: src/gui/setup_video.cpp:231
 msgid "as particle"
 msgstr ""
 
-#: src/gui/setup_video.cpp:214
+#: src/gui/setup_video.cpp:236
 #, fuzzy
 msgid "FPS limit:"
 msgstr "Limita FPS:"
 
-#: src/gui/setup_video.cpp:225
+#: src/gui/setup_video.cpp:247
+msgid "Disable transparency (Low CPU mode)"
+msgstr ""
+
+#: src/gui/setup_video.cpp:250
 msgid "Video"
 msgstr "Video"
 
-#: src/gui/setup_video.cpp:227
+#: src/gui/setup_video.cpp:252
 #, fuzzy
-msgid "Show monster damage"
+msgid "Show damage"
 msgstr "Mostra nomi"
 
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:258
 msgid "Overhead text"
 msgstr "Testo sovrastante"
 
-#: src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:259
 msgid "Gui opacity"
 msgstr "Opacità IU"
 
-#: src/gui/setup_video.cpp:235
+#: src/gui/setup_video.cpp:260
 msgid "Ambient FX"
 msgstr "Suoni ambientali"
 
-#: src/gui/setup_video.cpp:236
+#: src/gui/setup_video.cpp:261
 #, fuzzy
 msgid "Particle detail"
 msgstr "Dettagli particelle"
 
-#: src/gui/setup_video.cpp:237
+#: src/gui/setup_video.cpp:262
 msgid "Font size"
 msgstr "Dimensione caratteri"
 
-#: src/gui/setup_video.cpp:251 src/gui/setup_video.cpp:454
-#: src/gui/setup_video.cpp:568
+#: src/gui/setup_video.cpp:277 src/gui/setup_video.cpp:532
+#: src/gui/setup_video.cpp:662
 #, fuzzy
 msgid "None"
 msgstr "No"
 
-#: src/gui/setup_video.cpp:381
+#: src/gui/setup_video.cpp:426
 #, fuzzy
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr "e il ripristino della precedente è fallito."
 
-#: src/gui/setup_video.cpp:387
+#: src/gui/setup_video.cpp:432
 #, fuzzy
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr "e il ripristino della precedente è fallito."
 
-#: src/gui/setup_video.cpp:398
+#: src/gui/setup_video.cpp:443
 #, fuzzy
 msgid "Switching to Full Screen"
 msgstr "Modalità a schermo intero"
 
-#: src/gui/setup_video.cpp:399
+#: src/gui/setup_video.cpp:444
 msgid "Restart needed for changes to take effect."
 msgstr "Riavvio necessario affinchè i cambiamenti abbiano effetto."
 
-#: src/gui/setup_video.cpp:411
+#: src/gui/setup_video.cpp:458
 #, fuzzy
 msgid "Changing to OpenGL"
 msgstr "Modifica OpenGL"
 
-#: src/gui/setup_video.cpp:412
+#: src/gui/setup_video.cpp:459
+msgid ""
+"Applying change to OpenGL requires restart. In case OpenGL messes up your "
+"game graphics, restart the game with the command line option \"--no-opengl\"."
+msgstr ""
+
+#: src/gui/setup_video.cpp:466
+msgid "Deactivating OpenGL"
+msgstr ""
+
+#: src/gui/setup_video.cpp:467
 msgid "Applying change to OpenGL requires restart."
 msgstr "Applicare le modifiche ad OpenGL richiede il riavvio."
 
-#: src/gui/setup_video.cpp:486 src/gui/setup_video.cpp:491
+#: src/gui/setup_video.cpp:475
+#, fuzzy
+msgid "Transparency disabled"
+msgstr "Disabilitata la condivisione dell'esperienza."
+
+#: src/gui/setup_video.cpp:476 src/gui/setup_video.cpp:484
+msgid "You must restart to apply changes."
+msgstr ""
+
+#: src/gui/setup_video.cpp:483
+msgid "Transparency enabled"
+msgstr ""
+
+#: src/gui/setup_video.cpp:576 src/gui/setup_video.cpp:581
 #, fuzzy
 msgid "Screen Resolution Changed"
 msgstr "Risoluzione schermo modificata"
 
-#: src/gui/setup_video.cpp:487 src/gui/setup_video.cpp:492
+#: src/gui/setup_video.cpp:577 src/gui/setup_video.cpp:582
 msgid "Restart your client for the change to take effect."
 msgstr "Per applicare le modifiche, è necessario riavviare il client."
 
-#: src/gui/setup_video.cpp:489
+#: src/gui/setup_video.cpp:579
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:522
+#: src/gui/setup_video.cpp:612
 #, fuzzy
 msgid "Particle Effect Settings Changed."
 msgstr "Impostazione effetti particelle modificato."
 
-#: src/gui/setup_video.cpp:523
+#: src/gui/setup_video.cpp:613
 msgid "Changes will take effect on map change."
 msgstr "I cambi saranno effettuati al cambio della mappa."
 
-#: src/gui/skilldialog.cpp:198 src/gui/windowmenu.cpp:59
+#: src/gui/skilldialog.cpp:212 src/gui/windowmenu.cpp:59
 msgid "Skills"
 msgstr "Abilità"
 
-#: src/gui/skilldialog.cpp:209
+#: src/gui/skilldialog.cpp:223
 msgid "Up"
 msgstr "Su"
 
-#: src/gui/skilldialog.cpp:263
+#: src/gui/skilldialog.cpp:269
 #, fuzzy, c-format
 msgid "Skill points available: %d"
 msgstr "Punti abilità: %d"
 
-#: src/gui/skilldialog.cpp:315
+#: src/gui/skilldialog.cpp:351
 #, fuzzy, c-format
 msgid "Skill Set %d"
 msgstr "Punti abilità: %d"
 
-#: src/gui/skilldialog.cpp:324
+#: src/gui/skilldialog.cpp:360
 #, fuzzy, c-format
 msgid "Skill %d"
 msgstr "Abilità"
 
-#: src/gui/skilldialog.cpp:406
+#: src/gui/skilldialog.cpp:442
 #, fuzzy, c-format
 msgid "Lvl: %d (%+d)"
 msgstr "Livello: %d"
 
-#: src/gui/skilldialog.cpp:417
+#: src/gui/skilldialog.cpp:453
 #, fuzzy, c-format
 msgid "Lvl: %d"
 msgstr "Livello: %d"
 
-#: src/gui/socialwindow.cpp:118
+#: src/gui/socialwindow.cpp:126
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:127
+#: src/gui/socialwindow.cpp:139
 #, fuzzy, c-format
 msgid "Guild %s quit requested."
 msgstr "La gilda è stata creata."
 
-#: src/gui/socialwindow.cpp:137
+#: src/gui/socialwindow.cpp:153
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:138
+#: src/gui/socialwindow.cpp:154
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:147
+#: src/gui/socialwindow.cpp:163
 #, fuzzy
 msgid "Leave Guild?"
 msgstr "Crea una Gilda"
 
-#: src/gui/socialwindow.cpp:148
+#: src/gui/socialwindow.cpp:164
 #, fuzzy, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Sei sicuro di voler uscire?"
 
-#: src/gui/socialwindow.cpp:183
+#: src/gui/socialwindow.cpp:207 src/net/tmwa/partyhandler.cpp:330
 #, fuzzy, c-format
 msgid "Invited user %s to party."
 msgstr "/party > Invita un utente nel party"
 
-#: src/gui/socialwindow.cpp:190
+#: src/gui/socialwindow.cpp:218
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:200
+#: src/gui/socialwindow.cpp:232
 #, fuzzy
 msgid "Member Invite to Party"
 msgstr "/party > Invita un utente nel party"
 
-#: src/gui/socialwindow.cpp:201
+#: src/gui/socialwindow.cpp:233
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:210
+#: src/gui/socialwindow.cpp:242
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:211
+#: src/gui/socialwindow.cpp:243
 #, fuzzy, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Sei sicuro di voler uscire?"
 
-#: src/gui/socialwindow.cpp:240
+#: src/gui/socialwindow.cpp:272
 msgid "Create Guild"
 msgstr "Crea una Gilda"
 
-#: src/gui/socialwindow.cpp:241 src/gui/socialwindow.cpp:565
+#: src/gui/socialwindow.cpp:273 src/gui/socialwindow.cpp:620
 #, fuzzy
 msgid "Create Party"
 msgstr "Crea Personaggio"
 
-#: src/gui/socialwindow.cpp:280 src/gui/windowmenu.cpp:64
+#: src/gui/socialwindow.cpp:312 src/gui/windowmenu.cpp:64
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:298
+#: src/gui/socialwindow.cpp:330
 #, fuzzy
 msgid "Invite"
 msgstr "Invita un utente"
 
-#: src/gui/socialwindow.cpp:299
+#: src/gui/socialwindow.cpp:331
 #, fuzzy
 msgid "Leave"
 msgstr "Largo"
 
-#: src/gui/socialwindow.cpp:395
+#: src/gui/socialwindow.cpp:443
 #, fuzzy, c-format
 msgid "Accepted party invite from %s."
 msgstr "Invito accettato da %s."
 
-#: src/gui/socialwindow.cpp:401
+#: src/gui/socialwindow.cpp:449
 #, fuzzy, c-format
 msgid "Rejected party invite from %s."
 msgstr "Invito rifiutato da %s."
 
-#: src/gui/socialwindow.cpp:414
+#: src/gui/socialwindow.cpp:462
 #, fuzzy, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Invito accettato da %s."
 
-#: src/gui/socialwindow.cpp:420
+#: src/gui/socialwindow.cpp:468
 #, fuzzy, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Invito rifiutato da %s."
 
-#: src/gui/socialwindow.cpp:464
+#: src/gui/socialwindow.cpp:497
+msgid "Creating guild failed, please choose a shorter name."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:504
 #, fuzzy, c-format
 msgid "Creating guild called %s."
 msgstr "Errore durante la creazione della gilda."
 
-#: src/gui/socialwindow.cpp:478
+#: src/gui/socialwindow.cpp:520
+msgid "Creating party failed, please choose a shorter name."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:527
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:485
+#: src/gui/socialwindow.cpp:541
 #, fuzzy
 msgid "Guild Name"
 msgstr "Gilda"
 
-#: src/gui/socialwindow.cpp:486
+#: src/gui/socialwindow.cpp:542
 #, fuzzy
 msgid "Choose your guild's name."
 msgstr "Scegliere il proprio server"
 
-#: src/gui/socialwindow.cpp:498
+#: src/gui/socialwindow.cpp:554
 #, fuzzy
 msgid "Received guild request, but one already exists."
 msgstr "Ricevuta richiesta di party, ma ne esiste già una."
 
-#: src/gui/socialwindow.cpp:503
+#: src/gui/socialwindow.cpp:559
 #, fuzzy, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s ti ha invitato ad unirti al party %s."
 
-#: src/gui/socialwindow.cpp:508
+#: src/gui/socialwindow.cpp:564
 #, fuzzy
 msgid "Accept Guild Invite"
 msgstr "Accetta invito nel party"
 
-#: src/gui/socialwindow.cpp:520
+#: src/gui/socialwindow.cpp:576
 msgid "Received party request, but one already exists."
 msgstr "Ricevuta richiesta di party, ma ne esiste già una."
 
-#: src/gui/socialwindow.cpp:530
+#: src/gui/socialwindow.cpp:585
 #, fuzzy
 msgid "You have been invited you to join a party."
 msgstr "%s ti ha invitato ad unirti al suo party."
 
-#: src/gui/socialwindow.cpp:534
+#: src/gui/socialwindow.cpp:589
 #, fuzzy, c-format
 msgid "You have been invited to join the %s party."
 msgstr "%s ti ha invitato ad unirti al party %s."
 
-#: src/gui/socialwindow.cpp:542
+#: src/gui/socialwindow.cpp:597
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s ti ha invitato ad unirti al suo party."
 
-#: src/gui/socialwindow.cpp:547
+#: src/gui/socialwindow.cpp:602
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s ti ha invitato ad unirti al party %s."
 
-#: src/gui/socialwindow.cpp:555
+#: src/gui/socialwindow.cpp:610
 msgid "Accept Party Invite"
 msgstr "Accetta invito nel party"
 
-#: src/gui/socialwindow.cpp:566
+#: src/gui/socialwindow.cpp:621
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:571
+#: src/gui/socialwindow.cpp:626
 #, fuzzy
 msgid "Party Name"
 msgstr "Party"
 
-#: src/gui/socialwindow.cpp:572
+#: src/gui/socialwindow.cpp:627
 #, fuzzy
 msgid "Choose your party's name."
 msgstr "Scegliere il proprio server"
 
-#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:62
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:62
 msgid "Specials"
 msgstr ""
 
-#: src/gui/specialswindow.cpp:174
-#, c-format
-msgid "Specials Set %d"
-msgstr ""
-
-#: src/gui/specialswindow.cpp:191
-#, c-format
-msgid "Special %d"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:247
+#: src/gui/statuswindow.cpp:113 src/gui/statuswindow.cpp:215
+#: src/gui/statuswindow.cpp:262
 #, c-format
 msgid "Level: %d"
 msgstr "Livello: %d"
 
-#: src/gui/statuswindow.cpp:101 src/gui/statuswindow.cpp:211
+#: src/gui/statuswindow.cpp:114 src/gui/statuswindow.cpp:208
+#: src/gui/statuswindow.cpp:239
 #, c-format
 msgid "Money: %s"
 msgstr "Soldi: %s"
 
-#: src/gui/statuswindow.cpp:104
+#: src/gui/statuswindow.cpp:117
 msgid "HP:"
 msgstr "HP:"
 
-#: src/gui/statuswindow.cpp:109
+#: src/gui/statuswindow.cpp:122
 msgid "Exp:"
 msgstr "Esperienza:"
 
-#: src/gui/statuswindow.cpp:114
+#: src/gui/statuswindow.cpp:130
 msgid "MP:"
 msgstr "MP:"
 
-#: src/gui/statuswindow.cpp:132 src/gui/statuswindow.cpp:219
+#: src/gui/statuswindow.cpp:158 src/gui/statuswindow.cpp:275
 #, c-format
 msgid "Job: %d"
 msgstr "Lavoro: %d"
 
-#: src/gui/statuswindow.cpp:133
+#: src/gui/statuswindow.cpp:159
 msgid "Job:"
 msgstr "Lavoro:"
 
-#: src/gui/statuswindow.cpp:194
-#, fuzzy
-msgid "HP"
-msgstr "HP:"
-
-#: src/gui/statuswindow.cpp:200
-#, fuzzy
-msgid "MP"
-msgstr "MP:"
-
-#: src/gui/statuswindow.cpp:206
-#, fuzzy
-msgid "Exp"
-msgstr "Esperienza:"
-
-#: src/gui/statuswindow.cpp:215
-#, fuzzy
-msgid "Money"
-msgstr "Soldi: %d"
-
-#: src/gui/statuswindow.cpp:225
-#, fuzzy
-msgid "Job"
-msgstr "Lavoro:"
-
-#: src/gui/statuswindow.cpp:229
+#: src/gui/statuswindow.cpp:211 src/gui/statuswindow.cpp:247
 #, fuzzy, c-format
 msgid "Character points: %d"
 msgstr "Statistiche personaggio OK"
 
-#: src/gui/statuswindow.cpp:235
+#: src/gui/statuswindow.cpp:255
 #, fuzzy, c-format
 msgid "Correction points: %d"
 msgstr "Punti abilità: %d"
 
-#: src/gui/statuswindow.cpp:251
-#, fuzzy
-msgid "Level"
-msgstr "Livello: %d"
-
-#: src/gui/storagewindow.cpp:59
-msgid "Storage"
-msgstr "Storage"
-
-#: src/gui/trade.cpp:52
+#: src/gui/trade.cpp:53
 msgid "Propose trade"
 msgstr "Inizia uno scambio"
 
-#: src/gui/trade.cpp:53
+#: src/gui/trade.cpp:54
 msgid "Confirmed. Waiting..."
 msgstr "Confermato. In attesa..."
 
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:55
 msgid "Agree trade"
 msgstr "Accetta scambio"
 
-#: src/gui/trade.cpp:55
+#: src/gui/trade.cpp:56
 msgid "Agreed. Waiting..."
 msgstr "Accettato. In attesa..."
 
-#: src/gui/trade.cpp:58
+#: src/gui/trade.cpp:59
 msgid "Trade: You"
 msgstr "Commercia: Tu"
 
-#: src/gui/trade.cpp:74 src/gui/trade.cpp:75
+#: src/gui/trade.cpp:73 src/gui/trade.cpp:74
 msgid "Trade"
 msgstr "Commercia"
 
-#: src/gui/trade.cpp:77
+#: src/gui/trade.cpp:76
 msgid "Add"
 msgstr "Aggiungi"
 
-#: src/gui/trade.cpp:99 src/gui/trade.cpp:135
+#: src/gui/trade.cpp:98 src/gui/trade.cpp:134
 #, fuzzy, c-format
 msgid "You get %s"
 msgstr "Hai ottenuto %s"
 
-#: src/gui/trade.cpp:100
+#: src/gui/trade.cpp:99
 msgid "You give:"
 msgstr "Dai:"
 
-#: src/gui/trade.cpp:104
+#: src/gui/trade.cpp:103
 msgid "Change"
 msgstr "Cambia"
 
-#: src/gui/trade.cpp:275
+#: src/gui/trade.cpp:262
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Aggiunta dell'oggetto fallita. Non puoi sovrapporre un tipo di oggetto sulla "
 "finestra."
 
-#: src/gui/trade.cpp:318
+#: src/gui/trade.cpp:304
 msgid "You don't have enough money."
 msgstr "Non hai abbastanza denaro."
 
@@ -1943,22 +1991,22 @@ msgstr "Connessione..."
 msgid "Play"
 msgstr "Gioca"
 
-#: src/gui/updatewindow.cpp:405
+#: src/gui/updatewindow.cpp:417
 msgid "##1  The update process is incomplete."
 msgstr "##1 L'aggiornamento è stato completato."
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:407
+#: src/gui/updatewindow.cpp:419
 msgid "##1  It is strongly recommended that"
 msgstr "##1 È fortemente raccomandato"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:409
+#: src/gui/updatewindow.cpp:421
 #, fuzzy
 msgid "##1  you try again later."
 msgstr "##1 prova più tardi"
 
-#: src/gui/updatewindow.cpp:501
+#: src/gui/updatewindow.cpp:515
 msgid "Completed"
 msgstr "Completato"
 
@@ -2040,55 +2088,55 @@ msgstr "Specificare un utente da rendere operatore!"
 msgid "Need a user to kick!"
 msgstr "Si deve specificare un utente da rimuovere!"
 
-#: src/gui/widgets/chattab.cpp:118
+#: src/gui/widgets/chattab.cpp:121
 msgid "Global announcement:"
 msgstr "Annuncio generale:"
 
-#: src/gui/widgets/chattab.cpp:124
+#: src/gui/widgets/chattab.cpp:127
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "Annuncio generale da %s:"
 
-#: src/gui/widgets/chattab.cpp:150
+#: src/gui/widgets/chattab.cpp:153
 #, fuzzy, c-format
 msgid "%s whispers: %s"
 msgstr "%s sospira: "
 
-#: src/gui/widgets/whispertab.cpp:51
+#: src/gui/widgets/whispertab.cpp:53
 msgid "Cannot send empty chat!"
 msgstr "Non puoi inviare un messaggio vuoto!"
 
-#: src/gui/widgets/whispertab.cpp:70
+#: src/gui/widgets/whispertab.cpp:72
 msgid "/ignore > Ignore the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:71
+#: src/gui/widgets/whispertab.cpp:73
 msgid "/unignore > Stop ignoring the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:72
+#: src/gui/widgets/whispertab.cpp:74
 msgid "/close > Close the whisper tab"
 msgstr "/close > Chiude la scheda del sussurro"
 
-#: src/gui/widgets/whispertab.cpp:82
+#: src/gui/widgets/whispertab.cpp:84
 msgid "Command: /close"
 msgstr "Comando: /close"
 
-#: src/gui/widgets/whispertab.cpp:83
+#: src/gui/widgets/whispertab.cpp:85
 msgid "This command closes the current whisper tab."
 msgstr "Questo comando chiude la scheda del sussurro attiva."
 
-#: src/gui/widgets/whispertab.cpp:87
+#: src/gui/widgets/whispertab.cpp:89
 #, fuzzy
 msgid "Command: /ignore"
 msgstr "Comando: /item"
 
-#: src/gui/widgets/whispertab.cpp:88
+#: src/gui/widgets/whispertab.cpp:90
 #, fuzzy
 msgid "This command ignores the other player regardless of current relations."
 msgstr "Questo comando mostra il numero dei giocatori attualmente connessi."
 
-#: src/gui/widgets/whispertab.cpp:94
+#: src/gui/widgets/whispertab.cpp:96
 #, fuzzy
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr "Questo comando attiva la registrazione della chat nel file <nome file>"
@@ -2116,194 +2164,194 @@ msgstr "Cambia"
 msgid "Choose World"
 msgstr "Scegliere il proprio server"
 
-#: src/keyboardconfig.cpp:40
+#: src/keyboardconfig.cpp:39
 msgid "Move Up"
 msgstr "Muoviti verso l'alto"
 
-#: src/keyboardconfig.cpp:41
+#: src/keyboardconfig.cpp:40
 msgid "Move Down"
 msgstr "Muoviti verso il basso"
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:41
 msgid "Move Left"
 msgstr "Muoviti verso sinistra"
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:42
 msgid "Move Right"
 msgstr "Muoviti verso destra"
 
-#: src/keyboardconfig.cpp:44 src/net/ea/generalhandler.cpp:223
+#: src/keyboardconfig.cpp:43 src/net/tmwa/generalhandler.cpp:237
 msgid "Attack"
 msgstr "Attacco"
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:44
 msgid "Target & Attack"
 msgstr "Mirino e attacco"
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:45
 msgid "Smilie"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:46
 msgid "Talk"
 msgstr "Parla"
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:47
 msgid "Stop Attack"
 msgstr "Ferma attacco"
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:48
 #, fuzzy
 msgid "Target Monster"
 msgstr "Punta Più vicino"
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboardconfig.cpp:49
 msgid "Target NPC"
 msgstr "Punta NPC"
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:50
 msgid "Target Player"
 msgstr "Punta Giocatore"
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:51
 msgid "Pickup"
 msgstr "Raccogli"
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:52
 msgid "Hide Windows"
 msgstr "Nascondi la Finestra"
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:53
 msgid "Sit"
 msgstr "Siediti"
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:54
 msgid "Screenshot"
 msgstr "Screenshot"
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:55
 msgid "Enable/Disable Trading"
 msgstr "Abilita/Disabilita Scambi"
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:56
 msgid "Find Path to Mouse"
 msgstr "Trova il percorso sino al mouse"
 
-#: src/keyboardconfig.cpp:58 src/keyboardconfig.cpp:59
-#: src/keyboardconfig.cpp:60 src/keyboardconfig.cpp:61
-#: src/keyboardconfig.cpp:62 src/keyboardconfig.cpp:63
-#: src/keyboardconfig.cpp:64 src/keyboardconfig.cpp:65
-#: src/keyboardconfig.cpp:66 src/keyboardconfig.cpp:67
-#: src/keyboardconfig.cpp:68 src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:57 src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60
+#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62
+#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64
+#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68
 #, c-format
 msgid "Item Shortcut %d"
 msgstr "Scorciatoia %d"
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:69
 msgid "Help Window"
 msgstr "Finestra di Aiuto"
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:70
 msgid "Status Window"
 msgstr "Finestra degli Status"
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:71
 msgid "Inventory Window"
 msgstr "Finestra dell'Inventario"
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:72
 msgid "Equipment Window"
 msgstr "Finestra dell'Equipaggiamento"
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:73
 msgid "Skill Window"
 msgstr "Finestra delle Capacità"
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:74
 msgid "Minimap Window"
 msgstr "Finestra Minimappa"
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:75
 msgid "Chat Window"
 msgstr "Finestra della Chat"
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:76
 msgid "Item Shortcut Window"
 msgstr "Finestra Scorciatoia Oggetti"
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:77
 msgid "Setup Window"
 msgstr "Finestra del Setup"
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:78
 msgid "Debug Window"
 msgstr "Finestra di debug"
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:79
 #, fuzzy
 msgid "Social Window"
 msgstr "Finestra delle Capacità"
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:80
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:81
 #, fuzzy
 msgid "Outfits Window"
 msgstr "Finestra degli Status"
 
-#: src/keyboardconfig.cpp:83
+#: src/keyboardconfig.cpp:82
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:83
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86
-#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88
-#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90
-#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92
-#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:84 src/keyboardconfig.cpp:85
+#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:87
+#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:89
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:91
+#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:93
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:95
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:96
 msgid "Toggle Chat"
 msgstr "Attiva Chat"
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:97
 msgid "Scroll Chat Up"
 msgstr "Scorre la chat in alto"
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:98
 msgid "Scroll Chat Down"
 msgstr "Scorre la chat in basso"
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:99
 msgid "Previous Chat Tab"
 msgstr "Scheda Chat Precedente"
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:100
 msgid "Next Chat Tab"
 msgstr "Scheda Chat Successiva"
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:101
 msgid "Select OK"
 msgstr "Seleziona OK"
 
-#: src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:103
 msgid "Ignore input 1"
 msgstr "Ignora input 1"
 
-#: src/keyboardconfig.cpp:105
+#: src/keyboardconfig.cpp:104
 msgid "Ignore input 2"
 msgstr "Ignora input 2"
 
-#: src/keyboardconfig.cpp:184
+#: src/keyboardconfig.cpp:183
 #, fuzzy, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -2311,455 +2359,815 @@ msgid ""
 msgstr ""
 "Se non vengono risolti, il gioco potrebbe comportarsi in modo inaspettato."
 
-#: src/localplayer.cpp:914
+#: src/localplayer.cpp:985
 msgid "Unable to pick up item."
 msgstr "Impossibile raccogliere l'oggetto."
 
 #. TRANSLATORS: This sentence may be translated differently
 #. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:923
+#: src/localplayer.cpp:994
 #, fuzzy, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "Hai raccolto %s [@@%d|%s@@]."
 msgstr[1] "Hai raccolto %s [@@%d|%s@@]."
 
-#: src/main.cpp:43
+#: src/main.cpp:42
 msgid "mana [options] [mana-file]"
 msgstr ""
 
+#: src/main.cpp:43
+msgid "[mana-file] : The mana file is an XML file (.mana)"
+msgstr ""
+
 #: src/main.cpp:44
+msgid "              used to set custom parameters"
+msgstr ""
+
+#: src/main.cpp:45
+msgid "              to the mana client."
+msgstr ""
+
+#: src/main.cpp:47
 msgid "Options:"
 msgstr "Opzioni"
 
-#: src/main.cpp:45
+#: src/main.cpp:48
 #, fuzzy
 msgid "  -v --version        : Display the version"
 msgstr "  -v --version : Mostra la versione"
 
-#: src/main.cpp:46
+#: src/main.cpp:49
 #, fuzzy
 msgid "  -h --help           : Display this help"
 msgstr "  -h --help        : Mostra questo aiuto"
 
-#: src/main.cpp:47
+#: src/main.cpp:50
 #, fuzzy
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr "  -C --config-file : File di configurazione da utilizzare"
 
-#: src/main.cpp:48
+#: src/main.cpp:51
 #, fuzzy
 msgid "  -U --username       : Login with this username"
 msgstr "  -U --username : Accedi con questo nome utente"
 
-#: src/main.cpp:49
+#: src/main.cpp:52
 #, fuzzy
 msgid "  -P --password       : Login with this password"
 msgstr "  -P --password : Accedi con questa password"
 
-#: src/main.cpp:50
+#: src/main.cpp:53
 #, fuzzy
 msgid "  -c --character      : Login with this character"
 msgstr "  -c --character : Accedi con questo personaggio"
 
-#: src/main.cpp:51
+#: src/main.cpp:54
 #, fuzzy
 msgid "  -s --server         : Login server name or IP"
 msgstr "  -s --server : Nome o IP del server di login"
 
-#: src/main.cpp:52
+#: src/main.cpp:55
 #, fuzzy
 msgid "  -p --port           : Login server port"
 msgstr "  -s --server : Nome o IP del server di login"
 
-#: src/main.cpp:53
+#: src/main.cpp:56
 #, fuzzy
 msgid "     --update-host    : Use this update host"
 msgstr "  -H --update-host : Usa questo host per gli aggiornamenti"
 
-#: src/main.cpp:54
+#: src/main.cpp:57
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:56
+#: src/main.cpp:59
 #, fuzzy
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr "  -u --skip-update : Salta i download degli update"
 
-#: src/main.cpp:57
+#: src/main.cpp:60
 #, fuzzy
 msgid "  -d --data           : Directory to load game data from"
 msgstr "  -d --data : Diectory dalla quale caricare i dati di gioco"
 
-#: src/main.cpp:58
+#: src/main.cpp:61
 #, fuzzy
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
+msgid "     --localdata-dir  : Directory to use as local data directory"
 msgstr "  -S --home-dir : Directory da usare come home directory"
 
-#: src/main.cpp:59
+#: src/main.cpp:62
+#, fuzzy
+msgid "     --chat-log-dir   : Chat log dir to use"
+msgstr "  -C --config-file : File di configurazione da utilizzare"
+
+#: src/main.cpp:63
 #, fuzzy
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr "  -S --home-dir : Directory da usare come home directory"
 
-#: src/main.cpp:61
+#: src/main.cpp:65
 #, fuzzy
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr "  -O --no-opengl : Disabilita OpenGL per questa sessione"
 
-#: src/net/ea/adminhandler.cpp:63
+#: src/net/manaserv/beinghandler.cpp:303 src/net/tmwa/playerhandler.cpp:94
+msgid "You are dead."
+msgstr "Sei morto."
+
+#: src/net/manaserv/beinghandler.cpp:304 src/net/tmwa/playerhandler.cpp:95
+msgid "We regret to inform you that your character was killed in battle."
+msgstr ""
+"Ci dispiace informarti che il tuo personaggio è stato ucciso in battaglia."
+
+#: src/net/manaserv/beinghandler.cpp:306 src/net/tmwa/playerhandler.cpp:97
+msgid "You are not that alive anymore."
+msgstr "Non sei più così vivo."
+
+#: src/net/manaserv/beinghandler.cpp:307 src/net/tmwa/playerhandler.cpp:98
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr "Le fredde mani della morte stanno afferrando la tua anima."
+
+#: src/net/manaserv/beinghandler.cpp:308 src/net/tmwa/playerhandler.cpp:99
+msgid "Game Over!"
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:309 src/net/tmwa/playerhandler.cpp:101
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+"No, figliolo. Il tuo personaggio non è veramente morto. È... ehm... andato "
+"in un posto migliore."
+
+#: src/net/manaserv/beinghandler.cpp:311 src/net/tmwa/playerhandler.cpp:103
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr ""
+"Il tuo piano di spezzare le armi dei tuoi nemici colpendole con la tua gola "
+"ha fallito."
+
+#: src/net/manaserv/beinghandler.cpp:313 src/net/tmwa/playerhandler.cpp:105
+msgid "I guess this did not run too well."
+msgstr "Suppongo non sia andata troppo bene."
+
+#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:107
+msgid "Do you want your possessions identified?"
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:109
+msgid "Sadly, no trace of you was ever found..."
+msgstr "Tristemente, nessuna traccia di te è stata mai trovata..."
+
+#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:111
+msgid "Annihilated."
+msgstr "Annichilito."
+
+#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:113
+msgid "Looks like you got your head handed to you."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:115
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:323
+msgid "Press OK to respawn."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:324
+#, fuzzy
+msgid "You Died"
+msgstr "Sei morto"
+
+#: src/net/manaserv/charhandler.cpp:138 src/net/manaserv/charhandler.cpp:209
+msgid "Not logged in."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:141
+msgid "No empty slot."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:144
+msgid "Invalid name."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:147
+#, fuzzy
+msgid "Character's name already exists."
+msgstr "Nome utente già esistente"
+
+#: src/net/manaserv/charhandler.cpp:150
+msgid "Invalid hairstyle."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:153
+msgid "Invalid hair color."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:156
+msgid "Invalid gender."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:159
+#, fuzzy
+msgid "Character's stats are too high."
+msgstr "Statistiche personaggio OK"
+
+#: src/net/manaserv/charhandler.cpp:162
+#, fuzzy
+msgid "Character's stats are too low."
+msgstr "Statistiche personaggio OK"
+
+#: src/net/manaserv/charhandler.cpp:165
+#, c-format
+msgid "At least one statis out of the permitted range: (%u - %u)."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:171 src/net/manaserv/loginhandler.cpp:96
+#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
+#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
+#: src/net/tmwa/loginhandler.cpp:95 src/net/tmwa/loginhandler.cpp:182
+#, fuzzy
+msgid "Unknown error."
+msgstr "Errore sconosciuto"
+
+#: src/net/manaserv/charhandler.cpp:200 src/net/tmwa/charserverhandler.cpp:146
+msgid "Info"
+msgstr "Informazioni"
+
+#: src/net/manaserv/charhandler.cpp:200
+#, fuzzy
+msgid "Player deleted."
+msgstr "Personaggio cancellato."
+
+#: src/net/manaserv/charhandler.cpp:212
+#, fuzzy
+msgid "Selection out of range."
+msgstr "Seleziona la quantità di oggetti da scambiare."
+
+#: src/net/manaserv/charhandler.cpp:215
+#, fuzzy, c-format
+msgid "Unknown error (%d)."
+msgstr "Errore sconosciuto"
+
+#: src/net/manaserv/charhandler.cpp:250
+msgid "No gameservers are available."
+msgstr "Nessun gameserver è disponibile."
+
+#: src/net/manaserv/chathandler.cpp:187 src/net/manaserv/chathandler.cpp:313
+#: src/net/manaserv/guildhandler.cpp:260
+#, c-format
+msgid "Topic: %s"
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:274
+#, fuzzy
+msgid "Players in this channel:"
+msgstr "Il giocatore colpisce il mostro"
+
+#: src/net/manaserv/chathandler.cpp:208
+#, fuzzy
+msgid "Error joining channel."
+msgstr "Comando: /join <canale>"
+
+#: src/net/manaserv/chathandler.cpp:214
+#, fuzzy
+msgid "Listing channels."
+msgstr "Richiesta per accedere al canale %s."
+
+#: src/net/manaserv/chathandler.cpp:226
+msgid "End of channel list."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:303
+#, fuzzy, c-format
+msgid "%s entered the channel."
+msgstr "%s si è unito al party."
+
+#: src/net/manaserv/chathandler.cpp:308
+#, c-format
+msgid "%s left the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:324
+#, c-format
+msgid "%s has set mode %s on user %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:334
+#, c-format
+msgid "%s has kicked %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:339
+#, fuzzy
+msgid "Unknown channel event."
+msgstr "Comando sconosciuto."
+
+#: src/net/manaserv/guildhandler.cpp:82
+msgid "Guild created."
+msgstr "La gilda è stata creata."
+
+#: src/net/manaserv/guildhandler.cpp:87
+msgid "Error creating guild."
+msgstr "Errore durante la creazione della gilda."
+
+#: src/net/manaserv/guildhandler.cpp:97
+msgid "Invite sent."
+msgstr "Invito spedito."
+
+#: src/net/manaserv/guildhandler.cpp:204
+msgid "Member was promoted successfully."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:209
+msgid "Failed to promote member."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:87
+msgid "Wrong magic_token."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
+#, fuzzy
+msgid "Already logged in."
+msgstr "La registrazione è già in corso."
+
+#: src/net/manaserv/loginhandler.cpp:93
+#, fuzzy
+msgid "Account banned."
+msgstr "Account scaduto"
+
+#: src/net/manaserv/loginhandler.cpp:118
+#, fuzzy
+msgid "New password incorrect."
+msgstr "Nuova password errata"
+
+#: src/net/manaserv/loginhandler.cpp:121 src/net/tmwa/loginhandler.cpp:89
+#, fuzzy
+msgid "Old password incorrect."
+msgstr "Vecchia password non corretta"
+
+#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
+msgid "Account not connected. Please login first."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:149
+#, fuzzy
+msgid "New email address incorrect."
+msgstr "Nuovo indirizzo email errato"
+
+#: src/net/manaserv/loginhandler.cpp:152
+#, fuzzy
+msgid "Old email address incorrect."
+msgstr "Vecchio indirizzo email errato"
+
+#: src/net/manaserv/loginhandler.cpp:158
+#, fuzzy
+msgid "The new email address already exists."
+msgstr "Il nuovo indirizzo e-mail esiste già."
+
+#: src/net/manaserv/loginhandler.cpp:239
+msgid ""
+"Client registration is not allowed. Please contact server administration."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
+#, fuzzy
+msgid "Client version is too old."
+msgstr "La varsione del client è troppo vecchia"
+
+#: src/net/manaserv/loginhandler.cpp:266
+#, fuzzy
+msgid "Wrong username or password."
+msgstr "Nome utente o password errati"
+
+#: src/net/manaserv/loginhandler.cpp:272
+#, fuzzy
+msgid "Account banned"
+msgstr "Account scaduto"
+
+#: src/net/manaserv/loginhandler.cpp:275
+msgid "Login attempt too soon after previous attempt."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:303
+#, fuzzy
+msgid "Wrong username, password or email address."
+msgstr "Nome utente, password o indirizzo email errati"
+
+#: src/net/manaserv/loginhandler.cpp:306
+#, fuzzy
+msgid "Username already exists."
+msgstr "Nome utente già esistente"
+
+#: src/net/manaserv/loginhandler.cpp:309
+#, fuzzy
+msgid "Email address already exists."
+msgstr "Indirizzo email già esistente"
+
+#: src/net/manaserv/loginhandler.cpp:312
+msgid "You took too long with the captcha or your response was incorrect."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:87
+msgid "Joined party."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:105
+#, c-format
+msgid "%s joined the party."
+msgstr "%s si è unito al party."
+
+#: src/net/manaserv/partyhandler.cpp:123
+#, fuzzy, c-format
+msgid "%s rejected your invite."
+msgstr "%s ha rifiutato il tuo invito."
+
+#: src/net/manaserv/tradehandler.cpp:95
+msgid "Accepting incoming trade requests."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:97
+msgid "Ignoring incoming trade requests."
+msgstr "Ignora la richiesta di commercio."
+
+#: src/net/manaserv/tradehandler.cpp:115 src/net/tmwa/tradehandler.cpp:109
+msgid "Request for Trade"
+msgstr "Richiesta di commercio"
+
+#: src/net/manaserv/tradehandler.cpp:116 src/net/tmwa/tradehandler.cpp:110
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
+msgstr "%s vuole commerciare con te, accetti?"
+
+#: src/net/manaserv/tradehandler.cpp:134
+#, c-format
+msgid "Trading with %s"
+msgstr "Commerciando con %s"
+
+#: src/net/manaserv/tradehandler.cpp:148 src/net/tmwa/tradehandler.cpp:224
+msgid "Trade canceled."
+msgstr "Scambio cancellato."
+
+#: src/net/manaserv/tradehandler.cpp:155 src/net/tmwa/tradehandler.cpp:231
+msgid "Trade completed."
+msgstr "Scambio completato."
+
+#: src/net/tmwa/adminhandler.cpp:64
 msgid "Kick failed!"
 msgstr "Espulsione fallita!"
 
-#: src/net/ea/adminhandler.cpp:65
+#: src/net/tmwa/adminhandler.cpp:66
 msgid "Kick succeeded!"
 msgstr "Kick riuscito!"
 
-#: src/net/ea/buysellhandler.cpp:110
+#: src/net/tmwa/buysellhandler.cpp:109
 msgid "Nothing to sell."
 msgstr "Niente da vendere."
 
-#: src/net/ea/buysellhandler.cpp:117
+#: src/net/tmwa/buysellhandler.cpp:116
 msgid "Thanks for buying."
 msgstr "Grazie per l'acquisto."
 
-#: src/net/ea/buysellhandler.cpp:124
+#: src/net/tmwa/buysellhandler.cpp:123
 msgid "Unable to buy."
 msgstr "Impossibile acquistare."
 
-#: src/net/ea/buysellhandler.cpp:130
+#: src/net/tmwa/buysellhandler.cpp:129
 msgid "Thanks for selling."
 msgstr "Grazie per la vendita."
 
-#: src/net/ea/buysellhandler.cpp:132
+#: src/net/tmwa/buysellhandler.cpp:131
 msgid "Unable to sell."
 msgstr "Impossibile vendere."
 
-#: src/net/ea/charserverhandler.cpp:103
-#, fuzzy
-msgid "Access denied."
-msgstr "Accesso negato"
+#: src/net/tmwa/charserverhandler.cpp:103
+msgid "Access denied. Most likely, there are too many players on this server."
+msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:106
+#: src/net/tmwa/charserverhandler.cpp:107
 #, fuzzy
 msgid "Cannot use this ID."
 msgstr "Impossibile usare questo ID"
 
-#: src/net/ea/charserverhandler.cpp:109
+#: src/net/tmwa/charserverhandler.cpp:110
 #, fuzzy
-msgid "Unknown failure to select character."
-msgstr "Cancellazione del personaggio fallita."
+msgid "Unknown char-server failure."
+msgstr "Errore sconosciuto"
 
-#: src/net/ea/charserverhandler.cpp:135
+#: src/net/tmwa/charserverhandler.cpp:134
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 "Creazione del personaggio fallita. E' molto probabile che il nome sia già "
 "stato preso."
 
-#: src/net/ea/charserverhandler.cpp:147 src/net/manaserv/charhandler.cpp:187
-msgid "Info"
-msgstr "Informazioni"
-
-#: src/net/ea/charserverhandler.cpp:147
+#: src/net/tmwa/charserverhandler.cpp:146
 msgid "Character deleted."
 msgstr "Personaggio cancellato."
 
-#: src/net/ea/charserverhandler.cpp:152
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Failed to delete character."
 msgstr "Cancellazione del personaggio fallita."
 
-#: src/net/ea/charserverhandler.cpp:237 src/net/manaserv/charhandler.cpp:263
+#: src/net/tmwa/charserverhandler.cpp:266
 msgid "Strength:"
 msgstr "Forza:"
 
-#: src/net/ea/charserverhandler.cpp:238 src/net/manaserv/charhandler.cpp:264
+#: src/net/tmwa/charserverhandler.cpp:267
 msgid "Agility:"
 msgstr "Agilità:"
 
-#: src/net/ea/charserverhandler.cpp:239 src/net/manaserv/charhandler.cpp:266
+#: src/net/tmwa/charserverhandler.cpp:268
 msgid "Vitality:"
 msgstr "Vitalità:"
 
-#: src/net/ea/charserverhandler.cpp:240 src/net/manaserv/charhandler.cpp:267
+#: src/net/tmwa/charserverhandler.cpp:269
 msgid "Intelligence:"
 msgstr "Intelligenza:"
 
-#: src/net/ea/charserverhandler.cpp:241 src/net/manaserv/charhandler.cpp:265
+#: src/net/tmwa/charserverhandler.cpp:270
 msgid "Dexterity:"
 msgstr "Destrezza:"
 
-#: src/net/ea/charserverhandler.cpp:242
+#: src/net/tmwa/charserverhandler.cpp:271
 msgid "Luck:"
 msgstr "Fortuna:"
 
-#: src/net/ea/chathandler.cpp:80
-msgid "Whisper could not be sent, user is offline."
+#: src/net/tmwa/chathandler.cpp:87
+#, fuzzy, c-format
+msgid "Whisper could not be sent, %s is offline."
 msgstr "Il bisbiglio non può essere inviato, l'utente è offline."
 
-#: src/net/ea/chathandler.cpp:84
-msgid "Whisper could not be sent, ignored by user."
+#: src/net/tmwa/chathandler.cpp:96
+#, fuzzy, c-format
+msgid "Whisper could not be sent, ignored by %s."
 msgstr "Il bisbiglio non può essere inviato, ignorato dall'utente."
 
-#: src/net/ea/chathandler.cpp:171
+#: src/net/tmwa/chathandler.cpp:230
 #, fuzzy
 msgid "MVP player."
 msgstr "Giocatore"
 
-#: src/net/ea/chathandler.cpp:204 src/net/ea/chathandler.cpp:210
-#: src/net/ea/chathandler.cpp:215 src/net/ea/chathandler.cpp:220
-#: src/net/ea/chathandler.cpp:225 src/net/ea/chathandler.cpp:230
-#: src/net/ea/chathandler.cpp:235 src/net/ea/chathandler.cpp:240
+#: src/net/tmwa/chathandler.cpp:265 src/net/tmwa/chathandler.cpp:271
+#: src/net/tmwa/chathandler.cpp:276 src/net/tmwa/chathandler.cpp:281
+#: src/net/tmwa/chathandler.cpp:286 src/net/tmwa/chathandler.cpp:291
+#: src/net/tmwa/chathandler.cpp:296 src/net/tmwa/chathandler.cpp:301
 msgid "Channels are not supported!"
 msgstr "I canali non sono supportati!"
 
-#: src/net/ea/gamehandler.cpp:86
+#: src/net/tmwa/gamehandler.cpp:88
 #, c-format
 msgid "Online users: %d"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:100
+#: src/net/tmwa/gamehandler.cpp:101
 #, fuzzy
 msgid "Game"
 msgstr "Nome"
 
-#: src/net/ea/gamehandler.cpp:100
+#: src/net/tmwa/gamehandler.cpp:101
 #, fuzzy
 msgid "Request to quit denied!"
 msgstr "Richiesta di commercio"
 
-#: src/net/ea/generalhandler.cpp:102 src/net/manaserv/generalhandler.cpp:95
+#: src/net/tmwa/generalhandler.cpp:102
 #, c-format
 msgid "Strength %+d"
 msgstr "Forza %+d"
 
-#: src/net/ea/generalhandler.cpp:103 src/net/manaserv/generalhandler.cpp:96
+#: src/net/tmwa/generalhandler.cpp:103
 #, c-format
 msgid "Agility %+d"
 msgstr "Agilità %+d"
 
-#: src/net/ea/generalhandler.cpp:104 src/net/manaserv/generalhandler.cpp:98
+#: src/net/tmwa/generalhandler.cpp:104
 #, c-format
 msgid "Vitality %+d"
 msgstr "Vitalità %+d"
 
-#: src/net/ea/generalhandler.cpp:105 src/net/manaserv/generalhandler.cpp:99
+#: src/net/tmwa/generalhandler.cpp:105
 #, c-format
 msgid "Intelligence %+d"
 msgstr "Intelligenza %+d"
 
-#: src/net/ea/generalhandler.cpp:106 src/net/manaserv/generalhandler.cpp:97
+#: src/net/tmwa/generalhandler.cpp:106
 #, c-format
 msgid "Dexterity %+d"
 msgstr "Destrezza %+d"
 
-#: src/net/ea/generalhandler.cpp:107
+#: src/net/tmwa/generalhandler.cpp:107
 #, c-format
 msgid "Luck %+d"
 msgstr "Fortuna %+d"
 
-#: src/net/ea/generalhandler.cpp:130
+#: src/net/tmwa/generalhandler.cpp:132
 #, fuzzy
 msgid "Authentication failed."
 msgstr "Autenticazione non riuscita"
 
-#: src/net/ea/generalhandler.cpp:133
+#: src/net/tmwa/generalhandler.cpp:135
 #, fuzzy
 msgid "No servers available."
 msgstr "Nessun server disponibile"
 
-#: src/net/ea/generalhandler.cpp:137
+#: src/net/tmwa/generalhandler.cpp:139
 #, fuzzy
 msgid "Someone else is trying to use this account."
 msgstr "Qualcun'altro sta cercando di usare questo account"
 
-#: src/net/ea/generalhandler.cpp:140
+#: src/net/tmwa/generalhandler.cpp:142
 #, fuzzy
 msgid "This account is already logged in."
 msgstr "Questo accaunt ha già effettuato l'accesso"
 
-#: src/net/ea/generalhandler.cpp:143
+#: src/net/tmwa/generalhandler.cpp:145
 msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:146
+#: src/net/tmwa/generalhandler.cpp:148
 #, fuzzy
 msgid "Duplicated login."
 msgstr "Accesso duplicato"
 
-#: src/net/ea/generalhandler.cpp:149
+#: src/net/tmwa/generalhandler.cpp:151
 #, fuzzy
 msgid "Unknown connection error."
 msgstr "Errore di connessione sconosciuto"
 
-#: src/net/ea/generalhandler.cpp:205
+#: src/net/tmwa/generalhandler.cpp:209
 msgid "Got disconnected from server!"
 msgstr "Disconnesso dal server!"
 
-#: src/net/ea/generalhandler.cpp:216 src/net/manaserv/generalhandler.cpp:166
+#: src/net/tmwa/generalhandler.cpp:230
 msgid "Strength"
 msgstr "Forza"
 
-#: src/net/ea/generalhandler.cpp:217 src/net/manaserv/generalhandler.cpp:167
+#: src/net/tmwa/generalhandler.cpp:231
 msgid "Agility"
 msgstr "Agilità"
 
-#: src/net/ea/generalhandler.cpp:218 src/net/manaserv/generalhandler.cpp:169
+#: src/net/tmwa/generalhandler.cpp:232
 msgid "Vitality"
 msgstr "Vitalità"
 
-#: src/net/ea/generalhandler.cpp:219 src/net/manaserv/generalhandler.cpp:170
+#: src/net/tmwa/generalhandler.cpp:233
 msgid "Intelligence"
 msgstr "Intelligenza"
 
-#: src/net/ea/generalhandler.cpp:220 src/net/manaserv/generalhandler.cpp:168
+#: src/net/tmwa/generalhandler.cpp:234
 msgid "Dexterity"
 msgstr "Destrezza"
 
-#: src/net/ea/generalhandler.cpp:221
+#: src/net/tmwa/generalhandler.cpp:235
 msgid "Luck"
 msgstr "Fortuna"
 
-#: src/net/ea/generalhandler.cpp:224
+#: src/net/tmwa/generalhandler.cpp:238
 #, fuzzy
 msgid "Defense"
 msgstr "Difesa:"
 
-#: src/net/ea/generalhandler.cpp:225
+#: src/net/tmwa/generalhandler.cpp:239
 #, fuzzy
 msgid "M.Attack"
 msgstr "Attacco Magico:"
 
-#: src/net/ea/generalhandler.cpp:226
+#: src/net/tmwa/generalhandler.cpp:240
 #, fuzzy
 msgid "M.Defense"
 msgstr "Difesa Magica:"
 
-#: src/net/ea/generalhandler.cpp:227
+#: src/net/tmwa/generalhandler.cpp:241
 #, fuzzy, c-format
 msgid "% Accuracy"
 msgstr "% Accuratezza:"
 
-#: src/net/ea/generalhandler.cpp:228
+#: src/net/tmwa/generalhandler.cpp:242
 #, fuzzy, c-format
 msgid "% Evade"
 msgstr "% Evasione:"
 
-#: src/net/ea/generalhandler.cpp:229
+#: src/net/tmwa/generalhandler.cpp:243
 #, fuzzy, c-format
 msgid "% Critical"
 msgstr "Colpo critico"
 
-#: src/net/ea/gui/guildtab.cpp:45
+#: src/net/tmwa/gui/guildtab.cpp:45
 msgid "Guild"
 msgstr "Gilda"
 
-#: src/net/ea/gui/guildtab.cpp:61 src/net/ea/gui/partytab.cpp:59
+#: src/net/tmwa/gui/guildtab.cpp:61 src/net/tmwa/gui/partytab.cpp:59
 msgid "/help > Display this help."
 msgstr "/help > Mostra questo messaggio di aiuto"
 
-#: src/net/ea/gui/guildtab.cpp:62
+#: src/net/tmwa/gui/guildtab.cpp:62
 #, fuzzy
 msgid "/invite > Invite a player to your guild"
 msgstr "/invite > Invita un giocatore al tuo party"
 
-#: src/net/ea/gui/guildtab.cpp:63
+#: src/net/tmwa/gui/guildtab.cpp:63
 #, fuzzy
 msgid "/leave > Leave the guild you are in"
 msgstr "/leave > Abbandona il party"
 
-#: src/net/ea/gui/guildtab.cpp:64
+#: src/net/tmwa/gui/guildtab.cpp:64
 #, fuzzy
 msgid "/kick > Kick some one from the guild you are in"
 msgstr "/kick > Escludi qualcuno dal gruppo in cui ti trovi"
 
-#: src/net/ea/gui/guildtab.cpp:73 src/net/ea/gui/partytab.cpp:73
+#: src/net/tmwa/gui/guildtab.cpp:73 src/net/tmwa/gui/partytab.cpp:73
 msgid "Command: /invite <nick>"
 msgstr "Comando: /invite <nick>"
 
-#: src/net/ea/gui/guildtab.cpp:74
+#: src/net/tmwa/gui/guildtab.cpp:74
 #, fuzzy
 msgid "This command invites <nick> to the guild you're in."
 msgstr "Questo comando invita <nick> nel tuo party."
 
-#: src/net/ea/gui/guildtab.cpp:80 src/net/ea/gui/partytab.cpp:80
+#: src/net/tmwa/gui/guildtab.cpp:80 src/net/tmwa/gui/partytab.cpp:80
 msgid "Command: /leave"
 msgstr "Comando: /leave"
 
-#: src/net/ea/gui/guildtab.cpp:81
+#: src/net/tmwa/gui/guildtab.cpp:81
 #, fuzzy
 msgid "This command causes the player to leave the guild."
 msgstr "Questo comando fa abbandonare il gruppo ad un giocatore."
 
-#: src/net/ea/gui/guildtab.cpp:89
+#: src/net/tmwa/gui/guildtab.cpp:89
 #, fuzzy
 msgid "Guild name is missing."
 msgstr "Manca il nome del party."
 
-#: src/net/ea/guildhandler.cpp:293
+#: src/net/tmwa/guildhandler.cpp:296
 msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:298
+#: src/net/tmwa/guildhandler.cpp:301
 msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:303
+#: src/net/tmwa/guildhandler.cpp:306
 #, fuzzy
 msgid "User is now part of your guild."
 msgstr "%s è ora un membro del tuo party."
 
-#: src/net/ea/guildhandler.cpp:308
+#: src/net/tmwa/guildhandler.cpp:311
 msgid "Your guild is full."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:313
+#: src/net/tmwa/guildhandler.cpp:316
 msgid "Unknown guild invite response."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:390
+#: src/net/tmwa/guildhandler.cpp:393
 msgid "Guild creation isn't supported yet."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:43
+#: src/net/tmwa/gui/partytab.cpp:43
 msgid "Party"
 msgstr "Party"
 
-#: src/net/ea/gui/partytab.cpp:60
+#: src/net/tmwa/gui/partytab.cpp:60
 msgid "/invite > Invite a player to your party"
 msgstr "/invite > Invita un giocatore al tuo party"
 
-#: src/net/ea/gui/partytab.cpp:61
+#: src/net/tmwa/gui/partytab.cpp:61
 msgid "/leave > Leave the party you are in"
 msgstr "/leave > Abbandona il party"
 
-#: src/net/ea/gui/partytab.cpp:62
+#: src/net/tmwa/gui/partytab.cpp:62
 msgid "/kick > Kick some one from the party you are in"
 msgstr "/kick > Escludi qualcuno dal gruppo in cui ti trovi"
 
-#: src/net/ea/gui/partytab.cpp:63
+#: src/net/tmwa/gui/partytab.cpp:63
 msgid "/item > Show/change party item sharing options"
 msgstr ""
 "/item > Mostra/modifica le opzioni di condivisione degli oggetti nel gruppo"
 
-#: src/net/ea/gui/partytab.cpp:64
+#: src/net/tmwa/gui/partytab.cpp:64
 msgid "/exp > Show/change party experience sharing options"
 msgstr ""
 "/item > Mostra/modifica le opzioni di condivisione dei punti esperienza nel "
 "gruppo"
 
-#: src/net/ea/gui/partytab.cpp:81
+#: src/net/tmwa/gui/partytab.cpp:81
 msgid "This command causes the player to leave the party."
 msgstr "Questo comando fa abbandonare il gruppo ad un giocatore."
 
-#: src/net/ea/gui/partytab.cpp:85
+#: src/net/tmwa/gui/partytab.cpp:85
 msgid "Command: /item <policy>"
 msgstr "Comando: /item <politica>"
 
-#: src/net/ea/gui/partytab.cpp:86
+#: src/net/tmwa/gui/partytab.cpp:86
 msgid "This command changes the party's item sharing policy."
 msgstr ""
 "Questo comando modifica la politica di condivisione degli oggetti nel gruppo."
 
-#: src/net/ea/gui/partytab.cpp:87
+#: src/net/tmwa/gui/partytab.cpp:87
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
@@ -2767,796 +3175,481 @@ msgstr ""
 "<politica> può essere uno fra \"1\", \"yes\", \"true\" per abilitare la "
 "condivisione degli oggetti o \"0\", \"no\", \"false\" per disabilitarla."
 
-#: src/net/ea/gui/partytab.cpp:90
+#: src/net/tmwa/gui/partytab.cpp:90
 msgid "Command: /item"
 msgstr "Comando: /item"
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/tmwa/gui/partytab.cpp:91
 msgid "This command displays the party's current item sharing policy."
 msgstr "Questo comando mostra la corrente politica di condivisione oggetti."
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/tmwa/gui/partytab.cpp:95
 msgid "Command: /exp <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:96
+#: src/net/tmwa/gui/partytab.cpp:96
 msgid "This command changes the party's experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/tmwa/gui/partytab.cpp:97
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:100
+#: src/net/tmwa/gui/partytab.cpp:100
 msgid "Command: /exp"
 msgstr "Comando: /exp"
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/tmwa/gui/partytab.cpp:101
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:132 src/net/ea/partyhandler.cpp:198
+#: src/net/tmwa/gui/partytab.cpp:132 src/net/tmwa/partyhandler.cpp:196
 msgid "Item sharing enabled."
 msgstr "Abilitata la condivisione degli oggetti."
 
-#: src/net/ea/gui/partytab.cpp:135 src/net/ea/partyhandler.cpp:204
+#: src/net/tmwa/gui/partytab.cpp:135 src/net/tmwa/partyhandler.cpp:202
 msgid "Item sharing disabled."
 msgstr "Disabilitata la condivisione degli oggetti"
 
-#: src/net/ea/gui/partytab.cpp:138 src/net/ea/partyhandler.cpp:210
+#: src/net/tmwa/gui/partytab.cpp:138 src/net/tmwa/partyhandler.cpp:208
 msgid "Item sharing not possible."
 msgstr "Impossibile condividere gli oggetti."
 
-#: src/net/ea/gui/partytab.cpp:141
+#: src/net/tmwa/gui/partytab.cpp:141
 #, fuzzy
 msgid "Item sharing unknown."
 msgstr "Abilitata la condivisione degli oggetti."
 
-#: src/net/ea/gui/partytab.cpp:167 src/net/ea/partyhandler.cpp:174
+#: src/net/tmwa/gui/partytab.cpp:167 src/net/tmwa/partyhandler.cpp:172
 msgid "Experience sharing enabled."
 msgstr "Abilitata la condivisione dell'esperienza."
 
-#: src/net/ea/gui/partytab.cpp:170 src/net/ea/partyhandler.cpp:180
+#: src/net/tmwa/gui/partytab.cpp:170 src/net/tmwa/partyhandler.cpp:178
 msgid "Experience sharing disabled."
 msgstr "Disabilitata la condivisione dell'esperienza."
 
-#: src/net/ea/gui/partytab.cpp:173 src/net/ea/partyhandler.cpp:186
+#: src/net/tmwa/gui/partytab.cpp:173 src/net/tmwa/partyhandler.cpp:184
 msgid "Experience sharing not possible."
 msgstr "Impossibile condividere l'esperienza."
 
-#: src/net/ea/gui/partytab.cpp:176
+#: src/net/tmwa/gui/partytab.cpp:176
 #, fuzzy
 msgid "Experience sharing unknown."
 msgstr "Abilitata la condivisione dell'esperienza."
 
-#: src/net/ea/inventoryhandler.cpp:281
+#: src/net/tmwa/inventoryhandler.cpp:285
 msgid "Failed to use item."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:391
+#: src/net/tmwa/inventoryhandler.cpp:399
 msgid "Unable to equip."
 msgstr "Impossibile equipaggiare."
 
-#: src/net/ea/inventoryhandler.cpp:402
+#: src/net/tmwa/inventoryhandler.cpp:410
 msgid "Unable to unequip."
 msgstr "Impossibile equipaggiare."
 
-#: src/net/ea/loginhandler.cpp:79
+#: src/net/tmwa/loginhandler.cpp:86
 msgid "Account was not found. Please re-login."
 msgstr "Account non trovato. Perfavore riesegui il login."
 
-#: src/net/ea/loginhandler.cpp:82 src/net/manaserv/loginhandler.cpp:121
-#, fuzzy
-msgid "Old password incorrect."
-msgstr "Vecchia password non corretta"
-
-#: src/net/ea/loginhandler.cpp:85
+#: src/net/tmwa/loginhandler.cpp:92
 #, fuzzy
 msgid "New password too short."
 msgstr "Nuova password troppo corta"
 
-#: src/net/ea/loginhandler.cpp:88 src/net/ea/loginhandler.cpp:175
-#: src/net/manaserv/charhandler.cpp:158 src/net/manaserv/loginhandler.cpp:96
-#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
-#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
-#, fuzzy
-msgid "Unknown error."
-msgstr "Errore sconosciuto"
-
-#: src/net/ea/loginhandler.cpp:149
+#: src/net/tmwa/loginhandler.cpp:156
 #, fuzzy
 msgid "Unregistered ID."
 msgstr "Cancella registrazione"
 
-#: src/net/ea/loginhandler.cpp:152
+#: src/net/tmwa/loginhandler.cpp:159
 #, fuzzy
 msgid "Wrong password."
 msgstr "Password errata"
 
-#: src/net/ea/loginhandler.cpp:155
+#: src/net/tmwa/loginhandler.cpp:162
 #, fuzzy
 msgid "Account expired."
 msgstr "Account scaduto"
 
-#: src/net/ea/loginhandler.cpp:158
+#: src/net/tmwa/loginhandler.cpp:165
 #, fuzzy
 msgid "Rejected from server."
 msgstr "Respinto dal server"
 
-#: src/net/ea/loginhandler.cpp:161
+#: src/net/tmwa/loginhandler.cpp:168
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:165
+#: src/net/tmwa/loginhandler.cpp:172
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:172
+#: src/net/tmwa/loginhandler.cpp:179
 #, fuzzy
 msgid "This user name is already taken."
 msgstr "Questo nome utente è già stato preso"
 
-#: src/net/ea/network.cpp:145
+#: src/net/tmwa/network.cpp:145
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/ea/network.cpp:345
+#: src/net/tmwa/network.cpp:345
 #, fuzzy
 msgid "Unable to resolve host \""
 msgstr "Impossibile vendere."
 
-#: src/net/ea/network.cpp:414
+#: src/net/tmwa/network.cpp:414
 #, fuzzy
 msgid "Connection to server terminated. "
 msgstr "Connessione al server della mappa..."
 
-#: src/net/ea/partyhandler.cpp:81
+#: src/net/tmwa/partyhandler.cpp:82
 msgid "Could not create party."
 msgstr "Non puoi creare un party."
 
-#: src/net/ea/partyhandler.cpp:84
+#: src/net/tmwa/partyhandler.cpp:84
 msgid "Party successfully created."
 msgstr "Party creato con successo."
 
-#: src/net/ea/partyhandler.cpp:118
+#: src/net/tmwa/partyhandler.cpp:119
 #, c-format
 msgid "%s is already a member of a party."
 msgstr "%s è già membro di un party."
 
-#: src/net/ea/partyhandler.cpp:122
+#: src/net/tmwa/partyhandler.cpp:123
 #, c-format
 msgid "%s refused your invitation."
 msgstr "%s ha rifiutato il tuo invito."
 
-#: src/net/ea/partyhandler.cpp:126
+#: src/net/tmwa/partyhandler.cpp:127
 #, c-format
 msgid "%s is now a member of your party."
 msgstr "%s è ora un membro del tuo party."
 
-#: src/net/ea/partyhandler.cpp:130
+#: src/net/tmwa/partyhandler.cpp:131
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:238
+#: src/net/tmwa/partyhandler.cpp:236
 msgid "You have left the party."
 msgstr "Hai lasciato il party."
 
-#: src/net/ea/partyhandler.cpp:249
+#: src/net/tmwa/partyhandler.cpp:246
 #, c-format
 msgid "%s has left your party."
 msgstr "%s ha lasciato il tuo party."
 
-#: src/net/ea/partyhandler.cpp:301
+#: src/net/tmwa/partyhandler.cpp:299
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:329
-msgid "Inviting like this isn't supported at the moment."
+#: src/net/tmwa/partyhandler.cpp:335
+#, c-format
+msgid "Inviting failed, because you can't see a player called %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:334
+#: src/net/tmwa/partyhandler.cpp:340
 msgid "You can only inivte when you are in a party!"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:365
+#: src/net/tmwa/partyhandler.cpp:368
 #, c-format
 msgid "%s is not in your party!"
 msgstr "%s non è nel tuo party!"
 
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:304
-msgid "You are dead."
-msgstr "Sei morto."
-
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:305
-msgid "We regret to inform you that your character was killed in battle."
-msgstr ""
-"Ci dispiace informarti che il tuo personaggio è stato ucciso in battaglia."
-
-#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:307
-msgid "You are not that alive anymore."
-msgstr "Non sei più così vivo."
-
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:308
-msgid "The cold hands of the grim reaper are grabbing for your soul."
-msgstr "Le fredde mani della morte stanno afferrando la tua anima."
-
-#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:309
-msgid "Game Over!"
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:105
+#: src/net/tmwa/playerhandler.cpp:100
 msgid "Insert coin to continue."
 msgstr "Inserisci un gettone per continuare."
 
-#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:310
-msgid ""
-"No, kids. Your character did not really die. It... err... went to a better "
-"place."
-msgstr ""
-"No, figliolo. Il tuo personaggio non è veramente morto. È... ehm... andato "
-"in un posto migliore."
-
-#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:312
-msgid ""
-"Your plan of breaking your enemies weapon by bashing it with your throat "
-"failed."
-msgstr ""
-"Il tuo piano di spezzare le armi dei tuoi nemici colpendole con la tua gola "
-"ha fallito."
-
-#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:314
-msgid "I guess this did not run too well."
-msgstr "Suppongo non sia andata troppo bene."
-
-#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:315
-msgid "Do you want your possessions identified?"
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:316
-msgid "Sadly, no trace of you was ever found..."
-msgstr "Tristemente, nessuna traccia di te è stata mai trovata..."
-
-#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:317
-msgid "Annihilated."
-msgstr "Annichilito."
-
-#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:318
-msgid "Looks like you got your head handed to you."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:120 src/net/manaserv/beinghandler.cpp:319
-msgid ""
-"You screwed up again, dump your body down the tubes and get you another one."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/tmwa/playerhandler.cpp:118
 msgid "You're not dead yet. You're just resting."
 msgstr "Non sei morto. Stai riposando."
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/tmwa/playerhandler.cpp:119
 msgid "You are no more."
 msgstr "Non sei più."
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/tmwa/playerhandler.cpp:120
 msgid "You have ceased to be."
 msgstr "Hai smesso di esistere."
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/tmwa/playerhandler.cpp:121
 msgid "You've expired and gone to meet your maker."
 msgstr "Sei spirato e sei andato a incontrare il tuo creatore."
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/tmwa/playerhandler.cpp:122
 msgid "You're a stiff."
 msgstr "Sei cadavere."
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/tmwa/playerhandler.cpp:123
 msgid "Bereft of life, you rest in peace."
 msgstr "Privato della vita, riposi in pace."
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/tmwa/playerhandler.cpp:124
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:130
+#: src/net/tmwa/playerhandler.cpp:125
 msgid "Your metabolic processes are now history."
 msgstr "I tuoi processi metabolici sono storia ora."
 
-#: src/net/ea/playerhandler.cpp:131
+#: src/net/tmwa/playerhandler.cpp:126
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/tmwa/playerhandler.cpp:127
 msgid "You've kicked the bucket."
 msgstr "Hai tirato le cuoia."
 
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/tmwa/playerhandler.cpp:128
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:135
+#: src/net/tmwa/playerhandler.cpp:130
 msgid "You are an ex-player."
 msgstr "Sei un ex-giocatore."
 
-#: src/net/ea/playerhandler.cpp:136
+#: src/net/tmwa/playerhandler.cpp:131
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:249 src/net/ea/playerhandler.cpp:310
+#: src/net/tmwa/playerhandler.cpp:246 src/net/tmwa/playerhandler.cpp:285
 msgid "Message"
 msgstr "Messaggio"
 
-#: src/net/ea/playerhandler.cpp:250
+#: src/net/tmwa/playerhandler.cpp:247
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 "Stai trasportando più della metà del tuo peso. Non puoi recuperare le "
 "energie."
 
-#: src/net/ea/playerhandler.cpp:333
+#: src/net/tmwa/playerhandler.cpp:313
 #, fuzzy, c-format
 msgid "You picked up %s."
 msgstr "Hai raccolto "
 
-#: src/net/ea/playerhandler.cpp:369
+#: src/net/tmwa/playerhandler.cpp:348
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:532
+#: src/net/tmwa/playerhandler.cpp:488
 msgid "Equip arrows first."
 msgstr "Equipaggia prima le frecce"
 
-#: src/net/ea/specialhandler.cpp:147
+#: src/net/tmwa/specialhandler.cpp:144
 msgid "Trade failed!"
 msgstr "Scambio fallito!"
 
-#: src/net/ea/specialhandler.cpp:150
+#: src/net/tmwa/specialhandler.cpp:147
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:153
+#: src/net/tmwa/specialhandler.cpp:150
 msgid "Sit failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:156
+#: src/net/tmwa/specialhandler.cpp:153
 msgid "Chat creating failed!"
 msgstr "Creazione della chat fallita!"
 
-#: src/net/ea/specialhandler.cpp:159
+#: src/net/tmwa/specialhandler.cpp:156
 msgid "Could not join party!"
 msgstr "Non puoi unirti al party!"
 
-#: src/net/ea/specialhandler.cpp:162
+#: src/net/tmwa/specialhandler.cpp:159
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:171
+#: src/net/tmwa/specialhandler.cpp:168
 msgid "You have not yet reached a high enough lvl!"
 msgstr "Non hai ancora raggiunto un livello abbastanza alto."
 
-#: src/net/ea/specialhandler.cpp:174
+#: src/net/tmwa/specialhandler.cpp:171
 msgid "Insufficient HP!"
 msgstr "HP insufficienti!"
 
-#: src/net/ea/specialhandler.cpp:177
+#: src/net/tmwa/specialhandler.cpp:174
 msgid "Insufficient SP!"
 msgstr "SP insufficienti!"
 
-#: src/net/ea/specialhandler.cpp:180
+#: src/net/tmwa/specialhandler.cpp:177
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:183
+#: src/net/tmwa/specialhandler.cpp:180
 msgid "You cannot do that right now!"
 msgstr "Non puoi farlo ora!"
 
-#: src/net/ea/specialhandler.cpp:186
+#: src/net/tmwa/specialhandler.cpp:183
 msgid "Seems you need more money... ;-)"
 msgstr "Sembra tu abbia bisogno di più denaro... ;-)"
 
-#: src/net/ea/specialhandler.cpp:189
+#: src/net/tmwa/specialhandler.cpp:186
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Non puoi usare questa abilità con questo tipo di arma!"
 
-#: src/net/ea/specialhandler.cpp:192
+#: src/net/tmwa/specialhandler.cpp:189
 msgid "You need another red gem!"
 msgstr "Hai bisogno di un'altra gemma rossa!"
 
-#: src/net/ea/specialhandler.cpp:195
+#: src/net/tmwa/specialhandler.cpp:192
 msgid "You need another blue gem!"
 msgstr "Hai bisogno di un'altra gemma blu!"
 
-#: src/net/ea/specialhandler.cpp:198
+#: src/net/tmwa/specialhandler.cpp:195
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:201
+#: src/net/tmwa/specialhandler.cpp:198
 msgid "Huh? What's that?"
 msgstr "Huh? Cos'è quello?"
 
-#: src/net/ea/specialhandler.cpp:210
+#: src/net/tmwa/specialhandler.cpp:207
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:213
+#: src/net/tmwa/specialhandler.cpp:210
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:216
+#: src/net/tmwa/specialhandler.cpp:213
 msgid "Poison had no effect..."
 msgstr "Il veleno non ha avuto effetto..."
 
-#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:116
-msgid "Request for Trade"
-msgstr "Richiesta di commercio"
-
-#: src/net/ea/tradehandler.cpp:108 src/net/manaserv/tradehandler.cpp:117
-#, c-format
-msgid "%s wants to trade with you, do you accept?"
-msgstr "%s vuole commerciare con te, accetti?"
-
-#: src/net/ea/tradehandler.cpp:124
+#: src/net/tmwa/tradehandler.cpp:126
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:128
+#: src/net/tmwa/tradehandler.cpp:130
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:132
+#: src/net/tmwa/tradehandler.cpp:134
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:137
+#: src/net/tmwa/tradehandler.cpp:139
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:144
+#: src/net/tmwa/tradehandler.cpp:146
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:153
+#: src/net/tmwa/tradehandler.cpp:154
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:202
+#: src/net/tmwa/tradehandler.cpp:202
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:207
+#: src/net/tmwa/tradehandler.cpp:207
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:211
+#: src/net/tmwa/tradehandler.cpp:211
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:224 src/net/manaserv/tradehandler.cpp:149
-msgid "Trade canceled."
-msgstr "Scambio cancellato."
-
-#: src/net/ea/tradehandler.cpp:231 src/net/manaserv/tradehandler.cpp:156
-msgid "Trade completed."
-msgstr "Scambio completato."
-
-#: src/net/manaserv/beinghandler.cpp:324
-msgid "Press OK to respawn."
-msgstr ""
-
-#: src/net/manaserv/beinghandler.cpp:325
+#: src/playerrelations.cpp:310
 #, fuzzy
-msgid "You Died"
-msgstr "Sei morto"
-
-#: src/net/manaserv/charhandler.cpp:128 src/net/manaserv/charhandler.cpp:196
-msgid "Not logged in."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:131
-msgid "No empty slot."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:134
-msgid "Invalid name."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:137
-#, fuzzy
-msgid "Character's name already exists."
-msgstr "Nome utente già esistente"
-
-#: src/net/manaserv/charhandler.cpp:140
-msgid "Invalid hairstyle."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:143
-msgid "Invalid hair color."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:146
-msgid "Invalid gender."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:149
-#, fuzzy
-msgid "Character's stats are too high."
-msgstr "Statistiche personaggio OK"
-
-#: src/net/manaserv/charhandler.cpp:152
-#, fuzzy
-msgid "Character's stats are too low."
-msgstr "Statistiche personaggio OK"
-
-#: src/net/manaserv/charhandler.cpp:155
-msgid "One stat is zero."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:187
-#, fuzzy
-msgid "Player deleted."
-msgstr "Personaggio cancellato."
-
-#: src/net/manaserv/charhandler.cpp:199
-#, fuzzy
-msgid "Selection out of range."
-msgstr "Seleziona la quantità di oggetti da scambiare."
-
-#: src/net/manaserv/charhandler.cpp:202
-#, fuzzy, c-format
-msgid "Unknown error (%d)."
-msgstr "Errore sconosciuto"
-
-#: src/net/manaserv/charhandler.cpp:242
-msgid "No gameservers are available."
-msgstr "Nessun gameserver è disponibile."
-
-#: src/net/manaserv/charhandler.cpp:268
-msgid "Willpower:"
-msgstr "Volontà:"
+msgid "Completely ignore"
+msgstr "@@ignore|Ignora completamente %s@@"
 
-#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
-#: src/net/manaserv/guildhandler.cpp:259
-#, c-format
-msgid "Topic: %s"
+#: src/playerrelations.cpp:324
+msgid "Print '...'"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
-#, fuzzy
-msgid "Players in this channel:"
-msgstr "Il giocatore colpisce il mostro"
-
-#: src/net/manaserv/chathandler.cpp:201
-#, fuzzy
-msgid "Error joining channel."
-msgstr "Comando: /join <canale>"
-
-#: src/net/manaserv/chathandler.cpp:207
-#, fuzzy
-msgid "Listing channels."
-msgstr "Richiesta per accedere al canale %s."
-
-#: src/net/manaserv/chathandler.cpp:219
-msgid "End of channel list."
+#: src/playerrelations.cpp:340
+msgid "Blink name"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:291
-#, fuzzy, c-format
-msgid "%s entered the channel."
-msgstr "%s si è unito al party."
-
-#: src/net/manaserv/chathandler.cpp:296
+#: src/resources/itemdb.cpp:44
 #, c-format
-msgid "%s left the channel."
-msgstr ""
+msgid "Attack %+d"
+msgstr "Attacco %+d"
 
-#: src/net/manaserv/chathandler.cpp:312
+#: src/resources/itemdb.cpp:45
 #, c-format
-msgid "%s has set mode %s on user %s."
-msgstr ""
+msgid "Defense %+d"
+msgstr "Difesa %+d"
 
-#: src/net/manaserv/chathandler.cpp:322
+#: src/resources/itemdb.cpp:46
 #, c-format
-msgid "%s has kicked %s."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:327
-#, fuzzy
-msgid "Unknown channel event."
-msgstr "Comando sconosciuto."
+msgid "HP %+d"
+msgstr "PF %+d"
 
-#: src/net/manaserv/generalhandler.cpp:100
+#: src/resources/itemdb.cpp:47
 #, c-format
-msgid "Willpower %+d"
-msgstr ""
-
-#: src/net/manaserv/generalhandler.cpp:171
-#, fuzzy
-msgid "Willpower"
-msgstr "Volontà:"
-
-#: src/net/manaserv/guildhandler.cpp:81
-msgid "Guild created."
-msgstr "La gilda è stata creata."
-
-#: src/net/manaserv/guildhandler.cpp:86
-msgid "Error creating guild."
-msgstr "Errore durante la creazione della gilda."
-
-#: src/net/manaserv/guildhandler.cpp:96
-msgid "Invite sent."
-msgstr "Invito spedito."
-
-#: src/net/manaserv/guildhandler.cpp:203
-msgid "Member was promoted successfully."
-msgstr ""
+msgid "MP %+d"
+msgstr "PM %+d"
 
-#: src/net/manaserv/guildhandler.cpp:208
-msgid "Failed to promote member."
-msgstr ""
+#: src/resources/itemdb.cpp:92
+msgid "Unknown item"
+msgstr "Oggetto sconosciuto"
 
-#: src/net/manaserv/loginhandler.cpp:87
-msgid "Wrong magic_token."
+#: src/resources/itemdb.cpp:135 src/resources/monsterdb.cpp:77
+msgid "unnamed"
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
 #, fuzzy
-msgid "Already logged in."
-msgstr "La registrazione è già in corso."
+#~ msgid "HP"
+#~ msgstr "HP:"
 
-#: src/net/manaserv/loginhandler.cpp:93 src/net/manaserv/loginhandler.cpp:272
 #, fuzzy
-msgid "Server is full."
-msgstr "Il server è pieno"
+#~ msgid "MP"
+#~ msgstr "MP:"
 
-#: src/net/manaserv/loginhandler.cpp:118
 #, fuzzy
-msgid "New password incorrect."
-msgstr "Nuova password errata"
+#~ msgid "Exp"
+#~ msgstr "Esperienza:"
 
-#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
-msgid "Account not connected. Please login first."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:149
 #, fuzzy
-msgid "New email address incorrect."
-msgstr "Nuovo indirizzo email errato"
+#~ msgid "Money"
+#~ msgstr "Soldi: %d"
 
-#: src/net/manaserv/loginhandler.cpp:152
 #, fuzzy
-msgid "Old email address incorrect."
-msgstr "Vecchio indirizzo email errato"
+#~ msgid "Job"
+#~ msgstr "Lavoro:"
 
-#: src/net/manaserv/loginhandler.cpp:158
 #, fuzzy
-msgid "The new email address already exists."
-msgstr "Il nuovo indirizzo e-mail esiste già."
+#~ msgid "Level"
+#~ msgstr "Livello: %d"
 
-#: src/net/manaserv/loginhandler.cpp:239
-msgid ""
-"Client registration is not allowed. Please contact server administration."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
 #, fuzzy
-msgid "Client version is too old."
-msgstr "La varsione del client è troppo vecchia"
+#~ msgid "Access denied."
+#~ msgstr "Accesso negato"
 
-#: src/net/manaserv/loginhandler.cpp:266
 #, fuzzy
-msgid "Wrong username or password."
-msgstr "Nome utente o password errati"
+#~ msgid "Unknown failure to select character."
+#~ msgstr "Cancellazione del personaggio fallita."
 
-#: src/net/manaserv/loginhandler.cpp:275
-msgid "Login attempt too soon after previous attempt."
-msgstr ""
+#~ msgid "Willpower:"
+#~ msgstr "Volontà:"
 
-#: src/net/manaserv/loginhandler.cpp:303
 #, fuzzy
-msgid "Wrong username, password or email address."
-msgstr "Nome utente, password o indirizzo email errati"
+#~ msgid "Willpower"
+#~ msgstr "Volontà:"
 
-#: src/net/manaserv/loginhandler.cpp:306
 #, fuzzy
-msgid "Username already exists."
-msgstr "Nome utente già esistente"
-
-#: src/net/manaserv/loginhandler.cpp:309
-#, fuzzy
-msgid "Email address already exists."
-msgstr "Indirizzo email già esistente"
-
-#: src/net/manaserv/loginhandler.cpp:312
-msgid "You took too long with the captcha or your response was incorrect."
-msgstr ""
-
-#: src/net/manaserv/partyhandler.cpp:88
-msgid "Joined party."
-msgstr ""
-
-#: src/net/manaserv/partyhandler.cpp:106
-#, c-format
-msgid "%s joined the party."
-msgstr "%s si è unito al party."
-
-#: src/net/manaserv/partyhandler.cpp:123
-#, fuzzy, c-format
-msgid "%s rejected your invite."
-msgstr "%s ha rifiutato il tuo invito."
-
-#: src/net/manaserv/tradehandler.cpp:96
-msgid "Accepting incoming trade requests."
-msgstr ""
-
-#: src/net/manaserv/tradehandler.cpp:98
-msgid "Ignoring incoming trade requests."
-msgstr "Ignora la richiesta di commercio."
-
-#: src/net/manaserv/tradehandler.cpp:135
-#, c-format
-msgid "Trading with %s"
-msgstr "Commerciando con %s"
-
-#: src/playerrelations.cpp:304
-#, fuzzy
-msgid "Completely ignore"
-msgstr "@@ignore|Ignora completamente %s@@"
-
-#: src/playerrelations.cpp:318
-msgid "Print '...'"
-msgstr ""
-
-#: src/playerrelations.cpp:334
-msgid "Blink name"
-msgstr ""
-
-#: src/playerrelations.cpp:371
-msgid "Floating '...' bubble"
-msgstr ""
-
-#: src/playerrelations.cpp:374
-msgid "Floating bubble"
-msgstr ""
-
-#: src/resources/itemdb.cpp:52
-#, c-format
-msgid "Attack %+d"
-msgstr "Attacco %+d"
-
-#: src/resources/itemdb.cpp:53
-#, c-format
-msgid "Defense %+d"
-msgstr "Difesa %+d"
-
-#: src/resources/itemdb.cpp:54
-#, c-format
-msgid "HP %+d"
-msgstr "PF %+d"
-
-#: src/resources/itemdb.cpp:55
-#, c-format
-msgid "MP %+d"
-msgstr "PM %+d"
-
-#: src/resources/itemdb.cpp:114
-msgid "Unknown item"
-msgstr "Oggetto sconosciuto"
-
-#: src/resources/itemdb.cpp:158 src/resources/monsterdb.cpp:45
-#: src/resources/monsterdb.cpp:69
-msgid "unnamed"
-msgstr ""
+#~ msgid "Server is full."
+#~ msgstr "Il server è pieno"
 
 #~ msgid "Text Shadow"
 #~ msgstr "Ombra del testo"
diff --git a/po/ja.po b/po/ja.po
index 74ebc683..225e733d 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2010-03-05 21:52+0100\n"
+"POT-Creation-Date: 2010-12-13 20:04+0100\n"
 "PO-Revision-Date: 2010-02-28 13:40+0000\n"
 "Last-Translator: swimmy <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
+"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,326 +19,332 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/client.cpp:553 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:62
+#: src/client.cpp:598 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
 msgid "Setup"
 msgstr "設定"
 
-#: src/client.cpp:623
+#: src/client.cpp:679
 #, fuzzy
 msgid "Connecting to server"
 msgstr "マップサーバと接続中…"
 
-#: src/client.cpp:650
+#: src/client.cpp:706
 #, fuzzy
 msgid "Logging in"
 msgstr "ログイン"
 
-#: src/client.cpp:683
+#: src/client.cpp:739
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:739
+#: src/client.cpp:804
 #, fuzzy
 msgid "Requesting characters"
 msgstr "キャラを選択"
 
-#: src/client.cpp:768
+#: src/client.cpp:833
 #, fuzzy
 msgid "Connecting to the game server"
 msgstr "マップサーバと接続中…"
 
-#: src/client.cpp:799 src/client.cpp:806 src/client.cpp:940
+#: src/client.cpp:843
+#, fuzzy
+msgid "Changing game servers"
+msgstr "サーバ"
+
+#: src/client.cpp:872 src/client.cpp:879 src/client.cpp:1014
 #: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
 #: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
-#: src/gui/serverdialog.cpp:261 src/gui/unregisterdialog.cpp:133
-#: src/net/ea/charserverhandler.cpp:135 src/net/ea/charserverhandler.cpp:152
-#: src/net/manaserv/charhandler.cpp:161 src/net/manaserv/charhandler.cpp:204
+#: src/gui/serverdialog.cpp:323 src/gui/unregisterdialog.cpp:133
+#: src/net/manaserv/charhandler.cpp:174 src/net/manaserv/charhandler.cpp:217
+#: src/net/tmwa/charserverhandler.cpp:134
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Error"
 msgstr "エラー"
 
-#: src/client.cpp:815
+#: src/client.cpp:888
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:842
+#: src/client.cpp:915
 #, fuzzy
 msgid "Password Change"
 msgstr "パスワード:"
 
-#: src/client.cpp:843
+#: src/client.cpp:916
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:862
+#: src/client.cpp:935
 #, fuzzy
 msgid "Email Change"
 msgstr "変更"
 
-#: src/client.cpp:863
+#: src/client.cpp:936
 #, fuzzy
 msgid "Email changed successfully!"
 msgstr "本メンバーが無事に昇進された。"
 
-#: src/client.cpp:883
+#: src/client.cpp:956
 #, fuzzy
 msgid "Unregister Successful"
 msgstr "登録解除"
 
-#: src/client.cpp:884
+#: src/client.cpp:957
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1007 src/client.cpp:1030
+#: src/client.cpp:1138 src/client.cpp:1161
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1119
+#: src/client.cpp:1281
 #, fuzzy, c-format
 msgid "Invalid update host: %s"
 msgstr "無効なアップデートホスト: "
 
-#: src/client.cpp:1153 src/client.cpp:1159
+#: src/client.cpp:1315 src/client.cpp:1321
 msgid "Error creating updates directory!"
 msgstr "更新フォルダの作成エラー"
 
-#: src/commandhandler.cpp:127 src/commandhandler.cpp:308
+#: src/commandhandler.cpp:131 src/commandhandler.cpp:317
 msgid "Unknown command."
 msgstr "不明なコマンド"
 
-#: src/commandhandler.cpp:156
+#: src/commandhandler.cpp:160
 msgid "-- Help --"
 msgstr "-ヘルプ-"
 
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:161
 msgid "/help > Display this help"
 msgstr "/helpを入力すると、ヘルプメニューを表示します。"
 
-#: src/commandhandler.cpp:159
+#: src/commandhandler.cpp:163
 msgid "/where > Display map name"
 msgstr "/where を入力すると、現在のマップ名を表示します。"
 
-#: src/commandhandler.cpp:160
+#: src/commandhandler.cpp:164
 msgid "/who > Display number of online users"
 msgstr "/who を入力すると、オンラインであるユーザーの数を表示します。"
 
-#: src/commandhandler.cpp:161
+#: src/commandhandler.cpp:165
 msgid "/me > Tell something about yourself"
 msgstr "/me を入力すると、自分に関する情報を教えます。"
 
-#: src/commandhandler.cpp:163
+#: src/commandhandler.cpp:167
 msgid "/clear > Clears this window"
 msgstr "/clear を入力すると、チャットウィンドウをきれいにします。"
 
-#: src/commandhandler.cpp:165
+#: src/commandhandler.cpp:169
 msgid "/msg > Send a private message to a user"
 msgstr "/msg を入力すると、他のユーザーにプライベートメッセージを送信します。"
 
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:170
 msgid "/whisper > Alias of msg"
 msgstr "/whisper は/msgと同じです。"
 
-#: src/commandhandler.cpp:167
+#: src/commandhandler.cpp:171
 msgid "/w > Alias of msg"
 msgstr "/w は/msgと同じです。"
 
-#: src/commandhandler.cpp:168
+#: src/commandhandler.cpp:172
 msgid "/query > Makes a tab for private messages with another user"
 msgstr ""
 "/query を入力すると、他のユーザーとのプライベートなチャットタブを作成します。"
 
-#: src/commandhandler.cpp:169
+#: src/commandhandler.cpp:174
 msgid "/q > Alias of query"
 msgstr "/q は/queryと同じです。"
 
-#: src/commandhandler.cpp:171
+#: src/commandhandler.cpp:176
 msgid "/ignore > ignore a player"
 msgstr ""
 
-#: src/commandhandler.cpp:172
+#: src/commandhandler.cpp:177
 msgid "/unignore > stop ignoring a player"
 msgstr ""
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:179
 msgid "/list > Display all public channels"
 msgstr "/list を入力するとすべての公共なチャンネルを表示します。"
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:180
 msgid "/join > Join or create a channel"
 msgstr ""
 "/join (+チャンネル名)をと入力すると、新しいチャンネルを作成するか、既にある"
 "チャンネルに参加します。"
 
-#: src/commandhandler.cpp:177
+#: src/commandhandler.cpp:182
 #, fuzzy
 msgid "/createparty > Create a new party"
 msgstr "/createで新パーティ作成"
 
-#: src/commandhandler.cpp:178
+#: src/commandhandler.cpp:183
 msgid "/party > Invite a user to party"
 msgstr ""
 "/party (＋ユーザー名)を入力すると、そのユーザーにパーティ招待を送ります。"
 
-#: src/commandhandler.cpp:180
+#: src/commandhandler.cpp:185
 msgid "/record > Start recording the chat to an external file"
 msgstr "/recordを入力すると、外部のファイルでチャットを記録します。"
 
-#: src/commandhandler.cpp:181
+#: src/commandhandler.cpp:187
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr ""
 "/toggleを入力すると、＜リターン＞がチャットログを留めておくかどうかを決定しま"
 "す。"
 
-#: src/commandhandler.cpp:182
+#: src/commandhandler.cpp:189
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
 "/presentを入力すると、現在のプレイヤーリストを表示します。(記録している場合"
 "は、チャットログに送信されます。)"
 
-#: src/commandhandler.cpp:184
+#: src/commandhandler.cpp:192
 msgid "/announce > Global announcement (GM only)"
 msgstr ""
 "/announce を入力すると、グローバルアナウンスをすることができます。（ゲームマ"
 "スターのみ）"
 
-#: src/commandhandler.cpp:188
+#: src/commandhandler.cpp:196
 msgid "For more information, type /help <command>."
 msgstr "もっと情報を得たい場合は、/help (コマンド）と入力してください。"
 
-#: src/commandhandler.cpp:192
+#: src/commandhandler.cpp:200
 msgid "Command: /help"
 msgstr "コマンド: /help"
 
-#: src/commandhandler.cpp:193
+#: src/commandhandler.cpp:201
 msgid "This command displays a list of all commands available."
 msgstr "このコマンドは有効なすべてのコマンドを表示します。"
 
-#: src/commandhandler.cpp:194
+#: src/commandhandler.cpp:203
 msgid "Command: /help <command>"
 msgstr "コマンド: /help ＜コマンド＞"
 
-#: src/commandhandler.cpp:195
+#: src/commandhandler.cpp:204
 msgid "This command displays help on <command>."
 msgstr "このコマンドは入力したコマンドのヘルプを表示します。"
 
-#: src/commandhandler.cpp:203
+#: src/commandhandler.cpp:212
 msgid "Command: /announce <msg>"
 msgstr "コマンド: /announce ＜メッセージ＞"
 
-#: src/commandhandler.cpp:204
+#: src/commandhandler.cpp:213
 msgid "*** only available to a GM ***"
 msgstr "*** GMに限り有効 ***"
 
-#: src/commandhandler.cpp:205
+#: src/commandhandler.cpp:214
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 "このコマンドでは、オンラインである全てのプレイヤーにメッセージを送信します。"
 
-#: src/commandhandler.cpp:210
+#: src/commandhandler.cpp:219
 msgid "Command: /clear"
 msgstr "コマンド: /clear"
 
-#: src/commandhandler.cpp:211
+#: src/commandhandler.cpp:220
 msgid "This command clears the chat log of previous chat."
 msgstr "このコマンドでは、以前のチャットのログを消去します。"
 
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:224
 #, fuzzy
 msgid "Command: /ignore <player>"
 msgstr "コマンド: /item <ポリシ>"
 
-#: src/commandhandler.cpp:216
+#: src/commandhandler.cpp:225
 #, fuzzy
 msgid "This command ignores the given player regardless of current relations."
 msgstr "このコマンドは現在オンライン状態であるプレイヤーの数を表示します。"
 
-#: src/commandhandler.cpp:221
+#: src/commandhandler.cpp:230
 msgid "Command: /join <channel>"
 msgstr "コマンド: /join ＜チャンネル＞"
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:231
 msgid "This command makes you enter <channel>."
 msgstr "このコマンドで、入力したチャンネルに参加します。"
 
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:232
 msgid "If <channel> doesn't exist, it's created."
 msgstr "もしそのチャンネルがない場合は、新しく作られます。"
 
-#: src/commandhandler.cpp:227
+#: src/commandhandler.cpp:236
 msgid "Command: /list"
 msgstr "コマンド: /list"
 
-#: src/commandhandler.cpp:228
+#: src/commandhandler.cpp:237
 msgid "This command shows a list of all channels."
 msgstr "このコマンドでは、チャンネルリストを表示します。"
 
-#: src/commandhandler.cpp:232
+#: src/commandhandler.cpp:241
 msgid "Command: /me <message>"
 msgstr "コマンド: /me ＜メッセージ＞"
 
-#: src/commandhandler.cpp:233
+#: src/commandhandler.cpp:242
 msgid "This command tell others you are (doing) <msg>."
 msgstr "このコマンドでは、他の人に入力した状態であることを教えます。"
 
-#: src/commandhandler.cpp:237
+#: src/commandhandler.cpp:246
 msgid "Command: /msg <nick> <message>"
 msgstr "コマンド: /msg ＜ニックネーム＞＜メッセージ＞"
 
-#: src/commandhandler.cpp:238
+#: src/commandhandler.cpp:247
 msgid "Command: /whisper <nick> <message>"
 msgstr "コマンド: /whisper  ＜ニックネーム＞ ＜メッセージ＞"
 
-#: src/commandhandler.cpp:239
+#: src/commandhandler.cpp:248
 msgid "Command: /w <nick> <message>"
 msgstr "コマンド: /w <ニックネーム> <メッセージ>"
 
-#: src/commandhandler.cpp:240
+#: src/commandhandler.cpp:249
 msgid "This command sends the text <message> to <nick>."
 msgstr "このコマンドでは、メッセージを入力した人へ送信します。"
 
-#: src/commandhandler.cpp:241 src/commandhandler.cpp:260
+#: src/commandhandler.cpp:250 src/commandhandler.cpp:269
 #: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
-#: src/net/ea/gui/guildtab.cpp:75 src/net/ea/gui/partytab.cpp:75
+#: src/net/tmwa/gui/guildtab.cpp:75 src/net/tmwa/gui/partytab.cpp:75
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 "入力するニックネームにスペースが入っている場合、ダブルコーテーション(\")で囲"
 "んでください。"
 
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:255
 msgid "Command: /query <nick>"
 msgstr "コマンド: /query ＜ニックネーム＞"
 
-#: src/commandhandler.cpp:247
+#: src/commandhandler.cpp:256
 msgid "Command: /q <nick>"
 msgstr "コマンド: /q ＜ニックネーム＞"
 
-#: src/commandhandler.cpp:248
+#: src/commandhandler.cpp:257
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr "このコマンドでは、入力したプレイヤーとのチャットタブを作成します。"
 
-#: src/commandhandler.cpp:253
+#: src/commandhandler.cpp:262
 #, fuzzy
 msgid "Command: /createparty <name>"
 msgstr "コマンド: /create ＜パーティ名＞"
 
-#: src/commandhandler.cpp:254
+#: src/commandhandler.cpp:263
 #, fuzzy
 msgid "This command creates a new party called <name>."
 msgstr "本コマンドでは、引数の名前で新パーティ作成"
 
-#: src/commandhandler.cpp:258
+#: src/commandhandler.cpp:267
 msgid "Command: /party <nick>"
 msgstr "コマンド: /party ＜ニックネーム＞"
 
-#: src/commandhandler.cpp:259 src/net/ea/gui/partytab.cpp:74
+#: src/commandhandler.cpp:268 src/net/tmwa/gui/partytab.cpp:74
 msgid "This command invites <nick> to party with you."
 msgstr "このコマンドでは、入力したプレイヤーを自分のパーティーに招待します。"
 
-#: src/commandhandler.cpp:265
+#: src/commandhandler.cpp:274
 msgid "Command: /present"
 msgstr "コマンド: /present"
 
-#: src/commandhandler.cpp:266
+#: src/commandhandler.cpp:275
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
@@ -345,27 +352,27 @@ msgstr ""
 "このコマンドは見えている範囲内にいるプレイヤーのリストを得て、記録しているな"
 "ら記録ログに、そうでなければチャットログに送られます。"
 
-#: src/commandhandler.cpp:272
+#: src/commandhandler.cpp:281
 msgid "Command: /record <filename>"
 msgstr "コマンド: /record ＜ファイル名＞"
 
-#: src/commandhandler.cpp:273
+#: src/commandhandler.cpp:282
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr "このコマンドでは、入力したファイルにチャットログの記録を開始します。"
 
-#: src/commandhandler.cpp:275
+#: src/commandhandler.cpp:284
 msgid "Command: /record"
 msgstr "コマンド: /record"
 
-#: src/commandhandler.cpp:276
+#: src/commandhandler.cpp:285
 msgid "This command finishes a recording session."
 msgstr "このコマンドでは、記録セッションを終了させます。"
 
-#: src/commandhandler.cpp:280
+#: src/commandhandler.cpp:289
 msgid "Command: /toggle <state>"
 msgstr "コマンド: /toggle <状態>"
 
-#: src/commandhandler.cpp:281
+#: src/commandhandler.cpp:290
 msgid ""
 "This command sets whether the return key should toggle the chat log, or "
 "whether the chat log turns off automatically."
@@ -373,56 +380,56 @@ msgstr ""
 "このコマンドはリターンキーがチャットログを留めておくか、もしくはチャットログ"
 "が自動的に消えるかどうかを設定します。"
 
-#: src/commandhandler.cpp:283
+#: src/commandhandler.cpp:292
 msgid ""
-"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
-"\", \"no\", \"false\" to turn the toggle off."
+"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
+"\"0\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 "<状態>の部分は切り替えをオンにするには\"1\",\"yes\",\"true\"のどれか一つを、"
 "オフにするには\"0\",\"no\",\"false\"のどれかになります。"
 
-#: src/commandhandler.cpp:286
+#: src/commandhandler.cpp:295
 msgid "Command: /toggle"
 msgstr "コマンド: /toggle"
 
-#: src/commandhandler.cpp:287
+#: src/commandhandler.cpp:296
 msgid "This command displays the return toggle status."
 msgstr "このコマンドでは、トグルのスイッチ状態を表示します。"
 
-#: src/commandhandler.cpp:291 src/gui/widgets/whispertab.cpp:93
+#: src/commandhandler.cpp:300 src/gui/widgets/whispertab.cpp:95
 #, fuzzy
 msgid "Command: /unignore <player>"
 msgstr "コマンド: /item <ポリシ>"
 
-#: src/commandhandler.cpp:292
+#: src/commandhandler.cpp:301
 msgid "This command stops ignoring the given player if they are being ignored"
 msgstr ""
 
-#: src/commandhandler.cpp:297
+#: src/commandhandler.cpp:306
 msgid "Command: /where"
 msgstr "コマンド: /where"
 
-#: src/commandhandler.cpp:298
+#: src/commandhandler.cpp:307
 msgid "This command displays the name of the current map."
 msgstr "このコマンドは現在地点のマップの名前を表示します。"
 
-#: src/commandhandler.cpp:302
+#: src/commandhandler.cpp:311
 msgid "Command: /who"
 msgstr "コマンド: /who"
 
-#: src/commandhandler.cpp:303
+#: src/commandhandler.cpp:312
 msgid "This command displays the number of players currently online."
 msgstr "このコマンドは現在オンライン状態であるプレイヤーの数を表示します。"
 
-#: src/commandhandler.cpp:309
+#: src/commandhandler.cpp:318
 msgid "Type /help for a list of commands."
 msgstr "/help を入力すると、可能なコマンドのリストを表示します。"
 
-#: src/commandhandler.cpp:375
+#: src/commandhandler.cpp:384
 msgid "Cannot send empty whispers!"
 msgstr "空のメッセージを送信することはできません！"
 
-#: src/commandhandler.cpp:383
+#: src/commandhandler.cpp:392
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -431,59 +438,67 @@ msgstr ""
 "%sと言うメッセージタブの作成ができません！それはもう既に存在しているか、自分"
 "です。"
 
-#: src/commandhandler.cpp:397
+#: src/commandhandler.cpp:406
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "%sというチャンネルへの参加を要求しています。"
 
-#: src/commandhandler.cpp:410 src/net/ea/gui/partytab.cpp:109
+#: src/commandhandler.cpp:419 src/net/tmwa/gui/partytab.cpp:109
 msgid "Party name is missing."
 msgstr "パーティ名がない。"
 
-#: src/commandhandler.cpp:423 src/commandhandler.cpp:471
-#: src/commandhandler.cpp:493
+#: src/commandhandler.cpp:432 src/commandhandler.cpp:509
+#: src/commandhandler.cpp:531
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:441
+#: src/commandhandler.cpp:450
 msgid "Return toggles chat."
 msgstr "リターンはチャットを留めておきます。"
 
-#: src/commandhandler.cpp:441
+#: src/commandhandler.cpp:450
 msgid "Message closes chat."
 msgstr "メッセージはチャットを閉じます。"
 
-#: src/commandhandler.cpp:450
+#: src/commandhandler.cpp:459
 msgid "Return now toggles chat."
 msgstr "リターンはこれからチャットを留めておきます。"
 
-#: src/commandhandler.cpp:454
+#: src/commandhandler.cpp:463
 msgid "Message now closes chat."
 msgstr "メッセージはこれからチャットを閉じます。"
 
-#: src/commandhandler.cpp:477
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:489
+msgid "Show IP: On"
+msgstr ""
+
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:485
+msgid "Show IP: Off"
+msgstr ""
+
+#: src/commandhandler.cpp:515
 msgid "Player already ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:484
+#: src/commandhandler.cpp:522
 #, fuzzy
 msgid "Player successfully ignored!"
 msgstr "パーティ作成成功"
 
-#: src/commandhandler.cpp:486
+#: src/commandhandler.cpp:524
 #, fuzzy
 msgid "Player could not be ignored!"
 msgstr "プライベートなメッセージが送れなかった、ユーザに無視された。"
 
-#: src/commandhandler.cpp:501
+#: src/commandhandler.cpp:539
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:506
+#: src/commandhandler.cpp:544
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:508
+#: src/commandhandler.cpp:546
 #, fuzzy
 msgid "Player could not be unignored!"
 msgstr "プライベートなメッセージが送れなかった、ユーザに無視された。"
@@ -492,50 +507,50 @@ msgstr "プライベートなメッセージが送れなかった、ユーザに
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
-"/%sへの可能なオプションは：\"yes\", \"no\", \"true\", \"false\", \"1\", \"0"
-"\"。"
+"/%sへの可能なオプションは：\"yes\", \"no\", \"true\", \"false\", \"1\", "
+"\"0\"。"
 
 #: src/game.cpp:172
 msgid "General"
 msgstr "一般"
 
-#: src/game.cpp:326
+#: src/game.cpp:342
 #, fuzzy
 msgid "Screenshot saved as "
 msgstr "~/にスクリーンショットを保存しました。"
 
-#: src/game.cpp:331
+#: src/game.cpp:347
 msgid "Saving screenshot failed!"
 msgstr "スクリーンショットを保存することに失敗しました！"
 
-#: src/game.cpp:355
+#: src/game.cpp:378
 #, fuzzy
 msgid "The connection to the server was lost."
 msgstr "サーバが切断されたので、プログラムは終了します。"
 
-#: src/game.cpp:360
+#: src/game.cpp:382
 msgid "Network Error"
 msgstr "ネットワークエラー"
 
-#: src/game.cpp:705
+#: src/game.cpp:721
 msgid "Ignoring incoming trade requests"
 msgstr "他人からのトレードリクエストを無視します。"
 
-#: src/game.cpp:712
+#: src/game.cpp:726
 msgid "Accepting incoming trade requests"
 msgstr "他人からのトレードリクエストを受け入れます。"
 
-#: src/game.cpp:946
+#: src/game.cpp:954
 #, fuzzy
 msgid "Could Not Load Map"
 msgstr "マップをロードすることができませんでした。"
 
-#: src/game.cpp:947
+#: src/game.cpp:955
 #, c-format
 msgid "Error while loading %s"
 msgstr "%sをロードしている間にエラーが起きました。"
 
-#: src/gui/beingpopup.cpp:75
+#: src/gui/beingpopup.cpp:76
 #, fuzzy, c-format
 msgid "Party: %s"
 msgstr "パーティ (%s)"
@@ -544,34 +559,34 @@ msgstr "パーティ (%s)"
 msgid "Buy"
 msgstr "買う"
 
-#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
-#: src/gui/sell.cpp:276
+#: src/gui/buy.cpp:69 src/gui/buy.cpp:261 src/gui/sell.cpp:71
+#: src/gui/sell.cpp:288
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "価格:%s /合計:%s"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:99 src/gui/npcdialog.cpp:100
-#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:479
+#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:112 src/gui/npcdialog.cpp:124
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:463
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:98 src/gui/npcdialog.cpp:101
-#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:491
+#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:111 src/gui/npcdialog.cpp:125
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:475
 msgid "-"
 msgstr ""
 
 #: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
-#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:182
-#: src/keyboardconfig.cpp:103
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:228
+#: src/keyboardconfig.cpp:102
 msgid "Quit"
 msgstr "終了"
 
-#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:408
-#: src/gui/statuswindow.cpp:478 src/gui/statuswindow.cpp:512
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:384
+#: src/gui/statuswindow.cpp:462 src/gui/statuswindow.cpp:496
 msgid "Max"
 msgstr "最大"
 
@@ -585,11 +600,11 @@ msgstr "売る"
 
 #: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
 #: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
-#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:101
-#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:178
-#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:402
+#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:114
+#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:389
 #: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
-#: src/gui/socialwindow.cpp:242 src/gui/textdialog.cpp:39
+#: src/gui/socialwindow.cpp:275 src/gui/textdialog.cpp:40
 #: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr "キャンセル"
@@ -628,7 +643,7 @@ msgstr "新メールアドがもう存在している。"
 msgid "Change Password"
 msgstr "パスワードの変更"
 
-#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:53
+#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:55
 #: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
 msgid "Password:"
 msgstr "パスワード:"
@@ -660,19 +675,19 @@ msgstr ""
 msgid "Create Character"
 msgstr "キャラクターを作成"
 
-#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:52
+#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:54
 #: src/gui/register.cpp:67
 msgid "Name:"
 msgstr "名前:"
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
 #: src/gui/outfitwindow.cpp:67
 msgid ">"
 msgstr ""
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
 #: src/gui/outfitwindow.cpp:66
@@ -689,8 +704,8 @@ msgstr "髪の色："
 msgid "Hair style:"
 msgstr "髪型："
 
-#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:397
-#: src/gui/socialwindow.cpp:296
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:392
+#: src/gui/socialwindow.cpp:329
 msgid "Create"
 msgstr "作成"
 
@@ -746,34 +761,34 @@ msgstr "登録解除"
 msgid "Change Email"
 msgstr "メールアドレスを変える。"
 
-#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:185
-#: src/gui/setup_players.cpp:230
+#: src/gui/charselectdialog.cpp:336 src/gui/serverdialog.cpp:231
+#: src/gui/setup_players.cpp:229
 msgid "Delete"
 msgstr "削除"
 
-#: src/gui/charselectdialog.cpp:387
+#: src/gui/charselectdialog.cpp:380
 #, fuzzy
 msgid "Choose"
 msgstr "閉じる"
 
-#: src/gui/charselectdialog.cpp:399 src/gui/charselectdialog.cpp:400
+#: src/gui/charselectdialog.cpp:394 src/gui/charselectdialog.cpp:395
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:77 src/gui/palette.cpp:96
+#: src/gui/chat.cpp:88
 msgid "Chat"
 msgstr "チャット"
 
-#: src/gui/chat.cpp:287
+#: src/gui/chat.cpp:311
 #, fuzzy, c-format
 msgid "Present: %s; %d players are present."
 msgstr "オンラインプレイヤーは%d人です。"
 
-#: src/gui/chat.cpp:305
+#: src/gui/chat.cpp:329
 msgid "Attendance written to record log."
 msgstr "出席者は記録ログに書かれました。"
 
-#: src/gui/chat.cpp:469
+#: src/gui/chat.cpp:493
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "%sに送信中： %s"
@@ -835,143 +850,174 @@ msgstr "粒子の詳細"
 msgid "Ambient FX: %s"
 msgstr "環境FX"
 
-#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:56
+#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:55
 msgid "Equipment"
 msgstr "装備"
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:77
-#: src/gui/inventorywindow.cpp:79 src/gui/inventorywindow.cpp:298
-#: src/gui/popupmenu.cpp:372
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:89
+#: src/gui/inventorywindow.cpp:337 src/gui/popupmenu.cpp:359
 msgid "Unequip"
 msgstr "外す"
 
-#: src/gui/help.cpp:36
+#: src/gui/help.cpp:37
 msgid "Help"
 msgstr "ヘルプ"
 
-#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:73
+#: src/gui/help.cpp:51 src/gui/npcdialog.cpp:50
 msgid "Close"
 msgstr "閉じる"
 
-#: src/gui/inventorywindow.cpp:56 src/gui/windowmenu.cpp:57
+#: src/gui/inventorywindow.cpp:59 src/gui/windowmenu.cpp:56
 msgid "Inventory"
 msgstr "アイテム"
 
-#: src/gui/inventorywindow.cpp:72 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:300 src/gui/popupmenu.cpp:374
+#: src/gui/inventorywindow.cpp:59
+msgid "Storage"
+msgstr "倉庫"
+
+#: src/gui/inventorywindow.cpp:82
+msgid "Slots:"
+msgstr "スロット"
+
+#: src/gui/inventorywindow.cpp:87 src/gui/inventorywindow.cpp:100
+#: src/gui/inventorywindow.cpp:339 src/gui/popupmenu.cpp:361
 msgid "Equip"
 msgstr "装備する"
 
-#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:304 src/gui/popupmenu.cpp:377
+#: src/gui/inventorywindow.cpp:88
 msgid "Use"
 msgstr "使う"
 
-#: src/gui/inventorywindow.cpp:83 src/gui/inventorywindow.cpp:308
-#: src/gui/popupmenu.cpp:380
+#: src/gui/inventorywindow.cpp:101 src/gui/popupmenu.cpp:364
+msgid "Activate"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:102 src/gui/inventorywindow.cpp:348
+#: src/gui/popupmenu.cpp:367
 #, fuzzy
 msgid "Drop..."
 msgstr "落とす"
 
-#: src/gui/inventorywindow.cpp:84 src/gui/popupmenu.cpp:386
+#: src/gui/inventorywindow.cpp:103 src/gui/popupmenu.cpp:373
 msgid "Split"
 msgstr "分割する"
 
-#: src/gui/inventorywindow.cpp:85 src/gui/outfitwindow.cpp:51
+#: src/gui/inventorywindow.cpp:104 src/gui/outfitwindow.cpp:51
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:96 src/gui/storagewindow.cpp:83
-msgid "Slots:"
-msgstr "スロット"
-
-#: src/gui/inventorywindow.cpp:97
+#: src/gui/inventorywindow.cpp:106
 msgid "Weight:"
 msgstr "重量"
 
-#: src/gui/inventorywindow.cpp:310 src/gui/popupmenu.cpp:382
+#: src/gui/inventorywindow.cpp:124 src/gui/popupmenu.cpp:378
+msgid "Store"
+msgstr "保存"
+
+#: src/gui/inventorywindow.cpp:125 src/gui/popupmenu.cpp:385
+msgid "Retrieve"
+msgstr "取り戻す"
+
+#: src/gui/inventorywindow.cpp:350 src/gui/popupmenu.cpp:369
 msgid "Drop"
 msgstr "落とす"
 
-#: src/gui/itemamount.cpp:100 src/gui/okdialog.cpp:42
-#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:38 src/gui/trade.cpp:73
-#: src/gui/trade.cpp:75
+#: src/gui/itemamount.cpp:113 src/gui/okdialog.cpp:42
+#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:39 src/gui/trade.cpp:72
+#: src/gui/trade.cpp:74
 msgid "OK"
 msgstr "OK"
 
-#: src/gui/itemamount.cpp:102
+#: src/gui/itemamount.cpp:115
 msgid "All"
 msgstr "全て"
 
-#: src/gui/itemamount.cpp:128
+#: src/gui/itemamount.cpp:141
 msgid "Select amount of items to trade."
 msgstr "交換するアイテムの量を選択してください。"
 
-#: src/gui/itemamount.cpp:131
+#: src/gui/itemamount.cpp:144
 msgid "Select amount of items to drop."
 msgstr "落とすアイテムの量を選択してください"
 
-#: src/gui/itemamount.cpp:134
+#: src/gui/itemamount.cpp:147
 msgid "Select amount of items to store."
 msgstr "保管するアイテムの量を選択してください。"
 
-#: src/gui/itemamount.cpp:137
+#: src/gui/itemamount.cpp:150
 msgid "Select amount of items to retrieve."
 msgstr "取り出すアイテムの量を選択してください。"
 
-#: src/gui/itemamount.cpp:140
+#: src/gui/itemamount.cpp:153
 msgid "Select amount of items to split."
 msgstr "分割するアイテムの量を選択してください。"
 
-#: src/gui/itempopup.cpp:92
+#: src/gui/itempopup.cpp:137
 #, fuzzy, c-format
 msgid "Weight: %s"
 msgstr "重量： "
 
-#: src/gui/login.cpp:49 src/gui/login.cpp:61
+#: src/gui/login.cpp:51 src/gui/login.cpp:63
 msgid "Login"
 msgstr "ログイン"
 
-#: src/gui/login.cpp:58
+#: src/gui/login.cpp:60
 #, fuzzy
 msgid "Remember username"
 msgstr "ユーザネームを保存する"
 
-#: src/gui/login.cpp:59 src/gui/register.cpp:58 src/gui/register.cpp:73
+#: src/gui/login.cpp:61 src/gui/register.cpp:58 src/gui/register.cpp:73
 msgid "Register"
 msgstr "登録する"
 
-#: src/gui/login.cpp:60
+#: src/gui/login.cpp:62
 #, fuzzy
 msgid "Change Server"
 msgstr "サーバ"
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
+#: src/gui/login.cpp:129
+#, fuzzy
+msgid "Registration disabled"
+msgstr "アイテムシェア無効"
+
+#: src/gui/login.cpp:129
+msgid "You need to use the website to register an account for this server."
+msgstr ""
+
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:86
 msgid "Map"
 msgstr "地図"
 
-#: src/gui/npcdialog.cpp:44
+#: src/gui/ministatus.cpp:235
+msgid "Need"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:48
 msgid "Waiting for server"
 msgstr "サーバを待っています…"
 
-#: src/gui/npcdialog.cpp:45
+#: src/gui/npcdialog.cpp:49
 msgid "Next"
 msgstr "次へ"
 
-#: src/gui/npcdialog.cpp:47
+#: src/gui/npcdialog.cpp:51
 msgid "Submit"
 msgstr "決定"
 
-#: src/gui/npcdialog.cpp:52 src/gui/npcpostdialog.cpp:41
+#: src/gui/npcdialog.cpp:73 src/gui/npcpostdialog.cpp:41
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:110
+#: src/gui/npcdialog.cpp:118
+msgid "Clear log"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:134
 msgid "Reset"
 msgstr "リセット"
 
 #. TRANSLATORS: Please leave the \n sequences intact.
-#: src/gui/npcdialog.cpp:171
+#: src/gui/npcdialog.cpp:208
 #, fuzzy
 msgid ""
 "\n"
@@ -986,7 +1032,7 @@ msgstr "宛先:"
 msgid "Send"
 msgstr "送信する"
 
-#: src/gui/npcpostdialog.cpp:96
+#: src/gui/npcpostdialog.cpp:99
 msgid "Failed to send as sender or letter invalid."
 msgstr "文字か差出人が無効なので送信に失敗しました。"
 
@@ -1001,313 +1047,86 @@ msgstr ""
 msgid "Unequip first"
 msgstr "外す"
 
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:143
-msgid "Text"
-msgstr "テキスト"
-
-#: src/gui/palette.cpp:82
-msgid "Text Shadow"
-msgstr "文字の影"
-
-#: src/gui/palette.cpp:83
-msgid "Text Outline"
-msgstr "文字の外線"
-
-#: src/gui/palette.cpp:84
-msgid "Progress Bar Labels"
-msgstr "進行状況バーのラベル"
-
-#: src/gui/palette.cpp:85
-msgid "Buttons"
-msgstr ""
-
-#: src/gui/palette.cpp:86
-msgid "Disabled Buttons"
-msgstr ""
-
-#: src/gui/palette.cpp:87
-msgid "Tabs"
-msgstr ""
-
-#: src/gui/palette.cpp:89
-msgid "Background"
-msgstr "背景色"
-
-#: src/gui/palette.cpp:91
-msgid "Highlight"
-msgstr "強調"
-
-#: src/gui/palette.cpp:92
-msgid "Tab Highlight"
-msgstr "タブの強調"
-
-#: src/gui/palette.cpp:93
-#, fuzzy
-msgid "Item Too Expensive"
-msgstr "アイテムが買えない"
-
-#: src/gui/palette.cpp:94
-#, fuzzy
-msgid "Item Is Equipped"
-msgstr "アイテムが装備されている"
-
-#: src/gui/palette.cpp:97
-msgid "GM"
-msgstr "ゲームマスター"
-
-#: src/gui/palette.cpp:98
-msgid "Player"
-msgstr "プレイヤー"
-
-#: src/gui/palette.cpp:99
-msgid "Whisper"
-msgstr "プライベートメッセージ"
-
-#: src/gui/palette.cpp:100
-msgid "Is"
-msgstr "等しい"
-
-#: src/gui/palette.cpp:101 src/net/ea/gui/partytab.cpp:43
-msgid "Party"
-msgstr "パーティー"
-
-#: src/gui/palette.cpp:102 src/net/ea/gui/guildtab.cpp:45
-msgid "Guild"
-msgstr "ギルド"
-
-#: src/gui/palette.cpp:103
-msgid "Server"
-msgstr "サーバ"
-
-#: src/gui/palette.cpp:104
-msgid "Logger"
-msgstr "ロガー"
-
-#: src/gui/palette.cpp:105
-msgid "Hyperlink"
-msgstr "ハイパーリンク"
-
-#: src/gui/palette.cpp:107
-msgid "Being"
-msgstr "人"
-
-#: src/gui/palette.cpp:108
-msgid "Other Players' Names"
-msgstr "他のプレイヤー名"
-
-#: src/gui/palette.cpp:109
-msgid "Own Name"
-msgstr "自分の名前"
-
-#: src/gui/palette.cpp:110
-msgid "GM Names"
-msgstr "ゲームマスター名"
-
-#: src/gui/palette.cpp:111
-msgid "NPCs"
-msgstr "NPCたち"
-
-#: src/gui/palette.cpp:112
-msgid "Monsters"
-msgstr "モンスター"
-
-#: src/gui/palette.cpp:114
-msgid "Unknown Item Type"
-msgstr "不明なアイテムタイプ"
-
-#: src/gui/palette.cpp:115
-msgid "Generics"
-msgstr "非使用アイテム"
-
-#: src/gui/palette.cpp:116
-msgid "Hats"
-msgstr "帽子"
-
-#: src/gui/palette.cpp:117
-msgid "Usables"
-msgstr "回復アイテム"
-
-#: src/gui/palette.cpp:118
-msgid "Shirts"
-msgstr "シャツ"
-
-#: src/gui/palette.cpp:119
-#, fuzzy
-msgid "One Handed Weapons"
-msgstr "武器１"
-
-#: src/gui/palette.cpp:120
-msgid "Pants"
-msgstr "ズボン"
-
-#: src/gui/palette.cpp:121
-msgid "Shoes"
-msgstr "靴"
-
-#: src/gui/palette.cpp:122
-#, fuzzy
-msgid "Two Handed Weapons"
-msgstr "武器１"
-
-#: src/gui/palette.cpp:123
-msgid "Shields"
-msgstr "盾"
-
-#: src/gui/palette.cpp:124
-msgid "Rings"
-msgstr "指輪"
-
-#: src/gui/palette.cpp:125
-msgid "Necklaces"
-msgstr "首飾り"
-
-#: src/gui/palette.cpp:126
-msgid "Arms"
-msgstr "腕パーツ"
-
-#: src/gui/palette.cpp:127
-msgid "Ammo"
-msgstr "矢、弾薬など"
-
-#: src/gui/palette.cpp:129
-msgid "Particle Effects"
-msgstr "特有の効果"
-
-#: src/gui/palette.cpp:130
-msgid "Pickup Notification"
-msgstr "収集通知"
-
-#: src/gui/palette.cpp:131
-msgid "Exp Notification"
-msgstr "経験値通知"
-
-#: src/gui/palette.cpp:133
-#, fuzzy
-msgid "Player Hits Monster"
-msgstr "プレイヤーがモンスターをアタックした時"
-
-#: src/gui/palette.cpp:135
-#, fuzzy
-msgid "Monster Hits Player"
-msgstr "モンスターがプレイヤーをアタックした時"
-
-#: src/gui/palette.cpp:136
-msgid "Critical Hit"
-msgstr "クリティカルヒット"
-
-#: src/gui/palette.cpp:137
-msgid "Misses"
-msgstr "ミス"
-
-#: src/gui/palette.cpp:139
-msgid "HP Bar"
-msgstr "HPバー"
-
-#: src/gui/palette.cpp:140
-msgid "3/4 HP Bar"
-msgstr "HPが3/4のとき"
-
-#: src/gui/palette.cpp:141
-msgid "1/2 HP Bar"
-msgstr "HPが1/2のとき"
-
-#: src/gui/palette.cpp:142
-msgid "1/4 HP Bar"
-msgstr "HPが1/4のとき"
-
-#: src/gui/popupmenu.cpp:84
+#: src/gui/popupmenu.cpp:83
 #, fuzzy, c-format
 msgid "Trade with %s..."
 msgstr "%sと取引中"
 
-#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:161
+#: src/gui/popupmenu.cpp:87 src/gui/popupmenu.cpp:158
 #, fuzzy, c-format
 msgid "Attack %s"
 msgstr "攻撃力 %+d"
 
-#: src/gui/popupmenu.cpp:92
+#: src/gui/popupmenu.cpp:91
 #, fuzzy, c-format
 msgid "Whisper %s"
 msgstr "プライベートメッセージ"
 
-#: src/gui/popupmenu.cpp:101
+#: src/gui/popupmenu.cpp:100
 #, fuzzy, c-format
 msgid "Befriend %s"
 msgstr "@@friend|%sと友達になる@@"
 
-#: src/gui/popupmenu.cpp:106
+#: src/gui/popupmenu.cpp:105
 #, fuzzy, c-format
 msgid "Disregard %s"
 msgstr "無視"
 
-#: src/gui/popupmenu.cpp:109
+#: src/gui/popupmenu.cpp:108
 #, fuzzy, c-format
 msgid "Ignore %s"
 msgstr "無視する"
 
-#: src/gui/popupmenu.cpp:115 src/gui/popupmenu.cpp:124
+#: src/gui/popupmenu.cpp:114 src/gui/popupmenu.cpp:123
 #, c-format
 msgid "Unignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:118
+#: src/gui/popupmenu.cpp:117
 #, fuzzy, c-format
 msgid "Completely ignore %s"
 msgstr "@@Ignore|%sを完璧に無視する@@"
 
 #: src/gui/popupmenu.cpp:130
-#, c-format
-msgid "Follow %s"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:133
 #, fuzzy, c-format
 msgid "Invite %s to join your guild"
 msgstr "@@guild|%sにギルドへの参加の招待を送る@@"
 
-#: src/gui/popupmenu.cpp:137
+#: src/gui/popupmenu.cpp:134
 #, fuzzy, c-format
 msgid "Invite %s to join your party"
 msgstr "@@party|%sにパーティへの参加の招待を送る@@"
 
-#: src/gui/popupmenu.cpp:144
+#: src/gui/popupmenu.cpp:141
 #, fuzzy
 msgid "Kick player"
 msgstr "キック失敗"
 
-#: src/gui/popupmenu.cpp:153
+#: src/gui/popupmenu.cpp:150
 #, fuzzy, c-format
 msgid "Talk to %s"
 msgstr "@@talk|%sと会話@@"
 
-#: src/gui/popupmenu.cpp:166
+#: src/gui/popupmenu.cpp:163
 #, fuzzy
 msgid "Kick monster"
 msgstr "@@admin-kick|モンスターを追い出す@@"
 
-#: src/gui/popupmenu.cpp:174
+#: src/gui/popupmenu.cpp:171
 #, fuzzy
 msgid "Add name to chat"
 msgstr "@@name|名前をチャットに追加＠＠"
 
-#: src/gui/popupmenu.cpp:191
+#: src/gui/popupmenu.cpp:188
 #, fuzzy, c-format
 msgid "Pick up %s"
 msgstr "拾う"
 
-#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:400
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:387
 #, fuzzy
 msgid "Add to chat"
 msgstr "@@chat|チャットに追加@@"
 
-#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:70
-msgid "Store"
-msgstr "保存"
-
-#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:71
-msgid "Retrieve"
-msgstr "取り戻す"
-
 #: src/gui/quitdialog.cpp:44
 msgid "Switch server"
 msgstr "サーバーを切り替える"
@@ -1376,52 +1195,65 @@ msgstr "パスワードは%d文字より短くなくてはいけません。"
 msgid "Passwords do not match."
 msgstr "パスワードが一致していません。"
 
-#: src/gui/serverdialog.cpp:134
+#: src/gui/serverdialog.cpp:197
 #, fuzzy
 msgid "Choose Your Server"
 msgstr "サーバーを選んでください。"
 
-#: src/gui/serverdialog.cpp:141 src/gui/widgets/chattab.cpp:139
+#: src/gui/serverdialog.cpp:206 src/gui/widgets/chattab.cpp:142
 msgid "Server:"
 msgstr "サーバ:"
 
-#: src/gui/serverdialog.cpp:142
+#: src/gui/serverdialog.cpp:207
 msgid "Port:"
 msgstr "ポート:"
 
-#: src/gui/serverdialog.cpp:143
+#: src/gui/serverdialog.cpp:208
 #, fuzzy
 msgid "Server type:"
 msgstr "サーバ:"
 
-#: src/gui/serverdialog.cpp:183
+#: src/gui/serverdialog.cpp:229
 #, fuzzy
 msgid "Connect"
 msgstr "接続しています..."
 
-#: src/gui/serverdialog.cpp:184
+#: src/gui/serverdialog.cpp:230
 #, fuzzy
 msgid "Custom Server"
 msgstr "カスタムカーソル"
 
-#: src/gui/serverdialog.cpp:262
+#: src/gui/serverdialog.cpp:324
 msgid "Please type both the address and the port of a server."
 msgstr "サーバのアドレスとポート番号を両方入力してください。"
 
-#: src/gui/serverdialog.cpp:411
+#: src/gui/serverdialog.cpp:441
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:417
+#: src/gui/serverdialog.cpp:447
 #, fuzzy
 msgid "Waiting for server..."
 msgstr "サーバを待っています…"
 
-#: src/gui/serverdialog.cpp:421
+#: src/gui/serverdialog.cpp:451
 msgid "Preparing download"
 msgstr ""
 
+#: src/gui/serverdialog.cpp:455
+msgid "Error retreiving server list!"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:550
+msgid "requires a newer version"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:552
+#, c-format
+msgid "requires v%s"
+msgstr ""
+
 #: src/gui/setup_audio.cpp:42
 msgid "Sound"
 msgstr "音"
@@ -1455,54 +1287,54 @@ msgstr ""
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:44
+#: src/gui/setup_colors.cpp:46
 msgid "This is what the color looks like"
 msgstr "これがその色がどのように見えるかです。"
 
-#: src/gui/setup_colors.cpp:49
+#: src/gui/setup_colors.cpp:51
 msgid "Colors"
 msgstr "色彩"
 
-#: src/gui/setup_colors.cpp:70
+#: src/gui/setup_colors.cpp:72
 #, fuzzy
 msgid "Type:"
 msgstr "種類 "
 
-#: src/gui/setup_colors.cpp:81 src/gui/setup_colors.cpp:433
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:331
 msgid "Static"
 msgstr "穏やか"
 
-#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:84
-#: src/gui/setup_colors.cpp:434
+#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
+#: src/gui/setup_colors.cpp:332
 msgid "Pulse"
 msgstr "点滅"
 
-#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
+#: src/gui/setup_colors.cpp:333
 msgid "Rainbow"
 msgstr "カラフル"
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
+#: src/gui/setup_colors.cpp:333
 msgid "Spectrum"
 msgstr "スペクトル"
 
-#: src/gui/setup_colors.cpp:92
+#: src/gui/setup_colors.cpp:94
 #, fuzzy
 msgid "Delay:"
 msgstr "遅れ： "
 
-#: src/gui/setup_colors.cpp:107
+#: src/gui/setup_colors.cpp:109
 #, fuzzy
 msgid "Red:"
 msgstr "赤色: "
 
-#: src/gui/setup_colors.cpp:122
+#: src/gui/setup_colors.cpp:124
 #, fuzzy
 msgid "Green:"
 msgstr "緑色: "
 
-#: src/gui/setup_colors.cpp:137
+#: src/gui/setup_colors.cpp:139
 #, fuzzy
 msgid "Blue:"
 msgstr "青色: "
@@ -1548,596 +1380,607 @@ msgid "Assign"
 msgstr "割り当てる"
 
 #: src/gui/setup_keyboard.cpp:90
+#, fuzzy
+msgid "Unassign"
+msgstr "割り当てる"
+
+#: src/gui/setup_keyboard.cpp:94
 msgid "Default"
 msgstr "標準に戻す"
 
-#: src/gui/setup_keyboard.cpp:119
+#: src/gui/setup_keyboard.cpp:125
 msgid "Key Conflict(s) Detected."
 msgstr "キーが重複しています。"
 
-#: src/gui/setup_players.cpp:57
+#: src/gui/setup_players.cpp:58
 msgid "Name"
 msgstr "名前"
 
-#: src/gui/setup_players.cpp:58
+#: src/gui/setup_players.cpp:59
 msgid "Relation"
 msgstr "関係"
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:64
 msgid "Neutral"
 msgstr "普通"
 
-#: src/gui/setup_players.cpp:64
+#: src/gui/setup_players.cpp:65
 msgid "Friend"
 msgstr "友達"
 
-#: src/gui/setup_players.cpp:65
+#: src/gui/setup_players.cpp:66
 msgid "Disregarded"
 msgstr "無視"
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_players.cpp:67
 msgid "Ignored"
 msgstr "無視する"
 
-#: src/gui/setup_players.cpp:208 src/gui/setup_video.cpp:132
+#: src/gui/setup_players.cpp:206 src/gui/setup_video.cpp:153
 msgid "???"
 msgstr "???"
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_players.cpp:225
 msgid "Allow trading"
 msgstr "交換を承認する"
 
-#: src/gui/setup_players.cpp:228
+#: src/gui/setup_players.cpp:227
 msgid "Allow whispers"
 msgstr "プライベートメッセージを受け取ることを承認する"
 
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:231
 msgid "Put all whispers in tabs"
 msgstr "プライベートメッセージをタブに出す。"
 
-#: src/gui/setup_players.cpp:234
+#: src/gui/setup_players.cpp:233
 #, fuzzy
 msgid "Show gender"
 msgstr "名前を表示"
 
-#: src/gui/setup_players.cpp:236
+#: src/gui/setup_players.cpp:235
+#, fuzzy
+msgid "Enable Chat log"
+msgstr "売ること不可能"
+
+#: src/gui/setup_players.cpp:237
 msgid "Players"
 msgstr "プレイヤー"
 
-#: src/gui/setup_players.cpp:261
+#: src/gui/setup_players.cpp:262
 msgid "When ignoring:"
 msgstr "無視の際には："
 
-#: src/gui/setup_video.cpp:113
+#: src/gui/setup_video.cpp:134
 msgid "Tiny"
 msgstr "とても小さい"
 
-#: src/gui/setup_video.cpp:114
+#: src/gui/setup_video.cpp:135
 msgid "Small"
 msgstr "小さい"
 
-#: src/gui/setup_video.cpp:115
+#: src/gui/setup_video.cpp:136
 msgid "Medium"
 msgstr "中"
 
-#: src/gui/setup_video.cpp:116
+#: src/gui/setup_video.cpp:137
 msgid "Large"
 msgstr "大"
 
-#: src/gui/setup_video.cpp:142
+#: src/gui/setup_video.cpp:163
 msgid "No text"
 msgstr "テキストなし"
 
-#: src/gui/setup_video.cpp:144
+#: src/gui/setup_video.cpp:164
+msgid "Text"
+msgstr "テキスト"
+
+#: src/gui/setup_video.cpp:165
 msgid "Bubbles, no names"
 msgstr "バブル、名前表示なし"
 
-#: src/gui/setup_video.cpp:145
+#: src/gui/setup_video.cpp:166
 msgid "Bubbles with names"
 msgstr "バブル、名前表示あり"
 
-#: src/gui/setup_video.cpp:157
+#: src/gui/setup_video.cpp:178
 msgid "off"
 msgstr "オフ"
 
-#: src/gui/setup_video.cpp:158 src/gui/setup_video.cpp:171
+#: src/gui/setup_video.cpp:179 src/gui/setup_video.cpp:192
 msgid "low"
 msgstr "低"
 
-#: src/gui/setup_video.cpp:159 src/gui/setup_video.cpp:173
+#: src/gui/setup_video.cpp:180 src/gui/setup_video.cpp:194
 msgid "high"
 msgstr "高"
 
-#: src/gui/setup_video.cpp:172
+#: src/gui/setup_video.cpp:193
 msgid "medium"
 msgstr "中"
 
-#: src/gui/setup_video.cpp:174
+#: src/gui/setup_video.cpp:195
 msgid "max"
 msgstr "最大"
 
-#: src/gui/setup_video.cpp:196
+#: src/gui/setup_video.cpp:217
 msgid "Full screen"
 msgstr "フールスクリーン"
 
-#: src/gui/setup_video.cpp:197
+#: src/gui/setup_video.cpp:218
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:198
+#: src/gui/setup_video.cpp:219
 msgid "Custom cursor"
 msgstr "カスタムカーソル"
 
-#: src/gui/setup_video.cpp:200
+#: src/gui/setup_video.cpp:221
 msgid "Visible names"
 msgstr "名前を表示する"
 
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:223
 msgid "Particle effects"
 msgstr "粒子効果"
 
-#: src/gui/setup_video.cpp:204
+#: src/gui/setup_video.cpp:225
 #, fuzzy
 msgid "Show own name"
 msgstr "名前を表示"
 
-#: src/gui/setup_video.cpp:205
+#: src/gui/setup_video.cpp:226
+msgid "Log NPC dialogue"
+msgstr ""
+
+#: src/gui/setup_video.cpp:227
 msgid "Show pickup notification"
 msgstr "ピックアップ通知表示"
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:207
+#. TRANSLATORS: Refers to "Show pickup notification"
+#: src/gui/setup_video.cpp:229
 msgid "in chat"
 msgstr "チャット中"
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:209
+#. TRANSLATORS: Refers to "Show pickup notification"
+#: src/gui/setup_video.cpp:231
 msgid "as particle"
 msgstr "画面内で"
 
-#: src/gui/setup_video.cpp:214
+#: src/gui/setup_video.cpp:236
 #, fuzzy
 msgid "FPS limit:"
 msgstr "FPS限界値:"
 
-#: src/gui/setup_video.cpp:225
+#: src/gui/setup_video.cpp:247
+msgid "Disable transparency (Low CPU mode)"
+msgstr ""
+
+#: src/gui/setup_video.cpp:250
 msgid "Video"
 msgstr "ビデオ"
 
-#: src/gui/setup_video.cpp:227
+#: src/gui/setup_video.cpp:252
 #, fuzzy
-msgid "Show monster damage"
+msgid "Show damage"
 msgstr "名前を表示"
 
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:258
 msgid "Overhead text"
 msgstr "ヘッダーテキスト"
 
-#: src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:259
 msgid "Gui opacity"
 msgstr "GUI不透明"
 
-#: src/gui/setup_video.cpp:235
+#: src/gui/setup_video.cpp:260
 msgid "Ambient FX"
 msgstr "環境FX"
 
-#: src/gui/setup_video.cpp:236
+#: src/gui/setup_video.cpp:261
 #, fuzzy
 msgid "Particle detail"
 msgstr "粒子の詳細"
 
-#: src/gui/setup_video.cpp:237
+#: src/gui/setup_video.cpp:262
 msgid "Font size"
 msgstr "フォントサイズ"
 
-#: src/gui/setup_video.cpp:251 src/gui/setup_video.cpp:454
-#: src/gui/setup_video.cpp:568
+#: src/gui/setup_video.cpp:277 src/gui/setup_video.cpp:532
+#: src/gui/setup_video.cpp:662
 #, fuzzy
 msgid "None"
 msgstr "いいえ"
 
-#: src/gui/setup_video.cpp:381
+#: src/gui/setup_video.cpp:426
 #, fuzzy
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr "現在のモードでも前のモードの復元もまた失敗しました！"
 
-#: src/gui/setup_video.cpp:387
+#: src/gui/setup_video.cpp:432
 #, fuzzy
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr "現在のモードでも前のモードの復元もまた失敗しました！"
 
-#: src/gui/setup_video.cpp:398
+#: src/gui/setup_video.cpp:443
 #, fuzzy
 msgid "Switching to Full Screen"
 msgstr "全画面に変更"
 
-#: src/gui/setup_video.cpp:399
+#: src/gui/setup_video.cpp:444
 msgid "Restart needed for changes to take effect."
 msgstr "設定変更のため、再起動をしてください。"
 
-#: src/gui/setup_video.cpp:411
+#: src/gui/setup_video.cpp:458
 #, fuzzy
 msgid "Changing to OpenGL"
 msgstr "OpenGLを変える"
 
-#: src/gui/setup_video.cpp:412
+#: src/gui/setup_video.cpp:459
+msgid ""
+"Applying change to OpenGL requires restart. In case OpenGL messes up your "
+"game graphics, restart the game with the command line option \"--no-opengl\"."
+msgstr ""
+
+#: src/gui/setup_video.cpp:466
+msgid "Deactivating OpenGL"
+msgstr ""
+
+#: src/gui/setup_video.cpp:467
 msgid "Applying change to OpenGL requires restart."
 msgstr "OpenGLの設定を変更するため、再起動をしてください。"
 
-#: src/gui/setup_video.cpp:486 src/gui/setup_video.cpp:491
+#: src/gui/setup_video.cpp:475
+#, fuzzy
+msgid "Transparency disabled"
+msgstr "経験シェア無効"
+
+#: src/gui/setup_video.cpp:476 src/gui/setup_video.cpp:484
+msgid "You must restart to apply changes."
+msgstr ""
+
+#: src/gui/setup_video.cpp:483
+msgid "Transparency enabled"
+msgstr ""
+
+#: src/gui/setup_video.cpp:576 src/gui/setup_video.cpp:581
 #, fuzzy
 msgid "Screen Resolution Changed"
 msgstr "スクリーンの解像度が変わりました。"
 
-#: src/gui/setup_video.cpp:487 src/gui/setup_video.cpp:492
+#: src/gui/setup_video.cpp:577 src/gui/setup_video.cpp:582
 msgid "Restart your client for the change to take effect."
 msgstr "設定変更のため、アプリケーションを再起動してください。"
 
-#: src/gui/setup_video.cpp:489
+#: src/gui/setup_video.cpp:579
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:522
+#: src/gui/setup_video.cpp:612
 #, fuzzy
 msgid "Particle Effect Settings Changed."
 msgstr "粒子の効果の設定が変わりました。"
 
-#: src/gui/setup_video.cpp:523
+#: src/gui/setup_video.cpp:613
 msgid "Changes will take effect on map change."
 msgstr "変化はマップがかわったときから影響します。"
 
-#: src/gui/skilldialog.cpp:197 src/gui/windowmenu.cpp:58
+#: src/gui/skilldialog.cpp:212 src/gui/windowmenu.cpp:59
 msgid "Skills"
 msgstr "スキル"
 
-#: src/gui/skilldialog.cpp:208
+#: src/gui/skilldialog.cpp:223
 msgid "Up"
 msgstr "上げる"
 
-#: src/gui/skilldialog.cpp:262
+#: src/gui/skilldialog.cpp:269
 #, fuzzy, c-format
 msgid "Skill points available: %d"
 msgstr "スキルポイント: %d"
 
-#: src/gui/skilldialog.cpp:314
+#: src/gui/skilldialog.cpp:351
 #, fuzzy, c-format
 msgid "Skill Set %d"
 msgstr "スキルポイント: %d"
 
-#: src/gui/skilldialog.cpp:323
+#: src/gui/skilldialog.cpp:360
 #, fuzzy, c-format
 msgid "Skill %d"
 msgstr "スキル"
 
-#: src/gui/skilldialog.cpp:405
+#: src/gui/skilldialog.cpp:442
 #, fuzzy, c-format
 msgid "Lvl: %d (%+d)"
 msgstr "レベル: %d"
 
-#: src/gui/skilldialog.cpp:416
+#: src/gui/skilldialog.cpp:453
 #, fuzzy, c-format
 msgid "Lvl: %d"
 msgstr "レベル: %d"
 
-#: src/gui/socialwindow.cpp:117
+#: src/gui/socialwindow.cpp:126
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:126
+#: src/gui/socialwindow.cpp:139
 #, fuzzy, c-format
 msgid "Guild %s quit requested."
 msgstr "ギルド作成成功"
 
-#: src/gui/socialwindow.cpp:136
+#: src/gui/socialwindow.cpp:153
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:137
+#: src/gui/socialwindow.cpp:154
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:146
+#: src/gui/socialwindow.cpp:163
 #, fuzzy
 msgid "Leave Guild?"
 msgstr "ギルドを作成する"
 
-#: src/gui/socialwindow.cpp:147
+#: src/gui/socialwindow.cpp:164
 #, fuzzy, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "本当に終了してもよろしいですか?"
 
-#: src/gui/socialwindow.cpp:182
+#: src/gui/socialwindow.cpp:207 src/net/tmwa/partyhandler.cpp:330
 #, fuzzy, c-format
 msgid "Invited user %s to party."
 msgstr ""
 "/party (＋ユーザー名)を入力すると、そのユーザーにパーティ招待を送ります。"
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:218
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:199
+#: src/gui/socialwindow.cpp:232
 #, fuzzy
 msgid "Member Invite to Party"
 msgstr ""
 "/party (＋ユーザー名)を入力すると、そのユーザーにパーティ招待を送ります。"
 
-#: src/gui/socialwindow.cpp:200
+#: src/gui/socialwindow.cpp:233
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:209
+#: src/gui/socialwindow.cpp:242
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:210
+#: src/gui/socialwindow.cpp:243
 #, fuzzy, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "本当に終了してもよろしいですか?"
 
-#: src/gui/socialwindow.cpp:239
+#: src/gui/socialwindow.cpp:272
 msgid "Create Guild"
 msgstr "ギルドを作成する"
 
-#: src/gui/socialwindow.cpp:240 src/gui/socialwindow.cpp:564
+#: src/gui/socialwindow.cpp:273 src/gui/socialwindow.cpp:620
 #, fuzzy
 msgid "Create Party"
 msgstr "キャラクターを作成"
 
-#: src/gui/socialwindow.cpp:279 src/gui/windowmenu.cpp:60
+#: src/gui/socialwindow.cpp:312 src/gui/windowmenu.cpp:64
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:297
+#: src/gui/socialwindow.cpp:330
 #, fuzzy
 msgid "Invite"
 msgstr "ユーザーを招待する"
 
-#: src/gui/socialwindow.cpp:298
+#: src/gui/socialwindow.cpp:331
 #, fuzzy
 msgid "Leave"
 msgstr "大"
 
-#: src/gui/socialwindow.cpp:394
+#: src/gui/socialwindow.cpp:443
 #, fuzzy, c-format
 msgid "Accepted party invite from %s."
 msgstr "%sからの招待を受け入れました。"
 
-#: src/gui/socialwindow.cpp:400
+#: src/gui/socialwindow.cpp:449
 #, fuzzy, c-format
 msgid "Rejected party invite from %s."
 msgstr "%sからの招待を拒否しました。"
 
-#: src/gui/socialwindow.cpp:413
+#: src/gui/socialwindow.cpp:462
 #, fuzzy, c-format
 msgid "Accepted guild invite from %s."
 msgstr "%sからの招待を受け入れました。"
 
-#: src/gui/socialwindow.cpp:419
+#: src/gui/socialwindow.cpp:468
 #, fuzzy, c-format
 msgid "Rejected guild invite from %s."
 msgstr "%sからの招待を拒否しました。"
 
-#: src/gui/socialwindow.cpp:463
+#: src/gui/socialwindow.cpp:497
+msgid "Creating guild failed, please choose a shorter name."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:504
 #, fuzzy, c-format
 msgid "Creating guild called %s."
 msgstr "ギルド作成エラー"
 
-#: src/gui/socialwindow.cpp:477
+#: src/gui/socialwindow.cpp:520
+msgid "Creating party failed, please choose a shorter name."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:527
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:484
+#: src/gui/socialwindow.cpp:541
 #, fuzzy
 msgid "Guild Name"
 msgstr "ギルド"
 
-#: src/gui/socialwindow.cpp:485
+#: src/gui/socialwindow.cpp:542
 #, fuzzy
 msgid "Choose your guild's name."
 msgstr "サーバーを選んでください。"
 
-#: src/gui/socialwindow.cpp:497
+#: src/gui/socialwindow.cpp:554
 #, fuzzy
 msgid "Received guild request, but one already exists."
 msgstr "パーティへの招待を受け取りましたが、もう既に存在しています。"
 
-#: src/gui/socialwindow.cpp:502
+#: src/gui/socialwindow.cpp:559
 #, fuzzy, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%sはあなたを%sというパーティに招待しました。"
 
-#: src/gui/socialwindow.cpp:507
+#: src/gui/socialwindow.cpp:564
 #, fuzzy
 msgid "Accept Guild Invite"
 msgstr "パーティ招待を受け入れます。"
 
-#: src/gui/socialwindow.cpp:519
+#: src/gui/socialwindow.cpp:576
 msgid "Received party request, but one already exists."
 msgstr "パーティへの招待を受け取りましたが、もう既に存在しています。"
 
-#: src/gui/socialwindow.cpp:529
+#: src/gui/socialwindow.cpp:585
 #, fuzzy
 msgid "You have been invited you to join a party."
 msgstr "%sはあなたをパーティに招待しました。"
 
-#: src/gui/socialwindow.cpp:533
+#: src/gui/socialwindow.cpp:589
 #, fuzzy, c-format
 msgid "You have been invited to join the %s party."
 msgstr "%sはあなたを%sというパーティに招待しました。"
 
-#: src/gui/socialwindow.cpp:541
+#: src/gui/socialwindow.cpp:597
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%sはあなたをパーティに招待しました。"
 
-#: src/gui/socialwindow.cpp:546
+#: src/gui/socialwindow.cpp:602
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%sはあなたを%sというパーティに招待しました。"
 
-#: src/gui/socialwindow.cpp:554
+#: src/gui/socialwindow.cpp:610
 msgid "Accept Party Invite"
 msgstr "パーティ招待を受け入れます。"
 
-#: src/gui/socialwindow.cpp:565
+#: src/gui/socialwindow.cpp:621
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:570
+#: src/gui/socialwindow.cpp:626
 #, fuzzy
 msgid "Party Name"
 msgstr "パーティー"
 
-#: src/gui/socialwindow.cpp:571
+#: src/gui/socialwindow.cpp:627
 #, fuzzy
 msgid "Choose your party's name."
 msgstr "サーバーを選んでください。"
 
-#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:59
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:62
 msgid "Specials"
 msgstr ""
 
-#: src/gui/specialswindow.cpp:174
-#, c-format
-msgid "Specials Set %d"
-msgstr ""
-
-#: src/gui/specialswindow.cpp:191
-#, c-format
-msgid "Special %d"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:99 src/gui/statuswindow.cpp:247
+#: src/gui/statuswindow.cpp:113 src/gui/statuswindow.cpp:215
+#: src/gui/statuswindow.cpp:262
 #, c-format
 msgid "Level: %d"
 msgstr "レベル: %d"
 
-#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:211
+#: src/gui/statuswindow.cpp:114 src/gui/statuswindow.cpp:208
+#: src/gui/statuswindow.cpp:239
 #, c-format
 msgid "Money: %s"
 msgstr "GP:%s"
 
-#: src/gui/statuswindow.cpp:102
+#: src/gui/statuswindow.cpp:117
 msgid "HP:"
 msgstr "HP:"
 
-#: src/gui/statuswindow.cpp:107
+#: src/gui/statuswindow.cpp:122
 msgid "Exp:"
 msgstr "経験値:"
 
-#: src/gui/statuswindow.cpp:112
+#: src/gui/statuswindow.cpp:130
 msgid "MP:"
 msgstr "MP:"
 
-#: src/gui/statuswindow.cpp:132 src/gui/statuswindow.cpp:219
+#: src/gui/statuswindow.cpp:158 src/gui/statuswindow.cpp:275
 #, c-format
 msgid "Job: %d"
 msgstr "ジョブ: %d"
 
-#: src/gui/statuswindow.cpp:133
+#: src/gui/statuswindow.cpp:159
 msgid "Job:"
 msgstr "ジョブポイント:"
 
-#: src/gui/statuswindow.cpp:194
-#, fuzzy
-msgid "HP"
-msgstr "HP:"
-
-#: src/gui/statuswindow.cpp:200
-#, fuzzy
-msgid "MP"
-msgstr "MP:"
-
-#: src/gui/statuswindow.cpp:206
-#, fuzzy
-msgid "Exp"
-msgstr "経験値:"
-
-#: src/gui/statuswindow.cpp:215
-#, fuzzy
-msgid "Money"
-msgstr "GP: %d"
-
-#: src/gui/statuswindow.cpp:225
-#, fuzzy
-msgid "Job"
-msgstr "ジョブポイント:"
-
-#: src/gui/statuswindow.cpp:229
+#: src/gui/statuswindow.cpp:211 src/gui/statuswindow.cpp:247
 #, fuzzy, c-format
 msgid "Character points: %d"
 msgstr "キャラクターの能力ポイント配分量は問題ありません。"
 
-#: src/gui/statuswindow.cpp:235
+#: src/gui/statuswindow.cpp:255
 #, fuzzy, c-format
 msgid "Correction points: %d"
 msgstr "スキルポイント: %d"
 
-#: src/gui/statuswindow.cpp:251
-#, fuzzy
-msgid "Level"
-msgstr "レベル: %d"
-
-#: src/gui/storagewindow.cpp:58
-msgid "Storage"
-msgstr "倉庫"
-
-#: src/gui/trade.cpp:52
+#: src/gui/trade.cpp:53
 msgid "Propose trade"
 msgstr "交換の提案"
 
-#: src/gui/trade.cpp:53
+#: src/gui/trade.cpp:54
 msgid "Confirmed. Waiting..."
 msgstr "確認しました。待っています…。"
 
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:55
 msgid "Agree trade"
 msgstr "交換を了承する"
 
-#: src/gui/trade.cpp:55
+#: src/gui/trade.cpp:56
 msgid "Agreed. Waiting..."
 msgstr "了承しました。待っています…。"
 
-#: src/gui/trade.cpp:58
+#: src/gui/trade.cpp:59
 msgid "Trade: You"
 msgstr "交換:あなたと"
 
-#: src/gui/trade.cpp:74 src/gui/trade.cpp:75
+#: src/gui/trade.cpp:73 src/gui/trade.cpp:74
 msgid "Trade"
 msgstr "交換"
 
-#: src/gui/trade.cpp:77
+#: src/gui/trade.cpp:76
 msgid "Add"
 msgstr "追加"
 
-#: src/gui/trade.cpp:99 src/gui/trade.cpp:135
+#: src/gui/trade.cpp:98 src/gui/trade.cpp:134
 #, fuzzy, c-format
 msgid "You get %s"
 msgstr "%sを貰いました。"
 
-#: src/gui/trade.cpp:100
+#: src/gui/trade.cpp:99
 msgid "You give:"
 msgstr "あげる物:"
 
-#: src/gui/trade.cpp:104
+#: src/gui/trade.cpp:103
 msgid "Change"
 msgstr "変更"
 
-#: src/gui/trade.cpp:275
+#: src/gui/trade.cpp:262
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "アイテムを追加することに失敗しました。アイテム一種類を一つのウインドウ上で重"
 "複して追加することは出来ません！"
 
-#: src/gui/trade.cpp:318
+#: src/gui/trade.cpp:304
 msgid "You don't have enough money."
 msgstr "現金不足です。"
 
@@ -2158,22 +2001,22 @@ msgstr "接続しています..."
 msgid "Play"
 msgstr "プレイ"
 
-#: src/gui/updatewindow.cpp:405
+#: src/gui/updatewindow.cpp:417
 msgid "##1  The update process is incomplete."
 msgstr "##1  アップデートは完了していません。"
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:407
+#: src/gui/updatewindow.cpp:419
 msgid "##1  It is strongly recommended that"
 msgstr "##1 とても推奨されます。"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:409
+#: src/gui/updatewindow.cpp:421
 #, fuzzy
 msgid "##1  you try again later."
 msgstr "##1 もう一度やってみてください。"
 
-#: src/gui/updatewindow.cpp:501
+#: src/gui/updatewindow.cpp:515
 msgid "Completed"
 msgstr "完了"
 
@@ -2255,65 +2098,65 @@ msgstr "オペレーターになる人が必要です！"
 msgid "Need a user to kick!"
 msgstr "追い出すことができるメンバーが必要です！"
 
-#: src/gui/widgets/chattab.cpp:118
+#: src/gui/widgets/chattab.cpp:121
 msgid "Global announcement:"
 msgstr "アナウンス:"
 
-#: src/gui/widgets/chattab.cpp:124
+#: src/gui/widgets/chattab.cpp:127
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "%sからのアナウンス:"
 
-#: src/gui/widgets/chattab.cpp:150
+#: src/gui/widgets/chattab.cpp:153
 #, fuzzy, c-format
 msgid "%s whispers: %s"
 msgstr "%sからのPM: "
 
-#: src/gui/widgets/whispertab.cpp:51
+#: src/gui/widgets/whispertab.cpp:53
 msgid "Cannot send empty chat!"
 msgstr "空のチャットを送ることはできません！"
 
-#: src/gui/widgets/whispertab.cpp:70
+#: src/gui/widgets/whispertab.cpp:72
 msgid "/ignore > Ignore the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:71
+#: src/gui/widgets/whispertab.cpp:73
 msgid "/unignore > Stop ignoring the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:72
+#: src/gui/widgets/whispertab.cpp:74
 msgid "/close > Close the whisper tab"
 msgstr "/closeでプライベートメッセージのタブを閉じます。"
 
-#: src/gui/widgets/whispertab.cpp:82
+#: src/gui/widgets/whispertab.cpp:84
 msgid "Command: /close"
 msgstr "コマンド: /close"
 
-#: src/gui/widgets/whispertab.cpp:83
+#: src/gui/widgets/whispertab.cpp:85
 msgid "This command closes the current whisper tab."
 msgstr ""
 "このコマンドでは、現在開いているプライベートメッセージのタブを閉じます。"
 
-#: src/gui/widgets/whispertab.cpp:87
+#: src/gui/widgets/whispertab.cpp:89
 #, fuzzy
 msgid "Command: /ignore"
 msgstr "コマンド: /item"
 
-#: src/gui/widgets/whispertab.cpp:88
+#: src/gui/widgets/whispertab.cpp:90
 #, fuzzy
 msgid "This command ignores the other player regardless of current relations."
 msgstr "このコマンドは現在オンライン状態であるプレイヤーの数を表示します。"
 
-#: src/gui/widgets/whispertab.cpp:94
+#: src/gui/widgets/whispertab.cpp:96
 #, fuzzy
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr "このコマンドでは、入力したファイルにチャットログの記録を開始します。"
 
-#: src/gui/windowmenu.cpp:55
+#: src/gui/windowmenu.cpp:54
 msgid "Status"
 msgstr "状態"
 
-#: src/gui/windowmenu.cpp:61
+#: src/gui/windowmenu.cpp:65
 msgid "Shortcut"
 msgstr "ショートカット"
 
@@ -2332,639 +2175,1007 @@ msgstr "変更"
 msgid "Choose World"
 msgstr "サーバーを選んでください。"
 
-#: src/keyboardconfig.cpp:40
+#: src/keyboardconfig.cpp:39
 msgid "Move Up"
 msgstr "上移動"
 
-#: src/keyboardconfig.cpp:41
+#: src/keyboardconfig.cpp:40
 msgid "Move Down"
 msgstr "下移動"
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:41
 msgid "Move Left"
 msgstr "左移動"
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:42
 msgid "Move Right"
 msgstr "右移動"
 
-#: src/keyboardconfig.cpp:44 src/net/ea/generalhandler.cpp:223
+#: src/keyboardconfig.cpp:43 src/net/tmwa/generalhandler.cpp:237
 msgid "Attack"
 msgstr "攻撃"
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:44
 msgid "Target & Attack"
 msgstr "ターゲットと攻撃"
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:45
 msgid "Smilie"
 msgstr "スマイリー"
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:46
 msgid "Talk"
 msgstr "話す"
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:47
 msgid "Stop Attack"
 msgstr "攻撃を止める"
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:48
 #, fuzzy
 msgid "Target Monster"
 msgstr "一番近い物を狙う"
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboardconfig.cpp:49
 msgid "Target NPC"
 msgstr "NPCを狙う"
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:50
 msgid "Target Player"
 msgstr "プレイヤーを狙う"
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:51
 msgid "Pickup"
 msgstr "拾う"
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:52
 msgid "Hide Windows"
 msgstr "ウィンドウを隠す"
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:53
 msgid "Sit"
 msgstr "座る"
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:54
 msgid "Screenshot"
 msgstr "スクリーンショット"
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:55
 msgid "Enable/Disable Trading"
 msgstr "取引を可能/不可能にする"
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:56
 msgid "Find Path to Mouse"
 msgstr "マウスまでの道を表示する"
 
-#: src/keyboardconfig.cpp:58 src/keyboardconfig.cpp:59
-#: src/keyboardconfig.cpp:60 src/keyboardconfig.cpp:61
-#: src/keyboardconfig.cpp:62 src/keyboardconfig.cpp:63
-#: src/keyboardconfig.cpp:64 src/keyboardconfig.cpp:65
-#: src/keyboardconfig.cpp:66 src/keyboardconfig.cpp:67
-#: src/keyboardconfig.cpp:68 src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:57 src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60
+#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62
+#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64
+#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68
 #, c-format
 msgid "Item Shortcut %d"
 msgstr "アイテムショートカット: %d"
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:69
 msgid "Help Window"
 msgstr "ヘルプウィンドウ"
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:70
 msgid "Status Window"
 msgstr "ステータス・ウィンドウ"
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:71
 msgid "Inventory Window"
 msgstr "在庫ウィンドウ"
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:72
 msgid "Equipment Window"
 msgstr "装備ウィンドウ"
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:73
 msgid "Skill Window"
 msgstr "スキルウィンドウ"
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:74
 msgid "Minimap Window"
 msgstr "小さなマップウィンドウ"
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:75
 msgid "Chat Window"
 msgstr "チャットウィンドウ"
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:76
 msgid "Item Shortcut Window"
 msgstr "アイテムショートカットウィンドウ"
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:77
 msgid "Setup Window"
 msgstr "設定ウィンドウ"
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:78
 msgid "Debug Window"
 msgstr "デバグウィンドウ"
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:79
 #, fuzzy
 msgid "Social Window"
 msgstr "スキルウィンドウ"
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:80
 msgid "Emote Shortcut Window"
 msgstr "表情ショートカットウィンドウ"
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:81
 #, fuzzy
 msgid "Outfits Window"
 msgstr "ステータス・ウィンドウ"
 
-#: src/keyboardconfig.cpp:83
+#: src/keyboardconfig.cpp:82
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:83
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86
-#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88
-#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90
-#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92
-#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:84 src/keyboardconfig.cpp:85
+#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:87
+#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:89
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:91
+#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:93
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:95
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "スマイリーショートカット: %d"
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:96
 msgid "Toggle Chat"
 msgstr "トグルチャット"
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:97
 msgid "Scroll Chat Up"
 msgstr "チャットを上にスクロールする"
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:98
 msgid "Scroll Chat Down"
 msgstr "チャットを下にスクロールする"
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:99
 msgid "Previous Chat Tab"
 msgstr "前のチャットタブ"
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:100
 msgid "Next Chat Tab"
 msgstr "次のチャットタブ"
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:101
 msgid "Select OK"
 msgstr "OKを選択する"
 
-#: src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:103
 msgid "Ignore input 1"
 msgstr "インプット１無視"
 
-#: src/keyboardconfig.cpp:105
+#: src/keyboardconfig.cpp:104
 msgid "Ignore input 2"
 msgstr "インプット２無視"
 
-#: src/keyboardconfig.cpp:178
+#: src/keyboardconfig.cpp:183
 #, fuzzy, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr "修正しなければ、ゲームプレイが変なふるまいになります。"
 
-#: src/localplayer.cpp:913
+#: src/localplayer.cpp:985
 msgid "Unable to pick up item."
 msgstr "アイテムを拾うことができない。"
 
 #. TRANSLATORS: This sentence may be translated differently
 #. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:922
+#: src/localplayer.cpp:994
 #, fuzzy, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "%s [@@%d|%s@@]を拾った。"
 msgstr[1] "%s [@@%d|%s@@]を拾った。"
 
-#: src/main.cpp:43
+#: src/main.cpp:42
 msgid "mana [options] [mana-file]"
 msgstr ""
 
+#: src/main.cpp:43
+msgid "[mana-file] : The mana file is an XML file (.mana)"
+msgstr ""
+
 #: src/main.cpp:44
+msgid "              used to set custom parameters"
+msgstr ""
+
+#: src/main.cpp:45
+msgid "              to the mana client."
+msgstr ""
+
+#: src/main.cpp:47
 msgid "Options:"
 msgstr "オプション:"
 
-#: src/main.cpp:45
+#: src/main.cpp:48
 #, fuzzy
 msgid "  -v --version        : Display the version"
 msgstr "  -v --version : バーション番号表示"
 
-#: src/main.cpp:46
+#: src/main.cpp:49
 #, fuzzy
 msgid "  -h --help           : Display this help"
 msgstr "  -h --help：ヘルプ表示"
 
-#: src/main.cpp:47
+#: src/main.cpp:50
 #, fuzzy
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr "  -C --config-file :使用されている設定ファイル"
 
-#: src/main.cpp:48
+#: src/main.cpp:51
 #, fuzzy
 msgid "  -U --username       : Login with this username"
 msgstr "  -U --username: 本ユーザ名でログインする。"
 
-#: src/main.cpp:49
+#: src/main.cpp:52
 #, fuzzy
 msgid "  -P --password       : Login with this password"
 msgstr "  -P --password :ログインに対するパスワード設定"
 
-#: src/main.cpp:50
+#: src/main.cpp:53
 #, fuzzy
 msgid "  -c --character      : Login with this character"
 msgstr "  -c --character :本キャラでログインする"
 
-#: src/main.cpp:51
+#: src/main.cpp:54
 #, fuzzy
 msgid "  -s --server         : Login server name or IP"
 msgstr "  -s --server : ログインサーバ名あるいはIPアドレス"
 
-#: src/main.cpp:52
+#: src/main.cpp:55
 #, fuzzy
 msgid "  -p --port           : Login server port"
 msgstr "  -p --port : ログインサーバのポート番号"
 
-#: src/main.cpp:53
+#: src/main.cpp:56
 #, fuzzy
 msgid "     --update-host    : Use this update host"
 msgstr "  -H --update-host :本ホストは更新ホストとして使用"
 
-#: src/main.cpp:54
+#: src/main.cpp:57
 #, fuzzy
 msgid "  -D --default        : Choose default character server and character"
 msgstr "  -D --default: デフォールトキャラクタサーバとキャラクタ選択"
 
-#: src/main.cpp:56
+#: src/main.cpp:59
 #, fuzzy
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr "  -u --skip-update : 更新ダウンロードをスキップする。"
 
-#: src/main.cpp:57
+#: src/main.cpp:60
 #, fuzzy
 msgid "  -d --data           : Directory to load game data from"
 msgstr "  -d --data :本レポジトリからゲームデータをロードする。"
 
-#: src/main.cpp:58
+#: src/main.cpp:61
 #, fuzzy
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
+msgid "     --localdata-dir  : Directory to use as local data directory"
 msgstr "  -S --home-dir :ホームレポジトリとして使用しているフォルダ"
 
-#: src/main.cpp:59
+#: src/main.cpp:62
+#, fuzzy
+msgid "     --chat-log-dir   : Chat log dir to use"
+msgstr "  -C --config-file :使用されている設定ファイル"
+
+#: src/main.cpp:63
 #, fuzzy
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr "  -S --home-dir :ホームレポジトリとして使用しているフォルダ"
 
-#: src/main.cpp:61
+#: src/main.cpp:65
 #, fuzzy
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr "  -O --no-opengl : 本セッションでOpenGLが使用不可"
 
-#: src/net/ea/adminhandler.cpp:63
+#: src/net/manaserv/beinghandler.cpp:303 src/net/tmwa/playerhandler.cpp:94
+msgid "You are dead."
+msgstr "あなたは死にました。"
+
+#: src/net/manaserv/beinghandler.cpp:304 src/net/tmwa/playerhandler.cpp:95
+msgid "We regret to inform you that your character was killed in battle."
+msgstr "残念なお知らせですが、あなた様のキャラは戦闘中亡くなってしまいました。"
+
+#: src/net/manaserv/beinghandler.cpp:306 src/net/tmwa/playerhandler.cpp:97
+msgid "You are not that alive anymore."
+msgstr "今から生きていない。"
+
+#: src/net/manaserv/beinghandler.cpp:307 src/net/tmwa/playerhandler.cpp:98
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr "死神の冷たい手に魂が取られてしまった。"
+
+#: src/net/manaserv/beinghandler.cpp:308 src/net/tmwa/playerhandler.cpp:99
+msgid "Game Over!"
+msgstr "ゲームオーバー!"
+
+#: src/net/manaserv/beinghandler.cpp:309 src/net/tmwa/playerhandler.cpp:101
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+"ううん、棒ややち。あなたのキャラは本当にしんでなかった。もっと綺麗なところに"
+"向かっただけ。"
+
+#: src/net/manaserv/beinghandler.cpp:311 src/net/tmwa/playerhandler.cpp:103
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr "喉で的の武器を潰す予定だったが…失敗した。"
+
+#: src/net/manaserv/beinghandler.cpp:313 src/net/tmwa/playerhandler.cpp:105
+msgid "I guess this did not run too well."
+msgstr "あんまり上手くいかなかったぜー"
+
+#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:107
+msgid "Do you want your possessions identified?"
+msgstr "持ち物を確定して欲しい？"
+
+#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:109
+msgid "Sadly, no trace of you was ever found..."
+msgstr "悲しさのあまり、痕跡でさえ見つからなかった。"
+
+#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:111
+msgid "Annihilated."
+msgstr "全滅された。"
+
+#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:113
+msgid "Looks like you got your head handed to you."
+msgstr "相手から自分の頭が渡されたみたい。"
+
+#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:115
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr "もう一回倒された、水道管から死体を這ってみた後、新体を受け取ってみて"
+
+#: src/net/manaserv/beinghandler.cpp:323
+#, fuzzy
+msgid "Press OK to respawn."
+msgstr " OKを押すと、復活させる。"
+
+#: src/net/manaserv/beinghandler.cpp:324
+#, fuzzy
+msgid "You Died"
+msgstr "死んじゃった。"
+
+#: src/net/manaserv/charhandler.cpp:138 src/net/manaserv/charhandler.cpp:209
+#, fuzzy
+msgid "Not logged in."
+msgstr "既にサインインできた。"
+
+#: src/net/manaserv/charhandler.cpp:141
+msgid "No empty slot."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:144
+msgid "Invalid name."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:147
+#, fuzzy
+msgid "Character's name already exists."
+msgstr "ユーザーネームは既に存在している。"
+
+#: src/net/manaserv/charhandler.cpp:150
+msgid "Invalid hairstyle."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:153
+msgid "Invalid hair color."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:156
+msgid "Invalid gender."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:159
+#, fuzzy
+msgid "Character's stats are too high."
+msgstr "キャラクターの能力ポイント配分量は問題ありません。"
+
+#: src/net/manaserv/charhandler.cpp:162
+#, fuzzy
+msgid "Character's stats are too low."
+msgstr "キャラクターの能力ポイント配分量は問題ありません。"
+
+#: src/net/manaserv/charhandler.cpp:165
+#, c-format
+msgid "At least one statis out of the permitted range: (%u - %u)."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:171 src/net/manaserv/loginhandler.cpp:96
+#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
+#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
+#: src/net/tmwa/loginhandler.cpp:95 src/net/tmwa/loginhandler.cpp:182
+#, fuzzy
+msgid "Unknown error."
+msgstr "不明エラー"
+
+#: src/net/manaserv/charhandler.cpp:200 src/net/tmwa/charserverhandler.cpp:146
+msgid "Info"
+msgstr "情報"
+
+#: src/net/manaserv/charhandler.cpp:200
+#, fuzzy
+msgid "Player deleted."
+msgstr "キャラクターを削除した。"
+
+#: src/net/manaserv/charhandler.cpp:212
+#, fuzzy
+msgid "Selection out of range."
+msgstr "交換するアイテムの量を選択してください。"
+
+#: src/net/manaserv/charhandler.cpp:215
+#, fuzzy, c-format
+msgid "Unknown error (%d)."
+msgstr "不明エラー"
+
+#: src/net/manaserv/charhandler.cpp:250
+msgid "No gameservers are available."
+msgstr "全サーバは現在フールである。"
+
+#: src/net/manaserv/chathandler.cpp:187 src/net/manaserv/chathandler.cpp:313
+#: src/net/manaserv/guildhandler.cpp:260
+#, c-format
+msgid "Topic: %s"
+msgstr "トピック：%s"
+
+#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:274
+#, fuzzy
+msgid "Players in this channel:"
+msgstr "プレイヤーがモンスターをアタックした時"
+
+#: src/net/manaserv/chathandler.cpp:208
+#, fuzzy
+msgid "Error joining channel."
+msgstr "コマンド: /join ＜チャンネル＞"
+
+#: src/net/manaserv/chathandler.cpp:214
+#, fuzzy
+msgid "Listing channels."
+msgstr "%sというチャンネルへの参加を要求しています。"
+
+#: src/net/manaserv/chathandler.cpp:226
+msgid "End of channel list."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:303
+#, fuzzy, c-format
+msgid "%s entered the channel."
+msgstr "%sがパーティに参加した。"
+
+#: src/net/manaserv/chathandler.cpp:308
+#, c-format
+msgid "%s left the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:324
+#, c-format
+msgid "%s has set mode %s on user %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:334
+#, c-format
+msgid "%s has kicked %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:339
+#, fuzzy
+msgid "Unknown channel event."
+msgstr "不明なコマンド"
+
+#: src/net/manaserv/guildhandler.cpp:82
+msgid "Guild created."
+msgstr "ギルド作成成功"
+
+#: src/net/manaserv/guildhandler.cpp:87
+msgid "Error creating guild."
+msgstr "ギルド作成エラー"
+
+#: src/net/manaserv/guildhandler.cpp:97
+msgid "Invite sent."
+msgstr "招待送信成功"
+
+#: src/net/manaserv/guildhandler.cpp:204
+msgid "Member was promoted successfully."
+msgstr "本メンバーが無事に昇進された。"
+
+#: src/net/manaserv/guildhandler.cpp:209
+msgid "Failed to promote member."
+msgstr "メンバー昇進失敗"
+
+#: src/net/manaserv/loginhandler.cpp:87
+#, fuzzy
+msgid "Wrong magic_token."
+msgstr "違うmagic_token"
+
+#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
+#, fuzzy
+msgid "Already logged in."
+msgstr "既にサインインできた。"
+
+#: src/net/manaserv/loginhandler.cpp:93
+#, fuzzy
+msgid "Account banned."
+msgstr "アカウントの有効期限が切られた。"
+
+#: src/net/manaserv/loginhandler.cpp:118
+#, fuzzy
+msgid "New password incorrect."
+msgstr "新パスワードが間違っている。"
+
+#: src/net/manaserv/loginhandler.cpp:121 src/net/tmwa/loginhandler.cpp:89
+#, fuzzy
+msgid "Old password incorrect."
+msgstr "旧パスワードが間違っている。"
+
+#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
+msgid "Account not connected. Please login first."
+msgstr "アカウントが接続されていない。最初にログインしてください。"
+
+#: src/net/manaserv/loginhandler.cpp:149
+#, fuzzy
+msgid "New email address incorrect."
+msgstr "新メールアドが間違っている。"
+
+#: src/net/manaserv/loginhandler.cpp:152
+#, fuzzy
+msgid "Old email address incorrect."
+msgstr "旧メールアドが間違っている。"
+
+#: src/net/manaserv/loginhandler.cpp:158
+#, fuzzy
+msgid "The new email address already exists."
+msgstr "新メールアドがもう存在している。"
+
+#: src/net/manaserv/loginhandler.cpp:239
+msgid ""
+"Client registration is not allowed. Please contact server administration."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
+#, fuzzy
+msgid "Client version is too old."
+msgstr "アプリケーションバージョンが古すぎる。"
+
+#: src/net/manaserv/loginhandler.cpp:266
+#, fuzzy
+msgid "Wrong username or password."
+msgstr "ユーザ名かパスワードが間違ってる。"
+
+#: src/net/manaserv/loginhandler.cpp:272
+#, fuzzy
+msgid "Account banned"
+msgstr "アカウントの有効期限が切られた。"
+
+#: src/net/manaserv/loginhandler.cpp:275
+msgid "Login attempt too soon after previous attempt."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:303
+#, fuzzy
+msgid "Wrong username, password or email address."
+msgstr "ユーザ名、パスワードかメールアドが間違ってる。"
+
+#: src/net/manaserv/loginhandler.cpp:306
+#, fuzzy
+msgid "Username already exists."
+msgstr "ユーザーネームは既に存在している。"
+
+#: src/net/manaserv/loginhandler.cpp:309
+#, fuzzy
+msgid "Email address already exists."
+msgstr "メールアドは既に存在します。"
+
+#: src/net/manaserv/loginhandler.cpp:312
+msgid "You took too long with the captcha or your response was incorrect."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:87
+msgid "Joined party."
+msgstr "パーティに参加した。"
+
+#: src/net/manaserv/partyhandler.cpp:105
+#, c-format
+msgid "%s joined the party."
+msgstr "%sがパーティに参加した。"
+
+#: src/net/manaserv/partyhandler.cpp:123
+#, fuzzy, c-format
+msgid "%s rejected your invite."
+msgstr "%sは招待を拒んだ。"
+
+#: src/net/manaserv/tradehandler.cpp:95
+msgid "Accepting incoming trade requests."
+msgstr "取引要求を受け取り中"
+
+#: src/net/manaserv/tradehandler.cpp:97
+msgid "Ignoring incoming trade requests."
+msgstr "取引要求を無視にしている。"
+
+#: src/net/manaserv/tradehandler.cpp:115 src/net/tmwa/tradehandler.cpp:109
+msgid "Request for Trade"
+msgstr "取引要求"
+
+#: src/net/manaserv/tradehandler.cpp:116 src/net/tmwa/tradehandler.cpp:110
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
+msgstr "%sはあなたと取引したいみたいが、応じる？"
+
+#: src/net/manaserv/tradehandler.cpp:134
+#, c-format
+msgid "Trading with %s"
+msgstr "%sと取引中"
+
+#: src/net/manaserv/tradehandler.cpp:148 src/net/tmwa/tradehandler.cpp:224
+msgid "Trade canceled."
+msgstr "取引中止"
+
+#: src/net/manaserv/tradehandler.cpp:155 src/net/tmwa/tradehandler.cpp:231
+msgid "Trade completed."
+msgstr "取引完了"
+
+#: src/net/tmwa/adminhandler.cpp:64
 msgid "Kick failed!"
 msgstr "キック失敗"
 
-#: src/net/ea/adminhandler.cpp:65
+#: src/net/tmwa/adminhandler.cpp:66
 msgid "Kick succeeded!"
 msgstr "キック成功"
 
-#: src/net/ea/buysellhandler.cpp:110
+#: src/net/tmwa/buysellhandler.cpp:109
 msgid "Nothing to sell."
 msgstr "売り物がございません。"
 
-#: src/net/ea/buysellhandler.cpp:117
+#: src/net/tmwa/buysellhandler.cpp:116
 msgid "Thanks for buying."
 msgstr "買ってくださり、ありがとうございました。"
 
-#: src/net/ea/buysellhandler.cpp:124
+#: src/net/tmwa/buysellhandler.cpp:123
 msgid "Unable to buy."
 msgstr "購買不可能"
 
-#: src/net/ea/buysellhandler.cpp:130
+#: src/net/tmwa/buysellhandler.cpp:129
 msgid "Thanks for selling."
 msgstr "売ってくださり、ありがとうございました。"
 
-#: src/net/ea/buysellhandler.cpp:132
+#: src/net/tmwa/buysellhandler.cpp:131
 msgid "Unable to sell."
 msgstr "売ること不可能"
 
-#: src/net/ea/charserverhandler.cpp:103
-#, fuzzy
-msgid "Access denied."
-msgstr "アクセス拒否"
+#: src/net/tmwa/charserverhandler.cpp:103
+msgid "Access denied. Most likely, there are too many players on this server."
+msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:106
+#: src/net/tmwa/charserverhandler.cpp:107
 #, fuzzy
 msgid "Cannot use this ID."
 msgstr "ID使用不可"
 
-#: src/net/ea/charserverhandler.cpp:109
+#: src/net/tmwa/charserverhandler.cpp:110
 #, fuzzy
-msgid "Unknown failure to select character."
-msgstr "キャラクター選択時、不明なエラーが発生した。"
+msgid "Unknown char-server failure."
+msgstr "不明エラー"
 
-#: src/net/ea/charserverhandler.cpp:135
+#: src/net/tmwa/charserverhandler.cpp:134
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr "キャラクター作成失敗。本名はのう使われている。"
 
-#: src/net/ea/charserverhandler.cpp:147 src/net/manaserv/charhandler.cpp:187
-msgid "Info"
-msgstr "情報"
-
-#: src/net/ea/charserverhandler.cpp:147
+#: src/net/tmwa/charserverhandler.cpp:146
 msgid "Character deleted."
 msgstr "キャラクターを削除した。"
 
-#: src/net/ea/charserverhandler.cpp:152
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Failed to delete character."
 msgstr "キャラ削除失敗"
 
-#: src/net/ea/charserverhandler.cpp:237 src/net/manaserv/charhandler.cpp:263
+#: src/net/tmwa/charserverhandler.cpp:266
 msgid "Strength:"
 msgstr "筋力:"
 
-#: src/net/ea/charserverhandler.cpp:238 src/net/manaserv/charhandler.cpp:264
+#: src/net/tmwa/charserverhandler.cpp:267
 msgid "Agility:"
 msgstr "素早さ:"
 
-#: src/net/ea/charserverhandler.cpp:239 src/net/manaserv/charhandler.cpp:266
+#: src/net/tmwa/charserverhandler.cpp:268
 msgid "Vitality:"
 msgstr "体力:"
 
-#: src/net/ea/charserverhandler.cpp:240 src/net/manaserv/charhandler.cpp:267
+#: src/net/tmwa/charserverhandler.cpp:269
 msgid "Intelligence:"
 msgstr "知性:"
 
-#: src/net/ea/charserverhandler.cpp:241 src/net/manaserv/charhandler.cpp:265
+#: src/net/tmwa/charserverhandler.cpp:270
 msgid "Dexterity:"
 msgstr "敏捷:"
 
-#: src/net/ea/charserverhandler.cpp:242
+#: src/net/tmwa/charserverhandler.cpp:271
 msgid "Luck:"
 msgstr "運:"
 
-#: src/net/ea/chathandler.cpp:80
-msgid "Whisper could not be sent, user is offline."
+#: src/net/tmwa/chathandler.cpp:87
+#, fuzzy, c-format
+msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 "プライベートなメッセージが送れなかった、相手ユーザーがオフライン状態である。"
 
-#: src/net/ea/chathandler.cpp:84
-msgid "Whisper could not be sent, ignored by user."
+#: src/net/tmwa/chathandler.cpp:96
+#, fuzzy, c-format
+msgid "Whisper could not be sent, ignored by %s."
 msgstr "プライベートなメッセージが送れなかった、ユーザに無視された。"
 
-#: src/net/ea/chathandler.cpp:171
+#: src/net/tmwa/chathandler.cpp:230
 #, fuzzy
 msgid "MVP player."
 msgstr "プレイヤー"
 
-#: src/net/ea/chathandler.cpp:204 src/net/ea/chathandler.cpp:210
-#: src/net/ea/chathandler.cpp:215 src/net/ea/chathandler.cpp:220
-#: src/net/ea/chathandler.cpp:225 src/net/ea/chathandler.cpp:230
-#: src/net/ea/chathandler.cpp:235 src/net/ea/chathandler.cpp:240
+#: src/net/tmwa/chathandler.cpp:265 src/net/tmwa/chathandler.cpp:271
+#: src/net/tmwa/chathandler.cpp:276 src/net/tmwa/chathandler.cpp:281
+#: src/net/tmwa/chathandler.cpp:286 src/net/tmwa/chathandler.cpp:291
+#: src/net/tmwa/chathandler.cpp:296 src/net/tmwa/chathandler.cpp:301
 msgid "Channels are not supported!"
 msgstr "チャンネルはサポートされていない。"
 
-#: src/net/ea/gamehandler.cpp:86
+#: src/net/tmwa/gamehandler.cpp:88
 #, c-format
 msgid "Online users: %d"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:100
+#: src/net/tmwa/gamehandler.cpp:101
 #, fuzzy
 msgid "Game"
 msgstr "名前"
 
-#: src/net/ea/gamehandler.cpp:100
+#: src/net/tmwa/gamehandler.cpp:101
 #, fuzzy
 msgid "Request to quit denied!"
 msgstr "取引要求"
 
-#: src/net/ea/generalhandler.cpp:102 src/net/manaserv/generalhandler.cpp:95
+#: src/net/tmwa/generalhandler.cpp:102
 #, c-format
 msgid "Strength %+d"
 msgstr "強さ %+d"
 
-#: src/net/ea/generalhandler.cpp:103 src/net/manaserv/generalhandler.cpp:96
+#: src/net/tmwa/generalhandler.cpp:103
 #, c-format
 msgid "Agility %+d"
 msgstr "俊敏さ%+d"
 
-#: src/net/ea/generalhandler.cpp:104 src/net/manaserv/generalhandler.cpp:98
+#: src/net/tmwa/generalhandler.cpp:104
 #, c-format
 msgid "Vitality %+d"
 msgstr "活力 %+d"
 
-#: src/net/ea/generalhandler.cpp:105 src/net/manaserv/generalhandler.cpp:99
+#: src/net/tmwa/generalhandler.cpp:105
 #, c-format
 msgid "Intelligence %+d"
 msgstr "知能 %+d"
 
-#: src/net/ea/generalhandler.cpp:106 src/net/manaserv/generalhandler.cpp:97
+#: src/net/tmwa/generalhandler.cpp:106
 #, c-format
 msgid "Dexterity %+d"
 msgstr "正確さ %+d"
 
-#: src/net/ea/generalhandler.cpp:107
+#: src/net/tmwa/generalhandler.cpp:107
 #, c-format
 msgid "Luck %+d"
 msgstr "運 %+d"
 
-#: src/net/ea/generalhandler.cpp:130
+#: src/net/tmwa/generalhandler.cpp:132
 #, fuzzy
 msgid "Authentication failed."
 msgstr "認証失敗"
 
-#: src/net/ea/generalhandler.cpp:133
+#: src/net/tmwa/generalhandler.cpp:135
 #, fuzzy
 msgid "No servers available."
 msgstr "どんなサーバでも使用不可"
 
-#: src/net/ea/generalhandler.cpp:137
+#: src/net/tmwa/generalhandler.cpp:139
 #, fuzzy
 msgid "Someone else is trying to use this account."
 msgstr "他人が本アカウントを使用してみている。"
 
-#: src/net/ea/generalhandler.cpp:140
+#: src/net/tmwa/generalhandler.cpp:142
 #, fuzzy
 msgid "This account is already logged in."
 msgstr "本アカウントはもうオンライン中。"
 
-#: src/net/ea/generalhandler.cpp:143
+#: src/net/tmwa/generalhandler.cpp:145
 #, fuzzy
 msgid "Speed hack detected."
 msgstr "スピードハック発見"
 
-#: src/net/ea/generalhandler.cpp:146
+#: src/net/tmwa/generalhandler.cpp:148
 #, fuzzy
 msgid "Duplicated login."
 msgstr "重複ログイン"
 
-#: src/net/ea/generalhandler.cpp:149
+#: src/net/tmwa/generalhandler.cpp:151
 #, fuzzy
 msgid "Unknown connection error."
 msgstr "不明な接続エラー"
 
-#: src/net/ea/generalhandler.cpp:205
+#: src/net/tmwa/generalhandler.cpp:209
 msgid "Got disconnected from server!"
 msgstr "サーバーから切断された。"
 
-#: src/net/ea/generalhandler.cpp:216 src/net/manaserv/generalhandler.cpp:166
+#: src/net/tmwa/generalhandler.cpp:230
 msgid "Strength"
 msgstr "強さ"
 
-#: src/net/ea/generalhandler.cpp:217 src/net/manaserv/generalhandler.cpp:167
+#: src/net/tmwa/generalhandler.cpp:231
 msgid "Agility"
 msgstr "素早さ"
 
-#: src/net/ea/generalhandler.cpp:218 src/net/manaserv/generalhandler.cpp:169
+#: src/net/tmwa/generalhandler.cpp:232
 msgid "Vitality"
 msgstr "活力"
 
-#: src/net/ea/generalhandler.cpp:219 src/net/manaserv/generalhandler.cpp:170
+#: src/net/tmwa/generalhandler.cpp:233
 msgid "Intelligence"
 msgstr "知能"
 
-#: src/net/ea/generalhandler.cpp:220 src/net/manaserv/generalhandler.cpp:168
+#: src/net/tmwa/generalhandler.cpp:234
 msgid "Dexterity"
 msgstr "器用さ"
 
-#: src/net/ea/generalhandler.cpp:221
+#: src/net/tmwa/generalhandler.cpp:235
 msgid "Luck"
 msgstr "運"
 
-#: src/net/ea/generalhandler.cpp:224
+#: src/net/tmwa/generalhandler.cpp:238
 #, fuzzy
 msgid "Defense"
 msgstr "防御力:"
 
-#: src/net/ea/generalhandler.cpp:225
+#: src/net/tmwa/generalhandler.cpp:239
 #, fuzzy
 msgid "M.Attack"
 msgstr "魔法攻撃力:"
 
-#: src/net/ea/generalhandler.cpp:226
+#: src/net/tmwa/generalhandler.cpp:240
 #, fuzzy
 msgid "M.Defense"
 msgstr "魔法防御力:"
 
-#: src/net/ea/generalhandler.cpp:227
+#: src/net/tmwa/generalhandler.cpp:241
 #, fuzzy, c-format
 msgid "% Accuracy"
 msgstr "命中率(%):"
 
-#: src/net/ea/generalhandler.cpp:228
+#: src/net/tmwa/generalhandler.cpp:242
 #, fuzzy, c-format
 msgid "% Evade"
 msgstr "回避率(%):"
 
-#: src/net/ea/generalhandler.cpp:229
+#: src/net/tmwa/generalhandler.cpp:243
 #, fuzzy, c-format
 msgid "% Critical"
 msgstr "クリティカルヒット"
 
-#: src/net/ea/gui/guildtab.cpp:61 src/net/ea/gui/partytab.cpp:59
+#: src/net/tmwa/gui/guildtab.cpp:45
+msgid "Guild"
+msgstr "ギルド"
+
+#: src/net/tmwa/gui/guildtab.cpp:61 src/net/tmwa/gui/partytab.cpp:59
 msgid "/help > Display this help."
 msgstr "/helpでこのヘルプを表示する。"
 
-#: src/net/ea/gui/guildtab.cpp:62
+#: src/net/tmwa/gui/guildtab.cpp:62
 #, fuzzy
 msgid "/invite > Invite a player to your guild"
 msgstr "/inviteでパーティにプレーヤーを招待する。"
 
-#: src/net/ea/gui/guildtab.cpp:63
+#: src/net/tmwa/gui/guildtab.cpp:63
 #, fuzzy
 msgid "/leave > Leave the guild you are in"
 msgstr "/leaveで既存のパーティから離れる。"
 
-#: src/net/ea/gui/guildtab.cpp:64
+#: src/net/tmwa/gui/guildtab.cpp:64
 #, fuzzy
 msgid "/kick > Kick some one from the guild you are in"
 msgstr "/kickで既存のパーティから一人を追い出してみる。"
 
-#: src/net/ea/gui/guildtab.cpp:73 src/net/ea/gui/partytab.cpp:73
+#: src/net/tmwa/gui/guildtab.cpp:73 src/net/tmwa/gui/partytab.cpp:73
 msgid "Command: /invite <nick>"
 msgstr "コマンド: /invite ＜プレイヤー名＞"
 
-#: src/net/ea/gui/guildtab.cpp:74
+#: src/net/tmwa/gui/guildtab.cpp:74
 #, fuzzy
 msgid "This command invites <nick> to the guild you're in."
 msgstr "このコマンドでは、入力したプレイヤーを自分のパーティーに招待します。"
 
-#: src/net/ea/gui/guildtab.cpp:80 src/net/ea/gui/partytab.cpp:80
+#: src/net/tmwa/gui/guildtab.cpp:80 src/net/tmwa/gui/partytab.cpp:80
 msgid "Command: /leave"
 msgstr "コマンド: /leave"
 
-#: src/net/ea/gui/guildtab.cpp:81
+#: src/net/tmwa/gui/guildtab.cpp:81
 #, fuzzy
 msgid "This command causes the player to leave the guild."
 msgstr "本コマンドではパティからプレイヤーを追い出させる。"
 
-#: src/net/ea/gui/guildtab.cpp:89
+#: src/net/tmwa/gui/guildtab.cpp:89
 #, fuzzy
 msgid "Guild name is missing."
 msgstr "パーティ名がない。"
 
-#: src/net/ea/guildhandler.cpp:293
+#: src/net/tmwa/guildhandler.cpp:296
 msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:298
+#: src/net/tmwa/guildhandler.cpp:301
 msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:303
+#: src/net/tmwa/guildhandler.cpp:306
 #, fuzzy
 msgid "User is now part of your guild."
 msgstr "%sは今からパーティのメンバーになった。"
 
-#: src/net/ea/guildhandler.cpp:308
+#: src/net/tmwa/guildhandler.cpp:311
 msgid "Your guild is full."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:313
+#: src/net/tmwa/guildhandler.cpp:316
 #, fuzzy
 msgid "Unknown guild invite response."
 msgstr "%sからの未知招待返信"
 
-#: src/net/ea/guildhandler.cpp:390
+#: src/net/tmwa/guildhandler.cpp:393
 msgid "Guild creation isn't supported yet."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:60
+#: src/net/tmwa/gui/partytab.cpp:43
+msgid "Party"
+msgstr "パーティー"
+
+#: src/net/tmwa/gui/partytab.cpp:60
 msgid "/invite > Invite a player to your party"
 msgstr "/inviteでパーティにプレーヤーを招待する。"
 
-#: src/net/ea/gui/partytab.cpp:61
+#: src/net/tmwa/gui/partytab.cpp:61
 msgid "/leave > Leave the party you are in"
 msgstr "/leaveで既存のパーティから離れる。"
 
-#: src/net/ea/gui/partytab.cpp:62
+#: src/net/tmwa/gui/partytab.cpp:62
 msgid "/kick > Kick some one from the party you are in"
 msgstr "/kickで既存のパーティから一人を追い出してみる。"
 
-#: src/net/ea/gui/partytab.cpp:63
+#: src/net/tmwa/gui/partytab.cpp:63
 msgid "/item > Show/change party item sharing options"
 msgstr "/item でパーティ内のアイテムシェアモードを表示および変更する。"
 
-#: src/net/ea/gui/partytab.cpp:64
+#: src/net/tmwa/gui/partytab.cpp:64
 msgid "/exp > Show/change party experience sharing options"
 msgstr "/exp でパーティ内の経験分割モードを表示および変更する。"
 
-#: src/net/ea/gui/partytab.cpp:81
+#: src/net/tmwa/gui/partytab.cpp:81
 msgid "This command causes the player to leave the party."
 msgstr "本コマンドではパティからプレイヤーを追い出させる。"
 
-#: src/net/ea/gui/partytab.cpp:85
+#: src/net/tmwa/gui/partytab.cpp:85
 msgid "Command: /item <policy>"
 msgstr "コマンド: /item <ポリシ>"
 
-#: src/net/ea/gui/partytab.cpp:86
+#: src/net/tmwa/gui/partytab.cpp:86
 msgid "This command changes the party's item sharing policy."
 msgstr "本コマンドでは、アイテム共有モードを変更する。"
 
-#: src/net/ea/gui/partytab.cpp:87
+#: src/net/tmwa/gui/partytab.cpp:87
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
@@ -2972,23 +3183,23 @@ msgstr ""
 "＜ポリシ＞を有効するためには「１」、「yes」か「true」を設定ください。無効にす"
 "るために、「0」、「no」か「false」を設定ください。"
 
-#: src/net/ea/gui/partytab.cpp:90
+#: src/net/tmwa/gui/partytab.cpp:90
 msgid "Command: /item"
 msgstr "コマンド: /item"
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/tmwa/gui/partytab.cpp:91
 msgid "This command displays the party's current item sharing policy."
 msgstr "本コマンドでは、アイテム共有モードを表示する。"
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/tmwa/gui/partytab.cpp:95
 msgid "Command: /exp <policy>"
 msgstr "コマンド: /exp <ポリシ>"
 
-#: src/net/ea/gui/partytab.cpp:96
+#: src/net/tmwa/gui/partytab.cpp:96
 msgid "This command changes the party's experience sharing policy."
 msgstr "本コマンドでは、経験分割モードを変更する。"
 
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/tmwa/gui/partytab.cpp:97
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
@@ -2996,109 +3207,96 @@ msgstr ""
 "<ポリシ>を有効するためには、「1」、「yes」か「true」を設定ください。無効にす"
 "る場合、「0」、「no」か「false」を設定ください。"
 
-#: src/net/ea/gui/partytab.cpp:100
+#: src/net/tmwa/gui/partytab.cpp:100
 msgid "Command: /exp"
 msgstr "コマンド: /exp"
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/tmwa/gui/partytab.cpp:101
 msgid "This command displays the party's current experience sharing policy."
 msgstr "本コマンドでは、パーティメンバー以内の経験分割方針を表示する。"
 
-#: src/net/ea/gui/partytab.cpp:132 src/net/ea/partyhandler.cpp:198
+#: src/net/tmwa/gui/partytab.cpp:132 src/net/tmwa/partyhandler.cpp:196
 msgid "Item sharing enabled."
 msgstr "アイテムシェア有効"
 
-#: src/net/ea/gui/partytab.cpp:135 src/net/ea/partyhandler.cpp:204
+#: src/net/tmwa/gui/partytab.cpp:135 src/net/tmwa/partyhandler.cpp:202
 msgid "Item sharing disabled."
 msgstr "アイテムシェア無効"
 
-#: src/net/ea/gui/partytab.cpp:138 src/net/ea/partyhandler.cpp:210
+#: src/net/tmwa/gui/partytab.cpp:138 src/net/tmwa/partyhandler.cpp:208
 msgid "Item sharing not possible."
 msgstr "アイテムシェア不可能"
 
-#: src/net/ea/gui/partytab.cpp:141
+#: src/net/tmwa/gui/partytab.cpp:141
 #, fuzzy
 msgid "Item sharing unknown."
 msgstr "アイテムシェア有効"
 
-#: src/net/ea/gui/partytab.cpp:167 src/net/ea/partyhandler.cpp:174
+#: src/net/tmwa/gui/partytab.cpp:167 src/net/tmwa/partyhandler.cpp:172
 msgid "Experience sharing enabled."
 msgstr "経験シェア有効"
 
-#: src/net/ea/gui/partytab.cpp:170 src/net/ea/partyhandler.cpp:180
+#: src/net/tmwa/gui/partytab.cpp:170 src/net/tmwa/partyhandler.cpp:178
 msgid "Experience sharing disabled."
 msgstr "経験シェア無効"
 
-#: src/net/ea/gui/partytab.cpp:173 src/net/ea/partyhandler.cpp:186
+#: src/net/tmwa/gui/partytab.cpp:173 src/net/tmwa/partyhandler.cpp:184
 msgid "Experience sharing not possible."
 msgstr "経験シェア不可能"
 
-#: src/net/ea/gui/partytab.cpp:176
+#: src/net/tmwa/gui/partytab.cpp:176
 #, fuzzy
 msgid "Experience sharing unknown."
 msgstr "経験シェア有効"
 
-#: src/net/ea/inventoryhandler.cpp:281
+#: src/net/tmwa/inventoryhandler.cpp:285
 msgid "Failed to use item."
 msgstr "アイテム使用失敗"
 
-#: src/net/ea/inventoryhandler.cpp:391
+#: src/net/tmwa/inventoryhandler.cpp:399
 msgid "Unable to equip."
 msgstr "装備不可能"
 
-#: src/net/ea/inventoryhandler.cpp:402
+#: src/net/tmwa/inventoryhandler.cpp:410
 msgid "Unable to unequip."
 msgstr "装備を外すのは不可能。"
 
-#: src/net/ea/loginhandler.cpp:79
+#: src/net/tmwa/loginhandler.cpp:86
 msgid "Account was not found. Please re-login."
 msgstr "アカウントが見つからなかった。再ログインをください。"
 
-#: src/net/ea/loginhandler.cpp:82 src/net/manaserv/loginhandler.cpp:121
-#, fuzzy
-msgid "Old password incorrect."
-msgstr "旧パスワードが間違っている。"
-
-#: src/net/ea/loginhandler.cpp:85
+#: src/net/tmwa/loginhandler.cpp:92
 #, fuzzy
 msgid "New password too short."
 msgstr "新パスワードは短すぎている。"
 
-#: src/net/ea/loginhandler.cpp:88 src/net/ea/loginhandler.cpp:175
-#: src/net/manaserv/charhandler.cpp:158 src/net/manaserv/loginhandler.cpp:96
-#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
-#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
-#, fuzzy
-msgid "Unknown error."
-msgstr "不明エラー"
-
-#: src/net/ea/loginhandler.cpp:149
+#: src/net/tmwa/loginhandler.cpp:156
 #, fuzzy
 msgid "Unregistered ID."
 msgstr "登録されていないID"
 
-#: src/net/ea/loginhandler.cpp:152
+#: src/net/tmwa/loginhandler.cpp:159
 #, fuzzy
 msgid "Wrong password."
 msgstr "パースワードが間違っている。"
 
-#: src/net/ea/loginhandler.cpp:155
+#: src/net/tmwa/loginhandler.cpp:162
 #, fuzzy
 msgid "Account expired."
 msgstr "アカウントの有効期限が切られた。"
 
-#: src/net/ea/loginhandler.cpp:158
+#: src/net/tmwa/loginhandler.cpp:165
 #, fuzzy
 msgid "Rejected from server."
 msgstr "サーバからリジェクトされた。"
 
-#: src/net/ea/loginhandler.cpp:161
+#: src/net/tmwa/loginhandler.cpp:168
 #, fuzzy
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr "永久にゲームからバーンされた。ゲームマスターたちにご連絡ください。"
 
-#: src/net/ea/loginhandler.cpp:165
+#: src/net/tmwa/loginhandler.cpp:172
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -3107,666 +3305,514 @@ msgstr ""
 "あなたは%sまでゲームからバーンされた。\n"
 "ゲームマスターたちにご連絡ください。"
 
-#: src/net/ea/loginhandler.cpp:172
+#: src/net/tmwa/loginhandler.cpp:179
 #, fuzzy
 msgid "This user name is already taken."
 msgstr "本ユーザ名はもう使われている。"
 
-#: src/net/ea/network.cpp:145
+#: src/net/tmwa/network.cpp:145
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/ea/network.cpp:345
+#: src/net/tmwa/network.cpp:345
 #, fuzzy
 msgid "Unable to resolve host \""
 msgstr "売ること不可能"
 
-#: src/net/ea/network.cpp:414
+#: src/net/tmwa/network.cpp:414
 #, fuzzy
 msgid "Connection to server terminated. "
 msgstr "マップサーバと接続中…"
 
-#: src/net/ea/partyhandler.cpp:81
+#: src/net/tmwa/partyhandler.cpp:82
 msgid "Could not create party."
 msgstr "パーティ作成失敗"
 
-#: src/net/ea/partyhandler.cpp:84
+#: src/net/tmwa/partyhandler.cpp:84
 msgid "Party successfully created."
 msgstr "パーティ作成成功"
 
-#: src/net/ea/partyhandler.cpp:118
+#: src/net/tmwa/partyhandler.cpp:119
 #, c-format
 msgid "%s is already a member of a party."
 msgstr "%sはもうパーティのメンバーである。"
 
-#: src/net/ea/partyhandler.cpp:122
+#: src/net/tmwa/partyhandler.cpp:123
 #, c-format
 msgid "%s refused your invitation."
 msgstr "%sは招待を拒んだ。"
 
-#: src/net/ea/partyhandler.cpp:126
+#: src/net/tmwa/partyhandler.cpp:127
 #, c-format
 msgid "%s is now a member of your party."
 msgstr "%sは今からパーティのメンバーになった。"
 
-#: src/net/ea/partyhandler.cpp:130
+#: src/net/tmwa/partyhandler.cpp:131
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr "%sからの未知招待返信"
 
-#: src/net/ea/partyhandler.cpp:238
+#: src/net/tmwa/partyhandler.cpp:236
 msgid "You have left the party."
 msgstr "パーティから離れた。"
 
-#: src/net/ea/partyhandler.cpp:249
+#: src/net/tmwa/partyhandler.cpp:246
 #, c-format
 msgid "%s has left your party."
 msgstr "%sがパーティから離れた。"
 
-#: src/net/ea/partyhandler.cpp:301
+#: src/net/tmwa/partyhandler.cpp:299
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr "不明なメンバーが言おうとした事: %s"
 
-#: src/net/ea/partyhandler.cpp:329
-msgid "Inviting like this isn't supported at the moment."
-msgstr "このような招待することは現時点ではまたサポートされていない。"
+#: src/net/tmwa/partyhandler.cpp:335
+#, c-format
+msgid "Inviting failed, because you can't see a player called %s."
+msgstr ""
 
-#: src/net/ea/partyhandler.cpp:334
+#: src/net/tmwa/partyhandler.cpp:340
 msgid "You can only inivte when you are in a party!"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:365
+#: src/net/tmwa/partyhandler.cpp:368
 #, c-format
 msgid "%s is not in your party!"
 msgstr "%sはパーティにはいない！"
 
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:304
-msgid "You are dead."
-msgstr "あなたは死にました。"
-
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:305
-msgid "We regret to inform you that your character was killed in battle."
-msgstr "残念なお知らせですが、あなた様のキャラは戦闘中亡くなってしまいました。"
-
-#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:307
-msgid "You are not that alive anymore."
-msgstr "今から生きていない。"
-
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:308
-msgid "The cold hands of the grim reaper are grabbing for your soul."
-msgstr "死神の冷たい手に魂が取られてしまった。"
-
-#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:309
-msgid "Game Over!"
-msgstr "ゲームオーバー!"
-
-#: src/net/ea/playerhandler.cpp:105
+#: src/net/tmwa/playerhandler.cpp:100
 msgid "Insert coin to continue."
 msgstr "ゲームを続けるためにはコインを入れてください。"
 
-#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:310
-msgid ""
-"No, kids. Your character did not really die. It... err... went to a better "
-"place."
-msgstr ""
-"ううん、棒ややち。あなたのキャラは本当にしんでなかった。もっと綺麗なところに"
-"向かっただけ。"
-
-#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:312
-msgid ""
-"Your plan of breaking your enemies weapon by bashing it with your throat "
-"failed."
-msgstr "喉で的の武器を潰す予定だったが…失敗した。"
-
-#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:314
-msgid "I guess this did not run too well."
-msgstr "あんまり上手くいかなかったぜー"
-
-#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:315
-msgid "Do you want your possessions identified?"
-msgstr "持ち物を確定して欲しい？"
-
-#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:316
-msgid "Sadly, no trace of you was ever found..."
-msgstr "悲しさのあまり、痕跡でさえ見つからなかった。"
-
-#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:317
-msgid "Annihilated."
-msgstr "全滅された。"
-
-#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:318
-msgid "Looks like you got your head handed to you."
-msgstr "相手から自分の頭が渡されたみたい。"
-
-#: src/net/ea/playerhandler.cpp:120 src/net/manaserv/beinghandler.cpp:319
-msgid ""
-"You screwed up again, dump your body down the tubes and get you another one."
-msgstr "もう一回倒された、水道管から死体を這ってみた後、新体を受け取ってみて"
-
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/tmwa/playerhandler.cpp:118
 msgid "You're not dead yet. You're just resting."
 msgstr "まだ死ななかった。休憩中だけである。"
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/tmwa/playerhandler.cpp:119
 msgid "You are no more."
 msgstr "あなたはもう存在していない。"
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/tmwa/playerhandler.cpp:120
 msgid "You have ceased to be."
 msgstr "生きることなく、いなくなった。"
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/tmwa/playerhandler.cpp:121
 msgid "You've expired and gone to meet your maker."
 msgstr "あなたは息を引き取り、あなたを作った人へ逢いに行ってしまった。"
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/tmwa/playerhandler.cpp:122
 msgid "You're a stiff."
 msgstr "あなたは死体である。"
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/tmwa/playerhandler.cpp:123
 msgid "Bereft of life, you rest in peace."
 msgstr "命を失い、天国に向かった。"
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/tmwa/playerhandler.cpp:124
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 "もしあなたがそんなにも生気に満ちていなかったならば、死んで葬られていたんじゃ"
 "ないか？"
 
-#: src/net/ea/playerhandler.cpp:130
+#: src/net/tmwa/playerhandler.cpp:125
 msgid "Your metabolic processes are now history."
 msgstr "あなたのがんばりは今や歴史となったらしい。"
 
-#: src/net/ea/playerhandler.cpp:131
+#: src/net/tmwa/playerhandler.cpp:126
 msgid "You're off the twig."
 msgstr "クタバッタみたいな。"
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/tmwa/playerhandler.cpp:127
 msgid "You've kicked the bucket."
 msgstr "人間界から追い出された。"
 
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/tmwa/playerhandler.cpp:128
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr "最後の呼吸だった。死神に会った後、無と結合しちゃった。"
 
-#: src/net/ea/playerhandler.cpp:135
+#: src/net/tmwa/playerhandler.cpp:130
 msgid "You are an ex-player."
 msgstr "旧プレイヤーである。"
 
-#: src/net/ea/playerhandler.cpp:136
+#: src/net/tmwa/playerhandler.cpp:131
 msgid "You're pining for the fjords."
 msgstr "お前の魂は北極まで飛ばれた。"
 
-#: src/net/ea/playerhandler.cpp:249 src/net/ea/playerhandler.cpp:310
+#: src/net/tmwa/playerhandler.cpp:246 src/net/tmwa/playerhandler.cpp:285
 msgid "Message"
 msgstr "メッセージ"
 
-#: src/net/ea/playerhandler.cpp:250
+#: src/net/tmwa/playerhandler.cpp:247
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr "持っているアイテムは体重より半分以上なので、体力が回復できない。"
 
-#: src/net/ea/playerhandler.cpp:333
+#: src/net/tmwa/playerhandler.cpp:313
 #, fuzzy, c-format
 msgid "You picked up %s."
 msgstr "を拾った。 "
 
-#: src/net/ea/playerhandler.cpp:369
+#: src/net/tmwa/playerhandler.cpp:348
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:532
+#: src/net/tmwa/playerhandler.cpp:488
 msgid "Equip arrows first."
 msgstr "矢を先に装備してください。"
 
-#: src/net/ea/specialhandler.cpp:147
+#: src/net/tmwa/specialhandler.cpp:144
 msgid "Trade failed!"
 msgstr "取引失敗"
 
-#: src/net/ea/specialhandler.cpp:150
+#: src/net/tmwa/specialhandler.cpp:147
 msgid "Emote failed!"
 msgstr "スマイリー表示失敗"
 
-#: src/net/ea/specialhandler.cpp:153
+#: src/net/tmwa/specialhandler.cpp:150
 msgid "Sit failed!"
 msgstr "触ることが失敗した。"
 
-#: src/net/ea/specialhandler.cpp:156
+#: src/net/tmwa/specialhandler.cpp:153
 msgid "Chat creating failed!"
 msgstr "チャット作成失敗"
 
-#: src/net/ea/specialhandler.cpp:159
+#: src/net/tmwa/specialhandler.cpp:156
 msgid "Could not join party!"
 msgstr "パーティに参加できなかった！"
 
-#: src/net/ea/specialhandler.cpp:162
+#: src/net/tmwa/specialhandler.cpp:159
 msgid "Cannot shout!"
 msgstr "叫べない！"
 
-#: src/net/ea/specialhandler.cpp:171
+#: src/net/tmwa/specialhandler.cpp:168
 msgid "You have not yet reached a high enough lvl!"
 msgstr "あなたは十分で高いレベルにまだ達してないよ！"
 
-#: src/net/ea/specialhandler.cpp:174
+#: src/net/tmwa/specialhandler.cpp:171
 msgid "Insufficient HP!"
 msgstr "HP不足！"
 
-#: src/net/ea/specialhandler.cpp:177
+#: src/net/tmwa/specialhandler.cpp:174
 msgid "Insufficient SP!"
 msgstr "SP不足！"
 
-#: src/net/ea/specialhandler.cpp:180
+#: src/net/tmwa/specialhandler.cpp:177
 msgid "You have no memos!"
 msgstr "メモなし！"
 
-#: src/net/ea/specialhandler.cpp:183
+#: src/net/tmwa/specialhandler.cpp:180
 msgid "You cannot do that right now!"
 msgstr "今この行動は無理。"
 
-#: src/net/ea/specialhandler.cpp:186
+#: src/net/tmwa/specialhandler.cpp:183
 msgid "Seems you need more money... ;-)"
 msgstr "金欠みたいんじゃないか…"
 
-#: src/net/ea/specialhandler.cpp:189
+#: src/net/tmwa/specialhandler.cpp:186
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "本スキルがこの武器と使えない。"
 
-#: src/net/ea/specialhandler.cpp:192
+#: src/net/tmwa/specialhandler.cpp:189
 msgid "You need another red gem!"
 msgstr "他の赤宝石が必要となった！"
 
-#: src/net/ea/specialhandler.cpp:195
+#: src/net/tmwa/specialhandler.cpp:192
 msgid "You need another blue gem!"
 msgstr "他の青宝石が必要となった！"
 
-#: src/net/ea/specialhandler.cpp:198
+#: src/net/tmwa/specialhandler.cpp:195
 msgid "You're carrying to much to do this!"
 msgstr "アイテムが持ちすぎている状態！"
 
-#: src/net/ea/specialhandler.cpp:201
+#: src/net/tmwa/specialhandler.cpp:198
 msgid "Huh? What's that?"
 msgstr "うん？何それ？"
 
-#: src/net/ea/specialhandler.cpp:210
+#: src/net/tmwa/specialhandler.cpp:207
 msgid "Warp failed..."
 msgstr "ワープが失敗した。"
 
-#: src/net/ea/specialhandler.cpp:213
+#: src/net/tmwa/specialhandler.cpp:210
 msgid "Could not steal anything..."
 msgstr "何も盗めなかった…"
 
-#: src/net/ea/specialhandler.cpp:216
+#: src/net/tmwa/specialhandler.cpp:213
 msgid "Poison had no effect..."
 msgstr "毒は不効果"
 
-#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:116
-msgid "Request for Trade"
-msgstr "取引要求"
-
-#: src/net/ea/tradehandler.cpp:108 src/net/manaserv/tradehandler.cpp:117
-#, c-format
-msgid "%s wants to trade with you, do you accept?"
-msgstr "%sはあなたと取引したいみたいが、応じる？"
-
-#: src/net/ea/tradehandler.cpp:124
+#: src/net/tmwa/tradehandler.cpp:126
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr "取引は不可能。取引の相手は遠すぎる。"
 
-#: src/net/ea/tradehandler.cpp:128
+#: src/net/tmwa/tradehandler.cpp:130
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr "取引は不可能。本キャラが存在していない。"
 
-#: src/net/ea/tradehandler.cpp:132
+#: src/net/tmwa/tradehandler.cpp:134
 msgid "Trade cancelled due to an unknown reason."
 msgstr "不明な理由で取引が中止された。"
 
-#: src/net/ea/tradehandler.cpp:137
+#: src/net/tmwa/tradehandler.cpp:139
 #, c-format
 msgid "Trade: You and %s"
 msgstr "あなたと%sとの取引"
 
-#: src/net/ea/tradehandler.cpp:144
+#: src/net/tmwa/tradehandler.cpp:146
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr "%sとの取引が中止された。"
 
-#: src/net/ea/tradehandler.cpp:153
+#: src/net/tmwa/tradehandler.cpp:154
 msgid "Unhandled trade cancel packet."
 msgstr "できなかった取引キャンセルパケット"
 
-#: src/net/ea/tradehandler.cpp:202
+#: src/net/tmwa/tradehandler.cpp:202
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr "アイテム追加失敗。相手はアイテムを持ちすぎている状態である。"
 
-#: src/net/ea/tradehandler.cpp:207
+#: src/net/tmwa/tradehandler.cpp:207
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr "アイテム追加失敗。相手の空いているスロットはない。"
 
-#: src/net/ea/tradehandler.cpp:211
+#: src/net/tmwa/tradehandler.cpp:211
 msgid "Failed adding item for unknown reason."
 msgstr "不明な理由でアイテム追加失敗"
 
-#: src/net/ea/tradehandler.cpp:224 src/net/manaserv/tradehandler.cpp:149
-msgid "Trade canceled."
-msgstr "取引中止"
-
-#: src/net/ea/tradehandler.cpp:231 src/net/manaserv/tradehandler.cpp:156
-msgid "Trade completed."
-msgstr "取引完了"
-
-#: src/net/manaserv/beinghandler.cpp:324
-#, fuzzy
-msgid "Press OK to respawn."
-msgstr " OKを押すと、復活させる。"
-
-#: src/net/manaserv/beinghandler.cpp:325
+#: src/playerrelations.cpp:310
 #, fuzzy
-msgid "You Died"
-msgstr "死んじゃった。"
-
-#: src/net/manaserv/charhandler.cpp:128 src/net/manaserv/charhandler.cpp:196
-#, fuzzy
-msgid "Not logged in."
-msgstr "既にサインインできた。"
+msgid "Completely ignore"
+msgstr "@@Ignore|%sを完璧に無視する@@"
 
-#: src/net/manaserv/charhandler.cpp:131
-msgid "No empty slot."
+#: src/playerrelations.cpp:324
+msgid "Print '...'"
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:134
-msgid "Invalid name."
+#: src/playerrelations.cpp:340
+msgid "Blink name"
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:137
-#, fuzzy
-msgid "Character's name already exists."
-msgstr "ユーザーネームは既に存在している。"
-
-#: src/net/manaserv/charhandler.cpp:140
-msgid "Invalid hairstyle."
-msgstr ""
+#: src/resources/itemdb.cpp:44
+#, c-format
+msgid "Attack %+d"
+msgstr "攻撃力 %+d"
 
-#: src/net/manaserv/charhandler.cpp:143
-msgid "Invalid hair color."
-msgstr ""
+#: src/resources/itemdb.cpp:45
+#, c-format
+msgid "Defense %+d"
+msgstr "守備力 %+d"
 
-#: src/net/manaserv/charhandler.cpp:146
-msgid "Invalid gender."
-msgstr ""
+#: src/resources/itemdb.cpp:46
+#, c-format
+msgid "HP %+d"
+msgstr "HP %+d"
 
-#: src/net/manaserv/charhandler.cpp:149
-#, fuzzy
-msgid "Character's stats are too high."
-msgstr "キャラクターの能力ポイント配分量は問題ありません。"
+#: src/resources/itemdb.cpp:47
+#, c-format
+msgid "MP %+d"
+msgstr "MP %+d"
 
-#: src/net/manaserv/charhandler.cpp:152
-#, fuzzy
-msgid "Character's stats are too low."
-msgstr "キャラクターの能力ポイント配分量は問題ありません。"
+#: src/resources/itemdb.cpp:92
+msgid "Unknown item"
+msgstr "不明なアイテム"
 
-#: src/net/manaserv/charhandler.cpp:155
-msgid "One stat is zero."
-msgstr ""
+#: src/resources/itemdb.cpp:135 src/resources/monsterdb.cpp:77
+msgid "unnamed"
+msgstr "名前なし"
 
-#: src/net/manaserv/charhandler.cpp:187
-#, fuzzy
-msgid "Player deleted."
-msgstr "キャラクターを削除した。"
+#~ msgid "Text Shadow"
+#~ msgstr "文字の影"
 
-#: src/net/manaserv/charhandler.cpp:199
-#, fuzzy
-msgid "Selection out of range."
-msgstr "交換するアイテムの量を選択してください。"
+#~ msgid "Text Outline"
+#~ msgstr "文字の外線"
 
-#: src/net/manaserv/charhandler.cpp:202
-#, fuzzy, c-format
-msgid "Unknown error (%d)."
-msgstr "不明エラー"
+#~ msgid "Progress Bar Labels"
+#~ msgstr "進行状況バーのラベル"
 
-#: src/net/manaserv/charhandler.cpp:242
-msgid "No gameservers are available."
-msgstr "全サーバは現在フールである。"
+#~ msgid "Background"
+#~ msgstr "背景色"
 
-#: src/net/manaserv/charhandler.cpp:268
-msgid "Willpower:"
-msgstr "意志力"
+#~ msgid "Highlight"
+#~ msgstr "強調"
 
-#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
-#: src/net/manaserv/guildhandler.cpp:259
-#, c-format
-msgid "Topic: %s"
-msgstr "トピック：%s"
+#~ msgid "Tab Highlight"
+#~ msgstr "タブの強調"
 
-#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
 #, fuzzy
-msgid "Players in this channel:"
-msgstr "プレイヤーがモンスターをアタックした時"
+#~ msgid "Item Too Expensive"
+#~ msgstr "アイテムが買えない"
 
-#: src/net/manaserv/chathandler.cpp:201
 #, fuzzy
-msgid "Error joining channel."
-msgstr "コマンド: /join ＜チャンネル＞"
+#~ msgid "Item Is Equipped"
+#~ msgstr "アイテムが装備されている"
 
-#: src/net/manaserv/chathandler.cpp:207
-#, fuzzy
-msgid "Listing channels."
-msgstr "%sというチャンネルへの参加を要求しています。"
+#~ msgid "GM"
+#~ msgstr "ゲームマスター"
 
-#: src/net/manaserv/chathandler.cpp:219
-msgid "End of channel list."
-msgstr ""
+#~ msgid "Player"
+#~ msgstr "プレイヤー"
 
-#: src/net/manaserv/chathandler.cpp:291
-#, fuzzy, c-format
-msgid "%s entered the channel."
-msgstr "%sがパーティに参加した。"
+#~ msgid "Whisper"
+#~ msgstr "プライベートメッセージ"
 
-#: src/net/manaserv/chathandler.cpp:296
-#, c-format
-msgid "%s left the channel."
-msgstr ""
+#~ msgid "Is"
+#~ msgstr "等しい"
 
-#: src/net/manaserv/chathandler.cpp:312
-#, c-format
-msgid "%s has set mode %s on user %s."
-msgstr ""
+#~ msgid "Server"
+#~ msgstr "サーバ"
 
-#: src/net/manaserv/chathandler.cpp:322
-#, c-format
-msgid "%s has kicked %s."
-msgstr ""
+#~ msgid "Logger"
+#~ msgstr "ロガー"
 
-#: src/net/manaserv/chathandler.cpp:327
-#, fuzzy
-msgid "Unknown channel event."
-msgstr "不明なコマンド"
+#~ msgid "Hyperlink"
+#~ msgstr "ハイパーリンク"
 
-#: src/net/manaserv/generalhandler.cpp:100
-#, c-format
-msgid "Willpower %+d"
-msgstr "意志力 %+d"
+#~ msgid "Being"
+#~ msgstr "人"
 
-#: src/net/manaserv/generalhandler.cpp:171
-#, fuzzy
-msgid "Willpower"
-msgstr "意志力"
+#~ msgid "Other Players' Names"
+#~ msgstr "他のプレイヤー名"
 
-#: src/net/manaserv/guildhandler.cpp:81
-msgid "Guild created."
-msgstr "ギルド作成成功"
+#~ msgid "Own Name"
+#~ msgstr "自分の名前"
 
-#: src/net/manaserv/guildhandler.cpp:86
-msgid "Error creating guild."
-msgstr "ギルド作成エラー"
+#~ msgid "GM Names"
+#~ msgstr "ゲームマスター名"
 
-#: src/net/manaserv/guildhandler.cpp:96
-msgid "Invite sent."
-msgstr "招待送信成功"
+#~ msgid "NPCs"
+#~ msgstr "NPCたち"
 
-#: src/net/manaserv/guildhandler.cpp:203
-msgid "Member was promoted successfully."
-msgstr "本メンバーが無事に昇進された。"
+#~ msgid "Monsters"
+#~ msgstr "モンスター"
 
-#: src/net/manaserv/guildhandler.cpp:208
-msgid "Failed to promote member."
-msgstr "メンバー昇進失敗"
+#~ msgid "Unknown Item Type"
+#~ msgstr "不明なアイテムタイプ"
 
-#: src/net/manaserv/loginhandler.cpp:87
-#, fuzzy
-msgid "Wrong magic_token."
-msgstr "違うmagic_token"
+#~ msgid "Generics"
+#~ msgstr "非使用アイテム"
 
-#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
-#, fuzzy
-msgid "Already logged in."
-msgstr "既にサインインできた。"
+#~ msgid "Hats"
+#~ msgstr "帽子"
 
-#: src/net/manaserv/loginhandler.cpp:93 src/net/manaserv/loginhandler.cpp:272
-#, fuzzy
-msgid "Server is full."
-msgstr "サーバーが満席である。"
+#~ msgid "Usables"
+#~ msgstr "回復アイテム"
+
+#~ msgid "Shirts"
+#~ msgstr "シャツ"
 
-#: src/net/manaserv/loginhandler.cpp:118
 #, fuzzy
-msgid "New password incorrect."
-msgstr "新パスワードが間違っている。"
+#~ msgid "One Handed Weapons"
+#~ msgstr "武器１"
 
-#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
-msgid "Account not connected. Please login first."
-msgstr "アカウントが接続されていない。最初にログインしてください。"
+#~ msgid "Pants"
+#~ msgstr "ズボン"
 
-#: src/net/manaserv/loginhandler.cpp:149
-#, fuzzy
-msgid "New email address incorrect."
-msgstr "新メールアドが間違っている。"
+#~ msgid "Shoes"
+#~ msgstr "靴"
 
-#: src/net/manaserv/loginhandler.cpp:152
 #, fuzzy
-msgid "Old email address incorrect."
-msgstr "旧メールアドが間違っている。"
+#~ msgid "Two Handed Weapons"
+#~ msgstr "武器１"
 
-#: src/net/manaserv/loginhandler.cpp:158
-#, fuzzy
-msgid "The new email address already exists."
-msgstr "新メールアドがもう存在している。"
+#~ msgid "Shields"
+#~ msgstr "盾"
 
-#: src/net/manaserv/loginhandler.cpp:239
-msgid ""
-"Client registration is not allowed. Please contact server administration."
-msgstr ""
+#~ msgid "Rings"
+#~ msgstr "指輪"
 
-#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
-#, fuzzy
-msgid "Client version is too old."
-msgstr "アプリケーションバージョンが古すぎる。"
+#~ msgid "Necklaces"
+#~ msgstr "首飾り"
 
-#: src/net/manaserv/loginhandler.cpp:266
-#, fuzzy
-msgid "Wrong username or password."
-msgstr "ユーザ名かパスワードが間違ってる。"
+#~ msgid "Arms"
+#~ msgstr "腕パーツ"
 
-#: src/net/manaserv/loginhandler.cpp:275
-msgid "Login attempt too soon after previous attempt."
-msgstr ""
+#~ msgid "Ammo"
+#~ msgstr "矢、弾薬など"
 
-#: src/net/manaserv/loginhandler.cpp:303
-#, fuzzy
-msgid "Wrong username, password or email address."
-msgstr "ユーザ名、パスワードかメールアドが間違ってる。"
+#~ msgid "Particle Effects"
+#~ msgstr "特有の効果"
+
+#~ msgid "Pickup Notification"
+#~ msgstr "収集通知"
+
+#~ msgid "Exp Notification"
+#~ msgstr "経験値通知"
 
-#: src/net/manaserv/loginhandler.cpp:306
 #, fuzzy
-msgid "Username already exists."
-msgstr "ユーザーネームは既に存在している。"
+#~ msgid "Player Hits Monster"
+#~ msgstr "プレイヤーがモンスターをアタックした時"
 
-#: src/net/manaserv/loginhandler.cpp:309
 #, fuzzy
-msgid "Email address already exists."
-msgstr "メールアドは既に存在します。"
+#~ msgid "Monster Hits Player"
+#~ msgstr "モンスターがプレイヤーをアタックした時"
 
-#: src/net/manaserv/loginhandler.cpp:312
-msgid "You took too long with the captcha or your response was incorrect."
-msgstr ""
+#~ msgid "Critical Hit"
+#~ msgstr "クリティカルヒット"
 
-#: src/net/manaserv/partyhandler.cpp:88
-msgid "Joined party."
-msgstr "パーティに参加した。"
+#~ msgid "Misses"
+#~ msgstr "ミス"
 
-#: src/net/manaserv/partyhandler.cpp:106
-#, c-format
-msgid "%s joined the party."
-msgstr "%sがパーティに参加した。"
+#~ msgid "HP Bar"
+#~ msgstr "HPバー"
 
-#: src/net/manaserv/partyhandler.cpp:123
-#, fuzzy, c-format
-msgid "%s rejected your invite."
-msgstr "%sは招待を拒んだ。"
+#~ msgid "3/4 HP Bar"
+#~ msgstr "HPが3/4のとき"
 
-#: src/net/manaserv/tradehandler.cpp:96
-msgid "Accepting incoming trade requests."
-msgstr "取引要求を受け取り中"
+#~ msgid "1/2 HP Bar"
+#~ msgstr "HPが1/2のとき"
 
-#: src/net/manaserv/tradehandler.cpp:98
-msgid "Ignoring incoming trade requests."
-msgstr "取引要求を無視にしている。"
+#~ msgid "1/4 HP Bar"
+#~ msgstr "HPが1/4のとき"
 
-#: src/net/manaserv/tradehandler.cpp:135
-#, c-format
-msgid "Trading with %s"
-msgstr "%sと取引中"
+#, fuzzy
+#~ msgid "HP"
+#~ msgstr "HP:"
 
-#: src/playerrelations.cpp:304
 #, fuzzy
-msgid "Completely ignore"
-msgstr "@@Ignore|%sを完璧に無視する@@"
+#~ msgid "MP"
+#~ msgstr "MP:"
 
-#: src/playerrelations.cpp:318
-msgid "Print '...'"
-msgstr ""
+#, fuzzy
+#~ msgid "Exp"
+#~ msgstr "経験値:"
 
-#: src/playerrelations.cpp:334
-msgid "Blink name"
-msgstr ""
+#, fuzzy
+#~ msgid "Money"
+#~ msgstr "GP: %d"
 
-#: src/playerrelations.cpp:371
-msgid "Floating '...' bubble"
-msgstr ""
+#, fuzzy
+#~ msgid "Job"
+#~ msgstr "ジョブポイント:"
 
-#: src/playerrelations.cpp:374
-msgid "Floating bubble"
-msgstr ""
+#, fuzzy
+#~ msgid "Level"
+#~ msgstr "レベル: %d"
 
-#: src/resources/itemdb.cpp:52
-#, c-format
-msgid "Attack %+d"
-msgstr "攻撃力 %+d"
+#, fuzzy
+#~ msgid "Access denied."
+#~ msgstr "アクセス拒否"
 
-#: src/resources/itemdb.cpp:53
-#, c-format
-msgid "Defense %+d"
-msgstr "守備力 %+d"
+#, fuzzy
+#~ msgid "Unknown failure to select character."
+#~ msgstr "キャラクター選択時、不明なエラーが発生した。"
 
-#: src/resources/itemdb.cpp:54
-#, c-format
-msgid "HP %+d"
-msgstr "HP %+d"
+#~ msgid "Inviting like this isn't supported at the moment."
+#~ msgstr "このような招待することは現時点ではまたサポートされていない。"
 
-#: src/resources/itemdb.cpp:55
-#, c-format
-msgid "MP %+d"
-msgstr "MP %+d"
+#~ msgid "Willpower:"
+#~ msgstr "意志力"
 
-#: src/resources/itemdb.cpp:114
-msgid "Unknown item"
-msgstr "不明なアイテム"
+#~ msgid "Willpower %+d"
+#~ msgstr "意志力 %+d"
 
-#: src/resources/itemdb.cpp:158 src/resources/monsterdb.cpp:45
-#: src/resources/monsterdb.cpp:67
-msgid "unnamed"
-msgstr "名前なし"
+#, fuzzy
+#~ msgid "Willpower"
+#~ msgstr "意志力"
+
+#, fuzzy
+#~ msgid "Server is full."
+#~ msgstr "サーバーが満席である。"
 
 #~ msgid "no"
 #~ msgstr "いいえ"
diff --git a/po/ka.po b/po/ka.po
index 9d9b5c53..d110abc3 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2010-03-05 21:52+0100\n"
+"POT-Creation-Date: 2010-12-13 20:04+0100\n"
 "PO-Revision-Date: 2009-07-23 22:14+0000\n"
 "Last-Translator: Mpa4Hu <ymen9@pisem.net>\n"
 "Language-Team: Georgian <ka@li.org>\n"
+"Language: ka\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,436 +19,449 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/client.cpp:553 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:62
+#: src/client.cpp:598 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
 msgid "Setup"
 msgstr ""
 
-#: src/client.cpp:623
+#: src/client.cpp:679
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:650
+#: src/client.cpp:706
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:683
+#: src/client.cpp:739
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:739
+#: src/client.cpp:804
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:768
+#: src/client.cpp:833
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:799 src/client.cpp:806 src/client.cpp:940
+#: src/client.cpp:843
+msgid "Changing game servers"
+msgstr ""
+
+#: src/client.cpp:872 src/client.cpp:879 src/client.cpp:1014
 #: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
 #: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
-#: src/gui/serverdialog.cpp:261 src/gui/unregisterdialog.cpp:133
-#: src/net/ea/charserverhandler.cpp:135 src/net/ea/charserverhandler.cpp:152
-#: src/net/manaserv/charhandler.cpp:161 src/net/manaserv/charhandler.cpp:204
+#: src/gui/serverdialog.cpp:323 src/gui/unregisterdialog.cpp:133
+#: src/net/manaserv/charhandler.cpp:174 src/net/manaserv/charhandler.cpp:217
+#: src/net/tmwa/charserverhandler.cpp:134
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Error"
 msgstr ""
 
-#: src/client.cpp:815
+#: src/client.cpp:888
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:842
+#: src/client.cpp:915
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:843
+#: src/client.cpp:916
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:862
+#: src/client.cpp:935
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:863
+#: src/client.cpp:936
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:883
+#: src/client.cpp:956
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:884
+#: src/client.cpp:957
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1007 src/client.cpp:1030
+#: src/client.cpp:1138 src/client.cpp:1161
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1119
+#: src/client.cpp:1281
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1153 src/client.cpp:1159
+#: src/client.cpp:1315 src/client.cpp:1321
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/commandhandler.cpp:127 src/commandhandler.cpp:308
+#: src/commandhandler.cpp:131 src/commandhandler.cpp:317
 msgid "Unknown command."
 msgstr "უცნობი კომანდა."
 
-#: src/commandhandler.cpp:156
+#: src/commandhandler.cpp:160
 msgid "-- Help --"
 msgstr "-- დახმარება --"
 
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:161
 msgid "/help > Display this help"
 msgstr "/help > დახმარების გამოტანა"
 
-#: src/commandhandler.cpp:159
+#: src/commandhandler.cpp:163
 msgid "/where > Display map name"
 msgstr "/where > რუქის სახელის გამოტანა"
 
-#: src/commandhandler.cpp:160
+#: src/commandhandler.cpp:164
 msgid "/who > Display number of online users"
 msgstr "/who > ონლაინ მომხმარებლების რაოდენობა"
 
-#: src/commandhandler.cpp:161
+#: src/commandhandler.cpp:165
 msgid "/me > Tell something about yourself"
 msgstr "/me > მოყევით რამე თქვენს შესახებ"
 
-#: src/commandhandler.cpp:163
+#: src/commandhandler.cpp:167
 msgid "/clear > Clears this window"
 msgstr "/clear > ფანჯრის გასუფთავება"
 
-#: src/commandhandler.cpp:165
+#: src/commandhandler.cpp:169
 msgid "/msg > Send a private message to a user"
 msgstr "/msg > პრივატული მესიჯის გაგზავნა მომხმარებლისთვის"
 
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:170
 msgid "/whisper > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:167
+#: src/commandhandler.cpp:171
 msgid "/w > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:168
+#: src/commandhandler.cpp:172
 msgid "/query > Makes a tab for private messages with another user"
 msgstr ""
 
-#: src/commandhandler.cpp:169
+#: src/commandhandler.cpp:174
 msgid "/q > Alias of query"
 msgstr ""
 
-#: src/commandhandler.cpp:171
+#: src/commandhandler.cpp:176
 msgid "/ignore > ignore a player"
 msgstr ""
 
-#: src/commandhandler.cpp:172
+#: src/commandhandler.cpp:177
 msgid "/unignore > stop ignoring a player"
 msgstr ""
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:179
 msgid "/list > Display all public channels"
 msgstr ""
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:180
 msgid "/join > Join or create a channel"
 msgstr ""
 
-#: src/commandhandler.cpp:177
+#: src/commandhandler.cpp:182
 msgid "/createparty > Create a new party"
 msgstr ""
 
-#: src/commandhandler.cpp:178
+#: src/commandhandler.cpp:183
 msgid "/party > Invite a user to party"
 msgstr ""
 
-#: src/commandhandler.cpp:180
+#: src/commandhandler.cpp:185
 msgid "/record > Start recording the chat to an external file"
 msgstr ""
 
-#: src/commandhandler.cpp:181
+#: src/commandhandler.cpp:187
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr ""
 
-#: src/commandhandler.cpp:182
+#: src/commandhandler.cpp:189
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
 
-#: src/commandhandler.cpp:184
+#: src/commandhandler.cpp:192
 msgid "/announce > Global announcement (GM only)"
 msgstr ""
 
-#: src/commandhandler.cpp:188
+#: src/commandhandler.cpp:196
 msgid "For more information, type /help <command>."
 msgstr ""
 
-#: src/commandhandler.cpp:192
+#: src/commandhandler.cpp:200
 msgid "Command: /help"
 msgstr ""
 
-#: src/commandhandler.cpp:193
+#: src/commandhandler.cpp:201
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: src/commandhandler.cpp:194
+#: src/commandhandler.cpp:203
 msgid "Command: /help <command>"
 msgstr ""
 
-#: src/commandhandler.cpp:195
+#: src/commandhandler.cpp:204
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/commandhandler.cpp:203
+#: src/commandhandler.cpp:212
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: src/commandhandler.cpp:204
+#: src/commandhandler.cpp:213
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/commandhandler.cpp:205
+#: src/commandhandler.cpp:214
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:210
+#: src/commandhandler.cpp:219
 msgid "Command: /clear"
 msgstr ""
 
-#: src/commandhandler.cpp:211
+#: src/commandhandler.cpp:220
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:224
 msgid "Command: /ignore <player>"
 msgstr ""
 
-#: src/commandhandler.cpp:216
+#: src/commandhandler.cpp:225
 #, fuzzy
 msgid "This command ignores the given player regardless of current relations."
 msgstr "ამ კომანდას გამოაქ კონკრეტული რუქის სახელი"
 
-#: src/commandhandler.cpp:221
+#: src/commandhandler.cpp:230
 msgid "Command: /join <channel>"
 msgstr ""
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:231
 msgid "This command makes you enter <channel>."
 msgstr ""
 
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:232
 msgid "If <channel> doesn't exist, it's created."
 msgstr ""
 
-#: src/commandhandler.cpp:227
+#: src/commandhandler.cpp:236
 msgid "Command: /list"
 msgstr ""
 
-#: src/commandhandler.cpp:228
+#: src/commandhandler.cpp:237
 msgid "This command shows a list of all channels."
 msgstr ""
 
-#: src/commandhandler.cpp:232
+#: src/commandhandler.cpp:241
 msgid "Command: /me <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:233
+#: src/commandhandler.cpp:242
 msgid "This command tell others you are (doing) <msg>."
 msgstr ""
 
-#: src/commandhandler.cpp:237
+#: src/commandhandler.cpp:246
 msgid "Command: /msg <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:238
+#: src/commandhandler.cpp:247
 msgid "Command: /whisper <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:239
+#: src/commandhandler.cpp:248
 msgid "Command: /w <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:240
+#: src/commandhandler.cpp:249
 msgid "This command sends the text <message> to <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:241 src/commandhandler.cpp:260
+#: src/commandhandler.cpp:250 src/commandhandler.cpp:269
 #: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
-#: src/net/ea/gui/guildtab.cpp:75 src/net/ea/gui/partytab.cpp:75
+#: src/net/tmwa/gui/guildtab.cpp:75 src/net/tmwa/gui/partytab.cpp:75
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:255
 msgid "Command: /query <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:247
+#: src/commandhandler.cpp:256
 msgid "Command: /q <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:248
+#: src/commandhandler.cpp:257
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:253
+#: src/commandhandler.cpp:262
 msgid "Command: /createparty <name>"
 msgstr ""
 
-#: src/commandhandler.cpp:254
+#: src/commandhandler.cpp:263
 msgid "This command creates a new party called <name>."
 msgstr ""
 
-#: src/commandhandler.cpp:258
+#: src/commandhandler.cpp:267
 msgid "Command: /party <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:259 src/net/ea/gui/partytab.cpp:74
+#: src/commandhandler.cpp:268 src/net/tmwa/gui/partytab.cpp:74
 msgid "This command invites <nick> to party with you."
 msgstr ""
 
-#: src/commandhandler.cpp:265
+#: src/commandhandler.cpp:274
 msgid "Command: /present"
 msgstr ""
 
-#: src/commandhandler.cpp:266
+#: src/commandhandler.cpp:275
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: src/commandhandler.cpp:272
+#: src/commandhandler.cpp:281
 msgid "Command: /record <filename>"
 msgstr ""
 
-#: src/commandhandler.cpp:273
+#: src/commandhandler.cpp:282
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr ""
 
-#: src/commandhandler.cpp:275
+#: src/commandhandler.cpp:284
 msgid "Command: /record"
 msgstr ""
 
-#: src/commandhandler.cpp:276
+#: src/commandhandler.cpp:285
 msgid "This command finishes a recording session."
 msgstr ""
 
-#: src/commandhandler.cpp:280
+#: src/commandhandler.cpp:289
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: src/commandhandler.cpp:281
+#: src/commandhandler.cpp:290
 msgid ""
 "This command sets whether the return key should toggle the chat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: src/commandhandler.cpp:283
+#: src/commandhandler.cpp:292
 msgid ""
-"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
-"\", \"no\", \"false\" to turn the toggle off."
+"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
+"\"0\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: src/commandhandler.cpp:286
+#: src/commandhandler.cpp:295
 msgid "Command: /toggle"
 msgstr ""
 
-#: src/commandhandler.cpp:287
+#: src/commandhandler.cpp:296
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: src/commandhandler.cpp:291 src/gui/widgets/whispertab.cpp:93
+#: src/commandhandler.cpp:300 src/gui/widgets/whispertab.cpp:95
 msgid "Command: /unignore <player>"
 msgstr ""
 
-#: src/commandhandler.cpp:292
+#: src/commandhandler.cpp:301
 msgid "This command stops ignoring the given player if they are being ignored"
 msgstr ""
 
-#: src/commandhandler.cpp:297
+#: src/commandhandler.cpp:306
 msgid "Command: /where"
 msgstr ""
 
-#: src/commandhandler.cpp:298
+#: src/commandhandler.cpp:307
 msgid "This command displays the name of the current map."
 msgstr "ამ კომანდას გამოაქ კონკრეტული რუქის სახელი"
 
-#: src/commandhandler.cpp:302
+#: src/commandhandler.cpp:311
 msgid "Command: /who"
 msgstr ""
 
-#: src/commandhandler.cpp:303
+#: src/commandhandler.cpp:312
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:309
+#: src/commandhandler.cpp:318
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: src/commandhandler.cpp:375
+#: src/commandhandler.cpp:384
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:383
+#: src/commandhandler.cpp:392
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:397
+#: src/commandhandler.cpp:406
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:410 src/net/ea/gui/partytab.cpp:109
+#: src/commandhandler.cpp:419 src/net/tmwa/gui/partytab.cpp:109
 msgid "Party name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:423 src/commandhandler.cpp:471
-#: src/commandhandler.cpp:493
+#: src/commandhandler.cpp:432 src/commandhandler.cpp:509
+#: src/commandhandler.cpp:531
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:441
+#: src/commandhandler.cpp:450
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:441
+#: src/commandhandler.cpp:450
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:450
+#: src/commandhandler.cpp:459
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:454
+#: src/commandhandler.cpp:463
 msgid "Message now closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:477
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:489
+msgid "Show IP: On"
+msgstr ""
+
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:485
+msgid "Show IP: Off"
+msgstr ""
+
+#: src/commandhandler.cpp:515
 msgid "Player already ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:484
+#: src/commandhandler.cpp:522
 msgid "Player successfully ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:486
+#: src/commandhandler.cpp:524
 msgid "Player could not be ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:501
+#: src/commandhandler.cpp:539
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:506
+#: src/commandhandler.cpp:544
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:508
+#: src/commandhandler.cpp:546
 msgid "Player could not be unignored!"
 msgstr ""
 
@@ -460,40 +474,40 @@ msgstr ""
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:326
+#: src/game.cpp:342
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:331
+#: src/game.cpp:347
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:355
+#: src/game.cpp:378
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:360
+#: src/game.cpp:382
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:705
+#: src/game.cpp:721
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:712
+#: src/game.cpp:726
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:946
+#: src/game.cpp:954
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:947
+#: src/game.cpp:955
 #, c-format
 msgid "Error while loading %s"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:75
+#: src/gui/beingpopup.cpp:76
 #, c-format
 msgid "Party: %s"
 msgstr ""
@@ -502,34 +516,34 @@ msgstr ""
 msgid "Buy"
 msgstr ""
 
-#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
-#: src/gui/sell.cpp:276
+#: src/gui/buy.cpp:69 src/gui/buy.cpp:261 src/gui/sell.cpp:71
+#: src/gui/sell.cpp:288
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:99 src/gui/npcdialog.cpp:100
-#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:479
+#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:112 src/gui/npcdialog.cpp:124
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:463
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:98 src/gui/npcdialog.cpp:101
-#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:491
+#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:111 src/gui/npcdialog.cpp:125
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:475
 msgid "-"
 msgstr ""
 
 #: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
-#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:182
-#: src/keyboardconfig.cpp:103
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:228
+#: src/keyboardconfig.cpp:102
 msgid "Quit"
 msgstr ""
 
-#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:408
-#: src/gui/statuswindow.cpp:478 src/gui/statuswindow.cpp:512
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:384
+#: src/gui/statuswindow.cpp:462 src/gui/statuswindow.cpp:496
 msgid "Max"
 msgstr ""
 
@@ -543,11 +557,11 @@ msgstr ""
 
 #: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
 #: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
-#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:101
-#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:178
-#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:402
+#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:114
+#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:389
 #: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
-#: src/gui/socialwindow.cpp:242 src/gui/textdialog.cpp:39
+#: src/gui/socialwindow.cpp:275 src/gui/textdialog.cpp:40
 #: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr ""
@@ -584,7 +598,7 @@ msgstr ""
 msgid "Change Password"
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:53
+#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:55
 #: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
 msgid "Password:"
 msgstr ""
@@ -615,19 +629,19 @@ msgstr ""
 msgid "Create Character"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:52
+#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:54
 #: src/gui/register.cpp:67
 msgid "Name:"
 msgstr ""
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
 #: src/gui/outfitwindow.cpp:67
 msgid ">"
 msgstr ""
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
 #: src/gui/outfitwindow.cpp:66
@@ -642,8 +656,8 @@ msgstr ""
 msgid "Hair style:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:397
-#: src/gui/socialwindow.cpp:296
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:392
+#: src/gui/socialwindow.cpp:329
 msgid "Create"
 msgstr ""
 
@@ -698,33 +712,33 @@ msgstr ""
 msgid "Change Email"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:185
-#: src/gui/setup_players.cpp:230
+#: src/gui/charselectdialog.cpp:336 src/gui/serverdialog.cpp:231
+#: src/gui/setup_players.cpp:229
 msgid "Delete"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:387
+#: src/gui/charselectdialog.cpp:380
 msgid "Choose"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:399 src/gui/charselectdialog.cpp:400
+#: src/gui/charselectdialog.cpp:394 src/gui/charselectdialog.cpp:395
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:77 src/gui/palette.cpp:96
+#: src/gui/chat.cpp:88
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chat.cpp:287
+#: src/gui/chat.cpp:311
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:305
+#: src/gui/chat.cpp:329
 msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:469
+#: src/gui/chat.cpp:493
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -786,140 +800,170 @@ msgstr ""
 msgid "Ambient FX: %s"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:56
+#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:55
 msgid "Equipment"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:77
-#: src/gui/inventorywindow.cpp:79 src/gui/inventorywindow.cpp:298
-#: src/gui/popupmenu.cpp:372
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:89
+#: src/gui/inventorywindow.cpp:337 src/gui/popupmenu.cpp:359
 msgid "Unequip"
 msgstr ""
 
-#: src/gui/help.cpp:36
+#: src/gui/help.cpp:37
 msgid "Help"
 msgstr ""
 
-#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:73
+#: src/gui/help.cpp:51 src/gui/npcdialog.cpp:50
 msgid "Close"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:56 src/gui/windowmenu.cpp:57
+#: src/gui/inventorywindow.cpp:59 src/gui/windowmenu.cpp:56
 msgid "Inventory"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:72 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:300 src/gui/popupmenu.cpp:374
+#: src/gui/inventorywindow.cpp:59
+msgid "Storage"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:82
+msgid "Slots:"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:87 src/gui/inventorywindow.cpp:100
+#: src/gui/inventorywindow.cpp:339 src/gui/popupmenu.cpp:361
 msgid "Equip"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:304 src/gui/popupmenu.cpp:377
+#: src/gui/inventorywindow.cpp:88
 msgid "Use"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:83 src/gui/inventorywindow.cpp:308
-#: src/gui/popupmenu.cpp:380
+#: src/gui/inventorywindow.cpp:101 src/gui/popupmenu.cpp:364
+msgid "Activate"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:102 src/gui/inventorywindow.cpp:348
+#: src/gui/popupmenu.cpp:367
 msgid "Drop..."
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:84 src/gui/popupmenu.cpp:386
+#: src/gui/inventorywindow.cpp:103 src/gui/popupmenu.cpp:373
 msgid "Split"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:85 src/gui/outfitwindow.cpp:51
+#: src/gui/inventorywindow.cpp:104 src/gui/outfitwindow.cpp:51
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:96 src/gui/storagewindow.cpp:83
-msgid "Slots:"
+#: src/gui/inventorywindow.cpp:106
+msgid "Weight:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:97
-msgid "Weight:"
+#: src/gui/inventorywindow.cpp:124 src/gui/popupmenu.cpp:378
+msgid "Store"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:310 src/gui/popupmenu.cpp:382
+#: src/gui/inventorywindow.cpp:125 src/gui/popupmenu.cpp:385
+msgid "Retrieve"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:350 src/gui/popupmenu.cpp:369
 msgid "Drop"
 msgstr ""
 
-#: src/gui/itemamount.cpp:100 src/gui/okdialog.cpp:42
-#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:38 src/gui/trade.cpp:73
-#: src/gui/trade.cpp:75
+#: src/gui/itemamount.cpp:113 src/gui/okdialog.cpp:42
+#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:39 src/gui/trade.cpp:72
+#: src/gui/trade.cpp:74
 msgid "OK"
 msgstr ""
 
-#: src/gui/itemamount.cpp:102
+#: src/gui/itemamount.cpp:115
 msgid "All"
 msgstr ""
 
-#: src/gui/itemamount.cpp:128
+#: src/gui/itemamount.cpp:141
 msgid "Select amount of items to trade."
 msgstr ""
 
-#: src/gui/itemamount.cpp:131
+#: src/gui/itemamount.cpp:144
 msgid "Select amount of items to drop."
 msgstr ""
 
-#: src/gui/itemamount.cpp:134
+#: src/gui/itemamount.cpp:147
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/itemamount.cpp:137
+#: src/gui/itemamount.cpp:150
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamount.cpp:140
+#: src/gui/itemamount.cpp:153
 msgid "Select amount of items to split."
 msgstr ""
 
-#: src/gui/itempopup.cpp:92
+#: src/gui/itempopup.cpp:137
 #, c-format
 msgid "Weight: %s"
 msgstr ""
 
-#: src/gui/login.cpp:49 src/gui/login.cpp:61
+#: src/gui/login.cpp:51 src/gui/login.cpp:63
 msgid "Login"
 msgstr ""
 
-#: src/gui/login.cpp:58
+#: src/gui/login.cpp:60
 msgid "Remember username"
 msgstr ""
 
-#: src/gui/login.cpp:59 src/gui/register.cpp:58 src/gui/register.cpp:73
+#: src/gui/login.cpp:61 src/gui/register.cpp:58 src/gui/register.cpp:73
 msgid "Register"
 msgstr ""
 
-#: src/gui/login.cpp:60
+#: src/gui/login.cpp:62
 msgid "Change Server"
 msgstr ""
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
+#: src/gui/login.cpp:129
+msgid "Registration disabled"
+msgstr ""
+
+#: src/gui/login.cpp:129
+msgid "You need to use the website to register an account for this server."
+msgstr ""
+
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:86
 msgid "Map"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:44
+#: src/gui/ministatus.cpp:235
+msgid "Need"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:48
 msgid "Waiting for server"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:45
+#: src/gui/npcdialog.cpp:49
 msgid "Next"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:47
+#: src/gui/npcdialog.cpp:51
 msgid "Submit"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:52 src/gui/npcpostdialog.cpp:41
+#: src/gui/npcdialog.cpp:73 src/gui/npcpostdialog.cpp:41
 msgid "NPC"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:110
+#: src/gui/npcdialog.cpp:118
+msgid "Clear log"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:134
 msgid "Reset"
 msgstr ""
 
 #. TRANSLATORS: Please leave the \n sequences intact.
-#: src/gui/npcdialog.cpp:171
+#: src/gui/npcdialog.cpp:208
 msgid ""
 "\n"
 "> Next\n"
@@ -933,7 +977,7 @@ msgstr ""
 msgid "Send"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:96
+#: src/gui/npcpostdialog.cpp:99
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
@@ -947,303 +991,82 @@ msgstr ""
 msgid "Unequip first"
 msgstr ""
 
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:143
-msgid "Text"
-msgstr ""
-
-#: src/gui/palette.cpp:82
-msgid "Text Shadow"
-msgstr ""
-
-#: src/gui/palette.cpp:83
-msgid "Text Outline"
-msgstr ""
-
-#: src/gui/palette.cpp:84
-msgid "Progress Bar Labels"
-msgstr ""
-
-#: src/gui/palette.cpp:85
-msgid "Buttons"
-msgstr ""
-
-#: src/gui/palette.cpp:86
-msgid "Disabled Buttons"
-msgstr ""
-
-#: src/gui/palette.cpp:87
-msgid "Tabs"
-msgstr ""
-
-#: src/gui/palette.cpp:89
-msgid "Background"
-msgstr ""
-
-#: src/gui/palette.cpp:91
-msgid "Highlight"
-msgstr ""
-
-#: src/gui/palette.cpp:92
-msgid "Tab Highlight"
-msgstr ""
-
-#: src/gui/palette.cpp:93
-msgid "Item Too Expensive"
-msgstr ""
-
-#: src/gui/palette.cpp:94
-msgid "Item Is Equipped"
-msgstr ""
-
-#: src/gui/palette.cpp:97
-msgid "GM"
-msgstr ""
-
-#: src/gui/palette.cpp:98
-msgid "Player"
-msgstr ""
-
-#: src/gui/palette.cpp:99
-msgid "Whisper"
-msgstr ""
-
-#: src/gui/palette.cpp:100
-msgid "Is"
-msgstr ""
-
-#: src/gui/palette.cpp:101 src/net/ea/gui/partytab.cpp:43
-msgid "Party"
-msgstr ""
-
-#: src/gui/palette.cpp:102 src/net/ea/gui/guildtab.cpp:45
-msgid "Guild"
-msgstr ""
-
-#: src/gui/palette.cpp:103
-msgid "Server"
-msgstr ""
-
-#: src/gui/palette.cpp:104
-msgid "Logger"
-msgstr ""
-
-#: src/gui/palette.cpp:105
-msgid "Hyperlink"
-msgstr ""
-
-#: src/gui/palette.cpp:107
-msgid "Being"
-msgstr ""
-
-#: src/gui/palette.cpp:108
-msgid "Other Players' Names"
-msgstr ""
-
-#: src/gui/palette.cpp:109
-msgid "Own Name"
-msgstr ""
-
-#: src/gui/palette.cpp:110
-msgid "GM Names"
-msgstr ""
-
-#: src/gui/palette.cpp:111
-msgid "NPCs"
-msgstr ""
-
-#: src/gui/palette.cpp:112
-msgid "Monsters"
-msgstr ""
-
-#: src/gui/palette.cpp:114
-msgid "Unknown Item Type"
-msgstr ""
-
-#: src/gui/palette.cpp:115
-msgid "Generics"
-msgstr ""
-
-#: src/gui/palette.cpp:116
-msgid "Hats"
-msgstr ""
-
-#: src/gui/palette.cpp:117
-msgid "Usables"
-msgstr ""
-
-#: src/gui/palette.cpp:118
-msgid "Shirts"
-msgstr ""
-
-#: src/gui/palette.cpp:119
-msgid "One Handed Weapons"
-msgstr ""
-
-#: src/gui/palette.cpp:120
-msgid "Pants"
-msgstr ""
-
-#: src/gui/palette.cpp:121
-msgid "Shoes"
-msgstr ""
-
-#: src/gui/palette.cpp:122
-msgid "Two Handed Weapons"
-msgstr ""
-
-#: src/gui/palette.cpp:123
-msgid "Shields"
-msgstr ""
-
-#: src/gui/palette.cpp:124
-msgid "Rings"
-msgstr ""
-
-#: src/gui/palette.cpp:125
-msgid "Necklaces"
-msgstr ""
-
-#: src/gui/palette.cpp:126
-msgid "Arms"
-msgstr ""
-
-#: src/gui/palette.cpp:127
-msgid "Ammo"
-msgstr ""
-
-#: src/gui/palette.cpp:129
-msgid "Particle Effects"
-msgstr ""
-
-#: src/gui/palette.cpp:130
-msgid "Pickup Notification"
-msgstr ""
-
-#: src/gui/palette.cpp:131
-msgid "Exp Notification"
-msgstr ""
-
-#: src/gui/palette.cpp:133
-msgid "Player Hits Monster"
-msgstr ""
-
-#: src/gui/palette.cpp:135
-msgid "Monster Hits Player"
-msgstr ""
-
-#: src/gui/palette.cpp:136
-msgid "Critical Hit"
-msgstr ""
-
-#: src/gui/palette.cpp:137
-msgid "Misses"
-msgstr ""
-
-#: src/gui/palette.cpp:139
-msgid "HP Bar"
-msgstr ""
-
-#: src/gui/palette.cpp:140
-msgid "3/4 HP Bar"
-msgstr ""
-
-#: src/gui/palette.cpp:141
-msgid "1/2 HP Bar"
-msgstr ""
-
-#: src/gui/palette.cpp:142
-msgid "1/4 HP Bar"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:84
+#: src/gui/popupmenu.cpp:83
 #, c-format
 msgid "Trade with %s..."
 msgstr ""
 
-#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:161
+#: src/gui/popupmenu.cpp:87 src/gui/popupmenu.cpp:158
 #, c-format
 msgid "Attack %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:92
+#: src/gui/popupmenu.cpp:91
 #, c-format
 msgid "Whisper %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:101
+#: src/gui/popupmenu.cpp:100
 #, c-format
 msgid "Befriend %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:106
+#: src/gui/popupmenu.cpp:105
 #, c-format
 msgid "Disregard %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:109
+#: src/gui/popupmenu.cpp:108
 #, c-format
 msgid "Ignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:115 src/gui/popupmenu.cpp:124
+#: src/gui/popupmenu.cpp:114 src/gui/popupmenu.cpp:123
 #, c-format
 msgid "Unignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:118
+#: src/gui/popupmenu.cpp:117
 #, c-format
 msgid "Completely ignore %s"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:130
 #, c-format
-msgid "Follow %s"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:133
-#, c-format
 msgid "Invite %s to join your guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:137
+#: src/gui/popupmenu.cpp:134
 #, c-format
 msgid "Invite %s to join your party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144
+#: src/gui/popupmenu.cpp:141
 msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:153
+#: src/gui/popupmenu.cpp:150
 #, c-format
 msgid "Talk to %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:166
+#: src/gui/popupmenu.cpp:163
 msgid "Kick monster"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:174
+#: src/gui/popupmenu.cpp:171
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:191
+#: src/gui/popupmenu.cpp:188
 #, c-format
 msgid "Pick up %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:400
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:387
 msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:70
-msgid "Store"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:71
-msgid "Retrieve"
-msgstr ""
-
 #: src/gui/quitdialog.cpp:44
 msgid "Switch server"
 msgstr ""
@@ -1312,47 +1135,60 @@ msgstr ""
 msgid "Passwords do not match."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:134
+#: src/gui/serverdialog.cpp:197
 msgid "Choose Your Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:141 src/gui/widgets/chattab.cpp:139
+#: src/gui/serverdialog.cpp:206 src/gui/widgets/chattab.cpp:142
 msgid "Server:"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:142
+#: src/gui/serverdialog.cpp:207
 msgid "Port:"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:143
+#: src/gui/serverdialog.cpp:208
 msgid "Server type:"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:183
+#: src/gui/serverdialog.cpp:229
 msgid "Connect"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:184
+#: src/gui/serverdialog.cpp:230
 msgid "Custom Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:262
+#: src/gui/serverdialog.cpp:324
 msgid "Please type both the address and the port of a server."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:411
+#: src/gui/serverdialog.cpp:441
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:417
+#: src/gui/serverdialog.cpp:447
 msgid "Waiting for server..."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:421
+#: src/gui/serverdialog.cpp:451
 msgid "Preparing download"
 msgstr ""
 
+#: src/gui/serverdialog.cpp:455
+msgid "Error retreiving server list!"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:550
+msgid "requires a newer version"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:552
+#, c-format
+msgid "requires v%s"
+msgstr ""
+
 #: src/gui/setup_audio.cpp:42
 msgid "Sound"
 msgstr ""
@@ -1385,50 +1221,50 @@ msgstr ""
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:44
+#: src/gui/setup_colors.cpp:46
 msgid "This is what the color looks like"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:49
+#: src/gui/setup_colors.cpp:51
 msgid "Colors"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:70
+#: src/gui/setup_colors.cpp:72
 msgid "Type:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:81 src/gui/setup_colors.cpp:433
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:331
 msgid "Static"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:84
-#: src/gui/setup_colors.cpp:434
+#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
+#: src/gui/setup_colors.cpp:332
 msgid "Pulse"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
+#: src/gui/setup_colors.cpp:333
 msgid "Rainbow"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
+#: src/gui/setup_colors.cpp:333
 msgid "Spectrum"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:92
+#: src/gui/setup_colors.cpp:94
 msgid "Delay:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:107
+#: src/gui/setup_colors.cpp:109
 msgid "Red:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:122
+#: src/gui/setup_colors.cpp:124
 msgid "Green:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:137
+#: src/gui/setup_colors.cpp:139
 msgid "Blue:"
 msgstr ""
 
@@ -1473,562 +1309,576 @@ msgid "Assign"
 msgstr ""
 
 #: src/gui/setup_keyboard.cpp:90
+msgid "Unassign"
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:94
 msgid "Default"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:119
+#: src/gui/setup_keyboard.cpp:125
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_players.cpp:57
+#: src/gui/setup_players.cpp:58
 msgid "Name"
 msgstr ""
 
-#: src/gui/setup_players.cpp:58
+#: src/gui/setup_players.cpp:59
 msgid "Relation"
 msgstr ""
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:64
 msgid "Neutral"
 msgstr ""
 
-#: src/gui/setup_players.cpp:64
+#: src/gui/setup_players.cpp:65
 msgid "Friend"
 msgstr ""
 
-#: src/gui/setup_players.cpp:65
+#: src/gui/setup_players.cpp:66
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_players.cpp:67
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_players.cpp:208 src/gui/setup_video.cpp:132
+#: src/gui/setup_players.cpp:206 src/gui/setup_video.cpp:153
 msgid "???"
 msgstr ""
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_players.cpp:225
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_players.cpp:228
+#: src/gui/setup_players.cpp:227
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:231
 msgid "Put all whispers in tabs"
 msgstr ""
 
-#: src/gui/setup_players.cpp:234
+#: src/gui/setup_players.cpp:233
 msgid "Show gender"
 msgstr ""
 
-#: src/gui/setup_players.cpp:236
+#: src/gui/setup_players.cpp:235
+msgid "Enable Chat log"
+msgstr ""
+
+#: src/gui/setup_players.cpp:237
 msgid "Players"
 msgstr ""
 
-#: src/gui/setup_players.cpp:261
+#: src/gui/setup_players.cpp:262
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:113
+#: src/gui/setup_video.cpp:134
 msgid "Tiny"
 msgstr ""
 
-#: src/gui/setup_video.cpp:114
+#: src/gui/setup_video.cpp:135
 msgid "Small"
 msgstr ""
 
-#: src/gui/setup_video.cpp:115
+#: src/gui/setup_video.cpp:136
 msgid "Medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:116
+#: src/gui/setup_video.cpp:137
 msgid "Large"
 msgstr ""
 
-#: src/gui/setup_video.cpp:142
+#: src/gui/setup_video.cpp:163
 msgid "No text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:144
+#: src/gui/setup_video.cpp:164
+msgid "Text"
+msgstr ""
+
+#: src/gui/setup_video.cpp:165
 msgid "Bubbles, no names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:145
+#: src/gui/setup_video.cpp:166
 msgid "Bubbles with names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:157
+#: src/gui/setup_video.cpp:178
 msgid "off"
 msgstr ""
 
-#: src/gui/setup_video.cpp:158 src/gui/setup_video.cpp:171
+#: src/gui/setup_video.cpp:179 src/gui/setup_video.cpp:192
 msgid "low"
 msgstr ""
 
-#: src/gui/setup_video.cpp:159 src/gui/setup_video.cpp:173
+#: src/gui/setup_video.cpp:180 src/gui/setup_video.cpp:194
 msgid "high"
 msgstr ""
 
-#: src/gui/setup_video.cpp:172
+#: src/gui/setup_video.cpp:193
 msgid "medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:174
+#: src/gui/setup_video.cpp:195
 msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:196
+#: src/gui/setup_video.cpp:217
 msgid "Full screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:197
+#: src/gui/setup_video.cpp:218
 msgid "OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:198
+#: src/gui/setup_video.cpp:219
 msgid "Custom cursor"
 msgstr ""
 
-#: src/gui/setup_video.cpp:200
+#: src/gui/setup_video.cpp:221
 msgid "Visible names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:223
 msgid "Particle effects"
 msgstr ""
 
-#: src/gui/setup_video.cpp:204
+#: src/gui/setup_video.cpp:225
 msgid "Show own name"
 msgstr ""
 
-#: src/gui/setup_video.cpp:205
+#: src/gui/setup_video.cpp:226
+msgid "Log NPC dialogue"
+msgstr ""
+
+#: src/gui/setup_video.cpp:227
 msgid "Show pickup notification"
 msgstr ""
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:207
+#. TRANSLATORS: Refers to "Show pickup notification"
+#: src/gui/setup_video.cpp:229
 msgid "in chat"
 msgstr ""
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:209
+#. TRANSLATORS: Refers to "Show pickup notification"
+#: src/gui/setup_video.cpp:231
 msgid "as particle"
 msgstr ""
 
-#: src/gui/setup_video.cpp:214
+#: src/gui/setup_video.cpp:236
 msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:225
+#: src/gui/setup_video.cpp:247
+msgid "Disable transparency (Low CPU mode)"
+msgstr ""
+
+#: src/gui/setup_video.cpp:250
 msgid "Video"
 msgstr ""
 
-#: src/gui/setup_video.cpp:227
-msgid "Show monster damage"
+#: src/gui/setup_video.cpp:252
+msgid "Show damage"
 msgstr ""
 
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:258
 msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:259
 msgid "Gui opacity"
 msgstr ""
 
-#: src/gui/setup_video.cpp:235
+#: src/gui/setup_video.cpp:260
 msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_video.cpp:236
+#: src/gui/setup_video.cpp:261
 msgid "Particle detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237
+#: src/gui/setup_video.cpp:262
 msgid "Font size"
 msgstr ""
 
-#: src/gui/setup_video.cpp:251 src/gui/setup_video.cpp:454
-#: src/gui/setup_video.cpp:568
+#: src/gui/setup_video.cpp:277 src/gui/setup_video.cpp:532
+#: src/gui/setup_video.cpp:662
 msgid "None"
 msgstr ""
 
-#: src/gui/setup_video.cpp:381
+#: src/gui/setup_video.cpp:426
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:387
+#: src/gui/setup_video.cpp:432
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:398
+#: src/gui/setup_video.cpp:443
 msgid "Switching to Full Screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:399
+#: src/gui/setup_video.cpp:444
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:411
+#: src/gui/setup_video.cpp:458
 msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:412
+#: src/gui/setup_video.cpp:459
+msgid ""
+"Applying change to OpenGL requires restart. In case OpenGL messes up your "
+"game graphics, restart the game with the command line option \"--no-opengl\"."
+msgstr ""
+
+#: src/gui/setup_video.cpp:466
+msgid "Deactivating OpenGL"
+msgstr ""
+
+#: src/gui/setup_video.cpp:467
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#: src/gui/setup_video.cpp:486 src/gui/setup_video.cpp:491
+#: src/gui/setup_video.cpp:475
+msgid "Transparency disabled"
+msgstr ""
+
+#: src/gui/setup_video.cpp:476 src/gui/setup_video.cpp:484
+msgid "You must restart to apply changes."
+msgstr ""
+
+#: src/gui/setup_video.cpp:483
+msgid "Transparency enabled"
+msgstr ""
+
+#: src/gui/setup_video.cpp:576 src/gui/setup_video.cpp:581
 msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:487 src/gui/setup_video.cpp:492
+#: src/gui/setup_video.cpp:577 src/gui/setup_video.cpp:582
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:489
+#: src/gui/setup_video.cpp:579
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:522
+#: src/gui/setup_video.cpp:612
 msgid "Particle Effect Settings Changed."
 msgstr ""
 
-#: src/gui/setup_video.cpp:523
+#: src/gui/setup_video.cpp:613
 msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skilldialog.cpp:197 src/gui/windowmenu.cpp:58
+#: src/gui/skilldialog.cpp:212 src/gui/windowmenu.cpp:59
 msgid "Skills"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:208
+#: src/gui/skilldialog.cpp:223
 msgid "Up"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:262
+#: src/gui/skilldialog.cpp:269
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:314
+#: src/gui/skilldialog.cpp:351
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:323
+#: src/gui/skilldialog.cpp:360
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:405
+#: src/gui/skilldialog.cpp:442
 #, c-format
 msgid "Lvl: %d (%+d)"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:416
+#: src/gui/skilldialog.cpp:453
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:117
+#: src/gui/socialwindow.cpp:126
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:126
+#: src/gui/socialwindow.cpp:139
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:136
+#: src/gui/socialwindow.cpp:153
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:137
+#: src/gui/socialwindow.cpp:154
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:146
+#: src/gui/socialwindow.cpp:163
 msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:147
+#: src/gui/socialwindow.cpp:164
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:182
+#: src/gui/socialwindow.cpp:207 src/net/tmwa/partyhandler.cpp:330
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:218
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:199
+#: src/gui/socialwindow.cpp:232
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:200
+#: src/gui/socialwindow.cpp:233
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:209
+#: src/gui/socialwindow.cpp:242
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:210
+#: src/gui/socialwindow.cpp:243
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:239
+#: src/gui/socialwindow.cpp:272
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:240 src/gui/socialwindow.cpp:564
+#: src/gui/socialwindow.cpp:273 src/gui/socialwindow.cpp:620
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:279 src/gui/windowmenu.cpp:60
+#: src/gui/socialwindow.cpp:312 src/gui/windowmenu.cpp:64
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:297
+#: src/gui/socialwindow.cpp:330
 msgid "Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:298
+#: src/gui/socialwindow.cpp:331
 msgid "Leave"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:394
+#: src/gui/socialwindow.cpp:443
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:400
+#: src/gui/socialwindow.cpp:449
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:413
+#: src/gui/socialwindow.cpp:462
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:419
+#: src/gui/socialwindow.cpp:468
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:463
+#: src/gui/socialwindow.cpp:497
+msgid "Creating guild failed, please choose a shorter name."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:504
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:477
+#: src/gui/socialwindow.cpp:520
+msgid "Creating party failed, please choose a shorter name."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:527
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:484
+#: src/gui/socialwindow.cpp:541
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:485
+#: src/gui/socialwindow.cpp:542
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:497
+#: src/gui/socialwindow.cpp:554
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:502
+#: src/gui/socialwindow.cpp:559
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:507
+#: src/gui/socialwindow.cpp:564
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:519
+#: src/gui/socialwindow.cpp:576
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:529
+#: src/gui/socialwindow.cpp:585
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:533
+#: src/gui/socialwindow.cpp:589
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:541
+#: src/gui/socialwindow.cpp:597
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:546
+#: src/gui/socialwindow.cpp:602
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:554
+#: src/gui/socialwindow.cpp:610
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:565
+#: src/gui/socialwindow.cpp:621
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:570
+#: src/gui/socialwindow.cpp:626
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:571
+#: src/gui/socialwindow.cpp:627
 msgid "Choose your party's name."
 msgstr ""
 
-#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:59
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:62
 msgid "Specials"
 msgstr ""
 
-#: src/gui/specialswindow.cpp:174
-#, c-format
-msgid "Specials Set %d"
-msgstr ""
-
-#: src/gui/specialswindow.cpp:191
-#, c-format
-msgid "Special %d"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:99 src/gui/statuswindow.cpp:247
+#: src/gui/statuswindow.cpp:113 src/gui/statuswindow.cpp:215
+#: src/gui/statuswindow.cpp:262
 #, c-format
 msgid "Level: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:211
+#: src/gui/statuswindow.cpp:114 src/gui/statuswindow.cpp:208
+#: src/gui/statuswindow.cpp:239
 #, c-format
 msgid "Money: %s"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:102
+#: src/gui/statuswindow.cpp:117
 msgid "HP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:107
+#: src/gui/statuswindow.cpp:122
 msgid "Exp:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:112
+#: src/gui/statuswindow.cpp:130
 msgid "MP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:132 src/gui/statuswindow.cpp:219
+#: src/gui/statuswindow.cpp:158 src/gui/statuswindow.cpp:275
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:133
+#: src/gui/statuswindow.cpp:159
 msgid "Job:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:194
-msgid "HP"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:200
-msgid "MP"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:206
-msgid "Exp"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:215
-msgid "Money"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:225
-msgid "Job"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:229
+#: src/gui/statuswindow.cpp:211 src/gui/statuswindow.cpp:247
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:235
+#: src/gui/statuswindow.cpp:255
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:251
-msgid "Level"
-msgstr ""
-
-#: src/gui/storagewindow.cpp:58
-msgid "Storage"
-msgstr ""
-
-#: src/gui/trade.cpp:52
+#: src/gui/trade.cpp:53
 msgid "Propose trade"
 msgstr ""
 
-#: src/gui/trade.cpp:53
+#: src/gui/trade.cpp:54
 msgid "Confirmed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:55
 msgid "Agree trade"
 msgstr ""
 
-#: src/gui/trade.cpp:55
+#: src/gui/trade.cpp:56
 msgid "Agreed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:58
+#: src/gui/trade.cpp:59
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/trade.cpp:74 src/gui/trade.cpp:75
+#: src/gui/trade.cpp:73 src/gui/trade.cpp:74
 msgid "Trade"
 msgstr ""
 
-#: src/gui/trade.cpp:77
+#: src/gui/trade.cpp:76
 msgid "Add"
 msgstr ""
 
-#: src/gui/trade.cpp:99 src/gui/trade.cpp:135
+#: src/gui/trade.cpp:98 src/gui/trade.cpp:134
 #, c-format
 msgid "You get %s"
 msgstr ""
 
-#: src/gui/trade.cpp:100
+#: src/gui/trade.cpp:99
 msgid "You give:"
 msgstr ""
 
-#: src/gui/trade.cpp:104
+#: src/gui/trade.cpp:103
 msgid "Change"
 msgstr ""
 
-#: src/gui/trade.cpp:275
+#: src/gui/trade.cpp:262
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/trade.cpp:318
+#: src/gui/trade.cpp:304
 msgid "You don't have enough money."
 msgstr ""
 
@@ -2049,21 +1899,21 @@ msgstr ""
 msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:405
+#: src/gui/updatewindow.cpp:417
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:407
+#: src/gui/updatewindow.cpp:419
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:409
+#: src/gui/updatewindow.cpp:421
 msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:501
+#: src/gui/updatewindow.cpp:515
 msgid "Completed"
 msgstr ""
 
@@ -2143,62 +1993,62 @@ msgstr ""
 msgid "Need a user to kick!"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:118
+#: src/gui/widgets/chattab.cpp:121
 msgid "Global announcement:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:124
+#: src/gui/widgets/chattab.cpp:127
 #, c-format
 msgid "Global announcement from %s:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:150
+#: src/gui/widgets/chattab.cpp:153
 #, c-format
 msgid "%s whispers: %s"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:51
+#: src/gui/widgets/whispertab.cpp:53
 msgid "Cannot send empty chat!"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:70
+#: src/gui/widgets/whispertab.cpp:72
 msgid "/ignore > Ignore the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:71
+#: src/gui/widgets/whispertab.cpp:73
 msgid "/unignore > Stop ignoring the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:72
+#: src/gui/widgets/whispertab.cpp:74
 msgid "/close > Close the whisper tab"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:82
+#: src/gui/widgets/whispertab.cpp:84
 msgid "Command: /close"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:83
+#: src/gui/widgets/whispertab.cpp:85
 msgid "This command closes the current whisper tab."
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:87
+#: src/gui/widgets/whispertab.cpp:89
 msgid "Command: /ignore"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:88
+#: src/gui/widgets/whispertab.cpp:90
 #, fuzzy
 msgid "This command ignores the other player regardless of current relations."
 msgstr "ამ კომანდას გამოაქ კონკრეტული რუქის სახელი"
 
-#: src/gui/widgets/whispertab.cpp:94
+#: src/gui/widgets/whispertab.cpp:96
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:55
+#: src/gui/windowmenu.cpp:54
 msgid "Status"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:61
+#: src/gui/windowmenu.cpp:65
 msgid "Shortcut"
 msgstr ""
 
@@ -2214,1350 +2064,1361 @@ msgstr ""
 msgid "Choose World"
 msgstr ""
 
-#: src/keyboardconfig.cpp:40
+#: src/keyboardconfig.cpp:39
 msgid "Move Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:41
+#: src/keyboardconfig.cpp:40
 msgid "Move Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:41
 msgid "Move Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:42
 msgid "Move Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:44 src/net/ea/generalhandler.cpp:223
+#: src/keyboardconfig.cpp:43 src/net/tmwa/generalhandler.cpp:237
 msgid "Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:44
 msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:45
 msgid "Smilie"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:46
 msgid "Talk"
 msgstr ""
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:47
 msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:48
 msgid "Target Monster"
 msgstr ""
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboardconfig.cpp:49
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:50
 msgid "Target Player"
 msgstr ""
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:51
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:52
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:53
 msgid "Sit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:54
 msgid "Screenshot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:55
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:56
 msgid "Find Path to Mouse"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58 src/keyboardconfig.cpp:59
-#: src/keyboardconfig.cpp:60 src/keyboardconfig.cpp:61
-#: src/keyboardconfig.cpp:62 src/keyboardconfig.cpp:63
-#: src/keyboardconfig.cpp:64 src/keyboardconfig.cpp:65
-#: src/keyboardconfig.cpp:66 src/keyboardconfig.cpp:67
-#: src/keyboardconfig.cpp:68 src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:57 src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60
+#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62
+#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64
+#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68
 #, c-format
 msgid "Item Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:69
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:70
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:71
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:72
 msgid "Equipment Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:73
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:74
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:75
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:76
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:77
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:78
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:79
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:80
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:81
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:83
+#: src/keyboardconfig.cpp:82
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:83
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86
-#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88
-#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90
-#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92
-#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:84 src/keyboardconfig.cpp:85
+#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:87
+#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:89
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:91
+#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:93
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:95
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:96
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:97
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:98
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:99
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:100
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:101
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:103
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:105
+#: src/keyboardconfig.cpp:104
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:178
+#: src/keyboardconfig.cpp:183
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:913
+#: src/localplayer.cpp:985
 msgid "Unable to pick up item."
 msgstr ""
 
 #. TRANSLATORS: This sentence may be translated differently
 #. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:922
+#: src/localplayer.cpp:994
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/main.cpp:43
+#: src/main.cpp:42
 msgid "mana [options] [mana-file]"
 msgstr ""
 
+#: src/main.cpp:43
+msgid "[mana-file] : The mana file is an XML file (.mana)"
+msgstr ""
+
 #: src/main.cpp:44
-msgid "Options:"
+msgid "              used to set custom parameters"
 msgstr ""
 
 #: src/main.cpp:45
+msgid "              to the mana client."
+msgstr ""
+
+#: src/main.cpp:47
+msgid "Options:"
+msgstr ""
+
+#: src/main.cpp:48
 msgid "  -v --version        : Display the version"
 msgstr ""
 
-#: src/main.cpp:46
+#: src/main.cpp:49
 #, fuzzy
 msgid "  -h --help           : Display this help"
 msgstr "/help > დახმარების გამოტანა"
 
-#: src/main.cpp:47
+#: src/main.cpp:50
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
-#: src/main.cpp:48
+#: src/main.cpp:51
 msgid "  -U --username       : Login with this username"
 msgstr ""
 
-#: src/main.cpp:49
+#: src/main.cpp:52
 msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/main.cpp:50
+#: src/main.cpp:53
 msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/main.cpp:51
+#: src/main.cpp:54
 msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:52
+#: src/main.cpp:55
 msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/main.cpp:53
+#: src/main.cpp:56
 msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/main.cpp:54
+#: src/main.cpp:57
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:56
+#: src/main.cpp:59
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:57
+#: src/main.cpp:60
 msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:58
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
+#: src/main.cpp:61
+msgid "     --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/main.cpp:59
+#: src/main.cpp:62
+msgid "     --chat-log-dir   : Chat log dir to use"
+msgstr ""
+
+#: src/main.cpp:63
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/main.cpp:61
+#: src/main.cpp:65
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:63
+#: src/net/manaserv/beinghandler.cpp:303 src/net/tmwa/playerhandler.cpp:94
+msgid "You are dead."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:304 src/net/tmwa/playerhandler.cpp:95
+msgid "We regret to inform you that your character was killed in battle."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:306 src/net/tmwa/playerhandler.cpp:97
+msgid "You are not that alive anymore."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:307 src/net/tmwa/playerhandler.cpp:98
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:308 src/net/tmwa/playerhandler.cpp:99
+msgid "Game Over!"
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:309 src/net/tmwa/playerhandler.cpp:101
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:311 src/net/tmwa/playerhandler.cpp:103
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:313 src/net/tmwa/playerhandler.cpp:105
+msgid "I guess this did not run too well."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:107
+msgid "Do you want your possessions identified?"
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:109
+msgid "Sadly, no trace of you was ever found..."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:111
+msgid "Annihilated."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:113
+msgid "Looks like you got your head handed to you."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:115
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:323
+msgid "Press OK to respawn."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:324
+msgid "You Died"
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:138 src/net/manaserv/charhandler.cpp:209
+msgid "Not logged in."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:141
+msgid "No empty slot."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:144
+msgid "Invalid name."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:147
+msgid "Character's name already exists."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:150
+msgid "Invalid hairstyle."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:153
+msgid "Invalid hair color."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:156
+msgid "Invalid gender."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:159
+msgid "Character's stats are too high."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:162
+msgid "Character's stats are too low."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:165
+#, c-format
+msgid "At least one statis out of the permitted range: (%u - %u)."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:171 src/net/manaserv/loginhandler.cpp:96
+#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
+#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
+#: src/net/tmwa/loginhandler.cpp:95 src/net/tmwa/loginhandler.cpp:182
+#, fuzzy
+msgid "Unknown error."
+msgstr "უცნობი კომანდა."
+
+#: src/net/manaserv/charhandler.cpp:200 src/net/tmwa/charserverhandler.cpp:146
+msgid "Info"
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:200
+msgid "Player deleted."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:212
+msgid "Selection out of range."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:215
+#, fuzzy, c-format
+msgid "Unknown error (%d)."
+msgstr "უცნობი კომანდა."
+
+#: src/net/manaserv/charhandler.cpp:250
+msgid "No gameservers are available."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:187 src/net/manaserv/chathandler.cpp:313
+#: src/net/manaserv/guildhandler.cpp:260
+#, c-format
+msgid "Topic: %s"
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:274
+msgid "Players in this channel:"
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:208
+msgid "Error joining channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:214
+msgid "Listing channels."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:226
+msgid "End of channel list."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:303
+#, c-format
+msgid "%s entered the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:308
+#, c-format
+msgid "%s left the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:324
+#, c-format
+msgid "%s has set mode %s on user %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:334
+#, c-format
+msgid "%s has kicked %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:339
+#, fuzzy
+msgid "Unknown channel event."
+msgstr "უცნობი კომანდა."
+
+#: src/net/manaserv/guildhandler.cpp:82
+msgid "Guild created."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:87
+msgid "Error creating guild."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:97
+msgid "Invite sent."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:204
+msgid "Member was promoted successfully."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:209
+msgid "Failed to promote member."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:87
+msgid "Wrong magic_token."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
+msgid "Already logged in."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:93
+msgid "Account banned."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:118
+msgid "New password incorrect."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:121 src/net/tmwa/loginhandler.cpp:89
+msgid "Old password incorrect."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
+msgid "Account not connected. Please login first."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:149
+msgid "New email address incorrect."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:152
+msgid "Old email address incorrect."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:158
+msgid "The new email address already exists."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:239
+msgid ""
+"Client registration is not allowed. Please contact server administration."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
+msgid "Client version is too old."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:266
+msgid "Wrong username or password."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:272
+msgid "Account banned"
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:275
+msgid "Login attempt too soon after previous attempt."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:303
+msgid "Wrong username, password or email address."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:306
+msgid "Username already exists."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:309
+msgid "Email address already exists."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:312
+msgid "You took too long with the captcha or your response was incorrect."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:87
+msgid "Joined party."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:105
+#, c-format
+msgid "%s joined the party."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:123
+#, c-format
+msgid "%s rejected your invite."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:95
+msgid "Accepting incoming trade requests."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:97
+msgid "Ignoring incoming trade requests."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:115 src/net/tmwa/tradehandler.cpp:109
+msgid "Request for Trade"
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:116 src/net/tmwa/tradehandler.cpp:110
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:134
+#, c-format
+msgid "Trading with %s"
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:148 src/net/tmwa/tradehandler.cpp:224
+msgid "Trade canceled."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:155 src/net/tmwa/tradehandler.cpp:231
+msgid "Trade completed."
+msgstr ""
+
+#: src/net/tmwa/adminhandler.cpp:64
 msgid "Kick failed!"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:65
+#: src/net/tmwa/adminhandler.cpp:66
 msgid "Kick succeeded!"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:110
+#: src/net/tmwa/buysellhandler.cpp:109
 msgid "Nothing to sell."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:117
+#: src/net/tmwa/buysellhandler.cpp:116
 msgid "Thanks for buying."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:124
+#: src/net/tmwa/buysellhandler.cpp:123
 msgid "Unable to buy."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:130
+#: src/net/tmwa/buysellhandler.cpp:129
 msgid "Thanks for selling."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:132
+#: src/net/tmwa/buysellhandler.cpp:131
 msgid "Unable to sell."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:103
-msgid "Access denied."
+#: src/net/tmwa/charserverhandler.cpp:103
+msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:106
+#: src/net/tmwa/charserverhandler.cpp:107
 msgid "Cannot use this ID."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:109
-msgid "Unknown failure to select character."
-msgstr ""
+#: src/net/tmwa/charserverhandler.cpp:110
+#, fuzzy
+msgid "Unknown char-server failure."
+msgstr "უცნობი კომანდა."
 
-#: src/net/ea/charserverhandler.cpp:135
+#: src/net/tmwa/charserverhandler.cpp:134
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:147 src/net/manaserv/charhandler.cpp:187
-msgid "Info"
-msgstr ""
-
-#: src/net/ea/charserverhandler.cpp:147
+#: src/net/tmwa/charserverhandler.cpp:146
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:152
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Failed to delete character."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:237 src/net/manaserv/charhandler.cpp:263
+#: src/net/tmwa/charserverhandler.cpp:266
 msgid "Strength:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:238 src/net/manaserv/charhandler.cpp:264
+#: src/net/tmwa/charserverhandler.cpp:267
 msgid "Agility:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:239 src/net/manaserv/charhandler.cpp:266
+#: src/net/tmwa/charserverhandler.cpp:268
 msgid "Vitality:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:240 src/net/manaserv/charhandler.cpp:267
+#: src/net/tmwa/charserverhandler.cpp:269
 msgid "Intelligence:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:241 src/net/manaserv/charhandler.cpp:265
+#: src/net/tmwa/charserverhandler.cpp:270
 msgid "Dexterity:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:242
+#: src/net/tmwa/charserverhandler.cpp:271
 msgid "Luck:"
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:80
-msgid "Whisper could not be sent, user is offline."
+#: src/net/tmwa/chathandler.cpp:87
+#, c-format
+msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:84
-msgid "Whisper could not be sent, ignored by user."
+#: src/net/tmwa/chathandler.cpp:96
+#, c-format
+msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:171
+#: src/net/tmwa/chathandler.cpp:230
 msgid "MVP player."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:204 src/net/ea/chathandler.cpp:210
-#: src/net/ea/chathandler.cpp:215 src/net/ea/chathandler.cpp:220
-#: src/net/ea/chathandler.cpp:225 src/net/ea/chathandler.cpp:230
-#: src/net/ea/chathandler.cpp:235 src/net/ea/chathandler.cpp:240
+#: src/net/tmwa/chathandler.cpp:265 src/net/tmwa/chathandler.cpp:271
+#: src/net/tmwa/chathandler.cpp:276 src/net/tmwa/chathandler.cpp:281
+#: src/net/tmwa/chathandler.cpp:286 src/net/tmwa/chathandler.cpp:291
+#: src/net/tmwa/chathandler.cpp:296 src/net/tmwa/chathandler.cpp:301
 msgid "Channels are not supported!"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:86
+#: src/net/tmwa/gamehandler.cpp:88
 #, c-format
 msgid "Online users: %d"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:100
+#: src/net/tmwa/gamehandler.cpp:101
 msgid "Game"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:100
+#: src/net/tmwa/gamehandler.cpp:101
 msgid "Request to quit denied!"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:102 src/net/manaserv/generalhandler.cpp:95
+#: src/net/tmwa/generalhandler.cpp:102
 #, c-format
 msgid "Strength %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:103 src/net/manaserv/generalhandler.cpp:96
+#: src/net/tmwa/generalhandler.cpp:103
 #, c-format
 msgid "Agility %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:104 src/net/manaserv/generalhandler.cpp:98
+#: src/net/tmwa/generalhandler.cpp:104
 #, c-format
 msgid "Vitality %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:105 src/net/manaserv/generalhandler.cpp:99
+#: src/net/tmwa/generalhandler.cpp:105
 #, c-format
 msgid "Intelligence %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:106 src/net/manaserv/generalhandler.cpp:97
+#: src/net/tmwa/generalhandler.cpp:106
 #, c-format
 msgid "Dexterity %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:107
+#: src/net/tmwa/generalhandler.cpp:107
 #, c-format
 msgid "Luck %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:130
+#: src/net/tmwa/generalhandler.cpp:132
 msgid "Authentication failed."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:133
+#: src/net/tmwa/generalhandler.cpp:135
 msgid "No servers available."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:137
+#: src/net/tmwa/generalhandler.cpp:139
 msgid "Someone else is trying to use this account."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:140
+#: src/net/tmwa/generalhandler.cpp:142
 msgid "This account is already logged in."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:143
+#: src/net/tmwa/generalhandler.cpp:145
 msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:146
+#: src/net/tmwa/generalhandler.cpp:148
 msgid "Duplicated login."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:149
+#: src/net/tmwa/generalhandler.cpp:151
 msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:205
+#: src/net/tmwa/generalhandler.cpp:209
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:216 src/net/manaserv/generalhandler.cpp:166
+#: src/net/tmwa/generalhandler.cpp:230
 msgid "Strength"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:217 src/net/manaserv/generalhandler.cpp:167
+#: src/net/tmwa/generalhandler.cpp:231
 msgid "Agility"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:218 src/net/manaserv/generalhandler.cpp:169
+#: src/net/tmwa/generalhandler.cpp:232
 msgid "Vitality"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:219 src/net/manaserv/generalhandler.cpp:170
+#: src/net/tmwa/generalhandler.cpp:233
 msgid "Intelligence"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:220 src/net/manaserv/generalhandler.cpp:168
+#: src/net/tmwa/generalhandler.cpp:234
 msgid "Dexterity"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:221
+#: src/net/tmwa/generalhandler.cpp:235
 msgid "Luck"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:224
+#: src/net/tmwa/generalhandler.cpp:238
 msgid "Defense"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:225
+#: src/net/tmwa/generalhandler.cpp:239
 msgid "M.Attack"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:226
+#: src/net/tmwa/generalhandler.cpp:240
 msgid "M.Defense"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:227
+#: src/net/tmwa/generalhandler.cpp:241
 #, c-format
 msgid "% Accuracy"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:228
+#: src/net/tmwa/generalhandler.cpp:242
 #, c-format
 msgid "% Evade"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:229
+#: src/net/tmwa/generalhandler.cpp:243
 #, c-format
 msgid "% Critical"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:61 src/net/ea/gui/partytab.cpp:59
+#: src/net/tmwa/gui/guildtab.cpp:45
+msgid "Guild"
+msgstr ""
+
+#: src/net/tmwa/gui/guildtab.cpp:61 src/net/tmwa/gui/partytab.cpp:59
 msgid "/help > Display this help."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:62
+#: src/net/tmwa/gui/guildtab.cpp:62
 msgid "/invite > Invite a player to your guild"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:63
+#: src/net/tmwa/gui/guildtab.cpp:63
 msgid "/leave > Leave the guild you are in"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:64
+#: src/net/tmwa/gui/guildtab.cpp:64
 msgid "/kick > Kick some one from the guild you are in"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:73 src/net/ea/gui/partytab.cpp:73
+#: src/net/tmwa/gui/guildtab.cpp:73 src/net/tmwa/gui/partytab.cpp:73
 msgid "Command: /invite <nick>"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:74
+#: src/net/tmwa/gui/guildtab.cpp:74
 msgid "This command invites <nick> to the guild you're in."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:80 src/net/ea/gui/partytab.cpp:80
+#: src/net/tmwa/gui/guildtab.cpp:80 src/net/tmwa/gui/partytab.cpp:80
 msgid "Command: /leave"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:81
+#: src/net/tmwa/gui/guildtab.cpp:81
 #, fuzzy
 msgid "This command causes the player to leave the guild."
 msgstr "ამ კომანდას გამოაქ კონკრეტული რუქის სახელი"
 
-#: src/net/ea/gui/guildtab.cpp:89
+#: src/net/tmwa/gui/guildtab.cpp:89
 msgid "Guild name is missing."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:293
+#: src/net/tmwa/guildhandler.cpp:296
 msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:298
+#: src/net/tmwa/guildhandler.cpp:301
 msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:303
+#: src/net/tmwa/guildhandler.cpp:306
 msgid "User is now part of your guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:308
+#: src/net/tmwa/guildhandler.cpp:311
 msgid "Your guild is full."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:313
+#: src/net/tmwa/guildhandler.cpp:316
 msgid "Unknown guild invite response."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:390
+#: src/net/tmwa/guildhandler.cpp:393
 msgid "Guild creation isn't supported yet."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:60
+#: src/net/tmwa/gui/partytab.cpp:43
+msgid "Party"
+msgstr ""
+
+#: src/net/tmwa/gui/partytab.cpp:60
 msgid "/invite > Invite a player to your party"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:61
+#: src/net/tmwa/gui/partytab.cpp:61
 msgid "/leave > Leave the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:62
+#: src/net/tmwa/gui/partytab.cpp:62
 msgid "/kick > Kick some one from the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:63
+#: src/net/tmwa/gui/partytab.cpp:63
 msgid "/item > Show/change party item sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:64
+#: src/net/tmwa/gui/partytab.cpp:64
 msgid "/exp > Show/change party experience sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:81
+#: src/net/tmwa/gui/partytab.cpp:81
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:85
+#: src/net/tmwa/gui/partytab.cpp:85
 msgid "Command: /item <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:86
+#: src/net/tmwa/gui/partytab.cpp:86
 msgid "This command changes the party's item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:87
+#: src/net/tmwa/gui/partytab.cpp:87
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:90
+#: src/net/tmwa/gui/partytab.cpp:90
 msgid "Command: /item"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/tmwa/gui/partytab.cpp:91
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/tmwa/gui/partytab.cpp:95
 msgid "Command: /exp <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:96
+#: src/net/tmwa/gui/partytab.cpp:96
 msgid "This command changes the party's experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/tmwa/gui/partytab.cpp:97
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:100
+#: src/net/tmwa/gui/partytab.cpp:100
 msgid "Command: /exp"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/tmwa/gui/partytab.cpp:101
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:132 src/net/ea/partyhandler.cpp:198
+#: src/net/tmwa/gui/partytab.cpp:132 src/net/tmwa/partyhandler.cpp:196
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:135 src/net/ea/partyhandler.cpp:204
+#: src/net/tmwa/gui/partytab.cpp:135 src/net/tmwa/partyhandler.cpp:202
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:138 src/net/ea/partyhandler.cpp:210
+#: src/net/tmwa/gui/partytab.cpp:138 src/net/tmwa/partyhandler.cpp:208
 msgid "Item sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:141
+#: src/net/tmwa/gui/partytab.cpp:141
 msgid "Item sharing unknown."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:167 src/net/ea/partyhandler.cpp:174
+#: src/net/tmwa/gui/partytab.cpp:167 src/net/tmwa/partyhandler.cpp:172
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:170 src/net/ea/partyhandler.cpp:180
+#: src/net/tmwa/gui/partytab.cpp:170 src/net/tmwa/partyhandler.cpp:178
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:173 src/net/ea/partyhandler.cpp:186
+#: src/net/tmwa/gui/partytab.cpp:173 src/net/tmwa/partyhandler.cpp:184
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:176
+#: src/net/tmwa/gui/partytab.cpp:176
 msgid "Experience sharing unknown."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:281
+#: src/net/tmwa/inventoryhandler.cpp:285
 msgid "Failed to use item."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:391
+#: src/net/tmwa/inventoryhandler.cpp:399
 msgid "Unable to equip."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:402
+#: src/net/tmwa/inventoryhandler.cpp:410
 msgid "Unable to unequip."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:79
+#: src/net/tmwa/loginhandler.cpp:86
 msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:82 src/net/manaserv/loginhandler.cpp:121
-msgid "Old password incorrect."
-msgstr ""
-
-#: src/net/ea/loginhandler.cpp:85
+#: src/net/tmwa/loginhandler.cpp:92
 msgid "New password too short."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:88 src/net/ea/loginhandler.cpp:175
-#: src/net/manaserv/charhandler.cpp:158 src/net/manaserv/loginhandler.cpp:96
-#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
-#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
-#, fuzzy
-msgid "Unknown error."
-msgstr "უცნობი კომანდა."
-
-#: src/net/ea/loginhandler.cpp:149
+#: src/net/tmwa/loginhandler.cpp:156
 msgid "Unregistered ID."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:152
+#: src/net/tmwa/loginhandler.cpp:159
 msgid "Wrong password."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:155
+#: src/net/tmwa/loginhandler.cpp:162
 msgid "Account expired."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:158
+#: src/net/tmwa/loginhandler.cpp:165
 msgid "Rejected from server."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:161
+#: src/net/tmwa/loginhandler.cpp:168
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:165
+#: src/net/tmwa/loginhandler.cpp:172
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:172
+#: src/net/tmwa/loginhandler.cpp:179
 msgid "This user name is already taken."
 msgstr ""
 
-#: src/net/ea/network.cpp:145
+#: src/net/tmwa/network.cpp:145
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/ea/network.cpp:345
+#: src/net/tmwa/network.cpp:345
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/ea/network.cpp:414
+#: src/net/tmwa/network.cpp:414
 msgid "Connection to server terminated. "
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:81
+#: src/net/tmwa/partyhandler.cpp:82
 msgid "Could not create party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:84
+#: src/net/tmwa/partyhandler.cpp:84
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:118
+#: src/net/tmwa/partyhandler.cpp:119
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:122
+#: src/net/tmwa/partyhandler.cpp:123
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:126
+#: src/net/tmwa/partyhandler.cpp:127
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:130
+#: src/net/tmwa/partyhandler.cpp:131
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:238
+#: src/net/tmwa/partyhandler.cpp:236
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:249
+#: src/net/tmwa/partyhandler.cpp:246
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:301
+#: src/net/tmwa/partyhandler.cpp:299
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:329
-msgid "Inviting like this isn't supported at the moment."
+#: src/net/tmwa/partyhandler.cpp:335
+#, c-format
+msgid "Inviting failed, because you can't see a player called %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:334
+#: src/net/tmwa/partyhandler.cpp:340
 msgid "You can only inivte when you are in a party!"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:365
+#: src/net/tmwa/partyhandler.cpp:368
 #, c-format
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:304
-msgid "You are dead."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:305
-msgid "We regret to inform you that your character was killed in battle."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:307
-msgid "You are not that alive anymore."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:308
-msgid "The cold hands of the grim reaper are grabbing for your soul."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:309
-msgid "Game Over!"
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:105
+#: src/net/tmwa/playerhandler.cpp:100
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:310
-msgid ""
-"No, kids. Your character did not really die. It... err... went to a better "
-"place."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:312
-msgid ""
-"Your plan of breaking your enemies weapon by bashing it with your throat "
-"failed."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:314
-msgid "I guess this did not run too well."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:315
-msgid "Do you want your possessions identified?"
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:316
-msgid "Sadly, no trace of you was ever found..."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:317
-msgid "Annihilated."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:318
-msgid "Looks like you got your head handed to you."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:120 src/net/manaserv/beinghandler.cpp:319
-msgid ""
-"You screwed up again, dump your body down the tubes and get you another one."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/tmwa/playerhandler.cpp:118
 msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/tmwa/playerhandler.cpp:119
 msgid "You are no more."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/tmwa/playerhandler.cpp:120
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/tmwa/playerhandler.cpp:121
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/tmwa/playerhandler.cpp:122
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/tmwa/playerhandler.cpp:123
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/tmwa/playerhandler.cpp:124
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:130
+#: src/net/tmwa/playerhandler.cpp:125
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:131
+#: src/net/tmwa/playerhandler.cpp:126
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/tmwa/playerhandler.cpp:127
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/tmwa/playerhandler.cpp:128
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:135
+#: src/net/tmwa/playerhandler.cpp:130
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:136
+#: src/net/tmwa/playerhandler.cpp:131
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:249 src/net/ea/playerhandler.cpp:310
+#: src/net/tmwa/playerhandler.cpp:246 src/net/tmwa/playerhandler.cpp:285
 msgid "Message"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:250
+#: src/net/tmwa/playerhandler.cpp:247
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:333
+#: src/net/tmwa/playerhandler.cpp:313
 #, c-format
 msgid "You picked up %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:369
+#: src/net/tmwa/playerhandler.cpp:348
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:532
+#: src/net/tmwa/playerhandler.cpp:488
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:147
+#: src/net/tmwa/specialhandler.cpp:144
 msgid "Trade failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:150
+#: src/net/tmwa/specialhandler.cpp:147
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:153
+#: src/net/tmwa/specialhandler.cpp:150
 msgid "Sit failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:156
+#: src/net/tmwa/specialhandler.cpp:153
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:159
+#: src/net/tmwa/specialhandler.cpp:156
 msgid "Could not join party!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:162
+#: src/net/tmwa/specialhandler.cpp:159
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:171
+#: src/net/tmwa/specialhandler.cpp:168
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:174
+#: src/net/tmwa/specialhandler.cpp:171
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:177
+#: src/net/tmwa/specialhandler.cpp:174
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:180
+#: src/net/tmwa/specialhandler.cpp:177
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:183
+#: src/net/tmwa/specialhandler.cpp:180
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:186
+#: src/net/tmwa/specialhandler.cpp:183
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:189
+#: src/net/tmwa/specialhandler.cpp:186
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:192
+#: src/net/tmwa/specialhandler.cpp:189
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:195
+#: src/net/tmwa/specialhandler.cpp:192
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:198
+#: src/net/tmwa/specialhandler.cpp:195
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:201
+#: src/net/tmwa/specialhandler.cpp:198
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:210
+#: src/net/tmwa/specialhandler.cpp:207
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:213
+#: src/net/tmwa/specialhandler.cpp:210
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:216
+#: src/net/tmwa/specialhandler.cpp:213
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:116
-msgid "Request for Trade"
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:108 src/net/manaserv/tradehandler.cpp:117
-#, c-format
-msgid "%s wants to trade with you, do you accept?"
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:124
+#: src/net/tmwa/tradehandler.cpp:126
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:128
+#: src/net/tmwa/tradehandler.cpp:130
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:132
+#: src/net/tmwa/tradehandler.cpp:134
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:137
+#: src/net/tmwa/tradehandler.cpp:139
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:144
+#: src/net/tmwa/tradehandler.cpp:146
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:153
+#: src/net/tmwa/tradehandler.cpp:154
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:202
+#: src/net/tmwa/tradehandler.cpp:202
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:207
+#: src/net/tmwa/tradehandler.cpp:207
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:211
+#: src/net/tmwa/tradehandler.cpp:211
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:224 src/net/manaserv/tradehandler.cpp:149
-msgid "Trade canceled."
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:231 src/net/manaserv/tradehandler.cpp:156
-msgid "Trade completed."
-msgstr ""
-
-#: src/net/manaserv/beinghandler.cpp:324
-msgid "Press OK to respawn."
-msgstr ""
-
-#: src/net/manaserv/beinghandler.cpp:325
-msgid "You Died"
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:128 src/net/manaserv/charhandler.cpp:196
-msgid "Not logged in."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:131
-msgid "No empty slot."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:134
-msgid "Invalid name."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:137
-msgid "Character's name already exists."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:140
-msgid "Invalid hairstyle."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:143
-msgid "Invalid hair color."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:146
-msgid "Invalid gender."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:149
-msgid "Character's stats are too high."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:152
-msgid "Character's stats are too low."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:155
-msgid "One stat is zero."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:187
-msgid "Player deleted."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:199
-msgid "Selection out of range."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:202
-#, fuzzy, c-format
-msgid "Unknown error (%d)."
-msgstr "უცნობი კომანდა."
-
-#: src/net/manaserv/charhandler.cpp:242
-msgid "No gameservers are available."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:268
-msgid "Willpower:"
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
-#: src/net/manaserv/guildhandler.cpp:259
-#, c-format
-msgid "Topic: %s"
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
-msgid "Players in this channel:"
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:201
-msgid "Error joining channel."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:207
-msgid "Listing channels."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:219
-msgid "End of channel list."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:291
-#, c-format
-msgid "%s entered the channel."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:296
-#, c-format
-msgid "%s left the channel."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:312
-#, c-format
-msgid "%s has set mode %s on user %s."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:322
-#, c-format
-msgid "%s has kicked %s."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:327
-#, fuzzy
-msgid "Unknown channel event."
-msgstr "უცნობი კომანდა."
-
-#: src/net/manaserv/generalhandler.cpp:100
-#, c-format
-msgid "Willpower %+d"
-msgstr ""
-
-#: src/net/manaserv/generalhandler.cpp:171
-msgid "Willpower"
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:81
-msgid "Guild created."
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:86
-msgid "Error creating guild."
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:96
-msgid "Invite sent."
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:203
-msgid "Member was promoted successfully."
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:208
-msgid "Failed to promote member."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:87
-msgid "Wrong magic_token."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
-msgid "Already logged in."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:93 src/net/manaserv/loginhandler.cpp:272
-msgid "Server is full."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:118
-msgid "New password incorrect."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
-msgid "Account not connected. Please login first."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:149
-msgid "New email address incorrect."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:152
-msgid "Old email address incorrect."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:158
-msgid "The new email address already exists."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:239
-msgid ""
-"Client registration is not allowed. Please contact server administration."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
-msgid "Client version is too old."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:266
-msgid "Wrong username or password."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:275
-msgid "Login attempt too soon after previous attempt."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:303
-msgid "Wrong username, password or email address."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:306
-msgid "Username already exists."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:309
-msgid "Email address already exists."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:312
-msgid "You took too long with the captcha or your response was incorrect."
-msgstr ""
-
-#: src/net/manaserv/partyhandler.cpp:88
-msgid "Joined party."
-msgstr ""
-
-#: src/net/manaserv/partyhandler.cpp:106
-#, c-format
-msgid "%s joined the party."
-msgstr ""
-
-#: src/net/manaserv/partyhandler.cpp:123
-#, c-format
-msgid "%s rejected your invite."
-msgstr ""
-
-#: src/net/manaserv/tradehandler.cpp:96
-msgid "Accepting incoming trade requests."
-msgstr ""
-
-#: src/net/manaserv/tradehandler.cpp:98
-msgid "Ignoring incoming trade requests."
-msgstr ""
-
-#: src/net/manaserv/tradehandler.cpp:135
-#, c-format
-msgid "Trading with %s"
-msgstr ""
-
-#: src/playerrelations.cpp:304
+#: src/playerrelations.cpp:310
 msgid "Completely ignore"
 msgstr ""
 
-#: src/playerrelations.cpp:318
+#: src/playerrelations.cpp:324
 msgid "Print '...'"
 msgstr ""
 
-#: src/playerrelations.cpp:334
+#: src/playerrelations.cpp:340
 msgid "Blink name"
 msgstr ""
 
-#: src/playerrelations.cpp:371
-msgid "Floating '...' bubble"
-msgstr ""
-
-#: src/playerrelations.cpp:374
-msgid "Floating bubble"
-msgstr ""
-
-#: src/resources/itemdb.cpp:52
+#: src/resources/itemdb.cpp:44
 #, c-format
 msgid "Attack %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:53
+#: src/resources/itemdb.cpp:45
 #, c-format
 msgid "Defense %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:54
+#: src/resources/itemdb.cpp:46
 #, c-format
 msgid "HP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:55
+#: src/resources/itemdb.cpp:47
 #, c-format
 msgid "MP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:114
+#: src/resources/itemdb.cpp:92
 msgid "Unknown item"
 msgstr ""
 
-#: src/resources/itemdb.cpp:158 src/resources/monsterdb.cpp:45
-#: src/resources/monsterdb.cpp:67
+#: src/resources/itemdb.cpp:135 src/resources/monsterdb.cpp:77
 msgid "unnamed"
 msgstr ""
diff --git a/po/mana.pot b/po/mana.pot
index 7c5d2ec8..d380b9fb 100644
--- a/po/mana.pot
+++ b/po/mana.pot
@@ -8,444 +8,458 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2010-03-16 22:27+0100\n"
+"POT-Creation-Date: 2010-12-13 20:04+0100\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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: src/client.cpp:555 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
+#: src/client.cpp:598 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
 msgid "Setup"
 msgstr ""
 
-#: src/client.cpp:625
+#: src/client.cpp:679
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:652
+#: src/client.cpp:706
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:685
+#: src/client.cpp:739
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:741
+#: src/client.cpp:804
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:770
+#: src/client.cpp:833
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:801 src/client.cpp:808 src/client.cpp:942
+#: src/client.cpp:843
+msgid "Changing game servers"
+msgstr ""
+
+#: src/client.cpp:872 src/client.cpp:879 src/client.cpp:1014
 #: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
 #: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
-#: src/gui/serverdialog.cpp:241 src/gui/unregisterdialog.cpp:133
-#: src/net/ea/charserverhandler.cpp:135 src/net/ea/charserverhandler.cpp:152
-#: src/net/manaserv/charhandler.cpp:161 src/net/manaserv/charhandler.cpp:204
+#: src/gui/serverdialog.cpp:323 src/gui/unregisterdialog.cpp:133
+#: src/net/manaserv/charhandler.cpp:174 src/net/manaserv/charhandler.cpp:217
+#: src/net/tmwa/charserverhandler.cpp:134
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Error"
 msgstr ""
 
-#: src/client.cpp:817
+#: src/client.cpp:888
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:844
+#: src/client.cpp:915
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:845
+#: src/client.cpp:916
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:864
+#: src/client.cpp:935
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:865
+#: src/client.cpp:936
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:885
+#: src/client.cpp:956
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:886
+#: src/client.cpp:957
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1009 src/client.cpp:1032
+#: src/client.cpp:1138 src/client.cpp:1161
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1121
+#: src/client.cpp:1281
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1155 src/client.cpp:1161
+#: src/client.cpp:1315 src/client.cpp:1321
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/commandhandler.cpp:127 src/commandhandler.cpp:308
+#: src/commandhandler.cpp:131 src/commandhandler.cpp:317
 msgid "Unknown command."
 msgstr ""
 
-#: src/commandhandler.cpp:156
+#: src/commandhandler.cpp:160
 msgid "-- Help --"
 msgstr ""
 
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:161
 msgid "/help > Display this help"
 msgstr ""
 
-#: src/commandhandler.cpp:159
+#: src/commandhandler.cpp:163
 msgid "/where > Display map name"
 msgstr ""
 
-#: src/commandhandler.cpp:160
+#: src/commandhandler.cpp:164
 msgid "/who > Display number of online users"
 msgstr ""
 
-#: src/commandhandler.cpp:161
+#: src/commandhandler.cpp:165
 msgid "/me > Tell something about yourself"
 msgstr ""
 
-#: src/commandhandler.cpp:163
+#: src/commandhandler.cpp:167
 msgid "/clear > Clears this window"
 msgstr ""
 
-#: src/commandhandler.cpp:165
+#: src/commandhandler.cpp:169
 msgid "/msg > Send a private message to a user"
 msgstr ""
 
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:170
 msgid "/whisper > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:167
+#: src/commandhandler.cpp:171
 msgid "/w > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:168
+#: src/commandhandler.cpp:172
 msgid "/query > Makes a tab for private messages with another user"
 msgstr ""
 
-#: src/commandhandler.cpp:169
+#: src/commandhandler.cpp:174
 msgid "/q > Alias of query"
 msgstr ""
 
-#: src/commandhandler.cpp:171
+#: src/commandhandler.cpp:176
 msgid "/ignore > ignore a player"
 msgstr ""
 
-#: src/commandhandler.cpp:172
+#: src/commandhandler.cpp:177
 msgid "/unignore > stop ignoring a player"
 msgstr ""
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:179
 msgid "/list > Display all public channels"
 msgstr ""
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:180
 msgid "/join > Join or create a channel"
 msgstr ""
 
-#: src/commandhandler.cpp:177
+#: src/commandhandler.cpp:182
 msgid "/createparty > Create a new party"
 msgstr ""
 
-#: src/commandhandler.cpp:178
+#: src/commandhandler.cpp:183
 msgid "/party > Invite a user to party"
 msgstr ""
 
-#: src/commandhandler.cpp:180
+#: src/commandhandler.cpp:185
 msgid "/record > Start recording the chat to an external file"
 msgstr ""
 
-#: src/commandhandler.cpp:181
+#: src/commandhandler.cpp:187
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr ""
 
-#: src/commandhandler.cpp:182
+#: src/commandhandler.cpp:189
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
 
-#: src/commandhandler.cpp:184
+#: src/commandhandler.cpp:192
 msgid "/announce > Global announcement (GM only)"
 msgstr ""
 
-#: src/commandhandler.cpp:188
+#: src/commandhandler.cpp:196
 msgid "For more information, type /help <command>."
 msgstr ""
 
-#: src/commandhandler.cpp:192
+#: src/commandhandler.cpp:200
 msgid "Command: /help"
 msgstr ""
 
-#: src/commandhandler.cpp:193
+#: src/commandhandler.cpp:201
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: src/commandhandler.cpp:194
+#: src/commandhandler.cpp:203
 msgid "Command: /help <command>"
 msgstr ""
 
-#: src/commandhandler.cpp:195
+#: src/commandhandler.cpp:204
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/commandhandler.cpp:203
+#: src/commandhandler.cpp:212
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: src/commandhandler.cpp:204
+#: src/commandhandler.cpp:213
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/commandhandler.cpp:205
+#: src/commandhandler.cpp:214
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:210
+#: src/commandhandler.cpp:219
 msgid "Command: /clear"
 msgstr ""
 
-#: src/commandhandler.cpp:211
+#: src/commandhandler.cpp:220
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:224
 msgid "Command: /ignore <player>"
 msgstr ""
 
-#: src/commandhandler.cpp:216
+#: src/commandhandler.cpp:225
 msgid "This command ignores the given player regardless of current relations."
 msgstr ""
 
-#: src/commandhandler.cpp:221
+#: src/commandhandler.cpp:230
 msgid "Command: /join <channel>"
 msgstr ""
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:231
 msgid "This command makes you enter <channel>."
 msgstr ""
 
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:232
 msgid "If <channel> doesn't exist, it's created."
 msgstr ""
 
-#: src/commandhandler.cpp:227
+#: src/commandhandler.cpp:236
 msgid "Command: /list"
 msgstr ""
 
-#: src/commandhandler.cpp:228
+#: src/commandhandler.cpp:237
 msgid "This command shows a list of all channels."
 msgstr ""
 
-#: src/commandhandler.cpp:232
+#: src/commandhandler.cpp:241
 msgid "Command: /me <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:233
+#: src/commandhandler.cpp:242
 msgid "This command tell others you are (doing) <msg>."
 msgstr ""
 
-#: src/commandhandler.cpp:237
+#: src/commandhandler.cpp:246
 msgid "Command: /msg <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:238
+#: src/commandhandler.cpp:247
 msgid "Command: /whisper <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:239
+#: src/commandhandler.cpp:248
 msgid "Command: /w <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:240
+#: src/commandhandler.cpp:249
 msgid "This command sends the text <message> to <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:241 src/commandhandler.cpp:260
+#: src/commandhandler.cpp:250 src/commandhandler.cpp:269
 #: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
-#: src/net/ea/gui/guildtab.cpp:75 src/net/ea/gui/partytab.cpp:75
+#: src/net/tmwa/gui/guildtab.cpp:75 src/net/tmwa/gui/partytab.cpp:75
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:255
 msgid "Command: /query <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:247
+#: src/commandhandler.cpp:256
 msgid "Command: /q <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:248
+#: src/commandhandler.cpp:257
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:253
+#: src/commandhandler.cpp:262
 msgid "Command: /createparty <name>"
 msgstr ""
 
-#: src/commandhandler.cpp:254
+#: src/commandhandler.cpp:263
 msgid "This command creates a new party called <name>."
 msgstr ""
 
-#: src/commandhandler.cpp:258
+#: src/commandhandler.cpp:267
 msgid "Command: /party <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:259 src/net/ea/gui/partytab.cpp:74
+#: src/commandhandler.cpp:268 src/net/tmwa/gui/partytab.cpp:74
 msgid "This command invites <nick> to party with you."
 msgstr ""
 
-#: src/commandhandler.cpp:265
+#: src/commandhandler.cpp:274
 msgid "Command: /present"
 msgstr ""
 
-#: src/commandhandler.cpp:266
+#: src/commandhandler.cpp:275
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: src/commandhandler.cpp:272
+#: src/commandhandler.cpp:281
 msgid "Command: /record <filename>"
 msgstr ""
 
-#: src/commandhandler.cpp:273
+#: src/commandhandler.cpp:282
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr ""
 
-#: src/commandhandler.cpp:275
+#: src/commandhandler.cpp:284
 msgid "Command: /record"
 msgstr ""
 
-#: src/commandhandler.cpp:276
+#: src/commandhandler.cpp:285
 msgid "This command finishes a recording session."
 msgstr ""
 
-#: src/commandhandler.cpp:280
+#: src/commandhandler.cpp:289
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: src/commandhandler.cpp:281
+#: src/commandhandler.cpp:290
 msgid ""
 "This command sets whether the return key should toggle the chat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: src/commandhandler.cpp:283
+#: src/commandhandler.cpp:292
 msgid ""
-"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
-"\", \"no\", \"false\" to turn the toggle off."
+"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
+"\"0\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: src/commandhandler.cpp:286
+#: src/commandhandler.cpp:295
 msgid "Command: /toggle"
 msgstr ""
 
-#: src/commandhandler.cpp:287
+#: src/commandhandler.cpp:296
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: src/commandhandler.cpp:291 src/gui/widgets/whispertab.cpp:93
+#: src/commandhandler.cpp:300 src/gui/widgets/whispertab.cpp:95
 msgid "Command: /unignore <player>"
 msgstr ""
 
-#: src/commandhandler.cpp:292
+#: src/commandhandler.cpp:301
 msgid "This command stops ignoring the given player if they are being ignored"
 msgstr ""
 
-#: src/commandhandler.cpp:297
+#: src/commandhandler.cpp:306
 msgid "Command: /where"
 msgstr ""
 
-#: src/commandhandler.cpp:298
+#: src/commandhandler.cpp:307
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: src/commandhandler.cpp:302
+#: src/commandhandler.cpp:311
 msgid "Command: /who"
 msgstr ""
 
-#: src/commandhandler.cpp:303
+#: src/commandhandler.cpp:312
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:309
+#: src/commandhandler.cpp:318
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: src/commandhandler.cpp:375
+#: src/commandhandler.cpp:384
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:383
+#: src/commandhandler.cpp:392
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:397
+#: src/commandhandler.cpp:406
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:410 src/net/ea/gui/partytab.cpp:109
+#: src/commandhandler.cpp:419 src/net/tmwa/gui/partytab.cpp:109
 msgid "Party name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:423 src/commandhandler.cpp:471
-#: src/commandhandler.cpp:493
+#: src/commandhandler.cpp:432 src/commandhandler.cpp:509
+#: src/commandhandler.cpp:531
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:441
+#: src/commandhandler.cpp:450
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:441
+#: src/commandhandler.cpp:450
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:450
+#: src/commandhandler.cpp:459
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:454
+#: src/commandhandler.cpp:463
 msgid "Message now closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:477
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:489
+msgid "Show IP: On"
+msgstr ""
+
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:485
+msgid "Show IP: Off"
+msgstr ""
+
+#: src/commandhandler.cpp:515
 msgid "Player already ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:484
+#: src/commandhandler.cpp:522
 msgid "Player successfully ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:486
+#: src/commandhandler.cpp:524
 msgid "Player could not be ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:501
+#: src/commandhandler.cpp:539
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:506
+#: src/commandhandler.cpp:544
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:508
+#: src/commandhandler.cpp:546
 msgid "Player could not be unignored!"
 msgstr ""
 
@@ -458,40 +472,40 @@ msgstr ""
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:326
+#: src/game.cpp:342
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:331
+#: src/game.cpp:347
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:355
+#: src/game.cpp:378
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:360
+#: src/game.cpp:382
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:705
+#: src/game.cpp:721
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:712
+#: src/game.cpp:726
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:946
+#: src/game.cpp:954
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:947
+#: src/game.cpp:955
 #, c-format
 msgid "Error while loading %s"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:75
+#: src/gui/beingpopup.cpp:76
 #, c-format
 msgid "Party: %s"
 msgstr ""
@@ -500,34 +514,34 @@ msgstr ""
 msgid "Buy"
 msgstr ""
 
-#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
-#: src/gui/sell.cpp:276
+#: src/gui/buy.cpp:69 src/gui/buy.cpp:261 src/gui/sell.cpp:71
+#: src/gui/sell.cpp:288
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:99 src/gui/npcdialog.cpp:100
-#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:404
+#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:112 src/gui/npcdialog.cpp:124
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:463
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:98 src/gui/npcdialog.cpp:101
-#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:416
+#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:111 src/gui/npcdialog.cpp:125
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:475
 msgid "-"
 msgstr ""
 
 #: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
-#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:152
-#: src/keyboardconfig.cpp:103
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:228
+#: src/keyboardconfig.cpp:102
 msgid "Quit"
 msgstr ""
 
-#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:333
-#: src/gui/statuswindow.cpp:403 src/gui/statuswindow.cpp:437
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:384
+#: src/gui/statuswindow.cpp:462 src/gui/statuswindow.cpp:496
 msgid "Max"
 msgstr ""
 
@@ -541,11 +555,11 @@ msgstr ""
 
 #: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
 #: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
-#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:101
-#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:178
-#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:402
+#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:114
+#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:389
 #: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
-#: src/gui/socialwindow.cpp:243 src/gui/textdialog.cpp:39
+#: src/gui/socialwindow.cpp:275 src/gui/textdialog.cpp:40
 #: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr ""
@@ -582,7 +596,7 @@ msgstr ""
 msgid "Change Password"
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:53
+#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:55
 #: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
 msgid "Password:"
 msgstr ""
@@ -613,19 +627,19 @@ msgstr ""
 msgid "Create Character"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:52
+#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:54
 #: src/gui/register.cpp:67
 msgid "Name:"
 msgstr ""
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
 #: src/gui/outfitwindow.cpp:67
 msgid ">"
 msgstr ""
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
 #: src/gui/outfitwindow.cpp:66
@@ -640,8 +654,8 @@ msgstr ""
 msgid "Hair style:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:397
-#: src/gui/socialwindow.cpp:297
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:392
+#: src/gui/socialwindow.cpp:329
 msgid "Create"
 msgstr ""
 
@@ -696,33 +710,33 @@ msgstr ""
 msgid "Change Email"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:155
-#: src/gui/setup_players.cpp:230
+#: src/gui/charselectdialog.cpp:336 src/gui/serverdialog.cpp:231
+#: src/gui/setup_players.cpp:229
 msgid "Delete"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:387
+#: src/gui/charselectdialog.cpp:380
 msgid "Choose"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:399 src/gui/charselectdialog.cpp:400
+#: src/gui/charselectdialog.cpp:394 src/gui/charselectdialog.cpp:395
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:77
+#: src/gui/chat.cpp:88
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chat.cpp:287
+#: src/gui/chat.cpp:311
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:305
+#: src/gui/chat.cpp:329
 msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:469
+#: src/gui/chat.cpp:493
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -788,136 +802,166 @@ msgstr ""
 msgid "Equipment"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:78
-#: src/gui/inventorywindow.cpp:80 src/gui/inventorywindow.cpp:291
-#: src/gui/popupmenu.cpp:372
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:89
+#: src/gui/inventorywindow.cpp:337 src/gui/popupmenu.cpp:359
 msgid "Unequip"
 msgstr ""
 
-#: src/gui/help.cpp:36
+#: src/gui/help.cpp:37
 msgid "Help"
 msgstr ""
 
-#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:74
+#: src/gui/help.cpp:51 src/gui/npcdialog.cpp:50
 msgid "Close"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:57 src/gui/windowmenu.cpp:56
+#: src/gui/inventorywindow.cpp:59 src/gui/windowmenu.cpp:56
 msgid "Inventory"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:75
-#: src/gui/inventorywindow.cpp:293 src/gui/popupmenu.cpp:374
+#: src/gui/inventorywindow.cpp:59
+msgid "Storage"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:82
+msgid "Slots:"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:87 src/gui/inventorywindow.cpp:100
+#: src/gui/inventorywindow.cpp:339 src/gui/popupmenu.cpp:361
 msgid "Equip"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:74 src/gui/inventorywindow.cpp:75
-#: src/gui/inventorywindow.cpp:297 src/gui/popupmenu.cpp:377
+#: src/gui/inventorywindow.cpp:88
 msgid "Use"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:84 src/gui/inventorywindow.cpp:301
-#: src/gui/popupmenu.cpp:380
+#: src/gui/inventorywindow.cpp:101 src/gui/popupmenu.cpp:364
+msgid "Activate"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:102 src/gui/inventorywindow.cpp:348
+#: src/gui/popupmenu.cpp:367
 msgid "Drop..."
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:85 src/gui/popupmenu.cpp:386
+#: src/gui/inventorywindow.cpp:103 src/gui/popupmenu.cpp:373
 msgid "Split"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:86 src/gui/outfitwindow.cpp:51
+#: src/gui/inventorywindow.cpp:104 src/gui/outfitwindow.cpp:51
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:97 src/gui/storagewindow.cpp:84
-msgid "Slots:"
+#: src/gui/inventorywindow.cpp:106
+msgid "Weight:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:98
-msgid "Weight:"
+#: src/gui/inventorywindow.cpp:124 src/gui/popupmenu.cpp:378
+msgid "Store"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:303 src/gui/popupmenu.cpp:382
+#: src/gui/inventorywindow.cpp:125 src/gui/popupmenu.cpp:385
+msgid "Retrieve"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:350 src/gui/popupmenu.cpp:369
 msgid "Drop"
 msgstr ""
 
-#: src/gui/itemamount.cpp:100 src/gui/okdialog.cpp:42
-#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:38 src/gui/trade.cpp:73
-#: src/gui/trade.cpp:75
+#: src/gui/itemamount.cpp:113 src/gui/okdialog.cpp:42
+#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:39 src/gui/trade.cpp:72
+#: src/gui/trade.cpp:74
 msgid "OK"
 msgstr ""
 
-#: src/gui/itemamount.cpp:102
+#: src/gui/itemamount.cpp:115
 msgid "All"
 msgstr ""
 
-#: src/gui/itemamount.cpp:128
+#: src/gui/itemamount.cpp:141
 msgid "Select amount of items to trade."
 msgstr ""
 
-#: src/gui/itemamount.cpp:131
+#: src/gui/itemamount.cpp:144
 msgid "Select amount of items to drop."
 msgstr ""
 
-#: src/gui/itemamount.cpp:134
+#: src/gui/itemamount.cpp:147
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/itemamount.cpp:137
+#: src/gui/itemamount.cpp:150
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamount.cpp:140
+#: src/gui/itemamount.cpp:153
 msgid "Select amount of items to split."
 msgstr ""
 
-#: src/gui/itempopup.cpp:92
+#: src/gui/itempopup.cpp:137
 #, c-format
 msgid "Weight: %s"
 msgstr ""
 
-#: src/gui/login.cpp:49 src/gui/login.cpp:61
+#: src/gui/login.cpp:51 src/gui/login.cpp:63
 msgid "Login"
 msgstr ""
 
-#: src/gui/login.cpp:58
+#: src/gui/login.cpp:60
 msgid "Remember username"
 msgstr ""
 
-#: src/gui/login.cpp:59 src/gui/register.cpp:58 src/gui/register.cpp:73
+#: src/gui/login.cpp:61 src/gui/register.cpp:58 src/gui/register.cpp:73
 msgid "Register"
 msgstr ""
 
-#: src/gui/login.cpp:60
+#: src/gui/login.cpp:62
 msgid "Change Server"
 msgstr ""
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
+#: src/gui/login.cpp:129
+msgid "Registration disabled"
+msgstr ""
+
+#: src/gui/login.cpp:129
+msgid "You need to use the website to register an account for this server."
+msgstr ""
+
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:86
 msgid "Map"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:44
+#: src/gui/ministatus.cpp:235
+msgid "Need"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:48
 msgid "Waiting for server"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:45
+#: src/gui/npcdialog.cpp:49
 msgid "Next"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:47
+#: src/gui/npcdialog.cpp:51
 msgid "Submit"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:52 src/gui/npcpostdialog.cpp:41
+#: src/gui/npcdialog.cpp:73 src/gui/npcpostdialog.cpp:41
 msgid "NPC"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:110
+#: src/gui/npcdialog.cpp:118
+msgid "Clear log"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:134
 msgid "Reset"
 msgstr ""
 
 #. TRANSLATORS: Please leave the \n sequences intact.
-#: src/gui/npcdialog.cpp:171
+#: src/gui/npcdialog.cpp:208
 msgid ""
 "\n"
 "> Next\n"
@@ -931,7 +975,7 @@ msgstr ""
 msgid "Send"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:96
+#: src/gui/npcpostdialog.cpp:99
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
@@ -945,95 +989,82 @@ msgstr ""
 msgid "Unequip first"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:84
+#: src/gui/popupmenu.cpp:83
 #, c-format
 msgid "Trade with %s..."
 msgstr ""
 
-#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:161
+#: src/gui/popupmenu.cpp:87 src/gui/popupmenu.cpp:158
 #, c-format
 msgid "Attack %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:92
+#: src/gui/popupmenu.cpp:91
 #, c-format
 msgid "Whisper %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:101
+#: src/gui/popupmenu.cpp:100
 #, c-format
 msgid "Befriend %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:106
+#: src/gui/popupmenu.cpp:105
 #, c-format
 msgid "Disregard %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:109
+#: src/gui/popupmenu.cpp:108
 #, c-format
 msgid "Ignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:115 src/gui/popupmenu.cpp:124
+#: src/gui/popupmenu.cpp:114 src/gui/popupmenu.cpp:123
 #, c-format
 msgid "Unignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:118
+#: src/gui/popupmenu.cpp:117
 #, c-format
 msgid "Completely ignore %s"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:130
 #, c-format
-msgid "Follow %s"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:133
-#, c-format
 msgid "Invite %s to join your guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:137
+#: src/gui/popupmenu.cpp:134
 #, c-format
 msgid "Invite %s to join your party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144
+#: src/gui/popupmenu.cpp:141
 msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:153
+#: src/gui/popupmenu.cpp:150
 #, c-format
 msgid "Talk to %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:166
+#: src/gui/popupmenu.cpp:163
 msgid "Kick monster"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:174
+#: src/gui/popupmenu.cpp:171
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:191
+#: src/gui/popupmenu.cpp:188
 #, c-format
 msgid "Pick up %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:400
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:387
 msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:71
-msgid "Store"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:72
-msgid "Retrieve"
-msgstr ""
-
 #: src/gui/quitdialog.cpp:44
 msgid "Switch server"
 msgstr ""
@@ -1102,47 +1133,60 @@ msgstr ""
 msgid "Passwords do not match."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:124
+#: src/gui/serverdialog.cpp:197
 msgid "Choose Your Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:131 src/gui/widgets/chattab.cpp:139
+#: src/gui/serverdialog.cpp:206 src/gui/widgets/chattab.cpp:142
 msgid "Server:"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:132
+#: src/gui/serverdialog.cpp:207
 msgid "Port:"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:133
+#: src/gui/serverdialog.cpp:208
 msgid "Server type:"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:153
+#: src/gui/serverdialog.cpp:229
 msgid "Connect"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:154
+#: src/gui/serverdialog.cpp:230
 msgid "Custom Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:242
+#: src/gui/serverdialog.cpp:324
 msgid "Please type both the address and the port of a server."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:357
+#: src/gui/serverdialog.cpp:441
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:363
+#: src/gui/serverdialog.cpp:447
 msgid "Waiting for server..."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:367
+#: src/gui/serverdialog.cpp:451
 msgid "Preparing download"
 msgstr ""
 
+#: src/gui/serverdialog.cpp:455
+msgid "Error retreiving server list!"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:550
+msgid "requires a newer version"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:552
+#, c-format
+msgid "requires v%s"
+msgstr ""
+
 #: src/gui/setup_audio.cpp:42
 msgid "Sound"
 msgstr ""
@@ -1175,50 +1219,50 @@ msgstr ""
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:45
+#: src/gui/setup_colors.cpp:46
 msgid "This is what the color looks like"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:50
+#: src/gui/setup_colors.cpp:51
 msgid "Colors"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:71
+#: src/gui/setup_colors.cpp:72
 msgid "Type:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:82 src/gui/setup_colors.cpp:330
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:331
 msgid "Static"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:84 src/gui/setup_colors.cpp:85
-#: src/gui/setup_colors.cpp:331
+#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
+#: src/gui/setup_colors.cpp:332
 msgid "Pulse"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:87
-#: src/gui/setup_colors.cpp:332
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
+#: src/gui/setup_colors.cpp:333
 msgid "Rainbow"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
-#: src/gui/setup_colors.cpp:332
+#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
+#: src/gui/setup_colors.cpp:333
 msgid "Spectrum"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:94
 msgid "Delay:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:108
+#: src/gui/setup_colors.cpp:109
 msgid "Red:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:123
+#: src/gui/setup_colors.cpp:124
 msgid "Green:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:138
+#: src/gui/setup_colors.cpp:139
 msgid "Blue:"
 msgstr ""
 
@@ -1274,559 +1318,565 @@ msgstr ""
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_players.cpp:57
+#: src/gui/setup_players.cpp:58
 msgid "Name"
 msgstr ""
 
-#: src/gui/setup_players.cpp:58
+#: src/gui/setup_players.cpp:59
 msgid "Relation"
 msgstr ""
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:64
 msgid "Neutral"
 msgstr ""
 
-#: src/gui/setup_players.cpp:64
+#: src/gui/setup_players.cpp:65
 msgid "Friend"
 msgstr ""
 
-#: src/gui/setup_players.cpp:65
+#: src/gui/setup_players.cpp:66
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_players.cpp:67
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_players.cpp:208 src/gui/setup_video.cpp:132
+#: src/gui/setup_players.cpp:206 src/gui/setup_video.cpp:153
 msgid "???"
 msgstr ""
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_players.cpp:225
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_players.cpp:228
+#: src/gui/setup_players.cpp:227
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:231
 msgid "Put all whispers in tabs"
 msgstr ""
 
-#: src/gui/setup_players.cpp:234
+#: src/gui/setup_players.cpp:233
 msgid "Show gender"
 msgstr ""
 
-#: src/gui/setup_players.cpp:236
+#: src/gui/setup_players.cpp:235
+msgid "Enable Chat log"
+msgstr ""
+
+#: src/gui/setup_players.cpp:237
 msgid "Players"
 msgstr ""
 
-#: src/gui/setup_players.cpp:261
+#: src/gui/setup_players.cpp:262
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:113
+#: src/gui/setup_video.cpp:134
 msgid "Tiny"
 msgstr ""
 
-#: src/gui/setup_video.cpp:114
+#: src/gui/setup_video.cpp:135
 msgid "Small"
 msgstr ""
 
-#: src/gui/setup_video.cpp:115
+#: src/gui/setup_video.cpp:136
 msgid "Medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:116
+#: src/gui/setup_video.cpp:137
 msgid "Large"
 msgstr ""
 
-#: src/gui/setup_video.cpp:142
+#: src/gui/setup_video.cpp:163
 msgid "No text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:143
+#: src/gui/setup_video.cpp:164
 msgid "Text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:144
+#: src/gui/setup_video.cpp:165
 msgid "Bubbles, no names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:145
+#: src/gui/setup_video.cpp:166
 msgid "Bubbles with names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:157
+#: src/gui/setup_video.cpp:178
 msgid "off"
 msgstr ""
 
-#: src/gui/setup_video.cpp:158 src/gui/setup_video.cpp:171
+#: src/gui/setup_video.cpp:179 src/gui/setup_video.cpp:192
 msgid "low"
 msgstr ""
 
-#: src/gui/setup_video.cpp:159 src/gui/setup_video.cpp:173
+#: src/gui/setup_video.cpp:180 src/gui/setup_video.cpp:194
 msgid "high"
 msgstr ""
 
-#: src/gui/setup_video.cpp:172
+#: src/gui/setup_video.cpp:193
 msgid "medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:174
+#: src/gui/setup_video.cpp:195
 msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:196
+#: src/gui/setup_video.cpp:217
 msgid "Full screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:197
+#: src/gui/setup_video.cpp:218
 msgid "OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:198
+#: src/gui/setup_video.cpp:219
 msgid "Custom cursor"
 msgstr ""
 
-#: src/gui/setup_video.cpp:200
+#: src/gui/setup_video.cpp:221
 msgid "Visible names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:223
 msgid "Particle effects"
 msgstr ""
 
-#: src/gui/setup_video.cpp:204
+#: src/gui/setup_video.cpp:225
 msgid "Show own name"
 msgstr ""
 
-#: src/gui/setup_video.cpp:205
+#: src/gui/setup_video.cpp:226
+msgid "Log NPC dialogue"
+msgstr ""
+
+#: src/gui/setup_video.cpp:227
 msgid "Show pickup notification"
 msgstr ""
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:207
+#. TRANSLATORS: Refers to "Show pickup notification"
+#: src/gui/setup_video.cpp:229
 msgid "in chat"
 msgstr ""
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:209
+#. TRANSLATORS: Refers to "Show pickup notification"
+#: src/gui/setup_video.cpp:231
 msgid "as particle"
 msgstr ""
 
-#: src/gui/setup_video.cpp:214
+#: src/gui/setup_video.cpp:236
 msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:225
+#: src/gui/setup_video.cpp:247
+msgid "Disable transparency (Low CPU mode)"
+msgstr ""
+
+#: src/gui/setup_video.cpp:250
 msgid "Video"
 msgstr ""
 
-#: src/gui/setup_video.cpp:227
-msgid "Show monster damage"
+#: src/gui/setup_video.cpp:252
+msgid "Show damage"
 msgstr ""
 
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:258
 msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:259
 msgid "Gui opacity"
 msgstr ""
 
-#: src/gui/setup_video.cpp:235
+#: src/gui/setup_video.cpp:260
 msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_video.cpp:236
+#: src/gui/setup_video.cpp:261
 msgid "Particle detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237
+#: src/gui/setup_video.cpp:262
 msgid "Font size"
 msgstr ""
 
-#: src/gui/setup_video.cpp:251 src/gui/setup_video.cpp:454
-#: src/gui/setup_video.cpp:568
+#: src/gui/setup_video.cpp:277 src/gui/setup_video.cpp:532
+#: src/gui/setup_video.cpp:662
 msgid "None"
 msgstr ""
 
-#: src/gui/setup_video.cpp:381
+#: src/gui/setup_video.cpp:426
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:387
+#: src/gui/setup_video.cpp:432
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:398
+#: src/gui/setup_video.cpp:443
 msgid "Switching to Full Screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:399
+#: src/gui/setup_video.cpp:444
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:411
+#: src/gui/setup_video.cpp:458
 msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:412
+#: src/gui/setup_video.cpp:459
+msgid ""
+"Applying change to OpenGL requires restart. In case OpenGL messes up your "
+"game graphics, restart the game with the command line option \"--no-opengl\"."
+msgstr ""
+
+#: src/gui/setup_video.cpp:466
+msgid "Deactivating OpenGL"
+msgstr ""
+
+#: src/gui/setup_video.cpp:467
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#: src/gui/setup_video.cpp:486 src/gui/setup_video.cpp:491
+#: src/gui/setup_video.cpp:475
+msgid "Transparency disabled"
+msgstr ""
+
+#: src/gui/setup_video.cpp:476 src/gui/setup_video.cpp:484
+msgid "You must restart to apply changes."
+msgstr ""
+
+#: src/gui/setup_video.cpp:483
+msgid "Transparency enabled"
+msgstr ""
+
+#: src/gui/setup_video.cpp:576 src/gui/setup_video.cpp:581
 msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:487 src/gui/setup_video.cpp:492
+#: src/gui/setup_video.cpp:577 src/gui/setup_video.cpp:582
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:489
+#: src/gui/setup_video.cpp:579
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:522
+#: src/gui/setup_video.cpp:612
 msgid "Particle Effect Settings Changed."
 msgstr ""
 
-#: src/gui/setup_video.cpp:523
+#: src/gui/setup_video.cpp:613
 msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skilldialog.cpp:198 src/gui/windowmenu.cpp:59
+#: src/gui/skilldialog.cpp:212 src/gui/windowmenu.cpp:59
 msgid "Skills"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:209
+#: src/gui/skilldialog.cpp:223
 msgid "Up"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:263
+#: src/gui/skilldialog.cpp:269
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:315
+#: src/gui/skilldialog.cpp:351
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:324
+#: src/gui/skilldialog.cpp:360
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:406
+#: src/gui/skilldialog.cpp:442
 #, c-format
 msgid "Lvl: %d (%+d)"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:417
+#: src/gui/skilldialog.cpp:453
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:118
+#: src/gui/socialwindow.cpp:126
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:127
+#: src/gui/socialwindow.cpp:139
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:137
+#: src/gui/socialwindow.cpp:153
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:138
+#: src/gui/socialwindow.cpp:154
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:147
+#: src/gui/socialwindow.cpp:163
 msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:148
+#: src/gui/socialwindow.cpp:164
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:183
+#: src/gui/socialwindow.cpp:207 src/net/tmwa/partyhandler.cpp:330
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:190
+#: src/gui/socialwindow.cpp:218
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:200
+#: src/gui/socialwindow.cpp:232
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:201
+#: src/gui/socialwindow.cpp:233
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:210
+#: src/gui/socialwindow.cpp:242
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:211
+#: src/gui/socialwindow.cpp:243
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:240
+#: src/gui/socialwindow.cpp:272
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:241 src/gui/socialwindow.cpp:565
+#: src/gui/socialwindow.cpp:273 src/gui/socialwindow.cpp:620
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:280 src/gui/windowmenu.cpp:64
+#: src/gui/socialwindow.cpp:312 src/gui/windowmenu.cpp:64
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:298
+#: src/gui/socialwindow.cpp:330
 msgid "Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:299
+#: src/gui/socialwindow.cpp:331
 msgid "Leave"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:395
+#: src/gui/socialwindow.cpp:443
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:401
+#: src/gui/socialwindow.cpp:449
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:414
+#: src/gui/socialwindow.cpp:462
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:420
+#: src/gui/socialwindow.cpp:468
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:464
+#: src/gui/socialwindow.cpp:497
+msgid "Creating guild failed, please choose a shorter name."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:504
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:478
+#: src/gui/socialwindow.cpp:520
+msgid "Creating party failed, please choose a shorter name."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:527
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:485
+#: src/gui/socialwindow.cpp:541
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:486
+#: src/gui/socialwindow.cpp:542
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:498
+#: src/gui/socialwindow.cpp:554
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:503
+#: src/gui/socialwindow.cpp:559
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:508
+#: src/gui/socialwindow.cpp:564
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:520
+#: src/gui/socialwindow.cpp:576
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:530
+#: src/gui/socialwindow.cpp:585
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:534
+#: src/gui/socialwindow.cpp:589
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:542
+#: src/gui/socialwindow.cpp:597
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:547
+#: src/gui/socialwindow.cpp:602
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:555
+#: src/gui/socialwindow.cpp:610
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:566
+#: src/gui/socialwindow.cpp:621
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:571
+#: src/gui/socialwindow.cpp:626
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:572
+#: src/gui/socialwindow.cpp:627
 msgid "Choose your party's name."
 msgstr ""
 
-#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:62
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:62
 msgid "Specials"
 msgstr ""
 
-#: src/gui/specialswindow.cpp:174
-#, c-format
-msgid "Specials Set %d"
-msgstr ""
-
-#: src/gui/specialswindow.cpp:191
-#, c-format
-msgid "Special %d"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:247
+#: src/gui/statuswindow.cpp:113 src/gui/statuswindow.cpp:215
+#: src/gui/statuswindow.cpp:262
 #, c-format
 msgid "Level: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:101 src/gui/statuswindow.cpp:211
+#: src/gui/statuswindow.cpp:114 src/gui/statuswindow.cpp:208
+#: src/gui/statuswindow.cpp:239
 #, c-format
 msgid "Money: %s"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:104
+#: src/gui/statuswindow.cpp:117
 msgid "HP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:109
+#: src/gui/statuswindow.cpp:122
 msgid "Exp:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:114
+#: src/gui/statuswindow.cpp:130
 msgid "MP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:132 src/gui/statuswindow.cpp:219
+#: src/gui/statuswindow.cpp:158 src/gui/statuswindow.cpp:275
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:133
+#: src/gui/statuswindow.cpp:159
 msgid "Job:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:194
-msgid "HP"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:200
-msgid "MP"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:206
-msgid "Exp"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:215
-msgid "Money"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:225
-msgid "Job"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:229
+#: src/gui/statuswindow.cpp:211 src/gui/statuswindow.cpp:247
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:235
+#: src/gui/statuswindow.cpp:255
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:251
-msgid "Level"
-msgstr ""
-
-#: src/gui/storagewindow.cpp:59
-msgid "Storage"
-msgstr ""
-
-#: src/gui/trade.cpp:52
+#: src/gui/trade.cpp:53
 msgid "Propose trade"
 msgstr ""
 
-#: src/gui/trade.cpp:53
+#: src/gui/trade.cpp:54
 msgid "Confirmed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:55
 msgid "Agree trade"
 msgstr ""
 
-#: src/gui/trade.cpp:55
+#: src/gui/trade.cpp:56
 msgid "Agreed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:58
+#: src/gui/trade.cpp:59
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/trade.cpp:74 src/gui/trade.cpp:75
+#: src/gui/trade.cpp:73 src/gui/trade.cpp:74
 msgid "Trade"
 msgstr ""
 
-#: src/gui/trade.cpp:77
+#: src/gui/trade.cpp:76
 msgid "Add"
 msgstr ""
 
-#: src/gui/trade.cpp:99 src/gui/trade.cpp:135
+#: src/gui/trade.cpp:98 src/gui/trade.cpp:134
 #, c-format
 msgid "You get %s"
 msgstr ""
 
-#: src/gui/trade.cpp:100
+#: src/gui/trade.cpp:99
 msgid "You give:"
 msgstr ""
 
-#: src/gui/trade.cpp:104
+#: src/gui/trade.cpp:103
 msgid "Change"
 msgstr ""
 
-#: src/gui/trade.cpp:275
+#: src/gui/trade.cpp:262
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/trade.cpp:318
+#: src/gui/trade.cpp:304
 msgid "You don't have enough money."
 msgstr ""
 
@@ -1847,21 +1897,21 @@ msgstr ""
 msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:405
+#: src/gui/updatewindow.cpp:417
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:407
+#: src/gui/updatewindow.cpp:419
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:409
+#: src/gui/updatewindow.cpp:421
 msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:501
+#: src/gui/updatewindow.cpp:515
 msgid "Completed"
 msgstr ""
 
@@ -1941,53 +1991,53 @@ msgstr ""
 msgid "Need a user to kick!"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:118
+#: src/gui/widgets/chattab.cpp:121
 msgid "Global announcement:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:124
+#: src/gui/widgets/chattab.cpp:127
 #, c-format
 msgid "Global announcement from %s:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:150
+#: src/gui/widgets/chattab.cpp:153
 #, c-format
 msgid "%s whispers: %s"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:51
+#: src/gui/widgets/whispertab.cpp:53
 msgid "Cannot send empty chat!"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:70
+#: src/gui/widgets/whispertab.cpp:72
 msgid "/ignore > Ignore the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:71
+#: src/gui/widgets/whispertab.cpp:73
 msgid "/unignore > Stop ignoring the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:72
+#: src/gui/widgets/whispertab.cpp:74
 msgid "/close > Close the whisper tab"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:82
+#: src/gui/widgets/whispertab.cpp:84
 msgid "Command: /close"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:83
+#: src/gui/widgets/whispertab.cpp:85
 msgid "This command closes the current whisper tab."
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:87
+#: src/gui/widgets/whispertab.cpp:89
 msgid "Command: /ignore"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:88
+#: src/gui/widgets/whispertab.cpp:90
 msgid "This command ignores the other player regardless of current relations."
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:94
+#: src/gui/widgets/whispertab.cpp:96
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
@@ -2011,1354 +2061,1356 @@ msgstr ""
 msgid "Choose World"
 msgstr ""
 
-#: src/keyboardconfig.cpp:40
+#: src/keyboardconfig.cpp:39
 msgid "Move Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:41
+#: src/keyboardconfig.cpp:40
 msgid "Move Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:41
 msgid "Move Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:42
 msgid "Move Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:44 src/net/ea/generalhandler.cpp:223
+#: src/keyboardconfig.cpp:43 src/net/tmwa/generalhandler.cpp:237
 msgid "Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:44
 msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:45
 msgid "Smilie"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:46
 msgid "Talk"
 msgstr ""
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:47
 msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:48
 msgid "Target Monster"
 msgstr ""
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboardconfig.cpp:49
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:50
 msgid "Target Player"
 msgstr ""
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:51
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:52
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:53
 msgid "Sit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:54
 msgid "Screenshot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:55
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:56
 msgid "Find Path to Mouse"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58 src/keyboardconfig.cpp:59
-#: src/keyboardconfig.cpp:60 src/keyboardconfig.cpp:61
-#: src/keyboardconfig.cpp:62 src/keyboardconfig.cpp:63
-#: src/keyboardconfig.cpp:64 src/keyboardconfig.cpp:65
-#: src/keyboardconfig.cpp:66 src/keyboardconfig.cpp:67
-#: src/keyboardconfig.cpp:68 src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:57 src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60
+#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62
+#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64
+#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68
 #, c-format
 msgid "Item Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:69
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:70
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:71
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:72
 msgid "Equipment Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:73
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:74
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:75
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:76
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:77
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:78
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:79
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:80
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:81
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:83
+#: src/keyboardconfig.cpp:82
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:83
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86
-#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88
-#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90
-#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92
-#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:84 src/keyboardconfig.cpp:85
+#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:87
+#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:89
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:91
+#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:93
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:95
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:96
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:97
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:98
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:99
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:100
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:101
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:103
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:105
+#: src/keyboardconfig.cpp:104
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:184
+#: src/keyboardconfig.cpp:183
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:914
+#: src/localplayer.cpp:985
 msgid "Unable to pick up item."
 msgstr ""
 
 #. TRANSLATORS: This sentence may be translated differently
 #. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:923
+#: src/localplayer.cpp:994
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/main.cpp:43
+#: src/main.cpp:42
 msgid "mana [options] [mana-file]"
 msgstr ""
 
+#: src/main.cpp:43
+msgid "[mana-file] : The mana file is an XML file (.mana)"
+msgstr ""
+
 #: src/main.cpp:44
-msgid "Options:"
+msgid "              used to set custom parameters"
 msgstr ""
 
 #: src/main.cpp:45
+msgid "              to the mana client."
+msgstr ""
+
+#: src/main.cpp:47
+msgid "Options:"
+msgstr ""
+
+#: src/main.cpp:48
 msgid "  -v --version        : Display the version"
 msgstr ""
 
-#: src/main.cpp:46
+#: src/main.cpp:49
 msgid "  -h --help           : Display this help"
 msgstr ""
 
-#: src/main.cpp:47
+#: src/main.cpp:50
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
-#: src/main.cpp:48
+#: src/main.cpp:51
 msgid "  -U --username       : Login with this username"
 msgstr ""
 
-#: src/main.cpp:49
+#: src/main.cpp:52
 msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/main.cpp:50
+#: src/main.cpp:53
 msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/main.cpp:51
+#: src/main.cpp:54
 msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:52
+#: src/main.cpp:55
 msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/main.cpp:53
+#: src/main.cpp:56
 msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/main.cpp:54
+#: src/main.cpp:57
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:56
+#: src/main.cpp:59
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:57
+#: src/main.cpp:60
 msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:58
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
+#: src/main.cpp:61
+msgid "     --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/main.cpp:59
+#: src/main.cpp:62
+msgid "     --chat-log-dir   : Chat log dir to use"
+msgstr ""
+
+#: src/main.cpp:63
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/main.cpp:61
+#: src/main.cpp:65
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:63
+#: src/net/manaserv/beinghandler.cpp:303 src/net/tmwa/playerhandler.cpp:94
+msgid "You are dead."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:304 src/net/tmwa/playerhandler.cpp:95
+msgid "We regret to inform you that your character was killed in battle."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:306 src/net/tmwa/playerhandler.cpp:97
+msgid "You are not that alive anymore."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:307 src/net/tmwa/playerhandler.cpp:98
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:308 src/net/tmwa/playerhandler.cpp:99
+msgid "Game Over!"
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:309 src/net/tmwa/playerhandler.cpp:101
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:311 src/net/tmwa/playerhandler.cpp:103
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:313 src/net/tmwa/playerhandler.cpp:105
+msgid "I guess this did not run too well."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:107
+msgid "Do you want your possessions identified?"
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:109
+msgid "Sadly, no trace of you was ever found..."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:111
+msgid "Annihilated."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:113
+msgid "Looks like you got your head handed to you."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:115
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:323
+msgid "Press OK to respawn."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:324
+msgid "You Died"
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:138 src/net/manaserv/charhandler.cpp:209
+msgid "Not logged in."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:141
+msgid "No empty slot."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:144
+msgid "Invalid name."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:147
+msgid "Character's name already exists."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:150
+msgid "Invalid hairstyle."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:153
+msgid "Invalid hair color."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:156
+msgid "Invalid gender."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:159
+msgid "Character's stats are too high."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:162
+msgid "Character's stats are too low."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:165
+#, c-format
+msgid "At least one statis out of the permitted range: (%u - %u)."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:171 src/net/manaserv/loginhandler.cpp:96
+#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
+#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
+#: src/net/tmwa/loginhandler.cpp:95 src/net/tmwa/loginhandler.cpp:182
+msgid "Unknown error."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:200 src/net/tmwa/charserverhandler.cpp:146
+msgid "Info"
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:200
+msgid "Player deleted."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:212
+msgid "Selection out of range."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:215
+#, c-format
+msgid "Unknown error (%d)."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:250
+msgid "No gameservers are available."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:187 src/net/manaserv/chathandler.cpp:313
+#: src/net/manaserv/guildhandler.cpp:260
+#, c-format
+msgid "Topic: %s"
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:274
+msgid "Players in this channel:"
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:208
+msgid "Error joining channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:214
+msgid "Listing channels."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:226
+msgid "End of channel list."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:303
+#, c-format
+msgid "%s entered the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:308
+#, c-format
+msgid "%s left the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:324
+#, c-format
+msgid "%s has set mode %s on user %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:334
+#, c-format
+msgid "%s has kicked %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:339
+msgid "Unknown channel event."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:82
+msgid "Guild created."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:87
+msgid "Error creating guild."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:97
+msgid "Invite sent."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:204
+msgid "Member was promoted successfully."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:209
+msgid "Failed to promote member."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:87
+msgid "Wrong magic_token."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
+msgid "Already logged in."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:93
+msgid "Account banned."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:118
+msgid "New password incorrect."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:121 src/net/tmwa/loginhandler.cpp:89
+msgid "Old password incorrect."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
+msgid "Account not connected. Please login first."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:149
+msgid "New email address incorrect."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:152
+msgid "Old email address incorrect."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:158
+msgid "The new email address already exists."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:239
+msgid ""
+"Client registration is not allowed. Please contact server administration."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
+msgid "Client version is too old."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:266
+msgid "Wrong username or password."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:272
+msgid "Account banned"
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:275
+msgid "Login attempt too soon after previous attempt."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:303
+msgid "Wrong username, password or email address."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:306
+msgid "Username already exists."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:309
+msgid "Email address already exists."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:312
+msgid "You took too long with the captcha or your response was incorrect."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:87
+msgid "Joined party."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:105
+#, c-format
+msgid "%s joined the party."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:123
+#, c-format
+msgid "%s rejected your invite."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:95
+msgid "Accepting incoming trade requests."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:97
+msgid "Ignoring incoming trade requests."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:115 src/net/tmwa/tradehandler.cpp:109
+msgid "Request for Trade"
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:116 src/net/tmwa/tradehandler.cpp:110
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:134
+#, c-format
+msgid "Trading with %s"
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:148 src/net/tmwa/tradehandler.cpp:224
+msgid "Trade canceled."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:155 src/net/tmwa/tradehandler.cpp:231
+msgid "Trade completed."
+msgstr ""
+
+#: src/net/tmwa/adminhandler.cpp:64
 msgid "Kick failed!"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:65
+#: src/net/tmwa/adminhandler.cpp:66
 msgid "Kick succeeded!"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:110
+#: src/net/tmwa/buysellhandler.cpp:109
 msgid "Nothing to sell."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:117
+#: src/net/tmwa/buysellhandler.cpp:116
 msgid "Thanks for buying."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:124
+#: src/net/tmwa/buysellhandler.cpp:123
 msgid "Unable to buy."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:130
+#: src/net/tmwa/buysellhandler.cpp:129
 msgid "Thanks for selling."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:132
+#: src/net/tmwa/buysellhandler.cpp:131
 msgid "Unable to sell."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:103
-msgid "Access denied."
+#: src/net/tmwa/charserverhandler.cpp:103
+msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:106
+#: src/net/tmwa/charserverhandler.cpp:107
 msgid "Cannot use this ID."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:109
-msgid "Unknown failure to select character."
+#: src/net/tmwa/charserverhandler.cpp:110
+msgid "Unknown char-server failure."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:135
+#: src/net/tmwa/charserverhandler.cpp:134
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:147 src/net/manaserv/charhandler.cpp:187
-msgid "Info"
-msgstr ""
-
-#: src/net/ea/charserverhandler.cpp:147
+#: src/net/tmwa/charserverhandler.cpp:146
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:152
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Failed to delete character."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:237 src/net/manaserv/charhandler.cpp:263
+#: src/net/tmwa/charserverhandler.cpp:266
 msgid "Strength:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:238 src/net/manaserv/charhandler.cpp:264
+#: src/net/tmwa/charserverhandler.cpp:267
 msgid "Agility:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:239 src/net/manaserv/charhandler.cpp:266
+#: src/net/tmwa/charserverhandler.cpp:268
 msgid "Vitality:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:240 src/net/manaserv/charhandler.cpp:267
+#: src/net/tmwa/charserverhandler.cpp:269
 msgid "Intelligence:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:241 src/net/manaserv/charhandler.cpp:265
+#: src/net/tmwa/charserverhandler.cpp:270
 msgid "Dexterity:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:242
+#: src/net/tmwa/charserverhandler.cpp:271
 msgid "Luck:"
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:80
-msgid "Whisper could not be sent, user is offline."
+#: src/net/tmwa/chathandler.cpp:87
+#, c-format
+msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:84
-msgid "Whisper could not be sent, ignored by user."
+#: src/net/tmwa/chathandler.cpp:96
+#, c-format
+msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:171
+#: src/net/tmwa/chathandler.cpp:230
 msgid "MVP player."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:204 src/net/ea/chathandler.cpp:210
-#: src/net/ea/chathandler.cpp:215 src/net/ea/chathandler.cpp:220
-#: src/net/ea/chathandler.cpp:225 src/net/ea/chathandler.cpp:230
-#: src/net/ea/chathandler.cpp:235 src/net/ea/chathandler.cpp:240
+#: src/net/tmwa/chathandler.cpp:265 src/net/tmwa/chathandler.cpp:271
+#: src/net/tmwa/chathandler.cpp:276 src/net/tmwa/chathandler.cpp:281
+#: src/net/tmwa/chathandler.cpp:286 src/net/tmwa/chathandler.cpp:291
+#: src/net/tmwa/chathandler.cpp:296 src/net/tmwa/chathandler.cpp:301
 msgid "Channels are not supported!"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:86
+#: src/net/tmwa/gamehandler.cpp:88
 #, c-format
 msgid "Online users: %d"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:100
+#: src/net/tmwa/gamehandler.cpp:101
 msgid "Game"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:100
+#: src/net/tmwa/gamehandler.cpp:101
 msgid "Request to quit denied!"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:102 src/net/manaserv/generalhandler.cpp:95
+#: src/net/tmwa/generalhandler.cpp:102
 #, c-format
 msgid "Strength %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:103 src/net/manaserv/generalhandler.cpp:96
+#: src/net/tmwa/generalhandler.cpp:103
 #, c-format
 msgid "Agility %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:104 src/net/manaserv/generalhandler.cpp:98
+#: src/net/tmwa/generalhandler.cpp:104
 #, c-format
 msgid "Vitality %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:105 src/net/manaserv/generalhandler.cpp:99
+#: src/net/tmwa/generalhandler.cpp:105
 #, c-format
 msgid "Intelligence %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:106 src/net/manaserv/generalhandler.cpp:97
+#: src/net/tmwa/generalhandler.cpp:106
 #, c-format
 msgid "Dexterity %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:107
+#: src/net/tmwa/generalhandler.cpp:107
 #, c-format
 msgid "Luck %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:130
+#: src/net/tmwa/generalhandler.cpp:132
 msgid "Authentication failed."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:133
+#: src/net/tmwa/generalhandler.cpp:135
 msgid "No servers available."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:137
+#: src/net/tmwa/generalhandler.cpp:139
 msgid "Someone else is trying to use this account."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:140
+#: src/net/tmwa/generalhandler.cpp:142
 msgid "This account is already logged in."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:143
+#: src/net/tmwa/generalhandler.cpp:145
 msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:146
+#: src/net/tmwa/generalhandler.cpp:148
 msgid "Duplicated login."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:149
+#: src/net/tmwa/generalhandler.cpp:151
 msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:205
+#: src/net/tmwa/generalhandler.cpp:209
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:216 src/net/manaserv/generalhandler.cpp:166
+#: src/net/tmwa/generalhandler.cpp:230
 msgid "Strength"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:217 src/net/manaserv/generalhandler.cpp:167
+#: src/net/tmwa/generalhandler.cpp:231
 msgid "Agility"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:218 src/net/manaserv/generalhandler.cpp:169
+#: src/net/tmwa/generalhandler.cpp:232
 msgid "Vitality"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:219 src/net/manaserv/generalhandler.cpp:170
+#: src/net/tmwa/generalhandler.cpp:233
 msgid "Intelligence"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:220 src/net/manaserv/generalhandler.cpp:168
+#: src/net/tmwa/generalhandler.cpp:234
 msgid "Dexterity"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:221
+#: src/net/tmwa/generalhandler.cpp:235
 msgid "Luck"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:224
+#: src/net/tmwa/generalhandler.cpp:238
 msgid "Defense"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:225
+#: src/net/tmwa/generalhandler.cpp:239
 msgid "M.Attack"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:226
+#: src/net/tmwa/generalhandler.cpp:240
 msgid "M.Defense"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:227
+#: src/net/tmwa/generalhandler.cpp:241
 #, c-format
 msgid "% Accuracy"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:228
+#: src/net/tmwa/generalhandler.cpp:242
 #, c-format
 msgid "% Evade"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:229
+#: src/net/tmwa/generalhandler.cpp:243
 #, c-format
 msgid "% Critical"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:45
+#: src/net/tmwa/gui/guildtab.cpp:45
 msgid "Guild"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:61 src/net/ea/gui/partytab.cpp:59
+#: src/net/tmwa/gui/guildtab.cpp:61 src/net/tmwa/gui/partytab.cpp:59
 msgid "/help > Display this help."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:62
+#: src/net/tmwa/gui/guildtab.cpp:62
 msgid "/invite > Invite a player to your guild"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:63
+#: src/net/tmwa/gui/guildtab.cpp:63
 msgid "/leave > Leave the guild you are in"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:64
+#: src/net/tmwa/gui/guildtab.cpp:64
 msgid "/kick > Kick some one from the guild you are in"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:73 src/net/ea/gui/partytab.cpp:73
+#: src/net/tmwa/gui/guildtab.cpp:73 src/net/tmwa/gui/partytab.cpp:73
 msgid "Command: /invite <nick>"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:74
+#: src/net/tmwa/gui/guildtab.cpp:74
 msgid "This command invites <nick> to the guild you're in."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:80 src/net/ea/gui/partytab.cpp:80
+#: src/net/tmwa/gui/guildtab.cpp:80 src/net/tmwa/gui/partytab.cpp:80
 msgid "Command: /leave"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:81
+#: src/net/tmwa/gui/guildtab.cpp:81
 msgid "This command causes the player to leave the guild."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:89
+#: src/net/tmwa/gui/guildtab.cpp:89
 msgid "Guild name is missing."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:293
+#: src/net/tmwa/guildhandler.cpp:296
 msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:298
+#: src/net/tmwa/guildhandler.cpp:301
 msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:303
+#: src/net/tmwa/guildhandler.cpp:306
 msgid "User is now part of your guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:308
+#: src/net/tmwa/guildhandler.cpp:311
 msgid "Your guild is full."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:313
+#: src/net/tmwa/guildhandler.cpp:316
 msgid "Unknown guild invite response."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:390
+#: src/net/tmwa/guildhandler.cpp:393
 msgid "Guild creation isn't supported yet."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:43
+#: src/net/tmwa/gui/partytab.cpp:43
 msgid "Party"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:60
+#: src/net/tmwa/gui/partytab.cpp:60
 msgid "/invite > Invite a player to your party"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:61
+#: src/net/tmwa/gui/partytab.cpp:61
 msgid "/leave > Leave the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:62
+#: src/net/tmwa/gui/partytab.cpp:62
 msgid "/kick > Kick some one from the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:63
+#: src/net/tmwa/gui/partytab.cpp:63
 msgid "/item > Show/change party item sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:64
+#: src/net/tmwa/gui/partytab.cpp:64
 msgid "/exp > Show/change party experience sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:81
+#: src/net/tmwa/gui/partytab.cpp:81
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:85
+#: src/net/tmwa/gui/partytab.cpp:85
 msgid "Command: /item <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:86
+#: src/net/tmwa/gui/partytab.cpp:86
 msgid "This command changes the party's item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:87
+#: src/net/tmwa/gui/partytab.cpp:87
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:90
+#: src/net/tmwa/gui/partytab.cpp:90
 msgid "Command: /item"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/tmwa/gui/partytab.cpp:91
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/tmwa/gui/partytab.cpp:95
 msgid "Command: /exp <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:96
+#: src/net/tmwa/gui/partytab.cpp:96
 msgid "This command changes the party's experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/tmwa/gui/partytab.cpp:97
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:100
+#: src/net/tmwa/gui/partytab.cpp:100
 msgid "Command: /exp"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/tmwa/gui/partytab.cpp:101
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:132 src/net/ea/partyhandler.cpp:198
+#: src/net/tmwa/gui/partytab.cpp:132 src/net/tmwa/partyhandler.cpp:196
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:135 src/net/ea/partyhandler.cpp:204
+#: src/net/tmwa/gui/partytab.cpp:135 src/net/tmwa/partyhandler.cpp:202
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:138 src/net/ea/partyhandler.cpp:210
+#: src/net/tmwa/gui/partytab.cpp:138 src/net/tmwa/partyhandler.cpp:208
 msgid "Item sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:141
+#: src/net/tmwa/gui/partytab.cpp:141
 msgid "Item sharing unknown."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:167 src/net/ea/partyhandler.cpp:174
+#: src/net/tmwa/gui/partytab.cpp:167 src/net/tmwa/partyhandler.cpp:172
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:170 src/net/ea/partyhandler.cpp:180
+#: src/net/tmwa/gui/partytab.cpp:170 src/net/tmwa/partyhandler.cpp:178
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:173 src/net/ea/partyhandler.cpp:186
+#: src/net/tmwa/gui/partytab.cpp:173 src/net/tmwa/partyhandler.cpp:184
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:176
+#: src/net/tmwa/gui/partytab.cpp:176
 msgid "Experience sharing unknown."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:281
+#: src/net/tmwa/inventoryhandler.cpp:285
 msgid "Failed to use item."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:391
+#: src/net/tmwa/inventoryhandler.cpp:399
 msgid "Unable to equip."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:402
+#: src/net/tmwa/inventoryhandler.cpp:410
 msgid "Unable to unequip."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:79
+#: src/net/tmwa/loginhandler.cpp:86
 msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:82 src/net/manaserv/loginhandler.cpp:121
-msgid "Old password incorrect."
-msgstr ""
-
-#: src/net/ea/loginhandler.cpp:85
+#: src/net/tmwa/loginhandler.cpp:92
 msgid "New password too short."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:88 src/net/ea/loginhandler.cpp:175
-#: src/net/manaserv/charhandler.cpp:158 src/net/manaserv/loginhandler.cpp:96
-#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
-#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
-msgid "Unknown error."
-msgstr ""
-
-#: src/net/ea/loginhandler.cpp:149
+#: src/net/tmwa/loginhandler.cpp:156
 msgid "Unregistered ID."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:152
+#: src/net/tmwa/loginhandler.cpp:159
 msgid "Wrong password."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:155
+#: src/net/tmwa/loginhandler.cpp:162
 msgid "Account expired."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:158
+#: src/net/tmwa/loginhandler.cpp:165
 msgid "Rejected from server."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:161
+#: src/net/tmwa/loginhandler.cpp:168
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:165
+#: src/net/tmwa/loginhandler.cpp:172
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:172
+#: src/net/tmwa/loginhandler.cpp:179
 msgid "This user name is already taken."
 msgstr ""
 
-#: src/net/ea/network.cpp:145
+#: src/net/tmwa/network.cpp:145
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/ea/network.cpp:345
+#: src/net/tmwa/network.cpp:345
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/ea/network.cpp:414
+#: src/net/tmwa/network.cpp:414
 msgid "Connection to server terminated. "
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:81
+#: src/net/tmwa/partyhandler.cpp:82
 msgid "Could not create party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:84
+#: src/net/tmwa/partyhandler.cpp:84
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:118
+#: src/net/tmwa/partyhandler.cpp:119
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:122
+#: src/net/tmwa/partyhandler.cpp:123
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:126
+#: src/net/tmwa/partyhandler.cpp:127
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:130
+#: src/net/tmwa/partyhandler.cpp:131
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:238
+#: src/net/tmwa/partyhandler.cpp:236
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:249
+#: src/net/tmwa/partyhandler.cpp:246
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:301
+#: src/net/tmwa/partyhandler.cpp:299
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:329
-msgid "Inviting like this isn't supported at the moment."
+#: src/net/tmwa/partyhandler.cpp:335
+#, c-format
+msgid "Inviting failed, because you can't see a player called %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:334
+#: src/net/tmwa/partyhandler.cpp:340
 msgid "You can only inivte when you are in a party!"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:365
+#: src/net/tmwa/partyhandler.cpp:368
 #, c-format
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:304
-msgid "You are dead."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:305
-msgid "We regret to inform you that your character was killed in battle."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:307
-msgid "You are not that alive anymore."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:308
-msgid "The cold hands of the grim reaper are grabbing for your soul."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:309
-msgid "Game Over!"
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:105
+#: src/net/tmwa/playerhandler.cpp:100
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:310
-msgid ""
-"No, kids. Your character did not really die. It... err... went to a better "
-"place."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:312
-msgid ""
-"Your plan of breaking your enemies weapon by bashing it with your throat "
-"failed."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:314
-msgid "I guess this did not run too well."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:315
-msgid "Do you want your possessions identified?"
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:316
-msgid "Sadly, no trace of you was ever found..."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:317
-msgid "Annihilated."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:318
-msgid "Looks like you got your head handed to you."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:120 src/net/manaserv/beinghandler.cpp:319
-msgid ""
-"You screwed up again, dump your body down the tubes and get you another one."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/tmwa/playerhandler.cpp:118
 msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/tmwa/playerhandler.cpp:119
 msgid "You are no more."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/tmwa/playerhandler.cpp:120
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/tmwa/playerhandler.cpp:121
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/tmwa/playerhandler.cpp:122
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/tmwa/playerhandler.cpp:123
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/tmwa/playerhandler.cpp:124
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:130
+#: src/net/tmwa/playerhandler.cpp:125
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:131
+#: src/net/tmwa/playerhandler.cpp:126
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/tmwa/playerhandler.cpp:127
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/tmwa/playerhandler.cpp:128
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:135
+#: src/net/tmwa/playerhandler.cpp:130
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:136
+#: src/net/tmwa/playerhandler.cpp:131
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:249 src/net/ea/playerhandler.cpp:310
+#: src/net/tmwa/playerhandler.cpp:246 src/net/tmwa/playerhandler.cpp:285
 msgid "Message"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:250
+#: src/net/tmwa/playerhandler.cpp:247
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:333
+#: src/net/tmwa/playerhandler.cpp:313
 #, c-format
 msgid "You picked up %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:369
+#: src/net/tmwa/playerhandler.cpp:348
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:532
+#: src/net/tmwa/playerhandler.cpp:488
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:147
+#: src/net/tmwa/specialhandler.cpp:144
 msgid "Trade failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:150
+#: src/net/tmwa/specialhandler.cpp:147
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:153
+#: src/net/tmwa/specialhandler.cpp:150
 msgid "Sit failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:156
+#: src/net/tmwa/specialhandler.cpp:153
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:159
+#: src/net/tmwa/specialhandler.cpp:156
 msgid "Could not join party!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:162
+#: src/net/tmwa/specialhandler.cpp:159
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:171
+#: src/net/tmwa/specialhandler.cpp:168
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:174
+#: src/net/tmwa/specialhandler.cpp:171
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:177
+#: src/net/tmwa/specialhandler.cpp:174
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:180
+#: src/net/tmwa/specialhandler.cpp:177
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:183
+#: src/net/tmwa/specialhandler.cpp:180
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:186
+#: src/net/tmwa/specialhandler.cpp:183
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:189
+#: src/net/tmwa/specialhandler.cpp:186
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:192
+#: src/net/tmwa/specialhandler.cpp:189
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:195
+#: src/net/tmwa/specialhandler.cpp:192
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:198
+#: src/net/tmwa/specialhandler.cpp:195
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:201
+#: src/net/tmwa/specialhandler.cpp:198
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:210
+#: src/net/tmwa/specialhandler.cpp:207
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:213
+#: src/net/tmwa/specialhandler.cpp:210
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:216
+#: src/net/tmwa/specialhandler.cpp:213
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:116
-msgid "Request for Trade"
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:108 src/net/manaserv/tradehandler.cpp:117
-#, c-format
-msgid "%s wants to trade with you, do you accept?"
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:124
+#: src/net/tmwa/tradehandler.cpp:126
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:128
+#: src/net/tmwa/tradehandler.cpp:130
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:132
+#: src/net/tmwa/tradehandler.cpp:134
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:137
+#: src/net/tmwa/tradehandler.cpp:139
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:144
+#: src/net/tmwa/tradehandler.cpp:146
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:153
+#: src/net/tmwa/tradehandler.cpp:154
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:202
+#: src/net/tmwa/tradehandler.cpp:202
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:207
+#: src/net/tmwa/tradehandler.cpp:207
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:211
+#: src/net/tmwa/tradehandler.cpp:211
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:224 src/net/manaserv/tradehandler.cpp:149
-msgid "Trade canceled."
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:231 src/net/manaserv/tradehandler.cpp:156
-msgid "Trade completed."
-msgstr ""
-
-#: src/net/manaserv/beinghandler.cpp:324
-msgid "Press OK to respawn."
-msgstr ""
-
-#: src/net/manaserv/beinghandler.cpp:325
-msgid "You Died"
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:128 src/net/manaserv/charhandler.cpp:196
-msgid "Not logged in."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:131
-msgid "No empty slot."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:134
-msgid "Invalid name."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:137
-msgid "Character's name already exists."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:140
-msgid "Invalid hairstyle."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:143
-msgid "Invalid hair color."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:146
-msgid "Invalid gender."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:149
-msgid "Character's stats are too high."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:152
-msgid "Character's stats are too low."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:155
-msgid "One stat is zero."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:187
-msgid "Player deleted."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:199
-msgid "Selection out of range."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:202
-#, c-format
-msgid "Unknown error (%d)."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:242
-msgid "No gameservers are available."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:268
-msgid "Willpower:"
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
-#: src/net/manaserv/guildhandler.cpp:259
-#, c-format
-msgid "Topic: %s"
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
-msgid "Players in this channel:"
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:201
-msgid "Error joining channel."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:207
-msgid "Listing channels."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:219
-msgid "End of channel list."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:291
-#, c-format
-msgid "%s entered the channel."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:296
-#, c-format
-msgid "%s left the channel."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:312
-#, c-format
-msgid "%s has set mode %s on user %s."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:322
-#, c-format
-msgid "%s has kicked %s."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:327
-msgid "Unknown channel event."
-msgstr ""
-
-#: src/net/manaserv/generalhandler.cpp:100
-#, c-format
-msgid "Willpower %+d"
-msgstr ""
-
-#: src/net/manaserv/generalhandler.cpp:171
-msgid "Willpower"
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:81
-msgid "Guild created."
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:86
-msgid "Error creating guild."
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:96
-msgid "Invite sent."
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:203
-msgid "Member was promoted successfully."
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:208
-msgid "Failed to promote member."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:87
-msgid "Wrong magic_token."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
-msgid "Already logged in."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:93 src/net/manaserv/loginhandler.cpp:272
-msgid "Server is full."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:118
-msgid "New password incorrect."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
-msgid "Account not connected. Please login first."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:149
-msgid "New email address incorrect."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:152
-msgid "Old email address incorrect."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:158
-msgid "The new email address already exists."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:239
-msgid ""
-"Client registration is not allowed. Please contact server administration."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
-msgid "Client version is too old."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:266
-msgid "Wrong username or password."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:275
-msgid "Login attempt too soon after previous attempt."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:303
-msgid "Wrong username, password or email address."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:306
-msgid "Username already exists."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:309
-msgid "Email address already exists."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:312
-msgid "You took too long with the captcha or your response was incorrect."
-msgstr ""
-
-#: src/net/manaserv/partyhandler.cpp:88
-msgid "Joined party."
-msgstr ""
-
-#: src/net/manaserv/partyhandler.cpp:106
-#, c-format
-msgid "%s joined the party."
-msgstr ""
-
-#: src/net/manaserv/partyhandler.cpp:123
-#, c-format
-msgid "%s rejected your invite."
-msgstr ""
-
-#: src/net/manaserv/tradehandler.cpp:96
-msgid "Accepting incoming trade requests."
-msgstr ""
-
-#: src/net/manaserv/tradehandler.cpp:98
-msgid "Ignoring incoming trade requests."
-msgstr ""
-
-#: src/net/manaserv/tradehandler.cpp:135
-#, c-format
-msgid "Trading with %s"
-msgstr ""
-
-#: src/playerrelations.cpp:304
+#: src/playerrelations.cpp:310
 msgid "Completely ignore"
 msgstr ""
 
-#: src/playerrelations.cpp:318
+#: src/playerrelations.cpp:324
 msgid "Print '...'"
 msgstr ""
 
-#: src/playerrelations.cpp:334
+#: src/playerrelations.cpp:340
 msgid "Blink name"
 msgstr ""
 
-#: src/playerrelations.cpp:371
-msgid "Floating '...' bubble"
-msgstr ""
-
-#: src/playerrelations.cpp:374
-msgid "Floating bubble"
-msgstr ""
-
-#: src/resources/itemdb.cpp:52
+#: src/resources/itemdb.cpp:44
 #, c-format
 msgid "Attack %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:53
+#: src/resources/itemdb.cpp:45
 #, c-format
 msgid "Defense %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:54
+#: src/resources/itemdb.cpp:46
 #, c-format
 msgid "HP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:55
+#: src/resources/itemdb.cpp:47
 #, c-format
 msgid "MP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:114
+#: src/resources/itemdb.cpp:92
 msgid "Unknown item"
 msgstr ""
 
-#: src/resources/itemdb.cpp:158 src/resources/monsterdb.cpp:45
-#: src/resources/monsterdb.cpp:69
+#: src/resources/itemdb.cpp:135 src/resources/monsterdb.cpp:77
 msgid "unnamed"
 msgstr ""
diff --git a/po/nb.po b/po/nb.po
index c3ef82e4..b6132533 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2010-03-05 21:52+0100\n"
+"POT-Creation-Date: 2010-12-13 20:04+0100\n"
 "PO-Revision-Date: 2009-09-02 17:55+0000\n"
 "Last-Translator: Øyvind Øritsland <Unknown>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
+"Language: nb\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,449 +19,463 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/client.cpp:553 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:62
+#: src/client.cpp:598 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
 msgid "Setup"
 msgstr ""
 
-#: src/client.cpp:623
+#: src/client.cpp:679
 #, fuzzy
 msgid "Connecting to server"
 msgstr "Venter på server"
 
-#: src/client.cpp:650
+#: src/client.cpp:706
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:683
+#: src/client.cpp:739
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:739
+#: src/client.cpp:804
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:768
+#: src/client.cpp:833
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:799 src/client.cpp:806 src/client.cpp:940
+#: src/client.cpp:843
+#, fuzzy
+msgid "Changing game servers"
+msgstr "Server"
+
+#: src/client.cpp:872 src/client.cpp:879 src/client.cpp:1014
 #: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
 #: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
-#: src/gui/serverdialog.cpp:261 src/gui/unregisterdialog.cpp:133
-#: src/net/ea/charserverhandler.cpp:135 src/net/ea/charserverhandler.cpp:152
-#: src/net/manaserv/charhandler.cpp:161 src/net/manaserv/charhandler.cpp:204
+#: src/gui/serverdialog.cpp:323 src/gui/unregisterdialog.cpp:133
+#: src/net/manaserv/charhandler.cpp:174 src/net/manaserv/charhandler.cpp:217
+#: src/net/tmwa/charserverhandler.cpp:134
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Error"
 msgstr "Feil"
 
-#: src/client.cpp:815
+#: src/client.cpp:888
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:842
+#: src/client.cpp:915
 #, fuzzy
 msgid "Password Change"
 msgstr "Passord:"
 
-#: src/client.cpp:843
+#: src/client.cpp:916
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:862
+#: src/client.cpp:935
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:863
+#: src/client.cpp:936
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:883
+#: src/client.cpp:956
 #, fuzzy
 msgid "Unregister Successful"
 msgstr "Avregistrer"
 
-#: src/client.cpp:884
+#: src/client.cpp:957
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1007 src/client.cpp:1030
+#: src/client.cpp:1138 src/client.cpp:1161
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1119
+#: src/client.cpp:1281
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1153 src/client.cpp:1159
+#: src/client.cpp:1315 src/client.cpp:1321
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/commandhandler.cpp:127 src/commandhandler.cpp:308
+#: src/commandhandler.cpp:131 src/commandhandler.cpp:317
 msgid "Unknown command."
 msgstr "Ukjent kommando"
 
-#: src/commandhandler.cpp:156
+#: src/commandhandler.cpp:160
 msgid "-- Help --"
 msgstr "-- Hjelp --"
 
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:161
 msgid "/help > Display this help"
 msgstr "/hjelp > Hvis denne hjelpen"
 
-#: src/commandhandler.cpp:159
+#: src/commandhandler.cpp:163
 msgid "/where > Display map name"
 msgstr "/where > Viser kartnavn"
 
-#: src/commandhandler.cpp:160
+#: src/commandhandler.cpp:164
 msgid "/who > Display number of online users"
 msgstr "/who > Viser antall påloggede brukere"
 
-#: src/commandhandler.cpp:161
+#: src/commandhandler.cpp:165
 msgid "/me > Tell something about yourself"
 msgstr "/me > Si noe om deg selv"
 
-#: src/commandhandler.cpp:163
+#: src/commandhandler.cpp:167
 msgid "/clear > Clears this window"
 msgstr "/clear > Tømmer vinduet"
 
-#: src/commandhandler.cpp:165
+#: src/commandhandler.cpp:169
 msgid "/msg > Send a private message to a user"
 msgstr "/msg > Send en privat melding til en bruker"
 
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:170
 msgid "/whisper > Alias of msg"
 msgstr "/whisper > Alternativ for msg"
 
-#: src/commandhandler.cpp:167
+#: src/commandhandler.cpp:171
 msgid "/w > Alias of msg"
 msgstr "/w > Alternativ for msg"
 
-#: src/commandhandler.cpp:168
+#: src/commandhandler.cpp:172
 msgid "/query > Makes a tab for private messages with another user"
 msgstr ""
 "/query > Åpner en fane for å sende private meldinger med en annen bruker"
 
-#: src/commandhandler.cpp:169
+#: src/commandhandler.cpp:174
 msgid "/q > Alias of query"
 msgstr "/q > Alternativ for query"
 
-#: src/commandhandler.cpp:171
+#: src/commandhandler.cpp:176
 msgid "/ignore > ignore a player"
 msgstr ""
 
-#: src/commandhandler.cpp:172
+#: src/commandhandler.cpp:177
 msgid "/unignore > stop ignoring a player"
 msgstr ""
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:179
 msgid "/list > Display all public channels"
 msgstr "/list > Viser alle offentlige kanaler"
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:180
 msgid "/join > Join or create a channel"
 msgstr "/delta > Delta i eller opprett en kanal"
 
-#: src/commandhandler.cpp:177
+#: src/commandhandler.cpp:182
 #, fuzzy
 msgid "/createparty > Create a new party"
 msgstr "/party > Inviter en bruker til en gruppe"
 
-#: src/commandhandler.cpp:178
+#: src/commandhandler.cpp:183
 msgid "/party > Invite a user to party"
 msgstr "/party > Inviter en bruker til en gruppe"
 
-#: src/commandhandler.cpp:180
+#: src/commandhandler.cpp:185
 msgid "/record > Start recording the chat to an external file"
 msgstr "/innspilling > Start innspilling av chat til en ekstern fil"
 
-#: src/commandhandler.cpp:181
+#: src/commandhandler.cpp:187
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr ""
 
-#: src/commandhandler.cpp:182
+#: src/commandhandler.cpp:189
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
 
-#: src/commandhandler.cpp:184
+#: src/commandhandler.cpp:192
 msgid "/announce > Global announcement (GM only)"
 msgstr ""
 
-#: src/commandhandler.cpp:188
+#: src/commandhandler.cpp:196
 msgid "For more information, type /help <command>."
 msgstr "For mer informasjon, skriv /help <kommando>"
 
-#: src/commandhandler.cpp:192
+#: src/commandhandler.cpp:200
 msgid "Command: /help"
 msgstr "Kommando: /help"
 
-#: src/commandhandler.cpp:193
+#: src/commandhandler.cpp:201
 msgid "This command displays a list of all commands available."
 msgstr "Denne kommandoen viser en liste med alle tilgjengelige kommandoer."
 
-#: src/commandhandler.cpp:194
+#: src/commandhandler.cpp:203
 msgid "Command: /help <command>"
 msgstr "Kommando: /help <kommando>"
 
-#: src/commandhandler.cpp:195
+#: src/commandhandler.cpp:204
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/commandhandler.cpp:203
+#: src/commandhandler.cpp:212
 msgid "Command: /announce <msg>"
 msgstr "Kommando: /announce <msg>"
 
-#: src/commandhandler.cpp:204
+#: src/commandhandler.cpp:213
 msgid "*** only available to a GM ***"
 msgstr "*** kun tilgjengelig for GM ***"
 
-#: src/commandhandler.cpp:205
+#: src/commandhandler.cpp:214
 msgid "This command sends the message <msg> to all players currently online."
 msgstr "Denne kommandoen sender meldingen <msg> til alle påloggede spillere."
 
-#: src/commandhandler.cpp:210
+#: src/commandhandler.cpp:219
 msgid "Command: /clear"
 msgstr "Kommando: /clear"
 
-#: src/commandhandler.cpp:211
+#: src/commandhandler.cpp:220
 msgid "This command clears the chat log of previous chat."
 msgstr "Denne kommandoen klarer chatte-loggen."
 
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:224
 #, fuzzy
 msgid "Command: /ignore <player>"
 msgstr "Kommando: /join <kanal>"
 
-#: src/commandhandler.cpp:216
+#: src/commandhandler.cpp:225
 #, fuzzy
 msgid "This command ignores the given player regardless of current relations."
 msgstr "Denne kommandoen viser antall påloggede spillere -"
 
-#: src/commandhandler.cpp:221
+#: src/commandhandler.cpp:230
 msgid "Command: /join <channel>"
 msgstr "Kommando: /join <kanal>"
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:231
 msgid "This command makes you enter <channel>."
 msgstr "Denne kommandoen åpner <kanal>"
 
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:232
 msgid "If <channel> doesn't exist, it's created."
 msgstr "<kanal> blir opprettet om den ikke eksisterer."
 
-#: src/commandhandler.cpp:227
+#: src/commandhandler.cpp:236
 msgid "Command: /list"
 msgstr "Kommando: /list"
 
-#: src/commandhandler.cpp:228
+#: src/commandhandler.cpp:237
 msgid "This command shows a list of all channels."
 msgstr "Denne kommandoen viser en liste med alle kanaler."
 
-#: src/commandhandler.cpp:232
+#: src/commandhandler.cpp:241
 msgid "Command: /me <message>"
 msgstr "Kommando: /me <melding>"
 
-#: src/commandhandler.cpp:233
+#: src/commandhandler.cpp:242
 msgid "This command tell others you are (doing) <msg>."
 msgstr "Denne kommandoen forteller andre at du er (eller gjør) <melding>"
 
-#: src/commandhandler.cpp:237
+#: src/commandhandler.cpp:246
 msgid "Command: /msg <nick> <message>"
 msgstr "Kommando: /msg <brukernavn> <melding>"
 
-#: src/commandhandler.cpp:238
+#: src/commandhandler.cpp:247
 msgid "Command: /whisper <nick> <message>"
 msgstr "Kommando: /whisper <brukernavn> <melding>"
 
-#: src/commandhandler.cpp:239
+#: src/commandhandler.cpp:248
 msgid "Command: /w <nick> <message>"
 msgstr "Kommando: /w <brukernavn> <melding>"
 
-#: src/commandhandler.cpp:240
+#: src/commandhandler.cpp:249
 msgid "This command sends the text <message> to <nick>."
 msgstr "Denne kommandoen sender teksten <melding> til <brukernavn>."
 
-#: src/commandhandler.cpp:241 src/commandhandler.cpp:260
+#: src/commandhandler.cpp:250 src/commandhandler.cpp:269
 #: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
-#: src/net/ea/gui/guildtab.cpp:75 src/net/ea/gui/partytab.cpp:75
+#: src/net/tmwa/gui/guildtab.cpp:75 src/net/tmwa/gui/partytab.cpp:75
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 "Hvis <brukernavn> inneholder mellomrom, skriv det mellom to anførselstegn "
 "(\")."
 
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:255
 msgid "Command: /query <nick>"
 msgstr "Kommando: /query <brukernavn>"
 
-#: src/commandhandler.cpp:247
+#: src/commandhandler.cpp:256
 msgid "Command: /q <nick>"
 msgstr "Kommando: /q <brukernavn>"
 
-#: src/commandhandler.cpp:248
+#: src/commandhandler.cpp:257
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
 "Denne kommandoen prøver å opprette en fane for private meldinger mellom deg "
 "og <brukernavn>."
 
-#: src/commandhandler.cpp:253
+#: src/commandhandler.cpp:262
 #, fuzzy
 msgid "Command: /createparty <name>"
 msgstr "Kommando: /party <brukernavn>"
 
-#: src/commandhandler.cpp:254
+#: src/commandhandler.cpp:263
 #, fuzzy
 msgid "This command creates a new party called <name>."
 msgstr "Denne kommandoen åpner <kanal>"
 
-#: src/commandhandler.cpp:258
+#: src/commandhandler.cpp:267
 msgid "Command: /party <nick>"
 msgstr "Kommando: /party <brukernavn>"
 
-#: src/commandhandler.cpp:259 src/net/ea/gui/partytab.cpp:74
+#: src/commandhandler.cpp:268 src/net/tmwa/gui/partytab.cpp:74
 msgid "This command invites <nick> to party with you."
 msgstr "Denne kommandoen inviterer <brukernavn> til en gruppe med deg."
 
-#: src/commandhandler.cpp:265
+#: src/commandhandler.cpp:274
 msgid "Command: /present"
 msgstr "Kommando: /present"
 
-#: src/commandhandler.cpp:266
+#: src/commandhandler.cpp:275
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: src/commandhandler.cpp:272
+#: src/commandhandler.cpp:281
 msgid "Command: /record <filename>"
 msgstr "Kommando: /record <filnavn>"
 
-#: src/commandhandler.cpp:273
+#: src/commandhandler.cpp:282
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr "Denne kommandoen starter opptak av chatte-loggen til filen <filnavn>."
 
-#: src/commandhandler.cpp:275
+#: src/commandhandler.cpp:284
 msgid "Command: /record"
 msgstr "Kommando: /record"
 
-#: src/commandhandler.cpp:276
+#: src/commandhandler.cpp:285
 msgid "This command finishes a recording session."
 msgstr ""
 
-#: src/commandhandler.cpp:280
+#: src/commandhandler.cpp:289
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: src/commandhandler.cpp:281
+#: src/commandhandler.cpp:290
 msgid ""
 "This command sets whether the return key should toggle the chat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: src/commandhandler.cpp:283
+#: src/commandhandler.cpp:292
 msgid ""
-"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
-"\", \"no\", \"false\" to turn the toggle off."
+"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
+"\"0\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: src/commandhandler.cpp:286
+#: src/commandhandler.cpp:295
 msgid "Command: /toggle"
 msgstr ""
 
-#: src/commandhandler.cpp:287
+#: src/commandhandler.cpp:296
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: src/commandhandler.cpp:291 src/gui/widgets/whispertab.cpp:93
+#: src/commandhandler.cpp:300 src/gui/widgets/whispertab.cpp:95
 #, fuzzy
 msgid "Command: /unignore <player>"
 msgstr "Kommando: /announce <msg>"
 
-#: src/commandhandler.cpp:292
+#: src/commandhandler.cpp:301
 msgid "This command stops ignoring the given player if they are being ignored"
 msgstr ""
 
-#: src/commandhandler.cpp:297
+#: src/commandhandler.cpp:306
 msgid "Command: /where"
 msgstr ""
 
-#: src/commandhandler.cpp:298
+#: src/commandhandler.cpp:307
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: src/commandhandler.cpp:302
+#: src/commandhandler.cpp:311
 msgid "Command: /who"
 msgstr ""
 
-#: src/commandhandler.cpp:303
+#: src/commandhandler.cpp:312
 msgid "This command displays the number of players currently online."
 msgstr "Denne kommandoen viser antall påloggede spillere -"
 
-#: src/commandhandler.cpp:309
+#: src/commandhandler.cpp:318
 msgid "Type /help for a list of commands."
 msgstr "Skriv /help for en liste over kommandoer."
 
-#: src/commandhandler.cpp:375
+#: src/commandhandler.cpp:384
 msgid "Cannot send empty whispers!"
 msgstr "Kan ikke sende tomme meldinger!"
 
-#: src/commandhandler.cpp:383
+#: src/commandhandler.cpp:392
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:397
+#: src/commandhandler.cpp:406
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:410 src/net/ea/gui/partytab.cpp:109
+#: src/commandhandler.cpp:419 src/net/tmwa/gui/partytab.cpp:109
 msgid "Party name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:423 src/commandhandler.cpp:471
-#: src/commandhandler.cpp:493
+#: src/commandhandler.cpp:432 src/commandhandler.cpp:509
+#: src/commandhandler.cpp:531
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:441
+#: src/commandhandler.cpp:450
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:441
+#: src/commandhandler.cpp:450
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:450
+#: src/commandhandler.cpp:459
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:454
+#: src/commandhandler.cpp:463
 msgid "Message now closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:477
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:489
+msgid "Show IP: On"
+msgstr ""
+
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:485
+msgid "Show IP: Off"
+msgstr ""
+
+#: src/commandhandler.cpp:515
 msgid "Player already ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:484
+#: src/commandhandler.cpp:522
 msgid "Player successfully ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:486
+#: src/commandhandler.cpp:524
 msgid "Player could not be ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:501
+#: src/commandhandler.cpp:539
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:506
+#: src/commandhandler.cpp:544
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:508
+#: src/commandhandler.cpp:546
 msgid "Player could not be unignored!"
 msgstr ""
 
@@ -473,43 +488,43 @@ msgstr ""
 msgid "General"
 msgstr "Generelt"
 
-#: src/game.cpp:326
+#: src/game.cpp:342
 #, fuzzy
 msgid "Screenshot saved as "
 msgstr "Skjermbilde lagret til ~/"
 
-#: src/game.cpp:331
+#: src/game.cpp:347
 msgid "Saving screenshot failed!"
 msgstr "Lagring av skjermbilde feilet!"
 
-#: src/game.cpp:355
+#: src/game.cpp:378
 #, fuzzy
 msgid "The connection to the server was lost."
 msgstr "Forbindelsen til serveren mistet, programmet vil nå avsluttes"
 
-#: src/game.cpp:360
+#: src/game.cpp:382
 msgid "Network Error"
 msgstr "Nettverksfeil"
 
-#: src/game.cpp:705
+#: src/game.cpp:721
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:712
+#: src/game.cpp:726
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:946
+#: src/game.cpp:954
 #, fuzzy
 msgid "Could Not Load Map"
 msgstr "Kunne ikke laste inn kart."
 
-#: src/game.cpp:947
+#: src/game.cpp:955
 #, c-format
 msgid "Error while loading %s"
 msgstr "Feil i lastingen av %s"
 
-#: src/gui/beingpopup.cpp:75
+#: src/gui/beingpopup.cpp:76
 #, fuzzy, c-format
 msgid "Party: %s"
 msgstr "Gruppe (%s)"
@@ -518,34 +533,34 @@ msgstr "Gruppe (%s)"
 msgid "Buy"
 msgstr "Kjøp"
 
-#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
-#: src/gui/sell.cpp:276
+#: src/gui/buy.cpp:69 src/gui/buy.cpp:261 src/gui/sell.cpp:71
+#: src/gui/sell.cpp:288
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Pris: %s / Totalt: %s"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:99 src/gui/npcdialog.cpp:100
-#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:479
+#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:112 src/gui/npcdialog.cpp:124
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:463
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:98 src/gui/npcdialog.cpp:101
-#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:491
+#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:111 src/gui/npcdialog.cpp:125
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:475
 msgid "-"
 msgstr ""
 
 #: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
-#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:182
-#: src/keyboardconfig.cpp:103
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:228
+#: src/keyboardconfig.cpp:102
 msgid "Quit"
 msgstr "Avslutt"
 
-#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:408
-#: src/gui/statuswindow.cpp:478 src/gui/statuswindow.cpp:512
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:384
+#: src/gui/statuswindow.cpp:462 src/gui/statuswindow.cpp:496
 msgid "Max"
 msgstr "Maks"
 
@@ -559,11 +574,11 @@ msgstr "Selg"
 
 #: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
 #: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
-#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:101
-#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:178
-#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:402
+#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:114
+#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:389
 #: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
-#: src/gui/socialwindow.cpp:242 src/gui/textdialog.cpp:39
+#: src/gui/socialwindow.cpp:275 src/gui/textdialog.cpp:40
 #: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr "Avbryt"
@@ -601,7 +616,7 @@ msgstr ""
 msgid "Change Password"
 msgstr "Endre passord"
 
-#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:53
+#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:55
 #: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
 msgid "Password:"
 msgstr "Passord:"
@@ -633,19 +648,19 @@ msgstr ""
 msgid "Create Character"
 msgstr "Lag karakter:"
 
-#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:52
+#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:54
 #: src/gui/register.cpp:67
 msgid "Name:"
 msgstr "Navn:"
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
 #: src/gui/outfitwindow.cpp:67
 msgid ">"
 msgstr ""
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
 #: src/gui/outfitwindow.cpp:66
@@ -662,8 +677,8 @@ msgstr "Hårfarge:"
 msgid "Hair style:"
 msgstr "Frisyre:"
 
-#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:397
-#: src/gui/socialwindow.cpp:296
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:392
+#: src/gui/socialwindow.cpp:329
 msgid "Create"
 msgstr "Lag"
 
@@ -719,34 +734,34 @@ msgstr "Avregistrer"
 msgid "Change Email"
 msgstr "Endre epost-adresse"
 
-#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:185
-#: src/gui/setup_players.cpp:230
+#: src/gui/charselectdialog.cpp:336 src/gui/serverdialog.cpp:231
+#: src/gui/setup_players.cpp:229
 msgid "Delete"
 msgstr "Slett"
 
-#: src/gui/charselectdialog.cpp:387
+#: src/gui/charselectdialog.cpp:380
 #, fuzzy
 msgid "Choose"
 msgstr "Lukk"
 
-#: src/gui/charselectdialog.cpp:399 src/gui/charselectdialog.cpp:400
+#: src/gui/charselectdialog.cpp:394 src/gui/charselectdialog.cpp:395
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:77 src/gui/palette.cpp:96
+#: src/gui/chat.cpp:88
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chat.cpp:287
+#: src/gui/chat.cpp:311
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:305
+#: src/gui/chat.cpp:329
 msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:469
+#: src/gui/chat.cpp:493
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -808,142 +823,172 @@ msgstr "Partikkeldetalje"
 msgid "Ambient FX: %s"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:56
+#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:55
 msgid "Equipment"
 msgstr "Utstyr"
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:77
-#: src/gui/inventorywindow.cpp:79 src/gui/inventorywindow.cpp:298
-#: src/gui/popupmenu.cpp:372
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:89
+#: src/gui/inventorywindow.cpp:337 src/gui/popupmenu.cpp:359
 msgid "Unequip"
 msgstr ""
 
-#: src/gui/help.cpp:36
+#: src/gui/help.cpp:37
 msgid "Help"
 msgstr "Hjelp"
 
-#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:73
+#: src/gui/help.cpp:51 src/gui/npcdialog.cpp:50
 msgid "Close"
 msgstr "Lukk"
 
-#: src/gui/inventorywindow.cpp:56 src/gui/windowmenu.cpp:57
+#: src/gui/inventorywindow.cpp:59 src/gui/windowmenu.cpp:56
 msgid "Inventory"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:72 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:300 src/gui/popupmenu.cpp:374
+#: src/gui/inventorywindow.cpp:59
+msgid "Storage"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:82
+msgid "Slots:"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:87 src/gui/inventorywindow.cpp:100
+#: src/gui/inventorywindow.cpp:339 src/gui/popupmenu.cpp:361
 msgid "Equip"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:304 src/gui/popupmenu.cpp:377
+#: src/gui/inventorywindow.cpp:88
 msgid "Use"
 msgstr "Bruk"
 
-#: src/gui/inventorywindow.cpp:83 src/gui/inventorywindow.cpp:308
-#: src/gui/popupmenu.cpp:380
+#: src/gui/inventorywindow.cpp:101 src/gui/popupmenu.cpp:364
+msgid "Activate"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:102 src/gui/inventorywindow.cpp:348
+#: src/gui/popupmenu.cpp:367
 msgid "Drop..."
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:84 src/gui/popupmenu.cpp:386
+#: src/gui/inventorywindow.cpp:103 src/gui/popupmenu.cpp:373
 msgid "Split"
 msgstr "Del opp"
 
-#: src/gui/inventorywindow.cpp:85 src/gui/outfitwindow.cpp:51
+#: src/gui/inventorywindow.cpp:104 src/gui/outfitwindow.cpp:51
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:96 src/gui/storagewindow.cpp:83
-msgid "Slots:"
-msgstr ""
-
-#: src/gui/inventorywindow.cpp:97
+#: src/gui/inventorywindow.cpp:106
 msgid "Weight:"
 msgstr "Vekt:"
 
-#: src/gui/inventorywindow.cpp:310 src/gui/popupmenu.cpp:382
+#: src/gui/inventorywindow.cpp:124 src/gui/popupmenu.cpp:378
+msgid "Store"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:125 src/gui/popupmenu.cpp:385
+msgid "Retrieve"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:350 src/gui/popupmenu.cpp:369
 msgid "Drop"
 msgstr ""
 
-#: src/gui/itemamount.cpp:100 src/gui/okdialog.cpp:42
-#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:38 src/gui/trade.cpp:73
-#: src/gui/trade.cpp:75
+#: src/gui/itemamount.cpp:113 src/gui/okdialog.cpp:42
+#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:39 src/gui/trade.cpp:72
+#: src/gui/trade.cpp:74
 msgid "OK"
 msgstr "OK"
 
-#: src/gui/itemamount.cpp:102
+#: src/gui/itemamount.cpp:115
 msgid "All"
 msgstr "Alt"
 
-#: src/gui/itemamount.cpp:128
+#: src/gui/itemamount.cpp:141
 msgid "Select amount of items to trade."
 msgstr ""
 
-#: src/gui/itemamount.cpp:131
+#: src/gui/itemamount.cpp:144
 msgid "Select amount of items to drop."
 msgstr ""
 
-#: src/gui/itemamount.cpp:134
+#: src/gui/itemamount.cpp:147
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/itemamount.cpp:137
+#: src/gui/itemamount.cpp:150
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamount.cpp:140
+#: src/gui/itemamount.cpp:153
 msgid "Select amount of items to split."
 msgstr ""
 
-#: src/gui/itempopup.cpp:92
+#: src/gui/itempopup.cpp:137
 #, fuzzy, c-format
 msgid "Weight: %s"
 msgstr "Vekt:"
 
-#: src/gui/login.cpp:49 src/gui/login.cpp:61
+#: src/gui/login.cpp:51 src/gui/login.cpp:63
 msgid "Login"
 msgstr ""
 
-#: src/gui/login.cpp:58
+#: src/gui/login.cpp:60
 #, fuzzy
 msgid "Remember username"
 msgstr "Husk brukernavn"
 
-#: src/gui/login.cpp:59 src/gui/register.cpp:58 src/gui/register.cpp:73
+#: src/gui/login.cpp:61 src/gui/register.cpp:58 src/gui/register.cpp:73
 msgid "Register"
 msgstr "Registrer"
 
-#: src/gui/login.cpp:60
+#: src/gui/login.cpp:62
 #, fuzzy
 msgid "Change Server"
 msgstr "Server"
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
+#: src/gui/login.cpp:129
+msgid "Registration disabled"
+msgstr ""
+
+#: src/gui/login.cpp:129
+msgid "You need to use the website to register an account for this server."
+msgstr ""
+
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:86
 msgid "Map"
 msgstr "Kart"
 
-#: src/gui/npcdialog.cpp:44
+#: src/gui/ministatus.cpp:235
+msgid "Need"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:48
 msgid "Waiting for server"
 msgstr "Venter på server"
 
-#: src/gui/npcdialog.cpp:45
+#: src/gui/npcdialog.cpp:49
 msgid "Next"
 msgstr "Neste"
 
-#: src/gui/npcdialog.cpp:47
+#: src/gui/npcdialog.cpp:51
 msgid "Submit"
 msgstr "Bekreft"
 
-#: src/gui/npcdialog.cpp:52 src/gui/npcpostdialog.cpp:41
+#: src/gui/npcdialog.cpp:73 src/gui/npcpostdialog.cpp:41
 msgid "NPC"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:110
+#: src/gui/npcdialog.cpp:118
+msgid "Clear log"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:134
 msgid "Reset"
 msgstr "Tilbakestill"
 
 #. TRANSLATORS: Please leave the \n sequences intact.
-#: src/gui/npcdialog.cpp:171
+#: src/gui/npcdialog.cpp:208
 #, fuzzy
 msgid ""
 "\n"
@@ -958,7 +1003,7 @@ msgstr "Til:"
 msgid "Send"
 msgstr "Send"
 
-#: src/gui/npcpostdialog.cpp:96
+#: src/gui/npcpostdialog.cpp:99
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
@@ -972,306 +1017,83 @@ msgstr ""
 msgid "Unequip first"
 msgstr ""
 
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:143
-msgid "Text"
-msgstr "Tekst"
-
-#: src/gui/palette.cpp:82
-msgid "Text Shadow"
-msgstr "Tekstskygge"
-
-#: src/gui/palette.cpp:83
-msgid "Text Outline"
-msgstr ""
-
-#: src/gui/palette.cpp:84
-msgid "Progress Bar Labels"
-msgstr ""
-
-#: src/gui/palette.cpp:85
-msgid "Buttons"
-msgstr ""
-
-#: src/gui/palette.cpp:86
-msgid "Disabled Buttons"
-msgstr ""
-
-#: src/gui/palette.cpp:87
-msgid "Tabs"
-msgstr ""
-
-#: src/gui/palette.cpp:89
-msgid "Background"
-msgstr "Bakgrunn"
-
-#: src/gui/palette.cpp:91
-msgid "Highlight"
-msgstr ""
-
-#: src/gui/palette.cpp:92
-msgid "Tab Highlight"
-msgstr ""
-
-#: src/gui/palette.cpp:93
-msgid "Item Too Expensive"
-msgstr ""
-
-#: src/gui/palette.cpp:94
-msgid "Item Is Equipped"
-msgstr ""
-
-#: src/gui/palette.cpp:97
-msgid "GM"
-msgstr ""
-
-#: src/gui/palette.cpp:98
-msgid "Player"
-msgstr "Spiller"
-
-#: src/gui/palette.cpp:99
-msgid "Whisper"
-msgstr ""
-
-#: src/gui/palette.cpp:100
-msgid "Is"
-msgstr ""
-
-#: src/gui/palette.cpp:101 src/net/ea/gui/partytab.cpp:43
-msgid "Party"
-msgstr "Gruppe"
-
-#: src/gui/palette.cpp:102 src/net/ea/gui/guildtab.cpp:45
-msgid "Guild"
-msgstr ""
-
-#: src/gui/palette.cpp:103
-msgid "Server"
-msgstr "Server"
-
-#: src/gui/palette.cpp:104
-msgid "Logger"
-msgstr ""
-
-#: src/gui/palette.cpp:105
-msgid "Hyperlink"
-msgstr "Hyperlenke"
-
-#: src/gui/palette.cpp:107
-msgid "Being"
-msgstr ""
-
-#: src/gui/palette.cpp:108
-msgid "Other Players' Names"
-msgstr "Andre Spilleres Navn"
-
-#: src/gui/palette.cpp:109
-msgid "Own Name"
-msgstr "Eget Navn"
-
-#: src/gui/palette.cpp:110
-msgid "GM Names"
-msgstr "GM Navn"
-
-#: src/gui/palette.cpp:111
-msgid "NPCs"
-msgstr "NPCer"
-
-#: src/gui/palette.cpp:112
-msgid "Monsters"
-msgstr "Monstre"
-
-#: src/gui/palette.cpp:114
-msgid "Unknown Item Type"
-msgstr ""
-
-#: src/gui/palette.cpp:115
-msgid "Generics"
-msgstr ""
-
-#: src/gui/palette.cpp:116
-msgid "Hats"
-msgstr ""
-
-#: src/gui/palette.cpp:117
-msgid "Usables"
-msgstr ""
-
-#: src/gui/palette.cpp:118
-msgid "Shirts"
-msgstr "Skjorter"
-
-#: src/gui/palette.cpp:119
-#, fuzzy
-msgid "One Handed Weapons"
-msgstr "Én-håndsvåpen"
-
-#: src/gui/palette.cpp:120
-msgid "Pants"
-msgstr "Bukser"
-
-#: src/gui/palette.cpp:121
-msgid "Shoes"
-msgstr "Sko"
-
-#: src/gui/palette.cpp:122
-#, fuzzy
-msgid "Two Handed Weapons"
-msgstr "Én-håndsvåpen"
-
-#: src/gui/palette.cpp:123
-msgid "Shields"
-msgstr "Skjold"
-
-#: src/gui/palette.cpp:124
-msgid "Rings"
-msgstr "Ringer"
-
-#: src/gui/palette.cpp:125
-msgid "Necklaces"
-msgstr "Halsbånd"
-
-#: src/gui/palette.cpp:126
-msgid "Arms"
-msgstr ""
-
-#: src/gui/palette.cpp:127
-msgid "Ammo"
-msgstr "Ammunisjon"
-
-#: src/gui/palette.cpp:129
-msgid "Particle Effects"
-msgstr "Partikkeleffekter"
-
-#: src/gui/palette.cpp:130
-msgid "Pickup Notification"
-msgstr ""
-
-#: src/gui/palette.cpp:131
-msgid "Exp Notification"
-msgstr ""
-
-#: src/gui/palette.cpp:133
-msgid "Player Hits Monster"
-msgstr ""
-
-#: src/gui/palette.cpp:135
-msgid "Monster Hits Player"
-msgstr ""
-
-#: src/gui/palette.cpp:136
-msgid "Critical Hit"
-msgstr ""
-
-#: src/gui/palette.cpp:137
-msgid "Misses"
-msgstr ""
-
-#: src/gui/palette.cpp:139
-msgid "HP Bar"
-msgstr ""
-
-#: src/gui/palette.cpp:140
-msgid "3/4 HP Bar"
-msgstr ""
-
-#: src/gui/palette.cpp:141
-msgid "1/2 HP Bar"
-msgstr ""
-
-#: src/gui/palette.cpp:142
-msgid "1/4 HP Bar"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:84
+#: src/gui/popupmenu.cpp:83
 #, c-format
 msgid "Trade with %s..."
 msgstr ""
 
-#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:161
+#: src/gui/popupmenu.cpp:87 src/gui/popupmenu.cpp:158
 #, c-format
 msgid "Attack %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:92
+#: src/gui/popupmenu.cpp:91
 #, c-format
 msgid "Whisper %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:101
+#: src/gui/popupmenu.cpp:100
 #, c-format
 msgid "Befriend %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:106
+#: src/gui/popupmenu.cpp:105
 #, c-format
 msgid "Disregard %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:109
+#: src/gui/popupmenu.cpp:108
 #, fuzzy, c-format
 msgid "Ignore %s"
 msgstr "Ignorert"
 
-#: src/gui/popupmenu.cpp:115 src/gui/popupmenu.cpp:124
+#: src/gui/popupmenu.cpp:114 src/gui/popupmenu.cpp:123
 #, c-format
 msgid "Unignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:118
+#: src/gui/popupmenu.cpp:117
 #, c-format
 msgid "Completely ignore %s"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:130
 #, c-format
-msgid "Follow %s"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:133
-#, c-format
 msgid "Invite %s to join your guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:137
+#: src/gui/popupmenu.cpp:134
 #, fuzzy, c-format
 msgid "Invite %s to join your party"
 msgstr "%s har invitert deg til sin gruppe."
 
-#: src/gui/popupmenu.cpp:144
+#: src/gui/popupmenu.cpp:141
 msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:153
+#: src/gui/popupmenu.cpp:150
 #, c-format
 msgid "Talk to %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:166
+#: src/gui/popupmenu.cpp:163
 #, fuzzy
 msgid "Kick monster"
 msgstr "Monstre"
 
-#: src/gui/popupmenu.cpp:174
+#: src/gui/popupmenu.cpp:171
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:191
+#: src/gui/popupmenu.cpp:188
 #, c-format
 msgid "Pick up %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:400
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:387
 msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:70
-msgid "Store"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:71
-msgid "Retrieve"
-msgstr ""
-
 #: src/gui/quitdialog.cpp:44
 msgid "Switch server"
 msgstr ""
@@ -1340,52 +1162,65 @@ msgstr "Passordet må være mindre enn %d bokstaver."
 msgid "Passwords do not match."
 msgstr "Passordene stemmer ikke."
 
-#: src/gui/serverdialog.cpp:134
+#: src/gui/serverdialog.cpp:197
 #, fuzzy
 msgid "Choose Your Server"
 msgstr "Velg server"
 
-#: src/gui/serverdialog.cpp:141 src/gui/widgets/chattab.cpp:139
+#: src/gui/serverdialog.cpp:206 src/gui/widgets/chattab.cpp:142
 msgid "Server:"
 msgstr "Server:"
 
-#: src/gui/serverdialog.cpp:142
+#: src/gui/serverdialog.cpp:207
 msgid "Port:"
 msgstr "Port:"
 
-#: src/gui/serverdialog.cpp:143
+#: src/gui/serverdialog.cpp:208
 #, fuzzy
 msgid "Server type:"
 msgstr "Server:"
 
-#: src/gui/serverdialog.cpp:183
+#: src/gui/serverdialog.cpp:229
 #, fuzzy
 msgid "Connect"
 msgstr "Kobler til..."
 
-#: src/gui/serverdialog.cpp:184
+#: src/gui/serverdialog.cpp:230
 #, fuzzy
 msgid "Custom Server"
 msgstr "Server"
 
-#: src/gui/serverdialog.cpp:262
+#: src/gui/serverdialog.cpp:324
 msgid "Please type both the address and the port of a server."
 msgstr "Vennligst skriv inn både adresse og port til en server."
 
-#: src/gui/serverdialog.cpp:411
+#: src/gui/serverdialog.cpp:441
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:417
+#: src/gui/serverdialog.cpp:447
 #, fuzzy
 msgid "Waiting for server..."
 msgstr "Venter på server"
 
-#: src/gui/serverdialog.cpp:421
+#: src/gui/serverdialog.cpp:451
 msgid "Preparing download"
 msgstr ""
 
+#: src/gui/serverdialog.cpp:455
+msgid "Error retreiving server list!"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:550
+msgid "requires a newer version"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:552
+#, c-format
+msgid "requires v%s"
+msgstr ""
+
 #: src/gui/setup_audio.cpp:42
 msgid "Sound"
 msgstr "Lyd"
@@ -1419,53 +1254,53 @@ msgstr ""
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:44
+#: src/gui/setup_colors.cpp:46
 msgid "This is what the color looks like"
 msgstr "Slik ser fargen ut"
 
-#: src/gui/setup_colors.cpp:49
+#: src/gui/setup_colors.cpp:51
 msgid "Colors"
 msgstr "Farger"
 
-#: src/gui/setup_colors.cpp:70
+#: src/gui/setup_colors.cpp:72
 msgid "Type:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:81 src/gui/setup_colors.cpp:433
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:331
 msgid "Static"
 msgstr "Statisk"
 
-#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:84
-#: src/gui/setup_colors.cpp:434
+#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
+#: src/gui/setup_colors.cpp:332
 msgid "Pulse"
 msgstr "Puls"
 
-#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
+#: src/gui/setup_colors.cpp:333
 msgid "Rainbow"
 msgstr "Regnbue"
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
+#: src/gui/setup_colors.cpp:333
 msgid "Spectrum"
 msgstr "Spektrum"
 
-#: src/gui/setup_colors.cpp:92
+#: src/gui/setup_colors.cpp:94
 #, fuzzy
 msgid "Delay:"
 msgstr "Forsinkelse: "
 
-#: src/gui/setup_colors.cpp:107
+#: src/gui/setup_colors.cpp:109
 #, fuzzy
 msgid "Red:"
 msgstr "Rød: "
 
-#: src/gui/setup_colors.cpp:122
+#: src/gui/setup_colors.cpp:124
 #, fuzzy
 msgid "Green:"
 msgstr "Grønn: "
 
-#: src/gui/setup_colors.cpp:137
+#: src/gui/setup_colors.cpp:139
 #, fuzzy
 msgid "Blue:"
 msgstr "Blå: "
@@ -1511,587 +1346,597 @@ msgid "Assign"
 msgstr "Tildel"
 
 #: src/gui/setup_keyboard.cpp:90
+#, fuzzy
+msgid "Unassign"
+msgstr "Tildel"
+
+#: src/gui/setup_keyboard.cpp:94
 msgid "Default"
 msgstr "Standard"
 
-#: src/gui/setup_keyboard.cpp:119
+#: src/gui/setup_keyboard.cpp:125
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_players.cpp:57
+#: src/gui/setup_players.cpp:58
 msgid "Name"
 msgstr "Navn"
 
-#: src/gui/setup_players.cpp:58
+#: src/gui/setup_players.cpp:59
 msgid "Relation"
 msgstr ""
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:64
 msgid "Neutral"
 msgstr "Nøytral"
 
-#: src/gui/setup_players.cpp:64
+#: src/gui/setup_players.cpp:65
 msgid "Friend"
 msgstr "Venn"
 
-#: src/gui/setup_players.cpp:65
+#: src/gui/setup_players.cpp:66
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_players.cpp:67
 msgid "Ignored"
 msgstr "Ignorert"
 
-#: src/gui/setup_players.cpp:208 src/gui/setup_video.cpp:132
+#: src/gui/setup_players.cpp:206 src/gui/setup_video.cpp:153
 msgid "???"
 msgstr "???"
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_players.cpp:225
 msgid "Allow trading"
 msgstr "Tillat handel"
 
-#: src/gui/setup_players.cpp:228
+#: src/gui/setup_players.cpp:227
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:231
 msgid "Put all whispers in tabs"
 msgstr ""
 
-#: src/gui/setup_players.cpp:234
+#: src/gui/setup_players.cpp:233
 #, fuzzy
 msgid "Show gender"
 msgstr "Vis navn"
 
-#: src/gui/setup_players.cpp:236
+#: src/gui/setup_players.cpp:235
+msgid "Enable Chat log"
+msgstr ""
+
+#: src/gui/setup_players.cpp:237
 msgid "Players"
 msgstr "Spillere"
 
-#: src/gui/setup_players.cpp:261
+#: src/gui/setup_players.cpp:262
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:113
+#: src/gui/setup_video.cpp:134
 msgid "Tiny"
 msgstr "Bitteliten"
 
-#: src/gui/setup_video.cpp:114
+#: src/gui/setup_video.cpp:135
 msgid "Small"
 msgstr "Liten"
 
-#: src/gui/setup_video.cpp:115
+#: src/gui/setup_video.cpp:136
 msgid "Medium"
 msgstr "Medium"
 
-#: src/gui/setup_video.cpp:116
+#: src/gui/setup_video.cpp:137
 msgid "Large"
 msgstr "Stor"
 
-#: src/gui/setup_video.cpp:142
+#: src/gui/setup_video.cpp:163
 msgid "No text"
 msgstr "Ingen tekst"
 
-#: src/gui/setup_video.cpp:144
+#: src/gui/setup_video.cpp:164
+msgid "Text"
+msgstr "Tekst"
+
+#: src/gui/setup_video.cpp:165
 msgid "Bubbles, no names"
 msgstr "Bobler, ingen navn"
 
-#: src/gui/setup_video.cpp:145
+#: src/gui/setup_video.cpp:166
 msgid "Bubbles with names"
 msgstr "Bobler med navn"
 
-#: src/gui/setup_video.cpp:157
+#: src/gui/setup_video.cpp:178
 msgid "off"
 msgstr "av"
 
-#: src/gui/setup_video.cpp:158 src/gui/setup_video.cpp:171
+#: src/gui/setup_video.cpp:179 src/gui/setup_video.cpp:192
 msgid "low"
 msgstr "lav"
 
-#: src/gui/setup_video.cpp:159 src/gui/setup_video.cpp:173
+#: src/gui/setup_video.cpp:180 src/gui/setup_video.cpp:194
 msgid "high"
 msgstr "høy"
 
-#: src/gui/setup_video.cpp:172
+#: src/gui/setup_video.cpp:193
 msgid "medium"
 msgstr "medium"
 
-#: src/gui/setup_video.cpp:174
+#: src/gui/setup_video.cpp:195
 msgid "max"
 msgstr "maks"
 
-#: src/gui/setup_video.cpp:196
+#: src/gui/setup_video.cpp:217
 msgid "Full screen"
 msgstr "Fullskjerm"
 
-#: src/gui/setup_video.cpp:197
+#: src/gui/setup_video.cpp:218
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:198
+#: src/gui/setup_video.cpp:219
 msgid "Custom cursor"
 msgstr ""
 
-#: src/gui/setup_video.cpp:200
+#: src/gui/setup_video.cpp:221
 msgid "Visible names"
 msgstr "Synlige navn"
 
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:223
 msgid "Particle effects"
 msgstr "Partikkeleffekter"
 
-#: src/gui/setup_video.cpp:204
+#: src/gui/setup_video.cpp:225
 #, fuzzy
 msgid "Show own name"
 msgstr "Vis navn"
 
-#: src/gui/setup_video.cpp:205
+#: src/gui/setup_video.cpp:226
+msgid "Log NPC dialogue"
+msgstr ""
+
+#: src/gui/setup_video.cpp:227
 msgid "Show pickup notification"
 msgstr ""
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:207
+#. TRANSLATORS: Refers to "Show pickup notification"
+#: src/gui/setup_video.cpp:229
 msgid "in chat"
 msgstr ""
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:209
+#. TRANSLATORS: Refers to "Show pickup notification"
+#: src/gui/setup_video.cpp:231
 msgid "as particle"
 msgstr "som partikkel"
 
-#: src/gui/setup_video.cpp:214
+#: src/gui/setup_video.cpp:236
 #, fuzzy
 msgid "FPS limit:"
 msgstr "FPS-grense:"
 
-#: src/gui/setup_video.cpp:225
+#: src/gui/setup_video.cpp:247
+msgid "Disable transparency (Low CPU mode)"
+msgstr ""
+
+#: src/gui/setup_video.cpp:250
 msgid "Video"
 msgstr "Video"
 
-#: src/gui/setup_video.cpp:227
+#: src/gui/setup_video.cpp:252
 #, fuzzy
-msgid "Show monster damage"
+msgid "Show damage"
 msgstr "Vis navn"
 
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:258
 msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:259
 msgid "Gui opacity"
 msgstr "GUI-gjennomsiktighet"
 
-#: src/gui/setup_video.cpp:235
+#: src/gui/setup_video.cpp:260
 msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_video.cpp:236
+#: src/gui/setup_video.cpp:261
 #, fuzzy
 msgid "Particle detail"
 msgstr "Partikkeldetalje"
 
-#: src/gui/setup_video.cpp:237
+#: src/gui/setup_video.cpp:262
 msgid "Font size"
 msgstr "Skriftstørrelse"
 
-#: src/gui/setup_video.cpp:251 src/gui/setup_video.cpp:454
-#: src/gui/setup_video.cpp:568
+#: src/gui/setup_video.cpp:277 src/gui/setup_video.cpp:532
+#: src/gui/setup_video.cpp:662
 #, fuzzy
 msgid "None"
 msgstr "Nei"
 
-#: src/gui/setup_video.cpp:381
+#: src/gui/setup_video.cpp:426
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:387
+#: src/gui/setup_video.cpp:432
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:398
+#: src/gui/setup_video.cpp:443
 #, fuzzy
 msgid "Switching to Full Screen"
 msgstr "Bytter til fullskjerm"
 
-#: src/gui/setup_video.cpp:399
+#: src/gui/setup_video.cpp:444
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:411
+#: src/gui/setup_video.cpp:458
 #, fuzzy
 msgid "Changing to OpenGL"
 msgstr "Bytter OpenGL"
 
-#: src/gui/setup_video.cpp:412
+#: src/gui/setup_video.cpp:459
+msgid ""
+"Applying change to OpenGL requires restart. In case OpenGL messes up your "
+"game graphics, restart the game with the command line option \"--no-opengl\"."
+msgstr ""
+
+#: src/gui/setup_video.cpp:466
+msgid "Deactivating OpenGL"
+msgstr ""
+
+#: src/gui/setup_video.cpp:467
 msgid "Applying change to OpenGL requires restart."
 msgstr "Endringer av OpenGL krever restart."
 
-#: src/gui/setup_video.cpp:486 src/gui/setup_video.cpp:491
+#: src/gui/setup_video.cpp:475
+msgid "Transparency disabled"
+msgstr ""
+
+#: src/gui/setup_video.cpp:476 src/gui/setup_video.cpp:484
+msgid "You must restart to apply changes."
+msgstr ""
+
+#: src/gui/setup_video.cpp:483
+msgid "Transparency enabled"
+msgstr ""
+
+#: src/gui/setup_video.cpp:576 src/gui/setup_video.cpp:581
 #, fuzzy
 msgid "Screen Resolution Changed"
 msgstr "Skjermresolusjon endret"
 
-#: src/gui/setup_video.cpp:487 src/gui/setup_video.cpp:492
+#: src/gui/setup_video.cpp:577 src/gui/setup_video.cpp:582
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:489
+#: src/gui/setup_video.cpp:579
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:522
+#: src/gui/setup_video.cpp:612
 #, fuzzy
 msgid "Particle Effect Settings Changed."
 msgstr "Partikkeleffekt-instillinger endret."
 
-#: src/gui/setup_video.cpp:523
+#: src/gui/setup_video.cpp:613
 msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skilldialog.cpp:197 src/gui/windowmenu.cpp:58
+#: src/gui/skilldialog.cpp:212 src/gui/windowmenu.cpp:59
 msgid "Skills"
 msgstr "Ferdigheter"
 
-#: src/gui/skilldialog.cpp:208
+#: src/gui/skilldialog.cpp:223
 msgid "Up"
 msgstr "Opp"
 
-#: src/gui/skilldialog.cpp:262
+#: src/gui/skilldialog.cpp:269
 #, fuzzy, c-format
 msgid "Skill points available: %d"
 msgstr "Ferdighetspoeng: %d"
 
-#: src/gui/skilldialog.cpp:314
+#: src/gui/skilldialog.cpp:351
 #, fuzzy, c-format
 msgid "Skill Set %d"
 msgstr "Ferdighetspoeng: %d"
 
-#: src/gui/skilldialog.cpp:323
+#: src/gui/skilldialog.cpp:360
 #, fuzzy, c-format
 msgid "Skill %d"
 msgstr "Ferdigheter"
 
-#: src/gui/skilldialog.cpp:405
+#: src/gui/skilldialog.cpp:442
 #, fuzzy, c-format
 msgid "Lvl: %d (%+d)"
 msgstr "Nivå: %d"
 
-#: src/gui/skilldialog.cpp:416
+#: src/gui/skilldialog.cpp:453
 #, fuzzy, c-format
 msgid "Lvl: %d"
 msgstr "Nivå: %d"
 
-#: src/gui/socialwindow.cpp:117
+#: src/gui/socialwindow.cpp:126
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:126
+#: src/gui/socialwindow.cpp:139
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:136
+#: src/gui/socialwindow.cpp:153
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:137
+#: src/gui/socialwindow.cpp:154
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:146
+#: src/gui/socialwindow.cpp:163
 msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:147
+#: src/gui/socialwindow.cpp:164
 #, fuzzy, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Er du sikker på at du vil avslutte?"
 
-#: src/gui/socialwindow.cpp:182
+#: src/gui/socialwindow.cpp:207 src/net/tmwa/partyhandler.cpp:330
 #, fuzzy, c-format
 msgid "Invited user %s to party."
 msgstr "/party > Inviter en bruker til en gruppe"
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:218
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:199
+#: src/gui/socialwindow.cpp:232
 #, fuzzy
 msgid "Member Invite to Party"
 msgstr "/party > Inviter en bruker til en gruppe"
 
-#: src/gui/socialwindow.cpp:200
+#: src/gui/socialwindow.cpp:233
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:209
+#: src/gui/socialwindow.cpp:242
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:210
+#: src/gui/socialwindow.cpp:243
 #, fuzzy, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Er du sikker på at du vil avslutte?"
 
-#: src/gui/socialwindow.cpp:239
+#: src/gui/socialwindow.cpp:272
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:240 src/gui/socialwindow.cpp:564
+#: src/gui/socialwindow.cpp:273 src/gui/socialwindow.cpp:620
 #, fuzzy
 msgid "Create Party"
 msgstr "Lag karakter:"
 
-#: src/gui/socialwindow.cpp:279 src/gui/windowmenu.cpp:60
+#: src/gui/socialwindow.cpp:312 src/gui/windowmenu.cpp:64
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:297
+#: src/gui/socialwindow.cpp:330
 #, fuzzy
 msgid "Invite"
 msgstr "Inviter Bruker"
 
-#: src/gui/socialwindow.cpp:298
+#: src/gui/socialwindow.cpp:331
 #, fuzzy
 msgid "Leave"
 msgstr "Stor"
 
-#: src/gui/socialwindow.cpp:394
+#: src/gui/socialwindow.cpp:443
 #, fuzzy, c-format
 msgid "Accepted party invite from %s."
 msgstr "Godta invitasjon fra %s."
 
-#: src/gui/socialwindow.cpp:400
+#: src/gui/socialwindow.cpp:449
 #, fuzzy, c-format
 msgid "Rejected party invite from %s."
 msgstr "Avslo invitasjon fra %s."
 
-#: src/gui/socialwindow.cpp:413
+#: src/gui/socialwindow.cpp:462
 #, fuzzy, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Godta invitasjon fra %s."
 
-#: src/gui/socialwindow.cpp:419
+#: src/gui/socialwindow.cpp:468
 #, fuzzy, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Avslo invitasjon fra %s."
 
-#: src/gui/socialwindow.cpp:463
+#: src/gui/socialwindow.cpp:497
+msgid "Creating guild failed, please choose a shorter name."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:504
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:477
+#: src/gui/socialwindow.cpp:520
+msgid "Creating party failed, please choose a shorter name."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:527
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:484
+#: src/gui/socialwindow.cpp:541
 #, fuzzy
 msgid "Guild Name"
 msgstr "GM Navn"
 
-#: src/gui/socialwindow.cpp:485
+#: src/gui/socialwindow.cpp:542
 #, fuzzy
 msgid "Choose your guild's name."
 msgstr "Velg server"
 
-#: src/gui/socialwindow.cpp:497
+#: src/gui/socialwindow.cpp:554
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:502
+#: src/gui/socialwindow.cpp:559
 #, fuzzy, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s har invitert deg til sin gruppe."
 
-#: src/gui/socialwindow.cpp:507
+#: src/gui/socialwindow.cpp:564
 #, fuzzy
 msgid "Accept Guild Invite"
 msgstr "Godta Gruppeinvitasjon"
 
-#: src/gui/socialwindow.cpp:519
+#: src/gui/socialwindow.cpp:576
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:529
+#: src/gui/socialwindow.cpp:585
 #, fuzzy
 msgid "You have been invited you to join a party."
 msgstr "%s har invitert deg til sin gruppe."
 
-#: src/gui/socialwindow.cpp:533
+#: src/gui/socialwindow.cpp:589
 #, fuzzy, c-format
 msgid "You have been invited to join the %s party."
 msgstr "%s har invitert deg til sin gruppe."
 
-#: src/gui/socialwindow.cpp:541
+#: src/gui/socialwindow.cpp:597
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s har invitert deg til sin gruppe."
 
-#: src/gui/socialwindow.cpp:546
+#: src/gui/socialwindow.cpp:602
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:554
+#: src/gui/socialwindow.cpp:610
 msgid "Accept Party Invite"
 msgstr "Godta Gruppeinvitasjon"
 
-#: src/gui/socialwindow.cpp:565
+#: src/gui/socialwindow.cpp:621
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:570
+#: src/gui/socialwindow.cpp:626
 #, fuzzy
 msgid "Party Name"
 msgstr "Gruppe"
 
-#: src/gui/socialwindow.cpp:571
+#: src/gui/socialwindow.cpp:627
 #, fuzzy
 msgid "Choose your party's name."
 msgstr "Velg server"
 
-#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:59
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:62
 msgid "Specials"
 msgstr ""
 
-#: src/gui/specialswindow.cpp:174
-#, c-format
-msgid "Specials Set %d"
-msgstr ""
-
-#: src/gui/specialswindow.cpp:191
-#, c-format
-msgid "Special %d"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:99 src/gui/statuswindow.cpp:247
+#: src/gui/statuswindow.cpp:113 src/gui/statuswindow.cpp:215
+#: src/gui/statuswindow.cpp:262
 #, c-format
 msgid "Level: %d"
 msgstr "Nivå: %d"
 
-#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:211
+#: src/gui/statuswindow.cpp:114 src/gui/statuswindow.cpp:208
+#: src/gui/statuswindow.cpp:239
 #, c-format
 msgid "Money: %s"
 msgstr "Penger: %s"
 
-#: src/gui/statuswindow.cpp:102
+#: src/gui/statuswindow.cpp:117
 msgid "HP:"
 msgstr "HP:"
 
-#: src/gui/statuswindow.cpp:107
+#: src/gui/statuswindow.cpp:122
 msgid "Exp:"
 msgstr "Exp:"
 
-#: src/gui/statuswindow.cpp:112
+#: src/gui/statuswindow.cpp:130
 msgid "MP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:132 src/gui/statuswindow.cpp:219
+#: src/gui/statuswindow.cpp:158 src/gui/statuswindow.cpp:275
 #, c-format
 msgid "Job: %d"
 msgstr "Jobb: %d"
 
-#: src/gui/statuswindow.cpp:133
+#: src/gui/statuswindow.cpp:159
 msgid "Job:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:194
-#, fuzzy
-msgid "HP"
-msgstr "HP:"
-
-#: src/gui/statuswindow.cpp:200
-msgid "MP"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:206
-#, fuzzy
-msgid "Exp"
-msgstr "Exp:"
-
-#: src/gui/statuswindow.cpp:215
-#, fuzzy
-msgid "Money"
-msgstr "Penger: %d"
-
-#: src/gui/statuswindow.cpp:225
-#, fuzzy
-msgid "Job"
-msgstr "Jobb: %d"
-
-#: src/gui/statuswindow.cpp:229
+#: src/gui/statuswindow.cpp:211 src/gui/statuswindow.cpp:247
 #, fuzzy, c-format
 msgid "Character points: %d"
 msgstr "Ferdighetspoeng: %d"
 
-#: src/gui/statuswindow.cpp:235
+#: src/gui/statuswindow.cpp:255
 #, fuzzy, c-format
 msgid "Correction points: %d"
 msgstr "Ferdighetspoeng: %d"
 
-#: src/gui/statuswindow.cpp:251
-#, fuzzy
-msgid "Level"
-msgstr "Nivå: %d"
-
-#: src/gui/storagewindow.cpp:58
-msgid "Storage"
-msgstr ""
-
-#: src/gui/trade.cpp:52
+#: src/gui/trade.cpp:53
 msgid "Propose trade"
 msgstr ""
 
-#: src/gui/trade.cpp:53
+#: src/gui/trade.cpp:54
 msgid "Confirmed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:55
 msgid "Agree trade"
 msgstr ""
 
-#: src/gui/trade.cpp:55
+#: src/gui/trade.cpp:56
 msgid "Agreed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:58
+#: src/gui/trade.cpp:59
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/trade.cpp:74 src/gui/trade.cpp:75
+#: src/gui/trade.cpp:73 src/gui/trade.cpp:74
 msgid "Trade"
 msgstr ""
 
-#: src/gui/trade.cpp:77
+#: src/gui/trade.cpp:76
 msgid "Add"
 msgstr ""
 
-#: src/gui/trade.cpp:99 src/gui/trade.cpp:135
+#: src/gui/trade.cpp:98 src/gui/trade.cpp:134
 #, c-format
 msgid "You get %s"
 msgstr ""
 
-#: src/gui/trade.cpp:100
+#: src/gui/trade.cpp:99
 msgid "You give:"
 msgstr ""
 
-#: src/gui/trade.cpp:104
+#: src/gui/trade.cpp:103
 msgid "Change"
 msgstr ""
 
-#: src/gui/trade.cpp:275
+#: src/gui/trade.cpp:262
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/trade.cpp:318
+#: src/gui/trade.cpp:304
 msgid "You don't have enough money."
 msgstr ""
 
@@ -2112,21 +1957,21 @@ msgstr "Kobler til..."
 msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:405
+#: src/gui/updatewindow.cpp:417
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:407
+#: src/gui/updatewindow.cpp:419
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:409
+#: src/gui/updatewindow.cpp:421
 msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:501
+#: src/gui/updatewindow.cpp:515
 msgid "Completed"
 msgstr ""
 
@@ -2206,64 +2051,64 @@ msgstr ""
 msgid "Need a user to kick!"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:118
+#: src/gui/widgets/chattab.cpp:121
 msgid "Global announcement:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:124
+#: src/gui/widgets/chattab.cpp:127
 #, c-format
 msgid "Global announcement from %s:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:150
+#: src/gui/widgets/chattab.cpp:153
 #, c-format
 msgid "%s whispers: %s"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:51
+#: src/gui/widgets/whispertab.cpp:53
 msgid "Cannot send empty chat!"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:70
+#: src/gui/widgets/whispertab.cpp:72
 msgid "/ignore > Ignore the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:71
+#: src/gui/widgets/whispertab.cpp:73
 msgid "/unignore > Stop ignoring the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:72
+#: src/gui/widgets/whispertab.cpp:74
 msgid "/close > Close the whisper tab"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:82
+#: src/gui/widgets/whispertab.cpp:84
 msgid "Command: /close"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:83
+#: src/gui/widgets/whispertab.cpp:85
 msgid "This command closes the current whisper tab."
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:87
+#: src/gui/widgets/whispertab.cpp:89
 #, fuzzy
 msgid "Command: /ignore"
 msgstr "Kommando: /record"
 
-#: src/gui/widgets/whispertab.cpp:88
+#: src/gui/widgets/whispertab.cpp:90
 #, fuzzy
 msgid "This command ignores the other player regardless of current relations."
 msgstr "Denne kommandoen viser antall påloggede spillere -"
 
-#: src/gui/widgets/whispertab.cpp:94
+#: src/gui/widgets/whispertab.cpp:96
 #, fuzzy
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr "Denne kommandoen starter opptak av chatte-loggen til filen <filnavn>."
 
-#: src/gui/windowmenu.cpp:55
+#: src/gui/windowmenu.cpp:54
 msgid "Status"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:61
+#: src/gui/windowmenu.cpp:65
 msgid "Shortcut"
 msgstr ""
 
@@ -2281,1366 +2126,1461 @@ msgstr ""
 msgid "Choose World"
 msgstr "Velg server"
 
-#: src/keyboardconfig.cpp:40
+#: src/keyboardconfig.cpp:39
 msgid "Move Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:41
+#: src/keyboardconfig.cpp:40
 msgid "Move Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:41
 msgid "Move Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:42
 msgid "Move Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:44 src/net/ea/generalhandler.cpp:223
+#: src/keyboardconfig.cpp:43 src/net/tmwa/generalhandler.cpp:237
 msgid "Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:44
 msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:45
 msgid "Smilie"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:46
 msgid "Talk"
 msgstr ""
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:47
 msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:48
 #, fuzzy
 msgid "Target Monster"
 msgstr "Monstre"
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboardconfig.cpp:49
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:50
 msgid "Target Player"
 msgstr ""
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:51
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:52
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:53
 msgid "Sit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:54
 msgid "Screenshot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:55
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:56
 msgid "Find Path to Mouse"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58 src/keyboardconfig.cpp:59
-#: src/keyboardconfig.cpp:60 src/keyboardconfig.cpp:61
-#: src/keyboardconfig.cpp:62 src/keyboardconfig.cpp:63
-#: src/keyboardconfig.cpp:64 src/keyboardconfig.cpp:65
-#: src/keyboardconfig.cpp:66 src/keyboardconfig.cpp:67
-#: src/keyboardconfig.cpp:68 src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:57 src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60
+#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62
+#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64
+#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68
 #, c-format
 msgid "Item Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:69
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:70
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:71
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:72
 msgid "Equipment Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:73
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:74
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:75
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:76
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:77
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:78
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:79
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:80
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:81
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:83
+#: src/keyboardconfig.cpp:82
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:83
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86
-#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88
-#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90
-#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92
-#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:84 src/keyboardconfig.cpp:85
+#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:87
+#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:89
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:91
+#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:93
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:95
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:96
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:97
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:98
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:99
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:100
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:101
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:103
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:105
+#: src/keyboardconfig.cpp:104
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:178
+#: src/keyboardconfig.cpp:183
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:913
+#: src/localplayer.cpp:985
 msgid "Unable to pick up item."
 msgstr ""
 
 #. TRANSLATORS: This sentence may be translated differently
 #. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:922
+#: src/localplayer.cpp:994
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/main.cpp:43
+#: src/main.cpp:42
 msgid "mana [options] [mana-file]"
 msgstr ""
 
+#: src/main.cpp:43
+msgid "[mana-file] : The mana file is an XML file (.mana)"
+msgstr ""
+
 #: src/main.cpp:44
-msgid "Options:"
+msgid "              used to set custom parameters"
 msgstr ""
 
 #: src/main.cpp:45
+msgid "              to the mana client."
+msgstr ""
+
+#: src/main.cpp:47
+msgid "Options:"
+msgstr ""
+
+#: src/main.cpp:48
 msgid "  -v --version        : Display the version"
 msgstr ""
 
-#: src/main.cpp:46
+#: src/main.cpp:49
 #, fuzzy
 msgid "  -h --help           : Display this help"
 msgstr "/hjelp > Hvis denne hjelpen"
 
-#: src/main.cpp:47
+#: src/main.cpp:50
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
-#: src/main.cpp:48
+#: src/main.cpp:51
 msgid "  -U --username       : Login with this username"
 msgstr ""
 
-#: src/main.cpp:49
+#: src/main.cpp:52
 msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/main.cpp:50
+#: src/main.cpp:53
 msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/main.cpp:51
+#: src/main.cpp:54
 msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:52
+#: src/main.cpp:55
 msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/main.cpp:53
+#: src/main.cpp:56
 msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/main.cpp:54
+#: src/main.cpp:57
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:56
+#: src/main.cpp:59
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:57
+#: src/main.cpp:60
 msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:58
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
+#: src/main.cpp:61
+msgid "     --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/main.cpp:59
+#: src/main.cpp:62
+msgid "     --chat-log-dir   : Chat log dir to use"
+msgstr ""
+
+#: src/main.cpp:63
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/main.cpp:61
+#: src/main.cpp:65
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:63
+#: src/net/manaserv/beinghandler.cpp:303 src/net/tmwa/playerhandler.cpp:94
+msgid "You are dead."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:304 src/net/tmwa/playerhandler.cpp:95
+msgid "We regret to inform you that your character was killed in battle."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:306 src/net/tmwa/playerhandler.cpp:97
+msgid "You are not that alive anymore."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:307 src/net/tmwa/playerhandler.cpp:98
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:308 src/net/tmwa/playerhandler.cpp:99
+msgid "Game Over!"
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:309 src/net/tmwa/playerhandler.cpp:101
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:311 src/net/tmwa/playerhandler.cpp:103
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:313 src/net/tmwa/playerhandler.cpp:105
+msgid "I guess this did not run too well."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:107
+msgid "Do you want your possessions identified?"
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:109
+msgid "Sadly, no trace of you was ever found..."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:111
+msgid "Annihilated."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:113
+msgid "Looks like you got your head handed to you."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:115
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:323
+msgid "Press OK to respawn."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:324
+msgid "You Died"
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:138 src/net/manaserv/charhandler.cpp:209
+msgid "Not logged in."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:141
+msgid "No empty slot."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:144
+msgid "Invalid name."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:147
+msgid "Character's name already exists."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:150
+msgid "Invalid hairstyle."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:153
+msgid "Invalid hair color."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:156
+msgid "Invalid gender."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:159
+msgid "Character's stats are too high."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:162
+msgid "Character's stats are too low."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:165
+#, c-format
+msgid "At least one statis out of the permitted range: (%u - %u)."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:171 src/net/manaserv/loginhandler.cpp:96
+#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
+#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
+#: src/net/tmwa/loginhandler.cpp:95 src/net/tmwa/loginhandler.cpp:182
+#, fuzzy
+msgid "Unknown error."
+msgstr "Ukjent kommando"
+
+#: src/net/manaserv/charhandler.cpp:200 src/net/tmwa/charserverhandler.cpp:146
+msgid "Info"
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:200
+msgid "Player deleted."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:212
+msgid "Selection out of range."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:215
+#, fuzzy, c-format
+msgid "Unknown error (%d)."
+msgstr "Ukjent kommando"
+
+#: src/net/manaserv/charhandler.cpp:250
+msgid "No gameservers are available."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:187 src/net/manaserv/chathandler.cpp:313
+#: src/net/manaserv/guildhandler.cpp:260
+#, c-format
+msgid "Topic: %s"
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:274
+msgid "Players in this channel:"
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:208
+#, fuzzy
+msgid "Error joining channel."
+msgstr "Kommando: /join <kanal>"
+
+#: src/net/manaserv/chathandler.cpp:214
+msgid "Listing channels."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:226
+msgid "End of channel list."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:303
+#, c-format
+msgid "%s entered the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:308
+#, c-format
+msgid "%s left the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:324
+#, c-format
+msgid "%s has set mode %s on user %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:334
+#, c-format
+msgid "%s has kicked %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:339
+#, fuzzy
+msgid "Unknown channel event."
+msgstr "Ukjent kommando"
+
+#: src/net/manaserv/guildhandler.cpp:82
+msgid "Guild created."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:87
+msgid "Error creating guild."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:97
+msgid "Invite sent."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:204
+msgid "Member was promoted successfully."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:209
+msgid "Failed to promote member."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:87
+msgid "Wrong magic_token."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
+msgid "Already logged in."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:93
+#, fuzzy
+msgid "Account banned."
+msgstr "Konto: %s"
+
+#: src/net/manaserv/loginhandler.cpp:118
+#, fuzzy
+msgid "New password incorrect."
+msgstr "Skriv nytt passord to ganger:"
+
+#: src/net/manaserv/loginhandler.cpp:121 src/net/tmwa/loginhandler.cpp:89
+msgid "Old password incorrect."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
+msgid "Account not connected. Please login first."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:149
+#, fuzzy
+msgid "New email address incorrect."
+msgstr "Skriv ny epost-adresse to ganger:"
+
+#: src/net/manaserv/loginhandler.cpp:152
+msgid "Old email address incorrect."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:158
+msgid "The new email address already exists."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:239
+msgid ""
+"Client registration is not allowed. Please contact server administration."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
+msgid "Client version is too old."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:266
+msgid "Wrong username or password."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:272
+#, fuzzy
+msgid "Account banned"
+msgstr "Konto: %s"
+
+#: src/net/manaserv/loginhandler.cpp:275
+msgid "Login attempt too soon after previous attempt."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:303
+msgid "Wrong username, password or email address."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:306
+msgid "Username already exists."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:309
+msgid "Email address already exists."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:312
+msgid "You took too long with the captcha or your response was incorrect."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:87
+msgid "Joined party."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:105
+#, c-format
+msgid "%s joined the party."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:123
+#, fuzzy, c-format
+msgid "%s rejected your invite."
+msgstr "Avslo invitasjon fra %s."
+
+#: src/net/manaserv/tradehandler.cpp:95
+msgid "Accepting incoming trade requests."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:97
+msgid "Ignoring incoming trade requests."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:115 src/net/tmwa/tradehandler.cpp:109
+msgid "Request for Trade"
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:116 src/net/tmwa/tradehandler.cpp:110
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:134
+#, c-format
+msgid "Trading with %s"
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:148 src/net/tmwa/tradehandler.cpp:224
+msgid "Trade canceled."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:155 src/net/tmwa/tradehandler.cpp:231
+msgid "Trade completed."
+msgstr ""
+
+#: src/net/tmwa/adminhandler.cpp:64
 msgid "Kick failed!"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:65
+#: src/net/tmwa/adminhandler.cpp:66
 msgid "Kick succeeded!"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:110
+#: src/net/tmwa/buysellhandler.cpp:109
 msgid "Nothing to sell."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:117
+#: src/net/tmwa/buysellhandler.cpp:116
 msgid "Thanks for buying."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:124
+#: src/net/tmwa/buysellhandler.cpp:123
 msgid "Unable to buy."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:130
+#: src/net/tmwa/buysellhandler.cpp:129
 msgid "Thanks for selling."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:132
+#: src/net/tmwa/buysellhandler.cpp:131
 msgid "Unable to sell."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:103
-msgid "Access denied."
+#: src/net/tmwa/charserverhandler.cpp:103
+msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:106
+#: src/net/tmwa/charserverhandler.cpp:107
 #, fuzzy
 msgid "Cannot use this ID."
 msgstr "Kan ikke sende tomme meldinger!"
 
-#: src/net/ea/charserverhandler.cpp:109
-msgid "Unknown failure to select character."
-msgstr ""
+#: src/net/tmwa/charserverhandler.cpp:110
+#, fuzzy
+msgid "Unknown char-server failure."
+msgstr "Ukjent kommando"
 
-#: src/net/ea/charserverhandler.cpp:135
+#: src/net/tmwa/charserverhandler.cpp:134
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:147 src/net/manaserv/charhandler.cpp:187
-msgid "Info"
-msgstr ""
-
-#: src/net/ea/charserverhandler.cpp:147
+#: src/net/tmwa/charserverhandler.cpp:146
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:152
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Failed to delete character."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:237 src/net/manaserv/charhandler.cpp:263
+#: src/net/tmwa/charserverhandler.cpp:266
 msgid "Strength:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:238 src/net/manaserv/charhandler.cpp:264
+#: src/net/tmwa/charserverhandler.cpp:267
 msgid "Agility:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:239 src/net/manaserv/charhandler.cpp:266
+#: src/net/tmwa/charserverhandler.cpp:268
 msgid "Vitality:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:240 src/net/manaserv/charhandler.cpp:267
+#: src/net/tmwa/charserverhandler.cpp:269
 msgid "Intelligence:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:241 src/net/manaserv/charhandler.cpp:265
+#: src/net/tmwa/charserverhandler.cpp:270
 msgid "Dexterity:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:242
+#: src/net/tmwa/charserverhandler.cpp:271
 msgid "Luck:"
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:80
-msgid "Whisper could not be sent, user is offline."
+#: src/net/tmwa/chathandler.cpp:87
+#, c-format
+msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:84
-msgid "Whisper could not be sent, ignored by user."
+#: src/net/tmwa/chathandler.cpp:96
+#, c-format
+msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:171
+#: src/net/tmwa/chathandler.cpp:230
 #, fuzzy
 msgid "MVP player."
 msgstr "Spiller"
 
-#: src/net/ea/chathandler.cpp:204 src/net/ea/chathandler.cpp:210
-#: src/net/ea/chathandler.cpp:215 src/net/ea/chathandler.cpp:220
-#: src/net/ea/chathandler.cpp:225 src/net/ea/chathandler.cpp:230
-#: src/net/ea/chathandler.cpp:235 src/net/ea/chathandler.cpp:240
+#: src/net/tmwa/chathandler.cpp:265 src/net/tmwa/chathandler.cpp:271
+#: src/net/tmwa/chathandler.cpp:276 src/net/tmwa/chathandler.cpp:281
+#: src/net/tmwa/chathandler.cpp:286 src/net/tmwa/chathandler.cpp:291
+#: src/net/tmwa/chathandler.cpp:296 src/net/tmwa/chathandler.cpp:301
 msgid "Channels are not supported!"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:86
+#: src/net/tmwa/gamehandler.cpp:88
 #, c-format
 msgid "Online users: %d"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:100
+#: src/net/tmwa/gamehandler.cpp:101
 #, fuzzy
 msgid "Game"
 msgstr "Navn"
 
-#: src/net/ea/gamehandler.cpp:100
+#: src/net/tmwa/gamehandler.cpp:101
 msgid "Request to quit denied!"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:102 src/net/manaserv/generalhandler.cpp:95
+#: src/net/tmwa/generalhandler.cpp:102
 #, c-format
 msgid "Strength %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:103 src/net/manaserv/generalhandler.cpp:96
+#: src/net/tmwa/generalhandler.cpp:103
 #, c-format
 msgid "Agility %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:104 src/net/manaserv/generalhandler.cpp:98
+#: src/net/tmwa/generalhandler.cpp:104
 #, c-format
 msgid "Vitality %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:105 src/net/manaserv/generalhandler.cpp:99
+#: src/net/tmwa/generalhandler.cpp:105
 #, c-format
 msgid "Intelligence %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:106 src/net/manaserv/generalhandler.cpp:97
+#: src/net/tmwa/generalhandler.cpp:106
 #, c-format
 msgid "Dexterity %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:107
+#: src/net/tmwa/generalhandler.cpp:107
 #, c-format
 msgid "Luck %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:130
+#: src/net/tmwa/generalhandler.cpp:132
 msgid "Authentication failed."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:133
+#: src/net/tmwa/generalhandler.cpp:135
 msgid "No servers available."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:137
+#: src/net/tmwa/generalhandler.cpp:139
 msgid "Someone else is trying to use this account."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:140
+#: src/net/tmwa/generalhandler.cpp:142
 msgid "This account is already logged in."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:143
+#: src/net/tmwa/generalhandler.cpp:145
 msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:146
+#: src/net/tmwa/generalhandler.cpp:148
 msgid "Duplicated login."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:149
+#: src/net/tmwa/generalhandler.cpp:151
 msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:205
+#: src/net/tmwa/generalhandler.cpp:209
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:216 src/net/manaserv/generalhandler.cpp:166
+#: src/net/tmwa/generalhandler.cpp:230
 msgid "Strength"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:217 src/net/manaserv/generalhandler.cpp:167
+#: src/net/tmwa/generalhandler.cpp:231
 msgid "Agility"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:218 src/net/manaserv/generalhandler.cpp:169
+#: src/net/tmwa/generalhandler.cpp:232
 msgid "Vitality"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:219 src/net/manaserv/generalhandler.cpp:170
+#: src/net/tmwa/generalhandler.cpp:233
 msgid "Intelligence"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:220 src/net/manaserv/generalhandler.cpp:168
+#: src/net/tmwa/generalhandler.cpp:234
 msgid "Dexterity"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:221
+#: src/net/tmwa/generalhandler.cpp:235
 msgid "Luck"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:224
+#: src/net/tmwa/generalhandler.cpp:238
 #, fuzzy
 msgid "Defense"
 msgstr "Slett"
 
-#: src/net/ea/generalhandler.cpp:225
+#: src/net/tmwa/generalhandler.cpp:239
 msgid "M.Attack"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:226
+#: src/net/tmwa/generalhandler.cpp:240
 msgid "M.Defense"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:227
+#: src/net/tmwa/generalhandler.cpp:241
 #, c-format
 msgid "% Accuracy"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:228
+#: src/net/tmwa/generalhandler.cpp:242
 #, c-format
 msgid "% Evade"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:229
+#: src/net/tmwa/generalhandler.cpp:243
 #, c-format
 msgid "% Critical"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:61 src/net/ea/gui/partytab.cpp:59
+#: src/net/tmwa/gui/guildtab.cpp:45
+msgid "Guild"
+msgstr ""
+
+#: src/net/tmwa/gui/guildtab.cpp:61 src/net/tmwa/gui/partytab.cpp:59
 msgid "/help > Display this help."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:62
+#: src/net/tmwa/gui/guildtab.cpp:62
 #, fuzzy
 msgid "/invite > Invite a player to your guild"
 msgstr "/party > Inviter en bruker til en gruppe"
 
-#: src/net/ea/gui/guildtab.cpp:63
+#: src/net/tmwa/gui/guildtab.cpp:63
 msgid "/leave > Leave the guild you are in"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:64
+#: src/net/tmwa/gui/guildtab.cpp:64
 msgid "/kick > Kick some one from the guild you are in"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:73 src/net/ea/gui/partytab.cpp:73
+#: src/net/tmwa/gui/guildtab.cpp:73 src/net/tmwa/gui/partytab.cpp:73
 msgid "Command: /invite <nick>"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:74
+#: src/net/tmwa/gui/guildtab.cpp:74
 #, fuzzy
 msgid "This command invites <nick> to the guild you're in."
 msgstr "Denne kommandoen inviterer <brukernavn> til en gruppe med deg."
 
-#: src/net/ea/gui/guildtab.cpp:80 src/net/ea/gui/partytab.cpp:80
+#: src/net/tmwa/gui/guildtab.cpp:80 src/net/tmwa/gui/partytab.cpp:80
 msgid "Command: /leave"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:81
+#: src/net/tmwa/gui/guildtab.cpp:81
 #, fuzzy
 msgid "This command causes the player to leave the guild."
 msgstr "Denne kommandoen sender teksten <melding> til <brukernavn>."
 
-#: src/net/ea/gui/guildtab.cpp:89
+#: src/net/tmwa/gui/guildtab.cpp:89
 msgid "Guild name is missing."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:293
+#: src/net/tmwa/guildhandler.cpp:296
 msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:298
+#: src/net/tmwa/guildhandler.cpp:301
 msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:303
+#: src/net/tmwa/guildhandler.cpp:306
 msgid "User is now part of your guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:308
+#: src/net/tmwa/guildhandler.cpp:311
 msgid "Your guild is full."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:313
+#: src/net/tmwa/guildhandler.cpp:316
 msgid "Unknown guild invite response."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:390
+#: src/net/tmwa/guildhandler.cpp:393
 msgid "Guild creation isn't supported yet."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:60
+#: src/net/tmwa/gui/partytab.cpp:43
+msgid "Party"
+msgstr "Gruppe"
+
+#: src/net/tmwa/gui/partytab.cpp:60
 msgid "/invite > Invite a player to your party"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:61
+#: src/net/tmwa/gui/partytab.cpp:61
 msgid "/leave > Leave the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:62
+#: src/net/tmwa/gui/partytab.cpp:62
 msgid "/kick > Kick some one from the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:63
+#: src/net/tmwa/gui/partytab.cpp:63
 msgid "/item > Show/change party item sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:64
+#: src/net/tmwa/gui/partytab.cpp:64
 msgid "/exp > Show/change party experience sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:81
+#: src/net/tmwa/gui/partytab.cpp:81
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:85
+#: src/net/tmwa/gui/partytab.cpp:85
 msgid "Command: /item <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:86
+#: src/net/tmwa/gui/partytab.cpp:86
 msgid "This command changes the party's item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:87
+#: src/net/tmwa/gui/partytab.cpp:87
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:90
+#: src/net/tmwa/gui/partytab.cpp:90
 msgid "Command: /item"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/tmwa/gui/partytab.cpp:91
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/tmwa/gui/partytab.cpp:95
 msgid "Command: /exp <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:96
+#: src/net/tmwa/gui/partytab.cpp:96
 msgid "This command changes the party's experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/tmwa/gui/partytab.cpp:97
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:100
+#: src/net/tmwa/gui/partytab.cpp:100
 msgid "Command: /exp"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/tmwa/gui/partytab.cpp:101
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:132 src/net/ea/partyhandler.cpp:198
+#: src/net/tmwa/gui/partytab.cpp:132 src/net/tmwa/partyhandler.cpp:196
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:135 src/net/ea/partyhandler.cpp:204
+#: src/net/tmwa/gui/partytab.cpp:135 src/net/tmwa/partyhandler.cpp:202
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:138 src/net/ea/partyhandler.cpp:210
+#: src/net/tmwa/gui/partytab.cpp:138 src/net/tmwa/partyhandler.cpp:208
 msgid "Item sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:141
+#: src/net/tmwa/gui/partytab.cpp:141
 msgid "Item sharing unknown."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:167 src/net/ea/partyhandler.cpp:174
+#: src/net/tmwa/gui/partytab.cpp:167 src/net/tmwa/partyhandler.cpp:172
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:170 src/net/ea/partyhandler.cpp:180
+#: src/net/tmwa/gui/partytab.cpp:170 src/net/tmwa/partyhandler.cpp:178
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:173 src/net/ea/partyhandler.cpp:186
+#: src/net/tmwa/gui/partytab.cpp:173 src/net/tmwa/partyhandler.cpp:184
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:176
+#: src/net/tmwa/gui/partytab.cpp:176
 msgid "Experience sharing unknown."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:281
+#: src/net/tmwa/inventoryhandler.cpp:285
 msgid "Failed to use item."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:391
+#: src/net/tmwa/inventoryhandler.cpp:399
 msgid "Unable to equip."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:402
+#: src/net/tmwa/inventoryhandler.cpp:410
 msgid "Unable to unequip."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:79
+#: src/net/tmwa/loginhandler.cpp:86
 msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:82 src/net/manaserv/loginhandler.cpp:121
-msgid "Old password incorrect."
-msgstr ""
-
-#: src/net/ea/loginhandler.cpp:85
+#: src/net/tmwa/loginhandler.cpp:92
 msgid "New password too short."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:88 src/net/ea/loginhandler.cpp:175
-#: src/net/manaserv/charhandler.cpp:158 src/net/manaserv/loginhandler.cpp:96
-#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
-#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
-#, fuzzy
-msgid "Unknown error."
-msgstr "Ukjent kommando"
-
-#: src/net/ea/loginhandler.cpp:149
+#: src/net/tmwa/loginhandler.cpp:156
 #, fuzzy
 msgid "Unregistered ID."
 msgstr "Avregistrer"
 
-#: src/net/ea/loginhandler.cpp:152
+#: src/net/tmwa/loginhandler.cpp:159
 #, fuzzy
 msgid "Wrong password."
 msgstr "Endre passord"
 
-#: src/net/ea/loginhandler.cpp:155
+#: src/net/tmwa/loginhandler.cpp:162
 msgid "Account expired."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:158
+#: src/net/tmwa/loginhandler.cpp:165
 #, fuzzy
 msgid "Rejected from server."
 msgstr "Avslo invitasjon fra %s."
 
-#: src/net/ea/loginhandler.cpp:161
+#: src/net/tmwa/loginhandler.cpp:168
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:165
+#: src/net/tmwa/loginhandler.cpp:172
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:172
+#: src/net/tmwa/loginhandler.cpp:179
 msgid "This user name is already taken."
 msgstr ""
 
-#: src/net/ea/network.cpp:145
+#: src/net/tmwa/network.cpp:145
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/ea/network.cpp:345
+#: src/net/tmwa/network.cpp:345
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/ea/network.cpp:414
+#: src/net/tmwa/network.cpp:414
 msgid "Connection to server terminated. "
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:81
+#: src/net/tmwa/partyhandler.cpp:82
 msgid "Could not create party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:84
+#: src/net/tmwa/partyhandler.cpp:84
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:118
+#: src/net/tmwa/partyhandler.cpp:119
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:122
+#: src/net/tmwa/partyhandler.cpp:123
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:126
+#: src/net/tmwa/partyhandler.cpp:127
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:130
+#: src/net/tmwa/partyhandler.cpp:131
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:238
+#: src/net/tmwa/partyhandler.cpp:236
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:249
+#: src/net/tmwa/partyhandler.cpp:246
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:301
+#: src/net/tmwa/partyhandler.cpp:299
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:329
-msgid "Inviting like this isn't supported at the moment."
+#: src/net/tmwa/partyhandler.cpp:335
+#, c-format
+msgid "Inviting failed, because you can't see a player called %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:334
+#: src/net/tmwa/partyhandler.cpp:340
 msgid "You can only inivte when you are in a party!"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:365
+#: src/net/tmwa/partyhandler.cpp:368
 #, c-format
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:304
-msgid "You are dead."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:305
-msgid "We regret to inform you that your character was killed in battle."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:307
-msgid "You are not that alive anymore."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:308
-msgid "The cold hands of the grim reaper are grabbing for your soul."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:309
-msgid "Game Over!"
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:105
+#: src/net/tmwa/playerhandler.cpp:100
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:310
-msgid ""
-"No, kids. Your character did not really die. It... err... went to a better "
-"place."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:312
-msgid ""
-"Your plan of breaking your enemies weapon by bashing it with your throat "
-"failed."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:314
-msgid "I guess this did not run too well."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:315
-msgid "Do you want your possessions identified?"
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:316
-msgid "Sadly, no trace of you was ever found..."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:317
-msgid "Annihilated."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:318
-msgid "Looks like you got your head handed to you."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:120 src/net/manaserv/beinghandler.cpp:319
-msgid ""
-"You screwed up again, dump your body down the tubes and get you another one."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/tmwa/playerhandler.cpp:118
 msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/tmwa/playerhandler.cpp:119
 msgid "You are no more."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/tmwa/playerhandler.cpp:120
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/tmwa/playerhandler.cpp:121
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/tmwa/playerhandler.cpp:122
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/tmwa/playerhandler.cpp:123
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/tmwa/playerhandler.cpp:124
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:130
+#: src/net/tmwa/playerhandler.cpp:125
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:131
+#: src/net/tmwa/playerhandler.cpp:126
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/tmwa/playerhandler.cpp:127
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/tmwa/playerhandler.cpp:128
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:135
+#: src/net/tmwa/playerhandler.cpp:130
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:136
+#: src/net/tmwa/playerhandler.cpp:131
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:249 src/net/ea/playerhandler.cpp:310
+#: src/net/tmwa/playerhandler.cpp:246 src/net/tmwa/playerhandler.cpp:285
 msgid "Message"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:250
+#: src/net/tmwa/playerhandler.cpp:247
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:333
+#: src/net/tmwa/playerhandler.cpp:313
 #, c-format
 msgid "You picked up %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:369
+#: src/net/tmwa/playerhandler.cpp:348
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:532
+#: src/net/tmwa/playerhandler.cpp:488
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:147
+#: src/net/tmwa/specialhandler.cpp:144
 msgid "Trade failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:150
+#: src/net/tmwa/specialhandler.cpp:147
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:153
+#: src/net/tmwa/specialhandler.cpp:150
 msgid "Sit failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:156
+#: src/net/tmwa/specialhandler.cpp:153
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:159
+#: src/net/tmwa/specialhandler.cpp:156
 msgid "Could not join party!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:162
+#: src/net/tmwa/specialhandler.cpp:159
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:171
+#: src/net/tmwa/specialhandler.cpp:168
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:174
+#: src/net/tmwa/specialhandler.cpp:171
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:177
+#: src/net/tmwa/specialhandler.cpp:174
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:180
+#: src/net/tmwa/specialhandler.cpp:177
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:183
+#: src/net/tmwa/specialhandler.cpp:180
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:186
+#: src/net/tmwa/specialhandler.cpp:183
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:189
+#: src/net/tmwa/specialhandler.cpp:186
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:192
+#: src/net/tmwa/specialhandler.cpp:189
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:195
+#: src/net/tmwa/specialhandler.cpp:192
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:198
+#: src/net/tmwa/specialhandler.cpp:195
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:201
+#: src/net/tmwa/specialhandler.cpp:198
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:210
+#: src/net/tmwa/specialhandler.cpp:207
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:213
+#: src/net/tmwa/specialhandler.cpp:210
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:216
+#: src/net/tmwa/specialhandler.cpp:213
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:116
-msgid "Request for Trade"
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:108 src/net/manaserv/tradehandler.cpp:117
-#, c-format
-msgid "%s wants to trade with you, do you accept?"
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:124
+#: src/net/tmwa/tradehandler.cpp:126
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:128
+#: src/net/tmwa/tradehandler.cpp:130
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:132
+#: src/net/tmwa/tradehandler.cpp:134
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:137
+#: src/net/tmwa/tradehandler.cpp:139
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:144
+#: src/net/tmwa/tradehandler.cpp:146
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:153
+#: src/net/tmwa/tradehandler.cpp:154
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:202
+#: src/net/tmwa/tradehandler.cpp:202
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:207
+#: src/net/tmwa/tradehandler.cpp:207
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:211
+#: src/net/tmwa/tradehandler.cpp:211
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:224 src/net/manaserv/tradehandler.cpp:149
-msgid "Trade canceled."
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:231 src/net/manaserv/tradehandler.cpp:156
-msgid "Trade completed."
-msgstr ""
-
-#: src/net/manaserv/beinghandler.cpp:324
-msgid "Press OK to respawn."
-msgstr ""
-
-#: src/net/manaserv/beinghandler.cpp:325
-msgid "You Died"
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:128 src/net/manaserv/charhandler.cpp:196
-msgid "Not logged in."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:131
-msgid "No empty slot."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:134
-msgid "Invalid name."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:137
-msgid "Character's name already exists."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:140
-msgid "Invalid hairstyle."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:143
-msgid "Invalid hair color."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:146
-msgid "Invalid gender."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:149
-msgid "Character's stats are too high."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:152
-msgid "Character's stats are too low."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:155
-msgid "One stat is zero."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:187
-msgid "Player deleted."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:199
-msgid "Selection out of range."
+#: src/playerrelations.cpp:310
+msgid "Completely ignore"
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:202
-#, fuzzy, c-format
-msgid "Unknown error (%d)."
-msgstr "Ukjent kommando"
-
-#: src/net/manaserv/charhandler.cpp:242
-msgid "No gameservers are available."
+#: src/playerrelations.cpp:324
+msgid "Print '...'"
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:268
-msgid "Willpower:"
+#: src/playerrelations.cpp:340
+msgid "Blink name"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
-#: src/net/manaserv/guildhandler.cpp:259
+#: src/resources/itemdb.cpp:44
 #, c-format
-msgid "Topic: %s"
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
-msgid "Players in this channel:"
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:201
-#, fuzzy
-msgid "Error joining channel."
-msgstr "Kommando: /join <kanal>"
-
-#: src/net/manaserv/chathandler.cpp:207
-msgid "Listing channels."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:219
-msgid "End of channel list."
+msgid "Attack %+d"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:291
+#: src/resources/itemdb.cpp:45
 #, c-format
-msgid "%s entered the channel."
+msgid "Defense %+d"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:296
+#: src/resources/itemdb.cpp:46
 #, c-format
-msgid "%s left the channel."
+msgid "HP %+d"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:312
+#: src/resources/itemdb.cpp:47
 #, c-format
-msgid "%s has set mode %s on user %s."
+msgid "MP %+d"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:322
-#, c-format
-msgid "%s has kicked %s."
+#: src/resources/itemdb.cpp:92
+msgid "Unknown item"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:327
-#, fuzzy
-msgid "Unknown channel event."
-msgstr "Ukjent kommando"
-
-#: src/net/manaserv/generalhandler.cpp:100
-#, c-format
-msgid "Willpower %+d"
+#: src/resources/itemdb.cpp:135 src/resources/monsterdb.cpp:77
+msgid "unnamed"
 msgstr ""
 
-#: src/net/manaserv/generalhandler.cpp:171
-msgid "Willpower"
-msgstr ""
+#~ msgid "Text Shadow"
+#~ msgstr "Tekstskygge"
 
-#: src/net/manaserv/guildhandler.cpp:81
-msgid "Guild created."
-msgstr ""
+#~ msgid "Background"
+#~ msgstr "Bakgrunn"
 
-#: src/net/manaserv/guildhandler.cpp:86
-msgid "Error creating guild."
-msgstr ""
+#~ msgid "Player"
+#~ msgstr "Spiller"
 
-#: src/net/manaserv/guildhandler.cpp:96
-msgid "Invite sent."
-msgstr ""
+#~ msgid "Server"
+#~ msgstr "Server"
 
-#: src/net/manaserv/guildhandler.cpp:203
-msgid "Member was promoted successfully."
-msgstr ""
+#~ msgid "Hyperlink"
+#~ msgstr "Hyperlenke"
 
-#: src/net/manaserv/guildhandler.cpp:208
-msgid "Failed to promote member."
-msgstr ""
+#~ msgid "Other Players' Names"
+#~ msgstr "Andre Spilleres Navn"
 
-#: src/net/manaserv/loginhandler.cpp:87
-msgid "Wrong magic_token."
-msgstr ""
+#~ msgid "Own Name"
+#~ msgstr "Eget Navn"
 
-#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
-msgid "Already logged in."
-msgstr ""
+#~ msgid "GM Names"
+#~ msgstr "GM Navn"
 
-#: src/net/manaserv/loginhandler.cpp:93 src/net/manaserv/loginhandler.cpp:272
-msgid "Server is full."
-msgstr ""
+#~ msgid "NPCs"
+#~ msgstr "NPCer"
 
-#: src/net/manaserv/loginhandler.cpp:118
-#, fuzzy
-msgid "New password incorrect."
-msgstr "Skriv nytt passord to ganger:"
+#~ msgid "Monsters"
+#~ msgstr "Monstre"
 
-#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
-msgid "Account not connected. Please login first."
-msgstr ""
+#~ msgid "Shirts"
+#~ msgstr "Skjorter"
 
-#: src/net/manaserv/loginhandler.cpp:149
 #, fuzzy
-msgid "New email address incorrect."
-msgstr "Skriv ny epost-adresse to ganger:"
-
-#: src/net/manaserv/loginhandler.cpp:152
-msgid "Old email address incorrect."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:158
-msgid "The new email address already exists."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:239
-msgid ""
-"Client registration is not allowed. Please contact server administration."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
-msgid "Client version is too old."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:266
-msgid "Wrong username or password."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:275
-msgid "Login attempt too soon after previous attempt."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:303
-msgid "Wrong username, password or email address."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:306
-msgid "Username already exists."
-msgstr ""
+#~ msgid "One Handed Weapons"
+#~ msgstr "Én-håndsvåpen"
 
-#: src/net/manaserv/loginhandler.cpp:309
-msgid "Email address already exists."
-msgstr ""
+#~ msgid "Pants"
+#~ msgstr "Bukser"
 
-#: src/net/manaserv/loginhandler.cpp:312
-msgid "You took too long with the captcha or your response was incorrect."
-msgstr ""
+#~ msgid "Shoes"
+#~ msgstr "Sko"
 
-#: src/net/manaserv/partyhandler.cpp:88
-msgid "Joined party."
-msgstr ""
-
-#: src/net/manaserv/partyhandler.cpp:106
-#, c-format
-msgid "%s joined the party."
-msgstr ""
-
-#: src/net/manaserv/partyhandler.cpp:123
-#, fuzzy, c-format
-msgid "%s rejected your invite."
-msgstr "Avslo invitasjon fra %s."
-
-#: src/net/manaserv/tradehandler.cpp:96
-msgid "Accepting incoming trade requests."
-msgstr ""
-
-#: src/net/manaserv/tradehandler.cpp:98
-msgid "Ignoring incoming trade requests."
-msgstr ""
-
-#: src/net/manaserv/tradehandler.cpp:135
-#, c-format
-msgid "Trading with %s"
-msgstr ""
-
-#: src/playerrelations.cpp:304
-msgid "Completely ignore"
-msgstr ""
+#, fuzzy
+#~ msgid "Two Handed Weapons"
+#~ msgstr "Én-håndsvåpen"
 
-#: src/playerrelations.cpp:318
-msgid "Print '...'"
-msgstr ""
+#~ msgid "Shields"
+#~ msgstr "Skjold"
 
-#: src/playerrelations.cpp:334
-msgid "Blink name"
-msgstr ""
+#~ msgid "Rings"
+#~ msgstr "Ringer"
 
-#: src/playerrelations.cpp:371
-msgid "Floating '...' bubble"
-msgstr ""
+#~ msgid "Necklaces"
+#~ msgstr "Halsbånd"
 
-#: src/playerrelations.cpp:374
-msgid "Floating bubble"
-msgstr ""
+#~ msgid "Ammo"
+#~ msgstr "Ammunisjon"
 
-#: src/resources/itemdb.cpp:52
-#, c-format
-msgid "Attack %+d"
-msgstr ""
+#~ msgid "Particle Effects"
+#~ msgstr "Partikkeleffekter"
 
-#: src/resources/itemdb.cpp:53
-#, c-format
-msgid "Defense %+d"
-msgstr ""
+#, fuzzy
+#~ msgid "HP"
+#~ msgstr "HP:"
 
-#: src/resources/itemdb.cpp:54
-#, c-format
-msgid "HP %+d"
-msgstr ""
+#, fuzzy
+#~ msgid "Exp"
+#~ msgstr "Exp:"
 
-#: src/resources/itemdb.cpp:55
-#, c-format
-msgid "MP %+d"
-msgstr ""
+#, fuzzy
+#~ msgid "Money"
+#~ msgstr "Penger: %d"
 
-#: src/resources/itemdb.cpp:114
-msgid "Unknown item"
-msgstr ""
+#, fuzzy
+#~ msgid "Job"
+#~ msgstr "Jobb: %d"
 
-#: src/resources/itemdb.cpp:158 src/resources/monsterdb.cpp:45
-#: src/resources/monsterdb.cpp:67
-msgid "unnamed"
-msgstr ""
+#, fuzzy
+#~ msgid "Level"
+#~ msgstr "Nivå: %d"
 
 #~ msgid "no"
 #~ msgstr "nei"
diff --git a/po/nds.po b/po/nds.po
index ac1647c5..7c11e2d6 100644
--- a/po/nds.po
+++ b/po/nds.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2010-03-05 21:52+0100\n"
+"POT-Creation-Date: 2010-12-13 20:04+0100\n"
 "PO-Revision-Date: 2009-06-08 22:07+0000\n"
 "Last-Translator: Thorbjørn Lindeijer <bjorn@lindeijer.nl>\n"
 "Language-Team: German, Low <nds@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,438 +19,452 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/client.cpp:553 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:62
+#: src/client.cpp:598 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
 msgid "Setup"
 msgstr "Setup"
 
-#: src/client.cpp:623
+#: src/client.cpp:679
 #, fuzzy
 msgid "Connecting to server"
 msgstr "verbinde..."
 
-#: src/client.cpp:650
+#: src/client.cpp:706
 #, fuzzy
 msgid "Logging in"
 msgstr "Login"
 
-#: src/client.cpp:683
+#: src/client.cpp:739
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:739
+#: src/client.cpp:804
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:768
+#: src/client.cpp:833
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:799 src/client.cpp:806 src/client.cpp:940
+#: src/client.cpp:843
+#, fuzzy
+msgid "Changing game servers"
+msgstr "Server:"
+
+#: src/client.cpp:872 src/client.cpp:879 src/client.cpp:1014
 #: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
 #: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
-#: src/gui/serverdialog.cpp:261 src/gui/unregisterdialog.cpp:133
-#: src/net/ea/charserverhandler.cpp:135 src/net/ea/charserverhandler.cpp:152
-#: src/net/manaserv/charhandler.cpp:161 src/net/manaserv/charhandler.cpp:204
+#: src/gui/serverdialog.cpp:323 src/gui/unregisterdialog.cpp:133
+#: src/net/manaserv/charhandler.cpp:174 src/net/manaserv/charhandler.cpp:217
+#: src/net/tmwa/charserverhandler.cpp:134
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Error"
 msgstr "Fehler"
 
-#: src/client.cpp:815
+#: src/client.cpp:888
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:842
+#: src/client.cpp:915
 #, fuzzy
 msgid "Password Change"
 msgstr "Passwort:"
 
-#: src/client.cpp:843
+#: src/client.cpp:916
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:862
+#: src/client.cpp:935
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:863
+#: src/client.cpp:936
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:883
+#: src/client.cpp:956
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:884
+#: src/client.cpp:957
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1007 src/client.cpp:1030
+#: src/client.cpp:1138 src/client.cpp:1161
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1119
+#: src/client.cpp:1281
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1153 src/client.cpp:1159
+#: src/client.cpp:1315 src/client.cpp:1321
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/commandhandler.cpp:127 src/commandhandler.cpp:308
+#: src/commandhandler.cpp:131 src/commandhandler.cpp:317
 msgid "Unknown command."
 msgstr ""
 
-#: src/commandhandler.cpp:156
+#: src/commandhandler.cpp:160
 msgid "-- Help --"
 msgstr ""
 
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:161
 msgid "/help > Display this help"
 msgstr ""
 
-#: src/commandhandler.cpp:159
+#: src/commandhandler.cpp:163
 msgid "/where > Display map name"
 msgstr ""
 
-#: src/commandhandler.cpp:160
+#: src/commandhandler.cpp:164
 msgid "/who > Display number of online users"
 msgstr ""
 
-#: src/commandhandler.cpp:161
+#: src/commandhandler.cpp:165
 msgid "/me > Tell something about yourself"
 msgstr ""
 
-#: src/commandhandler.cpp:163
+#: src/commandhandler.cpp:167
 msgid "/clear > Clears this window"
 msgstr ""
 
-#: src/commandhandler.cpp:165
+#: src/commandhandler.cpp:169
 msgid "/msg > Send a private message to a user"
 msgstr ""
 
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:170
 msgid "/whisper > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:167
+#: src/commandhandler.cpp:171
 msgid "/w > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:168
+#: src/commandhandler.cpp:172
 msgid "/query > Makes a tab for private messages with another user"
 msgstr ""
 
-#: src/commandhandler.cpp:169
+#: src/commandhandler.cpp:174
 msgid "/q > Alias of query"
 msgstr ""
 
-#: src/commandhandler.cpp:171
+#: src/commandhandler.cpp:176
 msgid "/ignore > ignore a player"
 msgstr ""
 
-#: src/commandhandler.cpp:172
+#: src/commandhandler.cpp:177
 msgid "/unignore > stop ignoring a player"
 msgstr ""
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:179
 msgid "/list > Display all public channels"
 msgstr ""
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:180
 msgid "/join > Join or create a channel"
 msgstr ""
 
-#: src/commandhandler.cpp:177
+#: src/commandhandler.cpp:182
 msgid "/createparty > Create a new party"
 msgstr ""
 
-#: src/commandhandler.cpp:178
+#: src/commandhandler.cpp:183
 msgid "/party > Invite a user to party"
 msgstr ""
 
-#: src/commandhandler.cpp:180
+#: src/commandhandler.cpp:185
 msgid "/record > Start recording the chat to an external file"
 msgstr ""
 
-#: src/commandhandler.cpp:181
+#: src/commandhandler.cpp:187
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr ""
 
-#: src/commandhandler.cpp:182
+#: src/commandhandler.cpp:189
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
 
-#: src/commandhandler.cpp:184
+#: src/commandhandler.cpp:192
 msgid "/announce > Global announcement (GM only)"
 msgstr ""
 
-#: src/commandhandler.cpp:188
+#: src/commandhandler.cpp:196
 msgid "For more information, type /help <command>."
 msgstr ""
 
-#: src/commandhandler.cpp:192
+#: src/commandhandler.cpp:200
 msgid "Command: /help"
 msgstr ""
 
-#: src/commandhandler.cpp:193
+#: src/commandhandler.cpp:201
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: src/commandhandler.cpp:194
+#: src/commandhandler.cpp:203
 msgid "Command: /help <command>"
 msgstr ""
 
-#: src/commandhandler.cpp:195
+#: src/commandhandler.cpp:204
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/commandhandler.cpp:203
+#: src/commandhandler.cpp:212
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: src/commandhandler.cpp:204
+#: src/commandhandler.cpp:213
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/commandhandler.cpp:205
+#: src/commandhandler.cpp:214
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:210
+#: src/commandhandler.cpp:219
 msgid "Command: /clear"
 msgstr ""
 
-#: src/commandhandler.cpp:211
+#: src/commandhandler.cpp:220
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:224
 msgid "Command: /ignore <player>"
 msgstr ""
 
-#: src/commandhandler.cpp:216
+#: src/commandhandler.cpp:225
 msgid "This command ignores the given player regardless of current relations."
 msgstr ""
 
-#: src/commandhandler.cpp:221
+#: src/commandhandler.cpp:230
 msgid "Command: /join <channel>"
 msgstr ""
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:231
 msgid "This command makes you enter <channel>."
 msgstr ""
 
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:232
 msgid "If <channel> doesn't exist, it's created."
 msgstr ""
 
-#: src/commandhandler.cpp:227
+#: src/commandhandler.cpp:236
 msgid "Command: /list"
 msgstr ""
 
-#: src/commandhandler.cpp:228
+#: src/commandhandler.cpp:237
 msgid "This command shows a list of all channels."
 msgstr ""
 
-#: src/commandhandler.cpp:232
+#: src/commandhandler.cpp:241
 msgid "Command: /me <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:233
+#: src/commandhandler.cpp:242
 msgid "This command tell others you are (doing) <msg>."
 msgstr ""
 
-#: src/commandhandler.cpp:237
+#: src/commandhandler.cpp:246
 msgid "Command: /msg <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:238
+#: src/commandhandler.cpp:247
 msgid "Command: /whisper <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:239
+#: src/commandhandler.cpp:248
 msgid "Command: /w <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:240
+#: src/commandhandler.cpp:249
 msgid "This command sends the text <message> to <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:241 src/commandhandler.cpp:260
+#: src/commandhandler.cpp:250 src/commandhandler.cpp:269
 #: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
-#: src/net/ea/gui/guildtab.cpp:75 src/net/ea/gui/partytab.cpp:75
+#: src/net/tmwa/gui/guildtab.cpp:75 src/net/tmwa/gui/partytab.cpp:75
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:255
 msgid "Command: /query <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:247
+#: src/commandhandler.cpp:256
 msgid "Command: /q <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:248
+#: src/commandhandler.cpp:257
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:253
+#: src/commandhandler.cpp:262
 msgid "Command: /createparty <name>"
 msgstr ""
 
-#: src/commandhandler.cpp:254
+#: src/commandhandler.cpp:263
 msgid "This command creates a new party called <name>."
 msgstr ""
 
-#: src/commandhandler.cpp:258
+#: src/commandhandler.cpp:267
 msgid "Command: /party <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:259 src/net/ea/gui/partytab.cpp:74
+#: src/commandhandler.cpp:268 src/net/tmwa/gui/partytab.cpp:74
 msgid "This command invites <nick> to party with you."
 msgstr ""
 
-#: src/commandhandler.cpp:265
+#: src/commandhandler.cpp:274
 msgid "Command: /present"
 msgstr ""
 
-#: src/commandhandler.cpp:266
+#: src/commandhandler.cpp:275
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: src/commandhandler.cpp:272
+#: src/commandhandler.cpp:281
 msgid "Command: /record <filename>"
 msgstr ""
 
-#: src/commandhandler.cpp:273
+#: src/commandhandler.cpp:282
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr ""
 
-#: src/commandhandler.cpp:275
+#: src/commandhandler.cpp:284
 msgid "Command: /record"
 msgstr ""
 
-#: src/commandhandler.cpp:276
+#: src/commandhandler.cpp:285
 msgid "This command finishes a recording session."
 msgstr ""
 
-#: src/commandhandler.cpp:280
+#: src/commandhandler.cpp:289
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: src/commandhandler.cpp:281
+#: src/commandhandler.cpp:290
 msgid ""
 "This command sets whether the return key should toggle the chat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: src/commandhandler.cpp:283
+#: src/commandhandler.cpp:292
 msgid ""
-"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
-"\", \"no\", \"false\" to turn the toggle off."
+"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
+"\"0\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: src/commandhandler.cpp:286
+#: src/commandhandler.cpp:295
 msgid "Command: /toggle"
 msgstr ""
 
-#: src/commandhandler.cpp:287
+#: src/commandhandler.cpp:296
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: src/commandhandler.cpp:291 src/gui/widgets/whispertab.cpp:93
+#: src/commandhandler.cpp:300 src/gui/widgets/whispertab.cpp:95
 msgid "Command: /unignore <player>"
 msgstr ""
 
-#: src/commandhandler.cpp:292
+#: src/commandhandler.cpp:301
 msgid "This command stops ignoring the given player if they are being ignored"
 msgstr ""
 
-#: src/commandhandler.cpp:297
+#: src/commandhandler.cpp:306
 msgid "Command: /where"
 msgstr ""
 
-#: src/commandhandler.cpp:298
+#: src/commandhandler.cpp:307
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: src/commandhandler.cpp:302
+#: src/commandhandler.cpp:311
 msgid "Command: /who"
 msgstr ""
 
-#: src/commandhandler.cpp:303
+#: src/commandhandler.cpp:312
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:309
+#: src/commandhandler.cpp:318
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: src/commandhandler.cpp:375
+#: src/commandhandler.cpp:384
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:383
+#: src/commandhandler.cpp:392
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:397
+#: src/commandhandler.cpp:406
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:410 src/net/ea/gui/partytab.cpp:109
+#: src/commandhandler.cpp:419 src/net/tmwa/gui/partytab.cpp:109
 msgid "Party name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:423 src/commandhandler.cpp:471
-#: src/commandhandler.cpp:493
+#: src/commandhandler.cpp:432 src/commandhandler.cpp:509
+#: src/commandhandler.cpp:531
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:441
+#: src/commandhandler.cpp:450
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:441
+#: src/commandhandler.cpp:450
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:450
+#: src/commandhandler.cpp:459
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:454
+#: src/commandhandler.cpp:463
 msgid "Message now closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:477
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:489
+msgid "Show IP: On"
+msgstr ""
+
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:485
+msgid "Show IP: Off"
+msgstr ""
+
+#: src/commandhandler.cpp:515
 msgid "Player already ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:484
+#: src/commandhandler.cpp:522
 msgid "Player successfully ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:486
+#: src/commandhandler.cpp:524
 msgid "Player could not be ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:501
+#: src/commandhandler.cpp:539
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:506
+#: src/commandhandler.cpp:544
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:508
+#: src/commandhandler.cpp:546
 msgid "Player could not be unignored!"
 msgstr ""
 
@@ -462,40 +477,40 @@ msgstr ""
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:326
+#: src/game.cpp:342
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:331
+#: src/game.cpp:347
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:355
+#: src/game.cpp:378
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:360
+#: src/game.cpp:382
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:705
+#: src/game.cpp:721
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:712
+#: src/game.cpp:726
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:946
+#: src/game.cpp:954
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:947
+#: src/game.cpp:955
 #, c-format
 msgid "Error while loading %s"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:75
+#: src/gui/beingpopup.cpp:76
 #, c-format
 msgid "Party: %s"
 msgstr ""
@@ -504,34 +519,34 @@ msgstr ""
 msgid "Buy"
 msgstr "kaufen"
 
-#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
-#: src/gui/sell.cpp:276
+#: src/gui/buy.cpp:69 src/gui/buy.cpp:261 src/gui/sell.cpp:71
+#: src/gui/sell.cpp:288
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:99 src/gui/npcdialog.cpp:100
-#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:479
+#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:112 src/gui/npcdialog.cpp:124
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:463
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:98 src/gui/npcdialog.cpp:101
-#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:491
+#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:111 src/gui/npcdialog.cpp:125
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:475
 msgid "-"
 msgstr ""
 
 #: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
-#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:182
-#: src/keyboardconfig.cpp:103
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:228
+#: src/keyboardconfig.cpp:102
 msgid "Quit"
 msgstr "Beenden"
 
-#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:408
-#: src/gui/statuswindow.cpp:478 src/gui/statuswindow.cpp:512
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:384
+#: src/gui/statuswindow.cpp:462 src/gui/statuswindow.cpp:496
 msgid "Max"
 msgstr ""
 
@@ -545,11 +560,11 @@ msgstr "Verkaufen"
 
 #: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
 #: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
-#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:101
-#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:178
-#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:402
+#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:114
+#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:389
 #: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
-#: src/gui/socialwindow.cpp:242 src/gui/textdialog.cpp:39
+#: src/gui/socialwindow.cpp:275 src/gui/textdialog.cpp:40
 #: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr "Abbrechen"
@@ -586,7 +601,7 @@ msgstr ""
 msgid "Change Password"
 msgstr "Passwort ändern"
 
-#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:53
+#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:55
 #: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
 msgid "Password:"
 msgstr "Passwort:"
@@ -617,19 +632,19 @@ msgstr ""
 msgid "Create Character"
 msgstr "Charakter erstellen"
 
-#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:52
+#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:54
 #: src/gui/register.cpp:67
 msgid "Name:"
 msgstr "Name:"
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
 #: src/gui/outfitwindow.cpp:67
 msgid ">"
 msgstr ""
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
 #: src/gui/outfitwindow.cpp:66
@@ -646,8 +661,8 @@ msgstr "Haarfarbe:"
 msgid "Hair style:"
 msgstr "Frisur:"
 
-#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:397
-#: src/gui/socialwindow.cpp:296
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:392
+#: src/gui/socialwindow.cpp:329
 msgid "Create"
 msgstr "erstellen"
 
@@ -703,33 +718,33 @@ msgstr ""
 msgid "Change Email"
 msgstr "Email-Adresse ändern"
 
-#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:185
-#: src/gui/setup_players.cpp:230
+#: src/gui/charselectdialog.cpp:336 src/gui/serverdialog.cpp:231
+#: src/gui/setup_players.cpp:229
 msgid "Delete"
 msgstr "Löschen"
 
-#: src/gui/charselectdialog.cpp:387
+#: src/gui/charselectdialog.cpp:380
 msgid "Choose"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:399 src/gui/charselectdialog.cpp:400
+#: src/gui/charselectdialog.cpp:394 src/gui/charselectdialog.cpp:395
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:77 src/gui/palette.cpp:96
+#: src/gui/chat.cpp:88
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chat.cpp:287
+#: src/gui/chat.cpp:311
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:305
+#: src/gui/chat.cpp:329
 msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:469
+#: src/gui/chat.cpp:493
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -791,142 +806,172 @@ msgstr ""
 msgid "Ambient FX: %s"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:56
+#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:55
 msgid "Equipment"
 msgstr "Ausrüstung"
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:77
-#: src/gui/inventorywindow.cpp:79 src/gui/inventorywindow.cpp:298
-#: src/gui/popupmenu.cpp:372
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:89
+#: src/gui/inventorywindow.cpp:337 src/gui/popupmenu.cpp:359
 msgid "Unequip"
 msgstr "Ablegen"
 
-#: src/gui/help.cpp:36
+#: src/gui/help.cpp:37
 msgid "Help"
 msgstr ""
 
-#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:73
+#: src/gui/help.cpp:51 src/gui/npcdialog.cpp:50
 msgid "Close"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:56 src/gui/windowmenu.cpp:57
+#: src/gui/inventorywindow.cpp:59 src/gui/windowmenu.cpp:56
 msgid "Inventory"
 msgstr "Inventar"
 
-#: src/gui/inventorywindow.cpp:72 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:300 src/gui/popupmenu.cpp:374
+#: src/gui/inventorywindow.cpp:59
+msgid "Storage"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:82
+msgid "Slots:"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:87 src/gui/inventorywindow.cpp:100
+#: src/gui/inventorywindow.cpp:339 src/gui/popupmenu.cpp:361
 msgid "Equip"
 msgstr "Ausrüsten"
 
-#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:304 src/gui/popupmenu.cpp:377
+#: src/gui/inventorywindow.cpp:88
 msgid "Use"
 msgstr "Benutzen"
 
-#: src/gui/inventorywindow.cpp:83 src/gui/inventorywindow.cpp:308
-#: src/gui/popupmenu.cpp:380
+#: src/gui/inventorywindow.cpp:101 src/gui/popupmenu.cpp:364
+msgid "Activate"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:102 src/gui/inventorywindow.cpp:348
+#: src/gui/popupmenu.cpp:367
 #, fuzzy
 msgid "Drop..."
 msgstr "Ablegen"
 
-#: src/gui/inventorywindow.cpp:84 src/gui/popupmenu.cpp:386
+#: src/gui/inventorywindow.cpp:103 src/gui/popupmenu.cpp:373
 msgid "Split"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:85 src/gui/outfitwindow.cpp:51
+#: src/gui/inventorywindow.cpp:104 src/gui/outfitwindow.cpp:51
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:96 src/gui/storagewindow.cpp:83
-msgid "Slots:"
+#: src/gui/inventorywindow.cpp:106
+msgid "Weight:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:97
-msgid "Weight:"
+#: src/gui/inventorywindow.cpp:124 src/gui/popupmenu.cpp:378
+msgid "Store"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:310 src/gui/popupmenu.cpp:382
+#: src/gui/inventorywindow.cpp:125 src/gui/popupmenu.cpp:385
+msgid "Retrieve"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:350 src/gui/popupmenu.cpp:369
 msgid "Drop"
 msgstr "Ablegen"
 
-#: src/gui/itemamount.cpp:100 src/gui/okdialog.cpp:42
-#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:38 src/gui/trade.cpp:73
-#: src/gui/trade.cpp:75
+#: src/gui/itemamount.cpp:113 src/gui/okdialog.cpp:42
+#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:39 src/gui/trade.cpp:72
+#: src/gui/trade.cpp:74
 msgid "OK"
 msgstr ""
 
-#: src/gui/itemamount.cpp:102
+#: src/gui/itemamount.cpp:115
 msgid "All"
 msgstr ""
 
-#: src/gui/itemamount.cpp:128
+#: src/gui/itemamount.cpp:141
 msgid "Select amount of items to trade."
 msgstr ""
 
-#: src/gui/itemamount.cpp:131
+#: src/gui/itemamount.cpp:144
 msgid "Select amount of items to drop."
 msgstr ""
 
-#: src/gui/itemamount.cpp:134
+#: src/gui/itemamount.cpp:147
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/itemamount.cpp:137
+#: src/gui/itemamount.cpp:150
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamount.cpp:140
+#: src/gui/itemamount.cpp:153
 msgid "Select amount of items to split."
 msgstr ""
 
-#: src/gui/itempopup.cpp:92
+#: src/gui/itempopup.cpp:137
 #, fuzzy, c-format
 msgid "Weight: %s"
 msgstr "Wirkung: %s"
 
-#: src/gui/login.cpp:49 src/gui/login.cpp:61
+#: src/gui/login.cpp:51 src/gui/login.cpp:63
 msgid "Login"
 msgstr "Login"
 
-#: src/gui/login.cpp:58
+#: src/gui/login.cpp:60
 msgid "Remember username"
 msgstr ""
 
-#: src/gui/login.cpp:59 src/gui/register.cpp:58 src/gui/register.cpp:73
+#: src/gui/login.cpp:61 src/gui/register.cpp:58 src/gui/register.cpp:73
 msgid "Register"
 msgstr "Registrieren"
 
-#: src/gui/login.cpp:60
+#: src/gui/login.cpp:62
 #, fuzzy
 msgid "Change Server"
 msgstr "Server:"
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
+#: src/gui/login.cpp:129
+msgid "Registration disabled"
+msgstr ""
+
+#: src/gui/login.cpp:129
+msgid "You need to use the website to register an account for this server."
+msgstr ""
+
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:86
 msgid "Map"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:44
+#: src/gui/ministatus.cpp:235
+msgid "Need"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:48
 msgid "Waiting for server"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:45
+#: src/gui/npcdialog.cpp:49
 msgid "Next"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:47
+#: src/gui/npcdialog.cpp:51
 msgid "Submit"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:52 src/gui/npcpostdialog.cpp:41
+#: src/gui/npcdialog.cpp:73 src/gui/npcpostdialog.cpp:41
 msgid "NPC"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:110
+#: src/gui/npcdialog.cpp:118
+msgid "Clear log"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:134
 msgid "Reset"
 msgstr ""
 
 #. TRANSLATORS: Please leave the \n sequences intact.
-#: src/gui/npcdialog.cpp:171
+#: src/gui/npcdialog.cpp:208
 msgid ""
 "\n"
 "> Next\n"
@@ -940,7 +985,7 @@ msgstr ""
 msgid "Send"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:96
+#: src/gui/npcpostdialog.cpp:99
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
@@ -955,303 +1000,82 @@ msgstr ""
 msgid "Unequip first"
 msgstr "Ablegen"
 
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:143
-msgid "Text"
-msgstr ""
-
-#: src/gui/palette.cpp:82
-msgid "Text Shadow"
-msgstr ""
-
-#: src/gui/palette.cpp:83
-msgid "Text Outline"
-msgstr ""
-
-#: src/gui/palette.cpp:84
-msgid "Progress Bar Labels"
-msgstr ""
-
-#: src/gui/palette.cpp:85
-msgid "Buttons"
-msgstr ""
-
-#: src/gui/palette.cpp:86
-msgid "Disabled Buttons"
-msgstr ""
-
-#: src/gui/palette.cpp:87
-msgid "Tabs"
-msgstr ""
-
-#: src/gui/palette.cpp:89
-msgid "Background"
-msgstr ""
-
-#: src/gui/palette.cpp:91
-msgid "Highlight"
-msgstr ""
-
-#: src/gui/palette.cpp:92
-msgid "Tab Highlight"
-msgstr ""
-
-#: src/gui/palette.cpp:93
-msgid "Item Too Expensive"
-msgstr ""
-
-#: src/gui/palette.cpp:94
-msgid "Item Is Equipped"
-msgstr ""
-
-#: src/gui/palette.cpp:97
-msgid "GM"
-msgstr ""
-
-#: src/gui/palette.cpp:98
-msgid "Player"
-msgstr ""
-
-#: src/gui/palette.cpp:99
-msgid "Whisper"
-msgstr ""
-
-#: src/gui/palette.cpp:100
-msgid "Is"
-msgstr ""
-
-#: src/gui/palette.cpp:101 src/net/ea/gui/partytab.cpp:43
-msgid "Party"
-msgstr ""
-
-#: src/gui/palette.cpp:102 src/net/ea/gui/guildtab.cpp:45
-msgid "Guild"
-msgstr ""
-
-#: src/gui/palette.cpp:103
-msgid "Server"
-msgstr ""
-
-#: src/gui/palette.cpp:104
-msgid "Logger"
-msgstr ""
-
-#: src/gui/palette.cpp:105
-msgid "Hyperlink"
-msgstr ""
-
-#: src/gui/palette.cpp:107
-msgid "Being"
-msgstr ""
-
-#: src/gui/palette.cpp:108
-msgid "Other Players' Names"
-msgstr ""
-
-#: src/gui/palette.cpp:109
-msgid "Own Name"
-msgstr ""
-
-#: src/gui/palette.cpp:110
-msgid "GM Names"
-msgstr ""
-
-#: src/gui/palette.cpp:111
-msgid "NPCs"
-msgstr ""
-
-#: src/gui/palette.cpp:112
-msgid "Monsters"
-msgstr ""
-
-#: src/gui/palette.cpp:114
-msgid "Unknown Item Type"
-msgstr ""
-
-#: src/gui/palette.cpp:115
-msgid "Generics"
-msgstr ""
-
-#: src/gui/palette.cpp:116
-msgid "Hats"
-msgstr ""
-
-#: src/gui/palette.cpp:117
-msgid "Usables"
-msgstr ""
-
-#: src/gui/palette.cpp:118
-msgid "Shirts"
-msgstr ""
-
-#: src/gui/palette.cpp:119
-msgid "One Handed Weapons"
-msgstr ""
-
-#: src/gui/palette.cpp:120
-msgid "Pants"
-msgstr ""
-
-#: src/gui/palette.cpp:121
-msgid "Shoes"
-msgstr ""
-
-#: src/gui/palette.cpp:122
-msgid "Two Handed Weapons"
-msgstr ""
-
-#: src/gui/palette.cpp:123
-msgid "Shields"
-msgstr ""
-
-#: src/gui/palette.cpp:124
-msgid "Rings"
-msgstr ""
-
-#: src/gui/palette.cpp:125
-msgid "Necklaces"
-msgstr ""
-
-#: src/gui/palette.cpp:126
-msgid "Arms"
-msgstr ""
-
-#: src/gui/palette.cpp:127
-msgid "Ammo"
-msgstr ""
-
-#: src/gui/palette.cpp:129
-msgid "Particle Effects"
-msgstr ""
-
-#: src/gui/palette.cpp:130
-msgid "Pickup Notification"
-msgstr ""
-
-#: src/gui/palette.cpp:131
-msgid "Exp Notification"
-msgstr ""
-
-#: src/gui/palette.cpp:133
-msgid "Player Hits Monster"
-msgstr ""
-
-#: src/gui/palette.cpp:135
-msgid "Monster Hits Player"
-msgstr ""
-
-#: src/gui/palette.cpp:136
-msgid "Critical Hit"
-msgstr ""
-
-#: src/gui/palette.cpp:137
-msgid "Misses"
-msgstr ""
-
-#: src/gui/palette.cpp:139
-msgid "HP Bar"
-msgstr ""
-
-#: src/gui/palette.cpp:140
-msgid "3/4 HP Bar"
-msgstr ""
-
-#: src/gui/palette.cpp:141
-msgid "1/2 HP Bar"
-msgstr ""
-
-#: src/gui/palette.cpp:142
-msgid "1/4 HP Bar"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:84
+#: src/gui/popupmenu.cpp:83
 #, c-format
 msgid "Trade with %s..."
 msgstr ""
 
-#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:161
+#: src/gui/popupmenu.cpp:87 src/gui/popupmenu.cpp:158
 #, c-format
 msgid "Attack %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:92
+#: src/gui/popupmenu.cpp:91
 #, c-format
 msgid "Whisper %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:101
+#: src/gui/popupmenu.cpp:100
 #, c-format
 msgid "Befriend %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:106
+#: src/gui/popupmenu.cpp:105
 #, c-format
 msgid "Disregard %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:109
+#: src/gui/popupmenu.cpp:108
 #, c-format
 msgid "Ignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:115 src/gui/popupmenu.cpp:124
+#: src/gui/popupmenu.cpp:114 src/gui/popupmenu.cpp:123
 #, c-format
 msgid "Unignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:118
+#: src/gui/popupmenu.cpp:117
 #, c-format
 msgid "Completely ignore %s"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:130
 #, c-format
-msgid "Follow %s"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:133
-#, c-format
 msgid "Invite %s to join your guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:137
+#: src/gui/popupmenu.cpp:134
 #, c-format
 msgid "Invite %s to join your party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144
+#: src/gui/popupmenu.cpp:141
 msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:153
+#: src/gui/popupmenu.cpp:150
 #, c-format
 msgid "Talk to %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:166
+#: src/gui/popupmenu.cpp:163
 msgid "Kick monster"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:174
+#: src/gui/popupmenu.cpp:171
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:191
+#: src/gui/popupmenu.cpp:188
 #, c-format
 msgid "Pick up %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:400
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:387
 msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:70
-msgid "Store"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:71
-msgid "Retrieve"
-msgstr ""
-
 #: src/gui/quitdialog.cpp:44
 msgid "Switch server"
 msgstr "Server wechseln"
@@ -1320,50 +1144,63 @@ msgstr "Das Passwort muss weniger als %d Buchstaben beinhalten."
 msgid "Passwords do not match."
 msgstr "Die Passwörter stimmen nicht überein."
 
-#: src/gui/serverdialog.cpp:134
+#: src/gui/serverdialog.cpp:197
 msgid "Choose Your Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:141 src/gui/widgets/chattab.cpp:139
+#: src/gui/serverdialog.cpp:206 src/gui/widgets/chattab.cpp:142
 msgid "Server:"
 msgstr "Server:"
 
-#: src/gui/serverdialog.cpp:142
+#: src/gui/serverdialog.cpp:207
 msgid "Port:"
 msgstr "Port:"
 
-#: src/gui/serverdialog.cpp:143
+#: src/gui/serverdialog.cpp:208
 #, fuzzy
 msgid "Server type:"
 msgstr "Server:"
 
-#: src/gui/serverdialog.cpp:183
+#: src/gui/serverdialog.cpp:229
 #, fuzzy
 msgid "Connect"
 msgstr "verbinde..."
 
-#: src/gui/serverdialog.cpp:184
+#: src/gui/serverdialog.cpp:230
 #, fuzzy
 msgid "Custom Server"
 msgstr "Server:"
 
-#: src/gui/serverdialog.cpp:262
+#: src/gui/serverdialog.cpp:324
 msgid "Please type both the address and the port of a server."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:411
+#: src/gui/serverdialog.cpp:441
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:417
+#: src/gui/serverdialog.cpp:447
 msgid "Waiting for server..."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:421
+#: src/gui/serverdialog.cpp:451
 msgid "Preparing download"
 msgstr ""
 
+#: src/gui/serverdialog.cpp:455
+msgid "Error retreiving server list!"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:550
+msgid "requires a newer version"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:552
+#, c-format
+msgid "requires v%s"
+msgstr ""
+
 #: src/gui/setup_audio.cpp:42
 msgid "Sound"
 msgstr "Sound"
@@ -1396,50 +1233,50 @@ msgstr ""
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:44
+#: src/gui/setup_colors.cpp:46
 msgid "This is what the color looks like"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:49
+#: src/gui/setup_colors.cpp:51
 msgid "Colors"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:70
+#: src/gui/setup_colors.cpp:72
 msgid "Type:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:81 src/gui/setup_colors.cpp:433
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:331
 msgid "Static"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:84
-#: src/gui/setup_colors.cpp:434
+#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
+#: src/gui/setup_colors.cpp:332
 msgid "Pulse"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
+#: src/gui/setup_colors.cpp:333
 msgid "Rainbow"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
+#: src/gui/setup_colors.cpp:333
 msgid "Spectrum"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:92
+#: src/gui/setup_colors.cpp:94
 msgid "Delay:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:107
+#: src/gui/setup_colors.cpp:109
 msgid "Red:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:122
+#: src/gui/setup_colors.cpp:124
 msgid "Green:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:137
+#: src/gui/setup_colors.cpp:139
 msgid "Blue:"
 msgstr ""
 
@@ -1484,566 +1321,578 @@ msgid "Assign"
 msgstr ""
 
 #: src/gui/setup_keyboard.cpp:90
+msgid "Unassign"
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:94
 msgid "Default"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:119
+#: src/gui/setup_keyboard.cpp:125
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_players.cpp:57
+#: src/gui/setup_players.cpp:58
 msgid "Name"
 msgstr ""
 
-#: src/gui/setup_players.cpp:58
+#: src/gui/setup_players.cpp:59
 msgid "Relation"
 msgstr ""
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:64
 msgid "Neutral"
 msgstr ""
 
-#: src/gui/setup_players.cpp:64
+#: src/gui/setup_players.cpp:65
 msgid "Friend"
 msgstr ""
 
-#: src/gui/setup_players.cpp:65
+#: src/gui/setup_players.cpp:66
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_players.cpp:67
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_players.cpp:208 src/gui/setup_video.cpp:132
+#: src/gui/setup_players.cpp:206 src/gui/setup_video.cpp:153
 msgid "???"
 msgstr ""
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_players.cpp:225
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_players.cpp:228
+#: src/gui/setup_players.cpp:227
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:231
 msgid "Put all whispers in tabs"
 msgstr ""
 
-#: src/gui/setup_players.cpp:234
+#: src/gui/setup_players.cpp:233
 msgid "Show gender"
 msgstr ""
 
-#: src/gui/setup_players.cpp:236
+#: src/gui/setup_players.cpp:235
+msgid "Enable Chat log"
+msgstr ""
+
+#: src/gui/setup_players.cpp:237
 msgid "Players"
 msgstr ""
 
-#: src/gui/setup_players.cpp:261
+#: src/gui/setup_players.cpp:262
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:113
+#: src/gui/setup_video.cpp:134
 msgid "Tiny"
 msgstr ""
 
-#: src/gui/setup_video.cpp:114
+#: src/gui/setup_video.cpp:135
 msgid "Small"
 msgstr ""
 
-#: src/gui/setup_video.cpp:115
+#: src/gui/setup_video.cpp:136
 msgid "Medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:116
+#: src/gui/setup_video.cpp:137
 msgid "Large"
 msgstr ""
 
-#: src/gui/setup_video.cpp:142
+#: src/gui/setup_video.cpp:163
 msgid "No text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:144
+#: src/gui/setup_video.cpp:164
+msgid "Text"
+msgstr ""
+
+#: src/gui/setup_video.cpp:165
 msgid "Bubbles, no names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:145
+#: src/gui/setup_video.cpp:166
 msgid "Bubbles with names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:157
+#: src/gui/setup_video.cpp:178
 msgid "off"
 msgstr "aus"
 
-#: src/gui/setup_video.cpp:158 src/gui/setup_video.cpp:171
+#: src/gui/setup_video.cpp:179 src/gui/setup_video.cpp:192
 msgid "low"
 msgstr "niedrig"
 
-#: src/gui/setup_video.cpp:159 src/gui/setup_video.cpp:173
+#: src/gui/setup_video.cpp:180 src/gui/setup_video.cpp:194
 msgid "high"
 msgstr "hoch"
 
-#: src/gui/setup_video.cpp:172
+#: src/gui/setup_video.cpp:193
 msgid "medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:174
+#: src/gui/setup_video.cpp:195
 msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:196
+#: src/gui/setup_video.cpp:217
 msgid "Full screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:197
+#: src/gui/setup_video.cpp:218
 msgid "OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:198
+#: src/gui/setup_video.cpp:219
 msgid "Custom cursor"
 msgstr ""
 
-#: src/gui/setup_video.cpp:200
+#: src/gui/setup_video.cpp:221
 msgid "Visible names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:223
 msgid "Particle effects"
 msgstr ""
 
-#: src/gui/setup_video.cpp:204
+#: src/gui/setup_video.cpp:225
 msgid "Show own name"
 msgstr ""
 
-#: src/gui/setup_video.cpp:205
+#: src/gui/setup_video.cpp:226
+msgid "Log NPC dialogue"
+msgstr ""
+
+#: src/gui/setup_video.cpp:227
 msgid "Show pickup notification"
 msgstr ""
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:207
+#. TRANSLATORS: Refers to "Show pickup notification"
+#: src/gui/setup_video.cpp:229
 msgid "in chat"
 msgstr ""
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:209
+#. TRANSLATORS: Refers to "Show pickup notification"
+#: src/gui/setup_video.cpp:231
 msgid "as particle"
 msgstr ""
 
-#: src/gui/setup_video.cpp:214
+#: src/gui/setup_video.cpp:236
 msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:225
+#: src/gui/setup_video.cpp:247
+msgid "Disable transparency (Low CPU mode)"
+msgstr ""
+
+#: src/gui/setup_video.cpp:250
 msgid "Video"
 msgstr ""
 
-#: src/gui/setup_video.cpp:227
-msgid "Show monster damage"
+#: src/gui/setup_video.cpp:252
+msgid "Show damage"
 msgstr ""
 
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:258
 msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:259
 msgid "Gui opacity"
 msgstr ""
 
-#: src/gui/setup_video.cpp:235
+#: src/gui/setup_video.cpp:260
 msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_video.cpp:236
+#: src/gui/setup_video.cpp:261
 msgid "Particle detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237
+#: src/gui/setup_video.cpp:262
 msgid "Font size"
 msgstr ""
 
-#: src/gui/setup_video.cpp:251 src/gui/setup_video.cpp:454
-#: src/gui/setup_video.cpp:568
+#: src/gui/setup_video.cpp:277 src/gui/setup_video.cpp:532
+#: src/gui/setup_video.cpp:662
 #, fuzzy
 msgid "None"
 msgstr "Nein"
 
-#: src/gui/setup_video.cpp:381
+#: src/gui/setup_video.cpp:426
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:387
+#: src/gui/setup_video.cpp:432
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:398
+#: src/gui/setup_video.cpp:443
 msgid "Switching to Full Screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:399
+#: src/gui/setup_video.cpp:444
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:411
+#: src/gui/setup_video.cpp:458
 msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:412
+#: src/gui/setup_video.cpp:459
+msgid ""
+"Applying change to OpenGL requires restart. In case OpenGL messes up your "
+"game graphics, restart the game with the command line option \"--no-opengl\"."
+msgstr ""
+
+#: src/gui/setup_video.cpp:466
+msgid "Deactivating OpenGL"
+msgstr ""
+
+#: src/gui/setup_video.cpp:467
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#: src/gui/setup_video.cpp:486 src/gui/setup_video.cpp:491
+#: src/gui/setup_video.cpp:475
+msgid "Transparency disabled"
+msgstr ""
+
+#: src/gui/setup_video.cpp:476 src/gui/setup_video.cpp:484
+msgid "You must restart to apply changes."
+msgstr ""
+
+#: src/gui/setup_video.cpp:483
+msgid "Transparency enabled"
+msgstr ""
+
+#: src/gui/setup_video.cpp:576 src/gui/setup_video.cpp:581
 msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:487 src/gui/setup_video.cpp:492
+#: src/gui/setup_video.cpp:577 src/gui/setup_video.cpp:582
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:489
+#: src/gui/setup_video.cpp:579
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:522
+#: src/gui/setup_video.cpp:612
 msgid "Particle Effect Settings Changed."
 msgstr ""
 
-#: src/gui/setup_video.cpp:523
+#: src/gui/setup_video.cpp:613
 msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skilldialog.cpp:197 src/gui/windowmenu.cpp:58
+#: src/gui/skilldialog.cpp:212 src/gui/windowmenu.cpp:59
 msgid "Skills"
 msgstr "Fähigkeiten"
 
-#: src/gui/skilldialog.cpp:208
+#: src/gui/skilldialog.cpp:223
 msgid "Up"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:262
+#: src/gui/skilldialog.cpp:269
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:314
+#: src/gui/skilldialog.cpp:351
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:323
+#: src/gui/skilldialog.cpp:360
 #, fuzzy, c-format
 msgid "Skill %d"
 msgstr "Fähigkeiten"
 
-#: src/gui/skilldialog.cpp:405
+#: src/gui/skilldialog.cpp:442
 #, fuzzy, c-format
 msgid "Lvl: %d (%+d)"
 msgstr "Level: %d"
 
-#: src/gui/skilldialog.cpp:416
+#: src/gui/skilldialog.cpp:453
 #, fuzzy, c-format
 msgid "Lvl: %d"
 msgstr "Level: %d"
 
-#: src/gui/socialwindow.cpp:117
+#: src/gui/socialwindow.cpp:126
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:126
+#: src/gui/socialwindow.cpp:139
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:136
+#: src/gui/socialwindow.cpp:153
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:137
+#: src/gui/socialwindow.cpp:154
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:146
+#: src/gui/socialwindow.cpp:163
 msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:147
+#: src/gui/socialwindow.cpp:164
 #, fuzzy, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Bist du dir sicher, dass du diesen Charakter löschen möchtest?"
 
-#: src/gui/socialwindow.cpp:182
+#: src/gui/socialwindow.cpp:207 src/net/tmwa/partyhandler.cpp:330
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:218
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:199
+#: src/gui/socialwindow.cpp:232
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:200
+#: src/gui/socialwindow.cpp:233
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:209
+#: src/gui/socialwindow.cpp:242
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:210
+#: src/gui/socialwindow.cpp:243
 #, fuzzy, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Bist du dir sicher, dass du diesen Charakter löschen möchtest?"
 
-#: src/gui/socialwindow.cpp:239
+#: src/gui/socialwindow.cpp:272
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:240 src/gui/socialwindow.cpp:564
+#: src/gui/socialwindow.cpp:273 src/gui/socialwindow.cpp:620
 #, fuzzy
 msgid "Create Party"
 msgstr "Charakter erstellen"
 
-#: src/gui/socialwindow.cpp:279 src/gui/windowmenu.cpp:60
+#: src/gui/socialwindow.cpp:312 src/gui/windowmenu.cpp:64
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:297
+#: src/gui/socialwindow.cpp:330
 msgid "Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:298
+#: src/gui/socialwindow.cpp:331
 msgid "Leave"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:394
+#: src/gui/socialwindow.cpp:443
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:400
+#: src/gui/socialwindow.cpp:449
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:413
+#: src/gui/socialwindow.cpp:462
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:419
+#: src/gui/socialwindow.cpp:468
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:463
+#: src/gui/socialwindow.cpp:497
+msgid "Creating guild failed, please choose a shorter name."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:504
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:477
+#: src/gui/socialwindow.cpp:520
+msgid "Creating party failed, please choose a shorter name."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:527
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:484
+#: src/gui/socialwindow.cpp:541
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:485
+#: src/gui/socialwindow.cpp:542
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:497
+#: src/gui/socialwindow.cpp:554
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:502
+#: src/gui/socialwindow.cpp:559
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:507
+#: src/gui/socialwindow.cpp:564
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:519
+#: src/gui/socialwindow.cpp:576
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:529
+#: src/gui/socialwindow.cpp:585
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:533
+#: src/gui/socialwindow.cpp:589
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:541
+#: src/gui/socialwindow.cpp:597
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:546
+#: src/gui/socialwindow.cpp:602
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:554
+#: src/gui/socialwindow.cpp:610
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:565
+#: src/gui/socialwindow.cpp:621
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:570
+#: src/gui/socialwindow.cpp:626
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:571
+#: src/gui/socialwindow.cpp:627
 msgid "Choose your party's name."
 msgstr ""
 
-#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:59
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:62
 msgid "Specials"
 msgstr ""
 
-#: src/gui/specialswindow.cpp:174
-#, c-format
-msgid "Specials Set %d"
-msgstr ""
-
-#: src/gui/specialswindow.cpp:191
-#, c-format
-msgid "Special %d"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:99 src/gui/statuswindow.cpp:247
+#: src/gui/statuswindow.cpp:113 src/gui/statuswindow.cpp:215
+#: src/gui/statuswindow.cpp:262
 #, c-format
 msgid "Level: %d"
 msgstr "Level: %d"
 
-#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:211
+#: src/gui/statuswindow.cpp:114 src/gui/statuswindow.cpp:208
+#: src/gui/statuswindow.cpp:239
 #, c-format
 msgid "Money: %s"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:102
+#: src/gui/statuswindow.cpp:117
 msgid "HP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:107
+#: src/gui/statuswindow.cpp:122
 msgid "Exp:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:112
+#: src/gui/statuswindow.cpp:130
 msgid "MP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:132 src/gui/statuswindow.cpp:219
+#: src/gui/statuswindow.cpp:158 src/gui/statuswindow.cpp:275
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:133
+#: src/gui/statuswindow.cpp:159
 msgid "Job:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:194
-msgid "HP"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:200
-msgid "MP"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:206
-msgid "Exp"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:215
-#, fuzzy
-msgid "Money"
-msgstr "Geld: %d"
-
-#: src/gui/statuswindow.cpp:225
-msgid "Job"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:229
+#: src/gui/statuswindow.cpp:211 src/gui/statuswindow.cpp:247
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:235
+#: src/gui/statuswindow.cpp:255
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:251
-#, fuzzy
-msgid "Level"
-msgstr "Level: %d"
-
-#: src/gui/storagewindow.cpp:58
-msgid "Storage"
-msgstr ""
-
-#: src/gui/trade.cpp:52
+#: src/gui/trade.cpp:53
 msgid "Propose trade"
 msgstr ""
 
-#: src/gui/trade.cpp:53
+#: src/gui/trade.cpp:54
 msgid "Confirmed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:55
 msgid "Agree trade"
 msgstr ""
 
-#: src/gui/trade.cpp:55
+#: src/gui/trade.cpp:56
 msgid "Agreed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:58
+#: src/gui/trade.cpp:59
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/trade.cpp:74 src/gui/trade.cpp:75
+#: src/gui/trade.cpp:73 src/gui/trade.cpp:74
 msgid "Trade"
 msgstr ""
 
-#: src/gui/trade.cpp:77
+#: src/gui/trade.cpp:76
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: src/gui/trade.cpp:99 src/gui/trade.cpp:135
+#: src/gui/trade.cpp:98 src/gui/trade.cpp:134
 #, fuzzy, c-format
 msgid "You get %s"
 msgstr "Du gibst:"
 
-#: src/gui/trade.cpp:100
+#: src/gui/trade.cpp:99
 msgid "You give:"
 msgstr "Du gibst:"
 
-#: src/gui/trade.cpp:104
+#: src/gui/trade.cpp:103
 msgid "Change"
 msgstr ""
 
-#: src/gui/trade.cpp:275
+#: src/gui/trade.cpp:262
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/trade.cpp:318
+#: src/gui/trade.cpp:304
 msgid "You don't have enough money."
 msgstr ""
 
@@ -2064,21 +1913,21 @@ msgstr "verbinde..."
 msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:405
+#: src/gui/updatewindow.cpp:417
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:407
+#: src/gui/updatewindow.cpp:419
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:409
+#: src/gui/updatewindow.cpp:421
 msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:501
+#: src/gui/updatewindow.cpp:515
 msgid "Completed"
 msgstr ""
 
@@ -2158,61 +2007,61 @@ msgstr ""
 msgid "Need a user to kick!"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:118
+#: src/gui/widgets/chattab.cpp:121
 msgid "Global announcement:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:124
+#: src/gui/widgets/chattab.cpp:127
 #, c-format
 msgid "Global announcement from %s:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:150
+#: src/gui/widgets/chattab.cpp:153
 #, c-format
 msgid "%s whispers: %s"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:51
+#: src/gui/widgets/whispertab.cpp:53
 msgid "Cannot send empty chat!"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:70
+#: src/gui/widgets/whispertab.cpp:72
 msgid "/ignore > Ignore the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:71
+#: src/gui/widgets/whispertab.cpp:73
 msgid "/unignore > Stop ignoring the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:72
+#: src/gui/widgets/whispertab.cpp:74
 msgid "/close > Close the whisper tab"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:82
+#: src/gui/widgets/whispertab.cpp:84
 msgid "Command: /close"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:83
+#: src/gui/widgets/whispertab.cpp:85
 msgid "This command closes the current whisper tab."
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:87
+#: src/gui/widgets/whispertab.cpp:89
 msgid "Command: /ignore"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:88
+#: src/gui/widgets/whispertab.cpp:90
 msgid "This command ignores the other player regardless of current relations."
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:94
+#: src/gui/widgets/whispertab.cpp:96
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:55
+#: src/gui/windowmenu.cpp:54
 msgid "Status"
 msgstr "Status"
 
-#: src/gui/windowmenu.cpp:61
+#: src/gui/windowmenu.cpp:65
 msgid "Shortcut"
 msgstr ""
 
@@ -2228,1355 +2077,1381 @@ msgstr ""
 msgid "Choose World"
 msgstr ""
 
-#: src/keyboardconfig.cpp:40
+#: src/keyboardconfig.cpp:39
 msgid "Move Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:41
+#: src/keyboardconfig.cpp:40
 msgid "Move Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:41
 msgid "Move Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:42
 msgid "Move Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:44 src/net/ea/generalhandler.cpp:223
+#: src/keyboardconfig.cpp:43 src/net/tmwa/generalhandler.cpp:237
 msgid "Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:44
 msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:45
 msgid "Smilie"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:46
 msgid "Talk"
 msgstr ""
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:47
 msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:48
 msgid "Target Monster"
 msgstr ""
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboardconfig.cpp:49
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:50
 msgid "Target Player"
 msgstr ""
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:51
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:52
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:53
 msgid "Sit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:54
 msgid "Screenshot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:55
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:56
 msgid "Find Path to Mouse"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58 src/keyboardconfig.cpp:59
-#: src/keyboardconfig.cpp:60 src/keyboardconfig.cpp:61
-#: src/keyboardconfig.cpp:62 src/keyboardconfig.cpp:63
-#: src/keyboardconfig.cpp:64 src/keyboardconfig.cpp:65
-#: src/keyboardconfig.cpp:66 src/keyboardconfig.cpp:67
-#: src/keyboardconfig.cpp:68 src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:57 src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60
+#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62
+#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64
+#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68
 #, c-format
 msgid "Item Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:69
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:70
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:71
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:72
 msgid "Equipment Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:73
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:74
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:75
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:76
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:77
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:78
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:79
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:80
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:81
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:83
+#: src/keyboardconfig.cpp:82
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:83
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86
-#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88
-#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90
-#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92
-#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:84 src/keyboardconfig.cpp:85
+#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:87
+#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:89
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:91
+#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:93
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:95
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:96
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:97
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:98
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:99
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:100
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:101
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:103
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:105
+#: src/keyboardconfig.cpp:104
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:178
+#: src/keyboardconfig.cpp:183
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:913
+#: src/localplayer.cpp:985
 msgid "Unable to pick up item."
 msgstr ""
 
 #. TRANSLATORS: This sentence may be translated differently
 #. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:922
+#: src/localplayer.cpp:994
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/main.cpp:43
+#: src/main.cpp:42
 msgid "mana [options] [mana-file]"
 msgstr ""
 
+#: src/main.cpp:43
+msgid "[mana-file] : The mana file is an XML file (.mana)"
+msgstr ""
+
 #: src/main.cpp:44
-msgid "Options:"
+msgid "              used to set custom parameters"
 msgstr ""
 
 #: src/main.cpp:45
+msgid "              to the mana client."
+msgstr ""
+
+#: src/main.cpp:47
+msgid "Options:"
+msgstr ""
+
+#: src/main.cpp:48
 msgid "  -v --version        : Display the version"
 msgstr ""
 
-#: src/main.cpp:46
+#: src/main.cpp:49
 msgid "  -h --help           : Display this help"
 msgstr ""
 
-#: src/main.cpp:47
+#: src/main.cpp:50
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
-#: src/main.cpp:48
+#: src/main.cpp:51
 msgid "  -U --username       : Login with this username"
 msgstr ""
 
-#: src/main.cpp:49
+#: src/main.cpp:52
 msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/main.cpp:50
+#: src/main.cpp:53
 msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/main.cpp:51
+#: src/main.cpp:54
 msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:52
+#: src/main.cpp:55
 msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/main.cpp:53
+#: src/main.cpp:56
 msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/main.cpp:54
+#: src/main.cpp:57
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:56
+#: src/main.cpp:59
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:57
+#: src/main.cpp:60
 msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:58
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
+#: src/main.cpp:61
+msgid "     --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/main.cpp:59
+#: src/main.cpp:62
+msgid "     --chat-log-dir   : Chat log dir to use"
+msgstr ""
+
+#: src/main.cpp:63
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/main.cpp:61
+#: src/main.cpp:65
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:63
+#: src/net/manaserv/beinghandler.cpp:303 src/net/tmwa/playerhandler.cpp:94
+msgid "You are dead."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:304 src/net/tmwa/playerhandler.cpp:95
+msgid "We regret to inform you that your character was killed in battle."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:306 src/net/tmwa/playerhandler.cpp:97
+msgid "You are not that alive anymore."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:307 src/net/tmwa/playerhandler.cpp:98
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:308 src/net/tmwa/playerhandler.cpp:99
+msgid "Game Over!"
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:309 src/net/tmwa/playerhandler.cpp:101
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:311 src/net/tmwa/playerhandler.cpp:103
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:313 src/net/tmwa/playerhandler.cpp:105
+msgid "I guess this did not run too well."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:107
+msgid "Do you want your possessions identified?"
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:109
+msgid "Sadly, no trace of you was ever found..."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:111
+msgid "Annihilated."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:113
+msgid "Looks like you got your head handed to you."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:115
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:323
+msgid "Press OK to respawn."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:324
+#, fuzzy
+msgid "You Died"
+msgstr "Du gibst:"
+
+#: src/net/manaserv/charhandler.cpp:138 src/net/manaserv/charhandler.cpp:209
+msgid "Not logged in."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:141
+msgid "No empty slot."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:144
+msgid "Invalid name."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:147
+msgid "Character's name already exists."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:150
+msgid "Invalid hairstyle."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:153
+msgid "Invalid hair color."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:156
+msgid "Invalid gender."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:159
+msgid "Character's stats are too high."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:162
+msgid "Character's stats are too low."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:165
+#, c-format
+msgid "At least one statis out of the permitted range: (%u - %u)."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:171 src/net/manaserv/loginhandler.cpp:96
+#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
+#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
+#: src/net/tmwa/loginhandler.cpp:95 src/net/tmwa/loginhandler.cpp:182
+msgid "Unknown error."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:200 src/net/tmwa/charserverhandler.cpp:146
+msgid "Info"
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:200
+msgid "Player deleted."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:212
+msgid "Selection out of range."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:215
+#, c-format
+msgid "Unknown error (%d)."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:250
+msgid "No gameservers are available."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:187 src/net/manaserv/chathandler.cpp:313
+#: src/net/manaserv/guildhandler.cpp:260
+#, c-format
+msgid "Topic: %s"
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:274
+msgid "Players in this channel:"
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:208
+msgid "Error joining channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:214
+msgid "Listing channels."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:226
+msgid "End of channel list."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:303
+#, c-format
+msgid "%s entered the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:308
+#, c-format
+msgid "%s left the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:324
+#, c-format
+msgid "%s has set mode %s on user %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:334
+#, c-format
+msgid "%s has kicked %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:339
+msgid "Unknown channel event."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:82
+msgid "Guild created."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:87
+msgid "Error creating guild."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:97
+msgid "Invite sent."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:204
+msgid "Member was promoted successfully."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:209
+msgid "Failed to promote member."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:87
+msgid "Wrong magic_token."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
+msgid "Already logged in."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:93
+#, fuzzy
+msgid "Account banned."
+msgstr "Account: %s"
+
+#: src/net/manaserv/loginhandler.cpp:118
+msgid "New password incorrect."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:121 src/net/tmwa/loginhandler.cpp:89
+msgid "Old password incorrect."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
+msgid "Account not connected. Please login first."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:149
+msgid "New email address incorrect."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:152
+msgid "Old email address incorrect."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:158
+msgid "The new email address already exists."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:239
+msgid ""
+"Client registration is not allowed. Please contact server administration."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
+msgid "Client version is too old."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:266
+msgid "Wrong username or password."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:272
+#, fuzzy
+msgid "Account banned"
+msgstr "Account: %s"
+
+#: src/net/manaserv/loginhandler.cpp:275
+msgid "Login attempt too soon after previous attempt."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:303
+msgid "Wrong username, password or email address."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:306
+msgid "Username already exists."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:309
+msgid "Email address already exists."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:312
+msgid "You took too long with the captcha or your response was incorrect."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:87
+msgid "Joined party."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:105
+#, c-format
+msgid "%s joined the party."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:123
+#, c-format
+msgid "%s rejected your invite."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:95
+msgid "Accepting incoming trade requests."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:97
+msgid "Ignoring incoming trade requests."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:115 src/net/tmwa/tradehandler.cpp:109
+msgid "Request for Trade"
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:116 src/net/tmwa/tradehandler.cpp:110
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:134
+#, c-format
+msgid "Trading with %s"
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:148 src/net/tmwa/tradehandler.cpp:224
+msgid "Trade canceled."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:155 src/net/tmwa/tradehandler.cpp:231
+msgid "Trade completed."
+msgstr ""
+
+#: src/net/tmwa/adminhandler.cpp:64
 msgid "Kick failed!"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:65
+#: src/net/tmwa/adminhandler.cpp:66
 msgid "Kick succeeded!"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:110
+#: src/net/tmwa/buysellhandler.cpp:109
 msgid "Nothing to sell."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:117
+#: src/net/tmwa/buysellhandler.cpp:116
 msgid "Thanks for buying."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:124
+#: src/net/tmwa/buysellhandler.cpp:123
 msgid "Unable to buy."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:130
+#: src/net/tmwa/buysellhandler.cpp:129
 msgid "Thanks for selling."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:132
+#: src/net/tmwa/buysellhandler.cpp:131
 msgid "Unable to sell."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:103
-msgid "Access denied."
+#: src/net/tmwa/charserverhandler.cpp:103
+msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:106
+#: src/net/tmwa/charserverhandler.cpp:107
 msgid "Cannot use this ID."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:109
-msgid "Unknown failure to select character."
+#: src/net/tmwa/charserverhandler.cpp:110
+msgid "Unknown char-server failure."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:135
+#: src/net/tmwa/charserverhandler.cpp:134
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:147 src/net/manaserv/charhandler.cpp:187
-msgid "Info"
-msgstr ""
-
-#: src/net/ea/charserverhandler.cpp:147
+#: src/net/tmwa/charserverhandler.cpp:146
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:152
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Failed to delete character."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:237 src/net/manaserv/charhandler.cpp:263
+#: src/net/tmwa/charserverhandler.cpp:266
 msgid "Strength:"
 msgstr "Stärke"
 
-#: src/net/ea/charserverhandler.cpp:238 src/net/manaserv/charhandler.cpp:264
+#: src/net/tmwa/charserverhandler.cpp:267
 msgid "Agility:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:239 src/net/manaserv/charhandler.cpp:266
+#: src/net/tmwa/charserverhandler.cpp:268
 msgid "Vitality:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:240 src/net/manaserv/charhandler.cpp:267
+#: src/net/tmwa/charserverhandler.cpp:269
 msgid "Intelligence:"
 msgstr "Intelligenz"
 
-#: src/net/ea/charserverhandler.cpp:241 src/net/manaserv/charhandler.cpp:265
+#: src/net/tmwa/charserverhandler.cpp:270
 msgid "Dexterity:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:242
+#: src/net/tmwa/charserverhandler.cpp:271
 msgid "Luck:"
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:80
-msgid "Whisper could not be sent, user is offline."
+#: src/net/tmwa/chathandler.cpp:87
+#, c-format
+msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:84
-msgid "Whisper could not be sent, ignored by user."
+#: src/net/tmwa/chathandler.cpp:96
+#, c-format
+msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:171
+#: src/net/tmwa/chathandler.cpp:230
 msgid "MVP player."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:204 src/net/ea/chathandler.cpp:210
-#: src/net/ea/chathandler.cpp:215 src/net/ea/chathandler.cpp:220
-#: src/net/ea/chathandler.cpp:225 src/net/ea/chathandler.cpp:230
-#: src/net/ea/chathandler.cpp:235 src/net/ea/chathandler.cpp:240
+#: src/net/tmwa/chathandler.cpp:265 src/net/tmwa/chathandler.cpp:271
+#: src/net/tmwa/chathandler.cpp:276 src/net/tmwa/chathandler.cpp:281
+#: src/net/tmwa/chathandler.cpp:286 src/net/tmwa/chathandler.cpp:291
+#: src/net/tmwa/chathandler.cpp:296 src/net/tmwa/chathandler.cpp:301
 msgid "Channels are not supported!"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:86
+#: src/net/tmwa/gamehandler.cpp:88
 #, c-format
 msgid "Online users: %d"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:100
+#: src/net/tmwa/gamehandler.cpp:101
 #, fuzzy
 msgid "Game"
 msgstr "Name:"
 
-#: src/net/ea/gamehandler.cpp:100
+#: src/net/tmwa/gamehandler.cpp:101
 msgid "Request to quit denied!"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:102 src/net/manaserv/generalhandler.cpp:95
+#: src/net/tmwa/generalhandler.cpp:102
 #, c-format
 msgid "Strength %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:103 src/net/manaserv/generalhandler.cpp:96
+#: src/net/tmwa/generalhandler.cpp:103
 #, c-format
 msgid "Agility %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:104 src/net/manaserv/generalhandler.cpp:98
+#: src/net/tmwa/generalhandler.cpp:104
 #, c-format
 msgid "Vitality %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:105 src/net/manaserv/generalhandler.cpp:99
+#: src/net/tmwa/generalhandler.cpp:105
 #, c-format
 msgid "Intelligence %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:106 src/net/manaserv/generalhandler.cpp:97
+#: src/net/tmwa/generalhandler.cpp:106
 #, c-format
 msgid "Dexterity %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:107
+#: src/net/tmwa/generalhandler.cpp:107
 #, c-format
 msgid "Luck %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:130
+#: src/net/tmwa/generalhandler.cpp:132
 msgid "Authentication failed."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:133
+#: src/net/tmwa/generalhandler.cpp:135
 msgid "No servers available."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:137
+#: src/net/tmwa/generalhandler.cpp:139
 msgid "Someone else is trying to use this account."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:140
+#: src/net/tmwa/generalhandler.cpp:142
 msgid "This account is already logged in."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:143
+#: src/net/tmwa/generalhandler.cpp:145
 msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:146
+#: src/net/tmwa/generalhandler.cpp:148
 msgid "Duplicated login."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:149
+#: src/net/tmwa/generalhandler.cpp:151
 msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:205
+#: src/net/tmwa/generalhandler.cpp:209
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:216 src/net/manaserv/generalhandler.cpp:166
+#: src/net/tmwa/generalhandler.cpp:230
 msgid "Strength"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:217 src/net/manaserv/generalhandler.cpp:167
+#: src/net/tmwa/generalhandler.cpp:231
 msgid "Agility"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:218 src/net/manaserv/generalhandler.cpp:169
+#: src/net/tmwa/generalhandler.cpp:232
 msgid "Vitality"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:219 src/net/manaserv/generalhandler.cpp:170
+#: src/net/tmwa/generalhandler.cpp:233
 msgid "Intelligence"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:220 src/net/manaserv/generalhandler.cpp:168
+#: src/net/tmwa/generalhandler.cpp:234
 msgid "Dexterity"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:221
+#: src/net/tmwa/generalhandler.cpp:235
 msgid "Luck"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:224
+#: src/net/tmwa/generalhandler.cpp:238
 #, fuzzy
 msgid "Defense"
 msgstr "Löschen"
 
-#: src/net/ea/generalhandler.cpp:225
+#: src/net/tmwa/generalhandler.cpp:239
 msgid "M.Attack"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:226
+#: src/net/tmwa/generalhandler.cpp:240
 msgid "M.Defense"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:227
+#: src/net/tmwa/generalhandler.cpp:241
 #, c-format
 msgid "% Accuracy"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:228
+#: src/net/tmwa/generalhandler.cpp:242
 #, c-format
 msgid "% Evade"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:229
+#: src/net/tmwa/generalhandler.cpp:243
 #, c-format
 msgid "% Critical"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:61 src/net/ea/gui/partytab.cpp:59
+#: src/net/tmwa/gui/guildtab.cpp:45
+msgid "Guild"
+msgstr ""
+
+#: src/net/tmwa/gui/guildtab.cpp:61 src/net/tmwa/gui/partytab.cpp:59
 msgid "/help > Display this help."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:62
+#: src/net/tmwa/gui/guildtab.cpp:62
 msgid "/invite > Invite a player to your guild"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:63
+#: src/net/tmwa/gui/guildtab.cpp:63
 msgid "/leave > Leave the guild you are in"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:64
+#: src/net/tmwa/gui/guildtab.cpp:64
 msgid "/kick > Kick some one from the guild you are in"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:73 src/net/ea/gui/partytab.cpp:73
+#: src/net/tmwa/gui/guildtab.cpp:73 src/net/tmwa/gui/partytab.cpp:73
 msgid "Command: /invite <nick>"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:74
+#: src/net/tmwa/gui/guildtab.cpp:74
 msgid "This command invites <nick> to the guild you're in."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:80 src/net/ea/gui/partytab.cpp:80
+#: src/net/tmwa/gui/guildtab.cpp:80 src/net/tmwa/gui/partytab.cpp:80
 msgid "Command: /leave"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:81
+#: src/net/tmwa/gui/guildtab.cpp:81
 msgid "This command causes the player to leave the guild."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:89
+#: src/net/tmwa/gui/guildtab.cpp:89
 msgid "Guild name is missing."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:293
+#: src/net/tmwa/guildhandler.cpp:296
 msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:298
+#: src/net/tmwa/guildhandler.cpp:301
 msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:303
+#: src/net/tmwa/guildhandler.cpp:306
 msgid "User is now part of your guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:308
+#: src/net/tmwa/guildhandler.cpp:311
 msgid "Your guild is full."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:313
+#: src/net/tmwa/guildhandler.cpp:316
 msgid "Unknown guild invite response."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:390
+#: src/net/tmwa/guildhandler.cpp:393
 msgid "Guild creation isn't supported yet."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:60
+#: src/net/tmwa/gui/partytab.cpp:43
+msgid "Party"
+msgstr ""
+
+#: src/net/tmwa/gui/partytab.cpp:60
 msgid "/invite > Invite a player to your party"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:61
+#: src/net/tmwa/gui/partytab.cpp:61
 msgid "/leave > Leave the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:62
+#: src/net/tmwa/gui/partytab.cpp:62
 msgid "/kick > Kick some one from the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:63
+#: src/net/tmwa/gui/partytab.cpp:63
 msgid "/item > Show/change party item sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:64
+#: src/net/tmwa/gui/partytab.cpp:64
 msgid "/exp > Show/change party experience sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:81
+#: src/net/tmwa/gui/partytab.cpp:81
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:85
+#: src/net/tmwa/gui/partytab.cpp:85
 msgid "Command: /item <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:86
+#: src/net/tmwa/gui/partytab.cpp:86
 msgid "This command changes the party's item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:87
+#: src/net/tmwa/gui/partytab.cpp:87
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:90
+#: src/net/tmwa/gui/partytab.cpp:90
 msgid "Command: /item"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/tmwa/gui/partytab.cpp:91
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/tmwa/gui/partytab.cpp:95
 msgid "Command: /exp <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:96
+#: src/net/tmwa/gui/partytab.cpp:96
 msgid "This command changes the party's experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/tmwa/gui/partytab.cpp:97
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:100
+#: src/net/tmwa/gui/partytab.cpp:100
 msgid "Command: /exp"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/tmwa/gui/partytab.cpp:101
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:132 src/net/ea/partyhandler.cpp:198
+#: src/net/tmwa/gui/partytab.cpp:132 src/net/tmwa/partyhandler.cpp:196
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:135 src/net/ea/partyhandler.cpp:204
+#: src/net/tmwa/gui/partytab.cpp:135 src/net/tmwa/partyhandler.cpp:202
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:138 src/net/ea/partyhandler.cpp:210
+#: src/net/tmwa/gui/partytab.cpp:138 src/net/tmwa/partyhandler.cpp:208
 msgid "Item sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:141
+#: src/net/tmwa/gui/partytab.cpp:141
 msgid "Item sharing unknown."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:167 src/net/ea/partyhandler.cpp:174
+#: src/net/tmwa/gui/partytab.cpp:167 src/net/tmwa/partyhandler.cpp:172
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:170 src/net/ea/partyhandler.cpp:180
+#: src/net/tmwa/gui/partytab.cpp:170 src/net/tmwa/partyhandler.cpp:178
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:173 src/net/ea/partyhandler.cpp:186
+#: src/net/tmwa/gui/partytab.cpp:173 src/net/tmwa/partyhandler.cpp:184
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:176
+#: src/net/tmwa/gui/partytab.cpp:176
 msgid "Experience sharing unknown."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:281
+#: src/net/tmwa/inventoryhandler.cpp:285
 msgid "Failed to use item."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:391
+#: src/net/tmwa/inventoryhandler.cpp:399
 msgid "Unable to equip."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:402
+#: src/net/tmwa/inventoryhandler.cpp:410
 msgid "Unable to unequip."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:79
+#: src/net/tmwa/loginhandler.cpp:86
 msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:82 src/net/manaserv/loginhandler.cpp:121
-msgid "Old password incorrect."
-msgstr ""
-
-#: src/net/ea/loginhandler.cpp:85
+#: src/net/tmwa/loginhandler.cpp:92
 msgid "New password too short."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:88 src/net/ea/loginhandler.cpp:175
-#: src/net/manaserv/charhandler.cpp:158 src/net/manaserv/loginhandler.cpp:96
-#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
-#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
-msgid "Unknown error."
-msgstr ""
-
-#: src/net/ea/loginhandler.cpp:149
+#: src/net/tmwa/loginhandler.cpp:156
 msgid "Unregistered ID."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:152
+#: src/net/tmwa/loginhandler.cpp:159
 #, fuzzy
 msgid "Wrong password."
 msgstr "Passwort ändern"
 
-#: src/net/ea/loginhandler.cpp:155
+#: src/net/tmwa/loginhandler.cpp:162
 msgid "Account expired."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:158
+#: src/net/tmwa/loginhandler.cpp:165
 msgid "Rejected from server."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:161
+#: src/net/tmwa/loginhandler.cpp:168
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:165
+#: src/net/tmwa/loginhandler.cpp:172
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:172
+#: src/net/tmwa/loginhandler.cpp:179
 msgid "This user name is already taken."
 msgstr ""
 
-#: src/net/ea/network.cpp:145
+#: src/net/tmwa/network.cpp:145
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/ea/network.cpp:345
+#: src/net/tmwa/network.cpp:345
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/ea/network.cpp:414
+#: src/net/tmwa/network.cpp:414
 msgid "Connection to server terminated. "
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:81
+#: src/net/tmwa/partyhandler.cpp:82
 msgid "Could not create party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:84
+#: src/net/tmwa/partyhandler.cpp:84
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:118
+#: src/net/tmwa/partyhandler.cpp:119
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:122
+#: src/net/tmwa/partyhandler.cpp:123
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:126
+#: src/net/tmwa/partyhandler.cpp:127
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:130
+#: src/net/tmwa/partyhandler.cpp:131
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:238
+#: src/net/tmwa/partyhandler.cpp:236
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:249
+#: src/net/tmwa/partyhandler.cpp:246
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:301
+#: src/net/tmwa/partyhandler.cpp:299
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:329
-msgid "Inviting like this isn't supported at the moment."
+#: src/net/tmwa/partyhandler.cpp:335
+#, c-format
+msgid "Inviting failed, because you can't see a player called %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:334
+#: src/net/tmwa/partyhandler.cpp:340
 msgid "You can only inivte when you are in a party!"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:365
+#: src/net/tmwa/partyhandler.cpp:368
 #, c-format
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:304
-msgid "You are dead."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:305
-msgid "We regret to inform you that your character was killed in battle."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:307
-msgid "You are not that alive anymore."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:308
-msgid "The cold hands of the grim reaper are grabbing for your soul."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:309
-msgid "Game Over!"
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:105
+#: src/net/tmwa/playerhandler.cpp:100
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:310
-msgid ""
-"No, kids. Your character did not really die. It... err... went to a better "
-"place."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:312
-msgid ""
-"Your plan of breaking your enemies weapon by bashing it with your throat "
-"failed."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:314
-msgid "I guess this did not run too well."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:315
-msgid "Do you want your possessions identified?"
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:316
-msgid "Sadly, no trace of you was ever found..."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:317
-msgid "Annihilated."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:318
-msgid "Looks like you got your head handed to you."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:120 src/net/manaserv/beinghandler.cpp:319
-msgid ""
-"You screwed up again, dump your body down the tubes and get you another one."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/tmwa/playerhandler.cpp:118
 msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/tmwa/playerhandler.cpp:119
 msgid "You are no more."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/tmwa/playerhandler.cpp:120
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/tmwa/playerhandler.cpp:121
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/tmwa/playerhandler.cpp:122
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/tmwa/playerhandler.cpp:123
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/tmwa/playerhandler.cpp:124
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:130
+#: src/net/tmwa/playerhandler.cpp:125
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:131
+#: src/net/tmwa/playerhandler.cpp:126
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/tmwa/playerhandler.cpp:127
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/tmwa/playerhandler.cpp:128
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:135
+#: src/net/tmwa/playerhandler.cpp:130
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:136
+#: src/net/tmwa/playerhandler.cpp:131
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:249 src/net/ea/playerhandler.cpp:310
+#: src/net/tmwa/playerhandler.cpp:246 src/net/tmwa/playerhandler.cpp:285
 msgid "Message"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:250
+#: src/net/tmwa/playerhandler.cpp:247
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:333
+#: src/net/tmwa/playerhandler.cpp:313
 #, c-format
 msgid "You picked up %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:369
+#: src/net/tmwa/playerhandler.cpp:348
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:532
+#: src/net/tmwa/playerhandler.cpp:488
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:147
+#: src/net/tmwa/specialhandler.cpp:144
 msgid "Trade failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:150
+#: src/net/tmwa/specialhandler.cpp:147
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:153
+#: src/net/tmwa/specialhandler.cpp:150
 msgid "Sit failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:156
+#: src/net/tmwa/specialhandler.cpp:153
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:159
+#: src/net/tmwa/specialhandler.cpp:156
 msgid "Could not join party!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:162
+#: src/net/tmwa/specialhandler.cpp:159
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:171
+#: src/net/tmwa/specialhandler.cpp:168
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:174
+#: src/net/tmwa/specialhandler.cpp:171
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:177
+#: src/net/tmwa/specialhandler.cpp:174
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:180
+#: src/net/tmwa/specialhandler.cpp:177
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:183
+#: src/net/tmwa/specialhandler.cpp:180
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:186
+#: src/net/tmwa/specialhandler.cpp:183
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:189
+#: src/net/tmwa/specialhandler.cpp:186
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:192
+#: src/net/tmwa/specialhandler.cpp:189
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:195
+#: src/net/tmwa/specialhandler.cpp:192
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:198
+#: src/net/tmwa/specialhandler.cpp:195
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:201
+#: src/net/tmwa/specialhandler.cpp:198
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:210
+#: src/net/tmwa/specialhandler.cpp:207
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:213
+#: src/net/tmwa/specialhandler.cpp:210
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:216
+#: src/net/tmwa/specialhandler.cpp:213
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:116
-msgid "Request for Trade"
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:108 src/net/manaserv/tradehandler.cpp:117
-#, c-format
-msgid "%s wants to trade with you, do you accept?"
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:124
+#: src/net/tmwa/tradehandler.cpp:126
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:128
+#: src/net/tmwa/tradehandler.cpp:130
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:132
+#: src/net/tmwa/tradehandler.cpp:134
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:137
+#: src/net/tmwa/tradehandler.cpp:139
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:144
+#: src/net/tmwa/tradehandler.cpp:146
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:153
+#: src/net/tmwa/tradehandler.cpp:154
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:202
+#: src/net/tmwa/tradehandler.cpp:202
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:207
+#: src/net/tmwa/tradehandler.cpp:207
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:211
+#: src/net/tmwa/tradehandler.cpp:211
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:224 src/net/manaserv/tradehandler.cpp:149
-msgid "Trade canceled."
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:231 src/net/manaserv/tradehandler.cpp:156
-msgid "Trade completed."
-msgstr ""
-
-#: src/net/manaserv/beinghandler.cpp:324
-msgid "Press OK to respawn."
-msgstr ""
-
-#: src/net/manaserv/beinghandler.cpp:325
-#, fuzzy
-msgid "You Died"
-msgstr "Du gibst:"
-
-#: src/net/manaserv/charhandler.cpp:128 src/net/manaserv/charhandler.cpp:196
-msgid "Not logged in."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:131
-msgid "No empty slot."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:134
-msgid "Invalid name."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:137
-msgid "Character's name already exists."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:140
-msgid "Invalid hairstyle."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:143
-msgid "Invalid hair color."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:146
-msgid "Invalid gender."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:149
-msgid "Character's stats are too high."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:152
-msgid "Character's stats are too low."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:155
-msgid "One stat is zero."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:187
-msgid "Player deleted."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:199
-msgid "Selection out of range."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:202
-#, c-format
-msgid "Unknown error (%d)."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:242
-msgid "No gameservers are available."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:268
-msgid "Willpower:"
-msgstr "Willenskraft"
-
-#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
-#: src/net/manaserv/guildhandler.cpp:259
-#, c-format
-msgid "Topic: %s"
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
-msgid "Players in this channel:"
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:201
-msgid "Error joining channel."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:207
-msgid "Listing channels."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:219
-msgid "End of channel list."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:291
-#, c-format
-msgid "%s entered the channel."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:296
-#, c-format
-msgid "%s left the channel."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:312
-#, c-format
-msgid "%s has set mode %s on user %s."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:322
-#, c-format
-msgid "%s has kicked %s."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:327
-msgid "Unknown channel event."
-msgstr ""
-
-#: src/net/manaserv/generalhandler.cpp:100
-#, c-format
-msgid "Willpower %+d"
-msgstr ""
-
-#: src/net/manaserv/generalhandler.cpp:171
-#, fuzzy
-msgid "Willpower"
-msgstr "Willenskraft"
-
-#: src/net/manaserv/guildhandler.cpp:81
-msgid "Guild created."
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:86
-msgid "Error creating guild."
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:96
-msgid "Invite sent."
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:203
-msgid "Member was promoted successfully."
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:208
-msgid "Failed to promote member."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:87
-msgid "Wrong magic_token."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
-msgid "Already logged in."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:93 src/net/manaserv/loginhandler.cpp:272
-msgid "Server is full."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:118
-msgid "New password incorrect."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
-msgid "Account not connected. Please login first."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:149
-msgid "New email address incorrect."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:152
-msgid "Old email address incorrect."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:158
-msgid "The new email address already exists."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:239
-msgid ""
-"Client registration is not allowed. Please contact server administration."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
-msgid "Client version is too old."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:266
-msgid "Wrong username or password."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:275
-msgid "Login attempt too soon after previous attempt."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:303
-msgid "Wrong username, password or email address."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:306
-msgid "Username already exists."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:309
-msgid "Email address already exists."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:312
-msgid "You took too long with the captcha or your response was incorrect."
-msgstr ""
-
-#: src/net/manaserv/partyhandler.cpp:88
-msgid "Joined party."
-msgstr ""
-
-#: src/net/manaserv/partyhandler.cpp:106
-#, c-format
-msgid "%s joined the party."
-msgstr ""
-
-#: src/net/manaserv/partyhandler.cpp:123
-#, c-format
-msgid "%s rejected your invite."
-msgstr ""
-
-#: src/net/manaserv/tradehandler.cpp:96
-msgid "Accepting incoming trade requests."
-msgstr ""
-
-#: src/net/manaserv/tradehandler.cpp:98
-msgid "Ignoring incoming trade requests."
-msgstr ""
-
-#: src/net/manaserv/tradehandler.cpp:135
-#, c-format
-msgid "Trading with %s"
-msgstr ""
-
-#: src/playerrelations.cpp:304
+#: src/playerrelations.cpp:310
 msgid "Completely ignore"
 msgstr ""
 
-#: src/playerrelations.cpp:318
+#: src/playerrelations.cpp:324
 msgid "Print '...'"
 msgstr ""
 
-#: src/playerrelations.cpp:334
+#: src/playerrelations.cpp:340
 msgid "Blink name"
 msgstr ""
 
-#: src/playerrelations.cpp:371
-msgid "Floating '...' bubble"
-msgstr ""
-
-#: src/playerrelations.cpp:374
-msgid "Floating bubble"
-msgstr ""
-
-#: src/resources/itemdb.cpp:52
+#: src/resources/itemdb.cpp:44
 #, c-format
 msgid "Attack %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:53
+#: src/resources/itemdb.cpp:45
 #, c-format
 msgid "Defense %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:54
+#: src/resources/itemdb.cpp:46
 #, c-format
 msgid "HP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:55
+#: src/resources/itemdb.cpp:47
 #, c-format
 msgid "MP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:114
+#: src/resources/itemdb.cpp:92
 msgid "Unknown item"
 msgstr ""
 
-#: src/resources/itemdb.cpp:158 src/resources/monsterdb.cpp:45
-#: src/resources/monsterdb.cpp:67
+#: src/resources/itemdb.cpp:135 src/resources/monsterdb.cpp:77
 msgid "unnamed"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Money"
+#~ msgstr "Geld: %d"
+
+#, fuzzy
+#~ msgid "Level"
+#~ msgstr "Level: %d"
+
+#~ msgid "Willpower:"
+#~ msgstr "Willenskraft"
+
+#, fuzzy
+#~ msgid "Willpower"
+#~ msgstr "Willenskraft"
+
 #~ msgid "Description: %s"
 #~ msgstr "Beschreibung: %s"
 
diff --git a/po/nl.po b/po/nl.po
index 20c50b36..82c2ca42 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Mana World 0.1.0\n"
 "Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2010-03-16 22:27+0100\n"
+"POT-Creation-Date: 2010-12-13 20:04+0100\n"
 "PO-Revision-Date: 2009-07-15 12:21+0000\n"
 "Last-Translator: Yentl <y.v.t@scarlet.be>\n"
 "Language-Team: Dutch\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,320 +19,326 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/client.cpp:555 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
+#: src/client.cpp:598 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
 msgid "Setup"
 msgstr "Configureren"
 
-#: src/client.cpp:625
+#: src/client.cpp:679
 #, fuzzy
 msgid "Connecting to server"
 msgstr "Verbinden met de map server..."
 
-#: src/client.cpp:652
+#: src/client.cpp:706
 #, fuzzy
 msgid "Logging in"
 msgstr "Inloggen"
 
-#: src/client.cpp:685
+#: src/client.cpp:739
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:741
+#: src/client.cpp:804
 #, fuzzy
 msgid "Requesting characters"
 msgstr "Kies Personage"
 
-#: src/client.cpp:770
+#: src/client.cpp:833
 #, fuzzy
 msgid "Connecting to the game server"
 msgstr "Verbinden met de map server..."
 
-#: src/client.cpp:801 src/client.cpp:808 src/client.cpp:942
+#: src/client.cpp:843
+#, fuzzy
+msgid "Changing game servers"
+msgstr "Server"
+
+#: src/client.cpp:872 src/client.cpp:879 src/client.cpp:1014
 #: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
 #: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
-#: src/gui/serverdialog.cpp:241 src/gui/unregisterdialog.cpp:133
-#: src/net/ea/charserverhandler.cpp:135 src/net/ea/charserverhandler.cpp:152
-#: src/net/manaserv/charhandler.cpp:161 src/net/manaserv/charhandler.cpp:204
+#: src/gui/serverdialog.cpp:323 src/gui/unregisterdialog.cpp:133
+#: src/net/manaserv/charhandler.cpp:174 src/net/manaserv/charhandler.cpp:217
+#: src/net/tmwa/charserverhandler.cpp:134
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Error"
 msgstr "Fout"
 
-#: src/client.cpp:817
+#: src/client.cpp:888
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:844
+#: src/client.cpp:915
 #, fuzzy
 msgid "Password Change"
 msgstr "Wachtwoord:"
 
-#: src/client.cpp:845
+#: src/client.cpp:916
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:864
+#: src/client.cpp:935
 #, fuzzy
 msgid "Email Change"
 msgstr "Veranderen"
 
-#: src/client.cpp:865
+#: src/client.cpp:936
 #, fuzzy
 msgid "Email changed successfully!"
 msgstr "Lid is succesvol gepromoveerd."
 
-#: src/client.cpp:885
+#: src/client.cpp:956
 #, fuzzy
 msgid "Unregister Successful"
 msgstr "Registreren"
 
-#: src/client.cpp:886
+#: src/client.cpp:957
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1009 src/client.cpp:1032
+#: src/client.cpp:1138 src/client.cpp:1161
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1121
+#: src/client.cpp:1281
 #, fuzzy, c-format
 msgid "Invalid update host: %s"
 msgstr "Ongeldige updatahost: "
 
-#: src/client.cpp:1155 src/client.cpp:1161
+#: src/client.cpp:1315 src/client.cpp:1321
 msgid "Error creating updates directory!"
 msgstr "Fout bij het creëren van de update map!"
 
-#: src/commandhandler.cpp:127 src/commandhandler.cpp:308
+#: src/commandhandler.cpp:131 src/commandhandler.cpp:317
 msgid "Unknown command."
 msgstr "Onbekend commando."
 
-#: src/commandhandler.cpp:156
+#: src/commandhandler.cpp:160
 msgid "-- Help --"
 msgstr "-- Help --"
 
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:161
 msgid "/help > Display this help"
 msgstr "/help > Deze help weergeven"
 
-#: src/commandhandler.cpp:159
+#: src/commandhandler.cpp:163
 msgid "/where > Display map name"
 msgstr "/where > Mapnaam weergeven"
 
-#: src/commandhandler.cpp:160
+#: src/commandhandler.cpp:164
 msgid "/who > Display number of online users"
 msgstr "/who > Aantal online gebruikers weergeven"
 
-#: src/commandhandler.cpp:161
+#: src/commandhandler.cpp:165
 msgid "/me > Tell something about yourself"
 msgstr "/me > Vertel iets over jezelf"
 
-#: src/commandhandler.cpp:163
+#: src/commandhandler.cpp:167
 msgid "/clear > Clears this window"
 msgstr "/clear > Maak dit venster leeg"
 
-#: src/commandhandler.cpp:165
+#: src/commandhandler.cpp:169
 msgid "/msg > Send a private message to a user"
 msgstr "/msg > Zend een privébericht naar een gebruiker"
 
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:170
 msgid "/whisper > Alias of msg"
 msgstr "/whisper > zelfde functie als msg"
 
-#: src/commandhandler.cpp:167
+#: src/commandhandler.cpp:171
 msgid "/w > Alias of msg"
 msgstr "/w > zelfde als msg"
 
-#: src/commandhandler.cpp:168
+#: src/commandhandler.cpp:172
 msgid "/query > Makes a tab for private messages with another user"
 msgstr "/query > Maakt een tabblad voor privéberichten met andere gebruikers"
 
-#: src/commandhandler.cpp:169
+#: src/commandhandler.cpp:174
 msgid "/q > Alias of query"
 msgstr "/q > zelfde functie als query"
 
-#: src/commandhandler.cpp:171
+#: src/commandhandler.cpp:176
 msgid "/ignore > ignore a player"
 msgstr ""
 
-#: src/commandhandler.cpp:172
+#: src/commandhandler.cpp:177
 msgid "/unignore > stop ignoring a player"
 msgstr ""
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:179
 msgid "/list > Display all public channels"
 msgstr "/list > Alle publieke kanalen weergeven"
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:180
 msgid "/join > Join or create a channel"
 msgstr "/join > Een kanaal creëren of bij aansluiten"
 
-#: src/commandhandler.cpp:177
+#: src/commandhandler.cpp:182
 #, fuzzy
 msgid "/createparty > Create a new party"
 msgstr "/create > Creëer een nieuwe groep"
 
-#: src/commandhandler.cpp:178
+#: src/commandhandler.cpp:183
 msgid "/party > Invite a user to party"
 msgstr "/party > Een gebruiker uitnodigen in de groep"
 
-#: src/commandhandler.cpp:180
+#: src/commandhandler.cpp:185
 msgid "/record > Start recording the chat to an external file"
 msgstr "/record > De chat beginnen opnemen naar een extern bestand"
 
-#: src/commandhandler.cpp:181
+#: src/commandhandler.cpp:187
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr "/toggle > Bepalen of <return> de chatlog wisselt"
 
-#: src/commandhandler.cpp:182
+#: src/commandhandler.cpp:189
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
 "/present > Lijst weergeven met alle aanwezige spelers (opgeslagen in "
 "chatlog, als logging aanstaat)"
 
-#: src/commandhandler.cpp:184
+#: src/commandhandler.cpp:192
 msgid "/announce > Global announcement (GM only)"
 msgstr "/announce > Globale aankondiging (enkel GM)"
 
-#: src/commandhandler.cpp:188
+#: src/commandhandler.cpp:196
 msgid "For more information, type /help <command>."
 msgstr "Voor meer informatie, typ /help <commando>."
 
-#: src/commandhandler.cpp:192
+#: src/commandhandler.cpp:200
 msgid "Command: /help"
 msgstr "Commando: /help"
 
-#: src/commandhandler.cpp:193
+#: src/commandhandler.cpp:201
 msgid "This command displays a list of all commands available."
 msgstr "Dit commando geeft een lijst weer van alle mogelijke commando's"
 
-#: src/commandhandler.cpp:194
+#: src/commandhandler.cpp:203
 msgid "Command: /help <command>"
 msgstr "Commando: /help <commando>"
 
-#: src/commandhandler.cpp:195
+#: src/commandhandler.cpp:204
 msgid "This command displays help on <command>."
 msgstr "Dit commando geeft help weer van <commando>"
 
-#: src/commandhandler.cpp:203
+#: src/commandhandler.cpp:212
 msgid "Command: /announce <msg>"
 msgstr "Commando: /announce <msg>"
 
-#: src/commandhandler.cpp:204
+#: src/commandhandler.cpp:213
 msgid "*** only available to a GM ***"
 msgstr "*** enkel mogelijk door een GM ***"
 
-#: src/commandhandler.cpp:205
+#: src/commandhandler.cpp:214
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 "Dit commando stuurt het bericht <msg> naar alle spelers momenteel online."
 
-#: src/commandhandler.cpp:210
+#: src/commandhandler.cpp:219
 msgid "Command: /clear"
 msgstr "Commando: /clear"
 
-#: src/commandhandler.cpp:211
+#: src/commandhandler.cpp:220
 msgid "This command clears the chat log of previous chat."
 msgstr "Dit commando maakt de chatlog van vorige chatsessies leeg"
 
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:224
 #, fuzzy
 msgid "Command: /ignore <player>"
 msgstr "Commando: /item <beleid>"
 
-#: src/commandhandler.cpp:216
+#: src/commandhandler.cpp:225
 #, fuzzy
 msgid "This command ignores the given player regardless of current relations."
 msgstr "Dit commando geeft het aantal spelers dat momenteel online is weer."
 
-#: src/commandhandler.cpp:221
+#: src/commandhandler.cpp:230
 msgid "Command: /join <channel>"
 msgstr "Commando: /join <kanaal>"
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:231
 msgid "This command makes you enter <channel>."
 msgstr "Dit commando voegt je toe op kanaal <kanaal>."
 
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:232
 msgid "If <channel> doesn't exist, it's created."
 msgstr "Als <kanaal> niet bestaat, wordt het aangemaakt."
 
-#: src/commandhandler.cpp:227
+#: src/commandhandler.cpp:236
 msgid "Command: /list"
 msgstr "Commando: /list"
 
-#: src/commandhandler.cpp:228
+#: src/commandhandler.cpp:237
 msgid "This command shows a list of all channels."
 msgstr "Dit commando geeft een lijst weer van alle kanalen."
 
-#: src/commandhandler.cpp:232
+#: src/commandhandler.cpp:241
 msgid "Command: /me <message>"
 msgstr "Commando /me <bericht>"
 
-#: src/commandhandler.cpp:233
+#: src/commandhandler.cpp:242
 msgid "This command tell others you are (doing) <msg>."
 msgstr "Dit commando vertelt anderen dat je <msg> bent/doet."
 
-#: src/commandhandler.cpp:237
+#: src/commandhandler.cpp:246
 msgid "Command: /msg <nick> <message>"
 msgstr "Commando: /msg <nick> <bericht>"
 
-#: src/commandhandler.cpp:238
+#: src/commandhandler.cpp:247
 msgid "Command: /whisper <nick> <message>"
 msgstr "Commando: /msg <nick> <bericht>"
 
-#: src/commandhandler.cpp:239
+#: src/commandhandler.cpp:248
 msgid "Command: /w <nick> <message>"
 msgstr "Commando: /w <nick> <bericht>"
 
-#: src/commandhandler.cpp:240
+#: src/commandhandler.cpp:249
 msgid "This command sends the text <message> to <nick>."
 msgstr "Dit commando zendt de tekst <bericht> aan <nick>."
 
-#: src/commandhandler.cpp:241 src/commandhandler.cpp:260
+#: src/commandhandler.cpp:250 src/commandhandler.cpp:269
 #: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
-#: src/net/ea/gui/guildtab.cpp:75 src/net/ea/gui/partytab.cpp:75
+#: src/net/tmwa/gui/guildtab.cpp:75 src/net/tmwa/gui/partytab.cpp:75
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 "Als de <nick> spaties bevat, omsluit het dan met dubbele aanhalingstekens "
 "(\")."
 
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:255
 msgid "Command: /query <nick>"
 msgstr "Commando: /query <nick>"
 
-#: src/commandhandler.cpp:247
+#: src/commandhandler.cpp:256
 msgid "Command: /q <nick>"
 msgstr "Commando: /q <nick>"
 
-#: src/commandhandler.cpp:248
+#: src/commandhandler.cpp:257
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
 "Dit commando probeert een tabblad aan te maken voor alle whispers tussen jou "
 "en <nick>"
 
-#: src/commandhandler.cpp:253
+#: src/commandhandler.cpp:262
 #, fuzzy
 msgid "Command: /createparty <name>"
 msgstr "Commando: /create <groepsnaam>"
 
-#: src/commandhandler.cpp:254
+#: src/commandhandler.cpp:263
 #, fuzzy
 msgid "This command creates a new party called <name>."
 msgstr "Dit commando creëert een nieuwe groep genaamd <groepsnaam>"
 
-#: src/commandhandler.cpp:258
+#: src/commandhandler.cpp:267
 msgid "Command: /party <nick>"
 msgstr "Commando: /party <nick>"
 
-#: src/commandhandler.cpp:259 src/net/ea/gui/partytab.cpp:74
+#: src/commandhandler.cpp:268 src/net/tmwa/gui/partytab.cpp:74
 msgid "This command invites <nick> to party with you."
 msgstr "Dit commando nodigt <nick> uit om een groep te vormen met jou."
 
-#: src/commandhandler.cpp:265
+#: src/commandhandler.cpp:274
 msgid "Command: /present"
 msgstr "Commando: /present"
 
-#: src/commandhandler.cpp:266
+#: src/commandhandler.cpp:275
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
@@ -339,142 +346,150 @@ msgstr ""
 "Dit commando haalt een lijst op van spelers die je kunnen horen en zendt dit "
 "naar ofwel het logboek als dit opgeslagen wordt, of anders naar de chatlog."
 
-#: src/commandhandler.cpp:272
+#: src/commandhandler.cpp:281
 msgid "Command: /record <filename>"
 msgstr "Commando: /record <bestandsnaam>"
 
-#: src/commandhandler.cpp:273
+#: src/commandhandler.cpp:282
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr ""
 "Dit commando begint de chat log op te slaan naar het bestand <bestandsnaam>."
 
-#: src/commandhandler.cpp:275
+#: src/commandhandler.cpp:284
 msgid "Command: /record"
 msgstr "Commando: /record"
 
-#: src/commandhandler.cpp:276
+#: src/commandhandler.cpp:285
 msgid "This command finishes a recording session."
 msgstr "Dit commando beëindigt het opslaan van de chatlog."
 
-#: src/commandhandler.cpp:280
+#: src/commandhandler.cpp:289
 msgid "Command: /toggle <state>"
 msgstr "Commando: /toggle <status>"
 
-#: src/commandhandler.cpp:281
+#: src/commandhandler.cpp:290
 msgid ""
 "This command sets whether the return key should toggle the chat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: src/commandhandler.cpp:283
+#: src/commandhandler.cpp:292
 msgid ""
-"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
-"\", \"no\", \"false\" to turn the toggle off."
+"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
+"\"0\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 "<status> kan \"1\", \"yes\", \"true\" zijn om het in te schakelen, of \"0\", "
 "\"no\", \"false\" om het uit te schakelen."
 
-#: src/commandhandler.cpp:286
+#: src/commandhandler.cpp:295
 msgid "Command: /toggle"
 msgstr "Commando: /toggle"
 
-#: src/commandhandler.cpp:287
+#: src/commandhandler.cpp:296
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: src/commandhandler.cpp:291 src/gui/widgets/whispertab.cpp:93
+#: src/commandhandler.cpp:300 src/gui/widgets/whispertab.cpp:95
 #, fuzzy
 msgid "Command: /unignore <player>"
 msgstr "Commando: /item <beleid>"
 
-#: src/commandhandler.cpp:292
+#: src/commandhandler.cpp:301
 msgid "This command stops ignoring the given player if they are being ignored"
 msgstr ""
 
-#: src/commandhandler.cpp:297
+#: src/commandhandler.cpp:306
 msgid "Command: /where"
 msgstr "Commando: /where"
 
-#: src/commandhandler.cpp:298
+#: src/commandhandler.cpp:307
 msgid "This command displays the name of the current map."
 msgstr "Dit commando geeft de naam weer van de huidige map."
 
-#: src/commandhandler.cpp:302
+#: src/commandhandler.cpp:311
 msgid "Command: /who"
 msgstr "Commando: /who"
 
-#: src/commandhandler.cpp:303
+#: src/commandhandler.cpp:312
 msgid "This command displays the number of players currently online."
 msgstr "Dit commando geeft het aantal spelers dat momenteel online is weer."
 
-#: src/commandhandler.cpp:309
+#: src/commandhandler.cpp:318
 msgid "Type /help for a list of commands."
 msgstr "Type /help voor een lijst van commando's."
 
-#: src/commandhandler.cpp:375
+#: src/commandhandler.cpp:384
 msgid "Cannot send empty whispers!"
 msgstr "Kan geen lege berichten sturen!"
 
-#: src/commandhandler.cpp:383
+#: src/commandhandler.cpp:392
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:397
+#: src/commandhandler.cpp:406
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Aanvragen om bij kanaal %s toegevoegd te worden."
 
-#: src/commandhandler.cpp:410 src/net/ea/gui/partytab.cpp:109
+#: src/commandhandler.cpp:419 src/net/tmwa/gui/partytab.cpp:109
 msgid "Party name is missing."
 msgstr "Groepsnaam ontbreekt."
 
-#: src/commandhandler.cpp:423 src/commandhandler.cpp:471
-#: src/commandhandler.cpp:493
+#: src/commandhandler.cpp:432 src/commandhandler.cpp:509
+#: src/commandhandler.cpp:531
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:441
+#: src/commandhandler.cpp:450
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:441
+#: src/commandhandler.cpp:450
 msgid "Message closes chat."
 msgstr "Bericht sluit chat."
 
-#: src/commandhandler.cpp:450
+#: src/commandhandler.cpp:459
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:454
+#: src/commandhandler.cpp:463
 msgid "Message now closes chat."
 msgstr "Bericht sluit nu chat."
 
-#: src/commandhandler.cpp:477
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:489
+msgid "Show IP: On"
+msgstr ""
+
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:485
+msgid "Show IP: Off"
+msgstr ""
+
+#: src/commandhandler.cpp:515
 msgid "Player already ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:484
+#: src/commandhandler.cpp:522
 #, fuzzy
 msgid "Player successfully ignored!"
 msgstr "Groep succesvol aangemaakt."
 
-#: src/commandhandler.cpp:486
+#: src/commandhandler.cpp:524
 #, fuzzy
 msgid "Player could not be ignored!"
 msgstr "Fluisterbericht kon niet verzonden worden, genegeerd door gebruiker."
 
-#: src/commandhandler.cpp:501
+#: src/commandhandler.cpp:539
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:506
+#: src/commandhandler.cpp:544
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:508
+#: src/commandhandler.cpp:546
 #, fuzzy
 msgid "Player could not be unignored!"
 msgstr "Fluisterbericht kon niet verzonden worden, genegeerd door gebruiker."
@@ -489,45 +504,45 @@ msgstr ""
 msgid "General"
 msgstr "Algemeen"
 
-#: src/game.cpp:326
+#: src/game.cpp:342
 #, fuzzy
 msgid "Screenshot saved as "
 msgstr "Screenshot opgeslagen naar ~/"
 
-#: src/game.cpp:331
+#: src/game.cpp:347
 msgid "Saving screenshot failed!"
 msgstr "Opslaan van screenshot mislukt!"
 
-#: src/game.cpp:355
+#: src/game.cpp:378
 #, fuzzy
 msgid "The connection to the server was lost."
 msgstr ""
 "De verbinding met de server is verloren gegaan, het programma zal nu "
 "afsluiten"
 
-#: src/game.cpp:360
+#: src/game.cpp:382
 msgid "Network Error"
 msgstr "Netwerkfout"
 
-#: src/game.cpp:705
+#: src/game.cpp:721
 msgid "Ignoring incoming trade requests"
 msgstr "Inkomende handelsaanvragen negeren"
 
-#: src/game.cpp:712
+#: src/game.cpp:726
 msgid "Accepting incoming trade requests"
 msgstr "Inkomende handelsaanvragen accepteren"
 
-#: src/game.cpp:946
+#: src/game.cpp:954
 #, fuzzy
 msgid "Could Not Load Map"
 msgstr "Kan de map niet laden"
 
-#: src/game.cpp:947
+#: src/game.cpp:955
 #, c-format
 msgid "Error while loading %s"
 msgstr "Fout bij het laden van %s"
 
-#: src/gui/beingpopup.cpp:75
+#: src/gui/beingpopup.cpp:76
 #, fuzzy, c-format
 msgid "Party: %s"
 msgstr "Groep (%s)"
@@ -536,34 +551,34 @@ msgstr "Groep (%s)"
 msgid "Buy"
 msgstr "Kopen"
 
-#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
-#: src/gui/sell.cpp:276
+#: src/gui/buy.cpp:69 src/gui/buy.cpp:261 src/gui/sell.cpp:71
+#: src/gui/sell.cpp:288
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Prijs: %s / Totaal: %s"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:99 src/gui/npcdialog.cpp:100
-#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:404
+#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:112 src/gui/npcdialog.cpp:124
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:463
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:98 src/gui/npcdialog.cpp:101
-#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:416
+#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:111 src/gui/npcdialog.cpp:125
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:475
 msgid "-"
 msgstr ""
 
 #: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
-#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:152
-#: src/keyboardconfig.cpp:103
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:228
+#: src/keyboardconfig.cpp:102
 msgid "Quit"
 msgstr "Afsluiten"
 
-#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:333
-#: src/gui/statuswindow.cpp:403 src/gui/statuswindow.cpp:437
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:384
+#: src/gui/statuswindow.cpp:462 src/gui/statuswindow.cpp:496
 msgid "Max"
 msgstr "Maximum"
 
@@ -577,11 +592,11 @@ msgstr "Verkopen"
 
 #: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
 #: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
-#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:101
-#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:178
-#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:402
+#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:114
+#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:389
 #: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
-#: src/gui/socialwindow.cpp:243 src/gui/textdialog.cpp:39
+#: src/gui/socialwindow.cpp:275 src/gui/textdialog.cpp:40
 #: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr "Annuleren"
@@ -620,7 +635,7 @@ msgstr "Het nieuwe emailadres bestaat al."
 msgid "Change Password"
 msgstr "Wijzig wachtwoord"
 
-#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:53
+#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:55
 #: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
 msgid "Password:"
 msgstr "Wachtwoord:"
@@ -652,19 +667,19 @@ msgstr ""
 msgid "Create Character"
 msgstr "Personage Aanmaken"
 
-#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:52
+#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:54
 #: src/gui/register.cpp:67
 msgid "Name:"
 msgstr "Naam:"
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
 #: src/gui/outfitwindow.cpp:67
 msgid ">"
 msgstr ""
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
 #: src/gui/outfitwindow.cpp:66
@@ -681,8 +696,8 @@ msgstr "Haarkleur:"
 msgid "Hair style:"
 msgstr "Haarstijl:"
 
-#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:397
-#: src/gui/socialwindow.cpp:297
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:392
+#: src/gui/socialwindow.cpp:329
 msgid "Create"
 msgstr "Aanmaken"
 
@@ -738,34 +753,34 @@ msgstr "Registreren"
 msgid "Change Email"
 msgstr "Emailadres wijzigen"
 
-#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:155
-#: src/gui/setup_players.cpp:230
+#: src/gui/charselectdialog.cpp:336 src/gui/serverdialog.cpp:231
+#: src/gui/setup_players.cpp:229
 msgid "Delete"
 msgstr "Verwijderen"
 
-#: src/gui/charselectdialog.cpp:387
+#: src/gui/charselectdialog.cpp:380
 #, fuzzy
 msgid "Choose"
 msgstr "Sluiten"
 
-#: src/gui/charselectdialog.cpp:399 src/gui/charselectdialog.cpp:400
+#: src/gui/charselectdialog.cpp:394 src/gui/charselectdialog.cpp:395
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:77
+#: src/gui/chat.cpp:88
 msgid "Chat"
 msgstr "Chat"
 
-#: src/gui/chat.cpp:287
+#: src/gui/chat.cpp:311
 #, fuzzy, c-format
 msgid "Present: %s; %d players are present."
 msgstr "%d spelers zijn aanwezig."
 
-#: src/gui/chat.cpp:305
+#: src/gui/chat.cpp:329
 msgid "Attendance written to record log."
 msgstr "Aanwezigheid geschreven in logbestand."
 
-#: src/gui/chat.cpp:469
+#: src/gui/chat.cpp:493
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Fluisteren naar %s: %s"
@@ -831,139 +846,170 @@ msgstr "Omgevingseffecten"
 msgid "Equipment"
 msgstr "Uitrusting"
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:78
-#: src/gui/inventorywindow.cpp:80 src/gui/inventorywindow.cpp:291
-#: src/gui/popupmenu.cpp:372
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:89
+#: src/gui/inventorywindow.cpp:337 src/gui/popupmenu.cpp:359
 msgid "Unequip"
 msgstr "Afdoen"
 
-#: src/gui/help.cpp:36
+#: src/gui/help.cpp:37
 msgid "Help"
 msgstr "Help"
 
-#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:74
+#: src/gui/help.cpp:51 src/gui/npcdialog.cpp:50
 msgid "Close"
 msgstr "Sluiten"
 
-#: src/gui/inventorywindow.cpp:57 src/gui/windowmenu.cpp:56
+#: src/gui/inventorywindow.cpp:59 src/gui/windowmenu.cpp:56
 msgid "Inventory"
 msgstr "Inventaris"
 
-#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:75
-#: src/gui/inventorywindow.cpp:293 src/gui/popupmenu.cpp:374
+#: src/gui/inventorywindow.cpp:59
+msgid "Storage"
+msgstr "Opslag"
+
+#: src/gui/inventorywindow.cpp:82
+msgid "Slots:"
+msgstr "Sloten:"
+
+#: src/gui/inventorywindow.cpp:87 src/gui/inventorywindow.cpp:100
+#: src/gui/inventorywindow.cpp:339 src/gui/popupmenu.cpp:361
 msgid "Equip"
 msgstr "Uitrusten"
 
-#: src/gui/inventorywindow.cpp:74 src/gui/inventorywindow.cpp:75
-#: src/gui/inventorywindow.cpp:297 src/gui/popupmenu.cpp:377
+#: src/gui/inventorywindow.cpp:88
 msgid "Use"
 msgstr "Gebruiken"
 
-#: src/gui/inventorywindow.cpp:84 src/gui/inventorywindow.cpp:301
-#: src/gui/popupmenu.cpp:380
+#: src/gui/inventorywindow.cpp:101 src/gui/popupmenu.cpp:364
+msgid "Activate"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:102 src/gui/inventorywindow.cpp:348
+#: src/gui/popupmenu.cpp:367
 #, fuzzy
 msgid "Drop..."
 msgstr "Neerleggen"
 
-#: src/gui/inventorywindow.cpp:85 src/gui/popupmenu.cpp:386
+#: src/gui/inventorywindow.cpp:103 src/gui/popupmenu.cpp:373
 msgid "Split"
 msgstr "Splitsen"
 
-#: src/gui/inventorywindow.cpp:86 src/gui/outfitwindow.cpp:51
+#: src/gui/inventorywindow.cpp:104 src/gui/outfitwindow.cpp:51
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:97 src/gui/storagewindow.cpp:84
-msgid "Slots:"
-msgstr "Sloten:"
-
-#: src/gui/inventorywindow.cpp:98
+#: src/gui/inventorywindow.cpp:106
 msgid "Weight:"
 msgstr "Gewicht:"
 
-#: src/gui/inventorywindow.cpp:303 src/gui/popupmenu.cpp:382
+#: src/gui/inventorywindow.cpp:124 src/gui/popupmenu.cpp:378
+msgid "Store"
+msgstr "Opslaan"
+
+#: src/gui/inventorywindow.cpp:125 src/gui/popupmenu.cpp:385
+msgid "Retrieve"
+msgstr "Afhalen"
+
+#: src/gui/inventorywindow.cpp:350 src/gui/popupmenu.cpp:369
 msgid "Drop"
 msgstr "Neerleggen"
 
-#: src/gui/itemamount.cpp:100 src/gui/okdialog.cpp:42
-#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:38 src/gui/trade.cpp:73
-#: src/gui/trade.cpp:75
+#: src/gui/itemamount.cpp:113 src/gui/okdialog.cpp:42
+#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:39 src/gui/trade.cpp:72
+#: src/gui/trade.cpp:74
 msgid "OK"
 msgstr "OK"
 
-#: src/gui/itemamount.cpp:102
+#: src/gui/itemamount.cpp:115
 msgid "All"
 msgstr "Alle"
 
-#: src/gui/itemamount.cpp:128
+#: src/gui/itemamount.cpp:141
 msgid "Select amount of items to trade."
 msgstr "Selecteer het aantal exemplaren om te verhandelen"
 
-#: src/gui/itemamount.cpp:131
+#: src/gui/itemamount.cpp:144
 msgid "Select amount of items to drop."
 msgstr "Selecteer het aantal exemplaren om neer te leggen"
 
-#: src/gui/itemamount.cpp:134
+#: src/gui/itemamount.cpp:147
 msgid "Select amount of items to store."
 msgstr "Selecteer hoeveelheid voorwerpen te bewaren."
 
-#: src/gui/itemamount.cpp:137
+#: src/gui/itemamount.cpp:150
 msgid "Select amount of items to retrieve."
 msgstr "Selecteer hoeveelheid voorwerpen terug te nemen."
 
-#: src/gui/itemamount.cpp:140
+#: src/gui/itemamount.cpp:153
 msgid "Select amount of items to split."
 msgstr "Selecteer hoeveelheid voorwerpen om te splitsen."
 
-#: src/gui/itempopup.cpp:92
+#: src/gui/itempopup.cpp:137
 #, fuzzy, c-format
 msgid "Weight: %s"
 msgstr "Gewicht "
 
-#: src/gui/login.cpp:49 src/gui/login.cpp:61
+#: src/gui/login.cpp:51 src/gui/login.cpp:63
 msgid "Login"
 msgstr "Inloggen"
 
-#: src/gui/login.cpp:58
+#: src/gui/login.cpp:60
 #, fuzzy
 msgid "Remember username"
 msgstr "Onthoud Naam"
 
-#: src/gui/login.cpp:59 src/gui/register.cpp:58 src/gui/register.cpp:73
+#: src/gui/login.cpp:61 src/gui/register.cpp:58 src/gui/register.cpp:73
 msgid "Register"
 msgstr "Aanmelden"
 
-#: src/gui/login.cpp:60
+#: src/gui/login.cpp:62
 #, fuzzy
 msgid "Change Server"
 msgstr "Server"
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
+#: src/gui/login.cpp:129
+#, fuzzy
+msgid "Registration disabled"
+msgstr "Voorwerpdeling uitgeschakeld."
+
+#: src/gui/login.cpp:129
+msgid "You need to use the website to register an account for this server."
+msgstr ""
+
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:86
 msgid "Map"
 msgstr "Map"
 
-#: src/gui/npcdialog.cpp:44
+#: src/gui/ministatus.cpp:235
+msgid "Need"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:48
 msgid "Waiting for server"
 msgstr "Wachten op server"
 
-#: src/gui/npcdialog.cpp:45
+#: src/gui/npcdialog.cpp:49
 msgid "Next"
 msgstr "Volgende"
 
-#: src/gui/npcdialog.cpp:47
+#: src/gui/npcdialog.cpp:51
 msgid "Submit"
 msgstr "Indienen"
 
-#: src/gui/npcdialog.cpp:52 src/gui/npcpostdialog.cpp:41
+#: src/gui/npcdialog.cpp:73 src/gui/npcpostdialog.cpp:41
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:110
+#: src/gui/npcdialog.cpp:118
+msgid "Clear log"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:134
 msgid "Reset"
 msgstr "Reset"
 
 #. TRANSLATORS: Please leave the \n sequences intact.
-#: src/gui/npcdialog.cpp:171
+#: src/gui/npcdialog.cpp:208
 #, fuzzy
 msgid ""
 "\n"
@@ -978,7 +1024,7 @@ msgstr "Aan:"
 msgid "Send"
 msgstr "Verzenden"
 
-#: src/gui/npcpostdialog.cpp:96
+#: src/gui/npcpostdialog.cpp:99
 msgid "Failed to send as sender or letter invalid."
 msgstr "Kon niet zenden als zender, of de brief is ongeldig."
 
@@ -993,97 +1039,84 @@ msgstr ""
 msgid "Unequip first"
 msgstr "Afdoen"
 
-#: src/gui/popupmenu.cpp:84
+#: src/gui/popupmenu.cpp:83
 #, fuzzy, c-format
 msgid "Trade with %s..."
 msgstr "Handelen met %s"
 
-#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:161
+#: src/gui/popupmenu.cpp:87 src/gui/popupmenu.cpp:158
 #, fuzzy, c-format
 msgid "Attack %s"
 msgstr "Aanval %+d"
 
-#: src/gui/popupmenu.cpp:92
+#: src/gui/popupmenu.cpp:91
 #, fuzzy, c-format
 msgid "Whisper %s"
 msgstr "Fluister"
 
-#: src/gui/popupmenu.cpp:101
+#: src/gui/popupmenu.cpp:100
 #, c-format
 msgid "Befriend %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:106
+#: src/gui/popupmenu.cpp:105
 #, c-format
 msgid "Disregard %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:109
+#: src/gui/popupmenu.cpp:108
 #, fuzzy, c-format
 msgid "Ignore %s"
 msgstr "Genegeerd"
 
-#: src/gui/popupmenu.cpp:115 src/gui/popupmenu.cpp:124
+#: src/gui/popupmenu.cpp:114 src/gui/popupmenu.cpp:123
 #, c-format
 msgid "Unignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:118
+#: src/gui/popupmenu.cpp:117
 #, c-format
 msgid "Completely ignore %s"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:130
 #, c-format
-msgid "Follow %s"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:133
-#, c-format
 msgid "Invite %s to join your guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:137
+#: src/gui/popupmenu.cpp:134
 #, fuzzy, c-format
 msgid "Invite %s to join your party"
 msgstr "%s is niet in jouw groep!"
 
-#: src/gui/popupmenu.cpp:144
+#: src/gui/popupmenu.cpp:141
 #, fuzzy
 msgid "Kick player"
 msgstr "Kick gefaald!"
 
-#: src/gui/popupmenu.cpp:153
+#: src/gui/popupmenu.cpp:150
 #, c-format
 msgid "Talk to %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:166
+#: src/gui/popupmenu.cpp:163
 #, fuzzy
 msgid "Kick monster"
 msgstr "Monsters"
 
-#: src/gui/popupmenu.cpp:174
+#: src/gui/popupmenu.cpp:171
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:191
+#: src/gui/popupmenu.cpp:188
 #, fuzzy, c-format
 msgid "Pick up %s"
 msgstr "Oprapen"
 
-#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:400
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:387
 msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:71
-msgid "Store"
-msgstr "Opslaan"
-
-#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:72
-msgid "Retrieve"
-msgstr "Afhalen"
-
 #: src/gui/quitdialog.cpp:44
 msgid "Switch server"
 msgstr "Van server wisselen"
@@ -1152,52 +1185,65 @@ msgstr "Het wachtwoord moet uit minder dan %d tekens bestaan."
 msgid "Passwords do not match."
 msgstr "Wachtwoorden komen niet overeen."
 
-#: src/gui/serverdialog.cpp:124
+#: src/gui/serverdialog.cpp:197
 #, fuzzy
 msgid "Choose Your Server"
 msgstr "Kies jouw server"
 
-#: src/gui/serverdialog.cpp:131 src/gui/widgets/chattab.cpp:139
+#: src/gui/serverdialog.cpp:206 src/gui/widgets/chattab.cpp:142
 msgid "Server:"
 msgstr "Server:"
 
-#: src/gui/serverdialog.cpp:132
+#: src/gui/serverdialog.cpp:207
 msgid "Port:"
 msgstr "Poort:"
 
-#: src/gui/serverdialog.cpp:133
+#: src/gui/serverdialog.cpp:208
 #, fuzzy
 msgid "Server type:"
 msgstr "Server:"
 
-#: src/gui/serverdialog.cpp:153
+#: src/gui/serverdialog.cpp:229
 #, fuzzy
 msgid "Connect"
 msgstr "Verbinden..."
 
-#: src/gui/serverdialog.cpp:154
+#: src/gui/serverdialog.cpp:230
 #, fuzzy
 msgid "Custom Server"
 msgstr "Aangepaste cursor"
 
-#: src/gui/serverdialog.cpp:242
+#: src/gui/serverdialog.cpp:324
 msgid "Please type both the address and the port of a server."
 msgstr "Typ aub zowel het adres van de server, als de poort."
 
-#: src/gui/serverdialog.cpp:357
+#: src/gui/serverdialog.cpp:441
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:363
+#: src/gui/serverdialog.cpp:447
 #, fuzzy
 msgid "Waiting for server..."
 msgstr "Wachten op server"
 
-#: src/gui/serverdialog.cpp:367
+#: src/gui/serverdialog.cpp:451
 msgid "Preparing download"
 msgstr ""
 
+#: src/gui/serverdialog.cpp:455
+msgid "Error retreiving server list!"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:550
+msgid "requires a newer version"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:552
+#, c-format
+msgid "requires v%s"
+msgstr ""
+
 #: src/gui/setup_audio.cpp:42
 msgid "Sound"
 msgstr "Geluid"
@@ -1231,54 +1277,54 @@ msgstr ""
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:45
+#: src/gui/setup_colors.cpp:46
 msgid "This is what the color looks like"
 msgstr "Dit is hoe de kleur eruit ziet"
 
-#: src/gui/setup_colors.cpp:50
+#: src/gui/setup_colors.cpp:51
 msgid "Colors"
 msgstr "Kleuren"
 
-#: src/gui/setup_colors.cpp:71
+#: src/gui/setup_colors.cpp:72
 #, fuzzy
 msgid "Type:"
 msgstr "Type: "
 
-#: src/gui/setup_colors.cpp:82 src/gui/setup_colors.cpp:330
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:331
 msgid "Static"
 msgstr "Statisch"
 
-#: src/gui/setup_colors.cpp:84 src/gui/setup_colors.cpp:85
-#: src/gui/setup_colors.cpp:331
+#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
+#: src/gui/setup_colors.cpp:332
 msgid "Pulse"
 msgstr "Puls"
 
-#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:87
-#: src/gui/setup_colors.cpp:332
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
+#: src/gui/setup_colors.cpp:333
 msgid "Rainbow"
 msgstr "Regenboog"
 
-#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
-#: src/gui/setup_colors.cpp:332
+#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
+#: src/gui/setup_colors.cpp:333
 msgid "Spectrum"
 msgstr "Spectrum"
 
-#: src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:94
 #, fuzzy
 msgid "Delay:"
 msgstr "Vertraging: "
 
-#: src/gui/setup_colors.cpp:108
+#: src/gui/setup_colors.cpp:109
 #, fuzzy
 msgid "Red:"
 msgstr "Rood: "
 
-#: src/gui/setup_colors.cpp:123
+#: src/gui/setup_colors.cpp:124
 #, fuzzy
 msgid "Green:"
 msgstr "Groen: "
 
-#: src/gui/setup_colors.cpp:138
+#: src/gui/setup_colors.cpp:139
 #, fuzzy
 msgid "Blue:"
 msgstr "Blauw: "
@@ -1336,591 +1382,593 @@ msgstr "Standaard"
 msgid "Key Conflict(s) Detected."
 msgstr "Conflict(en) tussen toetsen gevonden."
 
-#: src/gui/setup_players.cpp:57
+#: src/gui/setup_players.cpp:58
 msgid "Name"
 msgstr "Naam"
 
-#: src/gui/setup_players.cpp:58
+#: src/gui/setup_players.cpp:59
 msgid "Relation"
 msgstr "Relatie"
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:64
 msgid "Neutral"
 msgstr "Neutraal"
 
-#: src/gui/setup_players.cpp:64
+#: src/gui/setup_players.cpp:65
 msgid "Friend"
 msgstr "Vriend"
 
-#: src/gui/setup_players.cpp:65
+#: src/gui/setup_players.cpp:66
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_players.cpp:67
 msgid "Ignored"
 msgstr "Genegeerd"
 
-#: src/gui/setup_players.cpp:208 src/gui/setup_video.cpp:132
+#: src/gui/setup_players.cpp:206 src/gui/setup_video.cpp:153
 msgid "???"
 msgstr "???"
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_players.cpp:225
 msgid "Allow trading"
 msgstr "Handelen toestaan"
 
-#: src/gui/setup_players.cpp:228
+#: src/gui/setup_players.cpp:227
 msgid "Allow whispers"
 msgstr "Fluisteren toestaan"
 
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:231
 msgid "Put all whispers in tabs"
 msgstr ""
 
-#: src/gui/setup_players.cpp:234
+#: src/gui/setup_players.cpp:233
 #, fuzzy
 msgid "Show gender"
 msgstr "Naam tonen"
 
-#: src/gui/setup_players.cpp:236
+#: src/gui/setup_players.cpp:235
+#, fuzzy
+msgid "Enable Chat log"
+msgstr "Kan niets verkopen."
+
+#: src/gui/setup_players.cpp:237
 msgid "Players"
 msgstr "Spelers"
 
-#: src/gui/setup_players.cpp:261
+#: src/gui/setup_players.cpp:262
 msgid "When ignoring:"
 msgstr "Tijdens negeren:"
 
-#: src/gui/setup_video.cpp:113
+#: src/gui/setup_video.cpp:134
 msgid "Tiny"
 msgstr "Klein"
 
-#: src/gui/setup_video.cpp:114
+#: src/gui/setup_video.cpp:135
 msgid "Small"
 msgstr "Klein"
 
-#: src/gui/setup_video.cpp:115
+#: src/gui/setup_video.cpp:136
 msgid "Medium"
 msgstr "Middelmatig"
 
-#: src/gui/setup_video.cpp:116
+#: src/gui/setup_video.cpp:137
 msgid "Large"
 msgstr "Groot"
 
-#: src/gui/setup_video.cpp:142
+#: src/gui/setup_video.cpp:163
 msgid "No text"
 msgstr "Geen tekst"
 
-#: src/gui/setup_video.cpp:143
+#: src/gui/setup_video.cpp:164
 msgid "Text"
 msgstr "Tekst"
 
-#: src/gui/setup_video.cpp:144
+#: src/gui/setup_video.cpp:165
 msgid "Bubbles, no names"
 msgstr "Bellen, geen namen"
 
-#: src/gui/setup_video.cpp:145
+#: src/gui/setup_video.cpp:166
 msgid "Bubbles with names"
 msgstr "Bellen met namen"
 
-#: src/gui/setup_video.cpp:157
+#: src/gui/setup_video.cpp:178
 msgid "off"
 msgstr "uit"
 
-#: src/gui/setup_video.cpp:158 src/gui/setup_video.cpp:171
+#: src/gui/setup_video.cpp:179 src/gui/setup_video.cpp:192
 msgid "low"
 msgstr "laag"
 
-#: src/gui/setup_video.cpp:159 src/gui/setup_video.cpp:173
+#: src/gui/setup_video.cpp:180 src/gui/setup_video.cpp:194
 msgid "high"
 msgstr "hoog"
 
-#: src/gui/setup_video.cpp:172
+#: src/gui/setup_video.cpp:193
 msgid "medium"
 msgstr "gemiddeld"
 
-#: src/gui/setup_video.cpp:174
+#: src/gui/setup_video.cpp:195
 msgid "max"
 msgstr "max"
 
-#: src/gui/setup_video.cpp:196
+#: src/gui/setup_video.cpp:217
 msgid "Full screen"
 msgstr "Volledig scherm"
 
-#: src/gui/setup_video.cpp:197
+#: src/gui/setup_video.cpp:218
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:198
+#: src/gui/setup_video.cpp:219
 msgid "Custom cursor"
 msgstr "Aangepaste cursor"
 
-#: src/gui/setup_video.cpp:200
+#: src/gui/setup_video.cpp:221
 msgid "Visible names"
 msgstr "Zichtbare namen"
 
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:223
 msgid "Particle effects"
 msgstr "Deeltjes effecten"
 
-#: src/gui/setup_video.cpp:204
+#: src/gui/setup_video.cpp:225
 #, fuzzy
 msgid "Show own name"
 msgstr "Naam tonen"
 
-#: src/gui/setup_video.cpp:205
+#: src/gui/setup_video.cpp:226
+msgid "Log NPC dialogue"
+msgstr ""
+
+#: src/gui/setup_video.cpp:227
 msgid "Show pickup notification"
 msgstr "Notificatie bij oprapen weergeven"
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:207
+#. TRANSLATORS: Refers to "Show pickup notification"
+#: src/gui/setup_video.cpp:229
 msgid "in chat"
 msgstr "in chat"
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:209
+#. TRANSLATORS: Refers to "Show pickup notification"
+#: src/gui/setup_video.cpp:231
 msgid "as particle"
 msgstr "als deeltje"
 
-#: src/gui/setup_video.cpp:214
+#: src/gui/setup_video.cpp:236
 #, fuzzy
 msgid "FPS limit:"
 msgstr "FPS limiet:"
 
-#: src/gui/setup_video.cpp:225
+#: src/gui/setup_video.cpp:247
+msgid "Disable transparency (Low CPU mode)"
+msgstr ""
+
+#: src/gui/setup_video.cpp:250
 msgid "Video"
 msgstr "Video"
 
-#: src/gui/setup_video.cpp:227
+#: src/gui/setup_video.cpp:252
 #, fuzzy
-msgid "Show monster damage"
+msgid "Show damage"
 msgstr "Naam tonen"
 
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:258
 msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:259
 msgid "Gui opacity"
 msgstr "Dekking van de GUI"
 
-#: src/gui/setup_video.cpp:235
+#: src/gui/setup_video.cpp:260
 msgid "Ambient FX"
 msgstr "Omgevingseffecten"
 
-#: src/gui/setup_video.cpp:236
+#: src/gui/setup_video.cpp:261
 #, fuzzy
 msgid "Particle detail"
 msgstr "Deeltjes details"
 
-#: src/gui/setup_video.cpp:237
+#: src/gui/setup_video.cpp:262
 msgid "Font size"
 msgstr "Lettergrootte"
 
-#: src/gui/setup_video.cpp:251 src/gui/setup_video.cpp:454
-#: src/gui/setup_video.cpp:568
+#: src/gui/setup_video.cpp:277 src/gui/setup_video.cpp:532
+#: src/gui/setup_video.cpp:662
 #, fuzzy
 msgid "None"
 msgstr "Nee"
 
-#: src/gui/setup_video.cpp:381
+#: src/gui/setup_video.cpp:426
 #, fuzzy
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr "modus en herstel van oude modus ook gefaald!"
 
-#: src/gui/setup_video.cpp:387
+#: src/gui/setup_video.cpp:432
 #, fuzzy
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr "modus en herstel van oude modus ook gefaald!"
 
-#: src/gui/setup_video.cpp:398
+#: src/gui/setup_video.cpp:443
 #, fuzzy
 msgid "Switching to Full Screen"
 msgstr "Overgaan naar volledig scherm"
 
-#: src/gui/setup_video.cpp:399
+#: src/gui/setup_video.cpp:444
 msgid "Restart needed for changes to take effect."
 msgstr "De veranderingen worden pas actief na opnieuw opstarten"
 
-#: src/gui/setup_video.cpp:411
+#: src/gui/setup_video.cpp:458
 #, fuzzy
 msgid "Changing to OpenGL"
 msgstr "Veranderen van OpenGL"
 
-#: src/gui/setup_video.cpp:412
+#: src/gui/setup_video.cpp:459
+msgid ""
+"Applying change to OpenGL requires restart. In case OpenGL messes up your "
+"game graphics, restart the game with the command line option \"--no-opengl\"."
+msgstr ""
+
+#: src/gui/setup_video.cpp:466
+msgid "Deactivating OpenGL"
+msgstr ""
+
+#: src/gui/setup_video.cpp:467
 msgid "Applying change to OpenGL requires restart."
 msgstr "Het wisselen van of naar OpenGL wordt pas actief na opnieuw opstarten"
 
-#: src/gui/setup_video.cpp:486 src/gui/setup_video.cpp:491
+#: src/gui/setup_video.cpp:475
+#, fuzzy
+msgid "Transparency disabled"
+msgstr "Ervaringsdeling uitgeschakeld."
+
+#: src/gui/setup_video.cpp:476 src/gui/setup_video.cpp:484
+msgid "You must restart to apply changes."
+msgstr ""
+
+#: src/gui/setup_video.cpp:483
+msgid "Transparency enabled"
+msgstr ""
+
+#: src/gui/setup_video.cpp:576 src/gui/setup_video.cpp:581
 #, fuzzy
 msgid "Screen Resolution Changed"
 msgstr "Schermresolutie veranderd"
 
-#: src/gui/setup_video.cpp:487 src/gui/setup_video.cpp:492
+#: src/gui/setup_video.cpp:577 src/gui/setup_video.cpp:582
 msgid "Restart your client for the change to take effect."
 msgstr "Herstart de client om de wijzigingen in werking te doen treden."
 
-#: src/gui/setup_video.cpp:489
+#: src/gui/setup_video.cpp:579
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:522
+#: src/gui/setup_video.cpp:612
 #, fuzzy
 msgid "Particle Effect Settings Changed."
 msgstr "Deeltjes effecten instellingen gewijzigd."
 
-#: src/gui/setup_video.cpp:523
+#: src/gui/setup_video.cpp:613
 msgid "Changes will take effect on map change."
 msgstr "Wijzigingen treden in werking bij het wisselen van map."
 
-#: src/gui/skilldialog.cpp:198 src/gui/windowmenu.cpp:59
+#: src/gui/skilldialog.cpp:212 src/gui/windowmenu.cpp:59
 msgid "Skills"
 msgstr "Vaardigheden"
 
-#: src/gui/skilldialog.cpp:209
+#: src/gui/skilldialog.cpp:223
 msgid "Up"
 msgstr "Omhoog"
 
-#: src/gui/skilldialog.cpp:263
+#: src/gui/skilldialog.cpp:269
 #, fuzzy, c-format
 msgid "Skill points available: %d"
 msgstr "Vaardigheidspunten: %d"
 
-#: src/gui/skilldialog.cpp:315
+#: src/gui/skilldialog.cpp:351
 #, fuzzy, c-format
 msgid "Skill Set %d"
 msgstr "Vaardigheidspunten: %d"
 
-#: src/gui/skilldialog.cpp:324
+#: src/gui/skilldialog.cpp:360
 #, fuzzy, c-format
 msgid "Skill %d"
 msgstr "Vaardigheden"
 
-#: src/gui/skilldialog.cpp:406
+#: src/gui/skilldialog.cpp:442
 #, fuzzy, c-format
 msgid "Lvl: %d (%+d)"
 msgstr "Level: %d"
 
-#: src/gui/skilldialog.cpp:417
+#: src/gui/skilldialog.cpp:453
 #, fuzzy, c-format
 msgid "Lvl: %d"
 msgstr "Level: %d"
 
-#: src/gui/socialwindow.cpp:118
+#: src/gui/socialwindow.cpp:126
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:127
+#: src/gui/socialwindow.cpp:139
 #, fuzzy, c-format
 msgid "Guild %s quit requested."
 msgstr "Guild aangemaakt."
 
-#: src/gui/socialwindow.cpp:137
+#: src/gui/socialwindow.cpp:153
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:138
+#: src/gui/socialwindow.cpp:154
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:147
+#: src/gui/socialwindow.cpp:163
 #, fuzzy
 msgid "Leave Guild?"
 msgstr "Guild aanmaken"
 
-#: src/gui/socialwindow.cpp:148
+#: src/gui/socialwindow.cpp:164
 #, fuzzy, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Weet u zeker dat u wilt afsluiten?"
 
-#: src/gui/socialwindow.cpp:183
+#: src/gui/socialwindow.cpp:207 src/net/tmwa/partyhandler.cpp:330
 #, fuzzy, c-format
 msgid "Invited user %s to party."
 msgstr "/party > Een gebruiker uitnodigen in de groep"
 
-#: src/gui/socialwindow.cpp:190
+#: src/gui/socialwindow.cpp:218
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:200
+#: src/gui/socialwindow.cpp:232
 #, fuzzy
 msgid "Member Invite to Party"
 msgstr "/party > Een gebruiker uitnodigen in de groep"
 
-#: src/gui/socialwindow.cpp:201
+#: src/gui/socialwindow.cpp:233
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:210
+#: src/gui/socialwindow.cpp:242
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:211
+#: src/gui/socialwindow.cpp:243
 #, fuzzy, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Weet u zeker dat u wilt afsluiten?"
 
-#: src/gui/socialwindow.cpp:240
+#: src/gui/socialwindow.cpp:272
 msgid "Create Guild"
 msgstr "Guild aanmaken"
 
-#: src/gui/socialwindow.cpp:241 src/gui/socialwindow.cpp:565
+#: src/gui/socialwindow.cpp:273 src/gui/socialwindow.cpp:620
 #, fuzzy
 msgid "Create Party"
 msgstr "Personage Aanmaken"
 
-#: src/gui/socialwindow.cpp:280 src/gui/windowmenu.cpp:64
+#: src/gui/socialwindow.cpp:312 src/gui/windowmenu.cpp:64
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:298
+#: src/gui/socialwindow.cpp:330
 #, fuzzy
 msgid "Invite"
 msgstr "Gebruiker uitnodigen"
 
-#: src/gui/socialwindow.cpp:299
+#: src/gui/socialwindow.cpp:331
 #, fuzzy
 msgid "Leave"
 msgstr "Groot"
 
-#: src/gui/socialwindow.cpp:395
+#: src/gui/socialwindow.cpp:443
 #, fuzzy, c-format
 msgid "Accepted party invite from %s."
 msgstr "Uitnodiging van %s aanvaard."
 
-#: src/gui/socialwindow.cpp:401
+#: src/gui/socialwindow.cpp:449
 #, fuzzy, c-format
 msgid "Rejected party invite from %s."
 msgstr "Uitnodiging van %s geweigerd."
 
-#: src/gui/socialwindow.cpp:414
+#: src/gui/socialwindow.cpp:462
 #, fuzzy, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Uitnodiging van %s aanvaard."
 
-#: src/gui/socialwindow.cpp:420
+#: src/gui/socialwindow.cpp:468
 #, fuzzy, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Uitnodiging van %s geweigerd."
 
-#: src/gui/socialwindow.cpp:464
+#: src/gui/socialwindow.cpp:497
+msgid "Creating guild failed, please choose a shorter name."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:504
 #, fuzzy, c-format
 msgid "Creating guild called %s."
 msgstr "Fout bij het creëren van guild."
 
-#: src/gui/socialwindow.cpp:478
+#: src/gui/socialwindow.cpp:520
+msgid "Creating party failed, please choose a shorter name."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:527
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:485
+#: src/gui/socialwindow.cpp:541
 #, fuzzy
 msgid "Guild Name"
 msgstr "Guild"
 
-#: src/gui/socialwindow.cpp:486
+#: src/gui/socialwindow.cpp:542
 #, fuzzy
 msgid "Choose your guild's name."
 msgstr "Kies jouw server"
 
-#: src/gui/socialwindow.cpp:498
+#: src/gui/socialwindow.cpp:554
 #, fuzzy
 msgid "Received guild request, but one already exists."
 msgstr "Uitnodiging tot groep ontvangen, maar er is er al één."
 
-#: src/gui/socialwindow.cpp:503
+#: src/gui/socialwindow.cpp:559
 #, fuzzy, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s heeft je uitgenodigd om je bij groep %s te voegen."
 
-#: src/gui/socialwindow.cpp:508
+#: src/gui/socialwindow.cpp:564
 #, fuzzy
 msgid "Accept Guild Invite"
 msgstr "Groepsuitnodiging aanvaarden"
 
-#: src/gui/socialwindow.cpp:520
+#: src/gui/socialwindow.cpp:576
 msgid "Received party request, but one already exists."
 msgstr "Uitnodiging tot groep ontvangen, maar er is er al één."
 
-#: src/gui/socialwindow.cpp:530
+#: src/gui/socialwindow.cpp:585
 #, fuzzy
 msgid "You have been invited you to join a party."
 msgstr "%s heeft je uitgenodigd om je bij hun groep te voegen."
 
-#: src/gui/socialwindow.cpp:534
+#: src/gui/socialwindow.cpp:589
 #, fuzzy, c-format
 msgid "You have been invited to join the %s party."
 msgstr "%s heeft je uitgenodigd om je bij groep %s te voegen."
 
-#: src/gui/socialwindow.cpp:542
+#: src/gui/socialwindow.cpp:597
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s heeft je uitgenodigd om je bij hun groep te voegen."
 
-#: src/gui/socialwindow.cpp:547
+#: src/gui/socialwindow.cpp:602
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s heeft je uitgenodigd om je bij groep %s te voegen."
 
-#: src/gui/socialwindow.cpp:555
+#: src/gui/socialwindow.cpp:610
 msgid "Accept Party Invite"
 msgstr "Groepsuitnodiging aanvaarden"
 
-#: src/gui/socialwindow.cpp:566
+#: src/gui/socialwindow.cpp:621
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:571
+#: src/gui/socialwindow.cpp:626
 #, fuzzy
 msgid "Party Name"
 msgstr "Groep"
 
-#: src/gui/socialwindow.cpp:572
+#: src/gui/socialwindow.cpp:627
 #, fuzzy
 msgid "Choose your party's name."
 msgstr "Kies jouw server"
 
-#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:62
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:62
 msgid "Specials"
 msgstr ""
 
-#: src/gui/specialswindow.cpp:174
-#, c-format
-msgid "Specials Set %d"
-msgstr ""
-
-#: src/gui/specialswindow.cpp:191
-#, c-format
-msgid "Special %d"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:247
+#: src/gui/statuswindow.cpp:113 src/gui/statuswindow.cpp:215
+#: src/gui/statuswindow.cpp:262
 #, c-format
 msgid "Level: %d"
 msgstr "Level: %d"
 
-#: src/gui/statuswindow.cpp:101 src/gui/statuswindow.cpp:211
+#: src/gui/statuswindow.cpp:114 src/gui/statuswindow.cpp:208
+#: src/gui/statuswindow.cpp:239
 #, c-format
 msgid "Money: %s"
 msgstr "Geld: %s"
 
-#: src/gui/statuswindow.cpp:104
+#: src/gui/statuswindow.cpp:117
 msgid "HP:"
 msgstr "Leven:"
 
-#: src/gui/statuswindow.cpp:109
+#: src/gui/statuswindow.cpp:122
 msgid "Exp:"
 msgstr "Ervaring:"
 
-#: src/gui/statuswindow.cpp:114
+#: src/gui/statuswindow.cpp:130
 msgid "MP:"
 msgstr "Magie:"
 
-#: src/gui/statuswindow.cpp:132 src/gui/statuswindow.cpp:219
+#: src/gui/statuswindow.cpp:158 src/gui/statuswindow.cpp:275
 #, c-format
 msgid "Job: %d"
 msgstr "Job: %d"
 
-#: src/gui/statuswindow.cpp:133
+#: src/gui/statuswindow.cpp:159
 msgid "Job:"
 msgstr "Job:"
 
-#: src/gui/statuswindow.cpp:194
-#, fuzzy
-msgid "HP"
-msgstr "Leven:"
-
-#: src/gui/statuswindow.cpp:200
-#, fuzzy
-msgid "MP"
-msgstr "Magie:"
-
-#: src/gui/statuswindow.cpp:206
-#, fuzzy
-msgid "Exp"
-msgstr "Ervaring:"
-
-#: src/gui/statuswindow.cpp:215
-#, fuzzy
-msgid "Money"
-msgstr "Geld: %d"
-
-#: src/gui/statuswindow.cpp:225
-#, fuzzy
-msgid "Job"
-msgstr "Job:"
-
-#: src/gui/statuswindow.cpp:229
+#: src/gui/statuswindow.cpp:211 src/gui/statuswindow.cpp:247
 #, fuzzy, c-format
 msgid "Character points: %d"
 msgstr "Attributen van personage OK"
 
-#: src/gui/statuswindow.cpp:235
+#: src/gui/statuswindow.cpp:255
 #, fuzzy, c-format
 msgid "Correction points: %d"
 msgstr "Vaardigheidspunten: %d"
 
-#: src/gui/statuswindow.cpp:251
-#, fuzzy
-msgid "Level"
-msgstr "Level: %d"
-
-#: src/gui/storagewindow.cpp:59
-msgid "Storage"
-msgstr "Opslag"
-
-#: src/gui/trade.cpp:52
+#: src/gui/trade.cpp:53
 msgid "Propose trade"
 msgstr "Handelen voorstellen"
 
-#: src/gui/trade.cpp:53
+#: src/gui/trade.cpp:54
 msgid "Confirmed. Waiting..."
 msgstr "Bevestigd. Wachten..."
 
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:55
 msgid "Agree trade"
 msgstr "Handel goedkeuren"
 
-#: src/gui/trade.cpp:55
+#: src/gui/trade.cpp:56
 msgid "Agreed. Waiting..."
 msgstr "Goedgekeurd. Wachten..."
 
-#: src/gui/trade.cpp:58
+#: src/gui/trade.cpp:59
 msgid "Trade: You"
 msgstr "Handel: Jij"
 
-#: src/gui/trade.cpp:74 src/gui/trade.cpp:75
+#: src/gui/trade.cpp:73 src/gui/trade.cpp:74
 msgid "Trade"
 msgstr "Handel"
 
-#: src/gui/trade.cpp:77
+#: src/gui/trade.cpp:76
 msgid "Add"
 msgstr "Toevoegen"
 
-#: src/gui/trade.cpp:99 src/gui/trade.cpp:135
+#: src/gui/trade.cpp:98 src/gui/trade.cpp:134
 #, fuzzy, c-format
 msgid "You get %s"
 msgstr "Jij krijgt %s."
 
-#: src/gui/trade.cpp:100
+#: src/gui/trade.cpp:99
 msgid "You give:"
 msgstr "Je geeft:"
 
-#: src/gui/trade.cpp:104
+#: src/gui/trade.cpp:103
 msgid "Change"
 msgstr "Veranderen"
 
-#: src/gui/trade.cpp:275
+#: src/gui/trade.cpp:262
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Kan dat voorwerp niet toevoegen. Je kan één type voorwerp niet overlappen in "
 "het venster."
 
-#: src/gui/trade.cpp:318
+#: src/gui/trade.cpp:304
 msgid "You don't have enough money."
 msgstr "Je hebt niet genoeg geld."
 
@@ -1941,22 +1989,22 @@ msgstr "Verbinden..."
 msgid "Play"
 msgstr "Spelen"
 
-#: src/gui/updatewindow.cpp:405
+#: src/gui/updatewindow.cpp:417
 msgid "##1  The update process is incomplete."
 msgstr "##1 Het updateproces is onvolledig."
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:407
+#: src/gui/updatewindow.cpp:419
 msgid "##1  It is strongly recommended that"
 msgstr "##1 Het is ten sterkste aanbevolen dat"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:409
+#: src/gui/updatewindow.cpp:421
 #, fuzzy
 msgid "##1  you try again later."
 msgstr "##1 je later opnieuw probeert"
 
-#: src/gui/updatewindow.cpp:501
+#: src/gui/updatewindow.cpp:515
 msgid "Completed"
 msgstr "Voltooid"
 
@@ -2040,55 +2088,55 @@ msgstr "Een gebruiker nodig om kanaalbeheerder te maken!"
 msgid "Need a user to kick!"
 msgstr "Een gebruiker nodig om uit het kanaal te verwijderen!"
 
-#: src/gui/widgets/chattab.cpp:118
+#: src/gui/widgets/chattab.cpp:121
 msgid "Global announcement:"
 msgstr "Globale aankondiging:"
 
-#: src/gui/widgets/chattab.cpp:124
+#: src/gui/widgets/chattab.cpp:127
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "Globale aankondiging van %s:"
 
-#: src/gui/widgets/chattab.cpp:150
+#: src/gui/widgets/chattab.cpp:153
 #, fuzzy, c-format
 msgid "%s whispers: %s"
 msgstr "%s fluistert: "
 
-#: src/gui/widgets/whispertab.cpp:51
+#: src/gui/widgets/whispertab.cpp:53
 msgid "Cannot send empty chat!"
 msgstr "Kan geen leeg chatbericht sturen!"
 
-#: src/gui/widgets/whispertab.cpp:70
+#: src/gui/widgets/whispertab.cpp:72
 msgid "/ignore > Ignore the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:71
+#: src/gui/widgets/whispertab.cpp:73
 msgid "/unignore > Stop ignoring the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:72
+#: src/gui/widgets/whispertab.cpp:74
 msgid "/close > Close the whisper tab"
 msgstr "/close > Sluit de fluistertab"
 
-#: src/gui/widgets/whispertab.cpp:82
+#: src/gui/widgets/whispertab.cpp:84
 msgid "Command: /close"
 msgstr "Commando: /close"
 
-#: src/gui/widgets/whispertab.cpp:83
+#: src/gui/widgets/whispertab.cpp:85
 msgid "This command closes the current whisper tab."
 msgstr "Dit commando sluit de huidige fluistertab."
 
-#: src/gui/widgets/whispertab.cpp:87
+#: src/gui/widgets/whispertab.cpp:89
 #, fuzzy
 msgid "Command: /ignore"
 msgstr "Commando: /item"
 
-#: src/gui/widgets/whispertab.cpp:88
+#: src/gui/widgets/whispertab.cpp:90
 #, fuzzy
 msgid "This command ignores the other player regardless of current relations."
 msgstr "Dit commando geeft het aantal spelers dat momenteel online is weer."
 
-#: src/gui/widgets/whispertab.cpp:94
+#: src/gui/widgets/whispertab.cpp:96
 #, fuzzy
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
@@ -2117,785 +2165,1137 @@ msgstr "Veranderen"
 msgid "Choose World"
 msgstr "Kies jouw server"
 
-#: src/keyboardconfig.cpp:40
+#: src/keyboardconfig.cpp:39
 msgid "Move Up"
 msgstr "Omhoog"
 
-#: src/keyboardconfig.cpp:41
+#: src/keyboardconfig.cpp:40
 msgid "Move Down"
 msgstr "Omlaag"
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:41
 msgid "Move Left"
 msgstr "Naar links"
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:42
 msgid "Move Right"
 msgstr "Naar rechts"
 
-#: src/keyboardconfig.cpp:44 src/net/ea/generalhandler.cpp:223
+#: src/keyboardconfig.cpp:43 src/net/tmwa/generalhandler.cpp:237
 msgid "Attack"
 msgstr "Aanvallen"
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:44
 msgid "Target & Attack"
 msgstr "Viseren en Aanvallen"
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:45
 msgid "Smilie"
 msgstr "Smilie"
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:46
 msgid "Talk"
 msgstr "Spreken"
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:47
 msgid "Stop Attack"
 msgstr "Aanval stoppen"
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:48
 #, fuzzy
 msgid "Target Monster"
 msgstr "Dichtstbijzijnde viseren"
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboardconfig.cpp:49
 msgid "Target NPC"
 msgstr "NPC viseren"
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:50
 msgid "Target Player"
 msgstr "Speler viseren"
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:51
 msgid "Pickup"
 msgstr "Oprapen"
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:52
 msgid "Hide Windows"
 msgstr "Vensters verbergen"
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:53
 msgid "Sit"
 msgstr "Zitten"
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:54
 msgid "Screenshot"
 msgstr "Schermafdruk"
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:55
 msgid "Enable/Disable Trading"
 msgstr "Handelen inschakelen/uitschakelen"
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:56
 msgid "Find Path to Mouse"
 msgstr "Pad naar Muis vinden"
 
-#: src/keyboardconfig.cpp:58 src/keyboardconfig.cpp:59
-#: src/keyboardconfig.cpp:60 src/keyboardconfig.cpp:61
-#: src/keyboardconfig.cpp:62 src/keyboardconfig.cpp:63
-#: src/keyboardconfig.cpp:64 src/keyboardconfig.cpp:65
-#: src/keyboardconfig.cpp:66 src/keyboardconfig.cpp:67
-#: src/keyboardconfig.cpp:68 src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:57 src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60
+#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62
+#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64
+#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68
 #, c-format
 msgid "Item Shortcut %d"
 msgstr "Snelkopeling naar voorwerp %d"
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:69
 msgid "Help Window"
 msgstr "Help venster"
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:70
 msgid "Status Window"
 msgstr "Statusvenster"
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:71
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:72
 msgid "Equipment Window"
 msgstr "Uitrustingsvenster"
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:73
 msgid "Skill Window"
 msgstr "Vaardigheidsvenster"
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:74
 msgid "Minimap Window"
 msgstr "Minimapvenster"
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:75
 msgid "Chat Window"
 msgstr "Gespreksvenster"
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:76
 msgid "Item Shortcut Window"
 msgstr "Voorwerpsnelkoppelingsvenster"
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:77
 msgid "Setup Window"
 msgstr "Instellingenvenster"
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:78
 msgid "Debug Window"
 msgstr "Debugvenster"
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:79
 #, fuzzy
 msgid "Social Window"
 msgstr "Vaardigheidsvenster"
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:80
 msgid "Emote Shortcut Window"
 msgstr "Emoticonsnelkoppelingsvenster"
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:81
 #, fuzzy
 msgid "Outfits Window"
 msgstr "Statusvenster"
 
-#: src/keyboardconfig.cpp:83
+#: src/keyboardconfig.cpp:82
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:83
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86
-#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88
-#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90
-#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92
-#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:84 src/keyboardconfig.cpp:85
+#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:87
+#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:89
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:91
+#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:93
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:95
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "Emoticon snelkoppeling %d"
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:96
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:97
 msgid "Scroll Chat Up"
 msgstr "Chat omhoogscrollen"
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:98
 msgid "Scroll Chat Down"
 msgstr "Chat omlaagscrollen"
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:99
 msgid "Previous Chat Tab"
 msgstr "Vorige chattab"
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:100
 msgid "Next Chat Tab"
 msgstr "Volgende chattab"
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:101
 msgid "Select OK"
 msgstr "OK selecteren"
 
-#: src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:103
 msgid "Ignore input 1"
 msgstr "Ingave 1 negeren"
 
-#: src/keyboardconfig.cpp:105
+#: src/keyboardconfig.cpp:104
 msgid "Ignore input 2"
 msgstr "Ingave 2 negeren"
 
-#: src/keyboardconfig.cpp:184
+#: src/keyboardconfig.cpp:183
 #, fuzzy, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr "Los deze problemen op, of het spel kan raar gedrag vertonen."
 
-#: src/localplayer.cpp:914
+#: src/localplayer.cpp:985
 msgid "Unable to pick up item."
 msgstr "Kan het voorwerp niet oprapen."
 
 #. TRANSLATORS: This sentence may be translated differently
 #. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:923
+#: src/localplayer.cpp:994
 #, fuzzy, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "Je raapte %s [@@%d|%s@@] op."
 msgstr[1] "Je raapte %s [@@%d|%s@@] op."
 
-#: src/main.cpp:43
+#: src/main.cpp:42
 msgid "mana [options] [mana-file]"
 msgstr ""
 
+#: src/main.cpp:43
+msgid "[mana-file] : The mana file is an XML file (.mana)"
+msgstr ""
+
 #: src/main.cpp:44
+msgid "              used to set custom parameters"
+msgstr ""
+
+#: src/main.cpp:45
+msgid "              to the mana client."
+msgstr ""
+
+#: src/main.cpp:47
 msgid "Options:"
 msgstr "Opties:"
 
-#: src/main.cpp:45
+#: src/main.cpp:48
 #, fuzzy
 msgid "  -v --version        : Display the version"
 msgstr "  -v --version : Versie weergeven"
 
-#: src/main.cpp:46
+#: src/main.cpp:49
 #, fuzzy
 msgid "  -h --help           : Display this help"
 msgstr "  -h --help : Deze help weergeven"
 
-#: src/main.cpp:47
+#: src/main.cpp:50
 #, fuzzy
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr "  -C --config-file : Gebruikte configuratiebestand"
 
-#: src/main.cpp:48
+#: src/main.cpp:51
 #, fuzzy
 msgid "  -U --username       : Login with this username"
 msgstr "  -U --username : Login met deze gebruikersnaam"
 
-#: src/main.cpp:49
+#: src/main.cpp:52
 #, fuzzy
 msgid "  -P --password       : Login with this password"
 msgstr "  -P --password : Login met dit wachtwoord"
 
-#: src/main.cpp:50
+#: src/main.cpp:53
 #, fuzzy
 msgid "  -c --character      : Login with this character"
 msgstr "  -c --character : Login met dit personage"
 
-#: src/main.cpp:51
+#: src/main.cpp:54
 #, fuzzy
 msgid "  -s --server         : Login server name or IP"
 msgstr "  -s --server : Loginserver naam of IP-adres"
 
-#: src/main.cpp:52
+#: src/main.cpp:55
 #, fuzzy
 msgid "  -p --port           : Login server port"
 msgstr "  -p --port : Loginserver poort"
 
-#: src/main.cpp:53
+#: src/main.cpp:56
 #, fuzzy
 msgid "     --update-host    : Use this update host"
 msgstr "  -H --update-host : Gebruik deze updatehost"
 
-#: src/main.cpp:54
+#: src/main.cpp:57
 #, fuzzy
 msgid "  -D --default        : Choose default character server and character"
 msgstr "  -D --default : Kies standaard personageserver en personage"
 
-#: src/main.cpp:56
+#: src/main.cpp:59
 #, fuzzy
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr "  -u --skip-update : Sla update downloads over"
 
-#: src/main.cpp:57
+#: src/main.cpp:60
 #, fuzzy
 msgid "  -d --data           : Directory to load game data from"
 msgstr "  -d --data : Map waarvan speldata geladen wordt"
 
-#: src/main.cpp:58
+#: src/main.cpp:61
 #, fuzzy
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
+msgid "     --localdata-dir  : Directory to use as local data directory"
 msgstr "  -S --home-dir : Map te gebruiken als home"
 
-#: src/main.cpp:59
+#: src/main.cpp:62
+#, fuzzy
+msgid "     --chat-log-dir   : Chat log dir to use"
+msgstr "  -C --config-file : Gebruikte configuratiebestand"
+
+#: src/main.cpp:63
 #, fuzzy
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr "  -S --home-dir : Map te gebruiken als home"
 
-#: src/main.cpp:61
+#: src/main.cpp:65
 #, fuzzy
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr "  -O --no-opengl : OpenGL uitschakelen voor deze sessie"
 
-#: src/net/ea/adminhandler.cpp:63
+#: src/net/manaserv/beinghandler.cpp:303 src/net/tmwa/playerhandler.cpp:94
+msgid "You are dead."
+msgstr "Je bent dood."
+
+#: src/net/manaserv/beinghandler.cpp:304 src/net/tmwa/playerhandler.cpp:95
+msgid "We regret to inform you that your character was killed in battle."
+msgstr ""
+"We betreuren het om je te melden dat jouw personage is gestorven in een "
+"gevecht."
+
+#: src/net/manaserv/beinghandler.cpp:306 src/net/tmwa/playerhandler.cpp:97
+msgid "You are not that alive anymore."
+msgstr "Je bent niet langer levend."
+
+#: src/net/manaserv/beinghandler.cpp:307 src/net/tmwa/playerhandler.cpp:98
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr "De koude handen van Pietje de Dood grijpen naar jouw ziel."
+
+#: src/net/manaserv/beinghandler.cpp:308 src/net/tmwa/playerhandler.cpp:99
+msgid "Game Over!"
+msgstr "Game Over!"
+
+#: src/net/manaserv/beinghandler.cpp:309 src/net/tmwa/playerhandler.cpp:101
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+"Neen, kinderen. Jouw personage is niet echt gestorven. Het... euhm... is "
+"naar een beter plaats gegaan."
+
+#: src/net/manaserv/beinghandler.cpp:311 src/net/tmwa/playerhandler.cpp:103
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr ""
+"Jouw plan om vijandelijke wapens te vernietignen door ermee tegen jouw keel "
+"te slaan is mislukt."
+
+#: src/net/manaserv/beinghandler.cpp:313 src/net/tmwa/playerhandler.cpp:105
+msgid "I guess this did not run too well."
+msgstr "Dit verliep niet zoals gepland."
+
+#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:107
+msgid "Do you want your possessions identified?"
+msgstr "Wil je dat jouw bezittingen geïdentificeerd worden?"
+
+#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:109
+msgid "Sadly, no trace of you was ever found..."
+msgstr "Spijtig genoeg, was er geen spoor van jou gevonden..."
+
+#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:111
+msgid "Annihilated."
+msgstr "Verslagen"
+
+#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:113
+msgid "Looks like you got your head handed to you."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:115
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr ""
+"Je hebt het weer verknald, dump jouw lichaam  en ga er een nieuw halen."
+
+#: src/net/manaserv/beinghandler.cpp:323
+#, fuzzy
+msgid "Press OK to respawn."
+msgstr " Druk op OK om te respawnen"
+
+#: src/net/manaserv/beinghandler.cpp:324
+#, fuzzy
+msgid "You Died"
+msgstr "Je stierf"
+
+#: src/net/manaserv/charhandler.cpp:138 src/net/manaserv/charhandler.cpp:209
+#, fuzzy
+msgid "Not logged in."
+msgstr "Reeds aangemeld"
+
+#: src/net/manaserv/charhandler.cpp:141
+msgid "No empty slot."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:144
+msgid "Invalid name."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:147
+#, fuzzy
+msgid "Character's name already exists."
+msgstr "Gebruikersnaam bestaat al"
+
+#: src/net/manaserv/charhandler.cpp:150
+msgid "Invalid hairstyle."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:153
+msgid "Invalid hair color."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:156
+msgid "Invalid gender."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:159
+#, fuzzy
+msgid "Character's stats are too high."
+msgstr "Attributen van personage OK"
+
+#: src/net/manaserv/charhandler.cpp:162
+#, fuzzy
+msgid "Character's stats are too low."
+msgstr "Attributen van personage OK"
+
+#: src/net/manaserv/charhandler.cpp:165
+#, c-format
+msgid "At least one statis out of the permitted range: (%u - %u)."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:171 src/net/manaserv/loginhandler.cpp:96
+#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
+#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
+#: src/net/tmwa/loginhandler.cpp:95 src/net/tmwa/loginhandler.cpp:182
+#, fuzzy
+msgid "Unknown error."
+msgstr "Onbekende foutmelding"
+
+#: src/net/manaserv/charhandler.cpp:200 src/net/tmwa/charserverhandler.cpp:146
+msgid "Info"
+msgstr "Info"
+
+#: src/net/manaserv/charhandler.cpp:200
+#, fuzzy
+msgid "Player deleted."
+msgstr "Personage verwijderd."
+
+#: src/net/manaserv/charhandler.cpp:212
+#, fuzzy
+msgid "Selection out of range."
+msgstr "Selecteer het aantal exemplaren om te verhandelen"
+
+#: src/net/manaserv/charhandler.cpp:215
+#, fuzzy, c-format
+msgid "Unknown error (%d)."
+msgstr "Onbekende foutmelding"
+
+#: src/net/manaserv/charhandler.cpp:250
+msgid "No gameservers are available."
+msgstr "Geen gameservers beschikbaar."
+
+#: src/net/manaserv/chathandler.cpp:187 src/net/manaserv/chathandler.cpp:313
+#: src/net/manaserv/guildhandler.cpp:260
+#, c-format
+msgid "Topic: %s"
+msgstr "Onderwerp: %s"
+
+#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:274
+#, fuzzy
+msgid "Players in this channel:"
+msgstr "Speler raakt Monster"
+
+#: src/net/manaserv/chathandler.cpp:208
+#, fuzzy
+msgid "Error joining channel."
+msgstr "Commando: /join <kanaal>"
+
+#: src/net/manaserv/chathandler.cpp:214
+#, fuzzy
+msgid "Listing channels."
+msgstr "Aanvragen om bij kanaal %s toegevoegd te worden."
+
+#: src/net/manaserv/chathandler.cpp:226
+msgid "End of channel list."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:303
+#, fuzzy, c-format
+msgid "%s entered the channel."
+msgstr "%s heeft zich bij de groep gevoegd."
+
+#: src/net/manaserv/chathandler.cpp:308
+#, c-format
+msgid "%s left the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:324
+#, c-format
+msgid "%s has set mode %s on user %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:334
+#, c-format
+msgid "%s has kicked %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:339
+#, fuzzy
+msgid "Unknown channel event."
+msgstr "Onbekend commando."
+
+#: src/net/manaserv/guildhandler.cpp:82
+msgid "Guild created."
+msgstr "Guild aangemaakt."
+
+#: src/net/manaserv/guildhandler.cpp:87
+msgid "Error creating guild."
+msgstr "Fout bij het creëren van guild."
+
+#: src/net/manaserv/guildhandler.cpp:97
+msgid "Invite sent."
+msgstr "Uitnodiging verzonden."
+
+#: src/net/manaserv/guildhandler.cpp:204
+msgid "Member was promoted successfully."
+msgstr "Lid is succesvol gepromoveerd."
+
+#: src/net/manaserv/guildhandler.cpp:209
+msgid "Failed to promote member."
+msgstr "Kon lid niet promoveren."
+
+#: src/net/manaserv/loginhandler.cpp:87
+#, fuzzy
+msgid "Wrong magic_token."
+msgstr "Verkeerd magie_teken"
+
+#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
+#, fuzzy
+msgid "Already logged in."
+msgstr "Reeds aangemeld"
+
+#: src/net/manaserv/loginhandler.cpp:93
+#, fuzzy
+msgid "Account banned."
+msgstr "Account verlopen"
+
+#: src/net/manaserv/loginhandler.cpp:118
+#, fuzzy
+msgid "New password incorrect."
+msgstr "Nieuw wachtwoord is incorrect"
+
+#: src/net/manaserv/loginhandler.cpp:121 src/net/tmwa/loginhandler.cpp:89
+#, fuzzy
+msgid "Old password incorrect."
+msgstr "Oud wachtwoord incorrect"
+
+#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
+msgid "Account not connected. Please login first."
+msgstr "Account niet verbonden. Log eerst in aub."
+
+#: src/net/manaserv/loginhandler.cpp:149
+#, fuzzy
+msgid "New email address incorrect."
+msgstr "Nieuw emailadres is incorrect"
+
+#: src/net/manaserv/loginhandler.cpp:152
+#, fuzzy
+msgid "Old email address incorrect."
+msgstr "Oud emailadres is incorrect"
+
+#: src/net/manaserv/loginhandler.cpp:158
+#, fuzzy
+msgid "The new email address already exists."
+msgstr "Het nieuwe emailadres bestaat al."
+
+#: src/net/manaserv/loginhandler.cpp:239
+msgid ""
+"Client registration is not allowed. Please contact server administration."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
+#, fuzzy
+msgid "Client version is too old."
+msgstr "Te oude Client versie"
+
+#: src/net/manaserv/loginhandler.cpp:266
+#, fuzzy
+msgid "Wrong username or password."
+msgstr "Verkeerde gebruikersnaam of wachtwoord"
+
+#: src/net/manaserv/loginhandler.cpp:272
+#, fuzzy
+msgid "Account banned"
+msgstr "Account verlopen"
+
+#: src/net/manaserv/loginhandler.cpp:275
+msgid "Login attempt too soon after previous attempt."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:303
+#, fuzzy
+msgid "Wrong username, password or email address."
+msgstr "Verkeerde gebruikersnaam, wachtwoord of emailadres"
+
+#: src/net/manaserv/loginhandler.cpp:306
+#, fuzzy
+msgid "Username already exists."
+msgstr "Gebruikersnaam bestaat al"
+
+#: src/net/manaserv/loginhandler.cpp:309
+#, fuzzy
+msgid "Email address already exists."
+msgstr "emailadres bestaat al"
+
+#: src/net/manaserv/loginhandler.cpp:312
+msgid "You took too long with the captcha or your response was incorrect."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:87
+msgid "Joined party."
+msgstr "Bijgevoegd bij groep."
+
+#: src/net/manaserv/partyhandler.cpp:105
+#, c-format
+msgid "%s joined the party."
+msgstr "%s heeft zich bij de groep gevoegd."
+
+#: src/net/manaserv/partyhandler.cpp:123
+#, fuzzy, c-format
+msgid "%s rejected your invite."
+msgstr "%s wees jouw uitnodiging af."
+
+#: src/net/manaserv/tradehandler.cpp:95
+msgid "Accepting incoming trade requests."
+msgstr "Inkomende handelsaanvragen accepteren."
+
+#: src/net/manaserv/tradehandler.cpp:97
+msgid "Ignoring incoming trade requests."
+msgstr "Inkomende handelsaanvragen negeren."
+
+#: src/net/manaserv/tradehandler.cpp:115 src/net/tmwa/tradehandler.cpp:109
+msgid "Request for Trade"
+msgstr "Handel aanvragen"
+
+#: src/net/manaserv/tradehandler.cpp:116 src/net/tmwa/tradehandler.cpp:110
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
+msgstr "%s wil met jou handelen, aanvaard je dit?"
+
+#: src/net/manaserv/tradehandler.cpp:134
+#, c-format
+msgid "Trading with %s"
+msgstr "Handelen met %s"
+
+#: src/net/manaserv/tradehandler.cpp:148 src/net/tmwa/tradehandler.cpp:224
+msgid "Trade canceled."
+msgstr "Handel geannuleerd."
+
+#: src/net/manaserv/tradehandler.cpp:155 src/net/tmwa/tradehandler.cpp:231
+msgid "Trade completed."
+msgstr "Handel voltooid."
+
+#: src/net/tmwa/adminhandler.cpp:64
 msgid "Kick failed!"
 msgstr "Kick gefaald!"
 
-#: src/net/ea/adminhandler.cpp:65
+#: src/net/tmwa/adminhandler.cpp:66
 msgid "Kick succeeded!"
 msgstr "Kick succesvol!"
 
-#: src/net/ea/buysellhandler.cpp:110
+#: src/net/tmwa/buysellhandler.cpp:109
 msgid "Nothing to sell."
 msgstr "Niets te verkopen."
 
-#: src/net/ea/buysellhandler.cpp:117
+#: src/net/tmwa/buysellhandler.cpp:116
 msgid "Thanks for buying."
 msgstr "Bedankt voor de aankopen."
 
-#: src/net/ea/buysellhandler.cpp:124
+#: src/net/tmwa/buysellhandler.cpp:123
 msgid "Unable to buy."
 msgstr "Kan niets kopen."
 
-#: src/net/ea/buysellhandler.cpp:130
+#: src/net/tmwa/buysellhandler.cpp:129
 msgid "Thanks for selling."
 msgstr "Bedankt voor het verkopen."
 
-#: src/net/ea/buysellhandler.cpp:132
+#: src/net/tmwa/buysellhandler.cpp:131
 msgid "Unable to sell."
 msgstr "Kan niets verkopen."
 
-#: src/net/ea/charserverhandler.cpp:103
-#, fuzzy
-msgid "Access denied."
-msgstr "Toegang geweigerd"
+#: src/net/tmwa/charserverhandler.cpp:103
+msgid "Access denied. Most likely, there are too many players on this server."
+msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:106
+#: src/net/tmwa/charserverhandler.cpp:107
 #, fuzzy
 msgid "Cannot use this ID."
 msgstr "Kan deze ID niet gebruiken"
 
-#: src/net/ea/charserverhandler.cpp:109
+#: src/net/tmwa/charserverhandler.cpp:110
 #, fuzzy
-msgid "Unknown failure to select character."
-msgstr "Onbekende fout bij het selecteren van personage"
+msgid "Unknown char-server failure."
+msgstr "Onbekende foutmelding"
 
-#: src/net/ea/charserverhandler.cpp:135
+#: src/net/tmwa/charserverhandler.cpp:134
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr "Kan personage niet aanmaken. Waarschijnlijk bestaat de naam al."
 
-#: src/net/ea/charserverhandler.cpp:147 src/net/manaserv/charhandler.cpp:187
-msgid "Info"
-msgstr "Info"
-
-#: src/net/ea/charserverhandler.cpp:147
+#: src/net/tmwa/charserverhandler.cpp:146
 msgid "Character deleted."
 msgstr "Personage verwijderd."
 
-#: src/net/ea/charserverhandler.cpp:152
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Failed to delete character."
 msgstr "Kon personage niet verwijderen."
 
-#: src/net/ea/charserverhandler.cpp:237 src/net/manaserv/charhandler.cpp:263
+#: src/net/tmwa/charserverhandler.cpp:266
 msgid "Strength:"
 msgstr "Sterkte:"
 
-#: src/net/ea/charserverhandler.cpp:238 src/net/manaserv/charhandler.cpp:264
+#: src/net/tmwa/charserverhandler.cpp:267
 msgid "Agility:"
 msgstr "Agiliteit:"
 
-#: src/net/ea/charserverhandler.cpp:239 src/net/manaserv/charhandler.cpp:266
+#: src/net/tmwa/charserverhandler.cpp:268
 msgid "Vitality:"
 msgstr "Vitaliteit:"
 
-#: src/net/ea/charserverhandler.cpp:240 src/net/manaserv/charhandler.cpp:267
+#: src/net/tmwa/charserverhandler.cpp:269
 msgid "Intelligence:"
 msgstr "Intelligentie:"
 
-#: src/net/ea/charserverhandler.cpp:241 src/net/manaserv/charhandler.cpp:265
+#: src/net/tmwa/charserverhandler.cpp:270
 msgid "Dexterity:"
 msgstr "Dexteriteit:"
 
-#: src/net/ea/charserverhandler.cpp:242
+#: src/net/tmwa/charserverhandler.cpp:271
 msgid "Luck:"
 msgstr "Geluk:"
 
-#: src/net/ea/chathandler.cpp:80
-msgid "Whisper could not be sent, user is offline."
+#: src/net/tmwa/chathandler.cpp:87
+#, fuzzy, c-format
+msgid "Whisper could not be sent, %s is offline."
 msgstr "Fluisterbericht kon niet verzonden worden, gebruiker is offline."
 
-#: src/net/ea/chathandler.cpp:84
-msgid "Whisper could not be sent, ignored by user."
+#: src/net/tmwa/chathandler.cpp:96
+#, fuzzy, c-format
+msgid "Whisper could not be sent, ignored by %s."
 msgstr "Fluisterbericht kon niet verzonden worden, genegeerd door gebruiker."
 
-#: src/net/ea/chathandler.cpp:171
+#: src/net/tmwa/chathandler.cpp:230
 #, fuzzy
 msgid "MVP player."
 msgstr "Speler"
 
-#: src/net/ea/chathandler.cpp:204 src/net/ea/chathandler.cpp:210
-#: src/net/ea/chathandler.cpp:215 src/net/ea/chathandler.cpp:220
-#: src/net/ea/chathandler.cpp:225 src/net/ea/chathandler.cpp:230
-#: src/net/ea/chathandler.cpp:235 src/net/ea/chathandler.cpp:240
+#: src/net/tmwa/chathandler.cpp:265 src/net/tmwa/chathandler.cpp:271
+#: src/net/tmwa/chathandler.cpp:276 src/net/tmwa/chathandler.cpp:281
+#: src/net/tmwa/chathandler.cpp:286 src/net/tmwa/chathandler.cpp:291
+#: src/net/tmwa/chathandler.cpp:296 src/net/tmwa/chathandler.cpp:301
 msgid "Channels are not supported!"
 msgstr "Kanalen worden niet ondersteund!"
 
-#: src/net/ea/gamehandler.cpp:86
+#: src/net/tmwa/gamehandler.cpp:88
 #, c-format
 msgid "Online users: %d"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:100
+#: src/net/tmwa/gamehandler.cpp:101
 #, fuzzy
 msgid "Game"
 msgstr "Naam"
 
-#: src/net/ea/gamehandler.cpp:100
+#: src/net/tmwa/gamehandler.cpp:101
 #, fuzzy
 msgid "Request to quit denied!"
 msgstr "Handel aanvragen"
 
-#: src/net/ea/generalhandler.cpp:102 src/net/manaserv/generalhandler.cpp:95
+#: src/net/tmwa/generalhandler.cpp:102
 #, c-format
 msgid "Strength %+d"
 msgstr "Kracht %+d"
 
-#: src/net/ea/generalhandler.cpp:103 src/net/manaserv/generalhandler.cpp:96
+#: src/net/tmwa/generalhandler.cpp:103
 #, c-format
 msgid "Agility %+d"
 msgstr "Behandigheid %+d"
 
-#: src/net/ea/generalhandler.cpp:104 src/net/manaserv/generalhandler.cpp:98
+#: src/net/tmwa/generalhandler.cpp:104
 #, c-format
 msgid "Vitality %+d"
 msgstr "Vitaliteit %+d"
 
-#: src/net/ea/generalhandler.cpp:105 src/net/manaserv/generalhandler.cpp:99
+#: src/net/tmwa/generalhandler.cpp:105
 #, c-format
 msgid "Intelligence %+d"
 msgstr "Intelligentie %+d"
 
-#: src/net/ea/generalhandler.cpp:106 src/net/manaserv/generalhandler.cpp:97
+#: src/net/tmwa/generalhandler.cpp:106
 #, c-format
 msgid "Dexterity %+d"
 msgstr "Vaardigheid %+d"
 
-#: src/net/ea/generalhandler.cpp:107
+#: src/net/tmwa/generalhandler.cpp:107
 #, c-format
 msgid "Luck %+d"
 msgstr "Geluk %+d"
 
-#: src/net/ea/generalhandler.cpp:130
+#: src/net/tmwa/generalhandler.cpp:132
 #, fuzzy
 msgid "Authentication failed."
 msgstr "Authenticatie mislukt"
 
-#: src/net/ea/generalhandler.cpp:133
+#: src/net/tmwa/generalhandler.cpp:135
 #, fuzzy
 msgid "No servers available."
 msgstr "Geen servers beschikbaar"
 
-#: src/net/ea/generalhandler.cpp:137
+#: src/net/tmwa/generalhandler.cpp:139
 #, fuzzy
 msgid "Someone else is trying to use this account."
 msgstr "Iemand anders probeert deze account te gebruiken"
 
-#: src/net/ea/generalhandler.cpp:140
+#: src/net/tmwa/generalhandler.cpp:142
 #, fuzzy
 msgid "This account is already logged in."
 msgstr "Deze account is reeds aangemeld"
 
-#: src/net/ea/generalhandler.cpp:143
+#: src/net/tmwa/generalhandler.cpp:145
 #, fuzzy
 msgid "Speed hack detected."
 msgstr "Speedhack gedetecteerd"
 
-#: src/net/ea/generalhandler.cpp:146
+#: src/net/tmwa/generalhandler.cpp:148
 #, fuzzy
 msgid "Duplicated login."
 msgstr "Dubbele login"
 
-#: src/net/ea/generalhandler.cpp:149
+#: src/net/tmwa/generalhandler.cpp:151
 #, fuzzy
 msgid "Unknown connection error."
 msgstr "Onbekenden connectiefout"
 
-#: src/net/ea/generalhandler.cpp:205
+#: src/net/tmwa/generalhandler.cpp:209
 msgid "Got disconnected from server!"
 msgstr "De verbinding met de server werd verbroken!"
 
-#: src/net/ea/generalhandler.cpp:216 src/net/manaserv/generalhandler.cpp:166
+#: src/net/tmwa/generalhandler.cpp:230
 msgid "Strength"
 msgstr "Kracht"
 
-#: src/net/ea/generalhandler.cpp:217 src/net/manaserv/generalhandler.cpp:167
+#: src/net/tmwa/generalhandler.cpp:231
 msgid "Agility"
 msgstr "Behendigheid"
 
-#: src/net/ea/generalhandler.cpp:218 src/net/manaserv/generalhandler.cpp:169
+#: src/net/tmwa/generalhandler.cpp:232
 msgid "Vitality"
 msgstr "Vitaliteit"
 
-#: src/net/ea/generalhandler.cpp:219 src/net/manaserv/generalhandler.cpp:170
+#: src/net/tmwa/generalhandler.cpp:233
 msgid "Intelligence"
 msgstr "Intelligentie"
 
-#: src/net/ea/generalhandler.cpp:220 src/net/manaserv/generalhandler.cpp:168
+#: src/net/tmwa/generalhandler.cpp:234
 msgid "Dexterity"
 msgstr "Vaardigheid"
 
-#: src/net/ea/generalhandler.cpp:221
+#: src/net/tmwa/generalhandler.cpp:235
 msgid "Luck"
 msgstr "Geluk"
 
-#: src/net/ea/generalhandler.cpp:224
+#: src/net/tmwa/generalhandler.cpp:238
 #, fuzzy
 msgid "Defense"
 msgstr "Verdediging:"
 
-#: src/net/ea/generalhandler.cpp:225
+#: src/net/tmwa/generalhandler.cpp:239
 #, fuzzy
 msgid "M.Attack"
 msgstr "Magische Aanval:"
 
-#: src/net/ea/generalhandler.cpp:226
+#: src/net/tmwa/generalhandler.cpp:240
 #, fuzzy
 msgid "M.Defense"
 msgstr "Magische Verdediging:"
 
-#: src/net/ea/generalhandler.cpp:227
+#: src/net/tmwa/generalhandler.cpp:241
 #, fuzzy, c-format
 msgid "% Accuracy"
 msgstr "% Nauwkeurigheid:"
 
-#: src/net/ea/generalhandler.cpp:228
+#: src/net/tmwa/generalhandler.cpp:242
 #, fuzzy, c-format
 msgid "% Evade"
 msgstr "% Ontwijking:"
 
-#: src/net/ea/generalhandler.cpp:229
+#: src/net/tmwa/generalhandler.cpp:243
 #, fuzzy, c-format
 msgid "% Critical"
 msgstr "Kritieke aanval"
 
-#: src/net/ea/gui/guildtab.cpp:45
+#: src/net/tmwa/gui/guildtab.cpp:45
 msgid "Guild"
 msgstr "Guild"
 
-#: src/net/ea/gui/guildtab.cpp:61 src/net/ea/gui/partytab.cpp:59
+#: src/net/tmwa/gui/guildtab.cpp:61 src/net/tmwa/gui/partytab.cpp:59
 msgid "/help > Display this help."
 msgstr "/help > Geeft deze help weer."
 
-#: src/net/ea/gui/guildtab.cpp:62
+#: src/net/tmwa/gui/guildtab.cpp:62
 #, fuzzy
 msgid "/invite > Invite a player to your guild"
 msgstr "/invite > Nodig een speler uit voor jouw groep"
 
-#: src/net/ea/gui/guildtab.cpp:63
+#: src/net/tmwa/gui/guildtab.cpp:63
 #, fuzzy
 msgid "/leave > Leave the guild you are in"
 msgstr "/leave > Verlaat de groep waarin je je bevindt"
 
-#: src/net/ea/gui/guildtab.cpp:64
+#: src/net/tmwa/gui/guildtab.cpp:64
 #, fuzzy
 msgid "/kick > Kick some one from the guild you are in"
 msgstr "/kick > Verwijder iemand vanuit de groep waarin je bent"
 
-#: src/net/ea/gui/guildtab.cpp:73 src/net/ea/gui/partytab.cpp:73
+#: src/net/tmwa/gui/guildtab.cpp:73 src/net/tmwa/gui/partytab.cpp:73
 msgid "Command: /invite <nick>"
 msgstr "Commando: /invite <nick>"
 
-#: src/net/ea/gui/guildtab.cpp:74
+#: src/net/tmwa/gui/guildtab.cpp:74
 #, fuzzy
 msgid "This command invites <nick> to the guild you're in."
 msgstr "Dit commando nodigt <nick> uit om een groep te vormen met jou."
 
-#: src/net/ea/gui/guildtab.cpp:80 src/net/ea/gui/partytab.cpp:80
+#: src/net/tmwa/gui/guildtab.cpp:80 src/net/tmwa/gui/partytab.cpp:80
 msgid "Command: /leave"
 msgstr "Commando: /leave"
 
-#: src/net/ea/gui/guildtab.cpp:81
+#: src/net/tmwa/gui/guildtab.cpp:81
 #, fuzzy
 msgid "This command causes the player to leave the guild."
 msgstr "Dit commando zorgt ervoor dat de speler de groep verlaat."
 
-#: src/net/ea/gui/guildtab.cpp:89
+#: src/net/tmwa/gui/guildtab.cpp:89
 #, fuzzy
 msgid "Guild name is missing."
 msgstr "Groepsnaam ontbreekt."
 
-#: src/net/ea/guildhandler.cpp:293
+#: src/net/tmwa/guildhandler.cpp:296
 msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:298
+#: src/net/tmwa/guildhandler.cpp:301
 msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:303
+#: src/net/tmwa/guildhandler.cpp:306
 #, fuzzy
 msgid "User is now part of your guild."
 msgstr "%s is nu een lid van jouw groep."
 
-#: src/net/ea/guildhandler.cpp:308
+#: src/net/tmwa/guildhandler.cpp:311
 msgid "Your guild is full."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:313
+#: src/net/tmwa/guildhandler.cpp:316
 #, fuzzy
 msgid "Unknown guild invite response."
 msgstr "Onbekend uitnodigingsantwoord van %s."
 
-#: src/net/ea/guildhandler.cpp:390
+#: src/net/tmwa/guildhandler.cpp:393
 msgid "Guild creation isn't supported yet."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:43
+#: src/net/tmwa/gui/partytab.cpp:43
 msgid "Party"
 msgstr "Groep"
 
-#: src/net/ea/gui/partytab.cpp:60
+#: src/net/tmwa/gui/partytab.cpp:60
 msgid "/invite > Invite a player to your party"
 msgstr "/invite > Nodig een speler uit voor jouw groep"
 
-#: src/net/ea/gui/partytab.cpp:61
+#: src/net/tmwa/gui/partytab.cpp:61
 msgid "/leave > Leave the party you are in"
 msgstr "/leave > Verlaat de groep waarin je je bevindt"
 
-#: src/net/ea/gui/partytab.cpp:62
+#: src/net/tmwa/gui/partytab.cpp:62
 msgid "/kick > Kick some one from the party you are in"
 msgstr "/kick > Verwijder iemand vanuit de groep waarin je bent"
 
-#: src/net/ea/gui/partytab.cpp:63
+#: src/net/tmwa/gui/partytab.cpp:63
 msgid "/item > Show/change party item sharing options"
 msgstr "/item > Geeft weer/wijzigt de opties voor voorwerpdeling"
 
-#: src/net/ea/gui/partytab.cpp:64
+#: src/net/tmwa/gui/partytab.cpp:64
 msgid "/exp > Show/change party experience sharing options"
 msgstr "/exp > Geeft weer/wijzigt de ervaringsdelingsopties"
 
-#: src/net/ea/gui/partytab.cpp:81
+#: src/net/tmwa/gui/partytab.cpp:81
 msgid "This command causes the player to leave the party."
 msgstr "Dit commando zorgt ervoor dat de speler de groep verlaat."
 
-#: src/net/ea/gui/partytab.cpp:85
+#: src/net/tmwa/gui/partytab.cpp:85
 msgid "Command: /item <policy>"
 msgstr "Commando: /item <beleid>"
 
-#: src/net/ea/gui/partytab.cpp:86
+#: src/net/tmwa/gui/partytab.cpp:86
 msgid "This command changes the party's item sharing policy."
 msgstr "Dit commando wijzigt het voorwerpdelingsbeleid van de groep."
 
-#: src/net/ea/gui/partytab.cpp:87
+#: src/net/tmwa/gui/partytab.cpp:87
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
 msgstr ""
-"<beleid> kan een van de volgende zijn om voorwerpdeling in te schakelen: \"1"
-"\", \"yes\", \"true\". Of om voorwerpdeling uit te schakelen: \"0\", \"no\", "
-"\"false\"."
+"<beleid> kan een van de volgende zijn om voorwerpdeling in te schakelen: "
+"\"1\", \"yes\", \"true\". Of om voorwerpdeling uit te schakelen: \"0\", \"no"
+"\", \"false\"."
 
-#: src/net/ea/gui/partytab.cpp:90
+#: src/net/tmwa/gui/partytab.cpp:90
 msgid "Command: /item"
 msgstr "Commando: /item"
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/tmwa/gui/partytab.cpp:91
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 "Dit commando geeft het huidige voorwerpdelingsbeleid van de groep weer."
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/tmwa/gui/partytab.cpp:95
 msgid "Command: /exp <policy>"
 msgstr "Commando: /exp <beleid>"
 
-#: src/net/ea/gui/partytab.cpp:96
+#: src/net/tmwa/gui/partytab.cpp:96
 msgid "This command changes the party's experience sharing policy."
 msgstr "Dit commando wijzigt het ervaringsdelingsbeleid van de groep."
 
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/tmwa/gui/partytab.cpp:97
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 msgstr ""
-"<beleid> kan een van de volgende zijn om ervaringsdeling in te schakelen: \"1"
-"\", \"true\", \"yes\". Of om ervaringsdeling uit te schakelen: \"0\", \"false"
-"\", \"no\"."
+"<beleid> kan een van de volgende zijn om ervaringsdeling in te schakelen: "
+"\"1\", \"true\", \"yes\". Of om ervaringsdeling uit te schakelen: \"0\", "
+"\"false\", \"no\"."
 
-#: src/net/ea/gui/partytab.cpp:100
+#: src/net/tmwa/gui/partytab.cpp:100
 msgid "Command: /exp"
 msgstr "Commando: /exp"
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/tmwa/gui/partytab.cpp:101
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 "Dit commando geeft het huidige ervaringsdelingbeleid van de groep weer."
 
-#: src/net/ea/gui/partytab.cpp:132 src/net/ea/partyhandler.cpp:198
+#: src/net/tmwa/gui/partytab.cpp:132 src/net/tmwa/partyhandler.cpp:196
 msgid "Item sharing enabled."
 msgstr "Voorwerpdeling ingeschakeld."
 
-#: src/net/ea/gui/partytab.cpp:135 src/net/ea/partyhandler.cpp:204
+#: src/net/tmwa/gui/partytab.cpp:135 src/net/tmwa/partyhandler.cpp:202
 msgid "Item sharing disabled."
 msgstr "Voorwerpdeling uitgeschakeld."
 
-#: src/net/ea/gui/partytab.cpp:138 src/net/ea/partyhandler.cpp:210
+#: src/net/tmwa/gui/partytab.cpp:138 src/net/tmwa/partyhandler.cpp:208
 msgid "Item sharing not possible."
 msgstr "Voorwerpdeling is niet mogelijk."
 
-#: src/net/ea/gui/partytab.cpp:141
+#: src/net/tmwa/gui/partytab.cpp:141
 #, fuzzy
 msgid "Item sharing unknown."
 msgstr "Voorwerpdeling ingeschakeld."
 
-#: src/net/ea/gui/partytab.cpp:167 src/net/ea/partyhandler.cpp:174
+#: src/net/tmwa/gui/partytab.cpp:167 src/net/tmwa/partyhandler.cpp:172
 msgid "Experience sharing enabled."
 msgstr "Ervaringsdeling ingeschakeld."
 
-#: src/net/ea/gui/partytab.cpp:170 src/net/ea/partyhandler.cpp:180
+#: src/net/tmwa/gui/partytab.cpp:170 src/net/tmwa/partyhandler.cpp:178
 msgid "Experience sharing disabled."
 msgstr "Ervaringsdeling uitgeschakeld."
 
-#: src/net/ea/gui/partytab.cpp:173 src/net/ea/partyhandler.cpp:186
+#: src/net/tmwa/gui/partytab.cpp:173 src/net/tmwa/partyhandler.cpp:184
 msgid "Experience sharing not possible."
 msgstr "Ervaringsdeling is niet mogelijk."
 
-#: src/net/ea/gui/partytab.cpp:176
+#: src/net/tmwa/gui/partytab.cpp:176
 #, fuzzy
 msgid "Experience sharing unknown."
 msgstr "Ervaringsdeling ingeschakeld."
 
-#: src/net/ea/inventoryhandler.cpp:281
+#: src/net/tmwa/inventoryhandler.cpp:285
 msgid "Failed to use item."
 msgstr "Kan voorwerp niet gebruiken."
 
-#: src/net/ea/inventoryhandler.cpp:391
+#: src/net/tmwa/inventoryhandler.cpp:399
 msgid "Unable to equip."
 msgstr "Kan dit niet uitrusten."
 
-#: src/net/ea/inventoryhandler.cpp:402
+#: src/net/tmwa/inventoryhandler.cpp:410
 msgid "Unable to unequip."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:79
+#: src/net/tmwa/loginhandler.cpp:86
 msgid "Account was not found. Please re-login."
 msgstr "Account was niet gevonden. Probeer opnieuw in te loggen aub."
 
-#: src/net/ea/loginhandler.cpp:82 src/net/manaserv/loginhandler.cpp:121
-#, fuzzy
-msgid "Old password incorrect."
-msgstr "Oud wachtwoord incorrect"
-
-#: src/net/ea/loginhandler.cpp:85
+#: src/net/tmwa/loginhandler.cpp:92
 #, fuzzy
 msgid "New password too short."
 msgstr "Nieuw wachtwoord is te kort"
 
-#: src/net/ea/loginhandler.cpp:88 src/net/ea/loginhandler.cpp:175
-#: src/net/manaserv/charhandler.cpp:158 src/net/manaserv/loginhandler.cpp:96
-#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
-#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
-#, fuzzy
-msgid "Unknown error."
-msgstr "Onbekende foutmelding"
-
-#: src/net/ea/loginhandler.cpp:149
+#: src/net/tmwa/loginhandler.cpp:156
 #, fuzzy
 msgid "Unregistered ID."
 msgstr "Ongeregistreerde ID"
 
-#: src/net/ea/loginhandler.cpp:152
+#: src/net/tmwa/loginhandler.cpp:159
 #, fuzzy
 msgid "Wrong password."
 msgstr "Onjuist wachtwoord"
 
-#: src/net/ea/loginhandler.cpp:155
+#: src/net/tmwa/loginhandler.cpp:162
 #, fuzzy
 msgid "Account expired."
 msgstr "Account verlopen"
 
-#: src/net/ea/loginhandler.cpp:158
+#: src/net/tmwa/loginhandler.cpp:165
 #, fuzzy
 msgid "Rejected from server."
 msgstr "Geweerd van server"
 
-#: src/net/ea/loginhandler.cpp:161
+#: src/net/tmwa/loginhandler.cpp:168
 #, fuzzy
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 "Je bent permanent geband van het spel. Neem aub contact op met het GM team."
 
-#: src/net/ea/loginhandler.cpp:165
+#: src/net/tmwa/loginhandler.cpp:172
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -2904,671 +3304,370 @@ msgstr ""
 "Je bent tijdelijk geband van het spel tot %s.\n"
 "Neem aub contact op met het GM team via de forums."
 
-#: src/net/ea/loginhandler.cpp:172
+#: src/net/tmwa/loginhandler.cpp:179
 #, fuzzy
 msgid "This user name is already taken."
 msgstr "Deze gebruikersnaam bestaat al"
 
-#: src/net/ea/network.cpp:145
+#: src/net/tmwa/network.cpp:145
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/ea/network.cpp:345
+#: src/net/tmwa/network.cpp:345
 #, fuzzy
 msgid "Unable to resolve host \""
 msgstr "Kan niets verkopen."
 
-#: src/net/ea/network.cpp:414
+#: src/net/tmwa/network.cpp:414
 #, fuzzy
 msgid "Connection to server terminated. "
 msgstr "Verbinden met de map server..."
 
-#: src/net/ea/partyhandler.cpp:81
+#: src/net/tmwa/partyhandler.cpp:82
 msgid "Could not create party."
 msgstr "Kan geen groep aanmaken."
 
-#: src/net/ea/partyhandler.cpp:84
+#: src/net/tmwa/partyhandler.cpp:84
 msgid "Party successfully created."
 msgstr "Groep succesvol aangemaakt."
 
-#: src/net/ea/partyhandler.cpp:118
+#: src/net/tmwa/partyhandler.cpp:119
 #, c-format
 msgid "%s is already a member of a party."
 msgstr "%s is al een lid van een groep."
 
-#: src/net/ea/partyhandler.cpp:122
+#: src/net/tmwa/partyhandler.cpp:123
 #, c-format
 msgid "%s refused your invitation."
 msgstr "%s wees jouw uitnodiging af."
 
-#: src/net/ea/partyhandler.cpp:126
+#: src/net/tmwa/partyhandler.cpp:127
 #, c-format
 msgid "%s is now a member of your party."
 msgstr "%s is nu een lid van jouw groep."
 
-#: src/net/ea/partyhandler.cpp:130
+#: src/net/tmwa/partyhandler.cpp:131
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr "Onbekend uitnodigingsantwoord van %s."
 
-#: src/net/ea/partyhandler.cpp:238
+#: src/net/tmwa/partyhandler.cpp:236
 msgid "You have left the party."
 msgstr "Je hebt de groep verlaten."
 
-#: src/net/ea/partyhandler.cpp:249
+#: src/net/tmwa/partyhandler.cpp:246
 #, c-format
 msgid "%s has left your party."
 msgstr "%s heeft jouw groep verlaten."
 
-#: src/net/ea/partyhandler.cpp:301
+#: src/net/tmwa/partyhandler.cpp:299
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr "Een onbekend lid probeerde te zeggen: %s"
 
-#: src/net/ea/partyhandler.cpp:329
-msgid "Inviting like this isn't supported at the moment."
-msgstr "Op deze manier iemand uitnodigen wordt momenteel niet ondersteund."
+#: src/net/tmwa/partyhandler.cpp:335
+#, c-format
+msgid "Inviting failed, because you can't see a player called %s."
+msgstr ""
 
-#: src/net/ea/partyhandler.cpp:334
+#: src/net/tmwa/partyhandler.cpp:340
 msgid "You can only inivte when you are in a party!"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:365
+#: src/net/tmwa/partyhandler.cpp:368
 #, c-format
 msgid "%s is not in your party!"
 msgstr "%s is niet in jouw groep!"
 
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:304
-msgid "You are dead."
-msgstr "Je bent dood."
-
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:305
-msgid "We regret to inform you that your character was killed in battle."
-msgstr ""
-"We betreuren het om je te melden dat jouw personage is gestorven in een "
-"gevecht."
-
-#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:307
-msgid "You are not that alive anymore."
-msgstr "Je bent niet langer levend."
-
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:308
-msgid "The cold hands of the grim reaper are grabbing for your soul."
-msgstr "De koude handen van Pietje de Dood grijpen naar jouw ziel."
-
-#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:309
-msgid "Game Over!"
-msgstr "Game Over!"
-
-#: src/net/ea/playerhandler.cpp:105
+#: src/net/tmwa/playerhandler.cpp:100
 msgid "Insert coin to continue."
 msgstr "Werp een muntstuk in om verder te spelen."
 
-#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:310
-msgid ""
-"No, kids. Your character did not really die. It... err... went to a better "
-"place."
-msgstr ""
-"Neen, kinderen. Jouw personage is niet echt gestorven. Het... euhm... is "
-"naar een beter plaats gegaan."
-
-#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:312
-msgid ""
-"Your plan of breaking your enemies weapon by bashing it with your throat "
-"failed."
-msgstr ""
-"Jouw plan om vijandelijke wapens te vernietignen door ermee tegen jouw keel "
-"te slaan is mislukt."
-
-#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:314
-msgid "I guess this did not run too well."
-msgstr "Dit verliep niet zoals gepland."
-
-#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:315
-msgid "Do you want your possessions identified?"
-msgstr "Wil je dat jouw bezittingen geïdentificeerd worden?"
-
-#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:316
-msgid "Sadly, no trace of you was ever found..."
-msgstr "Spijtig genoeg, was er geen spoor van jou gevonden..."
-
-#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:317
-msgid "Annihilated."
-msgstr "Verslagen"
-
-#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:318
-msgid "Looks like you got your head handed to you."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:120 src/net/manaserv/beinghandler.cpp:319
-msgid ""
-"You screwed up again, dump your body down the tubes and get you another one."
-msgstr ""
-"Je hebt het weer verknald, dump jouw lichaam  en ga er een nieuw halen."
-
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/tmwa/playerhandler.cpp:118
 msgid "You're not dead yet. You're just resting."
 msgstr "Je bent nog niet dood. Je bent maar aan het rusten."
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/tmwa/playerhandler.cpp:119
 msgid "You are no more."
 msgstr "Je bent niet langer."
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/tmwa/playerhandler.cpp:120
 msgid "You have ceased to be."
 msgstr "Je hebt opgehouden te zijn."
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/tmwa/playerhandler.cpp:121
 msgid "You've expired and gone to meet your maker."
 msgstr "Je bent verlopen en gaat een bezoekje maken bij jouw schepper."
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/tmwa/playerhandler.cpp:122
 msgid "You're a stiff."
 msgstr "Je bent stokstijf."
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/tmwa/playerhandler.cpp:123
 msgid "Bereft of life, you rest in peace."
 msgstr "Beroofd van het leven, rust je in vrede."
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/tmwa/playerhandler.cpp:124
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:130
+#: src/net/tmwa/playerhandler.cpp:125
 msgid "Your metabolic processes are now history."
 msgstr "Jouw metabolische processen behoren nu tot het verleden."
 
-#: src/net/ea/playerhandler.cpp:131
+#: src/net/tmwa/playerhandler.cpp:126
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/tmwa/playerhandler.cpp:127
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/tmwa/playerhandler.cpp:128
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:135
+#: src/net/tmwa/playerhandler.cpp:130
 msgid "You are an ex-player."
 msgstr "Je bent een ex-speler."
 
-#: src/net/ea/playerhandler.cpp:136
+#: src/net/tmwa/playerhandler.cpp:131
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:249 src/net/ea/playerhandler.cpp:310
+#: src/net/tmwa/playerhandler.cpp:246 src/net/tmwa/playerhandler.cpp:285
 msgid "Message"
 msgstr "Bericht"
 
-#: src/net/ea/playerhandler.cpp:250
+#: src/net/tmwa/playerhandler.cpp:247
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 "Je draagt meer dan de helft van jouw eigen gewicht. Je kan geen leven "
 "herstellen."
 
-#: src/net/ea/playerhandler.cpp:333
+#: src/net/tmwa/playerhandler.cpp:313
 #, fuzzy, c-format
 msgid "You picked up %s."
 msgstr "Je raapte op: "
 
-#: src/net/ea/playerhandler.cpp:369
+#: src/net/tmwa/playerhandler.cpp:348
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:532
+#: src/net/tmwa/playerhandler.cpp:488
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:147
+#: src/net/tmwa/specialhandler.cpp:144
 msgid "Trade failed!"
 msgstr "Handel mislukte!"
 
-#: src/net/ea/specialhandler.cpp:150
+#: src/net/tmwa/specialhandler.cpp:147
 msgid "Emote failed!"
 msgstr "Emoticon gefaald!"
 
-#: src/net/ea/specialhandler.cpp:153
+#: src/net/tmwa/specialhandler.cpp:150
 msgid "Sit failed!"
 msgstr "Zitten niet mogelijk!"
 
-#: src/net/ea/specialhandler.cpp:156
+#: src/net/tmwa/specialhandler.cpp:153
 msgid "Chat creating failed!"
 msgstr "Chatcreatie mislukte!"
 
-#: src/net/ea/specialhandler.cpp:159
+#: src/net/tmwa/specialhandler.cpp:156
 msgid "Could not join party!"
 msgstr "Kan je niet bij de groep voegen!"
 
-#: src/net/ea/specialhandler.cpp:162
+#: src/net/tmwa/specialhandler.cpp:159
 msgid "Cannot shout!"
 msgstr "Kan niet roepen!"
 
-#: src/net/ea/specialhandler.cpp:171
+#: src/net/tmwa/specialhandler.cpp:168
 msgid "You have not yet reached a high enough lvl!"
 msgstr "Je hebt nog geen hoog genoeg level bereikt!"
 
-#: src/net/ea/specialhandler.cpp:174
+#: src/net/tmwa/specialhandler.cpp:171
 msgid "Insufficient HP!"
 msgstr "Onvoldoende leven!"
 
-#: src/net/ea/specialhandler.cpp:177
+#: src/net/tmwa/specialhandler.cpp:174
 msgid "Insufficient SP!"
 msgstr "Onvoldoende Vaardigheidspunten!"
 
-#: src/net/ea/specialhandler.cpp:180
+#: src/net/tmwa/specialhandler.cpp:177
 msgid "You have no memos!"
 msgstr "Je hebt geen memo's!"
 
-#: src/net/ea/specialhandler.cpp:183
+#: src/net/tmwa/specialhandler.cpp:180
 msgid "You cannot do that right now!"
 msgstr "Je kan dat nu niet doen!"
 
-#: src/net/ea/specialhandler.cpp:186
+#: src/net/tmwa/specialhandler.cpp:183
 msgid "Seems you need more money... ;-)"
 msgstr "Het lijkt erop dat je meer geld nodig hebt... ;-)"
 
-#: src/net/ea/specialhandler.cpp:189
+#: src/net/tmwa/specialhandler.cpp:186
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Je kan die vaardigheid niet gebruiken met dit type wapen!"
 
-#: src/net/ea/specialhandler.cpp:192
+#: src/net/tmwa/specialhandler.cpp:189
 msgid "You need another red gem!"
 msgstr "Je hebt een andere rode edelsteen nodig!"
 
-#: src/net/ea/specialhandler.cpp:195
+#: src/net/tmwa/specialhandler.cpp:192
 msgid "You need another blue gem!"
 msgstr "Je hebt een andere blauwe edelsteen nodig!"
 
-#: src/net/ea/specialhandler.cpp:198
+#: src/net/tmwa/specialhandler.cpp:195
 msgid "You're carrying to much to do this!"
 msgstr "Je draagt teveel bij je om dit te doen!"
 
-#: src/net/ea/specialhandler.cpp:201
+#: src/net/tmwa/specialhandler.cpp:198
 msgid "Huh? What's that?"
 msgstr "Huh? Wat is dat?"
 
-#: src/net/ea/specialhandler.cpp:210
+#: src/net/tmwa/specialhandler.cpp:207
 msgid "Warp failed..."
 msgstr "Warp mislukt..."
 
-#: src/net/ea/specialhandler.cpp:213
+#: src/net/tmwa/specialhandler.cpp:210
 msgid "Could not steal anything..."
 msgstr "Kon niets stelen..."
 
-#: src/net/ea/specialhandler.cpp:216
+#: src/net/tmwa/specialhandler.cpp:213
 msgid "Poison had no effect..."
 msgstr "Gif had geen effect..."
 
-#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:116
-msgid "Request for Trade"
-msgstr "Handel aanvragen"
-
-#: src/net/ea/tradehandler.cpp:108 src/net/manaserv/tradehandler.cpp:117
-#, c-format
-msgid "%s wants to trade with you, do you accept?"
-msgstr "%s wil met jou handelen, aanvaard je dit?"
-
-#: src/net/ea/tradehandler.cpp:124
+#: src/net/tmwa/tradehandler.cpp:126
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr "Handelen is niet mogelijk. Partner is te ver weg."
 
-#: src/net/ea/tradehandler.cpp:128
+#: src/net/tmwa/tradehandler.cpp:130
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr "Handelen is niet mogelijk. Personage bestaat niet."
 
-#: src/net/ea/tradehandler.cpp:132
+#: src/net/tmwa/tradehandler.cpp:134
 msgid "Trade cancelled due to an unknown reason."
 msgstr "Handel onderbroken vanwege een onbekende reden."
 
-#: src/net/ea/tradehandler.cpp:137
+#: src/net/tmwa/tradehandler.cpp:139
 #, c-format
 msgid "Trade: You and %s"
 msgstr "Handelen: Jij en %s"
 
-#: src/net/ea/tradehandler.cpp:144
+#: src/net/tmwa/tradehandler.cpp:146
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr "Handel met %s geannuleerd."
 
-#: src/net/ea/tradehandler.cpp:153
+#: src/net/tmwa/tradehandler.cpp:154
 msgid "Unhandled trade cancel packet."
 msgstr "Onbehandelde handelannulatiepakket."
 
-#: src/net/ea/tradehandler.cpp:202
+#: src/net/tmwa/tradehandler.cpp:202
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr "Kan voorwerp niet toevoegen. Handelspartner is al te zwaar beladen."
 
-#: src/net/ea/tradehandler.cpp:207
+#: src/net/tmwa/tradehandler.cpp:207
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr "Kan voorwerp niet toevoegen. Handelspartner heeft geen vrij slot."
 
-#: src/net/ea/tradehandler.cpp:211
+#: src/net/tmwa/tradehandler.cpp:211
 msgid "Failed adding item for unknown reason."
 msgstr "Kan voorwerp niet toevoegen voor een onbekende reden."
 
-#: src/net/ea/tradehandler.cpp:224 src/net/manaserv/tradehandler.cpp:149
-msgid "Trade canceled."
-msgstr "Handel geannuleerd."
-
-#: src/net/ea/tradehandler.cpp:231 src/net/manaserv/tradehandler.cpp:156
-msgid "Trade completed."
-msgstr "Handel voltooid."
-
-#: src/net/manaserv/beinghandler.cpp:324
+#: src/playerrelations.cpp:310
 #, fuzzy
-msgid "Press OK to respawn."
-msgstr " Druk op OK om te respawnen"
-
-#: src/net/manaserv/beinghandler.cpp:325
-#, fuzzy
-msgid "You Died"
-msgstr "Je stierf"
-
-#: src/net/manaserv/charhandler.cpp:128 src/net/manaserv/charhandler.cpp:196
-#, fuzzy
-msgid "Not logged in."
-msgstr "Reeds aangemeld"
-
-#: src/net/manaserv/charhandler.cpp:131
-msgid "No empty slot."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:134
-msgid "Invalid name."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:137
-#, fuzzy
-msgid "Character's name already exists."
-msgstr "Gebruikersnaam bestaat al"
-
-#: src/net/manaserv/charhandler.cpp:140
-msgid "Invalid hairstyle."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:143
-msgid "Invalid hair color."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:146
-msgid "Invalid gender."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:149
-#, fuzzy
-msgid "Character's stats are too high."
-msgstr "Attributen van personage OK"
-
-#: src/net/manaserv/charhandler.cpp:152
-#, fuzzy
-msgid "Character's stats are too low."
-msgstr "Attributen van personage OK"
+msgid "Completely ignore"
+msgstr "Voltooid"
 
-#: src/net/manaserv/charhandler.cpp:155
-msgid "One stat is zero."
+#: src/playerrelations.cpp:324
+msgid "Print '...'"
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:187
-#, fuzzy
-msgid "Player deleted."
-msgstr "Personage verwijderd."
-
-#: src/net/manaserv/charhandler.cpp:199
-#, fuzzy
-msgid "Selection out of range."
-msgstr "Selecteer het aantal exemplaren om te verhandelen"
-
-#: src/net/manaserv/charhandler.cpp:202
-#, fuzzy, c-format
-msgid "Unknown error (%d)."
-msgstr "Onbekende foutmelding"
-
-#: src/net/manaserv/charhandler.cpp:242
-msgid "No gameservers are available."
-msgstr "Geen gameservers beschikbaar."
-
-#: src/net/manaserv/charhandler.cpp:268
-msgid "Willpower:"
-msgstr "Wilskracht:"
-
-#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
-#: src/net/manaserv/guildhandler.cpp:259
-#, c-format
-msgid "Topic: %s"
-msgstr "Onderwerp: %s"
-
-#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
-#, fuzzy
-msgid "Players in this channel:"
-msgstr "Speler raakt Monster"
-
-#: src/net/manaserv/chathandler.cpp:201
-#, fuzzy
-msgid "Error joining channel."
-msgstr "Commando: /join <kanaal>"
-
-#: src/net/manaserv/chathandler.cpp:207
-#, fuzzy
-msgid "Listing channels."
-msgstr "Aanvragen om bij kanaal %s toegevoegd te worden."
-
-#: src/net/manaserv/chathandler.cpp:219
-msgid "End of channel list."
+#: src/playerrelations.cpp:340
+msgid "Blink name"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:291
-#, fuzzy, c-format
-msgid "%s entered the channel."
-msgstr "%s heeft zich bij de groep gevoegd."
-
-#: src/net/manaserv/chathandler.cpp:296
+#: src/resources/itemdb.cpp:44
 #, c-format
-msgid "%s left the channel."
-msgstr ""
+msgid "Attack %+d"
+msgstr "Aanval %+d"
 
-#: src/net/manaserv/chathandler.cpp:312
+#: src/resources/itemdb.cpp:45
 #, c-format
-msgid "%s has set mode %s on user %s."
-msgstr ""
+msgid "Defense %+d"
+msgstr "Verdediging %+d"
 
-#: src/net/manaserv/chathandler.cpp:322
+#: src/resources/itemdb.cpp:46
 #, c-format
-msgid "%s has kicked %s."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:327
-#, fuzzy
-msgid "Unknown channel event."
-msgstr "Onbekend commando."
+msgid "HP %+d"
+msgstr "Leven %+d"
 
-#: src/net/manaserv/generalhandler.cpp:100
+#: src/resources/itemdb.cpp:47
 #, c-format
-msgid "Willpower %+d"
-msgstr "Wilskracht %+d"
-
-#: src/net/manaserv/generalhandler.cpp:171
-#, fuzzy
-msgid "Willpower"
-msgstr "Wilskracht:"
-
-#: src/net/manaserv/guildhandler.cpp:81
-msgid "Guild created."
-msgstr "Guild aangemaakt."
-
-#: src/net/manaserv/guildhandler.cpp:86
-msgid "Error creating guild."
-msgstr "Fout bij het creëren van guild."
-
-#: src/net/manaserv/guildhandler.cpp:96
-msgid "Invite sent."
-msgstr "Uitnodiging verzonden."
-
-#: src/net/manaserv/guildhandler.cpp:203
-msgid "Member was promoted successfully."
-msgstr "Lid is succesvol gepromoveerd."
+msgid "MP %+d"
+msgstr "Magie %+d"
 
-#: src/net/manaserv/guildhandler.cpp:208
-msgid "Failed to promote member."
-msgstr "Kon lid niet promoveren."
+#: src/resources/itemdb.cpp:92
+msgid "Unknown item"
+msgstr "Onbekend voorwerp"
 
-#: src/net/manaserv/loginhandler.cpp:87
-#, fuzzy
-msgid "Wrong magic_token."
-msgstr "Verkeerd magie_teken"
+#: src/resources/itemdb.cpp:135 src/resources/monsterdb.cpp:77
+msgid "unnamed"
+msgstr "naamloos"
 
-#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
 #, fuzzy
-msgid "Already logged in."
-msgstr "Reeds aangemeld"
+#~ msgid "HP"
+#~ msgstr "Leven:"
 
-#: src/net/manaserv/loginhandler.cpp:93 src/net/manaserv/loginhandler.cpp:272
 #, fuzzy
-msgid "Server is full."
-msgstr "Server is volzet"
+#~ msgid "MP"
+#~ msgstr "Magie:"
 
-#: src/net/manaserv/loginhandler.cpp:118
 #, fuzzy
-msgid "New password incorrect."
-msgstr "Nieuw wachtwoord is incorrect"
-
-#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
-msgid "Account not connected. Please login first."
-msgstr "Account niet verbonden. Log eerst in aub."
+#~ msgid "Exp"
+#~ msgstr "Ervaring:"
 
-#: src/net/manaserv/loginhandler.cpp:149
 #, fuzzy
-msgid "New email address incorrect."
-msgstr "Nieuw emailadres is incorrect"
+#~ msgid "Money"
+#~ msgstr "Geld: %d"
 
-#: src/net/manaserv/loginhandler.cpp:152
 #, fuzzy
-msgid "Old email address incorrect."
-msgstr "Oud emailadres is incorrect"
+#~ msgid "Job"
+#~ msgstr "Job:"
 
-#: src/net/manaserv/loginhandler.cpp:158
 #, fuzzy
-msgid "The new email address already exists."
-msgstr "Het nieuwe emailadres bestaat al."
+#~ msgid "Level"
+#~ msgstr "Level: %d"
 
-#: src/net/manaserv/loginhandler.cpp:239
-msgid ""
-"Client registration is not allowed. Please contact server administration."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
 #, fuzzy
-msgid "Client version is too old."
-msgstr "Te oude Client versie"
+#~ msgid "Access denied."
+#~ msgstr "Toegang geweigerd"
 
-#: src/net/manaserv/loginhandler.cpp:266
 #, fuzzy
-msgid "Wrong username or password."
-msgstr "Verkeerde gebruikersnaam of wachtwoord"
+#~ msgid "Unknown failure to select character."
+#~ msgstr "Onbekende fout bij het selecteren van personage"
 
-#: src/net/manaserv/loginhandler.cpp:275
-msgid "Login attempt too soon after previous attempt."
-msgstr ""
+#~ msgid "Inviting like this isn't supported at the moment."
+#~ msgstr "Op deze manier iemand uitnodigen wordt momenteel niet ondersteund."
 
-#: src/net/manaserv/loginhandler.cpp:303
-#, fuzzy
-msgid "Wrong username, password or email address."
-msgstr "Verkeerde gebruikersnaam, wachtwoord of emailadres"
+#~ msgid "Willpower:"
+#~ msgstr "Wilskracht:"
 
-#: src/net/manaserv/loginhandler.cpp:306
-#, fuzzy
-msgid "Username already exists."
-msgstr "Gebruikersnaam bestaat al"
+#~ msgid "Willpower %+d"
+#~ msgstr "Wilskracht %+d"
 
-#: src/net/manaserv/loginhandler.cpp:309
 #, fuzzy
-msgid "Email address already exists."
-msgstr "emailadres bestaat al"
-
-#: src/net/manaserv/loginhandler.cpp:312
-msgid "You took too long with the captcha or your response was incorrect."
-msgstr ""
-
-#: src/net/manaserv/partyhandler.cpp:88
-msgid "Joined party."
-msgstr "Bijgevoegd bij groep."
-
-#: src/net/manaserv/partyhandler.cpp:106
-#, c-format
-msgid "%s joined the party."
-msgstr "%s heeft zich bij de groep gevoegd."
-
-#: src/net/manaserv/partyhandler.cpp:123
-#, fuzzy, c-format
-msgid "%s rejected your invite."
-msgstr "%s wees jouw uitnodiging af."
-
-#: src/net/manaserv/tradehandler.cpp:96
-msgid "Accepting incoming trade requests."
-msgstr "Inkomende handelsaanvragen accepteren."
+#~ msgid "Willpower"
+#~ msgstr "Wilskracht:"
 
-#: src/net/manaserv/tradehandler.cpp:98
-msgid "Ignoring incoming trade requests."
-msgstr "Inkomende handelsaanvragen negeren."
-
-#: src/net/manaserv/tradehandler.cpp:135
-#, c-format
-msgid "Trading with %s"
-msgstr "Handelen met %s"
-
-#: src/playerrelations.cpp:304
 #, fuzzy
-msgid "Completely ignore"
-msgstr "Voltooid"
-
-#: src/playerrelations.cpp:318
-msgid "Print '...'"
-msgstr ""
-
-#: src/playerrelations.cpp:334
-msgid "Blink name"
-msgstr ""
-
-#: src/playerrelations.cpp:371
-msgid "Floating '...' bubble"
-msgstr ""
-
-#: src/playerrelations.cpp:374
-msgid "Floating bubble"
-msgstr ""
-
-#: src/resources/itemdb.cpp:52
-#, c-format
-msgid "Attack %+d"
-msgstr "Aanval %+d"
-
-#: src/resources/itemdb.cpp:53
-#, c-format
-msgid "Defense %+d"
-msgstr "Verdediging %+d"
-
-#: src/resources/itemdb.cpp:54
-#, c-format
-msgid "HP %+d"
-msgstr "Leven %+d"
-
-#: src/resources/itemdb.cpp:55
-#, c-format
-msgid "MP %+d"
-msgstr "Magie %+d"
-
-#: src/resources/itemdb.cpp:114
-msgid "Unknown item"
-msgstr "Onbekend voorwerp"
-
-#: src/resources/itemdb.cpp:158 src/resources/monsterdb.cpp:45
-#: src/resources/monsterdb.cpp:69
-msgid "unnamed"
-msgstr "naamloos"
+#~ msgid "Server is full."
+#~ msgstr "Server is volzet"
 
 #~ msgid "Text Shadow"
 #~ msgstr "Tekstschaduw"
diff --git a/po/pl.po b/po/pl.po
index f3057dd6..6a2a2b4d 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,10 +9,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Mana World 0.1.0\n"
 "Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2010-03-16 22:27+0100\n"
+"POT-Creation-Date: 2010-12-13 20:04+0100\n"
 "PO-Revision-Date: 2009-09-14 06:59+0000\n"
 "Last-Translator: Maciej Benke <syngress_stc@vp.pl>\n"
 "Language-Team: <pl@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -21,319 +22,325 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/client.cpp:555 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
+#: src/client.cpp:598 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
 msgid "Setup"
 msgstr "Konfiguracja"
 
-#: src/client.cpp:625
+#: src/client.cpp:679
 #, fuzzy
 msgid "Connecting to server"
 msgstr "Łączenie z serwerem map..."
 
-#: src/client.cpp:652
+#: src/client.cpp:706
 #, fuzzy
 msgid "Logging in"
 msgstr "Użytkownik"
 
-#: src/client.cpp:685
+#: src/client.cpp:739
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:741
+#: src/client.cpp:804
 #, fuzzy
 msgid "Requesting characters"
 msgstr "Wybierz postać"
 
-#: src/client.cpp:770
+#: src/client.cpp:833
 #, fuzzy
 msgid "Connecting to the game server"
 msgstr "Łączenie z serwerem map..."
 
-#: src/client.cpp:801 src/client.cpp:808 src/client.cpp:942
+#: src/client.cpp:843
+#, fuzzy
+msgid "Changing game servers"
+msgstr "Serwer"
+
+#: src/client.cpp:872 src/client.cpp:879 src/client.cpp:1014
 #: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
 #: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
-#: src/gui/serverdialog.cpp:241 src/gui/unregisterdialog.cpp:133
-#: src/net/ea/charserverhandler.cpp:135 src/net/ea/charserverhandler.cpp:152
-#: src/net/manaserv/charhandler.cpp:161 src/net/manaserv/charhandler.cpp:204
+#: src/gui/serverdialog.cpp:323 src/gui/unregisterdialog.cpp:133
+#: src/net/manaserv/charhandler.cpp:174 src/net/manaserv/charhandler.cpp:217
+#: src/net/tmwa/charserverhandler.cpp:134
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Error"
 msgstr "Błąd"
 
-#: src/client.cpp:817
+#: src/client.cpp:888
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:844
+#: src/client.cpp:915
 #, fuzzy
 msgid "Password Change"
 msgstr "Hasło:"
 
-#: src/client.cpp:845
+#: src/client.cpp:916
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:864
+#: src/client.cpp:935
 #, fuzzy
 msgid "Email Change"
 msgstr "Zmień"
 
-#: src/client.cpp:865
+#: src/client.cpp:936
 #, fuzzy
 msgid "Email changed successfully!"
 msgstr "Członek został pomyślnie wypromowany."
 
-#: src/client.cpp:885
+#: src/client.cpp:956
 #, fuzzy
 msgid "Unregister Successful"
 msgstr "Wyrejestruj"
 
-#: src/client.cpp:886
+#: src/client.cpp:957
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1009 src/client.cpp:1032
+#: src/client.cpp:1138 src/client.cpp:1161
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1121
+#: src/client.cpp:1281
 #, fuzzy, c-format
 msgid "Invalid update host: %s"
 msgstr "Nieprawidłowy host aktualizacji: "
 
-#: src/client.cpp:1155 src/client.cpp:1161
+#: src/client.cpp:1315 src/client.cpp:1321
 msgid "Error creating updates directory!"
 msgstr "Błąd podczas tworzenia katalogu aktualizacji!"
 
-#: src/commandhandler.cpp:127 src/commandhandler.cpp:308
+#: src/commandhandler.cpp:131 src/commandhandler.cpp:317
 msgid "Unknown command."
 msgstr "Nieznane polecenie."
 
-#: src/commandhandler.cpp:156
+#: src/commandhandler.cpp:160
 msgid "-- Help --"
 msgstr "-- Pomoc --"
 
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:161
 msgid "/help > Display this help"
 msgstr "/help > Pokazuje tę pomoc"
 
-#: src/commandhandler.cpp:159
+#: src/commandhandler.cpp:163
 msgid "/where > Display map name"
 msgstr "/where > Wyświetla nazwę mapy"
 
-#: src/commandhandler.cpp:160
+#: src/commandhandler.cpp:164
 msgid "/who > Display number of online users"
 msgstr "/who > Wyświetla liczbę podłączonych użytkowników"
 
-#: src/commandhandler.cpp:161
+#: src/commandhandler.cpp:165
 msgid "/me > Tell something about yourself"
 msgstr "/me > Powiedz coś o sobie"
 
-#: src/commandhandler.cpp:163
+#: src/commandhandler.cpp:167
 msgid "/clear > Clears this window"
 msgstr "/clear > Czyści to okno"
 
-#: src/commandhandler.cpp:165
+#: src/commandhandler.cpp:169
 msgid "/msg > Send a private message to a user"
 msgstr "/msg > Wysyła prywatną wiadomość do użytkownika"
 
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:170
 msgid "/whisper > Alias of msg"
 msgstr "/whisper > Alias  polecenia msg"
 
-#: src/commandhandler.cpp:167
+#: src/commandhandler.cpp:171
 msgid "/w > Alias of msg"
 msgstr "/w > Alias polecenia msg"
 
-#: src/commandhandler.cpp:168
+#: src/commandhandler.cpp:172
 msgid "/query > Makes a tab for private messages with another user"
 msgstr ""
 "/query > Tworzy zakładkę dla prywatnych wiadomości z innym użytkownikiem"
 
-#: src/commandhandler.cpp:169
+#: src/commandhandler.cpp:174
 msgid "/q > Alias of query"
 msgstr "/q > Alias polecenia query"
 
-#: src/commandhandler.cpp:171
+#: src/commandhandler.cpp:176
 msgid "/ignore > ignore a player"
 msgstr ""
 
-#: src/commandhandler.cpp:172
+#: src/commandhandler.cpp:177
 msgid "/unignore > stop ignoring a player"
 msgstr ""
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:179
 msgid "/list > Display all public channels"
 msgstr "/list > Pokaż wszystkie publiczne kanały"
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:180
 msgid "/join > Join or create a channel"
 msgstr "/join > Dołącz lub utwórz kanał"
 
-#: src/commandhandler.cpp:177
+#: src/commandhandler.cpp:182
 #, fuzzy
 msgid "/createparty > Create a new party"
 msgstr "/create > Utworzenie nowej grupy"
 
-#: src/commandhandler.cpp:178
+#: src/commandhandler.cpp:183
 msgid "/party > Invite a user to party"
 msgstr "/party > Zaproś użytkownika do grupy"
 
-#: src/commandhandler.cpp:180
+#: src/commandhandler.cpp:185
 msgid "/record > Start recording the chat to an external file"
 msgstr "/record > Rozpocznij zapisywanie czatu do zewnętrznego pliku"
 
-#: src/commandhandler.cpp:181
+#: src/commandhandler.cpp:187
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr "/toggle > Określa czy <return> przełącza dziennik czatu"
 
-#: src/commandhandler.cpp:182
+#: src/commandhandler.cpp:189
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
 "/present > Pobiera listę obecnych graczy (przesyła do dzienika czatu, jeżeli "
 "zapisywanie jest włączone)"
 
-#: src/commandhandler.cpp:184
+#: src/commandhandler.cpp:192
 msgid "/announce > Global announcement (GM only)"
 msgstr "/announce > Globalne ogłoszenie (tylko GM)"
 
-#: src/commandhandler.cpp:188
+#: src/commandhandler.cpp:196
 msgid "For more information, type /help <command>."
 msgstr "Aby uzyskać więcej informacji, wpisz /help <komenda>"
 
-#: src/commandhandler.cpp:192
+#: src/commandhandler.cpp:200
 msgid "Command: /help"
 msgstr "Komenda: /help"
 
-#: src/commandhandler.cpp:193
+#: src/commandhandler.cpp:201
 msgid "This command displays a list of all commands available."
 msgstr "Ta komenda wyświetla listę dostępnych komend."
 
-#: src/commandhandler.cpp:194
+#: src/commandhandler.cpp:203
 msgid "Command: /help <command>"
 msgstr "Komenda: /help <komenda>"
 
-#: src/commandhandler.cpp:195
+#: src/commandhandler.cpp:204
 msgid "This command displays help on <command>."
 msgstr "Ta komenda wyświetla pomoc dotyczącą <komenda>"
 
-#: src/commandhandler.cpp:203
+#: src/commandhandler.cpp:212
 msgid "Command: /announce <msg>"
 msgstr "Komenda: /announce <wiadomość>"
 
-#: src/commandhandler.cpp:204
+#: src/commandhandler.cpp:213
 msgid "*** only available to a GM ***"
 msgstr "*** dostępne tylko dla GM ***"
 
-#: src/commandhandler.cpp:205
+#: src/commandhandler.cpp:214
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 "Ta komenda wysyła wiadomość <wiadomość> to wszystkich połączonych graczy."
 
-#: src/commandhandler.cpp:210
+#: src/commandhandler.cpp:219
 msgid "Command: /clear"
 msgstr "Komenda: /clear"
 
-#: src/commandhandler.cpp:211
+#: src/commandhandler.cpp:220
 msgid "This command clears the chat log of previous chat."
 msgstr "Ta komenda czyści zawartość okna."
 
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:224
 #, fuzzy
 msgid "Command: /ignore <player>"
 msgstr "Komenda: /item <zasada>"
 
-#: src/commandhandler.cpp:216
+#: src/commandhandler.cpp:225
 #, fuzzy
 msgid "This command ignores the given player regardless of current relations."
 msgstr "Ta komenda wyświetla liczbę połączonych graczy."
 
-#: src/commandhandler.cpp:221
+#: src/commandhandler.cpp:230
 msgid "Command: /join <channel>"
 msgstr "Komenda: /join <kanał>"
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:231
 msgid "This command makes you enter <channel>."
 msgstr "Ta komenda powoduje, iż wejdziesz do  <kanał>"
 
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:232
 msgid "If <channel> doesn't exist, it's created."
 msgstr "Jeżeli <kanał> nie istnieje, to zostanie utworzony."
 
-#: src/commandhandler.cpp:227
+#: src/commandhandler.cpp:236
 msgid "Command: /list"
 msgstr "Komenda: /list"
 
-#: src/commandhandler.cpp:228
+#: src/commandhandler.cpp:237
 msgid "This command shows a list of all channels."
 msgstr "Ta komenda pokazuje listę wszystkich kanałów."
 
-#: src/commandhandler.cpp:232
+#: src/commandhandler.cpp:241
 msgid "Command: /me <message>"
 msgstr "Komenda: /me <wiadomość>"
 
-#: src/commandhandler.cpp:233
+#: src/commandhandler.cpp:242
 msgid "This command tell others you are (doing) <msg>."
 msgstr "Ta komenda mówi innym co (robisz) <wiadomość>."
 
-#: src/commandhandler.cpp:237
+#: src/commandhandler.cpp:246
 msgid "Command: /msg <nick> <message>"
 msgstr "Komenda: /msg <ksywka> <wiadomość>"
 
-#: src/commandhandler.cpp:238
+#: src/commandhandler.cpp:247
 msgid "Command: /whisper <nick> <message>"
 msgstr "Komenda: /whisper <ksywka> <wiadomość>"
 
-#: src/commandhandler.cpp:239
+#: src/commandhandler.cpp:248
 msgid "Command: /w <nick> <message>"
 msgstr "Komenda: /w <ksywka> <wiadomość>"
 
-#: src/commandhandler.cpp:240
+#: src/commandhandler.cpp:249
 msgid "This command sends the text <message> to <nick>."
 msgstr "Ta komenda wysyła tekst <wiadomość> do <ksywka>"
 
-#: src/commandhandler.cpp:241 src/commandhandler.cpp:260
+#: src/commandhandler.cpp:250 src/commandhandler.cpp:269
 #: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
-#: src/net/ea/gui/guildtab.cpp:75 src/net/ea/gui/partytab.cpp:75
+#: src/net/tmwa/gui/guildtab.cpp:75 src/net/tmwa/gui/partytab.cpp:75
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr "Jeżeli <postać> ma spację, należy ją zapisać w cudzysłowie (\")"
 
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:255
 msgid "Command: /query <nick>"
 msgstr "Komenda: /query <ksywka>"
 
-#: src/commandhandler.cpp:247
+#: src/commandhandler.cpp:256
 msgid "Command: /q <nick>"
 msgstr "Komenda: /q <ksywka>"
 
-#: src/commandhandler.cpp:248
+#: src/commandhandler.cpp:257
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
 "Ta komeda próbuje utworzyć zakładkę dla prywatnych wiadomości pomiędzy tobą "
 "i <ksywka>."
 
-#: src/commandhandler.cpp:253
+#: src/commandhandler.cpp:262
 #, fuzzy
 msgid "Command: /createparty <name>"
 msgstr "Komenda: /create <nazwa-grupy>"
 
-#: src/commandhandler.cpp:254
+#: src/commandhandler.cpp:263
 #, fuzzy
 msgid "This command creates a new party called <name>."
 msgstr "Te komendy utworzą nową grupę nazwaną <nazwa-grupy>."
 
-#: src/commandhandler.cpp:258
+#: src/commandhandler.cpp:267
 msgid "Command: /party <nick>"
 msgstr "Komenda: /party <ksywka>"
 
-#: src/commandhandler.cpp:259 src/net/ea/gui/partytab.cpp:74
+#: src/commandhandler.cpp:268 src/net/tmwa/gui/partytab.cpp:74
 msgid "This command invites <nick> to party with you."
 msgstr "Ta komenda zaprasza <ksywka> do twojej grupy."
 
-#: src/commandhandler.cpp:265
+#: src/commandhandler.cpp:274
 msgid "Command: /present"
 msgstr "Komenda: /present"
 
-#: src/commandhandler.cpp:266
+#: src/commandhandler.cpp:275
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
@@ -341,28 +348,28 @@ msgstr ""
 "Ta komenda pobiera listę graczy w zasięgu słuchu i wysyła ją do dziennika "
 "zapisu, lub dziennika czatu."
 
-#: src/commandhandler.cpp:272
+#: src/commandhandler.cpp:281
 msgid "Command: /record <filename>"
 msgstr "Komenda: /record <nazwa_pliku>"
 
-#: src/commandhandler.cpp:273
+#: src/commandhandler.cpp:282
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr ""
 "Ta komenda rozpoczyna zapisywanie dziennika czatu to pliku <nazwa_pliku."
 
-#: src/commandhandler.cpp:275
+#: src/commandhandler.cpp:284
 msgid "Command: /record"
 msgstr "Komenda: /record"
 
-#: src/commandhandler.cpp:276
+#: src/commandhandler.cpp:285
 msgid "This command finishes a recording session."
 msgstr "Ta komenda kończy zapisywanie sesji"
 
-#: src/commandhandler.cpp:280
+#: src/commandhandler.cpp:289
 msgid "Command: /toggle <state>"
 msgstr "Komenda: /toggle <stan>"
 
-#: src/commandhandler.cpp:281
+#: src/commandhandler.cpp:290
 msgid ""
 "This command sets whether the return key should toggle the chat log, or "
 "whether the chat log turns off automatically."
@@ -370,56 +377,56 @@ msgstr ""
 "Ta komenda ustawia, czy klawisz return powinien włączać dziennik zapisu, lub "
 "czy dziennik zapisu powinien się automatycznie wyłączyć."
 
-#: src/commandhandler.cpp:283
+#: src/commandhandler.cpp:292
 msgid ""
-"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
-"\", \"no\", \"false\" to turn the toggle off."
+"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
+"\"0\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 "<stan> może być jednym z \"1\", \"yes\", \"true\" aby uaktywnić przełącznik, "
 "lub \"0\", \"no\", \"false\" by deaktywować przełącznik."
 
-#: src/commandhandler.cpp:286
+#: src/commandhandler.cpp:295
 msgid "Command: /toggle"
 msgstr "Komenda: /toggle"
 
-#: src/commandhandler.cpp:287
+#: src/commandhandler.cpp:296
 msgid "This command displays the return toggle status."
 msgstr "Ta komenda wyświetla status przełącznika"
 
-#: src/commandhandler.cpp:291 src/gui/widgets/whispertab.cpp:93
+#: src/commandhandler.cpp:300 src/gui/widgets/whispertab.cpp:95
 #, fuzzy
 msgid "Command: /unignore <player>"
 msgstr "Komenda: /item <zasada>"
 
-#: src/commandhandler.cpp:292
+#: src/commandhandler.cpp:301
 msgid "This command stops ignoring the given player if they are being ignored"
 msgstr ""
 
-#: src/commandhandler.cpp:297
+#: src/commandhandler.cpp:306
 msgid "Command: /where"
 msgstr "Komenda: /where"
 
-#: src/commandhandler.cpp:298
+#: src/commandhandler.cpp:307
 msgid "This command displays the name of the current map."
 msgstr "Ta komenda wyświetla nazwę aktualnej mapy."
 
-#: src/commandhandler.cpp:302
+#: src/commandhandler.cpp:311
 msgid "Command: /who"
 msgstr "Komenda: /who"
 
-#: src/commandhandler.cpp:303
+#: src/commandhandler.cpp:312
 msgid "This command displays the number of players currently online."
 msgstr "Ta komenda wyświetla liczbę połączonych graczy."
 
-#: src/commandhandler.cpp:309
+#: src/commandhandler.cpp:318
 msgid "Type /help for a list of commands."
 msgstr "Wpisz /help aby usyskać listę komend."
 
-#: src/commandhandler.cpp:375
+#: src/commandhandler.cpp:384
 msgid "Cannot send empty whispers!"
 msgstr "Nie można wysłać pustych szeptów!"
 
-#: src/commandhandler.cpp:383
+#: src/commandhandler.cpp:392
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -428,59 +435,67 @@ msgstr ""
 "Nie można utworzyć zakładki szeptu dla ksywki \"%s\"! Już istnieje, albo to "
 "ty."
 
-#: src/commandhandler.cpp:397
+#: src/commandhandler.cpp:406
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Prośba o dołączenie do kanału %s."
 
-#: src/commandhandler.cpp:410 src/net/ea/gui/partytab.cpp:109
+#: src/commandhandler.cpp:419 src/net/tmwa/gui/partytab.cpp:109
 msgid "Party name is missing."
 msgstr "Brakuje nazwy grupy."
 
-#: src/commandhandler.cpp:423 src/commandhandler.cpp:471
-#: src/commandhandler.cpp:493
+#: src/commandhandler.cpp:432 src/commandhandler.cpp:509
+#: src/commandhandler.cpp:531
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:441
+#: src/commandhandler.cpp:450
 msgid "Return toggles chat."
 msgstr "Return włącza czat."
 
-#: src/commandhandler.cpp:441
+#: src/commandhandler.cpp:450
 msgid "Message closes chat."
 msgstr "Wiadomość zamyka czat."
 
-#: src/commandhandler.cpp:450
+#: src/commandhandler.cpp:459
 msgid "Return now toggles chat."
 msgstr "Return od teraz włącza czat."
 
-#: src/commandhandler.cpp:454
+#: src/commandhandler.cpp:463
 msgid "Message now closes chat."
 msgstr "Wiadomość od teraz zamyka czat."
 
-#: src/commandhandler.cpp:477
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:489
+msgid "Show IP: On"
+msgstr ""
+
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:485
+msgid "Show IP: Off"
+msgstr ""
+
+#: src/commandhandler.cpp:515
 msgid "Player already ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:484
+#: src/commandhandler.cpp:522
 #, fuzzy
 msgid "Player successfully ignored!"
 msgstr "Pomyślnie utworzono grupę."
 
-#: src/commandhandler.cpp:486
+#: src/commandhandler.cpp:524
 #, fuzzy
 msgid "Player could not be ignored!"
 msgstr "Szept nie mógł zostać wysłany, jesteś ignorowany przez odbiorcę."
 
-#: src/commandhandler.cpp:501
+#: src/commandhandler.cpp:539
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:506
+#: src/commandhandler.cpp:544
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:508
+#: src/commandhandler.cpp:546
 #, fuzzy
 msgid "Player could not be unignored!"
 msgstr "Szept nie mógł zostać wysłany, jesteś ignorowany przez odbiorcę."
@@ -494,43 +509,43 @@ msgstr "Opcjami dla /%s są \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgid "General"
 msgstr "Ogólny"
 
-#: src/game.cpp:326
+#: src/game.cpp:342
 #, fuzzy
 msgid "Screenshot saved as "
 msgstr "Zrzut ekranu zapisany do ~/"
 
-#: src/game.cpp:331
+#: src/game.cpp:347
 msgid "Saving screenshot failed!"
 msgstr "Zapisywanie zrzutu ekranu nie powiodło się!"
 
-#: src/game.cpp:355
+#: src/game.cpp:378
 #, fuzzy
 msgid "The connection to the server was lost."
 msgstr "Połączenie z serwerem zostało utracone, program zakończy pracę"
 
-#: src/game.cpp:360
+#: src/game.cpp:382
 msgid "Network Error"
 msgstr "Błąd sieci"
 
-#: src/game.cpp:705
+#: src/game.cpp:721
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorowanie przychodzących próśb o handel"
 
-#: src/game.cpp:712
+#: src/game.cpp:726
 msgid "Accepting incoming trade requests"
 msgstr "Akceptowanie przychodzących próśb o handel"
 
-#: src/game.cpp:946
+#: src/game.cpp:954
 #, fuzzy
 msgid "Could Not Load Map"
 msgstr "Nie można załadować mapy"
 
-#: src/game.cpp:947
+#: src/game.cpp:955
 #, c-format
 msgid "Error while loading %s"
 msgstr "Błąd podczas łądowania %s"
 
-#: src/gui/beingpopup.cpp:75
+#: src/gui/beingpopup.cpp:76
 #, fuzzy, c-format
 msgid "Party: %s"
 msgstr "Grupa (%s)"
@@ -539,34 +554,34 @@ msgstr "Grupa (%s)"
 msgid "Buy"
 msgstr "Kup"
 
-#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
-#: src/gui/sell.cpp:276
+#: src/gui/buy.cpp:69 src/gui/buy.cpp:261 src/gui/sell.cpp:71
+#: src/gui/sell.cpp:288
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Cena: %s/ Razem: %s"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:99 src/gui/npcdialog.cpp:100
-#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:404
+#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:112 src/gui/npcdialog.cpp:124
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:463
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:98 src/gui/npcdialog.cpp:101
-#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:416
+#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:111 src/gui/npcdialog.cpp:125
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:475
 msgid "-"
 msgstr ""
 
 #: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
-#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:152
-#: src/keyboardconfig.cpp:103
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:228
+#: src/keyboardconfig.cpp:102
 msgid "Quit"
 msgstr "Wyjdź"
 
-#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:333
-#: src/gui/statuswindow.cpp:403 src/gui/statuswindow.cpp:437
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:384
+#: src/gui/statuswindow.cpp:462 src/gui/statuswindow.cpp:496
 msgid "Max"
 msgstr "Maks."
 
@@ -580,11 +595,11 @@ msgstr "Sprzedaj"
 
 #: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
 #: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
-#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:101
-#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:178
-#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:402
+#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:114
+#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:389
 #: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
-#: src/gui/socialwindow.cpp:243 src/gui/textdialog.cpp:39
+#: src/gui/socialwindow.cpp:275 src/gui/textdialog.cpp:40
 #: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr "Anuluj"
@@ -623,7 +638,7 @@ msgstr "Nowy Adres Email już istnieje"
 msgid "Change Password"
 msgstr "Zmień hasło"
 
-#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:53
+#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:55
 #: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
 msgid "Password:"
 msgstr "Hasło:"
@@ -655,19 +670,19 @@ msgstr ""
 msgid "Create Character"
 msgstr "Stwórz postać"
 
-#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:52
+#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:54
 #: src/gui/register.cpp:67
 msgid "Name:"
 msgstr "Imię:"
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
 #: src/gui/outfitwindow.cpp:67
 msgid ">"
 msgstr ""
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
 #: src/gui/outfitwindow.cpp:66
@@ -684,8 +699,8 @@ msgstr "Kolor włosów:"
 msgid "Hair style:"
 msgstr "Fryzura:"
 
-#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:397
-#: src/gui/socialwindow.cpp:297
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:392
+#: src/gui/socialwindow.cpp:329
 msgid "Create"
 msgstr "Utwórz"
 
@@ -741,34 +756,34 @@ msgstr "Wyrejestruj"
 msgid "Change Email"
 msgstr "Zmień adres Email"
 
-#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:155
-#: src/gui/setup_players.cpp:230
+#: src/gui/charselectdialog.cpp:336 src/gui/serverdialog.cpp:231
+#: src/gui/setup_players.cpp:229
 msgid "Delete"
 msgstr "Usuń"
 
-#: src/gui/charselectdialog.cpp:387
+#: src/gui/charselectdialog.cpp:380
 #, fuzzy
 msgid "Choose"
 msgstr "Zamknij"
 
-#: src/gui/charselectdialog.cpp:399 src/gui/charselectdialog.cpp:400
+#: src/gui/charselectdialog.cpp:394 src/gui/charselectdialog.cpp:395
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:77
+#: src/gui/chat.cpp:88
 msgid "Chat"
 msgstr "Czat"
 
-#: src/gui/chat.cpp:287
+#: src/gui/chat.cpp:311
 #, fuzzy, c-format
 msgid "Present: %s; %d players are present."
 msgstr "%d graczy jest obecnych."
 
-#: src/gui/chat.cpp:305
+#: src/gui/chat.cpp:329
 msgid "Attendance written to record log."
 msgstr "Dozór wpisany do dziennika zapisu"
 
-#: src/gui/chat.cpp:469
+#: src/gui/chat.cpp:493
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Szepczesz do %s: %s"
@@ -834,139 +849,170 @@ msgstr "Efekty otoczenia"
 msgid "Equipment"
 msgstr "Ekwipunek"
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:78
-#: src/gui/inventorywindow.cpp:80 src/gui/inventorywindow.cpp:291
-#: src/gui/popupmenu.cpp:372
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:89
+#: src/gui/inventorywindow.cpp:337 src/gui/popupmenu.cpp:359
 msgid "Unequip"
 msgstr "Zdejmij"
 
-#: src/gui/help.cpp:36
+#: src/gui/help.cpp:37
 msgid "Help"
 msgstr "Pomoc"
 
-#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:74
+#: src/gui/help.cpp:51 src/gui/npcdialog.cpp:50
 msgid "Close"
 msgstr "Zamknij"
 
-#: src/gui/inventorywindow.cpp:57 src/gui/windowmenu.cpp:56
+#: src/gui/inventorywindow.cpp:59 src/gui/windowmenu.cpp:56
 msgid "Inventory"
 msgstr "Inwentarz"
 
-#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:75
-#: src/gui/inventorywindow.cpp:293 src/gui/popupmenu.cpp:374
+#: src/gui/inventorywindow.cpp:59
+msgid "Storage"
+msgstr "Magazyn"
+
+#: src/gui/inventorywindow.cpp:82
+msgid "Slots:"
+msgstr "Miejsc:"
+
+#: src/gui/inventorywindow.cpp:87 src/gui/inventorywindow.cpp:100
+#: src/gui/inventorywindow.cpp:339 src/gui/popupmenu.cpp:361
 msgid "Equip"
 msgstr "Załóż"
 
-#: src/gui/inventorywindow.cpp:74 src/gui/inventorywindow.cpp:75
-#: src/gui/inventorywindow.cpp:297 src/gui/popupmenu.cpp:377
+#: src/gui/inventorywindow.cpp:88
 msgid "Use"
 msgstr "Użyj"
 
-#: src/gui/inventorywindow.cpp:84 src/gui/inventorywindow.cpp:301
-#: src/gui/popupmenu.cpp:380
+#: src/gui/inventorywindow.cpp:101 src/gui/popupmenu.cpp:364
+msgid "Activate"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:102 src/gui/inventorywindow.cpp:348
+#: src/gui/popupmenu.cpp:367
 #, fuzzy
 msgid "Drop..."
 msgstr "Upuść"
 
-#: src/gui/inventorywindow.cpp:85 src/gui/popupmenu.cpp:386
+#: src/gui/inventorywindow.cpp:103 src/gui/popupmenu.cpp:373
 msgid "Split"
 msgstr "Podziel"
 
-#: src/gui/inventorywindow.cpp:86 src/gui/outfitwindow.cpp:51
+#: src/gui/inventorywindow.cpp:104 src/gui/outfitwindow.cpp:51
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:97 src/gui/storagewindow.cpp:84
-msgid "Slots:"
-msgstr "Miejsc:"
-
-#: src/gui/inventorywindow.cpp:98
+#: src/gui/inventorywindow.cpp:106
 msgid "Weight:"
 msgstr "Waga:"
 
-#: src/gui/inventorywindow.cpp:303 src/gui/popupmenu.cpp:382
+#: src/gui/inventorywindow.cpp:124 src/gui/popupmenu.cpp:378
+msgid "Store"
+msgstr "Przechowaj"
+
+#: src/gui/inventorywindow.cpp:125 src/gui/popupmenu.cpp:385
+msgid "Retrieve"
+msgstr "Pobierz"
+
+#: src/gui/inventorywindow.cpp:350 src/gui/popupmenu.cpp:369
 msgid "Drop"
 msgstr "Upuść"
 
-#: src/gui/itemamount.cpp:100 src/gui/okdialog.cpp:42
-#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:38 src/gui/trade.cpp:73
-#: src/gui/trade.cpp:75
+#: src/gui/itemamount.cpp:113 src/gui/okdialog.cpp:42
+#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:39 src/gui/trade.cpp:72
+#: src/gui/trade.cpp:74
 msgid "OK"
 msgstr "Ok"
 
-#: src/gui/itemamount.cpp:102
+#: src/gui/itemamount.cpp:115
 msgid "All"
 msgstr "wszystkie"
 
-#: src/gui/itemamount.cpp:128
+#: src/gui/itemamount.cpp:141
 msgid "Select amount of items to trade."
 msgstr "Wybierz ilość przedmiotów do handlu."
 
-#: src/gui/itemamount.cpp:131
+#: src/gui/itemamount.cpp:144
 msgid "Select amount of items to drop."
 msgstr "Wybierz ilość przedmiotów do upuszczenia."
 
-#: src/gui/itemamount.cpp:134
+#: src/gui/itemamount.cpp:147
 msgid "Select amount of items to store."
 msgstr "Podaj ilość rzeczy do przechowania."
 
-#: src/gui/itemamount.cpp:137
+#: src/gui/itemamount.cpp:150
 msgid "Select amount of items to retrieve."
 msgstr "Wybierz ilość przedmiotów do pobrania."
 
-#: src/gui/itemamount.cpp:140
+#: src/gui/itemamount.cpp:153
 msgid "Select amount of items to split."
 msgstr "Wybierz ilość przedmiotów do podziału."
 
-#: src/gui/itempopup.cpp:92
+#: src/gui/itempopup.cpp:137
 #, fuzzy, c-format
 msgid "Weight: %s"
 msgstr "Waga: "
 
-#: src/gui/login.cpp:49 src/gui/login.cpp:61
+#: src/gui/login.cpp:51 src/gui/login.cpp:63
 msgid "Login"
 msgstr "Użytkownik"
 
-#: src/gui/login.cpp:58
+#: src/gui/login.cpp:60
 #, fuzzy
 msgid "Remember username"
 msgstr "Zapamiętaj użytkownika"
 
-#: src/gui/login.cpp:59 src/gui/register.cpp:58 src/gui/register.cpp:73
+#: src/gui/login.cpp:61 src/gui/register.cpp:58 src/gui/register.cpp:73
 msgid "Register"
 msgstr "Rejestruj"
 
-#: src/gui/login.cpp:60
+#: src/gui/login.cpp:62
 #, fuzzy
 msgid "Change Server"
 msgstr "Serwer"
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
+#: src/gui/login.cpp:129
+#, fuzzy
+msgid "Registration disabled"
+msgstr "Podział przedmiotu wyłączony."
+
+#: src/gui/login.cpp:129
+msgid "You need to use the website to register an account for this server."
+msgstr ""
+
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:86
 msgid "Map"
 msgstr "Mapa"
 
-#: src/gui/npcdialog.cpp:44
+#: src/gui/ministatus.cpp:235
+msgid "Need"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:48
 msgid "Waiting for server"
 msgstr "Oczekiwanie na serwer"
 
-#: src/gui/npcdialog.cpp:45
+#: src/gui/npcdialog.cpp:49
 msgid "Next"
 msgstr "Następna"
 
-#: src/gui/npcdialog.cpp:47
+#: src/gui/npcdialog.cpp:51
 msgid "Submit"
 msgstr "Zatwierdź"
 
-#: src/gui/npcdialog.cpp:52 src/gui/npcpostdialog.cpp:41
+#: src/gui/npcdialog.cpp:73 src/gui/npcpostdialog.cpp:41
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:110
+#: src/gui/npcdialog.cpp:118
+msgid "Clear log"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:134
 msgid "Reset"
 msgstr "Resetuj"
 
 #. TRANSLATORS: Please leave the \n sequences intact.
-#: src/gui/npcdialog.cpp:171
+#: src/gui/npcdialog.cpp:208
 #, fuzzy
 msgid ""
 "\n"
@@ -981,7 +1027,7 @@ msgstr "Do:"
 msgid "Send"
 msgstr "Wyślij"
 
-#: src/gui/npcpostdialog.cpp:96
+#: src/gui/npcpostdialog.cpp:99
 msgid "Failed to send as sender or letter invalid."
 msgstr "Nie powiodła się wysyłka jako nadawca, albo list jest nieprawidłowy."
 
@@ -996,99 +1042,86 @@ msgstr ""
 msgid "Unequip first"
 msgstr "Zdejmij"
 
-#: src/gui/popupmenu.cpp:84
+#: src/gui/popupmenu.cpp:83
 #, fuzzy, c-format
 msgid "Trade with %s..."
 msgstr "Handel z %s"
 
-#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:161
+#: src/gui/popupmenu.cpp:87 src/gui/popupmenu.cpp:158
 #, fuzzy, c-format
 msgid "Attack %s"
 msgstr "Atak %+d"
 
-#: src/gui/popupmenu.cpp:92
+#: src/gui/popupmenu.cpp:91
 #, fuzzy, c-format
 msgid "Whisper %s"
 msgstr "Szept"
 
-#: src/gui/popupmenu.cpp:101
+#: src/gui/popupmenu.cpp:100
 #, fuzzy, c-format
 msgid "Befriend %s"
 msgstr "@@friend|Zaprzyjaźnij się z %s@@"
 
-#: src/gui/popupmenu.cpp:106
+#: src/gui/popupmenu.cpp:105
 #, fuzzy, c-format
 msgid "Disregard %s"
 msgstr "Nielubiany"
 
-#: src/gui/popupmenu.cpp:109
+#: src/gui/popupmenu.cpp:108
 #, fuzzy, c-format
 msgid "Ignore %s"
 msgstr "Ignorowany"
 
-#: src/gui/popupmenu.cpp:115 src/gui/popupmenu.cpp:124
+#: src/gui/popupmenu.cpp:114 src/gui/popupmenu.cpp:123
 #, c-format
 msgid "Unignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:118
+#: src/gui/popupmenu.cpp:117
 #, fuzzy, c-format
 msgid "Completely ignore %s"
 msgstr "@@ignore|Kompletnie ignoruj %s@@"
 
 #: src/gui/popupmenu.cpp:130
-#, c-format
-msgid "Follow %s"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:133
 #, fuzzy, c-format
 msgid "Invite %s to join your guild"
 msgstr "@@guild|Zaproś %s aby dołączył do twojej gildii@@"
 
-#: src/gui/popupmenu.cpp:137
+#: src/gui/popupmenu.cpp:134
 #, fuzzy, c-format
 msgid "Invite %s to join your party"
 msgstr "@@party|Zaproś %s do grupy@@"
 
-#: src/gui/popupmenu.cpp:144
+#: src/gui/popupmenu.cpp:141
 #, fuzzy
 msgid "Kick player"
 msgstr "Wykopanie nie powiodło się!"
 
-#: src/gui/popupmenu.cpp:153
+#: src/gui/popupmenu.cpp:150
 #, fuzzy, c-format
 msgid "Talk to %s"
 msgstr "@@talk|Rozmawiaj z %s@@"
 
-#: src/gui/popupmenu.cpp:166
+#: src/gui/popupmenu.cpp:163
 #, fuzzy
 msgid "Kick monster"
 msgstr "@@admin-kick|Wykop potwora@@"
 
-#: src/gui/popupmenu.cpp:174
+#: src/gui/popupmenu.cpp:171
 #, fuzzy
 msgid "Add name to chat"
 msgstr "@@name|Dodaj imię do czatu@@"
 
-#: src/gui/popupmenu.cpp:191
+#: src/gui/popupmenu.cpp:188
 #, fuzzy, c-format
 msgid "Pick up %s"
 msgstr "Podnieś"
 
-#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:400
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:387
 #, fuzzy
 msgid "Add to chat"
 msgstr "@@chat|Dodaj do czatu@@"
 
-#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:71
-msgid "Store"
-msgstr "Przechowaj"
-
-#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:72
-msgid "Retrieve"
-msgstr "Pobierz"
-
 #: src/gui/quitdialog.cpp:44
 msgid "Switch server"
 msgstr "Zmień serwer"
@@ -1157,52 +1190,65 @@ msgstr "Hasło nie może mieć więcej jak %d znaków."
 msgid "Passwords do not match."
 msgstr "Hasła nie zgadzają się."
 
-#: src/gui/serverdialog.cpp:124
+#: src/gui/serverdialog.cpp:197
 #, fuzzy
 msgid "Choose Your Server"
 msgstr "Wybierz twój serwer"
 
-#: src/gui/serverdialog.cpp:131 src/gui/widgets/chattab.cpp:139
+#: src/gui/serverdialog.cpp:206 src/gui/widgets/chattab.cpp:142
 msgid "Server:"
 msgstr "Serwer:"
 
-#: src/gui/serverdialog.cpp:132
+#: src/gui/serverdialog.cpp:207
 msgid "Port:"
 msgstr "Port:"
 
-#: src/gui/serverdialog.cpp:133
+#: src/gui/serverdialog.cpp:208
 #, fuzzy
 msgid "Server type:"
 msgstr "Serwer:"
 
-#: src/gui/serverdialog.cpp:153
+#: src/gui/serverdialog.cpp:229
 #, fuzzy
 msgid "Connect"
 msgstr "Łączenie..."
 
-#: src/gui/serverdialog.cpp:154
+#: src/gui/serverdialog.cpp:230
 #, fuzzy
 msgid "Custom Server"
 msgstr "Własny kursor"
 
-#: src/gui/serverdialog.cpp:242
+#: src/gui/serverdialog.cpp:324
 msgid "Please type both the address and the port of a server."
 msgstr "Proszę wpisać adres i port serwera"
 
-#: src/gui/serverdialog.cpp:357
+#: src/gui/serverdialog.cpp:441
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:363
+#: src/gui/serverdialog.cpp:447
 #, fuzzy
 msgid "Waiting for server..."
 msgstr "Oczekiwanie na serwer"
 
-#: src/gui/serverdialog.cpp:367
+#: src/gui/serverdialog.cpp:451
 msgid "Preparing download"
 msgstr ""
 
+#: src/gui/serverdialog.cpp:455
+msgid "Error retreiving server list!"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:550
+msgid "requires a newer version"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:552
+#, c-format
+msgid "requires v%s"
+msgstr ""
+
 #: src/gui/setup_audio.cpp:42
 msgid "Sound"
 msgstr "Dźwięk"
@@ -1236,54 +1282,54 @@ msgstr ""
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:45
+#: src/gui/setup_colors.cpp:46
 msgid "This is what the color looks like"
 msgstr "Kolor będzie wyglądał w ten sposób"
 
-#: src/gui/setup_colors.cpp:50
+#: src/gui/setup_colors.cpp:51
 msgid "Colors"
 msgstr "Kolory"
 
-#: src/gui/setup_colors.cpp:71
+#: src/gui/setup_colors.cpp:72
 #, fuzzy
 msgid "Type:"
 msgstr "Typ: "
 
-#: src/gui/setup_colors.cpp:82 src/gui/setup_colors.cpp:330
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:331
 msgid "Static"
 msgstr "Statyczny"
 
-#: src/gui/setup_colors.cpp:84 src/gui/setup_colors.cpp:85
-#: src/gui/setup_colors.cpp:331
+#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
+#: src/gui/setup_colors.cpp:332
 msgid "Pulse"
 msgstr "Puls"
 
-#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:87
-#: src/gui/setup_colors.cpp:332
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
+#: src/gui/setup_colors.cpp:333
 msgid "Rainbow"
 msgstr "Tęcza"
 
-#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
-#: src/gui/setup_colors.cpp:332
+#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
+#: src/gui/setup_colors.cpp:333
 msgid "Spectrum"
 msgstr "Widmo"
 
-#: src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:94
 #, fuzzy
 msgid "Delay:"
 msgstr "Opóźnienie: "
 
-#: src/gui/setup_colors.cpp:108
+#: src/gui/setup_colors.cpp:109
 #, fuzzy
 msgid "Red:"
 msgstr "Czerwony: "
 
-#: src/gui/setup_colors.cpp:123
+#: src/gui/setup_colors.cpp:124
 #, fuzzy
 msgid "Green:"
 msgstr "Zielony: "
 
-#: src/gui/setup_colors.cpp:138
+#: src/gui/setup_colors.cpp:139
 #, fuzzy
 msgid "Blue:"
 msgstr "Niebieski: "
@@ -1341,591 +1387,593 @@ msgstr "Domyślny"
 msgid "Key Conflict(s) Detected."
 msgstr "Wykryto konflikt klawiszy."
 
-#: src/gui/setup_players.cpp:57
+#: src/gui/setup_players.cpp:58
 msgid "Name"
 msgstr "Nazwa"
 
-#: src/gui/setup_players.cpp:58
+#: src/gui/setup_players.cpp:59
 msgid "Relation"
 msgstr "Relacja"
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:64
 msgid "Neutral"
 msgstr "Neutralny"
 
-#: src/gui/setup_players.cpp:64
+#: src/gui/setup_players.cpp:65
 msgid "Friend"
 msgstr "Przyjaciel"
 
-#: src/gui/setup_players.cpp:65
+#: src/gui/setup_players.cpp:66
 msgid "Disregarded"
 msgstr "Nielubiany"
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_players.cpp:67
 msgid "Ignored"
 msgstr "Ignorowany"
 
-#: src/gui/setup_players.cpp:208 src/gui/setup_video.cpp:132
+#: src/gui/setup_players.cpp:206 src/gui/setup_video.cpp:153
 msgid "???"
 msgstr "???"
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_players.cpp:225
 msgid "Allow trading"
 msgstr "Zezwól na handel"
 
-#: src/gui/setup_players.cpp:228
+#: src/gui/setup_players.cpp:227
 msgid "Allow whispers"
 msgstr "Zezwól na szepty"
 
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:231
 msgid "Put all whispers in tabs"
 msgstr "Umieść wszystkie szepty w zakładkach"
 
-#: src/gui/setup_players.cpp:234
+#: src/gui/setup_players.cpp:233
 #, fuzzy
 msgid "Show gender"
 msgstr "Pokaż imię"
 
-#: src/gui/setup_players.cpp:236
+#: src/gui/setup_players.cpp:235
+#, fuzzy
+msgid "Enable Chat log"
+msgstr "Nie można sprzedać."
+
+#: src/gui/setup_players.cpp:237
 msgid "Players"
 msgstr "Gracze"
 
-#: src/gui/setup_players.cpp:261
+#: src/gui/setup_players.cpp:262
 msgid "When ignoring:"
 msgstr "Gdy ignorowany:"
 
-#: src/gui/setup_video.cpp:113
+#: src/gui/setup_video.cpp:134
 msgid "Tiny"
 msgstr "Drobna"
 
-#: src/gui/setup_video.cpp:114
+#: src/gui/setup_video.cpp:135
 msgid "Small"
 msgstr "Mała"
 
-#: src/gui/setup_video.cpp:115
+#: src/gui/setup_video.cpp:136
 msgid "Medium"
 msgstr "Średnia"
 
-#: src/gui/setup_video.cpp:116
+#: src/gui/setup_video.cpp:137
 msgid "Large"
 msgstr "Duża"
 
-#: src/gui/setup_video.cpp:142
+#: src/gui/setup_video.cpp:163
 msgid "No text"
 msgstr "Brak tekstu"
 
-#: src/gui/setup_video.cpp:143
+#: src/gui/setup_video.cpp:164
 msgid "Text"
 msgstr "Tekst"
 
-#: src/gui/setup_video.cpp:144
+#: src/gui/setup_video.cpp:165
 msgid "Bubbles, no names"
 msgstr "Bąbelki, brak imion"
 
-#: src/gui/setup_video.cpp:145
+#: src/gui/setup_video.cpp:166
 msgid "Bubbles with names"
 msgstr "Bąbelki z imionami"
 
-#: src/gui/setup_video.cpp:157
+#: src/gui/setup_video.cpp:178
 msgid "off"
 msgstr "wyłączone"
 
-#: src/gui/setup_video.cpp:158 src/gui/setup_video.cpp:171
+#: src/gui/setup_video.cpp:179 src/gui/setup_video.cpp:192
 msgid "low"
 msgstr "niskie"
 
-#: src/gui/setup_video.cpp:159 src/gui/setup_video.cpp:173
+#: src/gui/setup_video.cpp:180 src/gui/setup_video.cpp:194
 msgid "high"
 msgstr "wysokie"
 
-#: src/gui/setup_video.cpp:172
+#: src/gui/setup_video.cpp:193
 msgid "medium"
 msgstr "średnie"
 
-#: src/gui/setup_video.cpp:174
+#: src/gui/setup_video.cpp:195
 msgid "max"
 msgstr "max"
 
-#: src/gui/setup_video.cpp:196
+#: src/gui/setup_video.cpp:217
 msgid "Full screen"
 msgstr "Pełen ekran"
 
-#: src/gui/setup_video.cpp:197
+#: src/gui/setup_video.cpp:218
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:198
+#: src/gui/setup_video.cpp:219
 msgid "Custom cursor"
 msgstr "Własny kursor"
 
-#: src/gui/setup_video.cpp:200
+#: src/gui/setup_video.cpp:221
 msgid "Visible names"
 msgstr "Widoczne imiona"
 
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:223
 msgid "Particle effects"
 msgstr "Efekty cząsteczkowe"
 
-#: src/gui/setup_video.cpp:204
+#: src/gui/setup_video.cpp:225
 #, fuzzy
 msgid "Show own name"
 msgstr "Pokaż imię"
 
-#: src/gui/setup_video.cpp:205
+#: src/gui/setup_video.cpp:226
+msgid "Log NPC dialogue"
+msgstr ""
+
+#: src/gui/setup_video.cpp:227
 msgid "Show pickup notification"
 msgstr "Pokaż powiadomienie o podniesieniu"
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:207
+#. TRANSLATORS: Refers to "Show pickup notification"
+#: src/gui/setup_video.cpp:229
 msgid "in chat"
 msgstr "w czacie"
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:209
+#. TRANSLATORS: Refers to "Show pickup notification"
+#: src/gui/setup_video.cpp:231
 msgid "as particle"
 msgstr "jako cząsteczkę"
 
-#: src/gui/setup_video.cpp:214
+#: src/gui/setup_video.cpp:236
 #, fuzzy
 msgid "FPS limit:"
 msgstr "Limit FPS:"
 
-#: src/gui/setup_video.cpp:225
+#: src/gui/setup_video.cpp:247
+msgid "Disable transparency (Low CPU mode)"
+msgstr ""
+
+#: src/gui/setup_video.cpp:250
 msgid "Video"
 msgstr "Obraz"
 
-#: src/gui/setup_video.cpp:227
+#: src/gui/setup_video.cpp:252
 #, fuzzy
-msgid "Show monster damage"
+msgid "Show damage"
 msgstr "Pokaż imię"
 
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:258
 msgid "Overhead text"
 msgstr "Tekst nad głową"
 
-#: src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:259
 msgid "Gui opacity"
 msgstr "Przezroczystość GUI"
 
-#: src/gui/setup_video.cpp:235
+#: src/gui/setup_video.cpp:260
 msgid "Ambient FX"
 msgstr "Efekty otoczenia"
 
-#: src/gui/setup_video.cpp:236
+#: src/gui/setup_video.cpp:261
 #, fuzzy
 msgid "Particle detail"
 msgstr "Detale cząsteczek"
 
-#: src/gui/setup_video.cpp:237
+#: src/gui/setup_video.cpp:262
 msgid "Font size"
 msgstr "Rozmiar czcionki"
 
-#: src/gui/setup_video.cpp:251 src/gui/setup_video.cpp:454
-#: src/gui/setup_video.cpp:568
+#: src/gui/setup_video.cpp:277 src/gui/setup_video.cpp:532
+#: src/gui/setup_video.cpp:662
 #, fuzzy
 msgid "None"
 msgstr "Nie"
 
-#: src/gui/setup_video.cpp:381
+#: src/gui/setup_video.cpp:426
 #, fuzzy
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr "tryb i przywrócenie starego trybu również nie powiodło się!"
 
-#: src/gui/setup_video.cpp:387
+#: src/gui/setup_video.cpp:432
 #, fuzzy
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr "tryb i przywrócenie starego trybu również nie powiodło się!"
 
-#: src/gui/setup_video.cpp:398
+#: src/gui/setup_video.cpp:443
 #, fuzzy
 msgid "Switching to Full Screen"
 msgstr "Przełączanie na pełen ekran"
 
-#: src/gui/setup_video.cpp:399
+#: src/gui/setup_video.cpp:444
 msgid "Restart needed for changes to take effect."
 msgstr "Wymagane ponowne uruchomienie aby zastosować zmiany."
 
-#: src/gui/setup_video.cpp:411
+#: src/gui/setup_video.cpp:458
 #, fuzzy
 msgid "Changing to OpenGL"
 msgstr "Zmień na OpenGL"
 
-#: src/gui/setup_video.cpp:412
+#: src/gui/setup_video.cpp:459
+msgid ""
+"Applying change to OpenGL requires restart. In case OpenGL messes up your "
+"game graphics, restart the game with the command line option \"--no-opengl\"."
+msgstr ""
+
+#: src/gui/setup_video.cpp:466
+msgid "Deactivating OpenGL"
+msgstr ""
+
+#: src/gui/setup_video.cpp:467
 msgid "Applying change to OpenGL requires restart."
 msgstr "Zastosowanie zmiany na OpenGL wymaga ponownego uruchomienia."
 
-#: src/gui/setup_video.cpp:486 src/gui/setup_video.cpp:491
+#: src/gui/setup_video.cpp:475
+#, fuzzy
+msgid "Transparency disabled"
+msgstr "Podział doświadczenia wyłączony."
+
+#: src/gui/setup_video.cpp:476 src/gui/setup_video.cpp:484
+msgid "You must restart to apply changes."
+msgstr ""
+
+#: src/gui/setup_video.cpp:483
+msgid "Transparency enabled"
+msgstr ""
+
+#: src/gui/setup_video.cpp:576 src/gui/setup_video.cpp:581
 #, fuzzy
 msgid "Screen Resolution Changed"
 msgstr "Zmieniono rozdzielczość ekranu"
 
-#: src/gui/setup_video.cpp:487 src/gui/setup_video.cpp:492
+#: src/gui/setup_video.cpp:577 src/gui/setup_video.cpp:582
 msgid "Restart your client for the change to take effect."
 msgstr "Uruchom ponownie twojego klienta, aby mogły zajść zmiany."
 
-#: src/gui/setup_video.cpp:489
+#: src/gui/setup_video.cpp:579
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:522
+#: src/gui/setup_video.cpp:612
 #, fuzzy
 msgid "Particle Effect Settings Changed."
 msgstr "Zmieniono ustawienia ef. cząsteczek"
 
-#: src/gui/setup_video.cpp:523
+#: src/gui/setup_video.cpp:613
 msgid "Changes will take effect on map change."
 msgstr "Efekty nastąpią po zmianie mapy."
 
-#: src/gui/skilldialog.cpp:198 src/gui/windowmenu.cpp:59
+#: src/gui/skilldialog.cpp:212 src/gui/windowmenu.cpp:59
 msgid "Skills"
 msgstr "Zdolności"
 
-#: src/gui/skilldialog.cpp:209
+#: src/gui/skilldialog.cpp:223
 msgid "Up"
 msgstr "Góra"
 
-#: src/gui/skilldialog.cpp:263
+#: src/gui/skilldialog.cpp:269
 #, fuzzy, c-format
 msgid "Skill points available: %d"
 msgstr "Punkty umiejętności: %d"
 
-#: src/gui/skilldialog.cpp:315
+#: src/gui/skilldialog.cpp:351
 #, fuzzy, c-format
 msgid "Skill Set %d"
 msgstr "Punkty umiejętności: %d"
 
-#: src/gui/skilldialog.cpp:324
+#: src/gui/skilldialog.cpp:360
 #, fuzzy, c-format
 msgid "Skill %d"
 msgstr "Zdolności"
 
-#: src/gui/skilldialog.cpp:406
+#: src/gui/skilldialog.cpp:442
 #, fuzzy, c-format
 msgid "Lvl: %d (%+d)"
 msgstr "Poziom: %d"
 
-#: src/gui/skilldialog.cpp:417
+#: src/gui/skilldialog.cpp:453
 #, fuzzy, c-format
 msgid "Lvl: %d"
 msgstr "Poziom: %d"
 
-#: src/gui/socialwindow.cpp:118
+#: src/gui/socialwindow.cpp:126
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:127
+#: src/gui/socialwindow.cpp:139
 #, fuzzy, c-format
 msgid "Guild %s quit requested."
 msgstr "Gildia została utworzona."
 
-#: src/gui/socialwindow.cpp:137
+#: src/gui/socialwindow.cpp:153
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:138
+#: src/gui/socialwindow.cpp:154
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:147
+#: src/gui/socialwindow.cpp:163
 #, fuzzy
 msgid "Leave Guild?"
 msgstr "Utwórz Gildię"
 
-#: src/gui/socialwindow.cpp:148
+#: src/gui/socialwindow.cpp:164
 #, fuzzy, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Czy na pewno chcesz wyjść?"
 
-#: src/gui/socialwindow.cpp:183
+#: src/gui/socialwindow.cpp:207 src/net/tmwa/partyhandler.cpp:330
 #, fuzzy, c-format
 msgid "Invited user %s to party."
 msgstr "/party > Zaproś użytkownika do grupy"
 
-#: src/gui/socialwindow.cpp:190
+#: src/gui/socialwindow.cpp:218
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:200
+#: src/gui/socialwindow.cpp:232
 #, fuzzy
 msgid "Member Invite to Party"
 msgstr "/party > Zaproś użytkownika do grupy"
 
-#: src/gui/socialwindow.cpp:201
+#: src/gui/socialwindow.cpp:233
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:210
+#: src/gui/socialwindow.cpp:242
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:211
+#: src/gui/socialwindow.cpp:243
 #, fuzzy, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Czy na pewno chcesz wyjść?"
 
-#: src/gui/socialwindow.cpp:240
+#: src/gui/socialwindow.cpp:272
 msgid "Create Guild"
 msgstr "Utwórz Gildię"
 
-#: src/gui/socialwindow.cpp:241 src/gui/socialwindow.cpp:565
+#: src/gui/socialwindow.cpp:273 src/gui/socialwindow.cpp:620
 #, fuzzy
 msgid "Create Party"
 msgstr "Stwórz postać"
 
-#: src/gui/socialwindow.cpp:280 src/gui/windowmenu.cpp:64
+#: src/gui/socialwindow.cpp:312 src/gui/windowmenu.cpp:64
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:298
+#: src/gui/socialwindow.cpp:330
 #, fuzzy
 msgid "Invite"
 msgstr "Zaproś Użytkownika"
 
-#: src/gui/socialwindow.cpp:299
+#: src/gui/socialwindow.cpp:331
 #, fuzzy
 msgid "Leave"
 msgstr "Duża"
 
-#: src/gui/socialwindow.cpp:395
+#: src/gui/socialwindow.cpp:443
 #, fuzzy, c-format
 msgid "Accepted party invite from %s."
 msgstr "Zaakceptowano zaproszenie od %s."
 
-#: src/gui/socialwindow.cpp:401
+#: src/gui/socialwindow.cpp:449
 #, fuzzy, c-format
 msgid "Rejected party invite from %s."
 msgstr "Odrzucono zaproszenie od %s."
 
-#: src/gui/socialwindow.cpp:414
+#: src/gui/socialwindow.cpp:462
 #, fuzzy, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Zaakceptowano zaproszenie od %s."
 
-#: src/gui/socialwindow.cpp:420
+#: src/gui/socialwindow.cpp:468
 #, fuzzy, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Odrzucono zaproszenie od %s."
 
-#: src/gui/socialwindow.cpp:464
+#: src/gui/socialwindow.cpp:497
+msgid "Creating guild failed, please choose a shorter name."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:504
 #, fuzzy, c-format
 msgid "Creating guild called %s."
 msgstr "Błąd podczas tworzenia gildii."
 
-#: src/gui/socialwindow.cpp:478
+#: src/gui/socialwindow.cpp:520
+msgid "Creating party failed, please choose a shorter name."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:527
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:485
+#: src/gui/socialwindow.cpp:541
 #, fuzzy
 msgid "Guild Name"
 msgstr "Gildia"
 
-#: src/gui/socialwindow.cpp:486
+#: src/gui/socialwindow.cpp:542
 #, fuzzy
 msgid "Choose your guild's name."
 msgstr "Wybierz twój serwer"
 
-#: src/gui/socialwindow.cpp:498
+#: src/gui/socialwindow.cpp:554
 #, fuzzy
 msgid "Received guild request, but one already exists."
 msgstr "Otrzymano prośbę o założenie grupy, ale ona już istnieje."
 
-#: src/gui/socialwindow.cpp:503
+#: src/gui/socialwindow.cpp:559
 #, fuzzy, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s zaprosił ciebie, byś dołączył do grupy %s ."
 
-#: src/gui/socialwindow.cpp:508
+#: src/gui/socialwindow.cpp:564
 #, fuzzy
 msgid "Accept Guild Invite"
 msgstr "Zaakceptuj zaproszenie do grupy"
 
-#: src/gui/socialwindow.cpp:520
+#: src/gui/socialwindow.cpp:576
 msgid "Received party request, but one already exists."
 msgstr "Otrzymano prośbę o założenie grupy, ale ona już istnieje."
 
-#: src/gui/socialwindow.cpp:530
+#: src/gui/socialwindow.cpp:585
 #, fuzzy
 msgid "You have been invited you to join a party."
 msgstr "%s zaprosił ciebie, byś dołączył do grupy."
 
-#: src/gui/socialwindow.cpp:534
+#: src/gui/socialwindow.cpp:589
 #, fuzzy, c-format
 msgid "You have been invited to join the %s party."
 msgstr "%s zaprosił ciebie, byś dołączył do grupy %s ."
 
-#: src/gui/socialwindow.cpp:542
+#: src/gui/socialwindow.cpp:597
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s zaprosił ciebie, byś dołączył do grupy."
 
-#: src/gui/socialwindow.cpp:547
+#: src/gui/socialwindow.cpp:602
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s zaprosił ciebie, byś dołączył do grupy %s ."
 
-#: src/gui/socialwindow.cpp:555
+#: src/gui/socialwindow.cpp:610
 msgid "Accept Party Invite"
 msgstr "Zaakceptuj zaproszenie do grupy"
 
-#: src/gui/socialwindow.cpp:566
+#: src/gui/socialwindow.cpp:621
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:571
+#: src/gui/socialwindow.cpp:626
 #, fuzzy
 msgid "Party Name"
 msgstr "Grupa"
 
-#: src/gui/socialwindow.cpp:572
+#: src/gui/socialwindow.cpp:627
 #, fuzzy
 msgid "Choose your party's name."
 msgstr "Wybierz twój serwer"
 
-#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:62
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:62
 msgid "Specials"
 msgstr ""
 
-#: src/gui/specialswindow.cpp:174
-#, c-format
-msgid "Specials Set %d"
-msgstr ""
-
-#: src/gui/specialswindow.cpp:191
-#, c-format
-msgid "Special %d"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:247
+#: src/gui/statuswindow.cpp:113 src/gui/statuswindow.cpp:215
+#: src/gui/statuswindow.cpp:262
 #, c-format
 msgid "Level: %d"
 msgstr "Poziom: %d"
 
-#: src/gui/statuswindow.cpp:101 src/gui/statuswindow.cpp:211
+#: src/gui/statuswindow.cpp:114 src/gui/statuswindow.cpp:208
+#: src/gui/statuswindow.cpp:239
 #, c-format
 msgid "Money: %s"
 msgstr "Pieniądze: %s"
 
-#: src/gui/statuswindow.cpp:104
+#: src/gui/statuswindow.cpp:117
 msgid "HP:"
 msgstr "HP:"
 
-#: src/gui/statuswindow.cpp:109
+#: src/gui/statuswindow.cpp:122
 msgid "Exp:"
 msgstr "Exp:"
 
-#: src/gui/statuswindow.cpp:114
+#: src/gui/statuswindow.cpp:130
 msgid "MP:"
 msgstr "MP:"
 
-#: src/gui/statuswindow.cpp:132 src/gui/statuswindow.cpp:219
+#: src/gui/statuswindow.cpp:158 src/gui/statuswindow.cpp:275
 #, c-format
 msgid "Job: %d"
 msgstr "Praca: %d"
 
-#: src/gui/statuswindow.cpp:133
+#: src/gui/statuswindow.cpp:159
 msgid "Job:"
 msgstr "Praca:"
 
-#: src/gui/statuswindow.cpp:194
-#, fuzzy
-msgid "HP"
-msgstr "HP:"
-
-#: src/gui/statuswindow.cpp:200
-#, fuzzy
-msgid "MP"
-msgstr "MP:"
-
-#: src/gui/statuswindow.cpp:206
-#, fuzzy
-msgid "Exp"
-msgstr "Exp:"
-
-#: src/gui/statuswindow.cpp:215
-#, fuzzy
-msgid "Money"
-msgstr "Pieniądze: %d"
-
-#: src/gui/statuswindow.cpp:225
-#, fuzzy
-msgid "Job"
-msgstr "Praca:"
-
-#: src/gui/statuswindow.cpp:229
+#: src/gui/statuswindow.cpp:211 src/gui/statuswindow.cpp:247
 #, fuzzy, c-format
 msgid "Character points: %d"
 msgstr "Statystyki postaci w porządku."
 
-#: src/gui/statuswindow.cpp:235
+#: src/gui/statuswindow.cpp:255
 #, fuzzy, c-format
 msgid "Correction points: %d"
 msgstr "Punkty umiejętności: %d"
 
-#: src/gui/statuswindow.cpp:251
-#, fuzzy
-msgid "Level"
-msgstr "Poziom: %d"
-
-#: src/gui/storagewindow.cpp:59
-msgid "Storage"
-msgstr "Magazyn"
-
-#: src/gui/trade.cpp:52
+#: src/gui/trade.cpp:53
 msgid "Propose trade"
 msgstr "Oferuj handel"
 
-#: src/gui/trade.cpp:53
+#: src/gui/trade.cpp:54
 msgid "Confirmed. Waiting..."
 msgstr "Potwierdzono. Oczekiwanie..."
 
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:55
 msgid "Agree trade"
 msgstr "Akceptuj handel"
 
-#: src/gui/trade.cpp:55
+#: src/gui/trade.cpp:56
 msgid "Agreed. Waiting..."
 msgstr "Zaakceptowano. Oczekiwanie..."
 
-#: src/gui/trade.cpp:58
+#: src/gui/trade.cpp:59
 msgid "Trade: You"
 msgstr "Handel: Ty"
 
-#: src/gui/trade.cpp:74 src/gui/trade.cpp:75
+#: src/gui/trade.cpp:73 src/gui/trade.cpp:74
 msgid "Trade"
 msgstr "Handel"
 
-#: src/gui/trade.cpp:77
+#: src/gui/trade.cpp:76
 msgid "Add"
 msgstr "Dodaj"
 
-#: src/gui/trade.cpp:99 src/gui/trade.cpp:135
+#: src/gui/trade.cpp:98 src/gui/trade.cpp:134
 #, fuzzy, c-format
 msgid "You get %s"
 msgstr "Otrzymujesz %s"
 
-#: src/gui/trade.cpp:100
+#: src/gui/trade.cpp:99
 msgid "You give:"
 msgstr "Dajesz:"
 
-#: src/gui/trade.cpp:104
+#: src/gui/trade.cpp:103
 msgid "Change"
 msgstr "Zmień"
 
-#: src/gui/trade.cpp:275
+#: src/gui/trade.cpp:262
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Dodanie przedmiotu nie powiodło się. Nie może zachodzić na siebie ten sam "
 "rodzaj przedmiotu w okienku."
 
-#: src/gui/trade.cpp:318
+#: src/gui/trade.cpp:304
 msgid "You don't have enough money."
 msgstr "Nie masz wystarczającej ilości pieniędzy."
 
@@ -1946,22 +1994,22 @@ msgstr "Łączenie..."
 msgid "Play"
 msgstr "Graj"
 
-#: src/gui/updatewindow.cpp:405
+#: src/gui/updatewindow.cpp:417
 msgid "##1  The update process is incomplete."
 msgstr "##1 Proces aktualizacji jest niekompletny."
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:407
+#: src/gui/updatewindow.cpp:419
 msgid "##1  It is strongly recommended that"
 msgstr "##1 Jest mocno zalecane abyś"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:409
+#: src/gui/updatewindow.cpp:421
 #, fuzzy
 msgid "##1  you try again later."
 msgstr "##1 spróbował później"
 
-#: src/gui/updatewindow.cpp:501
+#: src/gui/updatewindow.cpp:515
 msgid "Completed"
 msgstr "Zakończono"
 
@@ -2041,55 +2089,55 @@ msgstr "Wymagany użytkownik, aby przydzielić opa!"
 msgid "Need a user to kick!"
 msgstr "Wymagany użytkownk, aby go wykopać!"
 
-#: src/gui/widgets/chattab.cpp:118
+#: src/gui/widgets/chattab.cpp:121
 msgid "Global announcement:"
 msgstr "Ogłoszenie ogólne:"
 
-#: src/gui/widgets/chattab.cpp:124
+#: src/gui/widgets/chattab.cpp:127
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "Ogłoszenie ogólne od %s:"
 
-#: src/gui/widgets/chattab.cpp:150
+#: src/gui/widgets/chattab.cpp:153
 #, fuzzy, c-format
 msgid "%s whispers: %s"
 msgstr "%s szepcze: "
 
-#: src/gui/widgets/whispertab.cpp:51
+#: src/gui/widgets/whispertab.cpp:53
 msgid "Cannot send empty chat!"
 msgstr "Nie można wysłać pustego czatu!"
 
-#: src/gui/widgets/whispertab.cpp:70
+#: src/gui/widgets/whispertab.cpp:72
 msgid "/ignore > Ignore the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:71
+#: src/gui/widgets/whispertab.cpp:73
 msgid "/unignore > Stop ignoring the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:72
+#: src/gui/widgets/whispertab.cpp:74
 msgid "/close > Close the whisper tab"
 msgstr "/close > Zamyka zakładkę szeptania"
 
-#: src/gui/widgets/whispertab.cpp:82
+#: src/gui/widgets/whispertab.cpp:84
 msgid "Command: /close"
 msgstr "Komenda: /close"
 
-#: src/gui/widgets/whispertab.cpp:83
+#: src/gui/widgets/whispertab.cpp:85
 msgid "This command closes the current whisper tab."
 msgstr "Komenda zamyka obecną zakładkę szeptania"
 
-#: src/gui/widgets/whispertab.cpp:87
+#: src/gui/widgets/whispertab.cpp:89
 #, fuzzy
 msgid "Command: /ignore"
 msgstr "Komenda: /przedmiot"
 
-#: src/gui/widgets/whispertab.cpp:88
+#: src/gui/widgets/whispertab.cpp:90
 #, fuzzy
 msgid "This command ignores the other player regardless of current relations."
 msgstr "Ta komenda wyświetla liczbę połączonych graczy."
 
-#: src/gui/widgets/whispertab.cpp:94
+#: src/gui/widgets/whispertab.cpp:96
 #, fuzzy
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
@@ -2118,647 +2166,1009 @@ msgstr "Zmień"
 msgid "Choose World"
 msgstr "Wybierz twój serwer"
 
-#: src/keyboardconfig.cpp:40
+#: src/keyboardconfig.cpp:39
 msgid "Move Up"
 msgstr "Przesuń w górę"
 
-#: src/keyboardconfig.cpp:41
+#: src/keyboardconfig.cpp:40
 msgid "Move Down"
 msgstr "Przesuń w dół"
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:41
 msgid "Move Left"
 msgstr "Przesuń w lewo"
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:42
 msgid "Move Right"
 msgstr "Przesuń w prawo"
 
-#: src/keyboardconfig.cpp:44 src/net/ea/generalhandler.cpp:223
+#: src/keyboardconfig.cpp:43 src/net/tmwa/generalhandler.cpp:237
 msgid "Attack"
 msgstr "Atak"
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:44
 msgid "Target & Attack"
 msgstr "Namierz i Atakuj"
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:45
 msgid "Smilie"
 msgstr "Emotikonka"
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:46
 msgid "Talk"
 msgstr "Rozmowa"
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:47
 msgid "Stop Attack"
 msgstr "Zatrzymaj Atak"
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:48
 #, fuzzy
 msgid "Target Monster"
 msgstr "Namierz najbliższy cel"
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboardconfig.cpp:49
 msgid "Target NPC"
 msgstr "Namierz NPC"
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:50
 msgid "Target Player"
 msgstr "Namierz Gracza"
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:51
 msgid "Pickup"
 msgstr "Podnieś"
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:52
 msgid "Hide Windows"
 msgstr "Ukryj Okna"
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:53
 msgid "Sit"
 msgstr "Usiądź"
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:54
 msgid "Screenshot"
 msgstr "Zrzut ekranu"
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:55
 msgid "Enable/Disable Trading"
 msgstr "Włącz/Wysłącz Handlowanie"
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:56
 msgid "Find Path to Mouse"
 msgstr "Znajdź Ścieżkę do Myszy"
 
-#: src/keyboardconfig.cpp:58 src/keyboardconfig.cpp:59
-#: src/keyboardconfig.cpp:60 src/keyboardconfig.cpp:61
-#: src/keyboardconfig.cpp:62 src/keyboardconfig.cpp:63
-#: src/keyboardconfig.cpp:64 src/keyboardconfig.cpp:65
-#: src/keyboardconfig.cpp:66 src/keyboardconfig.cpp:67
-#: src/keyboardconfig.cpp:68 src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:57 src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60
+#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62
+#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64
+#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68
 #, c-format
 msgid "Item Shortcut %d"
 msgstr "Skrót Przedmiotu %d"
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:69
 msgid "Help Window"
 msgstr "Okno Pomocy"
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:70
 msgid "Status Window"
 msgstr "Okno statusu"
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:71
 msgid "Inventory Window"
 msgstr "Okno Inwentarza"
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:72
 msgid "Equipment Window"
 msgstr "Okno Ekwipunku"
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:73
 msgid "Skill Window"
 msgstr "Okno Umiejętności"
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:74
 msgid "Minimap Window"
 msgstr "Okno Minimapy"
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:75
 msgid "Chat Window"
 msgstr "Okno Czatu"
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:76
 msgid "Item Shortcut Window"
 msgstr "Okno Skrótów Przedmiotów"
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:77
 msgid "Setup Window"
 msgstr "Okno Ustawień"
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:78
 msgid "Debug Window"
 msgstr "Okno diagnostyczne"
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:79
 #, fuzzy
 msgid "Social Window"
 msgstr "Okno Umiejętności"
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:80
 msgid "Emote Shortcut Window"
 msgstr "Okno Skrótów Emotek"
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:81
 #, fuzzy
 msgid "Outfits Window"
 msgstr "Okno statusu"
 
-#: src/keyboardconfig.cpp:83
+#: src/keyboardconfig.cpp:82
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:83
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86
-#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88
-#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90
-#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92
-#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:84 src/keyboardconfig.cpp:85
+#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:87
+#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:89
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:91
+#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:93
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:95
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "Skrót Emotki %d"
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:96
 msgid "Toggle Chat"
 msgstr "Przełącznik Czatu"
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:97
 msgid "Scroll Chat Up"
 msgstr "Przewiń czat do góry"
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:98
 msgid "Scroll Chat Down"
 msgstr "Przewiń czat w doł"
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:99
 msgid "Previous Chat Tab"
 msgstr "Poprzednia zakładka czatu"
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:100
 msgid "Next Chat Tab"
 msgstr "Następna zakładka czatu"
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:101
 msgid "Select OK"
 msgstr "Wybrano OK"
 
-#: src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:103
 msgid "Ignore input 1"
 msgstr "Ignoruj wprowadzenie 1"
 
-#: src/keyboardconfig.cpp:105
+#: src/keyboardconfig.cpp:104
 msgid "Ignore input 2"
 msgstr "Ignoruj wprowadzenie 2"
 
-#: src/keyboardconfig.cpp:184
+#: src/keyboardconfig.cpp:183
 #, fuzzy, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr "Rozwiąż je, albo granie może być utrudnione."
 
-#: src/localplayer.cpp:914
+#: src/localplayer.cpp:985
 msgid "Unable to pick up item."
 msgstr "Nie można podnieść przedmiotu."
 
 #. TRANSLATORS: This sentence may be translated differently
 #. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:923
+#: src/localplayer.cpp:994
 #, fuzzy, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "Podniosłeś %s [@@%d|%s@@]."
 msgstr[1] "Podniosłeś %s [@@%d|%s@@]."
 
-#: src/main.cpp:43
+#: src/main.cpp:42
 msgid "mana [options] [mana-file]"
 msgstr ""
 
+#: src/main.cpp:43
+msgid "[mana-file] : The mana file is an XML file (.mana)"
+msgstr ""
+
 #: src/main.cpp:44
+msgid "              used to set custom parameters"
+msgstr ""
+
+#: src/main.cpp:45
+msgid "              to the mana client."
+msgstr ""
+
+#: src/main.cpp:47
 msgid "Options:"
 msgstr "Opcje:"
 
-#: src/main.cpp:45
+#: src/main.cpp:48
 #, fuzzy
 msgid "  -v --version        : Display the version"
 msgstr "  -v --version     : Pokazuje wersję"
 
-#: src/main.cpp:46
+#: src/main.cpp:49
 #, fuzzy
 msgid "  -h --help           : Display this help"
 msgstr "  -h --help        : Pokazuje tę pomoc"
 
-#: src/main.cpp:47
+#: src/main.cpp:50
 #, fuzzy
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr "  -C --config-file : Plik konfiguracyjny do użycia"
 
-#: src/main.cpp:48
+#: src/main.cpp:51
 #, fuzzy
 msgid "  -U --username       : Login with this username"
 msgstr "  -U --username    : Zaloguj z tą nazwą użytkownika"
 
-#: src/main.cpp:49
+#: src/main.cpp:52
 #, fuzzy
 msgid "  -P --password       : Login with this password"
 msgstr "  -P --password    : Zaloguj z tym hasłem"
 
-#: src/main.cpp:50
+#: src/main.cpp:53
 #, fuzzy
 msgid "  -c --character      : Login with this character"
 msgstr "  -c --character   : Zaloguj z tą postacią"
 
-#: src/main.cpp:51
+#: src/main.cpp:54
 #, fuzzy
 msgid "  -s --server         : Login server name or IP"
 msgstr "  -s --server      : Nazwa serwera logowania, lub IP"
 
-#: src/main.cpp:52
+#: src/main.cpp:55
 #, fuzzy
 msgid "  -p --port           : Login server port"
 msgstr "  -p --port        : Port serwera logowania"
 
-#: src/main.cpp:53
+#: src/main.cpp:56
 #, fuzzy
 msgid "     --update-host    : Use this update host"
 msgstr "  -H --update-host : Użyj tego hosta aktualizacji"
 
-#: src/main.cpp:54
+#: src/main.cpp:57
 #, fuzzy
 msgid "  -D --default        : Choose default character server and character"
 msgstr "  -D --default     : Wybierz domyślny serwer postaci i postać"
 
-#: src/main.cpp:56
+#: src/main.cpp:59
 #, fuzzy
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr "  -u --skip-update : Pomiń pobieranie aktualizacji"
 
-#: src/main.cpp:57
+#: src/main.cpp:60
 #, fuzzy
 msgid "  -d --data           : Directory to load game data from"
 msgstr "  -d --data        : Katalog, z którego załadować dane gry"
 
-#: src/main.cpp:58
+#: src/main.cpp:61
 #, fuzzy
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
+msgid "     --localdata-dir  : Directory to use as local data directory"
 msgstr "  -S --home-dir    : Katalog do użycia jako katalog domowy"
 
-#: src/main.cpp:59
+#: src/main.cpp:62
+#, fuzzy
+msgid "     --chat-log-dir   : Chat log dir to use"
+msgstr "  -C --config-file : Plik konfiguracyjny do użycia"
+
+#: src/main.cpp:63
 #, fuzzy
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr "  -S --home-dir    : Katalog do użycia jako katalog domowy"
 
-#: src/main.cpp:61
+#: src/main.cpp:65
 #, fuzzy
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr "  -O --no-opengl   : Wyłącz OpenGL dla tej sesji"
 
-#: src/net/ea/adminhandler.cpp:63
+#: src/net/manaserv/beinghandler.cpp:303 src/net/tmwa/playerhandler.cpp:94
+msgid "You are dead."
+msgstr "Jesteś martwy."
+
+#: src/net/manaserv/beinghandler.cpp:304 src/net/tmwa/playerhandler.cpp:95
+msgid "We regret to inform you that your character was killed in battle."
+msgstr "Ubolewamy, inforumując iż twoja postać została zabita w bitwie."
+
+#: src/net/manaserv/beinghandler.cpp:306 src/net/tmwa/playerhandler.cpp:97
+msgid "You are not that alive anymore."
+msgstr "Już nie jesteś taki żywy."
+
+#: src/net/manaserv/beinghandler.cpp:307 src/net/tmwa/playerhandler.cpp:98
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr "Skostniałe łapy ponurego żniwiarza sięgają po twoją duszę."
+
+#: src/net/manaserv/beinghandler.cpp:308 src/net/tmwa/playerhandler.cpp:99
+msgid "Game Over!"
+msgstr "Koniec gry!"
+
+#: src/net/manaserv/beinghandler.cpp:309 src/net/tmwa/playerhandler.cpp:101
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+"Nie, dzieci. Wasza postać tak naprawdę nie zginęła. Ona... yyy... udała się "
+"do lepszego miejsca."
+
+#: src/net/manaserv/beinghandler.cpp:311 src/net/tmwa/playerhandler.cpp:103
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr ""
+"Twój plan zniszczenia broni wrogów poprzez uderzanie o nią twoim gardłem "
+"zawiódł."
+
+#: src/net/manaserv/beinghandler.cpp:313 src/net/tmwa/playerhandler.cpp:105
+msgid "I guess this did not run too well."
+msgstr "Wydaje mi się, iż to nie poszło zbyt dobrze."
+
+#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:107
+msgid "Do you want your possessions identified?"
+msgstr "Czy chesz zidentyfikować twoje rzeczy?"
+
+#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:109
+msgid "Sadly, no trace of you was ever found..."
+msgstr "Niestety, ślad po tobie zaginął..."
+
+#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:111
+msgid "Annihilated."
+msgstr "Unicestwiony."
+
+#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:113
+msgid "Looks like you got your head handed to you."
+msgstr "Wygląda na to, że podano tobie twoją głowę."
+
+#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:115
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr "Znowu nawaliłeś, wrzuć swoje ciało do rur i weź sobie nowe."
+
+#: src/net/manaserv/beinghandler.cpp:323
+#, fuzzy
+msgid "Press OK to respawn."
+msgstr " Naciśnij OK, aby się odrodzić"
+
+#: src/net/manaserv/beinghandler.cpp:324
+#, fuzzy
+msgid "You Died"
+msgstr "Umarłeś"
+
+#: src/net/manaserv/charhandler.cpp:138 src/net/manaserv/charhandler.cpp:209
+#, fuzzy
+msgid "Not logged in."
+msgstr "Już zalogowany"
+
+#: src/net/manaserv/charhandler.cpp:141
+msgid "No empty slot."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:144
+msgid "Invalid name."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:147
+#, fuzzy
+msgid "Character's name already exists."
+msgstr "Nazwa użytkownika już istnieje"
+
+#: src/net/manaserv/charhandler.cpp:150
+msgid "Invalid hairstyle."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:153
+msgid "Invalid hair color."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:156
+msgid "Invalid gender."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:159
+#, fuzzy
+msgid "Character's stats are too high."
+msgstr "Statystyki postaci w porządku."
+
+#: src/net/manaserv/charhandler.cpp:162
+#, fuzzy
+msgid "Character's stats are too low."
+msgstr "Statystyki postaci w porządku."
+
+#: src/net/manaserv/charhandler.cpp:165
+#, c-format
+msgid "At least one statis out of the permitted range: (%u - %u)."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:171 src/net/manaserv/loginhandler.cpp:96
+#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
+#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
+#: src/net/tmwa/loginhandler.cpp:95 src/net/tmwa/loginhandler.cpp:182
+#, fuzzy
+msgid "Unknown error."
+msgstr "Nieznany błąd"
+
+#: src/net/manaserv/charhandler.cpp:200 src/net/tmwa/charserverhandler.cpp:146
+msgid "Info"
+msgstr "Info"
+
+#: src/net/manaserv/charhandler.cpp:200
+#, fuzzy
+msgid "Player deleted."
+msgstr "Gracz usunięty"
+
+#: src/net/manaserv/charhandler.cpp:212
+#, fuzzy
+msgid "Selection out of range."
+msgstr "Wybierz ilość przedmiotów do handlu."
+
+#: src/net/manaserv/charhandler.cpp:215
+#, fuzzy, c-format
+msgid "Unknown error (%d)."
+msgstr "Nieznany błąd"
+
+#: src/net/manaserv/charhandler.cpp:250
+msgid "No gameservers are available."
+msgstr "Brak dostępnych serwerów gier"
+
+#: src/net/manaserv/chathandler.cpp:187 src/net/manaserv/chathandler.cpp:313
+#: src/net/manaserv/guildhandler.cpp:260
+#, c-format
+msgid "Topic: %s"
+msgstr "Temat: %s"
+
+#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:274
+#, fuzzy
+msgid "Players in this channel:"
+msgstr "Gracz uderza Potwora"
+
+#: src/net/manaserv/chathandler.cpp:208
+#, fuzzy
+msgid "Error joining channel."
+msgstr "Komenda: /join <kanał>"
+
+#: src/net/manaserv/chathandler.cpp:214
+#, fuzzy
+msgid "Listing channels."
+msgstr "Prośba o dołączenie do kanału %s."
+
+#: src/net/manaserv/chathandler.cpp:226
+msgid "End of channel list."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:303
+#, fuzzy, c-format
+msgid "%s entered the channel."
+msgstr "%s dołączył do grupy."
+
+#: src/net/manaserv/chathandler.cpp:308
+#, c-format
+msgid "%s left the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:324
+#, c-format
+msgid "%s has set mode %s on user %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:334
+#, c-format
+msgid "%s has kicked %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:339
+#, fuzzy
+msgid "Unknown channel event."
+msgstr "Nieznane polecenie."
+
+#: src/net/manaserv/guildhandler.cpp:82
+msgid "Guild created."
+msgstr "Gildia została utworzona."
+
+#: src/net/manaserv/guildhandler.cpp:87
+msgid "Error creating guild."
+msgstr "Błąd podczas tworzenia gildii."
+
+#: src/net/manaserv/guildhandler.cpp:97
+msgid "Invite sent."
+msgstr "Zaproszenie wysłane."
+
+#: src/net/manaserv/guildhandler.cpp:204
+msgid "Member was promoted successfully."
+msgstr "Członek został pomyślnie wypromowany."
+
+#: src/net/manaserv/guildhandler.cpp:209
+msgid "Failed to promote member."
+msgstr "Promocja Członka nie powiodła się."
+
+#: src/net/manaserv/loginhandler.cpp:87
+#, fuzzy
+msgid "Wrong magic_token."
+msgstr "Zły magic_token"
+
+#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
+#, fuzzy
+msgid "Already logged in."
+msgstr "Już zalogowany"
+
+#: src/net/manaserv/loginhandler.cpp:93
+#, fuzzy
+msgid "Account banned."
+msgstr "Konto wygasło"
+
+#: src/net/manaserv/loginhandler.cpp:118
+#, fuzzy
+msgid "New password incorrect."
+msgstr "Nowe hasło jest nieprawidłowe"
+
+#: src/net/manaserv/loginhandler.cpp:121 src/net/tmwa/loginhandler.cpp:89
+#, fuzzy
+msgid "Old password incorrect."
+msgstr "Stare hasło jest nieprawidłowe"
+
+#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
+msgid "Account not connected. Please login first."
+msgstr "Konto niepołączone. Proszę najpierw się zalogować."
+
+#: src/net/manaserv/loginhandler.cpp:149
+#, fuzzy
+msgid "New email address incorrect."
+msgstr "Nowy adres email jest niepoprawny"
+
+#: src/net/manaserv/loginhandler.cpp:152
+#, fuzzy
+msgid "Old email address incorrect."
+msgstr "Stary adres email jest niepoprawny"
+
+#: src/net/manaserv/loginhandler.cpp:158
+#, fuzzy
+msgid "The new email address already exists."
+msgstr "Nowy Adres Email już istnieje"
+
+#: src/net/manaserv/loginhandler.cpp:239
+msgid ""
+"Client registration is not allowed. Please contact server administration."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
+#, fuzzy
+msgid "Client version is too old."
+msgstr "Wersja klienta jest zbyt stara"
+
+#: src/net/manaserv/loginhandler.cpp:266
+#, fuzzy
+msgid "Wrong username or password."
+msgstr "Zła nazwa użytkownika lub hasło"
+
+#: src/net/manaserv/loginhandler.cpp:272
+#, fuzzy
+msgid "Account banned"
+msgstr "Konto wygasło"
+
+#: src/net/manaserv/loginhandler.cpp:275
+msgid "Login attempt too soon after previous attempt."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:303
+#, fuzzy
+msgid "Wrong username, password or email address."
+msgstr "Zła nazwa użytkownika, hasło, lub adres email"
+
+#: src/net/manaserv/loginhandler.cpp:306
+#, fuzzy
+msgid "Username already exists."
+msgstr "Nazwa użytkownika już istnieje"
+
+#: src/net/manaserv/loginhandler.cpp:309
+#, fuzzy
+msgid "Email address already exists."
+msgstr "Adres email już istnieje"
+
+#: src/net/manaserv/loginhandler.cpp:312
+msgid "You took too long with the captcha or your response was incorrect."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:87
+msgid "Joined party."
+msgstr "Dołączono do grupy."
+
+#: src/net/manaserv/partyhandler.cpp:105
+#, c-format
+msgid "%s joined the party."
+msgstr "%s dołączył do grupy."
+
+#: src/net/manaserv/partyhandler.cpp:123
+#, fuzzy, c-format
+msgid "%s rejected your invite."
+msgstr "%s odmówił zaproszenia."
+
+#: src/net/manaserv/tradehandler.cpp:95
+msgid "Accepting incoming trade requests."
+msgstr "Akceptowanie nadchodzących próśb o handel."
+
+#: src/net/manaserv/tradehandler.cpp:97
+msgid "Ignoring incoming trade requests."
+msgstr "Ignorowanie nadchodzących próśb o handel."
+
+#: src/net/manaserv/tradehandler.cpp:115 src/net/tmwa/tradehandler.cpp:109
+msgid "Request for Trade"
+msgstr "Prośba o Handel"
+
+#: src/net/manaserv/tradehandler.cpp:116 src/net/tmwa/tradehandler.cpp:110
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
+msgstr "%s chce handlować z tobą, zgadzasz się?"
+
+#: src/net/manaserv/tradehandler.cpp:134
+#, c-format
+msgid "Trading with %s"
+msgstr "Handel z %s"
+
+#: src/net/manaserv/tradehandler.cpp:148 src/net/tmwa/tradehandler.cpp:224
+msgid "Trade canceled."
+msgstr "Handel anulowany."
+
+#: src/net/manaserv/tradehandler.cpp:155 src/net/tmwa/tradehandler.cpp:231
+msgid "Trade completed."
+msgstr "Handel zakończony."
+
+#: src/net/tmwa/adminhandler.cpp:64
 msgid "Kick failed!"
 msgstr "Wykopanie nie powiodło się!"
 
-#: src/net/ea/adminhandler.cpp:65
+#: src/net/tmwa/adminhandler.cpp:66
 msgid "Kick succeeded!"
 msgstr "Wykopanie powiodło się!"
 
-#: src/net/ea/buysellhandler.cpp:110
+#: src/net/tmwa/buysellhandler.cpp:109
 msgid "Nothing to sell."
 msgstr "Nie masz niczego do sprzedania."
 
-#: src/net/ea/buysellhandler.cpp:117
+#: src/net/tmwa/buysellhandler.cpp:116
 msgid "Thanks for buying."
 msgstr "Dziękuję za kupno."
 
-#: src/net/ea/buysellhandler.cpp:124
+#: src/net/tmwa/buysellhandler.cpp:123
 msgid "Unable to buy."
 msgstr "Nie można kupić."
 
-#: src/net/ea/buysellhandler.cpp:130
+#: src/net/tmwa/buysellhandler.cpp:129
 msgid "Thanks for selling."
 msgstr "Dziękuję za sprzedaż."
 
-#: src/net/ea/buysellhandler.cpp:132
+#: src/net/tmwa/buysellhandler.cpp:131
 msgid "Unable to sell."
 msgstr "Nie można sprzedać."
 
-#: src/net/ea/charserverhandler.cpp:103
-#, fuzzy
-msgid "Access denied."
-msgstr "Dostęp zabroniony"
+#: src/net/tmwa/charserverhandler.cpp:103
+msgid "Access denied. Most likely, there are too many players on this server."
+msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:106
+#: src/net/tmwa/charserverhandler.cpp:107
 #, fuzzy
 msgid "Cannot use this ID."
 msgstr "Nie można uzyć tego ID"
 
-#: src/net/ea/charserverhandler.cpp:109
+#: src/net/tmwa/charserverhandler.cpp:110
 #, fuzzy
-msgid "Unknown failure to select character."
-msgstr "Nieznany błąd podczas wyboru postaci"
+msgid "Unknown char-server failure."
+msgstr "Nieznany błąd"
 
-#: src/net/ea/charserverhandler.cpp:135
+#: src/net/tmwa/charserverhandler.cpp:134
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 "Utworzenie postaci nie powiodło się. Najprawdopodobniej imię jest już zajęte."
 
-#: src/net/ea/charserverhandler.cpp:147 src/net/manaserv/charhandler.cpp:187
-msgid "Info"
-msgstr "Info"
-
-#: src/net/ea/charserverhandler.cpp:147
+#: src/net/tmwa/charserverhandler.cpp:146
 msgid "Character deleted."
 msgstr "Usunięto postać."
 
-#: src/net/ea/charserverhandler.cpp:152
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Failed to delete character."
 msgstr "Usunięcie gracza nie powiodło się."
 
-#: src/net/ea/charserverhandler.cpp:237 src/net/manaserv/charhandler.cpp:263
+#: src/net/tmwa/charserverhandler.cpp:266
 msgid "Strength:"
 msgstr "Siła:"
 
-#: src/net/ea/charserverhandler.cpp:238 src/net/manaserv/charhandler.cpp:264
+#: src/net/tmwa/charserverhandler.cpp:267
 msgid "Agility:"
 msgstr "Zwinność:"
 
-#: src/net/ea/charserverhandler.cpp:239 src/net/manaserv/charhandler.cpp:266
+#: src/net/tmwa/charserverhandler.cpp:268
 msgid "Vitality:"
 msgstr "Witalność:"
 
-#: src/net/ea/charserverhandler.cpp:240 src/net/manaserv/charhandler.cpp:267
+#: src/net/tmwa/charserverhandler.cpp:269
 msgid "Intelligence:"
 msgstr "Inteligencja:"
 
-#: src/net/ea/charserverhandler.cpp:241 src/net/manaserv/charhandler.cpp:265
+#: src/net/tmwa/charserverhandler.cpp:270
 msgid "Dexterity:"
 msgstr "Zręczność:"
 
-#: src/net/ea/charserverhandler.cpp:242
+#: src/net/tmwa/charserverhandler.cpp:271
 msgid "Luck:"
 msgstr "Szczęście:"
 
-#: src/net/ea/chathandler.cpp:80
-msgid "Whisper could not be sent, user is offline."
+#: src/net/tmwa/chathandler.cpp:87
+#, fuzzy, c-format
+msgid "Whisper could not be sent, %s is offline."
 msgstr "Szept nie mógł zostać wysłany, użytkownik jest offline."
 
-#: src/net/ea/chathandler.cpp:84
-msgid "Whisper could not be sent, ignored by user."
+#: src/net/tmwa/chathandler.cpp:96
+#, fuzzy, c-format
+msgid "Whisper could not be sent, ignored by %s."
 msgstr "Szept nie mógł zostać wysłany, jesteś ignorowany przez odbiorcę."
 
-#: src/net/ea/chathandler.cpp:171
+#: src/net/tmwa/chathandler.cpp:230
 #, fuzzy
 msgid "MVP player."
 msgstr "Gracz"
 
-#: src/net/ea/chathandler.cpp:204 src/net/ea/chathandler.cpp:210
-#: src/net/ea/chathandler.cpp:215 src/net/ea/chathandler.cpp:220
-#: src/net/ea/chathandler.cpp:225 src/net/ea/chathandler.cpp:230
-#: src/net/ea/chathandler.cpp:235 src/net/ea/chathandler.cpp:240
+#: src/net/tmwa/chathandler.cpp:265 src/net/tmwa/chathandler.cpp:271
+#: src/net/tmwa/chathandler.cpp:276 src/net/tmwa/chathandler.cpp:281
+#: src/net/tmwa/chathandler.cpp:286 src/net/tmwa/chathandler.cpp:291
+#: src/net/tmwa/chathandler.cpp:296 src/net/tmwa/chathandler.cpp:301
 msgid "Channels are not supported!"
 msgstr "Kanały nie są wspierane!"
 
-#: src/net/ea/gamehandler.cpp:86
+#: src/net/tmwa/gamehandler.cpp:88
 #, c-format
 msgid "Online users: %d"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:100
+#: src/net/tmwa/gamehandler.cpp:101
 #, fuzzy
 msgid "Game"
 msgstr "Nazwa"
 
-#: src/net/ea/gamehandler.cpp:100
+#: src/net/tmwa/gamehandler.cpp:101
 #, fuzzy
 msgid "Request to quit denied!"
 msgstr "Prośba o Handel"
 
-#: src/net/ea/generalhandler.cpp:102 src/net/manaserv/generalhandler.cpp:95
+#: src/net/tmwa/generalhandler.cpp:102
 #, c-format
 msgid "Strength %+d"
 msgstr "Siła %+d"
 
-#: src/net/ea/generalhandler.cpp:103 src/net/manaserv/generalhandler.cpp:96
+#: src/net/tmwa/generalhandler.cpp:103
 #, c-format
 msgid "Agility %+d"
 msgstr "Zwinność %+d"
 
-#: src/net/ea/generalhandler.cpp:104 src/net/manaserv/generalhandler.cpp:98
+#: src/net/tmwa/generalhandler.cpp:104
 #, c-format
 msgid "Vitality %+d"
 msgstr "Witalność %+d"
 
-#: src/net/ea/generalhandler.cpp:105 src/net/manaserv/generalhandler.cpp:99
+#: src/net/tmwa/generalhandler.cpp:105
 #, c-format
 msgid "Intelligence %+d"
 msgstr "Inteligencja %+d"
 
-#: src/net/ea/generalhandler.cpp:106 src/net/manaserv/generalhandler.cpp:97
+#: src/net/tmwa/generalhandler.cpp:106
 #, c-format
 msgid "Dexterity %+d"
 msgstr "Zręczność %+d"
 
-#: src/net/ea/generalhandler.cpp:107
+#: src/net/tmwa/generalhandler.cpp:107
 #, c-format
 msgid "Luck %+d"
 msgstr "Szczęście %+d"
 
-#: src/net/ea/generalhandler.cpp:130
+#: src/net/tmwa/generalhandler.cpp:132
 #, fuzzy
 msgid "Authentication failed."
 msgstr "Uwierzytelnienie nie powiodło się"
 
-#: src/net/ea/generalhandler.cpp:133
+#: src/net/tmwa/generalhandler.cpp:135
 #, fuzzy
 msgid "No servers available."
 msgstr "Brak dostępnych serwerów"
 
-#: src/net/ea/generalhandler.cpp:137
+#: src/net/tmwa/generalhandler.cpp:139
 #, fuzzy
 msgid "Someone else is trying to use this account."
 msgstr "Ktoś inny próbuje użyć tego konta"
 
-#: src/net/ea/generalhandler.cpp:140
+#: src/net/tmwa/generalhandler.cpp:142
 #, fuzzy
 msgid "This account is already logged in."
 msgstr "To konto jest już zalogowane"
 
-#: src/net/ea/generalhandler.cpp:143
+#: src/net/tmwa/generalhandler.cpp:145
 #, fuzzy
 msgid "Speed hack detected."
 msgstr "Wykryto Speed hack"
 
-#: src/net/ea/generalhandler.cpp:146
+#: src/net/tmwa/generalhandler.cpp:148
 #, fuzzy
 msgid "Duplicated login."
 msgstr "Zduplikowany login"
 
-#: src/net/ea/generalhandler.cpp:149
+#: src/net/tmwa/generalhandler.cpp:151
 #, fuzzy
 msgid "Unknown connection error."
 msgstr "Nieznany błąd połączenia"
 
-#: src/net/ea/generalhandler.cpp:205
+#: src/net/tmwa/generalhandler.cpp:209
 msgid "Got disconnected from server!"
 msgstr "Rozłączono z serwerem!"
 
-#: src/net/ea/generalhandler.cpp:216 src/net/manaserv/generalhandler.cpp:166
+#: src/net/tmwa/generalhandler.cpp:230
 msgid "Strength"
 msgstr "Siła"
 
-#: src/net/ea/generalhandler.cpp:217 src/net/manaserv/generalhandler.cpp:167
+#: src/net/tmwa/generalhandler.cpp:231
 msgid "Agility"
 msgstr "Zwinność"
 
-#: src/net/ea/generalhandler.cpp:218 src/net/manaserv/generalhandler.cpp:169
+#: src/net/tmwa/generalhandler.cpp:232
 msgid "Vitality"
 msgstr "Witalność"
 
-#: src/net/ea/generalhandler.cpp:219 src/net/manaserv/generalhandler.cpp:170
+#: src/net/tmwa/generalhandler.cpp:233
 msgid "Intelligence"
 msgstr "Inteligencja"
 
-#: src/net/ea/generalhandler.cpp:220 src/net/manaserv/generalhandler.cpp:168
+#: src/net/tmwa/generalhandler.cpp:234
 msgid "Dexterity"
 msgstr "Zręczność"
 
-#: src/net/ea/generalhandler.cpp:221
+#: src/net/tmwa/generalhandler.cpp:235
 msgid "Luck"
 msgstr "Szczęście"
 
-#: src/net/ea/generalhandler.cpp:224
+#: src/net/tmwa/generalhandler.cpp:238
 #, fuzzy
 msgid "Defense"
 msgstr "Obrona:"
 
-#: src/net/ea/generalhandler.cpp:225
+#: src/net/tmwa/generalhandler.cpp:239
 #, fuzzy
 msgid "M.Attack"
 msgstr "Atak M.:"
 
-#: src/net/ea/generalhandler.cpp:226
+#: src/net/tmwa/generalhandler.cpp:240
 #, fuzzy
 msgid "M.Defense"
 msgstr "Obrona M.:"
 
-#: src/net/ea/generalhandler.cpp:227
+#: src/net/tmwa/generalhandler.cpp:241
 #, fuzzy, c-format
 msgid "% Accuracy"
 msgstr "% Celność:"
 
-#: src/net/ea/generalhandler.cpp:228
+#: src/net/tmwa/generalhandler.cpp:242
 #, fuzzy, c-format
 msgid "% Evade"
 msgstr "% Unik:"
 
-#: src/net/ea/generalhandler.cpp:229
+#: src/net/tmwa/generalhandler.cpp:243
 #, fuzzy, c-format
 msgid "% Critical"
 msgstr "Uderzenie Krytyczne"
 
-#: src/net/ea/gui/guildtab.cpp:45
+#: src/net/tmwa/gui/guildtab.cpp:45
 msgid "Guild"
 msgstr "Gildia"
 
-#: src/net/ea/gui/guildtab.cpp:61 src/net/ea/gui/partytab.cpp:59
+#: src/net/tmwa/gui/guildtab.cpp:61 src/net/tmwa/gui/partytab.cpp:59
 msgid "/help > Display this help."
 msgstr "/help > Wyświetla tą pomoc"
 
-#: src/net/ea/gui/guildtab.cpp:62
+#: src/net/tmwa/gui/guildtab.cpp:62
 #, fuzzy
 msgid "/invite > Invite a player to your guild"
 msgstr "/invite > Zaproszenie gracza do twojej grupy"
 
-#: src/net/ea/gui/guildtab.cpp:63
+#: src/net/tmwa/gui/guildtab.cpp:63
 #, fuzzy
 msgid "/leave > Leave the guild you are in"
 msgstr "/leave > Opuszenie grupy, w której jesteś"
 
-#: src/net/ea/gui/guildtab.cpp:64
+#: src/net/tmwa/gui/guildtab.cpp:64
 #, fuzzy
 msgid "/kick > Kick some one from the guild you are in"
 msgstr "/kick > Wykopanie kogoś z grupy, w której jesteś"
 
-#: src/net/ea/gui/guildtab.cpp:73 src/net/ea/gui/partytab.cpp:73
+#: src/net/tmwa/gui/guildtab.cpp:73 src/net/tmwa/gui/partytab.cpp:73
 msgid "Command: /invite <nick>"
 msgstr "Komenda: /invite <ksywka>"
 
-#: src/net/ea/gui/guildtab.cpp:74
+#: src/net/tmwa/gui/guildtab.cpp:74
 #, fuzzy
 msgid "This command invites <nick> to the guild you're in."
 msgstr "Ta komenda zaprasza <ksywka> do twojej grupy."
 
-#: src/net/ea/gui/guildtab.cpp:80 src/net/ea/gui/partytab.cpp:80
+#: src/net/tmwa/gui/guildtab.cpp:80 src/net/tmwa/gui/partytab.cpp:80
 msgid "Command: /leave"
 msgstr "Komenda: /leave"
 
-#: src/net/ea/gui/guildtab.cpp:81
+#: src/net/tmwa/gui/guildtab.cpp:81
 #, fuzzy
 msgid "This command causes the player to leave the guild."
 msgstr "Komenda powoduje opuszczenie grupy przez gracza"
 
-#: src/net/ea/gui/guildtab.cpp:89
+#: src/net/tmwa/gui/guildtab.cpp:89
 #, fuzzy
 msgid "Guild name is missing."
 msgstr "Brakuje nazwy grupy."
 
-#: src/net/ea/guildhandler.cpp:293
+#: src/net/tmwa/guildhandler.cpp:296
 msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:298
+#: src/net/tmwa/guildhandler.cpp:301
 msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:303
+#: src/net/tmwa/guildhandler.cpp:306
 #, fuzzy
 msgid "User is now part of your guild."
 msgstr "%s jest od teraz członkiem twojej grupy."
 
-#: src/net/ea/guildhandler.cpp:308
+#: src/net/tmwa/guildhandler.cpp:311
 msgid "Your guild is full."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:313
+#: src/net/tmwa/guildhandler.cpp:316
 #, fuzzy
 msgid "Unknown guild invite response."
 msgstr "Nieznana odpowiedź na zaproszenie dla %s"
 
-#: src/net/ea/guildhandler.cpp:390
+#: src/net/tmwa/guildhandler.cpp:393
 msgid "Guild creation isn't supported yet."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:43
+#: src/net/tmwa/gui/partytab.cpp:43
 msgid "Party"
 msgstr "Grupa"
 
-#: src/net/ea/gui/partytab.cpp:60
+#: src/net/tmwa/gui/partytab.cpp:60
 msgid "/invite > Invite a player to your party"
 msgstr "/invite > Zaproszenie gracza do twojej grupy"
 
-#: src/net/ea/gui/partytab.cpp:61
+#: src/net/tmwa/gui/partytab.cpp:61
 msgid "/leave > Leave the party you are in"
 msgstr "/leave > Opuszenie grupy, w której jesteś"
 
-#: src/net/ea/gui/partytab.cpp:62
+#: src/net/tmwa/gui/partytab.cpp:62
 msgid "/kick > Kick some one from the party you are in"
 msgstr "/kick > Wykopanie kogoś z grupy, w której jesteś"
 
-#: src/net/ea/gui/partytab.cpp:63
+#: src/net/tmwa/gui/partytab.cpp:63
 msgid "/item > Show/change party item sharing options"
 msgstr "/item > Pokaż/zmień opcje podziału przedmiotu w grupie"
 
-#: src/net/ea/gui/partytab.cpp:64
+#: src/net/tmwa/gui/partytab.cpp:64
 msgid "/exp > Show/change party experience sharing options"
 msgstr "/exp > Pokaż/zmień opcje pozdziału doświadczenia w grupie"
 
-#: src/net/ea/gui/partytab.cpp:81
+#: src/net/tmwa/gui/partytab.cpp:81
 msgid "This command causes the player to leave the party."
 msgstr "Komenda powoduje opuszczenie grupy przez gracza"
 
-#: src/net/ea/gui/partytab.cpp:85
+#: src/net/tmwa/gui/partytab.cpp:85
 msgid "Command: /item <policy>"
 msgstr "Komenda: /item <zasada>"
 
-#: src/net/ea/gui/partytab.cpp:86
+#: src/net/tmwa/gui/partytab.cpp:86
 msgid "This command changes the party's item sharing policy."
 msgstr "Komenda zmienia zasadę pozdziału przedmiotu w grupie"
 
-#: src/net/ea/gui/partytab.cpp:87
+#: src/net/tmwa/gui/partytab.cpp:87
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
@@ -2766,23 +3176,23 @@ msgstr ""
 "<zasada> może być jedną z \"1\", \"yes\", \"true\" aby aktywować pozdział "
 "przedmiotu lub \"0\", \"no\", \"false\" by wyłączyć podział przedmiotu."
 
-#: src/net/ea/gui/partytab.cpp:90
+#: src/net/tmwa/gui/partytab.cpp:90
 msgid "Command: /item"
 msgstr "Komenda: /przedmiot"
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/tmwa/gui/partytab.cpp:91
 msgid "This command displays the party's current item sharing policy."
 msgstr "Komenda pokazuje zasadę pozdziału przedmiotu w grupie."
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/tmwa/gui/partytab.cpp:95
 msgid "Command: /exp <policy>"
 msgstr "Komenda: /exp <zadada>"
 
-#: src/net/ea/gui/partytab.cpp:96
+#: src/net/tmwa/gui/partytab.cpp:96
 msgid "This command changes the party's experience sharing policy."
 msgstr "Komenda zmienia zasadę pozdziału doświadczenia w grupie."
 
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/tmwa/gui/partytab.cpp:97
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
@@ -2791,109 +3201,96 @@ msgstr ""
 "doświadczenia, lub \"0\", \"no\", \"false\" aby wyłączyć pozdział "
 "doświadczenia."
 
-#: src/net/ea/gui/partytab.cpp:100
+#: src/net/tmwa/gui/partytab.cpp:100
 msgid "Command: /exp"
 msgstr "Komenda: /exp"
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/tmwa/gui/partytab.cpp:101
 msgid "This command displays the party's current experience sharing policy."
 msgstr "Komenda pokazuje obecną zasadę podziału doświadczenia w grupie."
 
-#: src/net/ea/gui/partytab.cpp:132 src/net/ea/partyhandler.cpp:198
+#: src/net/tmwa/gui/partytab.cpp:132 src/net/tmwa/partyhandler.cpp:196
 msgid "Item sharing enabled."
 msgstr "Podział przedmiotu włączony."
 
-#: src/net/ea/gui/partytab.cpp:135 src/net/ea/partyhandler.cpp:204
+#: src/net/tmwa/gui/partytab.cpp:135 src/net/tmwa/partyhandler.cpp:202
 msgid "Item sharing disabled."
 msgstr "Podział przedmiotu wyłączony."
 
-#: src/net/ea/gui/partytab.cpp:138 src/net/ea/partyhandler.cpp:210
+#: src/net/tmwa/gui/partytab.cpp:138 src/net/tmwa/partyhandler.cpp:208
 msgid "Item sharing not possible."
 msgstr "Podział przedmiotu nie jest możliwy."
 
-#: src/net/ea/gui/partytab.cpp:141
+#: src/net/tmwa/gui/partytab.cpp:141
 #, fuzzy
 msgid "Item sharing unknown."
 msgstr "Podział przedmiotu włączony."
 
-#: src/net/ea/gui/partytab.cpp:167 src/net/ea/partyhandler.cpp:174
+#: src/net/tmwa/gui/partytab.cpp:167 src/net/tmwa/partyhandler.cpp:172
 msgid "Experience sharing enabled."
 msgstr "Podział doświadczenia włączony."
 
-#: src/net/ea/gui/partytab.cpp:170 src/net/ea/partyhandler.cpp:180
+#: src/net/tmwa/gui/partytab.cpp:170 src/net/tmwa/partyhandler.cpp:178
 msgid "Experience sharing disabled."
 msgstr "Podział doświadczenia wyłączony."
 
-#: src/net/ea/gui/partytab.cpp:173 src/net/ea/partyhandler.cpp:186
+#: src/net/tmwa/gui/partytab.cpp:173 src/net/tmwa/partyhandler.cpp:184
 msgid "Experience sharing not possible."
 msgstr "Podział doświadczenia nie jest możliwy."
 
-#: src/net/ea/gui/partytab.cpp:176
+#: src/net/tmwa/gui/partytab.cpp:176
 #, fuzzy
 msgid "Experience sharing unknown."
 msgstr "Podział doświadczenia włączony."
 
-#: src/net/ea/inventoryhandler.cpp:281
+#: src/net/tmwa/inventoryhandler.cpp:285
 msgid "Failed to use item."
 msgstr "Użycie przedmiotu nie powiodło się."
 
-#: src/net/ea/inventoryhandler.cpp:391
+#: src/net/tmwa/inventoryhandler.cpp:399
 msgid "Unable to equip."
 msgstr "Nie można założyć."
 
-#: src/net/ea/inventoryhandler.cpp:402
+#: src/net/tmwa/inventoryhandler.cpp:410
 msgid "Unable to unequip."
 msgstr "Nie można zdjąć."
 
-#: src/net/ea/loginhandler.cpp:79
+#: src/net/tmwa/loginhandler.cpp:86
 msgid "Account was not found. Please re-login."
 msgstr "Nie znaleziono Konta. Proszę zalogować się ponownie."
 
-#: src/net/ea/loginhandler.cpp:82 src/net/manaserv/loginhandler.cpp:121
-#, fuzzy
-msgid "Old password incorrect."
-msgstr "Stare hasło jest nieprawidłowe"
-
-#: src/net/ea/loginhandler.cpp:85
+#: src/net/tmwa/loginhandler.cpp:92
 #, fuzzy
 msgid "New password too short."
 msgstr "Nowe hasło jest za krótkie"
 
-#: src/net/ea/loginhandler.cpp:88 src/net/ea/loginhandler.cpp:175
-#: src/net/manaserv/charhandler.cpp:158 src/net/manaserv/loginhandler.cpp:96
-#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
-#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
-#, fuzzy
-msgid "Unknown error."
-msgstr "Nieznany błąd"
-
-#: src/net/ea/loginhandler.cpp:149
+#: src/net/tmwa/loginhandler.cpp:156
 #, fuzzy
 msgid "Unregistered ID."
 msgstr "Niezarejestrowany ID"
 
-#: src/net/ea/loginhandler.cpp:152
+#: src/net/tmwa/loginhandler.cpp:159
 #, fuzzy
 msgid "Wrong password."
 msgstr "Nieprawidłowe hasło"
 
-#: src/net/ea/loginhandler.cpp:155
+#: src/net/tmwa/loginhandler.cpp:162
 #, fuzzy
 msgid "Account expired."
 msgstr "Konto wygasło"
 
-#: src/net/ea/loginhandler.cpp:158
+#: src/net/tmwa/loginhandler.cpp:165
 #, fuzzy
 msgid "Rejected from server."
 msgstr "Odrzucony z serwera"
 
-#: src/net/ea/loginhandler.cpp:161
+#: src/net/tmwa/loginhandler.cpp:168
 #, fuzzy
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr "Zostałeś tymczasowo zbanowany. Proszę skontaktować się z zespołem GM."
 
-#: src/net/ea/loginhandler.cpp:165
+#: src/net/tmwa/loginhandler.cpp:172
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -2902,667 +3299,369 @@ msgstr ""
 "Zostałeś tymczasowo zbanowany z gry do dnia %s.\n"
 "Proszę skontaktować się z zespołem GM poprzez forum."
 
-#: src/net/ea/loginhandler.cpp:172
+#: src/net/tmwa/loginhandler.cpp:179
 #, fuzzy
 msgid "This user name is already taken."
 msgstr "Ta nazwa użytkownika jest już zajęta"
 
-#: src/net/ea/network.cpp:145
+#: src/net/tmwa/network.cpp:145
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/ea/network.cpp:345
+#: src/net/tmwa/network.cpp:345
 #, fuzzy
 msgid "Unable to resolve host \""
 msgstr "Nie można sprzedać."
 
-#: src/net/ea/network.cpp:414
+#: src/net/tmwa/network.cpp:414
 #, fuzzy
 msgid "Connection to server terminated. "
 msgstr "Łączenie z serwerem map..."
 
-#: src/net/ea/partyhandler.cpp:81
+#: src/net/tmwa/partyhandler.cpp:82
 msgid "Could not create party."
 msgstr "Nie można utworzyć grupy."
 
-#: src/net/ea/partyhandler.cpp:84
+#: src/net/tmwa/partyhandler.cpp:84
 msgid "Party successfully created."
 msgstr "Pomyślnie utworzono grupę."
 
-#: src/net/ea/partyhandler.cpp:118
+#: src/net/tmwa/partyhandler.cpp:119
 #, c-format
 msgid "%s is already a member of a party."
 msgstr "%s już jest członkiem grupy."
 
-#: src/net/ea/partyhandler.cpp:122
+#: src/net/tmwa/partyhandler.cpp:123
 #, c-format
 msgid "%s refused your invitation."
 msgstr "%s odmówił zaproszenia."
 
-#: src/net/ea/partyhandler.cpp:126
+#: src/net/tmwa/partyhandler.cpp:127
 #, c-format
 msgid "%s is now a member of your party."
 msgstr "%s jest od teraz członkiem twojej grupy."
 
-#: src/net/ea/partyhandler.cpp:130
+#: src/net/tmwa/partyhandler.cpp:131
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr "Nieznana odpowiedź na zaproszenie dla %s"
 
-#: src/net/ea/partyhandler.cpp:238
+#: src/net/tmwa/partyhandler.cpp:236
 msgid "You have left the party."
 msgstr "Opuściłeś grupę."
 
-#: src/net/ea/partyhandler.cpp:249
+#: src/net/tmwa/partyhandler.cpp:246
 #, c-format
 msgid "%s has left your party."
 msgstr "%s opuścił twoją grupę."
 
-#: src/net/ea/partyhandler.cpp:301
+#: src/net/tmwa/partyhandler.cpp:299
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr "Nieznany członek próbował powiedzieć: %s"
 
-#: src/net/ea/partyhandler.cpp:329
-msgid "Inviting like this isn't supported at the moment."
-msgstr "Zapraszanie w ten sposób nie jest obecnie wspierane."
+#: src/net/tmwa/partyhandler.cpp:335
+#, c-format
+msgid "Inviting failed, because you can't see a player called %s."
+msgstr ""
 
-#: src/net/ea/partyhandler.cpp:334
+#: src/net/tmwa/partyhandler.cpp:340
 msgid "You can only inivte when you are in a party!"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:365
+#: src/net/tmwa/partyhandler.cpp:368
 #, c-format
 msgid "%s is not in your party!"
 msgstr "%s nie jest w twojej grupie!"
 
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:304
-msgid "You are dead."
-msgstr "Jesteś martwy."
-
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:305
-msgid "We regret to inform you that your character was killed in battle."
-msgstr "Ubolewamy, inforumując iż twoja postać została zabita w bitwie."
-
-#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:307
-msgid "You are not that alive anymore."
-msgstr "Już nie jesteś taki żywy."
-
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:308
-msgid "The cold hands of the grim reaper are grabbing for your soul."
-msgstr "Skostniałe łapy ponurego żniwiarza sięgają po twoją duszę."
-
-#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:309
-msgid "Game Over!"
-msgstr "Koniec gry!"
-
-#: src/net/ea/playerhandler.cpp:105
+#: src/net/tmwa/playerhandler.cpp:100
 msgid "Insert coin to continue."
 msgstr "Wrzuć monetę aby kontynuować."
 
-#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:310
-msgid ""
-"No, kids. Your character did not really die. It... err... went to a better "
-"place."
-msgstr ""
-"Nie, dzieci. Wasza postać tak naprawdę nie zginęła. Ona... yyy... udała się "
-"do lepszego miejsca."
-
-#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:312
-msgid ""
-"Your plan of breaking your enemies weapon by bashing it with your throat "
-"failed."
-msgstr ""
-"Twój plan zniszczenia broni wrogów poprzez uderzanie o nią twoim gardłem "
-"zawiódł."
-
-#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:314
-msgid "I guess this did not run too well."
-msgstr "Wydaje mi się, iż to nie poszło zbyt dobrze."
-
-#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:315
-msgid "Do you want your possessions identified?"
-msgstr "Czy chesz zidentyfikować twoje rzeczy?"
-
-#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:316
-msgid "Sadly, no trace of you was ever found..."
-msgstr "Niestety, ślad po tobie zaginął..."
-
-#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:317
-msgid "Annihilated."
-msgstr "Unicestwiony."
-
-#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:318
-msgid "Looks like you got your head handed to you."
-msgstr "Wygląda na to, że podano tobie twoją głowę."
-
-#: src/net/ea/playerhandler.cpp:120 src/net/manaserv/beinghandler.cpp:319
-msgid ""
-"You screwed up again, dump your body down the tubes and get you another one."
-msgstr "Znowu nawaliłeś, wrzuć swoje ciało do rur i weź sobie nowe."
-
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/tmwa/playerhandler.cpp:118
 msgid "You're not dead yet. You're just resting."
 msgstr "Jeszcze nie umarłeś. Po prostu odpoczywasz."
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/tmwa/playerhandler.cpp:119
 msgid "You are no more."
 msgstr "Więcej ciebie nie ma."
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/tmwa/playerhandler.cpp:120
 msgid "You have ceased to be."
 msgstr "Przestałeś istnieć."
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/tmwa/playerhandler.cpp:121
 msgid "You've expired and gone to meet your maker."
 msgstr "Odszedłeś na spotkanie ze swoim stwórcą."
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/tmwa/playerhandler.cpp:122
 msgid "You're a stiff."
 msgstr "Jesteś sztywniakiem."
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/tmwa/playerhandler.cpp:123
 msgid "Bereft of life, you rest in peace."
 msgstr "Opuściło cię życie. Teraz spoczywasz w spokoju."
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/tmwa/playerhandler.cpp:124
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr "Gdybyś nie był taki aktywny, nadal byś zrywał kwiatki."
 
-#: src/net/ea/playerhandler.cpp:130
+#: src/net/tmwa/playerhandler.cpp:125
 msgid "Your metabolic processes are now history."
 msgstr "Twoje procesy metaboliczne są teraz historią."
 
-#: src/net/ea/playerhandler.cpp:131
+#: src/net/tmwa/playerhandler.cpp:126
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/tmwa/playerhandler.cpp:127
 msgid "You've kicked the bucket."
 msgstr "Kopnąłeś w kalendarz."
 
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/tmwa/playerhandler.cpp:128
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:135
+#: src/net/tmwa/playerhandler.cpp:130
 msgid "You are an ex-player."
 msgstr "Jesteś ex-graczem."
 
-#: src/net/ea/playerhandler.cpp:136
+#: src/net/tmwa/playerhandler.cpp:131
 msgid "You're pining for the fjords."
 msgstr "Usychasz z tęsknoty za fiordami."
 
-#: src/net/ea/playerhandler.cpp:249 src/net/ea/playerhandler.cpp:310
+#: src/net/tmwa/playerhandler.cpp:246 src/net/tmwa/playerhandler.cpp:285
 msgid "Message"
 msgstr "Wiadomość"
 
-#: src/net/ea/playerhandler.cpp:250
+#: src/net/tmwa/playerhandler.cpp:247
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr "Nosisz więcej, niż połowa twojej wagi. Nie możesz odzyskiwać zdrowia."
 
-#: src/net/ea/playerhandler.cpp:333
+#: src/net/tmwa/playerhandler.cpp:313
 #, fuzzy, c-format
 msgid "You picked up %s."
 msgstr "Podniosłeś "
 
-#: src/net/ea/playerhandler.cpp:369
+#: src/net/tmwa/playerhandler.cpp:348
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:532
+#: src/net/tmwa/playerhandler.cpp:488
 msgid "Equip arrows first."
 msgstr "Najpierw załóż strzały."
 
-#: src/net/ea/specialhandler.cpp:147
+#: src/net/tmwa/specialhandler.cpp:144
 msgid "Trade failed!"
 msgstr "Handel zakończony niepowodzeniem!"
 
-#: src/net/ea/specialhandler.cpp:150
+#: src/net/tmwa/specialhandler.cpp:147
 msgid "Emote failed!"
 msgstr "Emotka nieudana!"
 
-#: src/net/ea/specialhandler.cpp:153
+#: src/net/tmwa/specialhandler.cpp:150
 msgid "Sit failed!"
 msgstr "Siad nieudany!"
 
-#: src/net/ea/specialhandler.cpp:156
+#: src/net/tmwa/specialhandler.cpp:153
 msgid "Chat creating failed!"
 msgstr "Utworzenie czatu nieudane!"
 
-#: src/net/ea/specialhandler.cpp:159
+#: src/net/tmwa/specialhandler.cpp:156
 msgid "Could not join party!"
 msgstr "Nie można dołączyć do grupy!"
 
-#: src/net/ea/specialhandler.cpp:162
+#: src/net/tmwa/specialhandler.cpp:159
 msgid "Cannot shout!"
 msgstr "Nie można krzyknąć!"
 
-#: src/net/ea/specialhandler.cpp:171
+#: src/net/tmwa/specialhandler.cpp:168
 msgid "You have not yet reached a high enough lvl!"
 msgstr "Masz za niski poziom!"
 
-#: src/net/ea/specialhandler.cpp:174
+#: src/net/tmwa/specialhandler.cpp:171
 msgid "Insufficient HP!"
 msgstr "Niewystarczające HP!"
 
-#: src/net/ea/specialhandler.cpp:177
+#: src/net/tmwa/specialhandler.cpp:174
 msgid "Insufficient SP!"
 msgstr "Niewystarczające SP!"
 
-#: src/net/ea/specialhandler.cpp:180
+#: src/net/tmwa/specialhandler.cpp:177
 msgid "You have no memos!"
 msgstr "Nie masz notatek!"
 
-#: src/net/ea/specialhandler.cpp:183
+#: src/net/tmwa/specialhandler.cpp:180
 msgid "You cannot do that right now!"
 msgstr "Nie możesz teraz tego zrobić!"
 
-#: src/net/ea/specialhandler.cpp:186
+#: src/net/tmwa/specialhandler.cpp:183
 msgid "Seems you need more money... ;-)"
 msgstr "Wygląda na to, że potrzebujesz wiecej pieniędzy... ;-)"
 
-#: src/net/ea/specialhandler.cpp:189
+#: src/net/tmwa/specialhandler.cpp:186
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Nie można użyć tej umiejętności z taką bronią!"
 
-#: src/net/ea/specialhandler.cpp:192
+#: src/net/tmwa/specialhandler.cpp:189
 msgid "You need another red gem!"
 msgstr "Potrzebujesz innego czerwonego kamienia!"
 
-#: src/net/ea/specialhandler.cpp:195
+#: src/net/tmwa/specialhandler.cpp:192
 msgid "You need another blue gem!"
 msgstr "Potrzebujesz innego niebieskiego kamienia!"
 
-#: src/net/ea/specialhandler.cpp:198
+#: src/net/tmwa/specialhandler.cpp:195
 msgid "You're carrying to much to do this!"
 msgstr "Jesteś zbyt obciążony aby to zrobić!"
 
-#: src/net/ea/specialhandler.cpp:201
+#: src/net/tmwa/specialhandler.cpp:198
 msgid "Huh? What's that?"
 msgstr "O! Co to?"
 
-#: src/net/ea/specialhandler.cpp:210
+#: src/net/tmwa/specialhandler.cpp:207
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:213
+#: src/net/tmwa/specialhandler.cpp:210
 msgid "Could not steal anything..."
 msgstr "Nie mogę nic ukraść..."
 
-#: src/net/ea/specialhandler.cpp:216
+#: src/net/tmwa/specialhandler.cpp:213
 msgid "Poison had no effect..."
 msgstr "Trucizna nie zadziałała..."
 
-#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:116
-msgid "Request for Trade"
-msgstr "Prośba o Handel"
-
-#: src/net/ea/tradehandler.cpp:108 src/net/manaserv/tradehandler.cpp:117
-#, c-format
-msgid "%s wants to trade with you, do you accept?"
-msgstr "%s chce handlować z tobą, zgadzasz się?"
-
-#: src/net/ea/tradehandler.cpp:124
+#: src/net/tmwa/tradehandler.cpp:126
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr "Handlowanie nie jest możlwe. Kontrahent jest za daleko."
 
-#: src/net/ea/tradehandler.cpp:128
+#: src/net/tmwa/tradehandler.cpp:130
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr "Handlowanie nie jest możliwe. Postać nie istnieje."
 
-#: src/net/ea/tradehandler.cpp:132
+#: src/net/tmwa/tradehandler.cpp:134
 msgid "Trade cancelled due to an unknown reason."
 msgstr "Handel anulowany z nieznanego powodu."
 
-#: src/net/ea/tradehandler.cpp:137
+#: src/net/tmwa/tradehandler.cpp:139
 #, c-format
 msgid "Trade: You and %s"
 msgstr "Handel: Ty i %s"
 
-#: src/net/ea/tradehandler.cpp:144
+#: src/net/tmwa/tradehandler.cpp:146
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr "Handel z %s został anulowany."
 
-#: src/net/ea/tradehandler.cpp:153
+#: src/net/tmwa/tradehandler.cpp:154
 msgid "Unhandled trade cancel packet."
 msgstr "Nieobsługiwany pakiet anulowania handlu."
 
-#: src/net/ea/tradehandler.cpp:202
+#: src/net/tmwa/tradehandler.cpp:202
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr "Dodanie przedmiotu nie powiodło się. Kontrahent jest przeciążony."
 
-#: src/net/ea/tradehandler.cpp:207
+#: src/net/tmwa/tradehandler.cpp:207
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 "Dodanie przedmiotu nie powiodło się. Kontrahent nie posiada wolnego miejsca."
 
-#: src/net/ea/tradehandler.cpp:211
+#: src/net/tmwa/tradehandler.cpp:211
 msgid "Failed adding item for unknown reason."
 msgstr "Dodanie przedmiotu nie powiodło się z nieznanego powodu."
 
-#: src/net/ea/tradehandler.cpp:224 src/net/manaserv/tradehandler.cpp:149
-msgid "Trade canceled."
-msgstr "Handel anulowany."
-
-#: src/net/ea/tradehandler.cpp:231 src/net/manaserv/tradehandler.cpp:156
-msgid "Trade completed."
-msgstr "Handel zakończony."
-
-#: src/net/manaserv/beinghandler.cpp:324
-#, fuzzy
-msgid "Press OK to respawn."
-msgstr " Naciśnij OK, aby się odrodzić"
-
-#: src/net/manaserv/beinghandler.cpp:325
+#: src/playerrelations.cpp:310
 #, fuzzy
-msgid "You Died"
-msgstr "Umarłeś"
-
-#: src/net/manaserv/charhandler.cpp:128 src/net/manaserv/charhandler.cpp:196
-#, fuzzy
-msgid "Not logged in."
-msgstr "Już zalogowany"
-
-#: src/net/manaserv/charhandler.cpp:131
-msgid "No empty slot."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:134
-msgid "Invalid name."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:137
-#, fuzzy
-msgid "Character's name already exists."
-msgstr "Nazwa użytkownika już istnieje"
-
-#: src/net/manaserv/charhandler.cpp:140
-msgid "Invalid hairstyle."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:143
-msgid "Invalid hair color."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:146
-msgid "Invalid gender."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:149
-#, fuzzy
-msgid "Character's stats are too high."
-msgstr "Statystyki postaci w porządku."
-
-#: src/net/manaserv/charhandler.cpp:152
-#, fuzzy
-msgid "Character's stats are too low."
-msgstr "Statystyki postaci w porządku."
+msgid "Completely ignore"
+msgstr "@@ignore|Kompletnie ignoruj %s@@"
 
-#: src/net/manaserv/charhandler.cpp:155
-msgid "One stat is zero."
+#: src/playerrelations.cpp:324
+msgid "Print '...'"
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:187
-#, fuzzy
-msgid "Player deleted."
-msgstr "Gracz usunięty"
-
-#: src/net/manaserv/charhandler.cpp:199
-#, fuzzy
-msgid "Selection out of range."
-msgstr "Wybierz ilość przedmiotów do handlu."
-
-#: src/net/manaserv/charhandler.cpp:202
-#, fuzzy, c-format
-msgid "Unknown error (%d)."
-msgstr "Nieznany błąd"
-
-#: src/net/manaserv/charhandler.cpp:242
-msgid "No gameservers are available."
-msgstr "Brak dostępnych serwerów gier"
-
-#: src/net/manaserv/charhandler.cpp:268
-msgid "Willpower:"
-msgstr "Siła woli:"
-
-#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
-#: src/net/manaserv/guildhandler.cpp:259
-#, c-format
-msgid "Topic: %s"
-msgstr "Temat: %s"
-
-#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
-#, fuzzy
-msgid "Players in this channel:"
-msgstr "Gracz uderza Potwora"
-
-#: src/net/manaserv/chathandler.cpp:201
-#, fuzzy
-msgid "Error joining channel."
-msgstr "Komenda: /join <kanał>"
-
-#: src/net/manaserv/chathandler.cpp:207
-#, fuzzy
-msgid "Listing channels."
-msgstr "Prośba o dołączenie do kanału %s."
-
-#: src/net/manaserv/chathandler.cpp:219
-msgid "End of channel list."
+#: src/playerrelations.cpp:340
+msgid "Blink name"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:291
-#, fuzzy, c-format
-msgid "%s entered the channel."
-msgstr "%s dołączył do grupy."
-
-#: src/net/manaserv/chathandler.cpp:296
+#: src/resources/itemdb.cpp:44
 #, c-format
-msgid "%s left the channel."
-msgstr ""
+msgid "Attack %+d"
+msgstr "Atak %+d"
 
-#: src/net/manaserv/chathandler.cpp:312
+#: src/resources/itemdb.cpp:45
 #, c-format
-msgid "%s has set mode %s on user %s."
-msgstr ""
+msgid "Defense %+d"
+msgstr "Obrona %+d"
 
-#: src/net/manaserv/chathandler.cpp:322
+#: src/resources/itemdb.cpp:46
 #, c-format
-msgid "%s has kicked %s."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:327
-#, fuzzy
-msgid "Unknown channel event."
-msgstr "Nieznane polecenie."
+msgid "HP %+d"
+msgstr "HP %+d"
 
-#: src/net/manaserv/generalhandler.cpp:100
+#: src/resources/itemdb.cpp:47
 #, c-format
-msgid "Willpower %+d"
-msgstr "Siła woli %+d"
-
-#: src/net/manaserv/generalhandler.cpp:171
-#, fuzzy
-msgid "Willpower"
-msgstr "Siła woli:"
-
-#: src/net/manaserv/guildhandler.cpp:81
-msgid "Guild created."
-msgstr "Gildia została utworzona."
-
-#: src/net/manaserv/guildhandler.cpp:86
-msgid "Error creating guild."
-msgstr "Błąd podczas tworzenia gildii."
-
-#: src/net/manaserv/guildhandler.cpp:96
-msgid "Invite sent."
-msgstr "Zaproszenie wysłane."
-
-#: src/net/manaserv/guildhandler.cpp:203
-msgid "Member was promoted successfully."
-msgstr "Członek został pomyślnie wypromowany."
+msgid "MP %+d"
+msgstr "MP %+d"
 
-#: src/net/manaserv/guildhandler.cpp:208
-msgid "Failed to promote member."
-msgstr "Promocja Członka nie powiodła się."
+#: src/resources/itemdb.cpp:92
+msgid "Unknown item"
+msgstr "Nieznany przedmiot"
 
-#: src/net/manaserv/loginhandler.cpp:87
-#, fuzzy
-msgid "Wrong magic_token."
-msgstr "Zły magic_token"
+#: src/resources/itemdb.cpp:135 src/resources/monsterdb.cpp:77
+msgid "unnamed"
+msgstr "nienazwany"
 
-#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
 #, fuzzy
-msgid "Already logged in."
-msgstr "Już zalogowany"
+#~ msgid "HP"
+#~ msgstr "HP:"
 
-#: src/net/manaserv/loginhandler.cpp:93 src/net/manaserv/loginhandler.cpp:272
 #, fuzzy
-msgid "Server is full."
-msgstr "Serwer jest pełny"
+#~ msgid "MP"
+#~ msgstr "MP:"
 
-#: src/net/manaserv/loginhandler.cpp:118
 #, fuzzy
-msgid "New password incorrect."
-msgstr "Nowe hasło jest nieprawidłowe"
-
-#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
-msgid "Account not connected. Please login first."
-msgstr "Konto niepołączone. Proszę najpierw się zalogować."
+#~ msgid "Exp"
+#~ msgstr "Exp:"
 
-#: src/net/manaserv/loginhandler.cpp:149
 #, fuzzy
-msgid "New email address incorrect."
-msgstr "Nowy adres email jest niepoprawny"
+#~ msgid "Money"
+#~ msgstr "Pieniądze: %d"
 
-#: src/net/manaserv/loginhandler.cpp:152
 #, fuzzy
-msgid "Old email address incorrect."
-msgstr "Stary adres email jest niepoprawny"
+#~ msgid "Job"
+#~ msgstr "Praca:"
 
-#: src/net/manaserv/loginhandler.cpp:158
 #, fuzzy
-msgid "The new email address already exists."
-msgstr "Nowy Adres Email już istnieje"
+#~ msgid "Level"
+#~ msgstr "Poziom: %d"
 
-#: src/net/manaserv/loginhandler.cpp:239
-msgid ""
-"Client registration is not allowed. Please contact server administration."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
 #, fuzzy
-msgid "Client version is too old."
-msgstr "Wersja klienta jest zbyt stara"
+#~ msgid "Access denied."
+#~ msgstr "Dostęp zabroniony"
 
-#: src/net/manaserv/loginhandler.cpp:266
 #, fuzzy
-msgid "Wrong username or password."
-msgstr "Zła nazwa użytkownika lub hasło"
+#~ msgid "Unknown failure to select character."
+#~ msgstr "Nieznany błąd podczas wyboru postaci"
 
-#: src/net/manaserv/loginhandler.cpp:275
-msgid "Login attempt too soon after previous attempt."
-msgstr ""
+#~ msgid "Inviting like this isn't supported at the moment."
+#~ msgstr "Zapraszanie w ten sposób nie jest obecnie wspierane."
 
-#: src/net/manaserv/loginhandler.cpp:303
-#, fuzzy
-msgid "Wrong username, password or email address."
-msgstr "Zła nazwa użytkownika, hasło, lub adres email"
+#~ msgid "Willpower:"
+#~ msgstr "Siła woli:"
 
-#: src/net/manaserv/loginhandler.cpp:306
-#, fuzzy
-msgid "Username already exists."
-msgstr "Nazwa użytkownika już istnieje"
+#~ msgid "Willpower %+d"
+#~ msgstr "Siła woli %+d"
 
-#: src/net/manaserv/loginhandler.cpp:309
 #, fuzzy
-msgid "Email address already exists."
-msgstr "Adres email już istnieje"
-
-#: src/net/manaserv/loginhandler.cpp:312
-msgid "You took too long with the captcha or your response was incorrect."
-msgstr ""
-
-#: src/net/manaserv/partyhandler.cpp:88
-msgid "Joined party."
-msgstr "Dołączono do grupy."
-
-#: src/net/manaserv/partyhandler.cpp:106
-#, c-format
-msgid "%s joined the party."
-msgstr "%s dołączył do grupy."
-
-#: src/net/manaserv/partyhandler.cpp:123
-#, fuzzy, c-format
-msgid "%s rejected your invite."
-msgstr "%s odmówił zaproszenia."
-
-#: src/net/manaserv/tradehandler.cpp:96
-msgid "Accepting incoming trade requests."
-msgstr "Akceptowanie nadchodzących próśb o handel."
+#~ msgid "Willpower"
+#~ msgstr "Siła woli:"
 
-#: src/net/manaserv/tradehandler.cpp:98
-msgid "Ignoring incoming trade requests."
-msgstr "Ignorowanie nadchodzących próśb o handel."
-
-#: src/net/manaserv/tradehandler.cpp:135
-#, c-format
-msgid "Trading with %s"
-msgstr "Handel z %s"
-
-#: src/playerrelations.cpp:304
 #, fuzzy
-msgid "Completely ignore"
-msgstr "@@ignore|Kompletnie ignoruj %s@@"
-
-#: src/playerrelations.cpp:318
-msgid "Print '...'"
-msgstr ""
-
-#: src/playerrelations.cpp:334
-msgid "Blink name"
-msgstr ""
-
-#: src/playerrelations.cpp:371
-msgid "Floating '...' bubble"
-msgstr ""
-
-#: src/playerrelations.cpp:374
-msgid "Floating bubble"
-msgstr ""
-
-#: src/resources/itemdb.cpp:52
-#, c-format
-msgid "Attack %+d"
-msgstr "Atak %+d"
-
-#: src/resources/itemdb.cpp:53
-#, c-format
-msgid "Defense %+d"
-msgstr "Obrona %+d"
-
-#: src/resources/itemdb.cpp:54
-#, c-format
-msgid "HP %+d"
-msgstr "HP %+d"
-
-#: src/resources/itemdb.cpp:55
-#, c-format
-msgid "MP %+d"
-msgstr "MP %+d"
-
-#: src/resources/itemdb.cpp:114
-msgid "Unknown item"
-msgstr "Nieznany przedmiot"
-
-#: src/resources/itemdb.cpp:158 src/resources/monsterdb.cpp:45
-#: src/resources/monsterdb.cpp:69
-msgid "unnamed"
-msgstr "nienazwany"
+#~ msgid "Server is full."
+#~ msgstr "Serwer jest pełny"
 
 #~ msgid "Text Shadow"
 #~ msgstr "Cień tekstu"
diff --git a/po/pt.po b/po/pt.po
index a7e5ff9f..7d650680 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2010-03-16 22:27+0100\n"
+"POT-Creation-Date: 2010-12-13 20:04+0100\n"
 "PO-Revision-Date: 2010-03-05 13:28+0000\n"
 "Last-Translator: Tustiman <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
+"Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,316 +19,322 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/client.cpp:555 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
+#: src/client.cpp:598 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
 msgid "Setup"
 msgstr "Configuração"
 
-#: src/client.cpp:625
+#: src/client.cpp:679
 #, fuzzy
 msgid "Connecting to server"
 msgstr "Conectando ao servidor de mapas..."
 
-#: src/client.cpp:652
+#: src/client.cpp:706
 #, fuzzy
 msgid "Logging in"
 msgstr "Autenticar"
 
-#: src/client.cpp:685
+#: src/client.cpp:739
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:741
+#: src/client.cpp:804
 #, fuzzy
 msgid "Requesting characters"
 msgstr "Seleccione um Personagem"
 
-#: src/client.cpp:770
+#: src/client.cpp:833
 #, fuzzy
 msgid "Connecting to the game server"
 msgstr "Conectando ao servidor de mapas..."
 
-#: src/client.cpp:801 src/client.cpp:808 src/client.cpp:942
+#: src/client.cpp:843
+#, fuzzy
+msgid "Changing game servers"
+msgstr "Servidor"
+
+#: src/client.cpp:872 src/client.cpp:879 src/client.cpp:1014
 #: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
 #: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
-#: src/gui/serverdialog.cpp:241 src/gui/unregisterdialog.cpp:133
-#: src/net/ea/charserverhandler.cpp:135 src/net/ea/charserverhandler.cpp:152
-#: src/net/manaserv/charhandler.cpp:161 src/net/manaserv/charhandler.cpp:204
+#: src/gui/serverdialog.cpp:323 src/gui/unregisterdialog.cpp:133
+#: src/net/manaserv/charhandler.cpp:174 src/net/manaserv/charhandler.cpp:217
+#: src/net/tmwa/charserverhandler.cpp:134
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Error"
 msgstr "Erro"
 
-#: src/client.cpp:817
+#: src/client.cpp:888
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:844
+#: src/client.cpp:915
 #, fuzzy
 msgid "Password Change"
 msgstr "Senha:"
 
-#: src/client.cpp:845
+#: src/client.cpp:916
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:864
+#: src/client.cpp:935
 #, fuzzy
 msgid "Email Change"
 msgstr "Modificar"
 
-#: src/client.cpp:865
+#: src/client.cpp:936
 #, fuzzy
 msgid "Email changed successfully!"
 msgstr "Membro foi promovido com sucesso."
 
-#: src/client.cpp:885
+#: src/client.cpp:956
 #, fuzzy
 msgid "Unregister Successful"
 msgstr "Remover o Registo"
 
-#: src/client.cpp:886
+#: src/client.cpp:957
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1009 src/client.cpp:1032
+#: src/client.cpp:1138 src/client.cpp:1161
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1121
+#: src/client.cpp:1281
 #, fuzzy, c-format
 msgid "Invalid update host: %s"
 msgstr "Host de atualização inválido: "
 
-#: src/client.cpp:1155 src/client.cpp:1161
+#: src/client.cpp:1315 src/client.cpp:1321
 msgid "Error creating updates directory!"
 msgstr "Erro ao criar pasta de actualizações!"
 
-#: src/commandhandler.cpp:127 src/commandhandler.cpp:308
+#: src/commandhandler.cpp:131 src/commandhandler.cpp:317
 msgid "Unknown command."
 msgstr "Comando desconhecido"
 
-#: src/commandhandler.cpp:156
+#: src/commandhandler.cpp:160
 msgid "-- Help --"
 msgstr "-- Ajuda --"
 
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:161
 msgid "/help > Display this help"
 msgstr "/help > Mostra a ajuda"
 
-#: src/commandhandler.cpp:159
+#: src/commandhandler.cpp:163
 msgid "/where > Display map name"
 msgstr "/where > Mostra o nome do mapa"
 
-#: src/commandhandler.cpp:160
+#: src/commandhandler.cpp:164
 msgid "/who > Display number of online users"
 msgstr "/who > Mostra o numero de utilizadores online"
 
-#: src/commandhandler.cpp:161
+#: src/commandhandler.cpp:165
 msgid "/me > Tell something about yourself"
 msgstr "/me > Diga alguma coisa sobre si"
 
-#: src/commandhandler.cpp:163
+#: src/commandhandler.cpp:167
 msgid "/clear > Clears this window"
 msgstr "/clear > Limpa a janela"
 
-#: src/commandhandler.cpp:165
+#: src/commandhandler.cpp:169
 msgid "/msg > Send a private message to a user"
 msgstr "/msg > Envia uma mensagem privata a um utilizador"
 
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:170
 msgid "/whisper > Alias of msg"
 msgstr "/whisper > nome do jogador"
 
-#: src/commandhandler.cpp:167
+#: src/commandhandler.cpp:171
 msgid "/w > Alias of msg"
 msgstr "/w > nome do jogador"
 
-#: src/commandhandler.cpp:168
+#: src/commandhandler.cpp:172
 msgid "/query > Makes a tab for private messages with another user"
 msgstr "/query > Cria um separador para mensagens privadas com outro utlizador"
 
-#: src/commandhandler.cpp:169
+#: src/commandhandler.cpp:174
 msgid "/q > Alias of query"
 msgstr "/q > nome da pesquisa"
 
-#: src/commandhandler.cpp:171
+#: src/commandhandler.cpp:176
 msgid "/ignore > ignore a player"
 msgstr ""
 
-#: src/commandhandler.cpp:172
+#: src/commandhandler.cpp:177
 msgid "/unignore > stop ignoring a player"
 msgstr ""
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:179
 msgid "/list > Display all public channels"
 msgstr "/list > Mostra todos os canais públicos"
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:180
 msgid "/join > Join or create a channel"
 msgstr "/join > Junte-se ou crie um canal"
 
-#: src/commandhandler.cpp:177
+#: src/commandhandler.cpp:182
 #, fuzzy
 msgid "/createparty > Create a new party"
 msgstr "/create > Cria um novo grupo"
 
-#: src/commandhandler.cpp:178
+#: src/commandhandler.cpp:183
 msgid "/party > Invite a user to party"
 msgstr "/party > convidar um jogadora para a equipa"
 
-#: src/commandhandler.cpp:180
+#: src/commandhandler.cpp:185
 msgid "/record > Start recording the chat to an external file"
 msgstr "/record > Inicie a gravação da conversa para um ficheiro externo"
 
-#: src/commandhandler.cpp:181
+#: src/commandhandler.cpp:187
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr "/toggle > Determina se <enter> alterna para o log de chat"
 
-#: src/commandhandler.cpp:182
+#: src/commandhandler.cpp:189
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
 "/present > Obter lista de jogadores presentes (Envia para o log do chat. Se "
 "logando)"
 
-#: src/commandhandler.cpp:184
+#: src/commandhandler.cpp:192
 msgid "/announce > Global announcement (GM only)"
 msgstr "/announce > Anuciamento Global (Somente GM)"
 
-#: src/commandhandler.cpp:188
+#: src/commandhandler.cpp:196
 msgid "For more information, type /help <command>."
 msgstr "Para mais informações, escreva /help <command>."
 
-#: src/commandhandler.cpp:192
+#: src/commandhandler.cpp:200
 msgid "Command: /help"
 msgstr "Comando: /help"
 
-#: src/commandhandler.cpp:193
+#: src/commandhandler.cpp:201
 msgid "This command displays a list of all commands available."
 msgstr "Este comando mostra a lista de todos os comandos disponiveis"
 
-#: src/commandhandler.cpp:194
+#: src/commandhandler.cpp:203
 msgid "Command: /help <command>"
 msgstr "Comando: /help <command>"
 
-#: src/commandhandler.cpp:195
+#: src/commandhandler.cpp:204
 msgid "This command displays help on <command>."
 msgstr "Exibe o conteúdo de ajuda de <command>"
 
-#: src/commandhandler.cpp:203
+#: src/commandhandler.cpp:212
 msgid "Command: /announce <msg>"
 msgstr "Comando: /announce <msg>"
 
-#: src/commandhandler.cpp:204
+#: src/commandhandler.cpp:213
 msgid "*** only available to a GM ***"
 msgstr "*** apenas para GM's ***"
 
-#: src/commandhandler.cpp:205
+#: src/commandhandler.cpp:214
 msgid "This command sends the message <msg> to all players currently online."
 msgstr "Enviar mensagem <msg> para todos os jogadores conectados."
 
-#: src/commandhandler.cpp:210
+#: src/commandhandler.cpp:219
 msgid "Command: /clear"
 msgstr "Comando /clear"
 
-#: src/commandhandler.cpp:211
+#: src/commandhandler.cpp:220
 msgid "This command clears the chat log of previous chat."
 msgstr "Limpa os logs do chat anterior."
 
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:224
 #, fuzzy
 msgid "Command: /ignore <player>"
 msgstr "Comando> /item <opção>"
 
-#: src/commandhandler.cpp:216
+#: src/commandhandler.cpp:225
 #, fuzzy
 msgid "This command ignores the given player regardless of current relations."
 msgstr "Mostra o número de jogadores conectados."
 
-#: src/commandhandler.cpp:221
+#: src/commandhandler.cpp:230
 msgid "Command: /join <channel>"
 msgstr "Comando: /join <canal>"
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:231
 msgid "This command makes you enter <channel>."
 msgstr "Este comando faz você entrar em <canal>."
 
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:232
 msgid "If <channel> doesn't exist, it's created."
 msgstr "Se o <canal> não existe, ele será criado."
 
-#: src/commandhandler.cpp:227
+#: src/commandhandler.cpp:236
 msgid "Command: /list"
 msgstr "Comando /list"
 
-#: src/commandhandler.cpp:228
+#: src/commandhandler.cpp:237
 msgid "This command shows a list of all channels."
 msgstr "Mostrar uma lista de todos os canais."
 
-#: src/commandhandler.cpp:232
+#: src/commandhandler.cpp:241
 msgid "Command: /me <message>"
 msgstr "Comando /me <messagem>"
 
-#: src/commandhandler.cpp:233
+#: src/commandhandler.cpp:242
 msgid "This command tell others you are (doing) <msg>."
 msgstr "Este comando diz aos outros o que eu estou (fazendo) <msg>."
 
-#: src/commandhandler.cpp:237
+#: src/commandhandler.cpp:246
 msgid "Command: /msg <nick> <message>"
 msgstr "Comando: /msg <nick> <mensagem>"
 
-#: src/commandhandler.cpp:238
+#: src/commandhandler.cpp:247
 msgid "Command: /whisper <nick> <message>"
 msgstr "Comando: /whisper <nick> <mensagem>"
 
-#: src/commandhandler.cpp:239
+#: src/commandhandler.cpp:248
 msgid "Command: /w <nick> <message>"
 msgstr "Comando: /w <nick> <mensagem>"
 
-#: src/commandhandler.cpp:240
+#: src/commandhandler.cpp:249
 msgid "This command sends the text <message> to <nick>."
 msgstr "Enviar <mensagem> para <nick>."
 
-#: src/commandhandler.cpp:241 src/commandhandler.cpp:260
+#: src/commandhandler.cpp:250 src/commandhandler.cpp:269
 #: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
-#: src/net/ea/gui/guildtab.cpp:75 src/net/ea/gui/partytab.cpp:75
+#: src/net/tmwa/gui/guildtab.cpp:75 src/net/tmwa/gui/partytab.cpp:75
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr "Se <nick> possuir espaços, coloque dentro de parênteses (\")."
 
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:255
 msgid "Command: /query <nick>"
 msgstr "Comando: /query <nick>"
 
-#: src/commandhandler.cpp:247
+#: src/commandhandler.cpp:256
 msgid "Command: /q <nick>"
 msgstr "Comando: /q <nick>"
 
-#: src/commandhandler.cpp:248
+#: src/commandhandler.cpp:257
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
 "Este comando cria uma aba para mensagens confidenciais entre você e <nick>."
 
-#: src/commandhandler.cpp:253
+#: src/commandhandler.cpp:262
 #, fuzzy
 msgid "Command: /createparty <name>"
 msgstr "Comando: /create <nome-do-grupo>"
 
-#: src/commandhandler.cpp:254
+#: src/commandhandler.cpp:263
 #, fuzzy
 msgid "This command creates a new party called <name>."
 msgstr "Estes comandos criam um novo grupo chamado <nome-do-grupo>."
 
-#: src/commandhandler.cpp:258
+#: src/commandhandler.cpp:267
 msgid "Command: /party <nick>"
 msgstr "Comando: /party <nick>"
 
-#: src/commandhandler.cpp:259 src/net/ea/gui/partytab.cpp:74
+#: src/commandhandler.cpp:268 src/net/tmwa/gui/partytab.cpp:74
 msgid "This command invites <nick> to party with you."
 msgstr "Convida <nick> para uma festa com você."
 
-#: src/commandhandler.cpp:265
+#: src/commandhandler.cpp:274
 msgid "Command: /present"
 msgstr "Comando: /present"
 
-#: src/commandhandler.cpp:266
+#: src/commandhandler.cpp:275
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
@@ -336,29 +343,29 @@ msgstr ""
 "de registo do chat ou, caso haja uma gravação em andamento, para o log de "
 "gravação."
 
-#: src/commandhandler.cpp:272
+#: src/commandhandler.cpp:281
 msgid "Command: /record <filename>"
 msgstr "Comando: /record <arquivo>"
 
-#: src/commandhandler.cpp:273
+#: src/commandhandler.cpp:282
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr ""
 "Este comando inicia a gravação do registo do chat para o ficheiro "
 "<nome_do_ficheiro>."
 
-#: src/commandhandler.cpp:275
+#: src/commandhandler.cpp:284
 msgid "Command: /record"
 msgstr "Comando: /record"
 
-#: src/commandhandler.cpp:276
+#: src/commandhandler.cpp:285
 msgid "This command finishes a recording session."
 msgstr "Este comando finaliza a sessão de gravação."
 
-#: src/commandhandler.cpp:280
+#: src/commandhandler.cpp:289
 msgid "Command: /toggle <state>"
 msgstr "Comando: /toggle <estado>"
 
-#: src/commandhandler.cpp:281
+#: src/commandhandler.cpp:290
 msgid ""
 "This command sets whether the return key should toggle the chat log, or "
 "whether the chat log turns off automatically."
@@ -366,56 +373,56 @@ msgstr ""
 "Este comando define se a tecla enter deve alternar para o log do chat ou se "
 "o log do chat fica oculto automaticamente."
 
-#: src/commandhandler.cpp:283
+#: src/commandhandler.cpp:292
 msgid ""
-"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
-"\", \"no\", \"false\" to turn the toggle off."
+"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
+"\"0\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 "<estado> pode ser \"1\", \"yes\" e \"true\" para ativar ou \"0\", \"no\" e "
 "\"false\" para desactivar."
 
-#: src/commandhandler.cpp:286
+#: src/commandhandler.cpp:295
 msgid "Command: /toggle"
 msgstr "Comando: /toggle"
 
-#: src/commandhandler.cpp:287
+#: src/commandhandler.cpp:296
 msgid "This command displays the return toggle status."
 msgstr "Este comando mostra o status do botão alternar."
 
-#: src/commandhandler.cpp:291 src/gui/widgets/whispertab.cpp:93
+#: src/commandhandler.cpp:300 src/gui/widgets/whispertab.cpp:95
 #, fuzzy
 msgid "Command: /unignore <player>"
 msgstr "Comando> /item <opção>"
 
-#: src/commandhandler.cpp:292
+#: src/commandhandler.cpp:301
 msgid "This command stops ignoring the given player if they are being ignored"
 msgstr ""
 
-#: src/commandhandler.cpp:297
+#: src/commandhandler.cpp:306
 msgid "Command: /where"
 msgstr "Comando: /where"
 
-#: src/commandhandler.cpp:298
+#: src/commandhandler.cpp:307
 msgid "This command displays the name of the current map."
 msgstr "Mostra o nome do mapa atual."
 
-#: src/commandhandler.cpp:302
+#: src/commandhandler.cpp:311
 msgid "Command: /who"
 msgstr "Comando: /who"
 
-#: src/commandhandler.cpp:303
+#: src/commandhandler.cpp:312
 msgid "This command displays the number of players currently online."
 msgstr "Mostra o número de jogadores conectados."
 
-#: src/commandhandler.cpp:309
+#: src/commandhandler.cpp:318
 msgid "Type /help for a list of commands."
 msgstr "Digite /help para ver uma lista de comandos."
 
-#: src/commandhandler.cpp:375
+#: src/commandhandler.cpp:384
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:383
+#: src/commandhandler.cpp:392
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -424,59 +431,67 @@ msgstr ""
 "Não é possível  criar uma aba de sussurros para o nick \"%s\"! Ou ela já "
 "existe ou é você mesmo."
 
-#: src/commandhandler.cpp:397
+#: src/commandhandler.cpp:406
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Solicitando entrada no canal %s."
 
-#: src/commandhandler.cpp:410 src/net/ea/gui/partytab.cpp:109
+#: src/commandhandler.cpp:419 src/net/tmwa/gui/partytab.cpp:109
 msgid "Party name is missing."
 msgstr "Falta o nome do grupo."
 
-#: src/commandhandler.cpp:423 src/commandhandler.cpp:471
-#: src/commandhandler.cpp:493
+#: src/commandhandler.cpp:432 src/commandhandler.cpp:509
+#: src/commandhandler.cpp:531
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:441
+#: src/commandhandler.cpp:450
 msgid "Return toggles chat."
 msgstr "Enter alterna para o chat."
 
-#: src/commandhandler.cpp:441
+#: src/commandhandler.cpp:450
 msgid "Message closes chat."
 msgstr "A mensagem fecha o chat."
 
-#: src/commandhandler.cpp:450
+#: src/commandhandler.cpp:459
 msgid "Return now toggles chat."
 msgstr "Agora enter alterna para o chat."
 
-#: src/commandhandler.cpp:454
+#: src/commandhandler.cpp:463
 msgid "Message now closes chat."
 msgstr "Agora a mensagem fecha o chat."
 
-#: src/commandhandler.cpp:477
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:489
+msgid "Show IP: On"
+msgstr ""
+
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:485
+msgid "Show IP: Off"
+msgstr ""
+
+#: src/commandhandler.cpp:515
 msgid "Player already ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:484
+#: src/commandhandler.cpp:522
 #, fuzzy
 msgid "Player successfully ignored!"
 msgstr "Grupo criado."
 
-#: src/commandhandler.cpp:486
+#: src/commandhandler.cpp:524
 #, fuzzy
 msgid "Player could not be ignored!"
 msgstr "Impossível enviar sussurro, está ignorado pelo utilizador."
 
-#: src/commandhandler.cpp:501
+#: src/commandhandler.cpp:539
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:506
+#: src/commandhandler.cpp:544
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:508
+#: src/commandhandler.cpp:546
 #, fuzzy
 msgid "Player could not be unignored!"
 msgstr "Impossível enviar sussurro, está ignorado pelo utilizador."
@@ -491,43 +506,43 @@ msgstr ""
 msgid "General"
 msgstr "Geral"
 
-#: src/game.cpp:326
+#: src/game.cpp:342
 #, fuzzy
 msgid "Screenshot saved as "
 msgstr "Screenshot salvo em ~/"
 
-#: src/game.cpp:331
+#: src/game.cpp:347
 msgid "Saving screenshot failed!"
 msgstr "Erro ao salvar screenshot!"
 
-#: src/game.cpp:355
+#: src/game.cpp:378
 #, fuzzy
 msgid "The connection to the server was lost."
 msgstr "Conexão com o servidor perdida, o jogo será fechado"
 
-#: src/game.cpp:360
+#: src/game.cpp:382
 msgid "Network Error"
 msgstr "Erro de conexão"
 
-#: src/game.cpp:705
+#: src/game.cpp:721
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorando propostas de negócios"
 
-#: src/game.cpp:712
+#: src/game.cpp:726
 msgid "Accepting incoming trade requests"
 msgstr "Aceitando propostas de negócios"
 
-#: src/game.cpp:946
+#: src/game.cpp:954
 #, fuzzy
 msgid "Could Not Load Map"
 msgstr "Impossível carregar mapa"
 
-#: src/game.cpp:947
+#: src/game.cpp:955
 #, c-format
 msgid "Error while loading %s"
 msgstr "Erro ao carregar %s"
 
-#: src/gui/beingpopup.cpp:75
+#: src/gui/beingpopup.cpp:76
 #, fuzzy, c-format
 msgid "Party: %s"
 msgstr "Grupo (%s)"
@@ -536,34 +551,34 @@ msgstr "Grupo (%s)"
 msgid "Buy"
 msgstr "Comprar"
 
-#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
-#: src/gui/sell.cpp:276
+#: src/gui/buy.cpp:69 src/gui/buy.cpp:261 src/gui/sell.cpp:71
+#: src/gui/sell.cpp:288
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Preço: %s / Total: %s"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:99 src/gui/npcdialog.cpp:100
-#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:404
+#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:112 src/gui/npcdialog.cpp:124
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:463
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:98 src/gui/npcdialog.cpp:101
-#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:416
+#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:111 src/gui/npcdialog.cpp:125
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:475
 msgid "-"
 msgstr ""
 
 #: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
-#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:152
-#: src/keyboardconfig.cpp:103
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:228
+#: src/keyboardconfig.cpp:102
 msgid "Quit"
 msgstr "Sair"
 
-#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:333
-#: src/gui/statuswindow.cpp:403 src/gui/statuswindow.cpp:437
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:384
+#: src/gui/statuswindow.cpp:462 src/gui/statuswindow.cpp:496
 msgid "Max"
 msgstr "Máximo"
 
@@ -577,11 +592,11 @@ msgstr "Vender"
 
 #: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
 #: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
-#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:101
-#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:178
-#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:402
+#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:114
+#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:389
 #: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
-#: src/gui/socialwindow.cpp:243 src/gui/textdialog.cpp:39
+#: src/gui/socialwindow.cpp:275 src/gui/textdialog.cpp:40
 #: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr "Cancelar"
@@ -620,7 +635,7 @@ msgstr "O novo endereço de email já existe."
 msgid "Change Password"
 msgstr "Alterar Senha"
 
-#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:53
+#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:55
 #: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
 msgid "Password:"
 msgstr "Senha:"
@@ -652,19 +667,19 @@ msgstr ""
 msgid "Create Character"
 msgstr "Criar Personagem"
 
-#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:52
+#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:54
 #: src/gui/register.cpp:67
 msgid "Name:"
 msgstr "Nome:"
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
 #: src/gui/outfitwindow.cpp:67
 msgid ">"
 msgstr ""
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
 #: src/gui/outfitwindow.cpp:66
@@ -681,8 +696,8 @@ msgstr "Cor de Cabelo:"
 msgid "Hair style:"
 msgstr "Estilo do Cabelo:"
 
-#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:397
-#: src/gui/socialwindow.cpp:297
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:392
+#: src/gui/socialwindow.cpp:329
 msgid "Create"
 msgstr "Criar"
 
@@ -738,34 +753,34 @@ msgstr "Remover o Registo"
 msgid "Change Email"
 msgstr "Alterar e-mail"
 
-#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:155
-#: src/gui/setup_players.cpp:230
+#: src/gui/charselectdialog.cpp:336 src/gui/serverdialog.cpp:231
+#: src/gui/setup_players.cpp:229
 msgid "Delete"
 msgstr "Eliminar"
 
-#: src/gui/charselectdialog.cpp:387
+#: src/gui/charselectdialog.cpp:380
 #, fuzzy
 msgid "Choose"
 msgstr "Fechar"
 
-#: src/gui/charselectdialog.cpp:399 src/gui/charselectdialog.cpp:400
+#: src/gui/charselectdialog.cpp:394 src/gui/charselectdialog.cpp:395
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:77
+#: src/gui/chat.cpp:88
 msgid "Chat"
 msgstr "Chat"
 
-#: src/gui/chat.cpp:287
+#: src/gui/chat.cpp:311
 #, fuzzy, c-format
 msgid "Present: %s; %d players are present."
 msgstr "%d jogadores estão presentes."
 
-#: src/gui/chat.cpp:305
+#: src/gui/chat.cpp:329
 msgid "Attendance written to record log."
 msgstr "Presença gravada no registo do log."
 
-#: src/gui/chat.cpp:469
+#: src/gui/chat.cpp:493
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "A sussurrar para %s: %s"
@@ -831,139 +846,170 @@ msgstr "Efeitos Ambientais"
 msgid "Equipment"
 msgstr "Equipamento"
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:78
-#: src/gui/inventorywindow.cpp:80 src/gui/inventorywindow.cpp:291
-#: src/gui/popupmenu.cpp:372
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:89
+#: src/gui/inventorywindow.cpp:337 src/gui/popupmenu.cpp:359
 msgid "Unequip"
 msgstr "Desequipar"
 
-#: src/gui/help.cpp:36
+#: src/gui/help.cpp:37
 msgid "Help"
 msgstr "Ajuda"
 
-#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:74
+#: src/gui/help.cpp:51 src/gui/npcdialog.cpp:50
 msgid "Close"
 msgstr "Fechar"
 
-#: src/gui/inventorywindow.cpp:57 src/gui/windowmenu.cpp:56
+#: src/gui/inventorywindow.cpp:59 src/gui/windowmenu.cpp:56
 msgid "Inventory"
 msgstr "Inventário"
 
-#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:75
-#: src/gui/inventorywindow.cpp:293 src/gui/popupmenu.cpp:374
+#: src/gui/inventorywindow.cpp:59
+msgid "Storage"
+msgstr "Armazenamento"
+
+#: src/gui/inventorywindow.cpp:82
+msgid "Slots:"
+msgstr "Entradas:"
+
+#: src/gui/inventorywindow.cpp:87 src/gui/inventorywindow.cpp:100
+#: src/gui/inventorywindow.cpp:339 src/gui/popupmenu.cpp:361
 msgid "Equip"
 msgstr "Equipar"
 
-#: src/gui/inventorywindow.cpp:74 src/gui/inventorywindow.cpp:75
-#: src/gui/inventorywindow.cpp:297 src/gui/popupmenu.cpp:377
+#: src/gui/inventorywindow.cpp:88
 msgid "Use"
 msgstr "Usar"
 
-#: src/gui/inventorywindow.cpp:84 src/gui/inventorywindow.cpp:301
-#: src/gui/popupmenu.cpp:380
+#: src/gui/inventorywindow.cpp:101 src/gui/popupmenu.cpp:364
+msgid "Activate"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:102 src/gui/inventorywindow.cpp:348
+#: src/gui/popupmenu.cpp:367
 #, fuzzy
 msgid "Drop..."
 msgstr "Largar"
 
-#: src/gui/inventorywindow.cpp:85 src/gui/popupmenu.cpp:386
+#: src/gui/inventorywindow.cpp:103 src/gui/popupmenu.cpp:373
 msgid "Split"
 msgstr "Dividir"
 
-#: src/gui/inventorywindow.cpp:86 src/gui/outfitwindow.cpp:51
+#: src/gui/inventorywindow.cpp:104 src/gui/outfitwindow.cpp:51
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:97 src/gui/storagewindow.cpp:84
-msgid "Slots:"
-msgstr "Entradas:"
-
-#: src/gui/inventorywindow.cpp:98
+#: src/gui/inventorywindow.cpp:106
 msgid "Weight:"
 msgstr "Peso:"
 
-#: src/gui/inventorywindow.cpp:303 src/gui/popupmenu.cpp:382
+#: src/gui/inventorywindow.cpp:124 src/gui/popupmenu.cpp:378
+msgid "Store"
+msgstr "Guardar"
+
+#: src/gui/inventorywindow.cpp:125 src/gui/popupmenu.cpp:385
+msgid "Retrieve"
+msgstr "Recuperar"
+
+#: src/gui/inventorywindow.cpp:350 src/gui/popupmenu.cpp:369
 msgid "Drop"
 msgstr "Largar"
 
-#: src/gui/itemamount.cpp:100 src/gui/okdialog.cpp:42
-#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:38 src/gui/trade.cpp:73
-#: src/gui/trade.cpp:75
+#: src/gui/itemamount.cpp:113 src/gui/okdialog.cpp:42
+#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:39 src/gui/trade.cpp:72
+#: src/gui/trade.cpp:74
 msgid "OK"
 msgstr "OK"
 
-#: src/gui/itemamount.cpp:102
+#: src/gui/itemamount.cpp:115
 msgid "All"
 msgstr "Tudo"
 
-#: src/gui/itemamount.cpp:128
+#: src/gui/itemamount.cpp:141
 msgid "Select amount of items to trade."
 msgstr "Seleccionar a quantidade de itens a negociar."
 
-#: src/gui/itemamount.cpp:131
+#: src/gui/itemamount.cpp:144
 msgid "Select amount of items to drop."
 msgstr "Seleccionar a quantidade de itens a largar."
 
-#: src/gui/itemamount.cpp:134
+#: src/gui/itemamount.cpp:147
 msgid "Select amount of items to store."
 msgstr "Escolha a quantidade de itens para guardar."
 
-#: src/gui/itemamount.cpp:137
+#: src/gui/itemamount.cpp:150
 msgid "Select amount of items to retrieve."
 msgstr "Escolha a quantidade de itens para retirar."
 
-#: src/gui/itemamount.cpp:140
+#: src/gui/itemamount.cpp:153
 msgid "Select amount of items to split."
 msgstr "Seleccionar a quantidade de itens a dividir."
 
-#: src/gui/itempopup.cpp:92
+#: src/gui/itempopup.cpp:137
 #, fuzzy, c-format
 msgid "Weight: %s"
 msgstr "Peso: "
 
-#: src/gui/login.cpp:49 src/gui/login.cpp:61
+#: src/gui/login.cpp:51 src/gui/login.cpp:63
 msgid "Login"
 msgstr "Autenticar"
 
-#: src/gui/login.cpp:58
+#: src/gui/login.cpp:60
 #, fuzzy
 msgid "Remember username"
 msgstr "Lembras nome de usuário"
 
-#: src/gui/login.cpp:59 src/gui/register.cpp:58 src/gui/register.cpp:73
+#: src/gui/login.cpp:61 src/gui/register.cpp:58 src/gui/register.cpp:73
 msgid "Register"
 msgstr "Registo"
 
-#: src/gui/login.cpp:60
+#: src/gui/login.cpp:62
 #, fuzzy
 msgid "Change Server"
 msgstr "Servidor"
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
+#: src/gui/login.cpp:129
+#, fuzzy
+msgid "Registration disabled"
+msgstr "Partilha de itens desabilitado."
+
+#: src/gui/login.cpp:129
+msgid "You need to use the website to register an account for this server."
+msgstr ""
+
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:86
 msgid "Map"
 msgstr "Mapa"
 
-#: src/gui/npcdialog.cpp:44
+#: src/gui/ministatus.cpp:235
+msgid "Need"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:48
 msgid "Waiting for server"
 msgstr "Aguardando servidor"
 
-#: src/gui/npcdialog.cpp:45
+#: src/gui/npcdialog.cpp:49
 msgid "Next"
 msgstr "Seguinte"
 
-#: src/gui/npcdialog.cpp:47
+#: src/gui/npcdialog.cpp:51
 msgid "Submit"
 msgstr "Enviar"
 
-#: src/gui/npcdialog.cpp:52 src/gui/npcpostdialog.cpp:41
+#: src/gui/npcdialog.cpp:73 src/gui/npcpostdialog.cpp:41
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:110
+#: src/gui/npcdialog.cpp:118
+msgid "Clear log"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:134
 msgid "Reset"
 msgstr "Reiniciar"
 
 #. TRANSLATORS: Please leave the \n sequences intact.
-#: src/gui/npcdialog.cpp:171
+#: src/gui/npcdialog.cpp:208
 #, fuzzy
 msgid ""
 "\n"
@@ -978,7 +1024,7 @@ msgstr "Para:"
 msgid "Send"
 msgstr "Enviar"
 
-#: src/gui/npcpostdialog.cpp:96
+#: src/gui/npcpostdialog.cpp:99
 msgid "Failed to send as sender or letter invalid."
 msgstr "Falha ao enviar como remetente ou a carta é inválida."
 
@@ -993,99 +1039,86 @@ msgstr ""
 msgid "Unequip first"
 msgstr "Desequipar"
 
-#: src/gui/popupmenu.cpp:84
+#: src/gui/popupmenu.cpp:83
 #, fuzzy, c-format
 msgid "Trade with %s..."
 msgstr "Negociando com %s"
 
-#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:161
+#: src/gui/popupmenu.cpp:87 src/gui/popupmenu.cpp:158
 #, fuzzy, c-format
 msgid "Attack %s"
 msgstr "Ataque %+d"
 
-#: src/gui/popupmenu.cpp:92
+#: src/gui/popupmenu.cpp:91
 #, fuzzy, c-format
 msgid "Whisper %s"
 msgstr "Sussurrar"
 
-#: src/gui/popupmenu.cpp:101
+#: src/gui/popupmenu.cpp:100
 #, fuzzy, c-format
 msgid "Befriend %s"
 msgstr "@@friend|Ser amigo de %s@@"
 
-#: src/gui/popupmenu.cpp:106
+#: src/gui/popupmenu.cpp:105
 #, fuzzy, c-format
 msgid "Disregard %s"
 msgstr "Desconsiderado"
 
-#: src/gui/popupmenu.cpp:109
+#: src/gui/popupmenu.cpp:108
 #, fuzzy, c-format
 msgid "Ignore %s"
 msgstr "Ignorado"
 
-#: src/gui/popupmenu.cpp:115 src/gui/popupmenu.cpp:124
+#: src/gui/popupmenu.cpp:114 src/gui/popupmenu.cpp:123
 #, c-format
 msgid "Unignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:118
+#: src/gui/popupmenu.cpp:117
 #, fuzzy, c-format
 msgid "Completely ignore %s"
 msgstr "@@ignore|Ignorar completamente %s@@"
 
 #: src/gui/popupmenu.cpp:130
-#, c-format
-msgid "Follow %s"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:133
 #, fuzzy, c-format
 msgid "Invite %s to join your guild"
 msgstr "@@guild|Convidar %s para sua Guilda@@"
 
-#: src/gui/popupmenu.cpp:137
+#: src/gui/popupmenu.cpp:134
 #, fuzzy, c-format
 msgid "Invite %s to join your party"
 msgstr "@@party|Convidar %s para entrar no seu grupo@@"
 
-#: src/gui/popupmenu.cpp:144
+#: src/gui/popupmenu.cpp:141
 #, fuzzy
 msgid "Kick player"
 msgstr "Erro na expulsão!"
 
-#: src/gui/popupmenu.cpp:153
+#: src/gui/popupmenu.cpp:150
 #, fuzzy, c-format
 msgid "Talk to %s"
 msgstr "@@talk|Falar com %s@@"
 
-#: src/gui/popupmenu.cpp:166
+#: src/gui/popupmenu.cpp:163
 #, fuzzy
 msgid "Kick monster"
 msgstr "@@admin-kick|Expulsar monstro@@"
 
-#: src/gui/popupmenu.cpp:174
+#: src/gui/popupmenu.cpp:171
 #, fuzzy
 msgid "Add name to chat"
 msgstr "@@name|Adiciona nome ao chat@@"
 
-#: src/gui/popupmenu.cpp:191
+#: src/gui/popupmenu.cpp:188
 #, fuzzy, c-format
 msgid "Pick up %s"
 msgstr "Pegar"
 
-#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:400
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:387
 #, fuzzy
 msgid "Add to chat"
 msgstr "@@chat|Adicionar ao chat@@"
 
-#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:71
-msgid "Store"
-msgstr "Guardar"
-
-#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:72
-msgid "Retrieve"
-msgstr "Recuperar"
-
 #: src/gui/quitdialog.cpp:44
 msgid "Switch server"
 msgstr "Mudar de servidor"
@@ -1154,52 +1187,65 @@ msgstr "A password só pode ter até %d caracteres."
 msgid "Passwords do not match."
 msgstr "As senhas não coincidem."
 
-#: src/gui/serverdialog.cpp:124
+#: src/gui/serverdialog.cpp:197
 #, fuzzy
 msgid "Choose Your Server"
 msgstr "Selecione seu servidor"
 
-#: src/gui/serverdialog.cpp:131 src/gui/widgets/chattab.cpp:139
+#: src/gui/serverdialog.cpp:206 src/gui/widgets/chattab.cpp:142
 msgid "Server:"
 msgstr "Servidor:"
 
-#: src/gui/serverdialog.cpp:132
+#: src/gui/serverdialog.cpp:207
 msgid "Port:"
 msgstr "Porta:"
 
-#: src/gui/serverdialog.cpp:133
+#: src/gui/serverdialog.cpp:208
 #, fuzzy
 msgid "Server type:"
 msgstr "Servidor:"
 
-#: src/gui/serverdialog.cpp:153
+#: src/gui/serverdialog.cpp:229
 #, fuzzy
 msgid "Connect"
 msgstr "Conectando..."
 
-#: src/gui/serverdialog.cpp:154
+#: src/gui/serverdialog.cpp:230
 #, fuzzy
 msgid "Custom Server"
 msgstr "Cursor personalizado"
 
-#: src/gui/serverdialog.cpp:242
+#: src/gui/serverdialog.cpp:324
 msgid "Please type both the address and the port of a server."
 msgstr "Por favor escreva o endereço e a porta do servidor."
 
-#: src/gui/serverdialog.cpp:357
+#: src/gui/serverdialog.cpp:441
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:363
+#: src/gui/serverdialog.cpp:447
 #, fuzzy
 msgid "Waiting for server..."
 msgstr "Aguardando servidor"
 
-#: src/gui/serverdialog.cpp:367
+#: src/gui/serverdialog.cpp:451
 msgid "Preparing download"
 msgstr ""
 
+#: src/gui/serverdialog.cpp:455
+msgid "Error retreiving server list!"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:550
+msgid "requires a newer version"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:552
+#, c-format
+msgid "requires v%s"
+msgstr ""
+
 #: src/gui/setup_audio.cpp:42
 msgid "Sound"
 msgstr "Som"
@@ -1233,54 +1279,54 @@ msgstr ""
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:45
+#: src/gui/setup_colors.cpp:46
 msgid "This is what the color looks like"
 msgstr "A cor se parece com isso"
 
-#: src/gui/setup_colors.cpp:50
+#: src/gui/setup_colors.cpp:51
 msgid "Colors"
 msgstr "Cores"
 
-#: src/gui/setup_colors.cpp:71
+#: src/gui/setup_colors.cpp:72
 #, fuzzy
 msgid "Type:"
 msgstr "Tipo: "
 
-#: src/gui/setup_colors.cpp:82 src/gui/setup_colors.cpp:330
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:331
 msgid "Static"
 msgstr "Estática"
 
-#: src/gui/setup_colors.cpp:84 src/gui/setup_colors.cpp:85
-#: src/gui/setup_colors.cpp:331
+#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
+#: src/gui/setup_colors.cpp:332
 msgid "Pulse"
 msgstr "Pulsar"
 
-#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:87
-#: src/gui/setup_colors.cpp:332
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
+#: src/gui/setup_colors.cpp:333
 msgid "Rainbow"
 msgstr "Arco-Íris"
 
-#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
-#: src/gui/setup_colors.cpp:332
+#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
+#: src/gui/setup_colors.cpp:333
 msgid "Spectrum"
 msgstr "Espectro"
 
-#: src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:94
 #, fuzzy
 msgid "Delay:"
 msgstr "Atraso: "
 
-#: src/gui/setup_colors.cpp:108
+#: src/gui/setup_colors.cpp:109
 #, fuzzy
 msgid "Red:"
 msgstr "Vermelho: "
 
-#: src/gui/setup_colors.cpp:123
+#: src/gui/setup_colors.cpp:124
 #, fuzzy
 msgid "Green:"
 msgstr "Verde: "
 
-#: src/gui/setup_colors.cpp:138
+#: src/gui/setup_colors.cpp:139
 #, fuzzy
 msgid "Blue:"
 msgstr "Azul: "
@@ -1338,590 +1384,592 @@ msgstr "Padrão"
 msgid "Key Conflict(s) Detected."
 msgstr "Conflitos nas teclas detectado."
 
-#: src/gui/setup_players.cpp:57
+#: src/gui/setup_players.cpp:58
 msgid "Name"
 msgstr "Nome"
 
-#: src/gui/setup_players.cpp:58
+#: src/gui/setup_players.cpp:59
 msgid "Relation"
 msgstr "Relação"
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:64
 msgid "Neutral"
 msgstr "Neutro"
 
-#: src/gui/setup_players.cpp:64
+#: src/gui/setup_players.cpp:65
 msgid "Friend"
 msgstr "Amigo"
 
-#: src/gui/setup_players.cpp:65
+#: src/gui/setup_players.cpp:66
 msgid "Disregarded"
 msgstr "Desconsiderado"
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_players.cpp:67
 msgid "Ignored"
 msgstr "Ignorado"
 
-#: src/gui/setup_players.cpp:208 src/gui/setup_video.cpp:132
+#: src/gui/setup_players.cpp:206 src/gui/setup_video.cpp:153
 msgid "???"
 msgstr "???"
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_players.cpp:225
 msgid "Allow trading"
 msgstr "Permitir trocas"
 
-#: src/gui/setup_players.cpp:228
+#: src/gui/setup_players.cpp:227
 msgid "Allow whispers"
 msgstr "Permitir sussurros"
 
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:231
 msgid "Put all whispers in tabs"
 msgstr "Deixar todos os sussurros em abas"
 
-#: src/gui/setup_players.cpp:234
+#: src/gui/setup_players.cpp:233
 #, fuzzy
 msgid "Show gender"
 msgstr "Mostrar nome"
 
-#: src/gui/setup_players.cpp:236
+#: src/gui/setup_players.cpp:235
+#, fuzzy
+msgid "Enable Chat log"
+msgstr "Impossibilitado de vender."
+
+#: src/gui/setup_players.cpp:237
 msgid "Players"
 msgstr "Jogadores"
 
-#: src/gui/setup_players.cpp:261
+#: src/gui/setup_players.cpp:262
 msgid "When ignoring:"
 msgstr "Quando ignorado:"
 
-#: src/gui/setup_video.cpp:113
+#: src/gui/setup_video.cpp:134
 msgid "Tiny"
 msgstr "Minúscula"
 
-#: src/gui/setup_video.cpp:114
+#: src/gui/setup_video.cpp:135
 msgid "Small"
 msgstr "Pequeno"
 
-#: src/gui/setup_video.cpp:115
+#: src/gui/setup_video.cpp:136
 msgid "Medium"
 msgstr "Médio"
 
-#: src/gui/setup_video.cpp:116
+#: src/gui/setup_video.cpp:137
 msgid "Large"
 msgstr "Grande"
 
-#: src/gui/setup_video.cpp:142
+#: src/gui/setup_video.cpp:163
 msgid "No text"
 msgstr "Sem texto"
 
-#: src/gui/setup_video.cpp:143
+#: src/gui/setup_video.cpp:164
 msgid "Text"
 msgstr "texto"
 
-#: src/gui/setup_video.cpp:144
+#: src/gui/setup_video.cpp:165
 msgid "Bubbles, no names"
 msgstr "Bolhas, sem nomes"
 
-#: src/gui/setup_video.cpp:145
+#: src/gui/setup_video.cpp:166
 msgid "Bubbles with names"
 msgstr "Bolhas com nomes"
 
-#: src/gui/setup_video.cpp:157
+#: src/gui/setup_video.cpp:178
 msgid "off"
 msgstr "desligado"
 
-#: src/gui/setup_video.cpp:158 src/gui/setup_video.cpp:171
+#: src/gui/setup_video.cpp:179 src/gui/setup_video.cpp:192
 msgid "low"
 msgstr "baixo"
 
-#: src/gui/setup_video.cpp:159 src/gui/setup_video.cpp:173
+#: src/gui/setup_video.cpp:180 src/gui/setup_video.cpp:194
 msgid "high"
 msgstr "elevado"
 
-#: src/gui/setup_video.cpp:172
+#: src/gui/setup_video.cpp:193
 msgid "medium"
 msgstr "médio"
 
-#: src/gui/setup_video.cpp:174
+#: src/gui/setup_video.cpp:195
 msgid "max"
 msgstr "máximo"
 
-#: src/gui/setup_video.cpp:196
+#: src/gui/setup_video.cpp:217
 msgid "Full screen"
 msgstr "Ecrã completo"
 
-#: src/gui/setup_video.cpp:197
+#: src/gui/setup_video.cpp:218
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:198
+#: src/gui/setup_video.cpp:219
 msgid "Custom cursor"
 msgstr "Cursor personalizado"
 
-#: src/gui/setup_video.cpp:200
+#: src/gui/setup_video.cpp:221
 msgid "Visible names"
 msgstr "Nomes visíveis"
 
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:223
 msgid "Particle effects"
 msgstr "Efeitos de partícula"
 
-#: src/gui/setup_video.cpp:204
+#: src/gui/setup_video.cpp:225
 #, fuzzy
 msgid "Show own name"
 msgstr "Mostrar nome"
 
-#: src/gui/setup_video.cpp:205
+#: src/gui/setup_video.cpp:226
+msgid "Log NPC dialogue"
+msgstr ""
+
+#: src/gui/setup_video.cpp:227
 msgid "Show pickup notification"
 msgstr "Mostrar aviso de achado"
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:207
+#. TRANSLATORS: Refers to "Show pickup notification"
+#: src/gui/setup_video.cpp:229
 msgid "in chat"
 msgstr "no chat"
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:209
+#. TRANSLATORS: Refers to "Show pickup notification"
+#: src/gui/setup_video.cpp:231
 msgid "as particle"
 msgstr "como partícula"
 
-#: src/gui/setup_video.cpp:214
+#: src/gui/setup_video.cpp:236
 #, fuzzy
 msgid "FPS limit:"
 msgstr "Limite de FPS:"
 
-#: src/gui/setup_video.cpp:225
+#: src/gui/setup_video.cpp:247
+msgid "Disable transparency (Low CPU mode)"
+msgstr ""
+
+#: src/gui/setup_video.cpp:250
 msgid "Video"
 msgstr "Vídeo"
 
-#: src/gui/setup_video.cpp:227
+#: src/gui/setup_video.cpp:252
 #, fuzzy
-msgid "Show monster damage"
+msgid "Show damage"
 msgstr "Mostrar nome"
 
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:258
 msgid "Overhead text"
 msgstr "Texto sobrescrito"
 
-#: src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:259
 msgid "Gui opacity"
 msgstr "Opacidade do Interface"
 
-#: src/gui/setup_video.cpp:235
+#: src/gui/setup_video.cpp:260
 msgid "Ambient FX"
 msgstr "Efeitos Ambientais"
 
-#: src/gui/setup_video.cpp:236
+#: src/gui/setup_video.cpp:261
 #, fuzzy
 msgid "Particle detail"
 msgstr "Detalhe de partículas"
 
-#: src/gui/setup_video.cpp:237
+#: src/gui/setup_video.cpp:262
 msgid "Font size"
 msgstr "Tamanho da fonte"
 
-#: src/gui/setup_video.cpp:251 src/gui/setup_video.cpp:454
-#: src/gui/setup_video.cpp:568
+#: src/gui/setup_video.cpp:277 src/gui/setup_video.cpp:532
+#: src/gui/setup_video.cpp:662
 #, fuzzy
 msgid "None"
 msgstr "Não"
 
-#: src/gui/setup_video.cpp:381
+#: src/gui/setup_video.cpp:426
 #, fuzzy
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr "modo e restauração do antigo modo também falharam!"
 
-#: src/gui/setup_video.cpp:387
+#: src/gui/setup_video.cpp:432
 #, fuzzy
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr "modo e restauração do antigo modo também falharam!"
 
-#: src/gui/setup_video.cpp:398
+#: src/gui/setup_video.cpp:443
 #, fuzzy
 msgid "Switching to Full Screen"
 msgstr "Mudar para ecrã completo"
 
-#: src/gui/setup_video.cpp:399
+#: src/gui/setup_video.cpp:444
 msgid "Restart needed for changes to take effect."
 msgstr "É necessário reiniciar para as alterações terem efeito."
 
-#: src/gui/setup_video.cpp:411
+#: src/gui/setup_video.cpp:458
 #, fuzzy
 msgid "Changing to OpenGL"
 msgstr "Mudando OpenGL"
 
-#: src/gui/setup_video.cpp:412
+#: src/gui/setup_video.cpp:459
+msgid ""
+"Applying change to OpenGL requires restart. In case OpenGL messes up your "
+"game graphics, restart the game with the command line option \"--no-opengl\"."
+msgstr ""
+
+#: src/gui/setup_video.cpp:466
+msgid "Deactivating OpenGL"
+msgstr ""
+
+#: src/gui/setup_video.cpp:467
 msgid "Applying change to OpenGL requires restart."
 msgstr "É necessário reiniciar para as alterações ao OpenGl terem efeito."
 
-#: src/gui/setup_video.cpp:486 src/gui/setup_video.cpp:491
+#: src/gui/setup_video.cpp:475
+#, fuzzy
+msgid "Transparency disabled"
+msgstr "Partilha de experiência desabilitado."
+
+#: src/gui/setup_video.cpp:476 src/gui/setup_video.cpp:484
+msgid "You must restart to apply changes."
+msgstr ""
+
+#: src/gui/setup_video.cpp:483
+msgid "Transparency enabled"
+msgstr ""
+
+#: src/gui/setup_video.cpp:576 src/gui/setup_video.cpp:581
 #, fuzzy
 msgid "Screen Resolution Changed"
 msgstr "Resolução de tela alterada"
 
-#: src/gui/setup_video.cpp:487 src/gui/setup_video.cpp:492
+#: src/gui/setup_video.cpp:577 src/gui/setup_video.cpp:582
 msgid "Restart your client for the change to take effect."
 msgstr "Reincie o jogo para que as mudanças surtam efeito."
 
-#: src/gui/setup_video.cpp:489
+#: src/gui/setup_video.cpp:579
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:522
+#: src/gui/setup_video.cpp:612
 #, fuzzy
 msgid "Particle Effect Settings Changed."
 msgstr "Configurações de efeito de partícula modificadas."
 
-#: src/gui/setup_video.cpp:523
+#: src/gui/setup_video.cpp:613
 msgid "Changes will take effect on map change."
 msgstr "As mudanças terão efeito na mudança do mapa."
 
-#: src/gui/skilldialog.cpp:198 src/gui/windowmenu.cpp:59
+#: src/gui/skilldialog.cpp:212 src/gui/windowmenu.cpp:59
 msgid "Skills"
 msgstr "Competências"
 
-#: src/gui/skilldialog.cpp:209
+#: src/gui/skilldialog.cpp:223
 msgid "Up"
 msgstr "Para cima"
 
-#: src/gui/skilldialog.cpp:263
+#: src/gui/skilldialog.cpp:269
 #, fuzzy, c-format
 msgid "Skill points available: %d"
 msgstr "Pontos de habilidade: %d"
 
-#: src/gui/skilldialog.cpp:315
+#: src/gui/skilldialog.cpp:351
 #, fuzzy, c-format
 msgid "Skill Set %d"
 msgstr "Pontos de habilidade: %d"
 
-#: src/gui/skilldialog.cpp:324
+#: src/gui/skilldialog.cpp:360
 #, fuzzy, c-format
 msgid "Skill %d"
 msgstr "Competências"
 
-#: src/gui/skilldialog.cpp:406
+#: src/gui/skilldialog.cpp:442
 #, fuzzy, c-format
 msgid "Lvl: %d (%+d)"
 msgstr "Nível: %d"
 
-#: src/gui/skilldialog.cpp:417
+#: src/gui/skilldialog.cpp:453
 #, fuzzy, c-format
 msgid "Lvl: %d"
 msgstr "Nível: %d"
 
-#: src/gui/socialwindow.cpp:118
+#: src/gui/socialwindow.cpp:126
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:127
+#: src/gui/socialwindow.cpp:139
 #, fuzzy, c-format
 msgid "Guild %s quit requested."
 msgstr "Guilda criada."
 
-#: src/gui/socialwindow.cpp:137
+#: src/gui/socialwindow.cpp:153
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:138
+#: src/gui/socialwindow.cpp:154
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:147
+#: src/gui/socialwindow.cpp:163
 #, fuzzy
 msgid "Leave Guild?"
 msgstr "Criar Guilda"
 
-#: src/gui/socialwindow.cpp:148
+#: src/gui/socialwindow.cpp:164
 #, fuzzy, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Você tem certeza que deseja sair?"
 
-#: src/gui/socialwindow.cpp:183
+#: src/gui/socialwindow.cpp:207 src/net/tmwa/partyhandler.cpp:330
 #, fuzzy, c-format
 msgid "Invited user %s to party."
 msgstr "/party > convidar um jogadora para a equipa"
 
-#: src/gui/socialwindow.cpp:190
+#: src/gui/socialwindow.cpp:218
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:200
+#: src/gui/socialwindow.cpp:232
 #, fuzzy
 msgid "Member Invite to Party"
 msgstr "/party > convidar um jogadora para a equipa"
 
-#: src/gui/socialwindow.cpp:201
+#: src/gui/socialwindow.cpp:233
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:210
+#: src/gui/socialwindow.cpp:242
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:211
+#: src/gui/socialwindow.cpp:243
 #, fuzzy, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Você tem certeza que deseja sair?"
 
-#: src/gui/socialwindow.cpp:240
+#: src/gui/socialwindow.cpp:272
 msgid "Create Guild"
 msgstr "Criar Guilda"
 
-#: src/gui/socialwindow.cpp:241 src/gui/socialwindow.cpp:565
+#: src/gui/socialwindow.cpp:273 src/gui/socialwindow.cpp:620
 #, fuzzy
 msgid "Create Party"
 msgstr "Criar Personagem"
 
-#: src/gui/socialwindow.cpp:280 src/gui/windowmenu.cpp:64
+#: src/gui/socialwindow.cpp:312 src/gui/windowmenu.cpp:64
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:298
+#: src/gui/socialwindow.cpp:330
 #, fuzzy
 msgid "Invite"
 msgstr "Convidar Usuário"
 
-#: src/gui/socialwindow.cpp:299
+#: src/gui/socialwindow.cpp:331
 #, fuzzy
 msgid "Leave"
 msgstr "Grande"
 
-#: src/gui/socialwindow.cpp:395
+#: src/gui/socialwindow.cpp:443
 #, fuzzy, c-format
 msgid "Accepted party invite from %s."
 msgstr "Acaitar convite de %s."
 
-#: src/gui/socialwindow.cpp:401
+#: src/gui/socialwindow.cpp:449
 #, fuzzy, c-format
 msgid "Rejected party invite from %s."
 msgstr "Rejeitar convite de %s."
 
-#: src/gui/socialwindow.cpp:414
+#: src/gui/socialwindow.cpp:462
 #, fuzzy, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Acaitar convite de %s."
 
-#: src/gui/socialwindow.cpp:420
+#: src/gui/socialwindow.cpp:468
 #, fuzzy, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Rejeitar convite de %s."
 
-#: src/gui/socialwindow.cpp:464
+#: src/gui/socialwindow.cpp:497
+msgid "Creating guild failed, please choose a shorter name."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:504
 #, fuzzy, c-format
 msgid "Creating guild called %s."
 msgstr "Erro ao criar guilda."
 
-#: src/gui/socialwindow.cpp:478
+#: src/gui/socialwindow.cpp:520
+msgid "Creating party failed, please choose a shorter name."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:527
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:485
+#: src/gui/socialwindow.cpp:541
 #, fuzzy
 msgid "Guild Name"
 msgstr "Guilda"
 
-#: src/gui/socialwindow.cpp:486
+#: src/gui/socialwindow.cpp:542
 #, fuzzy
 msgid "Choose your guild's name."
 msgstr "Selecione seu servidor"
 
-#: src/gui/socialwindow.cpp:498
+#: src/gui/socialwindow.cpp:554
 #, fuzzy
 msgid "Received guild request, but one already exists."
 msgstr "Requisição de grupo recebida, mas já existe um."
 
-#: src/gui/socialwindow.cpp:503
+#: src/gui/socialwindow.cpp:559
 #, fuzzy, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s te convidou para entrar no grupo %s."
 
-#: src/gui/socialwindow.cpp:508
+#: src/gui/socialwindow.cpp:564
 #, fuzzy
 msgid "Accept Guild Invite"
 msgstr "Aceitar convite para o grupo"
 
-#: src/gui/socialwindow.cpp:520
+#: src/gui/socialwindow.cpp:576
 msgid "Received party request, but one already exists."
 msgstr "Requisição de grupo recebida, mas já existe um."
 
-#: src/gui/socialwindow.cpp:530
+#: src/gui/socialwindow.cpp:585
 #, fuzzy
 msgid "You have been invited you to join a party."
 msgstr "%s te convidou para entrar no seu grupo."
 
-#: src/gui/socialwindow.cpp:534
+#: src/gui/socialwindow.cpp:589
 #, fuzzy, c-format
 msgid "You have been invited to join the %s party."
 msgstr "%s te convidou para entrar no grupo %s."
 
-#: src/gui/socialwindow.cpp:542
+#: src/gui/socialwindow.cpp:597
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s te convidou para entrar no seu grupo."
 
-#: src/gui/socialwindow.cpp:547
+#: src/gui/socialwindow.cpp:602
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s te convidou para entrar no grupo %s."
 
-#: src/gui/socialwindow.cpp:555
+#: src/gui/socialwindow.cpp:610
 msgid "Accept Party Invite"
 msgstr "Aceitar convite para o grupo"
 
-#: src/gui/socialwindow.cpp:566
+#: src/gui/socialwindow.cpp:621
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:571
+#: src/gui/socialwindow.cpp:626
 #, fuzzy
 msgid "Party Name"
 msgstr "Festa"
 
-#: src/gui/socialwindow.cpp:572
+#: src/gui/socialwindow.cpp:627
 #, fuzzy
 msgid "Choose your party's name."
 msgstr "Selecione seu servidor"
 
-#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:62
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:62
 msgid "Specials"
 msgstr ""
 
-#: src/gui/specialswindow.cpp:174
-#, c-format
-msgid "Specials Set %d"
-msgstr ""
-
-#: src/gui/specialswindow.cpp:191
-#, c-format
-msgid "Special %d"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:247
+#: src/gui/statuswindow.cpp:113 src/gui/statuswindow.cpp:215
+#: src/gui/statuswindow.cpp:262
 #, c-format
 msgid "Level: %d"
 msgstr "Nível: %d"
 
-#: src/gui/statuswindow.cpp:101 src/gui/statuswindow.cpp:211
+#: src/gui/statuswindow.cpp:114 src/gui/statuswindow.cpp:208
+#: src/gui/statuswindow.cpp:239
 #, c-format
 msgid "Money: %s"
 msgstr "Dinheiro: %s"
 
-#: src/gui/statuswindow.cpp:104
+#: src/gui/statuswindow.cpp:117
 msgid "HP:"
 msgstr "HP:"
 
-#: src/gui/statuswindow.cpp:109
+#: src/gui/statuswindow.cpp:122
 msgid "Exp:"
 msgstr "Exp:"
 
-#: src/gui/statuswindow.cpp:114
+#: src/gui/statuswindow.cpp:130
 msgid "MP:"
 msgstr "MP:"
 
-#: src/gui/statuswindow.cpp:132 src/gui/statuswindow.cpp:219
+#: src/gui/statuswindow.cpp:158 src/gui/statuswindow.cpp:275
 #, c-format
 msgid "Job: %d"
 msgstr "Trabalho: %d"
 
-#: src/gui/statuswindow.cpp:133
+#: src/gui/statuswindow.cpp:159
 msgid "Job:"
 msgstr "Trabalho:"
 
-#: src/gui/statuswindow.cpp:194
-#, fuzzy
-msgid "HP"
-msgstr "HP:"
-
-#: src/gui/statuswindow.cpp:200
-#, fuzzy
-msgid "MP"
-msgstr "MP:"
-
-#: src/gui/statuswindow.cpp:206
-#, fuzzy
-msgid "Exp"
-msgstr "Exp:"
-
-#: src/gui/statuswindow.cpp:215
-#, fuzzy
-msgid "Money"
-msgstr "Dinheiro: %d"
-
-#: src/gui/statuswindow.cpp:225
-#, fuzzy
-msgid "Job"
-msgstr "Trabalho:"
-
-#: src/gui/statuswindow.cpp:229
+#: src/gui/statuswindow.cpp:211 src/gui/statuswindow.cpp:247
 #, fuzzy, c-format
 msgid "Character points: %d"
 msgstr "Estatisticas da personagem OK"
 
-#: src/gui/statuswindow.cpp:235
+#: src/gui/statuswindow.cpp:255
 #, fuzzy, c-format
 msgid "Correction points: %d"
 msgstr "Pontos de habilidade: %d"
 
-#: src/gui/statuswindow.cpp:251
-#, fuzzy
-msgid "Level"
-msgstr "Nível: %d"
-
-#: src/gui/storagewindow.cpp:59
-msgid "Storage"
-msgstr "Armazenamento"
-
-#: src/gui/trade.cpp:52
+#: src/gui/trade.cpp:53
 msgid "Propose trade"
 msgstr "Propor Negócio"
 
-#: src/gui/trade.cpp:53
+#: src/gui/trade.cpp:54
 msgid "Confirmed. Waiting..."
 msgstr "Confirmado. Aguardando..."
 
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:55
 msgid "Agree trade"
 msgstr "Aceitar negociação"
 
-#: src/gui/trade.cpp:55
+#: src/gui/trade.cpp:56
 msgid "Agreed. Waiting..."
 msgstr "Aceita. Aguarde..."
 
-#: src/gui/trade.cpp:58
+#: src/gui/trade.cpp:59
 msgid "Trade: You"
 msgstr "Negócio: você"
 
-#: src/gui/trade.cpp:74 src/gui/trade.cpp:75
+#: src/gui/trade.cpp:73 src/gui/trade.cpp:74
 msgid "Trade"
 msgstr "Negócio"
 
-#: src/gui/trade.cpp:77
+#: src/gui/trade.cpp:76
 msgid "Add"
 msgstr "Adicionar"
 
-#: src/gui/trade.cpp:99 src/gui/trade.cpp:135
+#: src/gui/trade.cpp:98 src/gui/trade.cpp:134
 #, fuzzy, c-format
 msgid "You get %s"
 msgstr "Você obteve %s"
 
-#: src/gui/trade.cpp:100
+#: src/gui/trade.cpp:99
 msgid "You give:"
 msgstr "Dá:"
 
-#: src/gui/trade.cpp:104
+#: src/gui/trade.cpp:103
 msgid "Change"
 msgstr "Modificar"
 
-#: src/gui/trade.cpp:275
+#: src/gui/trade.cpp:262
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Falha ao adicionar item. Você não pode duplicar um tipo de item na janela."
 
-#: src/gui/trade.cpp:318
+#: src/gui/trade.cpp:304
 msgid "You don't have enough money."
 msgstr "Você não tem dinheiro suficiente."
 
@@ -1942,22 +1990,22 @@ msgstr "Conectando..."
 msgid "Play"
 msgstr "Iniciar"
 
-#: src/gui/updatewindow.cpp:405
+#: src/gui/updatewindow.cpp:417
 msgid "##1  The update process is incomplete."
 msgstr "##1  O processo de update está incompleto."
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:407
+#: src/gui/updatewindow.cpp:419
 msgid "##1  It is strongly recommended that"
 msgstr "##1 É altamente recomendado que"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:409
+#: src/gui/updatewindow.cpp:421
 #, fuzzy
 msgid "##1  you try again later."
 msgstr "##1  você tente novamente mais tarde"
 
-#: src/gui/updatewindow.cpp:501
+#: src/gui/updatewindow.cpp:515
 msgid "Completed"
 msgstr "Concluído"
 
@@ -2038,55 +2086,55 @@ msgstr "É preciso um utilizador para dar op!"
 msgid "Need a user to kick!"
 msgstr "É preciso um utilizador para expulsar!"
 
-#: src/gui/widgets/chattab.cpp:118
+#: src/gui/widgets/chattab.cpp:121
 msgid "Global announcement:"
 msgstr "Anúncio geral:"
 
-#: src/gui/widgets/chattab.cpp:124
+#: src/gui/widgets/chattab.cpp:127
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "Anúncio geral de %s:"
 
-#: src/gui/widgets/chattab.cpp:150
+#: src/gui/widgets/chattab.cpp:153
 #, fuzzy, c-format
 msgid "%s whispers: %s"
 msgstr "%s sussurou: "
 
-#: src/gui/widgets/whispertab.cpp:51
+#: src/gui/widgets/whispertab.cpp:53
 msgid "Cannot send empty chat!"
 msgstr "Não é possível enviar chat vazio!"
 
-#: src/gui/widgets/whispertab.cpp:70
+#: src/gui/widgets/whispertab.cpp:72
 msgid "/ignore > Ignore the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:71
+#: src/gui/widgets/whispertab.cpp:73
 msgid "/unignore > Stop ignoring the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:72
+#: src/gui/widgets/whispertab.cpp:74
 msgid "/close > Close the whisper tab"
 msgstr "/close > Fecha a aba de sussurros"
 
-#: src/gui/widgets/whispertab.cpp:82
+#: src/gui/widgets/whispertab.cpp:84
 msgid "Command: /close"
 msgstr "Comando: /close"
 
-#: src/gui/widgets/whispertab.cpp:83
+#: src/gui/widgets/whispertab.cpp:85
 msgid "This command closes the current whisper tab."
 msgstr "Este comando fecha a atual aba de sussurros"
 
-#: src/gui/widgets/whispertab.cpp:87
+#: src/gui/widgets/whispertab.cpp:89
 #, fuzzy
 msgid "Command: /ignore"
 msgstr "Comando: /item"
 
-#: src/gui/widgets/whispertab.cpp:88
+#: src/gui/widgets/whispertab.cpp:90
 #, fuzzy
 msgid "This command ignores the other player regardless of current relations."
 msgstr "Mostra o número de jogadores conectados."
 
-#: src/gui/widgets/whispertab.cpp:94
+#: src/gui/widgets/whispertab.cpp:96
 #, fuzzy
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
@@ -2116,645 +2164,1007 @@ msgstr "Modificar"
 msgid "Choose World"
 msgstr "Selecione seu servidor"
 
-#: src/keyboardconfig.cpp:40
+#: src/keyboardconfig.cpp:39
 msgid "Move Up"
 msgstr "Mover para Cima"
 
-#: src/keyboardconfig.cpp:41
+#: src/keyboardconfig.cpp:40
 msgid "Move Down"
 msgstr "Mover para Baixo"
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:41
 msgid "Move Left"
 msgstr "Mover para Esquerda"
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:42
 msgid "Move Right"
 msgstr "Mover para Direita"
 
-#: src/keyboardconfig.cpp:44 src/net/ea/generalhandler.cpp:223
+#: src/keyboardconfig.cpp:43 src/net/tmwa/generalhandler.cpp:237
 msgid "Attack"
 msgstr "Ataque"
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:44
 msgid "Target & Attack"
 msgstr "Selecionar & Atacar"
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:45
 msgid "Smilie"
 msgstr "Emoticons"
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:46
 msgid "Talk"
 msgstr "Falar"
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:47
 msgid "Stop Attack"
 msgstr "Parar ataque"
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:48
 #, fuzzy
 msgid "Target Monster"
 msgstr "Seleccionar o mais próximo"
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboardconfig.cpp:49
 msgid "Target NPC"
 msgstr "Seleccionar NPC"
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:50
 msgid "Target Player"
 msgstr "Seleccionar Jogador"
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:51
 msgid "Pickup"
 msgstr "Pegar"
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:52
 msgid "Hide Windows"
 msgstr "Esconder Janelas"
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:53
 msgid "Sit"
 msgstr "Sentar"
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:54
 msgid "Screenshot"
 msgstr "Captura de Ecrã"
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:55
 msgid "Enable/Disable Trading"
 msgstr "Habilitar/Desabilitar Negociações"
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:56
 msgid "Find Path to Mouse"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58 src/keyboardconfig.cpp:59
-#: src/keyboardconfig.cpp:60 src/keyboardconfig.cpp:61
-#: src/keyboardconfig.cpp:62 src/keyboardconfig.cpp:63
-#: src/keyboardconfig.cpp:64 src/keyboardconfig.cpp:65
-#: src/keyboardconfig.cpp:66 src/keyboardconfig.cpp:67
-#: src/keyboardconfig.cpp:68 src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:57 src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60
+#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62
+#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64
+#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68
 #, c-format
 msgid "Item Shortcut %d"
 msgstr "Atalho para Item %d"
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:69
 msgid "Help Window"
 msgstr "Ajuda"
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:70
 msgid "Status Window"
 msgstr "Status"
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:71
 msgid "Inventory Window"
 msgstr "Janela de inventário"
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:72
 msgid "Equipment Window"
 msgstr "Equipamento"
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:73
 msgid "Skill Window"
 msgstr "Janela de Habilidade"
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:74
 msgid "Minimap Window"
 msgstr "Janela de Mini-mapa"
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:75
 msgid "Chat Window"
 msgstr "Janela de Diálogo"
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:76
 msgid "Item Shortcut Window"
 msgstr "Janela de atalhos para itens"
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:77
 msgid "Setup Window"
 msgstr "Configuração"
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:78
 msgid "Debug Window"
 msgstr "Janela de Depuração"
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:79
 #, fuzzy
 msgid "Social Window"
 msgstr "Janela de Habilidade"
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:80
 msgid "Emote Shortcut Window"
 msgstr "Janela de atalho para Emoticons"
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:81
 #, fuzzy
 msgid "Outfits Window"
 msgstr "Status"
 
-#: src/keyboardconfig.cpp:83
+#: src/keyboardconfig.cpp:82
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:83
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86
-#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88
-#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90
-#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92
-#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:84 src/keyboardconfig.cpp:85
+#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:87
+#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:89
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:91
+#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:93
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:95
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "Atalho para Emoticon %d"
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:96
 msgid "Toggle Chat"
 msgstr "Alternar para chat"
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:97
 msgid "Scroll Chat Up"
 msgstr "Rolar janela de chat para cima"
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:98
 msgid "Scroll Chat Down"
 msgstr "Rolar janela de chat para baixo"
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:99
 msgid "Previous Chat Tab"
 msgstr "Aba de chat anterior"
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:100
 msgid "Next Chat Tab"
 msgstr "Próxima aba de chat"
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:101
 msgid "Select OK"
 msgstr "Seleccionar OK"
 
-#: src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:103
 msgid "Ignore input 1"
 msgstr "Ignorar input 1"
 
-#: src/keyboardconfig.cpp:105
+#: src/keyboardconfig.cpp:104
 msgid "Ignore input 2"
 msgstr "Ignorar input 2"
 
-#: src/keyboardconfig.cpp:184
+#: src/keyboardconfig.cpp:183
 #, fuzzy, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr "Corrija-os, ou o jogo irá se comportar de forma estranha."
 
-#: src/localplayer.cpp:914
+#: src/localplayer.cpp:985
 msgid "Unable to pick up item."
 msgstr "Impossível pegar item."
 
 #. TRANSLATORS: This sentence may be translated differently
 #. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:923
+#: src/localplayer.cpp:994
 #, fuzzy, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "Você pegou %s [@@%d|%s@@]."
 msgstr[1] "Você pegou %s [@@%d|%s@@]."
 
-#: src/main.cpp:43
+#: src/main.cpp:42
 msgid "mana [options] [mana-file]"
 msgstr ""
 
+#: src/main.cpp:43
+msgid "[mana-file] : The mana file is an XML file (.mana)"
+msgstr ""
+
 #: src/main.cpp:44
+msgid "              used to set custom parameters"
+msgstr ""
+
+#: src/main.cpp:45
+msgid "              to the mana client."
+msgstr ""
+
+#: src/main.cpp:47
 msgid "Options:"
 msgstr "Opções:"
 
-#: src/main.cpp:45
+#: src/main.cpp:48
 #, fuzzy
 msgid "  -v --version        : Display the version"
 msgstr "  -v --version : Exibe a versão"
 
-#: src/main.cpp:46
+#: src/main.cpp:49
 #, fuzzy
 msgid "  -h --help           : Display this help"
 msgstr "  -h --help : Exibe esta ajuda"
 
-#: src/main.cpp:47
+#: src/main.cpp:50
 #, fuzzy
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr "  -C --config-file : Ficheiro de configuração a ser usado"
 
-#: src/main.cpp:48
+#: src/main.cpp:51
 #, fuzzy
 msgid "  -U --username       : Login with this username"
 msgstr "  -U --username : Efectua login com este utilizador"
 
-#: src/main.cpp:49
+#: src/main.cpp:52
 #, fuzzy
 msgid "  -P --password       : Login with this password"
 msgstr "  -P --password : Efectua login com esta senha"
 
-#: src/main.cpp:50
+#: src/main.cpp:53
 #, fuzzy
 msgid "  -c --character      : Login with this character"
 msgstr "  -c --character : Efectua login com este personagem"
 
-#: src/main.cpp:51
+#: src/main.cpp:54
 #, fuzzy
 msgid "  -s --server         : Login server name or IP"
 msgstr "  -s --server : Nome ou IP do servidor de login"
 
-#: src/main.cpp:52
+#: src/main.cpp:55
 #, fuzzy
 msgid "  -p --port           : Login server port"
 msgstr "  -p --port : Porta do servidor de login"
 
-#: src/main.cpp:53
+#: src/main.cpp:56
 #, fuzzy
 msgid "     --update-host    : Use this update host"
 msgstr "  -H --update-host : Usa esta actualização do host"
 
-#: src/main.cpp:54
+#: src/main.cpp:57
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:56
+#: src/main.cpp:59
 #, fuzzy
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr "  -u --skip-update : Não faz downloads de actualização"
 
-#: src/main.cpp:57
+#: src/main.cpp:60
 #, fuzzy
 msgid "  -d --data           : Directory to load game data from"
 msgstr "  -d --data : Pasta de onde os dados do jogo vão ser carregados"
 
-#: src/main.cpp:58
+#: src/main.cpp:61
 #, fuzzy
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
+msgid "     --localdata-dir  : Directory to use as local data directory"
 msgstr "  -S --home-dir : Directório a ser usado como pasta inicial"
 
-#: src/main.cpp:59
+#: src/main.cpp:62
+#, fuzzy
+msgid "     --chat-log-dir   : Chat log dir to use"
+msgstr "  -C --config-file : Ficheiro de configuração a ser usado"
+
+#: src/main.cpp:63
 #, fuzzy
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr "  -S --home-dir : Directório a ser usado como pasta inicial"
 
-#: src/main.cpp:61
+#: src/main.cpp:65
 #, fuzzy
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr "  -O --no-opengl : Desabilita OpenGL nesta sessão"
 
-#: src/net/ea/adminhandler.cpp:63
+#: src/net/manaserv/beinghandler.cpp:303 src/net/tmwa/playerhandler.cpp:94
+msgid "You are dead."
+msgstr "Você está morto."
+
+#: src/net/manaserv/beinghandler.cpp:304 src/net/tmwa/playerhandler.cpp:95
+msgid "We regret to inform you that your character was killed in battle."
+msgstr "Lamentamos informar que seu personagem foi morto em combate."
+
+#: src/net/manaserv/beinghandler.cpp:306 src/net/tmwa/playerhandler.cpp:97
+msgid "You are not that alive anymore."
+msgstr "Você não está mais vivo."
+
+#: src/net/manaserv/beinghandler.cpp:307 src/net/tmwa/playerhandler.cpp:98
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr "As mãos frias da morte estão levando sua alma."
+
+#: src/net/manaserv/beinghandler.cpp:308 src/net/tmwa/playerhandler.cpp:99
+msgid "Game Over!"
+msgstr "Fim de jogo!"
+
+#: src/net/manaserv/beinghandler.cpp:309 src/net/tmwa/playerhandler.cpp:101
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+"Não, crianças. Seu personagem não morreu de verdade. Ele... err... foi para "
+"um lugar melhor."
+
+#: src/net/manaserv/beinghandler.cpp:311 src/net/tmwa/playerhandler.cpp:103
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr ""
+"Seu plano de quebrar as armas de seus inimigos com o seu pescoço não deu "
+"certo."
+
+#: src/net/manaserv/beinghandler.cpp:313 src/net/tmwa/playerhandler.cpp:105
+msgid "I guess this did not run too well."
+msgstr "Eu acho que isso não correu lá muito bem."
+
+#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:107
+msgid "Do you want your possessions identified?"
+msgstr "Você quer uma identificação de suas posses?"
+
+#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:109
+msgid "Sadly, no trace of you was ever found..."
+msgstr "Infelizmente, seus vestigios nunca foram encontrados..."
+
+#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:111
+msgid "Annihilated."
+msgstr "Aniquilado."
+
+#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:113
+msgid "Looks like you got your head handed to you."
+msgstr "Parece que te ofereceram sua própria cabeça."
+
+#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:115
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr "Você estragou tudo de novo, jogue fora seu corpo e arranje outro."
+
+#: src/net/manaserv/beinghandler.cpp:323
+#, fuzzy
+msgid "Press OK to respawn."
+msgstr " Clique em OK para re-popular."
+
+#: src/net/manaserv/beinghandler.cpp:324
+#, fuzzy
+msgid "You Died"
+msgstr "Você morreu"
+
+#: src/net/manaserv/charhandler.cpp:138 src/net/manaserv/charhandler.cpp:209
+#, fuzzy
+msgid "Not logged in."
+msgstr "Já está conectado"
+
+#: src/net/manaserv/charhandler.cpp:141
+msgid "No empty slot."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:144
+msgid "Invalid name."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:147
+#, fuzzy
+msgid "Character's name already exists."
+msgstr "Nome de utilizador já existe"
+
+#: src/net/manaserv/charhandler.cpp:150
+msgid "Invalid hairstyle."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:153
+msgid "Invalid hair color."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:156
+msgid "Invalid gender."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:159
+#, fuzzy
+msgid "Character's stats are too high."
+msgstr "Estatisticas da personagem OK"
+
+#: src/net/manaserv/charhandler.cpp:162
+#, fuzzy
+msgid "Character's stats are too low."
+msgstr "Estatisticas da personagem OK"
+
+#: src/net/manaserv/charhandler.cpp:165
+#, c-format
+msgid "At least one statis out of the permitted range: (%u - %u)."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:171 src/net/manaserv/loginhandler.cpp:96
+#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
+#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
+#: src/net/tmwa/loginhandler.cpp:95 src/net/tmwa/loginhandler.cpp:182
+#, fuzzy
+msgid "Unknown error."
+msgstr "Erro desconhecido"
+
+#: src/net/manaserv/charhandler.cpp:200 src/net/tmwa/charserverhandler.cpp:146
+msgid "Info"
+msgstr "Info"
+
+#: src/net/manaserv/charhandler.cpp:200
+#, fuzzy
+msgid "Player deleted."
+msgstr "Personagem apagado."
+
+#: src/net/manaserv/charhandler.cpp:212
+#, fuzzy
+msgid "Selection out of range."
+msgstr "Seleccionar a quantidade de itens a negociar."
+
+#: src/net/manaserv/charhandler.cpp:215
+#, fuzzy, c-format
+msgid "Unknown error (%d)."
+msgstr "Erro desconhecido"
+
+#: src/net/manaserv/charhandler.cpp:250
+msgid "No gameservers are available."
+msgstr "Não há gameservers disponíveis."
+
+#: src/net/manaserv/chathandler.cpp:187 src/net/manaserv/chathandler.cpp:313
+#: src/net/manaserv/guildhandler.cpp:260
+#, c-format
+msgid "Topic: %s"
+msgstr "Tópico: %s"
+
+#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:274
+#, fuzzy
+msgid "Players in this channel:"
+msgstr "Jogador acerta monstro"
+
+#: src/net/manaserv/chathandler.cpp:208
+#, fuzzy
+msgid "Error joining channel."
+msgstr "Comando: /join <canal>"
+
+#: src/net/manaserv/chathandler.cpp:214
+#, fuzzy
+msgid "Listing channels."
+msgstr "Solicitando entrada no canal %s."
+
+#: src/net/manaserv/chathandler.cpp:226
+msgid "End of channel list."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:303
+#, fuzzy, c-format
+msgid "%s entered the channel."
+msgstr "%s entrou para o grupo."
+
+#: src/net/manaserv/chathandler.cpp:308
+#, c-format
+msgid "%s left the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:324
+#, c-format
+msgid "%s has set mode %s on user %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:334
+#, c-format
+msgid "%s has kicked %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:339
+#, fuzzy
+msgid "Unknown channel event."
+msgstr "Comando desconhecido"
+
+#: src/net/manaserv/guildhandler.cpp:82
+msgid "Guild created."
+msgstr "Guilda criada."
+
+#: src/net/manaserv/guildhandler.cpp:87
+msgid "Error creating guild."
+msgstr "Erro ao criar guilda."
+
+#: src/net/manaserv/guildhandler.cpp:97
+msgid "Invite sent."
+msgstr "Convite enviado."
+
+#: src/net/manaserv/guildhandler.cpp:204
+msgid "Member was promoted successfully."
+msgstr "Membro foi promovido com sucesso."
+
+#: src/net/manaserv/guildhandler.cpp:209
+msgid "Failed to promote member."
+msgstr "Erro ao promover membro."
+
+#: src/net/manaserv/loginhandler.cpp:87
+#, fuzzy
+msgid "Wrong magic_token."
+msgstr "Simbolo-mágico errado."
+
+#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
+#, fuzzy
+msgid "Already logged in."
+msgstr "Já está conectado"
+
+#: src/net/manaserv/loginhandler.cpp:93
+#, fuzzy
+msgid "Account banned."
+msgstr "A conta expirou"
+
+#: src/net/manaserv/loginhandler.cpp:118
+#, fuzzy
+msgid "New password incorrect."
+msgstr "Nova senha incorreta"
+
+#: src/net/manaserv/loginhandler.cpp:121 src/net/tmwa/loginhandler.cpp:89
+#, fuzzy
+msgid "Old password incorrect."
+msgstr "Senha antiga incorreta"
+
+#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
+msgid "Account not connected. Please login first."
+msgstr "Conta não conectada. Por favor, efectue o login primeiro."
+
+#: src/net/manaserv/loginhandler.cpp:149
+#, fuzzy
+msgid "New email address incorrect."
+msgstr "Novo endereço de email incorrecto"
+
+#: src/net/manaserv/loginhandler.cpp:152
+#, fuzzy
+msgid "Old email address incorrect."
+msgstr "Antigo endereço de email incorrecto"
+
+#: src/net/manaserv/loginhandler.cpp:158
+#, fuzzy
+msgid "The new email address already exists."
+msgstr "O novo endereço de email já existe."
+
+#: src/net/manaserv/loginhandler.cpp:239
+msgid ""
+"Client registration is not allowed. Please contact server administration."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
+#, fuzzy
+msgid "Client version is too old."
+msgstr "Versão do cliente é muito antiga"
+
+#: src/net/manaserv/loginhandler.cpp:266
+#, fuzzy
+msgid "Wrong username or password."
+msgstr "Nome de utilizador ou senha inválida"
+
+#: src/net/manaserv/loginhandler.cpp:272
+#, fuzzy
+msgid "Account banned"
+msgstr "A conta expirou"
+
+#: src/net/manaserv/loginhandler.cpp:275
+msgid "Login attempt too soon after previous attempt."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:303
+#, fuzzy
+msgid "Wrong username, password or email address."
+msgstr "Nome de utilizador, senha ou email inválido"
+
+#: src/net/manaserv/loginhandler.cpp:306
+#, fuzzy
+msgid "Username already exists."
+msgstr "Nome de utilizador já existe"
+
+#: src/net/manaserv/loginhandler.cpp:309
+#, fuzzy
+msgid "Email address already exists."
+msgstr "Endereço de email já existe"
+
+#: src/net/manaserv/loginhandler.cpp:312
+msgid "You took too long with the captcha or your response was incorrect."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:87
+msgid "Joined party."
+msgstr "Entrou para o grupo."
+
+#: src/net/manaserv/partyhandler.cpp:105
+#, c-format
+msgid "%s joined the party."
+msgstr "%s entrou para o grupo."
+
+#: src/net/manaserv/partyhandler.cpp:123
+#, fuzzy, c-format
+msgid "%s rejected your invite."
+msgstr "%s recusou seu convite."
+
+#: src/net/manaserv/tradehandler.cpp:95
+msgid "Accepting incoming trade requests."
+msgstr "Aceitando propostas de negócios."
+
+#: src/net/manaserv/tradehandler.cpp:97
+msgid "Ignoring incoming trade requests."
+msgstr "Ignorando propostas de negócios."
+
+#: src/net/manaserv/tradehandler.cpp:115 src/net/tmwa/tradehandler.cpp:109
+msgid "Request for Trade"
+msgstr "Proposta de negociação"
+
+#: src/net/manaserv/tradehandler.cpp:116 src/net/tmwa/tradehandler.cpp:110
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
+msgstr "%s quer negociar com você, você aceita?"
+
+#: src/net/manaserv/tradehandler.cpp:134
+#, c-format
+msgid "Trading with %s"
+msgstr "Negociando com %s"
+
+#: src/net/manaserv/tradehandler.cpp:148 src/net/tmwa/tradehandler.cpp:224
+msgid "Trade canceled."
+msgstr "Negociação cancelada."
+
+#: src/net/manaserv/tradehandler.cpp:155 src/net/tmwa/tradehandler.cpp:231
+msgid "Trade completed."
+msgstr "Negociação realizada."
+
+#: src/net/tmwa/adminhandler.cpp:64
 msgid "Kick failed!"
 msgstr "Erro na expulsão!"
 
-#: src/net/ea/adminhandler.cpp:65
+#: src/net/tmwa/adminhandler.cpp:66
 msgid "Kick succeeded!"
 msgstr "Expulsão bem sucedida!"
 
-#: src/net/ea/buysellhandler.cpp:110
+#: src/net/tmwa/buysellhandler.cpp:109
 msgid "Nothing to sell."
 msgstr "Nada para vender."
 
-#: src/net/ea/buysellhandler.cpp:117
+#: src/net/tmwa/buysellhandler.cpp:116
 msgid "Thanks for buying."
 msgstr "Obrigado pela compra."
 
-#: src/net/ea/buysellhandler.cpp:124
+#: src/net/tmwa/buysellhandler.cpp:123
 msgid "Unable to buy."
 msgstr "Impossível comprar."
 
-#: src/net/ea/buysellhandler.cpp:130
+#: src/net/tmwa/buysellhandler.cpp:129
 msgid "Thanks for selling."
 msgstr "Obrigado pela venda."
 
-#: src/net/ea/buysellhandler.cpp:132
+#: src/net/tmwa/buysellhandler.cpp:131
 msgid "Unable to sell."
 msgstr "Impossibilitado de vender."
 
-#: src/net/ea/charserverhandler.cpp:103
-#, fuzzy
-msgid "Access denied."
-msgstr "Acesso negado"
+#: src/net/tmwa/charserverhandler.cpp:103
+msgid "Access denied. Most likely, there are too many players on this server."
+msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:106
+#: src/net/tmwa/charserverhandler.cpp:107
 #, fuzzy
 msgid "Cannot use this ID."
 msgstr "Não é possível usar esta ID"
 
-#: src/net/ea/charserverhandler.cpp:109
+#: src/net/tmwa/charserverhandler.cpp:110
 #, fuzzy
-msgid "Unknown failure to select character."
-msgstr "Erro desconhecido ao seleccionar personagem"
+msgid "Unknown char-server failure."
+msgstr "Erro desconhecido"
 
-#: src/net/ea/charserverhandler.cpp:135
+#: src/net/tmwa/charserverhandler.cpp:134
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr "Erro ao criar personagem. Provavelmente o nome já está sendo usado."
 
-#: src/net/ea/charserverhandler.cpp:147 src/net/manaserv/charhandler.cpp:187
-msgid "Info"
-msgstr "Info"
-
-#: src/net/ea/charserverhandler.cpp:147
+#: src/net/tmwa/charserverhandler.cpp:146
 msgid "Character deleted."
 msgstr "Personagem apagado."
 
-#: src/net/ea/charserverhandler.cpp:152
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Failed to delete character."
 msgstr "Falha ao apagar personagem."
 
-#: src/net/ea/charserverhandler.cpp:237 src/net/manaserv/charhandler.cpp:263
+#: src/net/tmwa/charserverhandler.cpp:266
 msgid "Strength:"
 msgstr "Força:"
 
-#: src/net/ea/charserverhandler.cpp:238 src/net/manaserv/charhandler.cpp:264
+#: src/net/tmwa/charserverhandler.cpp:267
 msgid "Agility:"
 msgstr "Agilidade:"
 
-#: src/net/ea/charserverhandler.cpp:239 src/net/manaserv/charhandler.cpp:266
+#: src/net/tmwa/charserverhandler.cpp:268
 msgid "Vitality:"
 msgstr "Vitalidade:"
 
-#: src/net/ea/charserverhandler.cpp:240 src/net/manaserv/charhandler.cpp:267
+#: src/net/tmwa/charserverhandler.cpp:269
 msgid "Intelligence:"
 msgstr "Inteligência:"
 
-#: src/net/ea/charserverhandler.cpp:241 src/net/manaserv/charhandler.cpp:265
+#: src/net/tmwa/charserverhandler.cpp:270
 msgid "Dexterity:"
 msgstr "Destreza:"
 
-#: src/net/ea/charserverhandler.cpp:242
+#: src/net/tmwa/charserverhandler.cpp:271
 msgid "Luck:"
 msgstr "Sorte:"
 
-#: src/net/ea/chathandler.cpp:80
-msgid "Whisper could not be sent, user is offline."
+#: src/net/tmwa/chathandler.cpp:87
+#, fuzzy, c-format
+msgid "Whisper could not be sent, %s is offline."
 msgstr "Impossível enviar sussurro, o utilizador está desconectado."
 
-#: src/net/ea/chathandler.cpp:84
-msgid "Whisper could not be sent, ignored by user."
+#: src/net/tmwa/chathandler.cpp:96
+#, fuzzy, c-format
+msgid "Whisper could not be sent, ignored by %s."
 msgstr "Impossível enviar sussurro, está ignorado pelo utilizador."
 
-#: src/net/ea/chathandler.cpp:171
+#: src/net/tmwa/chathandler.cpp:230
 #, fuzzy
 msgid "MVP player."
 msgstr "Jogador"
 
-#: src/net/ea/chathandler.cpp:204 src/net/ea/chathandler.cpp:210
-#: src/net/ea/chathandler.cpp:215 src/net/ea/chathandler.cpp:220
-#: src/net/ea/chathandler.cpp:225 src/net/ea/chathandler.cpp:230
-#: src/net/ea/chathandler.cpp:235 src/net/ea/chathandler.cpp:240
+#: src/net/tmwa/chathandler.cpp:265 src/net/tmwa/chathandler.cpp:271
+#: src/net/tmwa/chathandler.cpp:276 src/net/tmwa/chathandler.cpp:281
+#: src/net/tmwa/chathandler.cpp:286 src/net/tmwa/chathandler.cpp:291
+#: src/net/tmwa/chathandler.cpp:296 src/net/tmwa/chathandler.cpp:301
 msgid "Channels are not supported!"
 msgstr "Não há suporte para canais!"
 
-#: src/net/ea/gamehandler.cpp:86
+#: src/net/tmwa/gamehandler.cpp:88
 #, c-format
 msgid "Online users: %d"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:100
+#: src/net/tmwa/gamehandler.cpp:101
 #, fuzzy
 msgid "Game"
 msgstr "Nome"
 
-#: src/net/ea/gamehandler.cpp:100
+#: src/net/tmwa/gamehandler.cpp:101
 #, fuzzy
 msgid "Request to quit denied!"
 msgstr "Proposta de negociação"
 
-#: src/net/ea/generalhandler.cpp:102 src/net/manaserv/generalhandler.cpp:95
+#: src/net/tmwa/generalhandler.cpp:102
 #, c-format
 msgid "Strength %+d"
 msgstr "Força %+d"
 
-#: src/net/ea/generalhandler.cpp:103 src/net/manaserv/generalhandler.cpp:96
+#: src/net/tmwa/generalhandler.cpp:103
 #, c-format
 msgid "Agility %+d"
 msgstr "Agilidade %+d"
 
-#: src/net/ea/generalhandler.cpp:104 src/net/manaserv/generalhandler.cpp:98
+#: src/net/tmwa/generalhandler.cpp:104
 #, c-format
 msgid "Vitality %+d"
 msgstr "Vitalidade %+d"
 
-#: src/net/ea/generalhandler.cpp:105 src/net/manaserv/generalhandler.cpp:99
+#: src/net/tmwa/generalhandler.cpp:105
 #, c-format
 msgid "Intelligence %+d"
 msgstr "Inteligência %+d"
 
-#: src/net/ea/generalhandler.cpp:106 src/net/manaserv/generalhandler.cpp:97
+#: src/net/tmwa/generalhandler.cpp:106
 #, c-format
 msgid "Dexterity %+d"
 msgstr "Destreza %+d"
 
-#: src/net/ea/generalhandler.cpp:107
+#: src/net/tmwa/generalhandler.cpp:107
 #, c-format
 msgid "Luck %+d"
 msgstr "Sorte %+d"
 
-#: src/net/ea/generalhandler.cpp:130
+#: src/net/tmwa/generalhandler.cpp:132
 #, fuzzy
 msgid "Authentication failed."
 msgstr "Autenticação falhou"
 
-#: src/net/ea/generalhandler.cpp:133
+#: src/net/tmwa/generalhandler.cpp:135
 #, fuzzy
 msgid "No servers available."
 msgstr "Não há servidores disponíveis"
 
-#: src/net/ea/generalhandler.cpp:137
+#: src/net/tmwa/generalhandler.cpp:139
 #, fuzzy
 msgid "Someone else is trying to use this account."
 msgstr "Mais alguém está tentando utilizar esta conta"
 
-#: src/net/ea/generalhandler.cpp:140
+#: src/net/tmwa/generalhandler.cpp:142
 #, fuzzy
 msgid "This account is already logged in."
 msgstr "Existe alguém logado a esta conta"
 
-#: src/net/ea/generalhandler.cpp:143
+#: src/net/tmwa/generalhandler.cpp:145
 #, fuzzy
 msgid "Speed hack detected."
 msgstr "Hack de velocidade detectado"
 
-#: src/net/ea/generalhandler.cpp:146
+#: src/net/tmwa/generalhandler.cpp:148
 #, fuzzy
 msgid "Duplicated login."
 msgstr "Login duplicado"
 
-#: src/net/ea/generalhandler.cpp:149
+#: src/net/tmwa/generalhandler.cpp:151
 #, fuzzy
 msgid "Unknown connection error."
 msgstr "Erro de conexão desconhecido"
 
-#: src/net/ea/generalhandler.cpp:205
+#: src/net/tmwa/generalhandler.cpp:209
 msgid "Got disconnected from server!"
 msgstr "Você foi desconectado do servidor!"
 
-#: src/net/ea/generalhandler.cpp:216 src/net/manaserv/generalhandler.cpp:166
+#: src/net/tmwa/generalhandler.cpp:230
 msgid "Strength"
 msgstr "Força"
 
-#: src/net/ea/generalhandler.cpp:217 src/net/manaserv/generalhandler.cpp:167
+#: src/net/tmwa/generalhandler.cpp:231
 msgid "Agility"
 msgstr "Agilidade"
 
-#: src/net/ea/generalhandler.cpp:218 src/net/manaserv/generalhandler.cpp:169
+#: src/net/tmwa/generalhandler.cpp:232
 msgid "Vitality"
 msgstr "Vitalidade"
 
-#: src/net/ea/generalhandler.cpp:219 src/net/manaserv/generalhandler.cpp:170
+#: src/net/tmwa/generalhandler.cpp:233
 msgid "Intelligence"
 msgstr "Inteligência"
 
-#: src/net/ea/generalhandler.cpp:220 src/net/manaserv/generalhandler.cpp:168
+#: src/net/tmwa/generalhandler.cpp:234
 msgid "Dexterity"
 msgstr "Destreza"
 
-#: src/net/ea/generalhandler.cpp:221
+#: src/net/tmwa/generalhandler.cpp:235
 msgid "Luck"
 msgstr "Sorte"
 
-#: src/net/ea/generalhandler.cpp:224
+#: src/net/tmwa/generalhandler.cpp:238
 #, fuzzy
 msgid "Defense"
 msgstr "Defesa:"
 
-#: src/net/ea/generalhandler.cpp:225
+#: src/net/tmwa/generalhandler.cpp:239
 #, fuzzy
 msgid "M.Attack"
 msgstr "M. Ataque:"
 
-#: src/net/ea/generalhandler.cpp:226
+#: src/net/tmwa/generalhandler.cpp:240
 #, fuzzy
 msgid "M.Defense"
 msgstr "M. Defesa:"
 
-#: src/net/ea/generalhandler.cpp:227
+#: src/net/tmwa/generalhandler.cpp:241
 #, fuzzy, c-format
 msgid "% Accuracy"
 msgstr "% Precisão:"
 
-#: src/net/ea/generalhandler.cpp:228
+#: src/net/tmwa/generalhandler.cpp:242
 #, fuzzy, c-format
 msgid "% Evade"
 msgstr "% Fuga:"
 
-#: src/net/ea/generalhandler.cpp:229
+#: src/net/tmwa/generalhandler.cpp:243
 #, fuzzy, c-format
 msgid "% Critical"
 msgstr "Golpe crítico"
 
-#: src/net/ea/gui/guildtab.cpp:45
+#: src/net/tmwa/gui/guildtab.cpp:45
 msgid "Guild"
 msgstr "Guilda"
 
-#: src/net/ea/gui/guildtab.cpp:61 src/net/ea/gui/partytab.cpp:59
+#: src/net/tmwa/gui/guildtab.cpp:61 src/net/tmwa/gui/partytab.cpp:59
 msgid "/help > Display this help."
 msgstr "/help > Exibe esta ajuda."
 
-#: src/net/ea/gui/guildtab.cpp:62
+#: src/net/tmwa/gui/guildtab.cpp:62
 #, fuzzy
 msgid "/invite > Invite a player to your guild"
 msgstr "/invite > Convida um jogador para o seu grupo"
 
-#: src/net/ea/gui/guildtab.cpp:63
+#: src/net/tmwa/gui/guildtab.cpp:63
 #, fuzzy
 msgid "/leave > Leave the guild you are in"
 msgstr "/leave > Sai do grupo em que você está"
 
-#: src/net/ea/gui/guildtab.cpp:64
+#: src/net/tmwa/gui/guildtab.cpp:64
 #, fuzzy
 msgid "/kick > Kick some one from the guild you are in"
 msgstr "/kick > Expulsa alguém do grupo em que você está"
 
-#: src/net/ea/gui/guildtab.cpp:73 src/net/ea/gui/partytab.cpp:73
+#: src/net/tmwa/gui/guildtab.cpp:73 src/net/tmwa/gui/partytab.cpp:73
 msgid "Command: /invite <nick>"
 msgstr "Comando: /invite <nick>"
 
-#: src/net/ea/gui/guildtab.cpp:74
+#: src/net/tmwa/gui/guildtab.cpp:74
 #, fuzzy
 msgid "This command invites <nick> to the guild you're in."
 msgstr "Convida <nick> para uma festa com você."
 
-#: src/net/ea/gui/guildtab.cpp:80 src/net/ea/gui/partytab.cpp:80
+#: src/net/tmwa/gui/guildtab.cpp:80 src/net/tmwa/gui/partytab.cpp:80
 msgid "Command: /leave"
 msgstr "Comando: /leave"
 
-#: src/net/ea/gui/guildtab.cpp:81
+#: src/net/tmwa/gui/guildtab.cpp:81
 #, fuzzy
 msgid "This command causes the player to leave the guild."
 msgstr "Este comando faz com que o jogador saia do grupo."
 
-#: src/net/ea/gui/guildtab.cpp:89
+#: src/net/tmwa/gui/guildtab.cpp:89
 #, fuzzy
 msgid "Guild name is missing."
 msgstr "Falta o nome do grupo."
 
-#: src/net/ea/guildhandler.cpp:293
+#: src/net/tmwa/guildhandler.cpp:296
 msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:298
+#: src/net/tmwa/guildhandler.cpp:301
 msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:303
+#: src/net/tmwa/guildhandler.cpp:306
 #, fuzzy
 msgid "User is now part of your guild."
 msgstr "%s agora é um membro do seu grupo."
 
-#: src/net/ea/guildhandler.cpp:308
+#: src/net/tmwa/guildhandler.cpp:311
 msgid "Your guild is full."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:313
+#: src/net/tmwa/guildhandler.cpp:316
 #, fuzzy
 msgid "Unknown guild invite response."
 msgstr "Resposta de convite desconhecida para %s."
 
-#: src/net/ea/guildhandler.cpp:390
+#: src/net/tmwa/guildhandler.cpp:393
 msgid "Guild creation isn't supported yet."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:43
+#: src/net/tmwa/gui/partytab.cpp:43
 msgid "Party"
 msgstr "Festa"
 
-#: src/net/ea/gui/partytab.cpp:60
+#: src/net/tmwa/gui/partytab.cpp:60
 msgid "/invite > Invite a player to your party"
 msgstr "/invite > Convida um jogador para o seu grupo"
 
-#: src/net/ea/gui/partytab.cpp:61
+#: src/net/tmwa/gui/partytab.cpp:61
 msgid "/leave > Leave the party you are in"
 msgstr "/leave > Sai do grupo em que você está"
 
-#: src/net/ea/gui/partytab.cpp:62
+#: src/net/tmwa/gui/partytab.cpp:62
 msgid "/kick > Kick some one from the party you are in"
 msgstr "/kick > Expulsa alguém do grupo em que você está"
 
-#: src/net/ea/gui/partytab.cpp:63
+#: src/net/tmwa/gui/partytab.cpp:63
 msgid "/item > Show/change party item sharing options"
 msgstr "/item > Mostra/Muda opções de partilha de itens do grupo"
 
-#: src/net/ea/gui/partytab.cpp:64
+#: src/net/tmwa/gui/partytab.cpp:64
 msgid "/exp > Show/change party experience sharing options"
 msgstr "/exp > Mostra/Modifica opções de partilha de experiência do grupo"
 
-#: src/net/ea/gui/partytab.cpp:81
+#: src/net/tmwa/gui/partytab.cpp:81
 msgid "This command causes the player to leave the party."
 msgstr "Este comando faz com que o jogador saia do grupo."
 
-#: src/net/ea/gui/partytab.cpp:85
+#: src/net/tmwa/gui/partytab.cpp:85
 msgid "Command: /item <policy>"
 msgstr "Comando> /item <opção>"
 
-#: src/net/ea/gui/partytab.cpp:86
+#: src/net/tmwa/gui/partytab.cpp:86
 msgid "This command changes the party's item sharing policy."
 msgstr "Este comando muda a opção de partilha de itens no grupo."
 
-#: src/net/ea/gui/partytab.cpp:87
+#: src/net/tmwa/gui/partytab.cpp:87
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
@@ -2762,23 +3172,23 @@ msgstr ""
 "<policy> pode ser \"1\", \"yes\" e \"true\" para habilitar partilhar de "
 "itens, ou \"0\", \"no\" e \"false\" para desabilitar."
 
-#: src/net/ea/gui/partytab.cpp:90
+#: src/net/tmwa/gui/partytab.cpp:90
 msgid "Command: /item"
 msgstr "Comando: /item"
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/tmwa/gui/partytab.cpp:91
 msgid "This command displays the party's current item sharing policy."
 msgstr "Este comando exibe a actual opção de partilha de itens no grupo."
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/tmwa/gui/partytab.cpp:95
 msgid "Command: /exp <policy>"
 msgstr "Comando: /exp <policy>"
 
-#: src/net/ea/gui/partytab.cpp:96
+#: src/net/tmwa/gui/partytab.cpp:96
 msgid "This command changes the party's experience sharing policy."
 msgstr "Este comando muda a opção de partilha de experiência no grupo."
 
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/tmwa/gui/partytab.cpp:97
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
@@ -2786,103 +3196,90 @@ msgstr ""
 "<policy> pode ser \"1\", \"yes\" e \"true\" para habilitar partilha de "
 "experiência, ou \"0\", \"no\" e \"false\" para desabilitar."
 
-#: src/net/ea/gui/partytab.cpp:100
+#: src/net/tmwa/gui/partytab.cpp:100
 msgid "Command: /exp"
 msgstr "Comando: /exp"
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/tmwa/gui/partytab.cpp:101
 msgid "This command displays the party's current experience sharing policy."
 msgstr "Este comando exibe a actual opção de partilha de experiência no grupo."
 
-#: src/net/ea/gui/partytab.cpp:132 src/net/ea/partyhandler.cpp:198
+#: src/net/tmwa/gui/partytab.cpp:132 src/net/tmwa/partyhandler.cpp:196
 msgid "Item sharing enabled."
 msgstr "Partilha de itens habilitado."
 
-#: src/net/ea/gui/partytab.cpp:135 src/net/ea/partyhandler.cpp:204
+#: src/net/tmwa/gui/partytab.cpp:135 src/net/tmwa/partyhandler.cpp:202
 msgid "Item sharing disabled."
 msgstr "Partilha de itens desabilitado."
 
-#: src/net/ea/gui/partytab.cpp:138 src/net/ea/partyhandler.cpp:210
+#: src/net/tmwa/gui/partytab.cpp:138 src/net/tmwa/partyhandler.cpp:208
 msgid "Item sharing not possible."
 msgstr "Não é possível partilhar itens."
 
-#: src/net/ea/gui/partytab.cpp:141
+#: src/net/tmwa/gui/partytab.cpp:141
 #, fuzzy
 msgid "Item sharing unknown."
 msgstr "Partilha de itens habilitado."
 
-#: src/net/ea/gui/partytab.cpp:167 src/net/ea/partyhandler.cpp:174
+#: src/net/tmwa/gui/partytab.cpp:167 src/net/tmwa/partyhandler.cpp:172
 msgid "Experience sharing enabled."
 msgstr "Partilha de experiência habilitado."
 
-#: src/net/ea/gui/partytab.cpp:170 src/net/ea/partyhandler.cpp:180
+#: src/net/tmwa/gui/partytab.cpp:170 src/net/tmwa/partyhandler.cpp:178
 msgid "Experience sharing disabled."
 msgstr "Partilha de experiência desabilitado."
 
-#: src/net/ea/gui/partytab.cpp:173 src/net/ea/partyhandler.cpp:186
+#: src/net/tmwa/gui/partytab.cpp:173 src/net/tmwa/partyhandler.cpp:184
 msgid "Experience sharing not possible."
 msgstr "Não é possível partilhar experiência."
 
-#: src/net/ea/gui/partytab.cpp:176
+#: src/net/tmwa/gui/partytab.cpp:176
 #, fuzzy
 msgid "Experience sharing unknown."
 msgstr "Partilha de experiência habilitado."
 
-#: src/net/ea/inventoryhandler.cpp:281
+#: src/net/tmwa/inventoryhandler.cpp:285
 msgid "Failed to use item."
 msgstr "Problemas ao usar item."
 
-#: src/net/ea/inventoryhandler.cpp:391
+#: src/net/tmwa/inventoryhandler.cpp:399
 msgid "Unable to equip."
 msgstr "Impossível equipar."
 
-#: src/net/ea/inventoryhandler.cpp:402
+#: src/net/tmwa/inventoryhandler.cpp:410
 msgid "Unable to unequip."
 msgstr "Impossível desequipar."
 
-#: src/net/ea/loginhandler.cpp:79
+#: src/net/tmwa/loginhandler.cpp:86
 msgid "Account was not found. Please re-login."
 msgstr "Conta não encontrada. Por favor, log novamente."
 
-#: src/net/ea/loginhandler.cpp:82 src/net/manaserv/loginhandler.cpp:121
-#, fuzzy
-msgid "Old password incorrect."
-msgstr "Senha antiga incorreta"
-
-#: src/net/ea/loginhandler.cpp:85
+#: src/net/tmwa/loginhandler.cpp:92
 #, fuzzy
 msgid "New password too short."
 msgstr "Nova senha é muito curta"
 
-#: src/net/ea/loginhandler.cpp:88 src/net/ea/loginhandler.cpp:175
-#: src/net/manaserv/charhandler.cpp:158 src/net/manaserv/loginhandler.cpp:96
-#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
-#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
-#, fuzzy
-msgid "Unknown error."
-msgstr "Erro desconhecido"
-
-#: src/net/ea/loginhandler.cpp:149
+#: src/net/tmwa/loginhandler.cpp:156
 #, fuzzy
 msgid "Unregistered ID."
 msgstr "ID não registado"
 
-#: src/net/ea/loginhandler.cpp:152
+#: src/net/tmwa/loginhandler.cpp:159
 #, fuzzy
 msgid "Wrong password."
 msgstr "Senha incorreta"
 
-#: src/net/ea/loginhandler.cpp:155
+#: src/net/tmwa/loginhandler.cpp:162
 #, fuzzy
 msgid "Account expired."
 msgstr "A conta expirou"
 
-#: src/net/ea/loginhandler.cpp:158
+#: src/net/tmwa/loginhandler.cpp:165
 #, fuzzy
 msgid "Rejected from server."
 msgstr "Rejeitado pelo servidor"
 
-#: src/net/ea/loginhandler.cpp:161
+#: src/net/tmwa/loginhandler.cpp:168
 #, fuzzy
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
@@ -2890,7 +3287,7 @@ msgstr ""
 "Você foi permanentemente banido do jogo. Por favor entre em contacto com "
 "algum GM."
 
-#: src/net/ea/loginhandler.cpp:165
+#: src/net/tmwa/loginhandler.cpp:172
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -2899,186 +3296,126 @@ msgstr ""
 "Você banido temporariamente do jogo até %s.\n"
 "Por favor entre em contacto com algum GM através dos fóruns."
 
-#: src/net/ea/loginhandler.cpp:172
+#: src/net/tmwa/loginhandler.cpp:179
 #, fuzzy
 msgid "This user name is already taken."
 msgstr "Este nome de utilizador já está em uso"
 
-#: src/net/ea/network.cpp:145
+#: src/net/tmwa/network.cpp:145
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/ea/network.cpp:345
+#: src/net/tmwa/network.cpp:345
 #, fuzzy
 msgid "Unable to resolve host \""
 msgstr "Impossibilitado de vender."
 
-#: src/net/ea/network.cpp:414
+#: src/net/tmwa/network.cpp:414
 #, fuzzy
 msgid "Connection to server terminated. "
 msgstr "Conectando ao servidor de mapas..."
 
-#: src/net/ea/partyhandler.cpp:81
+#: src/net/tmwa/partyhandler.cpp:82
 msgid "Could not create party."
 msgstr "Não foi possível criar o grupo."
 
-#: src/net/ea/partyhandler.cpp:84
+#: src/net/tmwa/partyhandler.cpp:84
 msgid "Party successfully created."
 msgstr "Grupo criado."
 
-#: src/net/ea/partyhandler.cpp:118
+#: src/net/tmwa/partyhandler.cpp:119
 #, c-format
 msgid "%s is already a member of a party."
 msgstr "%s já é membro de um grupo."
 
-#: src/net/ea/partyhandler.cpp:122
+#: src/net/tmwa/partyhandler.cpp:123
 #, c-format
 msgid "%s refused your invitation."
 msgstr "%s recusou seu convite."
 
-#: src/net/ea/partyhandler.cpp:126
+#: src/net/tmwa/partyhandler.cpp:127
 #, c-format
 msgid "%s is now a member of your party."
 msgstr "%s agora é um membro do seu grupo."
 
-#: src/net/ea/partyhandler.cpp:130
+#: src/net/tmwa/partyhandler.cpp:131
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr "Resposta de convite desconhecida para %s."
 
-#: src/net/ea/partyhandler.cpp:238
+#: src/net/tmwa/partyhandler.cpp:236
 msgid "You have left the party."
 msgstr "Você saiu do grupo."
 
-#: src/net/ea/partyhandler.cpp:249
+#: src/net/tmwa/partyhandler.cpp:246
 #, c-format
 msgid "%s has left your party."
 msgstr "%s saiu do seu grupo."
 
-#: src/net/ea/partyhandler.cpp:301
+#: src/net/tmwa/partyhandler.cpp:299
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr "Um membro desconhecido tentou dizer: %s"
 
-#: src/net/ea/partyhandler.cpp:329
-msgid "Inviting like this isn't supported at the moment."
-msgstr "No momento ainda não é possível convidar deste modo."
+#: src/net/tmwa/partyhandler.cpp:335
+#, c-format
+msgid "Inviting failed, because you can't see a player called %s."
+msgstr ""
 
-#: src/net/ea/partyhandler.cpp:334
+#: src/net/tmwa/partyhandler.cpp:340
 msgid "You can only inivte when you are in a party!"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:365
+#: src/net/tmwa/partyhandler.cpp:368
 #, c-format
 msgid "%s is not in your party!"
 msgstr "%s não está em seu grupo!"
 
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:304
-msgid "You are dead."
-msgstr "Você está morto."
-
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:305
-msgid "We regret to inform you that your character was killed in battle."
-msgstr "Lamentamos informar que seu personagem foi morto em combate."
-
-#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:307
-msgid "You are not that alive anymore."
-msgstr "Você não está mais vivo."
-
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:308
-msgid "The cold hands of the grim reaper are grabbing for your soul."
-msgstr "As mãos frias da morte estão levando sua alma."
-
-#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:309
-msgid "Game Over!"
-msgstr "Fim de jogo!"
-
-#: src/net/ea/playerhandler.cpp:105
+#: src/net/tmwa/playerhandler.cpp:100
 msgid "Insert coin to continue."
 msgstr "Insira uma moeda para continuar."
 
-#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:310
-msgid ""
-"No, kids. Your character did not really die. It... err... went to a better "
-"place."
-msgstr ""
-"Não, crianças. Seu personagem não morreu de verdade. Ele... err... foi para "
-"um lugar melhor."
-
-#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:312
-msgid ""
-"Your plan of breaking your enemies weapon by bashing it with your throat "
-"failed."
-msgstr ""
-"Seu plano de quebrar as armas de seus inimigos com o seu pescoço não deu "
-"certo."
-
-#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:314
-msgid "I guess this did not run too well."
-msgstr "Eu acho que isso não correu lá muito bem."
-
-#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:315
-msgid "Do you want your possessions identified?"
-msgstr "Você quer uma identificação de suas posses?"
-
-#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:316
-msgid "Sadly, no trace of you was ever found..."
-msgstr "Infelizmente, seus vestigios nunca foram encontrados..."
-
-#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:317
-msgid "Annihilated."
-msgstr "Aniquilado."
-
-#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:318
-msgid "Looks like you got your head handed to you."
-msgstr "Parece que te ofereceram sua própria cabeça."
-
-#: src/net/ea/playerhandler.cpp:120 src/net/manaserv/beinghandler.cpp:319
-msgid ""
-"You screwed up again, dump your body down the tubes and get you another one."
-msgstr "Você estragou tudo de novo, jogue fora seu corpo e arranje outro."
-
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/tmwa/playerhandler.cpp:118
 msgid "You're not dead yet. You're just resting."
 msgstr "Você não morreu ainda. Está apenas descansando."
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/tmwa/playerhandler.cpp:119
 msgid "You are no more."
 msgstr "Você não é mais."
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/tmwa/playerhandler.cpp:120
 msgid "You have ceased to be."
 msgstr "Você deixou de ser."
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/tmwa/playerhandler.cpp:121
 msgid "You've expired and gone to meet your maker."
 msgstr "Você expirou e foi encontrar o seu criador."
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/tmwa/playerhandler.cpp:122
 msgid "You're a stiff."
 msgstr "Você é um cadáver."
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/tmwa/playerhandler.cpp:123
 msgid "Bereft of life, you rest in peace."
 msgstr "Sem vida, descanse em paz."
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/tmwa/playerhandler.cpp:124
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr "Se não fosse tão animado, estaria comendo grama pela raiz."
 
-#: src/net/ea/playerhandler.cpp:130
+#: src/net/tmwa/playerhandler.cpp:125
 msgid "Your metabolic processes are now history."
 msgstr "Seus processos metabólicos são história agora."
 
-#: src/net/ea/playerhandler.cpp:131
+#: src/net/tmwa/playerhandler.cpp:126
 msgid "You're off the twig."
 msgstr "Você bateu as botas."
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/tmwa/playerhandler.cpp:127
 msgid "You've kicked the bucket."
 msgstr "Você chutou o balde."
 
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/tmwa/playerhandler.cpp:128
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
@@ -3086,483 +3423,245 @@ msgstr ""
 "Você dispensou seu corpo mortal, abaixou as cortinas e juntou-se ao maldito "
 "coro invisível."
 
-#: src/net/ea/playerhandler.cpp:135
+#: src/net/tmwa/playerhandler.cpp:130
 msgid "You are an ex-player."
 msgstr "Você é um ex-jogador"
 
-#: src/net/ea/playerhandler.cpp:136
+#: src/net/tmwa/playerhandler.cpp:131
 msgid "You're pining for the fjords."
 msgstr "Você foi desta para melhor."
 
-#: src/net/ea/playerhandler.cpp:249 src/net/ea/playerhandler.cpp:310
+#: src/net/tmwa/playerhandler.cpp:246 src/net/tmwa/playerhandler.cpp:285
 msgid "Message"
 msgstr "Mensagem"
 
-#: src/net/ea/playerhandler.cpp:250
+#: src/net/tmwa/playerhandler.cpp:247
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 "Você está carregando mais que a metade de seu peso. Você não poderá mais "
 "recuperar HP."
 
-#: src/net/ea/playerhandler.cpp:333
+#: src/net/tmwa/playerhandler.cpp:313
 #, fuzzy, c-format
 msgid "You picked up %s."
 msgstr "Você pegou "
 
-#: src/net/ea/playerhandler.cpp:369
+#: src/net/tmwa/playerhandler.cpp:348
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:532
+#: src/net/tmwa/playerhandler.cpp:488
 msgid "Equip arrows first."
 msgstr "Equipe as flechas primeiro."
 
-#: src/net/ea/specialhandler.cpp:147
+#: src/net/tmwa/specialhandler.cpp:144
 msgid "Trade failed!"
 msgstr "Falha na negociação!"
 
-#: src/net/ea/specialhandler.cpp:150
+#: src/net/tmwa/specialhandler.cpp:147
 msgid "Emote failed!"
 msgstr "Falha no Emote!"
 
-#: src/net/ea/specialhandler.cpp:153
+#: src/net/tmwa/specialhandler.cpp:150
 msgid "Sit failed!"
 msgstr "Falha ao sentar!"
 
-#: src/net/ea/specialhandler.cpp:156
+#: src/net/tmwa/specialhandler.cpp:153
 msgid "Chat creating failed!"
 msgstr "Falha ao criar Chat!"
 
-#: src/net/ea/specialhandler.cpp:159
+#: src/net/tmwa/specialhandler.cpp:156
 msgid "Could not join party!"
 msgstr "Impossível entrar no grupo!"
 
-#: src/net/ea/specialhandler.cpp:162
+#: src/net/tmwa/specialhandler.cpp:159
 msgid "Cannot shout!"
 msgstr "Impossível gritar!"
 
-#: src/net/ea/specialhandler.cpp:171
+#: src/net/tmwa/specialhandler.cpp:168
 msgid "You have not yet reached a high enough lvl!"
 msgstr "Você ainda não tem nível necessário!"
 
-#: src/net/ea/specialhandler.cpp:174
+#: src/net/tmwa/specialhandler.cpp:171
 msgid "Insufficient HP!"
 msgstr "HP insuficiente!"
 
-#: src/net/ea/specialhandler.cpp:177
+#: src/net/tmwa/specialhandler.cpp:174
 msgid "Insufficient SP!"
 msgstr "SP insuficiente!"
 
-#: src/net/ea/specialhandler.cpp:180
+#: src/net/tmwa/specialhandler.cpp:177
 msgid "You have no memos!"
 msgstr "Você não tem nenhuma nota armazenada!"
 
-#: src/net/ea/specialhandler.cpp:183
+#: src/net/tmwa/specialhandler.cpp:180
 msgid "You cannot do that right now!"
 msgstr "Você não pode fazer isso agora!"
 
-#: src/net/ea/specialhandler.cpp:186
+#: src/net/tmwa/specialhandler.cpp:183
 msgid "Seems you need more money... ;-)"
 msgstr "Parece que você precisa de mais dinheiro... ;-)"
 
-#: src/net/ea/specialhandler.cpp:189
+#: src/net/tmwa/specialhandler.cpp:186
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Você não pode usar essa habilidade com esse tipo de arma!"
 
-#: src/net/ea/specialhandler.cpp:192
+#: src/net/tmwa/specialhandler.cpp:189
 msgid "You need another red gem!"
 msgstr "Você precisa de outra gema vermelha!"
 
-#: src/net/ea/specialhandler.cpp:195
+#: src/net/tmwa/specialhandler.cpp:192
 msgid "You need another blue gem!"
 msgstr "Você precisa de outra gema azul!"
 
-#: src/net/ea/specialhandler.cpp:198
+#: src/net/tmwa/specialhandler.cpp:195
 msgid "You're carrying to much to do this!"
 msgstr "Você está com muita carga para fazer isso!"
 
-#: src/net/ea/specialhandler.cpp:201
+#: src/net/tmwa/specialhandler.cpp:198
 msgid "Huh? What's that?"
 msgstr "Hã? O que é isso?"
 
-#: src/net/ea/specialhandler.cpp:210
+#: src/net/tmwa/specialhandler.cpp:207
 msgid "Warp failed..."
 msgstr "Falha ao transportar..."
 
-#: src/net/ea/specialhandler.cpp:213
+#: src/net/tmwa/specialhandler.cpp:210
 msgid "Could not steal anything..."
 msgstr "Não foi possível roubar nada..."
 
-#: src/net/ea/specialhandler.cpp:216
+#: src/net/tmwa/specialhandler.cpp:213
 msgid "Poison had no effect..."
 msgstr "Veneno não surtiu efeito..."
 
-#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:116
-msgid "Request for Trade"
-msgstr "Proposta de negociação"
-
-#: src/net/ea/tradehandler.cpp:108 src/net/manaserv/tradehandler.cpp:117
-#, c-format
-msgid "%s wants to trade with you, do you accept?"
-msgstr "%s quer negociar com você, você aceita?"
-
-#: src/net/ea/tradehandler.cpp:124
+#: src/net/tmwa/tradehandler.cpp:126
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr "Negociação impossível. O parceiro de negócios está muito longe."
 
-#: src/net/ea/tradehandler.cpp:128
+#: src/net/tmwa/tradehandler.cpp:130
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr "Negociação impossível. O personagem não existe."
 
-#: src/net/ea/tradehandler.cpp:132
+#: src/net/tmwa/tradehandler.cpp:134
 msgid "Trade cancelled due to an unknown reason."
 msgstr "Negociação cancelada devido a uma razão desconhecida."
 
-#: src/net/ea/tradehandler.cpp:137
+#: src/net/tmwa/tradehandler.cpp:139
 #, c-format
 msgid "Trade: You and %s"
 msgstr "Negociação: Você e %s"
 
-#: src/net/ea/tradehandler.cpp:144
+#: src/net/tmwa/tradehandler.cpp:146
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr "Negociação com %s cancelada."
 
-#: src/net/ea/tradehandler.cpp:153
+#: src/net/tmwa/tradehandler.cpp:154
 msgid "Unhandled trade cancel packet."
 msgstr "Troca injusta pacote cancelado."
 
-#: src/net/ea/tradehandler.cpp:202
+#: src/net/tmwa/tradehandler.cpp:202
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr "Erro ao adicionar item. Parceiro de negócios carregando muito peso."
 
-#: src/net/ea/tradehandler.cpp:207
+#: src/net/tmwa/tradehandler.cpp:207
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr "Erro ao adicionar item. Parceiro de negócios não tem slots livres."
 
-#: src/net/ea/tradehandler.cpp:211
+#: src/net/tmwa/tradehandler.cpp:211
 msgid "Failed adding item for unknown reason."
 msgstr "Erro ao adicionar item devido a um motivo desconhecido."
 
-#: src/net/ea/tradehandler.cpp:224 src/net/manaserv/tradehandler.cpp:149
-msgid "Trade canceled."
-msgstr "Negociação cancelada."
-
-#: src/net/ea/tradehandler.cpp:231 src/net/manaserv/tradehandler.cpp:156
-msgid "Trade completed."
-msgstr "Negociação realizada."
-
-#: src/net/manaserv/beinghandler.cpp:324
-#, fuzzy
-msgid "Press OK to respawn."
-msgstr " Clique em OK para re-popular."
-
-#: src/net/manaserv/beinghandler.cpp:325
+#: src/playerrelations.cpp:310
 #, fuzzy
-msgid "You Died"
-msgstr "Você morreu"
-
-#: src/net/manaserv/charhandler.cpp:128 src/net/manaserv/charhandler.cpp:196
-#, fuzzy
-msgid "Not logged in."
-msgstr "Já está conectado"
-
-#: src/net/manaserv/charhandler.cpp:131
-msgid "No empty slot."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:134
-msgid "Invalid name."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:137
-#, fuzzy
-msgid "Character's name already exists."
-msgstr "Nome de utilizador já existe"
-
-#: src/net/manaserv/charhandler.cpp:140
-msgid "Invalid hairstyle."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:143
-msgid "Invalid hair color."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:146
-msgid "Invalid gender."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:149
-#, fuzzy
-msgid "Character's stats are too high."
-msgstr "Estatisticas da personagem OK"
-
-#: src/net/manaserv/charhandler.cpp:152
-#, fuzzy
-msgid "Character's stats are too low."
-msgstr "Estatisticas da personagem OK"
+msgid "Completely ignore"
+msgstr "@@ignore|Ignorar completamente %s@@"
 
-#: src/net/manaserv/charhandler.cpp:155
-msgid "One stat is zero."
+#: src/playerrelations.cpp:324
+msgid "Print '...'"
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:187
-#, fuzzy
-msgid "Player deleted."
-msgstr "Personagem apagado."
-
-#: src/net/manaserv/charhandler.cpp:199
-#, fuzzy
-msgid "Selection out of range."
-msgstr "Seleccionar a quantidade de itens a negociar."
-
-#: src/net/manaserv/charhandler.cpp:202
-#, fuzzy, c-format
-msgid "Unknown error (%d)."
-msgstr "Erro desconhecido"
-
-#: src/net/manaserv/charhandler.cpp:242
-msgid "No gameservers are available."
-msgstr "Não há gameservers disponíveis."
-
-#: src/net/manaserv/charhandler.cpp:268
-msgid "Willpower:"
-msgstr "Força de Vontade:"
-
-#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
-#: src/net/manaserv/guildhandler.cpp:259
-#, c-format
-msgid "Topic: %s"
-msgstr "Tópico: %s"
-
-#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
-#, fuzzy
-msgid "Players in this channel:"
-msgstr "Jogador acerta monstro"
-
-#: src/net/manaserv/chathandler.cpp:201
-#, fuzzy
-msgid "Error joining channel."
-msgstr "Comando: /join <canal>"
-
-#: src/net/manaserv/chathandler.cpp:207
-#, fuzzy
-msgid "Listing channels."
-msgstr "Solicitando entrada no canal %s."
-
-#: src/net/manaserv/chathandler.cpp:219
-msgid "End of channel list."
+#: src/playerrelations.cpp:340
+msgid "Blink name"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:291
-#, fuzzy, c-format
-msgid "%s entered the channel."
-msgstr "%s entrou para o grupo."
-
-#: src/net/manaserv/chathandler.cpp:296
+#: src/resources/itemdb.cpp:44
 #, c-format
-msgid "%s left the channel."
-msgstr ""
+msgid "Attack %+d"
+msgstr "Ataque %+d"
 
-#: src/net/manaserv/chathandler.cpp:312
+#: src/resources/itemdb.cpp:45
 #, c-format
-msgid "%s has set mode %s on user %s."
-msgstr ""
+msgid "Defense %+d"
+msgstr "Defesa %+d"
 
-#: src/net/manaserv/chathandler.cpp:322
+#: src/resources/itemdb.cpp:46
 #, c-format
-msgid "%s has kicked %s."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:327
-#, fuzzy
-msgid "Unknown channel event."
-msgstr "Comando desconhecido"
+msgid "HP %+d"
+msgstr "HP %+d"
 
-#: src/net/manaserv/generalhandler.cpp:100
+#: src/resources/itemdb.cpp:47
 #, c-format
-msgid "Willpower %+d"
-msgstr "Força de vontade %+d"
-
-#: src/net/manaserv/generalhandler.cpp:171
-#, fuzzy
-msgid "Willpower"
-msgstr "Força de Vontade:"
-
-#: src/net/manaserv/guildhandler.cpp:81
-msgid "Guild created."
-msgstr "Guilda criada."
-
-#: src/net/manaserv/guildhandler.cpp:86
-msgid "Error creating guild."
-msgstr "Erro ao criar guilda."
-
-#: src/net/manaserv/guildhandler.cpp:96
-msgid "Invite sent."
-msgstr "Convite enviado."
-
-#: src/net/manaserv/guildhandler.cpp:203
-msgid "Member was promoted successfully."
-msgstr "Membro foi promovido com sucesso."
+msgid "MP %+d"
+msgstr "MP %+d"
 
-#: src/net/manaserv/guildhandler.cpp:208
-msgid "Failed to promote member."
-msgstr "Erro ao promover membro."
+#: src/resources/itemdb.cpp:92
+msgid "Unknown item"
+msgstr "Item desconhecido"
 
-#: src/net/manaserv/loginhandler.cpp:87
-#, fuzzy
-msgid "Wrong magic_token."
-msgstr "Simbolo-mágico errado."
+#: src/resources/itemdb.cpp:135 src/resources/monsterdb.cpp:77
+msgid "unnamed"
+msgstr "sem nome"
 
-#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
 #, fuzzy
-msgid "Already logged in."
-msgstr "Já está conectado"
+#~ msgid "HP"
+#~ msgstr "HP:"
 
-#: src/net/manaserv/loginhandler.cpp:93 src/net/manaserv/loginhandler.cpp:272
 #, fuzzy
-msgid "Server is full."
-msgstr "Servidor cheio"
+#~ msgid "MP"
+#~ msgstr "MP:"
 
-#: src/net/manaserv/loginhandler.cpp:118
 #, fuzzy
-msgid "New password incorrect."
-msgstr "Nova senha incorreta"
-
-#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
-msgid "Account not connected. Please login first."
-msgstr "Conta não conectada. Por favor, efectue o login primeiro."
+#~ msgid "Exp"
+#~ msgstr "Exp:"
 
-#: src/net/manaserv/loginhandler.cpp:149
 #, fuzzy
-msgid "New email address incorrect."
-msgstr "Novo endereço de email incorrecto"
+#~ msgid "Money"
+#~ msgstr "Dinheiro: %d"
 
-#: src/net/manaserv/loginhandler.cpp:152
 #, fuzzy
-msgid "Old email address incorrect."
-msgstr "Antigo endereço de email incorrecto"
+#~ msgid "Job"
+#~ msgstr "Trabalho:"
 
-#: src/net/manaserv/loginhandler.cpp:158
 #, fuzzy
-msgid "The new email address already exists."
-msgstr "O novo endereço de email já existe."
+#~ msgid "Level"
+#~ msgstr "Nível: %d"
 
-#: src/net/manaserv/loginhandler.cpp:239
-msgid ""
-"Client registration is not allowed. Please contact server administration."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
 #, fuzzy
-msgid "Client version is too old."
-msgstr "Versão do cliente é muito antiga"
+#~ msgid "Access denied."
+#~ msgstr "Acesso negado"
 
-#: src/net/manaserv/loginhandler.cpp:266
 #, fuzzy
-msgid "Wrong username or password."
-msgstr "Nome de utilizador ou senha inválida"
+#~ msgid "Unknown failure to select character."
+#~ msgstr "Erro desconhecido ao seleccionar personagem"
 
-#: src/net/manaserv/loginhandler.cpp:275
-msgid "Login attempt too soon after previous attempt."
-msgstr ""
+#~ msgid "Inviting like this isn't supported at the moment."
+#~ msgstr "No momento ainda não é possível convidar deste modo."
 
-#: src/net/manaserv/loginhandler.cpp:303
-#, fuzzy
-msgid "Wrong username, password or email address."
-msgstr "Nome de utilizador, senha ou email inválido"
+#~ msgid "Willpower:"
+#~ msgstr "Força de Vontade:"
 
-#: src/net/manaserv/loginhandler.cpp:306
-#, fuzzy
-msgid "Username already exists."
-msgstr "Nome de utilizador já existe"
+#~ msgid "Willpower %+d"
+#~ msgstr "Força de vontade %+d"
 
-#: src/net/manaserv/loginhandler.cpp:309
 #, fuzzy
-msgid "Email address already exists."
-msgstr "Endereço de email já existe"
-
-#: src/net/manaserv/loginhandler.cpp:312
-msgid "You took too long with the captcha or your response was incorrect."
-msgstr ""
-
-#: src/net/manaserv/partyhandler.cpp:88
-msgid "Joined party."
-msgstr "Entrou para o grupo."
-
-#: src/net/manaserv/partyhandler.cpp:106
-#, c-format
-msgid "%s joined the party."
-msgstr "%s entrou para o grupo."
-
-#: src/net/manaserv/partyhandler.cpp:123
-#, fuzzy, c-format
-msgid "%s rejected your invite."
-msgstr "%s recusou seu convite."
-
-#: src/net/manaserv/tradehandler.cpp:96
-msgid "Accepting incoming trade requests."
-msgstr "Aceitando propostas de negócios."
+#~ msgid "Willpower"
+#~ msgstr "Força de Vontade:"
 
-#: src/net/manaserv/tradehandler.cpp:98
-msgid "Ignoring incoming trade requests."
-msgstr "Ignorando propostas de negócios."
-
-#: src/net/manaserv/tradehandler.cpp:135
-#, c-format
-msgid "Trading with %s"
-msgstr "Negociando com %s"
-
-#: src/playerrelations.cpp:304
 #, fuzzy
-msgid "Completely ignore"
-msgstr "@@ignore|Ignorar completamente %s@@"
-
-#: src/playerrelations.cpp:318
-msgid "Print '...'"
-msgstr ""
-
-#: src/playerrelations.cpp:334
-msgid "Blink name"
-msgstr ""
-
-#: src/playerrelations.cpp:371
-msgid "Floating '...' bubble"
-msgstr ""
-
-#: src/playerrelations.cpp:374
-msgid "Floating bubble"
-msgstr ""
-
-#: src/resources/itemdb.cpp:52
-#, c-format
-msgid "Attack %+d"
-msgstr "Ataque %+d"
-
-#: src/resources/itemdb.cpp:53
-#, c-format
-msgid "Defense %+d"
-msgstr "Defesa %+d"
-
-#: src/resources/itemdb.cpp:54
-#, c-format
-msgid "HP %+d"
-msgstr "HP %+d"
-
-#: src/resources/itemdb.cpp:55
-#, c-format
-msgid "MP %+d"
-msgstr "MP %+d"
-
-#: src/resources/itemdb.cpp:114
-msgid "Unknown item"
-msgstr "Item desconhecido"
-
-#: src/resources/itemdb.cpp:158 src/resources/monsterdb.cpp:45
-#: src/resources/monsterdb.cpp:69
-msgid "unnamed"
-msgstr "sem nome"
+#~ msgid "Server is full."
+#~ msgstr "Servidor cheio"
 
 #~ msgid "Text Shadow"
 #~ msgstr "Sombra do Texto"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 39d9cb5f..1480dce7 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2010-03-16 22:27+0100\n"
+"POT-Creation-Date: 2010-12-13 20:04+0100\n"
 "PO-Revision-Date: 2010-02-17 04:42+0000\n"
 "Last-Translator: alms21 <alms21@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
+"Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,316 +19,322 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/client.cpp:555 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
+#: src/client.cpp:598 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
 msgid "Setup"
 msgstr "Configurar"
 
-#: src/client.cpp:625
+#: src/client.cpp:679
 #, fuzzy
 msgid "Connecting to server"
 msgstr "Conectando ao servidor de mapas..."
 
-#: src/client.cpp:652
+#: src/client.cpp:706
 #, fuzzy
 msgid "Logging in"
 msgstr "Login"
 
-#: src/client.cpp:685
+#: src/client.cpp:739
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:741
+#: src/client.cpp:804
 #, fuzzy
 msgid "Requesting characters"
 msgstr "Selecionar personagem"
 
-#: src/client.cpp:770
+#: src/client.cpp:833
 #, fuzzy
 msgid "Connecting to the game server"
 msgstr "Conectando ao servidor de mapas..."
 
-#: src/client.cpp:801 src/client.cpp:808 src/client.cpp:942
+#: src/client.cpp:843
+#, fuzzy
+msgid "Changing game servers"
+msgstr "Servidor"
+
+#: src/client.cpp:872 src/client.cpp:879 src/client.cpp:1014
 #: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
 #: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
-#: src/gui/serverdialog.cpp:241 src/gui/unregisterdialog.cpp:133
-#: src/net/ea/charserverhandler.cpp:135 src/net/ea/charserverhandler.cpp:152
-#: src/net/manaserv/charhandler.cpp:161 src/net/manaserv/charhandler.cpp:204
+#: src/gui/serverdialog.cpp:323 src/gui/unregisterdialog.cpp:133
+#: src/net/manaserv/charhandler.cpp:174 src/net/manaserv/charhandler.cpp:217
+#: src/net/tmwa/charserverhandler.cpp:134
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Error"
 msgstr "Erro"
 
-#: src/client.cpp:817
+#: src/client.cpp:888
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:844
+#: src/client.cpp:915
 #, fuzzy
 msgid "Password Change"
 msgstr "Senha:"
 
-#: src/client.cpp:845
+#: src/client.cpp:916
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:864
+#: src/client.cpp:935
 #, fuzzy
 msgid "Email Change"
 msgstr "Mudar"
 
-#: src/client.cpp:865
+#: src/client.cpp:936
 #, fuzzy
 msgid "Email changed successfully!"
 msgstr "Membro foi promovido com sucesso."
 
-#: src/client.cpp:885
+#: src/client.cpp:956
 #, fuzzy
 msgid "Unregister Successful"
 msgstr "Cancelar Registro"
 
-#: src/client.cpp:886
+#: src/client.cpp:957
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1009 src/client.cpp:1032
+#: src/client.cpp:1138 src/client.cpp:1161
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1121
+#: src/client.cpp:1281
 #, fuzzy, c-format
 msgid "Invalid update host: %s"
 msgstr "Host de atualização inválido: "
 
-#: src/client.cpp:1155 src/client.cpp:1161
+#: src/client.cpp:1315 src/client.cpp:1321
 msgid "Error creating updates directory!"
 msgstr "Erro ao criar pasta de atualizações!"
 
-#: src/commandhandler.cpp:127 src/commandhandler.cpp:308
+#: src/commandhandler.cpp:131 src/commandhandler.cpp:317
 msgid "Unknown command."
 msgstr "Comando desconhecido."
 
-#: src/commandhandler.cpp:156
+#: src/commandhandler.cpp:160
 msgid "-- Help --"
 msgstr "--Ajuda--"
 
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:161
 msgid "/help > Display this help"
 msgstr "/help > Exibe ajuda"
 
-#: src/commandhandler.cpp:159
+#: src/commandhandler.cpp:163
 msgid "/where > Display map name"
 msgstr "/where > Exibe o nome do mapa"
 
-#: src/commandhandler.cpp:160
+#: src/commandhandler.cpp:164
 msgid "/who > Display number of online users"
 msgstr "/who > Exibe o número de usuários online"
 
-#: src/commandhandler.cpp:161
+#: src/commandhandler.cpp:165
 msgid "/me > Tell something about yourself"
 msgstr "/me > Diz alguma coisa sobre você"
 
-#: src/commandhandler.cpp:163
+#: src/commandhandler.cpp:167
 msgid "/clear > Clears this window"
 msgstr "/clear > Limpa janela atual"
 
-#: src/commandhandler.cpp:165
+#: src/commandhandler.cpp:169
 msgid "/msg > Send a private message to a user"
 msgstr "/msg > Envia uma messagem privada a um usuário"
 
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:170
 msgid "/whisper > Alias of msg"
 msgstr "/whisper > Messagem Confidêncial"
 
-#: src/commandhandler.cpp:167
+#: src/commandhandler.cpp:171
 msgid "/w > Alias of msg"
 msgstr "/w > Abreviação de messagem"
 
-#: src/commandhandler.cpp:168
+#: src/commandhandler.cpp:172
 msgid "/query > Makes a tab for private messages with another user"
 msgstr "/query > Fazer um chat com outros usuários"
 
-#: src/commandhandler.cpp:169
+#: src/commandhandler.cpp:174
 msgid "/q > Alias of query"
 msgstr "/q > Abreviação de query"
 
-#: src/commandhandler.cpp:171
+#: src/commandhandler.cpp:176
 msgid "/ignore > ignore a player"
 msgstr ""
 
-#: src/commandhandler.cpp:172
+#: src/commandhandler.cpp:177
 msgid "/unignore > stop ignoring a player"
 msgstr ""
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:179
 msgid "/list > Display all public channels"
 msgstr "/list > Exibir todos os canais públicos"
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:180
 msgid "/join > Join or create a channel"
 msgstr "/join > Criar ou entrar em um canal"
 
-#: src/commandhandler.cpp:177
+#: src/commandhandler.cpp:182
 #, fuzzy
 msgid "/createparty > Create a new party"
 msgstr "/create > Cria um novo grupo"
 
-#: src/commandhandler.cpp:178
+#: src/commandhandler.cpp:183
 msgid "/party > Invite a user to party"
 msgstr "/party > Convidar um usuário para o grupo"
 
-#: src/commandhandler.cpp:180
+#: src/commandhandler.cpp:185
 msgid "/record > Start recording the chat to an external file"
 msgstr "/record > Começar a gravar o chat em um arquivo externo"
 
-#: src/commandhandler.cpp:181
+#: src/commandhandler.cpp:187
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr "/toggle > Determina se <enter> alterna para o log de chat"
 
-#: src/commandhandler.cpp:182
+#: src/commandhandler.cpp:189
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
 "/present > Pegar a lista de jogadores presentes (Enviou log de chat. Se "
 "logando)"
 
-#: src/commandhandler.cpp:184
+#: src/commandhandler.cpp:192
 msgid "/announce > Global announcement (GM only)"
 msgstr "/announce > Anuciamento Global (Somente GM)"
 
-#: src/commandhandler.cpp:188
+#: src/commandhandler.cpp:196
 msgid "For more information, type /help <command>."
 msgstr "Para mais informações, digite /help <comando>."
 
-#: src/commandhandler.cpp:192
+#: src/commandhandler.cpp:200
 msgid "Command: /help"
 msgstr "Comando: /help"
 
-#: src/commandhandler.cpp:193
+#: src/commandhandler.cpp:201
 msgid "This command displays a list of all commands available."
 msgstr "Exibe uma lista de todos os comandos disponíveis."
 
-#: src/commandhandler.cpp:194
+#: src/commandhandler.cpp:203
 msgid "Command: /help <command>"
 msgstr "Comando: /help <comando>"
 
-#: src/commandhandler.cpp:195
+#: src/commandhandler.cpp:204
 msgid "This command displays help on <command>."
 msgstr "Exibe o conteúdo de ajuda de <command>"
 
-#: src/commandhandler.cpp:203
+#: src/commandhandler.cpp:212
 msgid "Command: /announce <msg>"
 msgstr "Comando: /announce <msg>"
 
-#: src/commandhandler.cpp:204
+#: src/commandhandler.cpp:213
 msgid "*** only available to a GM ***"
 msgstr "*** Disponivel apenas para GM's ***"
 
-#: src/commandhandler.cpp:205
+#: src/commandhandler.cpp:214
 msgid "This command sends the message <msg> to all players currently online."
 msgstr "Este comando envia a mensagem <msg> para todos os jogadores online."
 
-#: src/commandhandler.cpp:210
+#: src/commandhandler.cpp:219
 msgid "Command: /clear"
 msgstr "Comando: /clear"
 
-#: src/commandhandler.cpp:211
+#: src/commandhandler.cpp:220
 msgid "This command clears the chat log of previous chat."
 msgstr "Limpa os logs do chat anterior."
 
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:224
 #, fuzzy
 msgid "Command: /ignore <player>"
 msgstr "Comando> /item <opção>"
 
-#: src/commandhandler.cpp:216
+#: src/commandhandler.cpp:225
 #, fuzzy
 msgid "This command ignores the given player regardless of current relations."
 msgstr "Exibe o número total de jogadores online."
 
-#: src/commandhandler.cpp:221
+#: src/commandhandler.cpp:230
 msgid "Command: /join <channel>"
 msgstr "Comando: /join <canal>"
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:231
 msgid "This command makes you enter <channel>."
 msgstr "Este comando faz você entrar em <canal>."
 
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:232
 msgid "If <channel> doesn't exist, it's created."
 msgstr "Se o <canal> não existe, ele será criado."
 
-#: src/commandhandler.cpp:227
+#: src/commandhandler.cpp:236
 msgid "Command: /list"
 msgstr "Comando: /list"
 
-#: src/commandhandler.cpp:228
+#: src/commandhandler.cpp:237
 msgid "This command shows a list of all channels."
 msgstr "Este comando exibe uma lista com todos os canais."
 
-#: src/commandhandler.cpp:232
+#: src/commandhandler.cpp:241
 msgid "Command: /me <message>"
 msgstr "Comando: /me <mensagem>"
 
-#: src/commandhandler.cpp:233
+#: src/commandhandler.cpp:242
 msgid "This command tell others you are (doing) <msg>."
 msgstr "Este comando diz aos outros o que eu estou (fazendo) <msg>."
 
-#: src/commandhandler.cpp:237
+#: src/commandhandler.cpp:246
 msgid "Command: /msg <nick> <message>"
 msgstr "Comando: /msg <nick> <mensagem>"
 
-#: src/commandhandler.cpp:238
+#: src/commandhandler.cpp:247
 msgid "Command: /whisper <nick> <message>"
 msgstr "Comando: /whisper <nick> <mensagem>"
 
-#: src/commandhandler.cpp:239
+#: src/commandhandler.cpp:248
 msgid "Command: /w <nick> <message>"
 msgstr "Comando: /w <nick> <mensagem>"
 
-#: src/commandhandler.cpp:240
+#: src/commandhandler.cpp:249
 msgid "This command sends the text <message> to <nick>."
 msgstr "Este comando envia o texto <mensagem> para <nick>."
 
-#: src/commandhandler.cpp:241 src/commandhandler.cpp:260
+#: src/commandhandler.cpp:250 src/commandhandler.cpp:269
 #: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
-#: src/net/ea/gui/guildtab.cpp:75 src/net/ea/gui/partytab.cpp:75
+#: src/net/tmwa/gui/guildtab.cpp:75 src/net/tmwa/gui/partytab.cpp:75
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr "Se <nick> possuir espaços, coloque dentro de parenteses (\")."
 
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:255
 msgid "Command: /query <nick>"
 msgstr "Comando: /query <nick>"
 
-#: src/commandhandler.cpp:247
+#: src/commandhandler.cpp:256
 msgid "Command: /q <nick>"
 msgstr "Comando: /q <nick>"
 
-#: src/commandhandler.cpp:248
+#: src/commandhandler.cpp:257
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
 "Este comando cria uma aba para mensagens confidenciais entre você e <nick>."
 
-#: src/commandhandler.cpp:253
+#: src/commandhandler.cpp:262
 #, fuzzy
 msgid "Command: /createparty <name>"
 msgstr "Comando: /create <nome-do-grupo>"
 
-#: src/commandhandler.cpp:254
+#: src/commandhandler.cpp:263
 #, fuzzy
 msgid "This command creates a new party called <name>."
 msgstr "Estes comandos criam um novo grupo chamado <nome-do-grupo>."
 
-#: src/commandhandler.cpp:258
+#: src/commandhandler.cpp:267
 msgid "Command: /party <nick>"
 msgstr "Comando: /party <nick>"
 
-#: src/commandhandler.cpp:259 src/net/ea/gui/partytab.cpp:74
+#: src/commandhandler.cpp:268 src/net/tmwa/gui/partytab.cpp:74
 msgid "This command invites <nick> to party with you."
 msgstr "Convida <nick> para um grupo com você."
 
-#: src/commandhandler.cpp:265
+#: src/commandhandler.cpp:274
 msgid "Command: /present"
 msgstr "Comando: /present"
 
-#: src/commandhandler.cpp:266
+#: src/commandhandler.cpp:275
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
@@ -336,29 +343,29 @@ msgstr ""
 "de registro do chat ou, caso haja uma gravação em andamento, para o log de "
 "gravação."
 
-#: src/commandhandler.cpp:272
+#: src/commandhandler.cpp:281
 msgid "Command: /record <filename>"
 msgstr "Comando: /record <nome_do_arquivo>"
 
-#: src/commandhandler.cpp:273
+#: src/commandhandler.cpp:282
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr ""
 "Este comando inicia a gravação do registro de bate-papo para o arquivo "
 "<nome_do_arquivo>."
 
-#: src/commandhandler.cpp:275
+#: src/commandhandler.cpp:284
 msgid "Command: /record"
 msgstr "Comando: /record"
 
-#: src/commandhandler.cpp:276
+#: src/commandhandler.cpp:285
 msgid "This command finishes a recording session."
 msgstr "Este comando finaliza a sessão de gravação."
 
-#: src/commandhandler.cpp:280
+#: src/commandhandler.cpp:289
 msgid "Command: /toggle <state>"
 msgstr "Comando: /toggle <estado>"
 
-#: src/commandhandler.cpp:281
+#: src/commandhandler.cpp:290
 msgid ""
 "This command sets whether the return key should toggle the chat log, or "
 "whether the chat log turns off automatically."
@@ -366,56 +373,56 @@ msgstr ""
 "Este comando define se a tecla enter deve alternar para o log do chat ou se "
 "o log do chat fica oculto automaticamente."
 
-#: src/commandhandler.cpp:283
+#: src/commandhandler.cpp:292
 msgid ""
-"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
-"\", \"no\", \"false\" to turn the toggle off."
+"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
+"\"0\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 "<estado> pode ser \"1\", \"yes\" e \"true\" para ativar ou \"0\", \"no\" e "
 "\"false\" para desativar."
 
-#: src/commandhandler.cpp:286
+#: src/commandhandler.cpp:295
 msgid "Command: /toggle"
 msgstr "Comando: /toggle"
 
-#: src/commandhandler.cpp:287
+#: src/commandhandler.cpp:296
 msgid "This command displays the return toggle status."
 msgstr "Este comando mostra o status do botão alternar."
 
-#: src/commandhandler.cpp:291 src/gui/widgets/whispertab.cpp:93
+#: src/commandhandler.cpp:300 src/gui/widgets/whispertab.cpp:95
 #, fuzzy
 msgid "Command: /unignore <player>"
 msgstr "Comando> /item <opção>"
 
-#: src/commandhandler.cpp:292
+#: src/commandhandler.cpp:301
 msgid "This command stops ignoring the given player if they are being ignored"
 msgstr ""
 
-#: src/commandhandler.cpp:297
+#: src/commandhandler.cpp:306
 msgid "Command: /where"
 msgstr "Comando: /where"
 
-#: src/commandhandler.cpp:298
+#: src/commandhandler.cpp:307
 msgid "This command displays the name of the current map."
 msgstr "Mostra o nome do mapa atual."
 
-#: src/commandhandler.cpp:302
+#: src/commandhandler.cpp:311
 msgid "Command: /who"
 msgstr "Comando: /who"
 
-#: src/commandhandler.cpp:303
+#: src/commandhandler.cpp:312
 msgid "This command displays the number of players currently online."
 msgstr "Exibe o número total de jogadores online."
 
-#: src/commandhandler.cpp:309
+#: src/commandhandler.cpp:318
 msgid "Type /help for a list of commands."
 msgstr "Digite /help para uma lista de todos os comandos."
 
-#: src/commandhandler.cpp:375
+#: src/commandhandler.cpp:384
 msgid "Cannot send empty whispers!"
 msgstr "Não é possível enviar mensagens particulares vazias!"
 
-#: src/commandhandler.cpp:383
+#: src/commandhandler.cpp:392
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -424,59 +431,67 @@ msgstr ""
 "Não é possível  criar uma aba de mensagem particular para o nick \"%s\"! Ou "
 "ela já existe ou é você mesmo."
 
-#: src/commandhandler.cpp:397
+#: src/commandhandler.cpp:406
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Solicitando entrada no canal %s."
 
-#: src/commandhandler.cpp:410 src/net/ea/gui/partytab.cpp:109
+#: src/commandhandler.cpp:419 src/net/tmwa/gui/partytab.cpp:109
 msgid "Party name is missing."
 msgstr "Falta o nome do grupo."
 
-#: src/commandhandler.cpp:423 src/commandhandler.cpp:471
-#: src/commandhandler.cpp:493
+#: src/commandhandler.cpp:432 src/commandhandler.cpp:509
+#: src/commandhandler.cpp:531
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:441
+#: src/commandhandler.cpp:450
 msgid "Return toggles chat."
 msgstr "Enter alterna para o chat."
 
-#: src/commandhandler.cpp:441
+#: src/commandhandler.cpp:450
 msgid "Message closes chat."
 msgstr "A mensagem fecha o chat."
 
-#: src/commandhandler.cpp:450
+#: src/commandhandler.cpp:459
 msgid "Return now toggles chat."
 msgstr "Agora enter alterna para o chat."
 
-#: src/commandhandler.cpp:454
+#: src/commandhandler.cpp:463
 msgid "Message now closes chat."
 msgstr "Agora a mensagem fecha o chat."
 
-#: src/commandhandler.cpp:477
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:489
+msgid "Show IP: On"
+msgstr ""
+
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:485
+msgid "Show IP: Off"
+msgstr ""
+
+#: src/commandhandler.cpp:515
 msgid "Player already ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:484
+#: src/commandhandler.cpp:522
 #, fuzzy
 msgid "Player successfully ignored!"
 msgstr "Grupo criado."
 
-#: src/commandhandler.cpp:486
+#: src/commandhandler.cpp:524
 #, fuzzy
 msgid "Player could not be ignored!"
 msgstr "Impossível enviar mensagem privada, você foi ignorado pelo usuário."
 
-#: src/commandhandler.cpp:501
+#: src/commandhandler.cpp:539
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:506
+#: src/commandhandler.cpp:544
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:508
+#: src/commandhandler.cpp:546
 #, fuzzy
 msgid "Player could not be unignored!"
 msgstr "Impossível enviar mensagem privada, você foi ignorado pelo usuário."
@@ -491,43 +506,43 @@ msgstr ""
 msgid "General"
 msgstr "Geral"
 
-#: src/game.cpp:326
+#: src/game.cpp:342
 #, fuzzy
 msgid "Screenshot saved as "
 msgstr "Screenshot salvo em ~/"
 
-#: src/game.cpp:331
+#: src/game.cpp:347
 msgid "Saving screenshot failed!"
 msgstr "Falha ao salvar screenshot!"
 
-#: src/game.cpp:355
+#: src/game.cpp:378
 #, fuzzy
 msgid "The connection to the server was lost."
 msgstr "A conexão com o servidor caiu, o jogo será fechado."
 
-#: src/game.cpp:360
+#: src/game.cpp:382
 msgid "Network Error"
 msgstr "Erro de conexão"
 
-#: src/game.cpp:705
+#: src/game.cpp:721
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorando propostas de negócios"
 
-#: src/game.cpp:712
+#: src/game.cpp:726
 msgid "Accepting incoming trade requests"
 msgstr "Aceitando propostas de negócios"
 
-#: src/game.cpp:946
+#: src/game.cpp:954
 #, fuzzy
 msgid "Could Not Load Map"
 msgstr "Impossível carregar mapa"
 
-#: src/game.cpp:947
+#: src/game.cpp:955
 #, c-format
 msgid "Error while loading %s"
 msgstr "Erro ao carregar %s"
 
-#: src/gui/beingpopup.cpp:75
+#: src/gui/beingpopup.cpp:76
 #, fuzzy, c-format
 msgid "Party: %s"
 msgstr "Grupo (%s)"
@@ -536,34 +551,34 @@ msgstr "Grupo (%s)"
 msgid "Buy"
 msgstr "Comprar"
 
-#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
-#: src/gui/sell.cpp:276
+#: src/gui/buy.cpp:69 src/gui/buy.cpp:261 src/gui/sell.cpp:71
+#: src/gui/sell.cpp:288
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Preço: %s / Total: %s"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:99 src/gui/npcdialog.cpp:100
-#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:404
+#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:112 src/gui/npcdialog.cpp:124
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:463
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:98 src/gui/npcdialog.cpp:101
-#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:416
+#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:111 src/gui/npcdialog.cpp:125
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:475
 msgid "-"
 msgstr ""
 
 #: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
-#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:152
-#: src/keyboardconfig.cpp:103
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:228
+#: src/keyboardconfig.cpp:102
 msgid "Quit"
 msgstr "Sair"
 
-#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:333
-#: src/gui/statuswindow.cpp:403 src/gui/statuswindow.cpp:437
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:384
+#: src/gui/statuswindow.cpp:462 src/gui/statuswindow.cpp:496
 msgid "Max"
 msgstr "Máximo"
 
@@ -577,11 +592,11 @@ msgstr "Vender"
 
 #: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
 #: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
-#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:101
-#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:178
-#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:402
+#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:114
+#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:389
 #: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
-#: src/gui/socialwindow.cpp:243 src/gui/textdialog.cpp:39
+#: src/gui/socialwindow.cpp:275 src/gui/textdialog.cpp:40
 #: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr "Cancelar"
@@ -620,7 +635,7 @@ msgstr "O novo endereço de email já existe."
 msgid "Change Password"
 msgstr "Alterar senha"
 
-#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:53
+#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:55
 #: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
 msgid "Password:"
 msgstr "Senha:"
@@ -652,19 +667,19 @@ msgstr ""
 msgid "Create Character"
 msgstr "Criar Personagem"
 
-#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:52
+#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:54
 #: src/gui/register.cpp:67
 msgid "Name:"
 msgstr "Nome:"
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
 #: src/gui/outfitwindow.cpp:67
 msgid ">"
 msgstr ""
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
 #: src/gui/outfitwindow.cpp:66
@@ -681,8 +696,8 @@ msgstr "Cor do Cabelo:"
 msgid "Hair style:"
 msgstr "Estilo do Cabelo:"
 
-#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:397
-#: src/gui/socialwindow.cpp:297
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:392
+#: src/gui/socialwindow.cpp:329
 msgid "Create"
 msgstr "Criar"
 
@@ -738,34 +753,34 @@ msgstr "Cancelar Registro"
 msgid "Change Email"
 msgstr "Alterar e-mail"
 
-#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:155
-#: src/gui/setup_players.cpp:230
+#: src/gui/charselectdialog.cpp:336 src/gui/serverdialog.cpp:231
+#: src/gui/setup_players.cpp:229
 msgid "Delete"
 msgstr "Excluir"
 
-#: src/gui/charselectdialog.cpp:387
+#: src/gui/charselectdialog.cpp:380
 #, fuzzy
 msgid "Choose"
 msgstr "Fechar"
 
-#: src/gui/charselectdialog.cpp:399 src/gui/charselectdialog.cpp:400
+#: src/gui/charselectdialog.cpp:394 src/gui/charselectdialog.cpp:395
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:77
+#: src/gui/chat.cpp:88
 msgid "Chat"
 msgstr "Bate-papo"
 
-#: src/gui/chat.cpp:287
+#: src/gui/chat.cpp:311
 #, fuzzy, c-format
 msgid "Present: %s; %d players are present."
 msgstr "%d jogadores estão presentes."
 
-#: src/gui/chat.cpp:305
+#: src/gui/chat.cpp:329
 msgid "Attendance written to record log."
 msgstr "Presença gravada no registro do log."
 
-#: src/gui/chat.cpp:469
+#: src/gui/chat.cpp:493
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Sussurrando para %s: %s"
@@ -831,139 +846,170 @@ msgstr "Ambiente FX"
 msgid "Equipment"
 msgstr "Equipamento"
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:78
-#: src/gui/inventorywindow.cpp:80 src/gui/inventorywindow.cpp:291
-#: src/gui/popupmenu.cpp:372
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:89
+#: src/gui/inventorywindow.cpp:337 src/gui/popupmenu.cpp:359
 msgid "Unequip"
 msgstr "Desequipar"
 
-#: src/gui/help.cpp:36
+#: src/gui/help.cpp:37
 msgid "Help"
 msgstr "Ajuda"
 
-#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:74
+#: src/gui/help.cpp:51 src/gui/npcdialog.cpp:50
 msgid "Close"
 msgstr "Fechar"
 
-#: src/gui/inventorywindow.cpp:57 src/gui/windowmenu.cpp:56
+#: src/gui/inventorywindow.cpp:59 src/gui/windowmenu.cpp:56
 msgid "Inventory"
 msgstr "Inventório"
 
-#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:75
-#: src/gui/inventorywindow.cpp:293 src/gui/popupmenu.cpp:374
+#: src/gui/inventorywindow.cpp:59
+msgid "Storage"
+msgstr "Armazenamento"
+
+#: src/gui/inventorywindow.cpp:82
+msgid "Slots:"
+msgstr "Entradas:"
+
+#: src/gui/inventorywindow.cpp:87 src/gui/inventorywindow.cpp:100
+#: src/gui/inventorywindow.cpp:339 src/gui/popupmenu.cpp:361
 msgid "Equip"
 msgstr "Equipar"
 
-#: src/gui/inventorywindow.cpp:74 src/gui/inventorywindow.cpp:75
-#: src/gui/inventorywindow.cpp:297 src/gui/popupmenu.cpp:377
+#: src/gui/inventorywindow.cpp:88
 msgid "Use"
 msgstr "Usar"
 
-#: src/gui/inventorywindow.cpp:84 src/gui/inventorywindow.cpp:301
-#: src/gui/popupmenu.cpp:380
+#: src/gui/inventorywindow.cpp:101 src/gui/popupmenu.cpp:364
+msgid "Activate"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:102 src/gui/inventorywindow.cpp:348
+#: src/gui/popupmenu.cpp:367
 #, fuzzy
 msgid "Drop..."
 msgstr "Descartar"
 
-#: src/gui/inventorywindow.cpp:85 src/gui/popupmenu.cpp:386
+#: src/gui/inventorywindow.cpp:103 src/gui/popupmenu.cpp:373
 msgid "Split"
 msgstr "Dividir"
 
-#: src/gui/inventorywindow.cpp:86 src/gui/outfitwindow.cpp:51
+#: src/gui/inventorywindow.cpp:104 src/gui/outfitwindow.cpp:51
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:97 src/gui/storagewindow.cpp:84
-msgid "Slots:"
-msgstr "Entradas:"
-
-#: src/gui/inventorywindow.cpp:98
+#: src/gui/inventorywindow.cpp:106
 msgid "Weight:"
 msgstr "Peso:"
 
-#: src/gui/inventorywindow.cpp:303 src/gui/popupmenu.cpp:382
+#: src/gui/inventorywindow.cpp:124 src/gui/popupmenu.cpp:378
+msgid "Store"
+msgstr "Guardar"
+
+#: src/gui/inventorywindow.cpp:125 src/gui/popupmenu.cpp:385
+msgid "Retrieve"
+msgstr "Retirar"
+
+#: src/gui/inventorywindow.cpp:350 src/gui/popupmenu.cpp:369
 msgid "Drop"
 msgstr "Descartar"
 
-#: src/gui/itemamount.cpp:100 src/gui/okdialog.cpp:42
-#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:38 src/gui/trade.cpp:73
-#: src/gui/trade.cpp:75
+#: src/gui/itemamount.cpp:113 src/gui/okdialog.cpp:42
+#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:39 src/gui/trade.cpp:72
+#: src/gui/trade.cpp:74
 msgid "OK"
 msgstr "OK"
 
-#: src/gui/itemamount.cpp:102
+#: src/gui/itemamount.cpp:115
 msgid "All"
 msgstr "Tudo"
 
-#: src/gui/itemamount.cpp:128
+#: src/gui/itemamount.cpp:141
 msgid "Select amount of items to trade."
 msgstr "Selecionar quantidade de itens para negociar."
 
-#: src/gui/itemamount.cpp:131
+#: src/gui/itemamount.cpp:144
 msgid "Select amount of items to drop."
 msgstr "Selecionar quantidade de itens para descartar."
 
-#: src/gui/itemamount.cpp:134
+#: src/gui/itemamount.cpp:147
 msgid "Select amount of items to store."
 msgstr "Escolha a quantidade de itens para guardar."
 
-#: src/gui/itemamount.cpp:137
+#: src/gui/itemamount.cpp:150
 msgid "Select amount of items to retrieve."
 msgstr "Escolha a quantidade de itens para retirar."
 
-#: src/gui/itemamount.cpp:140
+#: src/gui/itemamount.cpp:153
 msgid "Select amount of items to split."
 msgstr "Selecionar quantidade de itens para dividir."
 
-#: src/gui/itempopup.cpp:92
+#: src/gui/itempopup.cpp:137
 #, fuzzy, c-format
 msgid "Weight: %s"
 msgstr "Peso: "
 
-#: src/gui/login.cpp:49 src/gui/login.cpp:61
+#: src/gui/login.cpp:51 src/gui/login.cpp:63
 msgid "Login"
 msgstr "Login"
 
-#: src/gui/login.cpp:58
+#: src/gui/login.cpp:60
 #, fuzzy
 msgid "Remember username"
 msgstr "Lembrar nome de usuário"
 
-#: src/gui/login.cpp:59 src/gui/register.cpp:58 src/gui/register.cpp:73
+#: src/gui/login.cpp:61 src/gui/register.cpp:58 src/gui/register.cpp:73
 msgid "Register"
 msgstr "Registrar"
 
-#: src/gui/login.cpp:60
+#: src/gui/login.cpp:62
 #, fuzzy
 msgid "Change Server"
 msgstr "Servidor"
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
+#: src/gui/login.cpp:129
+#, fuzzy
+msgid "Registration disabled"
+msgstr "Compartilhamento de itens desabilitado."
+
+#: src/gui/login.cpp:129
+msgid "You need to use the website to register an account for this server."
+msgstr ""
+
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:86
 msgid "Map"
 msgstr "Mapa"
 
-#: src/gui/npcdialog.cpp:44
+#: src/gui/ministatus.cpp:235
+msgid "Need"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:48
 msgid "Waiting for server"
 msgstr "Aguardando servidor"
 
-#: src/gui/npcdialog.cpp:45
+#: src/gui/npcdialog.cpp:49
 msgid "Next"
 msgstr "Próximo"
 
-#: src/gui/npcdialog.cpp:47
+#: src/gui/npcdialog.cpp:51
 msgid "Submit"
 msgstr "Confirmar"
 
-#: src/gui/npcdialog.cpp:52 src/gui/npcpostdialog.cpp:41
+#: src/gui/npcdialog.cpp:73 src/gui/npcpostdialog.cpp:41
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:110
+#: src/gui/npcdialog.cpp:118
+msgid "Clear log"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:134
 msgid "Reset"
 msgstr "Resetar"
 
 #. TRANSLATORS: Please leave the \n sequences intact.
-#: src/gui/npcdialog.cpp:171
+#: src/gui/npcdialog.cpp:208
 #, fuzzy
 msgid ""
 "\n"
@@ -978,7 +1024,7 @@ msgstr "Para:"
 msgid "Send"
 msgstr "Enviar"
 
-#: src/gui/npcpostdialog.cpp:96
+#: src/gui/npcpostdialog.cpp:99
 msgid "Failed to send as sender or letter invalid."
 msgstr "Falha ao enviar como remetente ou a carta é inválida."
 
@@ -993,99 +1039,86 @@ msgstr ""
 msgid "Unequip first"
 msgstr "Desequipar"
 
-#: src/gui/popupmenu.cpp:84
+#: src/gui/popupmenu.cpp:83
 #, fuzzy, c-format
 msgid "Trade with %s..."
 msgstr "Negociando com %s"
 
-#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:161
+#: src/gui/popupmenu.cpp:87 src/gui/popupmenu.cpp:158
 #, fuzzy, c-format
 msgid "Attack %s"
 msgstr "Ataque %+d"
 
-#: src/gui/popupmenu.cpp:92
+#: src/gui/popupmenu.cpp:91
 #, fuzzy, c-format
 msgid "Whisper %s"
 msgstr "Sussurrar"
 
-#: src/gui/popupmenu.cpp:101
+#: src/gui/popupmenu.cpp:100
 #, fuzzy, c-format
 msgid "Befriend %s"
 msgstr "@@friend|Fazer amizade com %s@@"
 
-#: src/gui/popupmenu.cpp:106
+#: src/gui/popupmenu.cpp:105
 #, fuzzy, c-format
 msgid "Disregard %s"
 msgstr "Desconsiderado"
 
-#: src/gui/popupmenu.cpp:109
+#: src/gui/popupmenu.cpp:108
 #, fuzzy, c-format
 msgid "Ignore %s"
 msgstr "Ignorado"
 
-#: src/gui/popupmenu.cpp:115 src/gui/popupmenu.cpp:124
+#: src/gui/popupmenu.cpp:114 src/gui/popupmenu.cpp:123
 #, c-format
 msgid "Unignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:118
+#: src/gui/popupmenu.cpp:117
 #, fuzzy, c-format
 msgid "Completely ignore %s"
 msgstr "@@ignore|Ignorar completamente %s@@"
 
 #: src/gui/popupmenu.cpp:130
-#, c-format
-msgid "Follow %s"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:133
 #, fuzzy, c-format
 msgid "Invite %s to join your guild"
 msgstr "@@guild|Convidar %s para sua corporação@@"
 
-#: src/gui/popupmenu.cpp:137
+#: src/gui/popupmenu.cpp:134
 #, fuzzy, c-format
 msgid "Invite %s to join your party"
 msgstr "@@party|Convidar %s para entrar no seu grupo@@"
 
-#: src/gui/popupmenu.cpp:144
+#: src/gui/popupmenu.cpp:141
 #, fuzzy
 msgid "Kick player"
 msgstr "Erro na expulsão!"
 
-#: src/gui/popupmenu.cpp:153
+#: src/gui/popupmenu.cpp:150
 #, fuzzy, c-format
 msgid "Talk to %s"
 msgstr "@@talk|Falar com %s@@"
 
-#: src/gui/popupmenu.cpp:166
+#: src/gui/popupmenu.cpp:163
 #, fuzzy
 msgid "Kick monster"
 msgstr "@@admin-kick|Expulsar monstro@@"
 
-#: src/gui/popupmenu.cpp:174
+#: src/gui/popupmenu.cpp:171
 #, fuzzy
 msgid "Add name to chat"
 msgstr "@@name|Adiciona nome ao chat@@"
 
-#: src/gui/popupmenu.cpp:191
+#: src/gui/popupmenu.cpp:188
 #, fuzzy, c-format
 msgid "Pick up %s"
 msgstr "Pegar"
 
-#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:400
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:387
 #, fuzzy
 msgid "Add to chat"
 msgstr "@@chat|Adicionar ao chat@@"
 
-#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:71
-msgid "Store"
-msgstr "Guardar"
-
-#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:72
-msgid "Retrieve"
-msgstr "Retirar"
-
 #: src/gui/quitdialog.cpp:44
 msgid "Switch server"
 msgstr "Trocar servidor"
@@ -1154,52 +1187,65 @@ msgstr "A senha deve ser menor que %d caracteres."
 msgid "Passwords do not match."
 msgstr "Senhas não conferem."
 
-#: src/gui/serverdialog.cpp:124
+#: src/gui/serverdialog.cpp:197
 #, fuzzy
 msgid "Choose Your Server"
 msgstr "Selecione seu servidor"
 
-#: src/gui/serverdialog.cpp:131 src/gui/widgets/chattab.cpp:139
+#: src/gui/serverdialog.cpp:206 src/gui/widgets/chattab.cpp:142
 msgid "Server:"
 msgstr "Servidor:"
 
-#: src/gui/serverdialog.cpp:132
+#: src/gui/serverdialog.cpp:207
 msgid "Port:"
 msgstr "Porta:"
 
-#: src/gui/serverdialog.cpp:133
+#: src/gui/serverdialog.cpp:208
 #, fuzzy
 msgid "Server type:"
 msgstr "Servidor:"
 
-#: src/gui/serverdialog.cpp:153
+#: src/gui/serverdialog.cpp:229
 #, fuzzy
 msgid "Connect"
 msgstr "Conectando..."
 
-#: src/gui/serverdialog.cpp:154
+#: src/gui/serverdialog.cpp:230
 #, fuzzy
 msgid "Custom Server"
 msgstr "Cursor customizado"
 
-#: src/gui/serverdialog.cpp:242
+#: src/gui/serverdialog.cpp:324
 msgid "Please type both the address and the port of a server."
 msgstr "Por favor especifique o endereço e a porta do servidor."
 
-#: src/gui/serverdialog.cpp:357
+#: src/gui/serverdialog.cpp:441
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:363
+#: src/gui/serverdialog.cpp:447
 #, fuzzy
 msgid "Waiting for server..."
 msgstr "Aguardando servidor"
 
-#: src/gui/serverdialog.cpp:367
+#: src/gui/serverdialog.cpp:451
 msgid "Preparing download"
 msgstr ""
 
+#: src/gui/serverdialog.cpp:455
+msgid "Error retreiving server list!"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:550
+msgid "requires a newer version"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:552
+#, c-format
+msgid "requires v%s"
+msgstr ""
+
 #: src/gui/setup_audio.cpp:42
 msgid "Sound"
 msgstr "Som"
@@ -1233,54 +1279,54 @@ msgstr ""
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:45
+#: src/gui/setup_colors.cpp:46
 msgid "This is what the color looks like"
 msgstr "A cor se parece com isso"
 
-#: src/gui/setup_colors.cpp:50
+#: src/gui/setup_colors.cpp:51
 msgid "Colors"
 msgstr "Cores"
 
-#: src/gui/setup_colors.cpp:71
+#: src/gui/setup_colors.cpp:72
 #, fuzzy
 msgid "Type:"
 msgstr "Tipo: "
 
-#: src/gui/setup_colors.cpp:82 src/gui/setup_colors.cpp:330
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:331
 msgid "Static"
 msgstr "Estático"
 
-#: src/gui/setup_colors.cpp:84 src/gui/setup_colors.cpp:85
-#: src/gui/setup_colors.cpp:331
+#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
+#: src/gui/setup_colors.cpp:332
 msgid "Pulse"
 msgstr "Pulso"
 
-#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:87
-#: src/gui/setup_colors.cpp:332
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
+#: src/gui/setup_colors.cpp:333
 msgid "Rainbow"
 msgstr "Arco-íris"
 
-#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
-#: src/gui/setup_colors.cpp:332
+#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
+#: src/gui/setup_colors.cpp:333
 msgid "Spectrum"
 msgstr "Espectro"
 
-#: src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:94
 #, fuzzy
 msgid "Delay:"
 msgstr "Atraso: "
 
-#: src/gui/setup_colors.cpp:108
+#: src/gui/setup_colors.cpp:109
 #, fuzzy
 msgid "Red:"
 msgstr "Vermelho: "
 
-#: src/gui/setup_colors.cpp:123
+#: src/gui/setup_colors.cpp:124
 #, fuzzy
 msgid "Green:"
 msgstr "Verde: "
 
-#: src/gui/setup_colors.cpp:138
+#: src/gui/setup_colors.cpp:139
 #, fuzzy
 msgid "Blue:"
 msgstr "Azul: "
@@ -1338,590 +1384,592 @@ msgstr "Padrão"
 msgid "Key Conflict(s) Detected."
 msgstr "Conflitos nas teclas detectado."
 
-#: src/gui/setup_players.cpp:57
+#: src/gui/setup_players.cpp:58
 msgid "Name"
 msgstr "Nome"
 
-#: src/gui/setup_players.cpp:58
+#: src/gui/setup_players.cpp:59
 msgid "Relation"
 msgstr "Relação"
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:64
 msgid "Neutral"
 msgstr "Neutro"
 
-#: src/gui/setup_players.cpp:64
+#: src/gui/setup_players.cpp:65
 msgid "Friend"
 msgstr "Amigo"
 
-#: src/gui/setup_players.cpp:65
+#: src/gui/setup_players.cpp:66
 msgid "Disregarded"
 msgstr "Desconsiderado"
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_players.cpp:67
 msgid "Ignored"
 msgstr "Ignorado"
 
-#: src/gui/setup_players.cpp:208 src/gui/setup_video.cpp:132
+#: src/gui/setup_players.cpp:206 src/gui/setup_video.cpp:153
 msgid "???"
 msgstr "???"
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_players.cpp:225
 msgid "Allow trading"
 msgstr "Permitir trocas"
 
-#: src/gui/setup_players.cpp:228
+#: src/gui/setup_players.cpp:227
 msgid "Allow whispers"
 msgstr "Permitir mensagens particular"
 
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:231
 msgid "Put all whispers in tabs"
 msgstr "Deixar todas as mensagens particulares em abas"
 
-#: src/gui/setup_players.cpp:234
+#: src/gui/setup_players.cpp:233
 #, fuzzy
 msgid "Show gender"
 msgstr "Mostrar nome"
 
-#: src/gui/setup_players.cpp:236
+#: src/gui/setup_players.cpp:235
+#, fuzzy
+msgid "Enable Chat log"
+msgstr "Impossibilitado de vender."
+
+#: src/gui/setup_players.cpp:237
 msgid "Players"
 msgstr "Jogadores"
 
-#: src/gui/setup_players.cpp:261
+#: src/gui/setup_players.cpp:262
 msgid "When ignoring:"
 msgstr "Quando ignorado:"
 
-#: src/gui/setup_video.cpp:113
+#: src/gui/setup_video.cpp:134
 msgid "Tiny"
 msgstr "Minúsculo"
 
-#: src/gui/setup_video.cpp:114
+#: src/gui/setup_video.cpp:135
 msgid "Small"
 msgstr "Pequena"
 
-#: src/gui/setup_video.cpp:115
+#: src/gui/setup_video.cpp:136
 msgid "Medium"
 msgstr "Média"
 
-#: src/gui/setup_video.cpp:116
+#: src/gui/setup_video.cpp:137
 msgid "Large"
 msgstr "Grande"
 
-#: src/gui/setup_video.cpp:142
+#: src/gui/setup_video.cpp:163
 msgid "No text"
 msgstr "Sem texto"
 
-#: src/gui/setup_video.cpp:143
+#: src/gui/setup_video.cpp:164
 msgid "Text"
 msgstr "Texto"
 
-#: src/gui/setup_video.cpp:144
+#: src/gui/setup_video.cpp:165
 msgid "Bubbles, no names"
 msgstr "Bolhas, sem nomes"
 
-#: src/gui/setup_video.cpp:145
+#: src/gui/setup_video.cpp:166
 msgid "Bubbles with names"
 msgstr "Bolhas com nomes"
 
-#: src/gui/setup_video.cpp:157
+#: src/gui/setup_video.cpp:178
 msgid "off"
 msgstr "desligado"
 
-#: src/gui/setup_video.cpp:158 src/gui/setup_video.cpp:171
+#: src/gui/setup_video.cpp:179 src/gui/setup_video.cpp:192
 msgid "low"
 msgstr "baixo"
 
-#: src/gui/setup_video.cpp:159 src/gui/setup_video.cpp:173
+#: src/gui/setup_video.cpp:180 src/gui/setup_video.cpp:194
 msgid "high"
 msgstr "alto"
 
-#: src/gui/setup_video.cpp:172
+#: src/gui/setup_video.cpp:193
 msgid "medium"
 msgstr "médio"
 
-#: src/gui/setup_video.cpp:174
+#: src/gui/setup_video.cpp:195
 msgid "max"
 msgstr "máximo"
 
-#: src/gui/setup_video.cpp:196
+#: src/gui/setup_video.cpp:217
 msgid "Full screen"
 msgstr "Tela cheia"
 
-#: src/gui/setup_video.cpp:197
+#: src/gui/setup_video.cpp:218
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:198
+#: src/gui/setup_video.cpp:219
 msgid "Custom cursor"
 msgstr "Cursor customizado"
 
-#: src/gui/setup_video.cpp:200
+#: src/gui/setup_video.cpp:221
 msgid "Visible names"
 msgstr "Nomes visíveis"
 
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:223
 msgid "Particle effects"
 msgstr "Efeitos de partícula"
 
-#: src/gui/setup_video.cpp:204
+#: src/gui/setup_video.cpp:225
 #, fuzzy
 msgid "Show own name"
 msgstr "Mostrar nome"
 
-#: src/gui/setup_video.cpp:205
+#: src/gui/setup_video.cpp:226
+msgid "Log NPC dialogue"
+msgstr ""
+
+#: src/gui/setup_video.cpp:227
 msgid "Show pickup notification"
 msgstr "Mostrar aviso de achado"
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:207
+#. TRANSLATORS: Refers to "Show pickup notification"
+#: src/gui/setup_video.cpp:229
 msgid "in chat"
 msgstr "em chat"
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:209
+#. TRANSLATORS: Refers to "Show pickup notification"
+#: src/gui/setup_video.cpp:231
 msgid "as particle"
 msgstr "como partícula"
 
-#: src/gui/setup_video.cpp:214
+#: src/gui/setup_video.cpp:236
 #, fuzzy
 msgid "FPS limit:"
 msgstr "Limite FPS:"
 
-#: src/gui/setup_video.cpp:225
+#: src/gui/setup_video.cpp:247
+msgid "Disable transparency (Low CPU mode)"
+msgstr ""
+
+#: src/gui/setup_video.cpp:250
 msgid "Video"
 msgstr "Vídeo"
 
-#: src/gui/setup_video.cpp:227
+#: src/gui/setup_video.cpp:252
 #, fuzzy
-msgid "Show monster damage"
+msgid "Show damage"
 msgstr "Mostrar nome"
 
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:258
 msgid "Overhead text"
 msgstr "Texto sobrescrito"
 
-#: src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:259
 msgid "Gui opacity"
 msgstr "Opacidade da GUI"
 
-#: src/gui/setup_video.cpp:235
+#: src/gui/setup_video.cpp:260
 msgid "Ambient FX"
 msgstr "Ambiente FX"
 
-#: src/gui/setup_video.cpp:236
+#: src/gui/setup_video.cpp:261
 #, fuzzy
 msgid "Particle detail"
 msgstr "Detalhe de partículas"
 
-#: src/gui/setup_video.cpp:237
+#: src/gui/setup_video.cpp:262
 msgid "Font size"
 msgstr "Tamanho da fonte"
 
-#: src/gui/setup_video.cpp:251 src/gui/setup_video.cpp:454
-#: src/gui/setup_video.cpp:568
+#: src/gui/setup_video.cpp:277 src/gui/setup_video.cpp:532
+#: src/gui/setup_video.cpp:662
 #, fuzzy
 msgid "None"
 msgstr "Não"
 
-#: src/gui/setup_video.cpp:381
+#: src/gui/setup_video.cpp:426
 #, fuzzy
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr "modo e restauração do antigo modo também falharam!"
 
-#: src/gui/setup_video.cpp:387
+#: src/gui/setup_video.cpp:432
 #, fuzzy
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr "modo e restauração do antigo modo também falharam!"
 
-#: src/gui/setup_video.cpp:398
+#: src/gui/setup_video.cpp:443
 #, fuzzy
 msgid "Switching to Full Screen"
 msgstr "Mudando para Tela cheia"
 
-#: src/gui/setup_video.cpp:399
+#: src/gui/setup_video.cpp:444
 msgid "Restart needed for changes to take effect."
 msgstr "É preciso reiniciar para as mudanças terem efeito."
 
-#: src/gui/setup_video.cpp:411
+#: src/gui/setup_video.cpp:458
 #, fuzzy
 msgid "Changing to OpenGL"
 msgstr "Trocando OpenGL"
 
-#: src/gui/setup_video.cpp:412
+#: src/gui/setup_video.cpp:459
+msgid ""
+"Applying change to OpenGL requires restart. In case OpenGL messes up your "
+"game graphics, restart the game with the command line option \"--no-opengl\"."
+msgstr ""
+
+#: src/gui/setup_video.cpp:466
+msgid "Deactivating OpenGL"
+msgstr ""
+
+#: src/gui/setup_video.cpp:467
 msgid "Applying change to OpenGL requires restart."
 msgstr "Aplicando mudança a OpenGL requer reiniciar o jogo."
 
-#: src/gui/setup_video.cpp:486 src/gui/setup_video.cpp:491
+#: src/gui/setup_video.cpp:475
+#, fuzzy
+msgid "Transparency disabled"
+msgstr "Compartilhamento de experiência desabilitado."
+
+#: src/gui/setup_video.cpp:476 src/gui/setup_video.cpp:484
+msgid "You must restart to apply changes."
+msgstr ""
+
+#: src/gui/setup_video.cpp:483
+msgid "Transparency enabled"
+msgstr ""
+
+#: src/gui/setup_video.cpp:576 src/gui/setup_video.cpp:581
 #, fuzzy
 msgid "Screen Resolution Changed"
 msgstr "Resolução de tela alterada"
 
-#: src/gui/setup_video.cpp:487 src/gui/setup_video.cpp:492
+#: src/gui/setup_video.cpp:577 src/gui/setup_video.cpp:582
 msgid "Restart your client for the change to take effect."
 msgstr "Reincie o jogo para que as mudanças surtam efeito."
 
-#: src/gui/setup_video.cpp:489
+#: src/gui/setup_video.cpp:579
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:522
+#: src/gui/setup_video.cpp:612
 #, fuzzy
 msgid "Particle Effect Settings Changed."
 msgstr "Configurações de efeito de partícula modificadas."
 
-#: src/gui/setup_video.cpp:523
+#: src/gui/setup_video.cpp:613
 msgid "Changes will take effect on map change."
 msgstr "As mudanças terão efeito na mudança do mapa."
 
-#: src/gui/skilldialog.cpp:198 src/gui/windowmenu.cpp:59
+#: src/gui/skilldialog.cpp:212 src/gui/windowmenu.cpp:59
 msgid "Skills"
 msgstr "Habilidades"
 
-#: src/gui/skilldialog.cpp:209
+#: src/gui/skilldialog.cpp:223
 msgid "Up"
 msgstr "Acima"
 
-#: src/gui/skilldialog.cpp:263
+#: src/gui/skilldialog.cpp:269
 #, fuzzy, c-format
 msgid "Skill points available: %d"
 msgstr "Pontos de habilidade: %d"
 
-#: src/gui/skilldialog.cpp:315
+#: src/gui/skilldialog.cpp:351
 #, fuzzy, c-format
 msgid "Skill Set %d"
 msgstr "Pontos de habilidade: %d"
 
-#: src/gui/skilldialog.cpp:324
+#: src/gui/skilldialog.cpp:360
 #, fuzzy, c-format
 msgid "Skill %d"
 msgstr "Habilidades"
 
-#: src/gui/skilldialog.cpp:406
+#: src/gui/skilldialog.cpp:442
 #, fuzzy, c-format
 msgid "Lvl: %d (%+d)"
 msgstr "Nível: %d"
 
-#: src/gui/skilldialog.cpp:417
+#: src/gui/skilldialog.cpp:453
 #, fuzzy, c-format
 msgid "Lvl: %d"
 msgstr "Nível: %d"
 
-#: src/gui/socialwindow.cpp:118
+#: src/gui/socialwindow.cpp:126
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:127
+#: src/gui/socialwindow.cpp:139
 #, fuzzy, c-format
 msgid "Guild %s quit requested."
 msgstr "Corporação criada."
 
-#: src/gui/socialwindow.cpp:137
+#: src/gui/socialwindow.cpp:153
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:138
+#: src/gui/socialwindow.cpp:154
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:147
+#: src/gui/socialwindow.cpp:163
 #, fuzzy
 msgid "Leave Guild?"
 msgstr "Criar corporação"
 
-#: src/gui/socialwindow.cpp:148
+#: src/gui/socialwindow.cpp:164
 #, fuzzy, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Tem certeza que deseja sair?"
 
-#: src/gui/socialwindow.cpp:183
+#: src/gui/socialwindow.cpp:207 src/net/tmwa/partyhandler.cpp:330
 #, fuzzy, c-format
 msgid "Invited user %s to party."
 msgstr "/party > Convidar um usuário para o grupo"
 
-#: src/gui/socialwindow.cpp:190
+#: src/gui/socialwindow.cpp:218
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:200
+#: src/gui/socialwindow.cpp:232
 #, fuzzy
 msgid "Member Invite to Party"
 msgstr "/party > Convidar um usuário para o grupo"
 
-#: src/gui/socialwindow.cpp:201
+#: src/gui/socialwindow.cpp:233
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:210
+#: src/gui/socialwindow.cpp:242
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:211
+#: src/gui/socialwindow.cpp:243
 #, fuzzy, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Tem certeza que deseja sair?"
 
-#: src/gui/socialwindow.cpp:240
+#: src/gui/socialwindow.cpp:272
 msgid "Create Guild"
 msgstr "Criar corporação"
 
-#: src/gui/socialwindow.cpp:241 src/gui/socialwindow.cpp:565
+#: src/gui/socialwindow.cpp:273 src/gui/socialwindow.cpp:620
 #, fuzzy
 msgid "Create Party"
 msgstr "Criar Personagem"
 
-#: src/gui/socialwindow.cpp:280 src/gui/windowmenu.cpp:64
+#: src/gui/socialwindow.cpp:312 src/gui/windowmenu.cpp:64
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:298
+#: src/gui/socialwindow.cpp:330
 #, fuzzy
 msgid "Invite"
 msgstr "Convidar Usuário"
 
-#: src/gui/socialwindow.cpp:299
+#: src/gui/socialwindow.cpp:331
 #, fuzzy
 msgid "Leave"
 msgstr "Grande"
 
-#: src/gui/socialwindow.cpp:395
+#: src/gui/socialwindow.cpp:443
 #, fuzzy, c-format
 msgid "Accepted party invite from %s."
 msgstr "Convite de %s aceito."
 
-#: src/gui/socialwindow.cpp:401
+#: src/gui/socialwindow.cpp:449
 #, fuzzy, c-format
 msgid "Rejected party invite from %s."
 msgstr "Convite de %s rejeitado."
 
-#: src/gui/socialwindow.cpp:414
+#: src/gui/socialwindow.cpp:462
 #, fuzzy, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Convite de %s aceito."
 
-#: src/gui/socialwindow.cpp:420
+#: src/gui/socialwindow.cpp:468
 #, fuzzy, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Convite de %s rejeitado."
 
-#: src/gui/socialwindow.cpp:464
+#: src/gui/socialwindow.cpp:497
+msgid "Creating guild failed, please choose a shorter name."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:504
 #, fuzzy, c-format
 msgid "Creating guild called %s."
 msgstr "Erro ao criar corporação."
 
-#: src/gui/socialwindow.cpp:478
+#: src/gui/socialwindow.cpp:520
+msgid "Creating party failed, please choose a shorter name."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:527
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:485
+#: src/gui/socialwindow.cpp:541
 #, fuzzy
 msgid "Guild Name"
 msgstr "Corporação"
 
-#: src/gui/socialwindow.cpp:486
+#: src/gui/socialwindow.cpp:542
 #, fuzzy
 msgid "Choose your guild's name."
 msgstr "Selecione seu servidor"
 
-#: src/gui/socialwindow.cpp:498
+#: src/gui/socialwindow.cpp:554
 #, fuzzy
 msgid "Received guild request, but one already exists."
 msgstr "Requisição de grupo recebida, mas já existe um."
 
-#: src/gui/socialwindow.cpp:503
+#: src/gui/socialwindow.cpp:559
 #, fuzzy, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s te convidou para entrar no grupo %s."
 
-#: src/gui/socialwindow.cpp:508
+#: src/gui/socialwindow.cpp:564
 #, fuzzy
 msgid "Accept Guild Invite"
 msgstr "Aceitar convite para o grupo"
 
-#: src/gui/socialwindow.cpp:520
+#: src/gui/socialwindow.cpp:576
 msgid "Received party request, but one already exists."
 msgstr "Requisição de grupo recebida, mas já existe um."
 
-#: src/gui/socialwindow.cpp:530
+#: src/gui/socialwindow.cpp:585
 #, fuzzy
 msgid "You have been invited you to join a party."
 msgstr "%s te convidou para entrar em seu grupo."
 
-#: src/gui/socialwindow.cpp:534
+#: src/gui/socialwindow.cpp:589
 #, fuzzy, c-format
 msgid "You have been invited to join the %s party."
 msgstr "%s te convidou para entrar no grupo %s."
 
-#: src/gui/socialwindow.cpp:542
+#: src/gui/socialwindow.cpp:597
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s te convidou para entrar em seu grupo."
 
-#: src/gui/socialwindow.cpp:547
+#: src/gui/socialwindow.cpp:602
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s te convidou para entrar no grupo %s."
 
-#: src/gui/socialwindow.cpp:555
+#: src/gui/socialwindow.cpp:610
 msgid "Accept Party Invite"
 msgstr "Aceitar convite para o grupo"
 
-#: src/gui/socialwindow.cpp:566
+#: src/gui/socialwindow.cpp:621
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:571
+#: src/gui/socialwindow.cpp:626
 #, fuzzy
 msgid "Party Name"
 msgstr "Grupo"
 
-#: src/gui/socialwindow.cpp:572
+#: src/gui/socialwindow.cpp:627
 #, fuzzy
 msgid "Choose your party's name."
 msgstr "Selecione seu servidor"
 
-#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:62
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:62
 msgid "Specials"
 msgstr ""
 
-#: src/gui/specialswindow.cpp:174
-#, c-format
-msgid "Specials Set %d"
-msgstr ""
-
-#: src/gui/specialswindow.cpp:191
-#, c-format
-msgid "Special %d"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:247
+#: src/gui/statuswindow.cpp:113 src/gui/statuswindow.cpp:215
+#: src/gui/statuswindow.cpp:262
 #, c-format
 msgid "Level: %d"
 msgstr "Nível: %d"
 
-#: src/gui/statuswindow.cpp:101 src/gui/statuswindow.cpp:211
+#: src/gui/statuswindow.cpp:114 src/gui/statuswindow.cpp:208
+#: src/gui/statuswindow.cpp:239
 #, c-format
 msgid "Money: %s"
 msgstr "Dinheiro: %s"
 
-#: src/gui/statuswindow.cpp:104
+#: src/gui/statuswindow.cpp:117
 msgid "HP:"
 msgstr "HP:"
 
-#: src/gui/statuswindow.cpp:109
+#: src/gui/statuswindow.cpp:122
 msgid "Exp:"
 msgstr "Exp:"
 
-#: src/gui/statuswindow.cpp:114
+#: src/gui/statuswindow.cpp:130
 msgid "MP:"
 msgstr "MP:"
 
-#: src/gui/statuswindow.cpp:132 src/gui/statuswindow.cpp:219
+#: src/gui/statuswindow.cpp:158 src/gui/statuswindow.cpp:275
 #, c-format
 msgid "Job: %d"
 msgstr "Trabalho: %d"
 
-#: src/gui/statuswindow.cpp:133
+#: src/gui/statuswindow.cpp:159
 msgid "Job:"
 msgstr "Trabalho:"
 
-#: src/gui/statuswindow.cpp:194
-#, fuzzy
-msgid "HP"
-msgstr "HP:"
-
-#: src/gui/statuswindow.cpp:200
-#, fuzzy
-msgid "MP"
-msgstr "MP:"
-
-#: src/gui/statuswindow.cpp:206
-#, fuzzy
-msgid "Exp"
-msgstr "Exp:"
-
-#: src/gui/statuswindow.cpp:215
-#, fuzzy
-msgid "Money"
-msgstr "Dinheiro: %d"
-
-#: src/gui/statuswindow.cpp:225
-#, fuzzy
-msgid "Job"
-msgstr "Trabalho:"
-
-#: src/gui/statuswindow.cpp:229
+#: src/gui/statuswindow.cpp:211 src/gui/statuswindow.cpp:247
 #, fuzzy, c-format
 msgid "Character points: %d"
 msgstr "Status do personagem OK"
 
-#: src/gui/statuswindow.cpp:235
+#: src/gui/statuswindow.cpp:255
 #, fuzzy, c-format
 msgid "Correction points: %d"
 msgstr "Pontos de habilidade: %d"
 
-#: src/gui/statuswindow.cpp:251
-#, fuzzy
-msgid "Level"
-msgstr "Nível: %d"
-
-#: src/gui/storagewindow.cpp:59
-msgid "Storage"
-msgstr "Armazenamento"
-
-#: src/gui/trade.cpp:52
+#: src/gui/trade.cpp:53
 msgid "Propose trade"
 msgstr "Propor negócio"
 
-#: src/gui/trade.cpp:53
+#: src/gui/trade.cpp:54
 msgid "Confirmed. Waiting..."
 msgstr "Confirmado. Aguardando..."
 
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:55
 msgid "Agree trade"
 msgstr "Aceitar negociação"
 
-#: src/gui/trade.cpp:55
+#: src/gui/trade.cpp:56
 msgid "Agreed. Waiting..."
 msgstr "Aceita. Aguarde..."
 
-#: src/gui/trade.cpp:58
+#: src/gui/trade.cpp:59
 msgid "Trade: You"
 msgstr "Negócio: você"
 
-#: src/gui/trade.cpp:74 src/gui/trade.cpp:75
+#: src/gui/trade.cpp:73 src/gui/trade.cpp:74
 msgid "Trade"
 msgstr "Negócio"
 
-#: src/gui/trade.cpp:77
+#: src/gui/trade.cpp:76
 msgid "Add"
 msgstr "Adicionar"
 
-#: src/gui/trade.cpp:99 src/gui/trade.cpp:135
+#: src/gui/trade.cpp:98 src/gui/trade.cpp:134
 #, fuzzy, c-format
 msgid "You get %s"
 msgstr "Você obteve %s"
 
-#: src/gui/trade.cpp:100
+#: src/gui/trade.cpp:99
 msgid "You give:"
 msgstr "Você dá:"
 
-#: src/gui/trade.cpp:104
+#: src/gui/trade.cpp:103
 msgid "Change"
 msgstr "Mudar"
 
-#: src/gui/trade.cpp:275
+#: src/gui/trade.cpp:262
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Falha ao adicionar item. Você não pode duplicar um tipo de item na janela."
 
-#: src/gui/trade.cpp:318
+#: src/gui/trade.cpp:304
 msgid "You don't have enough money."
 msgstr "Você não tem dinheiro suficiente."
 
@@ -1942,22 +1990,22 @@ msgstr "Conectando..."
 msgid "Play"
 msgstr "Jogar"
 
-#: src/gui/updatewindow.cpp:405
+#: src/gui/updatewindow.cpp:417
 msgid "##1  The update process is incomplete."
 msgstr "##1  O processo de update está incompleto."
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:407
+#: src/gui/updatewindow.cpp:419
 msgid "##1  It is strongly recommended that"
 msgstr "##1 É altamente recomendado que"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:409
+#: src/gui/updatewindow.cpp:421
 #, fuzzy
 msgid "##1  you try again later."
 msgstr "##1  você tente novamente mais tarde"
 
-#: src/gui/updatewindow.cpp:501
+#: src/gui/updatewindow.cpp:515
 msgid "Completed"
 msgstr "Concluído"
 
@@ -2038,55 +2086,55 @@ msgstr "É preciso um usuário para dar op!"
 msgid "Need a user to kick!"
 msgstr "É preciso um usuário para expulsar!"
 
-#: src/gui/widgets/chattab.cpp:118
+#: src/gui/widgets/chattab.cpp:121
 msgid "Global announcement:"
 msgstr "Anúncio geral:"
 
-#: src/gui/widgets/chattab.cpp:124
+#: src/gui/widgets/chattab.cpp:127
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "Anúncio geral de %s:"
 
-#: src/gui/widgets/chattab.cpp:150
+#: src/gui/widgets/chattab.cpp:153
 #, fuzzy, c-format
 msgid "%s whispers: %s"
 msgstr "%s envia a mensagem privada: "
 
-#: src/gui/widgets/whispertab.cpp:51
+#: src/gui/widgets/whispertab.cpp:53
 msgid "Cannot send empty chat!"
 msgstr "Não é possível enviar chat vazio!"
 
-#: src/gui/widgets/whispertab.cpp:70
+#: src/gui/widgets/whispertab.cpp:72
 msgid "/ignore > Ignore the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:71
+#: src/gui/widgets/whispertab.cpp:73
 msgid "/unignore > Stop ignoring the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:72
+#: src/gui/widgets/whispertab.cpp:74
 msgid "/close > Close the whisper tab"
 msgstr "/close > Fecha a aba de mensagem privada"
 
-#: src/gui/widgets/whispertab.cpp:82
+#: src/gui/widgets/whispertab.cpp:84
 msgid "Command: /close"
 msgstr "Comando: /close"
 
-#: src/gui/widgets/whispertab.cpp:83
+#: src/gui/widgets/whispertab.cpp:85
 msgid "This command closes the current whisper tab."
 msgstr "Este comando fecha a atual aba de mensagem privada"
 
-#: src/gui/widgets/whispertab.cpp:87
+#: src/gui/widgets/whispertab.cpp:89
 #, fuzzy
 msgid "Command: /ignore"
 msgstr "Comando: /item"
 
-#: src/gui/widgets/whispertab.cpp:88
+#: src/gui/widgets/whispertab.cpp:90
 #, fuzzy
 msgid "This command ignores the other player regardless of current relations."
 msgstr "Exibe o número total de jogadores online."
 
-#: src/gui/widgets/whispertab.cpp:94
+#: src/gui/widgets/whispertab.cpp:96
 #, fuzzy
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
@@ -2116,648 +2164,1010 @@ msgstr "Mudar"
 msgid "Choose World"
 msgstr "Selecione seu servidor"
 
-#: src/keyboardconfig.cpp:40
+#: src/keyboardconfig.cpp:39
 msgid "Move Up"
 msgstr "Mover para Cima"
 
-#: src/keyboardconfig.cpp:41
+#: src/keyboardconfig.cpp:40
 msgid "Move Down"
 msgstr "Mover para Baixo"
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:41
 msgid "Move Left"
 msgstr "Esquerda"
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:42
 msgid "Move Right"
 msgstr "Direita"
 
-#: src/keyboardconfig.cpp:44 src/net/ea/generalhandler.cpp:223
+#: src/keyboardconfig.cpp:43 src/net/tmwa/generalhandler.cpp:237
 msgid "Attack"
 msgstr "Atacar"
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:44
 msgid "Target & Attack"
 msgstr "Selecionar & Atacar"
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:45
 msgid "Smilie"
 msgstr "Emoticon"
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:46
 msgid "Talk"
 msgstr "Falar"
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:47
 msgid "Stop Attack"
 msgstr "Parar ataque"
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:48
 #, fuzzy
 msgid "Target Monster"
 msgstr "Selecionar o mais próximo"
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboardconfig.cpp:49
 msgid "Target NPC"
 msgstr "Selecionar NPC"
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:50
 msgid "Target Player"
 msgstr "Selecionar Jogador"
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:51
 msgid "Pickup"
 msgstr "Pegar"
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:52
 msgid "Hide Windows"
 msgstr "Esconder janelas"
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:53
 msgid "Sit"
 msgstr "Sentar"
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:54
 msgid "Screenshot"
 msgstr "Screenshot"
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:55
 msgid "Enable/Disable Trading"
 msgstr "Habilitar/Desabilitar Negociações"
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:56
 msgid "Find Path to Mouse"
 msgstr "Encontrar rota para o mouse"
 
-#: src/keyboardconfig.cpp:58 src/keyboardconfig.cpp:59
-#: src/keyboardconfig.cpp:60 src/keyboardconfig.cpp:61
-#: src/keyboardconfig.cpp:62 src/keyboardconfig.cpp:63
-#: src/keyboardconfig.cpp:64 src/keyboardconfig.cpp:65
-#: src/keyboardconfig.cpp:66 src/keyboardconfig.cpp:67
-#: src/keyboardconfig.cpp:68 src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:57 src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60
+#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62
+#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64
+#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68
 #, c-format
 msgid "Item Shortcut %d"
 msgstr "Atalho para Ítem %d"
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:69
 msgid "Help Window"
 msgstr "Janela de Ajuda"
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:70
 msgid "Status Window"
 msgstr "Janela de Status"
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:71
 msgid "Inventory Window"
 msgstr "Janela de inventário"
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:72
 msgid "Equipment Window"
 msgstr "Janela de equipamento"
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:73
 msgid "Skill Window"
 msgstr "Janela de Habilidade"
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:74
 msgid "Minimap Window"
 msgstr "Janela de Minimapa"
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:75
 msgid "Chat Window"
 msgstr "Janela de bate-papo"
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:76
 msgid "Item Shortcut Window"
 msgstr "Janela de atalhos para itens"
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:77
 msgid "Setup Window"
 msgstr "Janela de Configurações"
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:78
 msgid "Debug Window"
 msgstr "Janela de depuração"
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:79
 #, fuzzy
 msgid "Social Window"
 msgstr "Janela de Habilidade"
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:80
 msgid "Emote Shortcut Window"
 msgstr "Janela de atalho para Emoticons"
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:81
 #, fuzzy
 msgid "Outfits Window"
 msgstr "Janela de Status"
 
-#: src/keyboardconfig.cpp:83
+#: src/keyboardconfig.cpp:82
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:83
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86
-#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88
-#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90
-#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92
-#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:84 src/keyboardconfig.cpp:85
+#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:87
+#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:89
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:91
+#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:93
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:95
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "Atalho para Emoticon %d"
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:96
 msgid "Toggle Chat"
 msgstr "Alternar para chat"
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:97
 msgid "Scroll Chat Up"
 msgstr "Rolar janela de chat para cima"
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:98
 msgid "Scroll Chat Down"
 msgstr "Rolar janela de chat para baixo"
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:99
 msgid "Previous Chat Tab"
 msgstr "Aba de chat anterior"
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:100
 msgid "Next Chat Tab"
 msgstr "Próxima aba de chat"
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:101
 msgid "Select OK"
 msgstr "Selecionar OK"
 
-#: src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:103
 msgid "Ignore input 1"
 msgstr "Ignorar input 1"
 
-#: src/keyboardconfig.cpp:105
+#: src/keyboardconfig.cpp:104
 msgid "Ignore input 2"
 msgstr "Ignorar input 2"
 
-#: src/keyboardconfig.cpp:184
+#: src/keyboardconfig.cpp:183
 #, fuzzy, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr "Corrija-os, ou o jogo irá se comportar de forma estranha."
 
-#: src/localplayer.cpp:914
+#: src/localplayer.cpp:985
 msgid "Unable to pick up item."
 msgstr "Impossível pegar ítem."
 
 #. TRANSLATORS: This sentence may be translated differently
 #. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:923
+#: src/localplayer.cpp:994
 #, fuzzy, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "Você pegou %s [@@%d|%s@@]."
 msgstr[1] "Você pegou %s [@@%d|%s@@]."
 
-#: src/main.cpp:43
+#: src/main.cpp:42
 msgid "mana [options] [mana-file]"
 msgstr ""
 
+#: src/main.cpp:43
+msgid "[mana-file] : The mana file is an XML file (.mana)"
+msgstr ""
+
 #: src/main.cpp:44
+msgid "              used to set custom parameters"
+msgstr ""
+
+#: src/main.cpp:45
+msgid "              to the mana client."
+msgstr ""
+
+#: src/main.cpp:47
 msgid "Options:"
 msgstr "Opções:"
 
-#: src/main.cpp:45
+#: src/main.cpp:48
 #, fuzzy
 msgid "  -v --version        : Display the version"
 msgstr "  -v --version : Exibe a versão"
 
-#: src/main.cpp:46
+#: src/main.cpp:49
 #, fuzzy
 msgid "  -h --help           : Display this help"
 msgstr "  -h --help : Exibe esta ajuda"
 
-#: src/main.cpp:47
+#: src/main.cpp:50
 #, fuzzy
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr "  -C --config-file : Arquivo de configuração a ser usado"
 
-#: src/main.cpp:48
+#: src/main.cpp:51
 #, fuzzy
 msgid "  -U --username       : Login with this username"
 msgstr "  -U --username : Efetua login com este usuário"
 
-#: src/main.cpp:49
+#: src/main.cpp:52
 #, fuzzy
 msgid "  -P --password       : Login with this password"
 msgstr "  -P --password : Efetua login com esta senha"
 
-#: src/main.cpp:50
+#: src/main.cpp:53
 #, fuzzy
 msgid "  -c --character      : Login with this character"
 msgstr "  -c --character : Efetua login com este personagem"
 
-#: src/main.cpp:51
+#: src/main.cpp:54
 #, fuzzy
 msgid "  -s --server         : Login server name or IP"
 msgstr "  -s --server : Nome ou IP do servidor de login"
 
-#: src/main.cpp:52
+#: src/main.cpp:55
 #, fuzzy
 msgid "  -p --port           : Login server port"
 msgstr "  -p --port : Porta do servidor de login"
 
-#: src/main.cpp:53
+#: src/main.cpp:56
 #, fuzzy
 msgid "     --update-host    : Use this update host"
 msgstr "  -H --update-host : Usa este host de update"
 
-#: src/main.cpp:54
+#: src/main.cpp:57
 #, fuzzy
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 "  -D --default : Escolhe um personagem e um servidor de personagem padrão"
 
-#: src/main.cpp:56
+#: src/main.cpp:59
 #, fuzzy
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr "  -u --skip-update : Não faz downloads de atualização"
 
-#: src/main.cpp:57
+#: src/main.cpp:60
 #, fuzzy
 msgid "  -d --data           : Directory to load game data from"
 msgstr "  -d --data : Pasta de onde os dados do jogo vão ser carregados"
 
-#: src/main.cpp:58
+#: src/main.cpp:61
 #, fuzzy
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
+msgid "     --localdata-dir  : Directory to use as local data directory"
 msgstr "  -S --home-dir : Diretório a ser usado como pasta inicial"
 
-#: src/main.cpp:59
+#: src/main.cpp:62
+#, fuzzy
+msgid "     --chat-log-dir   : Chat log dir to use"
+msgstr "  -C --config-file : Arquivo de configuração a ser usado"
+
+#: src/main.cpp:63
 #, fuzzy
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr "  -S --home-dir : Diretório a ser usado como pasta inicial"
 
-#: src/main.cpp:61
+#: src/main.cpp:65
 #, fuzzy
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr "  -O --no-opengl : Desabilita OpenGL nesta sessão"
 
-#: src/net/ea/adminhandler.cpp:63
+#: src/net/manaserv/beinghandler.cpp:303 src/net/tmwa/playerhandler.cpp:94
+msgid "You are dead."
+msgstr "Você está morto."
+
+#: src/net/manaserv/beinghandler.cpp:304 src/net/tmwa/playerhandler.cpp:95
+msgid "We regret to inform you that your character was killed in battle."
+msgstr "Lamentamos informar que seu personagem foi morto em combate."
+
+#: src/net/manaserv/beinghandler.cpp:306 src/net/tmwa/playerhandler.cpp:97
+msgid "You are not that alive anymore."
+msgstr "Você não está mais tão vivo."
+
+#: src/net/manaserv/beinghandler.cpp:307 src/net/tmwa/playerhandler.cpp:98
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr "As mãos frias da morte estão levando sua alma."
+
+#: src/net/manaserv/beinghandler.cpp:308 src/net/tmwa/playerhandler.cpp:99
+msgid "Game Over!"
+msgstr "Fim de jogo!"
+
+#: src/net/manaserv/beinghandler.cpp:309 src/net/tmwa/playerhandler.cpp:101
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+"Não, crianças. Seu personagem não morreu de verdade. Ele... err... foi para "
+"um lugar melhor."
+
+#: src/net/manaserv/beinghandler.cpp:311 src/net/tmwa/playerhandler.cpp:103
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr ""
+"Seu plano de quebrar as armas de seus inimigos com o seu pescoço não deu "
+"certo."
+
+#: src/net/manaserv/beinghandler.cpp:313 src/net/tmwa/playerhandler.cpp:105
+msgid "I guess this did not run too well."
+msgstr "Eu acho que isso não funcionou muito bem."
+
+#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:107
+msgid "Do you want your possessions identified?"
+msgstr "Você quer uma identificação de suas posses?"
+
+#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:109
+msgid "Sadly, no trace of you was ever found..."
+msgstr "Infelizmente, seus traços nunca foram encontrados..."
+
+#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:111
+msgid "Annihilated."
+msgstr "Aniquilado."
+
+#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:113
+msgid "Looks like you got your head handed to you."
+msgstr "Parece que te ofereceram sua própria cabeça."
+
+#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:115
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr "Você estragou tudo de novo, jogue fora seu corpo e arranje outro."
+
+#: src/net/manaserv/beinghandler.cpp:323
+#, fuzzy
+msgid "Press OK to respawn."
+msgstr " Clique em OK para repopular."
+
+#: src/net/manaserv/beinghandler.cpp:324
+#, fuzzy
+msgid "You Died"
+msgstr "Você morreu"
+
+#: src/net/manaserv/charhandler.cpp:138 src/net/manaserv/charhandler.cpp:209
+#, fuzzy
+msgid "Not logged in."
+msgstr "Já está conectado"
+
+#: src/net/manaserv/charhandler.cpp:141
+msgid "No empty slot."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:144
+msgid "Invalid name."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:147
+#, fuzzy
+msgid "Character's name already exists."
+msgstr "Nome de usuário já existe"
+
+#: src/net/manaserv/charhandler.cpp:150
+msgid "Invalid hairstyle."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:153
+msgid "Invalid hair color."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:156
+msgid "Invalid gender."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:159
+#, fuzzy
+msgid "Character's stats are too high."
+msgstr "Status do personagem OK"
+
+#: src/net/manaserv/charhandler.cpp:162
+#, fuzzy
+msgid "Character's stats are too low."
+msgstr "Status do personagem OK"
+
+#: src/net/manaserv/charhandler.cpp:165
+#, c-format
+msgid "At least one statis out of the permitted range: (%u - %u)."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:171 src/net/manaserv/loginhandler.cpp:96
+#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
+#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
+#: src/net/tmwa/loginhandler.cpp:95 src/net/tmwa/loginhandler.cpp:182
+#, fuzzy
+msgid "Unknown error."
+msgstr "Erro desconhecido"
+
+#: src/net/manaserv/charhandler.cpp:200 src/net/tmwa/charserverhandler.cpp:146
+msgid "Info"
+msgstr "Informações"
+
+#: src/net/manaserv/charhandler.cpp:200
+#, fuzzy
+msgid "Player deleted."
+msgstr "Personagem deletado."
+
+#: src/net/manaserv/charhandler.cpp:212
+#, fuzzy
+msgid "Selection out of range."
+msgstr "Selecionar quantidade de itens para negociar."
+
+#: src/net/manaserv/charhandler.cpp:215
+#, fuzzy, c-format
+msgid "Unknown error (%d)."
+msgstr "Erro desconhecido"
+
+#: src/net/manaserv/charhandler.cpp:250
+msgid "No gameservers are available."
+msgstr "Não há gameservers disponíveis."
+
+#: src/net/manaserv/chathandler.cpp:187 src/net/manaserv/chathandler.cpp:313
+#: src/net/manaserv/guildhandler.cpp:260
+#, c-format
+msgid "Topic: %s"
+msgstr "Tópico: %s"
+
+#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:274
+#, fuzzy
+msgid "Players in this channel:"
+msgstr "Jogador acerta monstro"
+
+#: src/net/manaserv/chathandler.cpp:208
+#, fuzzy
+msgid "Error joining channel."
+msgstr "Comando: /join <canal>"
+
+#: src/net/manaserv/chathandler.cpp:214
+#, fuzzy
+msgid "Listing channels."
+msgstr "Solicitando entrada no canal %s."
+
+#: src/net/manaserv/chathandler.cpp:226
+msgid "End of channel list."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:303
+#, fuzzy, c-format
+msgid "%s entered the channel."
+msgstr "%s entrou para o grupo."
+
+#: src/net/manaserv/chathandler.cpp:308
+#, c-format
+msgid "%s left the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:324
+#, c-format
+msgid "%s has set mode %s on user %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:334
+#, c-format
+msgid "%s has kicked %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:339
+#, fuzzy
+msgid "Unknown channel event."
+msgstr "Comando desconhecido."
+
+#: src/net/manaserv/guildhandler.cpp:82
+msgid "Guild created."
+msgstr "Corporação criada."
+
+#: src/net/manaserv/guildhandler.cpp:87
+msgid "Error creating guild."
+msgstr "Erro ao criar corporação."
+
+#: src/net/manaserv/guildhandler.cpp:97
+msgid "Invite sent."
+msgstr "Convite enviado."
+
+#: src/net/manaserv/guildhandler.cpp:204
+msgid "Member was promoted successfully."
+msgstr "Membro foi promovido com sucesso."
+
+#: src/net/manaserv/guildhandler.cpp:209
+msgid "Failed to promote member."
+msgstr "Erro ao promover do membro."
+
+#: src/net/manaserv/loginhandler.cpp:87
+#, fuzzy
+msgid "Wrong magic_token."
+msgstr "Simbolo-mágico errado."
+
+#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
+#, fuzzy
+msgid "Already logged in."
+msgstr "Já está conectado"
+
+#: src/net/manaserv/loginhandler.cpp:93
+#, fuzzy
+msgid "Account banned."
+msgstr "A conta expirou"
+
+#: src/net/manaserv/loginhandler.cpp:118
+#, fuzzy
+msgid "New password incorrect."
+msgstr "Nova senha incorreta"
+
+#: src/net/manaserv/loginhandler.cpp:121 src/net/tmwa/loginhandler.cpp:89
+#, fuzzy
+msgid "Old password incorrect."
+msgstr "Senha antiga incorreta"
+
+#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
+msgid "Account not connected. Please login first."
+msgstr "Conta não conectada. Por favor, efetue o login primeiro."
+
+#: src/net/manaserv/loginhandler.cpp:149
+#, fuzzy
+msgid "New email address incorrect."
+msgstr "Novo endereço de email incorreto"
+
+#: src/net/manaserv/loginhandler.cpp:152
+#, fuzzy
+msgid "Old email address incorrect."
+msgstr "Antigo endereço de email incorreto"
+
+#: src/net/manaserv/loginhandler.cpp:158
+#, fuzzy
+msgid "The new email address already exists."
+msgstr "O novo endereço de email já existe."
+
+#: src/net/manaserv/loginhandler.cpp:239
+msgid ""
+"Client registration is not allowed. Please contact server administration."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
+#, fuzzy
+msgid "Client version is too old."
+msgstr "Versão do cliente é muito antiga"
+
+#: src/net/manaserv/loginhandler.cpp:266
+#, fuzzy
+msgid "Wrong username or password."
+msgstr "Nome de usuário ou senha inválido"
+
+#: src/net/manaserv/loginhandler.cpp:272
+#, fuzzy
+msgid "Account banned"
+msgstr "A conta expirou"
+
+#: src/net/manaserv/loginhandler.cpp:275
+msgid "Login attempt too soon after previous attempt."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:303
+#, fuzzy
+msgid "Wrong username, password or email address."
+msgstr "Nome de usuário, senha ou email inválido"
+
+#: src/net/manaserv/loginhandler.cpp:306
+#, fuzzy
+msgid "Username already exists."
+msgstr "Nome de usuário já existe"
+
+#: src/net/manaserv/loginhandler.cpp:309
+#, fuzzy
+msgid "Email address already exists."
+msgstr "Endereço de email já existe"
+
+#: src/net/manaserv/loginhandler.cpp:312
+msgid "You took too long with the captcha or your response was incorrect."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:87
+msgid "Joined party."
+msgstr "Entrou para o grupo."
+
+#: src/net/manaserv/partyhandler.cpp:105
+#, c-format
+msgid "%s joined the party."
+msgstr "%s entrou para o grupo."
+
+#: src/net/manaserv/partyhandler.cpp:123
+#, fuzzy, c-format
+msgid "%s rejected your invite."
+msgstr "%s recusou seu convite."
+
+#: src/net/manaserv/tradehandler.cpp:95
+msgid "Accepting incoming trade requests."
+msgstr "Aceitando propostas de negócios."
+
+#: src/net/manaserv/tradehandler.cpp:97
+msgid "Ignoring incoming trade requests."
+msgstr "Ignorando propostas de negócios."
+
+#: src/net/manaserv/tradehandler.cpp:115 src/net/tmwa/tradehandler.cpp:109
+msgid "Request for Trade"
+msgstr "Proposta de negociação"
+
+#: src/net/manaserv/tradehandler.cpp:116 src/net/tmwa/tradehandler.cpp:110
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
+msgstr "%s quer negociar com você, você aceita?"
+
+#: src/net/manaserv/tradehandler.cpp:134
+#, c-format
+msgid "Trading with %s"
+msgstr "Negociando com %s"
+
+#: src/net/manaserv/tradehandler.cpp:148 src/net/tmwa/tradehandler.cpp:224
+msgid "Trade canceled."
+msgstr "Negociação cancelada."
+
+#: src/net/manaserv/tradehandler.cpp:155 src/net/tmwa/tradehandler.cpp:231
+msgid "Trade completed."
+msgstr "Negociação realizada."
+
+#: src/net/tmwa/adminhandler.cpp:64
 msgid "Kick failed!"
 msgstr "Erro na expulsão!"
 
-#: src/net/ea/adminhandler.cpp:65
+#: src/net/tmwa/adminhandler.cpp:66
 msgid "Kick succeeded!"
 msgstr "Expulsão bem sucedida!"
 
-#: src/net/ea/buysellhandler.cpp:110
+#: src/net/tmwa/buysellhandler.cpp:109
 msgid "Nothing to sell."
 msgstr "Nada para vender."
 
-#: src/net/ea/buysellhandler.cpp:117
+#: src/net/tmwa/buysellhandler.cpp:116
 msgid "Thanks for buying."
 msgstr "Obrigado pela compra."
 
-#: src/net/ea/buysellhandler.cpp:124
+#: src/net/tmwa/buysellhandler.cpp:123
 msgid "Unable to buy."
 msgstr "Impossível comprar."
 
-#: src/net/ea/buysellhandler.cpp:130
+#: src/net/tmwa/buysellhandler.cpp:129
 msgid "Thanks for selling."
 msgstr "Obrigado pela venda."
 
-#: src/net/ea/buysellhandler.cpp:132
+#: src/net/tmwa/buysellhandler.cpp:131
 msgid "Unable to sell."
 msgstr "Impossibilitado de vender."
 
-#: src/net/ea/charserverhandler.cpp:103
-#, fuzzy
-msgid "Access denied."
-msgstr "Acesso negado"
+#: src/net/tmwa/charserverhandler.cpp:103
+msgid "Access denied. Most likely, there are too many players on this server."
+msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:106
+#: src/net/tmwa/charserverhandler.cpp:107
 #, fuzzy
 msgid "Cannot use this ID."
 msgstr "Não é possível usar este ID"
 
-#: src/net/ea/charserverhandler.cpp:109
+#: src/net/tmwa/charserverhandler.cpp:110
 #, fuzzy
-msgid "Unknown failure to select character."
-msgstr "Erro desconhecido ao selecionar personagem"
+msgid "Unknown char-server failure."
+msgstr "Erro desconhecido"
 
-#: src/net/ea/charserverhandler.cpp:135
+#: src/net/tmwa/charserverhandler.cpp:134
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr "Erro ao criar personagem. Provavelmente o nome já está sendo usado."
 
-#: src/net/ea/charserverhandler.cpp:147 src/net/manaserv/charhandler.cpp:187
-msgid "Info"
-msgstr "Informações"
-
-#: src/net/ea/charserverhandler.cpp:147
+#: src/net/tmwa/charserverhandler.cpp:146
 msgid "Character deleted."
 msgstr "Personagem deletado."
 
-#: src/net/ea/charserverhandler.cpp:152
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Failed to delete character."
 msgstr "Falha ao deletar personagem."
 
-#: src/net/ea/charserverhandler.cpp:237 src/net/manaserv/charhandler.cpp:263
+#: src/net/tmwa/charserverhandler.cpp:266
 msgid "Strength:"
 msgstr "Força:"
 
-#: src/net/ea/charserverhandler.cpp:238 src/net/manaserv/charhandler.cpp:264
+#: src/net/tmwa/charserverhandler.cpp:267
 msgid "Agility:"
 msgstr "Agilidade:"
 
-#: src/net/ea/charserverhandler.cpp:239 src/net/manaserv/charhandler.cpp:266
+#: src/net/tmwa/charserverhandler.cpp:268
 msgid "Vitality:"
 msgstr "Vitalidade:"
 
-#: src/net/ea/charserverhandler.cpp:240 src/net/manaserv/charhandler.cpp:267
+#: src/net/tmwa/charserverhandler.cpp:269
 msgid "Intelligence:"
 msgstr "Inteligência:"
 
-#: src/net/ea/charserverhandler.cpp:241 src/net/manaserv/charhandler.cpp:265
+#: src/net/tmwa/charserverhandler.cpp:270
 msgid "Dexterity:"
 msgstr "Destreza:"
 
-#: src/net/ea/charserverhandler.cpp:242
+#: src/net/tmwa/charserverhandler.cpp:271
 msgid "Luck:"
 msgstr "Sorte"
 
-#: src/net/ea/chathandler.cpp:80
-msgid "Whisper could not be sent, user is offline."
+#: src/net/tmwa/chathandler.cpp:87
+#, fuzzy, c-format
+msgid "Whisper could not be sent, %s is offline."
 msgstr "Impossível enviar mensagem privada, o usuário está desconectado."
 
-#: src/net/ea/chathandler.cpp:84
-msgid "Whisper could not be sent, ignored by user."
+#: src/net/tmwa/chathandler.cpp:96
+#, fuzzy, c-format
+msgid "Whisper could not be sent, ignored by %s."
 msgstr "Impossível enviar mensagem privada, você foi ignorado pelo usuário."
 
-#: src/net/ea/chathandler.cpp:171
+#: src/net/tmwa/chathandler.cpp:230
 #, fuzzy
 msgid "MVP player."
 msgstr "Jogador"
 
-#: src/net/ea/chathandler.cpp:204 src/net/ea/chathandler.cpp:210
-#: src/net/ea/chathandler.cpp:215 src/net/ea/chathandler.cpp:220
-#: src/net/ea/chathandler.cpp:225 src/net/ea/chathandler.cpp:230
-#: src/net/ea/chathandler.cpp:235 src/net/ea/chathandler.cpp:240
+#: src/net/tmwa/chathandler.cpp:265 src/net/tmwa/chathandler.cpp:271
+#: src/net/tmwa/chathandler.cpp:276 src/net/tmwa/chathandler.cpp:281
+#: src/net/tmwa/chathandler.cpp:286 src/net/tmwa/chathandler.cpp:291
+#: src/net/tmwa/chathandler.cpp:296 src/net/tmwa/chathandler.cpp:301
 msgid "Channels are not supported!"
 msgstr "Não há suporte para canais!"
 
-#: src/net/ea/gamehandler.cpp:86
+#: src/net/tmwa/gamehandler.cpp:88
 #, c-format
 msgid "Online users: %d"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:100
+#: src/net/tmwa/gamehandler.cpp:101
 #, fuzzy
 msgid "Game"
 msgstr "Nome"
 
-#: src/net/ea/gamehandler.cpp:100
+#: src/net/tmwa/gamehandler.cpp:101
 #, fuzzy
 msgid "Request to quit denied!"
 msgstr "Proposta de negociação"
 
-#: src/net/ea/generalhandler.cpp:102 src/net/manaserv/generalhandler.cpp:95
+#: src/net/tmwa/generalhandler.cpp:102
 #, c-format
 msgid "Strength %+d"
 msgstr "Força %+d"
 
-#: src/net/ea/generalhandler.cpp:103 src/net/manaserv/generalhandler.cpp:96
+#: src/net/tmwa/generalhandler.cpp:103
 #, c-format
 msgid "Agility %+d"
 msgstr "Agilidade %+d"
 
-#: src/net/ea/generalhandler.cpp:104 src/net/manaserv/generalhandler.cpp:98
+#: src/net/tmwa/generalhandler.cpp:104
 #, c-format
 msgid "Vitality %+d"
 msgstr "Vitalidade %+d"
 
-#: src/net/ea/generalhandler.cpp:105 src/net/manaserv/generalhandler.cpp:99
+#: src/net/tmwa/generalhandler.cpp:105
 #, c-format
 msgid "Intelligence %+d"
 msgstr "Inteligência %+d"
 
-#: src/net/ea/generalhandler.cpp:106 src/net/manaserv/generalhandler.cpp:97
+#: src/net/tmwa/generalhandler.cpp:106
 #, c-format
 msgid "Dexterity %+d"
 msgstr "Destreza %+d"
 
-#: src/net/ea/generalhandler.cpp:107
+#: src/net/tmwa/generalhandler.cpp:107
 #, c-format
 msgid "Luck %+d"
 msgstr "Sorte %+d"
 
-#: src/net/ea/generalhandler.cpp:130
+#: src/net/tmwa/generalhandler.cpp:132
 #, fuzzy
 msgid "Authentication failed."
 msgstr "Falha de autenticação"
 
-#: src/net/ea/generalhandler.cpp:133
+#: src/net/tmwa/generalhandler.cpp:135
 #, fuzzy
 msgid "No servers available."
 msgstr "Não há servidores disponíveis"
 
-#: src/net/ea/generalhandler.cpp:137
+#: src/net/tmwa/generalhandler.cpp:139
 #, fuzzy
 msgid "Someone else is trying to use this account."
 msgstr "Mais alguém está tentando utilizar esta conta"
 
-#: src/net/ea/generalhandler.cpp:140
+#: src/net/tmwa/generalhandler.cpp:142
 #, fuzzy
 msgid "This account is already logged in."
 msgstr "Existe alguém logado a esta conta"
 
-#: src/net/ea/generalhandler.cpp:143
+#: src/net/tmwa/generalhandler.cpp:145
 #, fuzzy
 msgid "Speed hack detected."
 msgstr "Hack de velocidade detectado"
 
-#: src/net/ea/generalhandler.cpp:146
+#: src/net/tmwa/generalhandler.cpp:148
 #, fuzzy
 msgid "Duplicated login."
 msgstr "Login duplicado"
 
-#: src/net/ea/generalhandler.cpp:149
+#: src/net/tmwa/generalhandler.cpp:151
 #, fuzzy
 msgid "Unknown connection error."
 msgstr "Erro de conexão desconhecido"
 
-#: src/net/ea/generalhandler.cpp:205
+#: src/net/tmwa/generalhandler.cpp:209
 msgid "Got disconnected from server!"
 msgstr "Você foi desconectado do servidor!"
 
-#: src/net/ea/generalhandler.cpp:216 src/net/manaserv/generalhandler.cpp:166
+#: src/net/tmwa/generalhandler.cpp:230
 msgid "Strength"
 msgstr "Força"
 
-#: src/net/ea/generalhandler.cpp:217 src/net/manaserv/generalhandler.cpp:167
+#: src/net/tmwa/generalhandler.cpp:231
 msgid "Agility"
 msgstr "Agilidade"
 
-#: src/net/ea/generalhandler.cpp:218 src/net/manaserv/generalhandler.cpp:169
+#: src/net/tmwa/generalhandler.cpp:232
 msgid "Vitality"
 msgstr "Vitalidade"
 
-#: src/net/ea/generalhandler.cpp:219 src/net/manaserv/generalhandler.cpp:170
+#: src/net/tmwa/generalhandler.cpp:233
 msgid "Intelligence"
 msgstr "Inteligência"
 
-#: src/net/ea/generalhandler.cpp:220 src/net/manaserv/generalhandler.cpp:168
+#: src/net/tmwa/generalhandler.cpp:234
 msgid "Dexterity"
 msgstr "Destreza"
 
-#: src/net/ea/generalhandler.cpp:221
+#: src/net/tmwa/generalhandler.cpp:235
 msgid "Luck"
 msgstr "Sorte"
 
-#: src/net/ea/generalhandler.cpp:224
+#: src/net/tmwa/generalhandler.cpp:238
 #, fuzzy
 msgid "Defense"
 msgstr "Defesa:"
 
-#: src/net/ea/generalhandler.cpp:225
+#: src/net/tmwa/generalhandler.cpp:239
 #, fuzzy
 msgid "M.Attack"
 msgstr "M. Ataque:"
 
-#: src/net/ea/generalhandler.cpp:226
+#: src/net/tmwa/generalhandler.cpp:240
 #, fuzzy
 msgid "M.Defense"
 msgstr "M. Defesa:"
 
-#: src/net/ea/generalhandler.cpp:227
+#: src/net/tmwa/generalhandler.cpp:241
 #, fuzzy, c-format
 msgid "% Accuracy"
 msgstr "% Acuracidade:"
 
-#: src/net/ea/generalhandler.cpp:228
+#: src/net/tmwa/generalhandler.cpp:242
 #, fuzzy, c-format
 msgid "% Evade"
 msgstr "% Evasão:"
 
-#: src/net/ea/generalhandler.cpp:229
+#: src/net/tmwa/generalhandler.cpp:243
 #, fuzzy, c-format
 msgid "% Critical"
 msgstr "Golpe crítico"
 
-#: src/net/ea/gui/guildtab.cpp:45
+#: src/net/tmwa/gui/guildtab.cpp:45
 msgid "Guild"
 msgstr "Corporação"
 
-#: src/net/ea/gui/guildtab.cpp:61 src/net/ea/gui/partytab.cpp:59
+#: src/net/tmwa/gui/guildtab.cpp:61 src/net/tmwa/gui/partytab.cpp:59
 msgid "/help > Display this help."
 msgstr "/help > Exibe esta ajuda."
 
-#: src/net/ea/gui/guildtab.cpp:62
+#: src/net/tmwa/gui/guildtab.cpp:62
 #, fuzzy
 msgid "/invite > Invite a player to your guild"
 msgstr "/invite > Convida um jogador para o seu grupo"
 
-#: src/net/ea/gui/guildtab.cpp:63
+#: src/net/tmwa/gui/guildtab.cpp:63
 #, fuzzy
 msgid "/leave > Leave the guild you are in"
 msgstr "/leave > Sai do grupo em que você está"
 
-#: src/net/ea/gui/guildtab.cpp:64
+#: src/net/tmwa/gui/guildtab.cpp:64
 #, fuzzy
 msgid "/kick > Kick some one from the guild you are in"
 msgstr "/kick > Expulsa alguém do grupo em que você está"
 
-#: src/net/ea/gui/guildtab.cpp:73 src/net/ea/gui/partytab.cpp:73
+#: src/net/tmwa/gui/guildtab.cpp:73 src/net/tmwa/gui/partytab.cpp:73
 msgid "Command: /invite <nick>"
 msgstr "Comando: /invite <nick>"
 
-#: src/net/ea/gui/guildtab.cpp:74
+#: src/net/tmwa/gui/guildtab.cpp:74
 #, fuzzy
 msgid "This command invites <nick> to the guild you're in."
 msgstr "Convida <nick> para um grupo com você."
 
-#: src/net/ea/gui/guildtab.cpp:80 src/net/ea/gui/partytab.cpp:80
+#: src/net/tmwa/gui/guildtab.cpp:80 src/net/tmwa/gui/partytab.cpp:80
 msgid "Command: /leave"
 msgstr "Comando: /leave"
 
-#: src/net/ea/gui/guildtab.cpp:81
+#: src/net/tmwa/gui/guildtab.cpp:81
 #, fuzzy
 msgid "This command causes the player to leave the guild."
 msgstr "Este comando faz com que o jogador saia do grupo."
 
-#: src/net/ea/gui/guildtab.cpp:89
+#: src/net/tmwa/gui/guildtab.cpp:89
 #, fuzzy
 msgid "Guild name is missing."
 msgstr "Falta o nome do grupo."
 
-#: src/net/ea/guildhandler.cpp:293
+#: src/net/tmwa/guildhandler.cpp:296
 msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:298
+#: src/net/tmwa/guildhandler.cpp:301
 msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:303
+#: src/net/tmwa/guildhandler.cpp:306
 #, fuzzy
 msgid "User is now part of your guild."
 msgstr "%s agora é um membro do seu grupo."
 
-#: src/net/ea/guildhandler.cpp:308
+#: src/net/tmwa/guildhandler.cpp:311
 msgid "Your guild is full."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:313
+#: src/net/tmwa/guildhandler.cpp:316
 #, fuzzy
 msgid "Unknown guild invite response."
 msgstr "Resposta de convite desconhecida para %s."
 
-#: src/net/ea/guildhandler.cpp:390
+#: src/net/tmwa/guildhandler.cpp:393
 msgid "Guild creation isn't supported yet."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:43
+#: src/net/tmwa/gui/partytab.cpp:43
 msgid "Party"
 msgstr "Grupo"
 
-#: src/net/ea/gui/partytab.cpp:60
+#: src/net/tmwa/gui/partytab.cpp:60
 msgid "/invite > Invite a player to your party"
 msgstr "/invite > Convida um jogador para o seu grupo"
 
-#: src/net/ea/gui/partytab.cpp:61
+#: src/net/tmwa/gui/partytab.cpp:61
 msgid "/leave > Leave the party you are in"
 msgstr "/leave > Sai do grupo em que você está"
 
-#: src/net/ea/gui/partytab.cpp:62
+#: src/net/tmwa/gui/partytab.cpp:62
 msgid "/kick > Kick some one from the party you are in"
 msgstr "/kick > Expulsa alguém do grupo em que você está"
 
-#: src/net/ea/gui/partytab.cpp:63
+#: src/net/tmwa/gui/partytab.cpp:63
 msgid "/item > Show/change party item sharing options"
 msgstr "/item > Mostra/Muda opções de compartilhamento de itens do grupo"
 
-#: src/net/ea/gui/partytab.cpp:64
+#: src/net/tmwa/gui/partytab.cpp:64
 msgid "/exp > Show/change party experience sharing options"
 msgstr ""
 "/exp > Mostra/Modifica opções de compartilhamento de experiência do grupo"
 
-#: src/net/ea/gui/partytab.cpp:81
+#: src/net/tmwa/gui/partytab.cpp:81
 msgid "This command causes the player to leave the party."
 msgstr "Este comando faz com que o jogador saia do grupo."
 
-#: src/net/ea/gui/partytab.cpp:85
+#: src/net/tmwa/gui/partytab.cpp:85
 msgid "Command: /item <policy>"
 msgstr "Comando> /item <opção>"
 
-#: src/net/ea/gui/partytab.cpp:86
+#: src/net/tmwa/gui/partytab.cpp:86
 msgid "This command changes the party's item sharing policy."
 msgstr "Este comando muda a opção de compartilhamento de itens do grupo."
 
-#: src/net/ea/gui/partytab.cpp:87
+#: src/net/tmwa/gui/partytab.cpp:87
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
@@ -2765,24 +3175,24 @@ msgstr ""
 "<policy> pode ser \"1\", \"yes\" e \"true\" para habilitar compartilhamento "
 "de itens, ou \"0\", \"no\" e \"false\" para desabilitar."
 
-#: src/net/ea/gui/partytab.cpp:90
+#: src/net/tmwa/gui/partytab.cpp:90
 msgid "Command: /item"
 msgstr "Comando: /item"
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/tmwa/gui/partytab.cpp:91
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 "Este comando exibe a atual opção de compartilhamento de itens do grupo."
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/tmwa/gui/partytab.cpp:95
 msgid "Command: /exp <policy>"
 msgstr "Comando: /exp <policy>"
 
-#: src/net/ea/gui/partytab.cpp:96
+#: src/net/tmwa/gui/partytab.cpp:96
 msgid "This command changes the party's experience sharing policy."
 msgstr "Este comando muda a opção de compartilhamento de experiência do grupo."
 
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/tmwa/gui/partytab.cpp:97
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
@@ -2790,104 +3200,91 @@ msgstr ""
 "<policy> pode ser \"1\", \"yes\" e \"true\" para habilitar compartilhamento "
 "de experiência, ou \"0\", \"no\" e \"false\" para desabilitar."
 
-#: src/net/ea/gui/partytab.cpp:100
+#: src/net/tmwa/gui/partytab.cpp:100
 msgid "Command: /exp"
 msgstr "Comando: /exp"
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/tmwa/gui/partytab.cpp:101
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 "Este comando exibe a atual opção de compartilhamento de experiência do grupo."
 
-#: src/net/ea/gui/partytab.cpp:132 src/net/ea/partyhandler.cpp:198
+#: src/net/tmwa/gui/partytab.cpp:132 src/net/tmwa/partyhandler.cpp:196
 msgid "Item sharing enabled."
 msgstr "Compartilhamento de itens habilitado."
 
-#: src/net/ea/gui/partytab.cpp:135 src/net/ea/partyhandler.cpp:204
+#: src/net/tmwa/gui/partytab.cpp:135 src/net/tmwa/partyhandler.cpp:202
 msgid "Item sharing disabled."
 msgstr "Compartilhamento de itens desabilitado."
 
-#: src/net/ea/gui/partytab.cpp:138 src/net/ea/partyhandler.cpp:210
+#: src/net/tmwa/gui/partytab.cpp:138 src/net/tmwa/partyhandler.cpp:208
 msgid "Item sharing not possible."
 msgstr "Não é possível compartilhar itens."
 
-#: src/net/ea/gui/partytab.cpp:141
+#: src/net/tmwa/gui/partytab.cpp:141
 #, fuzzy
 msgid "Item sharing unknown."
 msgstr "Compartilhamento de itens habilitado."
 
-#: src/net/ea/gui/partytab.cpp:167 src/net/ea/partyhandler.cpp:174
+#: src/net/tmwa/gui/partytab.cpp:167 src/net/tmwa/partyhandler.cpp:172
 msgid "Experience sharing enabled."
 msgstr "Compartilhamento de experiência habilitado."
 
-#: src/net/ea/gui/partytab.cpp:170 src/net/ea/partyhandler.cpp:180
+#: src/net/tmwa/gui/partytab.cpp:170 src/net/tmwa/partyhandler.cpp:178
 msgid "Experience sharing disabled."
 msgstr "Compartilhamento de experiência desabilitado."
 
-#: src/net/ea/gui/partytab.cpp:173 src/net/ea/partyhandler.cpp:186
+#: src/net/tmwa/gui/partytab.cpp:173 src/net/tmwa/partyhandler.cpp:184
 msgid "Experience sharing not possible."
 msgstr "Não é possível compartilhar experiência."
 
-#: src/net/ea/gui/partytab.cpp:176
+#: src/net/tmwa/gui/partytab.cpp:176
 #, fuzzy
 msgid "Experience sharing unknown."
 msgstr "Compartilhamento de experiência habilitado."
 
-#: src/net/ea/inventoryhandler.cpp:281
+#: src/net/tmwa/inventoryhandler.cpp:285
 msgid "Failed to use item."
 msgstr "Problemas ao usar ítem."
 
-#: src/net/ea/inventoryhandler.cpp:391
+#: src/net/tmwa/inventoryhandler.cpp:399
 msgid "Unable to equip."
 msgstr "Impossível equipar."
 
-#: src/net/ea/inventoryhandler.cpp:402
+#: src/net/tmwa/inventoryhandler.cpp:410
 msgid "Unable to unequip."
 msgstr "Impossível desequipar."
 
-#: src/net/ea/loginhandler.cpp:79
+#: src/net/tmwa/loginhandler.cpp:86
 msgid "Account was not found. Please re-login."
 msgstr "Conta não encontrada. Por favor, logue novamente."
 
-#: src/net/ea/loginhandler.cpp:82 src/net/manaserv/loginhandler.cpp:121
-#, fuzzy
-msgid "Old password incorrect."
-msgstr "Senha antiga incorreta"
-
-#: src/net/ea/loginhandler.cpp:85
+#: src/net/tmwa/loginhandler.cpp:92
 #, fuzzy
 msgid "New password too short."
 msgstr "Nova senha é muito curta"
 
-#: src/net/ea/loginhandler.cpp:88 src/net/ea/loginhandler.cpp:175
-#: src/net/manaserv/charhandler.cpp:158 src/net/manaserv/loginhandler.cpp:96
-#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
-#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
-#, fuzzy
-msgid "Unknown error."
-msgstr "Erro desconhecido"
-
-#: src/net/ea/loginhandler.cpp:149
+#: src/net/tmwa/loginhandler.cpp:156
 #, fuzzy
 msgid "Unregistered ID."
 msgstr "ID não registrado"
 
-#: src/net/ea/loginhandler.cpp:152
+#: src/net/tmwa/loginhandler.cpp:159
 #, fuzzy
 msgid "Wrong password."
 msgstr "Senha incorreta"
 
-#: src/net/ea/loginhandler.cpp:155
+#: src/net/tmwa/loginhandler.cpp:162
 #, fuzzy
 msgid "Account expired."
 msgstr "A conta expirou"
 
-#: src/net/ea/loginhandler.cpp:158
+#: src/net/tmwa/loginhandler.cpp:165
 #, fuzzy
 msgid "Rejected from server."
 msgstr "Rejeitado pelo servidor"
 
-#: src/net/ea/loginhandler.cpp:161
+#: src/net/tmwa/loginhandler.cpp:168
 #, fuzzy
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
@@ -2895,7 +3292,7 @@ msgstr ""
 "Você foi permanentemente banido do jogo. Por favor entre em contato com "
 "algum GM."
 
-#: src/net/ea/loginhandler.cpp:165
+#: src/net/tmwa/loginhandler.cpp:172
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -2904,186 +3301,126 @@ msgstr ""
 "Você banido do jogo até %s.\n"
 "Por favor entre em contato com algum GM através dos fóruns."
 
-#: src/net/ea/loginhandler.cpp:172
+#: src/net/tmwa/loginhandler.cpp:179
 #, fuzzy
 msgid "This user name is already taken."
 msgstr "Este nome de usuário já está em uso"
 
-#: src/net/ea/network.cpp:145
+#: src/net/tmwa/network.cpp:145
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/ea/network.cpp:345
+#: src/net/tmwa/network.cpp:345
 #, fuzzy
 msgid "Unable to resolve host \""
 msgstr "Impossibilitado de vender."
 
-#: src/net/ea/network.cpp:414
+#: src/net/tmwa/network.cpp:414
 #, fuzzy
 msgid "Connection to server terminated. "
 msgstr "Conectando ao servidor de mapas..."
 
-#: src/net/ea/partyhandler.cpp:81
+#: src/net/tmwa/partyhandler.cpp:82
 msgid "Could not create party."
 msgstr "Não foi possível criar o grupo."
 
-#: src/net/ea/partyhandler.cpp:84
+#: src/net/tmwa/partyhandler.cpp:84
 msgid "Party successfully created."
 msgstr "Grupo criado."
 
-#: src/net/ea/partyhandler.cpp:118
+#: src/net/tmwa/partyhandler.cpp:119
 #, c-format
 msgid "%s is already a member of a party."
 msgstr "%s já é membro de um grupo."
 
-#: src/net/ea/partyhandler.cpp:122
+#: src/net/tmwa/partyhandler.cpp:123
 #, c-format
 msgid "%s refused your invitation."
 msgstr "%s recusou seu convite."
 
-#: src/net/ea/partyhandler.cpp:126
+#: src/net/tmwa/partyhandler.cpp:127
 #, c-format
 msgid "%s is now a member of your party."
 msgstr "%s agora é um membro do seu grupo."
 
-#: src/net/ea/partyhandler.cpp:130
+#: src/net/tmwa/partyhandler.cpp:131
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr "Resposta de convite desconhecida para %s."
 
-#: src/net/ea/partyhandler.cpp:238
+#: src/net/tmwa/partyhandler.cpp:236
 msgid "You have left the party."
 msgstr "Você saiu do grupo."
 
-#: src/net/ea/partyhandler.cpp:249
+#: src/net/tmwa/partyhandler.cpp:246
 #, c-format
 msgid "%s has left your party."
 msgstr "%s saiu do seu grupo."
 
-#: src/net/ea/partyhandler.cpp:301
+#: src/net/tmwa/partyhandler.cpp:299
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr "Um membro desconhecido tentou dizer: %s"
 
-#: src/net/ea/partyhandler.cpp:329
-msgid "Inviting like this isn't supported at the moment."
-msgstr "No momento ainda não é possível convidar deste modo."
+#: src/net/tmwa/partyhandler.cpp:335
+#, c-format
+msgid "Inviting failed, because you can't see a player called %s."
+msgstr ""
 
-#: src/net/ea/partyhandler.cpp:334
+#: src/net/tmwa/partyhandler.cpp:340
 msgid "You can only inivte when you are in a party!"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:365
+#: src/net/tmwa/partyhandler.cpp:368
 #, c-format
 msgid "%s is not in your party!"
 msgstr "%s não está em seu grupo!"
 
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:304
-msgid "You are dead."
-msgstr "Você está morto."
-
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:305
-msgid "We regret to inform you that your character was killed in battle."
-msgstr "Lamentamos informar que seu personagem foi morto em combate."
-
-#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:307
-msgid "You are not that alive anymore."
-msgstr "Você não está mais tão vivo."
-
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:308
-msgid "The cold hands of the grim reaper are grabbing for your soul."
-msgstr "As mãos frias da morte estão levando sua alma."
-
-#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:309
-msgid "Game Over!"
-msgstr "Fim de jogo!"
-
-#: src/net/ea/playerhandler.cpp:105
+#: src/net/tmwa/playerhandler.cpp:100
 msgid "Insert coin to continue."
 msgstr "Insira uma moeda para continuar."
 
-#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:310
-msgid ""
-"No, kids. Your character did not really die. It... err... went to a better "
-"place."
-msgstr ""
-"Não, crianças. Seu personagem não morreu de verdade. Ele... err... foi para "
-"um lugar melhor."
-
-#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:312
-msgid ""
-"Your plan of breaking your enemies weapon by bashing it with your throat "
-"failed."
-msgstr ""
-"Seu plano de quebrar as armas de seus inimigos com o seu pescoço não deu "
-"certo."
-
-#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:314
-msgid "I guess this did not run too well."
-msgstr "Eu acho que isso não funcionou muito bem."
-
-#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:315
-msgid "Do you want your possessions identified?"
-msgstr "Você quer uma identificação de suas posses?"
-
-#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:316
-msgid "Sadly, no trace of you was ever found..."
-msgstr "Infelizmente, seus traços nunca foram encontrados..."
-
-#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:317
-msgid "Annihilated."
-msgstr "Aniquilado."
-
-#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:318
-msgid "Looks like you got your head handed to you."
-msgstr "Parece que te ofereceram sua própria cabeça."
-
-#: src/net/ea/playerhandler.cpp:120 src/net/manaserv/beinghandler.cpp:319
-msgid ""
-"You screwed up again, dump your body down the tubes and get you another one."
-msgstr "Você estragou tudo de novo, jogue fora seu corpo e arranje outro."
-
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/tmwa/playerhandler.cpp:118
 msgid "You're not dead yet. You're just resting."
 msgstr "Você não morreu ainda. Está apenas descansando."
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/tmwa/playerhandler.cpp:119
 msgid "You are no more."
 msgstr "Você não é mais."
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/tmwa/playerhandler.cpp:120
 msgid "You have ceased to be."
 msgstr "Você deixou de ser."
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/tmwa/playerhandler.cpp:121
 msgid "You've expired and gone to meet your maker."
 msgstr "Você expirou e foi encontrar seu criador."
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/tmwa/playerhandler.cpp:122
 msgid "You're a stiff."
 msgstr "Você é um cadáver."
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/tmwa/playerhandler.cpp:123
 msgid "Bereft of life, you rest in peace."
 msgstr "Sem vida, você descansa em paz."
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/tmwa/playerhandler.cpp:124
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr "Se não fosse tão animado, estaria comendo grama pela raiz."
 
-#: src/net/ea/playerhandler.cpp:130
+#: src/net/tmwa/playerhandler.cpp:125
 msgid "Your metabolic processes are now history."
 msgstr "Seus processos metabólicos agora são história."
 
-#: src/net/ea/playerhandler.cpp:131
+#: src/net/tmwa/playerhandler.cpp:126
 msgid "You're off the twig."
 msgstr "Você bateu as botas."
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/tmwa/playerhandler.cpp:127
 msgid "You've kicked the bucket."
 msgstr "Você chutou o balde."
 
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/tmwa/playerhandler.cpp:128
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
@@ -3091,483 +3428,245 @@ msgstr ""
 "Você dispensou seu corpo mortal, abaixou as cortinas e juntou-se ao maldito "
 "coro invisível."
 
-#: src/net/ea/playerhandler.cpp:135
+#: src/net/tmwa/playerhandler.cpp:130
 msgid "You are an ex-player."
 msgstr "Você é um ex-jogador"
 
-#: src/net/ea/playerhandler.cpp:136
+#: src/net/tmwa/playerhandler.cpp:131
 msgid "You're pining for the fjords."
 msgstr "Você foi desta para melhor."
 
-#: src/net/ea/playerhandler.cpp:249 src/net/ea/playerhandler.cpp:310
+#: src/net/tmwa/playerhandler.cpp:246 src/net/tmwa/playerhandler.cpp:285
 msgid "Message"
 msgstr "Mensagem"
 
-#: src/net/ea/playerhandler.cpp:250
+#: src/net/tmwa/playerhandler.cpp:247
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 "Você está carregando mais que a metade de seu peso. Você não poderá mais "
 "recuperar HP."
 
-#: src/net/ea/playerhandler.cpp:333
+#: src/net/tmwa/playerhandler.cpp:313
 #, fuzzy, c-format
 msgid "You picked up %s."
 msgstr "Você pegou "
 
-#: src/net/ea/playerhandler.cpp:369
+#: src/net/tmwa/playerhandler.cpp:348
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:532
+#: src/net/tmwa/playerhandler.cpp:488
 msgid "Equip arrows first."
 msgstr "Equipe as flechas primeiro."
 
-#: src/net/ea/specialhandler.cpp:147
+#: src/net/tmwa/specialhandler.cpp:144
 msgid "Trade failed!"
 msgstr "Falha na negociação!"
 
-#: src/net/ea/specialhandler.cpp:150
+#: src/net/tmwa/specialhandler.cpp:147
 msgid "Emote failed!"
 msgstr "Falha no Emote!"
 
-#: src/net/ea/specialhandler.cpp:153
+#: src/net/tmwa/specialhandler.cpp:150
 msgid "Sit failed!"
 msgstr "Falha ao sentar!"
 
-#: src/net/ea/specialhandler.cpp:156
+#: src/net/tmwa/specialhandler.cpp:153
 msgid "Chat creating failed!"
 msgstr "Falha ao criar Chat!"
 
-#: src/net/ea/specialhandler.cpp:159
+#: src/net/tmwa/specialhandler.cpp:156
 msgid "Could not join party!"
 msgstr "Impossivel entrar no grupo!"
 
-#: src/net/ea/specialhandler.cpp:162
+#: src/net/tmwa/specialhandler.cpp:159
 msgid "Cannot shout!"
 msgstr "Impossivel gritar!"
 
-#: src/net/ea/specialhandler.cpp:171
+#: src/net/tmwa/specialhandler.cpp:168
 msgid "You have not yet reached a high enough lvl!"
 msgstr "Você ainda não tem nivel necessário!"
 
-#: src/net/ea/specialhandler.cpp:174
+#: src/net/tmwa/specialhandler.cpp:171
 msgid "Insufficient HP!"
 msgstr "HP insuficiente!"
 
-#: src/net/ea/specialhandler.cpp:177
+#: src/net/tmwa/specialhandler.cpp:174
 msgid "Insufficient SP!"
 msgstr "SP insuficiente!"
 
-#: src/net/ea/specialhandler.cpp:180
+#: src/net/tmwa/specialhandler.cpp:177
 msgid "You have no memos!"
 msgstr "Você não tem nenhuma nota armazenada!"
 
-#: src/net/ea/specialhandler.cpp:183
+#: src/net/tmwa/specialhandler.cpp:180
 msgid "You cannot do that right now!"
 msgstr "Você não pode fazer isso agora!"
 
-#: src/net/ea/specialhandler.cpp:186
+#: src/net/tmwa/specialhandler.cpp:183
 msgid "Seems you need more money... ;-)"
 msgstr "Parece que você precisa de mais dinheiro... ;-)"
 
-#: src/net/ea/specialhandler.cpp:189
+#: src/net/tmwa/specialhandler.cpp:186
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Você não pode usar essa habilidade com esse tipo de arma!"
 
-#: src/net/ea/specialhandler.cpp:192
+#: src/net/tmwa/specialhandler.cpp:189
 msgid "You need another red gem!"
 msgstr "Você precisa de outra gema vermelha!"
 
-#: src/net/ea/specialhandler.cpp:195
+#: src/net/tmwa/specialhandler.cpp:192
 msgid "You need another blue gem!"
 msgstr "Você precisa de outra jóia azul!"
 
-#: src/net/ea/specialhandler.cpp:198
+#: src/net/tmwa/specialhandler.cpp:195
 msgid "You're carrying to much to do this!"
 msgstr "Você está com muita carga para fazer isso!"
 
-#: src/net/ea/specialhandler.cpp:201
+#: src/net/tmwa/specialhandler.cpp:198
 msgid "Huh? What's that?"
 msgstr "Hã? O que é isso?"
 
-#: src/net/ea/specialhandler.cpp:210
+#: src/net/tmwa/specialhandler.cpp:207
 msgid "Warp failed..."
 msgstr "Falha ao transportar..."
 
-#: src/net/ea/specialhandler.cpp:213
+#: src/net/tmwa/specialhandler.cpp:210
 msgid "Could not steal anything..."
 msgstr "Não foi possível roubar nada..."
 
-#: src/net/ea/specialhandler.cpp:216
+#: src/net/tmwa/specialhandler.cpp:213
 msgid "Poison had no effect..."
 msgstr "Veneno não surtiu efeito..."
 
-#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:116
-msgid "Request for Trade"
-msgstr "Proposta de negociação"
-
-#: src/net/ea/tradehandler.cpp:108 src/net/manaserv/tradehandler.cpp:117
-#, c-format
-msgid "%s wants to trade with you, do you accept?"
-msgstr "%s quer negociar com você, você aceita?"
-
-#: src/net/ea/tradehandler.cpp:124
+#: src/net/tmwa/tradehandler.cpp:126
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr "Negociação impossível. O parceiro de negócios está muito longe."
 
-#: src/net/ea/tradehandler.cpp:128
+#: src/net/tmwa/tradehandler.cpp:130
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr "Negociação impossível. O personagem não existe."
 
-#: src/net/ea/tradehandler.cpp:132
+#: src/net/tmwa/tradehandler.cpp:134
 msgid "Trade cancelled due to an unknown reason."
 msgstr "Negociação cancelada devido a uma razão desconhecida."
 
-#: src/net/ea/tradehandler.cpp:137
+#: src/net/tmwa/tradehandler.cpp:139
 #, c-format
 msgid "Trade: You and %s"
 msgstr "Negociação: Você e %s"
 
-#: src/net/ea/tradehandler.cpp:144
+#: src/net/tmwa/tradehandler.cpp:146
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr "Negociação com %s cancelada."
 
-#: src/net/ea/tradehandler.cpp:153
+#: src/net/tmwa/tradehandler.cpp:154
 msgid "Unhandled trade cancel packet."
 msgstr "Troca injusta pacote cancelado."
 
-#: src/net/ea/tradehandler.cpp:202
+#: src/net/tmwa/tradehandler.cpp:202
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr "Erro ao adicionar item. Parceiro de negócios carregando muito peso."
 
-#: src/net/ea/tradehandler.cpp:207
+#: src/net/tmwa/tradehandler.cpp:207
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr "Erro ao adicionar item. Parceiro de negócios não tem slots livres."
 
-#: src/net/ea/tradehandler.cpp:211
+#: src/net/tmwa/tradehandler.cpp:211
 msgid "Failed adding item for unknown reason."
 msgstr "Erro ao adicionar item devido a um motivo desconhecido."
 
-#: src/net/ea/tradehandler.cpp:224 src/net/manaserv/tradehandler.cpp:149
-msgid "Trade canceled."
-msgstr "Negociação cancelada."
-
-#: src/net/ea/tradehandler.cpp:231 src/net/manaserv/tradehandler.cpp:156
-msgid "Trade completed."
-msgstr "Negociação realizada."
-
-#: src/net/manaserv/beinghandler.cpp:324
-#, fuzzy
-msgid "Press OK to respawn."
-msgstr " Clique em OK para repopular."
-
-#: src/net/manaserv/beinghandler.cpp:325
+#: src/playerrelations.cpp:310
 #, fuzzy
-msgid "You Died"
-msgstr "Você morreu"
-
-#: src/net/manaserv/charhandler.cpp:128 src/net/manaserv/charhandler.cpp:196
-#, fuzzy
-msgid "Not logged in."
-msgstr "Já está conectado"
-
-#: src/net/manaserv/charhandler.cpp:131
-msgid "No empty slot."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:134
-msgid "Invalid name."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:137
-#, fuzzy
-msgid "Character's name already exists."
-msgstr "Nome de usuário já existe"
-
-#: src/net/manaserv/charhandler.cpp:140
-msgid "Invalid hairstyle."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:143
-msgid "Invalid hair color."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:146
-msgid "Invalid gender."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:149
-#, fuzzy
-msgid "Character's stats are too high."
-msgstr "Status do personagem OK"
-
-#: src/net/manaserv/charhandler.cpp:152
-#, fuzzy
-msgid "Character's stats are too low."
-msgstr "Status do personagem OK"
+msgid "Completely ignore"
+msgstr "@@ignore|Ignorar completamente %s@@"
 
-#: src/net/manaserv/charhandler.cpp:155
-msgid "One stat is zero."
+#: src/playerrelations.cpp:324
+msgid "Print '...'"
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:187
-#, fuzzy
-msgid "Player deleted."
-msgstr "Personagem deletado."
-
-#: src/net/manaserv/charhandler.cpp:199
-#, fuzzy
-msgid "Selection out of range."
-msgstr "Selecionar quantidade de itens para negociar."
-
-#: src/net/manaserv/charhandler.cpp:202
-#, fuzzy, c-format
-msgid "Unknown error (%d)."
-msgstr "Erro desconhecido"
-
-#: src/net/manaserv/charhandler.cpp:242
-msgid "No gameservers are available."
-msgstr "Não há gameservers disponíveis."
-
-#: src/net/manaserv/charhandler.cpp:268
-msgid "Willpower:"
-msgstr "Força de Vontade:"
-
-#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
-#: src/net/manaserv/guildhandler.cpp:259
-#, c-format
-msgid "Topic: %s"
-msgstr "Tópico: %s"
-
-#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
-#, fuzzy
-msgid "Players in this channel:"
-msgstr "Jogador acerta monstro"
-
-#: src/net/manaserv/chathandler.cpp:201
-#, fuzzy
-msgid "Error joining channel."
-msgstr "Comando: /join <canal>"
-
-#: src/net/manaserv/chathandler.cpp:207
-#, fuzzy
-msgid "Listing channels."
-msgstr "Solicitando entrada no canal %s."
-
-#: src/net/manaserv/chathandler.cpp:219
-msgid "End of channel list."
+#: src/playerrelations.cpp:340
+msgid "Blink name"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:291
-#, fuzzy, c-format
-msgid "%s entered the channel."
-msgstr "%s entrou para o grupo."
-
-#: src/net/manaserv/chathandler.cpp:296
+#: src/resources/itemdb.cpp:44
 #, c-format
-msgid "%s left the channel."
-msgstr ""
+msgid "Attack %+d"
+msgstr "Ataque %+d"
 
-#: src/net/manaserv/chathandler.cpp:312
+#: src/resources/itemdb.cpp:45
 #, c-format
-msgid "%s has set mode %s on user %s."
-msgstr ""
+msgid "Defense %+d"
+msgstr "Defesa %+d"
 
-#: src/net/manaserv/chathandler.cpp:322
+#: src/resources/itemdb.cpp:46
 #, c-format
-msgid "%s has kicked %s."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:327
-#, fuzzy
-msgid "Unknown channel event."
-msgstr "Comando desconhecido."
+msgid "HP %+d"
+msgstr "HP %+d"
 
-#: src/net/manaserv/generalhandler.cpp:100
+#: src/resources/itemdb.cpp:47
 #, c-format
-msgid "Willpower %+d"
-msgstr "Força de vontade %+d"
-
-#: src/net/manaserv/generalhandler.cpp:171
-#, fuzzy
-msgid "Willpower"
-msgstr "Força de Vontade:"
-
-#: src/net/manaserv/guildhandler.cpp:81
-msgid "Guild created."
-msgstr "Corporação criada."
-
-#: src/net/manaserv/guildhandler.cpp:86
-msgid "Error creating guild."
-msgstr "Erro ao criar corporação."
-
-#: src/net/manaserv/guildhandler.cpp:96
-msgid "Invite sent."
-msgstr "Convite enviado."
-
-#: src/net/manaserv/guildhandler.cpp:203
-msgid "Member was promoted successfully."
-msgstr "Membro foi promovido com sucesso."
+msgid "MP %+d"
+msgstr "MP %+d"
 
-#: src/net/manaserv/guildhandler.cpp:208
-msgid "Failed to promote member."
-msgstr "Erro ao promover do membro."
+#: src/resources/itemdb.cpp:92
+msgid "Unknown item"
+msgstr "Item desconhecido"
 
-#: src/net/manaserv/loginhandler.cpp:87
-#, fuzzy
-msgid "Wrong magic_token."
-msgstr "Simbolo-mágico errado."
+#: src/resources/itemdb.cpp:135 src/resources/monsterdb.cpp:77
+msgid "unnamed"
+msgstr "sem nome"
 
-#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
 #, fuzzy
-msgid "Already logged in."
-msgstr "Já está conectado"
+#~ msgid "HP"
+#~ msgstr "HP:"
 
-#: src/net/manaserv/loginhandler.cpp:93 src/net/manaserv/loginhandler.cpp:272
 #, fuzzy
-msgid "Server is full."
-msgstr "Servidor cheio"
+#~ msgid "MP"
+#~ msgstr "MP:"
 
-#: src/net/manaserv/loginhandler.cpp:118
 #, fuzzy
-msgid "New password incorrect."
-msgstr "Nova senha incorreta"
-
-#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
-msgid "Account not connected. Please login first."
-msgstr "Conta não conectada. Por favor, efetue o login primeiro."
+#~ msgid "Exp"
+#~ msgstr "Exp:"
 
-#: src/net/manaserv/loginhandler.cpp:149
 #, fuzzy
-msgid "New email address incorrect."
-msgstr "Novo endereço de email incorreto"
+#~ msgid "Money"
+#~ msgstr "Dinheiro: %d"
 
-#: src/net/manaserv/loginhandler.cpp:152
 #, fuzzy
-msgid "Old email address incorrect."
-msgstr "Antigo endereço de email incorreto"
+#~ msgid "Job"
+#~ msgstr "Trabalho:"
 
-#: src/net/manaserv/loginhandler.cpp:158
 #, fuzzy
-msgid "The new email address already exists."
-msgstr "O novo endereço de email já existe."
+#~ msgid "Level"
+#~ msgstr "Nível: %d"
 
-#: src/net/manaserv/loginhandler.cpp:239
-msgid ""
-"Client registration is not allowed. Please contact server administration."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
 #, fuzzy
-msgid "Client version is too old."
-msgstr "Versão do cliente é muito antiga"
+#~ msgid "Access denied."
+#~ msgstr "Acesso negado"
 
-#: src/net/manaserv/loginhandler.cpp:266
 #, fuzzy
-msgid "Wrong username or password."
-msgstr "Nome de usuário ou senha inválido"
+#~ msgid "Unknown failure to select character."
+#~ msgstr "Erro desconhecido ao selecionar personagem"
 
-#: src/net/manaserv/loginhandler.cpp:275
-msgid "Login attempt too soon after previous attempt."
-msgstr ""
+#~ msgid "Inviting like this isn't supported at the moment."
+#~ msgstr "No momento ainda não é possível convidar deste modo."
 
-#: src/net/manaserv/loginhandler.cpp:303
-#, fuzzy
-msgid "Wrong username, password or email address."
-msgstr "Nome de usuário, senha ou email inválido"
+#~ msgid "Willpower:"
+#~ msgstr "Força de Vontade:"
 
-#: src/net/manaserv/loginhandler.cpp:306
-#, fuzzy
-msgid "Username already exists."
-msgstr "Nome de usuário já existe"
+#~ msgid "Willpower %+d"
+#~ msgstr "Força de vontade %+d"
 
-#: src/net/manaserv/loginhandler.cpp:309
 #, fuzzy
-msgid "Email address already exists."
-msgstr "Endereço de email já existe"
-
-#: src/net/manaserv/loginhandler.cpp:312
-msgid "You took too long with the captcha or your response was incorrect."
-msgstr ""
-
-#: src/net/manaserv/partyhandler.cpp:88
-msgid "Joined party."
-msgstr "Entrou para o grupo."
-
-#: src/net/manaserv/partyhandler.cpp:106
-#, c-format
-msgid "%s joined the party."
-msgstr "%s entrou para o grupo."
-
-#: src/net/manaserv/partyhandler.cpp:123
-#, fuzzy, c-format
-msgid "%s rejected your invite."
-msgstr "%s recusou seu convite."
-
-#: src/net/manaserv/tradehandler.cpp:96
-msgid "Accepting incoming trade requests."
-msgstr "Aceitando propostas de negócios."
+#~ msgid "Willpower"
+#~ msgstr "Força de Vontade:"
 
-#: src/net/manaserv/tradehandler.cpp:98
-msgid "Ignoring incoming trade requests."
-msgstr "Ignorando propostas de negócios."
-
-#: src/net/manaserv/tradehandler.cpp:135
-#, c-format
-msgid "Trading with %s"
-msgstr "Negociando com %s"
-
-#: src/playerrelations.cpp:304
 #, fuzzy
-msgid "Completely ignore"
-msgstr "@@ignore|Ignorar completamente %s@@"
-
-#: src/playerrelations.cpp:318
-msgid "Print '...'"
-msgstr ""
-
-#: src/playerrelations.cpp:334
-msgid "Blink name"
-msgstr ""
-
-#: src/playerrelations.cpp:371
-msgid "Floating '...' bubble"
-msgstr ""
-
-#: src/playerrelations.cpp:374
-msgid "Floating bubble"
-msgstr ""
-
-#: src/resources/itemdb.cpp:52
-#, c-format
-msgid "Attack %+d"
-msgstr "Ataque %+d"
-
-#: src/resources/itemdb.cpp:53
-#, c-format
-msgid "Defense %+d"
-msgstr "Defesa %+d"
-
-#: src/resources/itemdb.cpp:54
-#, c-format
-msgid "HP %+d"
-msgstr "HP %+d"
-
-#: src/resources/itemdb.cpp:55
-#, c-format
-msgid "MP %+d"
-msgstr "MP %+d"
-
-#: src/resources/itemdb.cpp:114
-msgid "Unknown item"
-msgstr "Item desconhecido"
-
-#: src/resources/itemdb.cpp:158 src/resources/monsterdb.cpp:45
-#: src/resources/monsterdb.cpp:69
-msgid "unnamed"
-msgstr "sem nome"
+#~ msgid "Server is full."
+#~ msgstr "Servidor cheio"
 
 #~ msgid "Text Shadow"
 #~ msgstr "Sombra do Texto"
diff --git a/po/ru.po b/po/ru.po
index 4aca025a..2f15c881 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,327 +7,334 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2010-03-16 22:27+0100\n"
+"POT-Creation-Date: 2010-12-13 20:04+0100\n"
 "PO-Revision-Date: 2010-02-17 06:54+0000\n"
 "Last-Translator: jmb_kz <jmb_kz@mail.ru>\n"
 "Language-Team: Russian <ru@li.org>\n"
+"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/client.cpp:555 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
+#: src/client.cpp:598 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
 msgid "Setup"
 msgstr "Настройка"
 
-#: src/client.cpp:625
+#: src/client.cpp:679
 #, fuzzy
 msgid "Connecting to server"
 msgstr "Подключение к серверу карт..."
 
-#: src/client.cpp:652
+#: src/client.cpp:706
 #, fuzzy
 msgid "Logging in"
 msgstr "Вход"
 
-#: src/client.cpp:685
+#: src/client.cpp:739
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:741
+#: src/client.cpp:804
 #, fuzzy
 msgid "Requesting characters"
 msgstr "Выбор персонажа"
 
-#: src/client.cpp:770
+#: src/client.cpp:833
 #, fuzzy
 msgid "Connecting to the game server"
 msgstr "Подключение к серверу карт..."
 
-#: src/client.cpp:801 src/client.cpp:808 src/client.cpp:942
+#: src/client.cpp:843
+#, fuzzy
+msgid "Changing game servers"
+msgstr "Сервер"
+
+#: src/client.cpp:872 src/client.cpp:879 src/client.cpp:1014
 #: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
 #: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
-#: src/gui/serverdialog.cpp:241 src/gui/unregisterdialog.cpp:133
-#: src/net/ea/charserverhandler.cpp:135 src/net/ea/charserverhandler.cpp:152
-#: src/net/manaserv/charhandler.cpp:161 src/net/manaserv/charhandler.cpp:204
+#: src/gui/serverdialog.cpp:323 src/gui/unregisterdialog.cpp:133
+#: src/net/manaserv/charhandler.cpp:174 src/net/manaserv/charhandler.cpp:217
+#: src/net/tmwa/charserverhandler.cpp:134
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Error"
 msgstr "Ошибка"
 
-#: src/client.cpp:817
+#: src/client.cpp:888
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:844
+#: src/client.cpp:915
 #, fuzzy
 msgid "Password Change"
 msgstr "Пароль:"
 
-#: src/client.cpp:845
+#: src/client.cpp:916
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:864
+#: src/client.cpp:935
 #, fuzzy
 msgid "Email Change"
 msgstr "Сменить"
 
-#: src/client.cpp:865
+#: src/client.cpp:936
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:885
+#: src/client.cpp:956
 #, fuzzy
 msgid "Unregister Successful"
 msgstr "Удалить регистрацию"
 
-#: src/client.cpp:886
+#: src/client.cpp:957
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1009 src/client.cpp:1032
+#: src/client.cpp:1138 src/client.cpp:1161
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1121
+#: src/client.cpp:1281
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1155 src/client.cpp:1161
+#: src/client.cpp:1315 src/client.cpp:1321
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/commandhandler.cpp:127 src/commandhandler.cpp:308
+#: src/commandhandler.cpp:131 src/commandhandler.cpp:317
 msgid "Unknown command."
 msgstr "Неизвестная команда."
 
-#: src/commandhandler.cpp:156
+#: src/commandhandler.cpp:160
 msgid "-- Help --"
 msgstr "-- Помощь --"
 
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:161
 msgid "/help > Display this help"
 msgstr "/help > Отображает этот текст"
 
-#: src/commandhandler.cpp:159
+#: src/commandhandler.cpp:163
 msgid "/where > Display map name"
 msgstr "/where > Отображает имя карты"
 
-#: src/commandhandler.cpp:160
+#: src/commandhandler.cpp:164
 msgid "/who > Display number of online users"
 msgstr "/who > Отображает количество пользователей он-лайн"
 
-#: src/commandhandler.cpp:161
+#: src/commandhandler.cpp:165
 msgid "/me > Tell something about yourself"
 msgstr "/me > Расскажите что-нибудь о себе"
 
-#: src/commandhandler.cpp:163
+#: src/commandhandler.cpp:167
 msgid "/clear > Clears this window"
 msgstr "/clear > Очищает это окно"
 
-#: src/commandhandler.cpp:165
+#: src/commandhandler.cpp:169
 msgid "/msg > Send a private message to a user"
 msgstr "/msg > Послать приватное сообщение пользователю"
 
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:170
 msgid "/whisper > Alias of msg"
 msgstr "/whisper > Вариант команды msg"
 
-#: src/commandhandler.cpp:167
+#: src/commandhandler.cpp:171
 msgid "/w > Alias of msg"
 msgstr "/w > Вариант команды msg"
 
-#: src/commandhandler.cpp:168
+#: src/commandhandler.cpp:172
 msgid "/query > Makes a tab for private messages with another user"
 msgstr "/query> Создает вкладку для чата с пользователем."
 
-#: src/commandhandler.cpp:169
+#: src/commandhandler.cpp:174
 msgid "/q > Alias of query"
 msgstr "/q> Вариант query"
 
-#: src/commandhandler.cpp:171
+#: src/commandhandler.cpp:176
 msgid "/ignore > ignore a player"
 msgstr ""
 
-#: src/commandhandler.cpp:172
+#: src/commandhandler.cpp:177
 msgid "/unignore > stop ignoring a player"
 msgstr ""
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:179
 msgid "/list > Display all public channels"
 msgstr "/list > Показать список каналов"
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:180
 msgid "/join > Join or create a channel"
 msgstr "/join > Создать или присоединиться к каналу"
 
-#: src/commandhandler.cpp:177
+#: src/commandhandler.cpp:182
 #, fuzzy
 msgid "/createparty > Create a new party"
 msgstr "/create > Создать группу"
 
-#: src/commandhandler.cpp:178
+#: src/commandhandler.cpp:183
 msgid "/party > Invite a user to party"
 msgstr "Пригласить пользователя на канал"
 
-#: src/commandhandler.cpp:180
+#: src/commandhandler.cpp:185
 msgid "/record > Start recording the chat to an external file"
 msgstr "/record > Записывать чат во внешний файл"
 
-#: src/commandhandler.cpp:181
+#: src/commandhandler.cpp:187
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr ""
 
-#: src/commandhandler.cpp:182
+#: src/commandhandler.cpp:189
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
 "/present > Показывает список игроков он-лайн (посылается в окно чата, если "
 "включен лог)"
 
-#: src/commandhandler.cpp:184
+#: src/commandhandler.cpp:192
 msgid "/announce > Global announcement (GM only)"
 msgstr "/announce > Глобальное извещение (доступно только админу)"
 
-#: src/commandhandler.cpp:188
+#: src/commandhandler.cpp:196
 msgid "For more information, type /help <command>."
 msgstr "Для более точной информации введите /help <команда>"
 
-#: src/commandhandler.cpp:192
+#: src/commandhandler.cpp:200
 msgid "Command: /help"
 msgstr "Команда: /help"
 
-#: src/commandhandler.cpp:193
+#: src/commandhandler.cpp:201
 msgid "This command displays a list of all commands available."
 msgstr "Эта команда показывает список доступных команд"
 
-#: src/commandhandler.cpp:194
+#: src/commandhandler.cpp:203
 msgid "Command: /help <command>"
 msgstr "Команда: /help <команда>"
 
-#: src/commandhandler.cpp:195
+#: src/commandhandler.cpp:204
 msgid "This command displays help on <command>."
 msgstr "Эта команда показывает помощь по <команде>."
 
-#: src/commandhandler.cpp:203
+#: src/commandhandler.cpp:212
 msgid "Command: /announce <msg>"
 msgstr "Команда: /announce <сообщение>"
 
-#: src/commandhandler.cpp:204
+#: src/commandhandler.cpp:213
 msgid "*** only available to a GM ***"
 msgstr "*** доступно только для GM ***"
 
-#: src/commandhandler.cpp:205
+#: src/commandhandler.cpp:214
 msgid "This command sends the message <msg> to all players currently online."
 msgstr "Эта команда посылает <сообщение> всем игрокам в сети."
 
-#: src/commandhandler.cpp:210
+#: src/commandhandler.cpp:219
 msgid "Command: /clear"
 msgstr "Команда: /clear"
 
-#: src/commandhandler.cpp:211
+#: src/commandhandler.cpp:220
 msgid "This command clears the chat log of previous chat."
 msgstr "Эта команда очищает лог чата."
 
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:224
 #, fuzzy
 msgid "Command: /ignore <player>"
 msgstr "Комманда: /new <имя_группы>"
 
-#: src/commandhandler.cpp:216
+#: src/commandhandler.cpp:225
 #, fuzzy
 msgid "This command ignores the given player regardless of current relations."
 msgstr "Эта команда показывает число пользователей в сети на данный момент."
 
-#: src/commandhandler.cpp:221
+#: src/commandhandler.cpp:230
 msgid "Command: /join <channel>"
 msgstr "Команда: /join <канал>"
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:231
 msgid "This command makes you enter <channel>."
 msgstr "Команда для входа на <канал>."
 
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:232
 msgid "If <channel> doesn't exist, it's created."
 msgstr "Если <канал> не существует, он будет создан."
 
-#: src/commandhandler.cpp:227
+#: src/commandhandler.cpp:236
 msgid "Command: /list"
 msgstr "Команда: /list"
 
-#: src/commandhandler.cpp:228
+#: src/commandhandler.cpp:237
 msgid "This command shows a list of all channels."
 msgstr "Эта команда показывает список всех каналов."
 
-#: src/commandhandler.cpp:232
+#: src/commandhandler.cpp:241
 msgid "Command: /me <message>"
 msgstr "Комманда: /me <сообщение>"
 
-#: src/commandhandler.cpp:233
+#: src/commandhandler.cpp:242
 msgid "This command tell others you are (doing) <msg>."
 msgstr "Эта команда покажет другим игрокам, что вы (делаете) <сообщение>."
 
-#: src/commandhandler.cpp:237
+#: src/commandhandler.cpp:246
 msgid "Command: /msg <nick> <message>"
 msgstr "Комманда: /msg <имя персонажа> <сообщение>"
 
-#: src/commandhandler.cpp:238
+#: src/commandhandler.cpp:247
 msgid "Command: /whisper <nick> <message>"
 msgstr "Команда: /whisper <имя персонажа> <сообщение>"
 
-#: src/commandhandler.cpp:239
+#: src/commandhandler.cpp:248
 msgid "Command: /w <nick> <message>"
 msgstr "Команда: /w <ник> <сообщение>"
 
-#: src/commandhandler.cpp:240
+#: src/commandhandler.cpp:249
 msgid "This command sends the text <message> to <nick>."
 msgstr "Эта команда посылает текст <сообщение> пользователю <nick>."
 
-#: src/commandhandler.cpp:241 src/commandhandler.cpp:260
+#: src/commandhandler.cpp:250 src/commandhandler.cpp:269
 #: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
-#: src/net/ea/gui/guildtab.cpp:75 src/net/ea/gui/partytab.cpp:75
+#: src/net/tmwa/gui/guildtab.cpp:75 src/net/tmwa/gui/partytab.cpp:75
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr "Если ник содержит пробелы, заключите его в кавычки (\")."
 
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:255
 msgid "Command: /query <nick>"
 msgstr "Команда: /query <имя персонажа>"
 
-#: src/commandhandler.cpp:247
+#: src/commandhandler.cpp:256
 msgid "Command: /q <nick>"
 msgstr "Команда: /q <имя персонажа>"
 
-#: src/commandhandler.cpp:248
+#: src/commandhandler.cpp:257
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
 "Эта команда создаст закладку для личного общения между вами и <имя игрока>."
 
-#: src/commandhandler.cpp:253
+#: src/commandhandler.cpp:262
 #, fuzzy
 msgid "Command: /createparty <name>"
 msgstr "Command: /create <имя_группы>"
 
-#: src/commandhandler.cpp:254
+#: src/commandhandler.cpp:263
 #, fuzzy
 msgid "This command creates a new party called <name>."
 msgstr "Эти комманды создают группу под названием <имя_группы>."
 
-#: src/commandhandler.cpp:258
+#: src/commandhandler.cpp:267
 msgid "Command: /party <nick>"
 msgstr "Комманда: /party <имя>"
 
-#: src/commandhandler.cpp:259 src/net/ea/gui/partytab.cpp:74
+#: src/commandhandler.cpp:268 src/net/tmwa/gui/partytab.cpp:74
 msgid "This command invites <nick> to party with you."
 msgstr "Эта команда приглашает <имя персонажа> к вам в группу."
 
-#: src/commandhandler.cpp:265
+#: src/commandhandler.cpp:274
 msgid "Command: /present"
 msgstr "Комманда: /present"
 
-#: src/commandhandler.cpp:266
+#: src/commandhandler.cpp:275
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
@@ -335,27 +342,27 @@ msgstr ""
 "Комманда получпет список всех игроков, которых вы слышите и посылает его "
 "либо в лог-файл (если включена такая опция), либо в окно чата."
 
-#: src/commandhandler.cpp:272
+#: src/commandhandler.cpp:281
 msgid "Command: /record <filename>"
 msgstr "Команда: /record <имя файла>"
 
-#: src/commandhandler.cpp:273
+#: src/commandhandler.cpp:282
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr "Эта команда начнет протоколирование окна чата в файл <имя файла>."
 
-#: src/commandhandler.cpp:275
+#: src/commandhandler.cpp:284
 msgid "Command: /record"
 msgstr "Команда: /record"
 
-#: src/commandhandler.cpp:276
+#: src/commandhandler.cpp:285
 msgid "This command finishes a recording session."
 msgstr "Эта команда завершает запись."
 
-#: src/commandhandler.cpp:280
+#: src/commandhandler.cpp:289
 msgid "Command: /toggle <state>"
 msgstr "Комманда: /toggle <режим>"
 
-#: src/commandhandler.cpp:281
+#: src/commandhandler.cpp:290
 msgid ""
 "This command sets whether the return key should toggle the chat log, or "
 "whether the chat log turns off automatically."
@@ -363,56 +370,56 @@ msgstr ""
 "Эта комманда устанавливает, будет ли нажатие клавиши Enter переключать лог "
 "чата или же он (лог) будет выключен автоматически."
 
-#: src/commandhandler.cpp:283
+#: src/commandhandler.cpp:292
 msgid ""
-"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
-"\", \"no\", \"false\" to turn the toggle off."
+"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
+"\"0\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 "<режим> может быть \"1\", \"yes\", \"true\" дабы включить опцию или \"0\", "
 "\"no\", \"false\" чтобы выключить."
 
-#: src/commandhandler.cpp:286
+#: src/commandhandler.cpp:295
 msgid "Command: /toggle"
 msgstr "Команда: /toggle"
 
-#: src/commandhandler.cpp:287
+#: src/commandhandler.cpp:296
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: src/commandhandler.cpp:291 src/gui/widgets/whispertab.cpp:93
+#: src/commandhandler.cpp:300 src/gui/widgets/whispertab.cpp:95
 #, fuzzy
 msgid "Command: /unignore <player>"
 msgstr "Комманда: /new <имя_группы>"
 
-#: src/commandhandler.cpp:292
+#: src/commandhandler.cpp:301
 msgid "This command stops ignoring the given player if they are being ignored"
 msgstr ""
 
-#: src/commandhandler.cpp:297
+#: src/commandhandler.cpp:306
 msgid "Command: /where"
 msgstr "Команда: /where"
 
-#: src/commandhandler.cpp:298
+#: src/commandhandler.cpp:307
 msgid "This command displays the name of the current map."
 msgstr "Эта команда показывает имя текущей карты."
 
-#: src/commandhandler.cpp:302
+#: src/commandhandler.cpp:311
 msgid "Command: /who"
 msgstr "Команда: /who"
 
-#: src/commandhandler.cpp:303
+#: src/commandhandler.cpp:312
 msgid "This command displays the number of players currently online."
 msgstr "Эта команда показывает число пользователей в сети на данный момент."
 
-#: src/commandhandler.cpp:309
+#: src/commandhandler.cpp:318
 msgid "Type /help for a list of commands."
 msgstr "Введите /help для получения списка команд."
 
-#: src/commandhandler.cpp:375
+#: src/commandhandler.cpp:384
 msgid "Cannot send empty whispers!"
 msgstr "Нельзя отправлять пустые сообщения!"
 
-#: src/commandhandler.cpp:383
+#: src/commandhandler.cpp:392
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -421,58 +428,66 @@ msgstr ""
 "Невозможно создать вкладку для личного общения с игроком \"%s\"! Или вкладка "
 "уже создана, или этот игрок вы сами."
 
-#: src/commandhandler.cpp:397
+#: src/commandhandler.cpp:406
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Запрос на присоединение к каналу %s."
 
-#: src/commandhandler.cpp:410 src/net/ea/gui/partytab.cpp:109
+#: src/commandhandler.cpp:419 src/net/tmwa/gui/partytab.cpp:109
 msgid "Party name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:423 src/commandhandler.cpp:471
-#: src/commandhandler.cpp:493
+#: src/commandhandler.cpp:432 src/commandhandler.cpp:509
+#: src/commandhandler.cpp:531
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:441
+#: src/commandhandler.cpp:450
 msgid "Return toggles chat."
 msgstr "Enter переключает вас на окно чата."
 
-#: src/commandhandler.cpp:441
+#: src/commandhandler.cpp:450
 msgid "Message closes chat."
 msgstr "Сообщение закрывает чат."
 
-#: src/commandhandler.cpp:450
+#: src/commandhandler.cpp:459
 msgid "Return now toggles chat."
 msgstr "Теперь Return переключает чат."
 
-#: src/commandhandler.cpp:454
+#: src/commandhandler.cpp:463
 msgid "Message now closes chat."
 msgstr "Теперь сообщение закрывает чат."
 
-#: src/commandhandler.cpp:477
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:489
+msgid "Show IP: On"
+msgstr ""
+
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:485
+msgid "Show IP: Off"
+msgstr ""
+
+#: src/commandhandler.cpp:515
 msgid "Player already ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:484
+#: src/commandhandler.cpp:522
 msgid "Player successfully ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:486
+#: src/commandhandler.cpp:524
 #, fuzzy
 msgid "Player could not be ignored!"
 msgstr "Низзя прошептать: пользователь игнорирует шептание..."
 
-#: src/commandhandler.cpp:501
+#: src/commandhandler.cpp:539
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:506
+#: src/commandhandler.cpp:544
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:508
+#: src/commandhandler.cpp:546
 #, fuzzy
 msgid "Player could not be unignored!"
 msgstr "Низзя прошептать: пользователь игнорирует шептание..."
@@ -488,43 +503,43 @@ msgstr ""
 msgid "General"
 msgstr "Общие"
 
-#: src/game.cpp:326
+#: src/game.cpp:342
 #, fuzzy
 msgid "Screenshot saved as "
 msgstr "Снимок экрана сохранен в ~/"
 
-#: src/game.cpp:331
+#: src/game.cpp:347
 msgid "Saving screenshot failed!"
 msgstr "Ошибка при сохранении снимка экрана!"
 
-#: src/game.cpp:355
+#: src/game.cpp:378
 #, fuzzy
 msgid "The connection to the server was lost."
 msgstr "Соединение с сервером потеряно, завершение программы."
 
-#: src/game.cpp:360
+#: src/game.cpp:382
 msgid "Network Error"
 msgstr "Ошибка сети"
 
-#: src/game.cpp:705
+#: src/game.cpp:721
 msgid "Ignoring incoming trade requests"
 msgstr "Игнорировать предложения о торговле"
 
-#: src/game.cpp:712
+#: src/game.cpp:726
 msgid "Accepting incoming trade requests"
 msgstr "Принимать предложения о торговле"
 
-#: src/game.cpp:946
+#: src/game.cpp:954
 #, fuzzy
 msgid "Could Not Load Map"
 msgstr "Не удалось загрузить карту"
 
-#: src/game.cpp:947
+#: src/game.cpp:955
 #, c-format
 msgid "Error while loading %s"
 msgstr "Ошибка во время загрузки %s"
 
-#: src/gui/beingpopup.cpp:75
+#: src/gui/beingpopup.cpp:76
 #, fuzzy, c-format
 msgid "Party: %s"
 msgstr "Группа (%s)"
@@ -533,34 +548,34 @@ msgstr "Группа (%s)"
 msgid "Buy"
 msgstr "Купить"
 
-#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
-#: src/gui/sell.cpp:276
+#: src/gui/buy.cpp:69 src/gui/buy.cpp:261 src/gui/sell.cpp:71
+#: src/gui/sell.cpp:288
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Цена: %s / Всего: %s"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:99 src/gui/npcdialog.cpp:100
-#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:404
+#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:112 src/gui/npcdialog.cpp:124
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:463
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:98 src/gui/npcdialog.cpp:101
-#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:416
+#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:111 src/gui/npcdialog.cpp:125
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:475
 msgid "-"
 msgstr ""
 
 #: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
-#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:152
-#: src/keyboardconfig.cpp:103
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:228
+#: src/keyboardconfig.cpp:102
 msgid "Quit"
 msgstr "Выход"
 
-#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:333
-#: src/gui/statuswindow.cpp:403 src/gui/statuswindow.cpp:437
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:384
+#: src/gui/statuswindow.cpp:462 src/gui/statuswindow.cpp:496
 msgid "Max"
 msgstr "Макс"
 
@@ -574,11 +589,11 @@ msgstr "Продать"
 
 #: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
 #: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
-#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:101
-#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:178
-#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:402
+#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:114
+#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:389
 #: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
-#: src/gui/socialwindow.cpp:243 src/gui/textdialog.cpp:39
+#: src/gui/socialwindow.cpp:275 src/gui/textdialog.cpp:40
 #: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr "Отмена"
@@ -617,7 +632,7 @@ msgstr "Введенный адрес E-mail уже зарегистрирова
 msgid "Change Password"
 msgstr "Изменить пароль"
 
-#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:53
+#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:55
 #: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
 msgid "Password:"
 msgstr "Пароль:"
@@ -649,19 +664,19 @@ msgstr ""
 msgid "Create Character"
 msgstr "Создать персонажа"
 
-#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:52
+#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:54
 #: src/gui/register.cpp:67
 msgid "Name:"
 msgstr "Имя:"
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
 #: src/gui/outfitwindow.cpp:67
 msgid ">"
 msgstr ""
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
 #: src/gui/outfitwindow.cpp:66
@@ -678,8 +693,8 @@ msgstr "Цвет волос:"
 msgid "Hair style:"
 msgstr "Стрижка:"
 
-#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:397
-#: src/gui/socialwindow.cpp:297
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:392
+#: src/gui/socialwindow.cpp:329
 msgid "Create"
 msgstr "Создать"
 
@@ -735,34 +750,34 @@ msgstr "Удалить регистрацию"
 msgid "Change Email"
 msgstr "Сменить адрес E-mail"
 
-#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:155
-#: src/gui/setup_players.cpp:230
+#: src/gui/charselectdialog.cpp:336 src/gui/serverdialog.cpp:231
+#: src/gui/setup_players.cpp:229
 msgid "Delete"
 msgstr "Удалить"
 
-#: src/gui/charselectdialog.cpp:387
+#: src/gui/charselectdialog.cpp:380
 #, fuzzy
 msgid "Choose"
 msgstr "Закрыть"
 
-#: src/gui/charselectdialog.cpp:399 src/gui/charselectdialog.cpp:400
+#: src/gui/charselectdialog.cpp:394 src/gui/charselectdialog.cpp:395
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:77
+#: src/gui/chat.cpp:88
 msgid "Chat"
 msgstr "Чат"
 
-#: src/gui/chat.cpp:287
+#: src/gui/chat.cpp:311
 #, fuzzy, c-format
 msgid "Present: %s; %d players are present."
 msgstr "%d игроков он-лайн."
 
-#: src/gui/chat.cpp:305
+#: src/gui/chat.cpp:329
 msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:469
+#: src/gui/chat.cpp:493
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Вы прошептали %s: %s"
@@ -828,139 +843,169 @@ msgstr "Эффекты окружающей среды"
 msgid "Equipment"
 msgstr "Снаряжение"
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:78
-#: src/gui/inventorywindow.cpp:80 src/gui/inventorywindow.cpp:291
-#: src/gui/popupmenu.cpp:372
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:89
+#: src/gui/inventorywindow.cpp:337 src/gui/popupmenu.cpp:359
 msgid "Unequip"
 msgstr "Снять"
 
-#: src/gui/help.cpp:36
+#: src/gui/help.cpp:37
 msgid "Help"
 msgstr "Помощь"
 
-#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:74
+#: src/gui/help.cpp:51 src/gui/npcdialog.cpp:50
 msgid "Close"
 msgstr "Закрыть"
 
-#: src/gui/inventorywindow.cpp:57 src/gui/windowmenu.cpp:56
+#: src/gui/inventorywindow.cpp:59 src/gui/windowmenu.cpp:56
 msgid "Inventory"
 msgstr "Инвентарь"
 
-#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:75
-#: src/gui/inventorywindow.cpp:293 src/gui/popupmenu.cpp:374
+#: src/gui/inventorywindow.cpp:59
+msgid "Storage"
+msgstr "Хранение"
+
+#: src/gui/inventorywindow.cpp:82
+msgid "Slots:"
+msgstr "Вместимость:"
+
+#: src/gui/inventorywindow.cpp:87 src/gui/inventorywindow.cpp:100
+#: src/gui/inventorywindow.cpp:339 src/gui/popupmenu.cpp:361
 msgid "Equip"
 msgstr "Надеть"
 
-#: src/gui/inventorywindow.cpp:74 src/gui/inventorywindow.cpp:75
-#: src/gui/inventorywindow.cpp:297 src/gui/popupmenu.cpp:377
+#: src/gui/inventorywindow.cpp:88
 msgid "Use"
 msgstr "Использовать"
 
-#: src/gui/inventorywindow.cpp:84 src/gui/inventorywindow.cpp:301
-#: src/gui/popupmenu.cpp:380
+#: src/gui/inventorywindow.cpp:101 src/gui/popupmenu.cpp:364
+msgid "Activate"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:102 src/gui/inventorywindow.cpp:348
+#: src/gui/popupmenu.cpp:367
 #, fuzzy
 msgid "Drop..."
 msgstr "Бросить"
 
-#: src/gui/inventorywindow.cpp:85 src/gui/popupmenu.cpp:386
+#: src/gui/inventorywindow.cpp:103 src/gui/popupmenu.cpp:373
 msgid "Split"
 msgstr "Разделить"
 
-#: src/gui/inventorywindow.cpp:86 src/gui/outfitwindow.cpp:51
+#: src/gui/inventorywindow.cpp:104 src/gui/outfitwindow.cpp:51
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:97 src/gui/storagewindow.cpp:84
-msgid "Slots:"
-msgstr "Вместимость:"
-
-#: src/gui/inventorywindow.cpp:98
+#: src/gui/inventorywindow.cpp:106
 msgid "Weight:"
 msgstr "Вес:"
 
-#: src/gui/inventorywindow.cpp:303 src/gui/popupmenu.cpp:382
+#: src/gui/inventorywindow.cpp:124 src/gui/popupmenu.cpp:378
+msgid "Store"
+msgstr "Хранить"
+
+#: src/gui/inventorywindow.cpp:125 src/gui/popupmenu.cpp:385
+msgid "Retrieve"
+msgstr "Получить"
+
+#: src/gui/inventorywindow.cpp:350 src/gui/popupmenu.cpp:369
 msgid "Drop"
 msgstr "Бросить"
 
-#: src/gui/itemamount.cpp:100 src/gui/okdialog.cpp:42
-#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:38 src/gui/trade.cpp:73
-#: src/gui/trade.cpp:75
+#: src/gui/itemamount.cpp:113 src/gui/okdialog.cpp:42
+#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:39 src/gui/trade.cpp:72
+#: src/gui/trade.cpp:74
 msgid "OK"
 msgstr "ОК"
 
-#: src/gui/itemamount.cpp:102
+#: src/gui/itemamount.cpp:115
 msgid "All"
 msgstr "Всё"
 
-#: src/gui/itemamount.cpp:128
+#: src/gui/itemamount.cpp:141
 msgid "Select amount of items to trade."
 msgstr "Сколько предметов продать."
 
-#: src/gui/itemamount.cpp:131
+#: src/gui/itemamount.cpp:144
 msgid "Select amount of items to drop."
 msgstr "Сколько предметов сбросить."
 
-#: src/gui/itemamount.cpp:134
+#: src/gui/itemamount.cpp:147
 msgid "Select amount of items to store."
 msgstr "Укажите количество вещей для хранения."
 
-#: src/gui/itemamount.cpp:137
+#: src/gui/itemamount.cpp:150
 msgid "Select amount of items to retrieve."
 msgstr "Укажите количество вещей для изъятия."
 
-#: src/gui/itemamount.cpp:140
+#: src/gui/itemamount.cpp:153
 msgid "Select amount of items to split."
 msgstr "Сколько предметов разделить."
 
-#: src/gui/itempopup.cpp:92
+#: src/gui/itempopup.cpp:137
 #, fuzzy, c-format
 msgid "Weight: %s"
 msgstr "Вес: "
 
-#: src/gui/login.cpp:49 src/gui/login.cpp:61
+#: src/gui/login.cpp:51 src/gui/login.cpp:63
 msgid "Login"
 msgstr "Вход"
 
-#: src/gui/login.cpp:58
+#: src/gui/login.cpp:60
 #, fuzzy
 msgid "Remember username"
 msgstr "Запомнить имя пользователя"
 
-#: src/gui/login.cpp:59 src/gui/register.cpp:58 src/gui/register.cpp:73
+#: src/gui/login.cpp:61 src/gui/register.cpp:58 src/gui/register.cpp:73
 msgid "Register"
 msgstr "Зарегистрироваться"
 
-#: src/gui/login.cpp:60
+#: src/gui/login.cpp:62
 #, fuzzy
 msgid "Change Server"
 msgstr "Сервер"
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
+#: src/gui/login.cpp:129
+msgid "Registration disabled"
+msgstr ""
+
+#: src/gui/login.cpp:129
+msgid "You need to use the website to register an account for this server."
+msgstr ""
+
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:86
 msgid "Map"
 msgstr "Карта"
 
-#: src/gui/npcdialog.cpp:44
+#: src/gui/ministatus.cpp:235
+msgid "Need"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:48
 msgid "Waiting for server"
 msgstr "Ожидание ответа от сервера"
 
-#: src/gui/npcdialog.cpp:45
+#: src/gui/npcdialog.cpp:49
 msgid "Next"
 msgstr "Следующий"
 
-#: src/gui/npcdialog.cpp:47
+#: src/gui/npcdialog.cpp:51
 msgid "Submit"
 msgstr "Применить"
 
-#: src/gui/npcdialog.cpp:52 src/gui/npcpostdialog.cpp:41
+#: src/gui/npcdialog.cpp:73 src/gui/npcpostdialog.cpp:41
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:110
+#: src/gui/npcdialog.cpp:118
+msgid "Clear log"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:134
 msgid "Reset"
 msgstr "Сбросить"
 
 #. TRANSLATORS: Please leave the \n sequences intact.
-#: src/gui/npcdialog.cpp:171
+#: src/gui/npcdialog.cpp:208
 #, fuzzy
 msgid ""
 "\n"
@@ -975,7 +1020,7 @@ msgstr "Для:"
 msgid "Send"
 msgstr "Отправить"
 
-#: src/gui/npcpostdialog.cpp:96
+#: src/gui/npcpostdialog.cpp:99
 msgid "Failed to send as sender or letter invalid."
 msgstr "Невозможно послать ибо отправитель либо сообщение неверны."
 
@@ -990,98 +1035,85 @@ msgstr ""
 msgid "Unequip first"
 msgstr "Снять"
 
-#: src/gui/popupmenu.cpp:84
+#: src/gui/popupmenu.cpp:83
 #, fuzzy, c-format
 msgid "Trade with %s..."
 msgstr "@@trade|Торговать с %s@@"
 
-#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:161
+#: src/gui/popupmenu.cpp:87 src/gui/popupmenu.cpp:158
 #, fuzzy, c-format
 msgid "Attack %s"
 msgstr "Атака %+d"
 
-#: src/gui/popupmenu.cpp:92
+#: src/gui/popupmenu.cpp:91
 #, fuzzy, c-format
 msgid "Whisper %s"
 msgstr "Шептать"
 
-#: src/gui/popupmenu.cpp:101
+#: src/gui/popupmenu.cpp:100
 #, c-format
 msgid "Befriend %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:106
+#: src/gui/popupmenu.cpp:105
 #, c-format
 msgid "Disregard %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:109
+#: src/gui/popupmenu.cpp:108
 #, fuzzy, c-format
 msgid "Ignore %s"
 msgstr "Игнорировано"
 
-#: src/gui/popupmenu.cpp:115 src/gui/popupmenu.cpp:124
+#: src/gui/popupmenu.cpp:114 src/gui/popupmenu.cpp:123
 #, c-format
 msgid "Unignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:118
+#: src/gui/popupmenu.cpp:117
 #, fuzzy, c-format
 msgid "Completely ignore %s"
 msgstr "@@ignore|Полностью игнорировать %s@@"
 
 #: src/gui/popupmenu.cpp:130
-#, c-format
-msgid "Follow %s"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:133
 #, fuzzy, c-format
 msgid "Invite %s to join your guild"
 msgstr "@@guild|Пригласить %s в вашу гильдию@@"
 
-#: src/gui/popupmenu.cpp:137
+#: src/gui/popupmenu.cpp:134
 #, fuzzy, c-format
 msgid "Invite %s to join your party"
 msgstr "@@party|Пригласить %s в вашу группу@@"
 
-#: src/gui/popupmenu.cpp:144
+#: src/gui/popupmenu.cpp:141
 msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:153
+#: src/gui/popupmenu.cpp:150
 #, fuzzy, c-format
 msgid "Talk to %s"
 msgstr "@@talk|Говорить с %s@@"
 
-#: src/gui/popupmenu.cpp:166
+#: src/gui/popupmenu.cpp:163
 #, fuzzy
 msgid "Kick monster"
 msgstr "@@admin-kick|Вышвырнуть монстра@@"
 
-#: src/gui/popupmenu.cpp:174
+#: src/gui/popupmenu.cpp:171
 #, fuzzy
 msgid "Add name to chat"
 msgstr "@@chat|Добавить в чат@@"
 
-#: src/gui/popupmenu.cpp:191
+#: src/gui/popupmenu.cpp:188
 #, fuzzy, c-format
 msgid "Pick up %s"
 msgstr "Поднять"
 
-#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:400
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:387
 #, fuzzy
 msgid "Add to chat"
 msgstr "@@chat|Добавить в чат@@"
 
-#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:71
-msgid "Store"
-msgstr "Хранить"
-
-#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:72
-msgid "Retrieve"
-msgstr "Получить"
-
 #: src/gui/quitdialog.cpp:44
 msgid "Switch server"
 msgstr "Сменить сервер"
@@ -1150,52 +1182,65 @@ msgstr "Пароль не должен содержать более %d симв
 msgid "Passwords do not match."
 msgstr "Пароли не совпадают."
 
-#: src/gui/serverdialog.cpp:124
+#: src/gui/serverdialog.cpp:197
 #, fuzzy
 msgid "Choose Your Server"
 msgstr "Выберите сервер"
 
-#: src/gui/serverdialog.cpp:131 src/gui/widgets/chattab.cpp:139
+#: src/gui/serverdialog.cpp:206 src/gui/widgets/chattab.cpp:142
 msgid "Server:"
 msgstr "Сервер:"
 
-#: src/gui/serverdialog.cpp:132
+#: src/gui/serverdialog.cpp:207
 msgid "Port:"
 msgstr "Порт:"
 
-#: src/gui/serverdialog.cpp:133
+#: src/gui/serverdialog.cpp:208
 #, fuzzy
 msgid "Server type:"
 msgstr "Сервер:"
 
-#: src/gui/serverdialog.cpp:153
+#: src/gui/serverdialog.cpp:229
 #, fuzzy
 msgid "Connect"
 msgstr "Соединение..."
 
-#: src/gui/serverdialog.cpp:154
+#: src/gui/serverdialog.cpp:230
 #, fuzzy
 msgid "Custom Server"
 msgstr "Выборочный курсор"
 
-#: src/gui/serverdialog.cpp:242
+#: src/gui/serverdialog.cpp:324
 msgid "Please type both the address and the port of a server."
 msgstr "Следует указать адрес и порт сервера."
 
-#: src/gui/serverdialog.cpp:357
+#: src/gui/serverdialog.cpp:441
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:363
+#: src/gui/serverdialog.cpp:447
 #, fuzzy
 msgid "Waiting for server..."
 msgstr "Ожидание ответа от сервера"
 
-#: src/gui/serverdialog.cpp:367
+#: src/gui/serverdialog.cpp:451
 msgid "Preparing download"
 msgstr ""
 
+#: src/gui/serverdialog.cpp:455
+msgid "Error retreiving server list!"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:550
+msgid "requires a newer version"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:552
+#, c-format
+msgid "requires v%s"
+msgstr ""
+
 #: src/gui/setup_audio.cpp:42
 msgid "Sound"
 msgstr "Звук"
@@ -1229,53 +1274,53 @@ msgstr ""
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:45
+#: src/gui/setup_colors.cpp:46
 msgid "This is what the color looks like"
 msgstr "Вот, как выглядит сей цвет"
 
-#: src/gui/setup_colors.cpp:50
+#: src/gui/setup_colors.cpp:51
 msgid "Colors"
 msgstr "Цвета"
 
-#: src/gui/setup_colors.cpp:71
+#: src/gui/setup_colors.cpp:72
 #, fuzzy
 msgid "Type:"
 msgstr "Введите: "
 
-#: src/gui/setup_colors.cpp:82 src/gui/setup_colors.cpp:330
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:331
 msgid "Static"
 msgstr "Статичный"
 
-#: src/gui/setup_colors.cpp:84 src/gui/setup_colors.cpp:85
-#: src/gui/setup_colors.cpp:331
+#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
+#: src/gui/setup_colors.cpp:332
 msgid "Pulse"
 msgstr "Пульсирующий"
 
-#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:87
-#: src/gui/setup_colors.cpp:332
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
+#: src/gui/setup_colors.cpp:333
 msgid "Rainbow"
 msgstr "Радуга"
 
-#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
-#: src/gui/setup_colors.cpp:332
+#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
+#: src/gui/setup_colors.cpp:333
 msgid "Spectrum"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:94
 #, fuzzy
 msgid "Delay:"
 msgstr "Играть"
 
-#: src/gui/setup_colors.cpp:108
+#: src/gui/setup_colors.cpp:109
 msgid "Red:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:123
+#: src/gui/setup_colors.cpp:124
 #, fuzzy
 msgid "Green:"
 msgstr "Он-лайн: "
 
-#: src/gui/setup_colors.cpp:138
+#: src/gui/setup_colors.cpp:139
 #, fuzzy
 msgid "Blue:"
 msgstr "Синий: "
@@ -1333,586 +1378,587 @@ msgstr "По умолчанию"
 msgid "Key Conflict(s) Detected."
 msgstr "Обнаружены конфликты клавиш!"
 
-#: src/gui/setup_players.cpp:57
+#: src/gui/setup_players.cpp:58
 msgid "Name"
 msgstr "Имя"
 
-#: src/gui/setup_players.cpp:58
+#: src/gui/setup_players.cpp:59
 msgid "Relation"
 msgstr "Отношение"
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:64
 msgid "Neutral"
 msgstr "Нейтральное"
 
-#: src/gui/setup_players.cpp:64
+#: src/gui/setup_players.cpp:65
 msgid "Friend"
 msgstr "Друг"
 
-#: src/gui/setup_players.cpp:65
+#: src/gui/setup_players.cpp:66
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_players.cpp:67
 msgid "Ignored"
 msgstr "Игнорировано"
 
-#: src/gui/setup_players.cpp:208 src/gui/setup_video.cpp:132
+#: src/gui/setup_players.cpp:206 src/gui/setup_video.cpp:153
 msgid "???"
 msgstr "???"
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_players.cpp:225
 msgid "Allow trading"
 msgstr "Разрешить торговлю"
 
-#: src/gui/setup_players.cpp:228
+#: src/gui/setup_players.cpp:227
 msgid "Allow whispers"
 msgstr "Разрешить шептание"
 
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:231
 msgid "Put all whispers in tabs"
 msgstr "Личные сообщения во вкладках"
 
-#: src/gui/setup_players.cpp:234
+#: src/gui/setup_players.cpp:233
 #, fuzzy
 msgid "Show gender"
 msgstr "Показать имя"
 
-#: src/gui/setup_players.cpp:236
+#: src/gui/setup_players.cpp:235
+#, fuzzy
+msgid "Enable Chat log"
+msgstr "Низзя продать!"
+
+#: src/gui/setup_players.cpp:237
 msgid "Players"
 msgstr "Игроки"
 
-#: src/gui/setup_players.cpp:261
+#: src/gui/setup_players.cpp:262
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:113
+#: src/gui/setup_video.cpp:134
 msgid "Tiny"
 msgstr "Маленький"
 
-#: src/gui/setup_video.cpp:114
+#: src/gui/setup_video.cpp:135
 msgid "Small"
 msgstr "Маленький"
 
-#: src/gui/setup_video.cpp:115
+#: src/gui/setup_video.cpp:136
 msgid "Medium"
 msgstr "Средний"
 
-#: src/gui/setup_video.cpp:116
+#: src/gui/setup_video.cpp:137
 msgid "Large"
 msgstr "Большой"
 
-#: src/gui/setup_video.cpp:142
+#: src/gui/setup_video.cpp:163
 msgid "No text"
 msgstr "Нет текста"
 
-#: src/gui/setup_video.cpp:143
+#: src/gui/setup_video.cpp:164
 msgid "Text"
 msgstr "Текст"
 
-#: src/gui/setup_video.cpp:144
+#: src/gui/setup_video.cpp:165
 msgid "Bubbles, no names"
 msgstr "Пузырьки, без названий"
 
-#: src/gui/setup_video.cpp:145
+#: src/gui/setup_video.cpp:166
 msgid "Bubbles with names"
 msgstr "Пузырьки с названиями"
 
-#: src/gui/setup_video.cpp:157
+#: src/gui/setup_video.cpp:178
 msgid "off"
 msgstr "выкл"
 
-#: src/gui/setup_video.cpp:158 src/gui/setup_video.cpp:171
+#: src/gui/setup_video.cpp:179 src/gui/setup_video.cpp:192
 msgid "low"
 msgstr "низ."
 
-#: src/gui/setup_video.cpp:159 src/gui/setup_video.cpp:173
+#: src/gui/setup_video.cpp:180 src/gui/setup_video.cpp:194
 msgid "high"
 msgstr "выс."
 
-#: src/gui/setup_video.cpp:172
+#: src/gui/setup_video.cpp:193
 msgid "medium"
 msgstr "средне"
 
-#: src/gui/setup_video.cpp:174
+#: src/gui/setup_video.cpp:195
 msgid "max"
 msgstr "максимальное"
 
-#: src/gui/setup_video.cpp:196
+#: src/gui/setup_video.cpp:217
 msgid "Full screen"
 msgstr "На полный экран"
 
-#: src/gui/setup_video.cpp:197
+#: src/gui/setup_video.cpp:218
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:198
+#: src/gui/setup_video.cpp:219
 msgid "Custom cursor"
 msgstr "Выборочный курсор"
 
-#: src/gui/setup_video.cpp:200
+#: src/gui/setup_video.cpp:221
 msgid "Visible names"
 msgstr "Видимые имена"
 
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:223
 msgid "Particle effects"
 msgstr "Эффекты частиц"
 
-#: src/gui/setup_video.cpp:204
+#: src/gui/setup_video.cpp:225
 #, fuzzy
 msgid "Show own name"
 msgstr "Показать имя"
 
-#: src/gui/setup_video.cpp:205
+#: src/gui/setup_video.cpp:226
+msgid "Log NPC dialogue"
+msgstr ""
+
+#: src/gui/setup_video.cpp:227
 msgid "Show pickup notification"
 msgstr "Показать уведомление о подборе предмета"
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:207
+#. TRANSLATORS: Refers to "Show pickup notification"
+#: src/gui/setup_video.cpp:229
 msgid "in chat"
 msgstr ""
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:209
+#. TRANSLATORS: Refers to "Show pickup notification"
+#: src/gui/setup_video.cpp:231
 msgid "as particle"
 msgstr ""
 
-#: src/gui/setup_video.cpp:214
+#: src/gui/setup_video.cpp:236
 #, fuzzy
 msgid "FPS limit:"
 msgstr "Ограничение кадр/с:"
 
-#: src/gui/setup_video.cpp:225
+#: src/gui/setup_video.cpp:247
+msgid "Disable transparency (Low CPU mode)"
+msgstr ""
+
+#: src/gui/setup_video.cpp:250
 msgid "Video"
 msgstr "Видео"
 
-#: src/gui/setup_video.cpp:227
+#: src/gui/setup_video.cpp:252
 #, fuzzy
-msgid "Show monster damage"
+msgid "Show damage"
 msgstr "Показать имя"
 
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:258
 msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:259
 msgid "Gui opacity"
 msgstr "Прозрачность интерфейса"
 
-#: src/gui/setup_video.cpp:235
+#: src/gui/setup_video.cpp:260
 msgid "Ambient FX"
 msgstr "Эффекты окружающей среды"
 
-#: src/gui/setup_video.cpp:236
+#: src/gui/setup_video.cpp:261
 #, fuzzy
 msgid "Particle detail"
 msgstr "Качество частиц"
 
-#: src/gui/setup_video.cpp:237
+#: src/gui/setup_video.cpp:262
 msgid "Font size"
 msgstr "Размер шрифта"
 
-#: src/gui/setup_video.cpp:251 src/gui/setup_video.cpp:454
-#: src/gui/setup_video.cpp:568
+#: src/gui/setup_video.cpp:277 src/gui/setup_video.cpp:532
+#: src/gui/setup_video.cpp:662
 #, fuzzy
 msgid "None"
 msgstr "Нет"
 
-#: src/gui/setup_video.cpp:381
+#: src/gui/setup_video.cpp:426
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:387
+#: src/gui/setup_video.cpp:432
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:398
+#: src/gui/setup_video.cpp:443
 #, fuzzy
 msgid "Switching to Full Screen"
 msgstr "Переключение в полноэкранный режим"
 
-#: src/gui/setup_video.cpp:399
+#: src/gui/setup_video.cpp:444
 msgid "Restart needed for changes to take effect."
 msgstr "Для вступления в силу выбранных настроек требуется перезагрузка игры."
 
-#: src/gui/setup_video.cpp:411
+#: src/gui/setup_video.cpp:458
 #, fuzzy
 msgid "Changing to OpenGL"
 msgstr "Переключение на OpenGL"
 
-#: src/gui/setup_video.cpp:412
+#: src/gui/setup_video.cpp:459
+msgid ""
+"Applying change to OpenGL requires restart. In case OpenGL messes up your "
+"game graphics, restart the game with the command line option \"--no-opengl\"."
+msgstr ""
+
+#: src/gui/setup_video.cpp:466
+msgid "Deactivating OpenGL"
+msgstr ""
+
+#: src/gui/setup_video.cpp:467
 msgid "Applying change to OpenGL requires restart."
 msgstr "Переход к OpenGL требует перезагрузки игры."
 
-#: src/gui/setup_video.cpp:486 src/gui/setup_video.cpp:491
+#: src/gui/setup_video.cpp:475
+msgid "Transparency disabled"
+msgstr ""
+
+#: src/gui/setup_video.cpp:476 src/gui/setup_video.cpp:484
+msgid "You must restart to apply changes."
+msgstr ""
+
+#: src/gui/setup_video.cpp:483
+msgid "Transparency enabled"
+msgstr ""
+
+#: src/gui/setup_video.cpp:576 src/gui/setup_video.cpp:581
 msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:487 src/gui/setup_video.cpp:492
+#: src/gui/setup_video.cpp:577 src/gui/setup_video.cpp:582
 msgid "Restart your client for the change to take effect."
 msgstr "Перезегрузите игру дабы изменения вступили в силу"
 
-#: src/gui/setup_video.cpp:489
+#: src/gui/setup_video.cpp:579
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:522
+#: src/gui/setup_video.cpp:612
 #, fuzzy
 msgid "Particle Effect Settings Changed."
 msgstr "Эффекты частиц"
 
-#: src/gui/setup_video.cpp:523
+#: src/gui/setup_video.cpp:613
 msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skilldialog.cpp:198 src/gui/windowmenu.cpp:59
+#: src/gui/skilldialog.cpp:212 src/gui/windowmenu.cpp:59
 msgid "Skills"
 msgstr "Умения"
 
-#: src/gui/skilldialog.cpp:209
+#: src/gui/skilldialog.cpp:223
 msgid "Up"
 msgstr "Верх"
 
-#: src/gui/skilldialog.cpp:263
+#: src/gui/skilldialog.cpp:269
 #, fuzzy, c-format
 msgid "Skill points available: %d"
 msgstr "Очков навыков: %d"
 
-#: src/gui/skilldialog.cpp:315
+#: src/gui/skilldialog.cpp:351
 #, fuzzy, c-format
 msgid "Skill Set %d"
 msgstr "Очков навыков: %d"
 
-#: src/gui/skilldialog.cpp:324
+#: src/gui/skilldialog.cpp:360
 #, fuzzy, c-format
 msgid "Skill %d"
 msgstr "Умения"
 
-#: src/gui/skilldialog.cpp:406
+#: src/gui/skilldialog.cpp:442
 #, fuzzy, c-format
 msgid "Lvl: %d (%+d)"
 msgstr "Уровень: %d"
 
-#: src/gui/skilldialog.cpp:417
+#: src/gui/skilldialog.cpp:453
 #, fuzzy, c-format
 msgid "Lvl: %d"
 msgstr "Уровень: %d"
 
-#: src/gui/socialwindow.cpp:118
+#: src/gui/socialwindow.cpp:126
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:127
+#: src/gui/socialwindow.cpp:139
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:137
+#: src/gui/socialwindow.cpp:153
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:138
+#: src/gui/socialwindow.cpp:154
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:147
+#: src/gui/socialwindow.cpp:163
 #, fuzzy
 msgid "Leave Guild?"
 msgstr "Создать Гильдию"
 
-#: src/gui/socialwindow.cpp:148
+#: src/gui/socialwindow.cpp:164
 #, fuzzy, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Вы действительно хотите выйти?"
 
-#: src/gui/socialwindow.cpp:183
+#: src/gui/socialwindow.cpp:207 src/net/tmwa/partyhandler.cpp:330
 #, fuzzy, c-format
 msgid "Invited user %s to party."
 msgstr "Пригласить пользователя на канал"
 
-#: src/gui/socialwindow.cpp:190
+#: src/gui/socialwindow.cpp:218
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:200
+#: src/gui/socialwindow.cpp:232
 #, fuzzy
 msgid "Member Invite to Party"
 msgstr "Пригласить пользователя на канал"
 
-#: src/gui/socialwindow.cpp:201
+#: src/gui/socialwindow.cpp:233
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:210
+#: src/gui/socialwindow.cpp:242
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:211
+#: src/gui/socialwindow.cpp:243
 #, fuzzy, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Вы действительно хотите выйти?"
 
-#: src/gui/socialwindow.cpp:240
+#: src/gui/socialwindow.cpp:272
 msgid "Create Guild"
 msgstr "Создать Гильдию"
 
-#: src/gui/socialwindow.cpp:241 src/gui/socialwindow.cpp:565
+#: src/gui/socialwindow.cpp:273 src/gui/socialwindow.cpp:620
 #, fuzzy
 msgid "Create Party"
 msgstr "Создать персонажа"
 
-#: src/gui/socialwindow.cpp:280 src/gui/windowmenu.cpp:64
+#: src/gui/socialwindow.cpp:312 src/gui/windowmenu.cpp:64
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:298
+#: src/gui/socialwindow.cpp:330
 #, fuzzy
 msgid "Invite"
 msgstr "Пригласить пользователя"
 
-#: src/gui/socialwindow.cpp:299
+#: src/gui/socialwindow.cpp:331
 #, fuzzy
 msgid "Leave"
 msgstr "Большой"
 
-#: src/gui/socialwindow.cpp:395
+#: src/gui/socialwindow.cpp:443
 #, fuzzy, c-format
 msgid "Accepted party invite from %s."
 msgstr "Принять приглашение от %s."
 
-#: src/gui/socialwindow.cpp:401
+#: src/gui/socialwindow.cpp:449
 #, fuzzy, c-format
 msgid "Rejected party invite from %s."
 msgstr "Отклонено приглашение от %s."
 
-#: src/gui/socialwindow.cpp:414
+#: src/gui/socialwindow.cpp:462
 #, fuzzy, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Принять приглашение от %s."
 
-#: src/gui/socialwindow.cpp:420
+#: src/gui/socialwindow.cpp:468
 #, fuzzy, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Отклонено приглашение от %s."
 
-#: src/gui/socialwindow.cpp:464
+#: src/gui/socialwindow.cpp:497
+msgid "Creating guild failed, please choose a shorter name."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:504
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:478
+#: src/gui/socialwindow.cpp:520
+msgid "Creating party failed, please choose a shorter name."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:527
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:485
+#: src/gui/socialwindow.cpp:541
 #, fuzzy
 msgid "Guild Name"
 msgstr "Гильдия"
 
-#: src/gui/socialwindow.cpp:486
+#: src/gui/socialwindow.cpp:542
 #, fuzzy
 msgid "Choose your guild's name."
 msgstr "Выберите сервер"
 
-#: src/gui/socialwindow.cpp:498
+#: src/gui/socialwindow.cpp:554
 #, fuzzy
 msgid "Received guild request, but one already exists."
 msgstr "Получено приглашение в группу, но уже одно есть"
 
-#: src/gui/socialwindow.cpp:503
+#: src/gui/socialwindow.cpp:559
 #, fuzzy, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s приглашает присоединиться к %s группе."
 
-#: src/gui/socialwindow.cpp:508
+#: src/gui/socialwindow.cpp:564
 #, fuzzy
 msgid "Accept Guild Invite"
 msgstr "Принять приглашение в группу"
 
-#: src/gui/socialwindow.cpp:520
+#: src/gui/socialwindow.cpp:576
 msgid "Received party request, but one already exists."
 msgstr "Получено приглашение в группу, но уже одно есть"
 
-#: src/gui/socialwindow.cpp:530
+#: src/gui/socialwindow.cpp:585
 #, fuzzy
 msgid "You have been invited you to join a party."
 msgstr "%s приглашает вас к себе в группу."
 
-#: src/gui/socialwindow.cpp:534
+#: src/gui/socialwindow.cpp:589
 #, fuzzy, c-format
 msgid "You have been invited to join the %s party."
 msgstr "%s приглашает присоединиться к %s группе."
 
-#: src/gui/socialwindow.cpp:542
+#: src/gui/socialwindow.cpp:597
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s приглашает вас к себе в группу."
 
-#: src/gui/socialwindow.cpp:547
+#: src/gui/socialwindow.cpp:602
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s приглашает присоединиться к %s группе."
 
-#: src/gui/socialwindow.cpp:555
+#: src/gui/socialwindow.cpp:610
 msgid "Accept Party Invite"
 msgstr "Принять приглашение в группу"
 
-#: src/gui/socialwindow.cpp:566
+#: src/gui/socialwindow.cpp:621
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:571
+#: src/gui/socialwindow.cpp:626
 #, fuzzy
 msgid "Party Name"
 msgstr "Группа"
 
-#: src/gui/socialwindow.cpp:572
+#: src/gui/socialwindow.cpp:627
 #, fuzzy
 msgid "Choose your party's name."
 msgstr "Выберите сервер"
 
-#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:62
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:62
 msgid "Specials"
 msgstr ""
 
-#: src/gui/specialswindow.cpp:174
-#, c-format
-msgid "Specials Set %d"
-msgstr ""
-
-#: src/gui/specialswindow.cpp:191
-#, c-format
-msgid "Special %d"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:247
+#: src/gui/statuswindow.cpp:113 src/gui/statuswindow.cpp:215
+#: src/gui/statuswindow.cpp:262
 #, c-format
 msgid "Level: %d"
 msgstr "Уровень: %d"
 
-#: src/gui/statuswindow.cpp:101 src/gui/statuswindow.cpp:211
+#: src/gui/statuswindow.cpp:114 src/gui/statuswindow.cpp:208
+#: src/gui/statuswindow.cpp:239
 #, c-format
 msgid "Money: %s"
 msgstr "Деньги: %s"
 
-#: src/gui/statuswindow.cpp:104
+#: src/gui/statuswindow.cpp:117
 msgid "HP:"
 msgstr "ЖО:"
 
-#: src/gui/statuswindow.cpp:109
+#: src/gui/statuswindow.cpp:122
 msgid "Exp:"
 msgstr "Exp:"
 
-#: src/gui/statuswindow.cpp:114
+#: src/gui/statuswindow.cpp:130
 msgid "MP:"
 msgstr "Мана:"
 
-#: src/gui/statuswindow.cpp:132 src/gui/statuswindow.cpp:219
+#: src/gui/statuswindow.cpp:158 src/gui/statuswindow.cpp:275
 #, c-format
 msgid "Job: %d"
 msgstr "Профессия: %d"
 
-#: src/gui/statuswindow.cpp:133
+#: src/gui/statuswindow.cpp:159
 msgid "Job:"
 msgstr "Профессия:"
 
-#: src/gui/statuswindow.cpp:194
-#, fuzzy
-msgid "HP"
-msgstr "ЖО:"
-
-#: src/gui/statuswindow.cpp:200
-#, fuzzy
-msgid "MP"
-msgstr "Мана:"
-
-#: src/gui/statuswindow.cpp:206
-#, fuzzy
-msgid "Exp"
-msgstr "Exp:"
-
-#: src/gui/statuswindow.cpp:215
-#, fuzzy
-msgid "Money"
-msgstr "Деньги: %d"
-
-#: src/gui/statuswindow.cpp:225
-#, fuzzy
-msgid "Job"
-msgstr "Профессия:"
-
-#: src/gui/statuswindow.cpp:229
+#: src/gui/statuswindow.cpp:211 src/gui/statuswindow.cpp:247
 #, fuzzy, c-format
 msgid "Character points: %d"
 msgstr "Данные персонажа в порядке"
 
-#: src/gui/statuswindow.cpp:235
+#: src/gui/statuswindow.cpp:255
 #, fuzzy, c-format
 msgid "Correction points: %d"
 msgstr "Очков навыков: %d"
 
-#: src/gui/statuswindow.cpp:251
-#, fuzzy
-msgid "Level"
-msgstr "Уровень: %d"
-
-#: src/gui/storagewindow.cpp:59
-msgid "Storage"
-msgstr "Хранение"
-
-#: src/gui/trade.cpp:52
+#: src/gui/trade.cpp:53
 msgid "Propose trade"
 msgstr "Предложить торговлю"
 
-#: src/gui/trade.cpp:53
+#: src/gui/trade.cpp:54
 msgid "Confirmed. Waiting..."
 msgstr "Подтверждено. Ждем-с..."
 
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:55
 msgid "Agree trade"
 msgstr "Подтвердить торговлю"
 
-#: src/gui/trade.cpp:55
+#: src/gui/trade.cpp:56
 msgid "Agreed. Waiting..."
 msgstr "Подтверждено. Ждем-с..."
 
-#: src/gui/trade.cpp:58
+#: src/gui/trade.cpp:59
 msgid "Trade: You"
 msgstr "Торговля: Вы"
 
-#: src/gui/trade.cpp:74 src/gui/trade.cpp:75
+#: src/gui/trade.cpp:73 src/gui/trade.cpp:74
 msgid "Trade"
 msgstr "Торговать"
 
-#: src/gui/trade.cpp:77
+#: src/gui/trade.cpp:76
 msgid "Add"
 msgstr "Добавить"
 
-#: src/gui/trade.cpp:99 src/gui/trade.cpp:135
+#: src/gui/trade.cpp:98 src/gui/trade.cpp:134
 #, fuzzy, c-format
 msgid "You get %s"
 msgstr "Вы получили %s."
 
-#: src/gui/trade.cpp:100
+#: src/gui/trade.cpp:99
 msgid "You give:"
 msgstr "Вы отдаете:"
 
-#: src/gui/trade.cpp:104
+#: src/gui/trade.cpp:103
 msgid "Change"
 msgstr "Сменить"
 
-#: src/gui/trade.cpp:275
+#: src/gui/trade.cpp:262
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/trade.cpp:318
+#: src/gui/trade.cpp:304
 msgid "You don't have enough money."
 msgstr "У вас недостаточно денег"
 
@@ -1933,22 +1979,22 @@ msgstr "Соединение..."
 msgid "Play"
 msgstr "Играть"
 
-#: src/gui/updatewindow.cpp:405
+#: src/gui/updatewindow.cpp:417
 msgid "##1  The update process is incomplete."
 msgstr "##1  Процесс обновления не завершен!"
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:407
+#: src/gui/updatewindow.cpp:419
 msgid "##1  It is strongly recommended that"
 msgstr "##1  Настоятельно рекомендуется"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:409
+#: src/gui/updatewindow.cpp:421
 #, fuzzy
 msgid "##1  you try again later."
 msgstr "##1  попытаться еще раз немного погодя"
 
-#: src/gui/updatewindow.cpp:501
+#: src/gui/updatewindow.cpp:515
 msgid "Completed"
 msgstr "Завершено"
 
@@ -2029,55 +2075,55 @@ msgstr ""
 msgid "Need a user to kick!"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:118
+#: src/gui/widgets/chattab.cpp:121
 msgid "Global announcement:"
 msgstr "Глобальное объявление:"
 
-#: src/gui/widgets/chattab.cpp:124
+#: src/gui/widgets/chattab.cpp:127
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "Глобальное объявление от %s:"
 
-#: src/gui/widgets/chattab.cpp:150
+#: src/gui/widgets/chattab.cpp:153
 #, fuzzy, c-format
 msgid "%s whispers: %s"
 msgstr "%s шепчет: "
 
-#: src/gui/widgets/whispertab.cpp:51
+#: src/gui/widgets/whispertab.cpp:53
 msgid "Cannot send empty chat!"
 msgstr "Низзя послать пустое сообщение!"
 
-#: src/gui/widgets/whispertab.cpp:70
+#: src/gui/widgets/whispertab.cpp:72
 msgid "/ignore > Ignore the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:71
+#: src/gui/widgets/whispertab.cpp:73
 msgid "/unignore > Stop ignoring the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:72
+#: src/gui/widgets/whispertab.cpp:74
 msgid "/close > Close the whisper tab"
 msgstr "/close > Закрыть вкладку перешептывания"
 
-#: src/gui/widgets/whispertab.cpp:82
+#: src/gui/widgets/whispertab.cpp:84
 msgid "Command: /close"
 msgstr "Комманда: /close"
 
-#: src/gui/widgets/whispertab.cpp:83
+#: src/gui/widgets/whispertab.cpp:85
 msgid "This command closes the current whisper tab."
 msgstr "Закрывает вкладку перешептывания"
 
-#: src/gui/widgets/whispertab.cpp:87
+#: src/gui/widgets/whispertab.cpp:89
 #, fuzzy
 msgid "Command: /ignore"
 msgstr "Команда: /where"
 
-#: src/gui/widgets/whispertab.cpp:88
+#: src/gui/widgets/whispertab.cpp:90
 #, fuzzy
 msgid "This command ignores the other player regardless of current relations."
 msgstr "Эта команда показывает число пользователей в сети на данный момент."
 
-#: src/gui/widgets/whispertab.cpp:94
+#: src/gui/widgets/whispertab.cpp:96
 #, fuzzy
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr "Эта команда начнет протоколирование окна чата в файл <имя файла>."
@@ -2105,1411 +2151,1452 @@ msgstr "Сменить"
 msgid "Choose World"
 msgstr "Выберите сервер"
 
-#: src/keyboardconfig.cpp:40
+#: src/keyboardconfig.cpp:39
 msgid "Move Up"
 msgstr "Двигаться вверх"
 
-#: src/keyboardconfig.cpp:41
+#: src/keyboardconfig.cpp:40
 msgid "Move Down"
 msgstr "Двигаться вниз"
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:41
 msgid "Move Left"
 msgstr "Двигаться влево"
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:42
 msgid "Move Right"
 msgstr "Двигаться вправо"
 
-#: src/keyboardconfig.cpp:44 src/net/ea/generalhandler.cpp:223
+#: src/keyboardconfig.cpp:43 src/net/tmwa/generalhandler.cpp:237
 msgid "Attack"
 msgstr "Атаковать"
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:44
 msgid "Target & Attack"
 msgstr "Прицелиться и атаковать"
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:45
 msgid "Smilie"
 msgstr "Улыбнуться"
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:46
 msgid "Talk"
 msgstr "Говорить"
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:47
 msgid "Stop Attack"
 msgstr "Прекратить атаку"
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:48
 #, fuzzy
 msgid "Target Monster"
 msgstr "Прицелиться на ближайшего"
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboardconfig.cpp:49
 msgid "Target NPC"
 msgstr "Прицелиться на NPC"
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:50
 msgid "Target Player"
 msgstr "Прицелиться на игрока"
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:51
 msgid "Pickup"
 msgstr "Поднять"
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:52
 msgid "Hide Windows"
 msgstr "Скрыть окна"
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:53
 msgid "Sit"
 msgstr "Сесть"
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:54
 msgid "Screenshot"
 msgstr "Сделать скриншот"
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:55
 msgid "Enable/Disable Trading"
 msgstr "Разрешить/Запретить торговлю"
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:56
 msgid "Find Path to Mouse"
 msgstr "Идти за курсором мыши"
 
-#: src/keyboardconfig.cpp:58 src/keyboardconfig.cpp:59
-#: src/keyboardconfig.cpp:60 src/keyboardconfig.cpp:61
-#: src/keyboardconfig.cpp:62 src/keyboardconfig.cpp:63
-#: src/keyboardconfig.cpp:64 src/keyboardconfig.cpp:65
-#: src/keyboardconfig.cpp:66 src/keyboardconfig.cpp:67
-#: src/keyboardconfig.cpp:68 src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:57 src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60
+#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62
+#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64
+#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68
 #, c-format
 msgid "Item Shortcut %d"
 msgstr "Комбинация клавиш предмета %d"
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:69
 msgid "Help Window"
 msgstr "Окно помощи"
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:70
 msgid "Status Window"
 msgstr "Окно статуса"
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:71
 msgid "Inventory Window"
 msgstr "Окно инвентаря"
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:72
 msgid "Equipment Window"
 msgstr "Окно екипировки"
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:73
 msgid "Skill Window"
 msgstr "Окно навыков"
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:74
 msgid "Minimap Window"
 msgstr "Окно мини-карты"
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:75
 msgid "Chat Window"
 msgstr "Окно чата"
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:76
 msgid "Item Shortcut Window"
 msgstr "Окно комбинаций клавиш предметов"
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:77
 msgid "Setup Window"
 msgstr "Окно настроек"
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:78
 msgid "Debug Window"
 msgstr "Окно отладки"
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:79
 #, fuzzy
 msgid "Social Window"
 msgstr "Окно навыков"
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:80
 msgid "Emote Shortcut Window"
 msgstr "Окно емоций"
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:81
 #, fuzzy
 msgid "Outfits Window"
 msgstr "Окно статуса"
 
-#: src/keyboardconfig.cpp:83
+#: src/keyboardconfig.cpp:82
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:83
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86
-#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88
-#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90
-#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92
-#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:84 src/keyboardconfig.cpp:85
+#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:87
+#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:89
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:91
+#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:93
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:95
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "Комбинация клавиш для емоции %d"
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:96
 msgid "Toggle Chat"
 msgstr "Переключится на чат"
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:97
 msgid "Scroll Chat Up"
 msgstr "Прокрутить чат вверх"
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:98
 msgid "Scroll Chat Down"
 msgstr "Прокрутить чат вниз"
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:99
 msgid "Previous Chat Tab"
 msgstr "Предыдущая закладка чата"
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:100
 msgid "Next Chat Tab"
 msgstr "Следующая закладка чата"
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:101
 msgid "Select OK"
 msgstr "Выбрать Ok"
 
-#: src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:103
 msgid "Ignore input 1"
 msgstr "Игнорировать ввод 1"
 
-#: src/keyboardconfig.cpp:105
+#: src/keyboardconfig.cpp:104
 msgid "Ignore input 2"
 msgstr "Игнорировать ввод 2"
 
-#: src/keyboardconfig.cpp:184
+#: src/keyboardconfig.cpp:183
 #, fuzzy, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr "Исправьте их, или игра может себя странно вести."
 
-#: src/localplayer.cpp:914
+#: src/localplayer.cpp:985
 msgid "Unable to pick up item."
 msgstr ""
 
 #. TRANSLATORS: This sentence may be translated differently
 #. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:923
+#: src/localplayer.cpp:994
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/main.cpp:43
+#: src/main.cpp:42
 msgid "mana [options] [mana-file]"
 msgstr ""
 
+#: src/main.cpp:43
+msgid "[mana-file] : The mana file is an XML file (.mana)"
+msgstr ""
+
 #: src/main.cpp:44
+msgid "              used to set custom parameters"
+msgstr ""
+
+#: src/main.cpp:45
+msgid "              to the mana client."
+msgstr ""
+
+#: src/main.cpp:47
 msgid "Options:"
 msgstr "Опции:"
 
-#: src/main.cpp:45
+#: src/main.cpp:48
 msgid "  -v --version        : Display the version"
 msgstr ""
 
-#: src/main.cpp:46
+#: src/main.cpp:49
 #, fuzzy
 msgid "  -h --help           : Display this help"
 msgstr "/help > Отображает этот текст"
 
-#: src/main.cpp:47
+#: src/main.cpp:50
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
-#: src/main.cpp:48
+#: src/main.cpp:51
 msgid "  -U --username       : Login with this username"
 msgstr ""
 
-#: src/main.cpp:49
+#: src/main.cpp:52
 msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/main.cpp:50
+#: src/main.cpp:53
 msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/main.cpp:51
+#: src/main.cpp:54
 msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:52
+#: src/main.cpp:55
 msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/main.cpp:53
+#: src/main.cpp:56
 msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/main.cpp:54
+#: src/main.cpp:57
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:56
+#: src/main.cpp:59
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:57
+#: src/main.cpp:60
 msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:58
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
+#: src/main.cpp:61
+msgid "     --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/main.cpp:59
+#: src/main.cpp:62
+msgid "     --chat-log-dir   : Chat log dir to use"
+msgstr ""
+
+#: src/main.cpp:63
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/main.cpp:61
+#: src/main.cpp:65
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:63
+#: src/net/manaserv/beinghandler.cpp:303 src/net/tmwa/playerhandler.cpp:94
+msgid "You are dead."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:304 src/net/tmwa/playerhandler.cpp:95
+msgid "We regret to inform you that your character was killed in battle."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:306 src/net/tmwa/playerhandler.cpp:97
+msgid "You are not that alive anymore."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:307 src/net/tmwa/playerhandler.cpp:98
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:308 src/net/tmwa/playerhandler.cpp:99
+msgid "Game Over!"
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:309 src/net/tmwa/playerhandler.cpp:101
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:311 src/net/tmwa/playerhandler.cpp:103
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:313 src/net/tmwa/playerhandler.cpp:105
+msgid "I guess this did not run too well."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:107
+msgid "Do you want your possessions identified?"
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:109
+msgid "Sadly, no trace of you was ever found..."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:111
+msgid "Annihilated."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:113
+msgid "Looks like you got your head handed to you."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:115
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:323
+msgid "Press OK to respawn."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:324
+#, fuzzy
+msgid "You Died"
+msgstr "Вы отдаете:"
+
+#: src/net/manaserv/charhandler.cpp:138 src/net/manaserv/charhandler.cpp:209
+#, fuzzy
+msgid "Not logged in."
+msgstr "Уже в сети"
+
+#: src/net/manaserv/charhandler.cpp:141
+msgid "No empty slot."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:144
+msgid "Invalid name."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:147
+#, fuzzy
+msgid "Character's name already exists."
+msgstr "Пользователь с таким именем уже существует"
+
+#: src/net/manaserv/charhandler.cpp:150
+msgid "Invalid hairstyle."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:153
+msgid "Invalid hair color."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:156
+msgid "Invalid gender."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:159
+#, fuzzy
+msgid "Character's stats are too high."
+msgstr "Данные персонажа в порядке"
+
+#: src/net/manaserv/charhandler.cpp:162
+#, fuzzy
+msgid "Character's stats are too low."
+msgstr "Данные персонажа в порядке"
+
+#: src/net/manaserv/charhandler.cpp:165
+#, c-format
+msgid "At least one statis out of the permitted range: (%u - %u)."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:171 src/net/manaserv/loginhandler.cpp:96
+#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
+#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
+#: src/net/tmwa/loginhandler.cpp:95 src/net/tmwa/loginhandler.cpp:182
+#, fuzzy
+msgid "Unknown error."
+msgstr "Неизвестный предмет"
+
+#: src/net/manaserv/charhandler.cpp:200 src/net/tmwa/charserverhandler.cpp:146
+msgid "Info"
+msgstr "Сведения"
+
+#: src/net/manaserv/charhandler.cpp:200
+#, fuzzy
+msgid "Player deleted."
+msgstr "Персонаж удален"
+
+#: src/net/manaserv/charhandler.cpp:212
+#, fuzzy
+msgid "Selection out of range."
+msgstr "Сколько предметов продать."
+
+#: src/net/manaserv/charhandler.cpp:215
+#, fuzzy, c-format
+msgid "Unknown error (%d)."
+msgstr "Неизвестная команда."
+
+#: src/net/manaserv/charhandler.cpp:250
+msgid "No gameservers are available."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:187 src/net/manaserv/chathandler.cpp:313
+#: src/net/manaserv/guildhandler.cpp:260
+#, c-format
+msgid "Topic: %s"
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:274
+#, fuzzy
+msgid "Players in this channel:"
+msgstr "Удары игрока по монстру"
+
+#: src/net/manaserv/chathandler.cpp:208
+#, fuzzy
+msgid "Error joining channel."
+msgstr "Команда: /join <канал>"
+
+#: src/net/manaserv/chathandler.cpp:214
+#, fuzzy
+msgid "Listing channels."
+msgstr "Запрос на присоединение к каналу %s."
+
+#: src/net/manaserv/chathandler.cpp:226
+msgid "End of channel list."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:303
+#, fuzzy, c-format
+msgid "%s entered the channel."
+msgstr "%s теперь в группе."
+
+#: src/net/manaserv/chathandler.cpp:308
+#, c-format
+msgid "%s left the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:324
+#, c-format
+msgid "%s has set mode %s on user %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:334
+#, c-format
+msgid "%s has kicked %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:339
+#, fuzzy
+msgid "Unknown channel event."
+msgstr "Неизвестная команда."
+
+#: src/net/manaserv/guildhandler.cpp:82
+msgid "Guild created."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:87
+msgid "Error creating guild."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:97
+msgid "Invite sent."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:204
+msgid "Member was promoted successfully."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:209
+msgid "Failed to promote member."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:87
+msgid "Wrong magic_token."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
+#, fuzzy
+msgid "Already logged in."
+msgstr "Уже в сети"
+
+#: src/net/manaserv/loginhandler.cpp:93
+#, fuzzy
+msgid "Account banned."
+msgstr "Учётная запись: %s"
+
+#: src/net/manaserv/loginhandler.cpp:118
+#, fuzzy
+msgid "New password incorrect."
+msgstr "Новый адрес E-mail указан неверно"
+
+#: src/net/manaserv/loginhandler.cpp:121 src/net/tmwa/loginhandler.cpp:89
+#, fuzzy
+msgid "Old password incorrect."
+msgstr "Старый адрес E-mail указан неверно"
+
+#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
+msgid "Account not connected. Please login first."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:149
+#, fuzzy
+msgid "New email address incorrect."
+msgstr "Новый адрес E-mail указан неверно"
+
+#: src/net/manaserv/loginhandler.cpp:152
+#, fuzzy
+msgid "Old email address incorrect."
+msgstr "Старый адрес E-mail указан неверно"
+
+#: src/net/manaserv/loginhandler.cpp:158
+#, fuzzy
+msgid "The new email address already exists."
+msgstr "Введенный адрес E-mail уже зарегистрирован."
+
+#: src/net/manaserv/loginhandler.cpp:239
+msgid ""
+"Client registration is not allowed. Please contact server administration."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
+#, fuzzy
+msgid "Client version is too old."
+msgstr "Версия клиент-программы устарела."
+
+#: src/net/manaserv/loginhandler.cpp:266
+#, fuzzy
+msgid "Wrong username or password."
+msgstr "Неверное имя пользователя или пароль"
+
+#: src/net/manaserv/loginhandler.cpp:272
+#, fuzzy
+msgid "Account banned"
+msgstr "Учётная запись: %s"
+
+#: src/net/manaserv/loginhandler.cpp:275
+msgid "Login attempt too soon after previous attempt."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:303
+#, fuzzy
+msgid "Wrong username, password or email address."
+msgstr "Неверное имя пользователя, пароль или адрес E-mail"
+
+#: src/net/manaserv/loginhandler.cpp:306
+#, fuzzy
+msgid "Username already exists."
+msgstr "Пользователь с таким именем уже существует"
+
+#: src/net/manaserv/loginhandler.cpp:309
+#, fuzzy
+msgid "Email address already exists."
+msgstr "Введенный адрес E-mail уже зарегистрирован."
+
+#: src/net/manaserv/loginhandler.cpp:312
+msgid "You took too long with the captcha or your response was incorrect."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:87
+msgid "Joined party."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:105
+#, c-format
+msgid "%s joined the party."
+msgstr "%s теперь в группе."
+
+#: src/net/manaserv/partyhandler.cpp:123
+#, fuzzy, c-format
+msgid "%s rejected your invite."
+msgstr "Отклонено приглашение от %s."
+
+#: src/net/manaserv/tradehandler.cpp:95
+msgid "Accepting incoming trade requests."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:97
+msgid "Ignoring incoming trade requests."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:115 src/net/tmwa/tradehandler.cpp:109
+msgid "Request for Trade"
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:116 src/net/tmwa/tradehandler.cpp:110
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:134
+#, c-format
+msgid "Trading with %s"
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:148 src/net/tmwa/tradehandler.cpp:224
+msgid "Trade canceled."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:155 src/net/tmwa/tradehandler.cpp:231
+msgid "Trade completed."
+msgstr ""
+
+#: src/net/tmwa/adminhandler.cpp:64
 msgid "Kick failed!"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:65
+#: src/net/tmwa/adminhandler.cpp:66
 msgid "Kick succeeded!"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:110
+#: src/net/tmwa/buysellhandler.cpp:109
 msgid "Nothing to sell."
 msgstr "Нечего продавать..."
 
-#: src/net/ea/buysellhandler.cpp:117
+#: src/net/tmwa/buysellhandler.cpp:116
 msgid "Thanks for buying."
 msgstr "Спасибо за покупку!"
 
-#: src/net/ea/buysellhandler.cpp:124
+#: src/net/tmwa/buysellhandler.cpp:123
 msgid "Unable to buy."
 msgstr "Низзя купить!"
 
-#: src/net/ea/buysellhandler.cpp:130
+#: src/net/tmwa/buysellhandler.cpp:129
 msgid "Thanks for selling."
 msgstr "Спасибо за продажу!"
 
-#: src/net/ea/buysellhandler.cpp:132
+#: src/net/tmwa/buysellhandler.cpp:131
 msgid "Unable to sell."
 msgstr "Низзя продать!"
 
-#: src/net/ea/charserverhandler.cpp:103
-#, fuzzy
-msgid "Access denied."
-msgstr "Доступ запрещен"
+#: src/net/tmwa/charserverhandler.cpp:103
+msgid "Access denied. Most likely, there are too many players on this server."
+msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:106
+#: src/net/tmwa/charserverhandler.cpp:107
 #, fuzzy
 msgid "Cannot use this ID."
 msgstr "Низзя использовать данный ID"
 
-#: src/net/ea/charserverhandler.cpp:109
+#: src/net/tmwa/charserverhandler.cpp:110
 #, fuzzy
-msgid "Unknown failure to select character."
-msgstr "Неизвестный Глюк при выборе персонажа"
+msgid "Unknown char-server failure."
+msgstr "Неизвестный предмет"
 
-#: src/net/ea/charserverhandler.cpp:135
+#: src/net/tmwa/charserverhandler.cpp:134
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr "Невозможно создать персонажа. Скорее всего, таке имя уже используется."
 
-#: src/net/ea/charserverhandler.cpp:147 src/net/manaserv/charhandler.cpp:187
-msgid "Info"
-msgstr "Сведения"
-
-#: src/net/ea/charserverhandler.cpp:147
+#: src/net/tmwa/charserverhandler.cpp:146
 msgid "Character deleted."
 msgstr "Персонаж удален"
 
-#: src/net/ea/charserverhandler.cpp:152
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Failed to delete character."
 msgstr "Невозможно удалить персонажа"
 
-#: src/net/ea/charserverhandler.cpp:237 src/net/manaserv/charhandler.cpp:263
+#: src/net/tmwa/charserverhandler.cpp:266
 msgid "Strength:"
 msgstr "Сила:"
 
-#: src/net/ea/charserverhandler.cpp:238 src/net/manaserv/charhandler.cpp:264
+#: src/net/tmwa/charserverhandler.cpp:267
 msgid "Agility:"
 msgstr "Выносливость:"
 
-#: src/net/ea/charserverhandler.cpp:239 src/net/manaserv/charhandler.cpp:266
+#: src/net/tmwa/charserverhandler.cpp:268
 msgid "Vitality:"
 msgstr "Живучесть:"
 
-#: src/net/ea/charserverhandler.cpp:240 src/net/manaserv/charhandler.cpp:267
+#: src/net/tmwa/charserverhandler.cpp:269
 msgid "Intelligence:"
 msgstr "Интеллект:"
 
-#: src/net/ea/charserverhandler.cpp:241 src/net/manaserv/charhandler.cpp:265
+#: src/net/tmwa/charserverhandler.cpp:270
 msgid "Dexterity:"
 msgstr "Ловкость:"
 
-#: src/net/ea/charserverhandler.cpp:242
+#: src/net/tmwa/charserverhandler.cpp:271
 msgid "Luck:"
 msgstr "Удача:"
 
-#: src/net/ea/chathandler.cpp:80
-msgid "Whisper could not be sent, user is offline."
+#: src/net/tmwa/chathandler.cpp:87
+#, fuzzy, c-format
+msgid "Whisper could not be sent, %s is offline."
 msgstr "Низзя прошептать: пользователь оффлайн"
 
-#: src/net/ea/chathandler.cpp:84
-msgid "Whisper could not be sent, ignored by user."
+#: src/net/tmwa/chathandler.cpp:96
+#, fuzzy, c-format
+msgid "Whisper could not be sent, ignored by %s."
 msgstr "Низзя прошептать: пользователь игнорирует шептание..."
 
-#: src/net/ea/chathandler.cpp:171
+#: src/net/tmwa/chathandler.cpp:230
 #, fuzzy
 msgid "MVP player."
 msgstr "Игрок"
 
-#: src/net/ea/chathandler.cpp:204 src/net/ea/chathandler.cpp:210
-#: src/net/ea/chathandler.cpp:215 src/net/ea/chathandler.cpp:220
-#: src/net/ea/chathandler.cpp:225 src/net/ea/chathandler.cpp:230
-#: src/net/ea/chathandler.cpp:235 src/net/ea/chathandler.cpp:240
+#: src/net/tmwa/chathandler.cpp:265 src/net/tmwa/chathandler.cpp:271
+#: src/net/tmwa/chathandler.cpp:276 src/net/tmwa/chathandler.cpp:281
+#: src/net/tmwa/chathandler.cpp:286 src/net/tmwa/chathandler.cpp:291
+#: src/net/tmwa/chathandler.cpp:296 src/net/tmwa/chathandler.cpp:301
 msgid "Channels are not supported!"
 msgstr "Каналы не поддерживаются!"
 
-#: src/net/ea/gamehandler.cpp:86
+#: src/net/tmwa/gamehandler.cpp:88
 #, c-format
 msgid "Online users: %d"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:100
+#: src/net/tmwa/gamehandler.cpp:101
 #, fuzzy
 msgid "Game"
 msgstr "Имя"
 
-#: src/net/ea/gamehandler.cpp:100
+#: src/net/tmwa/gamehandler.cpp:101
 msgid "Request to quit denied!"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:102 src/net/manaserv/generalhandler.cpp:95
+#: src/net/tmwa/generalhandler.cpp:102
 #, c-format
 msgid "Strength %+d"
 msgstr "Сила %+d"
 
-#: src/net/ea/generalhandler.cpp:103 src/net/manaserv/generalhandler.cpp:96
+#: src/net/tmwa/generalhandler.cpp:103
 #, c-format
 msgid "Agility %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:104 src/net/manaserv/generalhandler.cpp:98
+#: src/net/tmwa/generalhandler.cpp:104
 #, c-format
 msgid "Vitality %+d"
 msgstr "Выносливость %+d"
 
-#: src/net/ea/generalhandler.cpp:105 src/net/manaserv/generalhandler.cpp:99
+#: src/net/tmwa/generalhandler.cpp:105
 #, c-format
 msgid "Intelligence %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:106 src/net/manaserv/generalhandler.cpp:97
+#: src/net/tmwa/generalhandler.cpp:106
 #, c-format
 msgid "Dexterity %+d"
 msgstr "Ловкость %+d"
 
-#: src/net/ea/generalhandler.cpp:107
+#: src/net/tmwa/generalhandler.cpp:107
 #, c-format
 msgid "Luck %+d"
 msgstr "Удача %+d"
 
-#: src/net/ea/generalhandler.cpp:130
+#: src/net/tmwa/generalhandler.cpp:132
 #, fuzzy
 msgid "Authentication failed."
 msgstr "Ошибка авторизации"
 
-#: src/net/ea/generalhandler.cpp:133
+#: src/net/tmwa/generalhandler.cpp:135
 #, fuzzy
 msgid "No servers available."
 msgstr "Нету доступных серверов"
 
-#: src/net/ea/generalhandler.cpp:137
+#: src/net/tmwa/generalhandler.cpp:139
 #, fuzzy
 msgid "Someone else is trying to use this account."
 msgstr "Кто-то еще пытается воспользоваться данным аккаунтом"
 
-#: src/net/ea/generalhandler.cpp:140
+#: src/net/tmwa/generalhandler.cpp:142
 #, fuzzy
 msgid "This account is already logged in."
 msgstr "Этот аккаунт уже авторизован"
 
-#: src/net/ea/generalhandler.cpp:143
+#: src/net/tmwa/generalhandler.cpp:145
 msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:146
+#: src/net/tmwa/generalhandler.cpp:148
 msgid "Duplicated login."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:149
+#: src/net/tmwa/generalhandler.cpp:151
 #, fuzzy
 msgid "Unknown connection error."
 msgstr "Неизвестный Глюк авторизации"
 
-#: src/net/ea/generalhandler.cpp:205
+#: src/net/tmwa/generalhandler.cpp:209
 msgid "Got disconnected from server!"
 msgstr "Отключено от сервера!"
 
-#: src/net/ea/generalhandler.cpp:216 src/net/manaserv/generalhandler.cpp:166
+#: src/net/tmwa/generalhandler.cpp:230
 msgid "Strength"
 msgstr "Сила"
 
-#: src/net/ea/generalhandler.cpp:217 src/net/manaserv/generalhandler.cpp:167
+#: src/net/tmwa/generalhandler.cpp:231
 msgid "Agility"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:218 src/net/manaserv/generalhandler.cpp:169
+#: src/net/tmwa/generalhandler.cpp:232
 msgid "Vitality"
 msgstr "Выносливость"
 
-#: src/net/ea/generalhandler.cpp:219 src/net/manaserv/generalhandler.cpp:170
+#: src/net/tmwa/generalhandler.cpp:233
 msgid "Intelligence"
 msgstr "Интеллект"
 
-#: src/net/ea/generalhandler.cpp:220 src/net/manaserv/generalhandler.cpp:168
+#: src/net/tmwa/generalhandler.cpp:234
 msgid "Dexterity"
 msgstr "Ловкость"
 
-#: src/net/ea/generalhandler.cpp:221
+#: src/net/tmwa/generalhandler.cpp:235
 msgid "Luck"
 msgstr "Удача"
 
-#: src/net/ea/generalhandler.cpp:224
+#: src/net/tmwa/generalhandler.cpp:238
 #, fuzzy
 msgid "Defense"
 msgstr "Защита:"
 
-#: src/net/ea/generalhandler.cpp:225
+#: src/net/tmwa/generalhandler.cpp:239
 #, fuzzy
 msgid "M.Attack"
 msgstr "Магическая атака:"
 
-#: src/net/ea/generalhandler.cpp:226
+#: src/net/tmwa/generalhandler.cpp:240
 #, fuzzy
 msgid "M.Defense"
 msgstr "Магическая защита:"
 
-#: src/net/ea/generalhandler.cpp:227
+#: src/net/tmwa/generalhandler.cpp:241
 #, fuzzy, c-format
 msgid "% Accuracy"
 msgstr "% точности:"
 
-#: src/net/ea/generalhandler.cpp:228
+#: src/net/tmwa/generalhandler.cpp:242
 #, fuzzy, c-format
 msgid "% Evade"
 msgstr "% уклонения:"
 
-#: src/net/ea/generalhandler.cpp:229
+#: src/net/tmwa/generalhandler.cpp:243
 #, fuzzy, c-format
 msgid "% Critical"
 msgstr "Критический удар"
 
-#: src/net/ea/gui/guildtab.cpp:45
+#: src/net/tmwa/gui/guildtab.cpp:45
 msgid "Guild"
 msgstr "Гильдия"
 
-#: src/net/ea/gui/guildtab.cpp:61 src/net/ea/gui/partytab.cpp:59
+#: src/net/tmwa/gui/guildtab.cpp:61 src/net/tmwa/gui/partytab.cpp:59
 msgid "/help > Display this help."
 msgstr "/help > Показать сию справку"
 
-#: src/net/ea/gui/guildtab.cpp:62
+#: src/net/tmwa/gui/guildtab.cpp:62
 #, fuzzy
 msgid "/invite > Invite a player to your guild"
 msgstr "/invite > Пригласить игрока в вашу группу"
 
-#: src/net/ea/gui/guildtab.cpp:63
+#: src/net/tmwa/gui/guildtab.cpp:63
 #, fuzzy
 msgid "/leave > Leave the guild you are in"
 msgstr "/leave > Покинуть текущую группу"
 
-#: src/net/ea/gui/guildtab.cpp:64
+#: src/net/tmwa/gui/guildtab.cpp:64
 #, fuzzy
 msgid "/kick > Kick some one from the guild you are in"
 msgstr "/kick > Вышвырнуть кого-либо из вашей текущей группы"
 
-#: src/net/ea/gui/guildtab.cpp:73 src/net/ea/gui/partytab.cpp:73
+#: src/net/tmwa/gui/guildtab.cpp:73 src/net/tmwa/gui/partytab.cpp:73
 msgid "Command: /invite <nick>"
 msgstr "Комманда: /invite <игрок>"
 
-#: src/net/ea/gui/guildtab.cpp:74
+#: src/net/tmwa/gui/guildtab.cpp:74
 #, fuzzy
 msgid "This command invites <nick> to the guild you're in."
 msgstr "Эта команда приглашает <имя персонажа> к вам в группу."
 
-#: src/net/ea/gui/guildtab.cpp:80 src/net/ea/gui/partytab.cpp:80
+#: src/net/tmwa/gui/guildtab.cpp:80 src/net/tmwa/gui/partytab.cpp:80
 msgid "Command: /leave"
 msgstr "Комманда: /leave"
 
-#: src/net/ea/gui/guildtab.cpp:81
+#: src/net/tmwa/gui/guildtab.cpp:81
 #, fuzzy
 msgid "This command causes the player to leave the guild."
 msgstr "Эта комманда заставляет игрока покинуть группу"
 
-#: src/net/ea/gui/guildtab.cpp:89
+#: src/net/tmwa/gui/guildtab.cpp:89
 msgid "Guild name is missing."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:293
+#: src/net/tmwa/guildhandler.cpp:296
 msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:298
+#: src/net/tmwa/guildhandler.cpp:301
 msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:303
+#: src/net/tmwa/guildhandler.cpp:306
 msgid "User is now part of your guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:308
+#: src/net/tmwa/guildhandler.cpp:311
 msgid "Your guild is full."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:313
+#: src/net/tmwa/guildhandler.cpp:316
 msgid "Unknown guild invite response."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:390
+#: src/net/tmwa/guildhandler.cpp:393
 msgid "Guild creation isn't supported yet."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:43
+#: src/net/tmwa/gui/partytab.cpp:43
 msgid "Party"
 msgstr "Группа"
 
-#: src/net/ea/gui/partytab.cpp:60
+#: src/net/tmwa/gui/partytab.cpp:60
 msgid "/invite > Invite a player to your party"
 msgstr "/invite > Пригласить игрока в вашу группу"
 
-#: src/net/ea/gui/partytab.cpp:61
+#: src/net/tmwa/gui/partytab.cpp:61
 msgid "/leave > Leave the party you are in"
 msgstr "/leave > Покинуть текущую группу"
 
-#: src/net/ea/gui/partytab.cpp:62
+#: src/net/tmwa/gui/partytab.cpp:62
 msgid "/kick > Kick some one from the party you are in"
 msgstr "/kick > Вышвырнуть кого-либо из вашей текущей группы"
 
-#: src/net/ea/gui/partytab.cpp:63
+#: src/net/tmwa/gui/partytab.cpp:63
 msgid "/item > Show/change party item sharing options"
 msgstr ""
 "/item > Показать/Скрыть текущее состояние распределения предметов в группе"
 
-#: src/net/ea/gui/partytab.cpp:64
+#: src/net/tmwa/gui/partytab.cpp:64
 msgid "/exp > Show/change party experience sharing options"
 msgstr "/exp > Показать/Скрыть текущее состояние распределения опыта в группе"
 
-#: src/net/ea/gui/partytab.cpp:81
+#: src/net/tmwa/gui/partytab.cpp:81
 msgid "This command causes the player to leave the party."
 msgstr "Эта комманда заставляет игрока покинуть группу"
 
-#: src/net/ea/gui/partytab.cpp:85
+#: src/net/tmwa/gui/partytab.cpp:85
 msgid "Command: /item <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:86
+#: src/net/tmwa/gui/partytab.cpp:86
 msgid "This command changes the party's item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:87
+#: src/net/tmwa/gui/partytab.cpp:87
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:90
+#: src/net/tmwa/gui/partytab.cpp:90
 msgid "Command: /item"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/tmwa/gui/partytab.cpp:91
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/tmwa/gui/partytab.cpp:95
 msgid "Command: /exp <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:96
+#: src/net/tmwa/gui/partytab.cpp:96
 msgid "This command changes the party's experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/tmwa/gui/partytab.cpp:97
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:100
+#: src/net/tmwa/gui/partytab.cpp:100
 msgid "Command: /exp"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/tmwa/gui/partytab.cpp:101
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:132 src/net/ea/partyhandler.cpp:198
+#: src/net/tmwa/gui/partytab.cpp:132 src/net/tmwa/partyhandler.cpp:196
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:135 src/net/ea/partyhandler.cpp:204
+#: src/net/tmwa/gui/partytab.cpp:135 src/net/tmwa/partyhandler.cpp:202
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:138 src/net/ea/partyhandler.cpp:210
+#: src/net/tmwa/gui/partytab.cpp:138 src/net/tmwa/partyhandler.cpp:208
 msgid "Item sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:141
+#: src/net/tmwa/gui/partytab.cpp:141
 msgid "Item sharing unknown."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:167 src/net/ea/partyhandler.cpp:174
+#: src/net/tmwa/gui/partytab.cpp:167 src/net/tmwa/partyhandler.cpp:172
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:170 src/net/ea/partyhandler.cpp:180
+#: src/net/tmwa/gui/partytab.cpp:170 src/net/tmwa/partyhandler.cpp:178
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:173 src/net/ea/partyhandler.cpp:186
+#: src/net/tmwa/gui/partytab.cpp:173 src/net/tmwa/partyhandler.cpp:184
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:176
+#: src/net/tmwa/gui/partytab.cpp:176
 msgid "Experience sharing unknown."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:281
+#: src/net/tmwa/inventoryhandler.cpp:285
 msgid "Failed to use item."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:391
+#: src/net/tmwa/inventoryhandler.cpp:399
 msgid "Unable to equip."
 msgstr "Низзя екипировать!"
 
-#: src/net/ea/inventoryhandler.cpp:402
+#: src/net/tmwa/inventoryhandler.cpp:410
 msgid "Unable to unequip."
 msgstr "Низзя разекипировать"
 
-#: src/net/ea/loginhandler.cpp:79
+#: src/net/tmwa/loginhandler.cpp:86
 msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:82 src/net/manaserv/loginhandler.cpp:121
-#, fuzzy
-msgid "Old password incorrect."
-msgstr "Старый адрес E-mail указан неверно"
-
-#: src/net/ea/loginhandler.cpp:85
+#: src/net/tmwa/loginhandler.cpp:92
 msgid "New password too short."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:88 src/net/ea/loginhandler.cpp:175
-#: src/net/manaserv/charhandler.cpp:158 src/net/manaserv/loginhandler.cpp:96
-#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
-#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
-#, fuzzy
-msgid "Unknown error."
-msgstr "Неизвестный предмет"
-
-#: src/net/ea/loginhandler.cpp:149
+#: src/net/tmwa/loginhandler.cpp:156
 #, fuzzy
 msgid "Unregistered ID."
 msgstr "Удалить регистрацию"
 
-#: src/net/ea/loginhandler.cpp:152
+#: src/net/tmwa/loginhandler.cpp:159
 #, fuzzy
 msgid "Wrong password."
 msgstr "Неверное имя пользователя или пароль"
 
-#: src/net/ea/loginhandler.cpp:155
+#: src/net/tmwa/loginhandler.cpp:162
 msgid "Account expired."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:158
+#: src/net/tmwa/loginhandler.cpp:165
 #, fuzzy
 msgid "Rejected from server."
 msgstr "Отклонено приглашение от %s."
 
-#: src/net/ea/loginhandler.cpp:161
+#: src/net/tmwa/loginhandler.cpp:168
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:165
+#: src/net/tmwa/loginhandler.cpp:172
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:172
+#: src/net/tmwa/loginhandler.cpp:179
 #, fuzzy
 msgid "This user name is already taken."
 msgstr "Этот аккаунт уже авторизован"
 
-#: src/net/ea/network.cpp:145
+#: src/net/tmwa/network.cpp:145
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/ea/network.cpp:345
+#: src/net/tmwa/network.cpp:345
 #, fuzzy
 msgid "Unable to resolve host \""
 msgstr "Низзя продать!"
 
-#: src/net/ea/network.cpp:414
+#: src/net/tmwa/network.cpp:414
 #, fuzzy
 msgid "Connection to server terminated. "
 msgstr "Подключение к серверу карт..."
 
-#: src/net/ea/partyhandler.cpp:81
+#: src/net/tmwa/partyhandler.cpp:82
 msgid "Could not create party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:84
+#: src/net/tmwa/partyhandler.cpp:84
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:118
+#: src/net/tmwa/partyhandler.cpp:119
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:122
+#: src/net/tmwa/partyhandler.cpp:123
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:126
+#: src/net/tmwa/partyhandler.cpp:127
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:130
+#: src/net/tmwa/partyhandler.cpp:131
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:238
+#: src/net/tmwa/partyhandler.cpp:236
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:249
+#: src/net/tmwa/partyhandler.cpp:246
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:301
+#: src/net/tmwa/partyhandler.cpp:299
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:329
-msgid "Inviting like this isn't supported at the moment."
+#: src/net/tmwa/partyhandler.cpp:335
+#, c-format
+msgid "Inviting failed, because you can't see a player called %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:334
+#: src/net/tmwa/partyhandler.cpp:340
 msgid "You can only inivte when you are in a party!"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:365
+#: src/net/tmwa/partyhandler.cpp:368
 #, c-format
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:304
-msgid "You are dead."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:305
-msgid "We regret to inform you that your character was killed in battle."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:307
-msgid "You are not that alive anymore."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:308
-msgid "The cold hands of the grim reaper are grabbing for your soul."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:309
-msgid "Game Over!"
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:105
+#: src/net/tmwa/playerhandler.cpp:100
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:310
-msgid ""
-"No, kids. Your character did not really die. It... err... went to a better "
-"place."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:312
-msgid ""
-"Your plan of breaking your enemies weapon by bashing it with your throat "
-"failed."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:314
-msgid "I guess this did not run too well."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:315
-msgid "Do you want your possessions identified?"
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:316
-msgid "Sadly, no trace of you was ever found..."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:317
-msgid "Annihilated."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:318
-msgid "Looks like you got your head handed to you."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:120 src/net/manaserv/beinghandler.cpp:319
-msgid ""
-"You screwed up again, dump your body down the tubes and get you another one."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/tmwa/playerhandler.cpp:118
 msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/tmwa/playerhandler.cpp:119
 msgid "You are no more."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/tmwa/playerhandler.cpp:120
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/tmwa/playerhandler.cpp:121
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/tmwa/playerhandler.cpp:122
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/tmwa/playerhandler.cpp:123
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/tmwa/playerhandler.cpp:124
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:130
+#: src/net/tmwa/playerhandler.cpp:125
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:131
+#: src/net/tmwa/playerhandler.cpp:126
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/tmwa/playerhandler.cpp:127
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/tmwa/playerhandler.cpp:128
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:135
+#: src/net/tmwa/playerhandler.cpp:130
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:136
+#: src/net/tmwa/playerhandler.cpp:131
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:249 src/net/ea/playerhandler.cpp:310
+#: src/net/tmwa/playerhandler.cpp:246 src/net/tmwa/playerhandler.cpp:285
 msgid "Message"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:250
+#: src/net/tmwa/playerhandler.cpp:247
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:333
+#: src/net/tmwa/playerhandler.cpp:313
 #, fuzzy, c-format
 msgid "You picked up %s."
 msgstr "Вы получили %s."
 
-#: src/net/ea/playerhandler.cpp:369
+#: src/net/tmwa/playerhandler.cpp:348
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:532
+#: src/net/tmwa/playerhandler.cpp:488
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:147
+#: src/net/tmwa/specialhandler.cpp:144
 msgid "Trade failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:150
+#: src/net/tmwa/specialhandler.cpp:147
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:153
+#: src/net/tmwa/specialhandler.cpp:150
 msgid "Sit failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:156
+#: src/net/tmwa/specialhandler.cpp:153
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:159
+#: src/net/tmwa/specialhandler.cpp:156
 msgid "Could not join party!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:162
+#: src/net/tmwa/specialhandler.cpp:159
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:171
+#: src/net/tmwa/specialhandler.cpp:168
 msgid "You have not yet reached a high enough lvl!"
 msgstr "У Вас недостаточный уровень!"
 
-#: src/net/ea/specialhandler.cpp:174
+#: src/net/tmwa/specialhandler.cpp:171
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:177
+#: src/net/tmwa/specialhandler.cpp:174
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:180
+#: src/net/tmwa/specialhandler.cpp:177
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:183
+#: src/net/tmwa/specialhandler.cpp:180
 msgid "You cannot do that right now!"
 msgstr "Вы не можете сделать это сейчас!"
 
-#: src/net/ea/specialhandler.cpp:186
+#: src/net/tmwa/specialhandler.cpp:183
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:189
+#: src/net/tmwa/specialhandler.cpp:186
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Вы не можете использовать это умение с этим видом оружия!"
 
-#: src/net/ea/specialhandler.cpp:192
+#: src/net/tmwa/specialhandler.cpp:189
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:195
+#: src/net/tmwa/specialhandler.cpp:192
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:198
+#: src/net/tmwa/specialhandler.cpp:195
 msgid "You're carrying to much to do this!"
 msgstr "Вы несёте слишком много, чтобы сделать это!"
 
-#: src/net/ea/specialhandler.cpp:201
+#: src/net/tmwa/specialhandler.cpp:198
 msgid "Huh? What's that?"
 msgstr "А? Что это?"
 
-#: src/net/ea/specialhandler.cpp:210
+#: src/net/tmwa/specialhandler.cpp:207
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:213
+#: src/net/tmwa/specialhandler.cpp:210
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:216
+#: src/net/tmwa/specialhandler.cpp:213
 msgid "Poison had no effect..."
 msgstr "Яд не подействовал..."
 
-#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:116
-msgid "Request for Trade"
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:108 src/net/manaserv/tradehandler.cpp:117
-#, c-format
-msgid "%s wants to trade with you, do you accept?"
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:124
+#: src/net/tmwa/tradehandler.cpp:126
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:128
+#: src/net/tmwa/tradehandler.cpp:130
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:132
+#: src/net/tmwa/tradehandler.cpp:134
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:137
+#: src/net/tmwa/tradehandler.cpp:139
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:144
+#: src/net/tmwa/tradehandler.cpp:146
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:153
+#: src/net/tmwa/tradehandler.cpp:154
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:202
+#: src/net/tmwa/tradehandler.cpp:202
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:207
+#: src/net/tmwa/tradehandler.cpp:207
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:211
+#: src/net/tmwa/tradehandler.cpp:211
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:224 src/net/manaserv/tradehandler.cpp:149
-msgid "Trade canceled."
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:231 src/net/manaserv/tradehandler.cpp:156
-msgid "Trade completed."
-msgstr ""
-
-#: src/net/manaserv/beinghandler.cpp:324
-msgid "Press OK to respawn."
-msgstr ""
-
-#: src/net/manaserv/beinghandler.cpp:325
+#: src/playerrelations.cpp:310
 #, fuzzy
-msgid "You Died"
-msgstr "Вы отдаете:"
-
-#: src/net/manaserv/charhandler.cpp:128 src/net/manaserv/charhandler.cpp:196
-#, fuzzy
-msgid "Not logged in."
-msgstr "Уже в сети"
-
-#: src/net/manaserv/charhandler.cpp:131
-msgid "No empty slot."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:134
-msgid "Invalid name."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:137
-#, fuzzy
-msgid "Character's name already exists."
-msgstr "Пользователь с таким именем уже существует"
-
-#: src/net/manaserv/charhandler.cpp:140
-msgid "Invalid hairstyle."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:143
-msgid "Invalid hair color."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:146
-msgid "Invalid gender."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:149
-#, fuzzy
-msgid "Character's stats are too high."
-msgstr "Данные персонажа в порядке"
-
-#: src/net/manaserv/charhandler.cpp:152
-#, fuzzy
-msgid "Character's stats are too low."
-msgstr "Данные персонажа в порядке"
-
-#: src/net/manaserv/charhandler.cpp:155
-msgid "One stat is zero."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:187
-#, fuzzy
-msgid "Player deleted."
-msgstr "Персонаж удален"
-
-#: src/net/manaserv/charhandler.cpp:199
-#, fuzzy
-msgid "Selection out of range."
-msgstr "Сколько предметов продать."
-
-#: src/net/manaserv/charhandler.cpp:202
-#, fuzzy, c-format
-msgid "Unknown error (%d)."
-msgstr "Неизвестная команда."
-
-#: src/net/manaserv/charhandler.cpp:242
-msgid "No gameservers are available."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:268
-msgid "Willpower:"
-msgstr "Сила волиr:"
+msgid "Completely ignore"
+msgstr "@@ignore|Полностью игнорировать %s@@"
 
-#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
-#: src/net/manaserv/guildhandler.cpp:259
-#, c-format
-msgid "Topic: %s"
+#: src/playerrelations.cpp:324
+msgid "Print '...'"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
-#, fuzzy
-msgid "Players in this channel:"
-msgstr "Удары игрока по монстру"
-
-#: src/net/manaserv/chathandler.cpp:201
-#, fuzzy
-msgid "Error joining channel."
-msgstr "Команда: /join <канал>"
-
-#: src/net/manaserv/chathandler.cpp:207
-#, fuzzy
-msgid "Listing channels."
-msgstr "Запрос на присоединение к каналу %s."
-
-#: src/net/manaserv/chathandler.cpp:219
-msgid "End of channel list."
+#: src/playerrelations.cpp:340
+msgid "Blink name"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:291
-#, fuzzy, c-format
-msgid "%s entered the channel."
-msgstr "%s теперь в группе."
-
-#: src/net/manaserv/chathandler.cpp:296
+#: src/resources/itemdb.cpp:44
 #, c-format
-msgid "%s left the channel."
-msgstr ""
+msgid "Attack %+d"
+msgstr "Атака %+d"
 
-#: src/net/manaserv/chathandler.cpp:312
+#: src/resources/itemdb.cpp:45
 #, c-format
-msgid "%s has set mode %s on user %s."
-msgstr ""
+msgid "Defense %+d"
+msgstr "Защита %+d"
 
-#: src/net/manaserv/chathandler.cpp:322
+#: src/resources/itemdb.cpp:46
 #, c-format
-msgid "%s has kicked %s."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:327
-#, fuzzy
-msgid "Unknown channel event."
-msgstr "Неизвестная команда."
+msgid "HP %+d"
+msgstr "HP %+d"
 
-#: src/net/manaserv/generalhandler.cpp:100
+#: src/resources/itemdb.cpp:47
 #, c-format
-msgid "Willpower %+d"
-msgstr ""
-
-#: src/net/manaserv/generalhandler.cpp:171
-#, fuzzy
-msgid "Willpower"
-msgstr "Сила волиr:"
-
-#: src/net/manaserv/guildhandler.cpp:81
-msgid "Guild created."
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:86
-msgid "Error creating guild."
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:96
-msgid "Invite sent."
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:203
-msgid "Member was promoted successfully."
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:208
-msgid "Failed to promote member."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:87
-msgid "Wrong magic_token."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
-#, fuzzy
-msgid "Already logged in."
-msgstr "Уже в сети"
-
-#: src/net/manaserv/loginhandler.cpp:93 src/net/manaserv/loginhandler.cpp:272
-msgid "Server is full."
-msgstr ""
+msgid "MP %+d"
+msgstr "Мана %+d"
 
-#: src/net/manaserv/loginhandler.cpp:118
-#, fuzzy
-msgid "New password incorrect."
-msgstr "Новый адрес E-mail указан неверно"
+#: src/resources/itemdb.cpp:92
+msgid "Unknown item"
+msgstr "Неизвестный предмет"
 
-#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
-msgid "Account not connected. Please login first."
-msgstr ""
+#: src/resources/itemdb.cpp:135 src/resources/monsterdb.cpp:77
+msgid "unnamed"
+msgstr "безымянный"
 
-#: src/net/manaserv/loginhandler.cpp:149
 #, fuzzy
-msgid "New email address incorrect."
-msgstr "Новый адрес E-mail указан неверно"
+#~ msgid "HP"
+#~ msgstr "ЖО:"
 
-#: src/net/manaserv/loginhandler.cpp:152
 #, fuzzy
-msgid "Old email address incorrect."
-msgstr "Старый адрес E-mail указан неверно"
+#~ msgid "MP"
+#~ msgstr "Мана:"
 
-#: src/net/manaserv/loginhandler.cpp:158
 #, fuzzy
-msgid "The new email address already exists."
-msgstr "Введенный адрес E-mail уже зарегистрирован."
-
-#: src/net/manaserv/loginhandler.cpp:239
-msgid ""
-"Client registration is not allowed. Please contact server administration."
-msgstr ""
+#~ msgid "Exp"
+#~ msgstr "Exp:"
 
-#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
 #, fuzzy
-msgid "Client version is too old."
-msgstr "Версия клиент-программы устарела."
+#~ msgid "Money"
+#~ msgstr "Деньги: %d"
 
-#: src/net/manaserv/loginhandler.cpp:266
 #, fuzzy
-msgid "Wrong username or password."
-msgstr "Неверное имя пользователя или пароль"
+#~ msgid "Job"
+#~ msgstr "Профессия:"
 
-#: src/net/manaserv/loginhandler.cpp:275
-msgid "Login attempt too soon after previous attempt."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:303
 #, fuzzy
-msgid "Wrong username, password or email address."
-msgstr "Неверное имя пользователя, пароль или адрес E-mail"
+#~ msgid "Level"
+#~ msgstr "Уровень: %d"
 
-#: src/net/manaserv/loginhandler.cpp:306
 #, fuzzy
-msgid "Username already exists."
-msgstr "Пользователь с таким именем уже существует"
+#~ msgid "Access denied."
+#~ msgstr "Доступ запрещен"
 
-#: src/net/manaserv/loginhandler.cpp:309
 #, fuzzy
-msgid "Email address already exists."
-msgstr "Введенный адрес E-mail уже зарегистрирован."
-
-#: src/net/manaserv/loginhandler.cpp:312
-msgid "You took too long with the captcha or your response was incorrect."
-msgstr ""
-
-#: src/net/manaserv/partyhandler.cpp:88
-msgid "Joined party."
-msgstr ""
-
-#: src/net/manaserv/partyhandler.cpp:106
-#, c-format
-msgid "%s joined the party."
-msgstr "%s теперь в группе."
-
-#: src/net/manaserv/partyhandler.cpp:123
-#, fuzzy, c-format
-msgid "%s rejected your invite."
-msgstr "Отклонено приглашение от %s."
+#~ msgid "Unknown failure to select character."
+#~ msgstr "Неизвестный Глюк при выборе персонажа"
 
-#: src/net/manaserv/tradehandler.cpp:96
-msgid "Accepting incoming trade requests."
-msgstr ""
+#~ msgid "Willpower:"
+#~ msgstr "Сила волиr:"
 
-#: src/net/manaserv/tradehandler.cpp:98
-msgid "Ignoring incoming trade requests."
-msgstr ""
-
-#: src/net/manaserv/tradehandler.cpp:135
-#, c-format
-msgid "Trading with %s"
-msgstr ""
-
-#: src/playerrelations.cpp:304
 #, fuzzy
-msgid "Completely ignore"
-msgstr "@@ignore|Полностью игнорировать %s@@"
-
-#: src/playerrelations.cpp:318
-msgid "Print '...'"
-msgstr ""
-
-#: src/playerrelations.cpp:334
-msgid "Blink name"
-msgstr ""
-
-#: src/playerrelations.cpp:371
-msgid "Floating '...' bubble"
-msgstr ""
-
-#: src/playerrelations.cpp:374
-msgid "Floating bubble"
-msgstr ""
-
-#: src/resources/itemdb.cpp:52
-#, c-format
-msgid "Attack %+d"
-msgstr "Атака %+d"
-
-#: src/resources/itemdb.cpp:53
-#, c-format
-msgid "Defense %+d"
-msgstr "Защита %+d"
-
-#: src/resources/itemdb.cpp:54
-#, c-format
-msgid "HP %+d"
-msgstr "HP %+d"
-
-#: src/resources/itemdb.cpp:55
-#, c-format
-msgid "MP %+d"
-msgstr "Мана %+d"
-
-#: src/resources/itemdb.cpp:114
-msgid "Unknown item"
-msgstr "Неизвестный предмет"
-
-#: src/resources/itemdb.cpp:158 src/resources/monsterdb.cpp:45
-#: src/resources/monsterdb.cpp:69
-msgid "unnamed"
-msgstr "безымянный"
+#~ msgid "Willpower"
+#~ msgstr "Сила волиr:"
 
 #~ msgid "Text Shadow"
 #~ msgstr "Затенение текста"
diff --git a/po/sk.po b/po/sk.po
index df2e25c6..585f99d8 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2010-03-05 21:52+0100\n"
+"POT-Creation-Date: 2010-12-13 20:04+0100\n"
 "PO-Revision-Date: 2009-06-08 22:09+0000\n"
 "Last-Translator: Thorbjørn Lindeijer <bjorn@lindeijer.nl>\n"
 "Language-Team: Slovak <sk@li.org>\n"
+"Language: sk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,444 +19,458 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/client.cpp:553 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:62
+#: src/client.cpp:598 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
 msgid "Setup"
 msgstr "Nastavenie"
 
-#: src/client.cpp:623
+#: src/client.cpp:679
 #, fuzzy
 msgid "Connecting to server"
 msgstr "Pripájam sa..."
 
-#: src/client.cpp:650
+#: src/client.cpp:706
 #, fuzzy
 msgid "Logging in"
 msgstr "Prihlásenie"
 
-#: src/client.cpp:683
+#: src/client.cpp:739
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:739
+#: src/client.cpp:804
 #, fuzzy
 msgid "Requesting characters"
 msgstr "Vyberte postavu"
 
-#: src/client.cpp:768
+#: src/client.cpp:833
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:799 src/client.cpp:806 src/client.cpp:940
+#: src/client.cpp:843
+#, fuzzy
+msgid "Changing game servers"
+msgstr "Vyberte Server"
+
+#: src/client.cpp:872 src/client.cpp:879 src/client.cpp:1014
 #: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
 #: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
-#: src/gui/serverdialog.cpp:261 src/gui/unregisterdialog.cpp:133
-#: src/net/ea/charserverhandler.cpp:135 src/net/ea/charserverhandler.cpp:152
-#: src/net/manaserv/charhandler.cpp:161 src/net/manaserv/charhandler.cpp:204
+#: src/gui/serverdialog.cpp:323 src/gui/unregisterdialog.cpp:133
+#: src/net/manaserv/charhandler.cpp:174 src/net/manaserv/charhandler.cpp:217
+#: src/net/tmwa/charserverhandler.cpp:134
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Error"
 msgstr "Chyba"
 
-#: src/client.cpp:815
+#: src/client.cpp:888
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:842
+#: src/client.cpp:915
 #, fuzzy
 msgid "Password Change"
 msgstr "Heslo:"
 
-#: src/client.cpp:843
+#: src/client.cpp:916
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:862
+#: src/client.cpp:935
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:863
+#: src/client.cpp:936
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:883
+#: src/client.cpp:956
 #, fuzzy
 msgid "Unregister Successful"
 msgstr "Zrušiť registráciu"
 
-#: src/client.cpp:884
+#: src/client.cpp:957
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1007 src/client.cpp:1030
+#: src/client.cpp:1138 src/client.cpp:1161
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1119
+#: src/client.cpp:1281
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1153 src/client.cpp:1159
+#: src/client.cpp:1315 src/client.cpp:1321
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/commandhandler.cpp:127 src/commandhandler.cpp:308
+#: src/commandhandler.cpp:131 src/commandhandler.cpp:317
 msgid "Unknown command."
 msgstr "Neznámy príkaz."
 
-#: src/commandhandler.cpp:156
+#: src/commandhandler.cpp:160
 msgid "-- Help --"
 msgstr "-- Pomoc --"
 
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:161
 msgid "/help > Display this help"
 msgstr ""
 
-#: src/commandhandler.cpp:159
+#: src/commandhandler.cpp:163
 msgid "/where > Display map name"
 msgstr ""
 
-#: src/commandhandler.cpp:160
+#: src/commandhandler.cpp:164
 msgid "/who > Display number of online users"
 msgstr ""
 
-#: src/commandhandler.cpp:161
+#: src/commandhandler.cpp:165
 msgid "/me > Tell something about yourself"
 msgstr ""
 
-#: src/commandhandler.cpp:163
+#: src/commandhandler.cpp:167
 msgid "/clear > Clears this window"
 msgstr ""
 
-#: src/commandhandler.cpp:165
+#: src/commandhandler.cpp:169
 msgid "/msg > Send a private message to a user"
 msgstr ""
 
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:170
 msgid "/whisper > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:167
+#: src/commandhandler.cpp:171
 msgid "/w > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:168
+#: src/commandhandler.cpp:172
 msgid "/query > Makes a tab for private messages with another user"
 msgstr ""
 
-#: src/commandhandler.cpp:169
+#: src/commandhandler.cpp:174
 msgid "/q > Alias of query"
 msgstr ""
 
-#: src/commandhandler.cpp:171
+#: src/commandhandler.cpp:176
 msgid "/ignore > ignore a player"
 msgstr ""
 
-#: src/commandhandler.cpp:172
+#: src/commandhandler.cpp:177
 msgid "/unignore > stop ignoring a player"
 msgstr ""
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:179
 msgid "/list > Display all public channels"
 msgstr ""
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:180
 msgid "/join > Join or create a channel"
 msgstr ""
 
-#: src/commandhandler.cpp:177
+#: src/commandhandler.cpp:182
 msgid "/createparty > Create a new party"
 msgstr ""
 
-#: src/commandhandler.cpp:178
+#: src/commandhandler.cpp:183
 msgid "/party > Invite a user to party"
 msgstr ""
 
-#: src/commandhandler.cpp:180
+#: src/commandhandler.cpp:185
 msgid "/record > Start recording the chat to an external file"
 msgstr ""
 
-#: src/commandhandler.cpp:181
+#: src/commandhandler.cpp:187
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr ""
 
-#: src/commandhandler.cpp:182
+#: src/commandhandler.cpp:189
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
 
-#: src/commandhandler.cpp:184
+#: src/commandhandler.cpp:192
 msgid "/announce > Global announcement (GM only)"
 msgstr ""
 
-#: src/commandhandler.cpp:188
+#: src/commandhandler.cpp:196
 msgid "For more information, type /help <command>."
 msgstr ""
 
-#: src/commandhandler.cpp:192
+#: src/commandhandler.cpp:200
 msgid "Command: /help"
 msgstr "Príkaz: /hel"
 
-#: src/commandhandler.cpp:193
+#: src/commandhandler.cpp:201
 msgid "This command displays a list of all commands available."
 msgstr "Tento príkaz zobrazí zoznam veštkých prístupných príkazov."
 
-#: src/commandhandler.cpp:194
+#: src/commandhandler.cpp:203
 msgid "Command: /help <command>"
 msgstr "Príkaz: /help <príkaz>"
 
-#: src/commandhandler.cpp:195
+#: src/commandhandler.cpp:204
 msgid "This command displays help on <command>."
 msgstr "Tento príkaz zobrazí nápovedu pre <príkaz>."
 
-#: src/commandhandler.cpp:203
+#: src/commandhandler.cpp:212
 msgid "Command: /announce <msg>"
 msgstr "Príkaz: /announce <správa>"
 
-#: src/commandhandler.cpp:204
+#: src/commandhandler.cpp:213
 msgid "*** only available to a GM ***"
 msgstr "*** prístupné iba pre GM ***"
 
-#: src/commandhandler.cpp:205
+#: src/commandhandler.cpp:214
 msgid "This command sends the message <msg> to all players currently online."
 msgstr "Tento príkaz pošle správu <správa> všetkým pripojeným používateľom."
 
-#: src/commandhandler.cpp:210
+#: src/commandhandler.cpp:219
 msgid "Command: /clear"
 msgstr "Príkaz: /clear"
 
-#: src/commandhandler.cpp:211
+#: src/commandhandler.cpp:220
 msgid "This command clears the chat log of previous chat."
 msgstr "Tento príkaz vymaže obsah logu predchádzajúceho rozhovoru."
 
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:224
 #, fuzzy
 msgid "Command: /ignore <player>"
 msgstr "Príkaz: /announce <správa>"
 
-#: src/commandhandler.cpp:216
+#: src/commandhandler.cpp:225
 #, fuzzy
 msgid "This command ignores the given player regardless of current relations."
 msgstr "Tento príkaz zobrazí počet aktuálne pripojených hráčov."
 
-#: src/commandhandler.cpp:221
+#: src/commandhandler.cpp:230
 msgid "Command: /join <channel>"
 msgstr ""
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:231
 msgid "This command makes you enter <channel>."
 msgstr ""
 
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:232
 msgid "If <channel> doesn't exist, it's created."
 msgstr ""
 
-#: src/commandhandler.cpp:227
+#: src/commandhandler.cpp:236
 msgid "Command: /list"
 msgstr ""
 
-#: src/commandhandler.cpp:228
+#: src/commandhandler.cpp:237
 msgid "This command shows a list of all channels."
 msgstr ""
 
-#: src/commandhandler.cpp:232
+#: src/commandhandler.cpp:241
 msgid "Command: /me <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:233
+#: src/commandhandler.cpp:242
 msgid "This command tell others you are (doing) <msg>."
 msgstr ""
 
-#: src/commandhandler.cpp:237
+#: src/commandhandler.cpp:246
 msgid "Command: /msg <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:238
+#: src/commandhandler.cpp:247
 msgid "Command: /whisper <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:239
+#: src/commandhandler.cpp:248
 msgid "Command: /w <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:240
+#: src/commandhandler.cpp:249
 msgid "This command sends the text <message> to <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:241 src/commandhandler.cpp:260
+#: src/commandhandler.cpp:250 src/commandhandler.cpp:269
 #: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
-#: src/net/ea/gui/guildtab.cpp:75 src/net/ea/gui/partytab.cpp:75
+#: src/net/tmwa/gui/guildtab.cpp:75 src/net/tmwa/gui/partytab.cpp:75
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr "Ak <nick> medzery v mene, použi dvojité úvodzovky (\")."
 
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:255
 msgid "Command: /query <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:247
+#: src/commandhandler.cpp:256
 msgid "Command: /q <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:248
+#: src/commandhandler.cpp:257
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:253
+#: src/commandhandler.cpp:262
 #, fuzzy
 msgid "Command: /createparty <name>"
 msgstr "Príkaz: /clear"
 
-#: src/commandhandler.cpp:254
+#: src/commandhandler.cpp:263
 msgid "This command creates a new party called <name>."
 msgstr ""
 
-#: src/commandhandler.cpp:258
+#: src/commandhandler.cpp:267
 msgid "Command: /party <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:259 src/net/ea/gui/partytab.cpp:74
+#: src/commandhandler.cpp:268 src/net/tmwa/gui/partytab.cpp:74
 msgid "This command invites <nick> to party with you."
 msgstr ""
 
-#: src/commandhandler.cpp:265
+#: src/commandhandler.cpp:274
 msgid "Command: /present"
 msgstr ""
 
-#: src/commandhandler.cpp:266
+#: src/commandhandler.cpp:275
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: src/commandhandler.cpp:272
+#: src/commandhandler.cpp:281
 msgid "Command: /record <filename>"
 msgstr ""
 
-#: src/commandhandler.cpp:273
+#: src/commandhandler.cpp:282
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr ""
 
-#: src/commandhandler.cpp:275
+#: src/commandhandler.cpp:284
 msgid "Command: /record"
 msgstr ""
 
-#: src/commandhandler.cpp:276
+#: src/commandhandler.cpp:285
 msgid "This command finishes a recording session."
 msgstr ""
 
-#: src/commandhandler.cpp:280
+#: src/commandhandler.cpp:289
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: src/commandhandler.cpp:281
+#: src/commandhandler.cpp:290
 msgid ""
 "This command sets whether the return key should toggle the chat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: src/commandhandler.cpp:283
+#: src/commandhandler.cpp:292
 msgid ""
-"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
-"\", \"no\", \"false\" to turn the toggle off."
+"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
+"\"0\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: src/commandhandler.cpp:286
+#: src/commandhandler.cpp:295
 msgid "Command: /toggle"
 msgstr ""
 
-#: src/commandhandler.cpp:287
+#: src/commandhandler.cpp:296
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: src/commandhandler.cpp:291 src/gui/widgets/whispertab.cpp:93
+#: src/commandhandler.cpp:300 src/gui/widgets/whispertab.cpp:95
 #, fuzzy
 msgid "Command: /unignore <player>"
 msgstr "Príkaz: /announce <správa>"
 
-#: src/commandhandler.cpp:292
+#: src/commandhandler.cpp:301
 msgid "This command stops ignoring the given player if they are being ignored"
 msgstr ""
 
-#: src/commandhandler.cpp:297
+#: src/commandhandler.cpp:306
 msgid "Command: /where"
 msgstr "Príkaz: /where"
 
-#: src/commandhandler.cpp:298
+#: src/commandhandler.cpp:307
 msgid "This command displays the name of the current map."
 msgstr "Tento príkaz zobrazí meno aktuálne mapy."
 
-#: src/commandhandler.cpp:302
+#: src/commandhandler.cpp:311
 msgid "Command: /who"
 msgstr "Príkaz: /who"
 
-#: src/commandhandler.cpp:303
+#: src/commandhandler.cpp:312
 msgid "This command displays the number of players currently online."
 msgstr "Tento príkaz zobrazí počet aktuálne pripojených hráčov."
 
-#: src/commandhandler.cpp:309
+#: src/commandhandler.cpp:318
 msgid "Type /help for a list of commands."
 msgstr "Napíš /help pre zoznam príkazov."
 
-#: src/commandhandler.cpp:375
+#: src/commandhandler.cpp:384
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:383
+#: src/commandhandler.cpp:392
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:397
+#: src/commandhandler.cpp:406
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:410 src/net/ea/gui/partytab.cpp:109
+#: src/commandhandler.cpp:419 src/net/tmwa/gui/partytab.cpp:109
 msgid "Party name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:423 src/commandhandler.cpp:471
-#: src/commandhandler.cpp:493
+#: src/commandhandler.cpp:432 src/commandhandler.cpp:509
+#: src/commandhandler.cpp:531
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:441
+#: src/commandhandler.cpp:450
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:441
+#: src/commandhandler.cpp:450
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:450
+#: src/commandhandler.cpp:459
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:454
+#: src/commandhandler.cpp:463
 msgid "Message now closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:477
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:489
+msgid "Show IP: On"
+msgstr ""
+
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:485
+msgid "Show IP: Off"
+msgstr ""
+
+#: src/commandhandler.cpp:515
 msgid "Player already ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:484
+#: src/commandhandler.cpp:522
 msgid "Player successfully ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:486
+#: src/commandhandler.cpp:524
 msgid "Player could not be ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:501
+#: src/commandhandler.cpp:539
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:506
+#: src/commandhandler.cpp:544
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:508
+#: src/commandhandler.cpp:546
 msgid "Player could not be unignored!"
 msgstr ""
 
@@ -468,41 +483,41 @@ msgstr ""
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:326
+#: src/game.cpp:342
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:331
+#: src/game.cpp:347
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:355
+#: src/game.cpp:378
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:360
+#: src/game.cpp:382
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:705
+#: src/game.cpp:721
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:712
+#: src/game.cpp:726
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:946
+#: src/game.cpp:954
 #, fuzzy
 msgid "Could Not Load Map"
 msgstr "Nie je možné  vstúpiť do párty!"
 
-#: src/game.cpp:947
+#: src/game.cpp:955
 #, c-format
 msgid "Error while loading %s"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:75
+#: src/gui/beingpopup.cpp:76
 #, c-format
 msgid "Party: %s"
 msgstr ""
@@ -511,34 +526,34 @@ msgstr ""
 msgid "Buy"
 msgstr "Kúpiť"
 
-#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
-#: src/gui/sell.cpp:276
+#: src/gui/buy.cpp:69 src/gui/buy.cpp:261 src/gui/sell.cpp:71
+#: src/gui/sell.cpp:288
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:99 src/gui/npcdialog.cpp:100
-#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:479
+#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:112 src/gui/npcdialog.cpp:124
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:463
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:98 src/gui/npcdialog.cpp:101
-#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:491
+#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:111 src/gui/npcdialog.cpp:125
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:475
 msgid "-"
 msgstr ""
 
 #: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
-#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:182
-#: src/keyboardconfig.cpp:103
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:228
+#: src/keyboardconfig.cpp:102
 msgid "Quit"
 msgstr "Ukončiť"
 
-#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:408
-#: src/gui/statuswindow.cpp:478 src/gui/statuswindow.cpp:512
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:384
+#: src/gui/statuswindow.cpp:462 src/gui/statuswindow.cpp:496
 msgid "Max"
 msgstr ""
 
@@ -552,11 +567,11 @@ msgstr "Predaj"
 
 #: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
 #: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
-#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:101
-#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:178
-#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:402
+#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:114
+#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:389
 #: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
-#: src/gui/socialwindow.cpp:242 src/gui/textdialog.cpp:39
+#: src/gui/socialwindow.cpp:275 src/gui/textdialog.cpp:40
 #: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr "Zrušiť"
@@ -593,7 +608,7 @@ msgstr ""
 msgid "Change Password"
 msgstr "Zmeniť heslo"
 
-#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:53
+#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:55
 #: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
 msgid "Password:"
 msgstr "Heslo:"
@@ -624,19 +639,19 @@ msgstr ""
 msgid "Create Character"
 msgstr "Vytvoriť postavu"
 
-#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:52
+#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:54
 #: src/gui/register.cpp:67
 msgid "Name:"
 msgstr "Meno"
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
 #: src/gui/outfitwindow.cpp:67
 msgid ">"
 msgstr ""
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
 #: src/gui/outfitwindow.cpp:66
@@ -653,8 +668,8 @@ msgstr "Farba vlasov:"
 msgid "Hair style:"
 msgstr "Štýl vlasov:"
 
-#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:397
-#: src/gui/socialwindow.cpp:296
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:392
+#: src/gui/socialwindow.cpp:329
 msgid "Create"
 msgstr "Vytvoriť"
 
@@ -710,34 +725,34 @@ msgstr "Zrušiť registráciu"
 msgid "Change Email"
 msgstr "Zmeniť Emailovú adresu"
 
-#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:185
-#: src/gui/setup_players.cpp:230
+#: src/gui/charselectdialog.cpp:336 src/gui/serverdialog.cpp:231
+#: src/gui/setup_players.cpp:229
 msgid "Delete"
 msgstr "Vymazať"
 
-#: src/gui/charselectdialog.cpp:387
+#: src/gui/charselectdialog.cpp:380
 #, fuzzy
 msgid "Choose"
 msgstr "Zatvoriť"
 
-#: src/gui/charselectdialog.cpp:399 src/gui/charselectdialog.cpp:400
+#: src/gui/charselectdialog.cpp:394 src/gui/charselectdialog.cpp:395
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:77 src/gui/palette.cpp:96
+#: src/gui/chat.cpp:88
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chat.cpp:287
+#: src/gui/chat.cpp:311
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:305
+#: src/gui/chat.cpp:329
 msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:469
+#: src/gui/chat.cpp:493
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Nápoveda pre %s: %s"
@@ -799,143 +814,173 @@ msgstr ""
 msgid "Ambient FX: %s"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:56
+#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:55
 msgid "Equipment"
 msgstr "Vybavenie"
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:77
-#: src/gui/inventorywindow.cpp:79 src/gui/inventorywindow.cpp:298
-#: src/gui/popupmenu.cpp:372
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:89
+#: src/gui/inventorywindow.cpp:337 src/gui/popupmenu.cpp:359
 msgid "Unequip"
 msgstr "Odstrojiť"
 
-#: src/gui/help.cpp:36
+#: src/gui/help.cpp:37
 msgid "Help"
 msgstr "Nápoveda"
 
-#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:73
+#: src/gui/help.cpp:51 src/gui/npcdialog.cpp:50
 msgid "Close"
 msgstr "Zatvoriť"
 
-#: src/gui/inventorywindow.cpp:56 src/gui/windowmenu.cpp:57
+#: src/gui/inventorywindow.cpp:59 src/gui/windowmenu.cpp:56
 msgid "Inventory"
 msgstr "Inventár"
 
-#: src/gui/inventorywindow.cpp:72 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:300 src/gui/popupmenu.cpp:374
+#: src/gui/inventorywindow.cpp:59
+msgid "Storage"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:82
+msgid "Slots:"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:87 src/gui/inventorywindow.cpp:100
+#: src/gui/inventorywindow.cpp:339 src/gui/popupmenu.cpp:361
 msgid "Equip"
 msgstr "Vystrojiť"
 
-#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:304 src/gui/popupmenu.cpp:377
+#: src/gui/inventorywindow.cpp:88
 msgid "Use"
 msgstr "Použiť"
 
-#: src/gui/inventorywindow.cpp:83 src/gui/inventorywindow.cpp:308
-#: src/gui/popupmenu.cpp:380
+#: src/gui/inventorywindow.cpp:101 src/gui/popupmenu.cpp:364
+msgid "Activate"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:102 src/gui/inventorywindow.cpp:348
+#: src/gui/popupmenu.cpp:367
 #, fuzzy
 msgid "Drop..."
 msgstr "Zahodiť"
 
-#: src/gui/inventorywindow.cpp:84 src/gui/popupmenu.cpp:386
+#: src/gui/inventorywindow.cpp:103 src/gui/popupmenu.cpp:373
 msgid "Split"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:85 src/gui/outfitwindow.cpp:51
+#: src/gui/inventorywindow.cpp:104 src/gui/outfitwindow.cpp:51
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:96 src/gui/storagewindow.cpp:83
-msgid "Slots:"
+#: src/gui/inventorywindow.cpp:106
+msgid "Weight:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:97
-msgid "Weight:"
+#: src/gui/inventorywindow.cpp:124 src/gui/popupmenu.cpp:378
+msgid "Store"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:125 src/gui/popupmenu.cpp:385
+msgid "Retrieve"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:310 src/gui/popupmenu.cpp:382
+#: src/gui/inventorywindow.cpp:350 src/gui/popupmenu.cpp:369
 msgid "Drop"
 msgstr "Zahodiť"
 
-#: src/gui/itemamount.cpp:100 src/gui/okdialog.cpp:42
-#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:38 src/gui/trade.cpp:73
-#: src/gui/trade.cpp:75
+#: src/gui/itemamount.cpp:113 src/gui/okdialog.cpp:42
+#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:39 src/gui/trade.cpp:72
+#: src/gui/trade.cpp:74
 msgid "OK"
 msgstr "Potvrdiť"
 
-#: src/gui/itemamount.cpp:102
+#: src/gui/itemamount.cpp:115
 msgid "All"
 msgstr ""
 
-#: src/gui/itemamount.cpp:128
+#: src/gui/itemamount.cpp:141
 msgid "Select amount of items to trade."
 msgstr "Zvoľte množstvo vecí k predaju."
 
-#: src/gui/itemamount.cpp:131
+#: src/gui/itemamount.cpp:144
 msgid "Select amount of items to drop."
 msgstr "Zvoľte množstvo vecí k zahodeniu."
 
-#: src/gui/itemamount.cpp:134
+#: src/gui/itemamount.cpp:147
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/itemamount.cpp:137
+#: src/gui/itemamount.cpp:150
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamount.cpp:140
+#: src/gui/itemamount.cpp:153
 msgid "Select amount of items to split."
 msgstr "Zvoľte množstvo vecí k rozdeleniu."
 
-#: src/gui/itempopup.cpp:92
+#: src/gui/itempopup.cpp:137
 #, fuzzy, c-format
 msgid "Weight: %s"
 msgstr "Effekt: %s"
 
-#: src/gui/login.cpp:49 src/gui/login.cpp:61
+#: src/gui/login.cpp:51 src/gui/login.cpp:63
 msgid "Login"
 msgstr "Prihlásenie"
 
-#: src/gui/login.cpp:58
+#: src/gui/login.cpp:60
 #, fuzzy
 msgid "Remember username"
 msgstr "Zapamätať si používateľské meno"
 
-#: src/gui/login.cpp:59 src/gui/register.cpp:58 src/gui/register.cpp:73
+#: src/gui/login.cpp:61 src/gui/register.cpp:58 src/gui/register.cpp:73
 msgid "Register"
 msgstr "Registrovať"
 
-#: src/gui/login.cpp:60
+#: src/gui/login.cpp:62
 #, fuzzy
 msgid "Change Server"
 msgstr "Vyberte Server"
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
+#: src/gui/login.cpp:129
+msgid "Registration disabled"
+msgstr ""
+
+#: src/gui/login.cpp:129
+msgid "You need to use the website to register an account for this server."
+msgstr ""
+
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:86
 msgid "Map"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:44
+#: src/gui/ministatus.cpp:235
+msgid "Need"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:48
 msgid "Waiting for server"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:45
+#: src/gui/npcdialog.cpp:49
 msgid "Next"
 msgstr "Nasledujúci"
 
-#: src/gui/npcdialog.cpp:47
+#: src/gui/npcdialog.cpp:51
 msgid "Submit"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:52 src/gui/npcpostdialog.cpp:41
+#: src/gui/npcdialog.cpp:73 src/gui/npcpostdialog.cpp:41
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:110
+#: src/gui/npcdialog.cpp:118
+msgid "Clear log"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:134
 msgid "Reset"
 msgstr ""
 
 #. TRANSLATORS: Please leave the \n sequences intact.
-#: src/gui/npcdialog.cpp:171
+#: src/gui/npcdialog.cpp:208
 #, fuzzy
 msgid ""
 "\n"
@@ -950,7 +995,7 @@ msgstr ""
 msgid "Send"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:96
+#: src/gui/npcpostdialog.cpp:99
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
@@ -965,303 +1010,82 @@ msgstr ""
 msgid "Unequip first"
 msgstr "Odstrojiť"
 
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:143
-msgid "Text"
-msgstr ""
-
-#: src/gui/palette.cpp:82
-msgid "Text Shadow"
-msgstr ""
-
-#: src/gui/palette.cpp:83
-msgid "Text Outline"
-msgstr ""
-
-#: src/gui/palette.cpp:84
-msgid "Progress Bar Labels"
-msgstr ""
-
-#: src/gui/palette.cpp:85
-msgid "Buttons"
-msgstr ""
-
-#: src/gui/palette.cpp:86
-msgid "Disabled Buttons"
-msgstr ""
-
-#: src/gui/palette.cpp:87
-msgid "Tabs"
-msgstr ""
-
-#: src/gui/palette.cpp:89
-msgid "Background"
-msgstr ""
-
-#: src/gui/palette.cpp:91
-msgid "Highlight"
-msgstr ""
-
-#: src/gui/palette.cpp:92
-msgid "Tab Highlight"
-msgstr ""
-
-#: src/gui/palette.cpp:93
-msgid "Item Too Expensive"
-msgstr ""
-
-#: src/gui/palette.cpp:94
-msgid "Item Is Equipped"
-msgstr ""
-
-#: src/gui/palette.cpp:97
-msgid "GM"
-msgstr ""
-
-#: src/gui/palette.cpp:98
-msgid "Player"
-msgstr ""
-
-#: src/gui/palette.cpp:99
-msgid "Whisper"
-msgstr ""
-
-#: src/gui/palette.cpp:100
-msgid "Is"
-msgstr ""
-
-#: src/gui/palette.cpp:101 src/net/ea/gui/partytab.cpp:43
-msgid "Party"
-msgstr ""
-
-#: src/gui/palette.cpp:102 src/net/ea/gui/guildtab.cpp:45
-msgid "Guild"
-msgstr ""
-
-#: src/gui/palette.cpp:103
-msgid "Server"
-msgstr ""
-
-#: src/gui/palette.cpp:104
-msgid "Logger"
-msgstr ""
-
-#: src/gui/palette.cpp:105
-msgid "Hyperlink"
-msgstr ""
-
-#: src/gui/palette.cpp:107
-msgid "Being"
-msgstr ""
-
-#: src/gui/palette.cpp:108
-msgid "Other Players' Names"
-msgstr ""
-
-#: src/gui/palette.cpp:109
-msgid "Own Name"
-msgstr ""
-
-#: src/gui/palette.cpp:110
-msgid "GM Names"
-msgstr ""
-
-#: src/gui/palette.cpp:111
-msgid "NPCs"
-msgstr ""
-
-#: src/gui/palette.cpp:112
-msgid "Monsters"
-msgstr ""
-
-#: src/gui/palette.cpp:114
-msgid "Unknown Item Type"
-msgstr ""
-
-#: src/gui/palette.cpp:115
-msgid "Generics"
-msgstr ""
-
-#: src/gui/palette.cpp:116
-msgid "Hats"
-msgstr ""
-
-#: src/gui/palette.cpp:117
-msgid "Usables"
-msgstr ""
-
-#: src/gui/palette.cpp:118
-msgid "Shirts"
-msgstr ""
-
-#: src/gui/palette.cpp:119
-msgid "One Handed Weapons"
-msgstr ""
-
-#: src/gui/palette.cpp:120
-msgid "Pants"
-msgstr ""
-
-#: src/gui/palette.cpp:121
-msgid "Shoes"
-msgstr ""
-
-#: src/gui/palette.cpp:122
-msgid "Two Handed Weapons"
-msgstr ""
-
-#: src/gui/palette.cpp:123
-msgid "Shields"
-msgstr ""
-
-#: src/gui/palette.cpp:124
-msgid "Rings"
-msgstr ""
-
-#: src/gui/palette.cpp:125
-msgid "Necklaces"
-msgstr ""
-
-#: src/gui/palette.cpp:126
-msgid "Arms"
-msgstr ""
-
-#: src/gui/palette.cpp:127
-msgid "Ammo"
-msgstr ""
-
-#: src/gui/palette.cpp:129
-msgid "Particle Effects"
-msgstr ""
-
-#: src/gui/palette.cpp:130
-msgid "Pickup Notification"
-msgstr ""
-
-#: src/gui/palette.cpp:131
-msgid "Exp Notification"
-msgstr ""
-
-#: src/gui/palette.cpp:133
-msgid "Player Hits Monster"
-msgstr ""
-
-#: src/gui/palette.cpp:135
-msgid "Monster Hits Player"
-msgstr ""
-
-#: src/gui/palette.cpp:136
-msgid "Critical Hit"
-msgstr ""
-
-#: src/gui/palette.cpp:137
-msgid "Misses"
-msgstr ""
-
-#: src/gui/palette.cpp:139
-msgid "HP Bar"
-msgstr ""
-
-#: src/gui/palette.cpp:140
-msgid "3/4 HP Bar"
-msgstr ""
-
-#: src/gui/palette.cpp:141
-msgid "1/2 HP Bar"
-msgstr ""
-
-#: src/gui/palette.cpp:142
-msgid "1/4 HP Bar"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:84
+#: src/gui/popupmenu.cpp:83
 #, fuzzy, c-format
 msgid "Trade with %s..."
 msgstr "@@obchod|Obchodovať s %s@@"
 
-#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:161
+#: src/gui/popupmenu.cpp:87 src/gui/popupmenu.cpp:158
 #, fuzzy, c-format
 msgid "Attack %s"
 msgstr "@@útok|Útok %s@@"
 
-#: src/gui/popupmenu.cpp:92
+#: src/gui/popupmenu.cpp:91
 #, fuzzy, c-format
 msgid "Whisper %s"
 msgstr "Nápoveda pre %s: %s"
 
-#: src/gui/popupmenu.cpp:101
+#: src/gui/popupmenu.cpp:100
 #, c-format
 msgid "Befriend %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:106
+#: src/gui/popupmenu.cpp:105
 #, c-format
 msgid "Disregard %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:109
+#: src/gui/popupmenu.cpp:108
 #, c-format
 msgid "Ignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:115 src/gui/popupmenu.cpp:124
+#: src/gui/popupmenu.cpp:114 src/gui/popupmenu.cpp:123
 #, c-format
 msgid "Unignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:118
+#: src/gui/popupmenu.cpp:117
 #, c-format
 msgid "Completely ignore %s"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:130
-#, c-format
-msgid "Follow %s"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:133
 #, fuzzy, c-format
 msgid "Invite %s to join your guild"
 msgstr "@@párti|Pozvať %s pridať sa do tvoje párti@@"
 
-#: src/gui/popupmenu.cpp:137
+#: src/gui/popupmenu.cpp:134
 #, fuzzy, c-format
 msgid "Invite %s to join your party"
 msgstr "@@párti|Pozvať %s pridať sa do tvoje párti@@"
 
-#: src/gui/popupmenu.cpp:144
+#: src/gui/popupmenu.cpp:141
 msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:153
+#: src/gui/popupmenu.cpp:150
 #, c-format
 msgid "Talk to %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:166
+#: src/gui/popupmenu.cpp:163
 msgid "Kick monster"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:174
+#: src/gui/popupmenu.cpp:171
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:191
+#: src/gui/popupmenu.cpp:188
 #, c-format
 msgid "Pick up %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:400
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:387
 msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:70
-msgid "Store"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:71
-msgid "Retrieve"
-msgstr ""
-
 #: src/gui/quitdialog.cpp:44
 msgid "Switch server"
 msgstr "Zmeniť server"
@@ -1330,50 +1154,63 @@ msgstr "Heslo musí byť menšie %d ako písmen."
 msgid "Passwords do not match."
 msgstr "Heslá sa nezhodujú."
 
-#: src/gui/serverdialog.cpp:134
+#: src/gui/serverdialog.cpp:197
 msgid "Choose Your Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:141 src/gui/widgets/chattab.cpp:139
+#: src/gui/serverdialog.cpp:206 src/gui/widgets/chattab.cpp:142
 msgid "Server:"
 msgstr "Server:"
 
-#: src/gui/serverdialog.cpp:142
+#: src/gui/serverdialog.cpp:207
 msgid "Port:"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:143
+#: src/gui/serverdialog.cpp:208
 #, fuzzy
 msgid "Server type:"
 msgstr "Server:"
 
-#: src/gui/serverdialog.cpp:183
+#: src/gui/serverdialog.cpp:229
 #, fuzzy
 msgid "Connect"
 msgstr "Pripájam sa..."
 
-#: src/gui/serverdialog.cpp:184
+#: src/gui/serverdialog.cpp:230
 #, fuzzy
 msgid "Custom Server"
 msgstr "Vyberte Server"
 
-#: src/gui/serverdialog.cpp:262
+#: src/gui/serverdialog.cpp:324
 msgid "Please type both the address and the port of a server."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:411
+#: src/gui/serverdialog.cpp:441
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:417
+#: src/gui/serverdialog.cpp:447
 msgid "Waiting for server..."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:421
+#: src/gui/serverdialog.cpp:451
 msgid "Preparing download"
 msgstr ""
 
+#: src/gui/serverdialog.cpp:455
+msgid "Error retreiving server list!"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:550
+msgid "requires a newer version"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:552
+#, c-format
+msgid "requires v%s"
+msgstr ""
+
 #: src/gui/setup_audio.cpp:42
 msgid "Sound"
 msgstr "Zvuk"
@@ -1406,50 +1243,50 @@ msgstr ""
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:44
+#: src/gui/setup_colors.cpp:46
 msgid "This is what the color looks like"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:49
+#: src/gui/setup_colors.cpp:51
 msgid "Colors"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:70
+#: src/gui/setup_colors.cpp:72
 msgid "Type:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:81 src/gui/setup_colors.cpp:433
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:331
 msgid "Static"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:84
-#: src/gui/setup_colors.cpp:434
+#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
+#: src/gui/setup_colors.cpp:332
 msgid "Pulse"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
+#: src/gui/setup_colors.cpp:333
 msgid "Rainbow"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
+#: src/gui/setup_colors.cpp:333
 msgid "Spectrum"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:92
+#: src/gui/setup_colors.cpp:94
 msgid "Delay:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:107
+#: src/gui/setup_colors.cpp:109
 msgid "Red:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:122
+#: src/gui/setup_colors.cpp:124
 msgid "Green:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:137
+#: src/gui/setup_colors.cpp:139
 msgid "Blue:"
 msgstr ""
 
@@ -1494,567 +1331,579 @@ msgid "Assign"
 msgstr ""
 
 #: src/gui/setup_keyboard.cpp:90
+msgid "Unassign"
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:94
 msgid "Default"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:119
+#: src/gui/setup_keyboard.cpp:125
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_players.cpp:57
+#: src/gui/setup_players.cpp:58
 msgid "Name"
 msgstr ""
 
-#: src/gui/setup_players.cpp:58
+#: src/gui/setup_players.cpp:59
 msgid "Relation"
 msgstr ""
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:64
 msgid "Neutral"
 msgstr ""
 
-#: src/gui/setup_players.cpp:64
+#: src/gui/setup_players.cpp:65
 msgid "Friend"
 msgstr ""
 
-#: src/gui/setup_players.cpp:65
+#: src/gui/setup_players.cpp:66
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_players.cpp:67
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_players.cpp:208 src/gui/setup_video.cpp:132
+#: src/gui/setup_players.cpp:206 src/gui/setup_video.cpp:153
 msgid "???"
 msgstr ""
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_players.cpp:225
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_players.cpp:228
+#: src/gui/setup_players.cpp:227
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:231
 msgid "Put all whispers in tabs"
 msgstr ""
 
-#: src/gui/setup_players.cpp:234
+#: src/gui/setup_players.cpp:233
 msgid "Show gender"
 msgstr ""
 
-#: src/gui/setup_players.cpp:236
+#: src/gui/setup_players.cpp:235
+msgid "Enable Chat log"
+msgstr ""
+
+#: src/gui/setup_players.cpp:237
 msgid "Players"
 msgstr ""
 
-#: src/gui/setup_players.cpp:261
+#: src/gui/setup_players.cpp:262
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:113
+#: src/gui/setup_video.cpp:134
 msgid "Tiny"
 msgstr ""
 
-#: src/gui/setup_video.cpp:114
+#: src/gui/setup_video.cpp:135
 msgid "Small"
 msgstr ""
 
-#: src/gui/setup_video.cpp:115
+#: src/gui/setup_video.cpp:136
 msgid "Medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:116
+#: src/gui/setup_video.cpp:137
 msgid "Large"
 msgstr ""
 
-#: src/gui/setup_video.cpp:142
+#: src/gui/setup_video.cpp:163
 msgid "No text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:144
+#: src/gui/setup_video.cpp:164
+msgid "Text"
+msgstr ""
+
+#: src/gui/setup_video.cpp:165
 msgid "Bubbles, no names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:145
+#: src/gui/setup_video.cpp:166
 msgid "Bubbles with names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:157
+#: src/gui/setup_video.cpp:178
 msgid "off"
 msgstr ""
 
-#: src/gui/setup_video.cpp:158 src/gui/setup_video.cpp:171
+#: src/gui/setup_video.cpp:179 src/gui/setup_video.cpp:192
 msgid "low"
 msgstr ""
 
-#: src/gui/setup_video.cpp:159 src/gui/setup_video.cpp:173
+#: src/gui/setup_video.cpp:180 src/gui/setup_video.cpp:194
 msgid "high"
 msgstr ""
 
-#: src/gui/setup_video.cpp:172
+#: src/gui/setup_video.cpp:193
 msgid "medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:174
+#: src/gui/setup_video.cpp:195
 msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:196
+#: src/gui/setup_video.cpp:217
 msgid "Full screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:197
+#: src/gui/setup_video.cpp:218
 msgid "OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:198
+#: src/gui/setup_video.cpp:219
 msgid "Custom cursor"
 msgstr ""
 
-#: src/gui/setup_video.cpp:200
+#: src/gui/setup_video.cpp:221
 msgid "Visible names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:223
 msgid "Particle effects"
 msgstr ""
 
-#: src/gui/setup_video.cpp:204
+#: src/gui/setup_video.cpp:225
 msgid "Show own name"
 msgstr ""
 
-#: src/gui/setup_video.cpp:205
+#: src/gui/setup_video.cpp:226
+msgid "Log NPC dialogue"
+msgstr ""
+
+#: src/gui/setup_video.cpp:227
 msgid "Show pickup notification"
 msgstr ""
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:207
+#. TRANSLATORS: Refers to "Show pickup notification"
+#: src/gui/setup_video.cpp:229
 msgid "in chat"
 msgstr ""
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:209
+#. TRANSLATORS: Refers to "Show pickup notification"
+#: src/gui/setup_video.cpp:231
 msgid "as particle"
 msgstr ""
 
-#: src/gui/setup_video.cpp:214
+#: src/gui/setup_video.cpp:236
 msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:225
+#: src/gui/setup_video.cpp:247
+msgid "Disable transparency (Low CPU mode)"
+msgstr ""
+
+#: src/gui/setup_video.cpp:250
 msgid "Video"
 msgstr ""
 
-#: src/gui/setup_video.cpp:227
-msgid "Show monster damage"
+#: src/gui/setup_video.cpp:252
+msgid "Show damage"
 msgstr ""
 
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:258
 msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:259
 msgid "Gui opacity"
 msgstr ""
 
-#: src/gui/setup_video.cpp:235
+#: src/gui/setup_video.cpp:260
 msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_video.cpp:236
+#: src/gui/setup_video.cpp:261
 msgid "Particle detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237
+#: src/gui/setup_video.cpp:262
 msgid "Font size"
 msgstr ""
 
-#: src/gui/setup_video.cpp:251 src/gui/setup_video.cpp:454
-#: src/gui/setup_video.cpp:568
+#: src/gui/setup_video.cpp:277 src/gui/setup_video.cpp:532
+#: src/gui/setup_video.cpp:662
 #, fuzzy
 msgid "None"
 msgstr "Nie"
 
-#: src/gui/setup_video.cpp:381
+#: src/gui/setup_video.cpp:426
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:387
+#: src/gui/setup_video.cpp:432
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:398
+#: src/gui/setup_video.cpp:443
 msgid "Switching to Full Screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:399
+#: src/gui/setup_video.cpp:444
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:411
+#: src/gui/setup_video.cpp:458
 msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:412
+#: src/gui/setup_video.cpp:459
+msgid ""
+"Applying change to OpenGL requires restart. In case OpenGL messes up your "
+"game graphics, restart the game with the command line option \"--no-opengl\"."
+msgstr ""
+
+#: src/gui/setup_video.cpp:466
+msgid "Deactivating OpenGL"
+msgstr ""
+
+#: src/gui/setup_video.cpp:467
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#: src/gui/setup_video.cpp:486 src/gui/setup_video.cpp:491
+#: src/gui/setup_video.cpp:475
+msgid "Transparency disabled"
+msgstr ""
+
+#: src/gui/setup_video.cpp:476 src/gui/setup_video.cpp:484
+msgid "You must restart to apply changes."
+msgstr ""
+
+#: src/gui/setup_video.cpp:483
+msgid "Transparency enabled"
+msgstr ""
+
+#: src/gui/setup_video.cpp:576 src/gui/setup_video.cpp:581
 msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:487 src/gui/setup_video.cpp:492
+#: src/gui/setup_video.cpp:577 src/gui/setup_video.cpp:582
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:489
+#: src/gui/setup_video.cpp:579
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:522
+#: src/gui/setup_video.cpp:612
 msgid "Particle Effect Settings Changed."
 msgstr ""
 
-#: src/gui/setup_video.cpp:523
+#: src/gui/setup_video.cpp:613
 msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skilldialog.cpp:197 src/gui/windowmenu.cpp:58
+#: src/gui/skilldialog.cpp:212 src/gui/windowmenu.cpp:59
 msgid "Skills"
 msgstr "Schopnosti"
 
-#: src/gui/skilldialog.cpp:208
+#: src/gui/skilldialog.cpp:223
 msgid "Up"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:262
+#: src/gui/skilldialog.cpp:269
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:314
+#: src/gui/skilldialog.cpp:351
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:323
+#: src/gui/skilldialog.cpp:360
 #, fuzzy, c-format
 msgid "Skill %d"
 msgstr "Schopnosti"
 
-#: src/gui/skilldialog.cpp:405
+#: src/gui/skilldialog.cpp:442
 #, fuzzy, c-format
 msgid "Lvl: %d (%+d)"
 msgstr "Level: %d"
 
-#: src/gui/skilldialog.cpp:416
+#: src/gui/skilldialog.cpp:453
 #, fuzzy, c-format
 msgid "Lvl: %d"
 msgstr "Level: %d"
 
-#: src/gui/socialwindow.cpp:117
+#: src/gui/socialwindow.cpp:126
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:126
+#: src/gui/socialwindow.cpp:139
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:136
+#: src/gui/socialwindow.cpp:153
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:137
+#: src/gui/socialwindow.cpp:154
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:146
+#: src/gui/socialwindow.cpp:163
 msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:147
+#: src/gui/socialwindow.cpp:164
 #, fuzzy, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Naozaj chcete odstrániť túto postavu?"
 
-#: src/gui/socialwindow.cpp:182
+#: src/gui/socialwindow.cpp:207 src/net/tmwa/partyhandler.cpp:330
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:218
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:199
+#: src/gui/socialwindow.cpp:232
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:200
+#: src/gui/socialwindow.cpp:233
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:209
+#: src/gui/socialwindow.cpp:242
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:210
+#: src/gui/socialwindow.cpp:243
 #, fuzzy, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Naozaj chcete odstrániť túto postavu?"
 
-#: src/gui/socialwindow.cpp:239
+#: src/gui/socialwindow.cpp:272
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:240 src/gui/socialwindow.cpp:564
+#: src/gui/socialwindow.cpp:273 src/gui/socialwindow.cpp:620
 #, fuzzy
 msgid "Create Party"
 msgstr "Vytvoriť postavu"
 
-#: src/gui/socialwindow.cpp:279 src/gui/windowmenu.cpp:60
+#: src/gui/socialwindow.cpp:312 src/gui/windowmenu.cpp:64
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:297
+#: src/gui/socialwindow.cpp:330
 msgid "Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:298
+#: src/gui/socialwindow.cpp:331
 msgid "Leave"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:394
+#: src/gui/socialwindow.cpp:443
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:400
+#: src/gui/socialwindow.cpp:449
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:413
+#: src/gui/socialwindow.cpp:462
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:419
+#: src/gui/socialwindow.cpp:468
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:463
+#: src/gui/socialwindow.cpp:497
+msgid "Creating guild failed, please choose a shorter name."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:504
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:477
+#: src/gui/socialwindow.cpp:520
+msgid "Creating party failed, please choose a shorter name."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:527
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:484
+#: src/gui/socialwindow.cpp:541
 #, fuzzy
 msgid "Guild Name"
 msgstr "Klany, aliancie, guildy"
 
-#: src/gui/socialwindow.cpp:485
+#: src/gui/socialwindow.cpp:542
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:497
+#: src/gui/socialwindow.cpp:554
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:502
+#: src/gui/socialwindow.cpp:559
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:507
+#: src/gui/socialwindow.cpp:564
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:519
+#: src/gui/socialwindow.cpp:576
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:529
+#: src/gui/socialwindow.cpp:585
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:533
+#: src/gui/socialwindow.cpp:589
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:541
+#: src/gui/socialwindow.cpp:597
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:546
+#: src/gui/socialwindow.cpp:602
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:554
+#: src/gui/socialwindow.cpp:610
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:565
+#: src/gui/socialwindow.cpp:621
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:570
+#: src/gui/socialwindow.cpp:626
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:571
+#: src/gui/socialwindow.cpp:627
 msgid "Choose your party's name."
 msgstr ""
 
-#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:59
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:62
 msgid "Specials"
 msgstr ""
 
-#: src/gui/specialswindow.cpp:174
-#, c-format
-msgid "Specials Set %d"
-msgstr ""
-
-#: src/gui/specialswindow.cpp:191
-#, c-format
-msgid "Special %d"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:99 src/gui/statuswindow.cpp:247
+#: src/gui/statuswindow.cpp:113 src/gui/statuswindow.cpp:215
+#: src/gui/statuswindow.cpp:262
 #, c-format
 msgid "Level: %d"
 msgstr "Level: %d"
 
-#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:211
+#: src/gui/statuswindow.cpp:114 src/gui/statuswindow.cpp:208
+#: src/gui/statuswindow.cpp:239
 #, c-format
 msgid "Money: %s"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:102
+#: src/gui/statuswindow.cpp:117
 msgid "HP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:107
+#: src/gui/statuswindow.cpp:122
 msgid "Exp:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:112
+#: src/gui/statuswindow.cpp:130
 msgid "MP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:132 src/gui/statuswindow.cpp:219
+#: src/gui/statuswindow.cpp:158 src/gui/statuswindow.cpp:275
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:133
+#: src/gui/statuswindow.cpp:159
 msgid "Job:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:194
-msgid "HP"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:200
-msgid "MP"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:206
-msgid "Exp"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:215
-#, fuzzy
-msgid "Money"
-msgstr "Peniaze: %d"
-
-#: src/gui/statuswindow.cpp:225
-msgid "Job"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:229
+#: src/gui/statuswindow.cpp:211 src/gui/statuswindow.cpp:247
 #, fuzzy, c-format
 msgid "Character points: %d"
 msgstr "Charakterové staty OK"
 
-#: src/gui/statuswindow.cpp:235
+#: src/gui/statuswindow.cpp:255
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:251
-#, fuzzy
-msgid "Level"
-msgstr "Level: %d"
-
-#: src/gui/storagewindow.cpp:58
-msgid "Storage"
-msgstr ""
-
-#: src/gui/trade.cpp:52
+#: src/gui/trade.cpp:53
 msgid "Propose trade"
 msgstr ""
 
-#: src/gui/trade.cpp:53
+#: src/gui/trade.cpp:54
 msgid "Confirmed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:55
 msgid "Agree trade"
 msgstr ""
 
-#: src/gui/trade.cpp:55
+#: src/gui/trade.cpp:56
 msgid "Agreed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:58
+#: src/gui/trade.cpp:59
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/trade.cpp:74 src/gui/trade.cpp:75
+#: src/gui/trade.cpp:73 src/gui/trade.cpp:74
 msgid "Trade"
 msgstr ""
 
-#: src/gui/trade.cpp:77
+#: src/gui/trade.cpp:76
 msgid "Add"
 msgstr ""
 
-#: src/gui/trade.cpp:99 src/gui/trade.cpp:135
+#: src/gui/trade.cpp:98 src/gui/trade.cpp:134
 #, c-format
 msgid "You get %s"
 msgstr ""
 
-#: src/gui/trade.cpp:100
+#: src/gui/trade.cpp:99
 msgid "You give:"
 msgstr ""
 
-#: src/gui/trade.cpp:104
+#: src/gui/trade.cpp:103
 msgid "Change"
 msgstr ""
 
-#: src/gui/trade.cpp:275
+#: src/gui/trade.cpp:262
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/trade.cpp:318
+#: src/gui/trade.cpp:304
 msgid "You don't have enough money."
 msgstr ""
 
@@ -2075,21 +1924,21 @@ msgstr "Pripájam sa..."
 msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:405
+#: src/gui/updatewindow.cpp:417
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:407
+#: src/gui/updatewindow.cpp:419
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:409
+#: src/gui/updatewindow.cpp:421
 msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:501
+#: src/gui/updatewindow.cpp:515
 msgid "Completed"
 msgstr ""
 
@@ -2169,63 +2018,63 @@ msgstr ""
 msgid "Need a user to kick!"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:118
+#: src/gui/widgets/chattab.cpp:121
 msgid "Global announcement:"
 msgstr "Globálne oznámenie:"
 
-#: src/gui/widgets/chattab.cpp:124
+#: src/gui/widgets/chattab.cpp:127
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "Globálne oznámenie od %s:"
 
-#: src/gui/widgets/chattab.cpp:150
+#: src/gui/widgets/chattab.cpp:153
 #, fuzzy, c-format
 msgid "%s whispers: %s"
 msgstr "Nápoveda pre %s: %s"
 
-#: src/gui/widgets/whispertab.cpp:51
+#: src/gui/widgets/whispertab.cpp:53
 msgid "Cannot send empty chat!"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:70
+#: src/gui/widgets/whispertab.cpp:72
 msgid "/ignore > Ignore the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:71
+#: src/gui/widgets/whispertab.cpp:73
 msgid "/unignore > Stop ignoring the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:72
+#: src/gui/widgets/whispertab.cpp:74
 msgid "/close > Close the whisper tab"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:82
+#: src/gui/widgets/whispertab.cpp:84
 msgid "Command: /close"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:83
+#: src/gui/widgets/whispertab.cpp:85
 msgid "This command closes the current whisper tab."
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:87
+#: src/gui/widgets/whispertab.cpp:89
 #, fuzzy
 msgid "Command: /ignore"
 msgstr "Príkaz: /where"
 
-#: src/gui/widgets/whispertab.cpp:88
+#: src/gui/widgets/whispertab.cpp:90
 #, fuzzy
 msgid "This command ignores the other player regardless of current relations."
 msgstr "Tento príkaz zobrazí počet aktuálne pripojených hráčov."
 
-#: src/gui/widgets/whispertab.cpp:94
+#: src/gui/widgets/whispertab.cpp:96
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:55
+#: src/gui/windowmenu.cpp:54
 msgid "Status"
 msgstr "Stav"
 
-#: src/gui/windowmenu.cpp:61
+#: src/gui/windowmenu.cpp:65
 msgid "Shortcut"
 msgstr "Skratka"
 
@@ -2242,1362 +2091,1389 @@ msgstr ""
 msgid "Choose World"
 msgstr ""
 
-#: src/keyboardconfig.cpp:40
+#: src/keyboardconfig.cpp:39
 msgid "Move Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:41
+#: src/keyboardconfig.cpp:40
 msgid "Move Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:41
 msgid "Move Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:42
 msgid "Move Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:44 src/net/ea/generalhandler.cpp:223
+#: src/keyboardconfig.cpp:43 src/net/tmwa/generalhandler.cpp:237
 msgid "Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:44
 msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:45
 msgid "Smilie"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:46
 msgid "Talk"
 msgstr ""
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:47
 msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:48
 msgid "Target Monster"
 msgstr ""
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboardconfig.cpp:49
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:50
 msgid "Target Player"
 msgstr ""
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:51
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:52
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:53
 msgid "Sit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:54
 msgid "Screenshot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:55
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:56
 msgid "Find Path to Mouse"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58 src/keyboardconfig.cpp:59
-#: src/keyboardconfig.cpp:60 src/keyboardconfig.cpp:61
-#: src/keyboardconfig.cpp:62 src/keyboardconfig.cpp:63
-#: src/keyboardconfig.cpp:64 src/keyboardconfig.cpp:65
-#: src/keyboardconfig.cpp:66 src/keyboardconfig.cpp:67
-#: src/keyboardconfig.cpp:68 src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:57 src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60
+#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62
+#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64
+#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68
 #, c-format
 msgid "Item Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:69
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:70
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:71
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:72
 msgid "Equipment Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:73
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:74
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:75
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:76
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:77
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:78
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:79
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:80
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:81
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:83
+#: src/keyboardconfig.cpp:82
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:83
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86
-#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88
-#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90
-#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92
-#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:84 src/keyboardconfig.cpp:85
+#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:87
+#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:89
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:91
+#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:93
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:95
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:96
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:97
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:98
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:99
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:100
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:101
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:103
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:105
+#: src/keyboardconfig.cpp:104
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:178
+#: src/keyboardconfig.cpp:183
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:913
+#: src/localplayer.cpp:985
 msgid "Unable to pick up item."
 msgstr ""
 
 #. TRANSLATORS: This sentence may be translated differently
 #. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:922
+#: src/localplayer.cpp:994
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/main.cpp:43
+#: src/main.cpp:42
 msgid "mana [options] [mana-file]"
 msgstr ""
 
+#: src/main.cpp:43
+msgid "[mana-file] : The mana file is an XML file (.mana)"
+msgstr ""
+
 #: src/main.cpp:44
-msgid "Options:"
+msgid "              used to set custom parameters"
 msgstr ""
 
 #: src/main.cpp:45
+msgid "              to the mana client."
+msgstr ""
+
+#: src/main.cpp:47
+msgid "Options:"
+msgstr ""
+
+#: src/main.cpp:48
 msgid "  -v --version        : Display the version"
 msgstr ""
 
-#: src/main.cpp:46
+#: src/main.cpp:49
 msgid "  -h --help           : Display this help"
 msgstr ""
 
-#: src/main.cpp:47
+#: src/main.cpp:50
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
-#: src/main.cpp:48
+#: src/main.cpp:51
 msgid "  -U --username       : Login with this username"
 msgstr ""
 
-#: src/main.cpp:49
+#: src/main.cpp:52
 msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/main.cpp:50
+#: src/main.cpp:53
 msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/main.cpp:51
+#: src/main.cpp:54
 msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:52
+#: src/main.cpp:55
 msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/main.cpp:53
+#: src/main.cpp:56
 msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/main.cpp:54
+#: src/main.cpp:57
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:56
+#: src/main.cpp:59
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:57
+#: src/main.cpp:60
 msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:58
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
+#: src/main.cpp:61
+msgid "     --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/main.cpp:59
+#: src/main.cpp:62
+msgid "     --chat-log-dir   : Chat log dir to use"
+msgstr ""
+
+#: src/main.cpp:63
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/main.cpp:61
+#: src/main.cpp:65
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:63
+#: src/net/manaserv/beinghandler.cpp:303 src/net/tmwa/playerhandler.cpp:94
+msgid "You are dead."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:304 src/net/tmwa/playerhandler.cpp:95
+msgid "We regret to inform you that your character was killed in battle."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:306 src/net/tmwa/playerhandler.cpp:97
+msgid "You are not that alive anymore."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:307 src/net/tmwa/playerhandler.cpp:98
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:308 src/net/tmwa/playerhandler.cpp:99
+msgid "Game Over!"
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:309 src/net/tmwa/playerhandler.cpp:101
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:311 src/net/tmwa/playerhandler.cpp:103
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:313 src/net/tmwa/playerhandler.cpp:105
+msgid "I guess this did not run too well."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:107
+msgid "Do you want your possessions identified?"
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:109
+msgid "Sadly, no trace of you was ever found..."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:111
+msgid "Annihilated."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:113
+msgid "Looks like you got your head handed to you."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:115
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:323
+msgid "Press OK to respawn."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:324
+msgid "You Died"
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:138 src/net/manaserv/charhandler.cpp:209
+msgid "Not logged in."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:141
+msgid "No empty slot."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:144
+msgid "Invalid name."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:147
+msgid "Character's name already exists."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:150
+msgid "Invalid hairstyle."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:153
+msgid "Invalid hair color."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:156
+msgid "Invalid gender."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:159
+#, fuzzy
+msgid "Character's stats are too high."
+msgstr "Charakterové staty OK"
+
+#: src/net/manaserv/charhandler.cpp:162
+#, fuzzy
+msgid "Character's stats are too low."
+msgstr "Charakterové staty OK"
+
+#: src/net/manaserv/charhandler.cpp:165
+#, c-format
+msgid "At least one statis out of the permitted range: (%u - %u)."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:171 src/net/manaserv/loginhandler.cpp:96
+#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
+#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
+#: src/net/tmwa/loginhandler.cpp:95 src/net/tmwa/loginhandler.cpp:182
+#, fuzzy
+msgid "Unknown error."
+msgstr "Neznámy príkaz."
+
+#: src/net/manaserv/charhandler.cpp:200 src/net/tmwa/charserverhandler.cpp:146
+msgid "Info"
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:200
+msgid "Player deleted."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:212
+#, fuzzy
+msgid "Selection out of range."
+msgstr "Zvoľte množstvo vecí k predaju."
+
+#: src/net/manaserv/charhandler.cpp:215
+#, fuzzy, c-format
+msgid "Unknown error (%d)."
+msgstr "Neznámy príkaz."
+
+#: src/net/manaserv/charhandler.cpp:250
+msgid "No gameservers are available."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:187 src/net/manaserv/chathandler.cpp:313
+#: src/net/manaserv/guildhandler.cpp:260
+#, c-format
+msgid "Topic: %s"
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:274
+msgid "Players in this channel:"
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:208
+msgid "Error joining channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:214
+msgid "Listing channels."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:226
+msgid "End of channel list."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:303
+#, c-format
+msgid "%s entered the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:308
+#, c-format
+msgid "%s left the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:324
+#, c-format
+msgid "%s has set mode %s on user %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:334
+#, c-format
+msgid "%s has kicked %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:339
+#, fuzzy
+msgid "Unknown channel event."
+msgstr "Neznámy príkaz."
+
+#: src/net/manaserv/guildhandler.cpp:82
+msgid "Guild created."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:87
+msgid "Error creating guild."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:97
+msgid "Invite sent."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:204
+msgid "Member was promoted successfully."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:209
+msgid "Failed to promote member."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:87
+msgid "Wrong magic_token."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
+msgid "Already logged in."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:93
+#, fuzzy
+msgid "Account banned."
+msgstr "Účet: %s"
+
+#: src/net/manaserv/loginhandler.cpp:118
+msgid "New password incorrect."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:121 src/net/tmwa/loginhandler.cpp:89
+msgid "Old password incorrect."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
+msgid "Account not connected. Please login first."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:149
+msgid "New email address incorrect."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:152
+msgid "Old email address incorrect."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:158
+msgid "The new email address already exists."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:239
+msgid ""
+"Client registration is not allowed. Please contact server administration."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
+msgid "Client version is too old."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:266
+msgid "Wrong username or password."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:272
+#, fuzzy
+msgid "Account banned"
+msgstr "Účet: %s"
+
+#: src/net/manaserv/loginhandler.cpp:275
+msgid "Login attempt too soon after previous attempt."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:303
+msgid "Wrong username, password or email address."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:306
+msgid "Username already exists."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:309
+msgid "Email address already exists."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:312
+msgid "You took too long with the captcha or your response was incorrect."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:87
+msgid "Joined party."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:105
+#, c-format
+msgid "%s joined the party."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:123
+#, c-format
+msgid "%s rejected your invite."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:95
+msgid "Accepting incoming trade requests."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:97
+msgid "Ignoring incoming trade requests."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:115 src/net/tmwa/tradehandler.cpp:109
+msgid "Request for Trade"
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:116 src/net/tmwa/tradehandler.cpp:110
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:134
+#, c-format
+msgid "Trading with %s"
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:148 src/net/tmwa/tradehandler.cpp:224
+msgid "Trade canceled."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:155 src/net/tmwa/tradehandler.cpp:231
+msgid "Trade completed."
+msgstr ""
+
+#: src/net/tmwa/adminhandler.cpp:64
 msgid "Kick failed!"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:65
+#: src/net/tmwa/adminhandler.cpp:66
 msgid "Kick succeeded!"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:110
+#: src/net/tmwa/buysellhandler.cpp:109
 msgid "Nothing to sell."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:117
+#: src/net/tmwa/buysellhandler.cpp:116
 msgid "Thanks for buying."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:124
+#: src/net/tmwa/buysellhandler.cpp:123
 msgid "Unable to buy."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:130
+#: src/net/tmwa/buysellhandler.cpp:129
 msgid "Thanks for selling."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:132
+#: src/net/tmwa/buysellhandler.cpp:131
 msgid "Unable to sell."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:103
-msgid "Access denied."
+#: src/net/tmwa/charserverhandler.cpp:103
+msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:106
+#: src/net/tmwa/charserverhandler.cpp:107
 msgid "Cannot use this ID."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:109
-msgid "Unknown failure to select character."
-msgstr ""
+#: src/net/tmwa/charserverhandler.cpp:110
+#, fuzzy
+msgid "Unknown char-server failure."
+msgstr "Neznámy príkaz."
 
-#: src/net/ea/charserverhandler.cpp:135
+#: src/net/tmwa/charserverhandler.cpp:134
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:147 src/net/manaserv/charhandler.cpp:187
-msgid "Info"
-msgstr ""
-
-#: src/net/ea/charserverhandler.cpp:147
+#: src/net/tmwa/charserverhandler.cpp:146
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:152
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Failed to delete character."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:237 src/net/manaserv/charhandler.cpp:263
+#: src/net/tmwa/charserverhandler.cpp:266
 msgid "Strength:"
 msgstr "Sila:"
 
-#: src/net/ea/charserverhandler.cpp:238 src/net/manaserv/charhandler.cpp:264
+#: src/net/tmwa/charserverhandler.cpp:267
 msgid "Agility:"
 msgstr "Čulosť:"
 
-#: src/net/ea/charserverhandler.cpp:239 src/net/manaserv/charhandler.cpp:266
+#: src/net/tmwa/charserverhandler.cpp:268
 msgid "Vitality:"
 msgstr "Vitalita:"
 
-#: src/net/ea/charserverhandler.cpp:240 src/net/manaserv/charhandler.cpp:267
+#: src/net/tmwa/charserverhandler.cpp:269
 msgid "Intelligence:"
 msgstr "Inteligencia:"
 
-#: src/net/ea/charserverhandler.cpp:241 src/net/manaserv/charhandler.cpp:265
+#: src/net/tmwa/charserverhandler.cpp:270
 msgid "Dexterity:"
 msgstr "Obratnosť:"
 
-#: src/net/ea/charserverhandler.cpp:242
+#: src/net/tmwa/charserverhandler.cpp:271
 msgid "Luck:"
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:80
-msgid "Whisper could not be sent, user is offline."
+#: src/net/tmwa/chathandler.cpp:87
+#, c-format
+msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:84
-msgid "Whisper could not be sent, ignored by user."
+#: src/net/tmwa/chathandler.cpp:96
+#, c-format
+msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:171
+#: src/net/tmwa/chathandler.cpp:230
 msgid "MVP player."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:204 src/net/ea/chathandler.cpp:210
-#: src/net/ea/chathandler.cpp:215 src/net/ea/chathandler.cpp:220
-#: src/net/ea/chathandler.cpp:225 src/net/ea/chathandler.cpp:230
-#: src/net/ea/chathandler.cpp:235 src/net/ea/chathandler.cpp:240
+#: src/net/tmwa/chathandler.cpp:265 src/net/tmwa/chathandler.cpp:271
+#: src/net/tmwa/chathandler.cpp:276 src/net/tmwa/chathandler.cpp:281
+#: src/net/tmwa/chathandler.cpp:286 src/net/tmwa/chathandler.cpp:291
+#: src/net/tmwa/chathandler.cpp:296 src/net/tmwa/chathandler.cpp:301
 msgid "Channels are not supported!"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:86
+#: src/net/tmwa/gamehandler.cpp:88
 #, c-format
 msgid "Online users: %d"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:100
+#: src/net/tmwa/gamehandler.cpp:101
 #, fuzzy
 msgid "Game"
 msgstr "Meno"
 
-#: src/net/ea/gamehandler.cpp:100
+#: src/net/tmwa/gamehandler.cpp:101
 msgid "Request to quit denied!"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:102 src/net/manaserv/generalhandler.cpp:95
+#: src/net/tmwa/generalhandler.cpp:102
 #, c-format
 msgid "Strength %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:103 src/net/manaserv/generalhandler.cpp:96
+#: src/net/tmwa/generalhandler.cpp:103
 #, c-format
 msgid "Agility %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:104 src/net/manaserv/generalhandler.cpp:98
+#: src/net/tmwa/generalhandler.cpp:104
 #, c-format
 msgid "Vitality %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:105 src/net/manaserv/generalhandler.cpp:99
+#: src/net/tmwa/generalhandler.cpp:105
 #, c-format
 msgid "Intelligence %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:106 src/net/manaserv/generalhandler.cpp:97
+#: src/net/tmwa/generalhandler.cpp:106
 #, c-format
 msgid "Dexterity %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:107
+#: src/net/tmwa/generalhandler.cpp:107
 #, c-format
 msgid "Luck %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:130
+#: src/net/tmwa/generalhandler.cpp:132
 #, fuzzy
 msgid "Authentication failed."
 msgstr "Vytvorenie postavy sa nepodarilo"
 
-#: src/net/ea/generalhandler.cpp:133
+#: src/net/tmwa/generalhandler.cpp:135
 msgid "No servers available."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:137
+#: src/net/tmwa/generalhandler.cpp:139
 msgid "Someone else is trying to use this account."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:140
+#: src/net/tmwa/generalhandler.cpp:142
 msgid "This account is already logged in."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:143
+#: src/net/tmwa/generalhandler.cpp:145
 msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:146
+#: src/net/tmwa/generalhandler.cpp:148
 msgid "Duplicated login."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:149
+#: src/net/tmwa/generalhandler.cpp:151
 msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:205
+#: src/net/tmwa/generalhandler.cpp:209
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:216 src/net/manaserv/generalhandler.cpp:166
+#: src/net/tmwa/generalhandler.cpp:230
 msgid "Strength"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:217 src/net/manaserv/generalhandler.cpp:167
+#: src/net/tmwa/generalhandler.cpp:231
 msgid "Agility"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:218 src/net/manaserv/generalhandler.cpp:169
+#: src/net/tmwa/generalhandler.cpp:232
 msgid "Vitality"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:219 src/net/manaserv/generalhandler.cpp:170
+#: src/net/tmwa/generalhandler.cpp:233
 msgid "Intelligence"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:220 src/net/manaserv/generalhandler.cpp:168
+#: src/net/tmwa/generalhandler.cpp:234
 msgid "Dexterity"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:221
+#: src/net/tmwa/generalhandler.cpp:235
 msgid "Luck"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:224
+#: src/net/tmwa/generalhandler.cpp:238
 #, fuzzy
 msgid "Defense"
 msgstr "Vymazať"
 
-#: src/net/ea/generalhandler.cpp:225
+#: src/net/tmwa/generalhandler.cpp:239
 msgid "M.Attack"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:226
+#: src/net/tmwa/generalhandler.cpp:240
 msgid "M.Defense"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:227
+#: src/net/tmwa/generalhandler.cpp:241
 #, c-format
 msgid "% Accuracy"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:228
+#: src/net/tmwa/generalhandler.cpp:242
 #, c-format
 msgid "% Evade"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:229
+#: src/net/tmwa/generalhandler.cpp:243
 #, c-format
 msgid "% Critical"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:61 src/net/ea/gui/partytab.cpp:59
+#: src/net/tmwa/gui/guildtab.cpp:45
+msgid "Guild"
+msgstr ""
+
+#: src/net/tmwa/gui/guildtab.cpp:61 src/net/tmwa/gui/partytab.cpp:59
 msgid "/help > Display this help."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:62
+#: src/net/tmwa/gui/guildtab.cpp:62
 msgid "/invite > Invite a player to your guild"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:63
+#: src/net/tmwa/gui/guildtab.cpp:63
 msgid "/leave > Leave the guild you are in"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:64
+#: src/net/tmwa/gui/guildtab.cpp:64
 msgid "/kick > Kick some one from the guild you are in"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:73 src/net/ea/gui/partytab.cpp:73
+#: src/net/tmwa/gui/guildtab.cpp:73 src/net/tmwa/gui/partytab.cpp:73
 msgid "Command: /invite <nick>"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:74
+#: src/net/tmwa/gui/guildtab.cpp:74
 msgid "This command invites <nick> to the guild you're in."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:80 src/net/ea/gui/partytab.cpp:80
+#: src/net/tmwa/gui/guildtab.cpp:80 src/net/tmwa/gui/partytab.cpp:80
 msgid "Command: /leave"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:81
+#: src/net/tmwa/gui/guildtab.cpp:81
 #, fuzzy
 msgid "This command causes the player to leave the guild."
 msgstr "Tento príkaz zobrazí meno aktuálne mapy."
 
-#: src/net/ea/gui/guildtab.cpp:89
+#: src/net/tmwa/gui/guildtab.cpp:89
 msgid "Guild name is missing."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:293
+#: src/net/tmwa/guildhandler.cpp:296
 msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:298
+#: src/net/tmwa/guildhandler.cpp:301
 msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:303
+#: src/net/tmwa/guildhandler.cpp:306
 msgid "User is now part of your guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:308
+#: src/net/tmwa/guildhandler.cpp:311
 msgid "Your guild is full."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:313
+#: src/net/tmwa/guildhandler.cpp:316
 msgid "Unknown guild invite response."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:390
+#: src/net/tmwa/guildhandler.cpp:393
 msgid "Guild creation isn't supported yet."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:60
+#: src/net/tmwa/gui/partytab.cpp:43
+msgid "Party"
+msgstr ""
+
+#: src/net/tmwa/gui/partytab.cpp:60
 msgid "/invite > Invite a player to your party"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:61
+#: src/net/tmwa/gui/partytab.cpp:61
 msgid "/leave > Leave the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:62
+#: src/net/tmwa/gui/partytab.cpp:62
 msgid "/kick > Kick some one from the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:63
+#: src/net/tmwa/gui/partytab.cpp:63
 msgid "/item > Show/change party item sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:64
+#: src/net/tmwa/gui/partytab.cpp:64
 msgid "/exp > Show/change party experience sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:81
+#: src/net/tmwa/gui/partytab.cpp:81
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:85
+#: src/net/tmwa/gui/partytab.cpp:85
 msgid "Command: /item <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:86
+#: src/net/tmwa/gui/partytab.cpp:86
 msgid "This command changes the party's item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:87
+#: src/net/tmwa/gui/partytab.cpp:87
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:90
+#: src/net/tmwa/gui/partytab.cpp:90
 msgid "Command: /item"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/tmwa/gui/partytab.cpp:91
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/tmwa/gui/partytab.cpp:95
 msgid "Command: /exp <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:96
+#: src/net/tmwa/gui/partytab.cpp:96
 msgid "This command changes the party's experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/tmwa/gui/partytab.cpp:97
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:100
+#: src/net/tmwa/gui/partytab.cpp:100
 msgid "Command: /exp"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/tmwa/gui/partytab.cpp:101
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:132 src/net/ea/partyhandler.cpp:198
+#: src/net/tmwa/gui/partytab.cpp:132 src/net/tmwa/partyhandler.cpp:196
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:135 src/net/ea/partyhandler.cpp:204
+#: src/net/tmwa/gui/partytab.cpp:135 src/net/tmwa/partyhandler.cpp:202
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:138 src/net/ea/partyhandler.cpp:210
+#: src/net/tmwa/gui/partytab.cpp:138 src/net/tmwa/partyhandler.cpp:208
 msgid "Item sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:141
+#: src/net/tmwa/gui/partytab.cpp:141
 msgid "Item sharing unknown."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:167 src/net/ea/partyhandler.cpp:174
+#: src/net/tmwa/gui/partytab.cpp:167 src/net/tmwa/partyhandler.cpp:172
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:170 src/net/ea/partyhandler.cpp:180
+#: src/net/tmwa/gui/partytab.cpp:170 src/net/tmwa/partyhandler.cpp:178
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:173 src/net/ea/partyhandler.cpp:186
+#: src/net/tmwa/gui/partytab.cpp:173 src/net/tmwa/partyhandler.cpp:184
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:176
+#: src/net/tmwa/gui/partytab.cpp:176
 msgid "Experience sharing unknown."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:281
+#: src/net/tmwa/inventoryhandler.cpp:285
 msgid "Failed to use item."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:391
+#: src/net/tmwa/inventoryhandler.cpp:399
 msgid "Unable to equip."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:402
+#: src/net/tmwa/inventoryhandler.cpp:410
 msgid "Unable to unequip."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:79
+#: src/net/tmwa/loginhandler.cpp:86
 msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:82 src/net/manaserv/loginhandler.cpp:121
-msgid "Old password incorrect."
-msgstr ""
-
-#: src/net/ea/loginhandler.cpp:85
+#: src/net/tmwa/loginhandler.cpp:92
 msgid "New password too short."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:88 src/net/ea/loginhandler.cpp:175
-#: src/net/manaserv/charhandler.cpp:158 src/net/manaserv/loginhandler.cpp:96
-#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
-#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
-#, fuzzy
-msgid "Unknown error."
-msgstr "Neznámy príkaz."
-
-#: src/net/ea/loginhandler.cpp:149
+#: src/net/tmwa/loginhandler.cpp:156
 #, fuzzy
 msgid "Unregistered ID."
 msgstr "Zrušiť registráciu"
 
-#: src/net/ea/loginhandler.cpp:152
+#: src/net/tmwa/loginhandler.cpp:159
 #, fuzzy
 msgid "Wrong password."
 msgstr "Zmeniť heslo"
 
-#: src/net/ea/loginhandler.cpp:155
+#: src/net/tmwa/loginhandler.cpp:162
 msgid "Account expired."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:158
+#: src/net/tmwa/loginhandler.cpp:165
 msgid "Rejected from server."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:161
+#: src/net/tmwa/loginhandler.cpp:168
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:165
+#: src/net/tmwa/loginhandler.cpp:172
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:172
+#: src/net/tmwa/loginhandler.cpp:179
 msgid "This user name is already taken."
 msgstr ""
 
-#: src/net/ea/network.cpp:145
+#: src/net/tmwa/network.cpp:145
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/ea/network.cpp:345
+#: src/net/tmwa/network.cpp:345
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/ea/network.cpp:414
+#: src/net/tmwa/network.cpp:414
 msgid "Connection to server terminated. "
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:81
+#: src/net/tmwa/partyhandler.cpp:82
 msgid "Could not create party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:84
+#: src/net/tmwa/partyhandler.cpp:84
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:118
+#: src/net/tmwa/partyhandler.cpp:119
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:122
+#: src/net/tmwa/partyhandler.cpp:123
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:126
+#: src/net/tmwa/partyhandler.cpp:127
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:130
+#: src/net/tmwa/partyhandler.cpp:131
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:238
+#: src/net/tmwa/partyhandler.cpp:236
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:249
+#: src/net/tmwa/partyhandler.cpp:246
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:301
+#: src/net/tmwa/partyhandler.cpp:299
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:329
-msgid "Inviting like this isn't supported at the moment."
+#: src/net/tmwa/partyhandler.cpp:335
+#, c-format
+msgid "Inviting failed, because you can't see a player called %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:334
+#: src/net/tmwa/partyhandler.cpp:340
 msgid "You can only inivte when you are in a party!"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:365
+#: src/net/tmwa/partyhandler.cpp:368
 #, c-format
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:304
-msgid "You are dead."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:305
-msgid "We regret to inform you that your character was killed in battle."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:307
-msgid "You are not that alive anymore."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:308
-msgid "The cold hands of the grim reaper are grabbing for your soul."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:309
-msgid "Game Over!"
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:105
+#: src/net/tmwa/playerhandler.cpp:100
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:310
-msgid ""
-"No, kids. Your character did not really die. It... err... went to a better "
-"place."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:312
-msgid ""
-"Your plan of breaking your enemies weapon by bashing it with your throat "
-"failed."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:314
-msgid "I guess this did not run too well."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:315
-msgid "Do you want your possessions identified?"
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:316
-msgid "Sadly, no trace of you was ever found..."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:317
-msgid "Annihilated."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:318
-msgid "Looks like you got your head handed to you."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:120 src/net/manaserv/beinghandler.cpp:319
-msgid ""
-"You screwed up again, dump your body down the tubes and get you another one."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/tmwa/playerhandler.cpp:118
 msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/tmwa/playerhandler.cpp:119
 msgid "You are no more."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/tmwa/playerhandler.cpp:120
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/tmwa/playerhandler.cpp:121
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/tmwa/playerhandler.cpp:122
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/tmwa/playerhandler.cpp:123
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/tmwa/playerhandler.cpp:124
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:130
+#: src/net/tmwa/playerhandler.cpp:125
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:131
+#: src/net/tmwa/playerhandler.cpp:126
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/tmwa/playerhandler.cpp:127
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/tmwa/playerhandler.cpp:128
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:135
+#: src/net/tmwa/playerhandler.cpp:130
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:136
+#: src/net/tmwa/playerhandler.cpp:131
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:249 src/net/ea/playerhandler.cpp:310
+#: src/net/tmwa/playerhandler.cpp:246 src/net/tmwa/playerhandler.cpp:285
 msgid "Message"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:250
+#: src/net/tmwa/playerhandler.cpp:247
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:333
+#: src/net/tmwa/playerhandler.cpp:313
 #, c-format
 msgid "You picked up %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:369
+#: src/net/tmwa/playerhandler.cpp:348
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:532
+#: src/net/tmwa/playerhandler.cpp:488
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:147
+#: src/net/tmwa/specialhandler.cpp:144
 msgid "Trade failed!"
 msgstr "Obchod sa nepodaril!"
 
-#: src/net/ea/specialhandler.cpp:150
+#: src/net/tmwa/specialhandler.cpp:147
 msgid "Emote failed!"
 msgstr "Zobrazenie smajlíka sa nepodarilo!"
 
-#: src/net/ea/specialhandler.cpp:153
+#: src/net/tmwa/specialhandler.cpp:150
 msgid "Sit failed!"
 msgstr "Sadnutie sa nepodarilo!"
 
-#: src/net/ea/specialhandler.cpp:156
+#: src/net/tmwa/specialhandler.cpp:153
 msgid "Chat creating failed!"
 msgstr "Vytvorenie postavy sa nepodarilo"
 
-#: src/net/ea/specialhandler.cpp:159
+#: src/net/tmwa/specialhandler.cpp:156
 msgid "Could not join party!"
 msgstr "Nie je možné  vstúpiť do párty!"
 
-#: src/net/ea/specialhandler.cpp:162
+#: src/net/tmwa/specialhandler.cpp:159
 msgid "Cannot shout!"
 msgstr "Nemôžem kričať!"
 
-#: src/net/ea/specialhandler.cpp:171
+#: src/net/tmwa/specialhandler.cpp:168
 msgid "You have not yet reached a high enough lvl!"
 msgstr "Ešte si nedosiahol dostatočne vysokú úroveť!"
 
-#: src/net/ea/specialhandler.cpp:174
+#: src/net/tmwa/specialhandler.cpp:171
 msgid "Insufficient HP!"
 msgstr "Nedostatok HP!"
 
-#: src/net/ea/specialhandler.cpp:177
+#: src/net/tmwa/specialhandler.cpp:174
 msgid "Insufficient SP!"
 msgstr "Nedostatok SP!"
 
-#: src/net/ea/specialhandler.cpp:180
+#: src/net/tmwa/specialhandler.cpp:177
 msgid "You have no memos!"
 msgstr "Nemáš žiadne poznámky!"
 
-#: src/net/ea/specialhandler.cpp:183
+#: src/net/tmwa/specialhandler.cpp:180
 msgid "You cannot do that right now!"
 msgstr "Práve teraz to nemôžeš robiť."
 
-#: src/net/ea/specialhandler.cpp:186
+#: src/net/tmwa/specialhandler.cpp:183
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:189
+#: src/net/tmwa/specialhandler.cpp:186
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Nemôžeš použiť túto zručnosť s touto zbraňou!"
 
-#: src/net/ea/specialhandler.cpp:192
+#: src/net/tmwa/specialhandler.cpp:189
 msgid "You need another red gem!"
 msgstr "Potrebuješ ďaľší červený gem!"
 
-#: src/net/ea/specialhandler.cpp:195
+#: src/net/tmwa/specialhandler.cpp:192
 msgid "You need another blue gem!"
 msgstr "Potrebuješ ďaľší modrý gem!"
 
-#: src/net/ea/specialhandler.cpp:198
+#: src/net/tmwa/specialhandler.cpp:195
 msgid "You're carrying to much to do this!"
 msgstr "Nosíš veľa, aby si mohol spraviť toto!"
 
-#: src/net/ea/specialhandler.cpp:201
+#: src/net/tmwa/specialhandler.cpp:198
 msgid "Huh? What's that?"
 msgstr "Heh? Čo to je?"
 
-#: src/net/ea/specialhandler.cpp:210
+#: src/net/tmwa/specialhandler.cpp:207
 msgid "Warp failed..."
 msgstr "Warp sa nepodaril ..."
 
-#: src/net/ea/specialhandler.cpp:213
+#: src/net/tmwa/specialhandler.cpp:210
 msgid "Could not steal anything..."
 msgstr "Nedá sa kradnúť ..."
 
-#: src/net/ea/specialhandler.cpp:216
+#: src/net/tmwa/specialhandler.cpp:213
 msgid "Poison had no effect..."
 msgstr "Jed nemá žiaden účinnok ..."
 
-#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:116
-msgid "Request for Trade"
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:108 src/net/manaserv/tradehandler.cpp:117
-#, c-format
-msgid "%s wants to trade with you, do you accept?"
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:124
+#: src/net/tmwa/tradehandler.cpp:126
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:128
+#: src/net/tmwa/tradehandler.cpp:130
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:132
+#: src/net/tmwa/tradehandler.cpp:134
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:137
+#: src/net/tmwa/tradehandler.cpp:139
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:144
+#: src/net/tmwa/tradehandler.cpp:146
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:153
+#: src/net/tmwa/tradehandler.cpp:154
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:202
+#: src/net/tmwa/tradehandler.cpp:202
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:207
+#: src/net/tmwa/tradehandler.cpp:207
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:211
+#: src/net/tmwa/tradehandler.cpp:211
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:224 src/net/manaserv/tradehandler.cpp:149
-msgid "Trade canceled."
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:231 src/net/manaserv/tradehandler.cpp:156
-msgid "Trade completed."
-msgstr ""
-
-#: src/net/manaserv/beinghandler.cpp:324
-msgid "Press OK to respawn."
-msgstr ""
-
-#: src/net/manaserv/beinghandler.cpp:325
-msgid "You Died"
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:128 src/net/manaserv/charhandler.cpp:196
-msgid "Not logged in."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:131
-msgid "No empty slot."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:134
-msgid "Invalid name."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:137
-msgid "Character's name already exists."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:140
-msgid "Invalid hairstyle."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:143
-msgid "Invalid hair color."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:146
-msgid "Invalid gender."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:149
-#, fuzzy
-msgid "Character's stats are too high."
-msgstr "Charakterové staty OK"
-
-#: src/net/manaserv/charhandler.cpp:152
-#, fuzzy
-msgid "Character's stats are too low."
-msgstr "Charakterové staty OK"
-
-#: src/net/manaserv/charhandler.cpp:155
-msgid "One stat is zero."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:187
-msgid "Player deleted."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:199
-#, fuzzy
-msgid "Selection out of range."
-msgstr "Zvoľte množstvo vecí k predaju."
-
-#: src/net/manaserv/charhandler.cpp:202
-#, fuzzy, c-format
-msgid "Unknown error (%d)."
-msgstr "Neznámy príkaz."
-
-#: src/net/manaserv/charhandler.cpp:242
-msgid "No gameservers are available."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:268
-msgid "Willpower:"
-msgstr "Sila vôle:"
-
-#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
-#: src/net/manaserv/guildhandler.cpp:259
-#, c-format
-msgid "Topic: %s"
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
-msgid "Players in this channel:"
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:201
-msgid "Error joining channel."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:207
-msgid "Listing channels."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:219
-msgid "End of channel list."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:291
-#, c-format
-msgid "%s entered the channel."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:296
-#, c-format
-msgid "%s left the channel."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:312
-#, c-format
-msgid "%s has set mode %s on user %s."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:322
-#, c-format
-msgid "%s has kicked %s."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:327
-#, fuzzy
-msgid "Unknown channel event."
-msgstr "Neznámy príkaz."
-
-#: src/net/manaserv/generalhandler.cpp:100
-#, c-format
-msgid "Willpower %+d"
-msgstr ""
-
-#: src/net/manaserv/generalhandler.cpp:171
-#, fuzzy
-msgid "Willpower"
-msgstr "Sila vôle:"
-
-#: src/net/manaserv/guildhandler.cpp:81
-msgid "Guild created."
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:86
-msgid "Error creating guild."
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:96
-msgid "Invite sent."
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:203
-msgid "Member was promoted successfully."
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:208
-msgid "Failed to promote member."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:87
-msgid "Wrong magic_token."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
-msgid "Already logged in."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:93 src/net/manaserv/loginhandler.cpp:272
-msgid "Server is full."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:118
-msgid "New password incorrect."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
-msgid "Account not connected. Please login first."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:149
-msgid "New email address incorrect."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:152
-msgid "Old email address incorrect."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:158
-msgid "The new email address already exists."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:239
-msgid ""
-"Client registration is not allowed. Please contact server administration."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
-msgid "Client version is too old."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:266
-msgid "Wrong username or password."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:275
-msgid "Login attempt too soon after previous attempt."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:303
-msgid "Wrong username, password or email address."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:306
-msgid "Username already exists."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:309
-msgid "Email address already exists."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:312
-msgid "You took too long with the captcha or your response was incorrect."
-msgstr ""
-
-#: src/net/manaserv/partyhandler.cpp:88
-msgid "Joined party."
-msgstr ""
-
-#: src/net/manaserv/partyhandler.cpp:106
-#, c-format
-msgid "%s joined the party."
-msgstr ""
-
-#: src/net/manaserv/partyhandler.cpp:123
-#, c-format
-msgid "%s rejected your invite."
-msgstr ""
-
-#: src/net/manaserv/tradehandler.cpp:96
-msgid "Accepting incoming trade requests."
-msgstr ""
-
-#: src/net/manaserv/tradehandler.cpp:98
-msgid "Ignoring incoming trade requests."
-msgstr ""
-
-#: src/net/manaserv/tradehandler.cpp:135
-#, c-format
-msgid "Trading with %s"
-msgstr ""
-
-#: src/playerrelations.cpp:304
+#: src/playerrelations.cpp:310
 msgid "Completely ignore"
 msgstr ""
 
-#: src/playerrelations.cpp:318
+#: src/playerrelations.cpp:324
 msgid "Print '...'"
 msgstr ""
 
-#: src/playerrelations.cpp:334
+#: src/playerrelations.cpp:340
 msgid "Blink name"
 msgstr ""
 
-#: src/playerrelations.cpp:371
-msgid "Floating '...' bubble"
-msgstr ""
-
-#: src/playerrelations.cpp:374
-msgid "Floating bubble"
-msgstr ""
-
-#: src/resources/itemdb.cpp:52
+#: src/resources/itemdb.cpp:44
 #, c-format
 msgid "Attack %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:53
+#: src/resources/itemdb.cpp:45
 #, c-format
 msgid "Defense %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:54
+#: src/resources/itemdb.cpp:46
 #, c-format
 msgid "HP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:55
+#: src/resources/itemdb.cpp:47
 #, c-format
 msgid "MP %+d"
 msgstr "MP %+d"
 
-#: src/resources/itemdb.cpp:114
+#: src/resources/itemdb.cpp:92
 msgid "Unknown item"
 msgstr ""
 
-#: src/resources/itemdb.cpp:158 src/resources/monsterdb.cpp:45
-#: src/resources/monsterdb.cpp:67
+#: src/resources/itemdb.cpp:135 src/resources/monsterdb.cpp:77
 msgid "unnamed"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Money"
+#~ msgstr "Peniaze: %d"
+
+#, fuzzy
+#~ msgid "Level"
+#~ msgstr "Level: %d"
+
+#~ msgid "Willpower:"
+#~ msgstr "Sila vôle:"
+
+#, fuzzy
+#~ msgid "Willpower"
+#~ msgstr "Sila vôle:"
+
 #~ msgid "Description: %s"
 #~ msgstr "Popis: %s"
 
diff --git a/po/sq.po b/po/sq.po
index 71c3fa04..c1e27a95 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2010-03-05 21:52+0100\n"
+"POT-Creation-Date: 2010-12-13 20:04+0100\n"
 "PO-Revision-Date: 2010-01-02 10:47+0000\n"
 "Last-Translator: Jat Lee <Unknown>\n"
 "Language-Team: Albanian <sq@li.org>\n"
+"Language: sq\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,435 +19,448 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/client.cpp:553 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:62
+#: src/client.cpp:598 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
 msgid "Setup"
 msgstr ""
 
-#: src/client.cpp:623
+#: src/client.cpp:679
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:650
+#: src/client.cpp:706
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:683
+#: src/client.cpp:739
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:739
+#: src/client.cpp:804
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:768
+#: src/client.cpp:833
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:799 src/client.cpp:806 src/client.cpp:940
+#: src/client.cpp:843
+msgid "Changing game servers"
+msgstr ""
+
+#: src/client.cpp:872 src/client.cpp:879 src/client.cpp:1014
 #: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
 #: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
-#: src/gui/serverdialog.cpp:261 src/gui/unregisterdialog.cpp:133
-#: src/net/ea/charserverhandler.cpp:135 src/net/ea/charserverhandler.cpp:152
-#: src/net/manaserv/charhandler.cpp:161 src/net/manaserv/charhandler.cpp:204
+#: src/gui/serverdialog.cpp:323 src/gui/unregisterdialog.cpp:133
+#: src/net/manaserv/charhandler.cpp:174 src/net/manaserv/charhandler.cpp:217
+#: src/net/tmwa/charserverhandler.cpp:134
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Error"
 msgstr ""
 
-#: src/client.cpp:815
+#: src/client.cpp:888
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:842
+#: src/client.cpp:915
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:843
+#: src/client.cpp:916
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:862
+#: src/client.cpp:935
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:863
+#: src/client.cpp:936
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:883
+#: src/client.cpp:956
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:884
+#: src/client.cpp:957
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1007 src/client.cpp:1030
+#: src/client.cpp:1138 src/client.cpp:1161
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1119
+#: src/client.cpp:1281
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1153 src/client.cpp:1159
+#: src/client.cpp:1315 src/client.cpp:1321
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/commandhandler.cpp:127 src/commandhandler.cpp:308
+#: src/commandhandler.cpp:131 src/commandhandler.cpp:317
 msgid "Unknown command."
 msgstr "Unknown command > Komand e panjohur"
 
-#: src/commandhandler.cpp:156
+#: src/commandhandler.cpp:160
 msgid "-- Help --"
 msgstr "-- Ndihmë--"
 
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:161
 msgid "/help > Display this help"
 msgstr "/ndihmë > Ndihmë përeth disa komandave"
 
-#: src/commandhandler.cpp:159
+#: src/commandhandler.cpp:163
 msgid "/where > Display map name"
 msgstr "/ku > Emri i mapit ku gjendesh"
 
-#: src/commandhandler.cpp:160
+#: src/commandhandler.cpp:164
 msgid "/who > Display number of online users"
 msgstr "/kush > Numri i lojtarëve online"
 
-#: src/commandhandler.cpp:161
+#: src/commandhandler.cpp:165
 msgid "/me > Tell something about yourself"
 msgstr "/unë >Trego diqka për veten"
 
-#: src/commandhandler.cpp:163
+#: src/commandhandler.cpp:167
 msgid "/clear > Clears this window"
 msgstr "/pastro > Pastro këtë dritare"
 
-#: src/commandhandler.cpp:165
+#: src/commandhandler.cpp:169
 msgid "/msg > Send a private message to a user"
 msgstr "/mesazh > Dërgo mesazh privat te playeri që dëshiron"
 
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:170
 msgid "/whisper > Alias of msg"
 msgstr "/pëshpëritje > pseudonim i mesazhit"
 
-#: src/commandhandler.cpp:167
+#: src/commandhandler.cpp:171
 msgid "/w > Alias of msg"
 msgstr "/w > pseudonim i mesazhit"
 
-#: src/commandhandler.cpp:168
+#: src/commandhandler.cpp:172
 msgid "/query > Makes a tab for private messages with another user"
 msgstr ""
 
-#: src/commandhandler.cpp:169
+#: src/commandhandler.cpp:174
 msgid "/q > Alias of query"
 msgstr ""
 
-#: src/commandhandler.cpp:171
+#: src/commandhandler.cpp:176
 msgid "/ignore > ignore a player"
 msgstr ""
 
-#: src/commandhandler.cpp:172
+#: src/commandhandler.cpp:177
 msgid "/unignore > stop ignoring a player"
 msgstr ""
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:179
 msgid "/list > Display all public channels"
 msgstr ""
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:180
 msgid "/join > Join or create a channel"
 msgstr ""
 
-#: src/commandhandler.cpp:177
+#: src/commandhandler.cpp:182
 msgid "/createparty > Create a new party"
 msgstr ""
 
-#: src/commandhandler.cpp:178
+#: src/commandhandler.cpp:183
 msgid "/party > Invite a user to party"
 msgstr ""
 
-#: src/commandhandler.cpp:180
+#: src/commandhandler.cpp:185
 msgid "/record > Start recording the chat to an external file"
 msgstr ""
 
-#: src/commandhandler.cpp:181
+#: src/commandhandler.cpp:187
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr ""
 
-#: src/commandhandler.cpp:182
+#: src/commandhandler.cpp:189
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
 
-#: src/commandhandler.cpp:184
+#: src/commandhandler.cpp:192
 msgid "/announce > Global announcement (GM only)"
 msgstr ""
 
-#: src/commandhandler.cpp:188
+#: src/commandhandler.cpp:196
 msgid "For more information, type /help <command>."
 msgstr ""
 
-#: src/commandhandler.cpp:192
+#: src/commandhandler.cpp:200
 msgid "Command: /help"
 msgstr ""
 
-#: src/commandhandler.cpp:193
+#: src/commandhandler.cpp:201
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: src/commandhandler.cpp:194
+#: src/commandhandler.cpp:203
 msgid "Command: /help <command>"
 msgstr ""
 
-#: src/commandhandler.cpp:195
+#: src/commandhandler.cpp:204
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/commandhandler.cpp:203
+#: src/commandhandler.cpp:212
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: src/commandhandler.cpp:204
+#: src/commandhandler.cpp:213
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/commandhandler.cpp:205
+#: src/commandhandler.cpp:214
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:210
+#: src/commandhandler.cpp:219
 msgid "Command: /clear"
 msgstr ""
 
-#: src/commandhandler.cpp:211
+#: src/commandhandler.cpp:220
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:224
 msgid "Command: /ignore <player>"
 msgstr ""
 
-#: src/commandhandler.cpp:216
+#: src/commandhandler.cpp:225
 msgid "This command ignores the given player regardless of current relations."
 msgstr ""
 
-#: src/commandhandler.cpp:221
+#: src/commandhandler.cpp:230
 msgid "Command: /join <channel>"
 msgstr ""
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:231
 msgid "This command makes you enter <channel>."
 msgstr ""
 
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:232
 msgid "If <channel> doesn't exist, it's created."
 msgstr ""
 
-#: src/commandhandler.cpp:227
+#: src/commandhandler.cpp:236
 msgid "Command: /list"
 msgstr ""
 
-#: src/commandhandler.cpp:228
+#: src/commandhandler.cpp:237
 msgid "This command shows a list of all channels."
 msgstr ""
 
-#: src/commandhandler.cpp:232
+#: src/commandhandler.cpp:241
 msgid "Command: /me <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:233
+#: src/commandhandler.cpp:242
 msgid "This command tell others you are (doing) <msg>."
 msgstr ""
 
-#: src/commandhandler.cpp:237
+#: src/commandhandler.cpp:246
 msgid "Command: /msg <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:238
+#: src/commandhandler.cpp:247
 msgid "Command: /whisper <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:239
+#: src/commandhandler.cpp:248
 msgid "Command: /w <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:240
+#: src/commandhandler.cpp:249
 msgid "This command sends the text <message> to <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:241 src/commandhandler.cpp:260
+#: src/commandhandler.cpp:250 src/commandhandler.cpp:269
 #: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
-#: src/net/ea/gui/guildtab.cpp:75 src/net/ea/gui/partytab.cpp:75
+#: src/net/tmwa/gui/guildtab.cpp:75 src/net/tmwa/gui/partytab.cpp:75
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:255
 msgid "Command: /query <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:247
+#: src/commandhandler.cpp:256
 msgid "Command: /q <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:248
+#: src/commandhandler.cpp:257
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:253
+#: src/commandhandler.cpp:262
 msgid "Command: /createparty <name>"
 msgstr ""
 
-#: src/commandhandler.cpp:254
+#: src/commandhandler.cpp:263
 msgid "This command creates a new party called <name>."
 msgstr ""
 
-#: src/commandhandler.cpp:258
+#: src/commandhandler.cpp:267
 msgid "Command: /party <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:259 src/net/ea/gui/partytab.cpp:74
+#: src/commandhandler.cpp:268 src/net/tmwa/gui/partytab.cpp:74
 msgid "This command invites <nick> to party with you."
 msgstr ""
 
-#: src/commandhandler.cpp:265
+#: src/commandhandler.cpp:274
 msgid "Command: /present"
 msgstr ""
 
-#: src/commandhandler.cpp:266
+#: src/commandhandler.cpp:275
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: src/commandhandler.cpp:272
+#: src/commandhandler.cpp:281
 msgid "Command: /record <filename>"
 msgstr ""
 
-#: src/commandhandler.cpp:273
+#: src/commandhandler.cpp:282
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr ""
 
-#: src/commandhandler.cpp:275
+#: src/commandhandler.cpp:284
 msgid "Command: /record"
 msgstr ""
 
-#: src/commandhandler.cpp:276
+#: src/commandhandler.cpp:285
 msgid "This command finishes a recording session."
 msgstr ""
 
-#: src/commandhandler.cpp:280
+#: src/commandhandler.cpp:289
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: src/commandhandler.cpp:281
+#: src/commandhandler.cpp:290
 msgid ""
 "This command sets whether the return key should toggle the chat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: src/commandhandler.cpp:283
+#: src/commandhandler.cpp:292
 msgid ""
-"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
-"\", \"no\", \"false\" to turn the toggle off."
+"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
+"\"0\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: src/commandhandler.cpp:286
+#: src/commandhandler.cpp:295
 msgid "Command: /toggle"
 msgstr ""
 
-#: src/commandhandler.cpp:287
+#: src/commandhandler.cpp:296
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: src/commandhandler.cpp:291 src/gui/widgets/whispertab.cpp:93
+#: src/commandhandler.cpp:300 src/gui/widgets/whispertab.cpp:95
 msgid "Command: /unignore <player>"
 msgstr ""
 
-#: src/commandhandler.cpp:292
+#: src/commandhandler.cpp:301
 msgid "This command stops ignoring the given player if they are being ignored"
 msgstr ""
 
-#: src/commandhandler.cpp:297
+#: src/commandhandler.cpp:306
 msgid "Command: /where"
 msgstr ""
 
-#: src/commandhandler.cpp:298
+#: src/commandhandler.cpp:307
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: src/commandhandler.cpp:302
+#: src/commandhandler.cpp:311
 msgid "Command: /who"
 msgstr ""
 
-#: src/commandhandler.cpp:303
+#: src/commandhandler.cpp:312
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:309
+#: src/commandhandler.cpp:318
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: src/commandhandler.cpp:375
+#: src/commandhandler.cpp:384
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:383
+#: src/commandhandler.cpp:392
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:397
+#: src/commandhandler.cpp:406
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:410 src/net/ea/gui/partytab.cpp:109
+#: src/commandhandler.cpp:419 src/net/tmwa/gui/partytab.cpp:109
 msgid "Party name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:423 src/commandhandler.cpp:471
-#: src/commandhandler.cpp:493
+#: src/commandhandler.cpp:432 src/commandhandler.cpp:509
+#: src/commandhandler.cpp:531
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:441
+#: src/commandhandler.cpp:450
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:441
+#: src/commandhandler.cpp:450
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:450
+#: src/commandhandler.cpp:459
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:454
+#: src/commandhandler.cpp:463
 msgid "Message now closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:477
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:489
+msgid "Show IP: On"
+msgstr ""
+
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:485
+msgid "Show IP: Off"
+msgstr ""
+
+#: src/commandhandler.cpp:515
 msgid "Player already ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:484
+#: src/commandhandler.cpp:522
 msgid "Player successfully ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:486
+#: src/commandhandler.cpp:524
 msgid "Player could not be ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:501
+#: src/commandhandler.cpp:539
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:506
+#: src/commandhandler.cpp:544
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:508
+#: src/commandhandler.cpp:546
 msgid "Player could not be unignored!"
 msgstr ""
 
@@ -459,40 +473,40 @@ msgstr ""
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:326
+#: src/game.cpp:342
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:331
+#: src/game.cpp:347
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:355
+#: src/game.cpp:378
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:360
+#: src/game.cpp:382
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:705
+#: src/game.cpp:721
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:712
+#: src/game.cpp:726
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:946
+#: src/game.cpp:954
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:947
+#: src/game.cpp:955
 #, c-format
 msgid "Error while loading %s"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:75
+#: src/gui/beingpopup.cpp:76
 #, c-format
 msgid "Party: %s"
 msgstr ""
@@ -501,34 +515,34 @@ msgstr ""
 msgid "Buy"
 msgstr ""
 
-#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
-#: src/gui/sell.cpp:276
+#: src/gui/buy.cpp:69 src/gui/buy.cpp:261 src/gui/sell.cpp:71
+#: src/gui/sell.cpp:288
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:99 src/gui/npcdialog.cpp:100
-#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:479
+#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:112 src/gui/npcdialog.cpp:124
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:463
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:98 src/gui/npcdialog.cpp:101
-#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:491
+#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:111 src/gui/npcdialog.cpp:125
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:475
 msgid "-"
 msgstr ""
 
 #: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
-#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:182
-#: src/keyboardconfig.cpp:103
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:228
+#: src/keyboardconfig.cpp:102
 msgid "Quit"
 msgstr ""
 
-#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:408
-#: src/gui/statuswindow.cpp:478 src/gui/statuswindow.cpp:512
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:384
+#: src/gui/statuswindow.cpp:462 src/gui/statuswindow.cpp:496
 msgid "Max"
 msgstr ""
 
@@ -542,11 +556,11 @@ msgstr ""
 
 #: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
 #: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
-#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:101
-#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:178
-#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:402
+#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:114
+#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:389
 #: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
-#: src/gui/socialwindow.cpp:242 src/gui/textdialog.cpp:39
+#: src/gui/socialwindow.cpp:275 src/gui/textdialog.cpp:40
 #: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr ""
@@ -583,7 +597,7 @@ msgstr ""
 msgid "Change Password"
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:53
+#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:55
 #: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
 msgid "Password:"
 msgstr ""
@@ -614,19 +628,19 @@ msgstr ""
 msgid "Create Character"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:52
+#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:54
 #: src/gui/register.cpp:67
 msgid "Name:"
 msgstr ""
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
 #: src/gui/outfitwindow.cpp:67
 msgid ">"
 msgstr ""
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
 #: src/gui/outfitwindow.cpp:66
@@ -641,8 +655,8 @@ msgstr ""
 msgid "Hair style:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:397
-#: src/gui/socialwindow.cpp:296
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:392
+#: src/gui/socialwindow.cpp:329
 msgid "Create"
 msgstr ""
 
@@ -697,33 +711,33 @@ msgstr ""
 msgid "Change Email"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:185
-#: src/gui/setup_players.cpp:230
+#: src/gui/charselectdialog.cpp:336 src/gui/serverdialog.cpp:231
+#: src/gui/setup_players.cpp:229
 msgid "Delete"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:387
+#: src/gui/charselectdialog.cpp:380
 msgid "Choose"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:399 src/gui/charselectdialog.cpp:400
+#: src/gui/charselectdialog.cpp:394 src/gui/charselectdialog.cpp:395
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:77 src/gui/palette.cpp:96
+#: src/gui/chat.cpp:88
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chat.cpp:287
+#: src/gui/chat.cpp:311
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:305
+#: src/gui/chat.cpp:329
 msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:469
+#: src/gui/chat.cpp:493
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -785,140 +799,170 @@ msgstr ""
 msgid "Ambient FX: %s"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:56
+#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:55
 msgid "Equipment"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:77
-#: src/gui/inventorywindow.cpp:79 src/gui/inventorywindow.cpp:298
-#: src/gui/popupmenu.cpp:372
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:89
+#: src/gui/inventorywindow.cpp:337 src/gui/popupmenu.cpp:359
 msgid "Unequip"
 msgstr ""
 
-#: src/gui/help.cpp:36
+#: src/gui/help.cpp:37
 msgid "Help"
 msgstr ""
 
-#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:73
+#: src/gui/help.cpp:51 src/gui/npcdialog.cpp:50
 msgid "Close"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:56 src/gui/windowmenu.cpp:57
+#: src/gui/inventorywindow.cpp:59 src/gui/windowmenu.cpp:56
 msgid "Inventory"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:72 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:300 src/gui/popupmenu.cpp:374
+#: src/gui/inventorywindow.cpp:59
+msgid "Storage"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:82
+msgid "Slots:"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:87 src/gui/inventorywindow.cpp:100
+#: src/gui/inventorywindow.cpp:339 src/gui/popupmenu.cpp:361
 msgid "Equip"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:304 src/gui/popupmenu.cpp:377
+#: src/gui/inventorywindow.cpp:88
 msgid "Use"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:83 src/gui/inventorywindow.cpp:308
-#: src/gui/popupmenu.cpp:380
+#: src/gui/inventorywindow.cpp:101 src/gui/popupmenu.cpp:364
+msgid "Activate"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:102 src/gui/inventorywindow.cpp:348
+#: src/gui/popupmenu.cpp:367
 msgid "Drop..."
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:84 src/gui/popupmenu.cpp:386
+#: src/gui/inventorywindow.cpp:103 src/gui/popupmenu.cpp:373
 msgid "Split"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:85 src/gui/outfitwindow.cpp:51
+#: src/gui/inventorywindow.cpp:104 src/gui/outfitwindow.cpp:51
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:96 src/gui/storagewindow.cpp:83
-msgid "Slots:"
+#: src/gui/inventorywindow.cpp:106
+msgid "Weight:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:97
-msgid "Weight:"
+#: src/gui/inventorywindow.cpp:124 src/gui/popupmenu.cpp:378
+msgid "Store"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:310 src/gui/popupmenu.cpp:382
+#: src/gui/inventorywindow.cpp:125 src/gui/popupmenu.cpp:385
+msgid "Retrieve"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:350 src/gui/popupmenu.cpp:369
 msgid "Drop"
 msgstr ""
 
-#: src/gui/itemamount.cpp:100 src/gui/okdialog.cpp:42
-#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:38 src/gui/trade.cpp:73
-#: src/gui/trade.cpp:75
+#: src/gui/itemamount.cpp:113 src/gui/okdialog.cpp:42
+#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:39 src/gui/trade.cpp:72
+#: src/gui/trade.cpp:74
 msgid "OK"
 msgstr ""
 
-#: src/gui/itemamount.cpp:102
+#: src/gui/itemamount.cpp:115
 msgid "All"
 msgstr ""
 
-#: src/gui/itemamount.cpp:128
+#: src/gui/itemamount.cpp:141
 msgid "Select amount of items to trade."
 msgstr ""
 
-#: src/gui/itemamount.cpp:131
+#: src/gui/itemamount.cpp:144
 msgid "Select amount of items to drop."
 msgstr ""
 
-#: src/gui/itemamount.cpp:134
+#: src/gui/itemamount.cpp:147
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/itemamount.cpp:137
+#: src/gui/itemamount.cpp:150
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamount.cpp:140
+#: src/gui/itemamount.cpp:153
 msgid "Select amount of items to split."
 msgstr ""
 
-#: src/gui/itempopup.cpp:92
+#: src/gui/itempopup.cpp:137
 #, c-format
 msgid "Weight: %s"
 msgstr ""
 
-#: src/gui/login.cpp:49 src/gui/login.cpp:61
+#: src/gui/login.cpp:51 src/gui/login.cpp:63
 msgid "Login"
 msgstr ""
 
-#: src/gui/login.cpp:58
+#: src/gui/login.cpp:60
 msgid "Remember username"
 msgstr ""
 
-#: src/gui/login.cpp:59 src/gui/register.cpp:58 src/gui/register.cpp:73
+#: src/gui/login.cpp:61 src/gui/register.cpp:58 src/gui/register.cpp:73
 msgid "Register"
 msgstr ""
 
-#: src/gui/login.cpp:60
+#: src/gui/login.cpp:62
 msgid "Change Server"
 msgstr ""
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
+#: src/gui/login.cpp:129
+msgid "Registration disabled"
+msgstr ""
+
+#: src/gui/login.cpp:129
+msgid "You need to use the website to register an account for this server."
+msgstr ""
+
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:86
 msgid "Map"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:44
+#: src/gui/ministatus.cpp:235
+msgid "Need"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:48
 msgid "Waiting for server"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:45
+#: src/gui/npcdialog.cpp:49
 msgid "Next"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:47
+#: src/gui/npcdialog.cpp:51
 msgid "Submit"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:52 src/gui/npcpostdialog.cpp:41
+#: src/gui/npcdialog.cpp:73 src/gui/npcpostdialog.cpp:41
 msgid "NPC"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:110
+#: src/gui/npcdialog.cpp:118
+msgid "Clear log"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:134
 msgid "Reset"
 msgstr ""
 
 #. TRANSLATORS: Please leave the \n sequences intact.
-#: src/gui/npcdialog.cpp:171
+#: src/gui/npcdialog.cpp:208
 msgid ""
 "\n"
 "> Next\n"
@@ -932,7 +976,7 @@ msgstr ""
 msgid "Send"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:96
+#: src/gui/npcpostdialog.cpp:99
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
@@ -946,303 +990,82 @@ msgstr ""
 msgid "Unequip first"
 msgstr ""
 
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:143
-msgid "Text"
-msgstr ""
-
-#: src/gui/palette.cpp:82
-msgid "Text Shadow"
-msgstr ""
-
-#: src/gui/palette.cpp:83
-msgid "Text Outline"
-msgstr ""
-
-#: src/gui/palette.cpp:84
-msgid "Progress Bar Labels"
-msgstr ""
-
-#: src/gui/palette.cpp:85
-msgid "Buttons"
-msgstr ""
-
-#: src/gui/palette.cpp:86
-msgid "Disabled Buttons"
-msgstr ""
-
-#: src/gui/palette.cpp:87
-msgid "Tabs"
-msgstr ""
-
-#: src/gui/palette.cpp:89
-msgid "Background"
-msgstr ""
-
-#: src/gui/palette.cpp:91
-msgid "Highlight"
-msgstr ""
-
-#: src/gui/palette.cpp:92
-msgid "Tab Highlight"
-msgstr ""
-
-#: src/gui/palette.cpp:93
-msgid "Item Too Expensive"
-msgstr ""
-
-#: src/gui/palette.cpp:94
-msgid "Item Is Equipped"
-msgstr ""
-
-#: src/gui/palette.cpp:97
-msgid "GM"
-msgstr ""
-
-#: src/gui/palette.cpp:98
-msgid "Player"
-msgstr ""
-
-#: src/gui/palette.cpp:99
-msgid "Whisper"
-msgstr ""
-
-#: src/gui/palette.cpp:100
-msgid "Is"
-msgstr ""
-
-#: src/gui/palette.cpp:101 src/net/ea/gui/partytab.cpp:43
-msgid "Party"
-msgstr ""
-
-#: src/gui/palette.cpp:102 src/net/ea/gui/guildtab.cpp:45
-msgid "Guild"
-msgstr ""
-
-#: src/gui/palette.cpp:103
-msgid "Server"
-msgstr ""
-
-#: src/gui/palette.cpp:104
-msgid "Logger"
-msgstr ""
-
-#: src/gui/palette.cpp:105
-msgid "Hyperlink"
-msgstr ""
-
-#: src/gui/palette.cpp:107
-msgid "Being"
-msgstr ""
-
-#: src/gui/palette.cpp:108
-msgid "Other Players' Names"
-msgstr ""
-
-#: src/gui/palette.cpp:109
-msgid "Own Name"
-msgstr ""
-
-#: src/gui/palette.cpp:110
-msgid "GM Names"
-msgstr ""
-
-#: src/gui/palette.cpp:111
-msgid "NPCs"
-msgstr ""
-
-#: src/gui/palette.cpp:112
-msgid "Monsters"
-msgstr ""
-
-#: src/gui/palette.cpp:114
-msgid "Unknown Item Type"
-msgstr ""
-
-#: src/gui/palette.cpp:115
-msgid "Generics"
-msgstr ""
-
-#: src/gui/palette.cpp:116
-msgid "Hats"
-msgstr ""
-
-#: src/gui/palette.cpp:117
-msgid "Usables"
-msgstr ""
-
-#: src/gui/palette.cpp:118
-msgid "Shirts"
-msgstr ""
-
-#: src/gui/palette.cpp:119
-msgid "One Handed Weapons"
-msgstr ""
-
-#: src/gui/palette.cpp:120
-msgid "Pants"
-msgstr ""
-
-#: src/gui/palette.cpp:121
-msgid "Shoes"
-msgstr ""
-
-#: src/gui/palette.cpp:122
-msgid "Two Handed Weapons"
-msgstr ""
-
-#: src/gui/palette.cpp:123
-msgid "Shields"
-msgstr ""
-
-#: src/gui/palette.cpp:124
-msgid "Rings"
-msgstr ""
-
-#: src/gui/palette.cpp:125
-msgid "Necklaces"
-msgstr ""
-
-#: src/gui/palette.cpp:126
-msgid "Arms"
-msgstr ""
-
-#: src/gui/palette.cpp:127
-msgid "Ammo"
-msgstr ""
-
-#: src/gui/palette.cpp:129
-msgid "Particle Effects"
-msgstr ""
-
-#: src/gui/palette.cpp:130
-msgid "Pickup Notification"
-msgstr ""
-
-#: src/gui/palette.cpp:131
-msgid "Exp Notification"
-msgstr ""
-
-#: src/gui/palette.cpp:133
-msgid "Player Hits Monster"
-msgstr ""
-
-#: src/gui/palette.cpp:135
-msgid "Monster Hits Player"
-msgstr ""
-
-#: src/gui/palette.cpp:136
-msgid "Critical Hit"
-msgstr ""
-
-#: src/gui/palette.cpp:137
-msgid "Misses"
-msgstr ""
-
-#: src/gui/palette.cpp:139
-msgid "HP Bar"
-msgstr ""
-
-#: src/gui/palette.cpp:140
-msgid "3/4 HP Bar"
-msgstr ""
-
-#: src/gui/palette.cpp:141
-msgid "1/2 HP Bar"
-msgstr ""
-
-#: src/gui/palette.cpp:142
-msgid "1/4 HP Bar"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:84
+#: src/gui/popupmenu.cpp:83
 #, c-format
 msgid "Trade with %s..."
 msgstr ""
 
-#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:161
+#: src/gui/popupmenu.cpp:87 src/gui/popupmenu.cpp:158
 #, c-format
 msgid "Attack %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:92
+#: src/gui/popupmenu.cpp:91
 #, c-format
 msgid "Whisper %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:101
+#: src/gui/popupmenu.cpp:100
 #, c-format
 msgid "Befriend %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:106
+#: src/gui/popupmenu.cpp:105
 #, c-format
 msgid "Disregard %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:109
+#: src/gui/popupmenu.cpp:108
 #, c-format
 msgid "Ignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:115 src/gui/popupmenu.cpp:124
+#: src/gui/popupmenu.cpp:114 src/gui/popupmenu.cpp:123
 #, c-format
 msgid "Unignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:118
+#: src/gui/popupmenu.cpp:117
 #, c-format
 msgid "Completely ignore %s"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:130
 #, c-format
-msgid "Follow %s"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:133
-#, c-format
 msgid "Invite %s to join your guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:137
+#: src/gui/popupmenu.cpp:134
 #, c-format
 msgid "Invite %s to join your party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144
+#: src/gui/popupmenu.cpp:141
 msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:153
+#: src/gui/popupmenu.cpp:150
 #, c-format
 msgid "Talk to %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:166
+#: src/gui/popupmenu.cpp:163
 msgid "Kick monster"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:174
+#: src/gui/popupmenu.cpp:171
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:191
+#: src/gui/popupmenu.cpp:188
 #, c-format
 msgid "Pick up %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:400
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:387
 msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:70
-msgid "Store"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:71
-msgid "Retrieve"
-msgstr ""
-
 #: src/gui/quitdialog.cpp:44
 msgid "Switch server"
 msgstr ""
@@ -1311,47 +1134,60 @@ msgstr ""
 msgid "Passwords do not match."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:134
+#: src/gui/serverdialog.cpp:197
 msgid "Choose Your Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:141 src/gui/widgets/chattab.cpp:139
+#: src/gui/serverdialog.cpp:206 src/gui/widgets/chattab.cpp:142
 msgid "Server:"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:142
+#: src/gui/serverdialog.cpp:207
 msgid "Port:"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:143
+#: src/gui/serverdialog.cpp:208
 msgid "Server type:"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:183
+#: src/gui/serverdialog.cpp:229
 msgid "Connect"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:184
+#: src/gui/serverdialog.cpp:230
 msgid "Custom Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:262
+#: src/gui/serverdialog.cpp:324
 msgid "Please type both the address and the port of a server."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:411
+#: src/gui/serverdialog.cpp:441
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:417
+#: src/gui/serverdialog.cpp:447
 msgid "Waiting for server..."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:421
+#: src/gui/serverdialog.cpp:451
 msgid "Preparing download"
 msgstr ""
 
+#: src/gui/serverdialog.cpp:455
+msgid "Error retreiving server list!"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:550
+msgid "requires a newer version"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:552
+#, c-format
+msgid "requires v%s"
+msgstr ""
+
 #: src/gui/setup_audio.cpp:42
 msgid "Sound"
 msgstr ""
@@ -1384,50 +1220,50 @@ msgstr ""
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:44
+#: src/gui/setup_colors.cpp:46
 msgid "This is what the color looks like"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:49
+#: src/gui/setup_colors.cpp:51
 msgid "Colors"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:70
+#: src/gui/setup_colors.cpp:72
 msgid "Type:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:81 src/gui/setup_colors.cpp:433
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:331
 msgid "Static"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:84
-#: src/gui/setup_colors.cpp:434
+#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
+#: src/gui/setup_colors.cpp:332
 msgid "Pulse"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
+#: src/gui/setup_colors.cpp:333
 msgid "Rainbow"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
+#: src/gui/setup_colors.cpp:333
 msgid "Spectrum"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:92
+#: src/gui/setup_colors.cpp:94
 msgid "Delay:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:107
+#: src/gui/setup_colors.cpp:109
 msgid "Red:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:122
+#: src/gui/setup_colors.cpp:124
 msgid "Green:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:137
+#: src/gui/setup_colors.cpp:139
 msgid "Blue:"
 msgstr ""
 
@@ -1472,562 +1308,576 @@ msgid "Assign"
 msgstr ""
 
 #: src/gui/setup_keyboard.cpp:90
+msgid "Unassign"
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:94
 msgid "Default"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:119
+#: src/gui/setup_keyboard.cpp:125
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_players.cpp:57
+#: src/gui/setup_players.cpp:58
 msgid "Name"
 msgstr ""
 
-#: src/gui/setup_players.cpp:58
+#: src/gui/setup_players.cpp:59
 msgid "Relation"
 msgstr ""
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:64
 msgid "Neutral"
 msgstr ""
 
-#: src/gui/setup_players.cpp:64
+#: src/gui/setup_players.cpp:65
 msgid "Friend"
 msgstr ""
 
-#: src/gui/setup_players.cpp:65
+#: src/gui/setup_players.cpp:66
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_players.cpp:67
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_players.cpp:208 src/gui/setup_video.cpp:132
+#: src/gui/setup_players.cpp:206 src/gui/setup_video.cpp:153
 msgid "???"
 msgstr ""
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_players.cpp:225
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_players.cpp:228
+#: src/gui/setup_players.cpp:227
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:231
 msgid "Put all whispers in tabs"
 msgstr ""
 
-#: src/gui/setup_players.cpp:234
+#: src/gui/setup_players.cpp:233
 msgid "Show gender"
 msgstr ""
 
-#: src/gui/setup_players.cpp:236
+#: src/gui/setup_players.cpp:235
+msgid "Enable Chat log"
+msgstr ""
+
+#: src/gui/setup_players.cpp:237
 msgid "Players"
 msgstr ""
 
-#: src/gui/setup_players.cpp:261
+#: src/gui/setup_players.cpp:262
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:113
+#: src/gui/setup_video.cpp:134
 msgid "Tiny"
 msgstr ""
 
-#: src/gui/setup_video.cpp:114
+#: src/gui/setup_video.cpp:135
 msgid "Small"
 msgstr ""
 
-#: src/gui/setup_video.cpp:115
+#: src/gui/setup_video.cpp:136
 msgid "Medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:116
+#: src/gui/setup_video.cpp:137
 msgid "Large"
 msgstr ""
 
-#: src/gui/setup_video.cpp:142
+#: src/gui/setup_video.cpp:163
 msgid "No text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:144
+#: src/gui/setup_video.cpp:164
+msgid "Text"
+msgstr ""
+
+#: src/gui/setup_video.cpp:165
 msgid "Bubbles, no names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:145
+#: src/gui/setup_video.cpp:166
 msgid "Bubbles with names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:157
+#: src/gui/setup_video.cpp:178
 msgid "off"
 msgstr ""
 
-#: src/gui/setup_video.cpp:158 src/gui/setup_video.cpp:171
+#: src/gui/setup_video.cpp:179 src/gui/setup_video.cpp:192
 msgid "low"
 msgstr ""
 
-#: src/gui/setup_video.cpp:159 src/gui/setup_video.cpp:173
+#: src/gui/setup_video.cpp:180 src/gui/setup_video.cpp:194
 msgid "high"
 msgstr ""
 
-#: src/gui/setup_video.cpp:172
+#: src/gui/setup_video.cpp:193
 msgid "medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:174
+#: src/gui/setup_video.cpp:195
 msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:196
+#: src/gui/setup_video.cpp:217
 msgid "Full screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:197
+#: src/gui/setup_video.cpp:218
 msgid "OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:198
+#: src/gui/setup_video.cpp:219
 msgid "Custom cursor"
 msgstr ""
 
-#: src/gui/setup_video.cpp:200
+#: src/gui/setup_video.cpp:221
 msgid "Visible names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:223
 msgid "Particle effects"
 msgstr ""
 
-#: src/gui/setup_video.cpp:204
+#: src/gui/setup_video.cpp:225
 msgid "Show own name"
 msgstr ""
 
-#: src/gui/setup_video.cpp:205
+#: src/gui/setup_video.cpp:226
+msgid "Log NPC dialogue"
+msgstr ""
+
+#: src/gui/setup_video.cpp:227
 msgid "Show pickup notification"
 msgstr ""
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:207
+#. TRANSLATORS: Refers to "Show pickup notification"
+#: src/gui/setup_video.cpp:229
 msgid "in chat"
 msgstr ""
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:209
+#. TRANSLATORS: Refers to "Show pickup notification"
+#: src/gui/setup_video.cpp:231
 msgid "as particle"
 msgstr ""
 
-#: src/gui/setup_video.cpp:214
+#: src/gui/setup_video.cpp:236
 msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:225
+#: src/gui/setup_video.cpp:247
+msgid "Disable transparency (Low CPU mode)"
+msgstr ""
+
+#: src/gui/setup_video.cpp:250
 msgid "Video"
 msgstr ""
 
-#: src/gui/setup_video.cpp:227
-msgid "Show monster damage"
+#: src/gui/setup_video.cpp:252
+msgid "Show damage"
 msgstr ""
 
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:258
 msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:259
 msgid "Gui opacity"
 msgstr ""
 
-#: src/gui/setup_video.cpp:235
+#: src/gui/setup_video.cpp:260
 msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_video.cpp:236
+#: src/gui/setup_video.cpp:261
 msgid "Particle detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237
+#: src/gui/setup_video.cpp:262
 msgid "Font size"
 msgstr ""
 
-#: src/gui/setup_video.cpp:251 src/gui/setup_video.cpp:454
-#: src/gui/setup_video.cpp:568
+#: src/gui/setup_video.cpp:277 src/gui/setup_video.cpp:532
+#: src/gui/setup_video.cpp:662
 msgid "None"
 msgstr ""
 
-#: src/gui/setup_video.cpp:381
+#: src/gui/setup_video.cpp:426
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:387
+#: src/gui/setup_video.cpp:432
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:398
+#: src/gui/setup_video.cpp:443
 msgid "Switching to Full Screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:399
+#: src/gui/setup_video.cpp:444
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:411
+#: src/gui/setup_video.cpp:458
 msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:412
+#: src/gui/setup_video.cpp:459
+msgid ""
+"Applying change to OpenGL requires restart. In case OpenGL messes up your "
+"game graphics, restart the game with the command line option \"--no-opengl\"."
+msgstr ""
+
+#: src/gui/setup_video.cpp:466
+msgid "Deactivating OpenGL"
+msgstr ""
+
+#: src/gui/setup_video.cpp:467
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#: src/gui/setup_video.cpp:486 src/gui/setup_video.cpp:491
+#: src/gui/setup_video.cpp:475
+msgid "Transparency disabled"
+msgstr ""
+
+#: src/gui/setup_video.cpp:476 src/gui/setup_video.cpp:484
+msgid "You must restart to apply changes."
+msgstr ""
+
+#: src/gui/setup_video.cpp:483
+msgid "Transparency enabled"
+msgstr ""
+
+#: src/gui/setup_video.cpp:576 src/gui/setup_video.cpp:581
 msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:487 src/gui/setup_video.cpp:492
+#: src/gui/setup_video.cpp:577 src/gui/setup_video.cpp:582
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:489
+#: src/gui/setup_video.cpp:579
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:522
+#: src/gui/setup_video.cpp:612
 msgid "Particle Effect Settings Changed."
 msgstr ""
 
-#: src/gui/setup_video.cpp:523
+#: src/gui/setup_video.cpp:613
 msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skilldialog.cpp:197 src/gui/windowmenu.cpp:58
+#: src/gui/skilldialog.cpp:212 src/gui/windowmenu.cpp:59
 msgid "Skills"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:208
+#: src/gui/skilldialog.cpp:223
 msgid "Up"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:262
+#: src/gui/skilldialog.cpp:269
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:314
+#: src/gui/skilldialog.cpp:351
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:323
+#: src/gui/skilldialog.cpp:360
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:405
+#: src/gui/skilldialog.cpp:442
 #, c-format
 msgid "Lvl: %d (%+d)"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:416
+#: src/gui/skilldialog.cpp:453
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:117
+#: src/gui/socialwindow.cpp:126
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:126
+#: src/gui/socialwindow.cpp:139
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:136
+#: src/gui/socialwindow.cpp:153
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:137
+#: src/gui/socialwindow.cpp:154
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:146
+#: src/gui/socialwindow.cpp:163
 msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:147
+#: src/gui/socialwindow.cpp:164
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:182
+#: src/gui/socialwindow.cpp:207 src/net/tmwa/partyhandler.cpp:330
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:218
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:199
+#: src/gui/socialwindow.cpp:232
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:200
+#: src/gui/socialwindow.cpp:233
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:209
+#: src/gui/socialwindow.cpp:242
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:210
+#: src/gui/socialwindow.cpp:243
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:239
+#: src/gui/socialwindow.cpp:272
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:240 src/gui/socialwindow.cpp:564
+#: src/gui/socialwindow.cpp:273 src/gui/socialwindow.cpp:620
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:279 src/gui/windowmenu.cpp:60
+#: src/gui/socialwindow.cpp:312 src/gui/windowmenu.cpp:64
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:297
+#: src/gui/socialwindow.cpp:330
 msgid "Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:298
+#: src/gui/socialwindow.cpp:331
 msgid "Leave"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:394
+#: src/gui/socialwindow.cpp:443
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:400
+#: src/gui/socialwindow.cpp:449
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:413
+#: src/gui/socialwindow.cpp:462
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:419
+#: src/gui/socialwindow.cpp:468
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:463
+#: src/gui/socialwindow.cpp:497
+msgid "Creating guild failed, please choose a shorter name."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:504
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:477
+#: src/gui/socialwindow.cpp:520
+msgid "Creating party failed, please choose a shorter name."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:527
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:484
+#: src/gui/socialwindow.cpp:541
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:485
+#: src/gui/socialwindow.cpp:542
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:497
+#: src/gui/socialwindow.cpp:554
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:502
+#: src/gui/socialwindow.cpp:559
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:507
+#: src/gui/socialwindow.cpp:564
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:519
+#: src/gui/socialwindow.cpp:576
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:529
+#: src/gui/socialwindow.cpp:585
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:533
+#: src/gui/socialwindow.cpp:589
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:541
+#: src/gui/socialwindow.cpp:597
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:546
+#: src/gui/socialwindow.cpp:602
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:554
+#: src/gui/socialwindow.cpp:610
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:565
+#: src/gui/socialwindow.cpp:621
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:570
+#: src/gui/socialwindow.cpp:626
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:571
+#: src/gui/socialwindow.cpp:627
 msgid "Choose your party's name."
 msgstr ""
 
-#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:59
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:62
 msgid "Specials"
 msgstr ""
 
-#: src/gui/specialswindow.cpp:174
-#, c-format
-msgid "Specials Set %d"
-msgstr ""
-
-#: src/gui/specialswindow.cpp:191
-#, c-format
-msgid "Special %d"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:99 src/gui/statuswindow.cpp:247
+#: src/gui/statuswindow.cpp:113 src/gui/statuswindow.cpp:215
+#: src/gui/statuswindow.cpp:262
 #, c-format
 msgid "Level: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:211
+#: src/gui/statuswindow.cpp:114 src/gui/statuswindow.cpp:208
+#: src/gui/statuswindow.cpp:239
 #, c-format
 msgid "Money: %s"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:102
+#: src/gui/statuswindow.cpp:117
 msgid "HP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:107
+#: src/gui/statuswindow.cpp:122
 msgid "Exp:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:112
+#: src/gui/statuswindow.cpp:130
 msgid "MP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:132 src/gui/statuswindow.cpp:219
+#: src/gui/statuswindow.cpp:158 src/gui/statuswindow.cpp:275
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:133
+#: src/gui/statuswindow.cpp:159
 msgid "Job:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:194
-msgid "HP"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:200
-msgid "MP"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:206
-msgid "Exp"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:215
-msgid "Money"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:225
-msgid "Job"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:229
+#: src/gui/statuswindow.cpp:211 src/gui/statuswindow.cpp:247
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:235
+#: src/gui/statuswindow.cpp:255
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:251
-msgid "Level"
-msgstr ""
-
-#: src/gui/storagewindow.cpp:58
-msgid "Storage"
-msgstr ""
-
-#: src/gui/trade.cpp:52
+#: src/gui/trade.cpp:53
 msgid "Propose trade"
 msgstr ""
 
-#: src/gui/trade.cpp:53
+#: src/gui/trade.cpp:54
 msgid "Confirmed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:55
 msgid "Agree trade"
 msgstr ""
 
-#: src/gui/trade.cpp:55
+#: src/gui/trade.cpp:56
 msgid "Agreed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:58
+#: src/gui/trade.cpp:59
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/trade.cpp:74 src/gui/trade.cpp:75
+#: src/gui/trade.cpp:73 src/gui/trade.cpp:74
 msgid "Trade"
 msgstr ""
 
-#: src/gui/trade.cpp:77
+#: src/gui/trade.cpp:76
 msgid "Add"
 msgstr ""
 
-#: src/gui/trade.cpp:99 src/gui/trade.cpp:135
+#: src/gui/trade.cpp:98 src/gui/trade.cpp:134
 #, c-format
 msgid "You get %s"
 msgstr ""
 
-#: src/gui/trade.cpp:100
+#: src/gui/trade.cpp:99
 msgid "You give:"
 msgstr ""
 
-#: src/gui/trade.cpp:104
+#: src/gui/trade.cpp:103
 msgid "Change"
 msgstr ""
 
-#: src/gui/trade.cpp:275
+#: src/gui/trade.cpp:262
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/trade.cpp:318
+#: src/gui/trade.cpp:304
 msgid "You don't have enough money."
 msgstr ""
 
@@ -2048,21 +1898,21 @@ msgstr ""
 msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:405
+#: src/gui/updatewindow.cpp:417
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:407
+#: src/gui/updatewindow.cpp:419
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:409
+#: src/gui/updatewindow.cpp:421
 msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:501
+#: src/gui/updatewindow.cpp:515
 msgid "Completed"
 msgstr ""
 
@@ -2142,61 +1992,61 @@ msgstr ""
 msgid "Need a user to kick!"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:118
+#: src/gui/widgets/chattab.cpp:121
 msgid "Global announcement:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:124
+#: src/gui/widgets/chattab.cpp:127
 #, c-format
 msgid "Global announcement from %s:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:150
+#: src/gui/widgets/chattab.cpp:153
 #, c-format
 msgid "%s whispers: %s"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:51
+#: src/gui/widgets/whispertab.cpp:53
 msgid "Cannot send empty chat!"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:70
+#: src/gui/widgets/whispertab.cpp:72
 msgid "/ignore > Ignore the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:71
+#: src/gui/widgets/whispertab.cpp:73
 msgid "/unignore > Stop ignoring the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:72
+#: src/gui/widgets/whispertab.cpp:74
 msgid "/close > Close the whisper tab"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:82
+#: src/gui/widgets/whispertab.cpp:84
 msgid "Command: /close"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:83
+#: src/gui/widgets/whispertab.cpp:85
 msgid "This command closes the current whisper tab."
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:87
+#: src/gui/widgets/whispertab.cpp:89
 msgid "Command: /ignore"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:88
+#: src/gui/widgets/whispertab.cpp:90
 msgid "This command ignores the other player regardless of current relations."
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:94
+#: src/gui/widgets/whispertab.cpp:96
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:55
+#: src/gui/windowmenu.cpp:54
 msgid "Status"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:61
+#: src/gui/windowmenu.cpp:65
 msgid "Shortcut"
 msgstr ""
 
@@ -2212,1349 +2062,1360 @@ msgstr ""
 msgid "Choose World"
 msgstr ""
 
-#: src/keyboardconfig.cpp:40
+#: src/keyboardconfig.cpp:39
 msgid "Move Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:41
+#: src/keyboardconfig.cpp:40
 msgid "Move Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:41
 msgid "Move Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:42
 msgid "Move Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:44 src/net/ea/generalhandler.cpp:223
+#: src/keyboardconfig.cpp:43 src/net/tmwa/generalhandler.cpp:237
 msgid "Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:44
 msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:45
 msgid "Smilie"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:46
 msgid "Talk"
 msgstr ""
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:47
 msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:48
 msgid "Target Monster"
 msgstr ""
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboardconfig.cpp:49
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:50
 msgid "Target Player"
 msgstr ""
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:51
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:52
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:53
 msgid "Sit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:54
 msgid "Screenshot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:55
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:56
 msgid "Find Path to Mouse"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58 src/keyboardconfig.cpp:59
-#: src/keyboardconfig.cpp:60 src/keyboardconfig.cpp:61
-#: src/keyboardconfig.cpp:62 src/keyboardconfig.cpp:63
-#: src/keyboardconfig.cpp:64 src/keyboardconfig.cpp:65
-#: src/keyboardconfig.cpp:66 src/keyboardconfig.cpp:67
-#: src/keyboardconfig.cpp:68 src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:57 src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60
+#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62
+#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64
+#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68
 #, c-format
 msgid "Item Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:69
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:70
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:71
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:72
 msgid "Equipment Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:73
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:74
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:75
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:76
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:77
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:78
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:79
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:80
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:81
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:83
+#: src/keyboardconfig.cpp:82
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:83
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86
-#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88
-#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90
-#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92
-#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:84 src/keyboardconfig.cpp:85
+#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:87
+#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:89
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:91
+#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:93
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:95
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:96
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:97
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:98
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:99
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:100
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:101
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:103
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:105
+#: src/keyboardconfig.cpp:104
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:178
+#: src/keyboardconfig.cpp:183
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:913
+#: src/localplayer.cpp:985
 msgid "Unable to pick up item."
 msgstr ""
 
 #. TRANSLATORS: This sentence may be translated differently
 #. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:922
+#: src/localplayer.cpp:994
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/main.cpp:43
+#: src/main.cpp:42
 msgid "mana [options] [mana-file]"
 msgstr ""
 
+#: src/main.cpp:43
+msgid "[mana-file] : The mana file is an XML file (.mana)"
+msgstr ""
+
 #: src/main.cpp:44
-msgid "Options:"
+msgid "              used to set custom parameters"
 msgstr ""
 
 #: src/main.cpp:45
+msgid "              to the mana client."
+msgstr ""
+
+#: src/main.cpp:47
+msgid "Options:"
+msgstr ""
+
+#: src/main.cpp:48
 msgid "  -v --version        : Display the version"
 msgstr ""
 
-#: src/main.cpp:46
+#: src/main.cpp:49
 #, fuzzy
 msgid "  -h --help           : Display this help"
 msgstr "/ndihmë > Ndihmë përeth disa komandave"
 
-#: src/main.cpp:47
+#: src/main.cpp:50
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
-#: src/main.cpp:48
+#: src/main.cpp:51
 msgid "  -U --username       : Login with this username"
 msgstr ""
 
-#: src/main.cpp:49
+#: src/main.cpp:52
 msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/main.cpp:50
+#: src/main.cpp:53
 msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/main.cpp:51
+#: src/main.cpp:54
 msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:52
+#: src/main.cpp:55
 msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/main.cpp:53
+#: src/main.cpp:56
 msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/main.cpp:54
+#: src/main.cpp:57
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:56
+#: src/main.cpp:59
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:57
+#: src/main.cpp:60
 msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:58
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
+#: src/main.cpp:61
+msgid "     --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/main.cpp:59
+#: src/main.cpp:62
+msgid "     --chat-log-dir   : Chat log dir to use"
+msgstr ""
+
+#: src/main.cpp:63
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/main.cpp:61
+#: src/main.cpp:65
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:63
+#: src/net/manaserv/beinghandler.cpp:303 src/net/tmwa/playerhandler.cpp:94
+msgid "You are dead."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:304 src/net/tmwa/playerhandler.cpp:95
+msgid "We regret to inform you that your character was killed in battle."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:306 src/net/tmwa/playerhandler.cpp:97
+msgid "You are not that alive anymore."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:307 src/net/tmwa/playerhandler.cpp:98
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:308 src/net/tmwa/playerhandler.cpp:99
+msgid "Game Over!"
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:309 src/net/tmwa/playerhandler.cpp:101
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:311 src/net/tmwa/playerhandler.cpp:103
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:313 src/net/tmwa/playerhandler.cpp:105
+msgid "I guess this did not run too well."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:107
+msgid "Do you want your possessions identified?"
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:109
+msgid "Sadly, no trace of you was ever found..."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:111
+msgid "Annihilated."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:113
+msgid "Looks like you got your head handed to you."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:115
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:323
+msgid "Press OK to respawn."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:324
+msgid "You Died"
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:138 src/net/manaserv/charhandler.cpp:209
+msgid "Not logged in."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:141
+msgid "No empty slot."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:144
+msgid "Invalid name."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:147
+msgid "Character's name already exists."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:150
+msgid "Invalid hairstyle."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:153
+msgid "Invalid hair color."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:156
+msgid "Invalid gender."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:159
+msgid "Character's stats are too high."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:162
+msgid "Character's stats are too low."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:165
+#, c-format
+msgid "At least one statis out of the permitted range: (%u - %u)."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:171 src/net/manaserv/loginhandler.cpp:96
+#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
+#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
+#: src/net/tmwa/loginhandler.cpp:95 src/net/tmwa/loginhandler.cpp:182
+#, fuzzy
+msgid "Unknown error."
+msgstr "Unknown command > Komand e panjohur"
+
+#: src/net/manaserv/charhandler.cpp:200 src/net/tmwa/charserverhandler.cpp:146
+msgid "Info"
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:200
+msgid "Player deleted."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:212
+msgid "Selection out of range."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:215
+#, fuzzy, c-format
+msgid "Unknown error (%d)."
+msgstr "Unknown command > Komand e panjohur"
+
+#: src/net/manaserv/charhandler.cpp:250
+msgid "No gameservers are available."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:187 src/net/manaserv/chathandler.cpp:313
+#: src/net/manaserv/guildhandler.cpp:260
+#, c-format
+msgid "Topic: %s"
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:274
+msgid "Players in this channel:"
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:208
+msgid "Error joining channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:214
+msgid "Listing channels."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:226
+msgid "End of channel list."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:303
+#, c-format
+msgid "%s entered the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:308
+#, c-format
+msgid "%s left the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:324
+#, c-format
+msgid "%s has set mode %s on user %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:334
+#, c-format
+msgid "%s has kicked %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:339
+#, fuzzy
+msgid "Unknown channel event."
+msgstr "Unknown command > Komand e panjohur"
+
+#: src/net/manaserv/guildhandler.cpp:82
+msgid "Guild created."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:87
+msgid "Error creating guild."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:97
+msgid "Invite sent."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:204
+msgid "Member was promoted successfully."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:209
+msgid "Failed to promote member."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:87
+msgid "Wrong magic_token."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
+msgid "Already logged in."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:93
+msgid "Account banned."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:118
+msgid "New password incorrect."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:121 src/net/tmwa/loginhandler.cpp:89
+msgid "Old password incorrect."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
+msgid "Account not connected. Please login first."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:149
+msgid "New email address incorrect."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:152
+msgid "Old email address incorrect."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:158
+msgid "The new email address already exists."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:239
+msgid ""
+"Client registration is not allowed. Please contact server administration."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
+msgid "Client version is too old."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:266
+msgid "Wrong username or password."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:272
+msgid "Account banned"
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:275
+msgid "Login attempt too soon after previous attempt."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:303
+msgid "Wrong username, password or email address."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:306
+msgid "Username already exists."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:309
+msgid "Email address already exists."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:312
+msgid "You took too long with the captcha or your response was incorrect."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:87
+msgid "Joined party."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:105
+#, c-format
+msgid "%s joined the party."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:123
+#, c-format
+msgid "%s rejected your invite."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:95
+msgid "Accepting incoming trade requests."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:97
+msgid "Ignoring incoming trade requests."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:115 src/net/tmwa/tradehandler.cpp:109
+msgid "Request for Trade"
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:116 src/net/tmwa/tradehandler.cpp:110
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:134
+#, c-format
+msgid "Trading with %s"
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:148 src/net/tmwa/tradehandler.cpp:224
+msgid "Trade canceled."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:155 src/net/tmwa/tradehandler.cpp:231
+msgid "Trade completed."
+msgstr ""
+
+#: src/net/tmwa/adminhandler.cpp:64
 msgid "Kick failed!"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:65
+#: src/net/tmwa/adminhandler.cpp:66
 msgid "Kick succeeded!"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:110
+#: src/net/tmwa/buysellhandler.cpp:109
 msgid "Nothing to sell."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:117
+#: src/net/tmwa/buysellhandler.cpp:116
 msgid "Thanks for buying."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:124
+#: src/net/tmwa/buysellhandler.cpp:123
 msgid "Unable to buy."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:130
+#: src/net/tmwa/buysellhandler.cpp:129
 msgid "Thanks for selling."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:132
+#: src/net/tmwa/buysellhandler.cpp:131
 msgid "Unable to sell."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:103
-msgid "Access denied."
+#: src/net/tmwa/charserverhandler.cpp:103
+msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:106
+#: src/net/tmwa/charserverhandler.cpp:107
 msgid "Cannot use this ID."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:109
-msgid "Unknown failure to select character."
-msgstr ""
+#: src/net/tmwa/charserverhandler.cpp:110
+#, fuzzy
+msgid "Unknown char-server failure."
+msgstr "Unknown command > Komand e panjohur"
 
-#: src/net/ea/charserverhandler.cpp:135
+#: src/net/tmwa/charserverhandler.cpp:134
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:147 src/net/manaserv/charhandler.cpp:187
-msgid "Info"
-msgstr ""
-
-#: src/net/ea/charserverhandler.cpp:147
+#: src/net/tmwa/charserverhandler.cpp:146
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:152
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Failed to delete character."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:237 src/net/manaserv/charhandler.cpp:263
+#: src/net/tmwa/charserverhandler.cpp:266
 msgid "Strength:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:238 src/net/manaserv/charhandler.cpp:264
+#: src/net/tmwa/charserverhandler.cpp:267
 msgid "Agility:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:239 src/net/manaserv/charhandler.cpp:266
+#: src/net/tmwa/charserverhandler.cpp:268
 msgid "Vitality:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:240 src/net/manaserv/charhandler.cpp:267
+#: src/net/tmwa/charserverhandler.cpp:269
 msgid "Intelligence:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:241 src/net/manaserv/charhandler.cpp:265
+#: src/net/tmwa/charserverhandler.cpp:270
 msgid "Dexterity:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:242
+#: src/net/tmwa/charserverhandler.cpp:271
 msgid "Luck:"
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:80
-msgid "Whisper could not be sent, user is offline."
+#: src/net/tmwa/chathandler.cpp:87
+#, c-format
+msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:84
-msgid "Whisper could not be sent, ignored by user."
+#: src/net/tmwa/chathandler.cpp:96
+#, c-format
+msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:171
+#: src/net/tmwa/chathandler.cpp:230
 msgid "MVP player."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:204 src/net/ea/chathandler.cpp:210
-#: src/net/ea/chathandler.cpp:215 src/net/ea/chathandler.cpp:220
-#: src/net/ea/chathandler.cpp:225 src/net/ea/chathandler.cpp:230
-#: src/net/ea/chathandler.cpp:235 src/net/ea/chathandler.cpp:240
+#: src/net/tmwa/chathandler.cpp:265 src/net/tmwa/chathandler.cpp:271
+#: src/net/tmwa/chathandler.cpp:276 src/net/tmwa/chathandler.cpp:281
+#: src/net/tmwa/chathandler.cpp:286 src/net/tmwa/chathandler.cpp:291
+#: src/net/tmwa/chathandler.cpp:296 src/net/tmwa/chathandler.cpp:301
 msgid "Channels are not supported!"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:86
+#: src/net/tmwa/gamehandler.cpp:88
 #, c-format
 msgid "Online users: %d"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:100
+#: src/net/tmwa/gamehandler.cpp:101
 msgid "Game"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:100
+#: src/net/tmwa/gamehandler.cpp:101
 msgid "Request to quit denied!"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:102 src/net/manaserv/generalhandler.cpp:95
+#: src/net/tmwa/generalhandler.cpp:102
 #, c-format
 msgid "Strength %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:103 src/net/manaserv/generalhandler.cpp:96
+#: src/net/tmwa/generalhandler.cpp:103
 #, c-format
 msgid "Agility %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:104 src/net/manaserv/generalhandler.cpp:98
+#: src/net/tmwa/generalhandler.cpp:104
 #, c-format
 msgid "Vitality %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:105 src/net/manaserv/generalhandler.cpp:99
+#: src/net/tmwa/generalhandler.cpp:105
 #, c-format
 msgid "Intelligence %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:106 src/net/manaserv/generalhandler.cpp:97
+#: src/net/tmwa/generalhandler.cpp:106
 #, c-format
 msgid "Dexterity %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:107
+#: src/net/tmwa/generalhandler.cpp:107
 #, c-format
 msgid "Luck %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:130
+#: src/net/tmwa/generalhandler.cpp:132
 msgid "Authentication failed."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:133
+#: src/net/tmwa/generalhandler.cpp:135
 msgid "No servers available."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:137
+#: src/net/tmwa/generalhandler.cpp:139
 msgid "Someone else is trying to use this account."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:140
+#: src/net/tmwa/generalhandler.cpp:142
 msgid "This account is already logged in."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:143
+#: src/net/tmwa/generalhandler.cpp:145
 msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:146
+#: src/net/tmwa/generalhandler.cpp:148
 msgid "Duplicated login."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:149
+#: src/net/tmwa/generalhandler.cpp:151
 msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:205
+#: src/net/tmwa/generalhandler.cpp:209
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:216 src/net/manaserv/generalhandler.cpp:166
+#: src/net/tmwa/generalhandler.cpp:230
 msgid "Strength"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:217 src/net/manaserv/generalhandler.cpp:167
+#: src/net/tmwa/generalhandler.cpp:231
 msgid "Agility"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:218 src/net/manaserv/generalhandler.cpp:169
+#: src/net/tmwa/generalhandler.cpp:232
 msgid "Vitality"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:219 src/net/manaserv/generalhandler.cpp:170
+#: src/net/tmwa/generalhandler.cpp:233
 msgid "Intelligence"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:220 src/net/manaserv/generalhandler.cpp:168
+#: src/net/tmwa/generalhandler.cpp:234
 msgid "Dexterity"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:221
+#: src/net/tmwa/generalhandler.cpp:235
 msgid "Luck"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:224
+#: src/net/tmwa/generalhandler.cpp:238
 msgid "Defense"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:225
+#: src/net/tmwa/generalhandler.cpp:239
 msgid "M.Attack"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:226
+#: src/net/tmwa/generalhandler.cpp:240
 msgid "M.Defense"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:227
+#: src/net/tmwa/generalhandler.cpp:241
 #, c-format
 msgid "% Accuracy"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:228
+#: src/net/tmwa/generalhandler.cpp:242
 #, c-format
 msgid "% Evade"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:229
+#: src/net/tmwa/generalhandler.cpp:243
 #, c-format
 msgid "% Critical"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:61 src/net/ea/gui/partytab.cpp:59
+#: src/net/tmwa/gui/guildtab.cpp:45
+msgid "Guild"
+msgstr ""
+
+#: src/net/tmwa/gui/guildtab.cpp:61 src/net/tmwa/gui/partytab.cpp:59
 msgid "/help > Display this help."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:62
+#: src/net/tmwa/gui/guildtab.cpp:62
 msgid "/invite > Invite a player to your guild"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:63
+#: src/net/tmwa/gui/guildtab.cpp:63
 msgid "/leave > Leave the guild you are in"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:64
+#: src/net/tmwa/gui/guildtab.cpp:64
 msgid "/kick > Kick some one from the guild you are in"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:73 src/net/ea/gui/partytab.cpp:73
+#: src/net/tmwa/gui/guildtab.cpp:73 src/net/tmwa/gui/partytab.cpp:73
 msgid "Command: /invite <nick>"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:74
+#: src/net/tmwa/gui/guildtab.cpp:74
 msgid "This command invites <nick> to the guild you're in."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:80 src/net/ea/gui/partytab.cpp:80
+#: src/net/tmwa/gui/guildtab.cpp:80 src/net/tmwa/gui/partytab.cpp:80
 msgid "Command: /leave"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:81
+#: src/net/tmwa/gui/guildtab.cpp:81
 msgid "This command causes the player to leave the guild."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:89
+#: src/net/tmwa/gui/guildtab.cpp:89
 msgid "Guild name is missing."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:293
+#: src/net/tmwa/guildhandler.cpp:296
 msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:298
+#: src/net/tmwa/guildhandler.cpp:301
 msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:303
+#: src/net/tmwa/guildhandler.cpp:306
 msgid "User is now part of your guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:308
+#: src/net/tmwa/guildhandler.cpp:311
 msgid "Your guild is full."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:313
+#: src/net/tmwa/guildhandler.cpp:316
 msgid "Unknown guild invite response."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:390
+#: src/net/tmwa/guildhandler.cpp:393
 msgid "Guild creation isn't supported yet."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:60
+#: src/net/tmwa/gui/partytab.cpp:43
+msgid "Party"
+msgstr ""
+
+#: src/net/tmwa/gui/partytab.cpp:60
 msgid "/invite > Invite a player to your party"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:61
+#: src/net/tmwa/gui/partytab.cpp:61
 msgid "/leave > Leave the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:62
+#: src/net/tmwa/gui/partytab.cpp:62
 msgid "/kick > Kick some one from the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:63
+#: src/net/tmwa/gui/partytab.cpp:63
 msgid "/item > Show/change party item sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:64
+#: src/net/tmwa/gui/partytab.cpp:64
 msgid "/exp > Show/change party experience sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:81
+#: src/net/tmwa/gui/partytab.cpp:81
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:85
+#: src/net/tmwa/gui/partytab.cpp:85
 msgid "Command: /item <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:86
+#: src/net/tmwa/gui/partytab.cpp:86
 msgid "This command changes the party's item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:87
+#: src/net/tmwa/gui/partytab.cpp:87
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:90
+#: src/net/tmwa/gui/partytab.cpp:90
 msgid "Command: /item"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/tmwa/gui/partytab.cpp:91
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/tmwa/gui/partytab.cpp:95
 msgid "Command: /exp <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:96
+#: src/net/tmwa/gui/partytab.cpp:96
 msgid "This command changes the party's experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/tmwa/gui/partytab.cpp:97
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:100
+#: src/net/tmwa/gui/partytab.cpp:100
 msgid "Command: /exp"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/tmwa/gui/partytab.cpp:101
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:132 src/net/ea/partyhandler.cpp:198
+#: src/net/tmwa/gui/partytab.cpp:132 src/net/tmwa/partyhandler.cpp:196
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:135 src/net/ea/partyhandler.cpp:204
+#: src/net/tmwa/gui/partytab.cpp:135 src/net/tmwa/partyhandler.cpp:202
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:138 src/net/ea/partyhandler.cpp:210
+#: src/net/tmwa/gui/partytab.cpp:138 src/net/tmwa/partyhandler.cpp:208
 msgid "Item sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:141
+#: src/net/tmwa/gui/partytab.cpp:141
 msgid "Item sharing unknown."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:167 src/net/ea/partyhandler.cpp:174
+#: src/net/tmwa/gui/partytab.cpp:167 src/net/tmwa/partyhandler.cpp:172
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:170 src/net/ea/partyhandler.cpp:180
+#: src/net/tmwa/gui/partytab.cpp:170 src/net/tmwa/partyhandler.cpp:178
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:173 src/net/ea/partyhandler.cpp:186
+#: src/net/tmwa/gui/partytab.cpp:173 src/net/tmwa/partyhandler.cpp:184
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:176
+#: src/net/tmwa/gui/partytab.cpp:176
 msgid "Experience sharing unknown."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:281
+#: src/net/tmwa/inventoryhandler.cpp:285
 msgid "Failed to use item."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:391
+#: src/net/tmwa/inventoryhandler.cpp:399
 msgid "Unable to equip."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:402
+#: src/net/tmwa/inventoryhandler.cpp:410
 msgid "Unable to unequip."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:79
+#: src/net/tmwa/loginhandler.cpp:86
 msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:82 src/net/manaserv/loginhandler.cpp:121
-msgid "Old password incorrect."
-msgstr ""
-
-#: src/net/ea/loginhandler.cpp:85
+#: src/net/tmwa/loginhandler.cpp:92
 msgid "New password too short."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:88 src/net/ea/loginhandler.cpp:175
-#: src/net/manaserv/charhandler.cpp:158 src/net/manaserv/loginhandler.cpp:96
-#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
-#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
-#, fuzzy
-msgid "Unknown error."
-msgstr "Unknown command > Komand e panjohur"
-
-#: src/net/ea/loginhandler.cpp:149
+#: src/net/tmwa/loginhandler.cpp:156
 msgid "Unregistered ID."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:152
+#: src/net/tmwa/loginhandler.cpp:159
 msgid "Wrong password."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:155
+#: src/net/tmwa/loginhandler.cpp:162
 msgid "Account expired."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:158
+#: src/net/tmwa/loginhandler.cpp:165
 msgid "Rejected from server."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:161
+#: src/net/tmwa/loginhandler.cpp:168
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:165
+#: src/net/tmwa/loginhandler.cpp:172
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:172
+#: src/net/tmwa/loginhandler.cpp:179
 msgid "This user name is already taken."
 msgstr ""
 
-#: src/net/ea/network.cpp:145
+#: src/net/tmwa/network.cpp:145
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/ea/network.cpp:345
+#: src/net/tmwa/network.cpp:345
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/ea/network.cpp:414
+#: src/net/tmwa/network.cpp:414
 msgid "Connection to server terminated. "
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:81
+#: src/net/tmwa/partyhandler.cpp:82
 msgid "Could not create party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:84
+#: src/net/tmwa/partyhandler.cpp:84
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:118
+#: src/net/tmwa/partyhandler.cpp:119
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:122
+#: src/net/tmwa/partyhandler.cpp:123
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:126
+#: src/net/tmwa/partyhandler.cpp:127
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:130
+#: src/net/tmwa/partyhandler.cpp:131
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:238
+#: src/net/tmwa/partyhandler.cpp:236
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:249
+#: src/net/tmwa/partyhandler.cpp:246
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:301
+#: src/net/tmwa/partyhandler.cpp:299
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:329
-msgid "Inviting like this isn't supported at the moment."
+#: src/net/tmwa/partyhandler.cpp:335
+#, c-format
+msgid "Inviting failed, because you can't see a player called %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:334
+#: src/net/tmwa/partyhandler.cpp:340
 msgid "You can only inivte when you are in a party!"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:365
+#: src/net/tmwa/partyhandler.cpp:368
 #, c-format
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:304
-msgid "You are dead."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:305
-msgid "We regret to inform you that your character was killed in battle."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:307
-msgid "You are not that alive anymore."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:308
-msgid "The cold hands of the grim reaper are grabbing for your soul."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:309
-msgid "Game Over!"
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:105
+#: src/net/tmwa/playerhandler.cpp:100
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:310
-msgid ""
-"No, kids. Your character did not really die. It... err... went to a better "
-"place."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:312
-msgid ""
-"Your plan of breaking your enemies weapon by bashing it with your throat "
-"failed."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:314
-msgid "I guess this did not run too well."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:315
-msgid "Do you want your possessions identified?"
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:316
-msgid "Sadly, no trace of you was ever found..."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:317
-msgid "Annihilated."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:318
-msgid "Looks like you got your head handed to you."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:120 src/net/manaserv/beinghandler.cpp:319
-msgid ""
-"You screwed up again, dump your body down the tubes and get you another one."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/tmwa/playerhandler.cpp:118
 msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/tmwa/playerhandler.cpp:119
 msgid "You are no more."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/tmwa/playerhandler.cpp:120
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/tmwa/playerhandler.cpp:121
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/tmwa/playerhandler.cpp:122
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/tmwa/playerhandler.cpp:123
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/tmwa/playerhandler.cpp:124
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:130
+#: src/net/tmwa/playerhandler.cpp:125
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:131
+#: src/net/tmwa/playerhandler.cpp:126
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/tmwa/playerhandler.cpp:127
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/tmwa/playerhandler.cpp:128
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:135
+#: src/net/tmwa/playerhandler.cpp:130
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:136
+#: src/net/tmwa/playerhandler.cpp:131
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:249 src/net/ea/playerhandler.cpp:310
+#: src/net/tmwa/playerhandler.cpp:246 src/net/tmwa/playerhandler.cpp:285
 msgid "Message"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:250
+#: src/net/tmwa/playerhandler.cpp:247
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:333
+#: src/net/tmwa/playerhandler.cpp:313
 #, c-format
 msgid "You picked up %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:369
+#: src/net/tmwa/playerhandler.cpp:348
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:532
+#: src/net/tmwa/playerhandler.cpp:488
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:147
+#: src/net/tmwa/specialhandler.cpp:144
 msgid "Trade failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:150
+#: src/net/tmwa/specialhandler.cpp:147
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:153
+#: src/net/tmwa/specialhandler.cpp:150
 msgid "Sit failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:156
+#: src/net/tmwa/specialhandler.cpp:153
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:159
+#: src/net/tmwa/specialhandler.cpp:156
 msgid "Could not join party!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:162
+#: src/net/tmwa/specialhandler.cpp:159
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:171
+#: src/net/tmwa/specialhandler.cpp:168
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:174
+#: src/net/tmwa/specialhandler.cpp:171
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:177
+#: src/net/tmwa/specialhandler.cpp:174
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:180
+#: src/net/tmwa/specialhandler.cpp:177
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:183
+#: src/net/tmwa/specialhandler.cpp:180
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:186
+#: src/net/tmwa/specialhandler.cpp:183
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:189
+#: src/net/tmwa/specialhandler.cpp:186
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:192
+#: src/net/tmwa/specialhandler.cpp:189
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:195
+#: src/net/tmwa/specialhandler.cpp:192
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:198
+#: src/net/tmwa/specialhandler.cpp:195
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:201
+#: src/net/tmwa/specialhandler.cpp:198
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:210
+#: src/net/tmwa/specialhandler.cpp:207
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:213
+#: src/net/tmwa/specialhandler.cpp:210
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:216
+#: src/net/tmwa/specialhandler.cpp:213
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:116
-msgid "Request for Trade"
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:108 src/net/manaserv/tradehandler.cpp:117
-#, c-format
-msgid "%s wants to trade with you, do you accept?"
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:124
+#: src/net/tmwa/tradehandler.cpp:126
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:128
+#: src/net/tmwa/tradehandler.cpp:130
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:132
+#: src/net/tmwa/tradehandler.cpp:134
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:137
+#: src/net/tmwa/tradehandler.cpp:139
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:144
+#: src/net/tmwa/tradehandler.cpp:146
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:153
+#: src/net/tmwa/tradehandler.cpp:154
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:202
+#: src/net/tmwa/tradehandler.cpp:202
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:207
+#: src/net/tmwa/tradehandler.cpp:207
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:211
+#: src/net/tmwa/tradehandler.cpp:211
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:224 src/net/manaserv/tradehandler.cpp:149
-msgid "Trade canceled."
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:231 src/net/manaserv/tradehandler.cpp:156
-msgid "Trade completed."
-msgstr ""
-
-#: src/net/manaserv/beinghandler.cpp:324
-msgid "Press OK to respawn."
-msgstr ""
-
-#: src/net/manaserv/beinghandler.cpp:325
-msgid "You Died"
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:128 src/net/manaserv/charhandler.cpp:196
-msgid "Not logged in."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:131
-msgid "No empty slot."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:134
-msgid "Invalid name."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:137
-msgid "Character's name already exists."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:140
-msgid "Invalid hairstyle."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:143
-msgid "Invalid hair color."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:146
-msgid "Invalid gender."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:149
-msgid "Character's stats are too high."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:152
-msgid "Character's stats are too low."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:155
-msgid "One stat is zero."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:187
-msgid "Player deleted."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:199
-msgid "Selection out of range."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:202
-#, fuzzy, c-format
-msgid "Unknown error (%d)."
-msgstr "Unknown command > Komand e panjohur"
-
-#: src/net/manaserv/charhandler.cpp:242
-msgid "No gameservers are available."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:268
-msgid "Willpower:"
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
-#: src/net/manaserv/guildhandler.cpp:259
-#, c-format
-msgid "Topic: %s"
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
-msgid "Players in this channel:"
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:201
-msgid "Error joining channel."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:207
-msgid "Listing channels."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:219
-msgid "End of channel list."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:291
-#, c-format
-msgid "%s entered the channel."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:296
-#, c-format
-msgid "%s left the channel."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:312
-#, c-format
-msgid "%s has set mode %s on user %s."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:322
-#, c-format
-msgid "%s has kicked %s."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:327
-#, fuzzy
-msgid "Unknown channel event."
-msgstr "Unknown command > Komand e panjohur"
-
-#: src/net/manaserv/generalhandler.cpp:100
-#, c-format
-msgid "Willpower %+d"
-msgstr ""
-
-#: src/net/manaserv/generalhandler.cpp:171
-msgid "Willpower"
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:81
-msgid "Guild created."
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:86
-msgid "Error creating guild."
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:96
-msgid "Invite sent."
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:203
-msgid "Member was promoted successfully."
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:208
-msgid "Failed to promote member."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:87
-msgid "Wrong magic_token."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
-msgid "Already logged in."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:93 src/net/manaserv/loginhandler.cpp:272
-msgid "Server is full."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:118
-msgid "New password incorrect."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
-msgid "Account not connected. Please login first."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:149
-msgid "New email address incorrect."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:152
-msgid "Old email address incorrect."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:158
-msgid "The new email address already exists."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:239
-msgid ""
-"Client registration is not allowed. Please contact server administration."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
-msgid "Client version is too old."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:266
-msgid "Wrong username or password."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:275
-msgid "Login attempt too soon after previous attempt."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:303
-msgid "Wrong username, password or email address."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:306
-msgid "Username already exists."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:309
-msgid "Email address already exists."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:312
-msgid "You took too long with the captcha or your response was incorrect."
-msgstr ""
-
-#: src/net/manaserv/partyhandler.cpp:88
-msgid "Joined party."
-msgstr ""
-
-#: src/net/manaserv/partyhandler.cpp:106
-#, c-format
-msgid "%s joined the party."
-msgstr ""
-
-#: src/net/manaserv/partyhandler.cpp:123
-#, c-format
-msgid "%s rejected your invite."
-msgstr ""
-
-#: src/net/manaserv/tradehandler.cpp:96
-msgid "Accepting incoming trade requests."
-msgstr ""
-
-#: src/net/manaserv/tradehandler.cpp:98
-msgid "Ignoring incoming trade requests."
-msgstr ""
-
-#: src/net/manaserv/tradehandler.cpp:135
-#, c-format
-msgid "Trading with %s"
-msgstr ""
-
-#: src/playerrelations.cpp:304
+#: src/playerrelations.cpp:310
 msgid "Completely ignore"
 msgstr ""
 
-#: src/playerrelations.cpp:318
+#: src/playerrelations.cpp:324
 msgid "Print '...'"
 msgstr ""
 
-#: src/playerrelations.cpp:334
+#: src/playerrelations.cpp:340
 msgid "Blink name"
 msgstr ""
 
-#: src/playerrelations.cpp:371
-msgid "Floating '...' bubble"
-msgstr ""
-
-#: src/playerrelations.cpp:374
-msgid "Floating bubble"
-msgstr ""
-
-#: src/resources/itemdb.cpp:52
+#: src/resources/itemdb.cpp:44
 #, c-format
 msgid "Attack %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:53
+#: src/resources/itemdb.cpp:45
 #, c-format
 msgid "Defense %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:54
+#: src/resources/itemdb.cpp:46
 #, c-format
 msgid "HP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:55
+#: src/resources/itemdb.cpp:47
 #, c-format
 msgid "MP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:114
+#: src/resources/itemdb.cpp:92
 msgid "Unknown item"
 msgstr ""
 
-#: src/resources/itemdb.cpp:158 src/resources/monsterdb.cpp:45
-#: src/resources/monsterdb.cpp:67
+#: src/resources/itemdb.cpp:135 src/resources/monsterdb.cpp:77
 msgid "unnamed"
 msgstr ""
diff --git a/po/sv.po b/po/sv.po
index 755aa4e8..8949cd3b 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2010-03-16 22:27+0100\n"
+"POT-Creation-Date: 2010-12-13 20:04+0100\n"
 "PO-Revision-Date: 2009-07-17 05:36+0000\n"
 "Last-Translator: Kess Vargavind <Unknown>\n"
 "Language-Team: Swedish <sv@li.org>\n"
+"Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,319 +19,325 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/client.cpp:555 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
+#: src/client.cpp:598 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
 msgid "Setup"
 msgstr "Inställningar"
 
-#: src/client.cpp:625
+#: src/client.cpp:679
 #, fuzzy
 msgid "Connecting to server"
 msgstr "Ansluter till kartservern..."
 
-#: src/client.cpp:652
+#: src/client.cpp:706
 #, fuzzy
 msgid "Logging in"
 msgstr "Användarnamn"
 
-#: src/client.cpp:685
+#: src/client.cpp:739
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:741
+#: src/client.cpp:804
 #, fuzzy
 msgid "Requesting characters"
 msgstr "Välj karaktär"
 
-#: src/client.cpp:770
+#: src/client.cpp:833
 #, fuzzy
 msgid "Connecting to the game server"
 msgstr "Ansluter till kartservern..."
 
-#: src/client.cpp:801 src/client.cpp:808 src/client.cpp:942
+#: src/client.cpp:843
+#, fuzzy
+msgid "Changing game servers"
+msgstr "Server"
+
+#: src/client.cpp:872 src/client.cpp:879 src/client.cpp:1014
 #: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
 #: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
-#: src/gui/serverdialog.cpp:241 src/gui/unregisterdialog.cpp:133
-#: src/net/ea/charserverhandler.cpp:135 src/net/ea/charserverhandler.cpp:152
-#: src/net/manaserv/charhandler.cpp:161 src/net/manaserv/charhandler.cpp:204
+#: src/gui/serverdialog.cpp:323 src/gui/unregisterdialog.cpp:133
+#: src/net/manaserv/charhandler.cpp:174 src/net/manaserv/charhandler.cpp:217
+#: src/net/tmwa/charserverhandler.cpp:134
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Error"
 msgstr "Fel"
 
-#: src/client.cpp:817
+#: src/client.cpp:888
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:844
+#: src/client.cpp:915
 #, fuzzy
 msgid "Password Change"
 msgstr "Lösenord:"
 
-#: src/client.cpp:845
+#: src/client.cpp:916
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:864
+#: src/client.cpp:935
 #, fuzzy
 msgid "Email Change"
 msgstr "Ändra"
 
-#: src/client.cpp:865
+#: src/client.cpp:936
 #, fuzzy
 msgid "Email changed successfully!"
 msgstr "Medlem befordrad."
 
-#: src/client.cpp:885
+#: src/client.cpp:956
 #, fuzzy
 msgid "Unregister Successful"
 msgstr "Avregistrera"
 
-#: src/client.cpp:886
+#: src/client.cpp:957
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1009 src/client.cpp:1032
+#: src/client.cpp:1138 src/client.cpp:1161
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1121
+#: src/client.cpp:1281
 #, fuzzy, c-format
 msgid "Invalid update host: %s"
 msgstr "Ogiltig uppdateringsvärd: "
 
-#: src/client.cpp:1155 src/client.cpp:1161
+#: src/client.cpp:1315 src/client.cpp:1321
 msgid "Error creating updates directory!"
 msgstr "Kunde inte skapa katalog för uppdateringar!"
 
-#: src/commandhandler.cpp:127 src/commandhandler.cpp:308
+#: src/commandhandler.cpp:131 src/commandhandler.cpp:317
 msgid "Unknown command."
 msgstr "Okänt kommando."
 
-#: src/commandhandler.cpp:156
+#: src/commandhandler.cpp:160
 msgid "-- Help --"
 msgstr "-- Hjälp --"
 
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:161
 msgid "/help > Display this help"
 msgstr "/help > Visa den här hjälpen"
 
-#: src/commandhandler.cpp:159
+#: src/commandhandler.cpp:163
 msgid "/where > Display map name"
 msgstr "/where > Visa kartans namn"
 
-#: src/commandhandler.cpp:160
+#: src/commandhandler.cpp:164
 msgid "/who > Display number of online users"
 msgstr "/who > Visa antalet inloggade spelare"
 
-#: src/commandhandler.cpp:161
+#: src/commandhandler.cpp:165
 msgid "/me > Tell something about yourself"
 msgstr "/me > Säg något om dig själv"
 
-#: src/commandhandler.cpp:163
+#: src/commandhandler.cpp:167
 msgid "/clear > Clears this window"
 msgstr "/clear > Tömmer det här fönstret"
 
-#: src/commandhandler.cpp:165
+#: src/commandhandler.cpp:169
 msgid "/msg > Send a private message to a user"
 msgstr "/msg > Skickar ett privat meddelande till en spelare"
 
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:170
 msgid "/whisper > Alias of msg"
 msgstr "/whisper > Alias för msg"
 
-#: src/commandhandler.cpp:167
+#: src/commandhandler.cpp:171
 msgid "/w > Alias of msg"
 msgstr "/w > Alias för msg"
 
-#: src/commandhandler.cpp:168
+#: src/commandhandler.cpp:172
 msgid "/query > Makes a tab for private messages with another user"
 msgstr "/query > Skapar en flik för privata meddelanden med en annan spelare"
 
-#: src/commandhandler.cpp:169
+#: src/commandhandler.cpp:174
 msgid "/q > Alias of query"
 msgstr "/q > Alias för query"
 
-#: src/commandhandler.cpp:171
+#: src/commandhandler.cpp:176
 msgid "/ignore > ignore a player"
 msgstr ""
 
-#: src/commandhandler.cpp:172
+#: src/commandhandler.cpp:177
 msgid "/unignore > stop ignoring a player"
 msgstr ""
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:179
 msgid "/list > Display all public channels"
 msgstr "/list > Visa alla offentliga chattkanaler"
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:180
 msgid "/join > Join or create a channel"
 msgstr "/join > Gå med i eller skapa en chattkanal"
 
-#: src/commandhandler.cpp:177
+#: src/commandhandler.cpp:182
 #, fuzzy
 msgid "/createparty > Create a new party"
 msgstr "/create > Skapa ny grupp"
 
-#: src/commandhandler.cpp:178
+#: src/commandhandler.cpp:183
 msgid "/party > Invite a user to party"
 msgstr "/party > Bjud in en spelare till din grupp"
 
-#: src/commandhandler.cpp:180
+#: src/commandhandler.cpp:185
 msgid "/record > Start recording the chat to an external file"
 msgstr "/record > Påbörja loggning av chatten till en extern fil"
 
-#: src/commandhandler.cpp:181
+#: src/commandhandler.cpp:187
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr "/toggle > Avgör huruvida <retur> aktiverar chattfönstret eller ej"
 
-#: src/commandhandler.cpp:182
+#: src/commandhandler.cpp:189
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
 "/present > Lista närvarande spelare (sänds till chattloggen om loggning är "
 "aktiverad)"
 
-#: src/commandhandler.cpp:184
+#: src/commandhandler.cpp:192
 msgid "/announce > Global announcement (GM only)"
 msgstr "/announce > Globalt meddelande (endast för GM)"
 
-#: src/commandhandler.cpp:188
+#: src/commandhandler.cpp:196
 msgid "For more information, type /help <command>."
 msgstr "Skriv /help <kommando> för mer information."
 
-#: src/commandhandler.cpp:192
+#: src/commandhandler.cpp:200
 msgid "Command: /help"
 msgstr "Kommando: /help"
 
-#: src/commandhandler.cpp:193
+#: src/commandhandler.cpp:201
 msgid "This command displays a list of all commands available."
 msgstr "Det här kommandot visar en lista över alla tillgängliga kommandon."
 
-#: src/commandhandler.cpp:194
+#: src/commandhandler.cpp:203
 msgid "Command: /help <command>"
 msgstr "Kommando: /help <kommando>"
 
-#: src/commandhandler.cpp:195
+#: src/commandhandler.cpp:204
 msgid "This command displays help on <command>."
 msgstr "Det här kommandot ger mer information om <kommando>."
 
-#: src/commandhandler.cpp:203
+#: src/commandhandler.cpp:212
 msgid "Command: /announce <msg>"
 msgstr "Kommando: /announce <text>"
 
-#: src/commandhandler.cpp:204
+#: src/commandhandler.cpp:213
 msgid "*** only available to a GM ***"
 msgstr "*** endast en GM kan använda det här kommandot ***"
 
-#: src/commandhandler.cpp:205
+#: src/commandhandler.cpp:214
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 "Det här kommandot skickar meddelandet <text> till alla inloggade spelare."
 
-#: src/commandhandler.cpp:210
+#: src/commandhandler.cpp:219
 msgid "Command: /clear"
 msgstr "Kommando: /clear"
 
-#: src/commandhandler.cpp:211
+#: src/commandhandler.cpp:220
 msgid "This command clears the chat log of previous chat."
 msgstr "Det här kommandot tömmer chattloggen."
 
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:224
 #, fuzzy
 msgid "Command: /ignore <player>"
 msgstr "Kommando: /item <alternativ>"
 
-#: src/commandhandler.cpp:216
+#: src/commandhandler.cpp:225
 #, fuzzy
 msgid "This command ignores the given player regardless of current relations."
 msgstr "Det här kommandot visar antalet spelare som är inloggade just nu."
 
-#: src/commandhandler.cpp:221
+#: src/commandhandler.cpp:230
 msgid "Command: /join <channel>"
 msgstr "Kommando: /join <chattkanal>"
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:231
 msgid "This command makes you enter <channel>."
 msgstr "Det här kommandot låter dig gå in i <chattkanal>."
 
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:232
 msgid "If <channel> doesn't exist, it's created."
 msgstr "Om <chattkanal> inte existerar, skapas den."
 
-#: src/commandhandler.cpp:227
+#: src/commandhandler.cpp:236
 msgid "Command: /list"
 msgstr "Kommando: /list"
 
-#: src/commandhandler.cpp:228
+#: src/commandhandler.cpp:237
 msgid "This command shows a list of all channels."
 msgstr "Det här kommandot visar en lista över alla chattkanaler."
 
-#: src/commandhandler.cpp:232
+#: src/commandhandler.cpp:241
 msgid "Command: /me <message>"
 msgstr "Kommando: /me <meddelande>"
 
-#: src/commandhandler.cpp:233
+#: src/commandhandler.cpp:242
 msgid "This command tell others you are (doing) <msg>."
 msgstr "Det här kommandet berättar för andra att du är/gör <meddelande>."
 
-#: src/commandhandler.cpp:237
+#: src/commandhandler.cpp:246
 msgid "Command: /msg <nick> <message>"
 msgstr "Kommando: /msg <spelare> <meddelande>"
 
-#: src/commandhandler.cpp:238
+#: src/commandhandler.cpp:247
 msgid "Command: /whisper <nick> <message>"
 msgstr "Kommando: /whisper <spelare> <meddelande>"
 
-#: src/commandhandler.cpp:239
+#: src/commandhandler.cpp:248
 msgid "Command: /w <nick> <message>"
 msgstr "Kommando: /w <spelare> <meddelande>"
 
-#: src/commandhandler.cpp:240
+#: src/commandhandler.cpp:249
 msgid "This command sends the text <message> to <nick>."
 msgstr "Det här kommandot skickar <meddelande> till <spelare>."
 
-#: src/commandhandler.cpp:241 src/commandhandler.cpp:260
+#: src/commandhandler.cpp:250 src/commandhandler.cpp:269
 #: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
-#: src/net/ea/gui/guildtab.cpp:75 src/net/ea/gui/partytab.cpp:75
+#: src/net/tmwa/gui/guildtab.cpp:75 src/net/tmwa/gui/partytab.cpp:75
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 "Om <spelare> innehåller mellanslag, måste du sätta citattecken (\") runt det."
 
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:255
 msgid "Command: /query <nick>"
 msgstr "Kommando: /query <spelare>"
 
-#: src/commandhandler.cpp:247
+#: src/commandhandler.cpp:256
 msgid "Command: /q <nick>"
 msgstr "Kommando: /q <spelare>"
 
-#: src/commandhandler.cpp:248
+#: src/commandhandler.cpp:257
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
 "Det här kommandot försöker att skapa en flik för viskningar mellan dig och "
 "<spelare>."
 
-#: src/commandhandler.cpp:253
+#: src/commandhandler.cpp:262
 #, fuzzy
 msgid "Command: /createparty <name>"
 msgstr "Kommando: /create <grupp>"
 
-#: src/commandhandler.cpp:254
+#: src/commandhandler.cpp:263
 #, fuzzy
 msgid "This command creates a new party called <name>."
 msgstr "Dessa kommandon skapar <grupp>."
 
-#: src/commandhandler.cpp:258
+#: src/commandhandler.cpp:267
 msgid "Command: /party <nick>"
 msgstr "Kommando: /party <spelare>"
 
-#: src/commandhandler.cpp:259 src/net/ea/gui/partytab.cpp:74
+#: src/commandhandler.cpp:268 src/net/tmwa/gui/partytab.cpp:74
 msgid "This command invites <nick> to party with you."
 msgstr "Det här kommandot bjuder in <spelare> till din grupp."
 
-#: src/commandhandler.cpp:265
+#: src/commandhandler.cpp:274
 msgid "Command: /present"
 msgstr "Kommando: /present"
 
-#: src/commandhandler.cpp:266
+#: src/commandhandler.cpp:275
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
@@ -338,27 +345,27 @@ msgstr ""
 "Det här kommandot ger en lista över spelare som finns inom höravstånd, om "
 "loggning av chatten är aktiverad skickas listan till loggfilen."
 
-#: src/commandhandler.cpp:272
+#: src/commandhandler.cpp:281
 msgid "Command: /record <filename>"
 msgstr "Kommando: /record <filnamn>"
 
-#: src/commandhandler.cpp:273
+#: src/commandhandler.cpp:282
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr "Det här kommandot startar loggning av chatten till <filnamn>."
 
-#: src/commandhandler.cpp:275
+#: src/commandhandler.cpp:284
 msgid "Command: /record"
 msgstr "Kommando: /record"
 
-#: src/commandhandler.cpp:276
+#: src/commandhandler.cpp:285
 msgid "This command finishes a recording session."
 msgstr "Det här kommandot slutar loggning av chatten."
 
-#: src/commandhandler.cpp:280
+#: src/commandhandler.cpp:289
 msgid "Command: /toggle <state>"
 msgstr "Kommando: /toggle <tillstånd>"
 
-#: src/commandhandler.cpp:281
+#: src/commandhandler.cpp:290
 msgid ""
 "This command sets whether the return key should toggle the chat log, or "
 "whether the chat log turns off automatically."
@@ -366,56 +373,56 @@ msgstr ""
 "Det här kommandot anger huruvida retur visar/döljerer chattfönstret eller om "
 "chattfönstret stänger sig själv."
 
-#: src/commandhandler.cpp:283
+#: src/commandhandler.cpp:292
 msgid ""
-"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
-"\", \"no\", \"false\" to turn the toggle off."
+"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
+"\"0\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 "<tillstånd> kan vara ”1”, ”yes” eller ”true” för att använda returtangenten "
 "eller ”0”, ”no” eller ”false” för att använda automatisk stängning."
 
-#: src/commandhandler.cpp:286
+#: src/commandhandler.cpp:295
 msgid "Command: /toggle"
 msgstr "Kommando: /toggle"
 
-#: src/commandhandler.cpp:287
+#: src/commandhandler.cpp:296
 msgid "This command displays the return toggle status."
 msgstr "Det här kommandot visar tillståndet för huruvida retur används."
 
-#: src/commandhandler.cpp:291 src/gui/widgets/whispertab.cpp:93
+#: src/commandhandler.cpp:300 src/gui/widgets/whispertab.cpp:95
 #, fuzzy
 msgid "Command: /unignore <player>"
 msgstr "Kommando: /item <alternativ>"
 
-#: src/commandhandler.cpp:292
+#: src/commandhandler.cpp:301
 msgid "This command stops ignoring the given player if they are being ignored"
 msgstr ""
 
-#: src/commandhandler.cpp:297
+#: src/commandhandler.cpp:306
 msgid "Command: /where"
 msgstr "Kommando: /where"
 
-#: src/commandhandler.cpp:298
+#: src/commandhandler.cpp:307
 msgid "This command displays the name of the current map."
 msgstr "Det här kommandot visar namnet på den karta där du befinner dig."
 
-#: src/commandhandler.cpp:302
+#: src/commandhandler.cpp:311
 msgid "Command: /who"
 msgstr "Kommando: /who"
 
-#: src/commandhandler.cpp:303
+#: src/commandhandler.cpp:312
 msgid "This command displays the number of players currently online."
 msgstr "Det här kommandot visar antalet spelare som är inloggade just nu."
 
-#: src/commandhandler.cpp:309
+#: src/commandhandler.cpp:318
 msgid "Type /help for a list of commands."
 msgstr "Skriv /help för en lista med kommandon."
 
-#: src/commandhandler.cpp:375
+#: src/commandhandler.cpp:384
 msgid "Cannot send empty whispers!"
 msgstr "Behöver en text att viska!"
 
-#: src/commandhandler.cpp:383
+#: src/commandhandler.cpp:392
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -424,59 +431,67 @@ msgstr ""
 "Kan inte skapa viskningsflik för smeknamnet \"%s\"! Antingen existerar "
 "fliken redan eller så försöker du viska till dig själv."
 
-#: src/commandhandler.cpp:397
+#: src/commandhandler.cpp:406
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Skickar förfrågan att gå in i chattkanalen %s."
 
-#: src/commandhandler.cpp:410 src/net/ea/gui/partytab.cpp:109
+#: src/commandhandler.cpp:419 src/net/tmwa/gui/partytab.cpp:109
 msgid "Party name is missing."
 msgstr "Du måste ange gruppens namn."
 
-#: src/commandhandler.cpp:423 src/commandhandler.cpp:471
-#: src/commandhandler.cpp:493
+#: src/commandhandler.cpp:432 src/commandhandler.cpp:509
+#: src/commandhandler.cpp:531
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:441
+#: src/commandhandler.cpp:450
 msgid "Return toggles chat."
 msgstr "Retur visar/döljer chattfönstret."
 
-#: src/commandhandler.cpp:441
+#: src/commandhandler.cpp:450
 msgid "Message closes chat."
 msgstr "Meddelande stänger chattfönstret."
 
-#: src/commandhandler.cpp:450
+#: src/commandhandler.cpp:459
 msgid "Return now toggles chat."
 msgstr "Retur växlar nu chattfönstrets synlighet."
 
-#: src/commandhandler.cpp:454
+#: src/commandhandler.cpp:463
 msgid "Message now closes chat."
 msgstr "Meddelanden stänger nu chattfönstret."
 
-#: src/commandhandler.cpp:477
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:489
+msgid "Show IP: On"
+msgstr ""
+
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:485
+msgid "Show IP: Off"
+msgstr ""
+
+#: src/commandhandler.cpp:515
 msgid "Player already ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:484
+#: src/commandhandler.cpp:522
 #, fuzzy
 msgid "Player successfully ignored!"
 msgstr "Grupp skapad."
 
-#: src/commandhandler.cpp:486
+#: src/commandhandler.cpp:524
 #, fuzzy
 msgid "Player could not be ignored!"
 msgstr "Kunde inte viska eftersom ignorerad av spelaren."
 
-#: src/commandhandler.cpp:501
+#: src/commandhandler.cpp:539
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:506
+#: src/commandhandler.cpp:544
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:508
+#: src/commandhandler.cpp:546
 #, fuzzy
 msgid "Player could not be unignored!"
 msgstr "Kunde inte viska eftersom ignorerad av spelaren."
@@ -490,44 +505,44 @@ msgstr "Alternativ till /%s är ”yes”, ”no”, ”true”, ”false”, �
 msgid "General"
 msgstr "Allmänt"
 
-#: src/game.cpp:326
+#: src/game.cpp:342
 #, fuzzy
 msgid "Screenshot saved as "
 msgstr "Skärmbild sparades till ~/"
 
-#: src/game.cpp:331
+#: src/game.cpp:347
 msgid "Saving screenshot failed!"
 msgstr "Kunde inte spara skärmbild!"
 
-#: src/game.cpp:355
+#: src/game.cpp:378
 #, fuzzy
 msgid "The connection to the server was lost."
 msgstr ""
 "Förbindelsen till servern förlorades, programmet kommer nu att avslutas."
 
-#: src/game.cpp:360
+#: src/game.cpp:382
 msgid "Network Error"
 msgstr "Nätverksfel"
 
-#: src/game.cpp:705
+#: src/game.cpp:721
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorerar handelserbjudanden"
 
-#: src/game.cpp:712
+#: src/game.cpp:726
 msgid "Accepting incoming trade requests"
 msgstr "Accepterar handelserbjudanden"
 
-#: src/game.cpp:946
+#: src/game.cpp:954
 #, fuzzy
 msgid "Could Not Load Map"
 msgstr "Kunde inte ladda karta"
 
-#: src/game.cpp:947
+#: src/game.cpp:955
 #, c-format
 msgid "Error while loading %s"
 msgstr "Kunde inte ladda %s"
 
-#: src/gui/beingpopup.cpp:75
+#: src/gui/beingpopup.cpp:76
 #, fuzzy, c-format
 msgid "Party: %s"
 msgstr "Grupp (%s)"
@@ -536,34 +551,34 @@ msgstr "Grupp (%s)"
 msgid "Buy"
 msgstr "Köp"
 
-#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
-#: src/gui/sell.cpp:276
+#: src/gui/buy.cpp:69 src/gui/buy.cpp:261 src/gui/sell.cpp:71
+#: src/gui/sell.cpp:288
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Pris: %s / Totalt: %s"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:99 src/gui/npcdialog.cpp:100
-#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:404
+#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:112 src/gui/npcdialog.cpp:124
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:463
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:98 src/gui/npcdialog.cpp:101
-#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:416
+#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:111 src/gui/npcdialog.cpp:125
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:475
 msgid "-"
 msgstr ""
 
 #: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
-#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:152
-#: src/keyboardconfig.cpp:103
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:228
+#: src/keyboardconfig.cpp:102
 msgid "Quit"
 msgstr "Avsluta"
 
-#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:333
-#: src/gui/statuswindow.cpp:403 src/gui/statuswindow.cpp:437
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:384
+#: src/gui/statuswindow.cpp:462 src/gui/statuswindow.cpp:496
 msgid "Max"
 msgstr "Max"
 
@@ -577,11 +592,11 @@ msgstr "Sälj"
 
 #: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
 #: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
-#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:101
-#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:178
-#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:402
+#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:114
+#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:389
 #: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
-#: src/gui/socialwindow.cpp:243 src/gui/textdialog.cpp:39
+#: src/gui/socialwindow.cpp:275 src/gui/textdialog.cpp:40
 #: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr "Avbryt"
@@ -620,7 +635,7 @@ msgstr "Den nya epostadressen används redan."
 msgid "Change Password"
 msgstr "Ändra lösenord"
 
-#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:53
+#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:55
 #: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
 msgid "Password:"
 msgstr "Lösenord:"
@@ -652,19 +667,19 @@ msgstr ""
 msgid "Create Character"
 msgstr "Skapa karaktär"
 
-#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:52
+#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:54
 #: src/gui/register.cpp:67
 msgid "Name:"
 msgstr "Namn:"
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
 #: src/gui/outfitwindow.cpp:67
 msgid ">"
 msgstr ""
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
 #: src/gui/outfitwindow.cpp:66
@@ -681,8 +696,8 @@ msgstr "Hårfärg:"
 msgid "Hair style:"
 msgstr "Frisyr:"
 
-#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:397
-#: src/gui/socialwindow.cpp:297
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:392
+#: src/gui/socialwindow.cpp:329
 msgid "Create"
 msgstr "Skapa"
 
@@ -738,34 +753,34 @@ msgstr "Avregistrera"
 msgid "Change Email"
 msgstr "Ändra epostadress"
 
-#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:155
-#: src/gui/setup_players.cpp:230
+#: src/gui/charselectdialog.cpp:336 src/gui/serverdialog.cpp:231
+#: src/gui/setup_players.cpp:229
 msgid "Delete"
 msgstr "Ta bort"
 
-#: src/gui/charselectdialog.cpp:387
+#: src/gui/charselectdialog.cpp:380
 #, fuzzy
 msgid "Choose"
 msgstr "Stäng"
 
-#: src/gui/charselectdialog.cpp:399 src/gui/charselectdialog.cpp:400
+#: src/gui/charselectdialog.cpp:394 src/gui/charselectdialog.cpp:395
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:77
+#: src/gui/chat.cpp:88
 msgid "Chat"
 msgstr "Chatt"
 
-#: src/gui/chat.cpp:287
+#: src/gui/chat.cpp:311
 #, fuzzy, c-format
 msgid "Present: %s; %d players are present."
 msgstr "%d spelare är närvarande."
 
-#: src/gui/chat.cpp:305
+#: src/gui/chat.cpp:329
 msgid "Attendance written to record log."
 msgstr "Närvaro loggades till fil."
 
-#: src/gui/chat.cpp:469
+#: src/gui/chat.cpp:493
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Viskar till %s: %s"
@@ -831,139 +846,170 @@ msgstr "Omgivande FX"
 msgid "Equipment"
 msgstr "Utrustning"
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:78
-#: src/gui/inventorywindow.cpp:80 src/gui/inventorywindow.cpp:291
-#: src/gui/popupmenu.cpp:372
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:89
+#: src/gui/inventorywindow.cpp:337 src/gui/popupmenu.cpp:359
 msgid "Unequip"
 msgstr "Avrusta"
 
-#: src/gui/help.cpp:36
+#: src/gui/help.cpp:37
 msgid "Help"
 msgstr "Hjälp"
 
-#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:74
+#: src/gui/help.cpp:51 src/gui/npcdialog.cpp:50
 msgid "Close"
 msgstr "Stäng"
 
-#: src/gui/inventorywindow.cpp:57 src/gui/windowmenu.cpp:56
+#: src/gui/inventorywindow.cpp:59 src/gui/windowmenu.cpp:56
 msgid "Inventory"
 msgstr "Inventarium"
 
-#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:75
-#: src/gui/inventorywindow.cpp:293 src/gui/popupmenu.cpp:374
+#: src/gui/inventorywindow.cpp:59
+msgid "Storage"
+msgstr "Lagring"
+
+#: src/gui/inventorywindow.cpp:82
+msgid "Slots:"
+msgstr "Utrymme:"
+
+#: src/gui/inventorywindow.cpp:87 src/gui/inventorywindow.cpp:100
+#: src/gui/inventorywindow.cpp:339 src/gui/popupmenu.cpp:361
 msgid "Equip"
 msgstr "Utrusta"
 
-#: src/gui/inventorywindow.cpp:74 src/gui/inventorywindow.cpp:75
-#: src/gui/inventorywindow.cpp:297 src/gui/popupmenu.cpp:377
+#: src/gui/inventorywindow.cpp:88
 msgid "Use"
 msgstr "Använd"
 
-#: src/gui/inventorywindow.cpp:84 src/gui/inventorywindow.cpp:301
-#: src/gui/popupmenu.cpp:380
+#: src/gui/inventorywindow.cpp:101 src/gui/popupmenu.cpp:364
+msgid "Activate"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:102 src/gui/inventorywindow.cpp:348
+#: src/gui/popupmenu.cpp:367
 #, fuzzy
 msgid "Drop..."
 msgstr "Släpp"
 
-#: src/gui/inventorywindow.cpp:85 src/gui/popupmenu.cpp:386
+#: src/gui/inventorywindow.cpp:103 src/gui/popupmenu.cpp:373
 msgid "Split"
 msgstr "Dela"
 
-#: src/gui/inventorywindow.cpp:86 src/gui/outfitwindow.cpp:51
+#: src/gui/inventorywindow.cpp:104 src/gui/outfitwindow.cpp:51
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:97 src/gui/storagewindow.cpp:84
-msgid "Slots:"
-msgstr "Utrymme:"
-
-#: src/gui/inventorywindow.cpp:98
+#: src/gui/inventorywindow.cpp:106
 msgid "Weight:"
 msgstr "Vikt:"
 
-#: src/gui/inventorywindow.cpp:303 src/gui/popupmenu.cpp:382
+#: src/gui/inventorywindow.cpp:124 src/gui/popupmenu.cpp:378
+msgid "Store"
+msgstr "Lagra"
+
+#: src/gui/inventorywindow.cpp:125 src/gui/popupmenu.cpp:385
+msgid "Retrieve"
+msgstr "Hämta"
+
+#: src/gui/inventorywindow.cpp:350 src/gui/popupmenu.cpp:369
 msgid "Drop"
 msgstr "Släpp"
 
-#: src/gui/itemamount.cpp:100 src/gui/okdialog.cpp:42
-#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:38 src/gui/trade.cpp:73
-#: src/gui/trade.cpp:75
+#: src/gui/itemamount.cpp:113 src/gui/okdialog.cpp:42
+#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:39 src/gui/trade.cpp:72
+#: src/gui/trade.cpp:74
 msgid "OK"
 msgstr "Okej"
 
-#: src/gui/itemamount.cpp:102
+#: src/gui/itemamount.cpp:115
 msgid "All"
 msgstr "Alla"
 
-#: src/gui/itemamount.cpp:128
+#: src/gui/itemamount.cpp:141
 msgid "Select amount of items to trade."
 msgstr "Välj antal föremål att handla med."
 
-#: src/gui/itemamount.cpp:131
+#: src/gui/itemamount.cpp:144
 msgid "Select amount of items to drop."
 msgstr "Välj antal föremål att släppa."
 
-#: src/gui/itemamount.cpp:134
+#: src/gui/itemamount.cpp:147
 msgid "Select amount of items to store."
 msgstr "Välj antal att lagra."
 
-#: src/gui/itemamount.cpp:137
+#: src/gui/itemamount.cpp:150
 msgid "Select amount of items to retrieve."
 msgstr "Välj antal att hämta."
 
-#: src/gui/itemamount.cpp:140
+#: src/gui/itemamount.cpp:153
 msgid "Select amount of items to split."
 msgstr "Välj antal föremål att dela."
 
-#: src/gui/itempopup.cpp:92
+#: src/gui/itempopup.cpp:137
 #, fuzzy, c-format
 msgid "Weight: %s"
 msgstr "Vikt: "
 
-#: src/gui/login.cpp:49 src/gui/login.cpp:61
+#: src/gui/login.cpp:51 src/gui/login.cpp:63
 msgid "Login"
 msgstr "Användarnamn"
 
-#: src/gui/login.cpp:58
+#: src/gui/login.cpp:60
 #, fuzzy
 msgid "Remember username"
 msgstr "Kom ihåg användarnamnet"
 
-#: src/gui/login.cpp:59 src/gui/register.cpp:58 src/gui/register.cpp:73
+#: src/gui/login.cpp:61 src/gui/register.cpp:58 src/gui/register.cpp:73
 msgid "Register"
 msgstr "Registrera"
 
-#: src/gui/login.cpp:60
+#: src/gui/login.cpp:62
 #, fuzzy
 msgid "Change Server"
 msgstr "Server"
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
+#: src/gui/login.cpp:129
+#, fuzzy
+msgid "Registration disabled"
+msgstr "Upplocksdelning avaktiverad."
+
+#: src/gui/login.cpp:129
+msgid "You need to use the website to register an account for this server."
+msgstr ""
+
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:86
 msgid "Map"
 msgstr "Karta"
 
-#: src/gui/npcdialog.cpp:44
+#: src/gui/ministatus.cpp:235
+msgid "Need"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:48
 msgid "Waiting for server"
 msgstr "Väntar på server"
 
-#: src/gui/npcdialog.cpp:45
+#: src/gui/npcdialog.cpp:49
 msgid "Next"
 msgstr "Nästa"
 
-#: src/gui/npcdialog.cpp:47
+#: src/gui/npcdialog.cpp:51
 msgid "Submit"
 msgstr "Vidare"
 
-#: src/gui/npcdialog.cpp:52 src/gui/npcpostdialog.cpp:41
+#: src/gui/npcdialog.cpp:73 src/gui/npcpostdialog.cpp:41
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:110
+#: src/gui/npcdialog.cpp:118
+msgid "Clear log"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:134
 msgid "Reset"
 msgstr "Återställ"
 
 #. TRANSLATORS: Please leave the \n sequences intact.
-#: src/gui/npcdialog.cpp:171
+#: src/gui/npcdialog.cpp:208
 #, fuzzy
 msgid ""
 "\n"
@@ -978,7 +1024,7 @@ msgstr "Till:"
 msgid "Send"
 msgstr "Skicka"
 
-#: src/gui/npcpostdialog.cpp:96
+#: src/gui/npcpostdialog.cpp:99
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 "Kunde inte skicka brevet eftersom antingen avsändaren eller brevet självt är "
@@ -995,99 +1041,86 @@ msgstr ""
 msgid "Unequip first"
 msgstr "Avrusta"
 
-#: src/gui/popupmenu.cpp:84
+#: src/gui/popupmenu.cpp:83
 #, fuzzy, c-format
 msgid "Trade with %s..."
 msgstr "Byteshandlar med %s"
 
-#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:161
+#: src/gui/popupmenu.cpp:87 src/gui/popupmenu.cpp:158
 #, fuzzy, c-format
 msgid "Attack %s"
 msgstr "Attack %+d"
 
-#: src/gui/popupmenu.cpp:92
+#: src/gui/popupmenu.cpp:91
 #, fuzzy, c-format
 msgid "Whisper %s"
 msgstr "Viskning"
 
-#: src/gui/popupmenu.cpp:101
+#: src/gui/popupmenu.cpp:100
 #, fuzzy, c-format
 msgid "Befriend %s"
 msgstr "@@friend|Lägg till %s som vän@@"
 
-#: src/gui/popupmenu.cpp:106
+#: src/gui/popupmenu.cpp:105
 #, fuzzy, c-format
 msgid "Disregard %s"
 msgstr "Förbisedd"
 
-#: src/gui/popupmenu.cpp:109
+#: src/gui/popupmenu.cpp:108
 #, fuzzy, c-format
 msgid "Ignore %s"
 msgstr "Ignorerad"
 
-#: src/gui/popupmenu.cpp:115 src/gui/popupmenu.cpp:124
+#: src/gui/popupmenu.cpp:114 src/gui/popupmenu.cpp:123
 #, c-format
 msgid "Unignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:118
+#: src/gui/popupmenu.cpp:117
 #, fuzzy, c-format
 msgid "Completely ignore %s"
 msgstr "@@ignore|Ignorera %s fullständigt@@"
 
 #: src/gui/popupmenu.cpp:130
-#, c-format
-msgid "Follow %s"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:133
 #, fuzzy, c-format
 msgid "Invite %s to join your guild"
 msgstr "@@guild|Bjud in %s till ditt gille@@"
 
-#: src/gui/popupmenu.cpp:137
+#: src/gui/popupmenu.cpp:134
 #, fuzzy, c-format
 msgid "Invite %s to join your party"
 msgstr "@@party|Bjud in %s till din grupp@@"
 
-#: src/gui/popupmenu.cpp:144
+#: src/gui/popupmenu.cpp:141
 #, fuzzy
 msgid "Kick player"
 msgstr "Kunde inte sparka ut!"
 
-#: src/gui/popupmenu.cpp:153
+#: src/gui/popupmenu.cpp:150
 #, fuzzy, c-format
 msgid "Talk to %s"
 msgstr "@@talk|Prata med %s@@"
 
-#: src/gui/popupmenu.cpp:166
+#: src/gui/popupmenu.cpp:163
 #, fuzzy
 msgid "Kick monster"
 msgstr "@@admin-kick|Sparka monster@@"
 
-#: src/gui/popupmenu.cpp:174
+#: src/gui/popupmenu.cpp:171
 #, fuzzy
 msgid "Add name to chat"
 msgstr "@@name|Använd namn i chatt@@"
 
-#: src/gui/popupmenu.cpp:191
+#: src/gui/popupmenu.cpp:188
 #, fuzzy, c-format
 msgid "Pick up %s"
 msgstr "Plocka upp"
 
-#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:400
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:387
 #, fuzzy
 msgid "Add to chat"
 msgstr "@@chat|Nämn i chattfönstret@@"
 
-#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:71
-msgid "Store"
-msgstr "Lagra"
-
-#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:72
-msgid "Retrieve"
-msgstr "Hämta"
-
 #: src/gui/quitdialog.cpp:44
 msgid "Switch server"
 msgstr "Byt server"
@@ -1156,52 +1189,65 @@ msgstr "Lösenordet måste vara kortare än %d tecken."
 msgid "Passwords do not match."
 msgstr "Lösenorden stämmer inte överens."
 
-#: src/gui/serverdialog.cpp:124
+#: src/gui/serverdialog.cpp:197
 #, fuzzy
 msgid "Choose Your Server"
 msgstr "Välj din server"
 
-#: src/gui/serverdialog.cpp:131 src/gui/widgets/chattab.cpp:139
+#: src/gui/serverdialog.cpp:206 src/gui/widgets/chattab.cpp:142
 msgid "Server:"
 msgstr "Server:"
 
-#: src/gui/serverdialog.cpp:132
+#: src/gui/serverdialog.cpp:207
 msgid "Port:"
 msgstr "Port:"
 
-#: src/gui/serverdialog.cpp:133
+#: src/gui/serverdialog.cpp:208
 #, fuzzy
 msgid "Server type:"
 msgstr "Server:"
 
-#: src/gui/serverdialog.cpp:153
+#: src/gui/serverdialog.cpp:229
 #, fuzzy
 msgid "Connect"
 msgstr "Ansluter..."
 
-#: src/gui/serverdialog.cpp:154
+#: src/gui/serverdialog.cpp:230
 #, fuzzy
 msgid "Custom Server"
 msgstr "Särskild muspekare"
 
-#: src/gui/serverdialog.cpp:242
+#: src/gui/serverdialog.cpp:324
 msgid "Please type both the address and the port of a server."
 msgstr "Var vänlig skriv både adressen och porten till en server."
 
-#: src/gui/serverdialog.cpp:357
+#: src/gui/serverdialog.cpp:441
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:363
+#: src/gui/serverdialog.cpp:447
 #, fuzzy
 msgid "Waiting for server..."
 msgstr "Väntar på server"
 
-#: src/gui/serverdialog.cpp:367
+#: src/gui/serverdialog.cpp:451
 msgid "Preparing download"
 msgstr ""
 
+#: src/gui/serverdialog.cpp:455
+msgid "Error retreiving server list!"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:550
+msgid "requires a newer version"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:552
+#, c-format
+msgid "requires v%s"
+msgstr ""
+
 #: src/gui/setup_audio.cpp:42
 msgid "Sound"
 msgstr "Ljud"
@@ -1235,54 +1281,54 @@ msgstr ""
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:45
+#: src/gui/setup_colors.cpp:46
 msgid "This is what the color looks like"
 msgstr "Så här ser färgen ut"
 
-#: src/gui/setup_colors.cpp:50
+#: src/gui/setup_colors.cpp:51
 msgid "Colors"
 msgstr "Färger"
 
-#: src/gui/setup_colors.cpp:71
+#: src/gui/setup_colors.cpp:72
 #, fuzzy
 msgid "Type:"
 msgstr "Typ: "
 
-#: src/gui/setup_colors.cpp:82 src/gui/setup_colors.cpp:330
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:331
 msgid "Static"
 msgstr "Statisk"
 
-#: src/gui/setup_colors.cpp:84 src/gui/setup_colors.cpp:85
-#: src/gui/setup_colors.cpp:331
+#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
+#: src/gui/setup_colors.cpp:332
 msgid "Pulse"
 msgstr "Pulserande"
 
-#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:87
-#: src/gui/setup_colors.cpp:332
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
+#: src/gui/setup_colors.cpp:333
 msgid "Rainbow"
 msgstr "Regnbåge"
 
-#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
-#: src/gui/setup_colors.cpp:332
+#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
+#: src/gui/setup_colors.cpp:333
 msgid "Spectrum"
 msgstr "Spektrum"
 
-#: src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:94
 #, fuzzy
 msgid "Delay:"
 msgstr "Fördröjning: "
 
-#: src/gui/setup_colors.cpp:108
+#: src/gui/setup_colors.cpp:109
 #, fuzzy
 msgid "Red:"
 msgstr "Röd: "
 
-#: src/gui/setup_colors.cpp:123
+#: src/gui/setup_colors.cpp:124
 #, fuzzy
 msgid "Green:"
 msgstr "Grön: "
 
-#: src/gui/setup_colors.cpp:138
+#: src/gui/setup_colors.cpp:139
 #, fuzzy
 msgid "Blue:"
 msgstr "Blå: "
@@ -1340,591 +1386,593 @@ msgstr "Förval"
 msgid "Key Conflict(s) Detected."
 msgstr "Samma tangent används på flera ställen."
 
-#: src/gui/setup_players.cpp:57
+#: src/gui/setup_players.cpp:58
 msgid "Name"
 msgstr "Namn"
 
-#: src/gui/setup_players.cpp:58
+#: src/gui/setup_players.cpp:59
 msgid "Relation"
 msgstr "Relation"
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:64
 msgid "Neutral"
 msgstr "Neutral"
 
-#: src/gui/setup_players.cpp:64
+#: src/gui/setup_players.cpp:65
 msgid "Friend"
 msgstr "Vän"
 
-#: src/gui/setup_players.cpp:65
+#: src/gui/setup_players.cpp:66
 msgid "Disregarded"
 msgstr "Förbisedd"
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_players.cpp:67
 msgid "Ignored"
 msgstr "Ignorerad"
 
-#: src/gui/setup_players.cpp:208 src/gui/setup_video.cpp:132
+#: src/gui/setup_players.cpp:206 src/gui/setup_video.cpp:153
 msgid "???"
 msgstr "???"
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_players.cpp:225
 msgid "Allow trading"
 msgstr "Tillåt byteshandel"
 
-#: src/gui/setup_players.cpp:228
+#: src/gui/setup_players.cpp:227
 msgid "Allow whispers"
 msgstr "Tillåt viskningar"
 
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:231
 msgid "Put all whispers in tabs"
 msgstr "Visa alla viskningar i egna flikar"
 
-#: src/gui/setup_players.cpp:234
+#: src/gui/setup_players.cpp:233
 #, fuzzy
 msgid "Show gender"
 msgstr "Visa namn"
 
-#: src/gui/setup_players.cpp:236
+#: src/gui/setup_players.cpp:235
+#, fuzzy
+msgid "Enable Chat log"
+msgstr "Kan inte sälja."
+
+#: src/gui/setup_players.cpp:237
 msgid "Players"
 msgstr "Spelare"
 
-#: src/gui/setup_players.cpp:261
+#: src/gui/setup_players.cpp:262
 msgid "When ignoring:"
 msgstr "Vid ignorering:"
 
-#: src/gui/setup_video.cpp:113
+#: src/gui/setup_video.cpp:134
 msgid "Tiny"
 msgstr "Pytteliten"
 
-#: src/gui/setup_video.cpp:114
+#: src/gui/setup_video.cpp:135
 msgid "Small"
 msgstr "Liten"
 
-#: src/gui/setup_video.cpp:115
+#: src/gui/setup_video.cpp:136
 msgid "Medium"
 msgstr "Mellan"
 
-#: src/gui/setup_video.cpp:116
+#: src/gui/setup_video.cpp:137
 msgid "Large"
 msgstr "Stor"
 
-#: src/gui/setup_video.cpp:142
+#: src/gui/setup_video.cpp:163
 msgid "No text"
 msgstr "Ingen text"
 
-#: src/gui/setup_video.cpp:143
+#: src/gui/setup_video.cpp:164
 msgid "Text"
 msgstr "Text"
 
-#: src/gui/setup_video.cpp:144
+#: src/gui/setup_video.cpp:165
 msgid "Bubbles, no names"
 msgstr "Textbubblor utan namn"
 
-#: src/gui/setup_video.cpp:145
+#: src/gui/setup_video.cpp:166
 msgid "Bubbles with names"
 msgstr "Textbubblor med namn"
 
-#: src/gui/setup_video.cpp:157
+#: src/gui/setup_video.cpp:178
 msgid "off"
 msgstr "av"
 
-#: src/gui/setup_video.cpp:158 src/gui/setup_video.cpp:171
+#: src/gui/setup_video.cpp:179 src/gui/setup_video.cpp:192
 msgid "low"
 msgstr "låg"
 
-#: src/gui/setup_video.cpp:159 src/gui/setup_video.cpp:173
+#: src/gui/setup_video.cpp:180 src/gui/setup_video.cpp:194
 msgid "high"
 msgstr "hög"
 
-#: src/gui/setup_video.cpp:172
+#: src/gui/setup_video.cpp:193
 msgid "medium"
 msgstr "medium"
 
-#: src/gui/setup_video.cpp:174
+#: src/gui/setup_video.cpp:195
 msgid "max"
 msgstr "maximal"
 
-#: src/gui/setup_video.cpp:196
+#: src/gui/setup_video.cpp:217
 msgid "Full screen"
 msgstr "Helskärm"
 
-#: src/gui/setup_video.cpp:197
+#: src/gui/setup_video.cpp:218
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:198
+#: src/gui/setup_video.cpp:219
 msgid "Custom cursor"
 msgstr "Särskild muspekare"
 
-#: src/gui/setup_video.cpp:200
+#: src/gui/setup_video.cpp:221
 msgid "Visible names"
 msgstr "Synliga namn"
 
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:223
 msgid "Particle effects"
 msgstr "Partikeleffekter"
 
-#: src/gui/setup_video.cpp:204
+#: src/gui/setup_video.cpp:225
 #, fuzzy
 msgid "Show own name"
 msgstr "Visa namn"
 
-#: src/gui/setup_video.cpp:205
+#: src/gui/setup_video.cpp:226
+msgid "Log NPC dialogue"
+msgstr ""
+
+#: src/gui/setup_video.cpp:227
 msgid "Show pickup notification"
 msgstr "Visa erhållna saker"
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:207
+#. TRANSLATORS: Refers to "Show pickup notification"
+#: src/gui/setup_video.cpp:229
 msgid "in chat"
 msgstr "i chattfönster"
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:209
+#. TRANSLATORS: Refers to "Show pickup notification"
+#: src/gui/setup_video.cpp:231
 msgid "as particle"
 msgstr "som partikel"
 
-#: src/gui/setup_video.cpp:214
+#: src/gui/setup_video.cpp:236
 #, fuzzy
 msgid "FPS limit:"
 msgstr "FPS-gräns:"
 
-#: src/gui/setup_video.cpp:225
+#: src/gui/setup_video.cpp:247
+msgid "Disable transparency (Low CPU mode)"
+msgstr ""
+
+#: src/gui/setup_video.cpp:250
 msgid "Video"
 msgstr "Video"
 
-#: src/gui/setup_video.cpp:227
+#: src/gui/setup_video.cpp:252
 #, fuzzy
-msgid "Show monster damage"
+msgid "Show damage"
 msgstr "Visa namn"
 
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:258
 msgid "Overhead text"
 msgstr "Text ovanför huvudet"
 
-#: src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:259
 msgid "Gui opacity"
 msgstr "Genomskinlighet"
 
-#: src/gui/setup_video.cpp:235
+#: src/gui/setup_video.cpp:260
 msgid "Ambient FX"
 msgstr "Omgivande FX"
 
-#: src/gui/setup_video.cpp:236
+#: src/gui/setup_video.cpp:261
 #, fuzzy
 msgid "Particle detail"
 msgstr "Partikeldetaljer"
 
-#: src/gui/setup_video.cpp:237
+#: src/gui/setup_video.cpp:262
 msgid "Font size"
 msgstr "Typsnittsgrad"
 
-#: src/gui/setup_video.cpp:251 src/gui/setup_video.cpp:454
-#: src/gui/setup_video.cpp:568
+#: src/gui/setup_video.cpp:277 src/gui/setup_video.cpp:532
+#: src/gui/setup_video.cpp:662
 #, fuzzy
 msgid "None"
 msgstr "Nej"
 
-#: src/gui/setup_video.cpp:381
+#: src/gui/setup_video.cpp:426
 #, fuzzy
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr "läge och återgång till det gamla läget misslyckades också!"
 
-#: src/gui/setup_video.cpp:387
+#: src/gui/setup_video.cpp:432
 #, fuzzy
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr "läge och återgång till det gamla läget misslyckades också!"
 
-#: src/gui/setup_video.cpp:398
+#: src/gui/setup_video.cpp:443
 #, fuzzy
 msgid "Switching to Full Screen"
 msgstr "Byte till helskärm"
 
-#: src/gui/setup_video.cpp:399
+#: src/gui/setup_video.cpp:444
 msgid "Restart needed for changes to take effect."
 msgstr "Omstart krävs för att ändringarna ska synas."
 
-#: src/gui/setup_video.cpp:411
+#: src/gui/setup_video.cpp:458
 #, fuzzy
 msgid "Changing to OpenGL"
 msgstr "Ändrar OpenGL"
 
-#: src/gui/setup_video.cpp:412
+#: src/gui/setup_video.cpp:459
+msgid ""
+"Applying change to OpenGL requires restart. In case OpenGL messes up your "
+"game graphics, restart the game with the command line option \"--no-opengl\"."
+msgstr ""
+
+#: src/gui/setup_video.cpp:466
+msgid "Deactivating OpenGL"
+msgstr ""
+
+#: src/gui/setup_video.cpp:467
 msgid "Applying change to OpenGL requires restart."
 msgstr "Ändringar i OpenGL kräver omstart."
 
-#: src/gui/setup_video.cpp:486 src/gui/setup_video.cpp:491
+#: src/gui/setup_video.cpp:475
+#, fuzzy
+msgid "Transparency disabled"
+msgstr "Fördelning av erfarenhet inaktiverad."
+
+#: src/gui/setup_video.cpp:476 src/gui/setup_video.cpp:484
+msgid "You must restart to apply changes."
+msgstr ""
+
+#: src/gui/setup_video.cpp:483
+msgid "Transparency enabled"
+msgstr ""
+
+#: src/gui/setup_video.cpp:576 src/gui/setup_video.cpp:581
 #, fuzzy
 msgid "Screen Resolution Changed"
 msgstr "Skärmupplösning ändrad"
 
-#: src/gui/setup_video.cpp:487 src/gui/setup_video.cpp:492
+#: src/gui/setup_video.cpp:577 src/gui/setup_video.cpp:582
 msgid "Restart your client for the change to take effect."
 msgstr "Starta om din klient för att ändringen ska börja gälla."
 
-#: src/gui/setup_video.cpp:489
+#: src/gui/setup_video.cpp:579
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:522
+#: src/gui/setup_video.cpp:612
 #, fuzzy
 msgid "Particle Effect Settings Changed."
 msgstr "Inställningar för partikeleffekter ändrade."
 
-#: src/gui/setup_video.cpp:523
+#: src/gui/setup_video.cpp:613
 msgid "Changes will take effect on map change."
 msgstr "Förändringar kommer att börja gälla när du byter karta."
 
-#: src/gui/skilldialog.cpp:198 src/gui/windowmenu.cpp:59
+#: src/gui/skilldialog.cpp:212 src/gui/windowmenu.cpp:59
 msgid "Skills"
 msgstr "Färdigheter"
 
-#: src/gui/skilldialog.cpp:209
+#: src/gui/skilldialog.cpp:223
 msgid "Up"
 msgstr "Upp"
 
-#: src/gui/skilldialog.cpp:263
+#: src/gui/skilldialog.cpp:269
 #, fuzzy, c-format
 msgid "Skill points available: %d"
 msgstr "Färdighetspoäng: %d"
 
-#: src/gui/skilldialog.cpp:315
+#: src/gui/skilldialog.cpp:351
 #, fuzzy, c-format
 msgid "Skill Set %d"
 msgstr "Färdighetspoäng: %d"
 
-#: src/gui/skilldialog.cpp:324
+#: src/gui/skilldialog.cpp:360
 #, fuzzy, c-format
 msgid "Skill %d"
 msgstr "Färdigheter"
 
-#: src/gui/skilldialog.cpp:406
+#: src/gui/skilldialog.cpp:442
 #, fuzzy, c-format
 msgid "Lvl: %d (%+d)"
 msgstr "Nivå: %d"
 
-#: src/gui/skilldialog.cpp:417
+#: src/gui/skilldialog.cpp:453
 #, fuzzy, c-format
 msgid "Lvl: %d"
 msgstr "Nivå: %d"
 
-#: src/gui/socialwindow.cpp:118
+#: src/gui/socialwindow.cpp:126
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:127
+#: src/gui/socialwindow.cpp:139
 #, fuzzy, c-format
 msgid "Guild %s quit requested."
 msgstr "Gille skapat."
 
-#: src/gui/socialwindow.cpp:137
+#: src/gui/socialwindow.cpp:153
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:138
+#: src/gui/socialwindow.cpp:154
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:147
+#: src/gui/socialwindow.cpp:163
 #, fuzzy
 msgid "Leave Guild?"
 msgstr "Skapa gille"
 
-#: src/gui/socialwindow.cpp:148
+#: src/gui/socialwindow.cpp:164
 #, fuzzy, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Är du säker på att du vill avsluta?"
 
-#: src/gui/socialwindow.cpp:183
+#: src/gui/socialwindow.cpp:207 src/net/tmwa/partyhandler.cpp:330
 #, fuzzy, c-format
 msgid "Invited user %s to party."
 msgstr "/party > Bjud in en spelare till din grupp"
 
-#: src/gui/socialwindow.cpp:190
+#: src/gui/socialwindow.cpp:218
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:200
+#: src/gui/socialwindow.cpp:232
 #, fuzzy
 msgid "Member Invite to Party"
 msgstr "/party > Bjud in en spelare till din grupp"
 
-#: src/gui/socialwindow.cpp:201
+#: src/gui/socialwindow.cpp:233
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:210
+#: src/gui/socialwindow.cpp:242
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:211
+#: src/gui/socialwindow.cpp:243
 #, fuzzy, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Är du säker på att du vill avsluta?"
 
-#: src/gui/socialwindow.cpp:240
+#: src/gui/socialwindow.cpp:272
 msgid "Create Guild"
 msgstr "Skapa gille"
 
-#: src/gui/socialwindow.cpp:241 src/gui/socialwindow.cpp:565
+#: src/gui/socialwindow.cpp:273 src/gui/socialwindow.cpp:620
 #, fuzzy
 msgid "Create Party"
 msgstr "Skapa karaktär"
 
-#: src/gui/socialwindow.cpp:280 src/gui/windowmenu.cpp:64
+#: src/gui/socialwindow.cpp:312 src/gui/windowmenu.cpp:64
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:298
+#: src/gui/socialwindow.cpp:330
 #, fuzzy
 msgid "Invite"
 msgstr "Bjud in spelare"
 
-#: src/gui/socialwindow.cpp:299
+#: src/gui/socialwindow.cpp:331
 #, fuzzy
 msgid "Leave"
 msgstr "Stor"
 
-#: src/gui/socialwindow.cpp:395
+#: src/gui/socialwindow.cpp:443
 #, fuzzy, c-format
 msgid "Accepted party invite from %s."
 msgstr "Accepterade injudan från %s."
 
-#: src/gui/socialwindow.cpp:401
+#: src/gui/socialwindow.cpp:449
 #, fuzzy, c-format
 msgid "Rejected party invite from %s."
 msgstr "Avslog inbjudan från %s."
 
-#: src/gui/socialwindow.cpp:414
+#: src/gui/socialwindow.cpp:462
 #, fuzzy, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Accepterade injudan från %s."
 
-#: src/gui/socialwindow.cpp:420
+#: src/gui/socialwindow.cpp:468
 #, fuzzy, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Avslog inbjudan från %s."
 
-#: src/gui/socialwindow.cpp:464
+#: src/gui/socialwindow.cpp:497
+msgid "Creating guild failed, please choose a shorter name."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:504
 #, fuzzy, c-format
 msgid "Creating guild called %s."
 msgstr "Kunde inte skapa gille."
 
-#: src/gui/socialwindow.cpp:478
+#: src/gui/socialwindow.cpp:520
+msgid "Creating party failed, please choose a shorter name."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:527
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:485
+#: src/gui/socialwindow.cpp:541
 #, fuzzy
 msgid "Guild Name"
 msgstr "Gille"
 
-#: src/gui/socialwindow.cpp:486
+#: src/gui/socialwindow.cpp:542
 #, fuzzy
 msgid "Choose your guild's name."
 msgstr "Välj din server"
 
-#: src/gui/socialwindow.cpp:498
+#: src/gui/socialwindow.cpp:554
 #, fuzzy
 msgid "Received guild request, but one already exists."
 msgstr "Mottog en gruppinbjudan, men du har redan en annan inbjudan."
 
-#: src/gui/socialwindow.cpp:503
+#: src/gui/socialwindow.cpp:559
 #, fuzzy, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s har bjudit in dig till %ss grupp."
 
-#: src/gui/socialwindow.cpp:508
+#: src/gui/socialwindow.cpp:564
 #, fuzzy
 msgid "Accept Guild Invite"
 msgstr "Acceptera gruppinbjudan"
 
-#: src/gui/socialwindow.cpp:520
+#: src/gui/socialwindow.cpp:576
 msgid "Received party request, but one already exists."
 msgstr "Mottog en gruppinbjudan, men du har redan en annan inbjudan."
 
-#: src/gui/socialwindow.cpp:530
+#: src/gui/socialwindow.cpp:585
 #, fuzzy
 msgid "You have been invited you to join a party."
 msgstr "%s har bjudit in dig till sin grupp."
 
-#: src/gui/socialwindow.cpp:534
+#: src/gui/socialwindow.cpp:589
 #, fuzzy, c-format
 msgid "You have been invited to join the %s party."
 msgstr "%s har bjudit in dig till %ss grupp."
 
-#: src/gui/socialwindow.cpp:542
+#: src/gui/socialwindow.cpp:597
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s har bjudit in dig till sin grupp."
 
-#: src/gui/socialwindow.cpp:547
+#: src/gui/socialwindow.cpp:602
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s har bjudit in dig till %ss grupp."
 
-#: src/gui/socialwindow.cpp:555
+#: src/gui/socialwindow.cpp:610
 msgid "Accept Party Invite"
 msgstr "Acceptera gruppinbjudan"
 
-#: src/gui/socialwindow.cpp:566
+#: src/gui/socialwindow.cpp:621
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:571
+#: src/gui/socialwindow.cpp:626
 #, fuzzy
 msgid "Party Name"
 msgstr "Grupp"
 
-#: src/gui/socialwindow.cpp:572
+#: src/gui/socialwindow.cpp:627
 #, fuzzy
 msgid "Choose your party's name."
 msgstr "Välj din server"
 
-#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:62
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:62
 msgid "Specials"
 msgstr ""
 
-#: src/gui/specialswindow.cpp:174
-#, c-format
-msgid "Specials Set %d"
-msgstr ""
-
-#: src/gui/specialswindow.cpp:191
-#, c-format
-msgid "Special %d"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:247
+#: src/gui/statuswindow.cpp:113 src/gui/statuswindow.cpp:215
+#: src/gui/statuswindow.cpp:262
 #, c-format
 msgid "Level: %d"
 msgstr "Nivå: %d"
 
-#: src/gui/statuswindow.cpp:101 src/gui/statuswindow.cpp:211
+#: src/gui/statuswindow.cpp:114 src/gui/statuswindow.cpp:208
+#: src/gui/statuswindow.cpp:239
 #, c-format
 msgid "Money: %s"
 msgstr "Pengar: %s"
 
-#: src/gui/statuswindow.cpp:104
+#: src/gui/statuswindow.cpp:117
 msgid "HP:"
 msgstr "HP:"
 
-#: src/gui/statuswindow.cpp:109
+#: src/gui/statuswindow.cpp:122
 msgid "Exp:"
 msgstr "EP:"
 
-#: src/gui/statuswindow.cpp:114
+#: src/gui/statuswindow.cpp:130
 msgid "MP:"
 msgstr "MP:"
 
-#: src/gui/statuswindow.cpp:132 src/gui/statuswindow.cpp:219
+#: src/gui/statuswindow.cpp:158 src/gui/statuswindow.cpp:275
 #, c-format
 msgid "Job: %d"
 msgstr "Jobb: %d"
 
-#: src/gui/statuswindow.cpp:133
+#: src/gui/statuswindow.cpp:159
 msgid "Job:"
 msgstr "Jobb:"
 
-#: src/gui/statuswindow.cpp:194
-#, fuzzy
-msgid "HP"
-msgstr "HP:"
-
-#: src/gui/statuswindow.cpp:200
-#, fuzzy
-msgid "MP"
-msgstr "MP:"
-
-#: src/gui/statuswindow.cpp:206
-#, fuzzy
-msgid "Exp"
-msgstr "EP:"
-
-#: src/gui/statuswindow.cpp:215
-#, fuzzy
-msgid "Money"
-msgstr "Pengar: %d"
-
-#: src/gui/statuswindow.cpp:225
-#, fuzzy
-msgid "Job"
-msgstr "Jobb:"
-
-#: src/gui/statuswindow.cpp:229
+#: src/gui/statuswindow.cpp:211 src/gui/statuswindow.cpp:247
 #, fuzzy, c-format
 msgid "Character points: %d"
 msgstr "Karaktärens värden okej"
 
-#: src/gui/statuswindow.cpp:235
+#: src/gui/statuswindow.cpp:255
 #, fuzzy, c-format
 msgid "Correction points: %d"
 msgstr "Färdighetspoäng: %d"
 
-#: src/gui/statuswindow.cpp:251
-#, fuzzy
-msgid "Level"
-msgstr "Nivå: %d"
-
-#: src/gui/storagewindow.cpp:59
-msgid "Storage"
-msgstr "Lagring"
-
-#: src/gui/trade.cpp:52
+#: src/gui/trade.cpp:53
 msgid "Propose trade"
 msgstr "Föreslå handel"
 
-#: src/gui/trade.cpp:53
+#: src/gui/trade.cpp:54
 msgid "Confirmed. Waiting..."
 msgstr "Bekräftat. Väntar…"
 
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:55
 msgid "Agree trade"
 msgstr "Godkänn handel"
 
-#: src/gui/trade.cpp:55
+#: src/gui/trade.cpp:56
 msgid "Agreed. Waiting..."
 msgstr "Godkänt. Väntar…"
 
-#: src/gui/trade.cpp:58
+#: src/gui/trade.cpp:59
 msgid "Trade: You"
 msgstr "Byteshandel: du"
 
-#: src/gui/trade.cpp:74 src/gui/trade.cpp:75
+#: src/gui/trade.cpp:73 src/gui/trade.cpp:74
 msgid "Trade"
 msgstr "Byteshandla"
 
-#: src/gui/trade.cpp:77
+#: src/gui/trade.cpp:76
 msgid "Add"
 msgstr "Lägg till"
 
-#: src/gui/trade.cpp:99 src/gui/trade.cpp:135
+#: src/gui/trade.cpp:98 src/gui/trade.cpp:134
 #, fuzzy, c-format
 msgid "You get %s"
 msgstr "Du får %s."
 
-#: src/gui/trade.cpp:100
+#: src/gui/trade.cpp:99
 msgid "You give:"
 msgstr "Du ger:"
 
-#: src/gui/trade.cpp:104
+#: src/gui/trade.cpp:103
 msgid "Change"
 msgstr "Ändra"
 
-#: src/gui/trade.cpp:275
+#: src/gui/trade.cpp:262
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Kan inte lägga till vald sak. Det går inte att byteshandla med samma slags "
 "sak flera gånger."
 
-#: src/gui/trade.cpp:318
+#: src/gui/trade.cpp:304
 msgid "You don't have enough money."
 msgstr "Du har inte tillräckligt med pengar."
 
@@ -1945,22 +1993,22 @@ msgstr "Ansluter..."
 msgid "Play"
 msgstr "Spela"
 
-#: src/gui/updatewindow.cpp:405
+#: src/gui/updatewindow.cpp:417
 msgid "##1  The update process is incomplete."
 msgstr "##1  Uppdateringsprocessen är inte avslutad."
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:407
+#: src/gui/updatewindow.cpp:419
 msgid "##1  It is strongly recommended that"
 msgstr "##1  Det rekommenderar verkligen att"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:409
+#: src/gui/updatewindow.cpp:421
 #, fuzzy
 msgid "##1  you try again later."
 msgstr "##1  du försöker igen senare"
 
-#: src/gui/updatewindow.cpp:501
+#: src/gui/updatewindow.cpp:515
 msgid "Completed"
 msgstr "Färdig"
 
@@ -2043,55 +2091,55 @@ msgstr "Du måste ange vilken spelare som ska få operatörsstatus!"
 msgid "Need a user to kick!"
 msgstr "Du måste ange vilken spelare som ska sparkas ut!"
 
-#: src/gui/widgets/chattab.cpp:118
+#: src/gui/widgets/chattab.cpp:121
 msgid "Global announcement:"
 msgstr "Globalt meddelande:"
 
-#: src/gui/widgets/chattab.cpp:124
+#: src/gui/widgets/chattab.cpp:127
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "Globalt meddelande från %s:"
 
-#: src/gui/widgets/chattab.cpp:150
+#: src/gui/widgets/chattab.cpp:153
 #, fuzzy, c-format
 msgid "%s whispers: %s"
 msgstr "%s viskar: "
 
-#: src/gui/widgets/whispertab.cpp:51
+#: src/gui/widgets/whispertab.cpp:53
 msgid "Cannot send empty chat!"
 msgstr "Kan inte skicka ett tomt chattmeddelande!"
 
-#: src/gui/widgets/whispertab.cpp:70
+#: src/gui/widgets/whispertab.cpp:72
 msgid "/ignore > Ignore the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:71
+#: src/gui/widgets/whispertab.cpp:73
 msgid "/unignore > Stop ignoring the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:72
+#: src/gui/widgets/whispertab.cpp:74
 msgid "/close > Close the whisper tab"
 msgstr "/close > Stänger viskningsfliken"
 
-#: src/gui/widgets/whispertab.cpp:82
+#: src/gui/widgets/whispertab.cpp:84
 msgid "Command: /close"
 msgstr "Kommando: /close"
 
-#: src/gui/widgets/whispertab.cpp:83
+#: src/gui/widgets/whispertab.cpp:85
 msgid "This command closes the current whisper tab."
 msgstr "Det här kommandot stänger aktuell viskningsflik."
 
-#: src/gui/widgets/whispertab.cpp:87
+#: src/gui/widgets/whispertab.cpp:89
 #, fuzzy
 msgid "Command: /ignore"
 msgstr "Kommando: /item"
 
-#: src/gui/widgets/whispertab.cpp:88
+#: src/gui/widgets/whispertab.cpp:90
 #, fuzzy
 msgid "This command ignores the other player regardless of current relations."
 msgstr "Det här kommandot visar antalet spelare som är inloggade just nu."
 
-#: src/gui/widgets/whispertab.cpp:94
+#: src/gui/widgets/whispertab.cpp:96
 #, fuzzy
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr "Det här kommandot startar loggning av chatten till <filnamn>."
@@ -2119,647 +2167,1012 @@ msgstr "Ändra"
 msgid "Choose World"
 msgstr "Välj din server"
 
-#: src/keyboardconfig.cpp:40
+#: src/keyboardconfig.cpp:39
 msgid "Move Up"
 msgstr "Gå uppåt"
 
-#: src/keyboardconfig.cpp:41
+#: src/keyboardconfig.cpp:40
 msgid "Move Down"
 msgstr "Gå nedåt"
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:41
 msgid "Move Left"
 msgstr "Gå åt vänster"
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:42
 msgid "Move Right"
 msgstr "Gå åt höger"
 
-#: src/keyboardconfig.cpp:44 src/net/ea/generalhandler.cpp:223
+#: src/keyboardconfig.cpp:43 src/net/tmwa/generalhandler.cpp:237
 msgid "Attack"
 msgstr "Attackera"
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:44
 msgid "Target & Attack"
 msgstr "Välj & attackera"
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:45
 msgid "Smilie"
 msgstr "Smiley"
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:46
 msgid "Talk"
 msgstr "Prata"
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:47
 msgid "Stop Attack"
 msgstr "Sluta attackera"
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:48
 #, fuzzy
 msgid "Target Monster"
 msgstr "Välj närmaste"
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboardconfig.cpp:49
 msgid "Target NPC"
 msgstr "Välj NPC"
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:50
 msgid "Target Player"
 msgstr "Välj spelare"
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:51
 msgid "Pickup"
 msgstr "Plocka upp"
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:52
 msgid "Hide Windows"
 msgstr "Dölj fönster"
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:53
 msgid "Sit"
 msgstr "Sitt"
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:54
 msgid "Screenshot"
 msgstr "Skärmbild"
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:55
 msgid "Enable/Disable Trading"
 msgstr "Tillåt/neka handel"
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:56
 msgid "Find Path to Mouse"
 msgstr "Gå till muspekaren"
 
-#: src/keyboardconfig.cpp:58 src/keyboardconfig.cpp:59
-#: src/keyboardconfig.cpp:60 src/keyboardconfig.cpp:61
-#: src/keyboardconfig.cpp:62 src/keyboardconfig.cpp:63
-#: src/keyboardconfig.cpp:64 src/keyboardconfig.cpp:65
-#: src/keyboardconfig.cpp:66 src/keyboardconfig.cpp:67
-#: src/keyboardconfig.cpp:68 src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:57 src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60
+#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62
+#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64
+#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68
 #, c-format
 msgid "Item Shortcut %d"
 msgstr "Tangent för snabbåtkomst %d"
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:69
 msgid "Help Window"
 msgstr "Hjälpfönster"
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:70
 msgid "Status Window"
 msgstr "Statusfönster"
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:71
 msgid "Inventory Window"
 msgstr "Inventorium"
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:72
 msgid "Equipment Window"
 msgstr "Utrustningsfönster"
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:73
 msgid "Skill Window"
 msgstr "Färdighetsfönster"
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:74
 msgid "Minimap Window"
 msgstr "Minikarta"
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:75
 msgid "Chat Window"
 msgstr "Chattfönster"
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:76
 msgid "Item Shortcut Window"
 msgstr "Snabbåtkomstfönster"
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:77
 msgid "Setup Window"
 msgstr "Inställningsfönster"
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:78
 msgid "Debug Window"
 msgstr "Felsökningsfönster"
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:79
 #, fuzzy
 msgid "Social Window"
 msgstr "Färdighetsfönster"
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:80
 msgid "Emote Shortcut Window"
 msgstr "Smileyfönster"
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:81
 #, fuzzy
 msgid "Outfits Window"
 msgstr "Statusfönster"
 
-#: src/keyboardconfig.cpp:83
+#: src/keyboardconfig.cpp:82
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:83
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86
-#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88
-#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90
-#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92
-#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:84 src/keyboardconfig.cpp:85
+#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:87
+#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:89
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:91
+#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:93
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:95
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "Tangent för smiley %d"
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:96
 msgid "Toggle Chat"
 msgstr "Växla chattfönster"
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:97
 msgid "Scroll Chat Up"
 msgstr "Rulla upp chatt"
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:98
 msgid "Scroll Chat Down"
 msgstr "Rulla ned chatt"
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:99
 msgid "Previous Chat Tab"
 msgstr "Föregående chattflik"
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:100
 msgid "Next Chat Tab"
 msgstr "Nästa chattflik"
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:101
 msgid "Select OK"
 msgstr "Välj okej"
 
-#: src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:103
 msgid "Ignore input 1"
 msgstr "Ignorera inmatning 1"
 
-#: src/keyboardconfig.cpp:105
+#: src/keyboardconfig.cpp:104
 msgid "Ignore input 2"
 msgstr "Ignorera inmatning 2"
 
-#: src/keyboardconfig.cpp:184
+#: src/keyboardconfig.cpp:183
 #, fuzzy, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr "Se till att använda olika tangenter, annars kan det bli konstigheter."
 
-#: src/localplayer.cpp:914
+#: src/localplayer.cpp:985
 msgid "Unable to pick up item."
 msgstr "Kunde inte plocka upp."
 
 #. TRANSLATORS: This sentence may be translated differently
 #. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:923
+#: src/localplayer.cpp:994
 #, fuzzy, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "Du plockade upp %s [@@%d|%s@@]."
 msgstr[1] "Du plockade upp %s [@@%d|%s@@]."
 
-#: src/main.cpp:43
+#: src/main.cpp:42
 msgid "mana [options] [mana-file]"
 msgstr ""
 
+#: src/main.cpp:43
+msgid "[mana-file] : The mana file is an XML file (.mana)"
+msgstr ""
+
 #: src/main.cpp:44
+msgid "              used to set custom parameters"
+msgstr ""
+
+#: src/main.cpp:45
+msgid "              to the mana client."
+msgstr ""
+
+#: src/main.cpp:47
 msgid "Options:"
 msgstr "Alternativ:"
 
-#: src/main.cpp:45
+#: src/main.cpp:48
 #, fuzzy
 msgid "  -v --version        : Display the version"
 msgstr "  -v --version     : Visa aktuell version"
 
-#: src/main.cpp:46
+#: src/main.cpp:49
 #, fuzzy
 msgid "  -h --help           : Display this help"
 msgstr "  -h --help        : Visa den här hjälpen"
 
-#: src/main.cpp:47
+#: src/main.cpp:50
 #, fuzzy
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr "  -C --config-file : Konfigurationsfil att använda"
 
-#: src/main.cpp:48
+#: src/main.cpp:51
 #, fuzzy
 msgid "  -U --username       : Login with this username"
 msgstr "  -U --username    : Logga in med det här användarnamnet"
 
-#: src/main.cpp:49
+#: src/main.cpp:52
 #, fuzzy
 msgid "  -P --password       : Login with this password"
 msgstr "  -P --password    : Logga in med det här lösenordet"
 
-#: src/main.cpp:50
+#: src/main.cpp:53
 #, fuzzy
 msgid "  -c --character      : Login with this character"
 msgstr "  -c --character   : Logga in med den här karaktären"
 
-#: src/main.cpp:51
+#: src/main.cpp:54
 #, fuzzy
 msgid "  -s --server         : Login server name or IP"
 msgstr "  -s --server      : Namn eller IP-adress för inloggningsserver"
 
-#: src/main.cpp:52
+#: src/main.cpp:55
 #, fuzzy
 msgid "  -p --port           : Login server port"
 msgstr "  -p --port        : Port på inloggningsserver"
 
-#: src/main.cpp:53
+#: src/main.cpp:56
 #, fuzzy
 msgid "     --update-host    : Use this update host"
 msgstr "  -H --update-host : Använd den här uppdateringsvärden"
 
-#: src/main.cpp:54
+#: src/main.cpp:57
 #, fuzzy
 msgid "  -D --default        : Choose default character server and character"
 msgstr "  -D --default     : Välj förvald karaktärsserver och karaktär"
 
-#: src/main.cpp:56
+#: src/main.cpp:59
 #, fuzzy
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr "  -u --skip-update : Ladda inte ner uppdateringar"
 
-#: src/main.cpp:57
+#: src/main.cpp:60
 #, fuzzy
 msgid "  -d --data           : Directory to load game data from"
 msgstr "  -d --data        : Katalog att hämta speldata från"
 
-#: src/main.cpp:58
+#: src/main.cpp:61
 #, fuzzy
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
+msgid "     --localdata-dir  : Directory to use as local data directory"
 msgstr "  -S --home-dir    : Katalog att använda som hemkatalog"
 
-#: src/main.cpp:59
+#: src/main.cpp:62
+#, fuzzy
+msgid "     --chat-log-dir   : Chat log dir to use"
+msgstr "  -C --config-file : Konfigurationsfil att använda"
+
+#: src/main.cpp:63
 #, fuzzy
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr "  -S --home-dir    : Katalog att använda som hemkatalog"
 
-#: src/main.cpp:61
+#: src/main.cpp:65
 #, fuzzy
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr "  -O --no-opengl   : Använd inte OpenGL den här sessionen"
 
-#: src/net/ea/adminhandler.cpp:63
+#: src/net/manaserv/beinghandler.cpp:303 src/net/tmwa/playerhandler.cpp:94
+msgid "You are dead."
+msgstr "Du är död."
+
+#: src/net/manaserv/beinghandler.cpp:304 src/net/tmwa/playerhandler.cpp:95
+msgid "We regret to inform you that your character was killed in battle."
+msgstr ""
+"Vi beklagar att behöva meddela dig om att din karaktär dödades i strid."
+
+#: src/net/manaserv/beinghandler.cpp:306 src/net/tmwa/playerhandler.cpp:97
+msgid "You are not that alive anymore."
+msgstr "Du är inte så värst levande längre."
+
+#: src/net/manaserv/beinghandler.cpp:307 src/net/tmwa/playerhandler.cpp:98
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr "Liemannens svala händer sträcker sig efter din själ."
+
+#: src/net/manaserv/beinghandler.cpp:308 src/net/tmwa/playerhandler.cpp:99
+msgid "Game Over!"
+msgstr "Spelet är slut!"
+
+#: src/net/manaserv/beinghandler.cpp:309 src/net/tmwa/playerhandler.cpp:101
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+"Barn, barn. Din karaktär dog egentligen inte. Den… öh… kom till ett bättre "
+"ställe."
+
+#: src/net/manaserv/beinghandler.cpp:311 src/net/tmwa/playerhandler.cpp:103
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr ""
+"Din plan att ha sönder dina fiendens vapen genom att krossa dem med din hals "
+"misslyckades."
+
+#: src/net/manaserv/beinghandler.cpp:313 src/net/tmwa/playerhandler.cpp:105
+msgid "I guess this did not run too well."
+msgstr "Jag antar att det kunde gått bättre."
+
+#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:107
+msgid "Do you want your possessions identified?"
+msgstr "Vill du att dina tillhörigheter ska identifieras?"
+
+#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:109
+msgid "Sadly, no trace of you was ever found..."
+msgstr "Ledsamt nog så kunde inga spår efter dig någonsin hittas…"
+
+#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:111
+msgid "Annihilated."
+msgstr "Tillintetgjord."
+
+#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:113
+msgid "Looks like you got your head handed to you."
+msgstr "Verkar som att som att någon gav dig ditt huvud."
+
+#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:115
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr ""
+"Du klantade till det igen, släng din kropp vid kloakerna och skaffa dig en "
+"ny."
+
+#: src/net/manaserv/beinghandler.cpp:323
+#, fuzzy
+msgid "Press OK to respawn."
+msgstr " Klicka okej för att återuppstå"
+
+#: src/net/manaserv/beinghandler.cpp:324
+#, fuzzy
+msgid "You Died"
+msgstr "Du dog"
+
+#: src/net/manaserv/charhandler.cpp:138 src/net/manaserv/charhandler.cpp:209
+#, fuzzy
+msgid "Not logged in."
+msgstr "Redan inloggad"
+
+#: src/net/manaserv/charhandler.cpp:141
+msgid "No empty slot."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:144
+msgid "Invalid name."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:147
+#, fuzzy
+msgid "Character's name already exists."
+msgstr "Användarnamnet finns redan"
+
+#: src/net/manaserv/charhandler.cpp:150
+msgid "Invalid hairstyle."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:153
+msgid "Invalid hair color."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:156
+msgid "Invalid gender."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:159
+#, fuzzy
+msgid "Character's stats are too high."
+msgstr "Karaktärens värden okej"
+
+#: src/net/manaserv/charhandler.cpp:162
+#, fuzzy
+msgid "Character's stats are too low."
+msgstr "Karaktärens värden okej"
+
+#: src/net/manaserv/charhandler.cpp:165
+#, c-format
+msgid "At least one statis out of the permitted range: (%u - %u)."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:171 src/net/manaserv/loginhandler.cpp:96
+#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
+#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
+#: src/net/tmwa/loginhandler.cpp:95 src/net/tmwa/loginhandler.cpp:182
+#, fuzzy
+msgid "Unknown error."
+msgstr "Okänt fel"
+
+#: src/net/manaserv/charhandler.cpp:200 src/net/tmwa/charserverhandler.cpp:146
+msgid "Info"
+msgstr "Information"
+
+#: src/net/manaserv/charhandler.cpp:200
+#, fuzzy
+msgid "Player deleted."
+msgstr "Karaktär borttagen."
+
+#: src/net/manaserv/charhandler.cpp:212
+#, fuzzy
+msgid "Selection out of range."
+msgstr "Välj antal föremål att handla med."
+
+#: src/net/manaserv/charhandler.cpp:215
+#, fuzzy, c-format
+msgid "Unknown error (%d)."
+msgstr "Okänt fel"
+
+#: src/net/manaserv/charhandler.cpp:250
+msgid "No gameservers are available."
+msgstr "Ingen spelserver finns tillgänglig."
+
+#: src/net/manaserv/chathandler.cpp:187 src/net/manaserv/chathandler.cpp:313
+#: src/net/manaserv/guildhandler.cpp:260
+#, c-format
+msgid "Topic: %s"
+msgstr "Ämne: %s"
+
+#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:274
+#, fuzzy
+msgid "Players in this channel:"
+msgstr "Spelare slår monster"
+
+#: src/net/manaserv/chathandler.cpp:208
+#, fuzzy
+msgid "Error joining channel."
+msgstr "Kommando: /join <chattkanal>"
+
+#: src/net/manaserv/chathandler.cpp:214
+#, fuzzy
+msgid "Listing channels."
+msgstr "Skickar förfrågan att gå in i chattkanalen %s."
+
+#: src/net/manaserv/chathandler.cpp:226
+msgid "End of channel list."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:303
+#, fuzzy, c-format
+msgid "%s entered the channel."
+msgstr "%s anslöt sig till gruppen."
+
+#: src/net/manaserv/chathandler.cpp:308
+#, c-format
+msgid "%s left the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:324
+#, c-format
+msgid "%s has set mode %s on user %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:334
+#, c-format
+msgid "%s has kicked %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:339
+#, fuzzy
+msgid "Unknown channel event."
+msgstr "Okänt kommando."
+
+#: src/net/manaserv/guildhandler.cpp:82
+msgid "Guild created."
+msgstr "Gille skapat."
+
+#: src/net/manaserv/guildhandler.cpp:87
+msgid "Error creating guild."
+msgstr "Kunde inte skapa gille."
+
+#: src/net/manaserv/guildhandler.cpp:97
+msgid "Invite sent."
+msgstr "Inbjudan skickad."
+
+#: src/net/manaserv/guildhandler.cpp:204
+msgid "Member was promoted successfully."
+msgstr "Medlem befordrad."
+
+#: src/net/manaserv/guildhandler.cpp:209
+msgid "Failed to promote member."
+msgstr "Kunde inte befordra medlem."
+
+#: src/net/manaserv/loginhandler.cpp:87
+#, fuzzy
+msgid "Wrong magic_token."
+msgstr "Fel magic_token"
+
+#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
+#, fuzzy
+msgid "Already logged in."
+msgstr "Redan inloggad"
+
+#: src/net/manaserv/loginhandler.cpp:93
+#, fuzzy
+msgid "Account banned."
+msgstr "Konto raderat"
+
+#: src/net/manaserv/loginhandler.cpp:118
+#, fuzzy
+msgid "New password incorrect."
+msgstr "Det nya lösenordet stämmer inte överens"
+
+#: src/net/manaserv/loginhandler.cpp:121 src/net/tmwa/loginhandler.cpp:89
+#, fuzzy
+msgid "Old password incorrect."
+msgstr "Det gamla lösenordet är fel"
+
+#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
+msgid "Account not connected. Please login first."
+msgstr "Kontot är inte anslutet. Var god logga in först."
+
+#: src/net/manaserv/loginhandler.cpp:149
+#, fuzzy
+msgid "New email address incorrect."
+msgstr "Den nya epostadressen är felaktig."
+
+#: src/net/manaserv/loginhandler.cpp:152
+#, fuzzy
+msgid "Old email address incorrect."
+msgstr "Den gamla epostadressen är fel."
+
+#: src/net/manaserv/loginhandler.cpp:158
+#, fuzzy
+msgid "The new email address already exists."
+msgstr "Den nya epostadressen används redan."
+
+#: src/net/manaserv/loginhandler.cpp:239
+msgid ""
+"Client registration is not allowed. Please contact server administration."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
+#, fuzzy
+msgid "Client version is too old."
+msgstr "Du har en för gammal version av klienten"
+
+#: src/net/manaserv/loginhandler.cpp:266
+#, fuzzy
+msgid "Wrong username or password."
+msgstr "Felaktigt användarnamn eller lösenord"
+
+#: src/net/manaserv/loginhandler.cpp:272
+#, fuzzy
+msgid "Account banned"
+msgstr "Konto raderat"
+
+#: src/net/manaserv/loginhandler.cpp:275
+msgid "Login attempt too soon after previous attempt."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:303
+#, fuzzy
+msgid "Wrong username, password or email address."
+msgstr "Felaktigt användarnamn, lösenord eller epostadress"
+
+#: src/net/manaserv/loginhandler.cpp:306
+#, fuzzy
+msgid "Username already exists."
+msgstr "Användarnamnet finns redan"
+
+#: src/net/manaserv/loginhandler.cpp:309
+#, fuzzy
+msgid "Email address already exists."
+msgstr "Epostadressen finns redan"
+
+#: src/net/manaserv/loginhandler.cpp:312
+msgid "You took too long with the captcha or your response was incorrect."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:87
+msgid "Joined party."
+msgstr "Anslöt dig till grupp."
+
+#: src/net/manaserv/partyhandler.cpp:105
+#, c-format
+msgid "%s joined the party."
+msgstr "%s anslöt sig till gruppen."
+
+#: src/net/manaserv/partyhandler.cpp:123
+#, fuzzy, c-format
+msgid "%s rejected your invite."
+msgstr "%s avvisade din inbjudan."
+
+#: src/net/manaserv/tradehandler.cpp:95
+msgid "Accepting incoming trade requests."
+msgstr "Accepterar byteshandelsförfrågningar."
+
+#: src/net/manaserv/tradehandler.cpp:97
+msgid "Ignoring incoming trade requests."
+msgstr "Ignorerar byteshandelsförfrågningar."
+
+#: src/net/manaserv/tradehandler.cpp:115 src/net/tmwa/tradehandler.cpp:109
+msgid "Request for Trade"
+msgstr "Förfrågan om byteshandel"
+
+#: src/net/manaserv/tradehandler.cpp:116 src/net/tmwa/tradehandler.cpp:110
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
+msgstr "%s vill byteshandla med dig, accepterar du?"
+
+#: src/net/manaserv/tradehandler.cpp:134
+#, c-format
+msgid "Trading with %s"
+msgstr "Byteshandlar med %s"
+
+#: src/net/manaserv/tradehandler.cpp:148 src/net/tmwa/tradehandler.cpp:224
+msgid "Trade canceled."
+msgstr "Byteshandel avbruten."
+
+#: src/net/manaserv/tradehandler.cpp:155 src/net/tmwa/tradehandler.cpp:231
+msgid "Trade completed."
+msgstr "Byteshandel genomförd."
+
+#: src/net/tmwa/adminhandler.cpp:64
 msgid "Kick failed!"
 msgstr "Kunde inte sparka ut!"
 
-#: src/net/ea/adminhandler.cpp:65
+#: src/net/tmwa/adminhandler.cpp:66
 msgid "Kick succeeded!"
 msgstr "Klarade av att sparka ut!"
 
-#: src/net/ea/buysellhandler.cpp:110
+#: src/net/tmwa/buysellhandler.cpp:109
 msgid "Nothing to sell."
 msgstr "Inget att sälja."
 
-#: src/net/ea/buysellhandler.cpp:117
+#: src/net/tmwa/buysellhandler.cpp:116
 msgid "Thanks for buying."
 msgstr "Tack för köpet."
 
-#: src/net/ea/buysellhandler.cpp:124
+#: src/net/tmwa/buysellhandler.cpp:123
 msgid "Unable to buy."
 msgstr "Kan inte köpa."
 
-#: src/net/ea/buysellhandler.cpp:130
+#: src/net/tmwa/buysellhandler.cpp:129
 msgid "Thanks for selling."
 msgstr "Tack för en god affär."
 
-#: src/net/ea/buysellhandler.cpp:132
+#: src/net/tmwa/buysellhandler.cpp:131
 msgid "Unable to sell."
 msgstr "Kan inte sälja."
 
-#: src/net/ea/charserverhandler.cpp:103
-#, fuzzy
-msgid "Access denied."
-msgstr "Tillträde nekat"
+#: src/net/tmwa/charserverhandler.cpp:103
+msgid "Access denied. Most likely, there are too many players on this server."
+msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:106
+#: src/net/tmwa/charserverhandler.cpp:107
 #, fuzzy
 msgid "Cannot use this ID."
 msgstr "Kan inte använda ID"
 
-#: src/net/ea/charserverhandler.cpp:109
+#: src/net/tmwa/charserverhandler.cpp:110
 #, fuzzy
-msgid "Unknown failure to select character."
-msgstr "Kunde inte välja karaktär av okänd anledning"
+msgid "Unknown char-server failure."
+msgstr "Okänt fel"
 
-#: src/net/ea/charserverhandler.cpp:135
+#: src/net/tmwa/charserverhandler.cpp:134
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr "Kan inte skapa karaktär. Troligtvis används namnet av någon annan."
 
-#: src/net/ea/charserverhandler.cpp:147 src/net/manaserv/charhandler.cpp:187
-msgid "Info"
-msgstr "Information"
-
-#: src/net/ea/charserverhandler.cpp:147
+#: src/net/tmwa/charserverhandler.cpp:146
 msgid "Character deleted."
 msgstr "Karaktär borttagen."
 
-#: src/net/ea/charserverhandler.cpp:152
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Failed to delete character."
 msgstr "Kunde inte ta bort karaktär."
 
-#: src/net/ea/charserverhandler.cpp:237 src/net/manaserv/charhandler.cpp:263
+#: src/net/tmwa/charserverhandler.cpp:266
 msgid "Strength:"
 msgstr "Styrka:"
 
-#: src/net/ea/charserverhandler.cpp:238 src/net/manaserv/charhandler.cpp:264
+#: src/net/tmwa/charserverhandler.cpp:267
 msgid "Agility:"
 msgstr "Smidighet:"
 
-#: src/net/ea/charserverhandler.cpp:239 src/net/manaserv/charhandler.cpp:266
+#: src/net/tmwa/charserverhandler.cpp:268
 msgid "Vitality:"
 msgstr "Hälsa:"
 
-#: src/net/ea/charserverhandler.cpp:240 src/net/manaserv/charhandler.cpp:267
+#: src/net/tmwa/charserverhandler.cpp:269
 msgid "Intelligence:"
 msgstr "Intelligens:"
 
-#: src/net/ea/charserverhandler.cpp:241 src/net/manaserv/charhandler.cpp:265
+#: src/net/tmwa/charserverhandler.cpp:270
 msgid "Dexterity:"
 msgstr "Skicklighet:"
 
-#: src/net/ea/charserverhandler.cpp:242
+#: src/net/tmwa/charserverhandler.cpp:271
 msgid "Luck:"
 msgstr "Tur:"
 
-#: src/net/ea/chathandler.cpp:80
-msgid "Whisper could not be sent, user is offline."
+#: src/net/tmwa/chathandler.cpp:87
+#, fuzzy, c-format
+msgid "Whisper could not be sent, %s is offline."
 msgstr "Kunde inte viska eftersom spelaren inte är inloggad."
 
-#: src/net/ea/chathandler.cpp:84
-msgid "Whisper could not be sent, ignored by user."
+#: src/net/tmwa/chathandler.cpp:96
+#, fuzzy, c-format
+msgid "Whisper could not be sent, ignored by %s."
 msgstr "Kunde inte viska eftersom ignorerad av spelaren."
 
-#: src/net/ea/chathandler.cpp:171
+#: src/net/tmwa/chathandler.cpp:230
 #, fuzzy
 msgid "MVP player."
 msgstr "Spelare"
 
-#: src/net/ea/chathandler.cpp:204 src/net/ea/chathandler.cpp:210
-#: src/net/ea/chathandler.cpp:215 src/net/ea/chathandler.cpp:220
-#: src/net/ea/chathandler.cpp:225 src/net/ea/chathandler.cpp:230
-#: src/net/ea/chathandler.cpp:235 src/net/ea/chathandler.cpp:240
+#: src/net/tmwa/chathandler.cpp:265 src/net/tmwa/chathandler.cpp:271
+#: src/net/tmwa/chathandler.cpp:276 src/net/tmwa/chathandler.cpp:281
+#: src/net/tmwa/chathandler.cpp:286 src/net/tmwa/chathandler.cpp:291
+#: src/net/tmwa/chathandler.cpp:296 src/net/tmwa/chathandler.cpp:301
 msgid "Channels are not supported!"
 msgstr "Chattkanaler stöds inte!"
 
-#: src/net/ea/gamehandler.cpp:86
+#: src/net/tmwa/gamehandler.cpp:88
 #, c-format
 msgid "Online users: %d"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:100
+#: src/net/tmwa/gamehandler.cpp:101
 #, fuzzy
 msgid "Game"
 msgstr "Namn"
 
-#: src/net/ea/gamehandler.cpp:100
+#: src/net/tmwa/gamehandler.cpp:101
 #, fuzzy
 msgid "Request to quit denied!"
 msgstr "Förfrågan om byteshandel"
 
-#: src/net/ea/generalhandler.cpp:102 src/net/manaserv/generalhandler.cpp:95
+#: src/net/tmwa/generalhandler.cpp:102
 #, c-format
 msgid "Strength %+d"
 msgstr "Styrka %+d"
 
-#: src/net/ea/generalhandler.cpp:103 src/net/manaserv/generalhandler.cpp:96
+#: src/net/tmwa/generalhandler.cpp:103
 #, c-format
 msgid "Agility %+d"
 msgstr "Smidighet %+d"
 
-#: src/net/ea/generalhandler.cpp:104 src/net/manaserv/generalhandler.cpp:98
+#: src/net/tmwa/generalhandler.cpp:104
 #, c-format
 msgid "Vitality %+d"
 msgstr "Livskraft %+d"
 
-#: src/net/ea/generalhandler.cpp:105 src/net/manaserv/generalhandler.cpp:99
+#: src/net/tmwa/generalhandler.cpp:105
 #, c-format
 msgid "Intelligence %+d"
 msgstr "Intelligens %+d"
 
-#: src/net/ea/generalhandler.cpp:106 src/net/manaserv/generalhandler.cpp:97
+#: src/net/tmwa/generalhandler.cpp:106
 #, c-format
 msgid "Dexterity %+d"
 msgstr "Skicklighet %+d"
 
-#: src/net/ea/generalhandler.cpp:107
+#: src/net/tmwa/generalhandler.cpp:107
 #, c-format
 msgid "Luck %+d"
 msgstr "Tur %+d"
 
-#: src/net/ea/generalhandler.cpp:130
+#: src/net/tmwa/generalhandler.cpp:132
 #, fuzzy
 msgid "Authentication failed."
 msgstr "Behörighetskontroll misslyckades"
 
-#: src/net/ea/generalhandler.cpp:133
+#: src/net/tmwa/generalhandler.cpp:135
 #, fuzzy
 msgid "No servers available."
 msgstr "Ingen server är tillgänglig"
 
-#: src/net/ea/generalhandler.cpp:137
+#: src/net/tmwa/generalhandler.cpp:139
 #, fuzzy
 msgid "Someone else is trying to use this account."
 msgstr "Någon annan försöker att använda det här kontot"
 
-#: src/net/ea/generalhandler.cpp:140
+#: src/net/tmwa/generalhandler.cpp:142
 #, fuzzy
 msgid "This account is already logged in."
 msgstr "Det här kontot är redan inloggat"
 
-#: src/net/ea/generalhandler.cpp:143
+#: src/net/tmwa/generalhandler.cpp:145
 #, fuzzy
 msgid "Speed hack detected."
 msgstr "Ett hastighetshack har upptäckts"
 
-#: src/net/ea/generalhandler.cpp:146
+#: src/net/tmwa/generalhandler.cpp:148
 #, fuzzy
 msgid "Duplicated login."
 msgstr "Dubbel inloggning"
 
-#: src/net/ea/generalhandler.cpp:149
+#: src/net/tmwa/generalhandler.cpp:151
 #, fuzzy
 msgid "Unknown connection error."
 msgstr "Okänt anslutningsfel"
 
-#: src/net/ea/generalhandler.cpp:205
+#: src/net/tmwa/generalhandler.cpp:209
 msgid "Got disconnected from server!"
 msgstr "Kopplades från servern!"
 
-#: src/net/ea/generalhandler.cpp:216 src/net/manaserv/generalhandler.cpp:166
+#: src/net/tmwa/generalhandler.cpp:230
 msgid "Strength"
 msgstr "Styrka"
 
-#: src/net/ea/generalhandler.cpp:217 src/net/manaserv/generalhandler.cpp:167
+#: src/net/tmwa/generalhandler.cpp:231
 msgid "Agility"
 msgstr "Smidighet"
 
-#: src/net/ea/generalhandler.cpp:218 src/net/manaserv/generalhandler.cpp:169
+#: src/net/tmwa/generalhandler.cpp:232
 msgid "Vitality"
 msgstr "Hälsa"
 
-#: src/net/ea/generalhandler.cpp:219 src/net/manaserv/generalhandler.cpp:170
+#: src/net/tmwa/generalhandler.cpp:233
 msgid "Intelligence"
 msgstr "Intelligens"
 
-#: src/net/ea/generalhandler.cpp:220 src/net/manaserv/generalhandler.cpp:168
+#: src/net/tmwa/generalhandler.cpp:234
 msgid "Dexterity"
 msgstr "Skicklighet"
 
-#: src/net/ea/generalhandler.cpp:221
+#: src/net/tmwa/generalhandler.cpp:235
 msgid "Luck"
 msgstr "Tur"
 
-#: src/net/ea/generalhandler.cpp:224
+#: src/net/tmwa/generalhandler.cpp:238
 #, fuzzy
 msgid "Defense"
 msgstr "Försvar:"
 
-#: src/net/ea/generalhandler.cpp:225
+#: src/net/tmwa/generalhandler.cpp:239
 #, fuzzy
 msgid "M.Attack"
 msgstr "M. attack:"
 
-#: src/net/ea/generalhandler.cpp:226
+#: src/net/tmwa/generalhandler.cpp:240
 #, fuzzy
 msgid "M.Defense"
 msgstr "M. försvar:"
 
-#: src/net/ea/generalhandler.cpp:227
+#: src/net/tmwa/generalhandler.cpp:241
 #, fuzzy, c-format
 msgid "% Accuracy"
 msgstr "% Träffsäkerhet:"
 
-#: src/net/ea/generalhandler.cpp:228
+#: src/net/tmwa/generalhandler.cpp:242
 #, fuzzy, c-format
 msgid "% Evade"
 msgstr "% Kringgå:"
 
-#: src/net/ea/generalhandler.cpp:229
+#: src/net/tmwa/generalhandler.cpp:243
 #, fuzzy, c-format
 msgid "% Critical"
 msgstr "Kritisk träff"
 
-#: src/net/ea/gui/guildtab.cpp:45
+#: src/net/tmwa/gui/guildtab.cpp:45
 msgid "Guild"
 msgstr "Gille"
 
-#: src/net/ea/gui/guildtab.cpp:61 src/net/ea/gui/partytab.cpp:59
+#: src/net/tmwa/gui/guildtab.cpp:61 src/net/tmwa/gui/partytab.cpp:59
 msgid "/help > Display this help."
 msgstr "/help > Visa den här hjälpen"
 
-#: src/net/ea/gui/guildtab.cpp:62
+#: src/net/tmwa/gui/guildtab.cpp:62
 #, fuzzy
 msgid "/invite > Invite a player to your guild"
 msgstr "/invite > Bjud in en spelare till din grupp"
 
-#: src/net/ea/gui/guildtab.cpp:63
+#: src/net/tmwa/gui/guildtab.cpp:63
 #, fuzzy
 msgid "/leave > Leave the guild you are in"
 msgstr "/leave > Lämna gruppen du är i"
 
-#: src/net/ea/gui/guildtab.cpp:64
+#: src/net/tmwa/gui/guildtab.cpp:64
 #, fuzzy
 msgid "/kick > Kick some one from the guild you are in"
 msgstr "/kick > Sparka ut någon från din grupp"
 
-#: src/net/ea/gui/guildtab.cpp:73 src/net/ea/gui/partytab.cpp:73
+#: src/net/tmwa/gui/guildtab.cpp:73 src/net/tmwa/gui/partytab.cpp:73
 msgid "Command: /invite <nick>"
 msgstr "Kommando: /invite <spelare>"
 
-#: src/net/ea/gui/guildtab.cpp:74
+#: src/net/tmwa/gui/guildtab.cpp:74
 #, fuzzy
 msgid "This command invites <nick> to the guild you're in."
 msgstr "Det här kommandot bjuder in <spelare> till din grupp."
 
-#: src/net/ea/gui/guildtab.cpp:80 src/net/ea/gui/partytab.cpp:80
+#: src/net/tmwa/gui/guildtab.cpp:80 src/net/tmwa/gui/partytab.cpp:80
 msgid "Command: /leave"
 msgstr "Kommando: /leave"
 
-#: src/net/ea/gui/guildtab.cpp:81
+#: src/net/tmwa/gui/guildtab.cpp:81
 #, fuzzy
 msgid "This command causes the player to leave the guild."
 msgstr "Det här kommandot får spelaren att lämna gruppen."
 
-#: src/net/ea/gui/guildtab.cpp:89
+#: src/net/tmwa/gui/guildtab.cpp:89
 #, fuzzy
 msgid "Guild name is missing."
 msgstr "Du måste ange gruppens namn."
 
-#: src/net/ea/guildhandler.cpp:293
+#: src/net/tmwa/guildhandler.cpp:296
 msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:298
+#: src/net/tmwa/guildhandler.cpp:301
 msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:303
+#: src/net/tmwa/guildhandler.cpp:306
 #, fuzzy
 msgid "User is now part of your guild."
 msgstr "%s är nu en medlem i din grupp."
 
-#: src/net/ea/guildhandler.cpp:308
+#: src/net/tmwa/guildhandler.cpp:311
 msgid "Your guild is full."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:313
+#: src/net/tmwa/guildhandler.cpp:316
 #, fuzzy
 msgid "Unknown guild invite response."
 msgstr "Okänt injudningssvar från %s."
 
-#: src/net/ea/guildhandler.cpp:390
+#: src/net/tmwa/guildhandler.cpp:393
 msgid "Guild creation isn't supported yet."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:43
+#: src/net/tmwa/gui/partytab.cpp:43
 msgid "Party"
 msgstr "Grupp"
 
-#: src/net/ea/gui/partytab.cpp:60
+#: src/net/tmwa/gui/partytab.cpp:60
 msgid "/invite > Invite a player to your party"
 msgstr "/invite > Bjud in en spelare till din grupp"
 
-#: src/net/ea/gui/partytab.cpp:61
+#: src/net/tmwa/gui/partytab.cpp:61
 msgid "/leave > Leave the party you are in"
 msgstr "/leave > Lämna gruppen du är i"
 
-#: src/net/ea/gui/partytab.cpp:62
+#: src/net/tmwa/gui/partytab.cpp:62
 msgid "/kick > Kick some one from the party you are in"
 msgstr "/kick > Sparka ut någon från din grupp"
 
-#: src/net/ea/gui/partytab.cpp:63
+#: src/net/tmwa/gui/partytab.cpp:63
 msgid "/item > Show/change party item sharing options"
 msgstr "/item > Visa/ändra delningsalternativ för upplock inom gruppen"
 
-#: src/net/ea/gui/partytab.cpp:64
+#: src/net/tmwa/gui/partytab.cpp:64
 msgid "/exp > Show/change party experience sharing options"
 msgstr "/exp > Visa/ändra hur erfarenhet fördelas i gruppen"
 
-#: src/net/ea/gui/partytab.cpp:81
+#: src/net/tmwa/gui/partytab.cpp:81
 msgid "This command causes the player to leave the party."
 msgstr "Det här kommandot får spelaren att lämna gruppen."
 
-#: src/net/ea/gui/partytab.cpp:85
+#: src/net/tmwa/gui/partytab.cpp:85
 msgid "Command: /item <policy>"
 msgstr "Kommando: /item <alternativ>"
 
-#: src/net/ea/gui/partytab.cpp:86
+#: src/net/tmwa/gui/partytab.cpp:86
 msgid "This command changes the party's item sharing policy."
 msgstr ""
 "Det här kommandot ändrar huruvida gruppen ska kunna plocka upp efter alla."
 
-#: src/net/ea/gui/partytab.cpp:87
+#: src/net/tmwa/gui/partytab.cpp:87
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
@@ -2769,23 +3182,23 @@ msgstr ""
 "efter alla gruppmedlemmar), eller ”0”, ”no” eller ”false” för att inte dela "
 "på upplocken."
 
-#: src/net/ea/gui/partytab.cpp:90
+#: src/net/tmwa/gui/partytab.cpp:90
 msgid "Command: /item"
 msgstr "Kommando: /item"
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/tmwa/gui/partytab.cpp:91
 msgid "This command displays the party's current item sharing policy."
 msgstr "Det här kommandot visar huruvida gruppen kan plocka upp efter alla."
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/tmwa/gui/partytab.cpp:95
 msgid "Command: /exp <policy>"
 msgstr "Kommando: /exp <alternativ>"
 
-#: src/net/ea/gui/partytab.cpp:96
+#: src/net/tmwa/gui/partytab.cpp:96
 msgid "This command changes the party's experience sharing policy."
 msgstr "Det här kommandot ändrar hur erfarenhet fördelas inom gruppen."
 
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/tmwa/gui/partytab.cpp:97
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
@@ -2794,109 +3207,96 @@ msgstr ""
 "delning av erfarenhet, eller ”0”, ”no” eller ”false” för att inte dela på "
 "erfarenhet."
 
-#: src/net/ea/gui/partytab.cpp:100
+#: src/net/tmwa/gui/partytab.cpp:100
 msgid "Command: /exp"
 msgstr "Kommando: /exp"
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/tmwa/gui/partytab.cpp:101
 msgid "This command displays the party's current experience sharing policy."
 msgstr "Det här kommandot visar om erfarenhet delas inom gruppen."
 
-#: src/net/ea/gui/partytab.cpp:132 src/net/ea/partyhandler.cpp:198
+#: src/net/tmwa/gui/partytab.cpp:132 src/net/tmwa/partyhandler.cpp:196
 msgid "Item sharing enabled."
 msgstr "Upplocksdelning aktiverad."
 
-#: src/net/ea/gui/partytab.cpp:135 src/net/ea/partyhandler.cpp:204
+#: src/net/tmwa/gui/partytab.cpp:135 src/net/tmwa/partyhandler.cpp:202
 msgid "Item sharing disabled."
 msgstr "Upplocksdelning avaktiverad."
 
-#: src/net/ea/gui/partytab.cpp:138 src/net/ea/partyhandler.cpp:210
+#: src/net/tmwa/gui/partytab.cpp:138 src/net/tmwa/partyhandler.cpp:208
 msgid "Item sharing not possible."
 msgstr "Upplocksdelning är inte möjligt."
 
-#: src/net/ea/gui/partytab.cpp:141
+#: src/net/tmwa/gui/partytab.cpp:141
 #, fuzzy
 msgid "Item sharing unknown."
 msgstr "Upplocksdelning aktiverad."
 
-#: src/net/ea/gui/partytab.cpp:167 src/net/ea/partyhandler.cpp:174
+#: src/net/tmwa/gui/partytab.cpp:167 src/net/tmwa/partyhandler.cpp:172
 msgid "Experience sharing enabled."
 msgstr "Fördelning av erfarenhet aktiverad."
 
-#: src/net/ea/gui/partytab.cpp:170 src/net/ea/partyhandler.cpp:180
+#: src/net/tmwa/gui/partytab.cpp:170 src/net/tmwa/partyhandler.cpp:178
 msgid "Experience sharing disabled."
 msgstr "Fördelning av erfarenhet inaktiverad."
 
-#: src/net/ea/gui/partytab.cpp:173 src/net/ea/partyhandler.cpp:186
+#: src/net/tmwa/gui/partytab.cpp:173 src/net/tmwa/partyhandler.cpp:184
 msgid "Experience sharing not possible."
 msgstr "Fördelning av erfarenhet ej möjlig."
 
-#: src/net/ea/gui/partytab.cpp:176
+#: src/net/tmwa/gui/partytab.cpp:176
 #, fuzzy
 msgid "Experience sharing unknown."
 msgstr "Fördelning av erfarenhet aktiverad."
 
-#: src/net/ea/inventoryhandler.cpp:281
+#: src/net/tmwa/inventoryhandler.cpp:285
 msgid "Failed to use item."
 msgstr "Kunde inte använda föremål."
 
-#: src/net/ea/inventoryhandler.cpp:391
+#: src/net/tmwa/inventoryhandler.cpp:399
 msgid "Unable to equip."
 msgstr "Kan inte utrusta."
 
-#: src/net/ea/inventoryhandler.cpp:402
+#: src/net/tmwa/inventoryhandler.cpp:410
 msgid "Unable to unequip."
 msgstr "Kan inte avrusta."
 
-#: src/net/ea/loginhandler.cpp:79
+#: src/net/tmwa/loginhandler.cpp:86
 msgid "Account was not found. Please re-login."
 msgstr "Kontot kunde inte hittas. Var vänlig att logga in på nytt."
 
-#: src/net/ea/loginhandler.cpp:82 src/net/manaserv/loginhandler.cpp:121
-#, fuzzy
-msgid "Old password incorrect."
-msgstr "Det gamla lösenordet är fel"
-
-#: src/net/ea/loginhandler.cpp:85
+#: src/net/tmwa/loginhandler.cpp:92
 #, fuzzy
 msgid "New password too short."
 msgstr "Det nya lösenordet är för kort"
 
-#: src/net/ea/loginhandler.cpp:88 src/net/ea/loginhandler.cpp:175
-#: src/net/manaserv/charhandler.cpp:158 src/net/manaserv/loginhandler.cpp:96
-#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
-#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
-#, fuzzy
-msgid "Unknown error."
-msgstr "Okänt fel"
-
-#: src/net/ea/loginhandler.cpp:149
+#: src/net/tmwa/loginhandler.cpp:156
 #, fuzzy
 msgid "Unregistered ID."
 msgstr "Oregistrerat ID"
 
-#: src/net/ea/loginhandler.cpp:152
+#: src/net/tmwa/loginhandler.cpp:159
 #, fuzzy
 msgid "Wrong password."
 msgstr "Fel lösenord"
 
-#: src/net/ea/loginhandler.cpp:155
+#: src/net/tmwa/loginhandler.cpp:162
 #, fuzzy
 msgid "Account expired."
 msgstr "Konto raderat"
 
-#: src/net/ea/loginhandler.cpp:158
+#: src/net/tmwa/loginhandler.cpp:165
 #, fuzzy
 msgid "Rejected from server."
 msgstr "Nekad tillträde till servern"
 
-#: src/net/ea/loginhandler.cpp:161
+#: src/net/tmwa/loginhandler.cpp:168
 #, fuzzy
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr "Du har permanent blivit bannlyst från spelet. Kontakta en GM."
 
-#: src/net/ea/loginhandler.cpp:165
+#: src/net/tmwa/loginhandler.cpp:172
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -2905,671 +3305,370 @@ msgstr ""
 "Du har tillfälligt blivit utkastat från spelet till %s.\n"
 "Var vänlig kontakta en GM i forumet."
 
-#: src/net/ea/loginhandler.cpp:172
+#: src/net/tmwa/loginhandler.cpp:179
 #, fuzzy
 msgid "This user name is already taken."
 msgstr "Det här användarnamnet finns redan"
 
-#: src/net/ea/network.cpp:145
+#: src/net/tmwa/network.cpp:145
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/ea/network.cpp:345
+#: src/net/tmwa/network.cpp:345
 #, fuzzy
 msgid "Unable to resolve host \""
 msgstr "Kan inte sälja."
 
-#: src/net/ea/network.cpp:414
+#: src/net/tmwa/network.cpp:414
 #, fuzzy
 msgid "Connection to server terminated. "
 msgstr "Ansluter till kartservern..."
 
-#: src/net/ea/partyhandler.cpp:81
+#: src/net/tmwa/partyhandler.cpp:82
 msgid "Could not create party."
 msgstr "Kunde inte skapa grupp."
 
-#: src/net/ea/partyhandler.cpp:84
+#: src/net/tmwa/partyhandler.cpp:84
 msgid "Party successfully created."
 msgstr "Grupp skapad."
 
-#: src/net/ea/partyhandler.cpp:118
+#: src/net/tmwa/partyhandler.cpp:119
 #, c-format
 msgid "%s is already a member of a party."
 msgstr "%s är redan medlem i en grupp."
 
-#: src/net/ea/partyhandler.cpp:122
+#: src/net/tmwa/partyhandler.cpp:123
 #, c-format
 msgid "%s refused your invitation."
 msgstr "%s avvisade din inbjudan."
 
-#: src/net/ea/partyhandler.cpp:126
+#: src/net/tmwa/partyhandler.cpp:127
 #, c-format
 msgid "%s is now a member of your party."
 msgstr "%s är nu en medlem i din grupp."
 
-#: src/net/ea/partyhandler.cpp:130
+#: src/net/tmwa/partyhandler.cpp:131
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr "Okänt injudningssvar från %s."
 
-#: src/net/ea/partyhandler.cpp:238
+#: src/net/tmwa/partyhandler.cpp:236
 msgid "You have left the party."
 msgstr "Du har lämnat gruppen."
 
-#: src/net/ea/partyhandler.cpp:249
+#: src/net/tmwa/partyhandler.cpp:246
 #, c-format
 msgid "%s has left your party."
 msgstr "%s har lämnat din grupp."
 
-#: src/net/ea/partyhandler.cpp:301
+#: src/net/tmwa/partyhandler.cpp:299
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr "En okänd medlem försökte säga: %s"
 
-#: src/net/ea/partyhandler.cpp:329
-msgid "Inviting like this isn't supported at the moment."
+#: src/net/tmwa/partyhandler.cpp:335
+#, c-format
+msgid "Inviting failed, because you can't see a player called %s."
 msgstr ""
-"För tillfället är det inte möjligt att bjuda in något på det här viset."
 
-#: src/net/ea/partyhandler.cpp:334
+#: src/net/tmwa/partyhandler.cpp:340
 msgid "You can only inivte when you are in a party!"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:365
+#: src/net/tmwa/partyhandler.cpp:368
 #, c-format
 msgid "%s is not in your party!"
 msgstr "%s är inte med i din grupp!"
 
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:304
-msgid "You are dead."
-msgstr "Du är död."
-
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:305
-msgid "We regret to inform you that your character was killed in battle."
-msgstr ""
-"Vi beklagar att behöva meddela dig om att din karaktär dödades i strid."
-
-#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:307
-msgid "You are not that alive anymore."
-msgstr "Du är inte så värst levande längre."
-
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:308
-msgid "The cold hands of the grim reaper are grabbing for your soul."
-msgstr "Liemannens svala händer sträcker sig efter din själ."
-
-#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:309
-msgid "Game Over!"
-msgstr "Spelet är slut!"
-
-#: src/net/ea/playerhandler.cpp:105
+#: src/net/tmwa/playerhandler.cpp:100
 msgid "Insert coin to continue."
 msgstr "Stoppa i mynt för att fortsätta."
 
-#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:310
-msgid ""
-"No, kids. Your character did not really die. It... err... went to a better "
-"place."
-msgstr ""
-"Barn, barn. Din karaktär dog egentligen inte. Den… öh… kom till ett bättre "
-"ställe."
-
-#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:312
-msgid ""
-"Your plan of breaking your enemies weapon by bashing it with your throat "
-"failed."
-msgstr ""
-"Din plan att ha sönder dina fiendens vapen genom att krossa dem med din hals "
-"misslyckades."
-
-#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:314
-msgid "I guess this did not run too well."
-msgstr "Jag antar att det kunde gått bättre."
-
-#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:315
-msgid "Do you want your possessions identified?"
-msgstr "Vill du att dina tillhörigheter ska identifieras?"
-
-#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:316
-msgid "Sadly, no trace of you was ever found..."
-msgstr "Ledsamt nog så kunde inga spår efter dig någonsin hittas…"
-
-#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:317
-msgid "Annihilated."
-msgstr "Tillintetgjord."
-
-#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:318
-msgid "Looks like you got your head handed to you."
-msgstr "Verkar som att som att någon gav dig ditt huvud."
-
-#: src/net/ea/playerhandler.cpp:120 src/net/manaserv/beinghandler.cpp:319
-msgid ""
-"You screwed up again, dump your body down the tubes and get you another one."
-msgstr ""
-"Du klantade till det igen, släng din kropp vid kloakerna och skaffa dig en "
-"ny."
-
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/tmwa/playerhandler.cpp:118
 msgid "You're not dead yet. You're just resting."
 msgstr "Du är inte död än. Du vilar bara."
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/tmwa/playerhandler.cpp:119
 msgid "You are no more."
 msgstr "Du finns inte längre."
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/tmwa/playerhandler.cpp:120
 msgid "You have ceased to be."
 msgstr "Du har slutat att existera."
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/tmwa/playerhandler.cpp:121
 msgid "You've expired and gone to meet your maker."
 msgstr "Du är passé och har givit dig av för att träffa din skapare."
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/tmwa/playerhandler.cpp:122
 msgid "You're a stiff."
 msgstr "Du är en steling."
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/tmwa/playerhandler.cpp:123
 msgid "Bereft of life, you rest in peace."
 msgstr "Berövad på ditt liv vilar du numera i frid."
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/tmwa/playerhandler.cpp:124
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 "Om du inte vore så livfull skulle du vara blomnäring vid det här laget."
 
-#: src/net/ea/playerhandler.cpp:130
+#: src/net/tmwa/playerhandler.cpp:125
 msgid "Your metabolic processes are now history."
 msgstr "Dina metaboliska processer är nu historia."
 
-#: src/net/ea/playerhandler.cpp:131
+#: src/net/tmwa/playerhandler.cpp:126
 msgid "You're off the twig."
 msgstr "Du har trillat av pinn."
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/tmwa/playerhandler.cpp:127
 msgid "You've kicked the bucket."
 msgstr "Du har kastat in handduken."
 
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/tmwa/playerhandler.cpp:128
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr "Du tog ner skylten, kilade runt hörnet och bet i gräset."
 
-#: src/net/ea/playerhandler.cpp:135
+#: src/net/tmwa/playerhandler.cpp:130
 msgid "You are an ex-player."
 msgstr "Du är en före detta spelare."
 
-#: src/net/ea/playerhandler.cpp:136
+#: src/net/tmwa/playerhandler.cpp:131
 msgid "You're pining for the fjords."
 msgstr "Du har gått till de sälla jaktmarkerna."
 
-#: src/net/ea/playerhandler.cpp:249 src/net/ea/playerhandler.cpp:310
+#: src/net/tmwa/playerhandler.cpp:246 src/net/tmwa/playerhandler.cpp:285
 msgid "Message"
 msgstr "Meddelande"
 
-#: src/net/ea/playerhandler.cpp:250
+#: src/net/tmwa/playerhandler.cpp:247
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr "Du bär mer än halva din vikt på dig. Du kan inte återfå hälsa."
 
-#: src/net/ea/playerhandler.cpp:333
+#: src/net/tmwa/playerhandler.cpp:313
 #, fuzzy, c-format
 msgid "You picked up %s."
 msgstr "Du plockade upp "
 
-#: src/net/ea/playerhandler.cpp:369
+#: src/net/tmwa/playerhandler.cpp:348
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:532
+#: src/net/tmwa/playerhandler.cpp:488
 msgid "Equip arrows first."
 msgstr "Utrusta dig med pilar först."
 
-#: src/net/ea/specialhandler.cpp:147
+#: src/net/tmwa/specialhandler.cpp:144
 msgid "Trade failed!"
 msgstr "Byteshandel misslyckades!"
 
-#: src/net/ea/specialhandler.cpp:150
+#: src/net/tmwa/specialhandler.cpp:147
 msgid "Emote failed!"
 msgstr "Kan inte visa smiley!"
 
-#: src/net/ea/specialhandler.cpp:153
+#: src/net/tmwa/specialhandler.cpp:150
 msgid "Sit failed!"
 msgstr "Kan inte sitta!"
 
-#: src/net/ea/specialhandler.cpp:156
+#: src/net/tmwa/specialhandler.cpp:153
 msgid "Chat creating failed!"
 msgstr "Kan inte skicka chattmeddelande!"
 
-#: src/net/ea/specialhandler.cpp:159
+#: src/net/tmwa/specialhandler.cpp:156
 msgid "Could not join party!"
 msgstr "Kan inte ansluta till gruppen!"
 
-#: src/net/ea/specialhandler.cpp:162
+#: src/net/tmwa/specialhandler.cpp:159
 msgid "Cannot shout!"
 msgstr "Kan inte skrika!"
 
-#: src/net/ea/specialhandler.cpp:171
+#: src/net/tmwa/specialhandler.cpp:168
 msgid "You have not yet reached a high enough lvl!"
 msgstr "Du har inte nått en tillräckligt hög nivå än!"
 
-#: src/net/ea/specialhandler.cpp:174
+#: src/net/tmwa/specialhandler.cpp:171
 msgid "Insufficient HP!"
 msgstr "Otillräckligt med HP!"
 
-#: src/net/ea/specialhandler.cpp:177
+#: src/net/tmwa/specialhandler.cpp:174
 msgid "Insufficient SP!"
 msgstr "Otillräckligt med SP!"
 
-#: src/net/ea/specialhandler.cpp:180
+#: src/net/tmwa/specialhandler.cpp:177
 msgid "You have no memos!"
 msgstr "Du har inga anteckningar!"
 
-#: src/net/ea/specialhandler.cpp:183
+#: src/net/tmwa/specialhandler.cpp:180
 msgid "You cannot do that right now!"
 msgstr "Du kan inte göra det just nu!"
 
-#: src/net/ea/specialhandler.cpp:186
+#: src/net/tmwa/specialhandler.cpp:183
 msgid "Seems you need more money... ;-)"
 msgstr "Verkar som att du behöver mer pengar… ;-)"
 
-#: src/net/ea/specialhandler.cpp:189
+#: src/net/tmwa/specialhandler.cpp:186
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Det går inte att använda den här förmågan med det där vapenslaget!"
 
-#: src/net/ea/specialhandler.cpp:192
+#: src/net/tmwa/specialhandler.cpp:189
 msgid "You need another red gem!"
 msgstr "Du behöver en till röd juvel!"
 
-#: src/net/ea/specialhandler.cpp:195
+#: src/net/tmwa/specialhandler.cpp:192
 msgid "You need another blue gem!"
 msgstr "Du behöver en till blå juvel!"
 
-#: src/net/ea/specialhandler.cpp:198
+#: src/net/tmwa/specialhandler.cpp:195
 msgid "You're carrying to much to do this!"
 msgstr "Du bär på för mycket för att kunna göra det här!"
 
-#: src/net/ea/specialhandler.cpp:201
+#: src/net/tmwa/specialhandler.cpp:198
 msgid "Huh? What's that?"
 msgstr "Öh? Vad är det där?"
 
-#: src/net/ea/specialhandler.cpp:210
+#: src/net/tmwa/specialhandler.cpp:207
 msgid "Warp failed..."
 msgstr "Kartförflyttning misslyckades..."
 
-#: src/net/ea/specialhandler.cpp:213
+#: src/net/tmwa/specialhandler.cpp:210
 msgid "Could not steal anything..."
 msgstr "Kunde inte stjäla något..."
 
-#: src/net/ea/specialhandler.cpp:216
+#: src/net/tmwa/specialhandler.cpp:213
 msgid "Poison had no effect..."
 msgstr "Giftet tog inte..."
 
-#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:116
-msgid "Request for Trade"
-msgstr "Förfrågan om byteshandel"
-
-#: src/net/ea/tradehandler.cpp:108 src/net/manaserv/tradehandler.cpp:117
-#, c-format
-msgid "%s wants to trade with you, do you accept?"
-msgstr "%s vill byteshandla med dig, accepterar du?"
-
-#: src/net/ea/tradehandler.cpp:124
+#: src/net/tmwa/tradehandler.cpp:126
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr "Byteshandel är inte möjligt. Handelspartnern är för långt borta."
 
-#: src/net/ea/tradehandler.cpp:128
+#: src/net/tmwa/tradehandler.cpp:130
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr "Byteshandel är inte möjligt. Karaktären existerar inte."
 
-#: src/net/ea/tradehandler.cpp:132
+#: src/net/tmwa/tradehandler.cpp:134
 msgid "Trade cancelled due to an unknown reason."
 msgstr "Byteshandel avbröts av okänd anledning."
 
-#: src/net/ea/tradehandler.cpp:137
+#: src/net/tmwa/tradehandler.cpp:139
 #, c-format
 msgid "Trade: You and %s"
 msgstr "Byteshandel: du och %s"
 
-#: src/net/ea/tradehandler.cpp:144
+#: src/net/tmwa/tradehandler.cpp:146
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr "Byteshandel med %s avbruten."
 
-#: src/net/ea/tradehandler.cpp:153
+#: src/net/tmwa/tradehandler.cpp:154
 msgid "Unhandled trade cancel packet."
 msgstr "Ett okänt paket för att avbryta byteshandeln påträffades."
 
-#: src/net/ea/tradehandler.cpp:202
+#: src/net/tmwa/tradehandler.cpp:202
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr "Kunde inte lägga till föremål. Bytespartnern är överfull."
 
-#: src/net/ea/tradehandler.cpp:207
+#: src/net/tmwa/tradehandler.cpp:207
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr "Kunde inte lägga till föremål. Bytespartnern har inget ledigt utrymme."
 
-#: src/net/ea/tradehandler.cpp:211
+#: src/net/tmwa/tradehandler.cpp:211
 msgid "Failed adding item for unknown reason."
 msgstr "Kunde inte lägga till föremål av okänd anledning."
 
-#: src/net/ea/tradehandler.cpp:224 src/net/manaserv/tradehandler.cpp:149
-msgid "Trade canceled."
-msgstr "Byteshandel avbruten."
-
-#: src/net/ea/tradehandler.cpp:231 src/net/manaserv/tradehandler.cpp:156
-msgid "Trade completed."
-msgstr "Byteshandel genomförd."
-
-#: src/net/manaserv/beinghandler.cpp:324
-#, fuzzy
-msgid "Press OK to respawn."
-msgstr " Klicka okej för att återuppstå"
-
-#: src/net/manaserv/beinghandler.cpp:325
+#: src/playerrelations.cpp:310
 #, fuzzy
-msgid "You Died"
-msgstr "Du dog"
-
-#: src/net/manaserv/charhandler.cpp:128 src/net/manaserv/charhandler.cpp:196
-#, fuzzy
-msgid "Not logged in."
-msgstr "Redan inloggad"
-
-#: src/net/manaserv/charhandler.cpp:131
-msgid "No empty slot."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:134
-msgid "Invalid name."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:137
-#, fuzzy
-msgid "Character's name already exists."
-msgstr "Användarnamnet finns redan"
-
-#: src/net/manaserv/charhandler.cpp:140
-msgid "Invalid hairstyle."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:143
-msgid "Invalid hair color."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:146
-msgid "Invalid gender."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:149
-#, fuzzy
-msgid "Character's stats are too high."
-msgstr "Karaktärens värden okej"
-
-#: src/net/manaserv/charhandler.cpp:152
-#, fuzzy
-msgid "Character's stats are too low."
-msgstr "Karaktärens värden okej"
+msgid "Completely ignore"
+msgstr "@@ignore|Ignorera %s fullständigt@@"
 
-#: src/net/manaserv/charhandler.cpp:155
-msgid "One stat is zero."
+#: src/playerrelations.cpp:324
+msgid "Print '...'"
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:187
-#, fuzzy
-msgid "Player deleted."
-msgstr "Karaktär borttagen."
-
-#: src/net/manaserv/charhandler.cpp:199
-#, fuzzy
-msgid "Selection out of range."
-msgstr "Välj antal föremål att handla med."
-
-#: src/net/manaserv/charhandler.cpp:202
-#, fuzzy, c-format
-msgid "Unknown error (%d)."
-msgstr "Okänt fel"
-
-#: src/net/manaserv/charhandler.cpp:242
-msgid "No gameservers are available."
-msgstr "Ingen spelserver finns tillgänglig."
-
-#: src/net/manaserv/charhandler.cpp:268
-msgid "Willpower:"
-msgstr "Viljestyrka:"
-
-#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
-#: src/net/manaserv/guildhandler.cpp:259
-#, c-format
-msgid "Topic: %s"
-msgstr "Ämne: %s"
-
-#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
-#, fuzzy
-msgid "Players in this channel:"
-msgstr "Spelare slår monster"
-
-#: src/net/manaserv/chathandler.cpp:201
-#, fuzzy
-msgid "Error joining channel."
-msgstr "Kommando: /join <chattkanal>"
-
-#: src/net/manaserv/chathandler.cpp:207
-#, fuzzy
-msgid "Listing channels."
-msgstr "Skickar förfrågan att gå in i chattkanalen %s."
-
-#: src/net/manaserv/chathandler.cpp:219
-msgid "End of channel list."
+#: src/playerrelations.cpp:340
+msgid "Blink name"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:291
-#, fuzzy, c-format
-msgid "%s entered the channel."
-msgstr "%s anslöt sig till gruppen."
-
-#: src/net/manaserv/chathandler.cpp:296
+#: src/resources/itemdb.cpp:44
 #, c-format
-msgid "%s left the channel."
-msgstr ""
+msgid "Attack %+d"
+msgstr "Attack %+d"
 
-#: src/net/manaserv/chathandler.cpp:312
+#: src/resources/itemdb.cpp:45
 #, c-format
-msgid "%s has set mode %s on user %s."
-msgstr ""
+msgid "Defense %+d"
+msgstr "Försvar %+d"
 
-#: src/net/manaserv/chathandler.cpp:322
+#: src/resources/itemdb.cpp:46
 #, c-format
-msgid "%s has kicked %s."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:327
-#, fuzzy
-msgid "Unknown channel event."
-msgstr "Okänt kommando."
+msgid "HP %+d"
+msgstr "Hälsa %+d"
 
-#: src/net/manaserv/generalhandler.cpp:100
+#: src/resources/itemdb.cpp:47
 #, c-format
-msgid "Willpower %+d"
-msgstr "Viljekraft %+d"
-
-#: src/net/manaserv/generalhandler.cpp:171
-#, fuzzy
-msgid "Willpower"
-msgstr "Viljestyrka:"
-
-#: src/net/manaserv/guildhandler.cpp:81
-msgid "Guild created."
-msgstr "Gille skapat."
-
-#: src/net/manaserv/guildhandler.cpp:86
-msgid "Error creating guild."
-msgstr "Kunde inte skapa gille."
-
-#: src/net/manaserv/guildhandler.cpp:96
-msgid "Invite sent."
-msgstr "Inbjudan skickad."
-
-#: src/net/manaserv/guildhandler.cpp:203
-msgid "Member was promoted successfully."
-msgstr "Medlem befordrad."
+msgid "MP %+d"
+msgstr "Mana %+d"
 
-#: src/net/manaserv/guildhandler.cpp:208
-msgid "Failed to promote member."
-msgstr "Kunde inte befordra medlem."
+#: src/resources/itemdb.cpp:92
+msgid "Unknown item"
+msgstr "Okänt föremål"
 
-#: src/net/manaserv/loginhandler.cpp:87
-#, fuzzy
-msgid "Wrong magic_token."
-msgstr "Fel magic_token"
+#: src/resources/itemdb.cpp:135 src/resources/monsterdb.cpp:77
+msgid "unnamed"
+msgstr "namnlös"
 
-#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
 #, fuzzy
-msgid "Already logged in."
-msgstr "Redan inloggad"
+#~ msgid "HP"
+#~ msgstr "HP:"
 
-#: src/net/manaserv/loginhandler.cpp:93 src/net/manaserv/loginhandler.cpp:272
 #, fuzzy
-msgid "Server is full."
-msgstr "Servern är full"
+#~ msgid "MP"
+#~ msgstr "MP:"
 
-#: src/net/manaserv/loginhandler.cpp:118
 #, fuzzy
-msgid "New password incorrect."
-msgstr "Det nya lösenordet stämmer inte överens"
-
-#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
-msgid "Account not connected. Please login first."
-msgstr "Kontot är inte anslutet. Var god logga in först."
+#~ msgid "Exp"
+#~ msgstr "EP:"
 
-#: src/net/manaserv/loginhandler.cpp:149
 #, fuzzy
-msgid "New email address incorrect."
-msgstr "Den nya epostadressen är felaktig."
+#~ msgid "Money"
+#~ msgstr "Pengar: %d"
 
-#: src/net/manaserv/loginhandler.cpp:152
 #, fuzzy
-msgid "Old email address incorrect."
-msgstr "Den gamla epostadressen är fel."
+#~ msgid "Job"
+#~ msgstr "Jobb:"
 
-#: src/net/manaserv/loginhandler.cpp:158
 #, fuzzy
-msgid "The new email address already exists."
-msgstr "Den nya epostadressen används redan."
+#~ msgid "Level"
+#~ msgstr "Nivå: %d"
 
-#: src/net/manaserv/loginhandler.cpp:239
-msgid ""
-"Client registration is not allowed. Please contact server administration."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
 #, fuzzy
-msgid "Client version is too old."
-msgstr "Du har en för gammal version av klienten"
+#~ msgid "Access denied."
+#~ msgstr "Tillträde nekat"
 
-#: src/net/manaserv/loginhandler.cpp:266
 #, fuzzy
-msgid "Wrong username or password."
-msgstr "Felaktigt användarnamn eller lösenord"
+#~ msgid "Unknown failure to select character."
+#~ msgstr "Kunde inte välja karaktär av okänd anledning"
 
-#: src/net/manaserv/loginhandler.cpp:275
-msgid "Login attempt too soon after previous attempt."
-msgstr ""
+#~ msgid "Inviting like this isn't supported at the moment."
+#~ msgstr ""
+#~ "För tillfället är det inte möjligt att bjuda in något på det här viset."
 
-#: src/net/manaserv/loginhandler.cpp:303
-#, fuzzy
-msgid "Wrong username, password or email address."
-msgstr "Felaktigt användarnamn, lösenord eller epostadress"
+#~ msgid "Willpower:"
+#~ msgstr "Viljestyrka:"
 
-#: src/net/manaserv/loginhandler.cpp:306
-#, fuzzy
-msgid "Username already exists."
-msgstr "Användarnamnet finns redan"
+#~ msgid "Willpower %+d"
+#~ msgstr "Viljekraft %+d"
 
-#: src/net/manaserv/loginhandler.cpp:309
 #, fuzzy
-msgid "Email address already exists."
-msgstr "Epostadressen finns redan"
-
-#: src/net/manaserv/loginhandler.cpp:312
-msgid "You took too long with the captcha or your response was incorrect."
-msgstr ""
-
-#: src/net/manaserv/partyhandler.cpp:88
-msgid "Joined party."
-msgstr "Anslöt dig till grupp."
-
-#: src/net/manaserv/partyhandler.cpp:106
-#, c-format
-msgid "%s joined the party."
-msgstr "%s anslöt sig till gruppen."
-
-#: src/net/manaserv/partyhandler.cpp:123
-#, fuzzy, c-format
-msgid "%s rejected your invite."
-msgstr "%s avvisade din inbjudan."
-
-#: src/net/manaserv/tradehandler.cpp:96
-msgid "Accepting incoming trade requests."
-msgstr "Accepterar byteshandelsförfrågningar."
+#~ msgid "Willpower"
+#~ msgstr "Viljestyrka:"
 
-#: src/net/manaserv/tradehandler.cpp:98
-msgid "Ignoring incoming trade requests."
-msgstr "Ignorerar byteshandelsförfrågningar."
-
-#: src/net/manaserv/tradehandler.cpp:135
-#, c-format
-msgid "Trading with %s"
-msgstr "Byteshandlar med %s"
-
-#: src/playerrelations.cpp:304
 #, fuzzy
-msgid "Completely ignore"
-msgstr "@@ignore|Ignorera %s fullständigt@@"
-
-#: src/playerrelations.cpp:318
-msgid "Print '...'"
-msgstr ""
-
-#: src/playerrelations.cpp:334
-msgid "Blink name"
-msgstr ""
-
-#: src/playerrelations.cpp:371
-msgid "Floating '...' bubble"
-msgstr ""
-
-#: src/playerrelations.cpp:374
-msgid "Floating bubble"
-msgstr ""
-
-#: src/resources/itemdb.cpp:52
-#, c-format
-msgid "Attack %+d"
-msgstr "Attack %+d"
-
-#: src/resources/itemdb.cpp:53
-#, c-format
-msgid "Defense %+d"
-msgstr "Försvar %+d"
-
-#: src/resources/itemdb.cpp:54
-#, c-format
-msgid "HP %+d"
-msgstr "Hälsa %+d"
-
-#: src/resources/itemdb.cpp:55
-#, c-format
-msgid "MP %+d"
-msgstr "Mana %+d"
-
-#: src/resources/itemdb.cpp:114
-msgid "Unknown item"
-msgstr "Okänt föremål"
-
-#: src/resources/itemdb.cpp:158 src/resources/monsterdb.cpp:45
-#: src/resources/monsterdb.cpp:69
-msgid "unnamed"
-msgstr "namnlös"
+#~ msgid "Server is full."
+#~ msgstr "Servern är full"
 
 #~ msgid "Text Shadow"
 #~ msgstr "Textskugga"
diff --git a/po/te.po b/po/te.po
index 6d05301f..f24ea08a 100644
--- a/po/te.po
+++ b/po/te.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2010-03-05 21:52+0100\n"
+"POT-Creation-Date: 2010-12-13 20:04+0100\n"
 "PO-Revision-Date: 2009-10-13 03:45+0000\n"
 "Last-Translator: వీవెన్ (Veeven) <Unknown>\n"
 "Language-Team: Telugu <te@li.org>\n"
+"Language: te\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,437 +19,450 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/client.cpp:553 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:62
+#: src/client.cpp:598 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
 msgid "Setup"
 msgstr ""
 
-#: src/client.cpp:623
+#: src/client.cpp:679
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:650
+#: src/client.cpp:706
 #, fuzzy
 msgid "Logging in"
 msgstr "ప్రవేశించు"
 
-#: src/client.cpp:683
+#: src/client.cpp:739
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:739
+#: src/client.cpp:804
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:768
+#: src/client.cpp:833
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:799 src/client.cpp:806 src/client.cpp:940
+#: src/client.cpp:843
+msgid "Changing game servers"
+msgstr ""
+
+#: src/client.cpp:872 src/client.cpp:879 src/client.cpp:1014
 #: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
 #: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
-#: src/gui/serverdialog.cpp:261 src/gui/unregisterdialog.cpp:133
-#: src/net/ea/charserverhandler.cpp:135 src/net/ea/charserverhandler.cpp:152
-#: src/net/manaserv/charhandler.cpp:161 src/net/manaserv/charhandler.cpp:204
+#: src/gui/serverdialog.cpp:323 src/gui/unregisterdialog.cpp:133
+#: src/net/manaserv/charhandler.cpp:174 src/net/manaserv/charhandler.cpp:217
+#: src/net/tmwa/charserverhandler.cpp:134
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Error"
 msgstr "పొరపాటు"
 
-#: src/client.cpp:815
+#: src/client.cpp:888
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:842
+#: src/client.cpp:915
 #, fuzzy
 msgid "Password Change"
 msgstr "సంకేతపదం:"
 
-#: src/client.cpp:843
+#: src/client.cpp:916
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:862
+#: src/client.cpp:935
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:863
+#: src/client.cpp:936
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:883
+#: src/client.cpp:956
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:884
+#: src/client.cpp:957
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1007 src/client.cpp:1030
+#: src/client.cpp:1138 src/client.cpp:1161
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1119
+#: src/client.cpp:1281
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1153 src/client.cpp:1159
+#: src/client.cpp:1315 src/client.cpp:1321
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/commandhandler.cpp:127 src/commandhandler.cpp:308
+#: src/commandhandler.cpp:131 src/commandhandler.cpp:317
 msgid "Unknown command."
 msgstr "గుర్తుతెలియని ఆదేశం."
 
-#: src/commandhandler.cpp:156
+#: src/commandhandler.cpp:160
 msgid "-- Help --"
 msgstr "-- సహాయం--"
 
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:161
 msgid "/help > Display this help"
 msgstr ""
 
-#: src/commandhandler.cpp:159
+#: src/commandhandler.cpp:163
 msgid "/where > Display map name"
 msgstr ""
 
-#: src/commandhandler.cpp:160
+#: src/commandhandler.cpp:164
 msgid "/who > Display number of online users"
 msgstr ""
 
-#: src/commandhandler.cpp:161
+#: src/commandhandler.cpp:165
 msgid "/me > Tell something about yourself"
 msgstr ""
 
-#: src/commandhandler.cpp:163
+#: src/commandhandler.cpp:167
 msgid "/clear > Clears this window"
 msgstr ""
 
-#: src/commandhandler.cpp:165
+#: src/commandhandler.cpp:169
 msgid "/msg > Send a private message to a user"
 msgstr ""
 
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:170
 msgid "/whisper > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:167
+#: src/commandhandler.cpp:171
 msgid "/w > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:168
+#: src/commandhandler.cpp:172
 msgid "/query > Makes a tab for private messages with another user"
 msgstr ""
 
-#: src/commandhandler.cpp:169
+#: src/commandhandler.cpp:174
 msgid "/q > Alias of query"
 msgstr ""
 
-#: src/commandhandler.cpp:171
+#: src/commandhandler.cpp:176
 msgid "/ignore > ignore a player"
 msgstr ""
 
-#: src/commandhandler.cpp:172
+#: src/commandhandler.cpp:177
 msgid "/unignore > stop ignoring a player"
 msgstr ""
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:179
 msgid "/list > Display all public channels"
 msgstr ""
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:180
 msgid "/join > Join or create a channel"
 msgstr ""
 
-#: src/commandhandler.cpp:177
+#: src/commandhandler.cpp:182
 msgid "/createparty > Create a new party"
 msgstr ""
 
-#: src/commandhandler.cpp:178
+#: src/commandhandler.cpp:183
 msgid "/party > Invite a user to party"
 msgstr ""
 
-#: src/commandhandler.cpp:180
+#: src/commandhandler.cpp:185
 msgid "/record > Start recording the chat to an external file"
 msgstr ""
 
-#: src/commandhandler.cpp:181
+#: src/commandhandler.cpp:187
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr ""
 
-#: src/commandhandler.cpp:182
+#: src/commandhandler.cpp:189
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
 
-#: src/commandhandler.cpp:184
+#: src/commandhandler.cpp:192
 msgid "/announce > Global announcement (GM only)"
 msgstr ""
 
-#: src/commandhandler.cpp:188
+#: src/commandhandler.cpp:196
 msgid "For more information, type /help <command>."
 msgstr "మరింత సమాచారం కోసం,  /help <ఆదేశం> అని టైపు చెయ్యండి."
 
-#: src/commandhandler.cpp:192
+#: src/commandhandler.cpp:200
 msgid "Command: /help"
 msgstr ""
 
-#: src/commandhandler.cpp:193
+#: src/commandhandler.cpp:201
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: src/commandhandler.cpp:194
+#: src/commandhandler.cpp:203
 msgid "Command: /help <command>"
 msgstr ""
 
-#: src/commandhandler.cpp:195
+#: src/commandhandler.cpp:204
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/commandhandler.cpp:203
+#: src/commandhandler.cpp:212
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: src/commandhandler.cpp:204
+#: src/commandhandler.cpp:213
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/commandhandler.cpp:205
+#: src/commandhandler.cpp:214
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:210
+#: src/commandhandler.cpp:219
 msgid "Command: /clear"
 msgstr ""
 
-#: src/commandhandler.cpp:211
+#: src/commandhandler.cpp:220
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:224
 msgid "Command: /ignore <player>"
 msgstr ""
 
-#: src/commandhandler.cpp:216
+#: src/commandhandler.cpp:225
 msgid "This command ignores the given player regardless of current relations."
 msgstr ""
 
-#: src/commandhandler.cpp:221
+#: src/commandhandler.cpp:230
 msgid "Command: /join <channel>"
 msgstr ""
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:231
 msgid "This command makes you enter <channel>."
 msgstr ""
 
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:232
 msgid "If <channel> doesn't exist, it's created."
 msgstr ""
 
-#: src/commandhandler.cpp:227
+#: src/commandhandler.cpp:236
 msgid "Command: /list"
 msgstr ""
 
-#: src/commandhandler.cpp:228
+#: src/commandhandler.cpp:237
 msgid "This command shows a list of all channels."
 msgstr ""
 
-#: src/commandhandler.cpp:232
+#: src/commandhandler.cpp:241
 msgid "Command: /me <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:233
+#: src/commandhandler.cpp:242
 msgid "This command tell others you are (doing) <msg>."
 msgstr ""
 
-#: src/commandhandler.cpp:237
+#: src/commandhandler.cpp:246
 msgid "Command: /msg <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:238
+#: src/commandhandler.cpp:247
 msgid "Command: /whisper <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:239
+#: src/commandhandler.cpp:248
 msgid "Command: /w <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:240
+#: src/commandhandler.cpp:249
 msgid "This command sends the text <message> to <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:241 src/commandhandler.cpp:260
+#: src/commandhandler.cpp:250 src/commandhandler.cpp:269
 #: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
-#: src/net/ea/gui/guildtab.cpp:75 src/net/ea/gui/partytab.cpp:75
+#: src/net/tmwa/gui/guildtab.cpp:75 src/net/tmwa/gui/partytab.cpp:75
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:255
 msgid "Command: /query <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:247
+#: src/commandhandler.cpp:256
 msgid "Command: /q <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:248
+#: src/commandhandler.cpp:257
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:253
+#: src/commandhandler.cpp:262
 msgid "Command: /createparty <name>"
 msgstr ""
 
-#: src/commandhandler.cpp:254
+#: src/commandhandler.cpp:263
 msgid "This command creates a new party called <name>."
 msgstr ""
 
-#: src/commandhandler.cpp:258
+#: src/commandhandler.cpp:267
 msgid "Command: /party <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:259 src/net/ea/gui/partytab.cpp:74
+#: src/commandhandler.cpp:268 src/net/tmwa/gui/partytab.cpp:74
 msgid "This command invites <nick> to party with you."
 msgstr ""
 
-#: src/commandhandler.cpp:265
+#: src/commandhandler.cpp:274
 msgid "Command: /present"
 msgstr ""
 
-#: src/commandhandler.cpp:266
+#: src/commandhandler.cpp:275
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: src/commandhandler.cpp:272
+#: src/commandhandler.cpp:281
 msgid "Command: /record <filename>"
 msgstr ""
 
-#: src/commandhandler.cpp:273
+#: src/commandhandler.cpp:282
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr ""
 
-#: src/commandhandler.cpp:275
+#: src/commandhandler.cpp:284
 msgid "Command: /record"
 msgstr ""
 
-#: src/commandhandler.cpp:276
+#: src/commandhandler.cpp:285
 msgid "This command finishes a recording session."
 msgstr ""
 
-#: src/commandhandler.cpp:280
+#: src/commandhandler.cpp:289
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: src/commandhandler.cpp:281
+#: src/commandhandler.cpp:290
 msgid ""
 "This command sets whether the return key should toggle the chat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: src/commandhandler.cpp:283
+#: src/commandhandler.cpp:292
 msgid ""
-"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
-"\", \"no\", \"false\" to turn the toggle off."
+"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
+"\"0\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: src/commandhandler.cpp:286
+#: src/commandhandler.cpp:295
 msgid "Command: /toggle"
 msgstr ""
 
-#: src/commandhandler.cpp:287
+#: src/commandhandler.cpp:296
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: src/commandhandler.cpp:291 src/gui/widgets/whispertab.cpp:93
+#: src/commandhandler.cpp:300 src/gui/widgets/whispertab.cpp:95
 msgid "Command: /unignore <player>"
 msgstr ""
 
-#: src/commandhandler.cpp:292
+#: src/commandhandler.cpp:301
 msgid "This command stops ignoring the given player if they are being ignored"
 msgstr ""
 
-#: src/commandhandler.cpp:297
+#: src/commandhandler.cpp:306
 msgid "Command: /where"
 msgstr ""
 
-#: src/commandhandler.cpp:298
+#: src/commandhandler.cpp:307
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: src/commandhandler.cpp:302
+#: src/commandhandler.cpp:311
 msgid "Command: /who"
 msgstr ""
 
-#: src/commandhandler.cpp:303
+#: src/commandhandler.cpp:312
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:309
+#: src/commandhandler.cpp:318
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: src/commandhandler.cpp:375
+#: src/commandhandler.cpp:384
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:383
+#: src/commandhandler.cpp:392
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:397
+#: src/commandhandler.cpp:406
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:410 src/net/ea/gui/partytab.cpp:109
+#: src/commandhandler.cpp:419 src/net/tmwa/gui/partytab.cpp:109
 msgid "Party name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:423 src/commandhandler.cpp:471
-#: src/commandhandler.cpp:493
+#: src/commandhandler.cpp:432 src/commandhandler.cpp:509
+#: src/commandhandler.cpp:531
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:441
+#: src/commandhandler.cpp:450
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:441
+#: src/commandhandler.cpp:450
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:450
+#: src/commandhandler.cpp:459
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:454
+#: src/commandhandler.cpp:463
 msgid "Message now closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:477
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:489
+msgid "Show IP: On"
+msgstr ""
+
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:485
+msgid "Show IP: Off"
+msgstr ""
+
+#: src/commandhandler.cpp:515
 msgid "Player already ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:484
+#: src/commandhandler.cpp:522
 msgid "Player successfully ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:486
+#: src/commandhandler.cpp:524
 msgid "Player could not be ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:501
+#: src/commandhandler.cpp:539
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:506
+#: src/commandhandler.cpp:544
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:508
+#: src/commandhandler.cpp:546
 msgid "Player could not be unignored!"
 msgstr ""
 
@@ -461,40 +475,40 @@ msgstr ""
 msgid "General"
 msgstr "సాధారణ"
 
-#: src/game.cpp:326
+#: src/game.cpp:342
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:331
+#: src/game.cpp:347
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:355
+#: src/game.cpp:378
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:360
+#: src/game.cpp:382
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:705
+#: src/game.cpp:721
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:712
+#: src/game.cpp:726
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:946
+#: src/game.cpp:954
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:947
+#: src/game.cpp:955
 #, c-format
 msgid "Error while loading %s"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:75
+#: src/gui/beingpopup.cpp:76
 #, c-format
 msgid "Party: %s"
 msgstr ""
@@ -503,34 +517,34 @@ msgstr ""
 msgid "Buy"
 msgstr ""
 
-#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
-#: src/gui/sell.cpp:276
+#: src/gui/buy.cpp:69 src/gui/buy.cpp:261 src/gui/sell.cpp:71
+#: src/gui/sell.cpp:288
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "వెల: %s / మొత్తం: %s"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:99 src/gui/npcdialog.cpp:100
-#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:479
+#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:112 src/gui/npcdialog.cpp:124
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:463
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:98 src/gui/npcdialog.cpp:101
-#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:491
+#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:111 src/gui/npcdialog.cpp:125
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:475
 msgid "-"
 msgstr ""
 
 #: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
-#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:182
-#: src/keyboardconfig.cpp:103
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:228
+#: src/keyboardconfig.cpp:102
 msgid "Quit"
 msgstr "నిష్క్రమించు"
 
-#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:408
-#: src/gui/statuswindow.cpp:478 src/gui/statuswindow.cpp:512
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:384
+#: src/gui/statuswindow.cpp:462 src/gui/statuswindow.cpp:496
 msgid "Max"
 msgstr "గరిష్ఠ"
 
@@ -544,11 +558,11 @@ msgstr ""
 
 #: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
 #: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
-#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:101
-#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:178
-#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:402
+#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:114
+#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:389
 #: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
-#: src/gui/socialwindow.cpp:242 src/gui/textdialog.cpp:39
+#: src/gui/socialwindow.cpp:275 src/gui/textdialog.cpp:40
 #: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr "రద్దుచేయి"
@@ -585,7 +599,7 @@ msgstr ""
 msgid "Change Password"
 msgstr "సంకేతపదాన్ని మార్చు"
 
-#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:53
+#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:55
 #: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
 msgid "Password:"
 msgstr "సంకేతపదం:"
@@ -616,19 +630,19 @@ msgstr ""
 msgid "Create Character"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:52
+#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:54
 #: src/gui/register.cpp:67
 msgid "Name:"
 msgstr "పేరు:"
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
 #: src/gui/outfitwindow.cpp:67
 msgid ">"
 msgstr ""
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
 #: src/gui/outfitwindow.cpp:66
@@ -645,8 +659,8 @@ msgstr "వెంట్రుకల రంగు:"
 msgid "Hair style:"
 msgstr "వెంట్రుకల శైలి:"
 
-#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:397
-#: src/gui/socialwindow.cpp:296
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:392
+#: src/gui/socialwindow.cpp:329
 msgid "Create"
 msgstr "సృష్టించు"
 
@@ -702,34 +716,34 @@ msgstr ""
 msgid "Change Email"
 msgstr "ఈమెయిల్ చిరునామాని మార్చు"
 
-#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:185
-#: src/gui/setup_players.cpp:230
+#: src/gui/charselectdialog.cpp:336 src/gui/serverdialog.cpp:231
+#: src/gui/setup_players.cpp:229
 msgid "Delete"
 msgstr "తొలగించు"
 
-#: src/gui/charselectdialog.cpp:387
+#: src/gui/charselectdialog.cpp:380
 #, fuzzy
 msgid "Choose"
 msgstr "రంగులు"
 
-#: src/gui/charselectdialog.cpp:399 src/gui/charselectdialog.cpp:400
+#: src/gui/charselectdialog.cpp:394 src/gui/charselectdialog.cpp:395
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:77 src/gui/palette.cpp:96
+#: src/gui/chat.cpp:88
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chat.cpp:287
+#: src/gui/chat.cpp:311
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:305
+#: src/gui/chat.cpp:329
 msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:469
+#: src/gui/chat.cpp:493
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -791,140 +805,170 @@ msgstr "వెల: %s / మొత్తం: %s"
 msgid "Ambient FX: %s"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:56
+#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:55
 msgid "Equipment"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:77
-#: src/gui/inventorywindow.cpp:79 src/gui/inventorywindow.cpp:298
-#: src/gui/popupmenu.cpp:372
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:89
+#: src/gui/inventorywindow.cpp:337 src/gui/popupmenu.cpp:359
 msgid "Unequip"
 msgstr ""
 
-#: src/gui/help.cpp:36
+#: src/gui/help.cpp:37
 msgid "Help"
 msgstr "సహాయం"
 
-#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:73
+#: src/gui/help.cpp:51 src/gui/npcdialog.cpp:50
 msgid "Close"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:56 src/gui/windowmenu.cpp:57
+#: src/gui/inventorywindow.cpp:59 src/gui/windowmenu.cpp:56
 msgid "Inventory"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:72 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:300 src/gui/popupmenu.cpp:374
+#: src/gui/inventorywindow.cpp:59
+msgid "Storage"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:82
+msgid "Slots:"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:87 src/gui/inventorywindow.cpp:100
+#: src/gui/inventorywindow.cpp:339 src/gui/popupmenu.cpp:361
 msgid "Equip"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:304 src/gui/popupmenu.cpp:377
+#: src/gui/inventorywindow.cpp:88
 msgid "Use"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:83 src/gui/inventorywindow.cpp:308
-#: src/gui/popupmenu.cpp:380
+#: src/gui/inventorywindow.cpp:101 src/gui/popupmenu.cpp:364
+msgid "Activate"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:102 src/gui/inventorywindow.cpp:348
+#: src/gui/popupmenu.cpp:367
 msgid "Drop..."
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:84 src/gui/popupmenu.cpp:386
+#: src/gui/inventorywindow.cpp:103 src/gui/popupmenu.cpp:373
 msgid "Split"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:85 src/gui/outfitwindow.cpp:51
+#: src/gui/inventorywindow.cpp:104 src/gui/outfitwindow.cpp:51
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:96 src/gui/storagewindow.cpp:83
-msgid "Slots:"
-msgstr ""
-
-#: src/gui/inventorywindow.cpp:97
+#: src/gui/inventorywindow.cpp:106
 msgid "Weight:"
 msgstr "బరువు:"
 
-#: src/gui/inventorywindow.cpp:310 src/gui/popupmenu.cpp:382
+#: src/gui/inventorywindow.cpp:124 src/gui/popupmenu.cpp:378
+msgid "Store"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:125 src/gui/popupmenu.cpp:385
+msgid "Retrieve"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:350 src/gui/popupmenu.cpp:369
 msgid "Drop"
 msgstr ""
 
-#: src/gui/itemamount.cpp:100 src/gui/okdialog.cpp:42
-#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:38 src/gui/trade.cpp:73
-#: src/gui/trade.cpp:75
+#: src/gui/itemamount.cpp:113 src/gui/okdialog.cpp:42
+#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:39 src/gui/trade.cpp:72
+#: src/gui/trade.cpp:74
 msgid "OK"
 msgstr "సరే"
 
-#: src/gui/itemamount.cpp:102
+#: src/gui/itemamount.cpp:115
 msgid "All"
 msgstr "అన్నీ"
 
-#: src/gui/itemamount.cpp:128
+#: src/gui/itemamount.cpp:141
 msgid "Select amount of items to trade."
 msgstr ""
 
-#: src/gui/itemamount.cpp:131
+#: src/gui/itemamount.cpp:144
 msgid "Select amount of items to drop."
 msgstr ""
 
-#: src/gui/itemamount.cpp:134
+#: src/gui/itemamount.cpp:147
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/itemamount.cpp:137
+#: src/gui/itemamount.cpp:150
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamount.cpp:140
+#: src/gui/itemamount.cpp:153
 msgid "Select amount of items to split."
 msgstr ""
 
-#: src/gui/itempopup.cpp:92
+#: src/gui/itempopup.cpp:137
 #, fuzzy, c-format
 msgid "Weight: %s"
 msgstr "బరువు: "
 
-#: src/gui/login.cpp:49 src/gui/login.cpp:61
+#: src/gui/login.cpp:51 src/gui/login.cpp:63
 msgid "Login"
 msgstr "ప్రవేశించు"
 
-#: src/gui/login.cpp:58
+#: src/gui/login.cpp:60
 msgid "Remember username"
 msgstr ""
 
-#: src/gui/login.cpp:59 src/gui/register.cpp:58 src/gui/register.cpp:73
+#: src/gui/login.cpp:61 src/gui/register.cpp:58 src/gui/register.cpp:73
 msgid "Register"
 msgstr ""
 
-#: src/gui/login.cpp:60
+#: src/gui/login.cpp:62
 msgid "Change Server"
 msgstr ""
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
+#: src/gui/login.cpp:129
+msgid "Registration disabled"
+msgstr ""
+
+#: src/gui/login.cpp:129
+msgid "You need to use the website to register an account for this server."
+msgstr ""
+
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:86
 msgid "Map"
 msgstr "పటం"
 
-#: src/gui/npcdialog.cpp:44
+#: src/gui/ministatus.cpp:235
+msgid "Need"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:48
 msgid "Waiting for server"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:45
+#: src/gui/npcdialog.cpp:49
 msgid "Next"
 msgstr "తదుపరి"
 
-#: src/gui/npcdialog.cpp:47
+#: src/gui/npcdialog.cpp:51
 msgid "Submit"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:52 src/gui/npcpostdialog.cpp:41
+#: src/gui/npcdialog.cpp:73 src/gui/npcpostdialog.cpp:41
 msgid "NPC"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:110
+#: src/gui/npcdialog.cpp:118
+msgid "Clear log"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:134
 msgid "Reset"
 msgstr ""
 
 #. TRANSLATORS: Please leave the \n sequences intact.
-#: src/gui/npcdialog.cpp:171
+#: src/gui/npcdialog.cpp:208
 #, fuzzy
 msgid ""
 "\n"
@@ -939,7 +983,7 @@ msgstr ""
 msgid "Send"
 msgstr "పంపించు"
 
-#: src/gui/npcpostdialog.cpp:96
+#: src/gui/npcpostdialog.cpp:99
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
@@ -953,303 +997,82 @@ msgstr ""
 msgid "Unequip first"
 msgstr ""
 
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:143
-msgid "Text"
-msgstr "పాఠ్యం"
-
-#: src/gui/palette.cpp:82
-msgid "Text Shadow"
-msgstr "పాఠ్యపు నీడ"
-
-#: src/gui/palette.cpp:83
-msgid "Text Outline"
-msgstr ""
-
-#: src/gui/palette.cpp:84
-msgid "Progress Bar Labels"
-msgstr ""
-
-#: src/gui/palette.cpp:85
-msgid "Buttons"
-msgstr ""
-
-#: src/gui/palette.cpp:86
-msgid "Disabled Buttons"
-msgstr ""
-
-#: src/gui/palette.cpp:87
-msgid "Tabs"
-msgstr ""
-
-#: src/gui/palette.cpp:89
-msgid "Background"
-msgstr "నేపథ్యం"
-
-#: src/gui/palette.cpp:91
-msgid "Highlight"
-msgstr ""
-
-#: src/gui/palette.cpp:92
-msgid "Tab Highlight"
-msgstr ""
-
-#: src/gui/palette.cpp:93
-msgid "Item Too Expensive"
-msgstr ""
-
-#: src/gui/palette.cpp:94
-msgid "Item Is Equipped"
-msgstr ""
-
-#: src/gui/palette.cpp:97
-msgid "GM"
-msgstr ""
-
-#: src/gui/palette.cpp:98
-msgid "Player"
-msgstr "ఆటగాడు"
-
-#: src/gui/palette.cpp:99
-msgid "Whisper"
-msgstr ""
-
-#: src/gui/palette.cpp:100
-msgid "Is"
-msgstr ""
-
-#: src/gui/palette.cpp:101 src/net/ea/gui/partytab.cpp:43
-msgid "Party"
-msgstr ""
-
-#: src/gui/palette.cpp:102 src/net/ea/gui/guildtab.cpp:45
-msgid "Guild"
-msgstr ""
-
-#: src/gui/palette.cpp:103
-msgid "Server"
-msgstr ""
-
-#: src/gui/palette.cpp:104
-msgid "Logger"
-msgstr ""
-
-#: src/gui/palette.cpp:105
-msgid "Hyperlink"
-msgstr ""
-
-#: src/gui/palette.cpp:107
-msgid "Being"
-msgstr ""
-
-#: src/gui/palette.cpp:108
-msgid "Other Players' Names"
-msgstr ""
-
-#: src/gui/palette.cpp:109
-msgid "Own Name"
-msgstr ""
-
-#: src/gui/palette.cpp:110
-msgid "GM Names"
-msgstr ""
-
-#: src/gui/palette.cpp:111
-msgid "NPCs"
-msgstr ""
-
-#: src/gui/palette.cpp:112
-msgid "Monsters"
-msgstr ""
-
-#: src/gui/palette.cpp:114
-msgid "Unknown Item Type"
-msgstr ""
-
-#: src/gui/palette.cpp:115
-msgid "Generics"
-msgstr ""
-
-#: src/gui/palette.cpp:116
-msgid "Hats"
-msgstr ""
-
-#: src/gui/palette.cpp:117
-msgid "Usables"
-msgstr ""
-
-#: src/gui/palette.cpp:118
-msgid "Shirts"
-msgstr "చొక్కాలు"
-
-#: src/gui/palette.cpp:119
-msgid "One Handed Weapons"
-msgstr ""
-
-#: src/gui/palette.cpp:120
-msgid "Pants"
-msgstr ""
-
-#: src/gui/palette.cpp:121
-msgid "Shoes"
-msgstr "బూట్లు"
-
-#: src/gui/palette.cpp:122
-msgid "Two Handed Weapons"
-msgstr ""
-
-#: src/gui/palette.cpp:123
-msgid "Shields"
-msgstr ""
-
-#: src/gui/palette.cpp:124
-msgid "Rings"
-msgstr "ఉంగరాలు"
-
-#: src/gui/palette.cpp:125
-msgid "Necklaces"
-msgstr ""
-
-#: src/gui/palette.cpp:126
-msgid "Arms"
-msgstr ""
-
-#: src/gui/palette.cpp:127
-msgid "Ammo"
-msgstr ""
-
-#: src/gui/palette.cpp:129
-msgid "Particle Effects"
-msgstr ""
-
-#: src/gui/palette.cpp:130
-msgid "Pickup Notification"
-msgstr ""
-
-#: src/gui/palette.cpp:131
-msgid "Exp Notification"
-msgstr ""
-
-#: src/gui/palette.cpp:133
-msgid "Player Hits Monster"
-msgstr ""
-
-#: src/gui/palette.cpp:135
-msgid "Monster Hits Player"
-msgstr ""
-
-#: src/gui/palette.cpp:136
-msgid "Critical Hit"
-msgstr ""
-
-#: src/gui/palette.cpp:137
-msgid "Misses"
-msgstr ""
-
-#: src/gui/palette.cpp:139
-msgid "HP Bar"
-msgstr ""
-
-#: src/gui/palette.cpp:140
-msgid "3/4 HP Bar"
-msgstr ""
-
-#: src/gui/palette.cpp:141
-msgid "1/2 HP Bar"
-msgstr ""
-
-#: src/gui/palette.cpp:142
-msgid "1/4 HP Bar"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:84
+#: src/gui/popupmenu.cpp:83
 #, c-format
 msgid "Trade with %s..."
 msgstr ""
 
-#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:161
+#: src/gui/popupmenu.cpp:87 src/gui/popupmenu.cpp:158
 #, c-format
 msgid "Attack %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:92
+#: src/gui/popupmenu.cpp:91
 #, c-format
 msgid "Whisper %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:101
+#: src/gui/popupmenu.cpp:100
 #, c-format
 msgid "Befriend %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:106
+#: src/gui/popupmenu.cpp:105
 #, c-format
 msgid "Disregard %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:109
+#: src/gui/popupmenu.cpp:108
 #, c-format
 msgid "Ignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:115 src/gui/popupmenu.cpp:124
+#: src/gui/popupmenu.cpp:114 src/gui/popupmenu.cpp:123
 #, c-format
 msgid "Unignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:118
+#: src/gui/popupmenu.cpp:117
 #, c-format
 msgid "Completely ignore %s"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:130
 #, c-format
-msgid "Follow %s"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:133
-#, c-format
 msgid "Invite %s to join your guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:137
+#: src/gui/popupmenu.cpp:134
 #, c-format
 msgid "Invite %s to join your party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144
+#: src/gui/popupmenu.cpp:141
 msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:153
+#: src/gui/popupmenu.cpp:150
 #, c-format
 msgid "Talk to %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:166
+#: src/gui/popupmenu.cpp:163
 msgid "Kick monster"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:174
+#: src/gui/popupmenu.cpp:171
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:191
+#: src/gui/popupmenu.cpp:188
 #, c-format
 msgid "Pick up %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:400
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:387
 msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:70
-msgid "Store"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:71
-msgid "Retrieve"
-msgstr ""
-
 #: src/gui/quitdialog.cpp:44
 msgid "Switch server"
 msgstr ""
@@ -1318,47 +1141,60 @@ msgstr ""
 msgid "Passwords do not match."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:134
+#: src/gui/serverdialog.cpp:197
 msgid "Choose Your Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:141 src/gui/widgets/chattab.cpp:139
+#: src/gui/serverdialog.cpp:206 src/gui/widgets/chattab.cpp:142
 msgid "Server:"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:142
+#: src/gui/serverdialog.cpp:207
 msgid "Port:"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:143
+#: src/gui/serverdialog.cpp:208
 msgid "Server type:"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:183
+#: src/gui/serverdialog.cpp:229
 msgid "Connect"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:184
+#: src/gui/serverdialog.cpp:230
 msgid "Custom Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:262
+#: src/gui/serverdialog.cpp:324
 msgid "Please type both the address and the port of a server."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:411
+#: src/gui/serverdialog.cpp:441
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:417
+#: src/gui/serverdialog.cpp:447
 msgid "Waiting for server..."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:421
+#: src/gui/serverdialog.cpp:451
 msgid "Preparing download"
 msgstr ""
 
+#: src/gui/serverdialog.cpp:455
+msgid "Error retreiving server list!"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:550
+msgid "requires a newer version"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:552
+#, c-format
+msgid "requires v%s"
+msgstr ""
+
 #: src/gui/setup_audio.cpp:42
 msgid "Sound"
 msgstr ""
@@ -1391,51 +1227,51 @@ msgstr ""
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:44
+#: src/gui/setup_colors.cpp:46
 msgid "This is what the color looks like"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:49
+#: src/gui/setup_colors.cpp:51
 msgid "Colors"
 msgstr "రంగులు"
 
-#: src/gui/setup_colors.cpp:70
+#: src/gui/setup_colors.cpp:72
 #, fuzzy
 msgid "Type:"
 msgstr "రకం: "
 
-#: src/gui/setup_colors.cpp:81 src/gui/setup_colors.cpp:433
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:331
 msgid "Static"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:84
-#: src/gui/setup_colors.cpp:434
+#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
+#: src/gui/setup_colors.cpp:332
 msgid "Pulse"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
+#: src/gui/setup_colors.cpp:333
 msgid "Rainbow"
 msgstr "ఇంద్ర ధనస్సు"
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
+#: src/gui/setup_colors.cpp:333
 msgid "Spectrum"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:92
+#: src/gui/setup_colors.cpp:94
 msgid "Delay:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:107
+#: src/gui/setup_colors.cpp:109
 msgid "Red:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:122
+#: src/gui/setup_colors.cpp:124
 msgid "Green:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:137
+#: src/gui/setup_colors.cpp:139
 msgid "Blue:"
 msgstr ""
 
@@ -1480,565 +1316,578 @@ msgid "Assign"
 msgstr ""
 
 #: src/gui/setup_keyboard.cpp:90
+msgid "Unassign"
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:94
 msgid "Default"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:119
+#: src/gui/setup_keyboard.cpp:125
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_players.cpp:57
+#: src/gui/setup_players.cpp:58
 msgid "Name"
 msgstr "పేరు"
 
-#: src/gui/setup_players.cpp:58
+#: src/gui/setup_players.cpp:59
 msgid "Relation"
 msgstr ""
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:64
 msgid "Neutral"
 msgstr ""
 
-#: src/gui/setup_players.cpp:64
+#: src/gui/setup_players.cpp:65
 msgid "Friend"
 msgstr ""
 
-#: src/gui/setup_players.cpp:65
+#: src/gui/setup_players.cpp:66
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_players.cpp:67
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_players.cpp:208 src/gui/setup_video.cpp:132
+#: src/gui/setup_players.cpp:206 src/gui/setup_video.cpp:153
 msgid "???"
 msgstr "???"
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_players.cpp:225
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_players.cpp:228
+#: src/gui/setup_players.cpp:227
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:231
 msgid "Put all whispers in tabs"
 msgstr ""
 
-#: src/gui/setup_players.cpp:234
+#: src/gui/setup_players.cpp:233
 msgid "Show gender"
 msgstr ""
 
-#: src/gui/setup_players.cpp:236
+#: src/gui/setup_players.cpp:235
+msgid "Enable Chat log"
+msgstr ""
+
+#: src/gui/setup_players.cpp:237
 msgid "Players"
 msgstr "ఆటగాళ్ళు"
 
-#: src/gui/setup_players.cpp:261
+#: src/gui/setup_players.cpp:262
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:113
+#: src/gui/setup_video.cpp:134
 msgid "Tiny"
 msgstr ""
 
-#: src/gui/setup_video.cpp:114
+#: src/gui/setup_video.cpp:135
 msgid "Small"
 msgstr ""
 
-#: src/gui/setup_video.cpp:115
+#: src/gui/setup_video.cpp:136
 msgid "Medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:116
+#: src/gui/setup_video.cpp:137
 msgid "Large"
 msgstr ""
 
-#: src/gui/setup_video.cpp:142
+#: src/gui/setup_video.cpp:163
 msgid "No text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:144
+#: src/gui/setup_video.cpp:164
+msgid "Text"
+msgstr "పాఠ్యం"
+
+#: src/gui/setup_video.cpp:165
 msgid "Bubbles, no names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:145
+#: src/gui/setup_video.cpp:166
 msgid "Bubbles with names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:157
+#: src/gui/setup_video.cpp:178
 msgid "off"
 msgstr ""
 
-#: src/gui/setup_video.cpp:158 src/gui/setup_video.cpp:171
+#: src/gui/setup_video.cpp:179 src/gui/setup_video.cpp:192
 msgid "low"
 msgstr ""
 
-#: src/gui/setup_video.cpp:159 src/gui/setup_video.cpp:173
+#: src/gui/setup_video.cpp:180 src/gui/setup_video.cpp:194
 msgid "high"
 msgstr ""
 
-#: src/gui/setup_video.cpp:172
+#: src/gui/setup_video.cpp:193
 msgid "medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:174
+#: src/gui/setup_video.cpp:195
 msgid "max"
 msgstr "గరిష్ఠ"
 
-#: src/gui/setup_video.cpp:196
+#: src/gui/setup_video.cpp:217
 msgid "Full screen"
 msgstr "నిండుతెర"
 
-#: src/gui/setup_video.cpp:197
+#: src/gui/setup_video.cpp:218
 msgid "OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:198
+#: src/gui/setup_video.cpp:219
 msgid "Custom cursor"
 msgstr ""
 
-#: src/gui/setup_video.cpp:200
+#: src/gui/setup_video.cpp:221
 msgid "Visible names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:223
 msgid "Particle effects"
 msgstr ""
 
-#: src/gui/setup_video.cpp:204
+#: src/gui/setup_video.cpp:225
 msgid "Show own name"
 msgstr ""
 
-#: src/gui/setup_video.cpp:205
+#: src/gui/setup_video.cpp:226
+msgid "Log NPC dialogue"
+msgstr ""
+
+#: src/gui/setup_video.cpp:227
 msgid "Show pickup notification"
 msgstr ""
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:207
+#. TRANSLATORS: Refers to "Show pickup notification"
+#: src/gui/setup_video.cpp:229
 msgid "in chat"
 msgstr ""
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:209
+#. TRANSLATORS: Refers to "Show pickup notification"
+#: src/gui/setup_video.cpp:231
 msgid "as particle"
 msgstr ""
 
-#: src/gui/setup_video.cpp:214
+#: src/gui/setup_video.cpp:236
 msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:225
+#: src/gui/setup_video.cpp:247
+msgid "Disable transparency (Low CPU mode)"
+msgstr ""
+
+#: src/gui/setup_video.cpp:250
 msgid "Video"
 msgstr ""
 
-#: src/gui/setup_video.cpp:227
-msgid "Show monster damage"
+#: src/gui/setup_video.cpp:252
+msgid "Show damage"
 msgstr ""
 
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:258
 msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:259
 msgid "Gui opacity"
 msgstr ""
 
-#: src/gui/setup_video.cpp:235
+#: src/gui/setup_video.cpp:260
 msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_video.cpp:236
+#: src/gui/setup_video.cpp:261
 msgid "Particle detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237
+#: src/gui/setup_video.cpp:262
 msgid "Font size"
 msgstr ""
 
-#: src/gui/setup_video.cpp:251 src/gui/setup_video.cpp:454
-#: src/gui/setup_video.cpp:568
+#: src/gui/setup_video.cpp:277 src/gui/setup_video.cpp:532
+#: src/gui/setup_video.cpp:662
 #, fuzzy
 msgid "None"
 msgstr "కాదు"
 
-#: src/gui/setup_video.cpp:381
+#: src/gui/setup_video.cpp:426
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:387
+#: src/gui/setup_video.cpp:432
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:398
+#: src/gui/setup_video.cpp:443
 msgid "Switching to Full Screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:399
+#: src/gui/setup_video.cpp:444
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:411
+#: src/gui/setup_video.cpp:458
 msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:412
+#: src/gui/setup_video.cpp:459
+msgid ""
+"Applying change to OpenGL requires restart. In case OpenGL messes up your "
+"game graphics, restart the game with the command line option \"--no-opengl\"."
+msgstr ""
+
+#: src/gui/setup_video.cpp:466
+msgid "Deactivating OpenGL"
+msgstr ""
+
+#: src/gui/setup_video.cpp:467
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#: src/gui/setup_video.cpp:486 src/gui/setup_video.cpp:491
+#: src/gui/setup_video.cpp:475
+msgid "Transparency disabled"
+msgstr ""
+
+#: src/gui/setup_video.cpp:476 src/gui/setup_video.cpp:484
+msgid "You must restart to apply changes."
+msgstr ""
+
+#: src/gui/setup_video.cpp:483
+msgid "Transparency enabled"
+msgstr ""
+
+#: src/gui/setup_video.cpp:576 src/gui/setup_video.cpp:581
 msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:487 src/gui/setup_video.cpp:492
+#: src/gui/setup_video.cpp:577 src/gui/setup_video.cpp:582
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:489
+#: src/gui/setup_video.cpp:579
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:522
+#: src/gui/setup_video.cpp:612
 msgid "Particle Effect Settings Changed."
 msgstr ""
 
-#: src/gui/setup_video.cpp:523
+#: src/gui/setup_video.cpp:613
 msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skilldialog.cpp:197 src/gui/windowmenu.cpp:58
+#: src/gui/skilldialog.cpp:212 src/gui/windowmenu.cpp:59
 msgid "Skills"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:208
+#: src/gui/skilldialog.cpp:223
 msgid "Up"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:262
+#: src/gui/skilldialog.cpp:269
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:314
+#: src/gui/skilldialog.cpp:351
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:323
+#: src/gui/skilldialog.cpp:360
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:405
+#: src/gui/skilldialog.cpp:442
 #, fuzzy, c-format
 msgid "Lvl: %d (%+d)"
 msgstr "స్థాయి: %d"
 
-#: src/gui/skilldialog.cpp:416
+#: src/gui/skilldialog.cpp:453
 #, fuzzy, c-format
 msgid "Lvl: %d"
 msgstr "స్థాయి: %d"
 
-#: src/gui/socialwindow.cpp:117
+#: src/gui/socialwindow.cpp:126
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:126
+#: src/gui/socialwindow.cpp:139
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:136
+#: src/gui/socialwindow.cpp:153
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:137
+#: src/gui/socialwindow.cpp:154
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:146
+#: src/gui/socialwindow.cpp:163
 msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:147
+#: src/gui/socialwindow.cpp:164
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:182
+#: src/gui/socialwindow.cpp:207 src/net/tmwa/partyhandler.cpp:330
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:218
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:199
+#: src/gui/socialwindow.cpp:232
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:200
+#: src/gui/socialwindow.cpp:233
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:209
+#: src/gui/socialwindow.cpp:242
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:210
+#: src/gui/socialwindow.cpp:243
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:239
+#: src/gui/socialwindow.cpp:272
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:240 src/gui/socialwindow.cpp:564
+#: src/gui/socialwindow.cpp:273 src/gui/socialwindow.cpp:620
 #, fuzzy
 msgid "Create Party"
 msgstr "సృష్టించు"
 
-#: src/gui/socialwindow.cpp:279 src/gui/windowmenu.cpp:60
+#: src/gui/socialwindow.cpp:312 src/gui/windowmenu.cpp:64
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:297
+#: src/gui/socialwindow.cpp:330
 msgid "Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:298
+#: src/gui/socialwindow.cpp:331
 msgid "Leave"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:394
+#: src/gui/socialwindow.cpp:443
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:400
+#: src/gui/socialwindow.cpp:449
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:413
+#: src/gui/socialwindow.cpp:462
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:419
+#: src/gui/socialwindow.cpp:468
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:463
+#: src/gui/socialwindow.cpp:497
+msgid "Creating guild failed, please choose a shorter name."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:504
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:477
+#: src/gui/socialwindow.cpp:520
+msgid "Creating party failed, please choose a shorter name."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:527
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:484
+#: src/gui/socialwindow.cpp:541
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:485
+#: src/gui/socialwindow.cpp:542
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:497
+#: src/gui/socialwindow.cpp:554
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:502
+#: src/gui/socialwindow.cpp:559
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:507
+#: src/gui/socialwindow.cpp:564
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:519
+#: src/gui/socialwindow.cpp:576
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:529
+#: src/gui/socialwindow.cpp:585
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:533
+#: src/gui/socialwindow.cpp:589
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:541
+#: src/gui/socialwindow.cpp:597
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:546
+#: src/gui/socialwindow.cpp:602
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:554
+#: src/gui/socialwindow.cpp:610
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:565
+#: src/gui/socialwindow.cpp:621
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:570
+#: src/gui/socialwindow.cpp:626
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:571
+#: src/gui/socialwindow.cpp:627
 msgid "Choose your party's name."
 msgstr ""
 
-#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:59
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:62
 msgid "Specials"
 msgstr ""
 
-#: src/gui/specialswindow.cpp:174
-#, c-format
-msgid "Specials Set %d"
-msgstr ""
-
-#: src/gui/specialswindow.cpp:191
-#, c-format
-msgid "Special %d"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:99 src/gui/statuswindow.cpp:247
+#: src/gui/statuswindow.cpp:113 src/gui/statuswindow.cpp:215
+#: src/gui/statuswindow.cpp:262
 #, c-format
 msgid "Level: %d"
 msgstr "స్థాయి: %d"
 
-#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:211
+#: src/gui/statuswindow.cpp:114 src/gui/statuswindow.cpp:208
+#: src/gui/statuswindow.cpp:239
 #, c-format
 msgid "Money: %s"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:102
+#: src/gui/statuswindow.cpp:117
 msgid "HP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:107
+#: src/gui/statuswindow.cpp:122
 msgid "Exp:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:112
+#: src/gui/statuswindow.cpp:130
 msgid "MP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:132 src/gui/statuswindow.cpp:219
+#: src/gui/statuswindow.cpp:158 src/gui/statuswindow.cpp:275
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:133
+#: src/gui/statuswindow.cpp:159
 msgid "Job:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:194
-msgid "HP"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:200
-msgid "MP"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:206
-msgid "Exp"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:215
-msgid "Money"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:225
-msgid "Job"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:229
+#: src/gui/statuswindow.cpp:211 src/gui/statuswindow.cpp:247
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:235
+#: src/gui/statuswindow.cpp:255
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:251
-#, fuzzy
-msgid "Level"
-msgstr "స్థాయి: %d"
-
-#: src/gui/storagewindow.cpp:58
-msgid "Storage"
-msgstr ""
-
-#: src/gui/trade.cpp:52
+#: src/gui/trade.cpp:53
 msgid "Propose trade"
 msgstr ""
 
-#: src/gui/trade.cpp:53
+#: src/gui/trade.cpp:54
 msgid "Confirmed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:55
 msgid "Agree trade"
 msgstr ""
 
-#: src/gui/trade.cpp:55
+#: src/gui/trade.cpp:56
 msgid "Agreed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:58
+#: src/gui/trade.cpp:59
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/trade.cpp:74 src/gui/trade.cpp:75
+#: src/gui/trade.cpp:73 src/gui/trade.cpp:74
 msgid "Trade"
 msgstr ""
 
-#: src/gui/trade.cpp:77
+#: src/gui/trade.cpp:76
 msgid "Add"
 msgstr ""
 
-#: src/gui/trade.cpp:99 src/gui/trade.cpp:135
+#: src/gui/trade.cpp:98 src/gui/trade.cpp:134
 #, c-format
 msgid "You get %s"
 msgstr ""
 
-#: src/gui/trade.cpp:100
+#: src/gui/trade.cpp:99
 msgid "You give:"
 msgstr ""
 
-#: src/gui/trade.cpp:104
+#: src/gui/trade.cpp:103
 msgid "Change"
 msgstr ""
 
-#: src/gui/trade.cpp:275
+#: src/gui/trade.cpp:262
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/trade.cpp:318
+#: src/gui/trade.cpp:304
 msgid "You don't have enough money."
 msgstr ""
 
@@ -2059,21 +1908,21 @@ msgstr ""
 msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:405
+#: src/gui/updatewindow.cpp:417
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:407
+#: src/gui/updatewindow.cpp:419
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:409
+#: src/gui/updatewindow.cpp:421
 msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:501
+#: src/gui/updatewindow.cpp:515
 msgid "Completed"
 msgstr ""
 
@@ -2153,61 +2002,61 @@ msgstr ""
 msgid "Need a user to kick!"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:118
+#: src/gui/widgets/chattab.cpp:121
 msgid "Global announcement:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:124
+#: src/gui/widgets/chattab.cpp:127
 #, c-format
 msgid "Global announcement from %s:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:150
+#: src/gui/widgets/chattab.cpp:153
 #, c-format
 msgid "%s whispers: %s"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:51
+#: src/gui/widgets/whispertab.cpp:53
 msgid "Cannot send empty chat!"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:70
+#: src/gui/widgets/whispertab.cpp:72
 msgid "/ignore > Ignore the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:71
+#: src/gui/widgets/whispertab.cpp:73
 msgid "/unignore > Stop ignoring the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:72
+#: src/gui/widgets/whispertab.cpp:74
 msgid "/close > Close the whisper tab"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:82
+#: src/gui/widgets/whispertab.cpp:84
 msgid "Command: /close"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:83
+#: src/gui/widgets/whispertab.cpp:85
 msgid "This command closes the current whisper tab."
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:87
+#: src/gui/widgets/whispertab.cpp:89
 msgid "Command: /ignore"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:88
+#: src/gui/widgets/whispertab.cpp:90
 msgid "This command ignores the other player regardless of current relations."
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:94
+#: src/gui/widgets/whispertab.cpp:96
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:55
+#: src/gui/windowmenu.cpp:54
 msgid "Status"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:61
+#: src/gui/windowmenu.cpp:65
 msgid "Shortcut"
 msgstr ""
 
@@ -2223,1356 +2072,1391 @@ msgstr ""
 msgid "Choose World"
 msgstr ""
 
-#: src/keyboardconfig.cpp:40
+#: src/keyboardconfig.cpp:39
 msgid "Move Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:41
+#: src/keyboardconfig.cpp:40
 msgid "Move Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:41
 msgid "Move Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:42
 msgid "Move Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:44 src/net/ea/generalhandler.cpp:223
+#: src/keyboardconfig.cpp:43 src/net/tmwa/generalhandler.cpp:237
 msgid "Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:44
 msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:45
 msgid "Smilie"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:46
 msgid "Talk"
 msgstr ""
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:47
 msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:48
 msgid "Target Monster"
 msgstr ""
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboardconfig.cpp:49
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:50
 msgid "Target Player"
 msgstr ""
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:51
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:52
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:53
 msgid "Sit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:54
 msgid "Screenshot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:55
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:56
 msgid "Find Path to Mouse"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58 src/keyboardconfig.cpp:59
-#: src/keyboardconfig.cpp:60 src/keyboardconfig.cpp:61
-#: src/keyboardconfig.cpp:62 src/keyboardconfig.cpp:63
-#: src/keyboardconfig.cpp:64 src/keyboardconfig.cpp:65
-#: src/keyboardconfig.cpp:66 src/keyboardconfig.cpp:67
-#: src/keyboardconfig.cpp:68 src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:57 src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60
+#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62
+#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64
+#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68
 #, c-format
 msgid "Item Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:69
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:70
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:71
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:72
 msgid "Equipment Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:73
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:74
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:75
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:76
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:77
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:78
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:79
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:80
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:81
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:83
+#: src/keyboardconfig.cpp:82
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:83
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86
-#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88
-#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90
-#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92
-#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:84 src/keyboardconfig.cpp:85
+#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:87
+#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:89
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:91
+#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:93
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:95
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:96
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:97
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:98
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:99
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:100
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:101
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:103
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:105
+#: src/keyboardconfig.cpp:104
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:178
+#: src/keyboardconfig.cpp:183
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:913
+#: src/localplayer.cpp:985
 msgid "Unable to pick up item."
 msgstr ""
 
 #. TRANSLATORS: This sentence may be translated differently
 #. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:922
+#: src/localplayer.cpp:994
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/main.cpp:43
+#: src/main.cpp:42
 msgid "mana [options] [mana-file]"
 msgstr ""
 
+#: src/main.cpp:43
+msgid "[mana-file] : The mana file is an XML file (.mana)"
+msgstr ""
+
 #: src/main.cpp:44
-msgid "Options:"
+msgid "              used to set custom parameters"
 msgstr ""
 
 #: src/main.cpp:45
+msgid "              to the mana client."
+msgstr ""
+
+#: src/main.cpp:47
+msgid "Options:"
+msgstr ""
+
+#: src/main.cpp:48
 msgid "  -v --version        : Display the version"
 msgstr ""
 
-#: src/main.cpp:46
+#: src/main.cpp:49
 msgid "  -h --help           : Display this help"
 msgstr ""
 
-#: src/main.cpp:47
+#: src/main.cpp:50
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
-#: src/main.cpp:48
+#: src/main.cpp:51
 msgid "  -U --username       : Login with this username"
 msgstr ""
 
-#: src/main.cpp:49
+#: src/main.cpp:52
 msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/main.cpp:50
+#: src/main.cpp:53
 msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/main.cpp:51
+#: src/main.cpp:54
 msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:52
+#: src/main.cpp:55
 msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/main.cpp:53
+#: src/main.cpp:56
 msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/main.cpp:54
+#: src/main.cpp:57
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:56
+#: src/main.cpp:59
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:57
+#: src/main.cpp:60
 msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:58
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
+#: src/main.cpp:61
+msgid "     --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/main.cpp:59
+#: src/main.cpp:62
+msgid "     --chat-log-dir   : Chat log dir to use"
+msgstr ""
+
+#: src/main.cpp:63
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/main.cpp:61
+#: src/main.cpp:65
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:63
+#: src/net/manaserv/beinghandler.cpp:303 src/net/tmwa/playerhandler.cpp:94
+msgid "You are dead."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:304 src/net/tmwa/playerhandler.cpp:95
+msgid "We regret to inform you that your character was killed in battle."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:306 src/net/tmwa/playerhandler.cpp:97
+msgid "You are not that alive anymore."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:307 src/net/tmwa/playerhandler.cpp:98
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:308 src/net/tmwa/playerhandler.cpp:99
+msgid "Game Over!"
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:309 src/net/tmwa/playerhandler.cpp:101
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:311 src/net/tmwa/playerhandler.cpp:103
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:313 src/net/tmwa/playerhandler.cpp:105
+msgid "I guess this did not run too well."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:107
+msgid "Do you want your possessions identified?"
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:109
+msgid "Sadly, no trace of you was ever found..."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:111
+msgid "Annihilated."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:113
+msgid "Looks like you got your head handed to you."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:115
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:323
+msgid "Press OK to respawn."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:324
+msgid "You Died"
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:138 src/net/manaserv/charhandler.cpp:209
+msgid "Not logged in."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:141
+msgid "No empty slot."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:144
+msgid "Invalid name."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:147
+msgid "Character's name already exists."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:150
+msgid "Invalid hairstyle."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:153
+msgid "Invalid hair color."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:156
+msgid "Invalid gender."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:159
+msgid "Character's stats are too high."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:162
+msgid "Character's stats are too low."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:165
+#, c-format
+msgid "At least one statis out of the permitted range: (%u - %u)."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:171 src/net/manaserv/loginhandler.cpp:96
+#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
+#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
+#: src/net/tmwa/loginhandler.cpp:95 src/net/tmwa/loginhandler.cpp:182
+#, fuzzy
+msgid "Unknown error."
+msgstr "గుర్తుతెలియని ఆదేశం."
+
+#: src/net/manaserv/charhandler.cpp:200 src/net/tmwa/charserverhandler.cpp:146
+msgid "Info"
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:200
+msgid "Player deleted."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:212
+msgid "Selection out of range."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:215
+#, fuzzy, c-format
+msgid "Unknown error (%d)."
+msgstr "గుర్తుతెలియని ఆదేశం."
+
+#: src/net/manaserv/charhandler.cpp:250
+msgid "No gameservers are available."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:187 src/net/manaserv/chathandler.cpp:313
+#: src/net/manaserv/guildhandler.cpp:260
+#, c-format
+msgid "Topic: %s"
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:274
+msgid "Players in this channel:"
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:208
+msgid "Error joining channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:214
+msgid "Listing channels."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:226
+msgid "End of channel list."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:303
+#, c-format
+msgid "%s entered the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:308
+#, c-format
+msgid "%s left the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:324
+#, c-format
+msgid "%s has set mode %s on user %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:334
+#, c-format
+msgid "%s has kicked %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:339
+#, fuzzy
+msgid "Unknown channel event."
+msgstr "గుర్తుతెలియని ఆదేశం."
+
+#: src/net/manaserv/guildhandler.cpp:82
+msgid "Guild created."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:87
+msgid "Error creating guild."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:97
+msgid "Invite sent."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:204
+msgid "Member was promoted successfully."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:209
+msgid "Failed to promote member."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:87
+msgid "Wrong magic_token."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
+msgid "Already logged in."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:93
+#, fuzzy
+msgid "Account banned."
+msgstr "ఖాతా: %s"
+
+#: src/net/manaserv/loginhandler.cpp:118
+msgid "New password incorrect."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:121 src/net/tmwa/loginhandler.cpp:89
+msgid "Old password incorrect."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
+msgid "Account not connected. Please login first."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:149
+msgid "New email address incorrect."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:152
+msgid "Old email address incorrect."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:158
+msgid "The new email address already exists."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:239
+msgid ""
+"Client registration is not allowed. Please contact server administration."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
+msgid "Client version is too old."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:266
+msgid "Wrong username or password."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:272
+#, fuzzy
+msgid "Account banned"
+msgstr "ఖాతా: %s"
+
+#: src/net/manaserv/loginhandler.cpp:275
+msgid "Login attempt too soon after previous attempt."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:303
+msgid "Wrong username, password or email address."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:306
+msgid "Username already exists."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:309
+msgid "Email address already exists."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:312
+msgid "You took too long with the captcha or your response was incorrect."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:87
+msgid "Joined party."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:105
+#, c-format
+msgid "%s joined the party."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:123
+#, c-format
+msgid "%s rejected your invite."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:95
+msgid "Accepting incoming trade requests."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:97
+msgid "Ignoring incoming trade requests."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:115 src/net/tmwa/tradehandler.cpp:109
+msgid "Request for Trade"
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:116 src/net/tmwa/tradehandler.cpp:110
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:134
+#, c-format
+msgid "Trading with %s"
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:148 src/net/tmwa/tradehandler.cpp:224
+msgid "Trade canceled."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:155 src/net/tmwa/tradehandler.cpp:231
+msgid "Trade completed."
+msgstr ""
+
+#: src/net/tmwa/adminhandler.cpp:64
 msgid "Kick failed!"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:65
+#: src/net/tmwa/adminhandler.cpp:66
 msgid "Kick succeeded!"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:110
+#: src/net/tmwa/buysellhandler.cpp:109
 msgid "Nothing to sell."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:117
+#: src/net/tmwa/buysellhandler.cpp:116
 msgid "Thanks for buying."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:124
+#: src/net/tmwa/buysellhandler.cpp:123
 msgid "Unable to buy."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:130
+#: src/net/tmwa/buysellhandler.cpp:129
 msgid "Thanks for selling."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:132
+#: src/net/tmwa/buysellhandler.cpp:131
 msgid "Unable to sell."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:103
-msgid "Access denied."
+#: src/net/tmwa/charserverhandler.cpp:103
+msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:106
+#: src/net/tmwa/charserverhandler.cpp:107
 msgid "Cannot use this ID."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:109
-msgid "Unknown failure to select character."
-msgstr ""
+#: src/net/tmwa/charserverhandler.cpp:110
+#, fuzzy
+msgid "Unknown char-server failure."
+msgstr "గుర్తుతెలియని ఆదేశం."
 
-#: src/net/ea/charserverhandler.cpp:135
+#: src/net/tmwa/charserverhandler.cpp:134
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:147 src/net/manaserv/charhandler.cpp:187
-msgid "Info"
-msgstr ""
-
-#: src/net/ea/charserverhandler.cpp:147
+#: src/net/tmwa/charserverhandler.cpp:146
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:152
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Failed to delete character."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:237 src/net/manaserv/charhandler.cpp:263
+#: src/net/tmwa/charserverhandler.cpp:266
 msgid "Strength:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:238 src/net/manaserv/charhandler.cpp:264
+#: src/net/tmwa/charserverhandler.cpp:267
 msgid "Agility:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:239 src/net/manaserv/charhandler.cpp:266
+#: src/net/tmwa/charserverhandler.cpp:268
 msgid "Vitality:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:240 src/net/manaserv/charhandler.cpp:267
+#: src/net/tmwa/charserverhandler.cpp:269
 msgid "Intelligence:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:241 src/net/manaserv/charhandler.cpp:265
+#: src/net/tmwa/charserverhandler.cpp:270
 msgid "Dexterity:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:242
+#: src/net/tmwa/charserverhandler.cpp:271
 msgid "Luck:"
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:80
-msgid "Whisper could not be sent, user is offline."
+#: src/net/tmwa/chathandler.cpp:87
+#, c-format
+msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:84
-msgid "Whisper could not be sent, ignored by user."
+#: src/net/tmwa/chathandler.cpp:96
+#, c-format
+msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:171
+#: src/net/tmwa/chathandler.cpp:230
 #, fuzzy
 msgid "MVP player."
 msgstr "ఆటగాడు"
 
-#: src/net/ea/chathandler.cpp:204 src/net/ea/chathandler.cpp:210
-#: src/net/ea/chathandler.cpp:215 src/net/ea/chathandler.cpp:220
-#: src/net/ea/chathandler.cpp:225 src/net/ea/chathandler.cpp:230
-#: src/net/ea/chathandler.cpp:235 src/net/ea/chathandler.cpp:240
+#: src/net/tmwa/chathandler.cpp:265 src/net/tmwa/chathandler.cpp:271
+#: src/net/tmwa/chathandler.cpp:276 src/net/tmwa/chathandler.cpp:281
+#: src/net/tmwa/chathandler.cpp:286 src/net/tmwa/chathandler.cpp:291
+#: src/net/tmwa/chathandler.cpp:296 src/net/tmwa/chathandler.cpp:301
 msgid "Channels are not supported!"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:86
+#: src/net/tmwa/gamehandler.cpp:88
 #, c-format
 msgid "Online users: %d"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:100
+#: src/net/tmwa/gamehandler.cpp:101
 #, fuzzy
 msgid "Game"
 msgstr "పేరు"
 
-#: src/net/ea/gamehandler.cpp:100
+#: src/net/tmwa/gamehandler.cpp:101
 msgid "Request to quit denied!"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:102 src/net/manaserv/generalhandler.cpp:95
+#: src/net/tmwa/generalhandler.cpp:102
 #, c-format
 msgid "Strength %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:103 src/net/manaserv/generalhandler.cpp:96
+#: src/net/tmwa/generalhandler.cpp:103
 #, c-format
 msgid "Agility %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:104 src/net/manaserv/generalhandler.cpp:98
+#: src/net/tmwa/generalhandler.cpp:104
 #, c-format
 msgid "Vitality %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:105 src/net/manaserv/generalhandler.cpp:99
+#: src/net/tmwa/generalhandler.cpp:105
 #, c-format
 msgid "Intelligence %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:106 src/net/manaserv/generalhandler.cpp:97
+#: src/net/tmwa/generalhandler.cpp:106
 #, c-format
 msgid "Dexterity %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:107
+#: src/net/tmwa/generalhandler.cpp:107
 #, c-format
 msgid "Luck %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:130
+#: src/net/tmwa/generalhandler.cpp:132
 msgid "Authentication failed."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:133
+#: src/net/tmwa/generalhandler.cpp:135
 msgid "No servers available."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:137
+#: src/net/tmwa/generalhandler.cpp:139
 msgid "Someone else is trying to use this account."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:140
+#: src/net/tmwa/generalhandler.cpp:142
 msgid "This account is already logged in."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:143
+#: src/net/tmwa/generalhandler.cpp:145
 msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:146
+#: src/net/tmwa/generalhandler.cpp:148
 msgid "Duplicated login."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:149
+#: src/net/tmwa/generalhandler.cpp:151
 msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:205
+#: src/net/tmwa/generalhandler.cpp:209
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:216 src/net/manaserv/generalhandler.cpp:166
+#: src/net/tmwa/generalhandler.cpp:230
 msgid "Strength"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:217 src/net/manaserv/generalhandler.cpp:167
+#: src/net/tmwa/generalhandler.cpp:231
 msgid "Agility"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:218 src/net/manaserv/generalhandler.cpp:169
+#: src/net/tmwa/generalhandler.cpp:232
 msgid "Vitality"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:219 src/net/manaserv/generalhandler.cpp:170
+#: src/net/tmwa/generalhandler.cpp:233
 msgid "Intelligence"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:220 src/net/manaserv/generalhandler.cpp:168
+#: src/net/tmwa/generalhandler.cpp:234
 msgid "Dexterity"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:221
+#: src/net/tmwa/generalhandler.cpp:235
 msgid "Luck"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:224
+#: src/net/tmwa/generalhandler.cpp:238
 #, fuzzy
 msgid "Defense"
 msgstr "తొలగించు"
 
-#: src/net/ea/generalhandler.cpp:225
+#: src/net/tmwa/generalhandler.cpp:239
 msgid "M.Attack"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:226
+#: src/net/tmwa/generalhandler.cpp:240
 msgid "M.Defense"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:227
+#: src/net/tmwa/generalhandler.cpp:241
 #, c-format
 msgid "% Accuracy"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:228
+#: src/net/tmwa/generalhandler.cpp:242
 #, c-format
 msgid "% Evade"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:229
+#: src/net/tmwa/generalhandler.cpp:243
 #, c-format
 msgid "% Critical"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:61 src/net/ea/gui/partytab.cpp:59
+#: src/net/tmwa/gui/guildtab.cpp:45
+msgid "Guild"
+msgstr ""
+
+#: src/net/tmwa/gui/guildtab.cpp:61 src/net/tmwa/gui/partytab.cpp:59
 msgid "/help > Display this help."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:62
+#: src/net/tmwa/gui/guildtab.cpp:62
 msgid "/invite > Invite a player to your guild"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:63
+#: src/net/tmwa/gui/guildtab.cpp:63
 msgid "/leave > Leave the guild you are in"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:64
+#: src/net/tmwa/gui/guildtab.cpp:64
 msgid "/kick > Kick some one from the guild you are in"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:73 src/net/ea/gui/partytab.cpp:73
+#: src/net/tmwa/gui/guildtab.cpp:73 src/net/tmwa/gui/partytab.cpp:73
 msgid "Command: /invite <nick>"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:74
+#: src/net/tmwa/gui/guildtab.cpp:74
 msgid "This command invites <nick> to the guild you're in."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:80 src/net/ea/gui/partytab.cpp:80
+#: src/net/tmwa/gui/guildtab.cpp:80 src/net/tmwa/gui/partytab.cpp:80
 msgid "Command: /leave"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:81
+#: src/net/tmwa/gui/guildtab.cpp:81
 msgid "This command causes the player to leave the guild."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:89
+#: src/net/tmwa/gui/guildtab.cpp:89
 msgid "Guild name is missing."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:293
+#: src/net/tmwa/guildhandler.cpp:296
 msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:298
+#: src/net/tmwa/guildhandler.cpp:301
 msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:303
+#: src/net/tmwa/guildhandler.cpp:306
 msgid "User is now part of your guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:308
+#: src/net/tmwa/guildhandler.cpp:311
 msgid "Your guild is full."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:313
+#: src/net/tmwa/guildhandler.cpp:316
 msgid "Unknown guild invite response."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:390
+#: src/net/tmwa/guildhandler.cpp:393
 msgid "Guild creation isn't supported yet."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:60
+#: src/net/tmwa/gui/partytab.cpp:43
+msgid "Party"
+msgstr ""
+
+#: src/net/tmwa/gui/partytab.cpp:60
 msgid "/invite > Invite a player to your party"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:61
+#: src/net/tmwa/gui/partytab.cpp:61
 msgid "/leave > Leave the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:62
+#: src/net/tmwa/gui/partytab.cpp:62
 msgid "/kick > Kick some one from the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:63
+#: src/net/tmwa/gui/partytab.cpp:63
 msgid "/item > Show/change party item sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:64
+#: src/net/tmwa/gui/partytab.cpp:64
 msgid "/exp > Show/change party experience sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:81
+#: src/net/tmwa/gui/partytab.cpp:81
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:85
+#: src/net/tmwa/gui/partytab.cpp:85
 msgid "Command: /item <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:86
+#: src/net/tmwa/gui/partytab.cpp:86
 msgid "This command changes the party's item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:87
+#: src/net/tmwa/gui/partytab.cpp:87
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:90
+#: src/net/tmwa/gui/partytab.cpp:90
 msgid "Command: /item"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/tmwa/gui/partytab.cpp:91
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/tmwa/gui/partytab.cpp:95
 msgid "Command: /exp <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:96
+#: src/net/tmwa/gui/partytab.cpp:96
 msgid "This command changes the party's experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/tmwa/gui/partytab.cpp:97
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:100
+#: src/net/tmwa/gui/partytab.cpp:100
 msgid "Command: /exp"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/tmwa/gui/partytab.cpp:101
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:132 src/net/ea/partyhandler.cpp:198
+#: src/net/tmwa/gui/partytab.cpp:132 src/net/tmwa/partyhandler.cpp:196
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:135 src/net/ea/partyhandler.cpp:204
+#: src/net/tmwa/gui/partytab.cpp:135 src/net/tmwa/partyhandler.cpp:202
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:138 src/net/ea/partyhandler.cpp:210
+#: src/net/tmwa/gui/partytab.cpp:138 src/net/tmwa/partyhandler.cpp:208
 msgid "Item sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:141
+#: src/net/tmwa/gui/partytab.cpp:141
 msgid "Item sharing unknown."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:167 src/net/ea/partyhandler.cpp:174
+#: src/net/tmwa/gui/partytab.cpp:167 src/net/tmwa/partyhandler.cpp:172
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:170 src/net/ea/partyhandler.cpp:180
+#: src/net/tmwa/gui/partytab.cpp:170 src/net/tmwa/partyhandler.cpp:178
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:173 src/net/ea/partyhandler.cpp:186
+#: src/net/tmwa/gui/partytab.cpp:173 src/net/tmwa/partyhandler.cpp:184
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:176
+#: src/net/tmwa/gui/partytab.cpp:176
 msgid "Experience sharing unknown."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:281
+#: src/net/tmwa/inventoryhandler.cpp:285
 msgid "Failed to use item."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:391
+#: src/net/tmwa/inventoryhandler.cpp:399
 msgid "Unable to equip."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:402
+#: src/net/tmwa/inventoryhandler.cpp:410
 msgid "Unable to unequip."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:79
+#: src/net/tmwa/loginhandler.cpp:86
 msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:82 src/net/manaserv/loginhandler.cpp:121
-msgid "Old password incorrect."
-msgstr ""
-
-#: src/net/ea/loginhandler.cpp:85
+#: src/net/tmwa/loginhandler.cpp:92
 msgid "New password too short."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:88 src/net/ea/loginhandler.cpp:175
-#: src/net/manaserv/charhandler.cpp:158 src/net/manaserv/loginhandler.cpp:96
-#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
-#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
-#, fuzzy
-msgid "Unknown error."
-msgstr "గుర్తుతెలియని ఆదేశం."
-
-#: src/net/ea/loginhandler.cpp:149
+#: src/net/tmwa/loginhandler.cpp:156
 msgid "Unregistered ID."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:152
+#: src/net/tmwa/loginhandler.cpp:159
 #, fuzzy
 msgid "Wrong password."
 msgstr "సంకేతపదాన్ని మార్చు"
 
-#: src/net/ea/loginhandler.cpp:155
+#: src/net/tmwa/loginhandler.cpp:162
 msgid "Account expired."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:158
+#: src/net/tmwa/loginhandler.cpp:165
 msgid "Rejected from server."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:161
+#: src/net/tmwa/loginhandler.cpp:168
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:165
+#: src/net/tmwa/loginhandler.cpp:172
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:172
+#: src/net/tmwa/loginhandler.cpp:179
 msgid "This user name is already taken."
 msgstr ""
 
-#: src/net/ea/network.cpp:145
+#: src/net/tmwa/network.cpp:145
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/ea/network.cpp:345
+#: src/net/tmwa/network.cpp:345
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/ea/network.cpp:414
+#: src/net/tmwa/network.cpp:414
 msgid "Connection to server terminated. "
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:81
+#: src/net/tmwa/partyhandler.cpp:82
 msgid "Could not create party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:84
+#: src/net/tmwa/partyhandler.cpp:84
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:118
+#: src/net/tmwa/partyhandler.cpp:119
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:122
+#: src/net/tmwa/partyhandler.cpp:123
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:126
+#: src/net/tmwa/partyhandler.cpp:127
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:130
+#: src/net/tmwa/partyhandler.cpp:131
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:238
+#: src/net/tmwa/partyhandler.cpp:236
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:249
+#: src/net/tmwa/partyhandler.cpp:246
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:301
+#: src/net/tmwa/partyhandler.cpp:299
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:329
-msgid "Inviting like this isn't supported at the moment."
+#: src/net/tmwa/partyhandler.cpp:335
+#, c-format
+msgid "Inviting failed, because you can't see a player called %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:334
+#: src/net/tmwa/partyhandler.cpp:340
 msgid "You can only inivte when you are in a party!"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:365
+#: src/net/tmwa/partyhandler.cpp:368
 #, c-format
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:304
-msgid "You are dead."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:305
-msgid "We regret to inform you that your character was killed in battle."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:307
-msgid "You are not that alive anymore."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:308
-msgid "The cold hands of the grim reaper are grabbing for your soul."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:309
-msgid "Game Over!"
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:105
+#: src/net/tmwa/playerhandler.cpp:100
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:310
-msgid ""
-"No, kids. Your character did not really die. It... err... went to a better "
-"place."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:312
-msgid ""
-"Your plan of breaking your enemies weapon by bashing it with your throat "
-"failed."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:314
-msgid "I guess this did not run too well."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:315
-msgid "Do you want your possessions identified?"
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:316
-msgid "Sadly, no trace of you was ever found..."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:317
-msgid "Annihilated."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:318
-msgid "Looks like you got your head handed to you."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:120 src/net/manaserv/beinghandler.cpp:319
-msgid ""
-"You screwed up again, dump your body down the tubes and get you another one."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/tmwa/playerhandler.cpp:118
 msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/tmwa/playerhandler.cpp:119
 msgid "You are no more."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/tmwa/playerhandler.cpp:120
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/tmwa/playerhandler.cpp:121
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/tmwa/playerhandler.cpp:122
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/tmwa/playerhandler.cpp:123
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/tmwa/playerhandler.cpp:124
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:130
+#: src/net/tmwa/playerhandler.cpp:125
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:131
+#: src/net/tmwa/playerhandler.cpp:126
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/tmwa/playerhandler.cpp:127
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/tmwa/playerhandler.cpp:128
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:135
+#: src/net/tmwa/playerhandler.cpp:130
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:136
+#: src/net/tmwa/playerhandler.cpp:131
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:249 src/net/ea/playerhandler.cpp:310
+#: src/net/tmwa/playerhandler.cpp:246 src/net/tmwa/playerhandler.cpp:285
 msgid "Message"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:250
+#: src/net/tmwa/playerhandler.cpp:247
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:333
+#: src/net/tmwa/playerhandler.cpp:313
 #, c-format
 msgid "You picked up %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:369
+#: src/net/tmwa/playerhandler.cpp:348
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:532
+#: src/net/tmwa/playerhandler.cpp:488
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:147
+#: src/net/tmwa/specialhandler.cpp:144
 msgid "Trade failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:150
+#: src/net/tmwa/specialhandler.cpp:147
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:153
+#: src/net/tmwa/specialhandler.cpp:150
 msgid "Sit failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:156
+#: src/net/tmwa/specialhandler.cpp:153
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:159
+#: src/net/tmwa/specialhandler.cpp:156
 msgid "Could not join party!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:162
+#: src/net/tmwa/specialhandler.cpp:159
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:171
+#: src/net/tmwa/specialhandler.cpp:168
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:174
+#: src/net/tmwa/specialhandler.cpp:171
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:177
+#: src/net/tmwa/specialhandler.cpp:174
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:180
+#: src/net/tmwa/specialhandler.cpp:177
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:183
+#: src/net/tmwa/specialhandler.cpp:180
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:186
+#: src/net/tmwa/specialhandler.cpp:183
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:189
+#: src/net/tmwa/specialhandler.cpp:186
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:192
+#: src/net/tmwa/specialhandler.cpp:189
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:195
+#: src/net/tmwa/specialhandler.cpp:192
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:198
+#: src/net/tmwa/specialhandler.cpp:195
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:201
+#: src/net/tmwa/specialhandler.cpp:198
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:210
+#: src/net/tmwa/specialhandler.cpp:207
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:213
+#: src/net/tmwa/specialhandler.cpp:210
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:216
+#: src/net/tmwa/specialhandler.cpp:213
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:116
-msgid "Request for Trade"
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:108 src/net/manaserv/tradehandler.cpp:117
-#, c-format
-msgid "%s wants to trade with you, do you accept?"
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:124
+#: src/net/tmwa/tradehandler.cpp:126
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:128
+#: src/net/tmwa/tradehandler.cpp:130
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:132
+#: src/net/tmwa/tradehandler.cpp:134
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:137
+#: src/net/tmwa/tradehandler.cpp:139
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:144
+#: src/net/tmwa/tradehandler.cpp:146
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:153
+#: src/net/tmwa/tradehandler.cpp:154
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:202
+#: src/net/tmwa/tradehandler.cpp:202
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:207
+#: src/net/tmwa/tradehandler.cpp:207
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:211
+#: src/net/tmwa/tradehandler.cpp:211
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:224 src/net/manaserv/tradehandler.cpp:149
-msgid "Trade canceled."
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:231 src/net/manaserv/tradehandler.cpp:156
-msgid "Trade completed."
-msgstr ""
-
-#: src/net/manaserv/beinghandler.cpp:324
-msgid "Press OK to respawn."
-msgstr ""
-
-#: src/net/manaserv/beinghandler.cpp:325
-msgid "You Died"
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:128 src/net/manaserv/charhandler.cpp:196
-msgid "Not logged in."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:131
-msgid "No empty slot."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:134
-msgid "Invalid name."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:137
-msgid "Character's name already exists."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:140
-msgid "Invalid hairstyle."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:143
-msgid "Invalid hair color."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:146
-msgid "Invalid gender."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:149
-msgid "Character's stats are too high."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:152
-msgid "Character's stats are too low."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:155
-msgid "One stat is zero."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:187
-msgid "Player deleted."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:199
-msgid "Selection out of range."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:202
-#, fuzzy, c-format
-msgid "Unknown error (%d)."
-msgstr "గుర్తుతెలియని ఆదేశం."
-
-#: src/net/manaserv/charhandler.cpp:242
-msgid "No gameservers are available."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:268
-msgid "Willpower:"
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
-#: src/net/manaserv/guildhandler.cpp:259
-#, c-format
-msgid "Topic: %s"
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
-msgid "Players in this channel:"
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:201
-msgid "Error joining channel."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:207
-msgid "Listing channels."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:219
-msgid "End of channel list."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:291
-#, c-format
-msgid "%s entered the channel."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:296
-#, c-format
-msgid "%s left the channel."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:312
-#, c-format
-msgid "%s has set mode %s on user %s."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:322
-#, c-format
-msgid "%s has kicked %s."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:327
-#, fuzzy
-msgid "Unknown channel event."
-msgstr "గుర్తుతెలియని ఆదేశం."
-
-#: src/net/manaserv/generalhandler.cpp:100
-#, c-format
-msgid "Willpower %+d"
-msgstr ""
-
-#: src/net/manaserv/generalhandler.cpp:171
-msgid "Willpower"
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:81
-msgid "Guild created."
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:86
-msgid "Error creating guild."
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:96
-msgid "Invite sent."
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:203
-msgid "Member was promoted successfully."
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:208
-msgid "Failed to promote member."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:87
-msgid "Wrong magic_token."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
-msgid "Already logged in."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:93 src/net/manaserv/loginhandler.cpp:272
-msgid "Server is full."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:118
-msgid "New password incorrect."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
-msgid "Account not connected. Please login first."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:149
-msgid "New email address incorrect."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:152
-msgid "Old email address incorrect."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:158
-msgid "The new email address already exists."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:239
-msgid ""
-"Client registration is not allowed. Please contact server administration."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
-msgid "Client version is too old."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:266
-msgid "Wrong username or password."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:275
-msgid "Login attempt too soon after previous attempt."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:303
-msgid "Wrong username, password or email address."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:306
-msgid "Username already exists."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:309
-msgid "Email address already exists."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:312
-msgid "You took too long with the captcha or your response was incorrect."
-msgstr ""
-
-#: src/net/manaserv/partyhandler.cpp:88
-msgid "Joined party."
-msgstr ""
-
-#: src/net/manaserv/partyhandler.cpp:106
-#, c-format
-msgid "%s joined the party."
-msgstr ""
-
-#: src/net/manaserv/partyhandler.cpp:123
-#, c-format
-msgid "%s rejected your invite."
-msgstr ""
-
-#: src/net/manaserv/tradehandler.cpp:96
-msgid "Accepting incoming trade requests."
-msgstr ""
-
-#: src/net/manaserv/tradehandler.cpp:98
-msgid "Ignoring incoming trade requests."
-msgstr ""
-
-#: src/net/manaserv/tradehandler.cpp:135
-#, c-format
-msgid "Trading with %s"
-msgstr ""
-
-#: src/playerrelations.cpp:304
+#: src/playerrelations.cpp:310
 msgid "Completely ignore"
 msgstr ""
 
-#: src/playerrelations.cpp:318
+#: src/playerrelations.cpp:324
 msgid "Print '...'"
 msgstr ""
 
-#: src/playerrelations.cpp:334
+#: src/playerrelations.cpp:340
 msgid "Blink name"
 msgstr ""
 
-#: src/playerrelations.cpp:371
-msgid "Floating '...' bubble"
-msgstr ""
-
-#: src/playerrelations.cpp:374
-msgid "Floating bubble"
-msgstr ""
-
-#: src/resources/itemdb.cpp:52
+#: src/resources/itemdb.cpp:44
 #, c-format
 msgid "Attack %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:53
+#: src/resources/itemdb.cpp:45
 #, c-format
 msgid "Defense %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:54
+#: src/resources/itemdb.cpp:46
 #, c-format
 msgid "HP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:55
+#: src/resources/itemdb.cpp:47
 #, c-format
 msgid "MP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:114
+#: src/resources/itemdb.cpp:92
 msgid "Unknown item"
 msgstr ""
 
-#: src/resources/itemdb.cpp:158 src/resources/monsterdb.cpp:45
-#: src/resources/monsterdb.cpp:67
+#: src/resources/itemdb.cpp:135 src/resources/monsterdb.cpp:77
 msgid "unnamed"
 msgstr ""
 
+#~ msgid "Text Shadow"
+#~ msgstr "పాఠ్యపు నీడ"
+
+#~ msgid "Background"
+#~ msgstr "నేపథ్యం"
+
+#~ msgid "Player"
+#~ msgstr "ఆటగాడు"
+
+#~ msgid "Shirts"
+#~ msgstr "చొక్కాలు"
+
+#~ msgid "Shoes"
+#~ msgstr "బూట్లు"
+
+#~ msgid "Rings"
+#~ msgstr "ఉంగరాలు"
+
+#, fuzzy
+#~ msgid "Level"
+#~ msgstr "స్థాయి: %d"
+
 #~ msgid "no"
 #~ msgstr "కాదు"
 
diff --git a/po/th.po b/po/th.po
index 26562944..79b857b7 100644
--- a/po/th.po
+++ b/po/th.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2010-03-05 21:52+0100\n"
+"POT-Creation-Date: 2010-12-13 20:04+0100\n"
 "PO-Revision-Date: 2009-11-06 15:29+0000\n"
 "Last-Translator: Krit Marukawisutthigul <Unknown>\n"
 "Language-Team: Thai <th@li.org>\n"
+"Language: th\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,438 +19,452 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/client.cpp:553 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:62
+#: src/client.cpp:598 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
 msgid "Setup"
 msgstr "ตั้งค่า"
 
-#: src/client.cpp:623
+#: src/client.cpp:679
 #, fuzzy
 msgid "Connecting to server"
 msgstr "กำลังเชื่อมต่อ..."
 
-#: src/client.cpp:650
+#: src/client.cpp:706
 #, fuzzy
 msgid "Logging in"
 msgstr "เข้าระบบ"
 
-#: src/client.cpp:683
+#: src/client.cpp:739
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:739
+#: src/client.cpp:804
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:768
+#: src/client.cpp:833
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:799 src/client.cpp:806 src/client.cpp:940
+#: src/client.cpp:843
+#, fuzzy
+msgid "Changing game servers"
+msgstr "กำลังเชื่อมต่อ..."
+
+#: src/client.cpp:872 src/client.cpp:879 src/client.cpp:1014
 #: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
 #: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
-#: src/gui/serverdialog.cpp:261 src/gui/unregisterdialog.cpp:133
-#: src/net/ea/charserverhandler.cpp:135 src/net/ea/charserverhandler.cpp:152
-#: src/net/manaserv/charhandler.cpp:161 src/net/manaserv/charhandler.cpp:204
+#: src/gui/serverdialog.cpp:323 src/gui/unregisterdialog.cpp:133
+#: src/net/manaserv/charhandler.cpp:174 src/net/manaserv/charhandler.cpp:217
+#: src/net/tmwa/charserverhandler.cpp:134
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Error"
 msgstr "ผิดพลาด"
 
-#: src/client.cpp:815
+#: src/client.cpp:888
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:842
+#: src/client.cpp:915
 #, fuzzy
 msgid "Password Change"
 msgstr "รหัสผ่าน:"
 
-#: src/client.cpp:843
+#: src/client.cpp:916
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:862
+#: src/client.cpp:935
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:863
+#: src/client.cpp:936
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:883
+#: src/client.cpp:956
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:884
+#: src/client.cpp:957
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1007 src/client.cpp:1030
+#: src/client.cpp:1138 src/client.cpp:1161
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1119
+#: src/client.cpp:1281
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1153 src/client.cpp:1159
+#: src/client.cpp:1315 src/client.cpp:1321
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/commandhandler.cpp:127 src/commandhandler.cpp:308
+#: src/commandhandler.cpp:131 src/commandhandler.cpp:317
 msgid "Unknown command."
 msgstr ""
 
-#: src/commandhandler.cpp:156
+#: src/commandhandler.cpp:160
 msgid "-- Help --"
 msgstr ""
 
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:161
 msgid "/help > Display this help"
 msgstr ""
 
-#: src/commandhandler.cpp:159
+#: src/commandhandler.cpp:163
 msgid "/where > Display map name"
 msgstr ""
 
-#: src/commandhandler.cpp:160
+#: src/commandhandler.cpp:164
 msgid "/who > Display number of online users"
 msgstr ""
 
-#: src/commandhandler.cpp:161
+#: src/commandhandler.cpp:165
 msgid "/me > Tell something about yourself"
 msgstr ""
 
-#: src/commandhandler.cpp:163
+#: src/commandhandler.cpp:167
 msgid "/clear > Clears this window"
 msgstr ""
 
-#: src/commandhandler.cpp:165
+#: src/commandhandler.cpp:169
 msgid "/msg > Send a private message to a user"
 msgstr ""
 
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:170
 msgid "/whisper > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:167
+#: src/commandhandler.cpp:171
 msgid "/w > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:168
+#: src/commandhandler.cpp:172
 msgid "/query > Makes a tab for private messages with another user"
 msgstr ""
 
-#: src/commandhandler.cpp:169
+#: src/commandhandler.cpp:174
 msgid "/q > Alias of query"
 msgstr ""
 
-#: src/commandhandler.cpp:171
+#: src/commandhandler.cpp:176
 msgid "/ignore > ignore a player"
 msgstr ""
 
-#: src/commandhandler.cpp:172
+#: src/commandhandler.cpp:177
 msgid "/unignore > stop ignoring a player"
 msgstr ""
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:179
 msgid "/list > Display all public channels"
 msgstr ""
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:180
 msgid "/join > Join or create a channel"
 msgstr ""
 
-#: src/commandhandler.cpp:177
+#: src/commandhandler.cpp:182
 msgid "/createparty > Create a new party"
 msgstr ""
 
-#: src/commandhandler.cpp:178
+#: src/commandhandler.cpp:183
 msgid "/party > Invite a user to party"
 msgstr ""
 
-#: src/commandhandler.cpp:180
+#: src/commandhandler.cpp:185
 msgid "/record > Start recording the chat to an external file"
 msgstr ""
 
-#: src/commandhandler.cpp:181
+#: src/commandhandler.cpp:187
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr ""
 
-#: src/commandhandler.cpp:182
+#: src/commandhandler.cpp:189
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
 
-#: src/commandhandler.cpp:184
+#: src/commandhandler.cpp:192
 msgid "/announce > Global announcement (GM only)"
 msgstr ""
 
-#: src/commandhandler.cpp:188
+#: src/commandhandler.cpp:196
 msgid "For more information, type /help <command>."
 msgstr ""
 
-#: src/commandhandler.cpp:192
+#: src/commandhandler.cpp:200
 msgid "Command: /help"
 msgstr ""
 
-#: src/commandhandler.cpp:193
+#: src/commandhandler.cpp:201
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: src/commandhandler.cpp:194
+#: src/commandhandler.cpp:203
 msgid "Command: /help <command>"
 msgstr ""
 
-#: src/commandhandler.cpp:195
+#: src/commandhandler.cpp:204
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/commandhandler.cpp:203
+#: src/commandhandler.cpp:212
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: src/commandhandler.cpp:204
+#: src/commandhandler.cpp:213
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/commandhandler.cpp:205
+#: src/commandhandler.cpp:214
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:210
+#: src/commandhandler.cpp:219
 msgid "Command: /clear"
 msgstr ""
 
-#: src/commandhandler.cpp:211
+#: src/commandhandler.cpp:220
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:224
 msgid "Command: /ignore <player>"
 msgstr ""
 
-#: src/commandhandler.cpp:216
+#: src/commandhandler.cpp:225
 msgid "This command ignores the given player regardless of current relations."
 msgstr ""
 
-#: src/commandhandler.cpp:221
+#: src/commandhandler.cpp:230
 msgid "Command: /join <channel>"
 msgstr ""
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:231
 msgid "This command makes you enter <channel>."
 msgstr ""
 
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:232
 msgid "If <channel> doesn't exist, it's created."
 msgstr ""
 
-#: src/commandhandler.cpp:227
+#: src/commandhandler.cpp:236
 msgid "Command: /list"
 msgstr ""
 
-#: src/commandhandler.cpp:228
+#: src/commandhandler.cpp:237
 msgid "This command shows a list of all channels."
 msgstr ""
 
-#: src/commandhandler.cpp:232
+#: src/commandhandler.cpp:241
 msgid "Command: /me <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:233
+#: src/commandhandler.cpp:242
 msgid "This command tell others you are (doing) <msg>."
 msgstr ""
 
-#: src/commandhandler.cpp:237
+#: src/commandhandler.cpp:246
 msgid "Command: /msg <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:238
+#: src/commandhandler.cpp:247
 msgid "Command: /whisper <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:239
+#: src/commandhandler.cpp:248
 msgid "Command: /w <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:240
+#: src/commandhandler.cpp:249
 msgid "This command sends the text <message> to <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:241 src/commandhandler.cpp:260
+#: src/commandhandler.cpp:250 src/commandhandler.cpp:269
 #: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
-#: src/net/ea/gui/guildtab.cpp:75 src/net/ea/gui/partytab.cpp:75
+#: src/net/tmwa/gui/guildtab.cpp:75 src/net/tmwa/gui/partytab.cpp:75
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:255
 msgid "Command: /query <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:247
+#: src/commandhandler.cpp:256
 msgid "Command: /q <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:248
+#: src/commandhandler.cpp:257
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:253
+#: src/commandhandler.cpp:262
 msgid "Command: /createparty <name>"
 msgstr ""
 
-#: src/commandhandler.cpp:254
+#: src/commandhandler.cpp:263
 msgid "This command creates a new party called <name>."
 msgstr ""
 
-#: src/commandhandler.cpp:258
+#: src/commandhandler.cpp:267
 msgid "Command: /party <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:259 src/net/ea/gui/partytab.cpp:74
+#: src/commandhandler.cpp:268 src/net/tmwa/gui/partytab.cpp:74
 msgid "This command invites <nick> to party with you."
 msgstr ""
 
-#: src/commandhandler.cpp:265
+#: src/commandhandler.cpp:274
 msgid "Command: /present"
 msgstr ""
 
-#: src/commandhandler.cpp:266
+#: src/commandhandler.cpp:275
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: src/commandhandler.cpp:272
+#: src/commandhandler.cpp:281
 msgid "Command: /record <filename>"
 msgstr ""
 
-#: src/commandhandler.cpp:273
+#: src/commandhandler.cpp:282
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr ""
 
-#: src/commandhandler.cpp:275
+#: src/commandhandler.cpp:284
 msgid "Command: /record"
 msgstr ""
 
-#: src/commandhandler.cpp:276
+#: src/commandhandler.cpp:285
 msgid "This command finishes a recording session."
 msgstr ""
 
-#: src/commandhandler.cpp:280
+#: src/commandhandler.cpp:289
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: src/commandhandler.cpp:281
+#: src/commandhandler.cpp:290
 msgid ""
 "This command sets whether the return key should toggle the chat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: src/commandhandler.cpp:283
+#: src/commandhandler.cpp:292
 msgid ""
-"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
-"\", \"no\", \"false\" to turn the toggle off."
+"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
+"\"0\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: src/commandhandler.cpp:286
+#: src/commandhandler.cpp:295
 msgid "Command: /toggle"
 msgstr ""
 
-#: src/commandhandler.cpp:287
+#: src/commandhandler.cpp:296
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: src/commandhandler.cpp:291 src/gui/widgets/whispertab.cpp:93
+#: src/commandhandler.cpp:300 src/gui/widgets/whispertab.cpp:95
 msgid "Command: /unignore <player>"
 msgstr ""
 
-#: src/commandhandler.cpp:292
+#: src/commandhandler.cpp:301
 msgid "This command stops ignoring the given player if they are being ignored"
 msgstr ""
 
-#: src/commandhandler.cpp:297
+#: src/commandhandler.cpp:306
 msgid "Command: /where"
 msgstr ""
 
-#: src/commandhandler.cpp:298
+#: src/commandhandler.cpp:307
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: src/commandhandler.cpp:302
+#: src/commandhandler.cpp:311
 msgid "Command: /who"
 msgstr ""
 
-#: src/commandhandler.cpp:303
+#: src/commandhandler.cpp:312
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:309
+#: src/commandhandler.cpp:318
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: src/commandhandler.cpp:375
+#: src/commandhandler.cpp:384
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:383
+#: src/commandhandler.cpp:392
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:397
+#: src/commandhandler.cpp:406
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:410 src/net/ea/gui/partytab.cpp:109
+#: src/commandhandler.cpp:419 src/net/tmwa/gui/partytab.cpp:109
 msgid "Party name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:423 src/commandhandler.cpp:471
-#: src/commandhandler.cpp:493
+#: src/commandhandler.cpp:432 src/commandhandler.cpp:509
+#: src/commandhandler.cpp:531
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:441
+#: src/commandhandler.cpp:450
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:441
+#: src/commandhandler.cpp:450
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:450
+#: src/commandhandler.cpp:459
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:454
+#: src/commandhandler.cpp:463
 msgid "Message now closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:477
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:489
+msgid "Show IP: On"
+msgstr ""
+
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:485
+msgid "Show IP: Off"
+msgstr ""
+
+#: src/commandhandler.cpp:515
 msgid "Player already ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:484
+#: src/commandhandler.cpp:522
 msgid "Player successfully ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:486
+#: src/commandhandler.cpp:524
 msgid "Player could not be ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:501
+#: src/commandhandler.cpp:539
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:506
+#: src/commandhandler.cpp:544
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:508
+#: src/commandhandler.cpp:546
 msgid "Player could not be unignored!"
 msgstr ""
 
@@ -462,40 +477,40 @@ msgstr ""
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:326
+#: src/game.cpp:342
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:331
+#: src/game.cpp:347
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:355
+#: src/game.cpp:378
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:360
+#: src/game.cpp:382
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:705
+#: src/game.cpp:721
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:712
+#: src/game.cpp:726
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:946
+#: src/game.cpp:954
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:947
+#: src/game.cpp:955
 #, c-format
 msgid "Error while loading %s"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:75
+#: src/gui/beingpopup.cpp:76
 #, c-format
 msgid "Party: %s"
 msgstr ""
@@ -504,34 +519,34 @@ msgstr ""
 msgid "Buy"
 msgstr "ซื้อ"
 
-#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
-#: src/gui/sell.cpp:276
+#: src/gui/buy.cpp:69 src/gui/buy.cpp:261 src/gui/sell.cpp:71
+#: src/gui/sell.cpp:288
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:99 src/gui/npcdialog.cpp:100
-#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:479
+#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:112 src/gui/npcdialog.cpp:124
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:463
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:98 src/gui/npcdialog.cpp:101
-#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:491
+#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:111 src/gui/npcdialog.cpp:125
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:475
 msgid "-"
 msgstr ""
 
 #: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
-#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:182
-#: src/keyboardconfig.cpp:103
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:228
+#: src/keyboardconfig.cpp:102
 msgid "Quit"
 msgstr "ออก"
 
-#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:408
-#: src/gui/statuswindow.cpp:478 src/gui/statuswindow.cpp:512
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:384
+#: src/gui/statuswindow.cpp:462 src/gui/statuswindow.cpp:496
 msgid "Max"
 msgstr ""
 
@@ -545,11 +560,11 @@ msgstr ""
 
 #: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
 #: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
-#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:101
-#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:178
-#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:402
+#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:114
+#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:389
 #: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
-#: src/gui/socialwindow.cpp:242 src/gui/textdialog.cpp:39
+#: src/gui/socialwindow.cpp:275 src/gui/textdialog.cpp:40
 #: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr "ยกเลิก"
@@ -586,7 +601,7 @@ msgstr ""
 msgid "Change Password"
 msgstr "เปลี่ยนรหัสผ่าน"
 
-#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:53
+#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:55
 #: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
 msgid "Password:"
 msgstr "รหัสผ่าน:"
@@ -617,19 +632,19 @@ msgstr ""
 msgid "Create Character"
 msgstr "สร้างตัวละคร"
 
-#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:52
+#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:54
 #: src/gui/register.cpp:67
 msgid "Name:"
 msgstr "ชื่อ:"
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
 #: src/gui/outfitwindow.cpp:67
 msgid ">"
 msgstr ""
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
 #: src/gui/outfitwindow.cpp:66
@@ -646,8 +661,8 @@ msgstr "สีผม:"
 msgid "Hair style:"
 msgstr "ทรงผม:"
 
-#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:397
-#: src/gui/socialwindow.cpp:296
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:392
+#: src/gui/socialwindow.cpp:329
 msgid "Create"
 msgstr "สร้าง"
 
@@ -703,33 +718,33 @@ msgstr ""
 msgid "Change Email"
 msgstr "เปลี่ยนที่อยู่ Email"
 
-#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:185
-#: src/gui/setup_players.cpp:230
+#: src/gui/charselectdialog.cpp:336 src/gui/serverdialog.cpp:231
+#: src/gui/setup_players.cpp:229
 msgid "Delete"
 msgstr "ลบทิ้ง"
 
-#: src/gui/charselectdialog.cpp:387
+#: src/gui/charselectdialog.cpp:380
 msgid "Choose"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:399 src/gui/charselectdialog.cpp:400
+#: src/gui/charselectdialog.cpp:394 src/gui/charselectdialog.cpp:395
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:77 src/gui/palette.cpp:96
+#: src/gui/chat.cpp:88
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chat.cpp:287
+#: src/gui/chat.cpp:311
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:305
+#: src/gui/chat.cpp:329
 msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:469
+#: src/gui/chat.cpp:493
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -791,141 +806,171 @@ msgstr ""
 msgid "Ambient FX: %s"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:56
+#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:55
 msgid "Equipment"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:77
-#: src/gui/inventorywindow.cpp:79 src/gui/inventorywindow.cpp:298
-#: src/gui/popupmenu.cpp:372
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:89
+#: src/gui/inventorywindow.cpp:337 src/gui/popupmenu.cpp:359
 msgid "Unequip"
 msgstr ""
 
-#: src/gui/help.cpp:36
+#: src/gui/help.cpp:37
 msgid "Help"
 msgstr ""
 
-#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:73
+#: src/gui/help.cpp:51 src/gui/npcdialog.cpp:50
 msgid "Close"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:56 src/gui/windowmenu.cpp:57
+#: src/gui/inventorywindow.cpp:59 src/gui/windowmenu.cpp:56
 msgid "Inventory"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:72 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:300 src/gui/popupmenu.cpp:374
+#: src/gui/inventorywindow.cpp:59
+msgid "Storage"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:82
+msgid "Slots:"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:87 src/gui/inventorywindow.cpp:100
+#: src/gui/inventorywindow.cpp:339 src/gui/popupmenu.cpp:361
 msgid "Equip"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:304 src/gui/popupmenu.cpp:377
+#: src/gui/inventorywindow.cpp:88
 msgid "Use"
 msgstr "ใช้"
 
-#: src/gui/inventorywindow.cpp:83 src/gui/inventorywindow.cpp:308
-#: src/gui/popupmenu.cpp:380
+#: src/gui/inventorywindow.cpp:101 src/gui/popupmenu.cpp:364
+msgid "Activate"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:102 src/gui/inventorywindow.cpp:348
+#: src/gui/popupmenu.cpp:367
 #, fuzzy
 msgid "Drop..."
 msgstr "ทิ้ง"
 
-#: src/gui/inventorywindow.cpp:84 src/gui/popupmenu.cpp:386
+#: src/gui/inventorywindow.cpp:103 src/gui/popupmenu.cpp:373
 msgid "Split"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:85 src/gui/outfitwindow.cpp:51
+#: src/gui/inventorywindow.cpp:104 src/gui/outfitwindow.cpp:51
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:96 src/gui/storagewindow.cpp:83
-msgid "Slots:"
+#: src/gui/inventorywindow.cpp:106
+msgid "Weight:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:97
-msgid "Weight:"
+#: src/gui/inventorywindow.cpp:124 src/gui/popupmenu.cpp:378
+msgid "Store"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:310 src/gui/popupmenu.cpp:382
+#: src/gui/inventorywindow.cpp:125 src/gui/popupmenu.cpp:385
+msgid "Retrieve"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:350 src/gui/popupmenu.cpp:369
 msgid "Drop"
 msgstr "ทิ้ง"
 
-#: src/gui/itemamount.cpp:100 src/gui/okdialog.cpp:42
-#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:38 src/gui/trade.cpp:73
-#: src/gui/trade.cpp:75
+#: src/gui/itemamount.cpp:113 src/gui/okdialog.cpp:42
+#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:39 src/gui/trade.cpp:72
+#: src/gui/trade.cpp:74
 msgid "OK"
 msgstr ""
 
-#: src/gui/itemamount.cpp:102
+#: src/gui/itemamount.cpp:115
 msgid "All"
 msgstr ""
 
-#: src/gui/itemamount.cpp:128
+#: src/gui/itemamount.cpp:141
 msgid "Select amount of items to trade."
 msgstr ""
 
-#: src/gui/itemamount.cpp:131
+#: src/gui/itemamount.cpp:144
 msgid "Select amount of items to drop."
 msgstr ""
 
-#: src/gui/itemamount.cpp:134
+#: src/gui/itemamount.cpp:147
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/itemamount.cpp:137
+#: src/gui/itemamount.cpp:150
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamount.cpp:140
+#: src/gui/itemamount.cpp:153
 msgid "Select amount of items to split."
 msgstr ""
 
-#: src/gui/itempopup.cpp:92
+#: src/gui/itempopup.cpp:137
 #, c-format
 msgid "Weight: %s"
 msgstr ""
 
-#: src/gui/login.cpp:49 src/gui/login.cpp:61
+#: src/gui/login.cpp:51 src/gui/login.cpp:63
 msgid "Login"
 msgstr "เข้าระบบ"
 
-#: src/gui/login.cpp:58
+#: src/gui/login.cpp:60
 msgid "Remember username"
 msgstr ""
 
-#: src/gui/login.cpp:59 src/gui/register.cpp:58 src/gui/register.cpp:73
+#: src/gui/login.cpp:61 src/gui/register.cpp:58 src/gui/register.cpp:73
 msgid "Register"
 msgstr "สมัครสมาชิก"
 
-#: src/gui/login.cpp:60
+#: src/gui/login.cpp:62
 msgid "Change Server"
 msgstr ""
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
+#: src/gui/login.cpp:129
+msgid "Registration disabled"
+msgstr ""
+
+#: src/gui/login.cpp:129
+msgid "You need to use the website to register an account for this server."
+msgstr ""
+
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:86
 msgid "Map"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:44
+#: src/gui/ministatus.cpp:235
+msgid "Need"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:48
 msgid "Waiting for server"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:45
+#: src/gui/npcdialog.cpp:49
 msgid "Next"
 msgstr "ถัดไป"
 
-#: src/gui/npcdialog.cpp:47
+#: src/gui/npcdialog.cpp:51
 msgid "Submit"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:52 src/gui/npcpostdialog.cpp:41
+#: src/gui/npcdialog.cpp:73 src/gui/npcpostdialog.cpp:41
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:110
+#: src/gui/npcdialog.cpp:118
+msgid "Clear log"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:134
 msgid "Reset"
 msgstr ""
 
 #. TRANSLATORS: Please leave the \n sequences intact.
-#: src/gui/npcdialog.cpp:171
+#: src/gui/npcdialog.cpp:208
 #, fuzzy
 msgid ""
 "\n"
@@ -940,7 +985,7 @@ msgstr ""
 msgid "Send"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:96
+#: src/gui/npcpostdialog.cpp:99
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
@@ -954,303 +999,82 @@ msgstr ""
 msgid "Unequip first"
 msgstr ""
 
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:143
-msgid "Text"
-msgstr ""
-
-#: src/gui/palette.cpp:82
-msgid "Text Shadow"
-msgstr ""
-
-#: src/gui/palette.cpp:83
-msgid "Text Outline"
-msgstr ""
-
-#: src/gui/palette.cpp:84
-msgid "Progress Bar Labels"
-msgstr ""
-
-#: src/gui/palette.cpp:85
-msgid "Buttons"
-msgstr ""
-
-#: src/gui/palette.cpp:86
-msgid "Disabled Buttons"
-msgstr ""
-
-#: src/gui/palette.cpp:87
-msgid "Tabs"
-msgstr ""
-
-#: src/gui/palette.cpp:89
-msgid "Background"
-msgstr ""
-
-#: src/gui/palette.cpp:91
-msgid "Highlight"
-msgstr ""
-
-#: src/gui/palette.cpp:92
-msgid "Tab Highlight"
-msgstr ""
-
-#: src/gui/palette.cpp:93
-msgid "Item Too Expensive"
-msgstr ""
-
-#: src/gui/palette.cpp:94
-msgid "Item Is Equipped"
-msgstr ""
-
-#: src/gui/palette.cpp:97
-msgid "GM"
-msgstr ""
-
-#: src/gui/palette.cpp:98
-msgid "Player"
-msgstr ""
-
-#: src/gui/palette.cpp:99
-msgid "Whisper"
-msgstr ""
-
-#: src/gui/palette.cpp:100
-msgid "Is"
-msgstr ""
-
-#: src/gui/palette.cpp:101 src/net/ea/gui/partytab.cpp:43
-msgid "Party"
-msgstr ""
-
-#: src/gui/palette.cpp:102 src/net/ea/gui/guildtab.cpp:45
-msgid "Guild"
-msgstr ""
-
-#: src/gui/palette.cpp:103
-msgid "Server"
-msgstr ""
-
-#: src/gui/palette.cpp:104
-msgid "Logger"
-msgstr ""
-
-#: src/gui/palette.cpp:105
-msgid "Hyperlink"
-msgstr ""
-
-#: src/gui/palette.cpp:107
-msgid "Being"
-msgstr ""
-
-#: src/gui/palette.cpp:108
-msgid "Other Players' Names"
-msgstr ""
-
-#: src/gui/palette.cpp:109
-msgid "Own Name"
-msgstr ""
-
-#: src/gui/palette.cpp:110
-msgid "GM Names"
-msgstr ""
-
-#: src/gui/palette.cpp:111
-msgid "NPCs"
-msgstr ""
-
-#: src/gui/palette.cpp:112
-msgid "Monsters"
-msgstr ""
-
-#: src/gui/palette.cpp:114
-msgid "Unknown Item Type"
-msgstr ""
-
-#: src/gui/palette.cpp:115
-msgid "Generics"
-msgstr ""
-
-#: src/gui/palette.cpp:116
-msgid "Hats"
-msgstr ""
-
-#: src/gui/palette.cpp:117
-msgid "Usables"
-msgstr ""
-
-#: src/gui/palette.cpp:118
-msgid "Shirts"
-msgstr ""
-
-#: src/gui/palette.cpp:119
-msgid "One Handed Weapons"
-msgstr ""
-
-#: src/gui/palette.cpp:120
-msgid "Pants"
-msgstr ""
-
-#: src/gui/palette.cpp:121
-msgid "Shoes"
-msgstr ""
-
-#: src/gui/palette.cpp:122
-msgid "Two Handed Weapons"
-msgstr ""
-
-#: src/gui/palette.cpp:123
-msgid "Shields"
-msgstr ""
-
-#: src/gui/palette.cpp:124
-msgid "Rings"
-msgstr ""
-
-#: src/gui/palette.cpp:125
-msgid "Necklaces"
-msgstr ""
-
-#: src/gui/palette.cpp:126
-msgid "Arms"
-msgstr ""
-
-#: src/gui/palette.cpp:127
-msgid "Ammo"
-msgstr ""
-
-#: src/gui/palette.cpp:129
-msgid "Particle Effects"
-msgstr ""
-
-#: src/gui/palette.cpp:130
-msgid "Pickup Notification"
-msgstr ""
-
-#: src/gui/palette.cpp:131
-msgid "Exp Notification"
-msgstr ""
-
-#: src/gui/palette.cpp:133
-msgid "Player Hits Monster"
-msgstr ""
-
-#: src/gui/palette.cpp:135
-msgid "Monster Hits Player"
-msgstr ""
-
-#: src/gui/palette.cpp:136
-msgid "Critical Hit"
-msgstr ""
-
-#: src/gui/palette.cpp:137
-msgid "Misses"
-msgstr ""
-
-#: src/gui/palette.cpp:139
-msgid "HP Bar"
-msgstr ""
-
-#: src/gui/palette.cpp:140
-msgid "3/4 HP Bar"
-msgstr ""
-
-#: src/gui/palette.cpp:141
-msgid "1/2 HP Bar"
-msgstr ""
-
-#: src/gui/palette.cpp:142
-msgid "1/4 HP Bar"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:84
+#: src/gui/popupmenu.cpp:83
 #, c-format
 msgid "Trade with %s..."
 msgstr ""
 
-#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:161
+#: src/gui/popupmenu.cpp:87 src/gui/popupmenu.cpp:158
 #, c-format
 msgid "Attack %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:92
+#: src/gui/popupmenu.cpp:91
 #, c-format
 msgid "Whisper %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:101
+#: src/gui/popupmenu.cpp:100
 #, c-format
 msgid "Befriend %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:106
+#: src/gui/popupmenu.cpp:105
 #, c-format
 msgid "Disregard %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:109
+#: src/gui/popupmenu.cpp:108
 #, c-format
 msgid "Ignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:115 src/gui/popupmenu.cpp:124
+#: src/gui/popupmenu.cpp:114 src/gui/popupmenu.cpp:123
 #, c-format
 msgid "Unignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:118
+#: src/gui/popupmenu.cpp:117
 #, c-format
 msgid "Completely ignore %s"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:130
 #, c-format
-msgid "Follow %s"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:133
-#, c-format
 msgid "Invite %s to join your guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:137
+#: src/gui/popupmenu.cpp:134
 #, c-format
 msgid "Invite %s to join your party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144
+#: src/gui/popupmenu.cpp:141
 msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:153
+#: src/gui/popupmenu.cpp:150
 #, c-format
 msgid "Talk to %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:166
+#: src/gui/popupmenu.cpp:163
 msgid "Kick monster"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:174
+#: src/gui/popupmenu.cpp:171
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:191
+#: src/gui/popupmenu.cpp:188
 #, c-format
 msgid "Pick up %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:400
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:387
 msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:70
-msgid "Store"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:71
-msgid "Retrieve"
-msgstr ""
-
 #: src/gui/quitdialog.cpp:44
 msgid "Switch server"
 msgstr ""
@@ -1319,48 +1143,61 @@ msgstr ""
 msgid "Passwords do not match."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:134
+#: src/gui/serverdialog.cpp:197
 msgid "Choose Your Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:141 src/gui/widgets/chattab.cpp:139
+#: src/gui/serverdialog.cpp:206 src/gui/widgets/chattab.cpp:142
 msgid "Server:"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:142
+#: src/gui/serverdialog.cpp:207
 msgid "Port:"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:143
+#: src/gui/serverdialog.cpp:208
 msgid "Server type:"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:183
+#: src/gui/serverdialog.cpp:229
 #, fuzzy
 msgid "Connect"
 msgstr "กำลังเชื่อมต่อ..."
 
-#: src/gui/serverdialog.cpp:184
+#: src/gui/serverdialog.cpp:230
 msgid "Custom Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:262
+#: src/gui/serverdialog.cpp:324
 msgid "Please type both the address and the port of a server."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:411
+#: src/gui/serverdialog.cpp:441
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:417
+#: src/gui/serverdialog.cpp:447
 msgid "Waiting for server..."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:421
+#: src/gui/serverdialog.cpp:451
 msgid "Preparing download"
 msgstr ""
 
+#: src/gui/serverdialog.cpp:455
+msgid "Error retreiving server list!"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:550
+msgid "requires a newer version"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:552
+#, c-format
+msgid "requires v%s"
+msgstr ""
+
 #: src/gui/setup_audio.cpp:42
 msgid "Sound"
 msgstr ""
@@ -1393,50 +1230,50 @@ msgstr ""
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:44
+#: src/gui/setup_colors.cpp:46
 msgid "This is what the color looks like"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:49
+#: src/gui/setup_colors.cpp:51
 msgid "Colors"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:70
+#: src/gui/setup_colors.cpp:72
 msgid "Type:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:81 src/gui/setup_colors.cpp:433
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:331
 msgid "Static"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:84
-#: src/gui/setup_colors.cpp:434
+#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
+#: src/gui/setup_colors.cpp:332
 msgid "Pulse"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
+#: src/gui/setup_colors.cpp:333
 msgid "Rainbow"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
+#: src/gui/setup_colors.cpp:333
 msgid "Spectrum"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:92
+#: src/gui/setup_colors.cpp:94
 msgid "Delay:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:107
+#: src/gui/setup_colors.cpp:109
 msgid "Red:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:122
+#: src/gui/setup_colors.cpp:124
 msgid "Green:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:137
+#: src/gui/setup_colors.cpp:139
 msgid "Blue:"
 msgstr ""
 
@@ -1481,565 +1318,578 @@ msgid "Assign"
 msgstr ""
 
 #: src/gui/setup_keyboard.cpp:90
+msgid "Unassign"
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:94
 msgid "Default"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:119
+#: src/gui/setup_keyboard.cpp:125
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_players.cpp:57
+#: src/gui/setup_players.cpp:58
 msgid "Name"
 msgstr ""
 
-#: src/gui/setup_players.cpp:58
+#: src/gui/setup_players.cpp:59
 msgid "Relation"
 msgstr ""
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:64
 msgid "Neutral"
 msgstr ""
 
-#: src/gui/setup_players.cpp:64
+#: src/gui/setup_players.cpp:65
 msgid "Friend"
 msgstr ""
 
-#: src/gui/setup_players.cpp:65
+#: src/gui/setup_players.cpp:66
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_players.cpp:67
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_players.cpp:208 src/gui/setup_video.cpp:132
+#: src/gui/setup_players.cpp:206 src/gui/setup_video.cpp:153
 msgid "???"
 msgstr ""
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_players.cpp:225
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_players.cpp:228
+#: src/gui/setup_players.cpp:227
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:231
 msgid "Put all whispers in tabs"
 msgstr ""
 
-#: src/gui/setup_players.cpp:234
+#: src/gui/setup_players.cpp:233
 msgid "Show gender"
 msgstr ""
 
-#: src/gui/setup_players.cpp:236
+#: src/gui/setup_players.cpp:235
+msgid "Enable Chat log"
+msgstr ""
+
+#: src/gui/setup_players.cpp:237
 msgid "Players"
 msgstr ""
 
-#: src/gui/setup_players.cpp:261
+#: src/gui/setup_players.cpp:262
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:113
+#: src/gui/setup_video.cpp:134
 msgid "Tiny"
 msgstr ""
 
-#: src/gui/setup_video.cpp:114
+#: src/gui/setup_video.cpp:135
 msgid "Small"
 msgstr ""
 
-#: src/gui/setup_video.cpp:115
+#: src/gui/setup_video.cpp:136
 msgid "Medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:116
+#: src/gui/setup_video.cpp:137
 msgid "Large"
 msgstr ""
 
-#: src/gui/setup_video.cpp:142
+#: src/gui/setup_video.cpp:163
 msgid "No text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:144
+#: src/gui/setup_video.cpp:164
+msgid "Text"
+msgstr ""
+
+#: src/gui/setup_video.cpp:165
 msgid "Bubbles, no names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:145
+#: src/gui/setup_video.cpp:166
 msgid "Bubbles with names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:157
+#: src/gui/setup_video.cpp:178
 msgid "off"
 msgstr ""
 
-#: src/gui/setup_video.cpp:158 src/gui/setup_video.cpp:171
+#: src/gui/setup_video.cpp:179 src/gui/setup_video.cpp:192
 msgid "low"
 msgstr ""
 
-#: src/gui/setup_video.cpp:159 src/gui/setup_video.cpp:173
+#: src/gui/setup_video.cpp:180 src/gui/setup_video.cpp:194
 msgid "high"
 msgstr ""
 
-#: src/gui/setup_video.cpp:172
+#: src/gui/setup_video.cpp:193
 msgid "medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:174
+#: src/gui/setup_video.cpp:195
 msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:196
+#: src/gui/setup_video.cpp:217
 msgid "Full screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:197
+#: src/gui/setup_video.cpp:218
 msgid "OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:198
+#: src/gui/setup_video.cpp:219
 msgid "Custom cursor"
 msgstr ""
 
-#: src/gui/setup_video.cpp:200
+#: src/gui/setup_video.cpp:221
 msgid "Visible names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:223
 msgid "Particle effects"
 msgstr ""
 
-#: src/gui/setup_video.cpp:204
+#: src/gui/setup_video.cpp:225
 msgid "Show own name"
 msgstr ""
 
-#: src/gui/setup_video.cpp:205
+#: src/gui/setup_video.cpp:226
+msgid "Log NPC dialogue"
+msgstr ""
+
+#: src/gui/setup_video.cpp:227
 msgid "Show pickup notification"
 msgstr ""
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:207
+#. TRANSLATORS: Refers to "Show pickup notification"
+#: src/gui/setup_video.cpp:229
 msgid "in chat"
 msgstr ""
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:209
+#. TRANSLATORS: Refers to "Show pickup notification"
+#: src/gui/setup_video.cpp:231
 msgid "as particle"
 msgstr ""
 
-#: src/gui/setup_video.cpp:214
+#: src/gui/setup_video.cpp:236
 msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:225
+#: src/gui/setup_video.cpp:247
+msgid "Disable transparency (Low CPU mode)"
+msgstr ""
+
+#: src/gui/setup_video.cpp:250
 msgid "Video"
 msgstr ""
 
-#: src/gui/setup_video.cpp:227
-msgid "Show monster damage"
+#: src/gui/setup_video.cpp:252
+msgid "Show damage"
 msgstr ""
 
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:258
 msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:259
 msgid "Gui opacity"
 msgstr ""
 
-#: src/gui/setup_video.cpp:235
+#: src/gui/setup_video.cpp:260
 msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_video.cpp:236
+#: src/gui/setup_video.cpp:261
 msgid "Particle detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237
+#: src/gui/setup_video.cpp:262
 msgid "Font size"
 msgstr ""
 
-#: src/gui/setup_video.cpp:251 src/gui/setup_video.cpp:454
-#: src/gui/setup_video.cpp:568
+#: src/gui/setup_video.cpp:277 src/gui/setup_video.cpp:532
+#: src/gui/setup_video.cpp:662
 #, fuzzy
 msgid "None"
 msgstr "ไม่"
 
-#: src/gui/setup_video.cpp:381
+#: src/gui/setup_video.cpp:426
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:387
+#: src/gui/setup_video.cpp:432
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:398
+#: src/gui/setup_video.cpp:443
 msgid "Switching to Full Screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:399
+#: src/gui/setup_video.cpp:444
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:411
+#: src/gui/setup_video.cpp:458
 msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:412
+#: src/gui/setup_video.cpp:459
+msgid ""
+"Applying change to OpenGL requires restart. In case OpenGL messes up your "
+"game graphics, restart the game with the command line option \"--no-opengl\"."
+msgstr ""
+
+#: src/gui/setup_video.cpp:466
+msgid "Deactivating OpenGL"
+msgstr ""
+
+#: src/gui/setup_video.cpp:467
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#: src/gui/setup_video.cpp:486 src/gui/setup_video.cpp:491
+#: src/gui/setup_video.cpp:475
+msgid "Transparency disabled"
+msgstr ""
+
+#: src/gui/setup_video.cpp:476 src/gui/setup_video.cpp:484
+msgid "You must restart to apply changes."
+msgstr ""
+
+#: src/gui/setup_video.cpp:483
+msgid "Transparency enabled"
+msgstr ""
+
+#: src/gui/setup_video.cpp:576 src/gui/setup_video.cpp:581
 msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:487 src/gui/setup_video.cpp:492
+#: src/gui/setup_video.cpp:577 src/gui/setup_video.cpp:582
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:489
+#: src/gui/setup_video.cpp:579
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:522
+#: src/gui/setup_video.cpp:612
 msgid "Particle Effect Settings Changed."
 msgstr ""
 
-#: src/gui/setup_video.cpp:523
+#: src/gui/setup_video.cpp:613
 msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skilldialog.cpp:197 src/gui/windowmenu.cpp:58
+#: src/gui/skilldialog.cpp:212 src/gui/windowmenu.cpp:59
 msgid "Skills"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:208
+#: src/gui/skilldialog.cpp:223
 msgid "Up"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:262
+#: src/gui/skilldialog.cpp:269
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:314
+#: src/gui/skilldialog.cpp:351
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:323
+#: src/gui/skilldialog.cpp:360
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:405
+#: src/gui/skilldialog.cpp:442
 #, fuzzy, c-format
 msgid "Lvl: %d (%+d)"
 msgstr "เลเวล: %d"
 
-#: src/gui/skilldialog.cpp:416
+#: src/gui/skilldialog.cpp:453
 #, fuzzy, c-format
 msgid "Lvl: %d"
 msgstr "เลเวล: %d"
 
-#: src/gui/socialwindow.cpp:117
+#: src/gui/socialwindow.cpp:126
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:126
+#: src/gui/socialwindow.cpp:139
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:136
+#: src/gui/socialwindow.cpp:153
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:137
+#: src/gui/socialwindow.cpp:154
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:146
+#: src/gui/socialwindow.cpp:163
 msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:147
+#: src/gui/socialwindow.cpp:164
 #, fuzzy, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "คุณแน่ใจแล้วหรือที่จะลบตัวละครนี้?"
 
-#: src/gui/socialwindow.cpp:182
+#: src/gui/socialwindow.cpp:207 src/net/tmwa/partyhandler.cpp:330
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:218
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:199
+#: src/gui/socialwindow.cpp:232
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:200
+#: src/gui/socialwindow.cpp:233
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:209
+#: src/gui/socialwindow.cpp:242
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:210
+#: src/gui/socialwindow.cpp:243
 #, fuzzy, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "คุณแน่ใจแล้วหรือที่จะลบตัวละครนี้?"
 
-#: src/gui/socialwindow.cpp:239
+#: src/gui/socialwindow.cpp:272
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:240 src/gui/socialwindow.cpp:564
+#: src/gui/socialwindow.cpp:273 src/gui/socialwindow.cpp:620
 #, fuzzy
 msgid "Create Party"
 msgstr "สร้างตัวละคร"
 
-#: src/gui/socialwindow.cpp:279 src/gui/windowmenu.cpp:60
+#: src/gui/socialwindow.cpp:312 src/gui/windowmenu.cpp:64
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:297
+#: src/gui/socialwindow.cpp:330
 msgid "Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:298
+#: src/gui/socialwindow.cpp:331
 msgid "Leave"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:394
+#: src/gui/socialwindow.cpp:443
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:400
+#: src/gui/socialwindow.cpp:449
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:413
+#: src/gui/socialwindow.cpp:462
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:419
+#: src/gui/socialwindow.cpp:468
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:463
+#: src/gui/socialwindow.cpp:497
+msgid "Creating guild failed, please choose a shorter name."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:504
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:477
+#: src/gui/socialwindow.cpp:520
+msgid "Creating party failed, please choose a shorter name."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:527
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:484
+#: src/gui/socialwindow.cpp:541
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:485
+#: src/gui/socialwindow.cpp:542
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:497
+#: src/gui/socialwindow.cpp:554
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:502
+#: src/gui/socialwindow.cpp:559
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:507
+#: src/gui/socialwindow.cpp:564
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:519
+#: src/gui/socialwindow.cpp:576
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:529
+#: src/gui/socialwindow.cpp:585
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:533
+#: src/gui/socialwindow.cpp:589
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:541
+#: src/gui/socialwindow.cpp:597
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:546
+#: src/gui/socialwindow.cpp:602
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:554
+#: src/gui/socialwindow.cpp:610
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:565
+#: src/gui/socialwindow.cpp:621
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:570
+#: src/gui/socialwindow.cpp:626
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:571
+#: src/gui/socialwindow.cpp:627
 msgid "Choose your party's name."
 msgstr ""
 
-#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:59
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:62
 msgid "Specials"
 msgstr ""
 
-#: src/gui/specialswindow.cpp:174
-#, c-format
-msgid "Specials Set %d"
-msgstr ""
-
-#: src/gui/specialswindow.cpp:191
-#, c-format
-msgid "Special %d"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:99 src/gui/statuswindow.cpp:247
+#: src/gui/statuswindow.cpp:113 src/gui/statuswindow.cpp:215
+#: src/gui/statuswindow.cpp:262
 #, c-format
 msgid "Level: %d"
 msgstr "เลเวล: %d"
 
-#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:211
+#: src/gui/statuswindow.cpp:114 src/gui/statuswindow.cpp:208
+#: src/gui/statuswindow.cpp:239
 #, c-format
 msgid "Money: %s"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:102
+#: src/gui/statuswindow.cpp:117
 msgid "HP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:107
+#: src/gui/statuswindow.cpp:122
 msgid "Exp:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:112
+#: src/gui/statuswindow.cpp:130
 msgid "MP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:132 src/gui/statuswindow.cpp:219
+#: src/gui/statuswindow.cpp:158 src/gui/statuswindow.cpp:275
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:133
+#: src/gui/statuswindow.cpp:159
 msgid "Job:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:194
-msgid "HP"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:200
-msgid "MP"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:206
-msgid "Exp"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:215
-msgid "Money"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:225
-msgid "Job"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:229
+#: src/gui/statuswindow.cpp:211 src/gui/statuswindow.cpp:247
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:235
+#: src/gui/statuswindow.cpp:255
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:251
-#, fuzzy
-msgid "Level"
-msgstr "เลเวล: %d"
-
-#: src/gui/storagewindow.cpp:58
-msgid "Storage"
-msgstr ""
-
-#: src/gui/trade.cpp:52
+#: src/gui/trade.cpp:53
 msgid "Propose trade"
 msgstr ""
 
-#: src/gui/trade.cpp:53
+#: src/gui/trade.cpp:54
 msgid "Confirmed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:55
 msgid "Agree trade"
 msgstr ""
 
-#: src/gui/trade.cpp:55
+#: src/gui/trade.cpp:56
 msgid "Agreed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:58
+#: src/gui/trade.cpp:59
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/trade.cpp:74 src/gui/trade.cpp:75
+#: src/gui/trade.cpp:73 src/gui/trade.cpp:74
 msgid "Trade"
 msgstr ""
 
-#: src/gui/trade.cpp:77
+#: src/gui/trade.cpp:76
 msgid "Add"
 msgstr ""
 
-#: src/gui/trade.cpp:99 src/gui/trade.cpp:135
+#: src/gui/trade.cpp:98 src/gui/trade.cpp:134
 #, c-format
 msgid "You get %s"
 msgstr ""
 
-#: src/gui/trade.cpp:100
+#: src/gui/trade.cpp:99
 msgid "You give:"
 msgstr ""
 
-#: src/gui/trade.cpp:104
+#: src/gui/trade.cpp:103
 msgid "Change"
 msgstr ""
 
-#: src/gui/trade.cpp:275
+#: src/gui/trade.cpp:262
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/trade.cpp:318
+#: src/gui/trade.cpp:304
 msgid "You don't have enough money."
 msgstr ""
 
@@ -2060,21 +1910,21 @@ msgstr "กำลังเชื่อมต่อ..."
 msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:405
+#: src/gui/updatewindow.cpp:417
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:407
+#: src/gui/updatewindow.cpp:419
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:409
+#: src/gui/updatewindow.cpp:421
 msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:501
+#: src/gui/updatewindow.cpp:515
 msgid "Completed"
 msgstr ""
 
@@ -2154,61 +2004,61 @@ msgstr ""
 msgid "Need a user to kick!"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:118
+#: src/gui/widgets/chattab.cpp:121
 msgid "Global announcement:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:124
+#: src/gui/widgets/chattab.cpp:127
 #, c-format
 msgid "Global announcement from %s:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:150
+#: src/gui/widgets/chattab.cpp:153
 #, c-format
 msgid "%s whispers: %s"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:51
+#: src/gui/widgets/whispertab.cpp:53
 msgid "Cannot send empty chat!"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:70
+#: src/gui/widgets/whispertab.cpp:72
 msgid "/ignore > Ignore the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:71
+#: src/gui/widgets/whispertab.cpp:73
 msgid "/unignore > Stop ignoring the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:72
+#: src/gui/widgets/whispertab.cpp:74
 msgid "/close > Close the whisper tab"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:82
+#: src/gui/widgets/whispertab.cpp:84
 msgid "Command: /close"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:83
+#: src/gui/widgets/whispertab.cpp:85
 msgid "This command closes the current whisper tab."
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:87
+#: src/gui/widgets/whispertab.cpp:89
 msgid "Command: /ignore"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:88
+#: src/gui/widgets/whispertab.cpp:90
 msgid "This command ignores the other player regardless of current relations."
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:94
+#: src/gui/widgets/whispertab.cpp:96
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:55
+#: src/gui/windowmenu.cpp:54
 msgid "Status"
 msgstr "สถานะ"
 
-#: src/gui/windowmenu.cpp:61
+#: src/gui/windowmenu.cpp:65
 msgid "Shortcut"
 msgstr ""
 
@@ -2224,1354 +2074,1376 @@ msgstr ""
 msgid "Choose World"
 msgstr ""
 
-#: src/keyboardconfig.cpp:40
+#: src/keyboardconfig.cpp:39
 msgid "Move Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:41
+#: src/keyboardconfig.cpp:40
 msgid "Move Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:41
 msgid "Move Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:42
 msgid "Move Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:44 src/net/ea/generalhandler.cpp:223
+#: src/keyboardconfig.cpp:43 src/net/tmwa/generalhandler.cpp:237
 msgid "Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:44
 msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:45
 msgid "Smilie"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:46
 msgid "Talk"
 msgstr ""
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:47
 msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:48
 msgid "Target Monster"
 msgstr ""
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboardconfig.cpp:49
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:50
 msgid "Target Player"
 msgstr ""
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:51
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:52
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:53
 msgid "Sit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:54
 msgid "Screenshot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:55
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:56
 msgid "Find Path to Mouse"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58 src/keyboardconfig.cpp:59
-#: src/keyboardconfig.cpp:60 src/keyboardconfig.cpp:61
-#: src/keyboardconfig.cpp:62 src/keyboardconfig.cpp:63
-#: src/keyboardconfig.cpp:64 src/keyboardconfig.cpp:65
-#: src/keyboardconfig.cpp:66 src/keyboardconfig.cpp:67
-#: src/keyboardconfig.cpp:68 src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:57 src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60
+#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62
+#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64
+#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68
 #, c-format
 msgid "Item Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:69
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:70
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:71
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:72
 msgid "Equipment Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:73
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:74
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:75
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:76
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:77
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:78
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:79
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:80
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:81
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:83
+#: src/keyboardconfig.cpp:82
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:83
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86
-#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88
-#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90
-#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92
-#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:84 src/keyboardconfig.cpp:85
+#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:87
+#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:89
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:91
+#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:93
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:95
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:96
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:97
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:98
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:99
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:100
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:101
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:103
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:105
+#: src/keyboardconfig.cpp:104
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:178
+#: src/keyboardconfig.cpp:183
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:913
+#: src/localplayer.cpp:985
 msgid "Unable to pick up item."
 msgstr ""
 
 #. TRANSLATORS: This sentence may be translated differently
 #. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:922
+#: src/localplayer.cpp:994
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/main.cpp:43
+#: src/main.cpp:42
 msgid "mana [options] [mana-file]"
 msgstr ""
 
+#: src/main.cpp:43
+msgid "[mana-file] : The mana file is an XML file (.mana)"
+msgstr ""
+
 #: src/main.cpp:44
-msgid "Options:"
+msgid "              used to set custom parameters"
 msgstr ""
 
 #: src/main.cpp:45
+msgid "              to the mana client."
+msgstr ""
+
+#: src/main.cpp:47
+msgid "Options:"
+msgstr ""
+
+#: src/main.cpp:48
 msgid "  -v --version        : Display the version"
 msgstr ""
 
-#: src/main.cpp:46
+#: src/main.cpp:49
 msgid "  -h --help           : Display this help"
 msgstr ""
 
-#: src/main.cpp:47
+#: src/main.cpp:50
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
-#: src/main.cpp:48
+#: src/main.cpp:51
 msgid "  -U --username       : Login with this username"
 msgstr ""
 
-#: src/main.cpp:49
+#: src/main.cpp:52
 msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/main.cpp:50
+#: src/main.cpp:53
 msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/main.cpp:51
+#: src/main.cpp:54
 msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:52
+#: src/main.cpp:55
 msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/main.cpp:53
+#: src/main.cpp:56
 msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/main.cpp:54
+#: src/main.cpp:57
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:56
+#: src/main.cpp:59
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:57
+#: src/main.cpp:60
 msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:58
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
+#: src/main.cpp:61
+msgid "     --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/main.cpp:59
+#: src/main.cpp:62
+msgid "     --chat-log-dir   : Chat log dir to use"
+msgstr ""
+
+#: src/main.cpp:63
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/main.cpp:61
+#: src/main.cpp:65
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:63
+#: src/net/manaserv/beinghandler.cpp:303 src/net/tmwa/playerhandler.cpp:94
+msgid "You are dead."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:304 src/net/tmwa/playerhandler.cpp:95
+msgid "We regret to inform you that your character was killed in battle."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:306 src/net/tmwa/playerhandler.cpp:97
+msgid "You are not that alive anymore."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:307 src/net/tmwa/playerhandler.cpp:98
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:308 src/net/tmwa/playerhandler.cpp:99
+msgid "Game Over!"
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:309 src/net/tmwa/playerhandler.cpp:101
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:311 src/net/tmwa/playerhandler.cpp:103
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:313 src/net/tmwa/playerhandler.cpp:105
+msgid "I guess this did not run too well."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:107
+msgid "Do you want your possessions identified?"
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:109
+msgid "Sadly, no trace of you was ever found..."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:111
+msgid "Annihilated."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:113
+msgid "Looks like you got your head handed to you."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:115
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:323
+msgid "Press OK to respawn."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:324
+msgid "You Died"
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:138 src/net/manaserv/charhandler.cpp:209
+msgid "Not logged in."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:141
+msgid "No empty slot."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:144
+msgid "Invalid name."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:147
+msgid "Character's name already exists."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:150
+msgid "Invalid hairstyle."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:153
+msgid "Invalid hair color."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:156
+msgid "Invalid gender."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:159
+msgid "Character's stats are too high."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:162
+msgid "Character's stats are too low."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:165
+#, c-format
+msgid "At least one statis out of the permitted range: (%u - %u)."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:171 src/net/manaserv/loginhandler.cpp:96
+#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
+#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
+#: src/net/tmwa/loginhandler.cpp:95 src/net/tmwa/loginhandler.cpp:182
+msgid "Unknown error."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:200 src/net/tmwa/charserverhandler.cpp:146
+msgid "Info"
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:200
+msgid "Player deleted."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:212
+msgid "Selection out of range."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:215
+#, c-format
+msgid "Unknown error (%d)."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:250
+msgid "No gameservers are available."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:187 src/net/manaserv/chathandler.cpp:313
+#: src/net/manaserv/guildhandler.cpp:260
+#, c-format
+msgid "Topic: %s"
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:274
+msgid "Players in this channel:"
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:208
+msgid "Error joining channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:214
+msgid "Listing channels."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:226
+msgid "End of channel list."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:303
+#, c-format
+msgid "%s entered the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:308
+#, c-format
+msgid "%s left the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:324
+#, c-format
+msgid "%s has set mode %s on user %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:334
+#, c-format
+msgid "%s has kicked %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:339
+msgid "Unknown channel event."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:82
+msgid "Guild created."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:87
+msgid "Error creating guild."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:97
+msgid "Invite sent."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:204
+msgid "Member was promoted successfully."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:209
+msgid "Failed to promote member."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:87
+msgid "Wrong magic_token."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
+msgid "Already logged in."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:93
+#, fuzzy
+msgid "Account banned."
+msgstr "บัญชี: %s"
+
+#: src/net/manaserv/loginhandler.cpp:118
+msgid "New password incorrect."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:121 src/net/tmwa/loginhandler.cpp:89
+msgid "Old password incorrect."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
+msgid "Account not connected. Please login first."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:149
+msgid "New email address incorrect."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:152
+msgid "Old email address incorrect."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:158
+msgid "The new email address already exists."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:239
+msgid ""
+"Client registration is not allowed. Please contact server administration."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
+msgid "Client version is too old."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:266
+msgid "Wrong username or password."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:272
+#, fuzzy
+msgid "Account banned"
+msgstr "บัญชี: %s"
+
+#: src/net/manaserv/loginhandler.cpp:275
+msgid "Login attempt too soon after previous attempt."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:303
+msgid "Wrong username, password or email address."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:306
+msgid "Username already exists."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:309
+msgid "Email address already exists."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:312
+msgid "You took too long with the captcha or your response was incorrect."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:87
+msgid "Joined party."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:105
+#, c-format
+msgid "%s joined the party."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:123
+#, c-format
+msgid "%s rejected your invite."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:95
+msgid "Accepting incoming trade requests."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:97
+msgid "Ignoring incoming trade requests."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:115 src/net/tmwa/tradehandler.cpp:109
+msgid "Request for Trade"
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:116 src/net/tmwa/tradehandler.cpp:110
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:134
+#, c-format
+msgid "Trading with %s"
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:148 src/net/tmwa/tradehandler.cpp:224
+msgid "Trade canceled."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:155 src/net/tmwa/tradehandler.cpp:231
+msgid "Trade completed."
+msgstr ""
+
+#: src/net/tmwa/adminhandler.cpp:64
 msgid "Kick failed!"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:65
+#: src/net/tmwa/adminhandler.cpp:66
 msgid "Kick succeeded!"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:110
+#: src/net/tmwa/buysellhandler.cpp:109
 msgid "Nothing to sell."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:117
+#: src/net/tmwa/buysellhandler.cpp:116
 msgid "Thanks for buying."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:124
+#: src/net/tmwa/buysellhandler.cpp:123
 msgid "Unable to buy."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:130
+#: src/net/tmwa/buysellhandler.cpp:129
 msgid "Thanks for selling."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:132
+#: src/net/tmwa/buysellhandler.cpp:131
 msgid "Unable to sell."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:103
-msgid "Access denied."
+#: src/net/tmwa/charserverhandler.cpp:103
+msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:106
+#: src/net/tmwa/charserverhandler.cpp:107
 msgid "Cannot use this ID."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:109
-msgid "Unknown failure to select character."
+#: src/net/tmwa/charserverhandler.cpp:110
+msgid "Unknown char-server failure."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:135
+#: src/net/tmwa/charserverhandler.cpp:134
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:147 src/net/manaserv/charhandler.cpp:187
-msgid "Info"
-msgstr ""
-
-#: src/net/ea/charserverhandler.cpp:147
+#: src/net/tmwa/charserverhandler.cpp:146
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:152
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Failed to delete character."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:237 src/net/manaserv/charhandler.cpp:263
+#: src/net/tmwa/charserverhandler.cpp:266
 msgid "Strength:"
 msgstr "Strength:"
 
-#: src/net/ea/charserverhandler.cpp:238 src/net/manaserv/charhandler.cpp:264
+#: src/net/tmwa/charserverhandler.cpp:267
 msgid "Agility:"
 msgstr "Agility:"
 
-#: src/net/ea/charserverhandler.cpp:239 src/net/manaserv/charhandler.cpp:266
+#: src/net/tmwa/charserverhandler.cpp:268
 msgid "Vitality:"
 msgstr "Vitality:"
 
-#: src/net/ea/charserverhandler.cpp:240 src/net/manaserv/charhandler.cpp:267
+#: src/net/tmwa/charserverhandler.cpp:269
 msgid "Intelligence:"
 msgstr "Intelligence:"
 
-#: src/net/ea/charserverhandler.cpp:241 src/net/manaserv/charhandler.cpp:265
+#: src/net/tmwa/charserverhandler.cpp:270
 msgid "Dexterity:"
 msgstr "Dexterity:"
 
-#: src/net/ea/charserverhandler.cpp:242
+#: src/net/tmwa/charserverhandler.cpp:271
 msgid "Luck:"
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:80
-msgid "Whisper could not be sent, user is offline."
+#: src/net/tmwa/chathandler.cpp:87
+#, c-format
+msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:84
-msgid "Whisper could not be sent, ignored by user."
+#: src/net/tmwa/chathandler.cpp:96
+#, c-format
+msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:171
+#: src/net/tmwa/chathandler.cpp:230
 msgid "MVP player."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:204 src/net/ea/chathandler.cpp:210
-#: src/net/ea/chathandler.cpp:215 src/net/ea/chathandler.cpp:220
-#: src/net/ea/chathandler.cpp:225 src/net/ea/chathandler.cpp:230
-#: src/net/ea/chathandler.cpp:235 src/net/ea/chathandler.cpp:240
+#: src/net/tmwa/chathandler.cpp:265 src/net/tmwa/chathandler.cpp:271
+#: src/net/tmwa/chathandler.cpp:276 src/net/tmwa/chathandler.cpp:281
+#: src/net/tmwa/chathandler.cpp:286 src/net/tmwa/chathandler.cpp:291
+#: src/net/tmwa/chathandler.cpp:296 src/net/tmwa/chathandler.cpp:301
 msgid "Channels are not supported!"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:86
+#: src/net/tmwa/gamehandler.cpp:88
 #, c-format
 msgid "Online users: %d"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:100
+#: src/net/tmwa/gamehandler.cpp:101
 #, fuzzy
 msgid "Game"
 msgstr "ชื่อ:"
 
-#: src/net/ea/gamehandler.cpp:100
+#: src/net/tmwa/gamehandler.cpp:101
 msgid "Request to quit denied!"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:102 src/net/manaserv/generalhandler.cpp:95
+#: src/net/tmwa/generalhandler.cpp:102
 #, c-format
 msgid "Strength %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:103 src/net/manaserv/generalhandler.cpp:96
+#: src/net/tmwa/generalhandler.cpp:103
 #, c-format
 msgid "Agility %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:104 src/net/manaserv/generalhandler.cpp:98
+#: src/net/tmwa/generalhandler.cpp:104
 #, c-format
 msgid "Vitality %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:105 src/net/manaserv/generalhandler.cpp:99
+#: src/net/tmwa/generalhandler.cpp:105
 #, c-format
 msgid "Intelligence %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:106 src/net/manaserv/generalhandler.cpp:97
+#: src/net/tmwa/generalhandler.cpp:106
 #, c-format
 msgid "Dexterity %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:107
+#: src/net/tmwa/generalhandler.cpp:107
 #, c-format
 msgid "Luck %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:130
+#: src/net/tmwa/generalhandler.cpp:132
 msgid "Authentication failed."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:133
+#: src/net/tmwa/generalhandler.cpp:135
 msgid "No servers available."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:137
+#: src/net/tmwa/generalhandler.cpp:139
 msgid "Someone else is trying to use this account."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:140
+#: src/net/tmwa/generalhandler.cpp:142
 msgid "This account is already logged in."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:143
+#: src/net/tmwa/generalhandler.cpp:145
 msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:146
+#: src/net/tmwa/generalhandler.cpp:148
 msgid "Duplicated login."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:149
+#: src/net/tmwa/generalhandler.cpp:151
 msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:205
+#: src/net/tmwa/generalhandler.cpp:209
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:216 src/net/manaserv/generalhandler.cpp:166
+#: src/net/tmwa/generalhandler.cpp:230
 msgid "Strength"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:217 src/net/manaserv/generalhandler.cpp:167
+#: src/net/tmwa/generalhandler.cpp:231
 msgid "Agility"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:218 src/net/manaserv/generalhandler.cpp:169
+#: src/net/tmwa/generalhandler.cpp:232
 msgid "Vitality"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:219 src/net/manaserv/generalhandler.cpp:170
+#: src/net/tmwa/generalhandler.cpp:233
 msgid "Intelligence"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:220 src/net/manaserv/generalhandler.cpp:168
+#: src/net/tmwa/generalhandler.cpp:234
 msgid "Dexterity"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:221
+#: src/net/tmwa/generalhandler.cpp:235
 msgid "Luck"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:224
+#: src/net/tmwa/generalhandler.cpp:238
 #, fuzzy
 msgid "Defense"
 msgstr "ลบทิ้ง"
 
-#: src/net/ea/generalhandler.cpp:225
+#: src/net/tmwa/generalhandler.cpp:239
 msgid "M.Attack"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:226
+#: src/net/tmwa/generalhandler.cpp:240
 msgid "M.Defense"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:227
+#: src/net/tmwa/generalhandler.cpp:241
 #, c-format
 msgid "% Accuracy"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:228
+#: src/net/tmwa/generalhandler.cpp:242
 #, c-format
 msgid "% Evade"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:229
+#: src/net/tmwa/generalhandler.cpp:243
 #, c-format
 msgid "% Critical"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:61 src/net/ea/gui/partytab.cpp:59
+#: src/net/tmwa/gui/guildtab.cpp:45
+msgid "Guild"
+msgstr ""
+
+#: src/net/tmwa/gui/guildtab.cpp:61 src/net/tmwa/gui/partytab.cpp:59
 msgid "/help > Display this help."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:62
+#: src/net/tmwa/gui/guildtab.cpp:62
 msgid "/invite > Invite a player to your guild"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:63
+#: src/net/tmwa/gui/guildtab.cpp:63
 msgid "/leave > Leave the guild you are in"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:64
+#: src/net/tmwa/gui/guildtab.cpp:64
 msgid "/kick > Kick some one from the guild you are in"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:73 src/net/ea/gui/partytab.cpp:73
+#: src/net/tmwa/gui/guildtab.cpp:73 src/net/tmwa/gui/partytab.cpp:73
 msgid "Command: /invite <nick>"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:74
+#: src/net/tmwa/gui/guildtab.cpp:74
 msgid "This command invites <nick> to the guild you're in."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:80 src/net/ea/gui/partytab.cpp:80
+#: src/net/tmwa/gui/guildtab.cpp:80 src/net/tmwa/gui/partytab.cpp:80
 msgid "Command: /leave"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:81
+#: src/net/tmwa/gui/guildtab.cpp:81
 msgid "This command causes the player to leave the guild."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:89
+#: src/net/tmwa/gui/guildtab.cpp:89
 msgid "Guild name is missing."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:293
+#: src/net/tmwa/guildhandler.cpp:296
 msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:298
+#: src/net/tmwa/guildhandler.cpp:301
 msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:303
+#: src/net/tmwa/guildhandler.cpp:306
 msgid "User is now part of your guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:308
+#: src/net/tmwa/guildhandler.cpp:311
 msgid "Your guild is full."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:313
+#: src/net/tmwa/guildhandler.cpp:316
 msgid "Unknown guild invite response."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:390
+#: src/net/tmwa/guildhandler.cpp:393
 msgid "Guild creation isn't supported yet."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:60
+#: src/net/tmwa/gui/partytab.cpp:43
+msgid "Party"
+msgstr ""
+
+#: src/net/tmwa/gui/partytab.cpp:60
 msgid "/invite > Invite a player to your party"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:61
+#: src/net/tmwa/gui/partytab.cpp:61
 msgid "/leave > Leave the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:62
+#: src/net/tmwa/gui/partytab.cpp:62
 msgid "/kick > Kick some one from the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:63
+#: src/net/tmwa/gui/partytab.cpp:63
 msgid "/item > Show/change party item sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:64
+#: src/net/tmwa/gui/partytab.cpp:64
 msgid "/exp > Show/change party experience sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:81
+#: src/net/tmwa/gui/partytab.cpp:81
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:85
+#: src/net/tmwa/gui/partytab.cpp:85
 msgid "Command: /item <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:86
+#: src/net/tmwa/gui/partytab.cpp:86
 msgid "This command changes the party's item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:87
+#: src/net/tmwa/gui/partytab.cpp:87
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:90
+#: src/net/tmwa/gui/partytab.cpp:90
 msgid "Command: /item"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/tmwa/gui/partytab.cpp:91
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/tmwa/gui/partytab.cpp:95
 msgid "Command: /exp <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:96
+#: src/net/tmwa/gui/partytab.cpp:96
 msgid "This command changes the party's experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/tmwa/gui/partytab.cpp:97
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:100
+#: src/net/tmwa/gui/partytab.cpp:100
 msgid "Command: /exp"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/tmwa/gui/partytab.cpp:101
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:132 src/net/ea/partyhandler.cpp:198
+#: src/net/tmwa/gui/partytab.cpp:132 src/net/tmwa/partyhandler.cpp:196
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:135 src/net/ea/partyhandler.cpp:204
+#: src/net/tmwa/gui/partytab.cpp:135 src/net/tmwa/partyhandler.cpp:202
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:138 src/net/ea/partyhandler.cpp:210
+#: src/net/tmwa/gui/partytab.cpp:138 src/net/tmwa/partyhandler.cpp:208
 msgid "Item sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:141
+#: src/net/tmwa/gui/partytab.cpp:141
 msgid "Item sharing unknown."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:167 src/net/ea/partyhandler.cpp:174
+#: src/net/tmwa/gui/partytab.cpp:167 src/net/tmwa/partyhandler.cpp:172
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:170 src/net/ea/partyhandler.cpp:180
+#: src/net/tmwa/gui/partytab.cpp:170 src/net/tmwa/partyhandler.cpp:178
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:173 src/net/ea/partyhandler.cpp:186
+#: src/net/tmwa/gui/partytab.cpp:173 src/net/tmwa/partyhandler.cpp:184
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:176
+#: src/net/tmwa/gui/partytab.cpp:176
 msgid "Experience sharing unknown."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:281
+#: src/net/tmwa/inventoryhandler.cpp:285
 msgid "Failed to use item."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:391
+#: src/net/tmwa/inventoryhandler.cpp:399
 msgid "Unable to equip."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:402
+#: src/net/tmwa/inventoryhandler.cpp:410
 msgid "Unable to unequip."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:79
+#: src/net/tmwa/loginhandler.cpp:86
 msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:82 src/net/manaserv/loginhandler.cpp:121
-msgid "Old password incorrect."
-msgstr ""
-
-#: src/net/ea/loginhandler.cpp:85
+#: src/net/tmwa/loginhandler.cpp:92
 msgid "New password too short."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:88 src/net/ea/loginhandler.cpp:175
-#: src/net/manaserv/charhandler.cpp:158 src/net/manaserv/loginhandler.cpp:96
-#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
-#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
-msgid "Unknown error."
-msgstr ""
-
-#: src/net/ea/loginhandler.cpp:149
+#: src/net/tmwa/loginhandler.cpp:156
 msgid "Unregistered ID."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:152
+#: src/net/tmwa/loginhandler.cpp:159
 #, fuzzy
 msgid "Wrong password."
 msgstr "เปลี่ยนรหัสผ่าน"
 
-#: src/net/ea/loginhandler.cpp:155
+#: src/net/tmwa/loginhandler.cpp:162
 msgid "Account expired."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:158
+#: src/net/tmwa/loginhandler.cpp:165
 msgid "Rejected from server."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:161
+#: src/net/tmwa/loginhandler.cpp:168
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:165
+#: src/net/tmwa/loginhandler.cpp:172
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:172
+#: src/net/tmwa/loginhandler.cpp:179
 msgid "This user name is already taken."
 msgstr ""
 
-#: src/net/ea/network.cpp:145
+#: src/net/tmwa/network.cpp:145
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/ea/network.cpp:345
+#: src/net/tmwa/network.cpp:345
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/ea/network.cpp:414
+#: src/net/tmwa/network.cpp:414
 msgid "Connection to server terminated. "
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:81
+#: src/net/tmwa/partyhandler.cpp:82
 msgid "Could not create party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:84
+#: src/net/tmwa/partyhandler.cpp:84
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:118
+#: src/net/tmwa/partyhandler.cpp:119
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:122
+#: src/net/tmwa/partyhandler.cpp:123
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:126
+#: src/net/tmwa/partyhandler.cpp:127
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:130
+#: src/net/tmwa/partyhandler.cpp:131
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:238
+#: src/net/tmwa/partyhandler.cpp:236
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:249
+#: src/net/tmwa/partyhandler.cpp:246
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:301
+#: src/net/tmwa/partyhandler.cpp:299
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:329
-msgid "Inviting like this isn't supported at the moment."
+#: src/net/tmwa/partyhandler.cpp:335
+#, c-format
+msgid "Inviting failed, because you can't see a player called %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:334
+#: src/net/tmwa/partyhandler.cpp:340
 msgid "You can only inivte when you are in a party!"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:365
+#: src/net/tmwa/partyhandler.cpp:368
 #, c-format
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:304
-msgid "You are dead."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:305
-msgid "We regret to inform you that your character was killed in battle."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:307
-msgid "You are not that alive anymore."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:308
-msgid "The cold hands of the grim reaper are grabbing for your soul."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:309
-msgid "Game Over!"
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:105
+#: src/net/tmwa/playerhandler.cpp:100
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:310
-msgid ""
-"No, kids. Your character did not really die. It... err... went to a better "
-"place."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:312
-msgid ""
-"Your plan of breaking your enemies weapon by bashing it with your throat "
-"failed."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:314
-msgid "I guess this did not run too well."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:315
-msgid "Do you want your possessions identified?"
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:316
-msgid "Sadly, no trace of you was ever found..."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:317
-msgid "Annihilated."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:318
-msgid "Looks like you got your head handed to you."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:120 src/net/manaserv/beinghandler.cpp:319
-msgid ""
-"You screwed up again, dump your body down the tubes and get you another one."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/tmwa/playerhandler.cpp:118
 msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/tmwa/playerhandler.cpp:119
 msgid "You are no more."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/tmwa/playerhandler.cpp:120
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/tmwa/playerhandler.cpp:121
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/tmwa/playerhandler.cpp:122
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/tmwa/playerhandler.cpp:123
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/tmwa/playerhandler.cpp:124
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:130
+#: src/net/tmwa/playerhandler.cpp:125
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:131
+#: src/net/tmwa/playerhandler.cpp:126
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/tmwa/playerhandler.cpp:127
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/tmwa/playerhandler.cpp:128
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:135
+#: src/net/tmwa/playerhandler.cpp:130
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:136
+#: src/net/tmwa/playerhandler.cpp:131
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:249 src/net/ea/playerhandler.cpp:310
+#: src/net/tmwa/playerhandler.cpp:246 src/net/tmwa/playerhandler.cpp:285
 msgid "Message"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:250
+#: src/net/tmwa/playerhandler.cpp:247
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:333
+#: src/net/tmwa/playerhandler.cpp:313
 #, c-format
 msgid "You picked up %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:369
+#: src/net/tmwa/playerhandler.cpp:348
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:532
+#: src/net/tmwa/playerhandler.cpp:488
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:147
+#: src/net/tmwa/specialhandler.cpp:144
 msgid "Trade failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:150
+#: src/net/tmwa/specialhandler.cpp:147
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:153
+#: src/net/tmwa/specialhandler.cpp:150
 msgid "Sit failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:156
+#: src/net/tmwa/specialhandler.cpp:153
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:159
+#: src/net/tmwa/specialhandler.cpp:156
 msgid "Could not join party!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:162
+#: src/net/tmwa/specialhandler.cpp:159
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:171
+#: src/net/tmwa/specialhandler.cpp:168
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:174
+#: src/net/tmwa/specialhandler.cpp:171
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:177
+#: src/net/tmwa/specialhandler.cpp:174
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:180
+#: src/net/tmwa/specialhandler.cpp:177
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:183
+#: src/net/tmwa/specialhandler.cpp:180
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:186
+#: src/net/tmwa/specialhandler.cpp:183
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:189
+#: src/net/tmwa/specialhandler.cpp:186
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:192
+#: src/net/tmwa/specialhandler.cpp:189
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:195
+#: src/net/tmwa/specialhandler.cpp:192
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:198
+#: src/net/tmwa/specialhandler.cpp:195
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:201
+#: src/net/tmwa/specialhandler.cpp:198
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:210
+#: src/net/tmwa/specialhandler.cpp:207
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:213
+#: src/net/tmwa/specialhandler.cpp:210
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:216
+#: src/net/tmwa/specialhandler.cpp:213
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:116
-msgid "Request for Trade"
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:108 src/net/manaserv/tradehandler.cpp:117
-#, c-format
-msgid "%s wants to trade with you, do you accept?"
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:124
+#: src/net/tmwa/tradehandler.cpp:126
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:128
+#: src/net/tmwa/tradehandler.cpp:130
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:132
+#: src/net/tmwa/tradehandler.cpp:134
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:137
+#: src/net/tmwa/tradehandler.cpp:139
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:144
+#: src/net/tmwa/tradehandler.cpp:146
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:153
+#: src/net/tmwa/tradehandler.cpp:154
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:202
+#: src/net/tmwa/tradehandler.cpp:202
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:207
+#: src/net/tmwa/tradehandler.cpp:207
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:211
+#: src/net/tmwa/tradehandler.cpp:211
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:224 src/net/manaserv/tradehandler.cpp:149
-msgid "Trade canceled."
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:231 src/net/manaserv/tradehandler.cpp:156
-msgid "Trade completed."
-msgstr ""
-
-#: src/net/manaserv/beinghandler.cpp:324
-msgid "Press OK to respawn."
-msgstr ""
-
-#: src/net/manaserv/beinghandler.cpp:325
-msgid "You Died"
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:128 src/net/manaserv/charhandler.cpp:196
-msgid "Not logged in."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:131
-msgid "No empty slot."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:134
-msgid "Invalid name."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:137
-msgid "Character's name already exists."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:140
-msgid "Invalid hairstyle."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:143
-msgid "Invalid hair color."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:146
-msgid "Invalid gender."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:149
-msgid "Character's stats are too high."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:152
-msgid "Character's stats are too low."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:155
-msgid "One stat is zero."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:187
-msgid "Player deleted."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:199
-msgid "Selection out of range."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:202
-#, c-format
-msgid "Unknown error (%d)."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:242
-msgid "No gameservers are available."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:268
-msgid "Willpower:"
-msgstr "Willpower:"
-
-#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
-#: src/net/manaserv/guildhandler.cpp:259
-#, c-format
-msgid "Topic: %s"
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
-msgid "Players in this channel:"
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:201
-msgid "Error joining channel."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:207
-msgid "Listing channels."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:219
-msgid "End of channel list."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:291
-#, c-format
-msgid "%s entered the channel."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:296
-#, c-format
-msgid "%s left the channel."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:312
-#, c-format
-msgid "%s has set mode %s on user %s."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:322
-#, c-format
-msgid "%s has kicked %s."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:327
-msgid "Unknown channel event."
-msgstr ""
-
-#: src/net/manaserv/generalhandler.cpp:100
-#, c-format
-msgid "Willpower %+d"
-msgstr ""
-
-#: src/net/manaserv/generalhandler.cpp:171
-#, fuzzy
-msgid "Willpower"
-msgstr "Willpower:"
-
-#: src/net/manaserv/guildhandler.cpp:81
-msgid "Guild created."
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:86
-msgid "Error creating guild."
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:96
-msgid "Invite sent."
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:203
-msgid "Member was promoted successfully."
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:208
-msgid "Failed to promote member."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:87
-msgid "Wrong magic_token."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
-msgid "Already logged in."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:93 src/net/manaserv/loginhandler.cpp:272
-msgid "Server is full."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:118
-msgid "New password incorrect."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
-msgid "Account not connected. Please login first."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:149
-msgid "New email address incorrect."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:152
-msgid "Old email address incorrect."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:158
-msgid "The new email address already exists."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:239
-msgid ""
-"Client registration is not allowed. Please contact server administration."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
-msgid "Client version is too old."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:266
-msgid "Wrong username or password."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:275
-msgid "Login attempt too soon after previous attempt."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:303
-msgid "Wrong username, password or email address."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:306
-msgid "Username already exists."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:309
-msgid "Email address already exists."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:312
-msgid "You took too long with the captcha or your response was incorrect."
-msgstr ""
-
-#: src/net/manaserv/partyhandler.cpp:88
-msgid "Joined party."
-msgstr ""
-
-#: src/net/manaserv/partyhandler.cpp:106
-#, c-format
-msgid "%s joined the party."
-msgstr ""
-
-#: src/net/manaserv/partyhandler.cpp:123
-#, c-format
-msgid "%s rejected your invite."
-msgstr ""
-
-#: src/net/manaserv/tradehandler.cpp:96
-msgid "Accepting incoming trade requests."
-msgstr ""
-
-#: src/net/manaserv/tradehandler.cpp:98
-msgid "Ignoring incoming trade requests."
-msgstr ""
-
-#: src/net/manaserv/tradehandler.cpp:135
-#, c-format
-msgid "Trading with %s"
-msgstr ""
-
-#: src/playerrelations.cpp:304
+#: src/playerrelations.cpp:310
 msgid "Completely ignore"
 msgstr ""
 
-#: src/playerrelations.cpp:318
+#: src/playerrelations.cpp:324
 msgid "Print '...'"
 msgstr ""
 
-#: src/playerrelations.cpp:334
+#: src/playerrelations.cpp:340
 msgid "Blink name"
 msgstr ""
 
-#: src/playerrelations.cpp:371
-msgid "Floating '...' bubble"
-msgstr ""
-
-#: src/playerrelations.cpp:374
-msgid "Floating bubble"
-msgstr ""
-
-#: src/resources/itemdb.cpp:52
+#: src/resources/itemdb.cpp:44
 #, c-format
 msgid "Attack %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:53
+#: src/resources/itemdb.cpp:45
 #, c-format
 msgid "Defense %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:54
+#: src/resources/itemdb.cpp:46
 #, c-format
 msgid "HP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:55
+#: src/resources/itemdb.cpp:47
 #, c-format
 msgid "MP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:114
+#: src/resources/itemdb.cpp:92
 msgid "Unknown item"
 msgstr ""
 
-#: src/resources/itemdb.cpp:158 src/resources/monsterdb.cpp:45
-#: src/resources/monsterdb.cpp:67
+#: src/resources/itemdb.cpp:135 src/resources/monsterdb.cpp:77
 msgid "unnamed"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Level"
+#~ msgstr "เลเวล: %d"
+
+#~ msgid "Willpower:"
+#~ msgstr "Willpower:"
+
+#, fuzzy
+#~ msgid "Willpower"
+#~ msgstr "Willpower:"
+
 #~ msgid "Description: %s"
 #~ msgstr "รายละเอียด: %s"
 
diff --git a/po/tr.po b/po/tr.po
index 3c550359..b3ddf5c2 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2010-03-05 21:52+0100\n"
+"POT-Creation-Date: 2010-12-13 20:04+0100\n"
 "PO-Revision-Date: 2010-02-12 09:43+0000\n"
 "Last-Translator: Bekir AVCI <bilgi@turkuazyakit.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
+"Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,445 +19,459 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/client.cpp:553 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:62
+#: src/client.cpp:598 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
 msgid "Setup"
 msgstr "Kur"
 
-#: src/client.cpp:623
+#: src/client.cpp:679
 #, fuzzy
 msgid "Connecting to server"
 msgstr "Sunucu bekleniyor"
 
-#: src/client.cpp:650
+#: src/client.cpp:706
 #, fuzzy
 msgid "Logging in"
 msgstr "Oturum Aç"
 
-#: src/client.cpp:683
+#: src/client.cpp:739
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:739
+#: src/client.cpp:804
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:768
+#: src/client.cpp:833
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:799 src/client.cpp:806 src/client.cpp:940
+#: src/client.cpp:843
+#, fuzzy
+msgid "Changing game servers"
+msgstr "Sunucu"
+
+#: src/client.cpp:872 src/client.cpp:879 src/client.cpp:1014
 #: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
 #: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
-#: src/gui/serverdialog.cpp:261 src/gui/unregisterdialog.cpp:133
-#: src/net/ea/charserverhandler.cpp:135 src/net/ea/charserverhandler.cpp:152
-#: src/net/manaserv/charhandler.cpp:161 src/net/manaserv/charhandler.cpp:204
+#: src/gui/serverdialog.cpp:323 src/gui/unregisterdialog.cpp:133
+#: src/net/manaserv/charhandler.cpp:174 src/net/manaserv/charhandler.cpp:217
+#: src/net/tmwa/charserverhandler.cpp:134
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Error"
 msgstr "Hata"
 
-#: src/client.cpp:815
+#: src/client.cpp:888
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:842
+#: src/client.cpp:915
 #, fuzzy
 msgid "Password Change"
 msgstr "Şifre:"
 
-#: src/client.cpp:843
+#: src/client.cpp:916
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:862
+#: src/client.cpp:935
 #, fuzzy
 msgid "Email Change"
 msgstr "Değiştir"
 
-#: src/client.cpp:863
+#: src/client.cpp:936
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:883
+#: src/client.cpp:956
 #, fuzzy
 msgid "Unregister Successful"
 msgstr "Hesabı Kapat"
 
-#: src/client.cpp:884
+#: src/client.cpp:957
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1007 src/client.cpp:1030
+#: src/client.cpp:1138 src/client.cpp:1161
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1119
+#: src/client.cpp:1281
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1153 src/client.cpp:1159
+#: src/client.cpp:1315 src/client.cpp:1321
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/commandhandler.cpp:127 src/commandhandler.cpp:308
+#: src/commandhandler.cpp:131 src/commandhandler.cpp:317
 msgid "Unknown command."
 msgstr "Bilinmeyen komut."
 
-#: src/commandhandler.cpp:156
+#: src/commandhandler.cpp:160
 msgid "-- Help --"
 msgstr "-- Yardım --"
 
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:161
 msgid "/help > Display this help"
 msgstr "/help > Bu yardımı görüntüler"
 
-#: src/commandhandler.cpp:159
+#: src/commandhandler.cpp:163
 msgid "/where > Display map name"
 msgstr "Harita adını gösterir"
 
-#: src/commandhandler.cpp:160
+#: src/commandhandler.cpp:164
 msgid "/who > Display number of online users"
 msgstr "/who > Çevirimiçi kullanıcı sayısını görüntüler"
 
-#: src/commandhandler.cpp:161
+#: src/commandhandler.cpp:165
 msgid "/me > Tell something about yourself"
 msgstr "/me > Hakkınızda birşey yazın"
 
-#: src/commandhandler.cpp:163
+#: src/commandhandler.cpp:167
 msgid "/clear > Clears this window"
 msgstr "/clear > Bu pencereyi temizler"
 
-#: src/commandhandler.cpp:165
+#: src/commandhandler.cpp:169
 msgid "/msg > Send a private message to a user"
 msgstr "/msg > Bir kullanıcıya özel mesaj gönder"
 
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:170
 msgid "/whisper > Alias of msg"
 msgstr "/whisper > Alias of msg"
 
-#: src/commandhandler.cpp:167
+#: src/commandhandler.cpp:171
 msgid "/w > Alias of msg"
 msgstr "/w > Alias of msg"
 
-#: src/commandhandler.cpp:168
+#: src/commandhandler.cpp:172
 msgid "/query > Makes a tab for private messages with another user"
 msgstr "/query > Diğer kullanıcılarla özel mesajlar için bir sekme yaratır."
 
-#: src/commandhandler.cpp:169
+#: src/commandhandler.cpp:174
 msgid "/q > Alias of query"
 msgstr ""
 
-#: src/commandhandler.cpp:171
+#: src/commandhandler.cpp:176
 msgid "/ignore > ignore a player"
 msgstr ""
 
-#: src/commandhandler.cpp:172
+#: src/commandhandler.cpp:177
 msgid "/unignore > stop ignoring a player"
 msgstr ""
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:179
 msgid "/list > Display all public channels"
 msgstr "/list > Bütün genel kanalları gösterir"
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:180
 msgid "/join > Join or create a channel"
 msgstr "Bir kanala katıl veya bir kanal oluştur"
 
-#: src/commandhandler.cpp:177
+#: src/commandhandler.cpp:182
 #, fuzzy
 msgid "/createparty > Create a new party"
 msgstr "Guruba bir kullanıcı davet et."
 
-#: src/commandhandler.cpp:178
+#: src/commandhandler.cpp:183
 msgid "/party > Invite a user to party"
 msgstr "Guruba bir kullanıcı davet et."
 
-#: src/commandhandler.cpp:180
+#: src/commandhandler.cpp:185
 msgid "/record > Start recording the chat to an external file"
 msgstr "Yazışmayı bir dış dosyaya kaydet."
 
-#: src/commandhandler.cpp:181
+#: src/commandhandler.cpp:187
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr ""
 
-#: src/commandhandler.cpp:182
+#: src/commandhandler.cpp:189
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
 
-#: src/commandhandler.cpp:184
+#: src/commandhandler.cpp:192
 msgid "/announce > Global announcement (GM only)"
 msgstr "Genel duyuru (yalnız GM)"
 
-#: src/commandhandler.cpp:188
+#: src/commandhandler.cpp:196
 msgid "For more information, type /help <command>."
 msgstr "Daha fazla bilgi için ,yardım/yaz <komut>."
 
-#: src/commandhandler.cpp:192
+#: src/commandhandler.cpp:200
 msgid "Command: /help"
 msgstr "Komut: /yardım"
 
-#: src/commandhandler.cpp:193
+#: src/commandhandler.cpp:201
 msgid "This command displays a list of all commands available."
 msgstr "Bu komut kullanılabilir bütün komutların bir  listesini gösterir."
 
-#: src/commandhandler.cpp:194
+#: src/commandhandler.cpp:203
 msgid "Command: /help <command>"
 msgstr "Komut: /help <command>"
 
-#: src/commandhandler.cpp:195
+#: src/commandhandler.cpp:204
 msgid "This command displays help on <command>."
 msgstr "Bu komut  <komut> hakkında yardımı gösterir."
 
-#: src/commandhandler.cpp:203
+#: src/commandhandler.cpp:212
 msgid "Command: /announce <msg>"
 msgstr "Komut: / duyuru <msg>"
 
-#: src/commandhandler.cpp:204
+#: src/commandhandler.cpp:213
 msgid "*** only available to a GM ***"
 msgstr "*** Sadece GM  için  mevcut ***"
 
-#: src/commandhandler.cpp:205
+#: src/commandhandler.cpp:214
 msgid "This command sends the message <msg> to all players currently online."
 msgstr "Bu komut şuanda çevirimiçi olan bütün oyunculara mesaj <msg> gönderir."
 
-#: src/commandhandler.cpp:210
+#: src/commandhandler.cpp:219
 msgid "Command: /clear"
 msgstr "Komut : /clear"
 
-#: src/commandhandler.cpp:211
+#: src/commandhandler.cpp:220
 msgid "This command clears the chat log of previous chat."
 msgstr "Bu komut önceki yazışma girdilerini siler."
 
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:224
 #, fuzzy
 msgid "Command: /ignore <player>"
 msgstr "Komut: /join <channel>"
 
-#: src/commandhandler.cpp:216
+#: src/commandhandler.cpp:225
 #, fuzzy
 msgid "This command ignores the given player regardless of current relations."
 msgstr "Bu komut şu anda çevrimiçi oyuncu sayısını gösterir."
 
-#: src/commandhandler.cpp:221
+#: src/commandhandler.cpp:230
 msgid "Command: /join <channel>"
 msgstr "Komut: /join <channel>"
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:231
 msgid "This command makes you enter <channel>."
 msgstr ""
 
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:232
 msgid "If <channel> doesn't exist, it's created."
 msgstr ""
 
-#: src/commandhandler.cpp:227
+#: src/commandhandler.cpp:236
 msgid "Command: /list"
 msgstr "Komut: /list"
 
-#: src/commandhandler.cpp:228
+#: src/commandhandler.cpp:237
 msgid "This command shows a list of all channels."
 msgstr ""
 
-#: src/commandhandler.cpp:232
+#: src/commandhandler.cpp:241
 msgid "Command: /me <message>"
 msgstr "Komut: /me <message>"
 
-#: src/commandhandler.cpp:233
+#: src/commandhandler.cpp:242
 msgid "This command tell others you are (doing) <msg>."
 msgstr ""
 
-#: src/commandhandler.cpp:237
+#: src/commandhandler.cpp:246
 msgid "Command: /msg <nick> <message>"
 msgstr "Komut: /msg <nick> <message>"
 
-#: src/commandhandler.cpp:238
+#: src/commandhandler.cpp:247
 msgid "Command: /whisper <nick> <message>"
 msgstr "Komut: /whisper <nick> <message>"
 
-#: src/commandhandler.cpp:239
+#: src/commandhandler.cpp:248
 msgid "Command: /w <nick> <message>"
 msgstr "Komut: /w <nick> <message>"
 
-#: src/commandhandler.cpp:240
+#: src/commandhandler.cpp:249
 msgid "This command sends the text <message> to <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:241 src/commandhandler.cpp:260
+#: src/commandhandler.cpp:250 src/commandhandler.cpp:269
 #: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
-#: src/net/ea/gui/guildtab.cpp:75 src/net/ea/gui/partytab.cpp:75
+#: src/net/tmwa/gui/guildtab.cpp:75 src/net/tmwa/gui/partytab.cpp:75
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:255
 msgid "Command: /query <nick>"
 msgstr "Komut: /query <nick>"
 
-#: src/commandhandler.cpp:247
+#: src/commandhandler.cpp:256
 msgid "Command: /q <nick>"
 msgstr "Komut: /q <nick>"
 
-#: src/commandhandler.cpp:248
+#: src/commandhandler.cpp:257
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:253
+#: src/commandhandler.cpp:262
 #, fuzzy
 msgid "Command: /createparty <name>"
 msgstr "Komut: /party <nick>"
 
-#: src/commandhandler.cpp:254
+#: src/commandhandler.cpp:263
 msgid "This command creates a new party called <name>."
 msgstr ""
 
-#: src/commandhandler.cpp:258
+#: src/commandhandler.cpp:267
 msgid "Command: /party <nick>"
 msgstr "Komut: /party <nick>"
 
-#: src/commandhandler.cpp:259 src/net/ea/gui/partytab.cpp:74
+#: src/commandhandler.cpp:268 src/net/tmwa/gui/partytab.cpp:74
 msgid "This command invites <nick> to party with you."
 msgstr "Bu komut <nick> adlı kişiyi partinize davet eder."
 
-#: src/commandhandler.cpp:265
+#: src/commandhandler.cpp:274
 msgid "Command: /present"
 msgstr "Komut: /present"
 
-#: src/commandhandler.cpp:266
+#: src/commandhandler.cpp:275
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: src/commandhandler.cpp:272
+#: src/commandhandler.cpp:281
 msgid "Command: /record <filename>"
 msgstr "Komut: /record <filename>"
 
-#: src/commandhandler.cpp:273
+#: src/commandhandler.cpp:282
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr ""
 
-#: src/commandhandler.cpp:275
+#: src/commandhandler.cpp:284
 msgid "Command: /record"
 msgstr "Komut: /record"
 
-#: src/commandhandler.cpp:276
+#: src/commandhandler.cpp:285
 msgid "This command finishes a recording session."
 msgstr ""
 
-#: src/commandhandler.cpp:280
+#: src/commandhandler.cpp:289
 msgid "Command: /toggle <state>"
 msgstr "Komut: /toggle <state>"
 
-#: src/commandhandler.cpp:281
+#: src/commandhandler.cpp:290
 msgid ""
 "This command sets whether the return key should toggle the chat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: src/commandhandler.cpp:283
+#: src/commandhandler.cpp:292
 msgid ""
-"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
-"\", \"no\", \"false\" to turn the toggle off."
+"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
+"\"0\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: src/commandhandler.cpp:286
+#: src/commandhandler.cpp:295
 msgid "Command: /toggle"
 msgstr "Komut: /toggle"
 
-#: src/commandhandler.cpp:287
+#: src/commandhandler.cpp:296
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: src/commandhandler.cpp:291 src/gui/widgets/whispertab.cpp:93
+#: src/commandhandler.cpp:300 src/gui/widgets/whispertab.cpp:95
 #, fuzzy
 msgid "Command: /unignore <player>"
 msgstr "Komut: / duyuru <msg>"
 
-#: src/commandhandler.cpp:292
+#: src/commandhandler.cpp:301
 msgid "This command stops ignoring the given player if they are being ignored"
 msgstr ""
 
-#: src/commandhandler.cpp:297
+#: src/commandhandler.cpp:306
 msgid "Command: /where"
 msgstr "Komut:  /where"
 
-#: src/commandhandler.cpp:298
+#: src/commandhandler.cpp:307
 msgid "This command displays the name of the current map."
 msgstr "Bu komut geçerli haritanın adını gösterir."
 
-#: src/commandhandler.cpp:302
+#: src/commandhandler.cpp:311
 msgid "Command: /who"
 msgstr "Komut:  /who"
 
-#: src/commandhandler.cpp:303
+#: src/commandhandler.cpp:312
 msgid "This command displays the number of players currently online."
 msgstr "Bu komut şu anda çevrimiçi oyuncu sayısını gösterir."
 
-#: src/commandhandler.cpp:309
+#: src/commandhandler.cpp:318
 msgid "Type /help for a list of commands."
 msgstr "Komutların bir listesi için /help yazın."
 
-#: src/commandhandler.cpp:375
+#: src/commandhandler.cpp:384
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:383
+#: src/commandhandler.cpp:392
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:397
+#: src/commandhandler.cpp:406
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:410 src/net/ea/gui/partytab.cpp:109
+#: src/commandhandler.cpp:419 src/net/tmwa/gui/partytab.cpp:109
 msgid "Party name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:423 src/commandhandler.cpp:471
-#: src/commandhandler.cpp:493
+#: src/commandhandler.cpp:432 src/commandhandler.cpp:509
+#: src/commandhandler.cpp:531
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:441
+#: src/commandhandler.cpp:450
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:441
+#: src/commandhandler.cpp:450
 msgid "Message closes chat."
 msgstr "Sohbeti kapatır."
 
-#: src/commandhandler.cpp:450
+#: src/commandhandler.cpp:459
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:454
+#: src/commandhandler.cpp:463
 msgid "Message now closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:477
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:489
+msgid "Show IP: On"
+msgstr ""
+
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:485
+msgid "Show IP: Off"
+msgstr ""
+
+#: src/commandhandler.cpp:515
 msgid "Player already ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:484
+#: src/commandhandler.cpp:522
 msgid "Player successfully ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:486
+#: src/commandhandler.cpp:524
 msgid "Player could not be ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:501
+#: src/commandhandler.cpp:539
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:506
+#: src/commandhandler.cpp:544
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:508
+#: src/commandhandler.cpp:546
 msgid "Player could not be unignored!"
 msgstr ""
 
@@ -469,43 +484,43 @@ msgstr ""
 msgid "General"
 msgstr "Genel"
 
-#: src/game.cpp:326
+#: src/game.cpp:342
 #, fuzzy
 msgid "Screenshot saved as "
 msgstr "Ekran Görüntüsü"
 
-#: src/game.cpp:331
+#: src/game.cpp:347
 msgid "Saving screenshot failed!"
 msgstr "Ekrangörüntüsü kaydı başarısız."
 
-#: src/game.cpp:355
+#: src/game.cpp:378
 #, fuzzy
 msgid "The connection to the server was lost."
 msgstr "Sunucu bağlantısı koptu,Program şimdi kapatılacak"
 
-#: src/game.cpp:360
+#: src/game.cpp:382
 msgid "Network Error"
 msgstr "Ağ Hatası"
 
-#: src/game.cpp:705
+#: src/game.cpp:721
 msgid "Ignoring incoming trade requests"
 msgstr "Gelen takas istekleri görmezden geliniyor."
 
-#: src/game.cpp:712
+#: src/game.cpp:726
 msgid "Accepting incoming trade requests"
 msgstr "Gelen takas istekleri kabul ediliyor"
 
-#: src/game.cpp:946
+#: src/game.cpp:954
 #, fuzzy
 msgid "Could Not Load Map"
 msgstr "Harita yüklenemedi"
 
-#: src/game.cpp:947
+#: src/game.cpp:955
 #, c-format
 msgid "Error while loading %s"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:75
+#: src/gui/beingpopup.cpp:76
 #, fuzzy, c-format
 msgid "Party: %s"
 msgstr "Parti"
@@ -514,34 +529,34 @@ msgstr "Parti"
 msgid "Buy"
 msgstr "Satın al"
 
-#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
-#: src/gui/sell.cpp:276
+#: src/gui/buy.cpp:69 src/gui/buy.cpp:261 src/gui/sell.cpp:71
+#: src/gui/sell.cpp:288
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Fiyat: %s / Toplam: %s"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:99 src/gui/npcdialog.cpp:100
-#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:479
+#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:112 src/gui/npcdialog.cpp:124
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:463
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:98 src/gui/npcdialog.cpp:101
-#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:491
+#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:111 src/gui/npcdialog.cpp:125
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:475
 msgid "-"
 msgstr ""
 
 #: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
-#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:182
-#: src/keyboardconfig.cpp:103
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:228
+#: src/keyboardconfig.cpp:102
 msgid "Quit"
 msgstr "Çıkış"
 
-#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:408
-#: src/gui/statuswindow.cpp:478 src/gui/statuswindow.cpp:512
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:384
+#: src/gui/statuswindow.cpp:462 src/gui/statuswindow.cpp:496
 msgid "Max"
 msgstr "En Fazla"
 
@@ -555,11 +570,11 @@ msgstr "Satış"
 
 #: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
 #: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
-#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:101
-#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:178
-#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:402
+#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:114
+#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:389
 #: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
-#: src/gui/socialwindow.cpp:242 src/gui/textdialog.cpp:39
+#: src/gui/socialwindow.cpp:275 src/gui/textdialog.cpp:40
 #: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr "İptal"
@@ -596,7 +611,7 @@ msgstr ""
 msgid "Change Password"
 msgstr "Şifre Değiştir"
 
-#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:53
+#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:55
 #: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
 msgid "Password:"
 msgstr "Şifre:"
@@ -627,19 +642,19 @@ msgstr ""
 msgid "Create Character"
 msgstr "Karakter oluşturma"
 
-#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:52
+#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:54
 #: src/gui/register.cpp:67
 msgid "Name:"
 msgstr "İsim:"
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
 #: src/gui/outfitwindow.cpp:67
 msgid ">"
 msgstr ""
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
 #: src/gui/outfitwindow.cpp:66
@@ -656,8 +671,8 @@ msgstr "Saç Rengi:"
 msgid "Hair style:"
 msgstr "Saç Stili:"
 
-#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:397
-#: src/gui/socialwindow.cpp:296
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:392
+#: src/gui/socialwindow.cpp:329
 msgid "Create"
 msgstr "Oluştur"
 
@@ -713,34 +728,34 @@ msgstr "Hesabı Kapat"
 msgid "Change Email"
 msgstr "Değiştir"
 
-#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:185
-#: src/gui/setup_players.cpp:230
+#: src/gui/charselectdialog.cpp:336 src/gui/serverdialog.cpp:231
+#: src/gui/setup_players.cpp:229
 msgid "Delete"
 msgstr "Sil"
 
-#: src/gui/charselectdialog.cpp:387
+#: src/gui/charselectdialog.cpp:380
 #, fuzzy
 msgid "Choose"
 msgstr "Kapat"
 
-#: src/gui/charselectdialog.cpp:399 src/gui/charselectdialog.cpp:400
+#: src/gui/charselectdialog.cpp:394 src/gui/charselectdialog.cpp:395
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:77 src/gui/palette.cpp:96
+#: src/gui/chat.cpp:88
 msgid "Chat"
 msgstr "Sohbet"
 
-#: src/gui/chat.cpp:287
+#: src/gui/chat.cpp:311
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:305
+#: src/gui/chat.cpp:329
 msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:469
+#: src/gui/chat.cpp:493
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -802,142 +817,172 @@ msgstr "Fiyat: %s / Toplam: %s"
 msgid "Ambient FX: %s"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:56
+#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:55
 msgid "Equipment"
 msgstr "Ekipman"
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:77
-#: src/gui/inventorywindow.cpp:79 src/gui/inventorywindow.cpp:298
-#: src/gui/popupmenu.cpp:372
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:89
+#: src/gui/inventorywindow.cpp:337 src/gui/popupmenu.cpp:359
 msgid "Unequip"
 msgstr ""
 
-#: src/gui/help.cpp:36
+#: src/gui/help.cpp:37
 msgid "Help"
 msgstr "Yardım"
 
-#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:73
+#: src/gui/help.cpp:51 src/gui/npcdialog.cpp:50
 msgid "Close"
 msgstr "Kapat"
 
-#: src/gui/inventorywindow.cpp:56 src/gui/windowmenu.cpp:57
+#: src/gui/inventorywindow.cpp:59 src/gui/windowmenu.cpp:56
 msgid "Inventory"
 msgstr "Envanter"
 
-#: src/gui/inventorywindow.cpp:72 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:300 src/gui/popupmenu.cpp:374
+#: src/gui/inventorywindow.cpp:59
+msgid "Storage"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:82
+msgid "Slots:"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:87 src/gui/inventorywindow.cpp:100
+#: src/gui/inventorywindow.cpp:339 src/gui/popupmenu.cpp:361
 msgid "Equip"
 msgstr "Donatmak"
 
-#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:304 src/gui/popupmenu.cpp:377
+#: src/gui/inventorywindow.cpp:88
 msgid "Use"
 msgstr "Kullan"
 
-#: src/gui/inventorywindow.cpp:83 src/gui/inventorywindow.cpp:308
-#: src/gui/popupmenu.cpp:380
+#: src/gui/inventorywindow.cpp:101 src/gui/popupmenu.cpp:364
+msgid "Activate"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:102 src/gui/inventorywindow.cpp:348
+#: src/gui/popupmenu.cpp:367
 msgid "Drop..."
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:84 src/gui/popupmenu.cpp:386
+#: src/gui/inventorywindow.cpp:103 src/gui/popupmenu.cpp:373
 msgid "Split"
 msgstr "Bölme"
 
-#: src/gui/inventorywindow.cpp:85 src/gui/outfitwindow.cpp:51
+#: src/gui/inventorywindow.cpp:104 src/gui/outfitwindow.cpp:51
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:96 src/gui/storagewindow.cpp:83
-msgid "Slots:"
-msgstr ""
-
-#: src/gui/inventorywindow.cpp:97
+#: src/gui/inventorywindow.cpp:106
 msgid "Weight:"
 msgstr "Ağırlık:"
 
-#: src/gui/inventorywindow.cpp:310 src/gui/popupmenu.cpp:382
+#: src/gui/inventorywindow.cpp:124 src/gui/popupmenu.cpp:378
+msgid "Store"
+msgstr "Depo"
+
+#: src/gui/inventorywindow.cpp:125 src/gui/popupmenu.cpp:385
+msgid "Retrieve"
+msgstr "Almak"
+
+#: src/gui/inventorywindow.cpp:350 src/gui/popupmenu.cpp:369
 msgid "Drop"
 msgstr ""
 
-#: src/gui/itemamount.cpp:100 src/gui/okdialog.cpp:42
-#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:38 src/gui/trade.cpp:73
-#: src/gui/trade.cpp:75
+#: src/gui/itemamount.cpp:113 src/gui/okdialog.cpp:42
+#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:39 src/gui/trade.cpp:72
+#: src/gui/trade.cpp:74
 msgid "OK"
 msgstr "Tamam"
 
-#: src/gui/itemamount.cpp:102
+#: src/gui/itemamount.cpp:115
 msgid "All"
 msgstr "Hepsi"
 
-#: src/gui/itemamount.cpp:128
+#: src/gui/itemamount.cpp:141
 msgid "Select amount of items to trade."
 msgstr ""
 
-#: src/gui/itemamount.cpp:131
+#: src/gui/itemamount.cpp:144
 msgid "Select amount of items to drop."
 msgstr ""
 
-#: src/gui/itemamount.cpp:134
+#: src/gui/itemamount.cpp:147
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/itemamount.cpp:137
+#: src/gui/itemamount.cpp:150
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamount.cpp:140
+#: src/gui/itemamount.cpp:153
 msgid "Select amount of items to split."
 msgstr ""
 
-#: src/gui/itempopup.cpp:92
+#: src/gui/itempopup.cpp:137
 #, fuzzy, c-format
 msgid "Weight: %s"
 msgstr "Ağırlık: "
 
-#: src/gui/login.cpp:49 src/gui/login.cpp:61
+#: src/gui/login.cpp:51 src/gui/login.cpp:63
 msgid "Login"
 msgstr "Oturum Aç"
 
-#: src/gui/login.cpp:58
+#: src/gui/login.cpp:60
 #, fuzzy
 msgid "Remember username"
 msgstr "Kullanıcı adını hatırla"
 
-#: src/gui/login.cpp:59 src/gui/register.cpp:58 src/gui/register.cpp:73
+#: src/gui/login.cpp:61 src/gui/register.cpp:58 src/gui/register.cpp:73
 msgid "Register"
 msgstr "Üye ol"
 
-#: src/gui/login.cpp:60
+#: src/gui/login.cpp:62
 #, fuzzy
 msgid "Change Server"
 msgstr "Sunucu"
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
+#: src/gui/login.cpp:129
+msgid "Registration disabled"
+msgstr ""
+
+#: src/gui/login.cpp:129
+msgid "You need to use the website to register an account for this server."
+msgstr ""
+
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:86
 msgid "Map"
 msgstr "Harita"
 
-#: src/gui/npcdialog.cpp:44
+#: src/gui/ministatus.cpp:235
+msgid "Need"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:48
 msgid "Waiting for server"
 msgstr "Sunucu bekleniyor"
 
-#: src/gui/npcdialog.cpp:45
+#: src/gui/npcdialog.cpp:49
 msgid "Next"
 msgstr "Sonraki"
 
-#: src/gui/npcdialog.cpp:47
+#: src/gui/npcdialog.cpp:51
 msgid "Submit"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:52 src/gui/npcpostdialog.cpp:41
+#: src/gui/npcdialog.cpp:73 src/gui/npcpostdialog.cpp:41
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:110
+#: src/gui/npcdialog.cpp:118
+msgid "Clear log"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:134
 msgid "Reset"
 msgstr "Sıfırla"
 
 #. TRANSLATORS: Please leave the \n sequences intact.
-#: src/gui/npcdialog.cpp:171
+#: src/gui/npcdialog.cpp:208
 #, fuzzy
 msgid ""
 "\n"
@@ -952,7 +997,7 @@ msgstr "Alıcı:"
 msgid "Send"
 msgstr "Gönder"
 
-#: src/gui/npcpostdialog.cpp:96
+#: src/gui/npcpostdialog.cpp:99
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
@@ -966,306 +1011,83 @@ msgstr ""
 msgid "Unequip first"
 msgstr ""
 
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:143
-msgid "Text"
-msgstr "Metin"
-
-#: src/gui/palette.cpp:82
-msgid "Text Shadow"
-msgstr "Metin Gölgesi"
-
-#: src/gui/palette.cpp:83
-msgid "Text Outline"
-msgstr "Metin Anahat"
-
-#: src/gui/palette.cpp:84
-msgid "Progress Bar Labels"
-msgstr ""
-
-#: src/gui/palette.cpp:85
-msgid "Buttons"
-msgstr ""
-
-#: src/gui/palette.cpp:86
-msgid "Disabled Buttons"
-msgstr ""
-
-#: src/gui/palette.cpp:87
-msgid "Tabs"
-msgstr ""
-
-#: src/gui/palette.cpp:89
-msgid "Background"
-msgstr "Arka plan"
-
-#: src/gui/palette.cpp:91
-msgid "Highlight"
-msgstr ""
-
-#: src/gui/palette.cpp:92
-msgid "Tab Highlight"
-msgstr ""
-
-#: src/gui/palette.cpp:93
-#, fuzzy
-msgid "Item Too Expensive"
-msgstr "Öğe çok pahalı"
-
-#: src/gui/palette.cpp:94
-#, fuzzy
-msgid "Item Is Equipped"
-msgstr "Öğe bulunuyor"
-
-#: src/gui/palette.cpp:97
-msgid "GM"
-msgstr "GM"
-
-#: src/gui/palette.cpp:98
-msgid "Player"
-msgstr "Oyuncu"
-
-#: src/gui/palette.cpp:99
-msgid "Whisper"
-msgstr ""
-
-#: src/gui/palette.cpp:100
-msgid "Is"
-msgstr ""
-
-#: src/gui/palette.cpp:101 src/net/ea/gui/partytab.cpp:43
-msgid "Party"
-msgstr "Parti"
-
-#: src/gui/palette.cpp:102 src/net/ea/gui/guildtab.cpp:45
-msgid "Guild"
-msgstr "Birlik"
-
-#: src/gui/palette.cpp:103
-msgid "Server"
-msgstr "Sunucu"
-
-#: src/gui/palette.cpp:104
-msgid "Logger"
-msgstr ""
-
-#: src/gui/palette.cpp:105
-msgid "Hyperlink"
-msgstr ""
-
-#: src/gui/palette.cpp:107
-msgid "Being"
-msgstr ""
-
-#: src/gui/palette.cpp:108
-msgid "Other Players' Names"
-msgstr "Diğer oyuncuların isimleri"
-
-#: src/gui/palette.cpp:109
-msgid "Own Name"
-msgstr ""
-
-#: src/gui/palette.cpp:110
-msgid "GM Names"
-msgstr "GM isimleri"
-
-#: src/gui/palette.cpp:111
-msgid "NPCs"
-msgstr "NPCs"
-
-#: src/gui/palette.cpp:112
-msgid "Monsters"
-msgstr "Canavarlar"
-
-#: src/gui/palette.cpp:114
-msgid "Unknown Item Type"
-msgstr "Bilinmeyen Öğe Türü"
-
-#: src/gui/palette.cpp:115
-msgid "Generics"
-msgstr "Jenerik"
-
-#: src/gui/palette.cpp:116
-msgid "Hats"
-msgstr "Şapkalar"
-
-#: src/gui/palette.cpp:117
-msgid "Usables"
-msgstr ""
-
-#: src/gui/palette.cpp:118
-msgid "Shirts"
-msgstr "Gömlek"
-
-#: src/gui/palette.cpp:119
-msgid "One Handed Weapons"
-msgstr ""
-
-#: src/gui/palette.cpp:120
-msgid "Pants"
-msgstr ""
-
-#: src/gui/palette.cpp:121
-msgid "Shoes"
-msgstr "Ayakkabılar"
-
-#: src/gui/palette.cpp:122
-msgid "Two Handed Weapons"
-msgstr ""
-
-#: src/gui/palette.cpp:123
-msgid "Shields"
-msgstr "Kalkanlar"
-
-#: src/gui/palette.cpp:124
-msgid "Rings"
-msgstr "Yüzükler"
-
-#: src/gui/palette.cpp:125
-msgid "Necklaces"
-msgstr "Kolye"
-
-#: src/gui/palette.cpp:126
-msgid "Arms"
-msgstr "Silah"
-
-#: src/gui/palette.cpp:127
-msgid "Ammo"
-msgstr ""
-
-#: src/gui/palette.cpp:129
-msgid "Particle Effects"
-msgstr ""
-
-#: src/gui/palette.cpp:130
-msgid "Pickup Notification"
-msgstr ""
-
-#: src/gui/palette.cpp:131
-msgid "Exp Notification"
-msgstr ""
-
-#: src/gui/palette.cpp:133
-msgid "Player Hits Monster"
-msgstr ""
-
-#: src/gui/palette.cpp:135
-msgid "Monster Hits Player"
-msgstr ""
-
-#: src/gui/palette.cpp:136
-msgid "Critical Hit"
-msgstr "Kritik Hit"
-
-#: src/gui/palette.cpp:137
-msgid "Misses"
-msgstr ""
-
-#: src/gui/palette.cpp:139
-msgid "HP Bar"
-msgstr "HP Bar"
-
-#: src/gui/palette.cpp:140
-msgid "3/4 HP Bar"
-msgstr "3/4 HP Bar"
-
-#: src/gui/palette.cpp:141
-msgid "1/2 HP Bar"
-msgstr "1/2 HP Bar"
-
-#: src/gui/palette.cpp:142
-msgid "1/4 HP Bar"
-msgstr "1/4 HP Bar"
-
-#: src/gui/popupmenu.cpp:84
+#: src/gui/popupmenu.cpp:83
 #, c-format
 msgid "Trade with %s..."
 msgstr ""
 
-#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:161
+#: src/gui/popupmenu.cpp:87 src/gui/popupmenu.cpp:158
 #, fuzzy, c-format
 msgid "Attack %s"
 msgstr "Saldırı"
 
-#: src/gui/popupmenu.cpp:92
+#: src/gui/popupmenu.cpp:91
 #, c-format
 msgid "Whisper %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:101
+#: src/gui/popupmenu.cpp:100
 #, c-format
 msgid "Befriend %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:106
+#: src/gui/popupmenu.cpp:105
 #, c-format
 msgid "Disregard %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:109
+#: src/gui/popupmenu.cpp:108
 #, c-format
 msgid "Ignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:115 src/gui/popupmenu.cpp:124
+#: src/gui/popupmenu.cpp:114 src/gui/popupmenu.cpp:123
 #, c-format
 msgid "Unignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:118
+#: src/gui/popupmenu.cpp:117
 #, c-format
 msgid "Completely ignore %s"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:130
 #, c-format
-msgid "Follow %s"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:133
-#, c-format
 msgid "Invite %s to join your guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:137
+#: src/gui/popupmenu.cpp:134
 #, c-format
 msgid "Invite %s to join your party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144
+#: src/gui/popupmenu.cpp:141
 msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:153
+#: src/gui/popupmenu.cpp:150
 #, c-format
 msgid "Talk to %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:166
+#: src/gui/popupmenu.cpp:163
 #, fuzzy
 msgid "Kick monster"
 msgstr "Canavarlar"
 
-#: src/gui/popupmenu.cpp:174
+#: src/gui/popupmenu.cpp:171
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:191
+#: src/gui/popupmenu.cpp:188
 #, c-format
 msgid "Pick up %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:400
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:387
 msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:70
-msgid "Store"
-msgstr "Depo"
-
-#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:71
-msgid "Retrieve"
-msgstr "Almak"
-
 #: src/gui/quitdialog.cpp:44
 msgid "Switch server"
 msgstr "Geçiş sunucusu"
@@ -1334,52 +1156,65 @@ msgstr ""
 msgid "Passwords do not match."
 msgstr "Parolalar uyuşmuyor."
 
-#: src/gui/serverdialog.cpp:134
+#: src/gui/serverdialog.cpp:197
 #, fuzzy
 msgid "Choose Your Server"
 msgstr "Sunucu Seçin"
 
-#: src/gui/serverdialog.cpp:141 src/gui/widgets/chattab.cpp:139
+#: src/gui/serverdialog.cpp:206 src/gui/widgets/chattab.cpp:142
 msgid "Server:"
 msgstr "Sunucu:"
 
-#: src/gui/serverdialog.cpp:142
+#: src/gui/serverdialog.cpp:207
 msgid "Port:"
 msgstr "Bağlantı Noktası:"
 
-#: src/gui/serverdialog.cpp:143
+#: src/gui/serverdialog.cpp:208
 #, fuzzy
 msgid "Server type:"
 msgstr "Sunucu:"
 
-#: src/gui/serverdialog.cpp:183
+#: src/gui/serverdialog.cpp:229
 #, fuzzy
 msgid "Connect"
 msgstr "Bağlanıyor..."
 
-#: src/gui/serverdialog.cpp:184
+#: src/gui/serverdialog.cpp:230
 #, fuzzy
 msgid "Custom Server"
 msgstr "Sunucu"
 
-#: src/gui/serverdialog.cpp:262
+#: src/gui/serverdialog.cpp:324
 msgid "Please type both the address and the port of a server."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:411
+#: src/gui/serverdialog.cpp:441
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:417
+#: src/gui/serverdialog.cpp:447
 #, fuzzy
 msgid "Waiting for server..."
 msgstr "Sunucu bekleniyor"
 
-#: src/gui/serverdialog.cpp:421
+#: src/gui/serverdialog.cpp:451
 msgid "Preparing download"
 msgstr ""
 
+#: src/gui/serverdialog.cpp:455
+msgid "Error retreiving server list!"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:550
+msgid "requires a newer version"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:552
+#, c-format
+msgid "requires v%s"
+msgstr ""
+
 #: src/gui/setup_audio.cpp:42
 msgid "Sound"
 msgstr "Ses"
@@ -1413,54 +1248,54 @@ msgstr ""
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:44
+#: src/gui/setup_colors.cpp:46
 msgid "This is what the color looks like"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:49
+#: src/gui/setup_colors.cpp:51
 msgid "Colors"
 msgstr "Renkler"
 
-#: src/gui/setup_colors.cpp:70
+#: src/gui/setup_colors.cpp:72
 #, fuzzy
 msgid "Type:"
 msgstr "Türü: "
 
-#: src/gui/setup_colors.cpp:81 src/gui/setup_colors.cpp:433
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:331
 msgid "Static"
 msgstr "Sabit"
 
-#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:84
-#: src/gui/setup_colors.cpp:434
+#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
+#: src/gui/setup_colors.cpp:332
 msgid "Pulse"
 msgstr "Darbe"
 
-#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
+#: src/gui/setup_colors.cpp:333
 msgid "Rainbow"
 msgstr "Gökkuşağı"
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
+#: src/gui/setup_colors.cpp:333
 msgid "Spectrum"
 msgstr "Spektrum"
 
-#: src/gui/setup_colors.cpp:92
+#: src/gui/setup_colors.cpp:94
 #, fuzzy
 msgid "Delay:"
 msgstr "Başlat"
 
-#: src/gui/setup_colors.cpp:107
+#: src/gui/setup_colors.cpp:109
 #, fuzzy
 msgid "Red:"
 msgstr "Kırmızı: "
 
-#: src/gui/setup_colors.cpp:122
+#: src/gui/setup_colors.cpp:124
 #, fuzzy
 msgid "Green:"
 msgstr "Yeşil: "
 
-#: src/gui/setup_colors.cpp:137
+#: src/gui/setup_colors.cpp:139
 #, fuzzy
 msgid "Blue:"
 msgstr "Mavi: "
@@ -1506,582 +1341,591 @@ msgid "Assign"
 msgstr "Atamak"
 
 #: src/gui/setup_keyboard.cpp:90
+#, fuzzy
+msgid "Unassign"
+msgstr "Atamak"
+
+#: src/gui/setup_keyboard.cpp:94
 msgid "Default"
 msgstr "Varsayılan"
 
-#: src/gui/setup_keyboard.cpp:119
+#: src/gui/setup_keyboard.cpp:125
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_players.cpp:57
+#: src/gui/setup_players.cpp:58
 msgid "Name"
 msgstr "İsim"
 
-#: src/gui/setup_players.cpp:58
+#: src/gui/setup_players.cpp:59
 msgid "Relation"
 msgstr ""
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:64
 msgid "Neutral"
 msgstr ""
 
-#: src/gui/setup_players.cpp:64
+#: src/gui/setup_players.cpp:65
 msgid "Friend"
 msgstr "Arkadaş"
 
-#: src/gui/setup_players.cpp:65
+#: src/gui/setup_players.cpp:66
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_players.cpp:67
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_players.cpp:208 src/gui/setup_video.cpp:132
+#: src/gui/setup_players.cpp:206 src/gui/setup_video.cpp:153
 msgid "???"
 msgstr "???"
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_players.cpp:225
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_players.cpp:228
+#: src/gui/setup_players.cpp:227
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:231
 msgid "Put all whispers in tabs"
 msgstr ""
 
-#: src/gui/setup_players.cpp:234
+#: src/gui/setup_players.cpp:233
 #, fuzzy
 msgid "Show gender"
 msgstr "Adı göster"
 
-#: src/gui/setup_players.cpp:236
+#: src/gui/setup_players.cpp:235
+msgid "Enable Chat log"
+msgstr ""
+
+#: src/gui/setup_players.cpp:237
 msgid "Players"
 msgstr "Oyuncular"
 
-#: src/gui/setup_players.cpp:261
+#: src/gui/setup_players.cpp:262
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:113
+#: src/gui/setup_video.cpp:134
 msgid "Tiny"
 msgstr ""
 
-#: src/gui/setup_video.cpp:114
+#: src/gui/setup_video.cpp:135
 msgid "Small"
 msgstr "Küçük"
 
-#: src/gui/setup_video.cpp:115
+#: src/gui/setup_video.cpp:136
 msgid "Medium"
 msgstr "Normal"
 
-#: src/gui/setup_video.cpp:116
+#: src/gui/setup_video.cpp:137
 msgid "Large"
 msgstr "Büyük"
 
-#: src/gui/setup_video.cpp:142
+#: src/gui/setup_video.cpp:163
 msgid "No text"
 msgstr "Metin yok"
 
-#: src/gui/setup_video.cpp:144
+#: src/gui/setup_video.cpp:164
+msgid "Text"
+msgstr "Metin"
+
+#: src/gui/setup_video.cpp:165
 msgid "Bubbles, no names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:145
+#: src/gui/setup_video.cpp:166
 msgid "Bubbles with names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:157
+#: src/gui/setup_video.cpp:178
 msgid "off"
 msgstr "kapalı"
 
-#: src/gui/setup_video.cpp:158 src/gui/setup_video.cpp:171
+#: src/gui/setup_video.cpp:179 src/gui/setup_video.cpp:192
 msgid "low"
 msgstr "düşük"
 
-#: src/gui/setup_video.cpp:159 src/gui/setup_video.cpp:173
+#: src/gui/setup_video.cpp:180 src/gui/setup_video.cpp:194
 msgid "high"
 msgstr "yüksek"
 
-#: src/gui/setup_video.cpp:172
+#: src/gui/setup_video.cpp:193
 msgid "medium"
 msgstr "orta"
 
-#: src/gui/setup_video.cpp:174
+#: src/gui/setup_video.cpp:195
 msgid "max"
 msgstr "max"
 
-#: src/gui/setup_video.cpp:196
+#: src/gui/setup_video.cpp:217
 msgid "Full screen"
 msgstr "Tam ekran"
 
-#: src/gui/setup_video.cpp:197
+#: src/gui/setup_video.cpp:218
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:198
+#: src/gui/setup_video.cpp:219
 msgid "Custom cursor"
 msgstr ""
 
-#: src/gui/setup_video.cpp:200
+#: src/gui/setup_video.cpp:221
 msgid "Visible names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:223
 msgid "Particle effects"
 msgstr ""
 
-#: src/gui/setup_video.cpp:204
+#: src/gui/setup_video.cpp:225
 #, fuzzy
 msgid "Show own name"
 msgstr "Adı göster"
 
-#: src/gui/setup_video.cpp:205
+#: src/gui/setup_video.cpp:226
+msgid "Log NPC dialogue"
+msgstr ""
+
+#: src/gui/setup_video.cpp:227
 msgid "Show pickup notification"
 msgstr ""
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:207
+#. TRANSLATORS: Refers to "Show pickup notification"
+#: src/gui/setup_video.cpp:229
 msgid "in chat"
 msgstr "sohbet"
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:209
+#. TRANSLATORS: Refers to "Show pickup notification"
+#: src/gui/setup_video.cpp:231
 msgid "as particle"
 msgstr ""
 
-#: src/gui/setup_video.cpp:214
+#: src/gui/setup_video.cpp:236
 #, fuzzy
 msgid "FPS limit:"
 msgstr "FPS Limit:"
 
-#: src/gui/setup_video.cpp:225
+#: src/gui/setup_video.cpp:247
+msgid "Disable transparency (Low CPU mode)"
+msgstr ""
+
+#: src/gui/setup_video.cpp:250
 msgid "Video"
 msgstr "Video"
 
-#: src/gui/setup_video.cpp:227
+#: src/gui/setup_video.cpp:252
 #, fuzzy
-msgid "Show monster damage"
+msgid "Show damage"
 msgstr "Adı göster"
 
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:258
 msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:259
 msgid "Gui opacity"
 msgstr ""
 
-#: src/gui/setup_video.cpp:235
+#: src/gui/setup_video.cpp:260
 msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_video.cpp:236
+#: src/gui/setup_video.cpp:261
 msgid "Particle detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237
+#: src/gui/setup_video.cpp:262
 msgid "Font size"
 msgstr "Yazı tipi boyutu"
 
-#: src/gui/setup_video.cpp:251 src/gui/setup_video.cpp:454
-#: src/gui/setup_video.cpp:568
+#: src/gui/setup_video.cpp:277 src/gui/setup_video.cpp:532
+#: src/gui/setup_video.cpp:662
 #, fuzzy
 msgid "None"
 msgstr "Hayır"
 
-#: src/gui/setup_video.cpp:381
+#: src/gui/setup_video.cpp:426
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:387
+#: src/gui/setup_video.cpp:432
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:398
+#: src/gui/setup_video.cpp:443
 msgid "Switching to Full Screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:399
+#: src/gui/setup_video.cpp:444
 msgid "Restart needed for changes to take effect."
 msgstr "Değişikliklerin etkili olması için yeniden başlatılması gerekli."
 
-#: src/gui/setup_video.cpp:411
+#: src/gui/setup_video.cpp:458
 msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:412
+#: src/gui/setup_video.cpp:459
+msgid ""
+"Applying change to OpenGL requires restart. In case OpenGL messes up your "
+"game graphics, restart the game with the command line option \"--no-opengl\"."
+msgstr ""
+
+#: src/gui/setup_video.cpp:466
+msgid "Deactivating OpenGL"
+msgstr ""
+
+#: src/gui/setup_video.cpp:467
 msgid "Applying change to OpenGL requires restart."
 msgstr "OpenGL değişikliklerini uygulamak yeniden başlatma gerektirir."
 
-#: src/gui/setup_video.cpp:486 src/gui/setup_video.cpp:491
+#: src/gui/setup_video.cpp:475
+msgid "Transparency disabled"
+msgstr ""
+
+#: src/gui/setup_video.cpp:476 src/gui/setup_video.cpp:484
+msgid "You must restart to apply changes."
+msgstr ""
+
+#: src/gui/setup_video.cpp:483
+msgid "Transparency enabled"
+msgstr ""
+
+#: src/gui/setup_video.cpp:576 src/gui/setup_video.cpp:581
 #, fuzzy
 msgid "Screen Resolution Changed"
 msgstr "Ekran çözünürlüğü değiştirildi"
 
-#: src/gui/setup_video.cpp:487 src/gui/setup_video.cpp:492
+#: src/gui/setup_video.cpp:577 src/gui/setup_video.cpp:582
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:489
+#: src/gui/setup_video.cpp:579
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:522
+#: src/gui/setup_video.cpp:612
 msgid "Particle Effect Settings Changed."
 msgstr ""
 
-#: src/gui/setup_video.cpp:523
+#: src/gui/setup_video.cpp:613
 msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skilldialog.cpp:197 src/gui/windowmenu.cpp:58
+#: src/gui/skilldialog.cpp:212 src/gui/windowmenu.cpp:59
 msgid "Skills"
 msgstr "Beceriler"
 
-#: src/gui/skilldialog.cpp:208
+#: src/gui/skilldialog.cpp:223
 msgid "Up"
 msgstr "Yukarı"
 
-#: src/gui/skilldialog.cpp:262
+#: src/gui/skilldialog.cpp:269
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:314
+#: src/gui/skilldialog.cpp:351
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:323
+#: src/gui/skilldialog.cpp:360
 #, fuzzy, c-format
 msgid "Skill %d"
 msgstr "Beceriler"
 
-#: src/gui/skilldialog.cpp:405
+#: src/gui/skilldialog.cpp:442
 #, fuzzy, c-format
 msgid "Lvl: %d (%+d)"
 msgstr "Seviye: %d"
 
-#: src/gui/skilldialog.cpp:416
+#: src/gui/skilldialog.cpp:453
 #, fuzzy, c-format
 msgid "Lvl: %d"
 msgstr "Seviye: %d"
 
-#: src/gui/socialwindow.cpp:117
+#: src/gui/socialwindow.cpp:126
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:126
+#: src/gui/socialwindow.cpp:139
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:136
+#: src/gui/socialwindow.cpp:153
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:137
+#: src/gui/socialwindow.cpp:154
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:146
+#: src/gui/socialwindow.cpp:163
 #, fuzzy
 msgid "Leave Guild?"
 msgstr "Birlik oluşturma"
 
-#: src/gui/socialwindow.cpp:147
+#: src/gui/socialwindow.cpp:164
 #, fuzzy, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Çıkmak istediğinize emin misiniz?"
 
-#: src/gui/socialwindow.cpp:182
+#: src/gui/socialwindow.cpp:207 src/net/tmwa/partyhandler.cpp:330
 #, fuzzy, c-format
 msgid "Invited user %s to party."
 msgstr "Guruba bir kullanıcı davet et."
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:218
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:199
+#: src/gui/socialwindow.cpp:232
 #, fuzzy
 msgid "Member Invite to Party"
 msgstr "Guruba bir kullanıcı davet et."
 
-#: src/gui/socialwindow.cpp:200
+#: src/gui/socialwindow.cpp:233
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:209
+#: src/gui/socialwindow.cpp:242
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:210
+#: src/gui/socialwindow.cpp:243
 #, fuzzy, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Çıkmak istediğinize emin misiniz?"
 
-#: src/gui/socialwindow.cpp:239
+#: src/gui/socialwindow.cpp:272
 msgid "Create Guild"
 msgstr "Birlik oluşturma"
 
-#: src/gui/socialwindow.cpp:240 src/gui/socialwindow.cpp:564
+#: src/gui/socialwindow.cpp:273 src/gui/socialwindow.cpp:620
 #, fuzzy
 msgid "Create Party"
 msgstr "Karakter oluşturma"
 
-#: src/gui/socialwindow.cpp:279 src/gui/windowmenu.cpp:60
+#: src/gui/socialwindow.cpp:312 src/gui/windowmenu.cpp:64
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:297
+#: src/gui/socialwindow.cpp:330
 msgid "Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:298
+#: src/gui/socialwindow.cpp:331
 #, fuzzy
 msgid "Leave"
 msgstr "Büyük"
 
-#: src/gui/socialwindow.cpp:394
+#: src/gui/socialwindow.cpp:443
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:400
+#: src/gui/socialwindow.cpp:449
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:413
+#: src/gui/socialwindow.cpp:462
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:419
+#: src/gui/socialwindow.cpp:468
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:463
+#: src/gui/socialwindow.cpp:497
+msgid "Creating guild failed, please choose a shorter name."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:504
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:477
+#: src/gui/socialwindow.cpp:520
+msgid "Creating party failed, please choose a shorter name."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:527
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:484
+#: src/gui/socialwindow.cpp:541
 #, fuzzy
 msgid "Guild Name"
 msgstr "Birlik"
 
-#: src/gui/socialwindow.cpp:485
+#: src/gui/socialwindow.cpp:542
 #, fuzzy
 msgid "Choose your guild's name."
 msgstr "Sunucu Seçin"
 
-#: src/gui/socialwindow.cpp:497
+#: src/gui/socialwindow.cpp:554
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:502
+#: src/gui/socialwindow.cpp:559
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:507
+#: src/gui/socialwindow.cpp:564
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:519
+#: src/gui/socialwindow.cpp:576
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:529
+#: src/gui/socialwindow.cpp:585
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:533
+#: src/gui/socialwindow.cpp:589
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:541
+#: src/gui/socialwindow.cpp:597
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:546
+#: src/gui/socialwindow.cpp:602
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:554
+#: src/gui/socialwindow.cpp:610
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:565
+#: src/gui/socialwindow.cpp:621
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:570
+#: src/gui/socialwindow.cpp:626
 #, fuzzy
 msgid "Party Name"
 msgstr "Parti"
 
-#: src/gui/socialwindow.cpp:571
+#: src/gui/socialwindow.cpp:627
 #, fuzzy
 msgid "Choose your party's name."
 msgstr "Sunucu Seçin"
 
-#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:59
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:62
 msgid "Specials"
 msgstr ""
 
-#: src/gui/specialswindow.cpp:174
-#, c-format
-msgid "Specials Set %d"
-msgstr ""
-
-#: src/gui/specialswindow.cpp:191
-#, c-format
-msgid "Special %d"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:99 src/gui/statuswindow.cpp:247
+#: src/gui/statuswindow.cpp:113 src/gui/statuswindow.cpp:215
+#: src/gui/statuswindow.cpp:262
 #, c-format
 msgid "Level: %d"
 msgstr "Seviye: %d"
 
-#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:211
+#: src/gui/statuswindow.cpp:114 src/gui/statuswindow.cpp:208
+#: src/gui/statuswindow.cpp:239
 #, c-format
 msgid "Money: %s"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:102
+#: src/gui/statuswindow.cpp:117
 msgid "HP:"
 msgstr "HP:"
 
-#: src/gui/statuswindow.cpp:107
+#: src/gui/statuswindow.cpp:122
 msgid "Exp:"
 msgstr "Exp:"
 
-#: src/gui/statuswindow.cpp:112
+#: src/gui/statuswindow.cpp:130
 msgid "MP:"
 msgstr "MP:"
 
-#: src/gui/statuswindow.cpp:132 src/gui/statuswindow.cpp:219
+#: src/gui/statuswindow.cpp:158 src/gui/statuswindow.cpp:275
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:133
+#: src/gui/statuswindow.cpp:159
 msgid "Job:"
 msgstr "İş:"
 
-#: src/gui/statuswindow.cpp:194
-#, fuzzy
-msgid "HP"
-msgstr "HP:"
-
-#: src/gui/statuswindow.cpp:200
-#, fuzzy
-msgid "MP"
-msgstr "MP:"
-
-#: src/gui/statuswindow.cpp:206
-#, fuzzy
-msgid "Exp"
-msgstr "Exp:"
-
-#: src/gui/statuswindow.cpp:215
-#, fuzzy
-msgid "Money"
-msgstr "Para: %d"
-
-#: src/gui/statuswindow.cpp:225
-#, fuzzy
-msgid "Job"
-msgstr "İş:"
-
-#: src/gui/statuswindow.cpp:229
+#: src/gui/statuswindow.cpp:211 src/gui/statuswindow.cpp:247
 #, fuzzy, c-format
 msgid "Character points: %d"
 msgstr "Karakter İstatistik Tamam"
 
-#: src/gui/statuswindow.cpp:235
+#: src/gui/statuswindow.cpp:255
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:251
-#, fuzzy
-msgid "Level"
-msgstr "Seviye: %d"
-
-#: src/gui/storagewindow.cpp:58
-msgid "Storage"
-msgstr ""
-
-#: src/gui/trade.cpp:52
+#: src/gui/trade.cpp:53
 msgid "Propose trade"
 msgstr ""
 
-#: src/gui/trade.cpp:53
+#: src/gui/trade.cpp:54
 msgid "Confirmed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:55
 msgid "Agree trade"
 msgstr ""
 
-#: src/gui/trade.cpp:55
+#: src/gui/trade.cpp:56
 msgid "Agreed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:58
+#: src/gui/trade.cpp:59
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/trade.cpp:74 src/gui/trade.cpp:75
+#: src/gui/trade.cpp:73 src/gui/trade.cpp:74
 msgid "Trade"
 msgstr "Ticaret"
 
-#: src/gui/trade.cpp:77
+#: src/gui/trade.cpp:76
 msgid "Add"
 msgstr "Ekle"
 
-#: src/gui/trade.cpp:99 src/gui/trade.cpp:135
+#: src/gui/trade.cpp:98 src/gui/trade.cpp:134
 #, c-format
 msgid "You get %s"
 msgstr ""
 
-#: src/gui/trade.cpp:100
+#: src/gui/trade.cpp:99
 msgid "You give:"
 msgstr ""
 
-#: src/gui/trade.cpp:104
+#: src/gui/trade.cpp:103
 msgid "Change"
 msgstr "Değiştir"
 
-#: src/gui/trade.cpp:275
+#: src/gui/trade.cpp:262
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/trade.cpp:318
+#: src/gui/trade.cpp:304
 msgid "You don't have enough money."
 msgstr "Yeterli para yok."
 
@@ -2102,21 +1946,21 @@ msgstr "Bağlanıyor..."
 msgid "Play"
 msgstr "Başlat"
 
-#: src/gui/updatewindow.cpp:405
+#: src/gui/updatewindow.cpp:417
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:407
+#: src/gui/updatewindow.cpp:419
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:409
+#: src/gui/updatewindow.cpp:421
 msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:501
+#: src/gui/updatewindow.cpp:515
 msgid "Completed"
 msgstr "Tamamlandı"
 
@@ -2196,63 +2040,63 @@ msgstr ""
 msgid "Need a user to kick!"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:118
+#: src/gui/widgets/chattab.cpp:121
 msgid "Global announcement:"
 msgstr "Global duyuru:"
 
-#: src/gui/widgets/chattab.cpp:124
+#: src/gui/widgets/chattab.cpp:127
 #, c-format
 msgid "Global announcement from %s:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:150
+#: src/gui/widgets/chattab.cpp:153
 #, c-format
 msgid "%s whispers: %s"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:51
+#: src/gui/widgets/whispertab.cpp:53
 msgid "Cannot send empty chat!"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:70
+#: src/gui/widgets/whispertab.cpp:72
 msgid "/ignore > Ignore the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:71
+#: src/gui/widgets/whispertab.cpp:73
 msgid "/unignore > Stop ignoring the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:72
+#: src/gui/widgets/whispertab.cpp:74
 msgid "/close > Close the whisper tab"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:82
+#: src/gui/widgets/whispertab.cpp:84
 msgid "Command: /close"
 msgstr "Komut: /close"
 
-#: src/gui/widgets/whispertab.cpp:83
+#: src/gui/widgets/whispertab.cpp:85
 msgid "This command closes the current whisper tab."
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:87
+#: src/gui/widgets/whispertab.cpp:89
 #, fuzzy
 msgid "Command: /ignore"
 msgstr "Komut:  /where"
 
-#: src/gui/widgets/whispertab.cpp:88
+#: src/gui/widgets/whispertab.cpp:90
 #, fuzzy
 msgid "This command ignores the other player regardless of current relations."
 msgstr "Bu komut şu anda çevrimiçi oyuncu sayısını gösterir."
 
-#: src/gui/widgets/whispertab.cpp:94
+#: src/gui/widgets/whispertab.cpp:96
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:55
+#: src/gui/windowmenu.cpp:54
 msgid "Status"
 msgstr "Durum"
 
-#: src/gui/windowmenu.cpp:61
+#: src/gui/windowmenu.cpp:65
 msgid "Shortcut"
 msgstr "Kısayol"
 
@@ -2271,1369 +2115,1486 @@ msgstr "Değiştir"
 msgid "Choose World"
 msgstr "Sunucu Seçin"
 
-#: src/keyboardconfig.cpp:40
+#: src/keyboardconfig.cpp:39
 msgid "Move Up"
 msgstr "Yukarı Taşı"
 
-#: src/keyboardconfig.cpp:41
+#: src/keyboardconfig.cpp:40
 msgid "Move Down"
 msgstr "Aşağı Taşı"
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:41
 msgid "Move Left"
 msgstr "Sola Taşı"
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:42
 msgid "Move Right"
 msgstr "Sağa Taşı"
 
-#: src/keyboardconfig.cpp:44 src/net/ea/generalhandler.cpp:223
+#: src/keyboardconfig.cpp:43 src/net/tmwa/generalhandler.cpp:237
 msgid "Attack"
 msgstr "Saldırı"
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:44
 msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:45
 msgid "Smilie"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:46
 msgid "Talk"
 msgstr "Konuş"
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:47
 msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:48
 #, fuzzy
 msgid "Target Monster"
 msgstr "Hedef Oyuncu"
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboardconfig.cpp:49
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:50
 msgid "Target Player"
 msgstr "Hedef Oyuncu"
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:51
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:52
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:53
 msgid "Sit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:54
 msgid "Screenshot"
 msgstr "Ekran Görüntüsü"
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:55
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:56
 msgid "Find Path to Mouse"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58 src/keyboardconfig.cpp:59
-#: src/keyboardconfig.cpp:60 src/keyboardconfig.cpp:61
-#: src/keyboardconfig.cpp:62 src/keyboardconfig.cpp:63
-#: src/keyboardconfig.cpp:64 src/keyboardconfig.cpp:65
-#: src/keyboardconfig.cpp:66 src/keyboardconfig.cpp:67
-#: src/keyboardconfig.cpp:68 src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:57 src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60
+#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62
+#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64
+#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68
 #, c-format
 msgid "Item Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:69
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:70
 msgid "Status Window"
 msgstr "Durum penceresi"
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:71
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:72
 msgid "Equipment Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:73
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:74
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:75
 msgid "Chat Window"
 msgstr "Sohbet Penceresi"
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:76
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:77
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:78
 msgid "Debug Window"
 msgstr "Hata Ayıklama Penceresi"
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:79
 #, fuzzy
 msgid "Social Window"
 msgstr "Durum penceresi"
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:80
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:81
 #, fuzzy
 msgid "Outfits Window"
 msgstr "Durum penceresi"
 
-#: src/keyboardconfig.cpp:83
+#: src/keyboardconfig.cpp:82
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:83
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86
-#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88
-#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90
-#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92
-#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:84 src/keyboardconfig.cpp:85
+#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:87
+#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:89
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:91
+#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:93
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:95
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:96
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:97
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:98
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:99
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:100
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:101
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:103
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:105
+#: src/keyboardconfig.cpp:104
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:178
+#: src/keyboardconfig.cpp:183
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:913
+#: src/localplayer.cpp:985
 msgid "Unable to pick up item."
 msgstr ""
 
 #. TRANSLATORS: This sentence may be translated differently
 #. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:922
+#: src/localplayer.cpp:994
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/main.cpp:43
+#: src/main.cpp:42
 msgid "mana [options] [mana-file]"
 msgstr ""
 
+#: src/main.cpp:43
+msgid "[mana-file] : The mana file is an XML file (.mana)"
+msgstr ""
+
 #: src/main.cpp:44
-msgid "Options:"
+msgid "              used to set custom parameters"
 msgstr ""
 
 #: src/main.cpp:45
+msgid "              to the mana client."
+msgstr ""
+
+#: src/main.cpp:47
+msgid "Options:"
+msgstr ""
+
+#: src/main.cpp:48
 msgid "  -v --version        : Display the version"
 msgstr ""
 
-#: src/main.cpp:46
+#: src/main.cpp:49
 #, fuzzy
 msgid "  -h --help           : Display this help"
 msgstr "/help > Bu yardımı görüntüler"
 
-#: src/main.cpp:47
+#: src/main.cpp:50
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
-#: src/main.cpp:48
+#: src/main.cpp:51
 msgid "  -U --username       : Login with this username"
 msgstr ""
 
-#: src/main.cpp:49
+#: src/main.cpp:52
 msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/main.cpp:50
+#: src/main.cpp:53
 msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/main.cpp:51
+#: src/main.cpp:54
 msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:52
+#: src/main.cpp:55
 msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/main.cpp:53
+#: src/main.cpp:56
 msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/main.cpp:54
+#: src/main.cpp:57
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:56
+#: src/main.cpp:59
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:57
+#: src/main.cpp:60
 msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:58
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
+#: src/main.cpp:61
+msgid "     --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/main.cpp:59
+#: src/main.cpp:62
+msgid "     --chat-log-dir   : Chat log dir to use"
+msgstr ""
+
+#: src/main.cpp:63
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/main.cpp:61
+#: src/main.cpp:65
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:63
+#: src/net/manaserv/beinghandler.cpp:303 src/net/tmwa/playerhandler.cpp:94
+msgid "You are dead."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:304 src/net/tmwa/playerhandler.cpp:95
+msgid "We regret to inform you that your character was killed in battle."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:306 src/net/tmwa/playerhandler.cpp:97
+msgid "You are not that alive anymore."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:307 src/net/tmwa/playerhandler.cpp:98
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:308 src/net/tmwa/playerhandler.cpp:99
+msgid "Game Over!"
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:309 src/net/tmwa/playerhandler.cpp:101
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:311 src/net/tmwa/playerhandler.cpp:103
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:313 src/net/tmwa/playerhandler.cpp:105
+msgid "I guess this did not run too well."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:107
+msgid "Do you want your possessions identified?"
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:109
+msgid "Sadly, no trace of you was ever found..."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:111
+msgid "Annihilated."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:113
+msgid "Looks like you got your head handed to you."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:115
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:323
+msgid "Press OK to respawn."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:324
+msgid "You Died"
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:138 src/net/manaserv/charhandler.cpp:209
+msgid "Not logged in."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:141
+msgid "No empty slot."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:144
+msgid "Invalid name."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:147
+msgid "Character's name already exists."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:150
+msgid "Invalid hairstyle."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:153
+msgid "Invalid hair color."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:156
+msgid "Invalid gender."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:159
+#, fuzzy
+msgid "Character's stats are too high."
+msgstr "Karakter İstatistik Tamam"
+
+#: src/net/manaserv/charhandler.cpp:162
+#, fuzzy
+msgid "Character's stats are too low."
+msgstr "Karakter İstatistik Tamam"
+
+#: src/net/manaserv/charhandler.cpp:165
+#, c-format
+msgid "At least one statis out of the permitted range: (%u - %u)."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:171 src/net/manaserv/loginhandler.cpp:96
+#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
+#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
+#: src/net/tmwa/loginhandler.cpp:95 src/net/tmwa/loginhandler.cpp:182
+#, fuzzy
+msgid "Unknown error."
+msgstr "Bilinmeyen komut."
+
+#: src/net/manaserv/charhandler.cpp:200 src/net/tmwa/charserverhandler.cpp:146
+msgid "Info"
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:200
+msgid "Player deleted."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:212
+msgid "Selection out of range."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:215
+#, fuzzy, c-format
+msgid "Unknown error (%d)."
+msgstr "Bilinmeyen komut."
+
+#: src/net/manaserv/charhandler.cpp:250
+msgid "No gameservers are available."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:187 src/net/manaserv/chathandler.cpp:313
+#: src/net/manaserv/guildhandler.cpp:260
+#, c-format
+msgid "Topic: %s"
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:274
+msgid "Players in this channel:"
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:208
+#, fuzzy
+msgid "Error joining channel."
+msgstr "Komut: /join <channel>"
+
+#: src/net/manaserv/chathandler.cpp:214
+msgid "Listing channels."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:226
+msgid "End of channel list."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:303
+#, c-format
+msgid "%s entered the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:308
+#, c-format
+msgid "%s left the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:324
+#, c-format
+msgid "%s has set mode %s on user %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:334
+#, c-format
+msgid "%s has kicked %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:339
+#, fuzzy
+msgid "Unknown channel event."
+msgstr "Bilinmeyen komut."
+
+#: src/net/manaserv/guildhandler.cpp:82
+msgid "Guild created."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:87
+msgid "Error creating guild."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:97
+msgid "Invite sent."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:204
+msgid "Member was promoted successfully."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:209
+msgid "Failed to promote member."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:87
+msgid "Wrong magic_token."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
+msgid "Already logged in."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:93
+#, fuzzy
+msgid "Account banned."
+msgstr "Hesab:% s"
+
+#: src/net/manaserv/loginhandler.cpp:118
+msgid "New password incorrect."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:121 src/net/tmwa/loginhandler.cpp:89
+msgid "Old password incorrect."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
+msgid "Account not connected. Please login first."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:149
+msgid "New email address incorrect."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:152
+msgid "Old email address incorrect."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:158
+msgid "The new email address already exists."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:239
+msgid ""
+"Client registration is not allowed. Please contact server administration."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
+msgid "Client version is too old."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:266
+msgid "Wrong username or password."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:272
+#, fuzzy
+msgid "Account banned"
+msgstr "Hesab:% s"
+
+#: src/net/manaserv/loginhandler.cpp:275
+msgid "Login attempt too soon after previous attempt."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:303
+msgid "Wrong username, password or email address."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:306
+msgid "Username already exists."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:309
+msgid "Email address already exists."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:312
+msgid "You took too long with the captcha or your response was incorrect."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:87
+msgid "Joined party."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:105
+#, c-format
+msgid "%s joined the party."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:123
+#, c-format
+msgid "%s rejected your invite."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:95
+msgid "Accepting incoming trade requests."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:97
+msgid "Ignoring incoming trade requests."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:115 src/net/tmwa/tradehandler.cpp:109
+msgid "Request for Trade"
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:116 src/net/tmwa/tradehandler.cpp:110
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:134
+#, c-format
+msgid "Trading with %s"
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:148 src/net/tmwa/tradehandler.cpp:224
+msgid "Trade canceled."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:155 src/net/tmwa/tradehandler.cpp:231
+msgid "Trade completed."
+msgstr ""
+
+#: src/net/tmwa/adminhandler.cpp:64
 msgid "Kick failed!"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:65
+#: src/net/tmwa/adminhandler.cpp:66
 msgid "Kick succeeded!"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:110
+#: src/net/tmwa/buysellhandler.cpp:109
 msgid "Nothing to sell."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:117
+#: src/net/tmwa/buysellhandler.cpp:116
 msgid "Thanks for buying."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:124
+#: src/net/tmwa/buysellhandler.cpp:123
 msgid "Unable to buy."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:130
+#: src/net/tmwa/buysellhandler.cpp:129
 msgid "Thanks for selling."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:132
+#: src/net/tmwa/buysellhandler.cpp:131
 msgid "Unable to sell."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:103
-msgid "Access denied."
+#: src/net/tmwa/charserverhandler.cpp:103
+msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:106
+#: src/net/tmwa/charserverhandler.cpp:107
 msgid "Cannot use this ID."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:109
-msgid "Unknown failure to select character."
-msgstr ""
+#: src/net/tmwa/charserverhandler.cpp:110
+#, fuzzy
+msgid "Unknown char-server failure."
+msgstr "Bilinmeyen komut."
 
-#: src/net/ea/charserverhandler.cpp:135
+#: src/net/tmwa/charserverhandler.cpp:134
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:147 src/net/manaserv/charhandler.cpp:187
-msgid "Info"
-msgstr ""
-
-#: src/net/ea/charserverhandler.cpp:147
+#: src/net/tmwa/charserverhandler.cpp:146
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:152
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Failed to delete character."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:237 src/net/manaserv/charhandler.cpp:263
+#: src/net/tmwa/charserverhandler.cpp:266
 msgid "Strength:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:238 src/net/manaserv/charhandler.cpp:264
+#: src/net/tmwa/charserverhandler.cpp:267
 msgid "Agility:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:239 src/net/manaserv/charhandler.cpp:266
+#: src/net/tmwa/charserverhandler.cpp:268
 msgid "Vitality:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:240 src/net/manaserv/charhandler.cpp:267
+#: src/net/tmwa/charserverhandler.cpp:269
 msgid "Intelligence:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:241 src/net/manaserv/charhandler.cpp:265
+#: src/net/tmwa/charserverhandler.cpp:270
 msgid "Dexterity:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:242
+#: src/net/tmwa/charserverhandler.cpp:271
 msgid "Luck:"
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:80
-msgid "Whisper could not be sent, user is offline."
+#: src/net/tmwa/chathandler.cpp:87
+#, c-format
+msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:84
-msgid "Whisper could not be sent, ignored by user."
+#: src/net/tmwa/chathandler.cpp:96
+#, c-format
+msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:171
+#: src/net/tmwa/chathandler.cpp:230
 #, fuzzy
 msgid "MVP player."
 msgstr "Oyuncu"
 
-#: src/net/ea/chathandler.cpp:204 src/net/ea/chathandler.cpp:210
-#: src/net/ea/chathandler.cpp:215 src/net/ea/chathandler.cpp:220
-#: src/net/ea/chathandler.cpp:225 src/net/ea/chathandler.cpp:230
-#: src/net/ea/chathandler.cpp:235 src/net/ea/chathandler.cpp:240
+#: src/net/tmwa/chathandler.cpp:265 src/net/tmwa/chathandler.cpp:271
+#: src/net/tmwa/chathandler.cpp:276 src/net/tmwa/chathandler.cpp:281
+#: src/net/tmwa/chathandler.cpp:286 src/net/tmwa/chathandler.cpp:291
+#: src/net/tmwa/chathandler.cpp:296 src/net/tmwa/chathandler.cpp:301
 msgid "Channels are not supported!"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:86
+#: src/net/tmwa/gamehandler.cpp:88
 #, c-format
 msgid "Online users: %d"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:100
+#: src/net/tmwa/gamehandler.cpp:101
 #, fuzzy
 msgid "Game"
 msgstr "İsim"
 
-#: src/net/ea/gamehandler.cpp:100
+#: src/net/tmwa/gamehandler.cpp:101
 msgid "Request to quit denied!"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:102 src/net/manaserv/generalhandler.cpp:95
+#: src/net/tmwa/generalhandler.cpp:102
 #, c-format
 msgid "Strength %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:103 src/net/manaserv/generalhandler.cpp:96
+#: src/net/tmwa/generalhandler.cpp:103
 #, c-format
 msgid "Agility %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:104 src/net/manaserv/generalhandler.cpp:98
+#: src/net/tmwa/generalhandler.cpp:104
 #, c-format
 msgid "Vitality %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:105 src/net/manaserv/generalhandler.cpp:99
+#: src/net/tmwa/generalhandler.cpp:105
 #, c-format
 msgid "Intelligence %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:106 src/net/manaserv/generalhandler.cpp:97
+#: src/net/tmwa/generalhandler.cpp:106
 #, c-format
 msgid "Dexterity %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:107
+#: src/net/tmwa/generalhandler.cpp:107
 #, c-format
 msgid "Luck %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:130
+#: src/net/tmwa/generalhandler.cpp:132
 msgid "Authentication failed."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:133
+#: src/net/tmwa/generalhandler.cpp:135
 msgid "No servers available."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:137
+#: src/net/tmwa/generalhandler.cpp:139
 msgid "Someone else is trying to use this account."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:140
+#: src/net/tmwa/generalhandler.cpp:142
 msgid "This account is already logged in."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:143
+#: src/net/tmwa/generalhandler.cpp:145
 msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:146
+#: src/net/tmwa/generalhandler.cpp:148
 msgid "Duplicated login."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:149
+#: src/net/tmwa/generalhandler.cpp:151
 msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:205
+#: src/net/tmwa/generalhandler.cpp:209
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:216 src/net/manaserv/generalhandler.cpp:166
+#: src/net/tmwa/generalhandler.cpp:230
 msgid "Strength"
 msgstr "Güçlülük"
 
-#: src/net/ea/generalhandler.cpp:217 src/net/manaserv/generalhandler.cpp:167
+#: src/net/tmwa/generalhandler.cpp:231
 msgid "Agility"
 msgstr "Çeviklik"
 
-#: src/net/ea/generalhandler.cpp:218 src/net/manaserv/generalhandler.cpp:169
+#: src/net/tmwa/generalhandler.cpp:232
 msgid "Vitality"
 msgstr "yaşama gücü"
 
-#: src/net/ea/generalhandler.cpp:219 src/net/manaserv/generalhandler.cpp:170
+#: src/net/tmwa/generalhandler.cpp:233
 msgid "Intelligence"
 msgstr "Istihbarat"
 
-#: src/net/ea/generalhandler.cpp:220 src/net/manaserv/generalhandler.cpp:168
+#: src/net/tmwa/generalhandler.cpp:234
 msgid "Dexterity"
 msgstr "Maharet"
 
-#: src/net/ea/generalhandler.cpp:221
+#: src/net/tmwa/generalhandler.cpp:235
 msgid "Luck"
 msgstr "Şans"
 
-#: src/net/ea/generalhandler.cpp:224
+#: src/net/tmwa/generalhandler.cpp:238
 #, fuzzy
 msgid "Defense"
 msgstr "Savunma:"
 
-#: src/net/ea/generalhandler.cpp:225
+#: src/net/tmwa/generalhandler.cpp:239
 #, fuzzy
 msgid "M.Attack"
 msgstr "Saldırı"
 
-#: src/net/ea/generalhandler.cpp:226
+#: src/net/tmwa/generalhandler.cpp:240
 #, fuzzy
 msgid "M.Defense"
 msgstr "Savunma:"
 
-#: src/net/ea/generalhandler.cpp:227
+#: src/net/tmwa/generalhandler.cpp:241
 #, c-format
 msgid "% Accuracy"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:228
+#: src/net/tmwa/generalhandler.cpp:242
 #, c-format
 msgid "% Evade"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:229
+#: src/net/tmwa/generalhandler.cpp:243
 #, fuzzy, c-format
 msgid "% Critical"
 msgstr "Kritik Hit"
 
-#: src/net/ea/gui/guildtab.cpp:61 src/net/ea/gui/partytab.cpp:59
+#: src/net/tmwa/gui/guildtab.cpp:45
+msgid "Guild"
+msgstr "Birlik"
+
+#: src/net/tmwa/gui/guildtab.cpp:61 src/net/tmwa/gui/partytab.cpp:59
 msgid "/help > Display this help."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:62
+#: src/net/tmwa/gui/guildtab.cpp:62
 #, fuzzy
 msgid "/invite > Invite a player to your guild"
 msgstr "Guruba bir kullanıcı davet et."
 
-#: src/net/ea/gui/guildtab.cpp:63
+#: src/net/tmwa/gui/guildtab.cpp:63
 msgid "/leave > Leave the guild you are in"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:64
+#: src/net/tmwa/gui/guildtab.cpp:64
 msgid "/kick > Kick some one from the guild you are in"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:73 src/net/ea/gui/partytab.cpp:73
+#: src/net/tmwa/gui/guildtab.cpp:73 src/net/tmwa/gui/partytab.cpp:73
 msgid "Command: /invite <nick>"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:74
+#: src/net/tmwa/gui/guildtab.cpp:74
 #, fuzzy
 msgid "This command invites <nick> to the guild you're in."
 msgstr "Bu komut <nick> adlı kişiyi partinize davet eder."
 
-#: src/net/ea/gui/guildtab.cpp:80 src/net/ea/gui/partytab.cpp:80
+#: src/net/tmwa/gui/guildtab.cpp:80 src/net/tmwa/gui/partytab.cpp:80
 msgid "Command: /leave"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:81
+#: src/net/tmwa/gui/guildtab.cpp:81
 #, fuzzy
 msgid "This command causes the player to leave the guild."
 msgstr "Bu komut geçerli haritanın adını gösterir."
 
-#: src/net/ea/gui/guildtab.cpp:89
+#: src/net/tmwa/gui/guildtab.cpp:89
 msgid "Guild name is missing."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:293
+#: src/net/tmwa/guildhandler.cpp:296
 msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:298
+#: src/net/tmwa/guildhandler.cpp:301
 msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:303
+#: src/net/tmwa/guildhandler.cpp:306
 msgid "User is now part of your guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:308
+#: src/net/tmwa/guildhandler.cpp:311
 msgid "Your guild is full."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:313
+#: src/net/tmwa/guildhandler.cpp:316
 msgid "Unknown guild invite response."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:390
+#: src/net/tmwa/guildhandler.cpp:393
 msgid "Guild creation isn't supported yet."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:60
+#: src/net/tmwa/gui/partytab.cpp:43
+msgid "Party"
+msgstr "Parti"
+
+#: src/net/tmwa/gui/partytab.cpp:60
 msgid "/invite > Invite a player to your party"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:61
+#: src/net/tmwa/gui/partytab.cpp:61
 msgid "/leave > Leave the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:62
+#: src/net/tmwa/gui/partytab.cpp:62
 msgid "/kick > Kick some one from the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:63
+#: src/net/tmwa/gui/partytab.cpp:63
 msgid "/item > Show/change party item sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:64
+#: src/net/tmwa/gui/partytab.cpp:64
 msgid "/exp > Show/change party experience sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:81
+#: src/net/tmwa/gui/partytab.cpp:81
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:85
+#: src/net/tmwa/gui/partytab.cpp:85
 msgid "Command: /item <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:86
+#: src/net/tmwa/gui/partytab.cpp:86
 msgid "This command changes the party's item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:87
+#: src/net/tmwa/gui/partytab.cpp:87
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:90
+#: src/net/tmwa/gui/partytab.cpp:90
 msgid "Command: /item"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/tmwa/gui/partytab.cpp:91
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/tmwa/gui/partytab.cpp:95
 msgid "Command: /exp <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:96
+#: src/net/tmwa/gui/partytab.cpp:96
 msgid "This command changes the party's experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/tmwa/gui/partytab.cpp:97
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:100
+#: src/net/tmwa/gui/partytab.cpp:100
 msgid "Command: /exp"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/tmwa/gui/partytab.cpp:101
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:132 src/net/ea/partyhandler.cpp:198
+#: src/net/tmwa/gui/partytab.cpp:132 src/net/tmwa/partyhandler.cpp:196
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:135 src/net/ea/partyhandler.cpp:204
+#: src/net/tmwa/gui/partytab.cpp:135 src/net/tmwa/partyhandler.cpp:202
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:138 src/net/ea/partyhandler.cpp:210
+#: src/net/tmwa/gui/partytab.cpp:138 src/net/tmwa/partyhandler.cpp:208
 msgid "Item sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:141
+#: src/net/tmwa/gui/partytab.cpp:141
 msgid "Item sharing unknown."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:167 src/net/ea/partyhandler.cpp:174
+#: src/net/tmwa/gui/partytab.cpp:167 src/net/tmwa/partyhandler.cpp:172
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:170 src/net/ea/partyhandler.cpp:180
+#: src/net/tmwa/gui/partytab.cpp:170 src/net/tmwa/partyhandler.cpp:178
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:173 src/net/ea/partyhandler.cpp:186
+#: src/net/tmwa/gui/partytab.cpp:173 src/net/tmwa/partyhandler.cpp:184
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:176
+#: src/net/tmwa/gui/partytab.cpp:176
 msgid "Experience sharing unknown."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:281
+#: src/net/tmwa/inventoryhandler.cpp:285
 msgid "Failed to use item."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:391
+#: src/net/tmwa/inventoryhandler.cpp:399
 msgid "Unable to equip."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:402
+#: src/net/tmwa/inventoryhandler.cpp:410
 msgid "Unable to unequip."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:79
+#: src/net/tmwa/loginhandler.cpp:86
 msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:82 src/net/manaserv/loginhandler.cpp:121
-msgid "Old password incorrect."
-msgstr ""
-
-#: src/net/ea/loginhandler.cpp:85
+#: src/net/tmwa/loginhandler.cpp:92
 msgid "New password too short."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:88 src/net/ea/loginhandler.cpp:175
-#: src/net/manaserv/charhandler.cpp:158 src/net/manaserv/loginhandler.cpp:96
-#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
-#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
-#, fuzzy
-msgid "Unknown error."
-msgstr "Bilinmeyen komut."
-
-#: src/net/ea/loginhandler.cpp:149
+#: src/net/tmwa/loginhandler.cpp:156
 #, fuzzy
 msgid "Unregistered ID."
 msgstr "Hesabı Kapat"
 
-#: src/net/ea/loginhandler.cpp:152
+#: src/net/tmwa/loginhandler.cpp:159
 #, fuzzy
 msgid "Wrong password."
 msgstr "Şifre Değiştir"
 
-#: src/net/ea/loginhandler.cpp:155
+#: src/net/tmwa/loginhandler.cpp:162
 msgid "Account expired."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:158
+#: src/net/tmwa/loginhandler.cpp:165
 msgid "Rejected from server."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:161
+#: src/net/tmwa/loginhandler.cpp:168
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:165
+#: src/net/tmwa/loginhandler.cpp:172
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:172
+#: src/net/tmwa/loginhandler.cpp:179
 msgid "This user name is already taken."
 msgstr ""
 
-#: src/net/ea/network.cpp:145
+#: src/net/tmwa/network.cpp:145
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/ea/network.cpp:345
+#: src/net/tmwa/network.cpp:345
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/ea/network.cpp:414
+#: src/net/tmwa/network.cpp:414
 msgid "Connection to server terminated. "
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:81
+#: src/net/tmwa/partyhandler.cpp:82
 msgid "Could not create party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:84
+#: src/net/tmwa/partyhandler.cpp:84
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:118
+#: src/net/tmwa/partyhandler.cpp:119
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:122
+#: src/net/tmwa/partyhandler.cpp:123
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:126
+#: src/net/tmwa/partyhandler.cpp:127
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:130
+#: src/net/tmwa/partyhandler.cpp:131
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:238
+#: src/net/tmwa/partyhandler.cpp:236
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:249
+#: src/net/tmwa/partyhandler.cpp:246
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:301
+#: src/net/tmwa/partyhandler.cpp:299
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:329
-msgid "Inviting like this isn't supported at the moment."
+#: src/net/tmwa/partyhandler.cpp:335
+#, c-format
+msgid "Inviting failed, because you can't see a player called %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:334
+#: src/net/tmwa/partyhandler.cpp:340
 msgid "You can only inivte when you are in a party!"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:365
+#: src/net/tmwa/partyhandler.cpp:368
 #, c-format
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:304
-msgid "You are dead."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:305
-msgid "We regret to inform you that your character was killed in battle."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:307
-msgid "You are not that alive anymore."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:308
-msgid "The cold hands of the grim reaper are grabbing for your soul."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:309
-msgid "Game Over!"
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:105
+#: src/net/tmwa/playerhandler.cpp:100
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:310
-msgid ""
-"No, kids. Your character did not really die. It... err... went to a better "
-"place."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:312
-msgid ""
-"Your plan of breaking your enemies weapon by bashing it with your throat "
-"failed."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:314
-msgid "I guess this did not run too well."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:315
-msgid "Do you want your possessions identified?"
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:316
-msgid "Sadly, no trace of you was ever found..."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:317
-msgid "Annihilated."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:318
-msgid "Looks like you got your head handed to you."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:120 src/net/manaserv/beinghandler.cpp:319
-msgid ""
-"You screwed up again, dump your body down the tubes and get you another one."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/tmwa/playerhandler.cpp:118
 msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/tmwa/playerhandler.cpp:119
 msgid "You are no more."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/tmwa/playerhandler.cpp:120
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/tmwa/playerhandler.cpp:121
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/tmwa/playerhandler.cpp:122
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/tmwa/playerhandler.cpp:123
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/tmwa/playerhandler.cpp:124
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:130
+#: src/net/tmwa/playerhandler.cpp:125
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:131
+#: src/net/tmwa/playerhandler.cpp:126
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/tmwa/playerhandler.cpp:127
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/tmwa/playerhandler.cpp:128
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:135
+#: src/net/tmwa/playerhandler.cpp:130
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:136
+#: src/net/tmwa/playerhandler.cpp:131
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:249 src/net/ea/playerhandler.cpp:310
+#: src/net/tmwa/playerhandler.cpp:246 src/net/tmwa/playerhandler.cpp:285
 msgid "Message"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:250
+#: src/net/tmwa/playerhandler.cpp:247
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:333
+#: src/net/tmwa/playerhandler.cpp:313
 #, c-format
 msgid "You picked up %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:369
+#: src/net/tmwa/playerhandler.cpp:348
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:532
+#: src/net/tmwa/playerhandler.cpp:488
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:147
+#: src/net/tmwa/specialhandler.cpp:144
 msgid "Trade failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:150
+#: src/net/tmwa/specialhandler.cpp:147
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:153
+#: src/net/tmwa/specialhandler.cpp:150
 msgid "Sit failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:156
+#: src/net/tmwa/specialhandler.cpp:153
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:159
+#: src/net/tmwa/specialhandler.cpp:156
 msgid "Could not join party!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:162
+#: src/net/tmwa/specialhandler.cpp:159
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:171
+#: src/net/tmwa/specialhandler.cpp:168
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:174
+#: src/net/tmwa/specialhandler.cpp:171
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:177
+#: src/net/tmwa/specialhandler.cpp:174
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:180
+#: src/net/tmwa/specialhandler.cpp:177
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:183
+#: src/net/tmwa/specialhandler.cpp:180
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:186
+#: src/net/tmwa/specialhandler.cpp:183
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:189
+#: src/net/tmwa/specialhandler.cpp:186
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:192
+#: src/net/tmwa/specialhandler.cpp:189
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:195
+#: src/net/tmwa/specialhandler.cpp:192
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:198
+#: src/net/tmwa/specialhandler.cpp:195
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:201
+#: src/net/tmwa/specialhandler.cpp:198
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:210
+#: src/net/tmwa/specialhandler.cpp:207
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:213
+#: src/net/tmwa/specialhandler.cpp:210
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:216
+#: src/net/tmwa/specialhandler.cpp:213
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:116
-msgid "Request for Trade"
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:108 src/net/manaserv/tradehandler.cpp:117
-#, c-format
-msgid "%s wants to trade with you, do you accept?"
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:124
+#: src/net/tmwa/tradehandler.cpp:126
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:128
+#: src/net/tmwa/tradehandler.cpp:130
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:132
+#: src/net/tmwa/tradehandler.cpp:134
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:137
+#: src/net/tmwa/tradehandler.cpp:139
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:144
+#: src/net/tmwa/tradehandler.cpp:146
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:153
+#: src/net/tmwa/tradehandler.cpp:154
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:202
+#: src/net/tmwa/tradehandler.cpp:202
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:207
+#: src/net/tmwa/tradehandler.cpp:207
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:211
+#: src/net/tmwa/tradehandler.cpp:211
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:224 src/net/manaserv/tradehandler.cpp:149
-msgid "Trade canceled."
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:231 src/net/manaserv/tradehandler.cpp:156
-msgid "Trade completed."
-msgstr ""
-
-#: src/net/manaserv/beinghandler.cpp:324
-msgid "Press OK to respawn."
-msgstr ""
-
-#: src/net/manaserv/beinghandler.cpp:325
-msgid "You Died"
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:128 src/net/manaserv/charhandler.cpp:196
-msgid "Not logged in."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:131
-msgid "No empty slot."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:134
-msgid "Invalid name."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:137
-msgid "Character's name already exists."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:140
-msgid "Invalid hairstyle."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:143
-msgid "Invalid hair color."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:146
-msgid "Invalid gender."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:149
-#, fuzzy
-msgid "Character's stats are too high."
-msgstr "Karakter İstatistik Tamam"
-
-#: src/net/manaserv/charhandler.cpp:152
-#, fuzzy
-msgid "Character's stats are too low."
-msgstr "Karakter İstatistik Tamam"
-
-#: src/net/manaserv/charhandler.cpp:155
-msgid "One stat is zero."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:187
-msgid "Player deleted."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:199
-msgid "Selection out of range."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:202
-#, fuzzy, c-format
-msgid "Unknown error (%d)."
-msgstr "Bilinmeyen komut."
-
-#: src/net/manaserv/charhandler.cpp:242
-msgid "No gameservers are available."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:268
-msgid "Willpower:"
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
-#: src/net/manaserv/guildhandler.cpp:259
-#, c-format
-msgid "Topic: %s"
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
-msgid "Players in this channel:"
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:201
+#: src/playerrelations.cpp:310
 #, fuzzy
-msgid "Error joining channel."
-msgstr "Komut: /join <channel>"
+msgid "Completely ignore"
+msgstr "Tamamlandı"
 
-#: src/net/manaserv/chathandler.cpp:207
-msgid "Listing channels."
+#: src/playerrelations.cpp:324
+msgid "Print '...'"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:219
-msgid "End of channel list."
+#: src/playerrelations.cpp:340
+msgid "Blink name"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:291
+#: src/resources/itemdb.cpp:44
 #, c-format
-msgid "%s entered the channel."
+msgid "Attack %+d"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:296
+#: src/resources/itemdb.cpp:45
 #, c-format
-msgid "%s left the channel."
+msgid "Defense %+d"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:312
+#: src/resources/itemdb.cpp:46
 #, c-format
-msgid "%s has set mode %s on user %s."
+msgid "HP %+d"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:322
+#: src/resources/itemdb.cpp:47
 #, c-format
-msgid "%s has kicked %s."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:327
-#, fuzzy
-msgid "Unknown channel event."
-msgstr "Bilinmeyen komut."
-
-#: src/net/manaserv/generalhandler.cpp:100
-#, c-format
-msgid "Willpower %+d"
+msgid "MP %+d"
 msgstr ""
 
-#: src/net/manaserv/generalhandler.cpp:171
-msgid "Willpower"
+#: src/resources/itemdb.cpp:92
+msgid "Unknown item"
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:81
-msgid "Guild created."
-msgstr ""
+#: src/resources/itemdb.cpp:135 src/resources/monsterdb.cpp:77
+msgid "unnamed"
+msgstr "isimsiz"
 
-#: src/net/manaserv/guildhandler.cpp:86
-msgid "Error creating guild."
-msgstr ""
+#~ msgid "Text Shadow"
+#~ msgstr "Metin Gölgesi"
 
-#: src/net/manaserv/guildhandler.cpp:96
-msgid "Invite sent."
-msgstr ""
+#~ msgid "Text Outline"
+#~ msgstr "Metin Anahat"
 
-#: src/net/manaserv/guildhandler.cpp:203
-msgid "Member was promoted successfully."
-msgstr ""
+#~ msgid "Background"
+#~ msgstr "Arka plan"
 
-#: src/net/manaserv/guildhandler.cpp:208
-msgid "Failed to promote member."
-msgstr ""
+#, fuzzy
+#~ msgid "Item Too Expensive"
+#~ msgstr "Öğe çok pahalı"
 
-#: src/net/manaserv/loginhandler.cpp:87
-msgid "Wrong magic_token."
-msgstr ""
+#, fuzzy
+#~ msgid "Item Is Equipped"
+#~ msgstr "Öğe bulunuyor"
 
-#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
-msgid "Already logged in."
-msgstr ""
+#~ msgid "GM"
+#~ msgstr "GM"
 
-#: src/net/manaserv/loginhandler.cpp:93 src/net/manaserv/loginhandler.cpp:272
-msgid "Server is full."
-msgstr ""
+#~ msgid "Player"
+#~ msgstr "Oyuncu"
 
-#: src/net/manaserv/loginhandler.cpp:118
-msgid "New password incorrect."
-msgstr ""
+#~ msgid "Server"
+#~ msgstr "Sunucu"
 
-#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
-msgid "Account not connected. Please login first."
-msgstr ""
+#~ msgid "Other Players' Names"
+#~ msgstr "Diğer oyuncuların isimleri"
 
-#: src/net/manaserv/loginhandler.cpp:149
-msgid "New email address incorrect."
-msgstr ""
+#~ msgid "GM Names"
+#~ msgstr "GM isimleri"
 
-#: src/net/manaserv/loginhandler.cpp:152
-msgid "Old email address incorrect."
-msgstr ""
+#~ msgid "NPCs"
+#~ msgstr "NPCs"
 
-#: src/net/manaserv/loginhandler.cpp:158
-msgid "The new email address already exists."
-msgstr ""
+#~ msgid "Monsters"
+#~ msgstr "Canavarlar"
 
-#: src/net/manaserv/loginhandler.cpp:239
-msgid ""
-"Client registration is not allowed. Please contact server administration."
-msgstr ""
+#~ msgid "Unknown Item Type"
+#~ msgstr "Bilinmeyen Öğe Türü"
 
-#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
-msgid "Client version is too old."
-msgstr ""
+#~ msgid "Generics"
+#~ msgstr "Jenerik"
 
-#: src/net/manaserv/loginhandler.cpp:266
-msgid "Wrong username or password."
-msgstr ""
+#~ msgid "Hats"
+#~ msgstr "Şapkalar"
 
-#: src/net/manaserv/loginhandler.cpp:275
-msgid "Login attempt too soon after previous attempt."
-msgstr ""
+#~ msgid "Shirts"
+#~ msgstr "Gömlek"
 
-#: src/net/manaserv/loginhandler.cpp:303
-msgid "Wrong username, password or email address."
-msgstr ""
+#~ msgid "Shoes"
+#~ msgstr "Ayakkabılar"
 
-#: src/net/manaserv/loginhandler.cpp:306
-msgid "Username already exists."
-msgstr ""
+#~ msgid "Shields"
+#~ msgstr "Kalkanlar"
 
-#: src/net/manaserv/loginhandler.cpp:309
-msgid "Email address already exists."
-msgstr ""
+#~ msgid "Rings"
+#~ msgstr "Yüzükler"
 
-#: src/net/manaserv/loginhandler.cpp:312
-msgid "You took too long with the captcha or your response was incorrect."
-msgstr ""
+#~ msgid "Necklaces"
+#~ msgstr "Kolye"
 
-#: src/net/manaserv/partyhandler.cpp:88
-msgid "Joined party."
-msgstr ""
+#~ msgid "Arms"
+#~ msgstr "Silah"
 
-#: src/net/manaserv/partyhandler.cpp:106
-#, c-format
-msgid "%s joined the party."
-msgstr ""
+#~ msgid "Critical Hit"
+#~ msgstr "Kritik Hit"
 
-#: src/net/manaserv/partyhandler.cpp:123
-#, c-format
-msgid "%s rejected your invite."
-msgstr ""
+#~ msgid "HP Bar"
+#~ msgstr "HP Bar"
 
-#: src/net/manaserv/tradehandler.cpp:96
-msgid "Accepting incoming trade requests."
-msgstr ""
+#~ msgid "3/4 HP Bar"
+#~ msgstr "3/4 HP Bar"
 
-#: src/net/manaserv/tradehandler.cpp:98
-msgid "Ignoring incoming trade requests."
-msgstr ""
+#~ msgid "1/2 HP Bar"
+#~ msgstr "1/2 HP Bar"
 
-#: src/net/manaserv/tradehandler.cpp:135
-#, c-format
-msgid "Trading with %s"
-msgstr ""
+#~ msgid "1/4 HP Bar"
+#~ msgstr "1/4 HP Bar"
 
-#: src/playerrelations.cpp:304
 #, fuzzy
-msgid "Completely ignore"
-msgstr "Tamamlandı"
+#~ msgid "HP"
+#~ msgstr "HP:"
 
-#: src/playerrelations.cpp:318
-msgid "Print '...'"
-msgstr ""
-
-#: src/playerrelations.cpp:334
-msgid "Blink name"
-msgstr ""
-
-#: src/playerrelations.cpp:371
-msgid "Floating '...' bubble"
-msgstr ""
-
-#: src/playerrelations.cpp:374
-msgid "Floating bubble"
-msgstr ""
-
-#: src/resources/itemdb.cpp:52
-#, c-format
-msgid "Attack %+d"
-msgstr ""
-
-#: src/resources/itemdb.cpp:53
-#, c-format
-msgid "Defense %+d"
-msgstr ""
+#, fuzzy
+#~ msgid "MP"
+#~ msgstr "MP:"
 
-#: src/resources/itemdb.cpp:54
-#, c-format
-msgid "HP %+d"
-msgstr ""
+#, fuzzy
+#~ msgid "Exp"
+#~ msgstr "Exp:"
 
-#: src/resources/itemdb.cpp:55
-#, c-format
-msgid "MP %+d"
-msgstr ""
+#, fuzzy
+#~ msgid "Money"
+#~ msgstr "Para: %d"
 
-#: src/resources/itemdb.cpp:114
-msgid "Unknown item"
-msgstr ""
+#, fuzzy
+#~ msgid "Job"
+#~ msgstr "İş:"
 
-#: src/resources/itemdb.cpp:158 src/resources/monsterdb.cpp:45
-#: src/resources/monsterdb.cpp:67
-msgid "unnamed"
-msgstr "isimsiz"
+#, fuzzy
+#~ msgid "Level"
+#~ msgstr "Seviye: %d"
 
 #~ msgid "no"
 #~ msgstr "hayır"
diff --git a/po/uk.po b/po/uk.po
index 873c6780..778a2a42 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -7,330 +7,337 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2010-03-05 21:52+0100\n"
+"POT-Creation-Date: 2010-12-13 20:04+0100\n"
 "PO-Revision-Date: 2009-10-16 13:01+0000\n"
 "Last-Translator: tivasyk <tivasyk@gmail.com>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
+"Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
-"n%10<=4 && (n%100<10 or n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 or n%100>=20) ? 1 : 2);\n"
 "X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/client.cpp:553 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:62
+#: src/client.cpp:598 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
 msgid "Setup"
 msgstr "Налаштування"
 
-#: src/client.cpp:623
+#: src/client.cpp:679
 #, fuzzy
 msgid "Connecting to server"
 msgstr "Очікування відповіді сервера"
 
-#: src/client.cpp:650
+#: src/client.cpp:706
 #, fuzzy
 msgid "Logging in"
 msgstr "Логін"
 
-#: src/client.cpp:683
+#: src/client.cpp:739
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:739
+#: src/client.cpp:804
 #, fuzzy
 msgid "Requesting characters"
 msgstr "Вимагається приєднання до каналу %s."
 
-#: src/client.cpp:768
+#: src/client.cpp:833
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:799 src/client.cpp:806 src/client.cpp:940
+#: src/client.cpp:843
+#, fuzzy
+msgid "Changing game servers"
+msgstr "Сервер"
+
+#: src/client.cpp:872 src/client.cpp:879 src/client.cpp:1014
 #: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
 #: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
-#: src/gui/serverdialog.cpp:261 src/gui/unregisterdialog.cpp:133
-#: src/net/ea/charserverhandler.cpp:135 src/net/ea/charserverhandler.cpp:152
-#: src/net/manaserv/charhandler.cpp:161 src/net/manaserv/charhandler.cpp:204
+#: src/gui/serverdialog.cpp:323 src/gui/unregisterdialog.cpp:133
+#: src/net/manaserv/charhandler.cpp:174 src/net/manaserv/charhandler.cpp:217
+#: src/net/tmwa/charserverhandler.cpp:134
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Error"
 msgstr "Помилка"
 
-#: src/client.cpp:815
+#: src/client.cpp:888
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:842
+#: src/client.cpp:915
 #, fuzzy
 msgid "Password Change"
 msgstr "Пароль:"
 
-#: src/client.cpp:843
+#: src/client.cpp:916
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:862
+#: src/client.cpp:935
 #, fuzzy
 msgid "Email Change"
 msgstr "Заміна"
 
-#: src/client.cpp:863
+#: src/client.cpp:936
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:883
+#: src/client.cpp:956
 #, fuzzy
 msgid "Unregister Successful"
 msgstr "Не зареєстрований"
 
-#: src/client.cpp:884
+#: src/client.cpp:957
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1007 src/client.cpp:1030
+#: src/client.cpp:1138 src/client.cpp:1161
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1119
+#: src/client.cpp:1281
 #, fuzzy, c-format
 msgid "Invalid update host: %s"
 msgstr "Невідомий сервер оновлення: "
 
-#: src/client.cpp:1153 src/client.cpp:1159
+#: src/client.cpp:1315 src/client.cpp:1321
 msgid "Error creating updates directory!"
 msgstr "Неможливо створити теку для оновлень!"
 
-#: src/commandhandler.cpp:127 src/commandhandler.cpp:308
+#: src/commandhandler.cpp:131 src/commandhandler.cpp:317
 msgid "Unknown command."
 msgstr "Чорт зна яка команда"
 
-#: src/commandhandler.cpp:156
+#: src/commandhandler.cpp:160
 msgid "-- Help --"
 msgstr "-- Довідка --"
 
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:161
 msgid "/help > Display this help"
 msgstr "/help > Показати це вікно"
 
-#: src/commandhandler.cpp:159
+#: src/commandhandler.cpp:163
 msgid "/where > Display map name"
 msgstr "/where > Показати ім'я мапи"
 
-#: src/commandhandler.cpp:160
+#: src/commandhandler.cpp:164
 msgid "/who > Display number of online users"
 msgstr "/who > Показати кількість гравців он-лайн"
 
-#: src/commandhandler.cpp:161
+#: src/commandhandler.cpp:165
 msgid "/me > Tell something about yourself"
 msgstr "/me > Розказати щось про себе"
 
-#: src/commandhandler.cpp:163
+#: src/commandhandler.cpp:167
 msgid "/clear > Clears this window"
 msgstr "/clear > Очистити оце вікно"
 
-#: src/commandhandler.cpp:165
+#: src/commandhandler.cpp:169
 msgid "/msg > Send a private message to a user"
 msgstr "/msg > Надіслати приватне повідомлення користувачеві"
 
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:170
 msgid "/whisper > Alias of msg"
 msgstr "/whisper > Варіант msg"
 
-#: src/commandhandler.cpp:167
+#: src/commandhandler.cpp:171
 msgid "/w > Alias of msg"
 msgstr "/w > Варіант msg"
 
-#: src/commandhandler.cpp:168
+#: src/commandhandler.cpp:172
 msgid "/query > Makes a tab for private messages with another user"
 msgstr "/query > Створює закладку для приватної розмови з іншим користувачем"
 
-#: src/commandhandler.cpp:169
+#: src/commandhandler.cpp:174
 msgid "/q > Alias of query"
 msgstr "/q > Варіант query"
 
-#: src/commandhandler.cpp:171
+#: src/commandhandler.cpp:176
 msgid "/ignore > ignore a player"
 msgstr ""
 
-#: src/commandhandler.cpp:172
+#: src/commandhandler.cpp:177
 msgid "/unignore > stop ignoring a player"
 msgstr ""
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:179
 msgid "/list > Display all public channels"
 msgstr "/list > Показати усі публічні канали"
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:180
 msgid "/join > Join or create a channel"
 msgstr "/join > Приєднатись чи створити канал"
 
-#: src/commandhandler.cpp:177
+#: src/commandhandler.cpp:182
 #, fuzzy
 msgid "/createparty > Create a new party"
 msgstr "/party > Запросити гравця до групи"
 
-#: src/commandhandler.cpp:178
+#: src/commandhandler.cpp:183
 msgid "/party > Invite a user to party"
 msgstr "/party > Запросити гравця до групи"
 
-#: src/commandhandler.cpp:180
+#: src/commandhandler.cpp:185
 msgid "/record > Start recording the chat to an external file"
 msgstr "/record > Розпочати запис чату у зовнішній файл"
 
-#: src/commandhandler.cpp:181
+#: src/commandhandler.cpp:187
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr "/toggle > Встановити, чи \"Ентер\" перемикатиме вас на вікно чату"
 
-#: src/commandhandler.cpp:182
+#: src/commandhandler.cpp:189
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
 "/present > Показати список всіх гравців он-лайн (надсилає в лог чату, якщо "
 "увімкнена опція логу чату)"
 
-#: src/commandhandler.cpp:184
+#: src/commandhandler.cpp:192
 msgid "/announce > Global announcement (GM only)"
 msgstr "/announce > Глобальне оголошення (лише для GM)"
 
-#: src/commandhandler.cpp:188
+#: src/commandhandler.cpp:196
 msgid "For more information, type /help <command>."
 msgstr "Хочете знати більше - введіть /help <команда>."
 
-#: src/commandhandler.cpp:192
+#: src/commandhandler.cpp:200
 msgid "Command: /help"
 msgstr "Команда: /help"
 
-#: src/commandhandler.cpp:193
+#: src/commandhandler.cpp:201
 msgid "This command displays a list of all commands available."
 msgstr "Ця команда показує список всіх доступних команд"
 
-#: src/commandhandler.cpp:194
+#: src/commandhandler.cpp:203
 msgid "Command: /help <command>"
 msgstr "Команда: /help <_команда_>"
 
-#: src/commandhandler.cpp:195
+#: src/commandhandler.cpp:204
 msgid "This command displays help on <command>."
 msgstr "Ця команда відображає коротку інформацію про <_команда_>"
 
-#: src/commandhandler.cpp:203
+#: src/commandhandler.cpp:212
 msgid "Command: /announce <msg>"
 msgstr "Команда: /announce <_текст_>"
 
-#: src/commandhandler.cpp:204
+#: src/commandhandler.cpp:213
 msgid "*** only available to a GM ***"
 msgstr "*** доступне лише для GM ***"
 
-#: src/commandhandler.cpp:205
+#: src/commandhandler.cpp:214
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 "Ця команда надсилає <_текст_> всім гравцям, що знаходяться в режимі он-лайн"
 
-#: src/commandhandler.cpp:210
+#: src/commandhandler.cpp:219
 msgid "Command: /clear"
 msgstr "Команда: /clear"
 
-#: src/commandhandler.cpp:211
+#: src/commandhandler.cpp:220
 msgid "This command clears the chat log of previous chat."
 msgstr "Ця команда очищає вікно логу чату від попередніх повідомлень"
 
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:224
 #, fuzzy
 msgid "Command: /ignore <player>"
 msgstr "Команда: /join <_канал_>"
 
-#: src/commandhandler.cpp:216
+#: src/commandhandler.cpp:225
 #, fuzzy
 msgid "This command ignores the given player regardless of current relations."
 msgstr "Відображає кількість гравців он-лайн"
 
-#: src/commandhandler.cpp:221
+#: src/commandhandler.cpp:230
 msgid "Command: /join <channel>"
 msgstr "Команда: /join <_канал_>"
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:231
 msgid "This command makes you enter <channel>."
 msgstr "Ця команда приєднує вас до <_канал_>"
 
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:232
 msgid "If <channel> doesn't exist, it's created."
 msgstr "Якщо <_канал_> не існує, він буде створений"
 
-#: src/commandhandler.cpp:227
+#: src/commandhandler.cpp:236
 msgid "Command: /list"
 msgstr "Команда: /list"
 
-#: src/commandhandler.cpp:228
+#: src/commandhandler.cpp:237
 msgid "This command shows a list of all channels."
 msgstr "Ця команда показує список всіх доступних каналів"
 
-#: src/commandhandler.cpp:232
+#: src/commandhandler.cpp:241
 msgid "Command: /me <message>"
 msgstr "Команда: /me <_текст_>"
 
-#: src/commandhandler.cpp:233
+#: src/commandhandler.cpp:242
 msgid "This command tell others you are (doing) <msg>."
 msgstr "Ця команда каже всім гравцям <_текст_> (або що ви робите)"
 
-#: src/commandhandler.cpp:237
+#: src/commandhandler.cpp:246
 msgid "Command: /msg <nick> <message>"
 msgstr "Команда: /msg <_ім'я_> <_текст_>"
 
-#: src/commandhandler.cpp:238
+#: src/commandhandler.cpp:247
 msgid "Command: /whisper <nick> <message>"
 msgstr "Команда: /whisper <_ім'я_> <_текст_>"
 
-#: src/commandhandler.cpp:239
+#: src/commandhandler.cpp:248
 msgid "Command: /w <nick> <message>"
 msgstr "Команда: /w <_ім'я_> <_текст_>"
 
-#: src/commandhandler.cpp:240
+#: src/commandhandler.cpp:249
 msgid "This command sends the text <message> to <nick>."
 msgstr "Ця команда надсилає <_текст_> гравцеві <_ім'я_>."
 
-#: src/commandhandler.cpp:241 src/commandhandler.cpp:260
+#: src/commandhandler.cpp:250 src/commandhandler.cpp:269
 #: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
-#: src/net/ea/gui/guildtab.cpp:75 src/net/ea/gui/partytab.cpp:75
+#: src/net/tmwa/gui/guildtab.cpp:75 src/net/tmwa/gui/partytab.cpp:75
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 "Якщо <_ім'я_> містить пробіли, візьміть все _ім'я_ в подвійні лапки (\r\n"
 "name surname\")"
 
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:255
 msgid "Command: /query <nick>"
 msgstr "Команда: /query <_ім'я_>"
 
-#: src/commandhandler.cpp:247
+#: src/commandhandler.cpp:256
 msgid "Command: /q <nick>"
 msgstr "Команда: /q <_ім'я_>"
 
-#: src/commandhandler.cpp:248
+#: src/commandhandler.cpp:257
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
 "Ця команда намагається створити закладинку для перешіптування між вами та "
 "гравцем <_ім'я_>"
 
-#: src/commandhandler.cpp:253
+#: src/commandhandler.cpp:262
 #, fuzzy
 msgid "Command: /createparty <name>"
 msgstr "Команда: /party <_ім'я_>"
 
-#: src/commandhandler.cpp:254
+#: src/commandhandler.cpp:263
 #, fuzzy
 msgid "This command creates a new party called <name>."
 msgstr "Ця команда приєднує вас до <_канал_>"
 
-#: src/commandhandler.cpp:258
+#: src/commandhandler.cpp:267
 msgid "Command: /party <nick>"
 msgstr "Команда: /party <_ім'я_>"
 
-#: src/commandhandler.cpp:259 src/net/ea/gui/partytab.cpp:74
+#: src/commandhandler.cpp:268 src/net/tmwa/gui/partytab.cpp:74
 msgid "This command invites <nick> to party with you."
 msgstr "Ця команда запрошує гравця <_ім'я_> до вас в групу"
 
-#: src/commandhandler.cpp:265
+#: src/commandhandler.cpp:274
 msgid "Command: /present"
 msgstr "Команда: /present"
 
-#: src/commandhandler.cpp:266
+#: src/commandhandler.cpp:275
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
@@ -338,28 +345,28 @@ msgstr ""
 "Ця команда отримує список гравців, які можуть почути вас і надсилає його або "
 "в файл логу чату (якщо увімкнена опція ведення логу), або до вікна чату"
 
-#: src/commandhandler.cpp:272
+#: src/commandhandler.cpp:281
 msgid "Command: /record <filename>"
 msgstr "Команда: /record <_файл_>"
 
-#: src/commandhandler.cpp:273
+#: src/commandhandler.cpp:282
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr ""
 "Ця команда вмикає ведення журналу чату (записує весь вміст чату у <_файл_>)"
 
-#: src/commandhandler.cpp:275
+#: src/commandhandler.cpp:284
 msgid "Command: /record"
 msgstr "Команда: /record"
 
-#: src/commandhandler.cpp:276
+#: src/commandhandler.cpp:285
 msgid "This command finishes a recording session."
 msgstr "Завершує ведення журналу (логу) чату"
 
-#: src/commandhandler.cpp:280
+#: src/commandhandler.cpp:289
 msgid "Command: /toggle <state>"
 msgstr "Команда: /toggle <_режим_>"
 
-#: src/commandhandler.cpp:281
+#: src/commandhandler.cpp:290
 msgid ""
 "This command sets whether the return key should toggle the chat log, or "
 "whether the chat log turns off automatically."
@@ -367,56 +374,56 @@ msgstr ""
 "Ця команда встановлює, чи буде натиснення клавіші Enter автоматично "
 "перемикатиме на вікно чату"
 
-#: src/commandhandler.cpp:283
+#: src/commandhandler.cpp:292
 msgid ""
-"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
-"\", \"no\", \"false\" to turn the toggle off."
+"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
+"\"0\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 "<_режим_> може бути \"1\", \"yes\", або \"true\" щоб увімкнути опцію, або ж "
 "\"0\", \"no\", чи \"false\" щоб вимкнути її."
 
-#: src/commandhandler.cpp:286
+#: src/commandhandler.cpp:295
 msgid "Command: /toggle"
 msgstr "Команда: /toggle"
 
-#: src/commandhandler.cpp:287
+#: src/commandhandler.cpp:296
 msgid "This command displays the return toggle status."
 msgstr "Показує режим клавіші Enter"
 
-#: src/commandhandler.cpp:291 src/gui/widgets/whispertab.cpp:93
+#: src/commandhandler.cpp:300 src/gui/widgets/whispertab.cpp:95
 #, fuzzy
 msgid "Command: /unignore <player>"
 msgstr "Команда: /announce <_текст_>"
 
-#: src/commandhandler.cpp:292
+#: src/commandhandler.cpp:301
 msgid "This command stops ignoring the given player if they are being ignored"
 msgstr ""
 
-#: src/commandhandler.cpp:297
+#: src/commandhandler.cpp:306
 msgid "Command: /where"
 msgstr "Команда: /where"
 
-#: src/commandhandler.cpp:298
+#: src/commandhandler.cpp:307
 msgid "This command displays the name of the current map."
 msgstr "Показує назву поточної локації"
 
-#: src/commandhandler.cpp:302
+#: src/commandhandler.cpp:311
 msgid "Command: /who"
 msgstr "Команда: /who"
 
-#: src/commandhandler.cpp:303
+#: src/commandhandler.cpp:312
 msgid "This command displays the number of players currently online."
 msgstr "Відображає кількість гравців он-лайн"
 
-#: src/commandhandler.cpp:309
+#: src/commandhandler.cpp:318
 msgid "Type /help for a list of commands."
 msgstr "Введіть /help щоб побачити список всіх команд"
 
-#: src/commandhandler.cpp:375
+#: src/commandhandler.cpp:384
 msgid "Cannot send empty whispers!"
 msgstr "Не можна надсилати порожні повідомлення!"
 
-#: src/commandhandler.cpp:383
+#: src/commandhandler.cpp:392
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -425,57 +432,65 @@ msgstr ""
 "Неможливо створити закладинку для спілкування з гравцем \"%s\" - або така "
 "вже існує, або ви намагаєтесь перешіптуватись сам з собою =Р"
 
-#: src/commandhandler.cpp:397
+#: src/commandhandler.cpp:406
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Вимагається приєднання до каналу %s."
 
-#: src/commandhandler.cpp:410 src/net/ea/gui/partytab.cpp:109
+#: src/commandhandler.cpp:419 src/net/tmwa/gui/partytab.cpp:109
 msgid "Party name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:423 src/commandhandler.cpp:471
-#: src/commandhandler.cpp:493
+#: src/commandhandler.cpp:432 src/commandhandler.cpp:509
+#: src/commandhandler.cpp:531
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:441
+#: src/commandhandler.cpp:450
 msgid "Return toggles chat."
 msgstr "Enter перемикає на чат"
 
-#: src/commandhandler.cpp:441
+#: src/commandhandler.cpp:450
 msgid "Message closes chat."
 msgstr "Повідомлення закриваж вікно чату"
 
-#: src/commandhandler.cpp:450
+#: src/commandhandler.cpp:459
 msgid "Return now toggles chat."
 msgstr "Enter тепер перемикає на вікно чату"
 
-#: src/commandhandler.cpp:454
+#: src/commandhandler.cpp:463
 msgid "Message now closes chat."
 msgstr "Тепер повідомлення закриватиме вікно чату"
 
-#: src/commandhandler.cpp:477
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:489
+msgid "Show IP: On"
+msgstr ""
+
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:485
+msgid "Show IP: Off"
+msgstr ""
+
+#: src/commandhandler.cpp:515
 msgid "Player already ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:484
+#: src/commandhandler.cpp:522
 msgid "Player successfully ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:486
+#: src/commandhandler.cpp:524
 msgid "Player could not be ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:501
+#: src/commandhandler.cpp:539
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:506
+#: src/commandhandler.cpp:544
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:508
+#: src/commandhandler.cpp:546
 msgid "Player could not be unignored!"
 msgstr ""
 
@@ -483,50 +498,50 @@ msgstr ""
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
-"Можливими опціями для /%s є: \"yes\", \"no\", \"true\", \"false\", \"1\", \"0"
-"\"."
+"Можливими опціями для /%s є: \"yes\", \"no\", \"true\", \"false\", \"1\", "
+"\"0\"."
 
 #: src/game.cpp:172
 msgid "General"
 msgstr "Загальне"
 
-#: src/game.cpp:326
+#: src/game.cpp:342
 #, fuzzy
 msgid "Screenshot saved as "
 msgstr "Фотознімок екрану (скріншот) збережено до теки ~/"
 
-#: src/game.cpp:331
+#: src/game.cpp:347
 msgid "Saving screenshot failed!"
 msgstr "Збереження скріншоту провалилось!"
 
-#: src/game.cpp:355
+#: src/game.cpp:378
 #, fuzzy
 msgid "The connection to the server was lost."
 msgstr "Втрачено з'єднання з сервером, програма завершуєтьсся"
 
-#: src/game.cpp:360
+#: src/game.cpp:382
 msgid "Network Error"
 msgstr "Мережева помилка"
 
-#: src/game.cpp:705
+#: src/game.cpp:721
 msgid "Ignoring incoming trade requests"
 msgstr "Ігнорування вхідних пропозицій торгівлі"
 
-#: src/game.cpp:712
+#: src/game.cpp:726
 msgid "Accepting incoming trade requests"
 msgstr "Приймання вхідних пропозицій торгівлі"
 
-#: src/game.cpp:946
+#: src/game.cpp:954
 #, fuzzy
 msgid "Could Not Load Map"
 msgstr "Неможливо завантажити локацію"
 
-#: src/game.cpp:947
+#: src/game.cpp:955
 #, c-format
 msgid "Error while loading %s"
 msgstr "Помилка під час завантаження %s"
 
-#: src/gui/beingpopup.cpp:75
+#: src/gui/beingpopup.cpp:76
 #, fuzzy, c-format
 msgid "Party: %s"
 msgstr "Група (%s)"
@@ -535,34 +550,34 @@ msgstr "Група (%s)"
 msgid "Buy"
 msgstr "Придбати"
 
-#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
-#: src/gui/sell.cpp:276
+#: src/gui/buy.cpp:69 src/gui/buy.cpp:261 src/gui/sell.cpp:71
+#: src/gui/sell.cpp:288
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Ціна: %s / Загалом: %s"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:99 src/gui/npcdialog.cpp:100
-#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:479
+#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:112 src/gui/npcdialog.cpp:124
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:463
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:98 src/gui/npcdialog.cpp:101
-#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:491
+#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:111 src/gui/npcdialog.cpp:125
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:475
 msgid "-"
 msgstr ""
 
 #: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
-#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:182
-#: src/keyboardconfig.cpp:103
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:228
+#: src/keyboardconfig.cpp:102
 msgid "Quit"
 msgstr "Вийти"
 
-#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:408
-#: src/gui/statuswindow.cpp:478 src/gui/statuswindow.cpp:512
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:384
+#: src/gui/statuswindow.cpp:462 src/gui/statuswindow.cpp:496
 msgid "Max"
 msgstr "Максимум"
 
@@ -576,11 +591,11 @@ msgstr "Продати"
 
 #: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
 #: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
-#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:101
-#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:178
-#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:402
+#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:114
+#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:389
 #: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
-#: src/gui/socialwindow.cpp:242 src/gui/textdialog.cpp:39
+#: src/gui/socialwindow.cpp:275 src/gui/textdialog.cpp:40
 #: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr "Скасувати"
@@ -618,7 +633,7 @@ msgstr ""
 msgid "Change Password"
 msgstr "Змінити пароль"
 
-#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:53
+#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:55
 #: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
 msgid "Password:"
 msgstr "Пароль:"
@@ -650,19 +665,19 @@ msgstr ""
 msgid "Create Character"
 msgstr "Створити персонажа"
 
-#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:52
+#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:54
 #: src/gui/register.cpp:67
 msgid "Name:"
 msgstr "Ім'я"
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
 #: src/gui/outfitwindow.cpp:67
 msgid ">"
 msgstr ""
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
 #: src/gui/outfitwindow.cpp:66
@@ -679,8 +694,8 @@ msgstr "Колір волосся:"
 msgid "Hair style:"
 msgstr "Зачіска:"
 
-#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:397
-#: src/gui/socialwindow.cpp:296
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:392
+#: src/gui/socialwindow.cpp:329
 msgid "Create"
 msgstr "Створити"
 
@@ -736,34 +751,34 @@ msgstr "Не зареєстрований"
 msgid "Change Email"
 msgstr "Змінити адресу електронної пошти"
 
-#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:185
-#: src/gui/setup_players.cpp:230
+#: src/gui/charselectdialog.cpp:336 src/gui/serverdialog.cpp:231
+#: src/gui/setup_players.cpp:229
 msgid "Delete"
 msgstr "Видалити"
 
-#: src/gui/charselectdialog.cpp:387
+#: src/gui/charselectdialog.cpp:380
 #, fuzzy
 msgid "Choose"
 msgstr "Закрити"
 
-#: src/gui/charselectdialog.cpp:399 src/gui/charselectdialog.cpp:400
+#: src/gui/charselectdialog.cpp:394 src/gui/charselectdialog.cpp:395
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:77 src/gui/palette.cpp:96
+#: src/gui/chat.cpp:88
 msgid "Chat"
 msgstr "Чат"
 
-#: src/gui/chat.cpp:287
+#: src/gui/chat.cpp:311
 #, fuzzy, c-format
 msgid "Present: %s; %d players are present."
 msgstr "%d гравців он-лайн"
 
-#: src/gui/chat.cpp:305
+#: src/gui/chat.cpp:329
 msgid "Attendance written to record log."
 msgstr "Аудиторія занесена до журналу"
 
-#: src/gui/chat.cpp:469
+#: src/gui/chat.cpp:493
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Шепчу до %s: %s"
@@ -825,143 +840,173 @@ msgstr "Деталізація ефектів частинок"
 msgid "Ambient FX: %s"
 msgstr "Звуки оточення"
 
-#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:56
+#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:55
 msgid "Equipment"
 msgstr "Обладунки"
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:77
-#: src/gui/inventorywindow.cpp:79 src/gui/inventorywindow.cpp:298
-#: src/gui/popupmenu.cpp:372
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:89
+#: src/gui/inventorywindow.cpp:337 src/gui/popupmenu.cpp:359
 msgid "Unequip"
 msgstr "Зняти"
 
-#: src/gui/help.cpp:36
+#: src/gui/help.cpp:37
 msgid "Help"
 msgstr "Довідка"
 
-#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:73
+#: src/gui/help.cpp:51 src/gui/npcdialog.cpp:50
 msgid "Close"
 msgstr "Закрити"
 
-#: src/gui/inventorywindow.cpp:56 src/gui/windowmenu.cpp:57
+#: src/gui/inventorywindow.cpp:59 src/gui/windowmenu.cpp:56
 msgid "Inventory"
 msgstr "Сумка"
 
-#: src/gui/inventorywindow.cpp:72 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:300 src/gui/popupmenu.cpp:374
+#: src/gui/inventorywindow.cpp:59
+msgid "Storage"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:82
+msgid "Slots:"
+msgstr "Комірки"
+
+#: src/gui/inventorywindow.cpp:87 src/gui/inventorywindow.cpp:100
+#: src/gui/inventorywindow.cpp:339 src/gui/popupmenu.cpp:361
 msgid "Equip"
 msgstr "Зняти"
 
-#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:304 src/gui/popupmenu.cpp:377
+#: src/gui/inventorywindow.cpp:88
 msgid "Use"
 msgstr "Використати"
 
-#: src/gui/inventorywindow.cpp:83 src/gui/inventorywindow.cpp:308
-#: src/gui/popupmenu.cpp:380
+#: src/gui/inventorywindow.cpp:101 src/gui/popupmenu.cpp:364
+msgid "Activate"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:102 src/gui/inventorywindow.cpp:348
+#: src/gui/popupmenu.cpp:367
 #, fuzzy
 msgid "Drop..."
 msgstr "Викинути"
 
-#: src/gui/inventorywindow.cpp:84 src/gui/popupmenu.cpp:386
+#: src/gui/inventorywindow.cpp:103 src/gui/popupmenu.cpp:373
 msgid "Split"
 msgstr "Поділити"
 
-#: src/gui/inventorywindow.cpp:85 src/gui/outfitwindow.cpp:51
+#: src/gui/inventorywindow.cpp:104 src/gui/outfitwindow.cpp:51
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:96 src/gui/storagewindow.cpp:83
-msgid "Slots:"
-msgstr "Комірки"
-
-#: src/gui/inventorywindow.cpp:97
+#: src/gui/inventorywindow.cpp:106
 msgid "Weight:"
 msgstr "Вага:"
 
-#: src/gui/inventorywindow.cpp:310 src/gui/popupmenu.cpp:382
+#: src/gui/inventorywindow.cpp:124 src/gui/popupmenu.cpp:378
+msgid "Store"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:125 src/gui/popupmenu.cpp:385
+msgid "Retrieve"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:350 src/gui/popupmenu.cpp:369
 msgid "Drop"
 msgstr "Викинути"
 
-#: src/gui/itemamount.cpp:100 src/gui/okdialog.cpp:42
-#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:38 src/gui/trade.cpp:73
-#: src/gui/trade.cpp:75
+#: src/gui/itemamount.cpp:113 src/gui/okdialog.cpp:42
+#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:39 src/gui/trade.cpp:72
+#: src/gui/trade.cpp:74
 msgid "OK"
 msgstr "Ок"
 
-#: src/gui/itemamount.cpp:102
+#: src/gui/itemamount.cpp:115
 msgid "All"
 msgstr "Все"
 
-#: src/gui/itemamount.cpp:128
+#: src/gui/itemamount.cpp:141
 msgid "Select amount of items to trade."
 msgstr "Вкажіть кількість предметів"
 
-#: src/gui/itemamount.cpp:131
+#: src/gui/itemamount.cpp:144
 msgid "Select amount of items to drop."
 msgstr "Вкажіть кількість предметів, щоб викинути"
 
-#: src/gui/itemamount.cpp:134
+#: src/gui/itemamount.cpp:147
 msgid "Select amount of items to store."
 msgstr "Вкажіть кількість предметів для зберігання"
 
-#: src/gui/itemamount.cpp:137
+#: src/gui/itemamount.cpp:150
 msgid "Select amount of items to retrieve."
 msgstr "Вкажіть кількість предметів для отримання"
 
-#: src/gui/itemamount.cpp:140
+#: src/gui/itemamount.cpp:153
 msgid "Select amount of items to split."
 msgstr "Вкажіть кількість предметів для розподілу"
 
-#: src/gui/itempopup.cpp:92
+#: src/gui/itempopup.cpp:137
 #, fuzzy, c-format
 msgid "Weight: %s"
 msgstr "Вага: "
 
-#: src/gui/login.cpp:49 src/gui/login.cpp:61
+#: src/gui/login.cpp:51 src/gui/login.cpp:63
 msgid "Login"
 msgstr "Логін"
 
-#: src/gui/login.cpp:58
+#: src/gui/login.cpp:60
 #, fuzzy
 msgid "Remember username"
 msgstr "Запам'ятати ім'я користувача"
 
-#: src/gui/login.cpp:59 src/gui/register.cpp:58 src/gui/register.cpp:73
+#: src/gui/login.cpp:61 src/gui/register.cpp:58 src/gui/register.cpp:73
 msgid "Register"
 msgstr "Зареєструватись"
 
-#: src/gui/login.cpp:60
+#: src/gui/login.cpp:62
 #, fuzzy
 msgid "Change Server"
 msgstr "Сервер"
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
+#: src/gui/login.cpp:129
+msgid "Registration disabled"
+msgstr ""
+
+#: src/gui/login.cpp:129
+msgid "You need to use the website to register an account for this server."
+msgstr ""
+
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:86
 msgid "Map"
 msgstr "Локація"
 
-#: src/gui/npcdialog.cpp:44
+#: src/gui/ministatus.cpp:235
+msgid "Need"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:48
 msgid "Waiting for server"
 msgstr "Очікування відповіді сервера"
 
-#: src/gui/npcdialog.cpp:45
+#: src/gui/npcdialog.cpp:49
 msgid "Next"
 msgstr "Далі"
 
-#: src/gui/npcdialog.cpp:47
+#: src/gui/npcdialog.cpp:51
 msgid "Submit"
 msgstr "Підтвердити"
 
-#: src/gui/npcdialog.cpp:52 src/gui/npcpostdialog.cpp:41
+#: src/gui/npcdialog.cpp:73 src/gui/npcpostdialog.cpp:41
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:110
+#: src/gui/npcdialog.cpp:118
+msgid "Clear log"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:134
 msgid "Reset"
 msgstr "Спробувати знову"
 
 #. TRANSLATORS: Please leave the \n sequences intact.
-#: src/gui/npcdialog.cpp:171
+#: src/gui/npcdialog.cpp:208
 #, fuzzy
 msgid ""
 "\n"
@@ -976,7 +1021,7 @@ msgstr "Для:"
 msgid "Send"
 msgstr "Надіслати"
 
-#: src/gui/npcpostdialog.cpp:96
+#: src/gui/npcpostdialog.cpp:99
 msgid "Failed to send as sender or letter invalid."
 msgstr "Неможливо надіслати, так як адресант або лист некорректні"
 
@@ -991,312 +1036,85 @@ msgstr ""
 msgid "Unequip first"
 msgstr "Зняти"
 
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:143
-msgid "Text"
-msgstr "Текст"
-
-#: src/gui/palette.cpp:82
-msgid "Text Shadow"
-msgstr "Відтінок тексту"
-
-#: src/gui/palette.cpp:83
-msgid "Text Outline"
-msgstr "Виділення тексту"
-
-#: src/gui/palette.cpp:84
-msgid "Progress Bar Labels"
-msgstr "Позначки на індикаторах прогресу"
-
-#: src/gui/palette.cpp:85
-msgid "Buttons"
-msgstr ""
-
-#: src/gui/palette.cpp:86
-msgid "Disabled Buttons"
-msgstr ""
-
-#: src/gui/palette.cpp:87
-msgid "Tabs"
-msgstr ""
-
-#: src/gui/palette.cpp:89
-msgid "Background"
-msgstr "Тло"
-
-#: src/gui/palette.cpp:91
-msgid "Highlight"
-msgstr "Підсвічення"
-
-#: src/gui/palette.cpp:92
-msgid "Tab Highlight"
-msgstr "Підсвічення закладинок"
-
-#: src/gui/palette.cpp:93
-#, fuzzy
-msgid "Item Too Expensive"
-msgstr "Предмет надто дорогий"
-
-#: src/gui/palette.cpp:94
-#, fuzzy
-msgid "Item Is Equipped"
-msgstr "Предмет одягнено"
-
-#: src/gui/palette.cpp:97
-msgid "GM"
-msgstr "GM"
-
-#: src/gui/palette.cpp:98
-msgid "Player"
-msgstr "Гравець"
-
-#: src/gui/palette.cpp:99
-msgid "Whisper"
-msgstr "Шепіт"
-
-#: src/gui/palette.cpp:100
-msgid "Is"
-msgstr "Є"
-
-#: src/gui/palette.cpp:101 src/net/ea/gui/partytab.cpp:43
-msgid "Party"
-msgstr "Група"
-
-#: src/gui/palette.cpp:102 src/net/ea/gui/guildtab.cpp:45
-msgid "Guild"
-msgstr "Гільдія"
-
-#: src/gui/palette.cpp:103
-msgid "Server"
-msgstr "Сервер"
-
-#: src/gui/palette.cpp:104
-msgid "Logger"
-msgstr "Логер"
-
-#: src/gui/palette.cpp:105
-msgid "Hyperlink"
-msgstr "Посилання"
-
-#: src/gui/palette.cpp:107
-msgid "Being"
-msgstr "Істота"
-
-#: src/gui/palette.cpp:108
-msgid "Other Players' Names"
-msgstr "Імена інших гравців"
-
-#: src/gui/palette.cpp:109
-msgid "Own Name"
-msgstr "Власне ім'я"
-
-#: src/gui/palette.cpp:110
-msgid "GM Names"
-msgstr "Імена GM"
-
-#: src/gui/palette.cpp:111
-msgid "NPCs"
-msgstr "NPC"
-
-#: src/gui/palette.cpp:112
-msgid "Monsters"
-msgstr "Тварюки"
-
-#: src/gui/palette.cpp:114
-msgid "Unknown Item Type"
-msgstr "Невідомий тип предмета"
-
-#: src/gui/palette.cpp:115
-msgid "Generics"
-msgstr "Загальні"
-
-#: src/gui/palette.cpp:116
-msgid "Hats"
-msgstr "Капелюхи"
-
-#: src/gui/palette.cpp:117
-msgid "Usables"
-msgstr "Використання"
-
-#: src/gui/palette.cpp:118
-msgid "Shirts"
-msgstr "Сорочки"
-
-#: src/gui/palette.cpp:119
-#, fuzzy
-msgid "One Handed Weapons"
-msgstr "\"Однорука\" зброя"
-
-#: src/gui/palette.cpp:120
-msgid "Pants"
-msgstr "Штанці"
-
-#: src/gui/palette.cpp:121
-msgid "Shoes"
-msgstr "Чоботи"
-
-#: src/gui/palette.cpp:122
-#, fuzzy
-msgid "Two Handed Weapons"
-msgstr "\"Однорука\" зброя"
-
-#: src/gui/palette.cpp:123
-msgid "Shields"
-msgstr "Щити"
-
-#: src/gui/palette.cpp:124
-msgid "Rings"
-msgstr "Кільця"
-
-#: src/gui/palette.cpp:125
-msgid "Necklaces"
-msgstr "Ошийники"
-
-#: src/gui/palette.cpp:126
-msgid "Arms"
-msgstr "Руки"
-
-#: src/gui/palette.cpp:127
-msgid "Ammo"
-msgstr "Боєприпаси"
-
-#: src/gui/palette.cpp:129
-msgid "Particle Effects"
-msgstr "Ефекти часток"
-
-#: src/gui/palette.cpp:130
-msgid "Pickup Notification"
-msgstr "Повідомлення про підбирання"
-
-#: src/gui/palette.cpp:131
-msgid "Exp Notification"
-msgstr "Повідомлення про зміну досвіду"
-
-#: src/gui/palette.cpp:133
-#, fuzzy
-msgid "Player Hits Monster"
-msgstr "Гравець вдарив Тварюку"
-
-#: src/gui/palette.cpp:135
-#, fuzzy
-msgid "Monster Hits Player"
-msgstr "Тварюка вдарила гравця"
-
-#: src/gui/palette.cpp:136
-msgid "Critical Hit"
-msgstr "Критичний удар"
-
-#: src/gui/palette.cpp:137
-msgid "Misses"
-msgstr "Промах"
-
-#: src/gui/palette.cpp:139
-msgid "HP Bar"
-msgstr "Рядок HP"
-
-#: src/gui/palette.cpp:140
-msgid "3/4 HP Bar"
-msgstr "3/4 рядка НР"
-
-#: src/gui/palette.cpp:141
-msgid "1/2 HP Bar"
-msgstr "1/2 рядка НР"
-
-#: src/gui/palette.cpp:142
-msgid "1/4 HP Bar"
-msgstr "1/4 здоров'я"
-
-#: src/gui/popupmenu.cpp:84
+#: src/gui/popupmenu.cpp:83
 #, fuzzy, c-format
 msgid "Trade with %s..."
 msgstr "@@trade|Торгувати з %s@@"
 
-#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:161
+#: src/gui/popupmenu.cpp:87 src/gui/popupmenu.cpp:158
 #, fuzzy, c-format
 msgid "Attack %s"
 msgstr "Нападати"
 
-#: src/gui/popupmenu.cpp:92
+#: src/gui/popupmenu.cpp:91
 #, fuzzy, c-format
 msgid "Whisper %s"
 msgstr "Шепіт"
 
-#: src/gui/popupmenu.cpp:101
+#: src/gui/popupmenu.cpp:100
 #, fuzzy, c-format
 msgid "Befriend %s"
 msgstr "@@friend|Товаришувати з %s@@"
 
-#: src/gui/popupmenu.cpp:106
+#: src/gui/popupmenu.cpp:105
 #, fuzzy, c-format
 msgid "Disregard %s"
 msgstr "Не зважати"
 
-#: src/gui/popupmenu.cpp:109
+#: src/gui/popupmenu.cpp:108
 #, fuzzy, c-format
 msgid "Ignore %s"
 msgstr "Ігнорувати повністю"
 
-#: src/gui/popupmenu.cpp:115 src/gui/popupmenu.cpp:124
+#: src/gui/popupmenu.cpp:114 src/gui/popupmenu.cpp:123
 #, c-format
 msgid "Unignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:118
+#: src/gui/popupmenu.cpp:117
 #, fuzzy, c-format
 msgid "Completely ignore %s"
 msgstr "@@ignore|Повністю ігнорувати %s@@"
 
 #: src/gui/popupmenu.cpp:130
-#, c-format
-msgid "Follow %s"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:133
 #, fuzzy, c-format
 msgid "Invite %s to join your guild"
 msgstr "@@guild|Запросити %s до вашої гільдії@@"
 
-#: src/gui/popupmenu.cpp:137
+#: src/gui/popupmenu.cpp:134
 #, fuzzy, c-format
 msgid "Invite %s to join your party"
 msgstr "@@party|Запросити %s до вашої групи@@"
 
-#: src/gui/popupmenu.cpp:144
+#: src/gui/popupmenu.cpp:141
 msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:153
+#: src/gui/popupmenu.cpp:150
 #, fuzzy, c-format
 msgid "Talk to %s"
 msgstr "@@talk|Шоворити з %s@@"
 
-#: src/gui/popupmenu.cpp:166
+#: src/gui/popupmenu.cpp:163
 #, fuzzy
 msgid "Kick monster"
 msgstr "@@admin-kick|Викинути тварюку@@"
 
-#: src/gui/popupmenu.cpp:174
+#: src/gui/popupmenu.cpp:171
 #, fuzzy
 msgid "Add name to chat"
 msgstr "@@name|додати ім'я до чату@@"
 
-#: src/gui/popupmenu.cpp:191
+#: src/gui/popupmenu.cpp:188
 #, fuzzy, c-format
 msgid "Pick up %s"
 msgstr "Підняти"
 
-#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:400
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:387
 #, fuzzy
 msgid "Add to chat"
 msgstr "@@chat|Додати до чату@@"
 
-#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:70
-msgid "Store"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:71
-msgid "Retrieve"
-msgstr ""
-
 #: src/gui/quitdialog.cpp:44
 msgid "Switch server"
 msgstr "Змінити сервер"
@@ -1365,52 +1183,65 @@ msgstr "Пароль повинен складатись менш, ніж з %d
 msgid "Passwords do not match."
 msgstr "Не ідентичні паролі!"
 
-#: src/gui/serverdialog.cpp:134
+#: src/gui/serverdialog.cpp:197
 #, fuzzy
 msgid "Choose Your Server"
 msgstr "Оберіть сервер"
 
-#: src/gui/serverdialog.cpp:141 src/gui/widgets/chattab.cpp:139
+#: src/gui/serverdialog.cpp:206 src/gui/widgets/chattab.cpp:142
 msgid "Server:"
 msgstr "Сервер:"
 
-#: src/gui/serverdialog.cpp:142
+#: src/gui/serverdialog.cpp:207
 msgid "Port:"
 msgstr "Порт:"
 
-#: src/gui/serverdialog.cpp:143
+#: src/gui/serverdialog.cpp:208
 #, fuzzy
 msgid "Server type:"
 msgstr "Сервер:"
 
-#: src/gui/serverdialog.cpp:183
+#: src/gui/serverdialog.cpp:229
 #, fuzzy
 msgid "Connect"
 msgstr "З'єднуюсь..."
 
-#: src/gui/serverdialog.cpp:184
+#: src/gui/serverdialog.cpp:230
 #, fuzzy
 msgid "Custom Server"
 msgstr "Красивий вказівник"
 
-#: src/gui/serverdialog.cpp:262
+#: src/gui/serverdialog.cpp:324
 msgid "Please type both the address and the port of a server."
 msgstr "Будь ласка, введіть порт і адресу серверу"
 
-#: src/gui/serverdialog.cpp:411
+#: src/gui/serverdialog.cpp:441
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:417
+#: src/gui/serverdialog.cpp:447
 #, fuzzy
 msgid "Waiting for server..."
 msgstr "Очікування відповіді сервера"
 
-#: src/gui/serverdialog.cpp:421
+#: src/gui/serverdialog.cpp:451
 msgid "Preparing download"
 msgstr ""
 
+#: src/gui/serverdialog.cpp:455
+msgid "Error retreiving server list!"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:550
+msgid "requires a newer version"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:552
+#, c-format
+msgid "requires v%s"
+msgstr ""
+
 #: src/gui/setup_audio.cpp:42
 msgid "Sound"
 msgstr "ЗвукАуді"
@@ -1444,54 +1275,54 @@ msgstr ""
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:44
+#: src/gui/setup_colors.cpp:46
 msgid "This is what the color looks like"
 msgstr "Ось, як виглядає цей колір"
 
-#: src/gui/setup_colors.cpp:49
+#: src/gui/setup_colors.cpp:51
 msgid "Colors"
 msgstr "Кольори"
 
-#: src/gui/setup_colors.cpp:70
+#: src/gui/setup_colors.cpp:72
 #, fuzzy
 msgid "Type:"
 msgstr "Тип: "
 
-#: src/gui/setup_colors.cpp:81 src/gui/setup_colors.cpp:433
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:331
 msgid "Static"
 msgstr "Статичне"
 
-#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:84
-#: src/gui/setup_colors.cpp:434
+#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
+#: src/gui/setup_colors.cpp:332
 msgid "Pulse"
 msgstr "Пульсуюче"
 
-#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
+#: src/gui/setup_colors.cpp:333
 msgid "Rainbow"
 msgstr "Веселка"
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
+#: src/gui/setup_colors.cpp:333
 msgid "Spectrum"
 msgstr "Спектр"
 
-#: src/gui/setup_colors.cpp:92
+#: src/gui/setup_colors.cpp:94
 #, fuzzy
 msgid "Delay:"
 msgstr "Затримка: "
 
-#: src/gui/setup_colors.cpp:107
+#: src/gui/setup_colors.cpp:109
 #, fuzzy
 msgid "Red:"
 msgstr "Червоний: "
 
-#: src/gui/setup_colors.cpp:122
+#: src/gui/setup_colors.cpp:124
 #, fuzzy
 msgid "Green:"
 msgstr "Зелений: "
 
-#: src/gui/setup_colors.cpp:137
+#: src/gui/setup_colors.cpp:139
 #, fuzzy
 msgid "Blue:"
 msgstr "Синій: "
@@ -1537,589 +1368,601 @@ msgid "Assign"
 msgstr "Призначити"
 
 #: src/gui/setup_keyboard.cpp:90
+#, fuzzy
+msgid "Unassign"
+msgstr "Призначити"
+
+#: src/gui/setup_keyboard.cpp:94
 msgid "Default"
 msgstr "Типово"
 
-#: src/gui/setup_keyboard.cpp:119
+#: src/gui/setup_keyboard.cpp:125
 msgid "Key Conflict(s) Detected."
 msgstr "Деякі скорочення дублюють одне одного"
 
-#: src/gui/setup_players.cpp:57
+#: src/gui/setup_players.cpp:58
 msgid "Name"
 msgstr "Назва"
 
-#: src/gui/setup_players.cpp:58
+#: src/gui/setup_players.cpp:59
 msgid "Relation"
 msgstr "Стосунки"
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:64
 msgid "Neutral"
 msgstr "Нейтрально"
 
-#: src/gui/setup_players.cpp:64
+#: src/gui/setup_players.cpp:65
 msgid "Friend"
 msgstr "Друзі"
 
-#: src/gui/setup_players.cpp:65
+#: src/gui/setup_players.cpp:66
 msgid "Disregarded"
 msgstr "Не зважати"
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_players.cpp:67
 msgid "Ignored"
 msgstr "Ігнорувати повністю"
 
-#: src/gui/setup_players.cpp:208 src/gui/setup_video.cpp:132
+#: src/gui/setup_players.cpp:206 src/gui/setup_video.cpp:153
 msgid "???"
 msgstr "???"
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_players.cpp:225
 msgid "Allow trading"
 msgstr "Дозволити торгівлю"
 
-#: src/gui/setup_players.cpp:228
+#: src/gui/setup_players.cpp:227
 msgid "Allow whispers"
 msgstr "Дозволити шепіт (приватне спілкування)"
 
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:231
 msgid "Put all whispers in tabs"
 msgstr "Шепіт (приватне спілкування) в окремих вкладках"
 
-#: src/gui/setup_players.cpp:234
+#: src/gui/setup_players.cpp:233
 #, fuzzy
 msgid "Show gender"
 msgstr "Показувати ім'я"
 
-#: src/gui/setup_players.cpp:236
+#: src/gui/setup_players.cpp:235
+msgid "Enable Chat log"
+msgstr ""
+
+#: src/gui/setup_players.cpp:237
 msgid "Players"
 msgstr "Гравці"
 
-#: src/gui/setup_players.cpp:261
+#: src/gui/setup_players.cpp:262
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:113
+#: src/gui/setup_video.cpp:134
 msgid "Tiny"
 msgstr "Крихітний"
 
-#: src/gui/setup_video.cpp:114
+#: src/gui/setup_video.cpp:135
 msgid "Small"
 msgstr "Малий"
 
-#: src/gui/setup_video.cpp:115
+#: src/gui/setup_video.cpp:136
 msgid "Medium"
 msgstr "Середній"
 
-#: src/gui/setup_video.cpp:116
+#: src/gui/setup_video.cpp:137
 msgid "Large"
 msgstr "Великий"
 
-#: src/gui/setup_video.cpp:142
+#: src/gui/setup_video.cpp:163
 msgid "No text"
 msgstr "Без тексту"
 
-#: src/gui/setup_video.cpp:144
+#: src/gui/setup_video.cpp:164
+msgid "Text"
+msgstr "Текст"
+
+#: src/gui/setup_video.cpp:165
 msgid "Bubbles, no names"
 msgstr "Лише бульбашки, без імен"
 
-#: src/gui/setup_video.cpp:145
+#: src/gui/setup_video.cpp:166
 msgid "Bubbles with names"
 msgstr "Бульбашки та імена"
 
-#: src/gui/setup_video.cpp:157
+#: src/gui/setup_video.cpp:178
 msgid "off"
 msgstr "вимкнено"
 
-#: src/gui/setup_video.cpp:158 src/gui/setup_video.cpp:171
+#: src/gui/setup_video.cpp:179 src/gui/setup_video.cpp:192
 msgid "low"
 msgstr "низький"
 
-#: src/gui/setup_video.cpp:159 src/gui/setup_video.cpp:173
+#: src/gui/setup_video.cpp:180 src/gui/setup_video.cpp:194
 msgid "high"
 msgstr "високий"
 
-#: src/gui/setup_video.cpp:172
+#: src/gui/setup_video.cpp:193
 msgid "medium"
 msgstr "середній"
 
-#: src/gui/setup_video.cpp:174
+#: src/gui/setup_video.cpp:195
 msgid "max"
 msgstr "максимальний"
 
-#: src/gui/setup_video.cpp:196
+#: src/gui/setup_video.cpp:217
 msgid "Full screen"
 msgstr "На повний екран"
 
-#: src/gui/setup_video.cpp:197
+#: src/gui/setup_video.cpp:218
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:198
+#: src/gui/setup_video.cpp:219
 msgid "Custom cursor"
 msgstr "Красивий вказівник"
 
-#: src/gui/setup_video.cpp:200
+#: src/gui/setup_video.cpp:221
 msgid "Visible names"
 msgstr "Видимі імена"
 
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:223
 msgid "Particle effects"
 msgstr "Ефекти частинок"
 
-#: src/gui/setup_video.cpp:204
+#: src/gui/setup_video.cpp:225
 #, fuzzy
 msgid "Show own name"
 msgstr "Показувати ім'я"
 
-#: src/gui/setup_video.cpp:205
+#: src/gui/setup_video.cpp:226
+msgid "Log NPC dialogue"
+msgstr ""
+
+#: src/gui/setup_video.cpp:227
 msgid "Show pickup notification"
 msgstr "Повідомляти, коли піднято предмет"
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:207
+#. TRANSLATORS: Refers to "Show pickup notification"
+#: src/gui/setup_video.cpp:229
 msgid "in chat"
 msgstr "у балачці"
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:209
+#. TRANSLATORS: Refers to "Show pickup notification"
+#: src/gui/setup_video.cpp:231
 msgid "as particle"
 msgstr "як частинки"
 
-#: src/gui/setup_video.cpp:214
+#: src/gui/setup_video.cpp:236
 #, fuzzy
 msgid "FPS limit:"
 msgstr "Обмеження частоти кадрів"
 
-#: src/gui/setup_video.cpp:225
+#: src/gui/setup_video.cpp:247
+msgid "Disable transparency (Low CPU mode)"
+msgstr ""
+
+#: src/gui/setup_video.cpp:250
 msgid "Video"
 msgstr "Відео"
 
-#: src/gui/setup_video.cpp:227
+#: src/gui/setup_video.cpp:252
 #, fuzzy
-msgid "Show monster damage"
+msgid "Show damage"
 msgstr "Показувати ім'я"
 
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:258
 msgid "Overhead text"
 msgstr "Текст зверху"
 
-#: src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:259
 msgid "Gui opacity"
 msgstr "Прозорість інтерфейсу"
 
-#: src/gui/setup_video.cpp:235
+#: src/gui/setup_video.cpp:260
 msgid "Ambient FX"
 msgstr "Звуки оточення"
 
-#: src/gui/setup_video.cpp:236
+#: src/gui/setup_video.cpp:261
 #, fuzzy
 msgid "Particle detail"
 msgstr "Деталізація ефектів частинок"
 
-#: src/gui/setup_video.cpp:237
+#: src/gui/setup_video.cpp:262
 msgid "Font size"
 msgstr "Розмір шрифта"
 
-#: src/gui/setup_video.cpp:251 src/gui/setup_video.cpp:454
-#: src/gui/setup_video.cpp:568
+#: src/gui/setup_video.cpp:277 src/gui/setup_video.cpp:532
+#: src/gui/setup_video.cpp:662
 #, fuzzy
 msgid "None"
 msgstr "Ні"
 
-#: src/gui/setup_video.cpp:381
+#: src/gui/setup_video.cpp:426
 #, fuzzy
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr "Невдалося встановити режим і відновити попередній!"
 
-#: src/gui/setup_video.cpp:387
+#: src/gui/setup_video.cpp:432
 #, fuzzy
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr "Невдалося встановити режим і відновити попередній!"
 
-#: src/gui/setup_video.cpp:398
+#: src/gui/setup_video.cpp:443
 #, fuzzy
 msgid "Switching to Full Screen"
 msgstr "Перемикання на повний екран"
 
-#: src/gui/setup_video.cpp:399
+#: src/gui/setup_video.cpp:444
 msgid "Restart needed for changes to take effect."
 msgstr "Потрібно перезапустити для застосування змін"
 
-#: src/gui/setup_video.cpp:411
+#: src/gui/setup_video.cpp:458
 #, fuzzy
 msgid "Changing to OpenGL"
 msgstr "Перемикання OpenGL"
 
-#: src/gui/setup_video.cpp:412
+#: src/gui/setup_video.cpp:459
+msgid ""
+"Applying change to OpenGL requires restart. In case OpenGL messes up your "
+"game graphics, restart the game with the command line option \"--no-opengl\"."
+msgstr ""
+
+#: src/gui/setup_video.cpp:466
+msgid "Deactivating OpenGL"
+msgstr ""
+
+#: src/gui/setup_video.cpp:467
 msgid "Applying change to OpenGL requires restart."
 msgstr "Потрібно перезапустити для застосування змін OpenGL"
 
-#: src/gui/setup_video.cpp:486 src/gui/setup_video.cpp:491
+#: src/gui/setup_video.cpp:475
+msgid "Transparency disabled"
+msgstr ""
+
+#: src/gui/setup_video.cpp:476 src/gui/setup_video.cpp:484
+msgid "You must restart to apply changes."
+msgstr ""
+
+#: src/gui/setup_video.cpp:483
+msgid "Transparency enabled"
+msgstr ""
+
+#: src/gui/setup_video.cpp:576 src/gui/setup_video.cpp:581
 #, fuzzy
 msgid "Screen Resolution Changed"
 msgstr "Розподільчу здатність встановлено"
 
-#: src/gui/setup_video.cpp:487 src/gui/setup_video.cpp:492
+#: src/gui/setup_video.cpp:577 src/gui/setup_video.cpp:582
 msgid "Restart your client for the change to take effect."
 msgstr "Перезавантажте клієнт, щоби застосувати зміни"
 
-#: src/gui/setup_video.cpp:489
+#: src/gui/setup_video.cpp:579
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:522
+#: src/gui/setup_video.cpp:612
 #, fuzzy
 msgid "Particle Effect Settings Changed."
 msgstr "Налаштування ефектів частинок застосовано"
 
-#: src/gui/setup_video.cpp:523
+#: src/gui/setup_video.cpp:613
 msgid "Changes will take effect on map change."
 msgstr "Зміни буде застосовано після завантаження мапи"
 
-#: src/gui/skilldialog.cpp:197 src/gui/windowmenu.cpp:58
+#: src/gui/skilldialog.cpp:212 src/gui/windowmenu.cpp:59
 msgid "Skills"
 msgstr "Навички"
 
-#: src/gui/skilldialog.cpp:208
+#: src/gui/skilldialog.cpp:223
 msgid "Up"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:262
+#: src/gui/skilldialog.cpp:269
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:314
+#: src/gui/skilldialog.cpp:351
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:323
+#: src/gui/skilldialog.cpp:360
 #, fuzzy, c-format
 msgid "Skill %d"
 msgstr "Навички"
 
-#: src/gui/skilldialog.cpp:405
+#: src/gui/skilldialog.cpp:442
 #, fuzzy, c-format
 msgid "Lvl: %d (%+d)"
 msgstr "Рівень: %d"
 
-#: src/gui/skilldialog.cpp:416
+#: src/gui/skilldialog.cpp:453
 #, fuzzy, c-format
 msgid "Lvl: %d"
 msgstr "Рівень: %d"
 
-#: src/gui/socialwindow.cpp:117
+#: src/gui/socialwindow.cpp:126
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:126
+#: src/gui/socialwindow.cpp:139
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:136
+#: src/gui/socialwindow.cpp:153
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:137
+#: src/gui/socialwindow.cpp:154
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:146
+#: src/gui/socialwindow.cpp:163
 #, fuzzy
 msgid "Leave Guild?"
 msgstr "Створити гільдію"
 
-#: src/gui/socialwindow.cpp:147
+#: src/gui/socialwindow.cpp:164
 #, fuzzy, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Ви дійсно хочете вийти?"
 
-#: src/gui/socialwindow.cpp:182
+#: src/gui/socialwindow.cpp:207 src/net/tmwa/partyhandler.cpp:330
 #, fuzzy, c-format
 msgid "Invited user %s to party."
 msgstr "/party > Запросити гравця до групи"
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:218
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:199
+#: src/gui/socialwindow.cpp:232
 #, fuzzy
 msgid "Member Invite to Party"
 msgstr "/party > Запросити гравця до групи"
 
-#: src/gui/socialwindow.cpp:200
+#: src/gui/socialwindow.cpp:233
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:209
+#: src/gui/socialwindow.cpp:242
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:210
+#: src/gui/socialwindow.cpp:243
 #, fuzzy, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Ви дійсно хочете вийти?"
 
-#: src/gui/socialwindow.cpp:239
+#: src/gui/socialwindow.cpp:272
 msgid "Create Guild"
 msgstr "Створити гільдію"
 
-#: src/gui/socialwindow.cpp:240 src/gui/socialwindow.cpp:564
+#: src/gui/socialwindow.cpp:273 src/gui/socialwindow.cpp:620
 #, fuzzy
 msgid "Create Party"
 msgstr "Створити персонажа"
 
-#: src/gui/socialwindow.cpp:279 src/gui/windowmenu.cpp:60
+#: src/gui/socialwindow.cpp:312 src/gui/windowmenu.cpp:64
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:297
+#: src/gui/socialwindow.cpp:330
 #, fuzzy
 msgid "Invite"
 msgstr "Запросити гравця"
 
-#: src/gui/socialwindow.cpp:298
+#: src/gui/socialwindow.cpp:331
 #, fuzzy
 msgid "Leave"
 msgstr "Великий"
 
-#: src/gui/socialwindow.cpp:394
+#: src/gui/socialwindow.cpp:443
 #, fuzzy, c-format
 msgid "Accepted party invite from %s."
 msgstr "Прийнято запрошення від %s."
 
-#: src/gui/socialwindow.cpp:400
+#: src/gui/socialwindow.cpp:449
 #, fuzzy, c-format
 msgid "Rejected party invite from %s."
 msgstr "Відхилено запрошення від %s."
 
-#: src/gui/socialwindow.cpp:413
+#: src/gui/socialwindow.cpp:462
 #, fuzzy, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Прийнято запрошення від %s."
 
-#: src/gui/socialwindow.cpp:419
+#: src/gui/socialwindow.cpp:468
 #, fuzzy, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Відхилено запрошення від %s."
 
-#: src/gui/socialwindow.cpp:463
+#: src/gui/socialwindow.cpp:497
+msgid "Creating guild failed, please choose a shorter name."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:504
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:477
+#: src/gui/socialwindow.cpp:520
+msgid "Creating party failed, please choose a shorter name."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:527
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:484
+#: src/gui/socialwindow.cpp:541
 #, fuzzy
 msgid "Guild Name"
 msgstr "Гільдія"
 
-#: src/gui/socialwindow.cpp:485
+#: src/gui/socialwindow.cpp:542
 #, fuzzy
 msgid "Choose your guild's name."
 msgstr "Оберіть сервер"
 
-#: src/gui/socialwindow.cpp:497
+#: src/gui/socialwindow.cpp:554
 #, fuzzy
 msgid "Received guild request, but one already exists."
 msgstr "Отримано запрошення до групи, але одне вже є."
 
-#: src/gui/socialwindow.cpp:502
+#: src/gui/socialwindow.cpp:559
 #, fuzzy, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s запрошує вас до групи %s."
 
-#: src/gui/socialwindow.cpp:507
+#: src/gui/socialwindow.cpp:564
 #, fuzzy
 msgid "Accept Guild Invite"
 msgstr "Запрошення до групи прийнято"
 
-#: src/gui/socialwindow.cpp:519
+#: src/gui/socialwindow.cpp:576
 msgid "Received party request, but one already exists."
 msgstr "Отримано запрошення до групи, але одне вже є."
 
-#: src/gui/socialwindow.cpp:529
+#: src/gui/socialwindow.cpp:585
 #, fuzzy
 msgid "You have been invited you to join a party."
 msgstr "%s запрошує вас приєднатись до їх групи."
 
-#: src/gui/socialwindow.cpp:533
+#: src/gui/socialwindow.cpp:589
 #, fuzzy, c-format
 msgid "You have been invited to join the %s party."
 msgstr "%s запрошує вас до групи %s."
 
-#: src/gui/socialwindow.cpp:541
+#: src/gui/socialwindow.cpp:597
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s запрошує вас приєднатись до їх групи."
 
-#: src/gui/socialwindow.cpp:546
+#: src/gui/socialwindow.cpp:602
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s запрошує вас до групи %s."
 
-#: src/gui/socialwindow.cpp:554
+#: src/gui/socialwindow.cpp:610
 msgid "Accept Party Invite"
 msgstr "Запрошення до групи прийнято"
 
-#: src/gui/socialwindow.cpp:565
+#: src/gui/socialwindow.cpp:621
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:570
+#: src/gui/socialwindow.cpp:626
 #, fuzzy
 msgid "Party Name"
 msgstr "Група"
 
-#: src/gui/socialwindow.cpp:571
+#: src/gui/socialwindow.cpp:627
 #, fuzzy
 msgid "Choose your party's name."
 msgstr "Оберіть сервер"
 
-#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:59
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:62
 msgid "Specials"
 msgstr ""
 
-#: src/gui/specialswindow.cpp:174
-#, c-format
-msgid "Specials Set %d"
-msgstr ""
-
-#: src/gui/specialswindow.cpp:191
-#, c-format
-msgid "Special %d"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:99 src/gui/statuswindow.cpp:247
+#: src/gui/statuswindow.cpp:113 src/gui/statuswindow.cpp:215
+#: src/gui/statuswindow.cpp:262
 #, c-format
 msgid "Level: %d"
 msgstr "Рівень: %d"
 
-#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:211
+#: src/gui/statuswindow.cpp:114 src/gui/statuswindow.cpp:208
+#: src/gui/statuswindow.cpp:239
 #, c-format
 msgid "Money: %s"
 msgstr "Кошти: %s"
 
-#: src/gui/statuswindow.cpp:102
+#: src/gui/statuswindow.cpp:117
 msgid "HP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:107
+#: src/gui/statuswindow.cpp:122
 msgid "Exp:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:112
+#: src/gui/statuswindow.cpp:130
 msgid "MP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:132 src/gui/statuswindow.cpp:219
+#: src/gui/statuswindow.cpp:158 src/gui/statuswindow.cpp:275
 #, c-format
 msgid "Job: %d"
 msgstr "Професія: %d"
 
-#: src/gui/statuswindow.cpp:133
+#: src/gui/statuswindow.cpp:159
 msgid "Job:"
 msgstr "Професія:"
 
-#: src/gui/statuswindow.cpp:194
-msgid "HP"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:200
-msgid "MP"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:206
-msgid "Exp"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:215
-#, fuzzy
-msgid "Money"
-msgstr "Кошти: %d"
-
-#: src/gui/statuswindow.cpp:225
-#, fuzzy
-msgid "Job"
-msgstr "Професія:"
-
-#: src/gui/statuswindow.cpp:229
+#: src/gui/statuswindow.cpp:211 src/gui/statuswindow.cpp:247
 #, fuzzy, c-format
 msgid "Character points: %d"
 msgstr "Характеристики персонажа в нормі"
 
-#: src/gui/statuswindow.cpp:235
+#: src/gui/statuswindow.cpp:255
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:251
-#, fuzzy
-msgid "Level"
-msgstr "Рівень: %d"
-
-#: src/gui/storagewindow.cpp:58
-msgid "Storage"
-msgstr ""
-
-#: src/gui/trade.cpp:52
+#: src/gui/trade.cpp:53
 msgid "Propose trade"
 msgstr "Запропонувати торгівлю"
 
-#: src/gui/trade.cpp:53
+#: src/gui/trade.cpp:54
 msgid "Confirmed. Waiting..."
 msgstr "Прийнято. Чекаємо..."
 
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:55
 msgid "Agree trade"
 msgstr "Згодитися торгувати"
 
-#: src/gui/trade.cpp:55
+#: src/gui/trade.cpp:56
 msgid "Agreed. Waiting..."
 msgstr "Згода. Чекаємо..."
 
-#: src/gui/trade.cpp:58
+#: src/gui/trade.cpp:59
 msgid "Trade: You"
 msgstr "Торгівля: ти"
 
-#: src/gui/trade.cpp:74 src/gui/trade.cpp:75
+#: src/gui/trade.cpp:73 src/gui/trade.cpp:74
 msgid "Trade"
 msgstr "Обмінятися"
 
-#: src/gui/trade.cpp:77
+#: src/gui/trade.cpp:76
 msgid "Add"
 msgstr "Додати"
 
-#: src/gui/trade.cpp:99 src/gui/trade.cpp:135
+#: src/gui/trade.cpp:98 src/gui/trade.cpp:134
 #, fuzzy, c-format
 msgid "You get %s"
 msgstr "Ти отримуєш: %s."
 
-#: src/gui/trade.cpp:100
+#: src/gui/trade.cpp:99
 msgid "You give:"
 msgstr "Ти віддаєш: %s."
 
-#: src/gui/trade.cpp:104
+#: src/gui/trade.cpp:103
 msgid "Change"
 msgstr "Заміна"
 
-#: src/gui/trade.cpp:275
+#: src/gui/trade.cpp:262
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr "Не вдається додати предмет. Не можна накладати предмети одного типу."
 
-#: src/gui/trade.cpp:318
+#: src/gui/trade.cpp:304
 msgid "You don't have enough money."
 msgstr "У тебе недостатньо грошей!"
 
@@ -2140,22 +1983,22 @@ msgstr "З'єднуюсь..."
 msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:405
+#: src/gui/updatewindow.cpp:417
 msgid "##1  The update process is incomplete."
 msgstr "##1 Процес поновлення не завершився!"
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:407
+#: src/gui/updatewindow.cpp:419
 msgid "##1  It is strongly recommended that"
 msgstr "##1 Настійно рекомендовано:"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:409
+#: src/gui/updatewindow.cpp:421
 #, fuzzy
 msgid "##1  you try again later."
 msgstr "##1 спробувати ще раз пізніше"
 
-#: src/gui/updatewindow.cpp:501
+#: src/gui/updatewindow.cpp:515
 msgid "Completed"
 msgstr "Закінчено"
 
@@ -2238,65 +2081,65 @@ msgstr "Потрібно вказати користувача для призн
 msgid "Need a user to kick!"
 msgstr "Потрібно вказати користувача для вигнання з каналу"
 
-#: src/gui/widgets/chattab.cpp:118
+#: src/gui/widgets/chattab.cpp:121
 msgid "Global announcement:"
 msgstr "Глобальне повідомлення:"
 
-#: src/gui/widgets/chattab.cpp:124
+#: src/gui/widgets/chattab.cpp:127
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "Глобальне повідомлення від %s:"
 
-#: src/gui/widgets/chattab.cpp:150
+#: src/gui/widgets/chattab.cpp:153
 #, fuzzy, c-format
 msgid "%s whispers: %s"
 msgstr "%s шепоче: "
 
-#: src/gui/widgets/whispertab.cpp:51
+#: src/gui/widgets/whispertab.cpp:53
 msgid "Cannot send empty chat!"
 msgstr "Чи ж можна говорити без слів?"
 
-#: src/gui/widgets/whispertab.cpp:70
+#: src/gui/widgets/whispertab.cpp:72
 msgid "/ignore > Ignore the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:71
+#: src/gui/widgets/whispertab.cpp:73
 msgid "/unignore > Stop ignoring the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:72
+#: src/gui/widgets/whispertab.cpp:74
 msgid "/close > Close the whisper tab"
 msgstr "Закрити вкладку приватної бесіди"
 
-#: src/gui/widgets/whispertab.cpp:82
+#: src/gui/widgets/whispertab.cpp:84
 msgid "Command: /close"
 msgstr "Команда: /close"
 
-#: src/gui/widgets/whispertab.cpp:83
+#: src/gui/widgets/whispertab.cpp:85
 msgid "This command closes the current whisper tab."
 msgstr "Ця команда закриває вкладку приватної бесіди"
 
-#: src/gui/widgets/whispertab.cpp:87
+#: src/gui/widgets/whispertab.cpp:89
 #, fuzzy
 msgid "Command: /ignore"
 msgstr "Команда: /where"
 
-#: src/gui/widgets/whispertab.cpp:88
+#: src/gui/widgets/whispertab.cpp:90
 #, fuzzy
 msgid "This command ignores the other player regardless of current relations."
 msgstr "Відображає кількість гравців он-лайн"
 
-#: src/gui/widgets/whispertab.cpp:94
+#: src/gui/widgets/whispertab.cpp:96
 #, fuzzy
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 "Ця команда вмикає ведення журналу чату (записує весь вміст чату у <_файл_>)"
 
-#: src/gui/windowmenu.cpp:55
+#: src/gui/windowmenu.cpp:54
 msgid "Status"
 msgstr "Стан"
 
-#: src/gui/windowmenu.cpp:61
+#: src/gui/windowmenu.cpp:65
 msgid "Shortcut"
 msgstr ""
 
@@ -2315,1392 +2158,1565 @@ msgstr "Заміна"
 msgid "Choose World"
 msgstr "Оберіть сервер"
 
-#: src/keyboardconfig.cpp:40
+#: src/keyboardconfig.cpp:39
 msgid "Move Up"
 msgstr "Підняти"
 
-#: src/keyboardconfig.cpp:41
+#: src/keyboardconfig.cpp:40
 msgid "Move Down"
 msgstr "Опустити"
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:41
 msgid "Move Left"
 msgstr "Пересунути вліво"
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:42
 msgid "Move Right"
 msgstr "Пересунути вправо"
 
-#: src/keyboardconfig.cpp:44 src/net/ea/generalhandler.cpp:223
+#: src/keyboardconfig.cpp:43 src/net/tmwa/generalhandler.cpp:237
 msgid "Attack"
 msgstr "Нападати"
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:44
 msgid "Target & Attack"
 msgstr "Вибрати ціль і нападати"
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:45
 msgid "Smilie"
 msgstr "Емоція"
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:46
 msgid "Talk"
 msgstr "Розмовляти"
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:47
 msgid "Stop Attack"
 msgstr "Зупинити напад"
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:48
 #, fuzzy
 msgid "Target Monster"
 msgstr "Вибрати найближчу ціль"
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboardconfig.cpp:49
 msgid "Target NPC"
 msgstr "Вибрати комп'ютерного персонажа"
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:50
 msgid "Target Player"
 msgstr "Вибрати ігрока"
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:51
 msgid "Pickup"
 msgstr "Підняти"
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:52
 msgid "Hide Windows"
 msgstr "Сховати вікна"
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:53
 msgid "Sit"
 msgstr "Присісти й відпочити"
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:54
 msgid "Screenshot"
 msgstr "Знімок екрану"
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:55
 msgid "Enable/Disable Trading"
 msgstr "Дозволити/заборонити торгівлю"
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:56
 msgid "Find Path to Mouse"
 msgstr "Прямувати до вказівника миші"
 
-#: src/keyboardconfig.cpp:58 src/keyboardconfig.cpp:59
-#: src/keyboardconfig.cpp:60 src/keyboardconfig.cpp:61
-#: src/keyboardconfig.cpp:62 src/keyboardconfig.cpp:63
-#: src/keyboardconfig.cpp:64 src/keyboardconfig.cpp:65
-#: src/keyboardconfig.cpp:66 src/keyboardconfig.cpp:67
-#: src/keyboardconfig.cpp:68 src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:57 src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60
+#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62
+#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64
+#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68
 #, c-format
 msgid "Item Shortcut %d"
 msgstr "Скорочений доступ %d"
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:69
 msgid "Help Window"
 msgstr "Вікно підказки"
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:70
 msgid "Status Window"
 msgstr "Вікно стану"
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:71
 msgid "Inventory Window"
 msgstr "Вікно майна"
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:72
 msgid "Equipment Window"
 msgstr "Вікно екіпіровки"
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:73
 msgid "Skill Window"
 msgstr "Вікно навичок"
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:74
 msgid "Minimap Window"
 msgstr "Вікно мінімапи"
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:75
 msgid "Chat Window"
 msgstr "Вікно балачки"
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:76
 msgid "Item Shortcut Window"
 msgstr "Вікно скороченого доступу"
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:77
 msgid "Setup Window"
 msgstr "Вікно налаштувань"
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:78
 msgid "Debug Window"
 msgstr "Вікно зневаждення"
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:79
 #, fuzzy
 msgid "Social Window"
 msgstr "Вікно навичок"
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:80
 msgid "Emote Shortcut Window"
 msgstr "Вікно емоцій"
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:81
 #, fuzzy
 msgid "Outfits Window"
 msgstr "Вікно стану"
 
-#: src/keyboardconfig.cpp:83
+#: src/keyboardconfig.cpp:82
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:83
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86
-#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88
-#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90
-#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92
-#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:84 src/keyboardconfig.cpp:85
+#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:87
+#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:89
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:91
+#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:93
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:95
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:96
 msgid "Toggle Chat"
 msgstr "Перейти до балачки"
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:97
 msgid "Scroll Chat Up"
 msgstr "Гортати балачку вище"
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:98
 msgid "Scroll Chat Down"
 msgstr "Гортати балачку нижче"
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:99
 msgid "Previous Chat Tab"
 msgstr "Попередня вкладка балачки"
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:100
 msgid "Next Chat Tab"
 msgstr "Наступна вкладка балачки"
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:101
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:103
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:105
+#: src/keyboardconfig.cpp:104
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:178
+#: src/keyboardconfig.cpp:183
 #, fuzzy, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr "Необхідно усунути повтори, інакше керування може бути ускладненим"
 
-#: src/localplayer.cpp:913
+#: src/localplayer.cpp:985
 msgid "Unable to pick up item."
 msgstr ""
 
 #. TRANSLATORS: This sentence may be translated differently
 #. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:922
+#: src/localplayer.cpp:994
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/main.cpp:43
+#: src/main.cpp:42
 msgid "mana [options] [mana-file]"
 msgstr ""
 
+#: src/main.cpp:43
+msgid "[mana-file] : The mana file is an XML file (.mana)"
+msgstr ""
+
 #: src/main.cpp:44
+msgid "              used to set custom parameters"
+msgstr ""
+
+#: src/main.cpp:45
+msgid "              to the mana client."
+msgstr ""
+
+#: src/main.cpp:47
 msgid "Options:"
 msgstr "Параметри:"
 
-#: src/main.cpp:45
+#: src/main.cpp:48
 #, fuzzy
 msgid "  -v --version        : Display the version"
 msgstr "  -h --help : показати ще раз цю довідку"
 
-#: src/main.cpp:46
+#: src/main.cpp:49
 #, fuzzy
 msgid "  -h --help           : Display this help"
 msgstr "  -h --help : показати ще раз цю довідку"
 
-#: src/main.cpp:47
+#: src/main.cpp:50
 #, fuzzy
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr "  -C --config-file : файл, з якого необхідно завантажити налаштування"
 
-#: src/main.cpp:48
+#: src/main.cpp:51
 #, fuzzy
 msgid "  -U --username       : Login with this username"
 msgstr "  -P --password : зареєструватися на сервері зі вказаним паролем"
 
-#: src/main.cpp:49
+#: src/main.cpp:52
 #, fuzzy
 msgid "  -P --password       : Login with this password"
 msgstr "  -P --password : зареєструватися на сервері зі вказаним паролем"
 
-#: src/main.cpp:50
+#: src/main.cpp:53
 #, fuzzy
 msgid "  -c --character      : Login with this character"
 msgstr "  -P --password : зареєструватися на сервері зі вказаним паролем"
 
-#: src/main.cpp:51
+#: src/main.cpp:54
 msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:52
+#: src/main.cpp:55
 #, fuzzy
 msgid "  -p --port           : Login server port"
 msgstr "  -P --password : зареєструватися на сервері зі вказаним паролем"
 
-#: src/main.cpp:53
+#: src/main.cpp:56
 #, fuzzy
 msgid "     --update-host    : Use this update host"
 msgstr "  -H --update-host : сервер, з якого необхідно завантажити оновлення"
 
-#: src/main.cpp:54
+#: src/main.cpp:57
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:56
+#: src/main.cpp:59
 #, fuzzy
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr "  -H --update-host : сервер, з якого необхідно завантажити оновлення"
 
-#: src/main.cpp:57
+#: src/main.cpp:60
 #, fuzzy
 msgid "  -d --data           : Directory to load game data from"
 msgstr "  -d --data : тека, з якої необхідно завантажити данні"
 
-#: src/main.cpp:58
+#: src/main.cpp:61
 #, fuzzy
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
+msgid "     --localdata-dir  : Directory to use as local data directory"
 msgstr "  -S --home-dir : тека, котру необхідно вживати як домашню"
 
-#: src/main.cpp:59
+#: src/main.cpp:62
+#, fuzzy
+msgid "     --chat-log-dir   : Chat log dir to use"
+msgstr "  -C --config-file : файл, з якого необхідно завантажити налаштування"
+
+#: src/main.cpp:63
 #, fuzzy
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr "  -S --home-dir : тека, котру необхідно вживати як домашню"
 
-#: src/main.cpp:61
+#: src/main.cpp:65
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:63
+#: src/net/manaserv/beinghandler.cpp:303 src/net/tmwa/playerhandler.cpp:94
+msgid "You are dead."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:304 src/net/tmwa/playerhandler.cpp:95
+msgid "We regret to inform you that your character was killed in battle."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:306 src/net/tmwa/playerhandler.cpp:97
+msgid "You are not that alive anymore."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:307 src/net/tmwa/playerhandler.cpp:98
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:308 src/net/tmwa/playerhandler.cpp:99
+msgid "Game Over!"
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:309 src/net/tmwa/playerhandler.cpp:101
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:311 src/net/tmwa/playerhandler.cpp:103
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:313 src/net/tmwa/playerhandler.cpp:105
+msgid "I guess this did not run too well."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:107
+msgid "Do you want your possessions identified?"
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:109
+msgid "Sadly, no trace of you was ever found..."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:111
+msgid "Annihilated."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:113
+msgid "Looks like you got your head handed to you."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:115
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:323
+msgid "Press OK to respawn."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:324
+#, fuzzy
+msgid "You Died"
+msgstr "Ти віддаєш: %s."
+
+#: src/net/manaserv/charhandler.cpp:138 src/net/manaserv/charhandler.cpp:209
+msgid "Not logged in."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:141
+msgid "No empty slot."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:144
+msgid "Invalid name."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:147
+#, fuzzy
+msgid "Character's name already exists."
+msgstr "Отримано запрошення до групи, але одне вже є."
+
+#: src/net/manaserv/charhandler.cpp:150
+msgid "Invalid hairstyle."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:153
+msgid "Invalid hair color."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:156
+msgid "Invalid gender."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:159
+#, fuzzy
+msgid "Character's stats are too high."
+msgstr "Характеристики персонажа в нормі"
+
+#: src/net/manaserv/charhandler.cpp:162
+#, fuzzy
+msgid "Character's stats are too low."
+msgstr "Характеристики персонажа в нормі"
+
+#: src/net/manaserv/charhandler.cpp:165
+#, c-format
+msgid "At least one statis out of the permitted range: (%u - %u)."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:171 src/net/manaserv/loginhandler.cpp:96
+#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
+#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
+#: src/net/tmwa/loginhandler.cpp:95 src/net/tmwa/loginhandler.cpp:182
+#, fuzzy
+msgid "Unknown error."
+msgstr "Чорт зна яка команда"
+
+#: src/net/manaserv/charhandler.cpp:200 src/net/tmwa/charserverhandler.cpp:146
+msgid "Info"
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:200
+msgid "Player deleted."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:212
+#, fuzzy
+msgid "Selection out of range."
+msgstr "Вкажіть кількість предметів"
+
+#: src/net/manaserv/charhandler.cpp:215
+#, fuzzy, c-format
+msgid "Unknown error (%d)."
+msgstr "Чорт зна яка команда"
+
+#: src/net/manaserv/charhandler.cpp:250
+msgid "No gameservers are available."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:187 src/net/manaserv/chathandler.cpp:313
+#: src/net/manaserv/guildhandler.cpp:260
+#, c-format
+msgid "Topic: %s"
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:274
+#, fuzzy
+msgid "Players in this channel:"
+msgstr "Гравець вдарив Тварюку"
+
+#: src/net/manaserv/chathandler.cpp:208
+#, fuzzy
+msgid "Error joining channel."
+msgstr "Команда: /join <_канал_>"
+
+#: src/net/manaserv/chathandler.cpp:214
+#, fuzzy
+msgid "Listing channels."
+msgstr "Вимагається приєднання до каналу %s."
+
+#: src/net/manaserv/chathandler.cpp:226
+msgid "End of channel list."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:303
+#, c-format
+msgid "%s entered the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:308
+#, c-format
+msgid "%s left the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:324
+#, c-format
+msgid "%s has set mode %s on user %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:334
+#, c-format
+msgid "%s has kicked %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:339
+#, fuzzy
+msgid "Unknown channel event."
+msgstr "Чорт зна яка команда"
+
+#: src/net/manaserv/guildhandler.cpp:82
+msgid "Guild created."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:87
+msgid "Error creating guild."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:97
+msgid "Invite sent."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:204
+msgid "Member was promoted successfully."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:209
+msgid "Failed to promote member."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:87
+msgid "Wrong magic_token."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
+#, fuzzy
+msgid "Already logged in."
+msgstr "Вже записується"
+
+#: src/net/manaserv/loginhandler.cpp:93
+#, fuzzy
+msgid "Account banned."
+msgstr "Обліковий запис: %s"
+
+#: src/net/manaserv/loginhandler.cpp:118
+#, fuzzy
+msgid "New password incorrect."
+msgstr "Введіть новий пароль двічі:"
+
+#: src/net/manaserv/loginhandler.cpp:121 src/net/tmwa/loginhandler.cpp:89
+msgid "Old password incorrect."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
+msgid "Account not connected. Please login first."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:149
+#, fuzzy
+msgid "New email address incorrect."
+msgstr "Двічі введіть вашу нову адресу електронної пошти:"
+
+#: src/net/manaserv/loginhandler.cpp:152
+msgid "Old email address incorrect."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:158
+msgid "The new email address already exists."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:239
+msgid ""
+"Client registration is not allowed. Please contact server administration."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
+msgid "Client version is too old."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:266
+msgid "Wrong username or password."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:272
+#, fuzzy
+msgid "Account banned"
+msgstr "Обліковий запис: %s"
+
+#: src/net/manaserv/loginhandler.cpp:275
+msgid "Login attempt too soon after previous attempt."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:303
+msgid "Wrong username, password or email address."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:306
+msgid "Username already exists."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:309
+msgid "Email address already exists."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:312
+msgid "You took too long with the captcha or your response was incorrect."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:87
+msgid "Joined party."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:105
+#, c-format
+msgid "%s joined the party."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:123
+#, fuzzy, c-format
+msgid "%s rejected your invite."
+msgstr "Відхилено запрошення від %s."
+
+#: src/net/manaserv/tradehandler.cpp:95
+msgid "Accepting incoming trade requests."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:97
+msgid "Ignoring incoming trade requests."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:115 src/net/tmwa/tradehandler.cpp:109
+msgid "Request for Trade"
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:116 src/net/tmwa/tradehandler.cpp:110
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:134
+#, c-format
+msgid "Trading with %s"
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:148 src/net/tmwa/tradehandler.cpp:224
+msgid "Trade canceled."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:155 src/net/tmwa/tradehandler.cpp:231
+msgid "Trade completed."
+msgstr ""
+
+#: src/net/tmwa/adminhandler.cpp:64
 msgid "Kick failed!"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:65
+#: src/net/tmwa/adminhandler.cpp:66
 msgid "Kick succeeded!"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:110
+#: src/net/tmwa/buysellhandler.cpp:109
 msgid "Nothing to sell."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:117
+#: src/net/tmwa/buysellhandler.cpp:116
 msgid "Thanks for buying."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:124
+#: src/net/tmwa/buysellhandler.cpp:123
 msgid "Unable to buy."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:130
+#: src/net/tmwa/buysellhandler.cpp:129
 msgid "Thanks for selling."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:132
+#: src/net/tmwa/buysellhandler.cpp:131
 msgid "Unable to sell."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:103
-msgid "Access denied."
+#: src/net/tmwa/charserverhandler.cpp:103
+msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:106
+#: src/net/tmwa/charserverhandler.cpp:107
 #, fuzzy
 msgid "Cannot use this ID."
 msgstr "Не можна надсилати порожні повідомлення!"
 
-#: src/net/ea/charserverhandler.cpp:109
-msgid "Unknown failure to select character."
-msgstr ""
+#: src/net/tmwa/charserverhandler.cpp:110
+#, fuzzy
+msgid "Unknown char-server failure."
+msgstr "Чорт зна яка команда"
 
-#: src/net/ea/charserverhandler.cpp:135
+#: src/net/tmwa/charserverhandler.cpp:134
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:147 src/net/manaserv/charhandler.cpp:187
-msgid "Info"
-msgstr ""
-
-#: src/net/ea/charserverhandler.cpp:147
+#: src/net/tmwa/charserverhandler.cpp:146
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:152
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Failed to delete character."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:237 src/net/manaserv/charhandler.cpp:263
+#: src/net/tmwa/charserverhandler.cpp:266
 msgid "Strength:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:238 src/net/manaserv/charhandler.cpp:264
+#: src/net/tmwa/charserverhandler.cpp:267
 msgid "Agility:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:239 src/net/manaserv/charhandler.cpp:266
+#: src/net/tmwa/charserverhandler.cpp:268
 msgid "Vitality:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:240 src/net/manaserv/charhandler.cpp:267
+#: src/net/tmwa/charserverhandler.cpp:269
 msgid "Intelligence:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:241 src/net/manaserv/charhandler.cpp:265
+#: src/net/tmwa/charserverhandler.cpp:270
 msgid "Dexterity:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:242
+#: src/net/tmwa/charserverhandler.cpp:271
 msgid "Luck:"
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:80
-msgid "Whisper could not be sent, user is offline."
+#: src/net/tmwa/chathandler.cpp:87
+#, c-format
+msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:84
-msgid "Whisper could not be sent, ignored by user."
+#: src/net/tmwa/chathandler.cpp:96
+#, c-format
+msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:171
+#: src/net/tmwa/chathandler.cpp:230
 #, fuzzy
 msgid "MVP player."
 msgstr "Гравець"
 
-#: src/net/ea/chathandler.cpp:204 src/net/ea/chathandler.cpp:210
-#: src/net/ea/chathandler.cpp:215 src/net/ea/chathandler.cpp:220
-#: src/net/ea/chathandler.cpp:225 src/net/ea/chathandler.cpp:230
-#: src/net/ea/chathandler.cpp:235 src/net/ea/chathandler.cpp:240
+#: src/net/tmwa/chathandler.cpp:265 src/net/tmwa/chathandler.cpp:271
+#: src/net/tmwa/chathandler.cpp:276 src/net/tmwa/chathandler.cpp:281
+#: src/net/tmwa/chathandler.cpp:286 src/net/tmwa/chathandler.cpp:291
+#: src/net/tmwa/chathandler.cpp:296 src/net/tmwa/chathandler.cpp:301
 msgid "Channels are not supported!"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:86
+#: src/net/tmwa/gamehandler.cpp:88
 #, c-format
 msgid "Online users: %d"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:100
+#: src/net/tmwa/gamehandler.cpp:101
 #, fuzzy
 msgid "Game"
 msgstr "Назва"
 
-#: src/net/ea/gamehandler.cpp:100
+#: src/net/tmwa/gamehandler.cpp:101
 msgid "Request to quit denied!"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:102 src/net/manaserv/generalhandler.cpp:95
+#: src/net/tmwa/generalhandler.cpp:102
 #, c-format
 msgid "Strength %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:103 src/net/manaserv/generalhandler.cpp:96
+#: src/net/tmwa/generalhandler.cpp:103
 #, c-format
 msgid "Agility %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:104 src/net/manaserv/generalhandler.cpp:98
+#: src/net/tmwa/generalhandler.cpp:104
 #, c-format
 msgid "Vitality %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:105 src/net/manaserv/generalhandler.cpp:99
+#: src/net/tmwa/generalhandler.cpp:105
 #, c-format
 msgid "Intelligence %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:106 src/net/manaserv/generalhandler.cpp:97
+#: src/net/tmwa/generalhandler.cpp:106
 #, c-format
 msgid "Dexterity %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:107
+#: src/net/tmwa/generalhandler.cpp:107
 #, c-format
 msgid "Luck %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:130
+#: src/net/tmwa/generalhandler.cpp:132
 msgid "Authentication failed."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:133
+#: src/net/tmwa/generalhandler.cpp:135
 msgid "No servers available."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:137
+#: src/net/tmwa/generalhandler.cpp:139
 msgid "Someone else is trying to use this account."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:140
+#: src/net/tmwa/generalhandler.cpp:142
 msgid "This account is already logged in."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:143
+#: src/net/tmwa/generalhandler.cpp:145
 msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:146
+#: src/net/tmwa/generalhandler.cpp:148
 msgid "Duplicated login."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:149
+#: src/net/tmwa/generalhandler.cpp:151
 msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:205
+#: src/net/tmwa/generalhandler.cpp:209
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:216 src/net/manaserv/generalhandler.cpp:166
+#: src/net/tmwa/generalhandler.cpp:230
 msgid "Strength"
 msgstr "Сила"
 
-#: src/net/ea/generalhandler.cpp:217 src/net/manaserv/generalhandler.cpp:167
+#: src/net/tmwa/generalhandler.cpp:231
 msgid "Agility"
 msgstr "Спритність"
 
-#: src/net/ea/generalhandler.cpp:218 src/net/manaserv/generalhandler.cpp:169
+#: src/net/tmwa/generalhandler.cpp:232
 msgid "Vitality"
 msgstr "Витривалість"
 
-#: src/net/ea/generalhandler.cpp:219 src/net/manaserv/generalhandler.cpp:170
+#: src/net/tmwa/generalhandler.cpp:233
 msgid "Intelligence"
 msgstr "Інтелект"
 
-#: src/net/ea/generalhandler.cpp:220 src/net/manaserv/generalhandler.cpp:168
+#: src/net/tmwa/generalhandler.cpp:234
 msgid "Dexterity"
 msgstr "Вправність"
 
-#: src/net/ea/generalhandler.cpp:221
+#: src/net/tmwa/generalhandler.cpp:235
 msgid "Luck"
 msgstr "Талан"
 
-#: src/net/ea/generalhandler.cpp:224
+#: src/net/tmwa/generalhandler.cpp:238
 #, fuzzy
 msgid "Defense"
 msgstr "Захист:"
 
-#: src/net/ea/generalhandler.cpp:225
+#: src/net/tmwa/generalhandler.cpp:239
 #, fuzzy
 msgid "M.Attack"
 msgstr "Маг. напад:"
 
-#: src/net/ea/generalhandler.cpp:226
+#: src/net/tmwa/generalhandler.cpp:240
 #, fuzzy
 msgid "M.Defense"
 msgstr "Маг. захист:"
 
-#: src/net/ea/generalhandler.cpp:227
+#: src/net/tmwa/generalhandler.cpp:241
 #, fuzzy, c-format
 msgid "% Accuracy"
 msgstr "Точність (%):"
 
-#: src/net/ea/generalhandler.cpp:228
+#: src/net/tmwa/generalhandler.cpp:242
 #, fuzzy, c-format
 msgid "% Evade"
 msgstr "Ухиляння (%):"
 
-#: src/net/ea/generalhandler.cpp:229
+#: src/net/tmwa/generalhandler.cpp:243
 #, fuzzy, c-format
 msgid "% Critical"
 msgstr "Критичний удар"
 
-#: src/net/ea/gui/guildtab.cpp:61 src/net/ea/gui/partytab.cpp:59
+#: src/net/tmwa/gui/guildtab.cpp:45
+msgid "Guild"
+msgstr "Гільдія"
+
+#: src/net/tmwa/gui/guildtab.cpp:61 src/net/tmwa/gui/partytab.cpp:59
 msgid "/help > Display this help."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:62
+#: src/net/tmwa/gui/guildtab.cpp:62
 #, fuzzy
 msgid "/invite > Invite a player to your guild"
 msgstr "/party > Запросити гравця до групи"
 
-#: src/net/ea/gui/guildtab.cpp:63
+#: src/net/tmwa/gui/guildtab.cpp:63
 msgid "/leave > Leave the guild you are in"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:64
+#: src/net/tmwa/gui/guildtab.cpp:64
 #, fuzzy
 msgid "/kick > Kick some one from the guild you are in"
 msgstr "/kick > Вигнати користувача з каналу"
 
-#: src/net/ea/gui/guildtab.cpp:73 src/net/ea/gui/partytab.cpp:73
+#: src/net/tmwa/gui/guildtab.cpp:73 src/net/tmwa/gui/partytab.cpp:73
 msgid "Command: /invite <nick>"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:74
+#: src/net/tmwa/gui/guildtab.cpp:74
 #, fuzzy
 msgid "This command invites <nick> to the guild you're in."
 msgstr "Ця команда запрошує гравця <_ім'я_> до вас в групу"
 
-#: src/net/ea/gui/guildtab.cpp:80 src/net/ea/gui/partytab.cpp:80
+#: src/net/tmwa/gui/guildtab.cpp:80 src/net/tmwa/gui/partytab.cpp:80
 msgid "Command: /leave"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:81
+#: src/net/tmwa/gui/guildtab.cpp:81
 #, fuzzy
 msgid "This command causes the player to leave the guild."
 msgstr "Ця команда встановлює тему каналу"
 
-#: src/net/ea/gui/guildtab.cpp:89
+#: src/net/tmwa/gui/guildtab.cpp:89
 msgid "Guild name is missing."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:293
+#: src/net/tmwa/guildhandler.cpp:296
 msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:298
+#: src/net/tmwa/guildhandler.cpp:301
 msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:303
+#: src/net/tmwa/guildhandler.cpp:306
 msgid "User is now part of your guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:308
+#: src/net/tmwa/guildhandler.cpp:311
 msgid "Your guild is full."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:313
+#: src/net/tmwa/guildhandler.cpp:316
 msgid "Unknown guild invite response."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:390
+#: src/net/tmwa/guildhandler.cpp:393
 msgid "Guild creation isn't supported yet."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:60
+#: src/net/tmwa/gui/partytab.cpp:43
+msgid "Party"
+msgstr "Група"
+
+#: src/net/tmwa/gui/partytab.cpp:60
 msgid "/invite > Invite a player to your party"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:61
+#: src/net/tmwa/gui/partytab.cpp:61
 msgid "/leave > Leave the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:62
+#: src/net/tmwa/gui/partytab.cpp:62
 msgid "/kick > Kick some one from the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:63
+#: src/net/tmwa/gui/partytab.cpp:63
 msgid "/item > Show/change party item sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:64
+#: src/net/tmwa/gui/partytab.cpp:64
 msgid "/exp > Show/change party experience sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:81
+#: src/net/tmwa/gui/partytab.cpp:81
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:85
+#: src/net/tmwa/gui/partytab.cpp:85
 msgid "Command: /item <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:86
+#: src/net/tmwa/gui/partytab.cpp:86
 msgid "This command changes the party's item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:87
+#: src/net/tmwa/gui/partytab.cpp:87
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:90
+#: src/net/tmwa/gui/partytab.cpp:90
 msgid "Command: /item"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/tmwa/gui/partytab.cpp:91
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/tmwa/gui/partytab.cpp:95
 msgid "Command: /exp <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:96
+#: src/net/tmwa/gui/partytab.cpp:96
 msgid "This command changes the party's experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/tmwa/gui/partytab.cpp:97
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:100
+#: src/net/tmwa/gui/partytab.cpp:100
 msgid "Command: /exp"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/tmwa/gui/partytab.cpp:101
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:132 src/net/ea/partyhandler.cpp:198
+#: src/net/tmwa/gui/partytab.cpp:132 src/net/tmwa/partyhandler.cpp:196
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:135 src/net/ea/partyhandler.cpp:204
+#: src/net/tmwa/gui/partytab.cpp:135 src/net/tmwa/partyhandler.cpp:202
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:138 src/net/ea/partyhandler.cpp:210
+#: src/net/tmwa/gui/partytab.cpp:138 src/net/tmwa/partyhandler.cpp:208
 msgid "Item sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:141
+#: src/net/tmwa/gui/partytab.cpp:141
 msgid "Item sharing unknown."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:167 src/net/ea/partyhandler.cpp:174
+#: src/net/tmwa/gui/partytab.cpp:167 src/net/tmwa/partyhandler.cpp:172
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:170 src/net/ea/partyhandler.cpp:180
+#: src/net/tmwa/gui/partytab.cpp:170 src/net/tmwa/partyhandler.cpp:178
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:173 src/net/ea/partyhandler.cpp:186
+#: src/net/tmwa/gui/partytab.cpp:173 src/net/tmwa/partyhandler.cpp:184
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:176
+#: src/net/tmwa/gui/partytab.cpp:176
 msgid "Experience sharing unknown."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:281
+#: src/net/tmwa/inventoryhandler.cpp:285
 msgid "Failed to use item."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:391
+#: src/net/tmwa/inventoryhandler.cpp:399
 msgid "Unable to equip."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:402
+#: src/net/tmwa/inventoryhandler.cpp:410
 msgid "Unable to unequip."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:79
+#: src/net/tmwa/loginhandler.cpp:86
 msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:82 src/net/manaserv/loginhandler.cpp:121
-msgid "Old password incorrect."
-msgstr ""
-
-#: src/net/ea/loginhandler.cpp:85
+#: src/net/tmwa/loginhandler.cpp:92
 msgid "New password too short."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:88 src/net/ea/loginhandler.cpp:175
-#: src/net/manaserv/charhandler.cpp:158 src/net/manaserv/loginhandler.cpp:96
-#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
-#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
-#, fuzzy
-msgid "Unknown error."
-msgstr "Чорт зна яка команда"
-
-#: src/net/ea/loginhandler.cpp:149
+#: src/net/tmwa/loginhandler.cpp:156
 #, fuzzy
 msgid "Unregistered ID."
 msgstr "Не зареєстрований"
 
-#: src/net/ea/loginhandler.cpp:152
+#: src/net/tmwa/loginhandler.cpp:159
 #, fuzzy
 msgid "Wrong password."
 msgstr "Змінити пароль"
 
-#: src/net/ea/loginhandler.cpp:155
+#: src/net/tmwa/loginhandler.cpp:162
 msgid "Account expired."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:158
+#: src/net/tmwa/loginhandler.cpp:165
 #, fuzzy
 msgid "Rejected from server."
 msgstr "Відхилено запрошення від %s."
 
-#: src/net/ea/loginhandler.cpp:161
+#: src/net/tmwa/loginhandler.cpp:168
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:165
+#: src/net/tmwa/loginhandler.cpp:172
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:172
+#: src/net/tmwa/loginhandler.cpp:179
 msgid "This user name is already taken."
 msgstr ""
 
-#: src/net/ea/network.cpp:145
+#: src/net/tmwa/network.cpp:145
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/ea/network.cpp:345
+#: src/net/tmwa/network.cpp:345
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/ea/network.cpp:414
+#: src/net/tmwa/network.cpp:414
 msgid "Connection to server terminated. "
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:81
+#: src/net/tmwa/partyhandler.cpp:82
 msgid "Could not create party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:84
+#: src/net/tmwa/partyhandler.cpp:84
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:118
+#: src/net/tmwa/partyhandler.cpp:119
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:122
+#: src/net/tmwa/partyhandler.cpp:123
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:126
+#: src/net/tmwa/partyhandler.cpp:127
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:130
+#: src/net/tmwa/partyhandler.cpp:131
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:238
+#: src/net/tmwa/partyhandler.cpp:236
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:249
+#: src/net/tmwa/partyhandler.cpp:246
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:301
+#: src/net/tmwa/partyhandler.cpp:299
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:329
-msgid "Inviting like this isn't supported at the moment."
+#: src/net/tmwa/partyhandler.cpp:335
+#, c-format
+msgid "Inviting failed, because you can't see a player called %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:334
+#: src/net/tmwa/partyhandler.cpp:340
 msgid "You can only inivte when you are in a party!"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:365
+#: src/net/tmwa/partyhandler.cpp:368
 #, c-format
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:304
-msgid "You are dead."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:305
-msgid "We regret to inform you that your character was killed in battle."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:307
-msgid "You are not that alive anymore."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:308
-msgid "The cold hands of the grim reaper are grabbing for your soul."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:309
-msgid "Game Over!"
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:105
+#: src/net/tmwa/playerhandler.cpp:100
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:310
-msgid ""
-"No, kids. Your character did not really die. It... err... went to a better "
-"place."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:312
-msgid ""
-"Your plan of breaking your enemies weapon by bashing it with your throat "
-"failed."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:314
-msgid "I guess this did not run too well."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:315
-msgid "Do you want your possessions identified?"
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:316
-msgid "Sadly, no trace of you was ever found..."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:317
-msgid "Annihilated."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:318
-msgid "Looks like you got your head handed to you."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:120 src/net/manaserv/beinghandler.cpp:319
-msgid ""
-"You screwed up again, dump your body down the tubes and get you another one."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/tmwa/playerhandler.cpp:118
 msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/tmwa/playerhandler.cpp:119
 msgid "You are no more."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/tmwa/playerhandler.cpp:120
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/tmwa/playerhandler.cpp:121
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/tmwa/playerhandler.cpp:122
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/tmwa/playerhandler.cpp:123
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/tmwa/playerhandler.cpp:124
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:130
+#: src/net/tmwa/playerhandler.cpp:125
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:131
+#: src/net/tmwa/playerhandler.cpp:126
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/tmwa/playerhandler.cpp:127
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/tmwa/playerhandler.cpp:128
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:135
+#: src/net/tmwa/playerhandler.cpp:130
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:136
+#: src/net/tmwa/playerhandler.cpp:131
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:249 src/net/ea/playerhandler.cpp:310
+#: src/net/tmwa/playerhandler.cpp:246 src/net/tmwa/playerhandler.cpp:285
 msgid "Message"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:250
+#: src/net/tmwa/playerhandler.cpp:247
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:333
+#: src/net/tmwa/playerhandler.cpp:313
 #, fuzzy, c-format
 msgid "You picked up %s."
 msgstr "Ти отримуєш: %s."
 
-#: src/net/ea/playerhandler.cpp:369
+#: src/net/tmwa/playerhandler.cpp:348
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:532
+#: src/net/tmwa/playerhandler.cpp:488
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:147
+#: src/net/tmwa/specialhandler.cpp:144
 msgid "Trade failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:150
+#: src/net/tmwa/specialhandler.cpp:147
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:153
+#: src/net/tmwa/specialhandler.cpp:150
 msgid "Sit failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:156
+#: src/net/tmwa/specialhandler.cpp:153
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:159
+#: src/net/tmwa/specialhandler.cpp:156
 msgid "Could not join party!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:162
+#: src/net/tmwa/specialhandler.cpp:159
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:171
+#: src/net/tmwa/specialhandler.cpp:168
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:174
+#: src/net/tmwa/specialhandler.cpp:171
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:177
+#: src/net/tmwa/specialhandler.cpp:174
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:180
+#: src/net/tmwa/specialhandler.cpp:177
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:183
+#: src/net/tmwa/specialhandler.cpp:180
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:186
+#: src/net/tmwa/specialhandler.cpp:183
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:189
+#: src/net/tmwa/specialhandler.cpp:186
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:192
+#: src/net/tmwa/specialhandler.cpp:189
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:195
+#: src/net/tmwa/specialhandler.cpp:192
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:198
+#: src/net/tmwa/specialhandler.cpp:195
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:201
+#: src/net/tmwa/specialhandler.cpp:198
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:210
+#: src/net/tmwa/specialhandler.cpp:207
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:213
+#: src/net/tmwa/specialhandler.cpp:210
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:216
+#: src/net/tmwa/specialhandler.cpp:213
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:116
-msgid "Request for Trade"
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:108 src/net/manaserv/tradehandler.cpp:117
-#, c-format
-msgid "%s wants to trade with you, do you accept?"
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:124
+#: src/net/tmwa/tradehandler.cpp:126
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:128
+#: src/net/tmwa/tradehandler.cpp:130
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:132
+#: src/net/tmwa/tradehandler.cpp:134
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:137
+#: src/net/tmwa/tradehandler.cpp:139
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:144
+#: src/net/tmwa/tradehandler.cpp:146
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:153
+#: src/net/tmwa/tradehandler.cpp:154
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:202
+#: src/net/tmwa/tradehandler.cpp:202
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:207
+#: src/net/tmwa/tradehandler.cpp:207
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:211
+#: src/net/tmwa/tradehandler.cpp:211
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:224 src/net/manaserv/tradehandler.cpp:149
-msgid "Trade canceled."
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:231 src/net/manaserv/tradehandler.cpp:156
-msgid "Trade completed."
-msgstr ""
-
-#: src/net/manaserv/beinghandler.cpp:324
-msgid "Press OK to respawn."
-msgstr ""
-
-#: src/net/manaserv/beinghandler.cpp:325
+#: src/playerrelations.cpp:310
 #, fuzzy
-msgid "You Died"
-msgstr "Ти віддаєш: %s."
+msgid "Completely ignore"
+msgstr "@@ignore|Повністю ігнорувати %s@@"
 
-#: src/net/manaserv/charhandler.cpp:128 src/net/manaserv/charhandler.cpp:196
-msgid "Not logged in."
+#: src/playerrelations.cpp:324
+msgid "Print '...'"
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:131
-msgid "No empty slot."
+#: src/playerrelations.cpp:340
+msgid "Blink name"
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:134
-msgid "Invalid name."
+#: src/resources/itemdb.cpp:44
+#, c-format
+msgid "Attack %+d"
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:137
-#, fuzzy
-msgid "Character's name already exists."
-msgstr "Отримано запрошення до групи, але одне вже є."
-
-#: src/net/manaserv/charhandler.cpp:140
-msgid "Invalid hairstyle."
+#: src/resources/itemdb.cpp:45
+#, c-format
+msgid "Defense %+d"
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:143
-msgid "Invalid hair color."
+#: src/resources/itemdb.cpp:46
+#, c-format
+msgid "HP %+d"
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:146
-msgid "Invalid gender."
+#: src/resources/itemdb.cpp:47
+#, c-format
+msgid "MP %+d"
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:149
-#, fuzzy
-msgid "Character's stats are too high."
-msgstr "Характеристики персонажа в нормі"
-
-#: src/net/manaserv/charhandler.cpp:152
-#, fuzzy
-msgid "Character's stats are too low."
-msgstr "Характеристики персонажа в нормі"
-
-#: src/net/manaserv/charhandler.cpp:155
-msgid "One stat is zero."
+#: src/resources/itemdb.cpp:92
+msgid "Unknown item"
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:187
-msgid "Player deleted."
+#: src/resources/itemdb.cpp:135 src/resources/monsterdb.cpp:77
+msgid "unnamed"
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:199
-#, fuzzy
-msgid "Selection out of range."
-msgstr "Вкажіть кількість предметів"
+#~ msgid "Text Shadow"
+#~ msgstr "Відтінок тексту"
 
-#: src/net/manaserv/charhandler.cpp:202
-#, fuzzy, c-format
-msgid "Unknown error (%d)."
-msgstr "Чорт зна яка команда"
+#~ msgid "Text Outline"
+#~ msgstr "Виділення тексту"
 
-#: src/net/manaserv/charhandler.cpp:242
-msgid "No gameservers are available."
-msgstr ""
+#~ msgid "Progress Bar Labels"
+#~ msgstr "Позначки на індикаторах прогресу"
 
-#: src/net/manaserv/charhandler.cpp:268
-msgid "Willpower:"
-msgstr ""
+#~ msgid "Background"
+#~ msgstr "Тло"
 
-#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
-#: src/net/manaserv/guildhandler.cpp:259
-#, c-format
-msgid "Topic: %s"
-msgstr ""
+#~ msgid "Highlight"
+#~ msgstr "Підсвічення"
 
-#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
-#, fuzzy
-msgid "Players in this channel:"
-msgstr "Гравець вдарив Тварюку"
+#~ msgid "Tab Highlight"
+#~ msgstr "Підсвічення закладинок"
 
-#: src/net/manaserv/chathandler.cpp:201
 #, fuzzy
-msgid "Error joining channel."
-msgstr "Команда: /join <_канал_>"
+#~ msgid "Item Too Expensive"
+#~ msgstr "Предмет надто дорогий"
 
-#: src/net/manaserv/chathandler.cpp:207
 #, fuzzy
-msgid "Listing channels."
-msgstr "Вимагається приєднання до каналу %s."
+#~ msgid "Item Is Equipped"
+#~ msgstr "Предмет одягнено"
 
-#: src/net/manaserv/chathandler.cpp:219
-msgid "End of channel list."
-msgstr ""
+#~ msgid "GM"
+#~ msgstr "GM"
 
-#: src/net/manaserv/chathandler.cpp:291
-#, c-format
-msgid "%s entered the channel."
-msgstr ""
+#~ msgid "Player"
+#~ msgstr "Гравець"
 
-#: src/net/manaserv/chathandler.cpp:296
-#, c-format
-msgid "%s left the channel."
-msgstr ""
+#~ msgid "Whisper"
+#~ msgstr "Шепіт"
 
-#: src/net/manaserv/chathandler.cpp:312
-#, c-format
-msgid "%s has set mode %s on user %s."
-msgstr ""
+#~ msgid "Is"
+#~ msgstr "Є"
 
-#: src/net/manaserv/chathandler.cpp:322
-#, c-format
-msgid "%s has kicked %s."
-msgstr ""
+#~ msgid "Server"
+#~ msgstr "Сервер"
 
-#: src/net/manaserv/chathandler.cpp:327
-#, fuzzy
-msgid "Unknown channel event."
-msgstr "Чорт зна яка команда"
+#~ msgid "Logger"
+#~ msgstr "Логер"
 
-#: src/net/manaserv/generalhandler.cpp:100
-#, c-format
-msgid "Willpower %+d"
-msgstr ""
+#~ msgid "Hyperlink"
+#~ msgstr "Посилання"
 
-#: src/net/manaserv/generalhandler.cpp:171
-#, fuzzy
-msgid "Willpower"
-msgstr "Шепіт"
+#~ msgid "Being"
+#~ msgstr "Істота"
 
-#: src/net/manaserv/guildhandler.cpp:81
-msgid "Guild created."
-msgstr ""
+#~ msgid "Other Players' Names"
+#~ msgstr "Імена інших гравців"
 
-#: src/net/manaserv/guildhandler.cpp:86
-msgid "Error creating guild."
-msgstr ""
+#~ msgid "Own Name"
+#~ msgstr "Власне ім'я"
 
-#: src/net/manaserv/guildhandler.cpp:96
-msgid "Invite sent."
-msgstr ""
+#~ msgid "GM Names"
+#~ msgstr "Імена GM"
 
-#: src/net/manaserv/guildhandler.cpp:203
-msgid "Member was promoted successfully."
-msgstr ""
+#~ msgid "NPCs"
+#~ msgstr "NPC"
 
-#: src/net/manaserv/guildhandler.cpp:208
-msgid "Failed to promote member."
-msgstr ""
+#~ msgid "Monsters"
+#~ msgstr "Тварюки"
 
-#: src/net/manaserv/loginhandler.cpp:87
-msgid "Wrong magic_token."
-msgstr ""
+#~ msgid "Unknown Item Type"
+#~ msgstr "Невідомий тип предмета"
 
-#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
-#, fuzzy
-msgid "Already logged in."
-msgstr "Вже записується"
+#~ msgid "Generics"
+#~ msgstr "Загальні"
 
-#: src/net/manaserv/loginhandler.cpp:93 src/net/manaserv/loginhandler.cpp:272
-msgid "Server is full."
-msgstr ""
+#~ msgid "Hats"
+#~ msgstr "Капелюхи"
 
-#: src/net/manaserv/loginhandler.cpp:118
-#, fuzzy
-msgid "New password incorrect."
-msgstr "Введіть новий пароль двічі:"
+#~ msgid "Usables"
+#~ msgstr "Використання"
 
-#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
-msgid "Account not connected. Please login first."
-msgstr ""
+#~ msgid "Shirts"
+#~ msgstr "Сорочки"
 
-#: src/net/manaserv/loginhandler.cpp:149
 #, fuzzy
-msgid "New email address incorrect."
-msgstr "Двічі введіть вашу нову адресу електронної пошти:"
-
-#: src/net/manaserv/loginhandler.cpp:152
-msgid "Old email address incorrect."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:158
-msgid "The new email address already exists."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:239
-msgid ""
-"Client registration is not allowed. Please contact server administration."
-msgstr ""
+#~ msgid "One Handed Weapons"
+#~ msgstr "\"Однорука\" зброя"
 
-#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
-msgid "Client version is too old."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:266
-msgid "Wrong username or password."
-msgstr ""
+#~ msgid "Pants"
+#~ msgstr "Штанці"
 
-#: src/net/manaserv/loginhandler.cpp:275
-msgid "Login attempt too soon after previous attempt."
-msgstr ""
+#~ msgid "Shoes"
+#~ msgstr "Чоботи"
 
-#: src/net/manaserv/loginhandler.cpp:303
-msgid "Wrong username, password or email address."
-msgstr ""
+#, fuzzy
+#~ msgid "Two Handed Weapons"
+#~ msgstr "\"Однорука\" зброя"
 
-#: src/net/manaserv/loginhandler.cpp:306
-msgid "Username already exists."
-msgstr ""
+#~ msgid "Shields"
+#~ msgstr "Щити"
 
-#: src/net/manaserv/loginhandler.cpp:309
-msgid "Email address already exists."
-msgstr ""
+#~ msgid "Rings"
+#~ msgstr "Кільця"
 
-#: src/net/manaserv/loginhandler.cpp:312
-msgid "You took too long with the captcha or your response was incorrect."
-msgstr ""
+#~ msgid "Necklaces"
+#~ msgstr "Ошийники"
 
-#: src/net/manaserv/partyhandler.cpp:88
-msgid "Joined party."
-msgstr ""
+#~ msgid "Arms"
+#~ msgstr "Руки"
 
-#: src/net/manaserv/partyhandler.cpp:106
-#, c-format
-msgid "%s joined the party."
-msgstr ""
+#~ msgid "Ammo"
+#~ msgstr "Боєприпаси"
 
-#: src/net/manaserv/partyhandler.cpp:123
-#, fuzzy, c-format
-msgid "%s rejected your invite."
-msgstr "Відхилено запрошення від %s."
+#~ msgid "Particle Effects"
+#~ msgstr "Ефекти часток"
 
-#: src/net/manaserv/tradehandler.cpp:96
-msgid "Accepting incoming trade requests."
-msgstr ""
+#~ msgid "Pickup Notification"
+#~ msgstr "Повідомлення про підбирання"
 
-#: src/net/manaserv/tradehandler.cpp:98
-msgid "Ignoring incoming trade requests."
-msgstr ""
+#~ msgid "Exp Notification"
+#~ msgstr "Повідомлення про зміну досвіду"
 
-#: src/net/manaserv/tradehandler.cpp:135
-#, c-format
-msgid "Trading with %s"
-msgstr ""
+#, fuzzy
+#~ msgid "Player Hits Monster"
+#~ msgstr "Гравець вдарив Тварюку"
 
-#: src/playerrelations.cpp:304
 #, fuzzy
-msgid "Completely ignore"
-msgstr "@@ignore|Повністю ігнорувати %s@@"
+#~ msgid "Monster Hits Player"
+#~ msgstr "Тварюка вдарила гравця"
 
-#: src/playerrelations.cpp:318
-msgid "Print '...'"
-msgstr ""
+#~ msgid "Critical Hit"
+#~ msgstr "Критичний удар"
 
-#: src/playerrelations.cpp:334
-msgid "Blink name"
-msgstr ""
+#~ msgid "Misses"
+#~ msgstr "Промах"
 
-#: src/playerrelations.cpp:371
-msgid "Floating '...' bubble"
-msgstr ""
+#~ msgid "HP Bar"
+#~ msgstr "Рядок HP"
 
-#: src/playerrelations.cpp:374
-msgid "Floating bubble"
-msgstr ""
+#~ msgid "3/4 HP Bar"
+#~ msgstr "3/4 рядка НР"
 
-#: src/resources/itemdb.cpp:52
-#, c-format
-msgid "Attack %+d"
-msgstr ""
+#~ msgid "1/2 HP Bar"
+#~ msgstr "1/2 рядка НР"
 
-#: src/resources/itemdb.cpp:53
-#, c-format
-msgid "Defense %+d"
-msgstr ""
+#~ msgid "1/4 HP Bar"
+#~ msgstr "1/4 здоров'я"
 
-#: src/resources/itemdb.cpp:54
-#, c-format
-msgid "HP %+d"
-msgstr ""
+#, fuzzy
+#~ msgid "Money"
+#~ msgstr "Кошти: %d"
 
-#: src/resources/itemdb.cpp:55
-#, c-format
-msgid "MP %+d"
-msgstr ""
+#, fuzzy
+#~ msgid "Job"
+#~ msgstr "Професія:"
 
-#: src/resources/itemdb.cpp:114
-msgid "Unknown item"
-msgstr ""
+#, fuzzy
+#~ msgid "Level"
+#~ msgstr "Рівень: %d"
 
-#: src/resources/itemdb.cpp:158 src/resources/monsterdb.cpp:45
-#: src/resources/monsterdb.cpp:67
-msgid "unnamed"
-msgstr ""
+#, fuzzy
+#~ msgid "Willpower"
+#~ msgstr "Шепіт"
 
 #~ msgid "no"
 #~ msgstr "ні"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index e8e52e5a..26bae705 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,11 +8,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2010-03-05 21:52+0100\n"
+"POT-Creation-Date: 2010-12-13 20:04+0100\n"
 "PO-Revision-Date: 2010-01-05 23:49+0000\n"
 "Last-Translator: luojie-dune <Unknown>\n"
 "Language-Team: Chinese Simplified <themanaworld-devel@lists.sourceforge."
 "net>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -23,451 +24,465 @@ msgstr ""
 "X-Poedit-Language: Chinese\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: src/client.cpp:553 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:62
+#: src/client.cpp:598 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
 msgid "Setup"
 msgstr "设置"
 
-#: src/client.cpp:623
+#: src/client.cpp:679
 #, fuzzy
 msgid "Connecting to server"
 msgstr "正在连接 地图 服务器..."
 
-#: src/client.cpp:650
+#: src/client.cpp:706
 #, fuzzy
 msgid "Logging in"
 msgstr "登录"
 
-#: src/client.cpp:683
+#: src/client.cpp:739
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:739
+#: src/client.cpp:804
 #, fuzzy
 msgid "Requesting characters"
 msgstr "选择角色"
 
-#: src/client.cpp:768
+#: src/client.cpp:833
 #, fuzzy
 msgid "Connecting to the game server"
 msgstr "正在连接 地图 服务器..."
 
-#: src/client.cpp:799 src/client.cpp:806 src/client.cpp:940
+#: src/client.cpp:843
+#, fuzzy
+msgid "Changing game servers"
+msgstr "服务器"
+
+#: src/client.cpp:872 src/client.cpp:879 src/client.cpp:1014
 #: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
 #: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
-#: src/gui/serverdialog.cpp:261 src/gui/unregisterdialog.cpp:133
-#: src/net/ea/charserverhandler.cpp:135 src/net/ea/charserverhandler.cpp:152
-#: src/net/manaserv/charhandler.cpp:161 src/net/manaserv/charhandler.cpp:204
+#: src/gui/serverdialog.cpp:323 src/gui/unregisterdialog.cpp:133
+#: src/net/manaserv/charhandler.cpp:174 src/net/manaserv/charhandler.cpp:217
+#: src/net/tmwa/charserverhandler.cpp:134
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Error"
 msgstr "错误"
 
-#: src/client.cpp:815
+#: src/client.cpp:888
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:842
+#: src/client.cpp:915
 #, fuzzy
 msgid "Password Change"
 msgstr "密码："
 
-#: src/client.cpp:843
+#: src/client.cpp:916
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:862
+#: src/client.cpp:935
 #, fuzzy
 msgid "Email Change"
 msgstr "改变"
 
-#: src/client.cpp:863
+#: src/client.cpp:936
 #, fuzzy
 msgid "Email changed successfully!"
 msgstr "会员晋升成功。"
 
-#: src/client.cpp:883
+#: src/client.cpp:956
 #, fuzzy
 msgid "Unregister Successful"
 msgstr "注销"
 
-#: src/client.cpp:884
+#: src/client.cpp:957
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1007 src/client.cpp:1030
+#: src/client.cpp:1138 src/client.cpp:1161
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1119
+#: src/client.cpp:1281
 #, fuzzy, c-format
 msgid "Invalid update host: %s"
 msgstr "无效的更新主机： "
 
-#: src/client.cpp:1153 src/client.cpp:1159
+#: src/client.cpp:1315 src/client.cpp:1321
 msgid "Error creating updates directory!"
 msgstr "创建更新目录错误！"
 
-#: src/commandhandler.cpp:127 src/commandhandler.cpp:308
+#: src/commandhandler.cpp:131 src/commandhandler.cpp:317
 msgid "Unknown command."
 msgstr "未知命令。"
 
-#: src/commandhandler.cpp:156
+#: src/commandhandler.cpp:160
 msgid "-- Help --"
 msgstr "-- 帮助 --"
 
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:161
 msgid "/help > Display this help"
 msgstr "/help > 显示此帮助"
 
-#: src/commandhandler.cpp:159
+#: src/commandhandler.cpp:163
 msgid "/where > Display map name"
 msgstr "/where > 显示地图名"
 
-#: src/commandhandler.cpp:160
+#: src/commandhandler.cpp:164
 msgid "/who > Display number of online users"
 msgstr "/who > 显示在线用户数"
 
-#: src/commandhandler.cpp:161
+#: src/commandhandler.cpp:165
 msgid "/me > Tell something about yourself"
 msgstr "/me > 自我介绍"
 
-#: src/commandhandler.cpp:163
+#: src/commandhandler.cpp:167
 msgid "/clear > Clears this window"
 msgstr "/clear > 清除此窗口"
 
-#: src/commandhandler.cpp:165
+#: src/commandhandler.cpp:169
 msgid "/msg > Send a private message to a user"
 msgstr "/msg > 发送私人信息给用户"
 
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:170
 msgid "/whisper > Alias of msg"
 msgstr "/whisper > msg的别名"
 
-#: src/commandhandler.cpp:167
+#: src/commandhandler.cpp:171
 msgid "/w > Alias of msg"
 msgstr "/w > msg的别名"
 
-#: src/commandhandler.cpp:168
+#: src/commandhandler.cpp:172
 msgid "/query > Makes a tab for private messages with another user"
 msgstr "/query > 为和其他用户之间的私密信息开启一个新的标签页"
 
-#: src/commandhandler.cpp:169
+#: src/commandhandler.cpp:174
 msgid "/q > Alias of query"
 msgstr "/q > query的别名"
 
-#: src/commandhandler.cpp:171
+#: src/commandhandler.cpp:176
 msgid "/ignore > ignore a player"
 msgstr ""
 
-#: src/commandhandler.cpp:172
+#: src/commandhandler.cpp:177
 msgid "/unignore > stop ignoring a player"
 msgstr ""
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:179
 msgid "/list > Display all public channels"
 msgstr "/list > 显示所有公共频道"
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:180
 msgid "/join > Join or create a channel"
 msgstr "/join > 加入或者创建一个新的频道"
 
-#: src/commandhandler.cpp:177
+#: src/commandhandler.cpp:182
 #, fuzzy
 msgid "/createparty > Create a new party"
 msgstr "/create > 创建一个新的帮会"
 
-#: src/commandhandler.cpp:178
+#: src/commandhandler.cpp:183
 msgid "/party > Invite a user to party"
 msgstr "邀请一个用户加入队伍"
 
-#: src/commandhandler.cpp:180
+#: src/commandhandler.cpp:185
 msgid "/record > Start recording the chat to an external file"
 msgstr "/record > 开始记录聊天至外部文件"
 
-#: src/commandhandler.cpp:181
+#: src/commandhandler.cpp:187
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr "/toggle > 确定<回车>键是否切换聊天日志"
 
-#: src/commandhandler.cpp:182
+#: src/commandhandler.cpp:189
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr "/present > 获取列席的玩家列表（若开启logging，则发送到聊天日志）"
 
-#: src/commandhandler.cpp:184
+#: src/commandhandler.cpp:192
 msgid "/announce > Global announcement (GM only)"
 msgstr "/announce > 全局通告（限GM使用）"
 
-#: src/commandhandler.cpp:188
+#: src/commandhandler.cpp:196
 msgid "For more information, type /help <command>."
 msgstr "输入 /help <命令>，获取更多信息。"
 
-#: src/commandhandler.cpp:192
+#: src/commandhandler.cpp:200
 msgid "Command: /help"
 msgstr "命令： /help"
 
-#: src/commandhandler.cpp:193
+#: src/commandhandler.cpp:201
 msgid "This command displays a list of all commands available."
 msgstr "该命令可显示所有可用命令。"
 
-#: src/commandhandler.cpp:194
+#: src/commandhandler.cpp:203
 msgid "Command: /help <command>"
 msgstr "命令： /help <命令>"
 
-#: src/commandhandler.cpp:195
+#: src/commandhandler.cpp:204
 msgid "This command displays help on <command>."
 msgstr "该命令显现<命令>的帮助信息"
 
-#: src/commandhandler.cpp:203
+#: src/commandhandler.cpp:212
 msgid "Command: /announce <msg>"
 msgstr "命令： /announce <信息>"
 
-#: src/commandhandler.cpp:204
+#: src/commandhandler.cpp:213
 msgid "*** only available to a GM ***"
 msgstr "*** 只有GM可用 ***"
 
-#: src/commandhandler.cpp:205
+#: src/commandhandler.cpp:214
 msgid "This command sends the message <msg> to all players currently online."
 msgstr "该命令会发送<信息>给所有在线用户。"
 
-#: src/commandhandler.cpp:210
+#: src/commandhandler.cpp:219
 msgid "Command: /clear"
 msgstr "命令： /clear"
 
-#: src/commandhandler.cpp:211
+#: src/commandhandler.cpp:220
 msgid "This command clears the chat log of previous chat."
 msgstr "该命令可清除历史聊天记录。"
 
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:224
 #, fuzzy
 msgid "Command: /ignore <player>"
 msgstr "命令：/item <策略>"
 
-#: src/commandhandler.cpp:216
+#: src/commandhandler.cpp:225
 #, fuzzy
 msgid "This command ignores the given player regardless of current relations."
 msgstr "该条命令可显现当前在线用户总数。"
 
-#: src/commandhandler.cpp:221
+#: src/commandhandler.cpp:230
 msgid "Command: /join <channel>"
 msgstr "命令：/join <频道>"
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:231
 msgid "This command makes you enter <channel>."
 msgstr "该命令让您进入<频道>。"
 
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:232
 msgid "If <channel> doesn't exist, it's created."
 msgstr "如果<频道>不存在，自动创建。"
 
-#: src/commandhandler.cpp:227
+#: src/commandhandler.cpp:236
 msgid "Command: /list"
 msgstr "命令：/list"
 
-#: src/commandhandler.cpp:228
+#: src/commandhandler.cpp:237
 msgid "This command shows a list of all channels."
 msgstr "改命令列出所有频道列表。"
 
-#: src/commandhandler.cpp:232
+#: src/commandhandler.cpp:241
 msgid "Command: /me <message>"
 msgstr "命令：/me <信息>"
 
-#: src/commandhandler.cpp:233
+#: src/commandhandler.cpp:242
 msgid "This command tell others you are (doing) <msg>."
 msgstr "该命令告诉别人你正在（做）<信息>。"
 
-#: src/commandhandler.cpp:237
+#: src/commandhandler.cpp:246
 msgid "Command: /msg <nick> <message>"
 msgstr "命令：/msg <昵称><信息>"
 
-#: src/commandhandler.cpp:238
+#: src/commandhandler.cpp:247
 msgid "Command: /whisper <nick> <message>"
 msgstr "命令：/whisper <昵称><信息>"
 
-#: src/commandhandler.cpp:239
+#: src/commandhandler.cpp:248
 msgid "Command: /w <nick> <message>"
 msgstr "命令：/w <昵称><信息>"
 
-#: src/commandhandler.cpp:240
+#: src/commandhandler.cpp:249
 msgid "This command sends the text <message> to <nick>."
 msgstr "该命令发送文本<信息>给<昵称>。"
 
-#: src/commandhandler.cpp:241 src/commandhandler.cpp:260
+#: src/commandhandler.cpp:250 src/commandhandler.cpp:269
 #: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
-#: src/net/ea/gui/guildtab.cpp:75 src/net/ea/gui/partytab.cpp:75
+#: src/net/tmwa/gui/guildtab.cpp:75 src/net/tmwa/gui/partytab.cpp:75
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr "如果<昵称>之间有空格，用双引号(\")括起来。"
 
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:255
 msgid "Command: /query <nick>"
 msgstr "命令：/query <昵称>"
 
-#: src/commandhandler.cpp:247
+#: src/commandhandler.cpp:256
 msgid "Command: /q <nick>"
 msgstr "命令：/q <昵称>"
 
-#: src/commandhandler.cpp:248
+#: src/commandhandler.cpp:257
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr "该命令尝试为您和<昵称>之间的密语开启一个新的标签。"
 
-#: src/commandhandler.cpp:253
+#: src/commandhandler.cpp:262
 #, fuzzy
 msgid "Command: /createparty <name>"
 msgstr "命令：/create <帮会名>"
 
-#: src/commandhandler.cpp:254
+#: src/commandhandler.cpp:263
 #, fuzzy
 msgid "This command creates a new party called <name>."
 msgstr "这些命令创建一个被称为<帮会名>的新帮会。"
 
-#: src/commandhandler.cpp:258
+#: src/commandhandler.cpp:267
 msgid "Command: /party <nick>"
 msgstr "命令：/party <昵称>"
 
-#: src/commandhandler.cpp:259 src/net/ea/gui/partytab.cpp:74
+#: src/commandhandler.cpp:268 src/net/tmwa/gui/partytab.cpp:74
 msgid "This command invites <nick> to party with you."
 msgstr "该命令邀请<昵称>和你聚会。"
 
-#: src/commandhandler.cpp:265
+#: src/commandhandler.cpp:274
 msgid "Command: /present"
 msgstr "命令： /present"
 
-#: src/commandhandler.cpp:266
+#: src/commandhandler.cpp:275
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr "该命令得到列席的玩家名单并传送到记录日志如果记录，否则聊天记录。"
 
-#: src/commandhandler.cpp:272
+#: src/commandhandler.cpp:281
 msgid "Command: /record <filename>"
 msgstr "命令： /record <文件名>"
 
-#: src/commandhandler.cpp:273
+#: src/commandhandler.cpp:282
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr "该命令开始记录聊天日志至文件<文件名>。"
 
-#: src/commandhandler.cpp:275
+#: src/commandhandler.cpp:284
 msgid "Command: /record"
 msgstr "命令: /record"
 
-#: src/commandhandler.cpp:276
+#: src/commandhandler.cpp:285
 msgid "This command finishes a recording session."
 msgstr "此命令结束将此会话记录"
 
-#: src/commandhandler.cpp:280
+#: src/commandhandler.cpp:289
 msgid "Command: /toggle <state>"
 msgstr "命令: /toggle <状态>"
 
-#: src/commandhandler.cpp:281
+#: src/commandhandler.cpp:290
 msgid ""
 "This command sets whether the return key should toggle the chat log, or "
 "whether the chat log turns off automatically."
 msgstr "该命令设置回车键是否切换聊天日志，或者聊天日志功能是否自动关闭。"
 
-#: src/commandhandler.cpp:283
+#: src/commandhandler.cpp:292
 msgid ""
-"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
-"\", \"no\", \"false\" to turn the toggle off."
+"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
+"\"0\", \"no\", \"false\" to turn the toggle off."
 msgstr "<状态> 可用“1”、“yes”、“true”来开启，或以“0”、“no”、“false”关闭。"
 
-#: src/commandhandler.cpp:286
+#: src/commandhandler.cpp:295
 msgid "Command: /toggle"
 msgstr "命令: /toggle"
 
-#: src/commandhandler.cpp:287
+#: src/commandhandler.cpp:296
 msgid "This command displays the return toggle status."
 msgstr "该命令显示<回车>键切换状态"
 
-#: src/commandhandler.cpp:291 src/gui/widgets/whispertab.cpp:93
+#: src/commandhandler.cpp:300 src/gui/widgets/whispertab.cpp:95
 #, fuzzy
 msgid "Command: /unignore <player>"
 msgstr "命令：/item <策略>"
 
-#: src/commandhandler.cpp:292
+#: src/commandhandler.cpp:301
 msgid "This command stops ignoring the given player if they are being ignored"
 msgstr ""
 
-#: src/commandhandler.cpp:297
+#: src/commandhandler.cpp:306
 msgid "Command: /where"
 msgstr "命令: /where"
 
-#: src/commandhandler.cpp:298
+#: src/commandhandler.cpp:307
 msgid "This command displays the name of the current map."
 msgstr "该条命令显示当前地图名。"
 
-#: src/commandhandler.cpp:302
+#: src/commandhandler.cpp:311
 msgid "Command: /who"
 msgstr "命令： /who"
 
-#: src/commandhandler.cpp:303
+#: src/commandhandler.cpp:312
 msgid "This command displays the number of players currently online."
 msgstr "该条命令可显现当前在线用户总数。"
 
-#: src/commandhandler.cpp:309
+#: src/commandhandler.cpp:318
 msgid "Type /help for a list of commands."
 msgstr "输入 /help 获取命令列表。"
 
-#: src/commandhandler.cpp:375
+#: src/commandhandler.cpp:384
 msgid "Cannot send empty whispers!"
 msgstr "无法发送空白密语！"
 
-#: src/commandhandler.cpp:383
+#: src/commandhandler.cpp:392
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr "无法同 \"%s\" 建立一个私人谈话标签页！或者已经存在，或者那就是自己。"
 
-#: src/commandhandler.cpp:397
+#: src/commandhandler.cpp:406
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "请求加入频道%s。"
 
-#: src/commandhandler.cpp:410 src/net/ea/gui/partytab.cpp:109
+#: src/commandhandler.cpp:419 src/net/tmwa/gui/partytab.cpp:109
 msgid "Party name is missing."
 msgstr "帮会名称缺失。"
 
-#: src/commandhandler.cpp:423 src/commandhandler.cpp:471
-#: src/commandhandler.cpp:493
+#: src/commandhandler.cpp:432 src/commandhandler.cpp:509
+#: src/commandhandler.cpp:531
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:441
+#: src/commandhandler.cpp:450
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:441
+#: src/commandhandler.cpp:450
 msgid "Message closes chat."
 msgstr "讯息关闭聊天。"
 
-#: src/commandhandler.cpp:450
+#: src/commandhandler.cpp:459
 msgid "Return now toggles chat."
 msgstr "<回车>键现在切换聊天。"
 
-#: src/commandhandler.cpp:454
+#: src/commandhandler.cpp:463
 msgid "Message now closes chat."
 msgstr "讯息现在关闭聊天。"
 
-#: src/commandhandler.cpp:477
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:489
+msgid "Show IP: On"
+msgstr ""
+
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:485
+msgid "Show IP: Off"
+msgstr ""
+
+#: src/commandhandler.cpp:515
 msgid "Player already ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:484
+#: src/commandhandler.cpp:522
 #, fuzzy
 msgid "Player successfully ignored!"
 msgstr "帮会创建成功。"
 
-#: src/commandhandler.cpp:486
+#: src/commandhandler.cpp:524
 #, fuzzy
 msgid "Player could not be ignored!"
 msgstr "密语无法发送，你已被用户忽略。"
 
-#: src/commandhandler.cpp:501
+#: src/commandhandler.cpp:539
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:506
+#: src/commandhandler.cpp:544
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:508
+#: src/commandhandler.cpp:546
 #, fuzzy
 msgid "Player could not be unignored!"
 msgstr "密语无法发送，你已被用户忽略。"
@@ -481,43 +496,43 @@ msgstr "/%s的选项是\"yes\"，\"no\"，\"true\"，\"false\"，\"1\"，\"0\"�
 msgid "General"
 msgstr "常规"
 
-#: src/game.cpp:326
+#: src/game.cpp:342
 #, fuzzy
 msgid "Screenshot saved as "
 msgstr "屏幕快照保存至 ~/"
 
-#: src/game.cpp:331
+#: src/game.cpp:347
 msgid "Saving screenshot failed!"
 msgstr "保存屏幕快照失败！"
 
-#: src/game.cpp:355
+#: src/game.cpp:378
 #, fuzzy
 msgid "The connection to the server was lost."
 msgstr "与服务器连接丢失,程序将会退出."
 
-#: src/game.cpp:360
+#: src/game.cpp:382
 msgid "Network Error"
 msgstr "网络错误"
 
-#: src/game.cpp:705
+#: src/game.cpp:721
 msgid "Ignoring incoming trade requests"
 msgstr "忽略新进的交易请求"
 
-#: src/game.cpp:712
+#: src/game.cpp:726
 msgid "Accepting incoming trade requests"
 msgstr "接受传入的交易请求"
 
-#: src/game.cpp:946
+#: src/game.cpp:954
 #, fuzzy
 msgid "Could Not Load Map"
 msgstr "无法加载地图"
 
-#: src/game.cpp:947
+#: src/game.cpp:955
 #, c-format
 msgid "Error while loading %s"
 msgstr "加载%s时出现错误"
 
-#: src/gui/beingpopup.cpp:75
+#: src/gui/beingpopup.cpp:76
 #, fuzzy, c-format
 msgid "Party: %s"
 msgstr "帮会（%s）"
@@ -526,34 +541,34 @@ msgstr "帮会（%s）"
 msgid "Buy"
 msgstr "购买"
 
-#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
-#: src/gui/sell.cpp:276
+#: src/gui/buy.cpp:69 src/gui/buy.cpp:261 src/gui/sell.cpp:71
+#: src/gui/sell.cpp:288
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "价格：%s / 总价：%s"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:99 src/gui/npcdialog.cpp:100
-#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:479
+#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:112 src/gui/npcdialog.cpp:124
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:463
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:98 src/gui/npcdialog.cpp:101
-#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:491
+#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:111 src/gui/npcdialog.cpp:125
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:475
 msgid "-"
 msgstr ""
 
 #: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
-#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:182
-#: src/keyboardconfig.cpp:103
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:228
+#: src/keyboardconfig.cpp:102
 msgid "Quit"
 msgstr "退出"
 
-#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:408
-#: src/gui/statuswindow.cpp:478 src/gui/statuswindow.cpp:512
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:384
+#: src/gui/statuswindow.cpp:462 src/gui/statuswindow.cpp:496
 msgid "Max"
 msgstr "最大"
 
@@ -567,11 +582,11 @@ msgstr "出售"
 
 #: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
 #: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
-#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:101
-#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:178
-#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:402
+#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:114
+#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:389
 #: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
-#: src/gui/socialwindow.cpp:242 src/gui/textdialog.cpp:39
+#: src/gui/socialwindow.cpp:275 src/gui/textdialog.cpp:40
 #: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr "取消"
@@ -610,7 +625,7 @@ msgstr "新电子邮件地址已经存在。"
 msgid "Change Password"
 msgstr "更换密码"
 
-#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:53
+#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:55
 #: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
 msgid "Password:"
 msgstr "密码："
@@ -642,19 +657,19 @@ msgstr ""
 msgid "Create Character"
 msgstr "创建角色"
 
-#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:52
+#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:54
 #: src/gui/register.cpp:67
 msgid "Name:"
 msgstr "姓名"
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
 #: src/gui/outfitwindow.cpp:67
 msgid ">"
 msgstr ""
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
 #: src/gui/outfitwindow.cpp:66
@@ -671,8 +686,8 @@ msgstr "发色："
 msgid "Hair style:"
 msgstr "发型："
 
-#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:397
-#: src/gui/socialwindow.cpp:296
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:392
+#: src/gui/socialwindow.cpp:329
 msgid "Create"
 msgstr "建立"
 
@@ -728,34 +743,34 @@ msgstr "注销"
 msgid "Change Email"
 msgstr "更换Email地址"
 
-#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:185
-#: src/gui/setup_players.cpp:230
+#: src/gui/charselectdialog.cpp:336 src/gui/serverdialog.cpp:231
+#: src/gui/setup_players.cpp:229
 msgid "Delete"
 msgstr "删除"
 
-#: src/gui/charselectdialog.cpp:387
+#: src/gui/charselectdialog.cpp:380
 #, fuzzy
 msgid "Choose"
 msgstr "关闭"
 
-#: src/gui/charselectdialog.cpp:399 src/gui/charselectdialog.cpp:400
+#: src/gui/charselectdialog.cpp:394 src/gui/charselectdialog.cpp:395
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:77 src/gui/palette.cpp:96
+#: src/gui/chat.cpp:88
 msgid "Chat"
 msgstr "聊天"
 
-#: src/gui/chat.cpp:287
+#: src/gui/chat.cpp:311
 #, fuzzy, c-format
 msgid "Present: %s; %d players are present."
 msgstr "%d 玩家出席。"
 
-#: src/gui/chat.cpp:305
+#: src/gui/chat.cpp:329
 msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:469
+#: src/gui/chat.cpp:493
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "对%s密语到：%s"
@@ -817,143 +832,174 @@ msgstr "纹理细节"
 msgid "Ambient FX: %s"
 msgstr "环境音效"
 
-#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:56
+#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:55
 msgid "Equipment"
 msgstr "装备"
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:77
-#: src/gui/inventorywindow.cpp:79 src/gui/inventorywindow.cpp:298
-#: src/gui/popupmenu.cpp:372
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:89
+#: src/gui/inventorywindow.cpp:337 src/gui/popupmenu.cpp:359
 msgid "Unequip"
 msgstr "卸下装备"
 
-#: src/gui/help.cpp:36
+#: src/gui/help.cpp:37
 msgid "Help"
 msgstr "帮助"
 
-#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:73
+#: src/gui/help.cpp:51 src/gui/npcdialog.cpp:50
 msgid "Close"
 msgstr "关闭"
 
-#: src/gui/inventorywindow.cpp:56 src/gui/windowmenu.cpp:57
+#: src/gui/inventorywindow.cpp:59 src/gui/windowmenu.cpp:56
 msgid "Inventory"
 msgstr "物品栏"
 
-#: src/gui/inventorywindow.cpp:72 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:300 src/gui/popupmenu.cpp:374
+#: src/gui/inventorywindow.cpp:59
+msgid "Storage"
+msgstr "仓库"
+
+#: src/gui/inventorywindow.cpp:82
+msgid "Slots:"
+msgstr "槽："
+
+#: src/gui/inventorywindow.cpp:87 src/gui/inventorywindow.cpp:100
+#: src/gui/inventorywindow.cpp:339 src/gui/popupmenu.cpp:361
 msgid "Equip"
 msgstr "装备"
 
-#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:304 src/gui/popupmenu.cpp:377
+#: src/gui/inventorywindow.cpp:88
 msgid "Use"
 msgstr "使用"
 
-#: src/gui/inventorywindow.cpp:83 src/gui/inventorywindow.cpp:308
-#: src/gui/popupmenu.cpp:380
+#: src/gui/inventorywindow.cpp:101 src/gui/popupmenu.cpp:364
+msgid "Activate"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:102 src/gui/inventorywindow.cpp:348
+#: src/gui/popupmenu.cpp:367
 #, fuzzy
 msgid "Drop..."
 msgstr "丢弃"
 
-#: src/gui/inventorywindow.cpp:84 src/gui/popupmenu.cpp:386
+#: src/gui/inventorywindow.cpp:103 src/gui/popupmenu.cpp:373
 msgid "Split"
 msgstr "分离"
 
-#: src/gui/inventorywindow.cpp:85 src/gui/outfitwindow.cpp:51
+#: src/gui/inventorywindow.cpp:104 src/gui/outfitwindow.cpp:51
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:96 src/gui/storagewindow.cpp:83
-msgid "Slots:"
-msgstr "槽："
-
-#: src/gui/inventorywindow.cpp:97
+#: src/gui/inventorywindow.cpp:106
 msgid "Weight:"
 msgstr "重量："
 
-#: src/gui/inventorywindow.cpp:310 src/gui/popupmenu.cpp:382
+#: src/gui/inventorywindow.cpp:124 src/gui/popupmenu.cpp:378
+msgid "Store"
+msgstr "存储"
+
+#: src/gui/inventorywindow.cpp:125 src/gui/popupmenu.cpp:385
+msgid "Retrieve"
+msgstr "取回"
+
+#: src/gui/inventorywindow.cpp:350 src/gui/popupmenu.cpp:369
 msgid "Drop"
 msgstr "丢弃"
 
-#: src/gui/itemamount.cpp:100 src/gui/okdialog.cpp:42
-#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:38 src/gui/trade.cpp:73
-#: src/gui/trade.cpp:75
+#: src/gui/itemamount.cpp:113 src/gui/okdialog.cpp:42
+#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:39 src/gui/trade.cpp:72
+#: src/gui/trade.cpp:74
 msgid "OK"
 msgstr "确定"
 
-#: src/gui/itemamount.cpp:102
+#: src/gui/itemamount.cpp:115
 msgid "All"
 msgstr "全部"
 
-#: src/gui/itemamount.cpp:128
+#: src/gui/itemamount.cpp:141
 msgid "Select amount of items to trade."
 msgstr "请选择交易的物品数量。"
 
-#: src/gui/itemamount.cpp:131
+#: src/gui/itemamount.cpp:144
 msgid "Select amount of items to drop."
 msgstr "请选择丢弃的物品数量。"
 
-#: src/gui/itemamount.cpp:134
+#: src/gui/itemamount.cpp:147
 msgid "Select amount of items to store."
 msgstr "请选择存储的物品数量。"
 
-#: src/gui/itemamount.cpp:137
+#: src/gui/itemamount.cpp:150
 msgid "Select amount of items to retrieve."
 msgstr "请选择取回的物品数量。"
 
-#: src/gui/itemamount.cpp:140
+#: src/gui/itemamount.cpp:153
 msgid "Select amount of items to split."
 msgstr "请选择你分离的物品的数量"
 
-#: src/gui/itempopup.cpp:92
+#: src/gui/itempopup.cpp:137
 #, fuzzy, c-format
 msgid "Weight: %s"
 msgstr "重量： "
 
-#: src/gui/login.cpp:49 src/gui/login.cpp:61
+#: src/gui/login.cpp:51 src/gui/login.cpp:63
 msgid "Login"
 msgstr "登录"
 
-#: src/gui/login.cpp:58
+#: src/gui/login.cpp:60
 #, fuzzy
 msgid "Remember username"
 msgstr "保存用户名"
 
-#: src/gui/login.cpp:59 src/gui/register.cpp:58 src/gui/register.cpp:73
+#: src/gui/login.cpp:61 src/gui/register.cpp:58 src/gui/register.cpp:73
 msgid "Register"
 msgstr "注册"
 
-#: src/gui/login.cpp:60
+#: src/gui/login.cpp:62
 #, fuzzy
 msgid "Change Server"
 msgstr "服务器"
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
+#: src/gui/login.cpp:129
+#, fuzzy
+msgid "Registration disabled"
+msgstr "物品共享关闭。"
+
+#: src/gui/login.cpp:129
+msgid "You need to use the website to register an account for this server."
+msgstr ""
+
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:86
 msgid "Map"
 msgstr "地图"
 
-#: src/gui/npcdialog.cpp:44
+#: src/gui/ministatus.cpp:235
+msgid "Need"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:48
 msgid "Waiting for server"
 msgstr "等待服务器中"
 
-#: src/gui/npcdialog.cpp:45
+#: src/gui/npcdialog.cpp:49
 msgid "Next"
 msgstr "下一个"
 
-#: src/gui/npcdialog.cpp:47
+#: src/gui/npcdialog.cpp:51
 msgid "Submit"
 msgstr "提交"
 
-#: src/gui/npcdialog.cpp:52 src/gui/npcpostdialog.cpp:41
+#: src/gui/npcdialog.cpp:73 src/gui/npcpostdialog.cpp:41
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:110
+#: src/gui/npcdialog.cpp:118
+msgid "Clear log"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:134
 msgid "Reset"
 msgstr "重置"
 
 #. TRANSLATORS: Please leave the \n sequences intact.
-#: src/gui/npcdialog.cpp:171
+#: src/gui/npcdialog.cpp:208
 #, fuzzy
 msgid ""
 "\n"
@@ -968,7 +1014,7 @@ msgstr "至："
 msgid "Send"
 msgstr "发送"
 
-#: src/gui/npcpostdialog.cpp:96
+#: src/gui/npcpostdialog.cpp:99
 msgid "Failed to send as sender or letter invalid."
 msgstr "发送信件失败或者信件无效。"
 
@@ -983,314 +1029,86 @@ msgstr ""
 msgid "Unequip first"
 msgstr "卸下装备"
 
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:143
-msgid "Text"
-msgstr "文本"
-
-#: src/gui/palette.cpp:82
-msgid "Text Shadow"
-msgstr "文本阴影"
-
-#: src/gui/palette.cpp:83
-msgid "Text Outline"
-msgstr "文本轮廓"
-
-#: src/gui/palette.cpp:84
-msgid "Progress Bar Labels"
-msgstr "进度条标签"
-
-#: src/gui/palette.cpp:85
-msgid "Buttons"
-msgstr ""
-
-#: src/gui/palette.cpp:86
-msgid "Disabled Buttons"
-msgstr ""
-
-#: src/gui/palette.cpp:87
-msgid "Tabs"
-msgstr ""
-
-#: src/gui/palette.cpp:89
-msgid "Background"
-msgstr "背景"
-
-#: src/gui/palette.cpp:91
-msgid "Highlight"
-msgstr "突出显示"
-
-#: src/gui/palette.cpp:92
-msgid "Tab Highlight"
-msgstr "标签加亮"
-
-#: src/gui/palette.cpp:93
-#, fuzzy
-msgid "Item Too Expensive"
-msgstr "物品太昂贵"
-
-#: src/gui/palette.cpp:94
-#, fuzzy
-msgid "Item Is Equipped"
-msgstr "物品已装备"
-
-#: src/gui/palette.cpp:97
-msgid "GM"
-msgstr "GM"
-
-#: src/gui/palette.cpp:98
-msgid "Player"
-msgstr "玩家"
-
-#: src/gui/palette.cpp:99
-msgid "Whisper"
-msgstr "密语"
-
-#: src/gui/palette.cpp:100
-msgid "Is"
-msgstr "是"
-
-#: src/gui/palette.cpp:101 src/net/ea/gui/partytab.cpp:43
-msgid "Party"
-msgstr "帮会"
-
-#: src/gui/palette.cpp:102 src/net/ea/gui/guildtab.cpp:45
-msgid "Guild"
-msgstr "帮会"
-
-#: src/gui/palette.cpp:103
-msgid "Server"
-msgstr "服务器"
-
-#: src/gui/palette.cpp:104
-msgid "Logger"
-msgstr "记录器"
-
-#: src/gui/palette.cpp:105
-msgid "Hyperlink"
-msgstr "超链接"
-
-# need more contents!!!
-#: src/gui/palette.cpp:107
-msgid "Being"
-msgstr "存在"
-
-#: src/gui/palette.cpp:108
-msgid "Other Players' Names"
-msgstr "其他玩家名"
-
-#: src/gui/palette.cpp:109
-msgid "Own Name"
-msgstr "自己的名字"
-
-#: src/gui/palette.cpp:110
-msgid "GM Names"
-msgstr "GM名"
-
-#: src/gui/palette.cpp:111
-msgid "NPCs"
-msgstr "NPCs"
-
-#: src/gui/palette.cpp:112
-msgid "Monsters"
-msgstr "怪物"
-
-#: src/gui/palette.cpp:114
-msgid "Unknown Item Type"
-msgstr "未知物品类型"
-
-#: src/gui/palette.cpp:115
-msgid "Generics"
-msgstr "一般的"
-
-#: src/gui/palette.cpp:116
-msgid "Hats"
-msgstr "帽子"
-
-#: src/gui/palette.cpp:117
-msgid "Usables"
-msgstr "可用的"
-
-#: src/gui/palette.cpp:118
-msgid "Shirts"
-msgstr "衬衫"
-
-#: src/gui/palette.cpp:119
-#, fuzzy
-msgid "One Handed Weapons"
-msgstr "单手武器"
-
-#: src/gui/palette.cpp:120
-msgid "Pants"
-msgstr "裤子"
-
-#: src/gui/palette.cpp:121
-msgid "Shoes"
-msgstr "鞋子"
-
-#: src/gui/palette.cpp:122
-#, fuzzy
-msgid "Two Handed Weapons"
-msgstr "单手武器"
-
-#: src/gui/palette.cpp:123
-msgid "Shields"
-msgstr "盾"
-
-#: src/gui/palette.cpp:124
-msgid "Rings"
-msgstr "指环"
-
-#: src/gui/palette.cpp:125
-msgid "Necklaces"
-msgstr "项链"
-
-#: src/gui/palette.cpp:126
-msgid "Arms"
-msgstr "武器"
-
-#: src/gui/palette.cpp:127
-msgid "Ammo"
-msgstr "弹药"
-
-#: src/gui/palette.cpp:129
-msgid "Particle Effects"
-msgstr "粒子效果"
-
-#: src/gui/palette.cpp:130
-msgid "Pickup Notification"
-msgstr "拾起通知"
-
-#: src/gui/palette.cpp:131
-msgid "Exp Notification"
-msgstr "到期通知"
-
-#: src/gui/palette.cpp:133
-#, fuzzy
-msgid "Player Hits Monster"
-msgstr "玩家攻击怪兽"
-
-#: src/gui/palette.cpp:135
-#, fuzzy
-msgid "Monster Hits Player"
-msgstr "怪兽击打玩家"
-
-#: src/gui/palette.cpp:136
-msgid "Critical Hit"
-msgstr "会心一击"
-
-#: src/gui/palette.cpp:137
-msgid "Misses"
-msgstr "失误"
-
-#: src/gui/palette.cpp:139
-msgid "HP Bar"
-msgstr "HP条"
-
-#: src/gui/palette.cpp:140
-msgid "3/4 HP Bar"
-msgstr "3/4 HP条"
-
-#: src/gui/palette.cpp:141
-msgid "1/2 HP Bar"
-msgstr "1/2 HP条"
-
-#: src/gui/palette.cpp:142
-msgid "1/4 HP Bar"
-msgstr "1/4 HP条"
-
-#: src/gui/popupmenu.cpp:84
+#: src/gui/popupmenu.cpp:83
 #, fuzzy, c-format
 msgid "Trade with %s..."
 msgstr "与%s交易中"
 
-#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:161
+#: src/gui/popupmenu.cpp:87 src/gui/popupmenu.cpp:158
 #, fuzzy, c-format
 msgid "Attack %s"
 msgstr "攻击 %+d"
 
-#: src/gui/popupmenu.cpp:92
+#: src/gui/popupmenu.cpp:91
 #, fuzzy, c-format
 msgid "Whisper %s"
 msgstr "密语"
 
-#: src/gui/popupmenu.cpp:101
+#: src/gui/popupmenu.cpp:100
 #, fuzzy, c-format
 msgid "Befriend %s"
 msgstr "@@friend|和%s成为朋友@@"
 
-#: src/gui/popupmenu.cpp:106
+#: src/gui/popupmenu.cpp:105
 #, fuzzy, c-format
 msgid "Disregard %s"
 msgstr "被忽视的"
 
-#: src/gui/popupmenu.cpp:109
+#: src/gui/popupmenu.cpp:108
 #, fuzzy, c-format
 msgid "Ignore %s"
 msgstr "忽略"
 
-#: src/gui/popupmenu.cpp:115 src/gui/popupmenu.cpp:124
+#: src/gui/popupmenu.cpp:114 src/gui/popupmenu.cpp:123
 #, c-format
 msgid "Unignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:118
+#: src/gui/popupmenu.cpp:117
 #, fuzzy, c-format
 msgid "Completely ignore %s"
 msgstr "@@ignore|完全忽略%s@@"
 
 #: src/gui/popupmenu.cpp:130
-#, c-format
-msgid "Follow %s"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:133
 #, fuzzy, c-format
 msgid "Invite %s to join your guild"
 msgstr "@@guild|邀请%s加入你的工会@@"
 
-#: src/gui/popupmenu.cpp:137
+#: src/gui/popupmenu.cpp:134
 #, fuzzy, c-format
 msgid "Invite %s to join your party"
 msgstr "@@party|邀请%s加入你的帮会@@"
 
-#: src/gui/popupmenu.cpp:144
+#: src/gui/popupmenu.cpp:141
 #, fuzzy
 msgid "Kick player"
 msgstr "踢出失败！"
 
-#: src/gui/popupmenu.cpp:153
+#: src/gui/popupmenu.cpp:150
 #, fuzzy, c-format
 msgid "Talk to %s"
 msgstr "@@talk|和%s交谈@@"
 
-#: src/gui/popupmenu.cpp:166
+#: src/gui/popupmenu.cpp:163
 #, fuzzy
 msgid "Kick monster"
 msgstr "@@admin-kick|踢掉怪物@@"
 
-#: src/gui/popupmenu.cpp:174
+#: src/gui/popupmenu.cpp:171
 #, fuzzy
 msgid "Add name to chat"
 msgstr "@@name|添加姓名至聊天@@"
 
-#: src/gui/popupmenu.cpp:191
+#: src/gui/popupmenu.cpp:188
 #, fuzzy, c-format
 msgid "Pick up %s"
 msgstr "捡起"
 
-#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:400
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:387
 #, fuzzy
 msgid "Add to chat"
 msgstr "@@chat|添加到聊天@@"
 
-#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:70
-msgid "Store"
-msgstr "存储"
-
-#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:71
-msgid "Retrieve"
-msgstr "取回"
-
 #: src/gui/quitdialog.cpp:44
 msgid "Switch server"
 msgstr "交换服务器"
@@ -1359,52 +1177,65 @@ msgstr "密码不能少于%d个字符。"
 msgid "Passwords do not match."
 msgstr "密码不一致."
 
-#: src/gui/serverdialog.cpp:134
+#: src/gui/serverdialog.cpp:197
 #, fuzzy
 msgid "Choose Your Server"
 msgstr "选择你的服务器"
 
-#: src/gui/serverdialog.cpp:141 src/gui/widgets/chattab.cpp:139
+#: src/gui/serverdialog.cpp:206 src/gui/widgets/chattab.cpp:142
 msgid "Server:"
 msgstr "服务器："
 
-#: src/gui/serverdialog.cpp:142
+#: src/gui/serverdialog.cpp:207
 msgid "Port:"
 msgstr "端口："
 
-#: src/gui/serverdialog.cpp:143
+#: src/gui/serverdialog.cpp:208
 #, fuzzy
 msgid "Server type:"
 msgstr "服务器："
 
-#: src/gui/serverdialog.cpp:183
+#: src/gui/serverdialog.cpp:229
 #, fuzzy
 msgid "Connect"
 msgstr "连接中..."
 
-#: src/gui/serverdialog.cpp:184
+#: src/gui/serverdialog.cpp:230
 #, fuzzy
 msgid "Custom Server"
 msgstr "自定义鼠标"
 
-#: src/gui/serverdialog.cpp:262
+#: src/gui/serverdialog.cpp:324
 msgid "Please type both the address and the port of a server."
 msgstr "请输入服务器的IP地址和端口"
 
-#: src/gui/serverdialog.cpp:411
+#: src/gui/serverdialog.cpp:441
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:417
+#: src/gui/serverdialog.cpp:447
 #, fuzzy
 msgid "Waiting for server..."
 msgstr "等待服务器中"
 
-#: src/gui/serverdialog.cpp:421
+#: src/gui/serverdialog.cpp:451
 msgid "Preparing download"
 msgstr ""
 
+#: src/gui/serverdialog.cpp:455
+msgid "Error retreiving server list!"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:550
+msgid "requires a newer version"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:552
+#, c-format
+msgid "requires v%s"
+msgstr ""
+
 #: src/gui/setup_audio.cpp:42
 msgid "Sound"
 msgstr "声音"
@@ -1438,54 +1269,54 @@ msgstr ""
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:44
+#: src/gui/setup_colors.cpp:46
 msgid "This is what the color looks like"
 msgstr "这就是该色彩看起来的样子"
 
-#: src/gui/setup_colors.cpp:49
+#: src/gui/setup_colors.cpp:51
 msgid "Colors"
 msgstr "颜色"
 
-#: src/gui/setup_colors.cpp:70
+#: src/gui/setup_colors.cpp:72
 #, fuzzy
 msgid "Type:"
 msgstr "类型： "
 
-#: src/gui/setup_colors.cpp:81 src/gui/setup_colors.cpp:433
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:331
 msgid "Static"
 msgstr "静止的"
 
-#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:84
-#: src/gui/setup_colors.cpp:434
+#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
+#: src/gui/setup_colors.cpp:332
 msgid "Pulse"
 msgstr "脉冲"
 
-#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
+#: src/gui/setup_colors.cpp:333
 msgid "Rainbow"
 msgstr "彩虹"
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
+#: src/gui/setup_colors.cpp:333
 msgid "Spectrum"
 msgstr "色谱"
 
-#: src/gui/setup_colors.cpp:92
+#: src/gui/setup_colors.cpp:94
 #, fuzzy
 msgid "Delay:"
 msgstr "显示： "
 
-#: src/gui/setup_colors.cpp:107
+#: src/gui/setup_colors.cpp:109
 #, fuzzy
 msgid "Red:"
 msgstr "红： "
 
-#: src/gui/setup_colors.cpp:122
+#: src/gui/setup_colors.cpp:124
 #, fuzzy
 msgid "Green:"
 msgstr "绿： "
 
-#: src/gui/setup_colors.cpp:137
+#: src/gui/setup_colors.cpp:139
 #, fuzzy
 msgid "Blue:"
 msgstr "蓝： "
@@ -1531,590 +1362,601 @@ msgid "Assign"
 msgstr "分配"
 
 #: src/gui/setup_keyboard.cpp:90
+#, fuzzy
+msgid "Unassign"
+msgstr "分配"
+
+#: src/gui/setup_keyboard.cpp:94
 msgid "Default"
 msgstr "预设"
 
-#: src/gui/setup_keyboard.cpp:119
+#: src/gui/setup_keyboard.cpp:125
 msgid "Key Conflict(s) Detected."
 msgstr "检测到按键冲突。"
 
-#: src/gui/setup_players.cpp:57
+#: src/gui/setup_players.cpp:58
 msgid "Name"
 msgstr "姓名"
 
-#: src/gui/setup_players.cpp:58
+#: src/gui/setup_players.cpp:59
 msgid "Relation"
 msgstr "关系"
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:64
 msgid "Neutral"
 msgstr "中立"
 
-#: src/gui/setup_players.cpp:64
+#: src/gui/setup_players.cpp:65
 msgid "Friend"
 msgstr "好友"
 
-#: src/gui/setup_players.cpp:65
+#: src/gui/setup_players.cpp:66
 msgid "Disregarded"
 msgstr "被忽视的"
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_players.cpp:67
 msgid "Ignored"
 msgstr "忽略"
 
-#: src/gui/setup_players.cpp:208 src/gui/setup_video.cpp:132
+#: src/gui/setup_players.cpp:206 src/gui/setup_video.cpp:153
 msgid "???"
 msgstr "？？？"
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_players.cpp:225
 msgid "Allow trading"
 msgstr "允许交易"
 
-#: src/gui/setup_players.cpp:228
+#: src/gui/setup_players.cpp:227
 msgid "Allow whispers"
 msgstr "允许密语"
 
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:231
 msgid "Put all whispers in tabs"
 msgstr "将所有密语放于标签夜"
 
-#: src/gui/setup_players.cpp:234
+#: src/gui/setup_players.cpp:233
 #, fuzzy
 msgid "Show gender"
 msgstr "显示姓名"
 
-#: src/gui/setup_players.cpp:236
+#: src/gui/setup_players.cpp:235
+#, fuzzy
+msgid "Enable Chat log"
+msgstr "无法出售."
+
+#: src/gui/setup_players.cpp:237
 msgid "Players"
 msgstr "玩家"
 
-#: src/gui/setup_players.cpp:261
+#: src/gui/setup_players.cpp:262
 msgid "When ignoring:"
 msgstr "当忽略时："
 
-#: src/gui/setup_video.cpp:113
+#: src/gui/setup_video.cpp:134
 msgid "Tiny"
 msgstr "微小"
 
-#: src/gui/setup_video.cpp:114
+#: src/gui/setup_video.cpp:135
 msgid "Small"
 msgstr "小"
 
-#: src/gui/setup_video.cpp:115
+#: src/gui/setup_video.cpp:136
 msgid "Medium"
 msgstr "中等"
 
-#: src/gui/setup_video.cpp:116
+#: src/gui/setup_video.cpp:137
 msgid "Large"
 msgstr "大"
 
-#: src/gui/setup_video.cpp:142
+#: src/gui/setup_video.cpp:163
 msgid "No text"
 msgstr "无文本"
 
-#: src/gui/setup_video.cpp:144
+#: src/gui/setup_video.cpp:164
+msgid "Text"
+msgstr "文本"
+
+#: src/gui/setup_video.cpp:165
 msgid "Bubbles, no names"
 msgstr "气泡，无名"
 
-#: src/gui/setup_video.cpp:145
+#: src/gui/setup_video.cpp:166
 msgid "Bubbles with names"
 msgstr "有名气泡"
 
-#: src/gui/setup_video.cpp:157
+#: src/gui/setup_video.cpp:178
 msgid "off"
 msgstr "关闭"
 
-#: src/gui/setup_video.cpp:158 src/gui/setup_video.cpp:171
+#: src/gui/setup_video.cpp:179 src/gui/setup_video.cpp:192
 msgid "low"
 msgstr "低"
 
-#: src/gui/setup_video.cpp:159 src/gui/setup_video.cpp:173
+#: src/gui/setup_video.cpp:180 src/gui/setup_video.cpp:194
 msgid "high"
 msgstr "高"
 
-#: src/gui/setup_video.cpp:172
+#: src/gui/setup_video.cpp:193
 msgid "medium"
 msgstr "中"
 
-#: src/gui/setup_video.cpp:174
+#: src/gui/setup_video.cpp:195
 msgid "max"
 msgstr "最大"
 
-#: src/gui/setup_video.cpp:196
+#: src/gui/setup_video.cpp:217
 msgid "Full screen"
 msgstr "全屏"
 
-#: src/gui/setup_video.cpp:197
+#: src/gui/setup_video.cpp:218
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:198
+#: src/gui/setup_video.cpp:219
 msgid "Custom cursor"
 msgstr "自定义鼠标"
 
-#: src/gui/setup_video.cpp:200
+#: src/gui/setup_video.cpp:221
 msgid "Visible names"
 msgstr "可见姓名"
 
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:223
 msgid "Particle effects"
 msgstr "粒子效果"
 
-#: src/gui/setup_video.cpp:204
+#: src/gui/setup_video.cpp:225
 #, fuzzy
 msgid "Show own name"
 msgstr "显示姓名"
 
-#: src/gui/setup_video.cpp:205
+#: src/gui/setup_video.cpp:226
+msgid "Log NPC dialogue"
+msgstr ""
+
+#: src/gui/setup_video.cpp:227
 msgid "Show pickup notification"
 msgstr "显示拾起通知"
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:207
+#. TRANSLATORS: Refers to "Show pickup notification"
+#: src/gui/setup_video.cpp:229
 msgid "in chat"
 msgstr "聊天中"
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:209
+#. TRANSLATORS: Refers to "Show pickup notification"
+#: src/gui/setup_video.cpp:231
 msgid "as particle"
 msgstr "作为发射武器"
 
-#: src/gui/setup_video.cpp:214
+#: src/gui/setup_video.cpp:236
 #, fuzzy
 msgid "FPS limit:"
 msgstr "FPS限制："
 
-#: src/gui/setup_video.cpp:225
+#: src/gui/setup_video.cpp:247
+msgid "Disable transparency (Low CPU mode)"
+msgstr ""
+
+#: src/gui/setup_video.cpp:250
 msgid "Video"
 msgstr "视频"
 
-#: src/gui/setup_video.cpp:227
+#: src/gui/setup_video.cpp:252
 #, fuzzy
-msgid "Show monster damage"
+msgid "Show damage"
 msgstr "显示姓名"
 
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:258
 msgid "Overhead text"
 msgstr "头顶文字"
 
-#: src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:259
 msgid "Gui opacity"
 msgstr "Gui 透明度"
 
-#: src/gui/setup_video.cpp:235
+#: src/gui/setup_video.cpp:260
 msgid "Ambient FX"
 msgstr "环境音效"
 
-#: src/gui/setup_video.cpp:236
+#: src/gui/setup_video.cpp:261
 #, fuzzy
 msgid "Particle detail"
 msgstr "纹理细节"
 
-#: src/gui/setup_video.cpp:237
+#: src/gui/setup_video.cpp:262
 msgid "Font size"
 msgstr "字体大小"
 
-#: src/gui/setup_video.cpp:251 src/gui/setup_video.cpp:454
-#: src/gui/setup_video.cpp:568
+#: src/gui/setup_video.cpp:277 src/gui/setup_video.cpp:532
+#: src/gui/setup_video.cpp:662
 #, fuzzy
 msgid "None"
 msgstr "否"
 
-#: src/gui/setup_video.cpp:381
+#: src/gui/setup_video.cpp:426
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:387
+#: src/gui/setup_video.cpp:432
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:398
+#: src/gui/setup_video.cpp:443
 #, fuzzy
 msgid "Switching to Full Screen"
 msgstr "切换到全屏"
 
-#: src/gui/setup_video.cpp:399
+#: src/gui/setup_video.cpp:444
 msgid "Restart needed for changes to take effect."
 msgstr "重启生效"
 
-#: src/gui/setup_video.cpp:411
+#: src/gui/setup_video.cpp:458
 #, fuzzy
 msgid "Changing to OpenGL"
 msgstr "改变成OpenGL"
 
-#: src/gui/setup_video.cpp:412
+#: src/gui/setup_video.cpp:459
+msgid ""
+"Applying change to OpenGL requires restart. In case OpenGL messes up your "
+"game graphics, restart the game with the command line option \"--no-opengl\"."
+msgstr ""
+
+#: src/gui/setup_video.cpp:466
+msgid "Deactivating OpenGL"
+msgstr ""
+
+#: src/gui/setup_video.cpp:467
 msgid "Applying change to OpenGL requires restart."
 msgstr "运用改变为OpenGL需要重新开始"
 
-#: src/gui/setup_video.cpp:486 src/gui/setup_video.cpp:491
+#: src/gui/setup_video.cpp:475
+#, fuzzy
+msgid "Transparency disabled"
+msgstr "经验共享关闭。"
+
+#: src/gui/setup_video.cpp:476 src/gui/setup_video.cpp:484
+msgid "You must restart to apply changes."
+msgstr ""
+
+#: src/gui/setup_video.cpp:483
+msgid "Transparency enabled"
+msgstr ""
+
+#: src/gui/setup_video.cpp:576 src/gui/setup_video.cpp:581
 #, fuzzy
 msgid "Screen Resolution Changed"
 msgstr "分辨率已变更"
 
-#: src/gui/setup_video.cpp:487 src/gui/setup_video.cpp:492
+#: src/gui/setup_video.cpp:577 src/gui/setup_video.cpp:582
 msgid "Restart your client for the change to take effect."
 msgstr "重启您的游戏客户端以使变更生效。"
 
-#: src/gui/setup_video.cpp:489
+#: src/gui/setup_video.cpp:579
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:522
+#: src/gui/setup_video.cpp:612
 #, fuzzy
 msgid "Particle Effect Settings Changed."
 msgstr "粒子效果设置已变更。"
 
-#: src/gui/setup_video.cpp:523
+#: src/gui/setup_video.cpp:613
 msgid "Changes will take effect on map change."
 msgstr "变更会在地图更换时生效。"
 
-#: src/gui/skilldialog.cpp:197 src/gui/windowmenu.cpp:58
+#: src/gui/skilldialog.cpp:212 src/gui/windowmenu.cpp:59
 msgid "Skills"
 msgstr "技能"
 
-#: src/gui/skilldialog.cpp:208
+#: src/gui/skilldialog.cpp:223
 msgid "Up"
 msgstr "升级"
 
-#: src/gui/skilldialog.cpp:262
+#: src/gui/skilldialog.cpp:269
 #, fuzzy, c-format
 msgid "Skill points available: %d"
 msgstr "技能点数：%d"
 
-#: src/gui/skilldialog.cpp:314
+#: src/gui/skilldialog.cpp:351
 #, fuzzy, c-format
 msgid "Skill Set %d"
 msgstr "技能点数：%d"
 
-#: src/gui/skilldialog.cpp:323
+#: src/gui/skilldialog.cpp:360
 #, fuzzy, c-format
 msgid "Skill %d"
 msgstr "技能"
 
-#: src/gui/skilldialog.cpp:405
+#: src/gui/skilldialog.cpp:442
 #, fuzzy, c-format
 msgid "Lvl: %d (%+d)"
 msgstr "等级：%d"
 
-#: src/gui/skilldialog.cpp:416
+#: src/gui/skilldialog.cpp:453
 #, fuzzy, c-format
 msgid "Lvl: %d"
 msgstr "等级：%d"
 
-#: src/gui/socialwindow.cpp:117
+#: src/gui/socialwindow.cpp:126
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:126
+#: src/gui/socialwindow.cpp:139
 #, fuzzy, c-format
 msgid "Guild %s quit requested."
 msgstr "帮会已创建"
 
-#: src/gui/socialwindow.cpp:136
+#: src/gui/socialwindow.cpp:153
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:137
+#: src/gui/socialwindow.cpp:154
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:146
+#: src/gui/socialwindow.cpp:163
 #, fuzzy
 msgid "Leave Guild?"
 msgstr "创建帮会"
 
-#: src/gui/socialwindow.cpp:147
+#: src/gui/socialwindow.cpp:164
 #, fuzzy, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "确定退出游戏？"
 
-#: src/gui/socialwindow.cpp:182
+#: src/gui/socialwindow.cpp:207 src/net/tmwa/partyhandler.cpp:330
 #, fuzzy, c-format
 msgid "Invited user %s to party."
 msgstr "邀请一个用户加入队伍"
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:218
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:199
+#: src/gui/socialwindow.cpp:232
 #, fuzzy
 msgid "Member Invite to Party"
 msgstr "邀请一个用户加入队伍"
 
-#: src/gui/socialwindow.cpp:200
+#: src/gui/socialwindow.cpp:233
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:209
+#: src/gui/socialwindow.cpp:242
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:210
+#: src/gui/socialwindow.cpp:243
 #, fuzzy, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "确定退出游戏？"
 
-#: src/gui/socialwindow.cpp:239
+#: src/gui/socialwindow.cpp:272
 msgid "Create Guild"
 msgstr "创建帮会"
 
-#: src/gui/socialwindow.cpp:240 src/gui/socialwindow.cpp:564
+#: src/gui/socialwindow.cpp:273 src/gui/socialwindow.cpp:620
 #, fuzzy
 msgid "Create Party"
 msgstr "创建角色"
 
-#: src/gui/socialwindow.cpp:279 src/gui/windowmenu.cpp:60
+#: src/gui/socialwindow.cpp:312 src/gui/windowmenu.cpp:64
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:297
+#: src/gui/socialwindow.cpp:330
 #, fuzzy
 msgid "Invite"
 msgstr "邀请用户"
 
-#: src/gui/socialwindow.cpp:298
+#: src/gui/socialwindow.cpp:331
 #, fuzzy
 msgid "Leave"
 msgstr "大"
 
-#: src/gui/socialwindow.cpp:394
+#: src/gui/socialwindow.cpp:443
 #, fuzzy, c-format
 msgid "Accepted party invite from %s."
 msgstr "接受%s的邀请。"
 
-#: src/gui/socialwindow.cpp:400
+#: src/gui/socialwindow.cpp:449
 #, fuzzy, c-format
 msgid "Rejected party invite from %s."
 msgstr "拒绝%s的邀请。"
 
-#: src/gui/socialwindow.cpp:413
+#: src/gui/socialwindow.cpp:462
 #, fuzzy, c-format
 msgid "Accepted guild invite from %s."
 msgstr "接受%s的邀请。"
 
-#: src/gui/socialwindow.cpp:419
+#: src/gui/socialwindow.cpp:468
 #, fuzzy, c-format
 msgid "Rejected guild invite from %s."
 msgstr "拒绝%s的邀请。"
 
-#: src/gui/socialwindow.cpp:463
+#: src/gui/socialwindow.cpp:497
+msgid "Creating guild failed, please choose a shorter name."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:504
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:477
+#: src/gui/socialwindow.cpp:520
+msgid "Creating party failed, please choose a shorter name."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:527
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:484
+#: src/gui/socialwindow.cpp:541
 #, fuzzy
 msgid "Guild Name"
 msgstr "帮会"
 
-#: src/gui/socialwindow.cpp:485
+#: src/gui/socialwindow.cpp:542
 #, fuzzy
 msgid "Choose your guild's name."
 msgstr "选择你的服务器"
 
-#: src/gui/socialwindow.cpp:497
+#: src/gui/socialwindow.cpp:554
 #, fuzzy
 msgid "Received guild request, but one already exists."
 msgstr "接受到一个已经存在的帮会邀请。"
 
-#: src/gui/socialwindow.cpp:502
+#: src/gui/socialwindow.cpp:559
 #, fuzzy, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s已经邀请你加入帮会%s。"
 
-#: src/gui/socialwindow.cpp:507
+#: src/gui/socialwindow.cpp:564
 #, fuzzy
 msgid "Accept Guild Invite"
 msgstr "接受帮会邀请"
 
-#: src/gui/socialwindow.cpp:519
+#: src/gui/socialwindow.cpp:576
 msgid "Received party request, but one already exists."
 msgstr "接受到一个已经存在的帮会邀请。"
 
-#: src/gui/socialwindow.cpp:529
+#: src/gui/socialwindow.cpp:585
 #, fuzzy
 msgid "You have been invited you to join a party."
 msgstr "%s已经邀请你加入他们的帮会。"
 
-#: src/gui/socialwindow.cpp:533
+#: src/gui/socialwindow.cpp:589
 #, fuzzy, c-format
 msgid "You have been invited to join the %s party."
 msgstr "%s已经邀请你加入帮会%s。"
 
-#: src/gui/socialwindow.cpp:541
+#: src/gui/socialwindow.cpp:597
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s已经邀请你加入他们的帮会。"
 
-#: src/gui/socialwindow.cpp:546
+#: src/gui/socialwindow.cpp:602
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s已经邀请你加入帮会%s。"
 
-#: src/gui/socialwindow.cpp:554
+#: src/gui/socialwindow.cpp:610
 msgid "Accept Party Invite"
 msgstr "接受帮会邀请"
 
-#: src/gui/socialwindow.cpp:565
+#: src/gui/socialwindow.cpp:621
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:570
+#: src/gui/socialwindow.cpp:626
 #, fuzzy
 msgid "Party Name"
 msgstr "帮会"
 
-#: src/gui/socialwindow.cpp:571
+#: src/gui/socialwindow.cpp:627
 #, fuzzy
 msgid "Choose your party's name."
 msgstr "选择你的服务器"
 
-#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:59
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:62
 msgid "Specials"
 msgstr ""
 
-#: src/gui/specialswindow.cpp:174
-#, c-format
-msgid "Specials Set %d"
-msgstr ""
-
-#: src/gui/specialswindow.cpp:191
-#, c-format
-msgid "Special %d"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:99 src/gui/statuswindow.cpp:247
+#: src/gui/statuswindow.cpp:113 src/gui/statuswindow.cpp:215
+#: src/gui/statuswindow.cpp:262
 #, c-format
 msgid "Level: %d"
 msgstr "等级：%d"
 
-#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:211
+#: src/gui/statuswindow.cpp:114 src/gui/statuswindow.cpp:208
+#: src/gui/statuswindow.cpp:239
 #, c-format
 msgid "Money: %s"
 msgstr "金币: %s"
 
-#: src/gui/statuswindow.cpp:102
+#: src/gui/statuswindow.cpp:117
 msgid "HP:"
 msgstr "HP："
 
-#: src/gui/statuswindow.cpp:107
+#: src/gui/statuswindow.cpp:122
 msgid "Exp:"
 msgstr "经验："
 
-#: src/gui/statuswindow.cpp:112
+#: src/gui/statuswindow.cpp:130
 msgid "MP:"
 msgstr "MP："
 
-#: src/gui/statuswindow.cpp:132 src/gui/statuswindow.cpp:219
+#: src/gui/statuswindow.cpp:158 src/gui/statuswindow.cpp:275
 #, c-format
 msgid "Job: %d"
 msgstr "职业：%d"
 
-#: src/gui/statuswindow.cpp:133
+#: src/gui/statuswindow.cpp:159
 msgid "Job:"
 msgstr "职业："
 
-#: src/gui/statuswindow.cpp:194
-#, fuzzy
-msgid "HP"
-msgstr "HP："
-
-#: src/gui/statuswindow.cpp:200
-#, fuzzy
-msgid "MP"
-msgstr "MP："
-
-#: src/gui/statuswindow.cpp:206
-#, fuzzy
-msgid "Exp"
-msgstr "经验："
-
-#: src/gui/statuswindow.cpp:215
-#, fuzzy
-msgid "Money"
-msgstr "金钱：%d"
-
-#: src/gui/statuswindow.cpp:225
-#, fuzzy
-msgid "Job"
-msgstr "职业："
-
-#: src/gui/statuswindow.cpp:229
+#: src/gui/statuswindow.cpp:211 src/gui/statuswindow.cpp:247
 #, fuzzy, c-format
 msgid "Character points: %d"
 msgstr "角色状态可以"
 
-#: src/gui/statuswindow.cpp:235
+#: src/gui/statuswindow.cpp:255
 #, fuzzy, c-format
 msgid "Correction points: %d"
 msgstr "技能点数：%d"
 
-#: src/gui/statuswindow.cpp:251
-#, fuzzy
-msgid "Level"
-msgstr "等级：%d"
-
-#: src/gui/storagewindow.cpp:58
-msgid "Storage"
-msgstr "仓库"
-
-#: src/gui/trade.cpp:52
+#: src/gui/trade.cpp:53
 msgid "Propose trade"
 msgstr "打算交易"
 
-#: src/gui/trade.cpp:53
+#: src/gui/trade.cpp:54
 msgid "Confirmed. Waiting..."
 msgstr "已确认。等待中……"
 
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:55
 msgid "Agree trade"
 msgstr "同意交易"
 
-#: src/gui/trade.cpp:55
+#: src/gui/trade.cpp:56
 msgid "Agreed. Waiting..."
 msgstr "已同意。等待中……"
 
-#: src/gui/trade.cpp:58
+#: src/gui/trade.cpp:59
 msgid "Trade: You"
 msgstr "交易：你"
 
-#: src/gui/trade.cpp:74 src/gui/trade.cpp:75
+#: src/gui/trade.cpp:73 src/gui/trade.cpp:74
 msgid "Trade"
 msgstr "交易"
 
-#: src/gui/trade.cpp:77
+#: src/gui/trade.cpp:76
 msgid "Add"
 msgstr "添加"
 
-#: src/gui/trade.cpp:99 src/gui/trade.cpp:135
+#: src/gui/trade.cpp:98 src/gui/trade.cpp:134
 #, fuzzy, c-format
 msgid "You get %s"
 msgstr "你得到%s。"
 
-#: src/gui/trade.cpp:100
+#: src/gui/trade.cpp:99
 msgid "You give:"
 msgstr "你给予："
 
-#: src/gui/trade.cpp:104
+#: src/gui/trade.cpp:103
 msgid "Change"
 msgstr "改变"
 
-#: src/gui/trade.cpp:275
+#: src/gui/trade.cpp:262
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr "添加物品失败。你不能覆盖窗口中的该类物品。"
 
-#: src/gui/trade.cpp:318
+#: src/gui/trade.cpp:304
 msgid "You don't have enough money."
 msgstr "你没有足够的钱币."
 
@@ -2135,22 +1977,22 @@ msgstr "连接中..."
 msgid "Play"
 msgstr "开始"
 
-#: src/gui/updatewindow.cpp:405
+#: src/gui/updatewindow.cpp:417
 msgid "##1  The update process is incomplete."
 msgstr "##1 更新过程不完整。"
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:407
+#: src/gui/updatewindow.cpp:419
 msgid "##1  It is strongly recommended that"
 msgstr "##1 强烈建议"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:409
+#: src/gui/updatewindow.cpp:421
 #, fuzzy
 msgid "##1  you try again later."
 msgstr "##1 您稍候再次尝试"
 
-#: src/gui/updatewindow.cpp:501
+#: src/gui/updatewindow.cpp:515
 msgid "Completed"
 msgstr "已完成"
 
@@ -2230,64 +2072,64 @@ msgstr "需要一个用户来操作"
 msgid "Need a user to kick!"
 msgstr "踢人时需要指定用户！"
 
-#: src/gui/widgets/chattab.cpp:118
+#: src/gui/widgets/chattab.cpp:121
 msgid "Global announcement:"
 msgstr "全局公告："
 
-#: src/gui/widgets/chattab.cpp:124
+#: src/gui/widgets/chattab.cpp:127
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "%s 全局公告："
 
-#: src/gui/widgets/chattab.cpp:150
+#: src/gui/widgets/chattab.cpp:153
 #, fuzzy, c-format
 msgid "%s whispers: %s"
 msgstr "%s悄悄的对您说： "
 
-#: src/gui/widgets/whispertab.cpp:51
+#: src/gui/widgets/whispertab.cpp:53
 msgid "Cannot send empty chat!"
 msgstr "无法发送空白信息！"
 
-#: src/gui/widgets/whispertab.cpp:70
+#: src/gui/widgets/whispertab.cpp:72
 msgid "/ignore > Ignore the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:71
+#: src/gui/widgets/whispertab.cpp:73
 msgid "/unignore > Stop ignoring the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:72
+#: src/gui/widgets/whispertab.cpp:74
 msgid "/close > Close the whisper tab"
 msgstr "/close > 关闭密语标签页"
 
-#: src/gui/widgets/whispertab.cpp:82
+#: src/gui/widgets/whispertab.cpp:84
 msgid "Command: /close"
 msgstr "命令: /close"
 
-#: src/gui/widgets/whispertab.cpp:83
+#: src/gui/widgets/whispertab.cpp:85
 msgid "This command closes the current whisper tab."
 msgstr "该命令关闭当前密语标签页。"
 
-#: src/gui/widgets/whispertab.cpp:87
+#: src/gui/widgets/whispertab.cpp:89
 #, fuzzy
 msgid "Command: /ignore"
 msgstr "命令：/item"
 
-#: src/gui/widgets/whispertab.cpp:88
+#: src/gui/widgets/whispertab.cpp:90
 #, fuzzy
 msgid "This command ignores the other player regardless of current relations."
 msgstr "该条命令可显现当前在线用户总数。"
 
-#: src/gui/widgets/whispertab.cpp:94
+#: src/gui/widgets/whispertab.cpp:96
 #, fuzzy
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr "该命令开始记录聊天日志至文件<文件名>。"
 
-#: src/gui/windowmenu.cpp:55
+#: src/gui/windowmenu.cpp:54
 msgid "Status"
 msgstr "状态"
 
-#: src/gui/windowmenu.cpp:61
+#: src/gui/windowmenu.cpp:65
 msgid "Shortcut"
 msgstr "快捷键"
 
@@ -2306,638 +2148,1004 @@ msgstr "改变"
 msgid "Choose World"
 msgstr "选择你的服务器"
 
-#: src/keyboardconfig.cpp:40
+#: src/keyboardconfig.cpp:39
 msgid "Move Up"
 msgstr "向上移动"
 
-#: src/keyboardconfig.cpp:41
+#: src/keyboardconfig.cpp:40
 msgid "Move Down"
 msgstr "向下移动"
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:41
 msgid "Move Left"
 msgstr "向左移动"
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:42
 msgid "Move Right"
 msgstr "向右移动"
 
-#: src/keyboardconfig.cpp:44 src/net/ea/generalhandler.cpp:223
+#: src/keyboardconfig.cpp:43 src/net/tmwa/generalhandler.cpp:237
 msgid "Attack"
 msgstr "攻击"
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:44
 msgid "Target & Attack"
 msgstr "对准并攻击"
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:45
 msgid "Smilie"
 msgstr "笑脸"
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:46
 msgid "Talk"
 msgstr "说话"
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:47
 msgid "Stop Attack"
 msgstr "停止攻击"
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:48
 #, fuzzy
 msgid "Target Monster"
 msgstr "对准最近目标"
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboardconfig.cpp:49
 msgid "Target NPC"
 msgstr "目标NPC"
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:50
 msgid "Target Player"
 msgstr "目标玩家"
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:51
 msgid "Pickup"
 msgstr "捡起"
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:52
 msgid "Hide Windows"
 msgstr "隐藏窗口"
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:53
 msgid "Sit"
 msgstr "坐下"
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:54
 msgid "Screenshot"
 msgstr "屏幕快照"
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:55
 msgid "Enable/Disable Trading"
 msgstr "开启/关闭交易"
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:56
 msgid "Find Path to Mouse"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58 src/keyboardconfig.cpp:59
-#: src/keyboardconfig.cpp:60 src/keyboardconfig.cpp:61
-#: src/keyboardconfig.cpp:62 src/keyboardconfig.cpp:63
-#: src/keyboardconfig.cpp:64 src/keyboardconfig.cpp:65
-#: src/keyboardconfig.cpp:66 src/keyboardconfig.cpp:67
-#: src/keyboardconfig.cpp:68 src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:57 src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60
+#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62
+#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64
+#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68
 #, c-format
 msgid "Item Shortcut %d"
 msgstr "物品快捷 %d"
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:69
 msgid "Help Window"
 msgstr "帮助窗口"
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:70
 msgid "Status Window"
 msgstr "状态窗口"
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:71
 msgid "Inventory Window"
 msgstr "物品栏窗口"
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:72
 msgid "Equipment Window"
 msgstr "装备窗口"
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:73
 msgid "Skill Window"
 msgstr "技能窗口"
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:74
 msgid "Minimap Window"
 msgstr "小地图窗口"
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:75
 msgid "Chat Window"
 msgstr "聊天窗口"
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:76
 msgid "Item Shortcut Window"
 msgstr "物品快捷窗口"
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:77
 msgid "Setup Window"
 msgstr "设置窗口"
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:78
 msgid "Debug Window"
 msgstr "Debug窗口"
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:79
 #, fuzzy
 msgid "Social Window"
 msgstr "技能窗口"
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:80
 msgid "Emote Shortcut Window"
 msgstr "表情快捷窗口"
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:81
 #, fuzzy
 msgid "Outfits Window"
 msgstr "状态窗口"
 
-#: src/keyboardconfig.cpp:83
+#: src/keyboardconfig.cpp:82
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:83
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86
-#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88
-#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90
-#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92
-#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:84 src/keyboardconfig.cpp:85
+#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:87
+#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:89
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:91
+#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:93
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:95
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "表情快捷键为 %d"
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:96
 msgid "Toggle Chat"
 msgstr "切换聊天"
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:97
 msgid "Scroll Chat Up"
 msgstr "向上滚动聊天记录"
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:98
 msgid "Scroll Chat Down"
 msgstr "向下滚动聊天记录"
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:99
 msgid "Previous Chat Tab"
 msgstr "上一个聊天窗口标签页"
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:100
 msgid "Next Chat Tab"
 msgstr "下一个聊天窗口标签页"
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:101
 msgid "Select OK"
 msgstr "选择OK"
 
-#: src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:103
 msgid "Ignore input 1"
 msgstr "忽略输入1"
 
-#: src/keyboardconfig.cpp:105
+#: src/keyboardconfig.cpp:104
 msgid "Ignore input 2"
 msgstr "忽略输入2"
 
-#: src/keyboardconfig.cpp:178
+#: src/keyboardconfig.cpp:183
 #, fuzzy, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr "解决按键冲突，否者游戏过程中可能发生奇怪行为。"
 
-#: src/localplayer.cpp:913
+#: src/localplayer.cpp:985
 msgid "Unable to pick up item."
 msgstr "无法拾取物品。"
 
 #. TRANSLATORS: This sentence may be translated differently
 #. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:922
+#: src/localplayer.cpp:994
 #, fuzzy, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "你捡起%s [@@%d|%s@@]。"
 msgstr[1] "你捡起%s [@@%d|%s@@]。"
 
-#: src/main.cpp:43
+#: src/main.cpp:42
 msgid "mana [options] [mana-file]"
 msgstr ""
 
+#: src/main.cpp:43
+msgid "[mana-file] : The mana file is an XML file (.mana)"
+msgstr ""
+
 #: src/main.cpp:44
+msgid "              used to set custom parameters"
+msgstr ""
+
+#: src/main.cpp:45
+msgid "              to the mana client."
+msgstr ""
+
+#: src/main.cpp:47
 msgid "Options:"
 msgstr "选项："
 
-#: src/main.cpp:45
+#: src/main.cpp:48
 #, fuzzy
 msgid "  -v --version        : Display the version"
 msgstr "  -v --version\t:显示版本号"
 
-#: src/main.cpp:46
+#: src/main.cpp:49
 #, fuzzy
 msgid "  -h --help           : Display this help"
 msgstr "  -h --help\t: 显示该帮助"
 
-#: src/main.cpp:47
+#: src/main.cpp:50
 #, fuzzy
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr "  -C --config-file\t: 使用的配置文件"
 
-#: src/main.cpp:48
+#: src/main.cpp:51
 #, fuzzy
 msgid "  -U --username       : Login with this username"
 msgstr "  -U --username\t:以该用户名登录游戏"
 
-#: src/main.cpp:49
+#: src/main.cpp:52
 #, fuzzy
 msgid "  -P --password       : Login with this password"
 msgstr "  -P --password\t: 以该密码登录"
 
-#: src/main.cpp:50
+#: src/main.cpp:53
 #, fuzzy
 msgid "  -c --character      : Login with this character"
 msgstr "  -c --character\t: 以该角色登录"
 
-#: src/main.cpp:51
+#: src/main.cpp:54
 #, fuzzy
 msgid "  -s --server         : Login server name or IP"
 msgstr "  -s --server\t: 登录服务器名或IP"
 
-#: src/main.cpp:52
+#: src/main.cpp:55
 #, fuzzy
 msgid "  -p --port           : Login server port"
 msgstr "  -p --port\t: 登录服务器端口"
 
-#: src/main.cpp:53
+#: src/main.cpp:56
 #, fuzzy
 msgid "     --update-host    : Use this update host"
 msgstr "  -H --update-host\t: 使用该更新主机"
 
-#: src/main.cpp:54
+#: src/main.cpp:57
 #, fuzzy
 msgid "  -D --default        : Choose default character server and character"
 msgstr "  -D --default\t: 选择某人角色服务器和角色"
 
-#: src/main.cpp:56
+#: src/main.cpp:59
 #, fuzzy
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr "  -u --skip-update\t:跳过下载更新"
 
-#: src/main.cpp:57
+#: src/main.cpp:60
 #, fuzzy
 msgid "  -d --data           : Directory to load game data from"
 msgstr "  -d --data\t: 从此目录加载游戏数据"
 
-#: src/main.cpp:58
+#: src/main.cpp:61
 #, fuzzy
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
+msgid "     --localdata-dir  : Directory to use as local data directory"
 msgstr "  -S --home-dir\t: 用该目录作为家目录"
 
-#: src/main.cpp:59
+#: src/main.cpp:62
+#, fuzzy
+msgid "     --chat-log-dir   : Chat log dir to use"
+msgstr "  -C --config-file\t: 使用的配置文件"
+
+#: src/main.cpp:63
 #, fuzzy
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr "  -S --home-dir\t: 用该目录作为家目录"
 
-#: src/main.cpp:61
+#: src/main.cpp:65
 #, fuzzy
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr "  -O --no-opengl\t:为该次会话关闭OpenGL"
 
-#: src/net/ea/adminhandler.cpp:63
+#: src/net/manaserv/beinghandler.cpp:303 src/net/tmwa/playerhandler.cpp:94
+msgid "You are dead."
+msgstr "你已玩完了。"
+
+#: src/net/manaserv/beinghandler.cpp:304 src/net/tmwa/playerhandler.cpp:95
+msgid "We regret to inform you that your character was killed in battle."
+msgstr "很遗憾的告诉您，您的角色在战斗中死亡了"
+
+#: src/net/manaserv/beinghandler.cpp:306 src/net/tmwa/playerhandler.cpp:97
+msgid "You are not that alive anymore."
+msgstr "你再也不是那样的生机勃勃了。"
+
+#: src/net/manaserv/beinghandler.cpp:307 src/net/tmwa/playerhandler.cpp:98
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:308 src/net/tmwa/playerhandler.cpp:99
+msgid "Game Over!"
+msgstr "游戏结束！"
+
+#: src/net/manaserv/beinghandler.cpp:309 src/net/tmwa/playerhandler.cpp:101
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr "不，孩子。你的角色没有真正死亡。他……呃……不过是去了一个更好的地方而已。"
+
+#: src/net/manaserv/beinghandler.cpp:311 src/net/tmwa/playerhandler.cpp:103
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:313 src/net/tmwa/playerhandler.cpp:105
+msgid "I guess this did not run too well."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:107
+msgid "Do you want your possessions identified?"
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:109
+msgid "Sadly, no trace of you was ever found..."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:111
+msgid "Annihilated."
+msgstr "被消灭了。"
+
+#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:113
+msgid "Looks like you got your head handed to you."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:115
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:323
+#, fuzzy
+msgid "Press OK to respawn."
+msgstr " 按OK重新开始"
+
+#: src/net/manaserv/beinghandler.cpp:324
+#, fuzzy
+msgid "You Died"
+msgstr "你完蛋了"
+
+#: src/net/manaserv/charhandler.cpp:138 src/net/manaserv/charhandler.cpp:209
+#, fuzzy
+msgid "Not logged in."
+msgstr "已经登录"
+
+#: src/net/manaserv/charhandler.cpp:141
+msgid "No empty slot."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:144
+msgid "Invalid name."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:147
+#, fuzzy
+msgid "Character's name already exists."
+msgstr "用户名已存在"
+
+#: src/net/manaserv/charhandler.cpp:150
+msgid "Invalid hairstyle."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:153
+msgid "Invalid hair color."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:156
+msgid "Invalid gender."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:159
+#, fuzzy
+msgid "Character's stats are too high."
+msgstr "角色状态可以"
+
+#: src/net/manaserv/charhandler.cpp:162
+#, fuzzy
+msgid "Character's stats are too low."
+msgstr "角色状态可以"
+
+#: src/net/manaserv/charhandler.cpp:165
+#, c-format
+msgid "At least one statis out of the permitted range: (%u - %u)."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:171 src/net/manaserv/loginhandler.cpp:96
+#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
+#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
+#: src/net/tmwa/loginhandler.cpp:95 src/net/tmwa/loginhandler.cpp:182
+#, fuzzy
+msgid "Unknown error."
+msgstr "未明错误"
+
+#: src/net/manaserv/charhandler.cpp:200 src/net/tmwa/charserverhandler.cpp:146
+msgid "Info"
+msgstr "信息"
+
+#: src/net/manaserv/charhandler.cpp:200
+#, fuzzy
+msgid "Player deleted."
+msgstr "角色已删除。"
+
+#: src/net/manaserv/charhandler.cpp:212
+#, fuzzy
+msgid "Selection out of range."
+msgstr "请选择交易的物品数量。"
+
+#: src/net/manaserv/charhandler.cpp:215
+#, fuzzy, c-format
+msgid "Unknown error (%d)."
+msgstr "未明错误"
+
+#: src/net/manaserv/charhandler.cpp:250
+msgid "No gameservers are available."
+msgstr "无 游戏服务器 可用。"
+
+#: src/net/manaserv/chathandler.cpp:187 src/net/manaserv/chathandler.cpp:313
+#: src/net/manaserv/guildhandler.cpp:260
+#, c-format
+msgid "Topic: %s"
+msgstr "主题：%s"
+
+#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:274
+#, fuzzy
+msgid "Players in this channel:"
+msgstr "玩家攻击怪兽"
+
+#: src/net/manaserv/chathandler.cpp:208
+#, fuzzy
+msgid "Error joining channel."
+msgstr "命令：/join <频道>"
+
+#: src/net/manaserv/chathandler.cpp:214
+#, fuzzy
+msgid "Listing channels."
+msgstr "请求加入频道%s。"
+
+#: src/net/manaserv/chathandler.cpp:226
+msgid "End of channel list."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:303
+#, fuzzy, c-format
+msgid "%s entered the channel."
+msgstr "%s加入了帮会。"
+
+#: src/net/manaserv/chathandler.cpp:308
+#, c-format
+msgid "%s left the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:324
+#, c-format
+msgid "%s has set mode %s on user %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:334
+#, c-format
+msgid "%s has kicked %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:339
+#, fuzzy
+msgid "Unknown channel event."
+msgstr "未知命令。"
+
+#: src/net/manaserv/guildhandler.cpp:82
+msgid "Guild created."
+msgstr "帮会已创建"
+
+#: src/net/manaserv/guildhandler.cpp:87
+msgid "Error creating guild."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:97
+msgid "Invite sent."
+msgstr "邀请已发送。"
+
+#: src/net/manaserv/guildhandler.cpp:204
+msgid "Member was promoted successfully."
+msgstr "会员晋升成功。"
+
+#: src/net/manaserv/guildhandler.cpp:209
+msgid "Failed to promote member."
+msgstr "晋升会员失败。"
+
+#: src/net/manaserv/loginhandler.cpp:87
+#, fuzzy
+msgid "Wrong magic_token."
+msgstr "错误的 magic_token"
+
+#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
+#, fuzzy
+msgid "Already logged in."
+msgstr "已经登录"
+
+#: src/net/manaserv/loginhandler.cpp:93
+#, fuzzy
+msgid "Account banned."
+msgstr "帐号期满"
+
+#: src/net/manaserv/loginhandler.cpp:118
+#, fuzzy
+msgid "New password incorrect."
+msgstr "新密码错误"
+
+#: src/net/manaserv/loginhandler.cpp:121 src/net/tmwa/loginhandler.cpp:89
+#, fuzzy
+msgid "Old password incorrect."
+msgstr "原密码错误"
+
+#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
+msgid "Account not connected. Please login first."
+msgstr "账户未连接。请先登录。"
+
+#: src/net/manaserv/loginhandler.cpp:149
+#, fuzzy
+msgid "New email address incorrect."
+msgstr "新电子邮件地址不正确"
+
+#: src/net/manaserv/loginhandler.cpp:152
+#, fuzzy
+msgid "Old email address incorrect."
+msgstr "原电子邮件地址不正确"
+
+#: src/net/manaserv/loginhandler.cpp:158
+#, fuzzy
+msgid "The new email address already exists."
+msgstr "新电子邮件地址已经存在。"
+
+#: src/net/manaserv/loginhandler.cpp:239
+msgid ""
+"Client registration is not allowed. Please contact server administration."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
+#, fuzzy
+msgid "Client version is too old."
+msgstr "客户端版本太旧"
+
+#: src/net/manaserv/loginhandler.cpp:266
+#, fuzzy
+msgid "Wrong username or password."
+msgstr "错误的用户名或密码"
+
+#: src/net/manaserv/loginhandler.cpp:272
+#, fuzzy
+msgid "Account banned"
+msgstr "帐号期满"
+
+#: src/net/manaserv/loginhandler.cpp:275
+msgid "Login attempt too soon after previous attempt."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:303
+#, fuzzy
+msgid "Wrong username, password or email address."
+msgstr "错误的用户名，密码或者电子邮件地址"
+
+#: src/net/manaserv/loginhandler.cpp:306
+#, fuzzy
+msgid "Username already exists."
+msgstr "用户名已存在"
+
+#: src/net/manaserv/loginhandler.cpp:309
+#, fuzzy
+msgid "Email address already exists."
+msgstr "电子邮件地址已存在"
+
+#: src/net/manaserv/loginhandler.cpp:312
+msgid "You took too long with the captcha or your response was incorrect."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:87
+msgid "Joined party."
+msgstr "加入了帮会。"
+
+#: src/net/manaserv/partyhandler.cpp:105
+#, c-format
+msgid "%s joined the party."
+msgstr "%s加入了帮会。"
+
+#: src/net/manaserv/partyhandler.cpp:123
+#, fuzzy, c-format
+msgid "%s rejected your invite."
+msgstr "%s拒绝了您的邀请。"
+
+#: src/net/manaserv/tradehandler.cpp:95
+msgid "Accepting incoming trade requests."
+msgstr "正在接受交易请求"
+
+#: src/net/manaserv/tradehandler.cpp:97
+msgid "Ignoring incoming trade requests."
+msgstr "忽略交易请求"
+
+#: src/net/manaserv/tradehandler.cpp:115 src/net/tmwa/tradehandler.cpp:109
+msgid "Request for Trade"
+msgstr "请求交易"
+
+#: src/net/manaserv/tradehandler.cpp:116 src/net/tmwa/tradehandler.cpp:110
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
+msgstr "%s想和您进行交易，是否接受？"
+
+#: src/net/manaserv/tradehandler.cpp:134
+#, c-format
+msgid "Trading with %s"
+msgstr "与%s交易中"
+
+#: src/net/manaserv/tradehandler.cpp:148 src/net/tmwa/tradehandler.cpp:224
+msgid "Trade canceled."
+msgstr "交易取消。"
+
+#: src/net/manaserv/tradehandler.cpp:155 src/net/tmwa/tradehandler.cpp:231
+msgid "Trade completed."
+msgstr "交易完成。"
+
+#: src/net/tmwa/adminhandler.cpp:64
 msgid "Kick failed!"
 msgstr "踢出失败！"
 
-#: src/net/ea/adminhandler.cpp:65
+#: src/net/tmwa/adminhandler.cpp:66
 msgid "Kick succeeded!"
 msgstr "成功踢出！"
 
-#: src/net/ea/buysellhandler.cpp:110
+#: src/net/tmwa/buysellhandler.cpp:109
 msgid "Nothing to sell."
 msgstr "无物可供出售。"
 
-#: src/net/ea/buysellhandler.cpp:117
+#: src/net/tmwa/buysellhandler.cpp:116
 msgid "Thanks for buying."
 msgstr "谢谢你的购买。"
 
-#: src/net/ea/buysellhandler.cpp:124
+#: src/net/tmwa/buysellhandler.cpp:123
 msgid "Unable to buy."
 msgstr "无法购买。"
 
-#: src/net/ea/buysellhandler.cpp:130
+#: src/net/tmwa/buysellhandler.cpp:129
 msgid "Thanks for selling."
 msgstr "感谢您的出售。"
 
-#: src/net/ea/buysellhandler.cpp:132
+#: src/net/tmwa/buysellhandler.cpp:131
 msgid "Unable to sell."
 msgstr "无法出售."
 
-#: src/net/ea/charserverhandler.cpp:103
-#, fuzzy
-msgid "Access denied."
-msgstr "访问被拒绝"
+#: src/net/tmwa/charserverhandler.cpp:103
+msgid "Access denied. Most likely, there are too many players on this server."
+msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:106
+#: src/net/tmwa/charserverhandler.cpp:107
 #, fuzzy
 msgid "Cannot use this ID."
 msgstr "不能使用该ID"
 
-#: src/net/ea/charserverhandler.cpp:109
+#: src/net/tmwa/charserverhandler.cpp:110
 #, fuzzy
-msgid "Unknown failure to select character."
-msgstr "选择人物时遇到未知错误"
+msgid "Unknown char-server failure."
+msgstr "未明错误"
 
-#: src/net/ea/charserverhandler.cpp:135
+#: src/net/tmwa/charserverhandler.cpp:134
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr "创建角色失败。很可能名称已被占用。"
 
-#: src/net/ea/charserverhandler.cpp:147 src/net/manaserv/charhandler.cpp:187
-msgid "Info"
-msgstr "信息"
-
-#: src/net/ea/charserverhandler.cpp:147
+#: src/net/tmwa/charserverhandler.cpp:146
 msgid "Character deleted."
 msgstr "角色已删除。"
 
-#: src/net/ea/charserverhandler.cpp:152
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Failed to delete character."
 msgstr "删除角色失败。"
 
-#: src/net/ea/charserverhandler.cpp:237 src/net/manaserv/charhandler.cpp:263
+#: src/net/tmwa/charserverhandler.cpp:266
 msgid "Strength:"
 msgstr "力量："
 
-#: src/net/ea/charserverhandler.cpp:238 src/net/manaserv/charhandler.cpp:264
+#: src/net/tmwa/charserverhandler.cpp:267
 msgid "Agility:"
 msgstr "敏捷："
 
-#: src/net/ea/charserverhandler.cpp:239 src/net/manaserv/charhandler.cpp:266
+#: src/net/tmwa/charserverhandler.cpp:268
 msgid "Vitality:"
 msgstr "生命："
 
-#: src/net/ea/charserverhandler.cpp:240 src/net/manaserv/charhandler.cpp:267
+#: src/net/tmwa/charserverhandler.cpp:269
 msgid "Intelligence:"
 msgstr "智力："
 
-#: src/net/ea/charserverhandler.cpp:241 src/net/manaserv/charhandler.cpp:265
+#: src/net/tmwa/charserverhandler.cpp:270
 msgid "Dexterity:"
 msgstr "灵巧："
 
-#: src/net/ea/charserverhandler.cpp:242
+#: src/net/tmwa/charserverhandler.cpp:271
 msgid "Luck:"
 msgstr "幸运："
 
-#: src/net/ea/chathandler.cpp:80
-msgid "Whisper could not be sent, user is offline."
+#: src/net/tmwa/chathandler.cpp:87
+#, fuzzy, c-format
+msgid "Whisper could not be sent, %s is offline."
 msgstr "密语无法发送，用户已离线。"
 
-#: src/net/ea/chathandler.cpp:84
-msgid "Whisper could not be sent, ignored by user."
+#: src/net/tmwa/chathandler.cpp:96
+#, fuzzy, c-format
+msgid "Whisper could not be sent, ignored by %s."
 msgstr "密语无法发送，你已被用户忽略。"
 
-#: src/net/ea/chathandler.cpp:171
+#: src/net/tmwa/chathandler.cpp:230
 #, fuzzy
 msgid "MVP player."
 msgstr "玩家"
 
-#: src/net/ea/chathandler.cpp:204 src/net/ea/chathandler.cpp:210
-#: src/net/ea/chathandler.cpp:215 src/net/ea/chathandler.cpp:220
-#: src/net/ea/chathandler.cpp:225 src/net/ea/chathandler.cpp:230
-#: src/net/ea/chathandler.cpp:235 src/net/ea/chathandler.cpp:240
+#: src/net/tmwa/chathandler.cpp:265 src/net/tmwa/chathandler.cpp:271
+#: src/net/tmwa/chathandler.cpp:276 src/net/tmwa/chathandler.cpp:281
+#: src/net/tmwa/chathandler.cpp:286 src/net/tmwa/chathandler.cpp:291
+#: src/net/tmwa/chathandler.cpp:296 src/net/tmwa/chathandler.cpp:301
 msgid "Channels are not supported!"
 msgstr "聊天频道不被支持！"
 
-#: src/net/ea/gamehandler.cpp:86
+#: src/net/tmwa/gamehandler.cpp:88
 #, c-format
 msgid "Online users: %d"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:100
+#: src/net/tmwa/gamehandler.cpp:101
 #, fuzzy
 msgid "Game"
 msgstr "姓名"
 
-#: src/net/ea/gamehandler.cpp:100
+#: src/net/tmwa/gamehandler.cpp:101
 #, fuzzy
 msgid "Request to quit denied!"
 msgstr "请求交易"
 
-#: src/net/ea/generalhandler.cpp:102 src/net/manaserv/generalhandler.cpp:95
+#: src/net/tmwa/generalhandler.cpp:102
 #, c-format
 msgid "Strength %+d"
 msgstr "力量 %+d"
 
-#: src/net/ea/generalhandler.cpp:103 src/net/manaserv/generalhandler.cpp:96
+#: src/net/tmwa/generalhandler.cpp:103
 #, c-format
 msgid "Agility %+d"
 msgstr "敏捷 %+d"
 
-#: src/net/ea/generalhandler.cpp:104 src/net/manaserv/generalhandler.cpp:98
+#: src/net/tmwa/generalhandler.cpp:104
 #, c-format
 msgid "Vitality %+d"
 msgstr "生命 %+d"
 
-#: src/net/ea/generalhandler.cpp:105 src/net/manaserv/generalhandler.cpp:99
+#: src/net/tmwa/generalhandler.cpp:105
 #, c-format
 msgid "Intelligence %+d"
 msgstr "智慧 %+d"
 
-#: src/net/ea/generalhandler.cpp:106 src/net/manaserv/generalhandler.cpp:97
+#: src/net/tmwa/generalhandler.cpp:106
 #, c-format
 msgid "Dexterity %+d"
 msgstr "敏捷 %+d"
 
-#: src/net/ea/generalhandler.cpp:107
+#: src/net/tmwa/generalhandler.cpp:107
 #, c-format
 msgid "Luck %+d"
 msgstr "幸运 %+d"
 
-#: src/net/ea/generalhandler.cpp:130
+#: src/net/tmwa/generalhandler.cpp:132
 #, fuzzy
 msgid "Authentication failed."
 msgstr "验证失败"
 
-#: src/net/ea/generalhandler.cpp:133
+#: src/net/tmwa/generalhandler.cpp:135
 #, fuzzy
 msgid "No servers available."
 msgstr "无可用服务器"
 
-#: src/net/ea/generalhandler.cpp:137
+#: src/net/tmwa/generalhandler.cpp:139
 #, fuzzy
 msgid "Someone else is trying to use this account."
 msgstr "某人正在尝试使用该帐号"
 
-#: src/net/ea/generalhandler.cpp:140
+#: src/net/tmwa/generalhandler.cpp:142
 #, fuzzy
 msgid "This account is already logged in."
 msgstr "该帐号已经登录"
 
-#: src/net/ea/generalhandler.cpp:143
+#: src/net/tmwa/generalhandler.cpp:145
 #, fuzzy
 msgid "Speed hack detected."
 msgstr "检测到调速作弊"
 
-#: src/net/ea/generalhandler.cpp:146
+#: src/net/tmwa/generalhandler.cpp:148
 #, fuzzy
 msgid "Duplicated login."
 msgstr "重复登录"
 
-#: src/net/ea/generalhandler.cpp:149
+#: src/net/tmwa/generalhandler.cpp:151
 #, fuzzy
 msgid "Unknown connection error."
 msgstr "未知连接错误"
 
-#: src/net/ea/generalhandler.cpp:205
+#: src/net/tmwa/generalhandler.cpp:209
 msgid "Got disconnected from server!"
 msgstr "和服务器失去连接"
 
-#: src/net/ea/generalhandler.cpp:216 src/net/manaserv/generalhandler.cpp:166
+#: src/net/tmwa/generalhandler.cpp:230
 msgid "Strength"
 msgstr "力量"
 
-#: src/net/ea/generalhandler.cpp:217 src/net/manaserv/generalhandler.cpp:167
+#: src/net/tmwa/generalhandler.cpp:231
 msgid "Agility"
 msgstr "敏捷"
 
-#: src/net/ea/generalhandler.cpp:218 src/net/manaserv/generalhandler.cpp:169
+#: src/net/tmwa/generalhandler.cpp:232
 msgid "Vitality"
 msgstr "生命"
 
-#: src/net/ea/generalhandler.cpp:219 src/net/manaserv/generalhandler.cpp:170
+#: src/net/tmwa/generalhandler.cpp:233
 msgid "Intelligence"
 msgstr "智慧"
 
-#: src/net/ea/generalhandler.cpp:220 src/net/manaserv/generalhandler.cpp:168
+#: src/net/tmwa/generalhandler.cpp:234
 msgid "Dexterity"
 msgstr "敏捷"
 
-#: src/net/ea/generalhandler.cpp:221
+#: src/net/tmwa/generalhandler.cpp:235
 msgid "Luck"
 msgstr "幸运"
 
-#: src/net/ea/generalhandler.cpp:224
+#: src/net/tmwa/generalhandler.cpp:238
 #, fuzzy
 msgid "Defense"
 msgstr "防御："
 
-#: src/net/ea/generalhandler.cpp:225
+#: src/net/tmwa/generalhandler.cpp:239
 #, fuzzy
 msgid "M.Attack"
 msgstr "魔攻："
 
-#: src/net/ea/generalhandler.cpp:226
+#: src/net/tmwa/generalhandler.cpp:240
 #, fuzzy
 msgid "M.Defense"
 msgstr "魔防："
 
-#: src/net/ea/generalhandler.cpp:227
+#: src/net/tmwa/generalhandler.cpp:241
 #, fuzzy, c-format
 msgid "% Accuracy"
 msgstr "% Ac精确度："
 
-#: src/net/ea/generalhandler.cpp:228
+#: src/net/tmwa/generalhandler.cpp:242
 #, fuzzy, c-format
 msgid "% Evade"
 msgstr "% E回避率："
 
-#: src/net/ea/generalhandler.cpp:229
+#: src/net/tmwa/generalhandler.cpp:243
 #, fuzzy, c-format
 msgid "% Critical"
 msgstr "会心一击"
 
-#: src/net/ea/gui/guildtab.cpp:61 src/net/ea/gui/partytab.cpp:59
+#: src/net/tmwa/gui/guildtab.cpp:45
+msgid "Guild"
+msgstr "帮会"
+
+#: src/net/tmwa/gui/guildtab.cpp:61 src/net/tmwa/gui/partytab.cpp:59
 msgid "/help > Display this help."
 msgstr "/help > 显示该帮助信息。"
 
-#: src/net/ea/gui/guildtab.cpp:62
+#: src/net/tmwa/gui/guildtab.cpp:62
 #, fuzzy
 msgid "/invite > Invite a player to your guild"
 msgstr "/invite > 邀请某一玩家加入您的帮会"
 
-#: src/net/ea/gui/guildtab.cpp:63
+#: src/net/tmwa/gui/guildtab.cpp:63
 #, fuzzy
 msgid "/leave > Leave the guild you are in"
 msgstr "/leave > 离开你所在的帮会"
 
-#: src/net/ea/gui/guildtab.cpp:64
+#: src/net/tmwa/gui/guildtab.cpp:64
 #, fuzzy
 msgid "/kick > Kick some one from the guild you are in"
 msgstr "/kick > 把某人踢出你所在的帮会"
 
-#: src/net/ea/gui/guildtab.cpp:73 src/net/ea/gui/partytab.cpp:73
+#: src/net/tmwa/gui/guildtab.cpp:73 src/net/tmwa/gui/partytab.cpp:73
 msgid "Command: /invite <nick>"
 msgstr "命令：/invite <昵称>"
 
-#: src/net/ea/gui/guildtab.cpp:74
+#: src/net/tmwa/gui/guildtab.cpp:74
 #, fuzzy
 msgid "This command invites <nick> to the guild you're in."
 msgstr "该命令邀请<昵称>和你聚会。"
 
-#: src/net/ea/gui/guildtab.cpp:80 src/net/ea/gui/partytab.cpp:80
+#: src/net/tmwa/gui/guildtab.cpp:80 src/net/tmwa/gui/partytab.cpp:80
 msgid "Command: /leave"
 msgstr "命令：/leave"
 
-#: src/net/ea/gui/guildtab.cpp:81
+#: src/net/tmwa/gui/guildtab.cpp:81
 #, fuzzy
 msgid "This command causes the player to leave the guild."
 msgstr "该命令致使玩家离开帮会"
 
-#: src/net/ea/gui/guildtab.cpp:89
+#: src/net/tmwa/gui/guildtab.cpp:89
 #, fuzzy
 msgid "Guild name is missing."
 msgstr "帮会名称缺失。"
 
-#: src/net/ea/guildhandler.cpp:293
+#: src/net/tmwa/guildhandler.cpp:296
 msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:298
+#: src/net/tmwa/guildhandler.cpp:301
 msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:303
+#: src/net/tmwa/guildhandler.cpp:306
 #, fuzzy
 msgid "User is now part of your guild."
 msgstr "%s现在是你帮会中的成员了。"
 
-#: src/net/ea/guildhandler.cpp:308
+#: src/net/tmwa/guildhandler.cpp:311
 msgid "Your guild is full."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:313
+#: src/net/tmwa/guildhandler.cpp:316
 #, fuzzy
 msgid "Unknown guild invite response."
 msgstr "未知邀请应答%s。"
 
-#: src/net/ea/guildhandler.cpp:390
+#: src/net/tmwa/guildhandler.cpp:393
 msgid "Guild creation isn't supported yet."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:60
+#: src/net/tmwa/gui/partytab.cpp:43
+msgid "Party"
+msgstr "帮会"
+
+#: src/net/tmwa/gui/partytab.cpp:60
 msgid "/invite > Invite a player to your party"
 msgstr "/invite > 邀请某一玩家加入您的帮会"
 
-#: src/net/ea/gui/partytab.cpp:61
+#: src/net/tmwa/gui/partytab.cpp:61
 msgid "/leave > Leave the party you are in"
 msgstr "/leave > 离开你所在的帮会"
 
-#: src/net/ea/gui/partytab.cpp:62
+#: src/net/tmwa/gui/partytab.cpp:62
 msgid "/kick > Kick some one from the party you are in"
 msgstr "/kick > 把某人踢出你所在的帮会"
 
-#: src/net/ea/gui/partytab.cpp:63
+#: src/net/tmwa/gui/partytab.cpp:63
 msgid "/item > Show/change party item sharing options"
 msgstr "/item > 显示/改变帮会项目共享选项"
 
-#: src/net/ea/gui/partytab.cpp:64
+#: src/net/tmwa/gui/partytab.cpp:64
 msgid "/exp > Show/change party experience sharing options"
 msgstr "/exp > 显示/改变帮会经验共享选项"
 
-#: src/net/ea/gui/partytab.cpp:81
+#: src/net/tmwa/gui/partytab.cpp:81
 msgid "This command causes the player to leave the party."
 msgstr "该命令致使玩家离开帮会"
 
-#: src/net/ea/gui/partytab.cpp:85
+#: src/net/tmwa/gui/partytab.cpp:85
 msgid "Command: /item <policy>"
 msgstr "命令：/item <策略>"
 
-#: src/net/ea/gui/partytab.cpp:86
+#: src/net/tmwa/gui/partytab.cpp:86
 msgid "This command changes the party's item sharing policy."
 msgstr "改命令改变帮会的物品共享策略。"
 
-#: src/net/ea/gui/partytab.cpp:87
+#: src/net/tmwa/gui/partytab.cpp:87
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
@@ -2945,23 +3153,23 @@ msgstr ""
 "<策略>可以为“1”，“yes”，“true”其中之一以开启物品共享，或者 是\"0\",\"no\","
 "\"false\"用来禁止物品共享。"
 
-#: src/net/ea/gui/partytab.cpp:90
+#: src/net/tmwa/gui/partytab.cpp:90
 msgid "Command: /item"
 msgstr "命令：/item"
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/tmwa/gui/partytab.cpp:91
 msgid "This command displays the party's current item sharing policy."
 msgstr "该命令显示帮会现有的物品共享策略。"
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/tmwa/gui/partytab.cpp:95
 msgid "Command: /exp <policy>"
 msgstr "命令：/exp <策略>"
 
-#: src/net/ea/gui/partytab.cpp:96
+#: src/net/tmwa/gui/partytab.cpp:96
 msgid "This command changes the party's experience sharing policy."
 msgstr "该命令改变帮会的经验共享策略。"
 
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/tmwa/gui/partytab.cpp:97
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
@@ -2969,109 +3177,96 @@ msgstr ""
 "<策略>可以为“1”，“yes”，“true”其中之一以开启经验共享，或者 是\"0\",\"no\","
 "\"false\"用来关闭经验共享。"
 
-#: src/net/ea/gui/partytab.cpp:100
+#: src/net/tmwa/gui/partytab.cpp:100
 msgid "Command: /exp"
 msgstr "命令：/exp"
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/tmwa/gui/partytab.cpp:101
 msgid "This command displays the party's current experience sharing policy."
 msgstr "该命令显示帮会现有的经验共享策略。"
 
-#: src/net/ea/gui/partytab.cpp:132 src/net/ea/partyhandler.cpp:198
+#: src/net/tmwa/gui/partytab.cpp:132 src/net/tmwa/partyhandler.cpp:196
 msgid "Item sharing enabled."
 msgstr "物品共享开启。"
 
-#: src/net/ea/gui/partytab.cpp:135 src/net/ea/partyhandler.cpp:204
+#: src/net/tmwa/gui/partytab.cpp:135 src/net/tmwa/partyhandler.cpp:202
 msgid "Item sharing disabled."
 msgstr "物品共享关闭。"
 
-#: src/net/ea/gui/partytab.cpp:138 src/net/ea/partyhandler.cpp:210
+#: src/net/tmwa/gui/partytab.cpp:138 src/net/tmwa/partyhandler.cpp:208
 msgid "Item sharing not possible."
 msgstr "物品共享不可能。"
 
-#: src/net/ea/gui/partytab.cpp:141
+#: src/net/tmwa/gui/partytab.cpp:141
 #, fuzzy
 msgid "Item sharing unknown."
 msgstr "物品共享开启。"
 
-#: src/net/ea/gui/partytab.cpp:167 src/net/ea/partyhandler.cpp:174
+#: src/net/tmwa/gui/partytab.cpp:167 src/net/tmwa/partyhandler.cpp:172
 msgid "Experience sharing enabled."
 msgstr "经验共享开启。"
 
-#: src/net/ea/gui/partytab.cpp:170 src/net/ea/partyhandler.cpp:180
+#: src/net/tmwa/gui/partytab.cpp:170 src/net/tmwa/partyhandler.cpp:178
 msgid "Experience sharing disabled."
 msgstr "经验共享关闭。"
 
-#: src/net/ea/gui/partytab.cpp:173 src/net/ea/partyhandler.cpp:186
+#: src/net/tmwa/gui/partytab.cpp:173 src/net/tmwa/partyhandler.cpp:184
 msgid "Experience sharing not possible."
 msgstr "经验共享不可能。"
 
-#: src/net/ea/gui/partytab.cpp:176
+#: src/net/tmwa/gui/partytab.cpp:176
 #, fuzzy
 msgid "Experience sharing unknown."
 msgstr "经验共享开启。"
 
-#: src/net/ea/inventoryhandler.cpp:281
+#: src/net/tmwa/inventoryhandler.cpp:285
 msgid "Failed to use item."
 msgstr "使用物品失败。"
 
-#: src/net/ea/inventoryhandler.cpp:391
+#: src/net/tmwa/inventoryhandler.cpp:399
 msgid "Unable to equip."
 msgstr "无法装备。"
 
-#: src/net/ea/inventoryhandler.cpp:402
+#: src/net/tmwa/inventoryhandler.cpp:410
 msgid "Unable to unequip."
 msgstr "无法卸载装备。"
 
-#: src/net/ea/loginhandler.cpp:79
+#: src/net/tmwa/loginhandler.cpp:86
 msgid "Account was not found. Please re-login."
 msgstr "帐号不存在。请重新登录。"
 
-#: src/net/ea/loginhandler.cpp:82 src/net/manaserv/loginhandler.cpp:121
-#, fuzzy
-msgid "Old password incorrect."
-msgstr "原密码错误"
-
-#: src/net/ea/loginhandler.cpp:85
+#: src/net/tmwa/loginhandler.cpp:92
 #, fuzzy
 msgid "New password too short."
 msgstr "新密码太短"
 
-#: src/net/ea/loginhandler.cpp:88 src/net/ea/loginhandler.cpp:175
-#: src/net/manaserv/charhandler.cpp:158 src/net/manaserv/loginhandler.cpp:96
-#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
-#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
-#, fuzzy
-msgid "Unknown error."
-msgstr "未明错误"
-
-#: src/net/ea/loginhandler.cpp:149
+#: src/net/tmwa/loginhandler.cpp:156
 #, fuzzy
 msgid "Unregistered ID."
 msgstr "未注册ID"
 
-#: src/net/ea/loginhandler.cpp:152
+#: src/net/tmwa/loginhandler.cpp:159
 #, fuzzy
 msgid "Wrong password."
 msgstr "错误的密码"
 
-#: src/net/ea/loginhandler.cpp:155
+#: src/net/tmwa/loginhandler.cpp:162
 #, fuzzy
 msgid "Account expired."
 msgstr "帐号期满"
 
-#: src/net/ea/loginhandler.cpp:158
+#: src/net/tmwa/loginhandler.cpp:165
 #, fuzzy
 msgid "Rejected from server."
 msgstr "登录请求被拒绝"
 
-#: src/net/ea/loginhandler.cpp:161
+#: src/net/tmwa/loginhandler.cpp:168
 #, fuzzy
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr "你已被永久性禁止游戏。请联系GM团队。"
 
-#: src/net/ea/loginhandler.cpp:165
+#: src/net/tmwa/loginhandler.cpp:172
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -3080,664 +3275,515 @@ msgstr ""
 "你被暂时禁止进入游戏直到%s.\n"
 "请通过论坛联系GM组"
 
-#: src/net/ea/loginhandler.cpp:172
+#: src/net/tmwa/loginhandler.cpp:179
 #, fuzzy
 msgid "This user name is already taken."
 msgstr "该用户名已被使用"
 
-#: src/net/ea/network.cpp:145
+#: src/net/tmwa/network.cpp:145
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/ea/network.cpp:345
+#: src/net/tmwa/network.cpp:345
 #, fuzzy
 msgid "Unable to resolve host \""
 msgstr "无法出售."
 
-#: src/net/ea/network.cpp:414
+#: src/net/tmwa/network.cpp:414
 #, fuzzy
 msgid "Connection to server terminated. "
 msgstr "正在连接 地图 服务器..."
 
-#: src/net/ea/partyhandler.cpp:81
+#: src/net/tmwa/partyhandler.cpp:82
 msgid "Could not create party."
 msgstr "无法创建帮会。"
 
-#: src/net/ea/partyhandler.cpp:84
+#: src/net/tmwa/partyhandler.cpp:84
 msgid "Party successfully created."
 msgstr "帮会创建成功。"
 
-#: src/net/ea/partyhandler.cpp:118
+#: src/net/tmwa/partyhandler.cpp:119
 #, c-format
 msgid "%s is already a member of a party."
 msgstr "%s已经是你的帮会成员了。"
 
-#: src/net/ea/partyhandler.cpp:122
+#: src/net/tmwa/partyhandler.cpp:123
 #, c-format
 msgid "%s refused your invitation."
 msgstr "%s拒绝了您的邀请。"
 
-#: src/net/ea/partyhandler.cpp:126
+#: src/net/tmwa/partyhandler.cpp:127
 #, c-format
 msgid "%s is now a member of your party."
 msgstr "%s现在是你帮会中的成员了。"
 
-#: src/net/ea/partyhandler.cpp:130
+#: src/net/tmwa/partyhandler.cpp:131
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr "未知邀请应答%s。"
 
-#: src/net/ea/partyhandler.cpp:238
+#: src/net/tmwa/partyhandler.cpp:236
 msgid "You have left the party."
 msgstr "你以退出帮会"
 
-#: src/net/ea/partyhandler.cpp:249
+#: src/net/tmwa/partyhandler.cpp:246
 #, c-format
 msgid "%s has left your party."
 msgstr "%s已经离开你的帮会。"
 
-#: src/net/ea/partyhandler.cpp:301
+#: src/net/tmwa/partyhandler.cpp:299
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr "一未知成员尝试说：%s"
 
-#: src/net/ea/partyhandler.cpp:329
-msgid "Inviting like this isn't supported at the moment."
-msgstr "这种方式的邀请暂时不支持。"
+#: src/net/tmwa/partyhandler.cpp:335
+#, c-format
+msgid "Inviting failed, because you can't see a player called %s."
+msgstr ""
 
-#: src/net/ea/partyhandler.cpp:334
+#: src/net/tmwa/partyhandler.cpp:340
 msgid "You can only inivte when you are in a party!"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:365
+#: src/net/tmwa/partyhandler.cpp:368
 #, c-format
 msgid "%s is not in your party!"
 msgstr "%s不在你的帮会中！"
 
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:304
-msgid "You are dead."
-msgstr "你已玩完了。"
-
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:305
-msgid "We regret to inform you that your character was killed in battle."
-msgstr "很遗憾的告诉您，您的角色在战斗中死亡了"
-
-#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:307
-msgid "You are not that alive anymore."
-msgstr "你再也不是那样的生机勃勃了。"
-
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:308
-msgid "The cold hands of the grim reaper are grabbing for your soul."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:309
-msgid "Game Over!"
-msgstr "游戏结束！"
-
-#: src/net/ea/playerhandler.cpp:105
+#: src/net/tmwa/playerhandler.cpp:100
 msgid "Insert coin to continue."
 msgstr "投入游戏币继续。"
 
-#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:310
-msgid ""
-"No, kids. Your character did not really die. It... err... went to a better "
-"place."
-msgstr "不，孩子。你的角色没有真正死亡。他……呃……不过是去了一个更好的地方而已。"
-
-#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:312
-msgid ""
-"Your plan of breaking your enemies weapon by bashing it with your throat "
-"failed."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:314
-msgid "I guess this did not run too well."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:315
-msgid "Do you want your possessions identified?"
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:316
-msgid "Sadly, no trace of you was ever found..."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:317
-msgid "Annihilated."
-msgstr "被消灭了。"
-
-#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:318
-msgid "Looks like you got your head handed to you."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:120 src/net/manaserv/beinghandler.cpp:319
-msgid ""
-"You screwed up again, dump your body down the tubes and get you another one."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/tmwa/playerhandler.cpp:118
 msgid "You're not dead yet. You're just resting."
 msgstr "你还没死，你只是在休息"
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/tmwa/playerhandler.cpp:119
 msgid "You are no more."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/tmwa/playerhandler.cpp:120
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/tmwa/playerhandler.cpp:121
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/tmwa/playerhandler.cpp:122
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/tmwa/playerhandler.cpp:123
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/tmwa/playerhandler.cpp:124
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:130
+#: src/net/tmwa/playerhandler.cpp:125
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:131
+#: src/net/tmwa/playerhandler.cpp:126
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/tmwa/playerhandler.cpp:127
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/tmwa/playerhandler.cpp:128
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:135
+#: src/net/tmwa/playerhandler.cpp:130
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:136
+#: src/net/tmwa/playerhandler.cpp:131
 msgid "You're pining for the fjords."
 msgstr ""
 "<策略>可以为“1”，“yes”，“true”其中之一以开启物品共享，或者 是\"0\",\"no\","
 "\"false\"用来禁止物品共享。"
 
-#: src/net/ea/playerhandler.cpp:249 src/net/ea/playerhandler.cpp:310
+#: src/net/tmwa/playerhandler.cpp:246 src/net/tmwa/playerhandler.cpp:285
 msgid "Message"
 msgstr "讯息"
 
-#: src/net/ea/playerhandler.cpp:250
+#: src/net/tmwa/playerhandler.cpp:247
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr "你已携带超过半数负重。无法回复健康（体力）"
 
-#: src/net/ea/playerhandler.cpp:333
+#: src/net/tmwa/playerhandler.cpp:313
 #, fuzzy, c-format
 msgid "You picked up %s."
 msgstr "你捡起 "
 
-#: src/net/ea/playerhandler.cpp:369
+#: src/net/tmwa/playerhandler.cpp:348
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:532
+#: src/net/tmwa/playerhandler.cpp:488
 msgid "Equip arrows first."
 msgstr "请先装备弓箭。"
 
-#: src/net/ea/specialhandler.cpp:147
+#: src/net/tmwa/specialhandler.cpp:144
 msgid "Trade failed!"
 msgstr "交易失败！"
 
-#: src/net/ea/specialhandler.cpp:150
+#: src/net/tmwa/specialhandler.cpp:147
 msgid "Emote failed!"
 msgstr "发送表情失败！"
 
-#: src/net/ea/specialhandler.cpp:153
+#: src/net/tmwa/specialhandler.cpp:150
 msgid "Sit failed!"
 msgstr "原地休息失败！"
 
-#: src/net/ea/specialhandler.cpp:156
+#: src/net/tmwa/specialhandler.cpp:153
 msgid "Chat creating failed!"
 msgstr "聊天创建失败！"
 
-#: src/net/ea/specialhandler.cpp:159
+#: src/net/tmwa/specialhandler.cpp:156
 msgid "Could not join party!"
 msgstr "不能加入工会！"
 
-#: src/net/ea/specialhandler.cpp:162
+#: src/net/tmwa/specialhandler.cpp:159
 msgid "Cannot shout!"
 msgstr "无法呼喊！"
 
-#: src/net/ea/specialhandler.cpp:171
+#: src/net/tmwa/specialhandler.cpp:168
 msgid "You have not yet reached a high enough lvl!"
 msgstr "你还没有达到足够的等级！"
 
-#: src/net/ea/specialhandler.cpp:174
+#: src/net/tmwa/specialhandler.cpp:171
 msgid "Insufficient HP!"
 msgstr "HP不足！"
 
-#: src/net/ea/specialhandler.cpp:177
+#: src/net/tmwa/specialhandler.cpp:174
 msgid "Insufficient SP!"
 msgstr "SP不足！"
 
-#: src/net/ea/specialhandler.cpp:180
+#: src/net/tmwa/specialhandler.cpp:177
 msgid "You have no memos!"
 msgstr "没有备忘录"
 
-#: src/net/ea/specialhandler.cpp:183
+#: src/net/tmwa/specialhandler.cpp:180
 msgid "You cannot do that right now!"
 msgstr "你无法办到！"
 
-#: src/net/ea/specialhandler.cpp:186
+#: src/net/tmwa/specialhandler.cpp:183
 msgid "Seems you need more money... ;-)"
 msgstr "看起来需要更多金币…… ;-)"
 
-#: src/net/ea/specialhandler.cpp:189
+#: src/net/tmwa/specialhandler.cpp:186
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "此武器无法用来使用此项技能！"
 
-#: src/net/ea/specialhandler.cpp:192
+#: src/net/tmwa/specialhandler.cpp:189
 msgid "You need another red gem!"
 msgstr "你需要另一颗红宝石！"
 
-#: src/net/ea/specialhandler.cpp:195
+#: src/net/tmwa/specialhandler.cpp:192
 msgid "You need another blue gem!"
 msgstr "你需要另一颗蓝宝石！"
 
-#: src/net/ea/specialhandler.cpp:198
+#: src/net/tmwa/specialhandler.cpp:195
 msgid "You're carrying to much to do this!"
 msgstr "你已负重太多，无法办到！"
 
-#: src/net/ea/specialhandler.cpp:201
+#: src/net/tmwa/specialhandler.cpp:198
 msgid "Huh? What's that?"
 msgstr "啊？那是什么？"
 
-#: src/net/ea/specialhandler.cpp:210
+#: src/net/tmwa/specialhandler.cpp:207
 msgid "Warp failed..."
 msgstr "传送失败..."
 
-#: src/net/ea/specialhandler.cpp:213
+#: src/net/tmwa/specialhandler.cpp:210
 msgid "Could not steal anything..."
 msgstr "无法偷取任何物品..."
 
-#: src/net/ea/specialhandler.cpp:216
+#: src/net/tmwa/specialhandler.cpp:213
 msgid "Poison had no effect..."
 msgstr "毒药无效..."
 
-#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:116
-msgid "Request for Trade"
-msgstr "请求交易"
-
-#: src/net/ea/tradehandler.cpp:108 src/net/manaserv/tradehandler.cpp:117
-#, c-format
-msgid "%s wants to trade with you, do you accept?"
-msgstr "%s想和您进行交易，是否接受？"
-
-#: src/net/ea/tradehandler.cpp:124
+#: src/net/tmwa/tradehandler.cpp:126
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr "交易不可能进行。与交易伙伴太过太过遥远"
 
-#: src/net/ea/tradehandler.cpp:128
+#: src/net/tmwa/tradehandler.cpp:130
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr "交易不可能进行。角色不存在。"
 
-#: src/net/ea/tradehandler.cpp:132
+#: src/net/tmwa/tradehandler.cpp:134
 msgid "Trade cancelled due to an unknown reason."
 msgstr "交易取消因不明原因。"
 
-#: src/net/ea/tradehandler.cpp:137
+#: src/net/tmwa/tradehandler.cpp:139
 #, c-format
 msgid "Trade: You and %s"
 msgstr "交易：您和%s"
 
-#: src/net/ea/tradehandler.cpp:144
+#: src/net/tmwa/tradehandler.cpp:146
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr "与%s的交易被取消。"
 
-#: src/net/ea/tradehandler.cpp:153
+#: src/net/tmwa/tradehandler.cpp:154
 msgid "Unhandled trade cancel packet."
 msgstr "未处理的交易取消分组。"
 
-#: src/net/ea/tradehandler.cpp:202
+#: src/net/tmwa/tradehandler.cpp:202
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr "添加项目失败。交易伙伴已经负重太多。"
 
-#: src/net/ea/tradehandler.cpp:207
+#: src/net/tmwa/tradehandler.cpp:207
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr "添加项目失败。交易伙伴无空闲槽存放物品。"
 
-#: src/net/ea/tradehandler.cpp:211
+#: src/net/tmwa/tradehandler.cpp:211
 msgid "Failed adding item for unknown reason."
 msgstr "添加项目失败，原因未知。"
 
-#: src/net/ea/tradehandler.cpp:224 src/net/manaserv/tradehandler.cpp:149
-msgid "Trade canceled."
-msgstr "交易取消。"
-
-#: src/net/ea/tradehandler.cpp:231 src/net/manaserv/tradehandler.cpp:156
-msgid "Trade completed."
-msgstr "交易完成。"
-
-#: src/net/manaserv/beinghandler.cpp:324
-#, fuzzy
-msgid "Press OK to respawn."
-msgstr " 按OK重新开始"
-
-#: src/net/manaserv/beinghandler.cpp:325
-#, fuzzy
-msgid "You Died"
-msgstr "你完蛋了"
-
-#: src/net/manaserv/charhandler.cpp:128 src/net/manaserv/charhandler.cpp:196
+#: src/playerrelations.cpp:310
 #, fuzzy
-msgid "Not logged in."
-msgstr "已经登录"
+msgid "Completely ignore"
+msgstr "@@ignore|完全忽略%s@@"
 
-#: src/net/manaserv/charhandler.cpp:131
-msgid "No empty slot."
+#: src/playerrelations.cpp:324
+msgid "Print '...'"
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:134
-msgid "Invalid name."
+#: src/playerrelations.cpp:340
+msgid "Blink name"
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:137
-#, fuzzy
-msgid "Character's name already exists."
-msgstr "用户名已存在"
-
-#: src/net/manaserv/charhandler.cpp:140
-msgid "Invalid hairstyle."
-msgstr ""
+#: src/resources/itemdb.cpp:44
+#, c-format
+msgid "Attack %+d"
+msgstr "攻击 %+d"
 
-#: src/net/manaserv/charhandler.cpp:143
-msgid "Invalid hair color."
-msgstr ""
+#: src/resources/itemdb.cpp:45
+#, c-format
+msgid "Defense %+d"
+msgstr "防护 %+d"
 
-#: src/net/manaserv/charhandler.cpp:146
-msgid "Invalid gender."
-msgstr ""
+#: src/resources/itemdb.cpp:46
+#, c-format
+msgid "HP %+d"
+msgstr "HP %+d"
 
-#: src/net/manaserv/charhandler.cpp:149
-#, fuzzy
-msgid "Character's stats are too high."
-msgstr "角色状态可以"
+#: src/resources/itemdb.cpp:47
+#, c-format
+msgid "MP %+d"
+msgstr "MP %+d"
 
-#: src/net/manaserv/charhandler.cpp:152
-#, fuzzy
-msgid "Character's stats are too low."
-msgstr "角色状态可以"
+#: src/resources/itemdb.cpp:92
+msgid "Unknown item"
+msgstr "未知物品"
 
-#: src/net/manaserv/charhandler.cpp:155
-msgid "One stat is zero."
-msgstr ""
+#: src/resources/itemdb.cpp:135 src/resources/monsterdb.cpp:77
+msgid "unnamed"
+msgstr "未知怪兽"
 
-#: src/net/manaserv/charhandler.cpp:187
-#, fuzzy
-msgid "Player deleted."
-msgstr "角色已删除。"
+#~ msgid "Text Shadow"
+#~ msgstr "文本阴影"
 
-#: src/net/manaserv/charhandler.cpp:199
-#, fuzzy
-msgid "Selection out of range."
-msgstr "请选择交易的物品数量。"
+#~ msgid "Text Outline"
+#~ msgstr "文本轮廓"
 
-#: src/net/manaserv/charhandler.cpp:202
-#, fuzzy, c-format
-msgid "Unknown error (%d)."
-msgstr "未明错误"
+#~ msgid "Progress Bar Labels"
+#~ msgstr "进度条标签"
 
-#: src/net/manaserv/charhandler.cpp:242
-msgid "No gameservers are available."
-msgstr "无 游戏服务器 可用。"
+#~ msgid "Background"
+#~ msgstr "背景"
 
-#: src/net/manaserv/charhandler.cpp:268
-msgid "Willpower:"
-msgstr "意志力："
+#~ msgid "Highlight"
+#~ msgstr "突出显示"
 
-#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
-#: src/net/manaserv/guildhandler.cpp:259
-#, c-format
-msgid "Topic: %s"
-msgstr "主题：%s"
+#~ msgid "Tab Highlight"
+#~ msgstr "标签加亮"
 
-#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
 #, fuzzy
-msgid "Players in this channel:"
-msgstr "玩家攻击怪兽"
+#~ msgid "Item Too Expensive"
+#~ msgstr "物品太昂贵"
 
-#: src/net/manaserv/chathandler.cpp:201
 #, fuzzy
-msgid "Error joining channel."
-msgstr "命令：/join <频道>"
+#~ msgid "Item Is Equipped"
+#~ msgstr "物品已装备"
 
-#: src/net/manaserv/chathandler.cpp:207
-#, fuzzy
-msgid "Listing channels."
-msgstr "请求加入频道%s。"
+#~ msgid "GM"
+#~ msgstr "GM"
 
-#: src/net/manaserv/chathandler.cpp:219
-msgid "End of channel list."
-msgstr ""
+#~ msgid "Player"
+#~ msgstr "玩家"
 
-#: src/net/manaserv/chathandler.cpp:291
-#, fuzzy, c-format
-msgid "%s entered the channel."
-msgstr "%s加入了帮会。"
+#~ msgid "Whisper"
+#~ msgstr "密语"
 
-#: src/net/manaserv/chathandler.cpp:296
-#, c-format
-msgid "%s left the channel."
-msgstr ""
+#~ msgid "Is"
+#~ msgstr "是"
 
-#: src/net/manaserv/chathandler.cpp:312
-#, c-format
-msgid "%s has set mode %s on user %s."
-msgstr ""
+#~ msgid "Server"
+#~ msgstr "服务器"
 
-#: src/net/manaserv/chathandler.cpp:322
-#, c-format
-msgid "%s has kicked %s."
-msgstr ""
+#~ msgid "Logger"
+#~ msgstr "记录器"
 
-#: src/net/manaserv/chathandler.cpp:327
-#, fuzzy
-msgid "Unknown channel event."
-msgstr "未知命令。"
+#~ msgid "Hyperlink"
+#~ msgstr "超链接"
 
-#: src/net/manaserv/generalhandler.cpp:100
-#, c-format
-msgid "Willpower %+d"
-msgstr "意志力 %+d"
+# need more contents!!!
+#~ msgid "Being"
+#~ msgstr "存在"
 
-#: src/net/manaserv/generalhandler.cpp:171
-#, fuzzy
-msgid "Willpower"
-msgstr "意志力："
+#~ msgid "Other Players' Names"
+#~ msgstr "其他玩家名"
 
-#: src/net/manaserv/guildhandler.cpp:81
-msgid "Guild created."
-msgstr "帮会已创建"
+#~ msgid "Own Name"
+#~ msgstr "自己的名字"
 
-#: src/net/manaserv/guildhandler.cpp:86
-msgid "Error creating guild."
-msgstr ""
+#~ msgid "GM Names"
+#~ msgstr "GM名"
 
-#: src/net/manaserv/guildhandler.cpp:96
-msgid "Invite sent."
-msgstr "邀请已发送。"
+#~ msgid "NPCs"
+#~ msgstr "NPCs"
 
-#: src/net/manaserv/guildhandler.cpp:203
-msgid "Member was promoted successfully."
-msgstr "会员晋升成功。"
+#~ msgid "Monsters"
+#~ msgstr "怪物"
 
-#: src/net/manaserv/guildhandler.cpp:208
-msgid "Failed to promote member."
-msgstr "晋升会员失败。"
+#~ msgid "Unknown Item Type"
+#~ msgstr "未知物品类型"
 
-#: src/net/manaserv/loginhandler.cpp:87
-#, fuzzy
-msgid "Wrong magic_token."
-msgstr "错误的 magic_token"
+#~ msgid "Generics"
+#~ msgstr "一般的"
 
-#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
-#, fuzzy
-msgid "Already logged in."
-msgstr "已经登录"
+#~ msgid "Hats"
+#~ msgstr "帽子"
 
-#: src/net/manaserv/loginhandler.cpp:93 src/net/manaserv/loginhandler.cpp:272
-#, fuzzy
-msgid "Server is full."
-msgstr "服务器满载"
+#~ msgid "Usables"
+#~ msgstr "可用的"
+
+#~ msgid "Shirts"
+#~ msgstr "衬衫"
 
-#: src/net/manaserv/loginhandler.cpp:118
 #, fuzzy
-msgid "New password incorrect."
-msgstr "新密码错误"
+#~ msgid "One Handed Weapons"
+#~ msgstr "单手武器"
 
-#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
-msgid "Account not connected. Please login first."
-msgstr "账户未连接。请先登录。"
+#~ msgid "Pants"
+#~ msgstr "裤子"
 
-#: src/net/manaserv/loginhandler.cpp:149
-#, fuzzy
-msgid "New email address incorrect."
-msgstr "新电子邮件地址不正确"
+#~ msgid "Shoes"
+#~ msgstr "鞋子"
 
-#: src/net/manaserv/loginhandler.cpp:152
 #, fuzzy
-msgid "Old email address incorrect."
-msgstr "原电子邮件地址不正确"
+#~ msgid "Two Handed Weapons"
+#~ msgstr "单手武器"
 
-#: src/net/manaserv/loginhandler.cpp:158
-#, fuzzy
-msgid "The new email address already exists."
-msgstr "新电子邮件地址已经存在。"
+#~ msgid "Shields"
+#~ msgstr "盾"
 
-#: src/net/manaserv/loginhandler.cpp:239
-msgid ""
-"Client registration is not allowed. Please contact server administration."
-msgstr ""
+#~ msgid "Rings"
+#~ msgstr "指环"
 
-#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
-#, fuzzy
-msgid "Client version is too old."
-msgstr "客户端版本太旧"
+#~ msgid "Necklaces"
+#~ msgstr "项链"
 
-#: src/net/manaserv/loginhandler.cpp:266
-#, fuzzy
-msgid "Wrong username or password."
-msgstr "错误的用户名或密码"
+#~ msgid "Arms"
+#~ msgstr "武器"
 
-#: src/net/manaserv/loginhandler.cpp:275
-msgid "Login attempt too soon after previous attempt."
-msgstr ""
+#~ msgid "Ammo"
+#~ msgstr "弹药"
 
-#: src/net/manaserv/loginhandler.cpp:303
-#, fuzzy
-msgid "Wrong username, password or email address."
-msgstr "错误的用户名，密码或者电子邮件地址"
+#~ msgid "Particle Effects"
+#~ msgstr "粒子效果"
+
+#~ msgid "Pickup Notification"
+#~ msgstr "拾起通知"
+
+#~ msgid "Exp Notification"
+#~ msgstr "到期通知"
 
-#: src/net/manaserv/loginhandler.cpp:306
 #, fuzzy
-msgid "Username already exists."
-msgstr "用户名已存在"
+#~ msgid "Player Hits Monster"
+#~ msgstr "玩家攻击怪兽"
 
-#: src/net/manaserv/loginhandler.cpp:309
 #, fuzzy
-msgid "Email address already exists."
-msgstr "电子邮件地址已存在"
+#~ msgid "Monster Hits Player"
+#~ msgstr "怪兽击打玩家"
 
-#: src/net/manaserv/loginhandler.cpp:312
-msgid "You took too long with the captcha or your response was incorrect."
-msgstr ""
+#~ msgid "Critical Hit"
+#~ msgstr "会心一击"
 
-#: src/net/manaserv/partyhandler.cpp:88
-msgid "Joined party."
-msgstr "加入了帮会。"
+#~ msgid "Misses"
+#~ msgstr "失误"
 
-#: src/net/manaserv/partyhandler.cpp:106
-#, c-format
-msgid "%s joined the party."
-msgstr "%s加入了帮会。"
+#~ msgid "HP Bar"
+#~ msgstr "HP条"
 
-#: src/net/manaserv/partyhandler.cpp:123
-#, fuzzy, c-format
-msgid "%s rejected your invite."
-msgstr "%s拒绝了您的邀请。"
+#~ msgid "3/4 HP Bar"
+#~ msgstr "3/4 HP条"
 
-#: src/net/manaserv/tradehandler.cpp:96
-msgid "Accepting incoming trade requests."
-msgstr "正在接受交易请求"
+#~ msgid "1/2 HP Bar"
+#~ msgstr "1/2 HP条"
 
-#: src/net/manaserv/tradehandler.cpp:98
-msgid "Ignoring incoming trade requests."
-msgstr "忽略交易请求"
+#~ msgid "1/4 HP Bar"
+#~ msgstr "1/4 HP条"
 
-#: src/net/manaserv/tradehandler.cpp:135
-#, c-format
-msgid "Trading with %s"
-msgstr "与%s交易中"
+#, fuzzy
+#~ msgid "HP"
+#~ msgstr "HP："
 
-#: src/playerrelations.cpp:304
 #, fuzzy
-msgid "Completely ignore"
-msgstr "@@ignore|完全忽略%s@@"
+#~ msgid "MP"
+#~ msgstr "MP："
 
-#: src/playerrelations.cpp:318
-msgid "Print '...'"
-msgstr ""
+#, fuzzy
+#~ msgid "Exp"
+#~ msgstr "经验："
 
-#: src/playerrelations.cpp:334
-msgid "Blink name"
-msgstr ""
+#, fuzzy
+#~ msgid "Money"
+#~ msgstr "金钱：%d"
 
-#: src/playerrelations.cpp:371
-msgid "Floating '...' bubble"
-msgstr ""
+#, fuzzy
+#~ msgid "Job"
+#~ msgstr "职业："
 
-#: src/playerrelations.cpp:374
-msgid "Floating bubble"
-msgstr ""
+#, fuzzy
+#~ msgid "Level"
+#~ msgstr "等级：%d"
 
-#: src/resources/itemdb.cpp:52
-#, c-format
-msgid "Attack %+d"
-msgstr "攻击 %+d"
+#, fuzzy
+#~ msgid "Access denied."
+#~ msgstr "访问被拒绝"
 
-#: src/resources/itemdb.cpp:53
-#, c-format
-msgid "Defense %+d"
-msgstr "防护 %+d"
+#, fuzzy
+#~ msgid "Unknown failure to select character."
+#~ msgstr "选择人物时遇到未知错误"
 
-#: src/resources/itemdb.cpp:54
-#, c-format
-msgid "HP %+d"
-msgstr "HP %+d"
+#~ msgid "Inviting like this isn't supported at the moment."
+#~ msgstr "这种方式的邀请暂时不支持。"
 
-#: src/resources/itemdb.cpp:55
-#, c-format
-msgid "MP %+d"
-msgstr "MP %+d"
+#~ msgid "Willpower:"
+#~ msgstr "意志力："
 
-#: src/resources/itemdb.cpp:114
-msgid "Unknown item"
-msgstr "未知物品"
+#~ msgid "Willpower %+d"
+#~ msgstr "意志力 %+d"
 
-#: src/resources/itemdb.cpp:158 src/resources/monsterdb.cpp:45
-#: src/resources/monsterdb.cpp:67
-msgid "unnamed"
-msgstr "未知怪兽"
+#, fuzzy
+#~ msgid "Willpower"
+#~ msgstr "意志力："
+
+#, fuzzy
+#~ msgid "Server is full."
+#~ msgstr "服务器满载"
 
 #~ msgid "no"
 #~ msgstr "不"
diff --git a/po/zh_HK.po b/po/zh_HK.po
index abeee507..70ba64d5 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -8,11 +8,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2010-03-05 21:52+0100\n"
+"POT-Creation-Date: 2010-12-13 20:04+0100\n"
 "PO-Revision-Date: 2009-06-08 22:11+0000\n"
 "Last-Translator: lok0919 <lok0919@gmail.com>\n"
 "Language-Team: Traditional Chinese <themanaworld-devel@lists.sourceforge."
 "net>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -23,448 +24,462 @@ msgstr ""
 "X-Poedit-Language: Chinese\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: src/client.cpp:553 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:62
+#: src/client.cpp:598 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
 msgid "Setup"
 msgstr "設定"
 
-#: src/client.cpp:623
+#: src/client.cpp:679
 #, fuzzy
 msgid "Connecting to server"
 msgstr "正在連接到地圖伺服器..."
 
-#: src/client.cpp:650
+#: src/client.cpp:706
 #, fuzzy
 msgid "Logging in"
 msgstr "登入"
 
-#: src/client.cpp:683
+#: src/client.cpp:739
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:739
+#: src/client.cpp:804
 #, fuzzy
 msgid "Requesting characters"
 msgstr "選擇角色"
 
-#: src/client.cpp:768
+#: src/client.cpp:833
 #, fuzzy
 msgid "Connecting to the game server"
 msgstr "正在連接到地圖伺服器..."
 
-#: src/client.cpp:799 src/client.cpp:806 src/client.cpp:940
+#: src/client.cpp:843
+#, fuzzy
+msgid "Changing game servers"
+msgstr "更改"
+
+#: src/client.cpp:872 src/client.cpp:879 src/client.cpp:1014
 #: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
 #: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
-#: src/gui/serverdialog.cpp:261 src/gui/unregisterdialog.cpp:133
-#: src/net/ea/charserverhandler.cpp:135 src/net/ea/charserverhandler.cpp:152
-#: src/net/manaserv/charhandler.cpp:161 src/net/manaserv/charhandler.cpp:204
+#: src/gui/serverdialog.cpp:323 src/gui/unregisterdialog.cpp:133
+#: src/net/manaserv/charhandler.cpp:174 src/net/manaserv/charhandler.cpp:217
+#: src/net/tmwa/charserverhandler.cpp:134
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Error"
 msgstr "錯誤"
 
-#: src/client.cpp:815
+#: src/client.cpp:888
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:842
+#: src/client.cpp:915
 #, fuzzy
 msgid "Password Change"
 msgstr "密碼："
 
-#: src/client.cpp:843
+#: src/client.cpp:916
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:862
+#: src/client.cpp:935
 #, fuzzy
 msgid "Email Change"
 msgstr "更改"
 
-#: src/client.cpp:863
+#: src/client.cpp:936
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:883
+#: src/client.cpp:956
 #, fuzzy
 msgid "Unregister Successful"
 msgstr "註冊"
 
-#: src/client.cpp:884
+#: src/client.cpp:957
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1007 src/client.cpp:1030
+#: src/client.cpp:1138 src/client.cpp:1161
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1119
+#: src/client.cpp:1281
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1153 src/client.cpp:1159
+#: src/client.cpp:1315 src/client.cpp:1321
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/commandhandler.cpp:127 src/commandhandler.cpp:308
+#: src/commandhandler.cpp:131 src/commandhandler.cpp:317
 msgid "Unknown command."
 msgstr "不明指令"
 
-#: src/commandhandler.cpp:156
+#: src/commandhandler.cpp:160
 msgid "-- Help --"
 msgstr "-- 說明 --"
 
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:161
 msgid "/help > Display this help"
 msgstr ""
 
-#: src/commandhandler.cpp:159
+#: src/commandhandler.cpp:163
 msgid "/where > Display map name"
 msgstr "/where > 顯示地圖名稱"
 
-#: src/commandhandler.cpp:160
+#: src/commandhandler.cpp:164
 msgid "/who > Display number of online users"
 msgstr "/who > 顯示線上人數"
 
-#: src/commandhandler.cpp:161
+#: src/commandhandler.cpp:165
 msgid "/me > Tell something about yourself"
 msgstr "/me > 告訴一些有關你的事"
 
-#: src/commandhandler.cpp:163
+#: src/commandhandler.cpp:167
 msgid "/clear > Clears this window"
 msgstr "/clear > 清除此窗口"
 
-#: src/commandhandler.cpp:165
+#: src/commandhandler.cpp:169
 msgid "/msg > Send a private message to a user"
 msgstr "/msg > 發送私人訊息給玩家"
 
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:170
 msgid "/whisper > Alias of msg"
 msgstr "/whisper > 等同msg"
 
-#: src/commandhandler.cpp:167
+#: src/commandhandler.cpp:171
 msgid "/w > Alias of msg"
 msgstr "/w > 等同msg"
 
-#: src/commandhandler.cpp:168
+#: src/commandhandler.cpp:172
 msgid "/query > Makes a tab for private messages with another user"
 msgstr ""
 
-#: src/commandhandler.cpp:169
+#: src/commandhandler.cpp:174
 msgid "/q > Alias of query"
 msgstr "/q > 等同query"
 
-#: src/commandhandler.cpp:171
+#: src/commandhandler.cpp:176
 msgid "/ignore > ignore a player"
 msgstr ""
 
-#: src/commandhandler.cpp:172
+#: src/commandhandler.cpp:177
 msgid "/unignore > stop ignoring a player"
 msgstr ""
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:179
 msgid "/list > Display all public channels"
 msgstr "/list > 顯示所有公共頻道"
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:180
 msgid "/join > Join or create a channel"
 msgstr "/join > 加入/建立一個頻道"
 
-#: src/commandhandler.cpp:177
+#: src/commandhandler.cpp:182
 #, fuzzy
 msgid "/createparty > Create a new party"
 msgstr "/party > 邀請玩家加入隊伍"
 
-#: src/commandhandler.cpp:178
+#: src/commandhandler.cpp:183
 msgid "/party > Invite a user to party"
 msgstr "/party > 邀請玩家加入隊伍"
 
-#: src/commandhandler.cpp:180
+#: src/commandhandler.cpp:185
 msgid "/record > Start recording the chat to an external file"
 msgstr "/record > 開始錄製聊天至外部文件"
 
-#: src/commandhandler.cpp:181
+#: src/commandhandler.cpp:187
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr ""
 
-#: src/commandhandler.cpp:182
+#: src/commandhandler.cpp:189
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr "/present > 獲取現在的玩家名單（如果錄製聊天中，會發送到聊天記錄）"
 
-#: src/commandhandler.cpp:184
+#: src/commandhandler.cpp:192
 msgid "/announce > Global announcement (GM only)"
 msgstr "/announce > 公告 (GM only)"
 
-#: src/commandhandler.cpp:188
+#: src/commandhandler.cpp:196
 msgid "For more information, type /help <command>."
 msgstr ""
 
-#: src/commandhandler.cpp:192
+#: src/commandhandler.cpp:200
 msgid "Command: /help"
 msgstr "指令： /help"
 
-#: src/commandhandler.cpp:193
+#: src/commandhandler.cpp:201
 msgid "This command displays a list of all commands available."
 msgstr "該指令可顯示所有可用指令。"
 
-#: src/commandhandler.cpp:194
+#: src/commandhandler.cpp:203
 msgid "Command: /help <command>"
 msgstr "指令： /help <指令>"
 
-#: src/commandhandler.cpp:195
+#: src/commandhandler.cpp:204
 msgid "This command displays help on <command>."
 msgstr "該指令會顯示<指令>的幫助訊息"
 
-#: src/commandhandler.cpp:203
+#: src/commandhandler.cpp:212
 msgid "Command: /announce <msg>"
 msgstr "指令： /announce <信息>"
 
-#: src/commandhandler.cpp:204
+#: src/commandhandler.cpp:213
 msgid "*** only available to a GM ***"
 msgstr "*** 只有GM可用 ***"
 
-#: src/commandhandler.cpp:205
+#: src/commandhandler.cpp:214
 msgid "This command sends the message <msg> to all players currently online."
 msgstr "該指令會發送<信息>給所有線上用戶。"
 
-#: src/commandhandler.cpp:210
+#: src/commandhandler.cpp:219
 msgid "Command: /clear"
 msgstr "指令： /clear"
 
-#: src/commandhandler.cpp:211
+#: src/commandhandler.cpp:220
 msgid "This command clears the chat log of previous chat."
 msgstr "該指令可以清除聊天紀錄。"
 
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:224
 #, fuzzy
 msgid "Command: /ignore <player>"
 msgstr "/join <頻道>"
 
-#: src/commandhandler.cpp:216
+#: src/commandhandler.cpp:225
 #, fuzzy
 msgid "This command ignores the given player regardless of current relations."
 msgstr "這調指令可顯示目前線上人數。"
 
-#: src/commandhandler.cpp:221
+#: src/commandhandler.cpp:230
 msgid "Command: /join <channel>"
 msgstr "/join <頻道>"
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:231
 msgid "This command makes you enter <channel>."
 msgstr "這個指令令你進入 <頻道>."
 
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:232
 msgid "If <channel> doesn't exist, it's created."
 msgstr "如果<頻道>不存在，將會被建立"
 
-#: src/commandhandler.cpp:227
+#: src/commandhandler.cpp:236
 msgid "Command: /list"
 msgstr ""
 
-#: src/commandhandler.cpp:228
+#: src/commandhandler.cpp:237
 msgid "This command shows a list of all channels."
 msgstr "這個指令會列出所有頻道"
 
-#: src/commandhandler.cpp:232
+#: src/commandhandler.cpp:241
 msgid "Command: /me <message>"
 msgstr "/me <信息>"
 
-#: src/commandhandler.cpp:233
+#: src/commandhandler.cpp:242
 msgid "This command tell others you are (doing) <msg>."
 msgstr "這個指令會告訴其他人你正在 <信息>."
 
-#: src/commandhandler.cpp:237
+#: src/commandhandler.cpp:246
 msgid "Command: /msg <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:238
+#: src/commandhandler.cpp:247
 msgid "Command: /whisper <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:239
+#: src/commandhandler.cpp:248
 msgid "Command: /w <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:240
+#: src/commandhandler.cpp:249
 msgid "This command sends the text <message> to <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:241 src/commandhandler.cpp:260
+#: src/commandhandler.cpp:250 src/commandhandler.cpp:269
 #: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
-#: src/net/ea/gui/guildtab.cpp:75 src/net/ea/gui/partytab.cpp:75
+#: src/net/tmwa/gui/guildtab.cpp:75 src/net/tmwa/gui/partytab.cpp:75
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr "如果<暱稱>之間有空格，用雙引號(\")括起來。"
 
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:255
 msgid "Command: /query <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:247
+#: src/commandhandler.cpp:256
 msgid "Command: /q <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:248
+#: src/commandhandler.cpp:257
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:253
+#: src/commandhandler.cpp:262
 #, fuzzy
 msgid "Command: /createparty <name>"
 msgstr "指令： /clear"
 
-#: src/commandhandler.cpp:254
+#: src/commandhandler.cpp:263
 #, fuzzy
 msgid "This command creates a new party called <name>."
 msgstr "這個指令令你進入 <頻道>."
 
-#: src/commandhandler.cpp:258
+#: src/commandhandler.cpp:267
 msgid "Command: /party <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:259 src/net/ea/gui/partytab.cpp:74
+#: src/commandhandler.cpp:268 src/net/tmwa/gui/partytab.cpp:74
 msgid "This command invites <nick> to party with you."
 msgstr ""
 
-#: src/commandhandler.cpp:265
+#: src/commandhandler.cpp:274
 msgid "Command: /present"
 msgstr ""
 
-#: src/commandhandler.cpp:266
+#: src/commandhandler.cpp:275
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: src/commandhandler.cpp:272
+#: src/commandhandler.cpp:281
 msgid "Command: /record <filename>"
 msgstr ""
 
-#: src/commandhandler.cpp:273
+#: src/commandhandler.cpp:282
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr ""
 
-#: src/commandhandler.cpp:275
+#: src/commandhandler.cpp:284
 msgid "Command: /record"
 msgstr ""
 
-#: src/commandhandler.cpp:276
+#: src/commandhandler.cpp:285
 msgid "This command finishes a recording session."
 msgstr ""
 
-#: src/commandhandler.cpp:280
+#: src/commandhandler.cpp:289
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: src/commandhandler.cpp:281
+#: src/commandhandler.cpp:290
 msgid ""
 "This command sets whether the return key should toggle the chat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: src/commandhandler.cpp:283
+#: src/commandhandler.cpp:292
 msgid ""
-"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
-"\", \"no\", \"false\" to turn the toggle off."
+"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
+"\"0\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: src/commandhandler.cpp:286
+#: src/commandhandler.cpp:295
 msgid "Command: /toggle"
 msgstr ""
 
-#: src/commandhandler.cpp:287
+#: src/commandhandler.cpp:296
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: src/commandhandler.cpp:291 src/gui/widgets/whispertab.cpp:93
+#: src/commandhandler.cpp:300 src/gui/widgets/whispertab.cpp:95
 #, fuzzy
 msgid "Command: /unignore <player>"
 msgstr "指令： /announce <信息>"
 
-#: src/commandhandler.cpp:292
+#: src/commandhandler.cpp:301
 msgid "This command stops ignoring the given player if they are being ignored"
 msgstr ""
 
-#: src/commandhandler.cpp:297
+#: src/commandhandler.cpp:306
 msgid "Command: /where"
 msgstr "指令: /where"
 
-#: src/commandhandler.cpp:298
+#: src/commandhandler.cpp:307
 msgid "This command displays the name of the current map."
 msgstr "這個指令顯示目前地圖名。"
 
-#: src/commandhandler.cpp:302
+#: src/commandhandler.cpp:311
 msgid "Command: /who"
 msgstr "指令： /who"
 
-#: src/commandhandler.cpp:303
+#: src/commandhandler.cpp:312
 msgid "This command displays the number of players currently online."
 msgstr "這調指令可顯示目前線上人數。"
 
-#: src/commandhandler.cpp:309
+#: src/commandhandler.cpp:318
 msgid "Type /help for a list of commands."
 msgstr "輸入 /help 獲取指令列表。"
 
-#: src/commandhandler.cpp:375
+#: src/commandhandler.cpp:384
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:383
+#: src/commandhandler.cpp:392
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:397
+#: src/commandhandler.cpp:406
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:410 src/net/ea/gui/partytab.cpp:109
+#: src/commandhandler.cpp:419 src/net/tmwa/gui/partytab.cpp:109
 msgid "Party name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:423 src/commandhandler.cpp:471
-#: src/commandhandler.cpp:493
+#: src/commandhandler.cpp:432 src/commandhandler.cpp:509
+#: src/commandhandler.cpp:531
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:441
+#: src/commandhandler.cpp:450
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:441
+#: src/commandhandler.cpp:450
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:450
+#: src/commandhandler.cpp:459
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:454
+#: src/commandhandler.cpp:463
 msgid "Message now closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:477
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:489
+msgid "Show IP: On"
+msgstr ""
+
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:485
+msgid "Show IP: Off"
+msgstr ""
+
+#: src/commandhandler.cpp:515
 msgid "Player already ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:484
+#: src/commandhandler.cpp:522
 msgid "Player successfully ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:486
+#: src/commandhandler.cpp:524
 msgid "Player could not be ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:501
+#: src/commandhandler.cpp:539
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:506
+#: src/commandhandler.cpp:544
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:508
+#: src/commandhandler.cpp:546
 msgid "Player could not be unignored!"
 msgstr ""
 
@@ -477,42 +492,42 @@ msgstr ""
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:326
+#: src/game.cpp:342
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:331
+#: src/game.cpp:347
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:355
+#: src/game.cpp:378
 #, fuzzy
 msgid "The connection to the server was lost."
 msgstr "正在連接角色伺服器..."
 
-#: src/game.cpp:360
+#: src/game.cpp:382
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:705
+#: src/game.cpp:721
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:712
+#: src/game.cpp:726
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:946
+#: src/game.cpp:954
 #, fuzzy
 msgid "Could Not Load Map"
 msgstr "不能加入隊伍！"
 
-#: src/game.cpp:947
+#: src/game.cpp:955
 #, c-format
 msgid "Error while loading %s"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:75
+#: src/gui/beingpopup.cpp:76
 #, c-format
 msgid "Party: %s"
 msgstr ""
@@ -521,34 +536,34 @@ msgstr ""
 msgid "Buy"
 msgstr "購買"
 
-#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
-#: src/gui/sell.cpp:276
+#: src/gui/buy.cpp:69 src/gui/buy.cpp:261 src/gui/sell.cpp:71
+#: src/gui/sell.cpp:288
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:99 src/gui/npcdialog.cpp:100
-#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:479
+#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:112 src/gui/npcdialog.cpp:124
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:463
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:98 src/gui/npcdialog.cpp:101
-#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:491
+#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:111 src/gui/npcdialog.cpp:125
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:475
 msgid "-"
 msgstr ""
 
 #: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
-#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:182
-#: src/keyboardconfig.cpp:103
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:228
+#: src/keyboardconfig.cpp:102
 msgid "Quit"
 msgstr "離開"
 
-#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:408
-#: src/gui/statuswindow.cpp:478 src/gui/statuswindow.cpp:512
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:384
+#: src/gui/statuswindow.cpp:462 src/gui/statuswindow.cpp:496
 msgid "Max"
 msgstr ""
 
@@ -562,11 +577,11 @@ msgstr "出售"
 
 #: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
 #: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
-#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:101
-#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:178
-#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:402
+#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:114
+#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:389
 #: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
-#: src/gui/socialwindow.cpp:242 src/gui/textdialog.cpp:39
+#: src/gui/socialwindow.cpp:275 src/gui/textdialog.cpp:40
 #: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr "取消"
@@ -603,7 +618,7 @@ msgstr ""
 msgid "Change Password"
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:53
+#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:55
 #: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
 msgid "Password:"
 msgstr "密碼："
@@ -634,19 +649,19 @@ msgstr ""
 msgid "Create Character"
 msgstr "新增角色"
 
-#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:52
+#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:54
 #: src/gui/register.cpp:67
 msgid "Name:"
 msgstr "名字："
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
 #: src/gui/outfitwindow.cpp:67
 msgid ">"
 msgstr ""
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
 #: src/gui/outfitwindow.cpp:66
@@ -663,8 +678,8 @@ msgstr "灰色："
 msgid "Hair style:"
 msgstr "髮型："
 
-#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:397
-#: src/gui/socialwindow.cpp:296
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:392
+#: src/gui/socialwindow.cpp:329
 msgid "Create"
 msgstr "創造"
 
@@ -720,34 +735,34 @@ msgstr "註冊"
 msgid "Change Email"
 msgstr "更改"
 
-#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:185
-#: src/gui/setup_players.cpp:230
+#: src/gui/charselectdialog.cpp:336 src/gui/serverdialog.cpp:231
+#: src/gui/setup_players.cpp:229
 msgid "Delete"
 msgstr "刪除"
 
-#: src/gui/charselectdialog.cpp:387
+#: src/gui/charselectdialog.cpp:380
 #, fuzzy
 msgid "Choose"
 msgstr "關閉"
 
-#: src/gui/charselectdialog.cpp:399 src/gui/charselectdialog.cpp:400
+#: src/gui/charselectdialog.cpp:394 src/gui/charselectdialog.cpp:395
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:77 src/gui/palette.cpp:96
+#: src/gui/chat.cpp:88
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chat.cpp:287
+#: src/gui/chat.cpp:311
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:305
+#: src/gui/chat.cpp:329
 msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:469
+#: src/gui/chat.cpp:493
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "對%s竊竊私語：%s"
@@ -809,143 +824,173 @@ msgstr "紋理細節"
 msgid "Ambient FX: %s"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:56
+#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:55
 msgid "Equipment"
 msgstr "裝備"
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:77
-#: src/gui/inventorywindow.cpp:79 src/gui/inventorywindow.cpp:298
-#: src/gui/popupmenu.cpp:372
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:89
+#: src/gui/inventorywindow.cpp:337 src/gui/popupmenu.cpp:359
 msgid "Unequip"
 msgstr "卸下裝備"
 
-#: src/gui/help.cpp:36
+#: src/gui/help.cpp:37
 msgid "Help"
 msgstr "說明"
 
-#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:73
+#: src/gui/help.cpp:51 src/gui/npcdialog.cpp:50
 msgid "Close"
 msgstr "關閉"
 
-#: src/gui/inventorywindow.cpp:56 src/gui/windowmenu.cpp:57
+#: src/gui/inventorywindow.cpp:59 src/gui/windowmenu.cpp:56
 msgid "Inventory"
 msgstr "物品攔"
 
-#: src/gui/inventorywindow.cpp:72 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:300 src/gui/popupmenu.cpp:374
+#: src/gui/inventorywindow.cpp:59
+msgid "Storage"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:82
+msgid "Slots:"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:87 src/gui/inventorywindow.cpp:100
+#: src/gui/inventorywindow.cpp:339 src/gui/popupmenu.cpp:361
 msgid "Equip"
 msgstr "裝備"
 
-#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:304 src/gui/popupmenu.cpp:377
+#: src/gui/inventorywindow.cpp:88
 msgid "Use"
 msgstr "使用"
 
-#: src/gui/inventorywindow.cpp:83 src/gui/inventorywindow.cpp:308
-#: src/gui/popupmenu.cpp:380
+#: src/gui/inventorywindow.cpp:101 src/gui/popupmenu.cpp:364
+msgid "Activate"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:102 src/gui/inventorywindow.cpp:348
+#: src/gui/popupmenu.cpp:367
 #, fuzzy
 msgid "Drop..."
 msgstr "丟棄"
 
-#: src/gui/inventorywindow.cpp:84 src/gui/popupmenu.cpp:386
+#: src/gui/inventorywindow.cpp:103 src/gui/popupmenu.cpp:373
 msgid "Split"
 msgstr "分開"
 
-#: src/gui/inventorywindow.cpp:85 src/gui/outfitwindow.cpp:51
+#: src/gui/inventorywindow.cpp:104 src/gui/outfitwindow.cpp:51
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:96 src/gui/storagewindow.cpp:83
-msgid "Slots:"
+#: src/gui/inventorywindow.cpp:106
+msgid "Weight:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:97
-msgid "Weight:"
+#: src/gui/inventorywindow.cpp:124 src/gui/popupmenu.cpp:378
+msgid "Store"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:125 src/gui/popupmenu.cpp:385
+msgid "Retrieve"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:310 src/gui/popupmenu.cpp:382
+#: src/gui/inventorywindow.cpp:350 src/gui/popupmenu.cpp:369
 msgid "Drop"
 msgstr "丟棄"
 
-#: src/gui/itemamount.cpp:100 src/gui/okdialog.cpp:42
-#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:38 src/gui/trade.cpp:73
-#: src/gui/trade.cpp:75
+#: src/gui/itemamount.cpp:113 src/gui/okdialog.cpp:42
+#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:39 src/gui/trade.cpp:72
+#: src/gui/trade.cpp:74
 msgid "OK"
 msgstr "確定"
 
-#: src/gui/itemamount.cpp:102
+#: src/gui/itemamount.cpp:115
 msgid "All"
 msgstr ""
 
-#: src/gui/itemamount.cpp:128
+#: src/gui/itemamount.cpp:141
 msgid "Select amount of items to trade."
 msgstr "請選擇交易的物品數量"
 
-#: src/gui/itemamount.cpp:131
+#: src/gui/itemamount.cpp:144
 msgid "Select amount of items to drop."
 msgstr "請選擇丟棄的物品數量"
 
-#: src/gui/itemamount.cpp:134
+#: src/gui/itemamount.cpp:147
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/itemamount.cpp:137
+#: src/gui/itemamount.cpp:150
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamount.cpp:140
+#: src/gui/itemamount.cpp:153
 msgid "Select amount of items to split."
 msgstr "請選擇你要分離的物品數量"
 
-#: src/gui/itempopup.cpp:92
+#: src/gui/itempopup.cpp:137
 #, fuzzy, c-format
 msgid "Weight: %s"
 msgstr "效果：%s"
 
-#: src/gui/login.cpp:49 src/gui/login.cpp:61
+#: src/gui/login.cpp:51 src/gui/login.cpp:63
 msgid "Login"
 msgstr "登入"
 
-#: src/gui/login.cpp:58
+#: src/gui/login.cpp:60
 #, fuzzy
 msgid "Remember username"
 msgstr "保存用戶名"
 
-#: src/gui/login.cpp:59 src/gui/register.cpp:58 src/gui/register.cpp:73
+#: src/gui/login.cpp:61 src/gui/register.cpp:58 src/gui/register.cpp:73
 msgid "Register"
 msgstr "註冊"
 
-#: src/gui/login.cpp:60
+#: src/gui/login.cpp:62
 #, fuzzy
 msgid "Change Server"
 msgstr "更改"
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
+#: src/gui/login.cpp:129
+msgid "Registration disabled"
+msgstr ""
+
+#: src/gui/login.cpp:129
+msgid "You need to use the website to register an account for this server."
+msgstr ""
+
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:86
 msgid "Map"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:44
+#: src/gui/ministatus.cpp:235
+msgid "Need"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:48
 msgid "Waiting for server"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:45
+#: src/gui/npcdialog.cpp:49
 msgid "Next"
 msgstr "下一個"
 
-#: src/gui/npcdialog.cpp:47
+#: src/gui/npcdialog.cpp:51
 msgid "Submit"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:52 src/gui/npcpostdialog.cpp:41
+#: src/gui/npcdialog.cpp:73 src/gui/npcpostdialog.cpp:41
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:110
+#: src/gui/npcdialog.cpp:118
+msgid "Clear log"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:134
 msgid "Reset"
 msgstr ""
 
 #. TRANSLATORS: Please leave the \n sequences intact.
-#: src/gui/npcdialog.cpp:171
+#: src/gui/npcdialog.cpp:208
 #, fuzzy
 msgid ""
 "\n"
@@ -960,7 +1005,7 @@ msgstr ""
 msgid "Send"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:96
+#: src/gui/npcpostdialog.cpp:99
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
@@ -975,303 +1020,82 @@ msgstr ""
 msgid "Unequip first"
 msgstr "卸下裝備"
 
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:143
-msgid "Text"
-msgstr ""
-
-#: src/gui/palette.cpp:82
-msgid "Text Shadow"
-msgstr ""
-
-#: src/gui/palette.cpp:83
-msgid "Text Outline"
-msgstr ""
-
-#: src/gui/palette.cpp:84
-msgid "Progress Bar Labels"
-msgstr ""
-
-#: src/gui/palette.cpp:85
-msgid "Buttons"
-msgstr ""
-
-#: src/gui/palette.cpp:86
-msgid "Disabled Buttons"
-msgstr ""
-
-#: src/gui/palette.cpp:87
-msgid "Tabs"
-msgstr ""
-
-#: src/gui/palette.cpp:89
-msgid "Background"
-msgstr ""
-
-#: src/gui/palette.cpp:91
-msgid "Highlight"
-msgstr ""
-
-#: src/gui/palette.cpp:92
-msgid "Tab Highlight"
-msgstr ""
-
-#: src/gui/palette.cpp:93
-msgid "Item Too Expensive"
-msgstr ""
-
-#: src/gui/palette.cpp:94
-msgid "Item Is Equipped"
-msgstr ""
-
-#: src/gui/palette.cpp:97
-msgid "GM"
-msgstr ""
-
-#: src/gui/palette.cpp:98
-msgid "Player"
-msgstr ""
-
-#: src/gui/palette.cpp:99
-msgid "Whisper"
-msgstr ""
-
-#: src/gui/palette.cpp:100
-msgid "Is"
-msgstr ""
-
-#: src/gui/palette.cpp:101 src/net/ea/gui/partytab.cpp:43
-msgid "Party"
-msgstr ""
-
-#: src/gui/palette.cpp:102 src/net/ea/gui/guildtab.cpp:45
-msgid "Guild"
-msgstr ""
-
-#: src/gui/palette.cpp:103
-msgid "Server"
-msgstr ""
-
-#: src/gui/palette.cpp:104
-msgid "Logger"
-msgstr ""
-
-#: src/gui/palette.cpp:105
-msgid "Hyperlink"
-msgstr ""
-
-#: src/gui/palette.cpp:107
-msgid "Being"
-msgstr ""
-
-#: src/gui/palette.cpp:108
-msgid "Other Players' Names"
-msgstr ""
-
-#: src/gui/palette.cpp:109
-msgid "Own Name"
-msgstr ""
-
-#: src/gui/palette.cpp:110
-msgid "GM Names"
-msgstr ""
-
-#: src/gui/palette.cpp:111
-msgid "NPCs"
-msgstr ""
-
-#: src/gui/palette.cpp:112
-msgid "Monsters"
-msgstr ""
-
-#: src/gui/palette.cpp:114
-msgid "Unknown Item Type"
-msgstr ""
-
-#: src/gui/palette.cpp:115
-msgid "Generics"
-msgstr ""
-
-#: src/gui/palette.cpp:116
-msgid "Hats"
-msgstr ""
-
-#: src/gui/palette.cpp:117
-msgid "Usables"
-msgstr ""
-
-#: src/gui/palette.cpp:118
-msgid "Shirts"
-msgstr ""
-
-#: src/gui/palette.cpp:119
-msgid "One Handed Weapons"
-msgstr ""
-
-#: src/gui/palette.cpp:120
-msgid "Pants"
-msgstr ""
-
-#: src/gui/palette.cpp:121
-msgid "Shoes"
-msgstr ""
-
-#: src/gui/palette.cpp:122
-msgid "Two Handed Weapons"
-msgstr ""
-
-#: src/gui/palette.cpp:123
-msgid "Shields"
-msgstr ""
-
-#: src/gui/palette.cpp:124
-msgid "Rings"
-msgstr ""
-
-#: src/gui/palette.cpp:125
-msgid "Necklaces"
-msgstr ""
-
-#: src/gui/palette.cpp:126
-msgid "Arms"
-msgstr ""
-
-#: src/gui/palette.cpp:127
-msgid "Ammo"
-msgstr ""
-
-#: src/gui/palette.cpp:129
-msgid "Particle Effects"
-msgstr ""
-
-#: src/gui/palette.cpp:130
-msgid "Pickup Notification"
-msgstr ""
-
-#: src/gui/palette.cpp:131
-msgid "Exp Notification"
-msgstr ""
-
-#: src/gui/palette.cpp:133
-msgid "Player Hits Monster"
-msgstr ""
-
-#: src/gui/palette.cpp:135
-msgid "Monster Hits Player"
-msgstr ""
-
-#: src/gui/palette.cpp:136
-msgid "Critical Hit"
-msgstr ""
-
-#: src/gui/palette.cpp:137
-msgid "Misses"
-msgstr ""
-
-#: src/gui/palette.cpp:139
-msgid "HP Bar"
-msgstr ""
-
-#: src/gui/palette.cpp:140
-msgid "3/4 HP Bar"
-msgstr ""
-
-#: src/gui/palette.cpp:141
-msgid "1/2 HP Bar"
-msgstr ""
-
-#: src/gui/palette.cpp:142
-msgid "1/4 HP Bar"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:84
+#: src/gui/popupmenu.cpp:83
 #, fuzzy, c-format
 msgid "Trade with %s..."
 msgstr "@@交易|與%s交易@@"
 
-#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:161
+#: src/gui/popupmenu.cpp:87 src/gui/popupmenu.cpp:158
 #, fuzzy, c-format
 msgid "Attack %s"
 msgstr "攻擊:"
 
-#: src/gui/popupmenu.cpp:92
+#: src/gui/popupmenu.cpp:91
 #, fuzzy, c-format
 msgid "Whisper %s"
 msgstr "對%s竊竊私語：%s"
 
-#: src/gui/popupmenu.cpp:101
+#: src/gui/popupmenu.cpp:100
 #, c-format
 msgid "Befriend %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:106
+#: src/gui/popupmenu.cpp:105
 #, c-format
 msgid "Disregard %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:109
+#: src/gui/popupmenu.cpp:108
 #, fuzzy, c-format
 msgid "Ignore %s"
 msgstr "忽略"
 
-#: src/gui/popupmenu.cpp:115 src/gui/popupmenu.cpp:124
+#: src/gui/popupmenu.cpp:114 src/gui/popupmenu.cpp:123
 #, c-format
 msgid "Unignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:118
+#: src/gui/popupmenu.cpp:117
 #, c-format
 msgid "Completely ignore %s"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:130
 #, c-format
-msgid "Follow %s"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:133
-#, c-format
 msgid "Invite %s to join your guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:137
+#: src/gui/popupmenu.cpp:134
 #, c-format
 msgid "Invite %s to join your party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144
+#: src/gui/popupmenu.cpp:141
 msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:153
+#: src/gui/popupmenu.cpp:150
 #, c-format
 msgid "Talk to %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:166
+#: src/gui/popupmenu.cpp:163
 msgid "Kick monster"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:174
+#: src/gui/popupmenu.cpp:171
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:191
+#: src/gui/popupmenu.cpp:188
 #, c-format
 msgid "Pick up %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:400
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:387
 msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:70
-msgid "Store"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:71
-msgid "Retrieve"
-msgstr ""
-
 #: src/gui/quitdialog.cpp:44
 msgid "Switch server"
 msgstr "交換伺服器"
@@ -1340,51 +1164,64 @@ msgstr "密碼不能少於%d個字元。"
 msgid "Passwords do not match."
 msgstr "密碼不一樣."
 
-#: src/gui/serverdialog.cpp:134
+#: src/gui/serverdialog.cpp:197
 msgid "Choose Your Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:141 src/gui/widgets/chattab.cpp:139
+#: src/gui/serverdialog.cpp:206 src/gui/widgets/chattab.cpp:142
 msgid "Server:"
 msgstr "伺服器："
 
-#: src/gui/serverdialog.cpp:142
+#: src/gui/serverdialog.cpp:207
 msgid "Port:"
 msgstr "Port："
 
-#: src/gui/serverdialog.cpp:143
+#: src/gui/serverdialog.cpp:208
 #, fuzzy
 msgid "Server type:"
 msgstr "伺服器："
 
-#: src/gui/serverdialog.cpp:183
+#: src/gui/serverdialog.cpp:229
 #, fuzzy
 msgid "Connect"
 msgstr "連線中..."
 
-#: src/gui/serverdialog.cpp:184
+#: src/gui/serverdialog.cpp:230
 #, fuzzy
 msgid "Custom Server"
 msgstr "自訂滑鼠標"
 
-#: src/gui/serverdialog.cpp:262
+#: src/gui/serverdialog.cpp:324
 msgid "Please type both the address and the port of a server."
 msgstr "請輸入伺服氣得IP地址和Port"
 
-#: src/gui/serverdialog.cpp:411
+#: src/gui/serverdialog.cpp:441
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:417
+#: src/gui/serverdialog.cpp:447
 #, fuzzy
 msgid "Waiting for server..."
 msgstr "正在連接到地圖伺服器..."
 
-#: src/gui/serverdialog.cpp:421
+#: src/gui/serverdialog.cpp:451
 msgid "Preparing download"
 msgstr ""
 
+#: src/gui/serverdialog.cpp:455
+msgid "Error retreiving server list!"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:550
+msgid "requires a newer version"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:552
+#, c-format
+msgid "requires v%s"
+msgstr ""
+
 #: src/gui/setup_audio.cpp:42
 msgid "Sound"
 msgstr "聲音"
@@ -1417,51 +1254,51 @@ msgstr ""
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:44
+#: src/gui/setup_colors.cpp:46
 msgid "This is what the color looks like"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:49
+#: src/gui/setup_colors.cpp:51
 msgid "Colors"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:70
+#: src/gui/setup_colors.cpp:72
 msgid "Type:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:81 src/gui/setup_colors.cpp:433
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:331
 msgid "Static"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:84
-#: src/gui/setup_colors.cpp:434
+#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
+#: src/gui/setup_colors.cpp:332
 msgid "Pulse"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
+#: src/gui/setup_colors.cpp:333
 msgid "Rainbow"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
+#: src/gui/setup_colors.cpp:333
 msgid "Spectrum"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:92
+#: src/gui/setup_colors.cpp:94
 #, fuzzy
 msgid "Delay:"
 msgstr "開始"
 
-#: src/gui/setup_colors.cpp:107
+#: src/gui/setup_colors.cpp:109
 msgid "Red:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:122
+#: src/gui/setup_colors.cpp:124
 msgid "Green:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:137
+#: src/gui/setup_colors.cpp:139
 msgid "Blue:"
 msgstr ""
 
@@ -1506,572 +1343,584 @@ msgid "Assign"
 msgstr "分配"
 
 #: src/gui/setup_keyboard.cpp:90
+#, fuzzy
+msgid "Unassign"
+msgstr "分配"
+
+#: src/gui/setup_keyboard.cpp:94
 msgid "Default"
 msgstr "預設"
 
-#: src/gui/setup_keyboard.cpp:119
+#: src/gui/setup_keyboard.cpp:125
 msgid "Key Conflict(s) Detected."
 msgstr "檢測到按鍵衝突。"
 
-#: src/gui/setup_players.cpp:57
+#: src/gui/setup_players.cpp:58
 msgid "Name"
 msgstr "名字"
 
-#: src/gui/setup_players.cpp:58
+#: src/gui/setup_players.cpp:59
 msgid "Relation"
 msgstr "關係"
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:64
 msgid "Neutral"
 msgstr "中立"
 
-#: src/gui/setup_players.cpp:64
+#: src/gui/setup_players.cpp:65
 msgid "Friend"
 msgstr "好友"
 
-#: src/gui/setup_players.cpp:65
+#: src/gui/setup_players.cpp:66
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_players.cpp:67
 msgid "Ignored"
 msgstr "忽略"
 
-#: src/gui/setup_players.cpp:208 src/gui/setup_video.cpp:132
+#: src/gui/setup_players.cpp:206 src/gui/setup_video.cpp:153
 msgid "???"
 msgstr ""
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_players.cpp:225
 msgid "Allow trading"
 msgstr "允許交易"
 
-#: src/gui/setup_players.cpp:228
+#: src/gui/setup_players.cpp:227
 msgid "Allow whispers"
 msgstr "允許密語"
 
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:231
 msgid "Put all whispers in tabs"
 msgstr ""
 
-#: src/gui/setup_players.cpp:234
+#: src/gui/setup_players.cpp:233
 msgid "Show gender"
 msgstr ""
 
-#: src/gui/setup_players.cpp:236
+#: src/gui/setup_players.cpp:235
+msgid "Enable Chat log"
+msgstr ""
+
+#: src/gui/setup_players.cpp:237
 msgid "Players"
 msgstr "玩家"
 
-#: src/gui/setup_players.cpp:261
+#: src/gui/setup_players.cpp:262
 msgid "When ignoring:"
 msgstr "當忽略時："
 
-#: src/gui/setup_video.cpp:113
+#: src/gui/setup_video.cpp:134
 msgid "Tiny"
 msgstr ""
 
-#: src/gui/setup_video.cpp:114
+#: src/gui/setup_video.cpp:135
 msgid "Small"
 msgstr ""
 
-#: src/gui/setup_video.cpp:115
+#: src/gui/setup_video.cpp:136
 msgid "Medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:116
+#: src/gui/setup_video.cpp:137
 msgid "Large"
 msgstr ""
 
-#: src/gui/setup_video.cpp:142
+#: src/gui/setup_video.cpp:163
 msgid "No text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:144
+#: src/gui/setup_video.cpp:164
+msgid "Text"
+msgstr ""
+
+#: src/gui/setup_video.cpp:165
 msgid "Bubbles, no names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:145
+#: src/gui/setup_video.cpp:166
 msgid "Bubbles with names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:157
+#: src/gui/setup_video.cpp:178
 msgid "off"
 msgstr "關閉"
 
-#: src/gui/setup_video.cpp:158 src/gui/setup_video.cpp:171
+#: src/gui/setup_video.cpp:179 src/gui/setup_video.cpp:192
 msgid "low"
 msgstr "低"
 
-#: src/gui/setup_video.cpp:159 src/gui/setup_video.cpp:173
+#: src/gui/setup_video.cpp:180 src/gui/setup_video.cpp:194
 msgid "high"
 msgstr "高"
 
-#: src/gui/setup_video.cpp:172
+#: src/gui/setup_video.cpp:193
 msgid "medium"
 msgstr "中"
 
-#: src/gui/setup_video.cpp:174
+#: src/gui/setup_video.cpp:195
 msgid "max"
 msgstr "最大"
 
-#: src/gui/setup_video.cpp:196
+#: src/gui/setup_video.cpp:217
 msgid "Full screen"
 msgstr "全螢幕"
 
-#: src/gui/setup_video.cpp:197
+#: src/gui/setup_video.cpp:218
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:198
+#: src/gui/setup_video.cpp:219
 msgid "Custom cursor"
 msgstr "自訂滑鼠標"
 
-#: src/gui/setup_video.cpp:200
+#: src/gui/setup_video.cpp:221
 msgid "Visible names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:223
 msgid "Particle effects"
 msgstr ""
 
-#: src/gui/setup_video.cpp:204
+#: src/gui/setup_video.cpp:225
 msgid "Show own name"
 msgstr ""
 
-#: src/gui/setup_video.cpp:205
+#: src/gui/setup_video.cpp:226
+msgid "Log NPC dialogue"
+msgstr ""
+
+#: src/gui/setup_video.cpp:227
 msgid "Show pickup notification"
 msgstr ""
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:207
+#. TRANSLATORS: Refers to "Show pickup notification"
+#: src/gui/setup_video.cpp:229
 msgid "in chat"
 msgstr ""
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:209
+#. TRANSLATORS: Refers to "Show pickup notification"
+#: src/gui/setup_video.cpp:231
 msgid "as particle"
 msgstr ""
 
-#: src/gui/setup_video.cpp:214
+#: src/gui/setup_video.cpp:236
 #, fuzzy
 msgid "FPS limit:"
 msgstr "FPS限制："
 
-#: src/gui/setup_video.cpp:225
+#: src/gui/setup_video.cpp:247
+msgid "Disable transparency (Low CPU mode)"
+msgstr ""
+
+#: src/gui/setup_video.cpp:250
 msgid "Video"
 msgstr "顯示"
 
-#: src/gui/setup_video.cpp:227
-msgid "Show monster damage"
+#: src/gui/setup_video.cpp:252
+msgid "Show damage"
 msgstr ""
 
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:258
 msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:259
 msgid "Gui opacity"
 msgstr "Gui 透明度"
 
-#: src/gui/setup_video.cpp:235
+#: src/gui/setup_video.cpp:260
 msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_video.cpp:236
+#: src/gui/setup_video.cpp:261
 #, fuzzy
 msgid "Particle detail"
 msgstr "紋理細節"
 
-#: src/gui/setup_video.cpp:237
+#: src/gui/setup_video.cpp:262
 msgid "Font size"
 msgstr ""
 
-#: src/gui/setup_video.cpp:251 src/gui/setup_video.cpp:454
-#: src/gui/setup_video.cpp:568
+#: src/gui/setup_video.cpp:277 src/gui/setup_video.cpp:532
+#: src/gui/setup_video.cpp:662
 #, fuzzy
 msgid "None"
 msgstr "否"
 
-#: src/gui/setup_video.cpp:381
+#: src/gui/setup_video.cpp:426
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:387
+#: src/gui/setup_video.cpp:432
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:398
+#: src/gui/setup_video.cpp:443
 #, fuzzy
 msgid "Switching to Full Screen"
 msgstr "切換全螢幕"
 
-#: src/gui/setup_video.cpp:399
+#: src/gui/setup_video.cpp:444
 msgid "Restart needed for changes to take effect."
 msgstr "請重新啟動"
 
-#: src/gui/setup_video.cpp:411
+#: src/gui/setup_video.cpp:458
 #, fuzzy
 msgid "Changing to OpenGL"
 msgstr "切換為OpenGL"
 
-#: src/gui/setup_video.cpp:412
+#: src/gui/setup_video.cpp:459
+msgid ""
+"Applying change to OpenGL requires restart. In case OpenGL messes up your "
+"game graphics, restart the game with the command line option \"--no-opengl\"."
+msgstr ""
+
+#: src/gui/setup_video.cpp:466
+msgid "Deactivating OpenGL"
+msgstr ""
+
+#: src/gui/setup_video.cpp:467
 msgid "Applying change to OpenGL requires restart."
 msgstr "確認切換OpenGL需要重新開始"
 
-#: src/gui/setup_video.cpp:486 src/gui/setup_video.cpp:491
+#: src/gui/setup_video.cpp:475
+msgid "Transparency disabled"
+msgstr ""
+
+#: src/gui/setup_video.cpp:476 src/gui/setup_video.cpp:484
+msgid "You must restart to apply changes."
+msgstr ""
+
+#: src/gui/setup_video.cpp:483
+msgid "Transparency enabled"
+msgstr ""
+
+#: src/gui/setup_video.cpp:576 src/gui/setup_video.cpp:581
 msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:487 src/gui/setup_video.cpp:492
+#: src/gui/setup_video.cpp:577 src/gui/setup_video.cpp:582
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:489
+#: src/gui/setup_video.cpp:579
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:522
+#: src/gui/setup_video.cpp:612
 msgid "Particle Effect Settings Changed."
 msgstr ""
 
-#: src/gui/setup_video.cpp:523
+#: src/gui/setup_video.cpp:613
 msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skilldialog.cpp:197 src/gui/windowmenu.cpp:58
+#: src/gui/skilldialog.cpp:212 src/gui/windowmenu.cpp:59
 msgid "Skills"
 msgstr "技能"
 
-#: src/gui/skilldialog.cpp:208
+#: src/gui/skilldialog.cpp:223
 msgid "Up"
 msgstr "升級"
 
-#: src/gui/skilldialog.cpp:262
+#: src/gui/skilldialog.cpp:269
 #, fuzzy, c-format
 msgid "Skill points available: %d"
 msgstr "技能點數：%d"
 
-#: src/gui/skilldialog.cpp:314
+#: src/gui/skilldialog.cpp:351
 #, fuzzy, c-format
 msgid "Skill Set %d"
 msgstr "技能點數：%d"
 
-#: src/gui/skilldialog.cpp:323
+#: src/gui/skilldialog.cpp:360
 #, fuzzy, c-format
 msgid "Skill %d"
 msgstr "技能"
 
-#: src/gui/skilldialog.cpp:405
+#: src/gui/skilldialog.cpp:442
 #, fuzzy, c-format
 msgid "Lvl: %d (%+d)"
 msgstr "等級：%d"
 
-#: src/gui/skilldialog.cpp:416
+#: src/gui/skilldialog.cpp:453
 #, fuzzy, c-format
 msgid "Lvl: %d"
 msgstr "等級：%d"
 
-#: src/gui/socialwindow.cpp:117
+#: src/gui/socialwindow.cpp:126
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:126
+#: src/gui/socialwindow.cpp:139
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:136
+#: src/gui/socialwindow.cpp:153
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:137
+#: src/gui/socialwindow.cpp:154
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:146
+#: src/gui/socialwindow.cpp:163
 msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:147
+#: src/gui/socialwindow.cpp:164
 #, fuzzy, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "你確定想刪除這個角色？"
 
-#: src/gui/socialwindow.cpp:182
+#: src/gui/socialwindow.cpp:207 src/net/tmwa/partyhandler.cpp:330
 #, fuzzy, c-format
 msgid "Invited user %s to party."
 msgstr "/party > 邀請玩家加入隊伍"
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:218
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:199
+#: src/gui/socialwindow.cpp:232
 #, fuzzy
 msgid "Member Invite to Party"
 msgstr "/party > 邀請玩家加入隊伍"
 
-#: src/gui/socialwindow.cpp:200
+#: src/gui/socialwindow.cpp:233
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:209
+#: src/gui/socialwindow.cpp:242
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:210
+#: src/gui/socialwindow.cpp:243
 #, fuzzy, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "你確定想刪除這個角色？"
 
-#: src/gui/socialwindow.cpp:239
+#: src/gui/socialwindow.cpp:272
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:240 src/gui/socialwindow.cpp:564
+#: src/gui/socialwindow.cpp:273 src/gui/socialwindow.cpp:620
 #, fuzzy
 msgid "Create Party"
 msgstr "新增角色"
 
-#: src/gui/socialwindow.cpp:279 src/gui/windowmenu.cpp:60
+#: src/gui/socialwindow.cpp:312 src/gui/windowmenu.cpp:64
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:297
+#: src/gui/socialwindow.cpp:330
 msgid "Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:298
+#: src/gui/socialwindow.cpp:331
 msgid "Leave"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:394
+#: src/gui/socialwindow.cpp:443
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:400
+#: src/gui/socialwindow.cpp:449
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:413
+#: src/gui/socialwindow.cpp:462
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:419
+#: src/gui/socialwindow.cpp:468
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:463
+#: src/gui/socialwindow.cpp:497
+msgid "Creating guild failed, please choose a shorter name."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:504
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:477
+#: src/gui/socialwindow.cpp:520
+msgid "Creating party failed, please choose a shorter name."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:527
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:484
+#: src/gui/socialwindow.cpp:541
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:485
+#: src/gui/socialwindow.cpp:542
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:497
+#: src/gui/socialwindow.cpp:554
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:502
+#: src/gui/socialwindow.cpp:559
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:507
+#: src/gui/socialwindow.cpp:564
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:519
+#: src/gui/socialwindow.cpp:576
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:529
+#: src/gui/socialwindow.cpp:585
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:533
+#: src/gui/socialwindow.cpp:589
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:541
+#: src/gui/socialwindow.cpp:597
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:546
+#: src/gui/socialwindow.cpp:602
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:554
+#: src/gui/socialwindow.cpp:610
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:565
+#: src/gui/socialwindow.cpp:621
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:570
+#: src/gui/socialwindow.cpp:626
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:571
+#: src/gui/socialwindow.cpp:627
 msgid "Choose your party's name."
 msgstr ""
 
-#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:59
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:62
 msgid "Specials"
 msgstr ""
 
-#: src/gui/specialswindow.cpp:174
-#, c-format
-msgid "Specials Set %d"
-msgstr ""
-
-#: src/gui/specialswindow.cpp:191
-#, c-format
-msgid "Special %d"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:99 src/gui/statuswindow.cpp:247
+#: src/gui/statuswindow.cpp:113 src/gui/statuswindow.cpp:215
+#: src/gui/statuswindow.cpp:262
 #, c-format
 msgid "Level: %d"
 msgstr "等級：%d"
 
-#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:211
+#: src/gui/statuswindow.cpp:114 src/gui/statuswindow.cpp:208
+#: src/gui/statuswindow.cpp:239
 #, c-format
 msgid "Money: %s"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:102
+#: src/gui/statuswindow.cpp:117
 msgid "HP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:107
+#: src/gui/statuswindow.cpp:122
 msgid "Exp:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:112
+#: src/gui/statuswindow.cpp:130
 msgid "MP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:132 src/gui/statuswindow.cpp:219
+#: src/gui/statuswindow.cpp:158 src/gui/statuswindow.cpp:275
 #, c-format
 msgid "Job: %d"
 msgstr "職業：%d"
 
-#: src/gui/statuswindow.cpp:133
+#: src/gui/statuswindow.cpp:159
 msgid "Job:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:194
-msgid "HP"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:200
-msgid "MP"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:206
-msgid "Exp"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:215
-#, fuzzy
-msgid "Money"
-msgstr "金錢：%d"
-
-#: src/gui/statuswindow.cpp:225
-#, fuzzy
-msgid "Job"
-msgstr "職業：%d"
-
-#: src/gui/statuswindow.cpp:229
+#: src/gui/statuswindow.cpp:211 src/gui/statuswindow.cpp:247
 #, fuzzy, c-format
 msgid "Character points: %d"
 msgstr "角色狀態確定"
 
-#: src/gui/statuswindow.cpp:235
+#: src/gui/statuswindow.cpp:255
 #, fuzzy, c-format
 msgid "Correction points: %d"
 msgstr "技能點數：%d"
 
-#: src/gui/statuswindow.cpp:251
-#, fuzzy
-msgid "Level"
-msgstr "等級：%d"
-
-#: src/gui/storagewindow.cpp:58
-msgid "Storage"
-msgstr ""
-
-#: src/gui/trade.cpp:52
+#: src/gui/trade.cpp:53
 msgid "Propose trade"
 msgstr "是否交易"
 
-#: src/gui/trade.cpp:53
+#: src/gui/trade.cpp:54
 msgid "Confirmed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:55
 msgid "Agree trade"
 msgstr ""
 
-#: src/gui/trade.cpp:55
+#: src/gui/trade.cpp:56
 msgid "Agreed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:58
+#: src/gui/trade.cpp:59
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/trade.cpp:74 src/gui/trade.cpp:75
+#: src/gui/trade.cpp:73 src/gui/trade.cpp:74
 msgid "Trade"
 msgstr "交易"
 
-#: src/gui/trade.cpp:77
+#: src/gui/trade.cpp:76
 msgid "Add"
 msgstr "增加"
 
-#: src/gui/trade.cpp:99 src/gui/trade.cpp:135
+#: src/gui/trade.cpp:98 src/gui/trade.cpp:134
 #, fuzzy, c-format
 msgid "You get %s"
 msgstr "你付出:"
 
-#: src/gui/trade.cpp:100
+#: src/gui/trade.cpp:99
 msgid "You give:"
 msgstr "你付出:"
 
-#: src/gui/trade.cpp:104
+#: src/gui/trade.cpp:103
 msgid "Change"
 msgstr "更改"
 
-#: src/gui/trade.cpp:275
+#: src/gui/trade.cpp:262
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr "增加物品失敗。你不能覆蓋視窗中的該類物品能。"
 
-#: src/gui/trade.cpp:318
+#: src/gui/trade.cpp:304
 msgid "You don't have enough money."
 msgstr ""
 
@@ -2092,21 +1941,21 @@ msgstr "連線中..."
 msgid "Play"
 msgstr "開始"
 
-#: src/gui/updatewindow.cpp:405
+#: src/gui/updatewindow.cpp:417
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:407
+#: src/gui/updatewindow.cpp:419
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:409
+#: src/gui/updatewindow.cpp:421
 msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:501
+#: src/gui/updatewindow.cpp:515
 msgid "Completed"
 msgstr "已完成"
 
@@ -2186,63 +2035,63 @@ msgstr ""
 msgid "Need a user to kick!"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:118
+#: src/gui/widgets/chattab.cpp:121
 msgid "Global announcement:"
 msgstr "主要公告："
 
-#: src/gui/widgets/chattab.cpp:124
+#: src/gui/widgets/chattab.cpp:127
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "%s 主要公告："
 
-#: src/gui/widgets/chattab.cpp:150
+#: src/gui/widgets/chattab.cpp:153
 #, fuzzy, c-format
 msgid "%s whispers: %s"
 msgstr "對%s竊竊私語：%s"
 
-#: src/gui/widgets/whispertab.cpp:51
+#: src/gui/widgets/whispertab.cpp:53
 msgid "Cannot send empty chat!"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:70
+#: src/gui/widgets/whispertab.cpp:72
 msgid "/ignore > Ignore the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:71
+#: src/gui/widgets/whispertab.cpp:73
 msgid "/unignore > Stop ignoring the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:72
+#: src/gui/widgets/whispertab.cpp:74
 msgid "/close > Close the whisper tab"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:82
+#: src/gui/widgets/whispertab.cpp:84
 msgid "Command: /close"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:83
+#: src/gui/widgets/whispertab.cpp:85
 msgid "This command closes the current whisper tab."
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:87
+#: src/gui/widgets/whispertab.cpp:89
 #, fuzzy
 msgid "Command: /ignore"
 msgstr "指令: /where"
 
-#: src/gui/widgets/whispertab.cpp:88
+#: src/gui/widgets/whispertab.cpp:90
 #, fuzzy
 msgid "This command ignores the other player regardless of current relations."
 msgstr "這調指令可顯示目前線上人數。"
 
-#: src/gui/widgets/whispertab.cpp:94
+#: src/gui/widgets/whispertab.cpp:96
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:55
+#: src/gui/windowmenu.cpp:54
 msgid "Status"
 msgstr "狀態"
 
-#: src/gui/windowmenu.cpp:61
+#: src/gui/windowmenu.cpp:65
 msgid "Shortcut"
 msgstr "快捷鍵"
 
@@ -2260,1372 +2109,1401 @@ msgstr "更改"
 msgid "Choose World"
 msgstr ""
 
-#: src/keyboardconfig.cpp:40
+#: src/keyboardconfig.cpp:39
 msgid "Move Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:41
+#: src/keyboardconfig.cpp:40
 msgid "Move Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:41
 msgid "Move Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:42
 msgid "Move Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:44 src/net/ea/generalhandler.cpp:223
+#: src/keyboardconfig.cpp:43 src/net/tmwa/generalhandler.cpp:237
 msgid "Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:44
 msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:45
 msgid "Smilie"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:46
 msgid "Talk"
 msgstr ""
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:47
 msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:48
 msgid "Target Monster"
 msgstr ""
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboardconfig.cpp:49
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:50
 msgid "Target Player"
 msgstr ""
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:51
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:52
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:53
 msgid "Sit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:54
 msgid "Screenshot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:55
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:56
 msgid "Find Path to Mouse"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58 src/keyboardconfig.cpp:59
-#: src/keyboardconfig.cpp:60 src/keyboardconfig.cpp:61
-#: src/keyboardconfig.cpp:62 src/keyboardconfig.cpp:63
-#: src/keyboardconfig.cpp:64 src/keyboardconfig.cpp:65
-#: src/keyboardconfig.cpp:66 src/keyboardconfig.cpp:67
-#: src/keyboardconfig.cpp:68 src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:57 src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60
+#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62
+#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64
+#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68
 #, c-format
 msgid "Item Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:69
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:70
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:71
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:72
 msgid "Equipment Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:73
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:74
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:75
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:76
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:77
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:78
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:79
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:80
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:81
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:83
+#: src/keyboardconfig.cpp:82
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:83
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86
-#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88
-#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90
-#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92
-#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:84 src/keyboardconfig.cpp:85
+#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:87
+#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:89
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:91
+#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:93
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:95
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:96
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:97
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:98
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:99
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:100
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:101
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:103
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:105
+#: src/keyboardconfig.cpp:104
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:178
+#: src/keyboardconfig.cpp:183
 #, fuzzy, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr "解決按鍵衝突，否則遊戲中可能遇到奇怪行為。"
 
-#: src/localplayer.cpp:913
+#: src/localplayer.cpp:985
 msgid "Unable to pick up item."
 msgstr ""
 
 #. TRANSLATORS: This sentence may be translated differently
 #. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:922
+#: src/localplayer.cpp:994
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/main.cpp:43
+#: src/main.cpp:42
 msgid "mana [options] [mana-file]"
 msgstr ""
 
+#: src/main.cpp:43
+msgid "[mana-file] : The mana file is an XML file (.mana)"
+msgstr ""
+
 #: src/main.cpp:44
-msgid "Options:"
+msgid "              used to set custom parameters"
 msgstr ""
 
 #: src/main.cpp:45
+msgid "              to the mana client."
+msgstr ""
+
+#: src/main.cpp:47
+msgid "Options:"
+msgstr ""
+
+#: src/main.cpp:48
 msgid "  -v --version        : Display the version"
 msgstr ""
 
-#: src/main.cpp:46
+#: src/main.cpp:49
 #, fuzzy
 msgid "  -h --help           : Display this help"
 msgstr "/help > 顯示幫助"
 
-#: src/main.cpp:47
+#: src/main.cpp:50
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
-#: src/main.cpp:48
+#: src/main.cpp:51
 msgid "  -U --username       : Login with this username"
 msgstr ""
 
-#: src/main.cpp:49
+#: src/main.cpp:52
 msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/main.cpp:50
+#: src/main.cpp:53
 msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/main.cpp:51
+#: src/main.cpp:54
 msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:52
+#: src/main.cpp:55
 msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/main.cpp:53
+#: src/main.cpp:56
 msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/main.cpp:54
+#: src/main.cpp:57
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:56
+#: src/main.cpp:59
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:57
+#: src/main.cpp:60
 msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:58
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
+#: src/main.cpp:61
+msgid "     --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/main.cpp:59
+#: src/main.cpp:62
+msgid "     --chat-log-dir   : Chat log dir to use"
+msgstr ""
+
+#: src/main.cpp:63
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/main.cpp:61
+#: src/main.cpp:65
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:63
+#: src/net/manaserv/beinghandler.cpp:303 src/net/tmwa/playerhandler.cpp:94
+msgid "You are dead."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:304 src/net/tmwa/playerhandler.cpp:95
+msgid "We regret to inform you that your character was killed in battle."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:306 src/net/tmwa/playerhandler.cpp:97
+msgid "You are not that alive anymore."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:307 src/net/tmwa/playerhandler.cpp:98
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:308 src/net/tmwa/playerhandler.cpp:99
+msgid "Game Over!"
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:309 src/net/tmwa/playerhandler.cpp:101
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:311 src/net/tmwa/playerhandler.cpp:103
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:313 src/net/tmwa/playerhandler.cpp:105
+msgid "I guess this did not run too well."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:107
+msgid "Do you want your possessions identified?"
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:109
+msgid "Sadly, no trace of you was ever found..."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:111
+msgid "Annihilated."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:113
+msgid "Looks like you got your head handed to you."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:115
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:323
+msgid "Press OK to respawn."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:324
+#, fuzzy
+msgid "You Died"
+msgstr "你付出:"
+
+#: src/net/manaserv/charhandler.cpp:138 src/net/manaserv/charhandler.cpp:209
+msgid "Not logged in."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:141
+msgid "No empty slot."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:144
+msgid "Invalid name."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:147
+msgid "Character's name already exists."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:150
+msgid "Invalid hairstyle."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:153
+msgid "Invalid hair color."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:156
+msgid "Invalid gender."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:159
+#, fuzzy
+msgid "Character's stats are too high."
+msgstr "角色狀態確定"
+
+#: src/net/manaserv/charhandler.cpp:162
+#, fuzzy
+msgid "Character's stats are too low."
+msgstr "角色狀態確定"
+
+#: src/net/manaserv/charhandler.cpp:165
+#, c-format
+msgid "At least one statis out of the permitted range: (%u - %u)."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:171 src/net/manaserv/loginhandler.cpp:96
+#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
+#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
+#: src/net/tmwa/loginhandler.cpp:95 src/net/tmwa/loginhandler.cpp:182
+#, fuzzy
+msgid "Unknown error."
+msgstr "不明指令"
+
+#: src/net/manaserv/charhandler.cpp:200 src/net/tmwa/charserverhandler.cpp:146
+msgid "Info"
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:200
+msgid "Player deleted."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:212
+#, fuzzy
+msgid "Selection out of range."
+msgstr "請選擇交易的物品數量"
+
+#: src/net/manaserv/charhandler.cpp:215
+#, fuzzy, c-format
+msgid "Unknown error (%d)."
+msgstr "不明指令"
+
+#: src/net/manaserv/charhandler.cpp:250
+msgid "No gameservers are available."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:187 src/net/manaserv/chathandler.cpp:313
+#: src/net/manaserv/guildhandler.cpp:260
+#, c-format
+msgid "Topic: %s"
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:274
+msgid "Players in this channel:"
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:208
+#, fuzzy
+msgid "Error joining channel."
+msgstr "/join <頻道>"
+
+#: src/net/manaserv/chathandler.cpp:214
+msgid "Listing channels."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:226
+msgid "End of channel list."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:303
+#, c-format
+msgid "%s entered the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:308
+#, c-format
+msgid "%s left the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:324
+#, c-format
+msgid "%s has set mode %s on user %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:334
+#, c-format
+msgid "%s has kicked %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:339
+#, fuzzy
+msgid "Unknown channel event."
+msgstr "不明指令"
+
+#: src/net/manaserv/guildhandler.cpp:82
+msgid "Guild created."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:87
+msgid "Error creating guild."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:97
+msgid "Invite sent."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:204
+msgid "Member was promoted successfully."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:209
+msgid "Failed to promote member."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:87
+msgid "Wrong magic_token."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
+msgid "Already logged in."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:93
+msgid "Account banned."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:118
+msgid "New password incorrect."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:121 src/net/tmwa/loginhandler.cpp:89
+msgid "Old password incorrect."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
+msgid "Account not connected. Please login first."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:149
+msgid "New email address incorrect."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:152
+msgid "Old email address incorrect."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:158
+msgid "The new email address already exists."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:239
+msgid ""
+"Client registration is not allowed. Please contact server administration."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
+msgid "Client version is too old."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:266
+msgid "Wrong username or password."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:272
+msgid "Account banned"
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:275
+msgid "Login attempt too soon after previous attempt."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:303
+msgid "Wrong username, password or email address."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:306
+msgid "Username already exists."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:309
+msgid "Email address already exists."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:312
+msgid "You took too long with the captcha or your response was incorrect."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:87
+msgid "Joined party."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:105
+#, c-format
+msgid "%s joined the party."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:123
+#, c-format
+msgid "%s rejected your invite."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:95
+msgid "Accepting incoming trade requests."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:97
+msgid "Ignoring incoming trade requests."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:115 src/net/tmwa/tradehandler.cpp:109
+msgid "Request for Trade"
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:116 src/net/tmwa/tradehandler.cpp:110
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:134
+#, c-format
+msgid "Trading with %s"
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:148 src/net/tmwa/tradehandler.cpp:224
+msgid "Trade canceled."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:155 src/net/tmwa/tradehandler.cpp:231
+msgid "Trade completed."
+msgstr ""
+
+#: src/net/tmwa/adminhandler.cpp:64
 msgid "Kick failed!"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:65
+#: src/net/tmwa/adminhandler.cpp:66
 msgid "Kick succeeded!"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:110
+#: src/net/tmwa/buysellhandler.cpp:109
 msgid "Nothing to sell."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:117
+#: src/net/tmwa/buysellhandler.cpp:116
 msgid "Thanks for buying."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:124
+#: src/net/tmwa/buysellhandler.cpp:123
 msgid "Unable to buy."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:130
+#: src/net/tmwa/buysellhandler.cpp:129
 msgid "Thanks for selling."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:132
+#: src/net/tmwa/buysellhandler.cpp:131
 msgid "Unable to sell."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:103
-msgid "Access denied."
+#: src/net/tmwa/charserverhandler.cpp:103
+msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:106
+#: src/net/tmwa/charserverhandler.cpp:107
 msgid "Cannot use this ID."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:109
-msgid "Unknown failure to select character."
-msgstr ""
+#: src/net/tmwa/charserverhandler.cpp:110
+#, fuzzy
+msgid "Unknown char-server failure."
+msgstr "不明指令"
 
-#: src/net/ea/charserverhandler.cpp:135
+#: src/net/tmwa/charserverhandler.cpp:134
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:147 src/net/manaserv/charhandler.cpp:187
-msgid "Info"
-msgstr ""
-
-#: src/net/ea/charserverhandler.cpp:147
+#: src/net/tmwa/charserverhandler.cpp:146
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:152
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Failed to delete character."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:237 src/net/manaserv/charhandler.cpp:263
+#: src/net/tmwa/charserverhandler.cpp:266
 msgid "Strength:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:238 src/net/manaserv/charhandler.cpp:264
+#: src/net/tmwa/charserverhandler.cpp:267
 msgid "Agility:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:239 src/net/manaserv/charhandler.cpp:266
+#: src/net/tmwa/charserverhandler.cpp:268
 msgid "Vitality:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:240 src/net/manaserv/charhandler.cpp:267
+#: src/net/tmwa/charserverhandler.cpp:269
 msgid "Intelligence:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:241 src/net/manaserv/charhandler.cpp:265
+#: src/net/tmwa/charserverhandler.cpp:270
 msgid "Dexterity:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:242
+#: src/net/tmwa/charserverhandler.cpp:271
 msgid "Luck:"
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:80
-msgid "Whisper could not be sent, user is offline."
+#: src/net/tmwa/chathandler.cpp:87
+#, c-format
+msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:84
-msgid "Whisper could not be sent, ignored by user."
+#: src/net/tmwa/chathandler.cpp:96
+#, c-format
+msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:171
+#: src/net/tmwa/chathandler.cpp:230
 #, fuzzy
 msgid "MVP player."
 msgstr "玩家"
 
-#: src/net/ea/chathandler.cpp:204 src/net/ea/chathandler.cpp:210
-#: src/net/ea/chathandler.cpp:215 src/net/ea/chathandler.cpp:220
-#: src/net/ea/chathandler.cpp:225 src/net/ea/chathandler.cpp:230
-#: src/net/ea/chathandler.cpp:235 src/net/ea/chathandler.cpp:240
+#: src/net/tmwa/chathandler.cpp:265 src/net/tmwa/chathandler.cpp:271
+#: src/net/tmwa/chathandler.cpp:276 src/net/tmwa/chathandler.cpp:281
+#: src/net/tmwa/chathandler.cpp:286 src/net/tmwa/chathandler.cpp:291
+#: src/net/tmwa/chathandler.cpp:296 src/net/tmwa/chathandler.cpp:301
 msgid "Channels are not supported!"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:86
+#: src/net/tmwa/gamehandler.cpp:88
 #, c-format
 msgid "Online users: %d"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:100
+#: src/net/tmwa/gamehandler.cpp:101
 #, fuzzy
 msgid "Game"
 msgstr "名字"
 
-#: src/net/ea/gamehandler.cpp:100
+#: src/net/tmwa/gamehandler.cpp:101
 msgid "Request to quit denied!"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:102 src/net/manaserv/generalhandler.cpp:95
+#: src/net/tmwa/generalhandler.cpp:102
 #, c-format
 msgid "Strength %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:103 src/net/manaserv/generalhandler.cpp:96
+#: src/net/tmwa/generalhandler.cpp:103
 #, c-format
 msgid "Agility %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:104 src/net/manaserv/generalhandler.cpp:98
+#: src/net/tmwa/generalhandler.cpp:104
 #, c-format
 msgid "Vitality %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:105 src/net/manaserv/generalhandler.cpp:99
+#: src/net/tmwa/generalhandler.cpp:105
 #, c-format
 msgid "Intelligence %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:106 src/net/manaserv/generalhandler.cpp:97
+#: src/net/tmwa/generalhandler.cpp:106
 #, c-format
 msgid "Dexterity %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:107
+#: src/net/tmwa/generalhandler.cpp:107
 #, c-format
 msgid "Luck %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:130
+#: src/net/tmwa/generalhandler.cpp:132
 #, fuzzy
 msgid "Authentication failed."
 msgstr "聊天新增失敗！"
 
-#: src/net/ea/generalhandler.cpp:133
+#: src/net/tmwa/generalhandler.cpp:135
 msgid "No servers available."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:137
+#: src/net/tmwa/generalhandler.cpp:139
 msgid "Someone else is trying to use this account."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:140
+#: src/net/tmwa/generalhandler.cpp:142
 msgid "This account is already logged in."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:143
+#: src/net/tmwa/generalhandler.cpp:145
 msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:146
+#: src/net/tmwa/generalhandler.cpp:148
 msgid "Duplicated login."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:149
+#: src/net/tmwa/generalhandler.cpp:151
 msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:205
+#: src/net/tmwa/generalhandler.cpp:209
 msgid "Got disconnected from server!"
 msgstr "和伺服器失去連線"
 
-#: src/net/ea/generalhandler.cpp:216 src/net/manaserv/generalhandler.cpp:166
+#: src/net/tmwa/generalhandler.cpp:230
 msgid "Strength"
 msgstr "力量"
 
-#: src/net/ea/generalhandler.cpp:217 src/net/manaserv/generalhandler.cpp:167
+#: src/net/tmwa/generalhandler.cpp:231
 msgid "Agility"
 msgstr "敏捷"
 
-#: src/net/ea/generalhandler.cpp:218 src/net/manaserv/generalhandler.cpp:169
+#: src/net/tmwa/generalhandler.cpp:232
 msgid "Vitality"
 msgstr "體力"
 
-#: src/net/ea/generalhandler.cpp:219 src/net/manaserv/generalhandler.cpp:170
+#: src/net/tmwa/generalhandler.cpp:233
 msgid "Intelligence"
 msgstr "智力"
 
-#: src/net/ea/generalhandler.cpp:220 src/net/manaserv/generalhandler.cpp:168
+#: src/net/tmwa/generalhandler.cpp:234
 msgid "Dexterity"
 msgstr "閃躲"
 
-#: src/net/ea/generalhandler.cpp:221
+#: src/net/tmwa/generalhandler.cpp:235
 msgid "Luck"
 msgstr "幸運"
 
-#: src/net/ea/generalhandler.cpp:224
+#: src/net/tmwa/generalhandler.cpp:238
 #, fuzzy
 msgid "Defense"
 msgstr "防禦："
 
-#: src/net/ea/generalhandler.cpp:225
+#: src/net/tmwa/generalhandler.cpp:239
 #, fuzzy
 msgid "M.Attack"
 msgstr "摩攻："
 
-#: src/net/ea/generalhandler.cpp:226
+#: src/net/tmwa/generalhandler.cpp:240
 #, fuzzy
 msgid "M.Defense"
 msgstr "魔防："
 
-#: src/net/ea/generalhandler.cpp:227
+#: src/net/tmwa/generalhandler.cpp:241
 #, fuzzy, c-format
 msgid "% Accuracy"
 msgstr "% Ac準確度："
 
-#: src/net/ea/generalhandler.cpp:228
+#: src/net/tmwa/generalhandler.cpp:242
 #, fuzzy, c-format
 msgid "% Evade"
 msgstr "% E迴避率："
 
-#: src/net/ea/generalhandler.cpp:229
+#: src/net/tmwa/generalhandler.cpp:243
 #, c-format
 msgid "% Critical"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:61 src/net/ea/gui/partytab.cpp:59
+#: src/net/tmwa/gui/guildtab.cpp:45
+msgid "Guild"
+msgstr ""
+
+#: src/net/tmwa/gui/guildtab.cpp:61 src/net/tmwa/gui/partytab.cpp:59
 msgid "/help > Display this help."
 msgstr "/help > 顯示幫助"
 
-#: src/net/ea/gui/guildtab.cpp:62
+#: src/net/tmwa/gui/guildtab.cpp:62
 #, fuzzy
 msgid "/invite > Invite a player to your guild"
 msgstr "/party > 邀請玩家加入隊伍"
 
-#: src/net/ea/gui/guildtab.cpp:63
+#: src/net/tmwa/gui/guildtab.cpp:63
 msgid "/leave > Leave the guild you are in"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:64
+#: src/net/tmwa/gui/guildtab.cpp:64
 msgid "/kick > Kick some one from the guild you are in"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:73 src/net/ea/gui/partytab.cpp:73
+#: src/net/tmwa/gui/guildtab.cpp:73 src/net/tmwa/gui/partytab.cpp:73
 msgid "Command: /invite <nick>"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:74
+#: src/net/tmwa/gui/guildtab.cpp:74
 #, fuzzy
 msgid "This command invites <nick> to the guild you're in."
 msgstr "這個指令會告訴其他人你正在 <信息>."
 
-#: src/net/ea/gui/guildtab.cpp:80 src/net/ea/gui/partytab.cpp:80
+#: src/net/tmwa/gui/guildtab.cpp:80 src/net/tmwa/gui/partytab.cpp:80
 msgid "Command: /leave"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:81
+#: src/net/tmwa/gui/guildtab.cpp:81
 #, fuzzy
 msgid "This command causes the player to leave the guild."
 msgstr "這個指令顯示目前地圖名。"
 
-#: src/net/ea/gui/guildtab.cpp:89
+#: src/net/tmwa/gui/guildtab.cpp:89
 msgid "Guild name is missing."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:293
+#: src/net/tmwa/guildhandler.cpp:296
 msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:298
+#: src/net/tmwa/guildhandler.cpp:301
 msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:303
+#: src/net/tmwa/guildhandler.cpp:306
 msgid "User is now part of your guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:308
+#: src/net/tmwa/guildhandler.cpp:311
 msgid "Your guild is full."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:313
+#: src/net/tmwa/guildhandler.cpp:316
 msgid "Unknown guild invite response."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:390
+#: src/net/tmwa/guildhandler.cpp:393
 msgid "Guild creation isn't supported yet."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:60
+#: src/net/tmwa/gui/partytab.cpp:43
+msgid "Party"
+msgstr ""
+
+#: src/net/tmwa/gui/partytab.cpp:60
 msgid "/invite > Invite a player to your party"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:61
+#: src/net/tmwa/gui/partytab.cpp:61
 msgid "/leave > Leave the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:62
+#: src/net/tmwa/gui/partytab.cpp:62
 msgid "/kick > Kick some one from the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:63
+#: src/net/tmwa/gui/partytab.cpp:63
 msgid "/item > Show/change party item sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:64
+#: src/net/tmwa/gui/partytab.cpp:64
 msgid "/exp > Show/change party experience sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:81
+#: src/net/tmwa/gui/partytab.cpp:81
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:85
+#: src/net/tmwa/gui/partytab.cpp:85
 msgid "Command: /item <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:86
+#: src/net/tmwa/gui/partytab.cpp:86
 msgid "This command changes the party's item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:87
+#: src/net/tmwa/gui/partytab.cpp:87
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:90
+#: src/net/tmwa/gui/partytab.cpp:90
 msgid "Command: /item"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/tmwa/gui/partytab.cpp:91
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/tmwa/gui/partytab.cpp:95
 msgid "Command: /exp <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:96
+#: src/net/tmwa/gui/partytab.cpp:96
 msgid "This command changes the party's experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/tmwa/gui/partytab.cpp:97
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:100
+#: src/net/tmwa/gui/partytab.cpp:100
 msgid "Command: /exp"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/tmwa/gui/partytab.cpp:101
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:132 src/net/ea/partyhandler.cpp:198
+#: src/net/tmwa/gui/partytab.cpp:132 src/net/tmwa/partyhandler.cpp:196
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:135 src/net/ea/partyhandler.cpp:204
+#: src/net/tmwa/gui/partytab.cpp:135 src/net/tmwa/partyhandler.cpp:202
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:138 src/net/ea/partyhandler.cpp:210
+#: src/net/tmwa/gui/partytab.cpp:138 src/net/tmwa/partyhandler.cpp:208
 msgid "Item sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:141
+#: src/net/tmwa/gui/partytab.cpp:141
 msgid "Item sharing unknown."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:167 src/net/ea/partyhandler.cpp:174
+#: src/net/tmwa/gui/partytab.cpp:167 src/net/tmwa/partyhandler.cpp:172
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:170 src/net/ea/partyhandler.cpp:180
+#: src/net/tmwa/gui/partytab.cpp:170 src/net/tmwa/partyhandler.cpp:178
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:173 src/net/ea/partyhandler.cpp:186
+#: src/net/tmwa/gui/partytab.cpp:173 src/net/tmwa/partyhandler.cpp:184
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:176
+#: src/net/tmwa/gui/partytab.cpp:176
 msgid "Experience sharing unknown."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:281
+#: src/net/tmwa/inventoryhandler.cpp:285
 msgid "Failed to use item."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:391
+#: src/net/tmwa/inventoryhandler.cpp:399
 msgid "Unable to equip."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:402
+#: src/net/tmwa/inventoryhandler.cpp:410
 msgid "Unable to unequip."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:79
+#: src/net/tmwa/loginhandler.cpp:86
 msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:82 src/net/manaserv/loginhandler.cpp:121
-msgid "Old password incorrect."
-msgstr ""
-
-#: src/net/ea/loginhandler.cpp:85
+#: src/net/tmwa/loginhandler.cpp:92
 msgid "New password too short."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:88 src/net/ea/loginhandler.cpp:175
-#: src/net/manaserv/charhandler.cpp:158 src/net/manaserv/loginhandler.cpp:96
-#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
-#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
-#, fuzzy
-msgid "Unknown error."
-msgstr "不明指令"
-
-#: src/net/ea/loginhandler.cpp:149
+#: src/net/tmwa/loginhandler.cpp:156
 #, fuzzy
 msgid "Unregistered ID."
 msgstr "註冊"
 
-#: src/net/ea/loginhandler.cpp:152
+#: src/net/tmwa/loginhandler.cpp:159
 msgid "Wrong password."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:155
+#: src/net/tmwa/loginhandler.cpp:162
 msgid "Account expired."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:158
+#: src/net/tmwa/loginhandler.cpp:165
 #, fuzzy
 msgid "Rejected from server."
 msgstr "和伺服器失去連線"
 
-#: src/net/ea/loginhandler.cpp:161
+#: src/net/tmwa/loginhandler.cpp:168
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:165
+#: src/net/tmwa/loginhandler.cpp:172
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:172
+#: src/net/tmwa/loginhandler.cpp:179
 msgid "This user name is already taken."
 msgstr ""
 
-#: src/net/ea/network.cpp:145
+#: src/net/tmwa/network.cpp:145
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/ea/network.cpp:345
+#: src/net/tmwa/network.cpp:345
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/ea/network.cpp:414
+#: src/net/tmwa/network.cpp:414
 #, fuzzy
 msgid "Connection to server terminated. "
 msgstr "正在連接到地圖伺服器..."
 
-#: src/net/ea/partyhandler.cpp:81
+#: src/net/tmwa/partyhandler.cpp:82
 msgid "Could not create party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:84
+#: src/net/tmwa/partyhandler.cpp:84
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:118
+#: src/net/tmwa/partyhandler.cpp:119
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:122
+#: src/net/tmwa/partyhandler.cpp:123
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:126
+#: src/net/tmwa/partyhandler.cpp:127
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:130
+#: src/net/tmwa/partyhandler.cpp:131
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:238
+#: src/net/tmwa/partyhandler.cpp:236
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:249
+#: src/net/tmwa/partyhandler.cpp:246
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:301
+#: src/net/tmwa/partyhandler.cpp:299
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:329
-msgid "Inviting like this isn't supported at the moment."
+#: src/net/tmwa/partyhandler.cpp:335
+#, c-format
+msgid "Inviting failed, because you can't see a player called %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:334
+#: src/net/tmwa/partyhandler.cpp:340
 msgid "You can only inivte when you are in a party!"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:365
+#: src/net/tmwa/partyhandler.cpp:368
 #, c-format
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:304
-msgid "You are dead."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:305
-msgid "We regret to inform you that your character was killed in battle."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:307
-msgid "You are not that alive anymore."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:308
-msgid "The cold hands of the grim reaper are grabbing for your soul."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:309
-msgid "Game Over!"
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:105
+#: src/net/tmwa/playerhandler.cpp:100
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:310
-msgid ""
-"No, kids. Your character did not really die. It... err... went to a better "
-"place."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:312
-msgid ""
-"Your plan of breaking your enemies weapon by bashing it with your throat "
-"failed."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:314
-msgid "I guess this did not run too well."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:315
-msgid "Do you want your possessions identified?"
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:316
-msgid "Sadly, no trace of you was ever found..."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:317
-msgid "Annihilated."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:318
-msgid "Looks like you got your head handed to you."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:120 src/net/manaserv/beinghandler.cpp:319
-msgid ""
-"You screwed up again, dump your body down the tubes and get you another one."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/tmwa/playerhandler.cpp:118
 msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/tmwa/playerhandler.cpp:119
 msgid "You are no more."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/tmwa/playerhandler.cpp:120
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/tmwa/playerhandler.cpp:121
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/tmwa/playerhandler.cpp:122
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/tmwa/playerhandler.cpp:123
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/tmwa/playerhandler.cpp:124
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:130
+#: src/net/tmwa/playerhandler.cpp:125
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:131
+#: src/net/tmwa/playerhandler.cpp:126
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/tmwa/playerhandler.cpp:127
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/tmwa/playerhandler.cpp:128
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:135
+#: src/net/tmwa/playerhandler.cpp:130
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:136
+#: src/net/tmwa/playerhandler.cpp:131
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:249 src/net/ea/playerhandler.cpp:310
+#: src/net/tmwa/playerhandler.cpp:246 src/net/tmwa/playerhandler.cpp:285
 msgid "Message"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:250
+#: src/net/tmwa/playerhandler.cpp:247
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:333
+#: src/net/tmwa/playerhandler.cpp:313
 #, c-format
 msgid "You picked up %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:369
+#: src/net/tmwa/playerhandler.cpp:348
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:532
+#: src/net/tmwa/playerhandler.cpp:488
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:147
+#: src/net/tmwa/specialhandler.cpp:144
 msgid "Trade failed!"
 msgstr "交易失敗！"
 
-#: src/net/ea/specialhandler.cpp:150
+#: src/net/tmwa/specialhandler.cpp:147
 msgid "Emote failed!"
 msgstr "顯示表情失敗！"
 
-#: src/net/ea/specialhandler.cpp:153
+#: src/net/tmwa/specialhandler.cpp:150
 msgid "Sit failed!"
 msgstr "坐下休息失敗！"
 
-#: src/net/ea/specialhandler.cpp:156
+#: src/net/tmwa/specialhandler.cpp:153
 msgid "Chat creating failed!"
 msgstr "聊天新增失敗！"
 
-#: src/net/ea/specialhandler.cpp:159
+#: src/net/tmwa/specialhandler.cpp:156
 msgid "Could not join party!"
 msgstr "不能加入隊伍！"
 
-#: src/net/ea/specialhandler.cpp:162
+#: src/net/tmwa/specialhandler.cpp:159
 msgid "Cannot shout!"
 msgstr "無法大叫！"
 
-#: src/net/ea/specialhandler.cpp:171
+#: src/net/tmwa/specialhandler.cpp:168
 msgid "You have not yet reached a high enough lvl!"
 msgstr "你還沒達到足夠等級！"
 
-#: src/net/ea/specialhandler.cpp:174
+#: src/net/tmwa/specialhandler.cpp:171
 msgid "Insufficient HP!"
 msgstr "HP不夠！"
 
-#: src/net/ea/specialhandler.cpp:177
+#: src/net/tmwa/specialhandler.cpp:174
 msgid "Insufficient SP!"
 msgstr "SP不夠！"
 
-#: src/net/ea/specialhandler.cpp:180
+#: src/net/tmwa/specialhandler.cpp:177
 msgid "You have no memos!"
 msgstr "沒有備忘錄"
 
-#: src/net/ea/specialhandler.cpp:183
+#: src/net/tmwa/specialhandler.cpp:180
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:186
+#: src/net/tmwa/specialhandler.cpp:183
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:189
+#: src/net/tmwa/specialhandler.cpp:186
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "此武器無法使用此技能！"
 
-#: src/net/ea/specialhandler.cpp:192
+#: src/net/tmwa/specialhandler.cpp:189
 msgid "You need another red gem!"
 msgstr "你需要再一顆紅寶石!"
 
-#: src/net/ea/specialhandler.cpp:195
+#: src/net/tmwa/specialhandler.cpp:192
 msgid "You need another blue gem!"
 msgstr "你需要再一棵藍寶石!"
 
-#: src/net/ea/specialhandler.cpp:198
+#: src/net/tmwa/specialhandler.cpp:195
 msgid "You're carrying to much to do this!"
 msgstr "你已負重太多，不能再多!"
 
-#: src/net/ea/specialhandler.cpp:201
+#: src/net/tmwa/specialhandler.cpp:198
 msgid "Huh? What's that?"
 msgstr "阿?那是甚麼?"
 
-#: src/net/ea/specialhandler.cpp:210
+#: src/net/tmwa/specialhandler.cpp:207
 msgid "Warp failed..."
 msgstr "傳送失敗..."
 
-#: src/net/ea/specialhandler.cpp:213
+#: src/net/tmwa/specialhandler.cpp:210
 msgid "Could not steal anything..."
 msgstr "無法偷取任何物品..."
 
-#: src/net/ea/specialhandler.cpp:216
+#: src/net/tmwa/specialhandler.cpp:213
 msgid "Poison had no effect..."
 msgstr "藥水無效..."
 
-#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:116
-msgid "Request for Trade"
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:108 src/net/manaserv/tradehandler.cpp:117
-#, c-format
-msgid "%s wants to trade with you, do you accept?"
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:124
+#: src/net/tmwa/tradehandler.cpp:126
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:128
+#: src/net/tmwa/tradehandler.cpp:130
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:132
+#: src/net/tmwa/tradehandler.cpp:134
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:137
+#: src/net/tmwa/tradehandler.cpp:139
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:144
+#: src/net/tmwa/tradehandler.cpp:146
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:153
+#: src/net/tmwa/tradehandler.cpp:154
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:202
+#: src/net/tmwa/tradehandler.cpp:202
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:207
+#: src/net/tmwa/tradehandler.cpp:207
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:211
+#: src/net/tmwa/tradehandler.cpp:211
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:224 src/net/manaserv/tradehandler.cpp:149
-msgid "Trade canceled."
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:231 src/net/manaserv/tradehandler.cpp:156
-msgid "Trade completed."
-msgstr ""
-
-#: src/net/manaserv/beinghandler.cpp:324
-msgid "Press OK to respawn."
-msgstr ""
-
-#: src/net/manaserv/beinghandler.cpp:325
-#, fuzzy
-msgid "You Died"
-msgstr "你付出:"
-
-#: src/net/manaserv/charhandler.cpp:128 src/net/manaserv/charhandler.cpp:196
-msgid "Not logged in."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:131
-msgid "No empty slot."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:134
-msgid "Invalid name."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:137
-msgid "Character's name already exists."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:140
-msgid "Invalid hairstyle."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:143
-msgid "Invalid hair color."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:146
-msgid "Invalid gender."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:149
-#, fuzzy
-msgid "Character's stats are too high."
-msgstr "角色狀態確定"
-
-#: src/net/manaserv/charhandler.cpp:152
-#, fuzzy
-msgid "Character's stats are too low."
-msgstr "角色狀態確定"
-
-#: src/net/manaserv/charhandler.cpp:155
-msgid "One stat is zero."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:187
-msgid "Player deleted."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:199
-#, fuzzy
-msgid "Selection out of range."
-msgstr "請選擇交易的物品數量"
-
-#: src/net/manaserv/charhandler.cpp:202
-#, fuzzy, c-format
-msgid "Unknown error (%d)."
-msgstr "不明指令"
-
-#: src/net/manaserv/charhandler.cpp:242
-msgid "No gameservers are available."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:268
-msgid "Willpower:"
-msgstr "意志力:"
-
-#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
-#: src/net/manaserv/guildhandler.cpp:259
-#, c-format
-msgid "Topic: %s"
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
-msgid "Players in this channel:"
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:201
-#, fuzzy
-msgid "Error joining channel."
-msgstr "/join <頻道>"
-
-#: src/net/manaserv/chathandler.cpp:207
-msgid "Listing channels."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:219
-msgid "End of channel list."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:291
-#, c-format
-msgid "%s entered the channel."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:296
-#, c-format
-msgid "%s left the channel."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:312
-#, c-format
-msgid "%s has set mode %s on user %s."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:322
-#, c-format
-msgid "%s has kicked %s."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:327
-#, fuzzy
-msgid "Unknown channel event."
-msgstr "不明指令"
-
-#: src/net/manaserv/generalhandler.cpp:100
-#, c-format
-msgid "Willpower %+d"
-msgstr ""
-
-#: src/net/manaserv/generalhandler.cpp:171
-#, fuzzy
-msgid "Willpower"
-msgstr "意志力:"
-
-#: src/net/manaserv/guildhandler.cpp:81
-msgid "Guild created."
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:86
-msgid "Error creating guild."
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:96
-msgid "Invite sent."
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:203
-msgid "Member was promoted successfully."
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:208
-msgid "Failed to promote member."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:87
-msgid "Wrong magic_token."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
-msgid "Already logged in."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:93 src/net/manaserv/loginhandler.cpp:272
-msgid "Server is full."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:118
-msgid "New password incorrect."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
-msgid "Account not connected. Please login first."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:149
-msgid "New email address incorrect."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:152
-msgid "Old email address incorrect."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:158
-msgid "The new email address already exists."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:239
-msgid ""
-"Client registration is not allowed. Please contact server administration."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
-msgid "Client version is too old."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:266
-msgid "Wrong username or password."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:275
-msgid "Login attempt too soon after previous attempt."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:303
-msgid "Wrong username, password or email address."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:306
-msgid "Username already exists."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:309
-msgid "Email address already exists."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:312
-msgid "You took too long with the captcha or your response was incorrect."
-msgstr ""
-
-#: src/net/manaserv/partyhandler.cpp:88
-msgid "Joined party."
-msgstr ""
-
-#: src/net/manaserv/partyhandler.cpp:106
-#, c-format
-msgid "%s joined the party."
-msgstr ""
-
-#: src/net/manaserv/partyhandler.cpp:123
-#, c-format
-msgid "%s rejected your invite."
-msgstr ""
-
-#: src/net/manaserv/tradehandler.cpp:96
-msgid "Accepting incoming trade requests."
-msgstr ""
-
-#: src/net/manaserv/tradehandler.cpp:98
-msgid "Ignoring incoming trade requests."
-msgstr ""
-
-#: src/net/manaserv/tradehandler.cpp:135
-#, c-format
-msgid "Trading with %s"
-msgstr ""
-
-#: src/playerrelations.cpp:304
+#: src/playerrelations.cpp:310
 #, fuzzy
 msgid "Completely ignore"
 msgstr "已完成"
 
-#: src/playerrelations.cpp:318
+#: src/playerrelations.cpp:324
 msgid "Print '...'"
 msgstr ""
 
-#: src/playerrelations.cpp:334
+#: src/playerrelations.cpp:340
 msgid "Blink name"
 msgstr ""
 
-#: src/playerrelations.cpp:371
-msgid "Floating '...' bubble"
-msgstr ""
-
-#: src/playerrelations.cpp:374
-msgid "Floating bubble"
-msgstr ""
-
-#: src/resources/itemdb.cpp:52
+#: src/resources/itemdb.cpp:44
 #, c-format
 msgid "Attack %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:53
+#: src/resources/itemdb.cpp:45
 #, c-format
 msgid "Defense %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:54
+#: src/resources/itemdb.cpp:46
 #, c-format
 msgid "HP %+d"
 msgstr "HP %+d"
 
-#: src/resources/itemdb.cpp:55
+#: src/resources/itemdb.cpp:47
 #, c-format
 msgid "MP %+d"
 msgstr "MP %+d"
 
-#: src/resources/itemdb.cpp:114
+#: src/resources/itemdb.cpp:92
 msgid "Unknown item"
 msgstr ""
 
-#: src/resources/itemdb.cpp:158 src/resources/monsterdb.cpp:45
-#: src/resources/monsterdb.cpp:67
+#: src/resources/itemdb.cpp:135 src/resources/monsterdb.cpp:77
 msgid "unnamed"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Money"
+#~ msgstr "金錢：%d"
+
+#, fuzzy
+#~ msgid "Job"
+#~ msgstr "職業：%d"
+
+#, fuzzy
+#~ msgid "Level"
+#~ msgstr "等級：%d"
+
+#~ msgid "Willpower:"
+#~ msgstr "意志力:"
+
+#, fuzzy
+#~ msgid "Willpower"
+#~ msgstr "意志力:"
+
 #~ msgid "Description: %s"
 #~ msgstr "說明：%s"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 884a9b94..3de50504 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,11 +8,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2010-03-05 21:52+0100\n"
+"POT-Creation-Date: 2010-12-13 20:04+0100\n"
 "PO-Revision-Date: 2010-01-23 17:23+0000\n"
 "Last-Translator: Peierh <Unknown>\n"
 "Language-Team: Traditional Chinese <themanaworld-devel@lists.sourceforge."
 "net>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -23,454 +24,468 @@ msgstr ""
 "X-Poedit-Language: Chinese\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: src/client.cpp:553 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:62
+#: src/client.cpp:598 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
 msgid "Setup"
 msgstr "設定"
 
-#: src/client.cpp:623
+#: src/client.cpp:679
 #, fuzzy
 msgid "Connecting to server"
 msgstr "正在連接到地圖伺服器..."
 
-#: src/client.cpp:650
+#: src/client.cpp:706
 #, fuzzy
 msgid "Logging in"
 msgstr "登入"
 
-#: src/client.cpp:683
+#: src/client.cpp:739
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:739
+#: src/client.cpp:804
 #, fuzzy
 msgid "Requesting characters"
 msgstr "選擇角色"
 
-#: src/client.cpp:768
+#: src/client.cpp:833
 #, fuzzy
 msgid "Connecting to the game server"
 msgstr "正在連接到地圖伺服器..."
 
-#: src/client.cpp:799 src/client.cpp:806 src/client.cpp:940
+#: src/client.cpp:843
+#, fuzzy
+msgid "Changing game servers"
+msgstr "伺服器"
+
+#: src/client.cpp:872 src/client.cpp:879 src/client.cpp:1014
 #: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
 #: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
-#: src/gui/serverdialog.cpp:261 src/gui/unregisterdialog.cpp:133
-#: src/net/ea/charserverhandler.cpp:135 src/net/ea/charserverhandler.cpp:152
-#: src/net/manaserv/charhandler.cpp:161 src/net/manaserv/charhandler.cpp:204
+#: src/gui/serverdialog.cpp:323 src/gui/unregisterdialog.cpp:133
+#: src/net/manaserv/charhandler.cpp:174 src/net/manaserv/charhandler.cpp:217
+#: src/net/tmwa/charserverhandler.cpp:134
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Error"
 msgstr "錯誤"
 
-#: src/client.cpp:815
+#: src/client.cpp:888
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:842
+#: src/client.cpp:915
 #, fuzzy
 msgid "Password Change"
 msgstr "密碼："
 
-#: src/client.cpp:843
+#: src/client.cpp:916
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:862
+#: src/client.cpp:935
 #, fuzzy
 msgid "Email Change"
 msgstr "更改"
 
-#: src/client.cpp:863
+#: src/client.cpp:936
 #, fuzzy
 msgid "Email changed successfully!"
 msgstr "成功提升會員."
 
-#: src/client.cpp:883
+#: src/client.cpp:956
 #, fuzzy
 msgid "Unregister Successful"
 msgstr "取消註冊"
 
-#: src/client.cpp:884
+#: src/client.cpp:957
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1007 src/client.cpp:1030
+#: src/client.cpp:1138 src/client.cpp:1161
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1119
+#: src/client.cpp:1281
 #, fuzzy, c-format
 msgid "Invalid update host: %s"
 msgstr "無效的更新主機: "
 
-#: src/client.cpp:1153 src/client.cpp:1159
+#: src/client.cpp:1315 src/client.cpp:1321
 msgid "Error creating updates directory!"
 msgstr "建立更新目錄失敗！"
 
-#: src/commandhandler.cpp:127 src/commandhandler.cpp:308
+#: src/commandhandler.cpp:131 src/commandhandler.cpp:317
 msgid "Unknown command."
 msgstr "不明指令"
 
-#: src/commandhandler.cpp:156
+#: src/commandhandler.cpp:160
 msgid "-- Help --"
 msgstr "-- 說明 --"
 
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:161
 msgid "/help > Display this help"
 msgstr "/help >顯示指令說明"
 
-#: src/commandhandler.cpp:159
+#: src/commandhandler.cpp:163
 msgid "/where > Display map name"
 msgstr "/where > 顯示地圖名稱"
 
-#: src/commandhandler.cpp:160
+#: src/commandhandler.cpp:164
 msgid "/who > Display number of online users"
 msgstr "/who > 顯示線上使用者的數量"
 
-#: src/commandhandler.cpp:161
+#: src/commandhandler.cpp:165
 msgid "/me > Tell something about yourself"
 msgstr "/me > 顯示關於自己的資訊"
 
-#: src/commandhandler.cpp:163
+#: src/commandhandler.cpp:167
 msgid "/clear > Clears this window"
 msgstr "/clear > 清除這個視窗"
 
-#: src/commandhandler.cpp:165
+#: src/commandhandler.cpp:169
 msgid "/msg > Send a private message to a user"
 msgstr "/msg > 傳送私人訊息給某使用者"
 
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:170
 msgid "/whisper > Alias of msg"
 msgstr "/whisper > 效果同 msg"
 
-#: src/commandhandler.cpp:167
+#: src/commandhandler.cpp:171
 msgid "/w > Alias of msg"
 msgstr "/w > 效果同 msg"
 
-#: src/commandhandler.cpp:168
+#: src/commandhandler.cpp:172
 msgid "/query > Makes a tab for private messages with another user"
 msgstr "/query > 建立與另一個使用者的私人訊息分頁"
 
-#: src/commandhandler.cpp:169
+#: src/commandhandler.cpp:174
 msgid "/q > Alias of query"
 msgstr "/q > 效果同 query"
 
-#: src/commandhandler.cpp:171
+#: src/commandhandler.cpp:176
 msgid "/ignore > ignore a player"
 msgstr ""
 
-#: src/commandhandler.cpp:172
+#: src/commandhandler.cpp:177
 msgid "/unignore > stop ignoring a player"
 msgstr ""
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:179
 msgid "/list > Display all public channels"
 msgstr "/list > 顯示所有公開頻道"
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:180
 msgid "/join > Join or create a channel"
 msgstr "/join > 加入或建立頻道"
 
-#: src/commandhandler.cpp:177
+#: src/commandhandler.cpp:182
 #, fuzzy
 msgid "/createparty > Create a new party"
 msgstr "/create > 建立新的隊伍"
 
-#: src/commandhandler.cpp:178
+#: src/commandhandler.cpp:183
 msgid "/party > Invite a user to party"
 msgstr "/party > 邀請使用者組隊"
 
-#: src/commandhandler.cpp:180
+#: src/commandhandler.cpp:185
 msgid "/record > Start recording the chat to an external file"
 msgstr "/record > 開始紀錄對話內容到外部檔案"
 
-#: src/commandhandler.cpp:181
+#: src/commandhandler.cpp:187
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr "/toggle > 是否切換回聊天視窗"
 
-#: src/commandhandler.cpp:182
+#: src/commandhandler.cpp:189
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr "/present > 取得上線玩家的清單（如果開啟記錄，傳送到聊天紀錄）"
 
-#: src/commandhandler.cpp:184
+#: src/commandhandler.cpp:192
 msgid "/announce > Global announcement (GM only)"
 msgstr "/announce > 全域廣播 (GM 專用)"
 
-#: src/commandhandler.cpp:188
+#: src/commandhandler.cpp:196
 msgid "For more information, type /help <command>."
 msgstr "查看更多資訊, 輸入 /help <指令>."
 
-#: src/commandhandler.cpp:192
+#: src/commandhandler.cpp:200
 msgid "Command: /help"
 msgstr "指令： /help"
 
-#: src/commandhandler.cpp:193
+#: src/commandhandler.cpp:201
 msgid "This command displays a list of all commands available."
 msgstr "該指令可顯示所有可用指令。"
 
-#: src/commandhandler.cpp:194
+#: src/commandhandler.cpp:203
 msgid "Command: /help <command>"
 msgstr "指令： /help <指令>"
 
-#: src/commandhandler.cpp:195
+#: src/commandhandler.cpp:204
 msgid "This command displays help on <command>."
 msgstr "該指令會顯示<指令>的幫助訊息"
 
-#: src/commandhandler.cpp:203
+#: src/commandhandler.cpp:212
 msgid "Command: /announce <msg>"
 msgstr "指令： /announce <信息>"
 
-#: src/commandhandler.cpp:204
+#: src/commandhandler.cpp:213
 msgid "*** only available to a GM ***"
 msgstr "*** 只有GM可用 ***"
 
-#: src/commandhandler.cpp:205
+#: src/commandhandler.cpp:214
 msgid "This command sends the message <msg> to all players currently online."
 msgstr "該指令會發送<信息>給所有線上用戶。"
 
-#: src/commandhandler.cpp:210
+#: src/commandhandler.cpp:219
 msgid "Command: /clear"
 msgstr "指令： /clear"
 
-#: src/commandhandler.cpp:211
+#: src/commandhandler.cpp:220
 msgid "This command clears the chat log of previous chat."
 msgstr "該指令可以清除聊天紀錄。"
 
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:224
 #, fuzzy
 msgid "Command: /ignore <player>"
 msgstr "/item <政策>"
 
-#: src/commandhandler.cpp:216
+#: src/commandhandler.cpp:225
 #, fuzzy
 msgid "This command ignores the given player regardless of current relations."
 msgstr "這調指令可顯示目前線上人數。"
 
-#: src/commandhandler.cpp:221
+#: src/commandhandler.cpp:230
 msgid "Command: /join <channel>"
 msgstr "指令: /join <頻道名稱>"
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:231
 msgid "This command makes you enter <channel>."
 msgstr "這個指令可以讓你輸入 <頻道名稱>."
 
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:232
 msgid "If <channel> doesn't exist, it's created."
 msgstr "假如 <頻道名稱> 不存在,那就建立."
 
-#: src/commandhandler.cpp:227
+#: src/commandhandler.cpp:236
 msgid "Command: /list"
 msgstr "指令： /list"
 
-#: src/commandhandler.cpp:228
+#: src/commandhandler.cpp:237
 msgid "This command shows a list of all channels."
 msgstr "這個指令會顯示所有頻道的清單。"
 
-#: src/commandhandler.cpp:232
+#: src/commandhandler.cpp:241
 msgid "Command: /me <message>"
 msgstr "指令： /me <message>"
 
-#: src/commandhandler.cpp:233
+#: src/commandhandler.cpp:242
 msgid "This command tell others you are (doing) <msg>."
 msgstr "這個指令會告訴其他人您正在做 <msg> 的事。"
 
-#: src/commandhandler.cpp:237
+#: src/commandhandler.cpp:246
 msgid "Command: /msg <nick> <message>"
 msgstr "指令： /msg <nick> <message>"
 
-#: src/commandhandler.cpp:238
+#: src/commandhandler.cpp:247
 msgid "Command: /whisper <nick> <message>"
 msgstr "指令： /whisper <nick> <message>"
 
-#: src/commandhandler.cpp:239
+#: src/commandhandler.cpp:248
 msgid "Command: /w <nick> <message>"
 msgstr "指令： /w <nick> <message>"
 
-#: src/commandhandler.cpp:240
+#: src/commandhandler.cpp:249
 msgid "This command sends the text <message> to <nick>."
 msgstr "這個指令會傳送 <message> 的文字給 <nick>。"
 
-#: src/commandhandler.cpp:241 src/commandhandler.cpp:260
+#: src/commandhandler.cpp:250 src/commandhandler.cpp:269
 #: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
-#: src/net/ea/gui/guildtab.cpp:75 src/net/ea/gui/partytab.cpp:75
+#: src/net/tmwa/gui/guildtab.cpp:75 src/net/tmwa/gui/partytab.cpp:75
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr "如果<暱稱>之間有空格，用雙引號(\")括起來。"
 
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:255
 msgid "Command: /query <nick>"
 msgstr "指令： /query <nick>"
 
-#: src/commandhandler.cpp:247
+#: src/commandhandler.cpp:256
 msgid "Command: /q <nick>"
 msgstr "指令： /q <nick>"
 
-#: src/commandhandler.cpp:248
+#: src/commandhandler.cpp:257
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr "這個指令會嘗試建立您和 <nick> 之間的悄悄話分頁。"
 
-#: src/commandhandler.cpp:253
+#: src/commandhandler.cpp:262
 #, fuzzy
 msgid "Command: /createparty <name>"
 msgstr "指令： /create <隊伍名稱>"
 
-#: src/commandhandler.cpp:254
+#: src/commandhandler.cpp:263
 #, fuzzy
 msgid "This command creates a new party called <name>."
 msgstr "這些指令會建立叫做 <隊伍名稱> 的新隊伍。"
 
-#: src/commandhandler.cpp:258
+#: src/commandhandler.cpp:267
 msgid "Command: /party <nick>"
 msgstr "指令： /party <nick>"
 
-#: src/commandhandler.cpp:259 src/net/ea/gui/partytab.cpp:74
+#: src/commandhandler.cpp:268 src/net/tmwa/gui/partytab.cpp:74
 msgid "This command invites <nick> to party with you."
 msgstr "這個指令會邀請 <nick> 跟您組隊。"
 
-#: src/commandhandler.cpp:265
+#: src/commandhandler.cpp:274
 msgid "Command: /present"
 msgstr "指令： /present"
 
-#: src/commandhandler.cpp:266
+#: src/commandhandler.cpp:275
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 "該指令顯示玩家有聽到並傳送到任何日誌記錄，如果記錄，聊天記錄或其他方式。"
 
-#: src/commandhandler.cpp:272
+#: src/commandhandler.cpp:281
 msgid "Command: /record <filename>"
 msgstr "指令： /record <filename>"
 
-#: src/commandhandler.cpp:273
+#: src/commandhandler.cpp:282
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr "這個指令會開始將聊天紀錄錄製為檔案 <filename>。"
 
-#: src/commandhandler.cpp:275
+#: src/commandhandler.cpp:284
 msgid "Command: /record"
 msgstr "指令： /record"
 
-#: src/commandhandler.cpp:276
+#: src/commandhandler.cpp:285
 msgid "This command finishes a recording session."
 msgstr "這個指令會結束錄製的作業階段。"
 
-#: src/commandhandler.cpp:280
+#: src/commandhandler.cpp:289
 msgid "Command: /toggle <state>"
 msgstr "指令： /toggle <state>"
 
-#: src/commandhandler.cpp:281
+#: src/commandhandler.cpp:290
 msgid ""
 "This command sets whether the return key should toggle the chat log, or "
 "whether the chat log turns off automatically."
 msgstr "這指令用來設定\"enter\"鍵是否切換聊天記錄,或者自動關閉記錄"
 
-#: src/commandhandler.cpp:283
+#: src/commandhandler.cpp:292
 msgid ""
-"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
-"\", \"no\", \"false\" to turn the toggle off."
+"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
+"\"0\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
-"可以是 \"1\"、\"yes\"、\"true\" 其中之一來代表切換為開，或是 \"0\"、\"no\"、"
-"\"false\" 來代表切換為關閉."
+"可以是 \"1\"、\"yes\"、\"true\" 其中之一來代表切換為開，或是 \"0\"、\"no"
+"\"、\"false\" 來代表切換為關閉."
 
-#: src/commandhandler.cpp:286
+#: src/commandhandler.cpp:295
 msgid "Command: /toggle"
 msgstr "指令： /toggle"
 
-#: src/commandhandler.cpp:287
+#: src/commandhandler.cpp:296
 msgid "This command displays the return toggle status."
 msgstr "這個指令顯示輸入切換狀態"
 
-#: src/commandhandler.cpp:291 src/gui/widgets/whispertab.cpp:93
+#: src/commandhandler.cpp:300 src/gui/widgets/whispertab.cpp:95
 #, fuzzy
 msgid "Command: /unignore <player>"
 msgstr "/item <政策>"
 
-#: src/commandhandler.cpp:292
+#: src/commandhandler.cpp:301
 msgid "This command stops ignoring the given player if they are being ignored"
 msgstr ""
 
-#: src/commandhandler.cpp:297
+#: src/commandhandler.cpp:306
 msgid "Command: /where"
 msgstr "指令: /where"
 
-#: src/commandhandler.cpp:298
+#: src/commandhandler.cpp:307
 msgid "This command displays the name of the current map."
 msgstr "這個指令顯示目前地圖名。"
 
-#: src/commandhandler.cpp:302
+#: src/commandhandler.cpp:311
 msgid "Command: /who"
 msgstr "指令： /who"
 
-#: src/commandhandler.cpp:303
+#: src/commandhandler.cpp:312
 msgid "This command displays the number of players currently online."
 msgstr "這調指令可顯示目前線上人數。"
 
-#: src/commandhandler.cpp:309
+#: src/commandhandler.cpp:318
 msgid "Type /help for a list of commands."
 msgstr "輸入 /help 獲取指令列表。"
 
-#: src/commandhandler.cpp:375
+#: src/commandhandler.cpp:384
 msgid "Cannot send empty whispers!"
 msgstr "傳送密語失敗"
 
-#: src/commandhandler.cpp:383
+#: src/commandhandler.cpp:392
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr "不能以名稱 \"%s\" 創建一個密語標籤! 該名稱已存在或對方是你."
 
-#: src/commandhandler.cpp:397
+#: src/commandhandler.cpp:406
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "要求參加頻道 %s"
 
-#: src/commandhandler.cpp:410 src/net/ea/gui/partytab.cpp:109
+#: src/commandhandler.cpp:419 src/net/tmwa/gui/partytab.cpp:109
 msgid "Party name is missing."
 msgstr "漏掉隊伍名稱。"
 
-#: src/commandhandler.cpp:423 src/commandhandler.cpp:471
-#: src/commandhandler.cpp:493
+#: src/commandhandler.cpp:432 src/commandhandler.cpp:509
+#: src/commandhandler.cpp:531
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:441
+#: src/commandhandler.cpp:450
 msgid "Return toggles chat."
 msgstr "\"ENTER\"切換聊天"
 
-#: src/commandhandler.cpp:441
+#: src/commandhandler.cpp:450
 msgid "Message closes chat."
 msgstr "關閉密語"
 
-#: src/commandhandler.cpp:450
+#: src/commandhandler.cpp:459
 msgid "Return now toggles chat."
 msgstr "\"ENTER\"切換聊天"
 
-#: src/commandhandler.cpp:454
+#: src/commandhandler.cpp:463
 msgid "Message now closes chat."
 msgstr "切換聊天"
 
-#: src/commandhandler.cpp:477
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:489
+msgid "Show IP: On"
+msgstr ""
+
+#: src/commandhandler.cpp:476 src/commandhandler.cpp:485
+msgid "Show IP: Off"
+msgstr ""
+
+#: src/commandhandler.cpp:515
 msgid "Player already ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:484
+#: src/commandhandler.cpp:522
 #, fuzzy
 msgid "Player successfully ignored!"
 msgstr "隊伍已成功的建立。"
 
-#: src/commandhandler.cpp:486
+#: src/commandhandler.cpp:524
 #, fuzzy
 msgid "Player could not be ignored!"
 msgstr "該玩家拒絕你的密語"
 
-#: src/commandhandler.cpp:501
+#: src/commandhandler.cpp:539
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:506
+#: src/commandhandler.cpp:544
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:508
+#: src/commandhandler.cpp:546
 #, fuzzy
 msgid "Player could not be unignored!"
 msgstr "該玩家拒絕你的密語"
@@ -484,43 +499,43 @@ msgstr "/%s 的選項可以是 \"yes\"、\"no\"、\"true\"、\"false\"、\"1\"�
 msgid "General"
 msgstr "一般"
 
-#: src/game.cpp:326
+#: src/game.cpp:342
 #, fuzzy
 msgid "Screenshot saved as "
 msgstr "抓圖存到 ~/"
 
-#: src/game.cpp:331
+#: src/game.cpp:347
 msgid "Saving screenshot failed!"
 msgstr "儲存抓圖失敗!"
 
-#: src/game.cpp:355
+#: src/game.cpp:378
 #, fuzzy
 msgid "The connection to the server was lost."
 msgstr "已中斷連線到伺服器,程式將要離開"
 
-#: src/game.cpp:360
+#: src/game.cpp:382
 msgid "Network Error"
 msgstr "網路錯誤"
 
-#: src/game.cpp:705
+#: src/game.cpp:721
 msgid "Ignoring incoming trade requests"
 msgstr "忽略收到的交易要求"
 
-#: src/game.cpp:712
+#: src/game.cpp:726
 msgid "Accepting incoming trade requests"
 msgstr "接受收到的交易要求"
 
-#: src/game.cpp:946
+#: src/game.cpp:954
 #, fuzzy
 msgid "Could Not Load Map"
 msgstr "無法載入地圖"
 
-#: src/game.cpp:947
+#: src/game.cpp:955
 #, c-format
 msgid "Error while loading %s"
 msgstr "載入 %s 時發生錯誤"
 
-#: src/gui/beingpopup.cpp:75
+#: src/gui/beingpopup.cpp:76
 #, fuzzy, c-format
 msgid "Party: %s"
 msgstr "隊伍(%s)"
@@ -529,34 +544,34 @@ msgstr "隊伍(%s)"
 msgid "Buy"
 msgstr "購買"
 
-#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
-#: src/gui/sell.cpp:276
+#: src/gui/buy.cpp:69 src/gui/buy.cpp:261 src/gui/sell.cpp:71
+#: src/gui/sell.cpp:288
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "價格: %s / 總共: %s"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:99 src/gui/npcdialog.cpp:100
-#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:479
+#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:112 src/gui/npcdialog.cpp:124
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:463
 msgid "+"
 msgstr "增加"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:98 src/gui/npcdialog.cpp:101
-#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:491
+#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:111 src/gui/npcdialog.cpp:125
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:475
 msgid "-"
 msgstr "減少"
 
 #: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
-#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:182
-#: src/keyboardconfig.cpp:103
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:228
+#: src/keyboardconfig.cpp:102
 msgid "Quit"
 msgstr "離開"
 
-#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:408
-#: src/gui/statuswindow.cpp:478 src/gui/statuswindow.cpp:512
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:384
+#: src/gui/statuswindow.cpp:462 src/gui/statuswindow.cpp:496
 msgid "Max"
 msgstr "最大"
 
@@ -570,11 +585,11 @@ msgstr "出售"
 
 #: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
 #: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
-#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:101
-#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:178
-#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:402
+#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:114
+#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:389
 #: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
-#: src/gui/socialwindow.cpp:242 src/gui/textdialog.cpp:39
+#: src/gui/socialwindow.cpp:275 src/gui/textdialog.cpp:40
 #: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr "取消"
@@ -613,7 +628,7 @@ msgstr "電子郵件已經被註冊"
 msgid "Change Password"
 msgstr "變更密碼"
 
-#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:53
+#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:55
 #: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
 msgid "Password:"
 msgstr "密碼："
@@ -645,19 +660,19 @@ msgstr ""
 msgid "Create Character"
 msgstr "新增角色"
 
-#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:52
+#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:54
 #: src/gui/register.cpp:67
 msgid "Name:"
 msgstr "名字："
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
 #: src/gui/outfitwindow.cpp:67
 msgid ">"
 msgstr ""
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
+#. TRANSLATORS: This is an arrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
 #: src/gui/outfitwindow.cpp:66
@@ -674,8 +689,8 @@ msgstr "髮色："
 msgid "Hair style:"
 msgstr "髮型："
 
-#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:397
-#: src/gui/socialwindow.cpp:296
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:392
+#: src/gui/socialwindow.cpp:329
 msgid "Create"
 msgstr "創造"
 
@@ -731,34 +746,34 @@ msgstr "取消註冊"
 msgid "Change Email"
 msgstr "變更郵件地址"
 
-#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:185
-#: src/gui/setup_players.cpp:230
+#: src/gui/charselectdialog.cpp:336 src/gui/serverdialog.cpp:231
+#: src/gui/setup_players.cpp:229
 msgid "Delete"
 msgstr "刪除"
 
-#: src/gui/charselectdialog.cpp:387
+#: src/gui/charselectdialog.cpp:380
 #, fuzzy
 msgid "Choose"
 msgstr "關閉"
 
-#: src/gui/charselectdialog.cpp:399 src/gui/charselectdialog.cpp:400
+#: src/gui/charselectdialog.cpp:394 src/gui/charselectdialog.cpp:395
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:77 src/gui/palette.cpp:96
+#: src/gui/chat.cpp:88
 msgid "Chat"
 msgstr "聊天"
 
-#: src/gui/chat.cpp:287
+#: src/gui/chat.cpp:311
 #, fuzzy, c-format
 msgid "Present: %s; %d players are present."
 msgstr "%d 位玩家的清單"
 
-#: src/gui/chat.cpp:305
+#: src/gui/chat.cpp:329
 msgid "Attendance written to record log."
 msgstr "將上線訊息寫入錄製紀錄。"
 
-#: src/gui/chat.cpp:469
+#: src/gui/chat.cpp:493
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "對%s竊竊私語：%s"
@@ -820,143 +835,174 @@ msgstr "紋理細節"
 msgid "Ambient FX: %s"
 msgstr "環境效果"
 
-#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:56
+#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:55
 msgid "Equipment"
 msgstr "裝備"
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:77
-#: src/gui/inventorywindow.cpp:79 src/gui/inventorywindow.cpp:298
-#: src/gui/popupmenu.cpp:372
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:89
+#: src/gui/inventorywindow.cpp:337 src/gui/popupmenu.cpp:359
 msgid "Unequip"
 msgstr "卸下裝備"
 
-#: src/gui/help.cpp:36
+#: src/gui/help.cpp:37
 msgid "Help"
 msgstr "說明"
 
-#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:73
+#: src/gui/help.cpp:51 src/gui/npcdialog.cpp:50
 msgid "Close"
 msgstr "關閉"
 
-#: src/gui/inventorywindow.cpp:56 src/gui/windowmenu.cpp:57
+#: src/gui/inventorywindow.cpp:59 src/gui/windowmenu.cpp:56
 msgid "Inventory"
 msgstr "物品攔"
 
-#: src/gui/inventorywindow.cpp:72 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:300 src/gui/popupmenu.cpp:374
+#: src/gui/inventorywindow.cpp:59
+msgid "Storage"
+msgstr "貯藏庫"
+
+#: src/gui/inventorywindow.cpp:82
+msgid "Slots:"
+msgstr "欄位:"
+
+#: src/gui/inventorywindow.cpp:87 src/gui/inventorywindow.cpp:100
+#: src/gui/inventorywindow.cpp:339 src/gui/popupmenu.cpp:361
 msgid "Equip"
 msgstr "裝備"
 
-#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:304 src/gui/popupmenu.cpp:377
+#: src/gui/inventorywindow.cpp:88
 msgid "Use"
 msgstr "使用"
 
-#: src/gui/inventorywindow.cpp:83 src/gui/inventorywindow.cpp:308
-#: src/gui/popupmenu.cpp:380
+#: src/gui/inventorywindow.cpp:101 src/gui/popupmenu.cpp:364
+msgid "Activate"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:102 src/gui/inventorywindow.cpp:348
+#: src/gui/popupmenu.cpp:367
 #, fuzzy
 msgid "Drop..."
 msgstr "丟棄"
 
-#: src/gui/inventorywindow.cpp:84 src/gui/popupmenu.cpp:386
+#: src/gui/inventorywindow.cpp:103 src/gui/popupmenu.cpp:373
 msgid "Split"
 msgstr "分開"
 
-#: src/gui/inventorywindow.cpp:85 src/gui/outfitwindow.cpp:51
+#: src/gui/inventorywindow.cpp:104 src/gui/outfitwindow.cpp:51
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:96 src/gui/storagewindow.cpp:83
-msgid "Slots:"
-msgstr "欄位:"
-
-#: src/gui/inventorywindow.cpp:97
+#: src/gui/inventorywindow.cpp:106
 msgid "Weight:"
 msgstr "重量:"
 
-#: src/gui/inventorywindow.cpp:310 src/gui/popupmenu.cpp:382
+#: src/gui/inventorywindow.cpp:124 src/gui/popupmenu.cpp:378
+msgid "Store"
+msgstr "寄放"
+
+#: src/gui/inventorywindow.cpp:125 src/gui/popupmenu.cpp:385
+msgid "Retrieve"
+msgstr "取回"
+
+#: src/gui/inventorywindow.cpp:350 src/gui/popupmenu.cpp:369
 msgid "Drop"
 msgstr "丟棄"
 
-#: src/gui/itemamount.cpp:100 src/gui/okdialog.cpp:42
-#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:38 src/gui/trade.cpp:73
-#: src/gui/trade.cpp:75
+#: src/gui/itemamount.cpp:113 src/gui/okdialog.cpp:42
+#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:39 src/gui/trade.cpp:72
+#: src/gui/trade.cpp:74
 msgid "OK"
 msgstr "確定"
 
-#: src/gui/itemamount.cpp:102
+#: src/gui/itemamount.cpp:115
 msgid "All"
 msgstr "全部"
 
-#: src/gui/itemamount.cpp:128
+#: src/gui/itemamount.cpp:141
 msgid "Select amount of items to trade."
 msgstr "請選擇交易的物品數量"
 
-#: src/gui/itemamount.cpp:131
+#: src/gui/itemamount.cpp:144
 msgid "Select amount of items to drop."
 msgstr "請選擇丟棄的物品數量"
 
-#: src/gui/itemamount.cpp:134
+#: src/gui/itemamount.cpp:147
 msgid "Select amount of items to store."
 msgstr "選擇要儲存的物品數量。"
 
-#: src/gui/itemamount.cpp:137
+#: src/gui/itemamount.cpp:150
 msgid "Select amount of items to retrieve."
 msgstr "選擇要取回的物品數量。"
 
-#: src/gui/itemamount.cpp:140
+#: src/gui/itemamount.cpp:153
 msgid "Select amount of items to split."
 msgstr "請選擇你要分離的物品數量"
 
-#: src/gui/itempopup.cpp:92
+#: src/gui/itempopup.cpp:137
 #, fuzzy, c-format
 msgid "Weight: %s"
 msgstr "重量: "
 
-#: src/gui/login.cpp:49 src/gui/login.cpp:61
+#: src/gui/login.cpp:51 src/gui/login.cpp:63
 msgid "Login"
 msgstr "登入"
 
-#: src/gui/login.cpp:58
+#: src/gui/login.cpp:60
 #, fuzzy
 msgid "Remember username"
 msgstr "保存用戶名"
 
-#: src/gui/login.cpp:59 src/gui/register.cpp:58 src/gui/register.cpp:73
+#: src/gui/login.cpp:61 src/gui/register.cpp:58 src/gui/register.cpp:73
 msgid "Register"
 msgstr "註冊"
 
-#: src/gui/login.cpp:60
+#: src/gui/login.cpp:62
 #, fuzzy
 msgid "Change Server"
 msgstr "伺服器"
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
+#: src/gui/login.cpp:129
+#, fuzzy
+msgid "Registration disabled"
+msgstr "物品分享已停用。"
+
+#: src/gui/login.cpp:129
+msgid "You need to use the website to register an account for this server."
+msgstr ""
+
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:86
 msgid "Map"
 msgstr "地圖"
 
-#: src/gui/npcdialog.cpp:44
+#: src/gui/ministatus.cpp:235
+msgid "Need"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:48
 msgid "Waiting for server"
 msgstr "等待伺服器中"
 
-#: src/gui/npcdialog.cpp:45
+#: src/gui/npcdialog.cpp:49
 msgid "Next"
 msgstr "下一個"
 
-#: src/gui/npcdialog.cpp:47
+#: src/gui/npcdialog.cpp:51
 msgid "Submit"
 msgstr "確認"
 
-#: src/gui/npcdialog.cpp:52 src/gui/npcpostdialog.cpp:41
+#: src/gui/npcdialog.cpp:73 src/gui/npcpostdialog.cpp:41
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:110
+#: src/gui/npcdialog.cpp:118
+msgid "Clear log"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:134
 msgid "Reset"
 msgstr "重設"
 
 #. TRANSLATORS: Please leave the \n sequences intact.
-#: src/gui/npcdialog.cpp:171
+#: src/gui/npcdialog.cpp:208
 #, fuzzy
 msgid ""
 "\n"
@@ -971,7 +1017,7 @@ msgstr "存至:"
 msgid "Send"
 msgstr "傳送"
 
-#: src/gui/npcpostdialog.cpp:96
+#: src/gui/npcpostdialog.cpp:99
 msgid "Failed to send as sender or letter invalid."
 msgstr "無法傳送的發件人或信息無效。"
 
@@ -986,313 +1032,86 @@ msgstr "體力: %d"
 msgid "Unequip first"
 msgstr "卸下裝備"
 
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:143
-msgid "Text"
-msgstr "文字"
-
-#: src/gui/palette.cpp:82
-msgid "Text Shadow"
-msgstr "文字陰影"
-
-#: src/gui/palette.cpp:83
-msgid "Text Outline"
-msgstr "文字輪廓"
-
-#: src/gui/palette.cpp:84
-msgid "Progress Bar Labels"
-msgstr "進度列標籤"
-
-#: src/gui/palette.cpp:85
-msgid "Buttons"
-msgstr ""
-
-#: src/gui/palette.cpp:86
-msgid "Disabled Buttons"
-msgstr ""
-
-#: src/gui/palette.cpp:87
-msgid "Tabs"
-msgstr ""
-
-#: src/gui/palette.cpp:89
-msgid "Background"
-msgstr "背景"
-
-#: src/gui/palette.cpp:91
-msgid "Highlight"
-msgstr "突顯"
-
-#: src/gui/palette.cpp:92
-msgid "Tab Highlight"
-msgstr "分頁突顯"
-
-#: src/gui/palette.cpp:93
-#, fuzzy
-msgid "Item Too Expensive"
-msgstr "物品太貴"
-
-#: src/gui/palette.cpp:94
-#, fuzzy
-msgid "Item Is Equipped"
-msgstr "物品已裝備"
-
-#: src/gui/palette.cpp:97
-msgid "GM"
-msgstr "遊戲管理者"
-
-#: src/gui/palette.cpp:98
-msgid "Player"
-msgstr "玩家"
-
-#: src/gui/palette.cpp:99
-msgid "Whisper"
-msgstr "悄悄話"
-
-#: src/gui/palette.cpp:100
-msgid "Is"
-msgstr "是"
-
-#: src/gui/palette.cpp:101 src/net/ea/gui/partytab.cpp:43
-msgid "Party"
-msgstr "隊伍"
-
-#: src/gui/palette.cpp:102 src/net/ea/gui/guildtab.cpp:45
-msgid "Guild"
-msgstr "公會"
-
-#: src/gui/palette.cpp:103
-msgid "Server"
-msgstr "伺服器"
-
-#: src/gui/palette.cpp:104
-msgid "Logger"
-msgstr "記錄器"
-
-#: src/gui/palette.cpp:105
-msgid "Hyperlink"
-msgstr "超連結"
-
-#: src/gui/palette.cpp:107
-msgid "Being"
-msgstr "物件"
-
-#: src/gui/palette.cpp:108
-msgid "Other Players' Names"
-msgstr "其他使用者名字"
-
-#: src/gui/palette.cpp:109
-msgid "Own Name"
-msgstr "我的名字"
-
-#: src/gui/palette.cpp:110
-msgid "GM Names"
-msgstr "遊戲管理者名字"
-
-#: src/gui/palette.cpp:111
-msgid "NPCs"
-msgstr "電腦"
-
-#: src/gui/palette.cpp:112
-msgid "Monsters"
-msgstr "怪物"
-
-#: src/gui/palette.cpp:114
-msgid "Unknown Item Type"
-msgstr "不明物品類型"
-
-#: src/gui/palette.cpp:115
-msgid "Generics"
-msgstr "一般"
-
-#: src/gui/palette.cpp:116
-msgid "Hats"
-msgstr "帽子"
-
-#: src/gui/palette.cpp:117
-msgid "Usables"
-msgstr "可使用的"
-
-#: src/gui/palette.cpp:118
-msgid "Shirts"
-msgstr "內衣"
-
-#: src/gui/palette.cpp:119
-#, fuzzy
-msgid "One Handed Weapons"
-msgstr "單手武器"
-
-#: src/gui/palette.cpp:120
-msgid "Pants"
-msgstr "褲子"
-
-#: src/gui/palette.cpp:121
-msgid "Shoes"
-msgstr "鞋子"
-
-#: src/gui/palette.cpp:122
-#, fuzzy
-msgid "Two Handed Weapons"
-msgstr "單手武器"
-
-#: src/gui/palette.cpp:123
-msgid "Shields"
-msgstr "盾牌"
-
-#: src/gui/palette.cpp:124
-msgid "Rings"
-msgstr "戒指"
-
-#: src/gui/palette.cpp:125
-msgid "Necklaces"
-msgstr "腕甲"
-
-#: src/gui/palette.cpp:126
-msgid "Arms"
-msgstr "武器"
-
-#: src/gui/palette.cpp:127
-msgid "Ammo"
-msgstr "箭"
-
-#: src/gui/palette.cpp:129
-msgid "Particle Effects"
-msgstr "粒子效果"
-
-#: src/gui/palette.cpp:130
-msgid "Pickup Notification"
-msgstr "撿拾通知"
-
-#: src/gui/palette.cpp:131
-msgid "Exp Notification"
-msgstr "經驗值通知"
-
-#: src/gui/palette.cpp:133
-#, fuzzy
-msgid "Player Hits Monster"
-msgstr "玩家攻擊怪物"
-
-#: src/gui/palette.cpp:135
-#, fuzzy
-msgid "Monster Hits Player"
-msgstr "怪物攻擊玩家"
-
-#: src/gui/palette.cpp:136
-msgid "Critical Hit"
-msgstr "致命一擊"
-
-#: src/gui/palette.cpp:137
-msgid "Misses"
-msgstr "失誤"
-
-#: src/gui/palette.cpp:139
-msgid "HP Bar"
-msgstr "血量"
-
-#: src/gui/palette.cpp:140
-msgid "3/4 HP Bar"
-msgstr "3/4 血量"
-
-#: src/gui/palette.cpp:141
-msgid "1/2 HP Bar"
-msgstr "1/2 血量"
-
-#: src/gui/palette.cpp:142
-msgid "1/4 HP Bar"
-msgstr "1/4 血量"
-
-#: src/gui/popupmenu.cpp:84
+#: src/gui/popupmenu.cpp:83
 #, fuzzy, c-format
 msgid "Trade with %s..."
 msgstr "與 %s 交易."
 
-#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:161
+#: src/gui/popupmenu.cpp:87 src/gui/popupmenu.cpp:158
 #, fuzzy, c-format
 msgid "Attack %s"
 msgstr "攻擊 %+d"
 
-#: src/gui/popupmenu.cpp:92
+#: src/gui/popupmenu.cpp:91
 #, fuzzy, c-format
 msgid "Whisper %s"
 msgstr "悄悄話"
 
-#: src/gui/popupmenu.cpp:101
+#: src/gui/popupmenu.cpp:100
 #, fuzzy, c-format
 msgid "Befriend %s"
 msgstr "@@friend|與%s交朋友@@"
 
-#: src/gui/popupmenu.cpp:106
+#: src/gui/popupmenu.cpp:105
 #, fuzzy, c-format
 msgid "Disregard %s"
 msgstr "不理"
 
-#: src/gui/popupmenu.cpp:109
+#: src/gui/popupmenu.cpp:108
 #, fuzzy, c-format
 msgid "Ignore %s"
 msgstr "忽略"
 
-#: src/gui/popupmenu.cpp:115 src/gui/popupmenu.cpp:124
+#: src/gui/popupmenu.cpp:114 src/gui/popupmenu.cpp:123
 #, c-format
 msgid "Unignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:118
+#: src/gui/popupmenu.cpp:117
 #, fuzzy, c-format
 msgid "Completely ignore %s"
 msgstr "@@ignore|完全忽視 %s@@"
 
 #: src/gui/popupmenu.cpp:130
-#, c-format
-msgid "Follow %s"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:133
 #, fuzzy, c-format
 msgid "Invite %s to join your guild"
 msgstr "@@guild|邀請 %s 加入你的公會@@"
 
-#: src/gui/popupmenu.cpp:137
+#: src/gui/popupmenu.cpp:134
 #, fuzzy, c-format
 msgid "Invite %s to join your party"
 msgstr "@@party|邀請 %s 加入你的隊伍@@"
 
-#: src/gui/popupmenu.cpp:144
+#: src/gui/popupmenu.cpp:141
 #, fuzzy
 msgid "Kick player"
 msgstr "踢人失敗！"
 
-#: src/gui/popupmenu.cpp:153
+#: src/gui/popupmenu.cpp:150
 #, fuzzy, c-format
 msgid "Talk to %s"
 msgstr "@@對話|與 %s 對話@@"
 
-#: src/gui/popupmenu.cpp:166
+#: src/gui/popupmenu.cpp:163
 #, fuzzy
 msgid "Kick monster"
 msgstr "@@admin-kick|移除怪物@@"
 
-#: src/gui/popupmenu.cpp:174
+#: src/gui/popupmenu.cpp:171
 #, fuzzy
 msgid "Add name to chat"
 msgstr "@@name|增加聊天名單@@"
 
-#: src/gui/popupmenu.cpp:191
+#: src/gui/popupmenu.cpp:188
 #, fuzzy, c-format
 msgid "Pick up %s"
 msgstr "撿拾"
 
-#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:400
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:387
 #, fuzzy
 msgid "Add to chat"
 msgstr "@@chat|加入聊天@@"
 
-#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:70
-msgid "Store"
-msgstr "寄放"
-
-#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:71
-msgid "Retrieve"
-msgstr "取回"
-
 #: src/gui/quitdialog.cpp:44
 msgid "Switch server"
 msgstr "交換伺服器"
@@ -1361,52 +1180,65 @@ msgstr "密碼不能少於%d個字元。"
 msgid "Passwords do not match."
 msgstr "密碼不一樣."
 
-#: src/gui/serverdialog.cpp:134
+#: src/gui/serverdialog.cpp:197
 #, fuzzy
 msgid "Choose Your Server"
 msgstr "選擇您的伺服器"
 
-#: src/gui/serverdialog.cpp:141 src/gui/widgets/chattab.cpp:139
+#: src/gui/serverdialog.cpp:206 src/gui/widgets/chattab.cpp:142
 msgid "Server:"
 msgstr "伺服器："
 
-#: src/gui/serverdialog.cpp:142
+#: src/gui/serverdialog.cpp:207
 msgid "Port:"
 msgstr "端口(port):"
 
-#: src/gui/serverdialog.cpp:143
+#: src/gui/serverdialog.cpp:208
 #, fuzzy
 msgid "Server type:"
 msgstr "伺服器："
 
-#: src/gui/serverdialog.cpp:183
+#: src/gui/serverdialog.cpp:229
 #, fuzzy
 msgid "Connect"
 msgstr "連線中..."
 
-#: src/gui/serverdialog.cpp:184
+#: src/gui/serverdialog.cpp:230
 #, fuzzy
 msgid "Custom Server"
 msgstr "自訂滑鼠標"
 
-#: src/gui/serverdialog.cpp:262
+#: src/gui/serverdialog.cpp:324
 msgid "Please type both the address and the port of a server."
 msgstr "請輸入伺服氣得IP地址和Port"
 
-#: src/gui/serverdialog.cpp:411
+#: src/gui/serverdialog.cpp:441
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:417
+#: src/gui/serverdialog.cpp:447
 #, fuzzy
 msgid "Waiting for server..."
 msgstr "等待伺服器中"
 
-#: src/gui/serverdialog.cpp:421
+#: src/gui/serverdialog.cpp:451
 msgid "Preparing download"
 msgstr ""
 
+#: src/gui/serverdialog.cpp:455
+msgid "Error retreiving server list!"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:550
+msgid "requires a newer version"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:552
+#, c-format
+msgid "requires v%s"
+msgstr ""
+
 #: src/gui/setup_audio.cpp:42
 msgid "Sound"
 msgstr "聲音"
@@ -1440,54 +1272,54 @@ msgstr ""
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:44
+#: src/gui/setup_colors.cpp:46
 msgid "This is what the color looks like"
 msgstr "這是顏色看起來的樣子"
 
-#: src/gui/setup_colors.cpp:49
+#: src/gui/setup_colors.cpp:51
 msgid "Colors"
 msgstr "顏色"
 
-#: src/gui/setup_colors.cpp:70
+#: src/gui/setup_colors.cpp:72
 #, fuzzy
 msgid "Type:"
 msgstr "類型: "
 
-#: src/gui/setup_colors.cpp:81 src/gui/setup_colors.cpp:433
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:331
 msgid "Static"
 msgstr "狀態"
 
-#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:84
-#: src/gui/setup_colors.cpp:434
+#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
+#: src/gui/setup_colors.cpp:332
 msgid "Pulse"
 msgstr "暫停"
 
-#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
+#: src/gui/setup_colors.cpp:333
 msgid "Rainbow"
 msgstr "彩虹"
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
+#: src/gui/setup_colors.cpp:333
 msgid "Spectrum"
 msgstr "光譜"
 
-#: src/gui/setup_colors.cpp:92
+#: src/gui/setup_colors.cpp:94
 #, fuzzy
 msgid "Delay:"
 msgstr "延遲: "
 
-#: src/gui/setup_colors.cpp:107
+#: src/gui/setup_colors.cpp:109
 #, fuzzy
 msgid "Red:"
 msgstr "紅: "
 
-#: src/gui/setup_colors.cpp:122
+#: src/gui/setup_colors.cpp:124
 #, fuzzy
 msgid "Green:"
 msgstr "綠: "
 
-#: src/gui/setup_colors.cpp:137
+#: src/gui/setup_colors.cpp:139
 #, fuzzy
 msgid "Blue:"
 msgstr "藍: "
@@ -1533,592 +1365,603 @@ msgid "Assign"
 msgstr "分配"
 
 #: src/gui/setup_keyboard.cpp:90
+#, fuzzy
+msgid "Unassign"
+msgstr "分配"
+
+#: src/gui/setup_keyboard.cpp:94
 msgid "Default"
 msgstr "預設"
 
-#: src/gui/setup_keyboard.cpp:119
+#: src/gui/setup_keyboard.cpp:125
 msgid "Key Conflict(s) Detected."
 msgstr "檢測到按鍵衝突。"
 
-#: src/gui/setup_players.cpp:57
+#: src/gui/setup_players.cpp:58
 msgid "Name"
 msgstr "名字"
 
-#: src/gui/setup_players.cpp:58
+#: src/gui/setup_players.cpp:59
 msgid "Relation"
 msgstr "關係"
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:64
 msgid "Neutral"
 msgstr "中立"
 
-#: src/gui/setup_players.cpp:64
+#: src/gui/setup_players.cpp:65
 msgid "Friend"
 msgstr "好友"
 
-#: src/gui/setup_players.cpp:65
+#: src/gui/setup_players.cpp:66
 msgid "Disregarded"
 msgstr "不理"
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_players.cpp:67
 msgid "Ignored"
 msgstr "忽略"
 
-#: src/gui/setup_players.cpp:208 src/gui/setup_video.cpp:132
+#: src/gui/setup_players.cpp:206 src/gui/setup_video.cpp:153
 msgid "???"
 msgstr "???"
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_players.cpp:225
 msgid "Allow trading"
 msgstr "允許交易"
 
-#: src/gui/setup_players.cpp:228
+#: src/gui/setup_players.cpp:227
 msgid "Allow whispers"
 msgstr "允許密語"
 
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:231
 msgid "Put all whispers in tabs"
 msgstr "將所有的悄悄話放到分頁中"
 
-#: src/gui/setup_players.cpp:234
+#: src/gui/setup_players.cpp:233
 #, fuzzy
 msgid "Show gender"
 msgstr "顯示名稱"
 
-#: src/gui/setup_players.cpp:236
+#: src/gui/setup_players.cpp:235
+#, fuzzy
+msgid "Enable Chat log"
+msgstr "不能出售."
+
+#: src/gui/setup_players.cpp:237
 msgid "Players"
 msgstr "玩家"
 
-#: src/gui/setup_players.cpp:261
+#: src/gui/setup_players.cpp:262
 msgid "When ignoring:"
 msgstr "當忽略時："
 
-#: src/gui/setup_video.cpp:113
+#: src/gui/setup_video.cpp:134
 msgid "Tiny"
 msgstr "小"
 
-#: src/gui/setup_video.cpp:114
+#: src/gui/setup_video.cpp:135
 msgid "Small"
 msgstr "小型"
 
-#: src/gui/setup_video.cpp:115
+#: src/gui/setup_video.cpp:136
 msgid "Medium"
 msgstr "中型"
 
-#: src/gui/setup_video.cpp:116
+#: src/gui/setup_video.cpp:137
 msgid "Large"
 msgstr "大型"
 
-#: src/gui/setup_video.cpp:142
+#: src/gui/setup_video.cpp:163
 msgid "No text"
 msgstr "沒有文字"
 
-#: src/gui/setup_video.cpp:144
+#: src/gui/setup_video.cpp:164
+msgid "Text"
+msgstr "文字"
+
+#: src/gui/setup_video.cpp:165
 msgid "Bubbles, no names"
 msgstr "有聊天泡泡,沒名字"
 
-#: src/gui/setup_video.cpp:145
+#: src/gui/setup_video.cpp:166
 msgid "Bubbles with names"
 msgstr "聊天泡泡加名字"
 
-#: src/gui/setup_video.cpp:157
+#: src/gui/setup_video.cpp:178
 msgid "off"
 msgstr "關閉"
 
-#: src/gui/setup_video.cpp:158 src/gui/setup_video.cpp:171
+#: src/gui/setup_video.cpp:179 src/gui/setup_video.cpp:192
 msgid "low"
 msgstr "低"
 
-#: src/gui/setup_video.cpp:159 src/gui/setup_video.cpp:173
+#: src/gui/setup_video.cpp:180 src/gui/setup_video.cpp:194
 msgid "high"
 msgstr "高"
 
-#: src/gui/setup_video.cpp:172
+#: src/gui/setup_video.cpp:193
 msgid "medium"
 msgstr "中"
 
-#: src/gui/setup_video.cpp:174
+#: src/gui/setup_video.cpp:195
 msgid "max"
 msgstr "最大"
 
-#: src/gui/setup_video.cpp:196
+#: src/gui/setup_video.cpp:217
 msgid "Full screen"
 msgstr "全螢幕"
 
-#: src/gui/setup_video.cpp:197
+#: src/gui/setup_video.cpp:218
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:198
+#: src/gui/setup_video.cpp:219
 msgid "Custom cursor"
 msgstr "自訂滑鼠標"
 
-#: src/gui/setup_video.cpp:200
+#: src/gui/setup_video.cpp:221
 msgid "Visible names"
 msgstr "可見的名稱"
 
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:223
 msgid "Particle effects"
 msgstr "粒子效果"
 
-#: src/gui/setup_video.cpp:204
+#: src/gui/setup_video.cpp:225
 #, fuzzy
 msgid "Show own name"
 msgstr "顯示名稱"
 
-#: src/gui/setup_video.cpp:205
+#: src/gui/setup_video.cpp:226
+msgid "Log NPC dialogue"
+msgstr ""
+
+#: src/gui/setup_video.cpp:227
 msgid "Show pickup notification"
 msgstr "顯示撿拾通知"
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:207
+#. TRANSLATORS: Refers to "Show pickup notification"
+#: src/gui/setup_video.cpp:229
 msgid "in chat"
 msgstr "聊天中"
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:209
+#. TRANSLATORS: Refers to "Show pickup notification"
+#: src/gui/setup_video.cpp:231
 msgid "as particle"
 msgstr "同粒子設定"
 
-#: src/gui/setup_video.cpp:214
+#: src/gui/setup_video.cpp:236
 #, fuzzy
 msgid "FPS limit:"
 msgstr "FPS限制："
 
-#: src/gui/setup_video.cpp:225
+#: src/gui/setup_video.cpp:247
+msgid "Disable transparency (Low CPU mode)"
+msgstr ""
+
+#: src/gui/setup_video.cpp:250
 msgid "Video"
 msgstr "顯示"
 
-#: src/gui/setup_video.cpp:227
+#: src/gui/setup_video.cpp:252
 #, fuzzy
-msgid "Show monster damage"
+msgid "Show damage"
 msgstr "顯示名稱"
 
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:258
 msgid "Overhead text"
 msgstr "置頂文字"
 
-#: src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:259
 msgid "Gui opacity"
 msgstr "Gui 透明度"
 
-#: src/gui/setup_video.cpp:235
+#: src/gui/setup_video.cpp:260
 msgid "Ambient FX"
 msgstr "環境效果"
 
-#: src/gui/setup_video.cpp:236
+#: src/gui/setup_video.cpp:261
 #, fuzzy
 msgid "Particle detail"
 msgstr "紋理細節"
 
-#: src/gui/setup_video.cpp:237
+#: src/gui/setup_video.cpp:262
 msgid "Font size"
 msgstr "字型大小"
 
-#: src/gui/setup_video.cpp:251 src/gui/setup_video.cpp:454
-#: src/gui/setup_video.cpp:568
+#: src/gui/setup_video.cpp:277 src/gui/setup_video.cpp:532
+#: src/gui/setup_video.cpp:662
 #, fuzzy
 msgid "None"
 msgstr "否"
 
-#: src/gui/setup_video.cpp:381
+#: src/gui/setup_video.cpp:426
 #, fuzzy
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr "模式和恢復舊模式也沒有！"
 
-#: src/gui/setup_video.cpp:387
+#: src/gui/setup_video.cpp:432
 #, fuzzy
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr "模式和恢復舊模式也沒有！"
 
-#: src/gui/setup_video.cpp:398
+#: src/gui/setup_video.cpp:443
 #, fuzzy
 msgid "Switching to Full Screen"
 msgstr "切換全螢幕"
 
-#: src/gui/setup_video.cpp:399
+#: src/gui/setup_video.cpp:444
 msgid "Restart needed for changes to take effect."
 msgstr "請重新啟動"
 
-#: src/gui/setup_video.cpp:411
+#: src/gui/setup_video.cpp:458
 #, fuzzy
 msgid "Changing to OpenGL"
 msgstr "切換為OpenGL"
 
-#: src/gui/setup_video.cpp:412
+#: src/gui/setup_video.cpp:459
+msgid ""
+"Applying change to OpenGL requires restart. In case OpenGL messes up your "
+"game graphics, restart the game with the command line option \"--no-opengl\"."
+msgstr ""
+
+#: src/gui/setup_video.cpp:466
+msgid "Deactivating OpenGL"
+msgstr ""
+
+#: src/gui/setup_video.cpp:467
 msgid "Applying change to OpenGL requires restart."
 msgstr "確認切換OpenGL需要重新開始"
 
-#: src/gui/setup_video.cpp:486 src/gui/setup_video.cpp:491
+#: src/gui/setup_video.cpp:475
+#, fuzzy
+msgid "Transparency disabled"
+msgstr "經驗值分享已停用。"
+
+#: src/gui/setup_video.cpp:476 src/gui/setup_video.cpp:484
+msgid "You must restart to apply changes."
+msgstr ""
+
+#: src/gui/setup_video.cpp:483
+msgid "Transparency enabled"
+msgstr ""
+
+#: src/gui/setup_video.cpp:576 src/gui/setup_video.cpp:581
 #, fuzzy
 msgid "Screen Resolution Changed"
 msgstr "螢幕解析度已變更"
 
-#: src/gui/setup_video.cpp:487 src/gui/setup_video.cpp:492
+#: src/gui/setup_video.cpp:577 src/gui/setup_video.cpp:582
 msgid "Restart your client for the change to take effect."
 msgstr "請重新啟動您的客戶端讓變更生效。"
 
-#: src/gui/setup_video.cpp:489
+#: src/gui/setup_video.cpp:579
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:522
+#: src/gui/setup_video.cpp:612
 #, fuzzy
 msgid "Particle Effect Settings Changed."
 msgstr "粒子效果設定值已變更。"
 
-#: src/gui/setup_video.cpp:523
+#: src/gui/setup_video.cpp:613
 msgid "Changes will take effect on map change."
 msgstr "變更會在地圖改變後生效。"
 
-#: src/gui/skilldialog.cpp:197 src/gui/windowmenu.cpp:58
+#: src/gui/skilldialog.cpp:212 src/gui/windowmenu.cpp:59
 msgid "Skills"
 msgstr "技能"
 
-#: src/gui/skilldialog.cpp:208
+#: src/gui/skilldialog.cpp:223
 msgid "Up"
 msgstr "升級"
 
-#: src/gui/skilldialog.cpp:262
+#: src/gui/skilldialog.cpp:269
 #, fuzzy, c-format
 msgid "Skill points available: %d"
 msgstr "技能點數：%d"
 
-#: src/gui/skilldialog.cpp:314
+#: src/gui/skilldialog.cpp:351
 #, fuzzy, c-format
 msgid "Skill Set %d"
 msgstr "技能點數：%d"
 
-#: src/gui/skilldialog.cpp:323
+#: src/gui/skilldialog.cpp:360
 #, fuzzy, c-format
 msgid "Skill %d"
 msgstr "技能"
 
-#: src/gui/skilldialog.cpp:405
+#: src/gui/skilldialog.cpp:442
 #, fuzzy, c-format
 msgid "Lvl: %d (%+d)"
 msgstr "等級：%d"
 
-#: src/gui/skilldialog.cpp:416
+#: src/gui/skilldialog.cpp:453
 #, fuzzy, c-format
 msgid "Lvl: %d"
 msgstr "等級：%d"
 
-#: src/gui/socialwindow.cpp:117
+#: src/gui/socialwindow.cpp:126
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:126
+#: src/gui/socialwindow.cpp:139
 #, fuzzy, c-format
 msgid "Guild %s quit requested."
 msgstr "公會已成立."
 
-#: src/gui/socialwindow.cpp:136
+#: src/gui/socialwindow.cpp:153
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:137
+#: src/gui/socialwindow.cpp:154
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:146
+#: src/gui/socialwindow.cpp:163
 #, fuzzy
 msgid "Leave Guild?"
 msgstr "建立公會"
 
-#: src/gui/socialwindow.cpp:147
+#: src/gui/socialwindow.cpp:164
 #, fuzzy, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "您確定要離開?"
 
-#: src/gui/socialwindow.cpp:182
+#: src/gui/socialwindow.cpp:207 src/net/tmwa/partyhandler.cpp:330
 #, fuzzy, c-format
 msgid "Invited user %s to party."
 msgstr "/party > 邀請使用者組隊"
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:218
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:199
+#: src/gui/socialwindow.cpp:232
 #, fuzzy
 msgid "Member Invite to Party"
 msgstr "/party > 邀請使用者組隊"
 
-#: src/gui/socialwindow.cpp:200
+#: src/gui/socialwindow.cpp:233
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:209
+#: src/gui/socialwindow.cpp:242
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:210
+#: src/gui/socialwindow.cpp:243
 #, fuzzy, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "您確定要離開?"
 
-#: src/gui/socialwindow.cpp:239
+#: src/gui/socialwindow.cpp:272
 msgid "Create Guild"
 msgstr "建立公會"
 
-#: src/gui/socialwindow.cpp:240 src/gui/socialwindow.cpp:564
+#: src/gui/socialwindow.cpp:273 src/gui/socialwindow.cpp:620
 #, fuzzy
 msgid "Create Party"
 msgstr "新增角色"
 
-#: src/gui/socialwindow.cpp:279 src/gui/windowmenu.cpp:60
+#: src/gui/socialwindow.cpp:312 src/gui/windowmenu.cpp:64
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:297
+#: src/gui/socialwindow.cpp:330
 #, fuzzy
 msgid "Invite"
 msgstr "邀請使用者"
 
-#: src/gui/socialwindow.cpp:298
+#: src/gui/socialwindow.cpp:331
 #, fuzzy
 msgid "Leave"
 msgstr "大型"
 
-#: src/gui/socialwindow.cpp:394
+#: src/gui/socialwindow.cpp:443
 #, fuzzy, c-format
 msgid "Accepted party invite from %s."
 msgstr "接受 %s 的派對邀請."
 
-#: src/gui/socialwindow.cpp:400
+#: src/gui/socialwindow.cpp:449
 #, fuzzy, c-format
 msgid "Rejected party invite from %s."
 msgstr "拒絕 %s 的派對邀請"
 
-#: src/gui/socialwindow.cpp:413
+#: src/gui/socialwindow.cpp:462
 #, fuzzy, c-format
 msgid "Accepted guild invite from %s."
 msgstr "接受 %s 的派對邀請."
 
-#: src/gui/socialwindow.cpp:419
+#: src/gui/socialwindow.cpp:468
 #, fuzzy, c-format
 msgid "Rejected guild invite from %s."
 msgstr "拒絕 %s 的派對邀請"
 
-#: src/gui/socialwindow.cpp:463
+#: src/gui/socialwindow.cpp:497
+msgid "Creating guild failed, please choose a shorter name."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:504
 #, fuzzy, c-format
 msgid "Creating guild called %s."
 msgstr "創建公會時發生錯誤."
 
-#: src/gui/socialwindow.cpp:477
+#: src/gui/socialwindow.cpp:520
+msgid "Creating party failed, please choose a shorter name."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:527
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:484
+#: src/gui/socialwindow.cpp:541
 #, fuzzy
 msgid "Guild Name"
 msgstr "公會"
 
-#: src/gui/socialwindow.cpp:485
+#: src/gui/socialwindow.cpp:542
 #, fuzzy
 msgid "Choose your guild's name."
 msgstr "選擇您的伺服器"
 
-#: src/gui/socialwindow.cpp:497
+#: src/gui/socialwindow.cpp:554
 #, fuzzy
 msgid "Received guild request, but one already exists."
 msgstr "收到派對邀請,但而有另一個存在."
 
-#: src/gui/socialwindow.cpp:502
+#: src/gui/socialwindow.cpp:559
 #, fuzzy, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s 邀請你參加 %s 派對."
 
-#: src/gui/socialwindow.cpp:507
+#: src/gui/socialwindow.cpp:564
 #, fuzzy
 msgid "Accept Guild Invite"
 msgstr "接受派對邀請"
 
-#: src/gui/socialwindow.cpp:519
+#: src/gui/socialwindow.cpp:576
 msgid "Received party request, but one already exists."
 msgstr "收到派對邀請,但而有另一個存在."
 
-#: src/gui/socialwindow.cpp:529
+#: src/gui/socialwindow.cpp:585
 #, fuzzy
 msgid "You have been invited you to join a party."
 msgstr "%s 邀請你參加他們的派對."
 
-#: src/gui/socialwindow.cpp:533
+#: src/gui/socialwindow.cpp:589
 #, fuzzy, c-format
 msgid "You have been invited to join the %s party."
 msgstr "%s 邀請你參加 %s 派對."
 
-#: src/gui/socialwindow.cpp:541
+#: src/gui/socialwindow.cpp:597
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s 邀請你參加他們的派對."
 
-#: src/gui/socialwindow.cpp:546
+#: src/gui/socialwindow.cpp:602
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s 邀請你參加 %s 派對."
 
-#: src/gui/socialwindow.cpp:554
+#: src/gui/socialwindow.cpp:610
 msgid "Accept Party Invite"
 msgstr "接受派對邀請"
 
-#: src/gui/socialwindow.cpp:565
+#: src/gui/socialwindow.cpp:621
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:570
+#: src/gui/socialwindow.cpp:626
 #, fuzzy
 msgid "Party Name"
 msgstr "隊伍"
 
-#: src/gui/socialwindow.cpp:571
+#: src/gui/socialwindow.cpp:627
 #, fuzzy
 msgid "Choose your party's name."
 msgstr "選擇您的伺服器"
 
-#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:59
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:62
 msgid "Specials"
 msgstr ""
 
-#: src/gui/specialswindow.cpp:174
-#, c-format
-msgid "Specials Set %d"
-msgstr ""
-
-#: src/gui/specialswindow.cpp:191
-#, c-format
-msgid "Special %d"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:99 src/gui/statuswindow.cpp:247
+#: src/gui/statuswindow.cpp:113 src/gui/statuswindow.cpp:215
+#: src/gui/statuswindow.cpp:262
 #, c-format
 msgid "Level: %d"
 msgstr "等級：%d"
 
-#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:211
+#: src/gui/statuswindow.cpp:114 src/gui/statuswindow.cpp:208
+#: src/gui/statuswindow.cpp:239
 #, c-format
 msgid "Money: %s"
 msgstr "金錢: %s"
 
-#: src/gui/statuswindow.cpp:102
+#: src/gui/statuswindow.cpp:117
 msgid "HP:"
 msgstr "體力 :"
 
-#: src/gui/statuswindow.cpp:107
+#: src/gui/statuswindow.cpp:122
 msgid "Exp:"
 msgstr "經驗值:"
 
-#: src/gui/statuswindow.cpp:112
+#: src/gui/statuswindow.cpp:130
 msgid "MP:"
 msgstr "魔力:"
 
-#: src/gui/statuswindow.cpp:132 src/gui/statuswindow.cpp:219
+#: src/gui/statuswindow.cpp:158 src/gui/statuswindow.cpp:275
 #, c-format
 msgid "Job: %d"
 msgstr "職業：%d"
 
-#: src/gui/statuswindow.cpp:133
+#: src/gui/statuswindow.cpp:159
 msgid "Job:"
 msgstr "職業:"
 
-#: src/gui/statuswindow.cpp:194
-#, fuzzy
-msgid "HP"
-msgstr "體力 :"
-
-#: src/gui/statuswindow.cpp:200
-#, fuzzy
-msgid "MP"
-msgstr "魔力:"
-
-#: src/gui/statuswindow.cpp:206
-#, fuzzy
-msgid "Exp"
-msgstr "經驗值:"
-
-#: src/gui/statuswindow.cpp:215
-#, fuzzy
-msgid "Money"
-msgstr "金錢：%d"
-
-#: src/gui/statuswindow.cpp:225
-#, fuzzy
-msgid "Job"
-msgstr "職業:"
-
-#: src/gui/statuswindow.cpp:229
+#: src/gui/statuswindow.cpp:211 src/gui/statuswindow.cpp:247
 #, fuzzy, c-format
 msgid "Character points: %d"
 msgstr "角色狀態確定"
 
-#: src/gui/statuswindow.cpp:235
+#: src/gui/statuswindow.cpp:255
 #, fuzzy, c-format
 msgid "Correction points: %d"
 msgstr "技能點數：%d"
 
-#: src/gui/statuswindow.cpp:251
-#, fuzzy
-msgid "Level"
-msgstr "等級：%d"
-
-#: src/gui/storagewindow.cpp:58
-msgid "Storage"
-msgstr "貯藏庫"
-
-#: src/gui/trade.cpp:52
+#: src/gui/trade.cpp:53
 msgid "Propose trade"
 msgstr "是否交易"
 
-#: src/gui/trade.cpp:53
+#: src/gui/trade.cpp:54
 msgid "Confirmed. Waiting..."
 msgstr "已確認。請稍候..."
 
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:55
 msgid "Agree trade"
 msgstr "同意交易"
 
-#: src/gui/trade.cpp:55
+#: src/gui/trade.cpp:56
 msgid "Agreed. Waiting..."
 msgstr "已同意。請稍候..."
 
-#: src/gui/trade.cpp:58
+#: src/gui/trade.cpp:59
 msgid "Trade: You"
 msgstr "交易：您"
 
-#: src/gui/trade.cpp:74 src/gui/trade.cpp:75
+#: src/gui/trade.cpp:73 src/gui/trade.cpp:74
 msgid "Trade"
 msgstr "交易"
 
-#: src/gui/trade.cpp:77
+#: src/gui/trade.cpp:76
 msgid "Add"
 msgstr "增加"
 
-#: src/gui/trade.cpp:99 src/gui/trade.cpp:135
+#: src/gui/trade.cpp:98 src/gui/trade.cpp:134
 #, fuzzy, c-format
 msgid "You get %s"
 msgstr "您得到 %s。"
 
-#: src/gui/trade.cpp:100
+#: src/gui/trade.cpp:99
 msgid "You give:"
 msgstr "你付出:"
 
-#: src/gui/trade.cpp:104
+#: src/gui/trade.cpp:103
 msgid "Change"
 msgstr "更改"
 
-#: src/gui/trade.cpp:275
+#: src/gui/trade.cpp:262
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr "增加物品失敗。你不能覆蓋視窗中的該類物品能。"
 
-#: src/gui/trade.cpp:318
+#: src/gui/trade.cpp:304
 msgid "You don't have enough money."
 msgstr "你沒有足夠的金錢."
 
@@ -2139,22 +1982,22 @@ msgstr "連線中..."
 msgid "Play"
 msgstr "開始"
 
-#: src/gui/updatewindow.cpp:405
+#: src/gui/updatewindow.cpp:417
 msgid "##1  The update process is incomplete."
 msgstr "##1  更新的程序不完整。"
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:407
+#: src/gui/updatewindow.cpp:419
 msgid "##1  It is strongly recommended that"
 msgstr "##1  強烈建議"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:409
+#: src/gui/updatewindow.cpp:421
 #, fuzzy
 msgid "##1  you try again later."
 msgstr "##1  您稍後再試一次"
 
-#: src/gui/updatewindow.cpp:501
+#: src/gui/updatewindow.cpp:515
 msgid "Completed"
 msgstr "已完成"
 
@@ -2234,64 +2077,64 @@ msgstr "需要指定要成為 op 的使用者！"
 msgid "Need a user to kick!"
 msgstr "需要指定要踢掉的使用者！"
 
-#: src/gui/widgets/chattab.cpp:118
+#: src/gui/widgets/chattab.cpp:121
 msgid "Global announcement:"
 msgstr "主要公告："
 
-#: src/gui/widgets/chattab.cpp:124
+#: src/gui/widgets/chattab.cpp:127
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "%s 主要公告："
 
-#: src/gui/widgets/chattab.cpp:150
+#: src/gui/widgets/chattab.cpp:153
 #, fuzzy, c-format
 msgid "%s whispers: %s"
 msgstr "%s 的悄悄話: "
 
-#: src/gui/widgets/whispertab.cpp:51
+#: src/gui/widgets/whispertab.cpp:53
 msgid "Cannot send empty chat!"
 msgstr "不能傳送空的聊天訊息！"
 
-#: src/gui/widgets/whispertab.cpp:70
+#: src/gui/widgets/whispertab.cpp:72
 msgid "/ignore > Ignore the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:71
+#: src/gui/widgets/whispertab.cpp:73
 msgid "/unignore > Stop ignoring the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:72
+#: src/gui/widgets/whispertab.cpp:74
 msgid "/close > Close the whisper tab"
 msgstr "/close > 關閉悄悄話分頁"
 
-#: src/gui/widgets/whispertab.cpp:82
+#: src/gui/widgets/whispertab.cpp:84
 msgid "Command: /close"
 msgstr "指令： /close"
 
-#: src/gui/widgets/whispertab.cpp:83
+#: src/gui/widgets/whispertab.cpp:85
 msgid "This command closes the current whisper tab."
 msgstr "這個指令會關閉目前的悄悄話分頁。"
 
-#: src/gui/widgets/whispertab.cpp:87
+#: src/gui/widgets/whispertab.cpp:89
 #, fuzzy
 msgid "Command: /ignore"
 msgstr "指令： /item"
 
-#: src/gui/widgets/whispertab.cpp:88
+#: src/gui/widgets/whispertab.cpp:90
 #, fuzzy
 msgid "This command ignores the other player regardless of current relations."
 msgstr "這調指令可顯示目前線上人數。"
 
-#: src/gui/widgets/whispertab.cpp:94
+#: src/gui/widgets/whispertab.cpp:96
 #, fuzzy
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr "這個指令會開始將聊天紀錄錄製為檔案 <filename>。"
 
-#: src/gui/windowmenu.cpp:55
+#: src/gui/windowmenu.cpp:54
 msgid "Status"
 msgstr "狀態"
 
-#: src/gui/windowmenu.cpp:61
+#: src/gui/windowmenu.cpp:65
 msgid "Shortcut"
 msgstr "快捷鍵"
 
@@ -2310,772 +2153,1125 @@ msgstr "更改"
 msgid "Choose World"
 msgstr "選擇您的伺服器"
 
-#: src/keyboardconfig.cpp:40
+#: src/keyboardconfig.cpp:39
 msgid "Move Up"
 msgstr "上移"
 
-#: src/keyboardconfig.cpp:41
+#: src/keyboardconfig.cpp:40
 msgid "Move Down"
 msgstr "下移"
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:41
 msgid "Move Left"
 msgstr "左移"
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:42
 msgid "Move Right"
 msgstr "右移"
 
-#: src/keyboardconfig.cpp:44 src/net/ea/generalhandler.cpp:223
+#: src/keyboardconfig.cpp:43 src/net/tmwa/generalhandler.cpp:237
 msgid "Attack"
 msgstr "攻擊"
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:44
 msgid "Target & Attack"
 msgstr "尋找目標攻擊"
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:45
 msgid "Smilie"
 msgstr "史萊姆吃掉妳了~~"
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:46
 msgid "Talk"
 msgstr "說話"
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:47
 msgid "Stop Attack"
 msgstr "停止攻擊"
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:48
 #, fuzzy
 msgid "Target Monster"
 msgstr "最接近的目標"
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboardconfig.cpp:49
 msgid "Target NPC"
 msgstr "以 NPC 為目標"
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:50
 msgid "Target Player"
 msgstr "以玩家為目標"
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:51
 msgid "Pickup"
 msgstr "撿拾"
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:52
 msgid "Hide Windows"
 msgstr "隱藏視窗"
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:53
 msgid "Sit"
 msgstr "坐下"
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:54
 msgid "Screenshot"
 msgstr "螢幕快照"
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:55
 msgid "Enable/Disable Trading"
 msgstr "啟用/停用交易"
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:56
 msgid "Find Path to Mouse"
 msgstr "尋找至滑鼠的路徑"
 
-#: src/keyboardconfig.cpp:58 src/keyboardconfig.cpp:59
-#: src/keyboardconfig.cpp:60 src/keyboardconfig.cpp:61
-#: src/keyboardconfig.cpp:62 src/keyboardconfig.cpp:63
-#: src/keyboardconfig.cpp:64 src/keyboardconfig.cpp:65
-#: src/keyboardconfig.cpp:66 src/keyboardconfig.cpp:67
-#: src/keyboardconfig.cpp:68 src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:57 src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60
+#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62
+#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64
+#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68
 #, c-format
 msgid "Item Shortcut %d"
 msgstr "物品捷徑鍵 %d"
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:69
 msgid "Help Window"
 msgstr "說明視窗"
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:70
 msgid "Status Window"
 msgstr "狀態視窗"
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:71
 msgid "Inventory Window"
 msgstr "物品欄視窗"
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:72
 msgid "Equipment Window"
 msgstr "物品視窗"
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:73
 msgid "Skill Window"
 msgstr "技能視窗"
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:74
 msgid "Minimap Window"
 msgstr "迷你地圖視窗"
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:75
 msgid "Chat Window"
 msgstr "聊天視窗"
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:76
 msgid "Item Shortcut Window"
 msgstr "物品捷徑鍵視窗"
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:77
 msgid "Setup Window"
 msgstr "設定視窗"
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:78
 msgid "Debug Window"
 msgstr "程式除錯視窗"
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:79
 #, fuzzy
 msgid "Social Window"
 msgstr "技能視窗"
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:80
 msgid "Emote Shortcut Window"
 msgstr "表情捷徑鍵視窗"
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:81
 #, fuzzy
 msgid "Outfits Window"
 msgstr "狀態視窗"
 
-#: src/keyboardconfig.cpp:83
+#: src/keyboardconfig.cpp:82
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:83
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86
-#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88
-#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90
-#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92
-#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:84 src/keyboardconfig.cpp:85
+#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:87
+#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:89
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:91
+#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:93
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:95
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "表情捷徑鍵 %d"
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:96
 msgid "Toggle Chat"
 msgstr "切換聊天"
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:97
 msgid "Scroll Chat Up"
 msgstr "將聊天向上捲動"
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:98
 msgid "Scroll Chat Down"
 msgstr "將聊天向下捲動"
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:99
 msgid "Previous Chat Tab"
 msgstr "前一個聊天分頁"
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:100
 msgid "Next Chat Tab"
 msgstr "下一個聊天分頁"
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:101
 msgid "Select OK"
 msgstr "選擇確定"
 
-#: src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:103
 msgid "Ignore input 1"
 msgstr "忽略輸入 1"
 
-#: src/keyboardconfig.cpp:105
+#: src/keyboardconfig.cpp:104
 msgid "Ignore input 2"
 msgstr "忽略輸入 2"
 
-#: src/keyboardconfig.cpp:178
+#: src/keyboardconfig.cpp:183
 #, fuzzy, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr "解決按鍵衝突，否則遊戲中可能遇到奇怪行為。"
 
-#: src/localplayer.cpp:913
+#: src/localplayer.cpp:985
 msgid "Unable to pick up item."
 msgstr "不能拾取物品."
 
 #. TRANSLATORS: This sentence may be translated differently
 #. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:922
+#: src/localplayer.cpp:994
 #, fuzzy, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "你拾取了 %s [@@%d|%s@@]."
 msgstr[1] "你拾取了 %s [@@%d|%s@@]."
 
-#: src/main.cpp:43
+#: src/main.cpp:42
 msgid "mana [options] [mana-file]"
 msgstr ""
 
+#: src/main.cpp:43
+msgid "[mana-file] : The mana file is an XML file (.mana)"
+msgstr ""
+
 #: src/main.cpp:44
+msgid "              used to set custom parameters"
+msgstr ""
+
+#: src/main.cpp:45
+msgid "              to the mana client."
+msgstr ""
+
+#: src/main.cpp:47
 msgid "Options:"
 msgstr "選項:"
 
-#: src/main.cpp:45
+#: src/main.cpp:48
 #, fuzzy
 msgid "  -v --version        : Display the version"
 msgstr "  -v --version : 顯示遊戲版本"
 
-#: src/main.cpp:46
+#: src/main.cpp:49
 #, fuzzy
 msgid "  -h --help           : Display this help"
 msgstr "  -h --help : 顯示求助說明"
 
-#: src/main.cpp:47
+#: src/main.cpp:50
 #, fuzzy
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr "  -C --config-file : 使用此設定檔"
 
-#: src/main.cpp:48
+#: src/main.cpp:51
 #, fuzzy
 msgid "  -U --username       : Login with this username"
 msgstr "  -U -username : 使用此帳號登入"
 
-#: src/main.cpp:49
+#: src/main.cpp:52
 #, fuzzy
 msgid "  -P --password       : Login with this password"
 msgstr "  -P --password : 用此密碼登入"
 
-#: src/main.cpp:50
+#: src/main.cpp:53
 #, fuzzy
 msgid "  -c --character      : Login with this character"
 msgstr "  -c --character : 用此帳號登入"
 
-#: src/main.cpp:51
+#: src/main.cpp:54
 #, fuzzy
 msgid "  -s --server         : Login server name or IP"
 msgstr "  -s --server : 登錄伺服器埠名稱或IP位址"
 
-#: src/main.cpp:52
+#: src/main.cpp:55
 #, fuzzy
 msgid "  -p --port           : Login server port"
 msgstr "  -p --port : 登錄伺服器埠"
 
-#: src/main.cpp:53
+#: src/main.cpp:56
 #, fuzzy
 msgid "     --update-host    : Use this update host"
 msgstr "  -H --update-host : 使用此更新伺服器"
 
-#: src/main.cpp:54
+#: src/main.cpp:57
 #, fuzzy
 msgid "  -D --default        : Choose default character server and character"
 msgstr "  -D --default : 選擇預設的角色伺服器及角色"
 
-#: src/main.cpp:56
+#: src/main.cpp:59
 #, fuzzy
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr "  -u --skip-update : 不使用更新"
 
-#: src/main.cpp:57
+#: src/main.cpp:60
 #, fuzzy
 msgid "  -d --data           : Directory to load game data from"
 msgstr "  -d -data : 指定遊戲資料所在的目錄"
 
-#: src/main.cpp:58
+#: src/main.cpp:61
 #, fuzzy
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
+msgid "     --localdata-dir  : Directory to use as local data directory"
 msgstr "  -S --home-dir : 設定此目錄為家目錄"
 
-#: src/main.cpp:59
+#: src/main.cpp:62
+#, fuzzy
+msgid "     --chat-log-dir   : Chat log dir to use"
+msgstr "  -C --config-file : 使用此設定檔"
+
+#: src/main.cpp:63
 #, fuzzy
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr "  -S --home-dir : 設定此目錄為家目錄"
 
-#: src/main.cpp:61
+#: src/main.cpp:65
 #, fuzzy
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr "  -O --no-opengl : 不使用OpenGL"
 
-#: src/net/ea/adminhandler.cpp:63
+#: src/net/manaserv/beinghandler.cpp:303 src/net/tmwa/playerhandler.cpp:94
+msgid "You are dead."
+msgstr "您已經死亡。"
+
+#: src/net/manaserv/beinghandler.cpp:304 src/net/tmwa/playerhandler.cpp:95
+msgid "We regret to inform you that your character was killed in battle."
+msgstr "我們很遺憾的通知您，您的角色已經在戰鬥中被殺了。"
+
+#: src/net/manaserv/beinghandler.cpp:306 src/net/tmwa/playerhandler.cpp:97
+msgid "You are not that alive anymore."
+msgstr "您不再是那麼有活力。"
+
+#: src/net/manaserv/beinghandler.cpp:307 src/net/tmwa/playerhandler.cpp:98
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr "殘酷的死神用冰冷的手正在抽出你的靈魂。"
+
+#: src/net/manaserv/beinghandler.cpp:308 src/net/tmwa/playerhandler.cpp:99
+msgid "Game Over!"
+msgstr "遊戲結束！"
+
+#: src/net/manaserv/beinghandler.cpp:309 src/net/tmwa/playerhandler.cpp:101
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr "不，孩子。您的角色並沒有真的死掉。他...呃...去了更好的地方。"
+
+#: src/net/manaserv/beinghandler.cpp:311 src/net/tmwa/playerhandler.cpp:103
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr "您想讓敵人的武器插入您的喉嚨好折斷它的計畫失敗了。"
+
+#: src/net/manaserv/beinghandler.cpp:313 src/net/tmwa/playerhandler.cpp:105
+msgid "I guess this did not run too well."
+msgstr "我猜這並沒有跑得很好"
+
+#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:107
+msgid "Do you want your possessions identified?"
+msgstr "您想要鑑定你的財產嗎？"
+
+#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:109
+msgid "Sadly, no trace of you was ever found..."
+msgstr "很悲傷的，沒有人發現你的蹤跡..."
+
+#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:111
+msgid "Annihilated."
+msgstr "灰飛煙滅了。"
+
+#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:113
+msgid "Looks like you got your head handed to you."
+msgstr "看起來你把你的頭拿在手上。"
+
+#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:115
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr "你又被幹掉啦!!!躺在地上一次又一次!!"
+
+#: src/net/manaserv/beinghandler.cpp:323
+#, fuzzy
+msgid "Press OK to respawn."
+msgstr " 請按確認啟動"
+
+#: src/net/manaserv/beinghandler.cpp:324
+#, fuzzy
+msgid "You Died"
+msgstr "您已經死亡"
+
+#: src/net/manaserv/charhandler.cpp:138 src/net/manaserv/charhandler.cpp:209
+#, fuzzy
+msgid "Not logged in."
+msgstr "已經登入"
+
+#: src/net/manaserv/charhandler.cpp:141
+msgid "No empty slot."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:144
+msgid "Invalid name."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:147
+#, fuzzy
+msgid "Character's name already exists."
+msgstr "名字已經有人使用"
+
+#: src/net/manaserv/charhandler.cpp:150
+msgid "Invalid hairstyle."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:153
+msgid "Invalid hair color."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:156
+msgid "Invalid gender."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:159
+#, fuzzy
+msgid "Character's stats are too high."
+msgstr "角色狀態確定"
+
+#: src/net/manaserv/charhandler.cpp:162
+#, fuzzy
+msgid "Character's stats are too low."
+msgstr "角色狀態確定"
+
+#: src/net/manaserv/charhandler.cpp:165
+#, c-format
+msgid "At least one statis out of the permitted range: (%u - %u)."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:171 src/net/manaserv/loginhandler.cpp:96
+#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
+#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
+#: src/net/tmwa/loginhandler.cpp:95 src/net/tmwa/loginhandler.cpp:182
+#, fuzzy
+msgid "Unknown error."
+msgstr "不明的錯誤"
+
+#: src/net/manaserv/charhandler.cpp:200 src/net/tmwa/charserverhandler.cpp:146
+msgid "Info"
+msgstr "資訊"
+
+#: src/net/manaserv/charhandler.cpp:200
+#, fuzzy
+msgid "Player deleted."
+msgstr "玩家已刪除"
+
+#: src/net/manaserv/charhandler.cpp:212
+#, fuzzy
+msgid "Selection out of range."
+msgstr "請選擇交易的物品數量"
+
+#: src/net/manaserv/charhandler.cpp:215
+#, fuzzy, c-format
+msgid "Unknown error (%d)."
+msgstr "不明的錯誤"
+
+#: src/net/manaserv/charhandler.cpp:250
+msgid "No gameservers are available."
+msgstr "沒有可用的遊戲伺服器。"
+
+#: src/net/manaserv/chathandler.cpp:187 src/net/manaserv/chathandler.cpp:313
+#: src/net/manaserv/guildhandler.cpp:260
+#, c-format
+msgid "Topic: %s"
+msgstr "主題: %s"
+
+#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:274
+#, fuzzy
+msgid "Players in this channel:"
+msgstr "玩家攻擊怪物"
+
+#: src/net/manaserv/chathandler.cpp:208
+#, fuzzy
+msgid "Error joining channel."
+msgstr "指令: /join <頻道名稱>"
+
+#: src/net/manaserv/chathandler.cpp:214
+#, fuzzy
+msgid "Listing channels."
+msgstr "要求參加頻道 %s"
+
+#: src/net/manaserv/chathandler.cpp:226
+msgid "End of channel list."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:303
+#, fuzzy, c-format
+msgid "%s entered the channel."
+msgstr "%s 參加了這個派對."
+
+#: src/net/manaserv/chathandler.cpp:308
+#, c-format
+msgid "%s left the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:324
+#, c-format
+msgid "%s has set mode %s on user %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:334
+#, c-format
+msgid "%s has kicked %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:339
+#, fuzzy
+msgid "Unknown channel event."
+msgstr "不明指令"
+
+#: src/net/manaserv/guildhandler.cpp:82
+msgid "Guild created."
+msgstr "公會已成立."
+
+#: src/net/manaserv/guildhandler.cpp:87
+msgid "Error creating guild."
+msgstr "創建公會時發生錯誤."
+
+#: src/net/manaserv/guildhandler.cpp:97
+msgid "Invite sent."
+msgstr "發出邀請."
+
+#: src/net/manaserv/guildhandler.cpp:204
+msgid "Member was promoted successfully."
+msgstr "成功提升會員."
+
+#: src/net/manaserv/guildhandler.cpp:209
+msgid "Failed to promote member."
+msgstr "無法提升會員."
+
+#: src/net/manaserv/loginhandler.cpp:87
+#, fuzzy
+msgid "Wrong magic_token."
+msgstr "錯誤的魔法代號"
+
+#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
+#, fuzzy
+msgid "Already logged in."
+msgstr "已經登入"
+
+#: src/net/manaserv/loginhandler.cpp:93
+#, fuzzy
+msgid "Account banned."
+msgstr "帳號已過期"
+
+#: src/net/manaserv/loginhandler.cpp:118
+#, fuzzy
+msgid "New password incorrect."
+msgstr "新密碼不正確"
+
+#: src/net/manaserv/loginhandler.cpp:121 src/net/tmwa/loginhandler.cpp:89
+#, fuzzy
+msgid "Old password incorrect."
+msgstr "舊密碼輸入錯誤"
+
+#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
+msgid "Account not connected. Please login first."
+msgstr "帳號還沒連線,請先登入"
+
+#: src/net/manaserv/loginhandler.cpp:149
+#, fuzzy
+msgid "New email address incorrect."
+msgstr "新的郵件位址不正確"
+
+#: src/net/manaserv/loginhandler.cpp:152
+#, fuzzy
+msgid "Old email address incorrect."
+msgstr "舊得郵件位址不正確"
+
+#: src/net/manaserv/loginhandler.cpp:158
+#, fuzzy
+msgid "The new email address already exists."
+msgstr "電子郵件已經被註冊"
+
+#: src/net/manaserv/loginhandler.cpp:239
+msgid ""
+"Client registration is not allowed. Please contact server administration."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
+#, fuzzy
+msgid "Client version is too old."
+msgstr "遊戲版本太老舊!!"
+
+#: src/net/manaserv/loginhandler.cpp:266
+#, fuzzy
+msgid "Wrong username or password."
+msgstr "錯誤的帳號或密碼"
+
+#: src/net/manaserv/loginhandler.cpp:272
+#, fuzzy
+msgid "Account banned"
+msgstr "帳號已過期"
+
+#: src/net/manaserv/loginhandler.cpp:275
+msgid "Login attempt too soon after previous attempt."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:303
+#, fuzzy
+msgid "Wrong username, password or email address."
+msgstr "錯誤的帳號或密碼及電子郵件"
+
+#: src/net/manaserv/loginhandler.cpp:306
+#, fuzzy
+msgid "Username already exists."
+msgstr "名字已經有人使用"
+
+#: src/net/manaserv/loginhandler.cpp:309
+#, fuzzy
+msgid "Email address already exists."
+msgstr "電子郵件已經存在"
+
+#: src/net/manaserv/loginhandler.cpp:312
+msgid "You took too long with the captcha or your response was incorrect."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:87
+msgid "Joined party."
+msgstr "參加派對."
+
+#: src/net/manaserv/partyhandler.cpp:105
+#, c-format
+msgid "%s joined the party."
+msgstr "%s 參加了這個派對."
+
+#: src/net/manaserv/partyhandler.cpp:123
+#, fuzzy, c-format
+msgid "%s rejected your invite."
+msgstr "%s 拒絕您的邀請。"
+
+#: src/net/manaserv/tradehandler.cpp:95
+msgid "Accepting incoming trade requests."
+msgstr "接受傳入的交易要求."
+
+#: src/net/manaserv/tradehandler.cpp:97
+msgid "Ignoring incoming trade requests."
+msgstr "拒絕傳入的交易要求."
+
+#: src/net/manaserv/tradehandler.cpp:115 src/net/tmwa/tradehandler.cpp:109
+msgid "Request for Trade"
+msgstr "要求交易"
+
+#: src/net/manaserv/tradehandler.cpp:116 src/net/tmwa/tradehandler.cpp:110
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
+msgstr "%s 請求交易, 是否接受?"
+
+#: src/net/manaserv/tradehandler.cpp:134
+#, c-format
+msgid "Trading with %s"
+msgstr "與 %s 交易."
+
+#: src/net/manaserv/tradehandler.cpp:148 src/net/tmwa/tradehandler.cpp:224
+msgid "Trade canceled."
+msgstr "交易已取消。"
+
+#: src/net/manaserv/tradehandler.cpp:155 src/net/tmwa/tradehandler.cpp:231
+msgid "Trade completed."
+msgstr "交易已完成。"
+
+#: src/net/tmwa/adminhandler.cpp:64
 msgid "Kick failed!"
 msgstr "踢人失敗！"
 
-#: src/net/ea/adminhandler.cpp:65
+#: src/net/tmwa/adminhandler.cpp:66
 msgid "Kick succeeded!"
 msgstr "踢人成功！"
 
-#: src/net/ea/buysellhandler.cpp:110
+#: src/net/tmwa/buysellhandler.cpp:109
 msgid "Nothing to sell."
 msgstr "沒有任何物品可出售."
 
-#: src/net/ea/buysellhandler.cpp:117
+#: src/net/tmwa/buysellhandler.cpp:116
 msgid "Thanks for buying."
 msgstr "謝謝光臨."
 
-#: src/net/ea/buysellhandler.cpp:124
+#: src/net/tmwa/buysellhandler.cpp:123
 msgid "Unable to buy."
 msgstr "不能購買."
 
-#: src/net/ea/buysellhandler.cpp:130
+#: src/net/tmwa/buysellhandler.cpp:129
 msgid "Thanks for selling."
 msgstr "謝謝你的出售."
 
-#: src/net/ea/buysellhandler.cpp:132
+#: src/net/tmwa/buysellhandler.cpp:131
 msgid "Unable to sell."
 msgstr "不能出售."
 
-#: src/net/ea/charserverhandler.cpp:103
-#, fuzzy
-msgid "Access denied."
-msgstr "存取被拒"
+#: src/net/tmwa/charserverhandler.cpp:103
+msgid "Access denied. Most likely, there are too many players on this server."
+msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:106
+#: src/net/tmwa/charserverhandler.cpp:107
 #, fuzzy
 msgid "Cannot use this ID."
 msgstr "不能使用這個 ID"
 
-#: src/net/ea/charserverhandler.cpp:109
+#: src/net/tmwa/charserverhandler.cpp:110
 #, fuzzy
-msgid "Unknown failure to select character."
-msgstr "選擇角色發生不明的失敗"
+msgid "Unknown char-server failure."
+msgstr "不明的錯誤"
 
-#: src/net/ea/charserverhandler.cpp:135
+#: src/net/tmwa/charserverhandler.cpp:134
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr "建立角色失敗。最有可能的情形是該名稱已經被使用了。"
 
-#: src/net/ea/charserverhandler.cpp:147 src/net/manaserv/charhandler.cpp:187
-msgid "Info"
-msgstr "資訊"
-
-#: src/net/ea/charserverhandler.cpp:147
+#: src/net/tmwa/charserverhandler.cpp:146
 msgid "Character deleted."
 msgstr "角色被刪除."
 
-#: src/net/ea/charserverhandler.cpp:152
+#: src/net/tmwa/charserverhandler.cpp:151
 msgid "Failed to delete character."
 msgstr "刪除角色失敗。"
 
-#: src/net/ea/charserverhandler.cpp:237 src/net/manaserv/charhandler.cpp:263
+#: src/net/tmwa/charserverhandler.cpp:266
 msgid "Strength:"
 msgstr "力量:"
 
-#: src/net/ea/charserverhandler.cpp:238 src/net/manaserv/charhandler.cpp:264
+#: src/net/tmwa/charserverhandler.cpp:267
 msgid "Agility:"
 msgstr "敏捷:"
 
-#: src/net/ea/charserverhandler.cpp:239 src/net/manaserv/charhandler.cpp:266
+#: src/net/tmwa/charserverhandler.cpp:268
 msgid "Vitality:"
 msgstr "體力:"
 
-#: src/net/ea/charserverhandler.cpp:240 src/net/manaserv/charhandler.cpp:267
+#: src/net/tmwa/charserverhandler.cpp:269
 msgid "Intelligence:"
 msgstr "智力:"
 
-#: src/net/ea/charserverhandler.cpp:241 src/net/manaserv/charhandler.cpp:265
+#: src/net/tmwa/charserverhandler.cpp:270
 msgid "Dexterity:"
 msgstr "閃躲:"
 
-#: src/net/ea/charserverhandler.cpp:242
+#: src/net/tmwa/charserverhandler.cpp:271
 msgid "Luck:"
 msgstr "幸運:"
 
-#: src/net/ea/chathandler.cpp:80
-msgid "Whisper could not be sent, user is offline."
+#: src/net/tmwa/chathandler.cpp:87
+#, fuzzy, c-format
+msgid "Whisper could not be sent, %s is offline."
 msgstr "該玩家已離線,無法送出密語."
 
-#: src/net/ea/chathandler.cpp:84
-msgid "Whisper could not be sent, ignored by user."
+#: src/net/tmwa/chathandler.cpp:96
+#, fuzzy, c-format
+msgid "Whisper could not be sent, ignored by %s."
 msgstr "該玩家拒絕你的密語"
 
-#: src/net/ea/chathandler.cpp:171
+#: src/net/tmwa/chathandler.cpp:230
 #, fuzzy
 msgid "MVP player."
 msgstr "玩家"
 
-#: src/net/ea/chathandler.cpp:204 src/net/ea/chathandler.cpp:210
-#: src/net/ea/chathandler.cpp:215 src/net/ea/chathandler.cpp:220
-#: src/net/ea/chathandler.cpp:225 src/net/ea/chathandler.cpp:230
-#: src/net/ea/chathandler.cpp:235 src/net/ea/chathandler.cpp:240
+#: src/net/tmwa/chathandler.cpp:265 src/net/tmwa/chathandler.cpp:271
+#: src/net/tmwa/chathandler.cpp:276 src/net/tmwa/chathandler.cpp:281
+#: src/net/tmwa/chathandler.cpp:286 src/net/tmwa/chathandler.cpp:291
+#: src/net/tmwa/chathandler.cpp:296 src/net/tmwa/chathandler.cpp:301
 msgid "Channels are not supported!"
 msgstr "頻道不支援！"
 
-#: src/net/ea/gamehandler.cpp:86
+#: src/net/tmwa/gamehandler.cpp:88
 #, c-format
 msgid "Online users: %d"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:100
+#: src/net/tmwa/gamehandler.cpp:101
 #, fuzzy
 msgid "Game"
 msgstr "名字"
 
-#: src/net/ea/gamehandler.cpp:100
+#: src/net/tmwa/gamehandler.cpp:101
 #, fuzzy
 msgid "Request to quit denied!"
 msgstr "要求交易"
 
-#: src/net/ea/generalhandler.cpp:102 src/net/manaserv/generalhandler.cpp:95
+#: src/net/tmwa/generalhandler.cpp:102
 #, c-format
 msgid "Strength %+d"
 msgstr "力量 %+d"
 
-#: src/net/ea/generalhandler.cpp:103 src/net/manaserv/generalhandler.cpp:96
+#: src/net/tmwa/generalhandler.cpp:103
 #, c-format
 msgid "Agility %+d"
 msgstr "敏捷 %+d"
 
-#: src/net/ea/generalhandler.cpp:104 src/net/manaserv/generalhandler.cpp:98
+#: src/net/tmwa/generalhandler.cpp:104
 #, c-format
 msgid "Vitality %+d"
 msgstr "體力 %+d"
 
-#: src/net/ea/generalhandler.cpp:105 src/net/manaserv/generalhandler.cpp:99
+#: src/net/tmwa/generalhandler.cpp:105
 #, c-format
 msgid "Intelligence %+d"
 msgstr "智力 %+d"
 
-#: src/net/ea/generalhandler.cpp:106 src/net/manaserv/generalhandler.cpp:97
+#: src/net/tmwa/generalhandler.cpp:106
 #, c-format
 msgid "Dexterity %+d"
 msgstr "閃躲 %+d"
 
-#: src/net/ea/generalhandler.cpp:107
+#: src/net/tmwa/generalhandler.cpp:107
 #, c-format
 msgid "Luck %+d"
 msgstr "幸運  %+d"
 
-#: src/net/ea/generalhandler.cpp:130
+#: src/net/tmwa/generalhandler.cpp:132
 #, fuzzy
 msgid "Authentication failed."
 msgstr "驗證失敗"
 
-#: src/net/ea/generalhandler.cpp:133
+#: src/net/tmwa/generalhandler.cpp:135
 #, fuzzy
 msgid "No servers available."
 msgstr "沒有可用的伺服器"
 
-#: src/net/ea/generalhandler.cpp:137
+#: src/net/tmwa/generalhandler.cpp:139
 #, fuzzy
 msgid "Someone else is trying to use this account."
 msgstr "此帳號正在使用中"
 
-#: src/net/ea/generalhandler.cpp:140
+#: src/net/tmwa/generalhandler.cpp:142
 #, fuzzy
 msgid "This account is already logged in."
 msgstr "這個帳號已經登入"
 
-#: src/net/ea/generalhandler.cpp:143
+#: src/net/tmwa/generalhandler.cpp:145
 #, fuzzy
 msgid "Speed hack detected."
 msgstr "使用加速器"
 
-#: src/net/ea/generalhandler.cpp:146
+#: src/net/tmwa/generalhandler.cpp:148
 #, fuzzy
 msgid "Duplicated login."
 msgstr "重複登入"
 
-#: src/net/ea/generalhandler.cpp:149
+#: src/net/tmwa/generalhandler.cpp:151
 #, fuzzy
 msgid "Unknown connection error."
 msgstr "不明的連線錯誤"
 
-#: src/net/ea/generalhandler.cpp:205
+#: src/net/tmwa/generalhandler.cpp:209
 msgid "Got disconnected from server!"
 msgstr "和伺服器失去連線"
 
-#: src/net/ea/generalhandler.cpp:216 src/net/manaserv/generalhandler.cpp:166
+#: src/net/tmwa/generalhandler.cpp:230
 msgid "Strength"
 msgstr "力量"
 
-#: src/net/ea/generalhandler.cpp:217 src/net/manaserv/generalhandler.cpp:167
+#: src/net/tmwa/generalhandler.cpp:231
 msgid "Agility"
 msgstr "敏捷"
 
-#: src/net/ea/generalhandler.cpp:218 src/net/manaserv/generalhandler.cpp:169
+#: src/net/tmwa/generalhandler.cpp:232
 msgid "Vitality"
 msgstr "體力"
 
-#: src/net/ea/generalhandler.cpp:219 src/net/manaserv/generalhandler.cpp:170
+#: src/net/tmwa/generalhandler.cpp:233
 msgid "Intelligence"
 msgstr "智力"
 
-#: src/net/ea/generalhandler.cpp:220 src/net/manaserv/generalhandler.cpp:168
+#: src/net/tmwa/generalhandler.cpp:234
 msgid "Dexterity"
 msgstr "閃躲"
 
-#: src/net/ea/generalhandler.cpp:221
+#: src/net/tmwa/generalhandler.cpp:235
 msgid "Luck"
 msgstr "幸運"
 
-#: src/net/ea/generalhandler.cpp:224
+#: src/net/tmwa/generalhandler.cpp:238
 #, fuzzy
 msgid "Defense"
 msgstr "防禦："
 
-#: src/net/ea/generalhandler.cpp:225
+#: src/net/tmwa/generalhandler.cpp:239
 #, fuzzy
 msgid "M.Attack"
 msgstr "摩攻："
 
-#: src/net/ea/generalhandler.cpp:226
+#: src/net/tmwa/generalhandler.cpp:240
 #, fuzzy
 msgid "M.Defense"
 msgstr "魔防："
 
-#: src/net/ea/generalhandler.cpp:227
+#: src/net/tmwa/generalhandler.cpp:241
 #, fuzzy, c-format
 msgid "% Accuracy"
 msgstr "% Ac準確度："
 
-#: src/net/ea/generalhandler.cpp:228
+#: src/net/tmwa/generalhandler.cpp:242
 #, fuzzy, c-format
 msgid "% Evade"
 msgstr "% E迴避率："
 
-#: src/net/ea/generalhandler.cpp:229
+#: src/net/tmwa/generalhandler.cpp:243
 #, fuzzy, c-format
 msgid "% Critical"
 msgstr "致命一擊"
 
-#: src/net/ea/gui/guildtab.cpp:61 src/net/ea/gui/partytab.cpp:59
+#: src/net/tmwa/gui/guildtab.cpp:45
+msgid "Guild"
+msgstr "公會"
+
+#: src/net/tmwa/gui/guildtab.cpp:61 src/net/tmwa/gui/partytab.cpp:59
 msgid "/help > Display this help."
 msgstr "/help > 顯示這個說明文件。"
 
-#: src/net/ea/gui/guildtab.cpp:62
+#: src/net/tmwa/gui/guildtab.cpp:62
 #, fuzzy
 msgid "/invite > Invite a player to your guild"
 msgstr "/invite > 邀請玩家加入您的隊伍"
 
-#: src/net/ea/gui/guildtab.cpp:63
+#: src/net/tmwa/gui/guildtab.cpp:63
 #, fuzzy
 msgid "/leave > Leave the guild you are in"
 msgstr "/leave > 離開您加入的隊伍"
 
-#: src/net/ea/gui/guildtab.cpp:64
+#: src/net/tmwa/gui/guildtab.cpp:64
 #, fuzzy
 msgid "/kick > Kick some one from the guild you are in"
 msgstr "/kick > 從您加入的隊伍中把某人踢出"
 
-#: src/net/ea/gui/guildtab.cpp:73 src/net/ea/gui/partytab.cpp:73
+#: src/net/tmwa/gui/guildtab.cpp:73 src/net/tmwa/gui/partytab.cpp:73
 msgid "Command: /invite <nick>"
 msgstr "/invite <暱稱>"
 
-#: src/net/ea/gui/guildtab.cpp:74
+#: src/net/tmwa/gui/guildtab.cpp:74
 #, fuzzy
 msgid "This command invites <nick> to the guild you're in."
 msgstr "這個指令會邀請 <nick> 跟您組隊。"
 
-#: src/net/ea/gui/guildtab.cpp:80 src/net/ea/gui/partytab.cpp:80
+#: src/net/tmwa/gui/guildtab.cpp:80 src/net/tmwa/gui/partytab.cpp:80
 msgid "Command: /leave"
 msgstr "指令： /leave"
 
-#: src/net/ea/gui/guildtab.cpp:81
+#: src/net/tmwa/gui/guildtab.cpp:81
 #, fuzzy
 msgid "This command causes the player to leave the guild."
 msgstr "這個指令會使玩家離開隊伍。"
 
-#: src/net/ea/gui/guildtab.cpp:89
+#: src/net/tmwa/gui/guildtab.cpp:89
 #, fuzzy
 msgid "Guild name is missing."
 msgstr "漏掉隊伍名稱。"
 
-#: src/net/ea/guildhandler.cpp:293
+#: src/net/tmwa/guildhandler.cpp:296
 msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:298
+#: src/net/tmwa/guildhandler.cpp:301
 msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:303
+#: src/net/tmwa/guildhandler.cpp:306
 #, fuzzy
 msgid "User is now part of your guild."
 msgstr "%s 現在已經是您隊伍的成員。"
 
-#: src/net/ea/guildhandler.cpp:308
+#: src/net/tmwa/guildhandler.cpp:311
 msgid "Your guild is full."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:313
+#: src/net/tmwa/guildhandler.cpp:316
 #, fuzzy
 msgid "Unknown guild invite response."
 msgstr "給 %s 的不明邀請回應。"
 
-#: src/net/ea/guildhandler.cpp:390
+#: src/net/tmwa/guildhandler.cpp:393
 msgid "Guild creation isn't supported yet."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:60
+#: src/net/tmwa/gui/partytab.cpp:43
+msgid "Party"
+msgstr "隊伍"
+
+#: src/net/tmwa/gui/partytab.cpp:60
 msgid "/invite > Invite a player to your party"
 msgstr "/invite > 邀請玩家加入您的隊伍"
 
-#: src/net/ea/gui/partytab.cpp:61
+#: src/net/tmwa/gui/partytab.cpp:61
 msgid "/leave > Leave the party you are in"
 msgstr "/leave > 離開您加入的隊伍"
 
-#: src/net/ea/gui/partytab.cpp:62
+#: src/net/tmwa/gui/partytab.cpp:62
 msgid "/kick > Kick some one from the party you are in"
 msgstr "/kick > 從您加入的隊伍中把某人踢出"
 
-#: src/net/ea/gui/partytab.cpp:63
+#: src/net/tmwa/gui/partytab.cpp:63
 msgid "/item > Show/change party item sharing options"
 msgstr "/item > 顯示/改變隊伍道具分享選項"
 
-#: src/net/ea/gui/partytab.cpp:64
+#: src/net/tmwa/gui/partytab.cpp:64
 msgid "/exp > Show/change party experience sharing options"
 msgstr "/exp > 顯示/改變隊伍經驗值分享選項"
 
-#: src/net/ea/gui/partytab.cpp:81
+#: src/net/tmwa/gui/partytab.cpp:81
 msgid "This command causes the player to leave the party."
 msgstr "這個指令會使玩家離開隊伍。"
 
-#: src/net/ea/gui/partytab.cpp:85
+#: src/net/tmwa/gui/partytab.cpp:85
 msgid "Command: /item <policy>"
 msgstr "/item <政策>"
 
-#: src/net/ea/gui/partytab.cpp:86
+#: src/net/tmwa/gui/partytab.cpp:86
 msgid "This command changes the party's item sharing policy."
 msgstr "這個指令會改變隊伍的道具分享政策。"
 
-#: src/net/ea/gui/partytab.cpp:87
+#: src/net/tmwa/gui/partytab.cpp:87
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
 msgstr ""
-"<policy> 可以是 \"1\"、\"yes\"、\"true\" 之一代表啟用道具分享，或是 \"0\"、"
-"\"no\"、\"false\" 來停用道具分享。"
+"<policy> 可以是 \"1\"、\"yes\"、\"true\" 之一代表啟用道具分享，或是 "
+"\"0\"、\"no\"、\"false\" 來停用道具分享。"
 
-#: src/net/ea/gui/partytab.cpp:90
+#: src/net/tmwa/gui/partytab.cpp:90
 msgid "Command: /item"
 msgstr "指令： /item"
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/tmwa/gui/partytab.cpp:91
 msgid "This command displays the party's current item sharing policy."
 msgstr "這個指令會顯示此隊伍目前的道具分享政策。"
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/tmwa/gui/partytab.cpp:95
 msgid "Command: /exp <policy>"
 msgstr "指令： /exp <政策>"
 
-#: src/net/ea/gui/partytab.cpp:96
+#: src/net/tmwa/gui/partytab.cpp:96
 msgid "This command changes the party's experience sharing policy."
 msgstr "這個指令會改變此隊伍的經驗值分享政策。"
 
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/tmwa/gui/partytab.cpp:97
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 msgstr ""
-"<policy> 可以是 \"1\"、\"yes\"、\"true\" 之一代表啟用經驗值分享，或是 \"0\"、"
-"\"no\"、\"false\" 來停用經驗值分享。"
+"<policy> 可以是 \"1\"、\"yes\"、\"true\" 之一代表啟用經驗值分享，或是 "
+"\"0\"、\"no\"、\"false\" 來停用經驗值分享。"
 
-#: src/net/ea/gui/partytab.cpp:100
+#: src/net/tmwa/gui/partytab.cpp:100
 msgid "Command: /exp"
 msgstr "指令： /exp"
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/tmwa/gui/partytab.cpp:101
 msgid "This command displays the party's current experience sharing policy."
 msgstr "這個指令會顯示此隊伍目前的經驗值分享政策。"
 
-#: src/net/ea/gui/partytab.cpp:132 src/net/ea/partyhandler.cpp:198
+#: src/net/tmwa/gui/partytab.cpp:132 src/net/tmwa/partyhandler.cpp:196
 msgid "Item sharing enabled."
 msgstr "物品分享已啟用。"
 
-#: src/net/ea/gui/partytab.cpp:135 src/net/ea/partyhandler.cpp:204
+#: src/net/tmwa/gui/partytab.cpp:135 src/net/tmwa/partyhandler.cpp:202
 msgid "Item sharing disabled."
 msgstr "物品分享已停用。"
 
-#: src/net/ea/gui/partytab.cpp:138 src/net/ea/partyhandler.cpp:210
+#: src/net/tmwa/gui/partytab.cpp:138 src/net/tmwa/partyhandler.cpp:208
 msgid "Item sharing not possible."
 msgstr "物品分享不可能。"
 
-#: src/net/ea/gui/partytab.cpp:141
+#: src/net/tmwa/gui/partytab.cpp:141
 #, fuzzy
 msgid "Item sharing unknown."
 msgstr "物品分享已啟用。"
 
-#: src/net/ea/gui/partytab.cpp:167 src/net/ea/partyhandler.cpp:174
+#: src/net/tmwa/gui/partytab.cpp:167 src/net/tmwa/partyhandler.cpp:172
 msgid "Experience sharing enabled."
 msgstr "經驗值分享已啟用。"
 
-#: src/net/ea/gui/partytab.cpp:170 src/net/ea/partyhandler.cpp:180
+#: src/net/tmwa/gui/partytab.cpp:170 src/net/tmwa/partyhandler.cpp:178
 msgid "Experience sharing disabled."
 msgstr "經驗值分享已停用。"
 
-#: src/net/ea/gui/partytab.cpp:173 src/net/ea/partyhandler.cpp:186
+#: src/net/tmwa/gui/partytab.cpp:173 src/net/tmwa/partyhandler.cpp:184
 msgid "Experience sharing not possible."
 msgstr "經驗值分享不可能。"
 
-#: src/net/ea/gui/partytab.cpp:176
+#: src/net/tmwa/gui/partytab.cpp:176
 #, fuzzy
 msgid "Experience sharing unknown."
 msgstr "經驗值分享已啟用。"
 
-#: src/net/ea/inventoryhandler.cpp:281
+#: src/net/tmwa/inventoryhandler.cpp:285
 msgid "Failed to use item."
 msgstr "不能使用該物品."
 
-#: src/net/ea/inventoryhandler.cpp:391
+#: src/net/tmwa/inventoryhandler.cpp:399
 msgid "Unable to equip."
 msgstr "無法裝備。"
 
-#: src/net/ea/inventoryhandler.cpp:402
+#: src/net/tmwa/inventoryhandler.cpp:410
 msgid "Unable to unequip."
 msgstr "無法卸下裝備。"
 
-#: src/net/ea/loginhandler.cpp:79
+#: src/net/tmwa/loginhandler.cpp:86
 msgid "Account was not found. Please re-login."
 msgstr "找不到該帳號,請重新登入."
 
-#: src/net/ea/loginhandler.cpp:82 src/net/manaserv/loginhandler.cpp:121
-#, fuzzy
-msgid "Old password incorrect."
-msgstr "舊密碼輸入錯誤"
-
-#: src/net/ea/loginhandler.cpp:85
+#: src/net/tmwa/loginhandler.cpp:92
 #, fuzzy
 msgid "New password too short."
 msgstr "新設定的密碼長度太短."
 
-#: src/net/ea/loginhandler.cpp:88 src/net/ea/loginhandler.cpp:175
-#: src/net/manaserv/charhandler.cpp:158 src/net/manaserv/loginhandler.cpp:96
-#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
-#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
-#, fuzzy
-msgid "Unknown error."
-msgstr "不明的錯誤"
-
-#: src/net/ea/loginhandler.cpp:149
+#: src/net/tmwa/loginhandler.cpp:156
 #, fuzzy
 msgid "Unregistered ID."
 msgstr "未註冊的 ID"
 
-#: src/net/ea/loginhandler.cpp:152
+#: src/net/tmwa/loginhandler.cpp:159
 #, fuzzy
 msgid "Wrong password."
 msgstr "錯誤的密碼"
 
-#: src/net/ea/loginhandler.cpp:155
+#: src/net/tmwa/loginhandler.cpp:162
 #, fuzzy
 msgid "Account expired."
 msgstr "帳號已過期"
 
-#: src/net/ea/loginhandler.cpp:158
+#: src/net/tmwa/loginhandler.cpp:165
 #, fuzzy
 msgid "Rejected from server."
 msgstr "被伺服器拒絕"
 
-#: src/net/ea/loginhandler.cpp:161
+#: src/net/tmwa/loginhandler.cpp:168
 #, fuzzy
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr "您已經被這個遊戲永遠列入黑名單。請連絡 GM 團隊。"
 
-#: src/net/ea/loginhandler.cpp:165
+#: src/net/tmwa/loginhandler.cpp:172
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -3084,662 +3280,512 @@ msgstr ""
 "你的帳號已被暫時凍結直至 %s.\n"
 "請通過論壇聯絡GM."
 
-#: src/net/ea/loginhandler.cpp:172
+#: src/net/tmwa/loginhandler.cpp:179
 #, fuzzy
 msgid "This user name is already taken."
 msgstr "這個使用者名稱已經被使用了"
 
-#: src/net/ea/network.cpp:145
+#: src/net/tmwa/network.cpp:145
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/ea/network.cpp:345
+#: src/net/tmwa/network.cpp:345
 #, fuzzy
 msgid "Unable to resolve host \""
 msgstr "不能出售."
 
-#: src/net/ea/network.cpp:414
+#: src/net/tmwa/network.cpp:414
 #, fuzzy
 msgid "Connection to server terminated. "
 msgstr "正在連接到地圖伺服器..."
 
-#: src/net/ea/partyhandler.cpp:81
+#: src/net/tmwa/partyhandler.cpp:82
 msgid "Could not create party."
 msgstr "無法建立隊伍。"
 
-#: src/net/ea/partyhandler.cpp:84
+#: src/net/tmwa/partyhandler.cpp:84
 msgid "Party successfully created."
 msgstr "隊伍已成功的建立。"
 
-#: src/net/ea/partyhandler.cpp:118
+#: src/net/tmwa/partyhandler.cpp:119
 #, c-format
 msgid "%s is already a member of a party."
 msgstr "%s 已經是隊伍的一員。"
 
-#: src/net/ea/partyhandler.cpp:122
+#: src/net/tmwa/partyhandler.cpp:123
 #, c-format
 msgid "%s refused your invitation."
 msgstr "%s 拒絕您的邀請。"
 
-#: src/net/ea/partyhandler.cpp:126
+#: src/net/tmwa/partyhandler.cpp:127
 #, c-format
 msgid "%s is now a member of your party."
 msgstr "%s 現在已經是您隊伍的成員。"
 
-#: src/net/ea/partyhandler.cpp:130
+#: src/net/tmwa/partyhandler.cpp:131
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr "給 %s 的不明邀請回應。"
 
-#: src/net/ea/partyhandler.cpp:238
+#: src/net/tmwa/partyhandler.cpp:236
 msgid "You have left the party."
 msgstr "您已經離開此隊伍。"
 
-#: src/net/ea/partyhandler.cpp:249
+#: src/net/tmwa/partyhandler.cpp:246
 #, c-format
 msgid "%s has left your party."
 msgstr "%s 已經離開您的隊伍。"
 
-#: src/net/ea/partyhandler.cpp:301
+#: src/net/tmwa/partyhandler.cpp:299
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr "不明的成員試著要說：%s"
 
-#: src/net/ea/partyhandler.cpp:329
-msgid "Inviting like this isn't supported at the moment."
-msgstr "此時無法支援邀請"
+#: src/net/tmwa/partyhandler.cpp:335
+#, c-format
+msgid "Inviting failed, because you can't see a player called %s."
+msgstr ""
 
-#: src/net/ea/partyhandler.cpp:334
+#: src/net/tmwa/partyhandler.cpp:340
 msgid "You can only inivte when you are in a party!"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:365
+#: src/net/tmwa/partyhandler.cpp:368
 #, c-format
 msgid "%s is not in your party!"
 msgstr "%s 不在您的隊伍中！"
 
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:304
-msgid "You are dead."
-msgstr "您已經死亡。"
-
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:305
-msgid "We regret to inform you that your character was killed in battle."
-msgstr "我們很遺憾的通知您，您的角色已經在戰鬥中被殺了。"
-
-#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:307
-msgid "You are not that alive anymore."
-msgstr "您不再是那麼有活力。"
-
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:308
-msgid "The cold hands of the grim reaper are grabbing for your soul."
-msgstr "殘酷的死神用冰冷的手正在抽出你的靈魂。"
-
-#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:309
-msgid "Game Over!"
-msgstr "遊戲結束！"
-
-#: src/net/ea/playerhandler.cpp:105
+#: src/net/tmwa/playerhandler.cpp:100
 msgid "Insert coin to continue."
 msgstr "請投入金幣"
 
-#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:310
-msgid ""
-"No, kids. Your character did not really die. It... err... went to a better "
-"place."
-msgstr "不，孩子。您的角色並沒有真的死掉。他...呃...去了更好的地方。"
-
-#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:312
-msgid ""
-"Your plan of breaking your enemies weapon by bashing it with your throat "
-"failed."
-msgstr "您想讓敵人的武器插入您的喉嚨好折斷它的計畫失敗了。"
-
-#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:314
-msgid "I guess this did not run too well."
-msgstr "我猜這並沒有跑得很好"
-
-#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:315
-msgid "Do you want your possessions identified?"
-msgstr "您想要鑑定你的財產嗎？"
-
-#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:316
-msgid "Sadly, no trace of you was ever found..."
-msgstr "很悲傷的，沒有人發現你的蹤跡..."
-
-#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:317
-msgid "Annihilated."
-msgstr "灰飛煙滅了。"
-
-#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:318
-msgid "Looks like you got your head handed to you."
-msgstr "看起來你把你的頭拿在手上。"
-
-#: src/net/ea/playerhandler.cpp:120 src/net/manaserv/beinghandler.cpp:319
-msgid ""
-"You screwed up again, dump your body down the tubes and get you another one."
-msgstr "你又被幹掉啦!!!躺在地上一次又一次!!"
-
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/tmwa/playerhandler.cpp:118
 msgid "You're not dead yet. You're just resting."
 msgstr "您還沒有死。您現在只是在休息。"
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/tmwa/playerhandler.cpp:119
 msgid "You are no more."
 msgstr "你已經沒有更多"
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/tmwa/playerhandler.cpp:120
 msgid "You have ceased to be."
 msgstr "你已不再是."
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/tmwa/playerhandler.cpp:121
 msgid "You've expired and gone to meet your maker."
 msgstr "你已經過期了,請求助管理員"
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/tmwa/playerhandler.cpp:122
 msgid "You're a stiff."
 msgstr "身體僵硬"
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/tmwa/playerhandler.cpp:123
 msgid "Bereft of life, you rest in peace."
 msgstr "失去了生命，您安詳的休息了。"
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/tmwa/playerhandler.cpp:124
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr "如果你沒有這樣做,你就不會上天堂了!!"
 
-#: src/net/ea/playerhandler.cpp:130
+#: src/net/tmwa/playerhandler.cpp:125
 msgid "Your metabolic processes are now history."
 msgstr "你的傳奇已經是過去式了!!"
 
-#: src/net/ea/playerhandler.cpp:131
+#: src/net/tmwa/playerhandler.cpp:126
 msgid "You're off the twig."
 msgstr "你折斷了樹枝"
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/tmwa/playerhandler.cpp:127
 msgid "You've kicked the bucket."
 msgstr "你踢了水桶"
 
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/tmwa/playerhandler.cpp:128
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr "死掉了...."
 
-#: src/net/ea/playerhandler.cpp:135
+#: src/net/tmwa/playerhandler.cpp:130
 msgid "You are an ex-player."
 msgstr "您已是前-玩家。"
 
-#: src/net/ea/playerhandler.cpp:136
+#: src/net/tmwa/playerhandler.cpp:131
 msgid "You're pining for the fjords."
 msgstr "你正走向地獄!!"
 
-#: src/net/ea/playerhandler.cpp:249 src/net/ea/playerhandler.cpp:310
+#: src/net/tmwa/playerhandler.cpp:246 src/net/tmwa/playerhandler.cpp:285
 msgid "Message"
 msgstr "訊息"
 
-#: src/net/ea/playerhandler.cpp:250
+#: src/net/tmwa/playerhandler.cpp:247
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr "您已經攜帶超過負重能力的一半。您將無法恢復生命。"
 
-#: src/net/ea/playerhandler.cpp:333
+#: src/net/tmwa/playerhandler.cpp:313
 #, fuzzy, c-format
 msgid "You picked up %s."
 msgstr "您已經撿起 "
 
-#: src/net/ea/playerhandler.cpp:369
+#: src/net/tmwa/playerhandler.cpp:348
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:532
+#: src/net/tmwa/playerhandler.cpp:488
 msgid "Equip arrows first."
 msgstr "先裝備箭."
 
-#: src/net/ea/specialhandler.cpp:147
+#: src/net/tmwa/specialhandler.cpp:144
 msgid "Trade failed!"
 msgstr "交易失敗！"
 
-#: src/net/ea/specialhandler.cpp:150
+#: src/net/tmwa/specialhandler.cpp:147
 msgid "Emote failed!"
 msgstr "顯示表情失敗！"
 
-#: src/net/ea/specialhandler.cpp:153
+#: src/net/tmwa/specialhandler.cpp:150
 msgid "Sit failed!"
 msgstr "坐下休息失敗！"
 
-#: src/net/ea/specialhandler.cpp:156
+#: src/net/tmwa/specialhandler.cpp:153
 msgid "Chat creating failed!"
 msgstr "聊天新增失敗！"
 
-#: src/net/ea/specialhandler.cpp:159
+#: src/net/tmwa/specialhandler.cpp:156
 msgid "Could not join party!"
 msgstr "不能加入隊伍！"
 
-#: src/net/ea/specialhandler.cpp:162
+#: src/net/tmwa/specialhandler.cpp:159
 msgid "Cannot shout!"
 msgstr "無法大叫！"
 
-#: src/net/ea/specialhandler.cpp:171
+#: src/net/tmwa/specialhandler.cpp:168
 msgid "You have not yet reached a high enough lvl!"
 msgstr "你還沒達到足夠等級！"
 
-#: src/net/ea/specialhandler.cpp:174
+#: src/net/tmwa/specialhandler.cpp:171
 msgid "Insufficient HP!"
 msgstr "HP不夠！"
 
-#: src/net/ea/specialhandler.cpp:177
+#: src/net/tmwa/specialhandler.cpp:174
 msgid "Insufficient SP!"
 msgstr "SP不夠！"
 
-#: src/net/ea/specialhandler.cpp:180
+#: src/net/tmwa/specialhandler.cpp:177
 msgid "You have no memos!"
 msgstr "沒有備忘錄"
 
-#: src/net/ea/specialhandler.cpp:183
+#: src/net/tmwa/specialhandler.cpp:180
 msgid "You cannot do that right now!"
 msgstr "您現在不能那麼做！"
 
-#: src/net/ea/specialhandler.cpp:186
+#: src/net/tmwa/specialhandler.cpp:183
 msgid "Seems you need more money... ;-)"
 msgstr "看來您需要更多錢... ;-)"
 
-#: src/net/ea/specialhandler.cpp:189
+#: src/net/tmwa/specialhandler.cpp:186
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "此武器無法使用此技能！"
 
-#: src/net/ea/specialhandler.cpp:192
+#: src/net/tmwa/specialhandler.cpp:189
 msgid "You need another red gem!"
 msgstr "你需要再一顆紅寶石!"
 
-#: src/net/ea/specialhandler.cpp:195
+#: src/net/tmwa/specialhandler.cpp:192
 msgid "You need another blue gem!"
 msgstr "你需要再一棵藍寶石!"
 
-#: src/net/ea/specialhandler.cpp:198
+#: src/net/tmwa/specialhandler.cpp:195
 msgid "You're carrying to much to do this!"
 msgstr "你已負重太多，不能再多!"
 
-#: src/net/ea/specialhandler.cpp:201
+#: src/net/tmwa/specialhandler.cpp:198
 msgid "Huh? What's that?"
 msgstr "阿?那是甚麼?"
 
-#: src/net/ea/specialhandler.cpp:210
+#: src/net/tmwa/specialhandler.cpp:207
 msgid "Warp failed..."
 msgstr "傳送失敗..."
 
-#: src/net/ea/specialhandler.cpp:213
+#: src/net/tmwa/specialhandler.cpp:210
 msgid "Could not steal anything..."
 msgstr "無法偷取任何物品..."
 
-#: src/net/ea/specialhandler.cpp:216
+#: src/net/tmwa/specialhandler.cpp:213
 msgid "Poison had no effect..."
 msgstr "藥水無效..."
 
-#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:116
-msgid "Request for Trade"
-msgstr "要求交易"
-
-#: src/net/ea/tradehandler.cpp:108 src/net/manaserv/tradehandler.cpp:117
-#, c-format
-msgid "%s wants to trade with you, do you accept?"
-msgstr "%s 請求交易, 是否接受?"
-
-#: src/net/ea/tradehandler.cpp:124
+#: src/net/tmwa/tradehandler.cpp:126
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr "交易無法進行。交易對象太遠了。"
 
-#: src/net/ea/tradehandler.cpp:128
+#: src/net/tmwa/tradehandler.cpp:130
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr "無法進行交易。該角色不存在。"
 
-#: src/net/ea/tradehandler.cpp:132
+#: src/net/tmwa/tradehandler.cpp:134
 msgid "Trade cancelled due to an unknown reason."
 msgstr "由於不明的原因已取消交易。"
 
-#: src/net/ea/tradehandler.cpp:137
+#: src/net/tmwa/tradehandler.cpp:139
 #, c-format
 msgid "Trade: You and %s"
 msgstr "交易: 你和 %s"
 
-#: src/net/ea/tradehandler.cpp:144
+#: src/net/tmwa/tradehandler.cpp:146
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr "取消和 %s 的交易."
 
-#: src/net/ea/tradehandler.cpp:153
+#: src/net/tmwa/tradehandler.cpp:154
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:202
+#: src/net/tmwa/tradehandler.cpp:202
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr "加入物品失敗。交易的伙伴已經超重。"
 
-#: src/net/ea/tradehandler.cpp:207
+#: src/net/tmwa/tradehandler.cpp:207
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr "加入物品失敗。交易對象沒有空的欄位。"
 
-#: src/net/ea/tradehandler.cpp:211
+#: src/net/tmwa/tradehandler.cpp:211
 msgid "Failed adding item for unknown reason."
 msgstr "由於不明的原因加入物品失敗。"
 
-#: src/net/ea/tradehandler.cpp:224 src/net/manaserv/tradehandler.cpp:149
-msgid "Trade canceled."
-msgstr "交易已取消。"
-
-#: src/net/ea/tradehandler.cpp:231 src/net/manaserv/tradehandler.cpp:156
-msgid "Trade completed."
-msgstr "交易已完成。"
-
-#: src/net/manaserv/beinghandler.cpp:324
-#, fuzzy
-msgid "Press OK to respawn."
-msgstr " 請按確認啟動"
-
-#: src/net/manaserv/beinghandler.cpp:325
-#, fuzzy
-msgid "You Died"
-msgstr "您已經死亡"
-
-#: src/net/manaserv/charhandler.cpp:128 src/net/manaserv/charhandler.cpp:196
+#: src/playerrelations.cpp:310
 #, fuzzy
-msgid "Not logged in."
-msgstr "已經登入"
+msgid "Completely ignore"
+msgstr "@@ignore|完全忽視 %s@@"
 
-#: src/net/manaserv/charhandler.cpp:131
-msgid "No empty slot."
+#: src/playerrelations.cpp:324
+msgid "Print '...'"
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:134
-msgid "Invalid name."
+#: src/playerrelations.cpp:340
+msgid "Blink name"
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:137
-#, fuzzy
-msgid "Character's name already exists."
-msgstr "名字已經有人使用"
-
-#: src/net/manaserv/charhandler.cpp:140
-msgid "Invalid hairstyle."
-msgstr ""
+#: src/resources/itemdb.cpp:44
+#, c-format
+msgid "Attack %+d"
+msgstr "攻擊 %+d"
 
-#: src/net/manaserv/charhandler.cpp:143
-msgid "Invalid hair color."
-msgstr ""
+#: src/resources/itemdb.cpp:45
+#, c-format
+msgid "Defense %+d"
+msgstr "防禦 %+d"
 
-#: src/net/manaserv/charhandler.cpp:146
-msgid "Invalid gender."
-msgstr ""
+#: src/resources/itemdb.cpp:46
+#, c-format
+msgid "HP %+d"
+msgstr "體力%+d"
 
-#: src/net/manaserv/charhandler.cpp:149
-#, fuzzy
-msgid "Character's stats are too high."
-msgstr "角色狀態確定"
+#: src/resources/itemdb.cpp:47
+#, c-format
+msgid "MP %+d"
+msgstr "魔力%+d"
 
-#: src/net/manaserv/charhandler.cpp:152
-#, fuzzy
-msgid "Character's stats are too low."
-msgstr "角色狀態確定"
+#: src/resources/itemdb.cpp:92
+msgid "Unknown item"
+msgstr "不明的物品"
 
-#: src/net/manaserv/charhandler.cpp:155
-msgid "One stat is zero."
-msgstr ""
+#: src/resources/itemdb.cpp:135 src/resources/monsterdb.cpp:77
+msgid "unnamed"
+msgstr "未知物品"
 
-#: src/net/manaserv/charhandler.cpp:187
-#, fuzzy
-msgid "Player deleted."
-msgstr "玩家已刪除"
+#~ msgid "Text Shadow"
+#~ msgstr "文字陰影"
 
-#: src/net/manaserv/charhandler.cpp:199
-#, fuzzy
-msgid "Selection out of range."
-msgstr "請選擇交易的物品數量"
+#~ msgid "Text Outline"
+#~ msgstr "文字輪廓"
 
-#: src/net/manaserv/charhandler.cpp:202
-#, fuzzy, c-format
-msgid "Unknown error (%d)."
-msgstr "不明的錯誤"
+#~ msgid "Progress Bar Labels"
+#~ msgstr "進度列標籤"
 
-#: src/net/manaserv/charhandler.cpp:242
-msgid "No gameservers are available."
-msgstr "沒有可用的遊戲伺服器。"
+#~ msgid "Background"
+#~ msgstr "背景"
 
-#: src/net/manaserv/charhandler.cpp:268
-msgid "Willpower:"
-msgstr "意志力:"
+#~ msgid "Highlight"
+#~ msgstr "突顯"
 
-#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
-#: src/net/manaserv/guildhandler.cpp:259
-#, c-format
-msgid "Topic: %s"
-msgstr "主題: %s"
+#~ msgid "Tab Highlight"
+#~ msgstr "分頁突顯"
 
-#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
 #, fuzzy
-msgid "Players in this channel:"
-msgstr "玩家攻擊怪物"
+#~ msgid "Item Too Expensive"
+#~ msgstr "物品太貴"
 
-#: src/net/manaserv/chathandler.cpp:201
 #, fuzzy
-msgid "Error joining channel."
-msgstr "指令: /join <頻道名稱>"
+#~ msgid "Item Is Equipped"
+#~ msgstr "物品已裝備"
 
-#: src/net/manaserv/chathandler.cpp:207
-#, fuzzy
-msgid "Listing channels."
-msgstr "要求參加頻道 %s"
+#~ msgid "GM"
+#~ msgstr "遊戲管理者"
 
-#: src/net/manaserv/chathandler.cpp:219
-msgid "End of channel list."
-msgstr ""
+#~ msgid "Player"
+#~ msgstr "玩家"
 
-#: src/net/manaserv/chathandler.cpp:291
-#, fuzzy, c-format
-msgid "%s entered the channel."
-msgstr "%s 參加了這個派對."
+#~ msgid "Whisper"
+#~ msgstr "悄悄話"
 
-#: src/net/manaserv/chathandler.cpp:296
-#, c-format
-msgid "%s left the channel."
-msgstr ""
+#~ msgid "Is"
+#~ msgstr "是"
 
-#: src/net/manaserv/chathandler.cpp:312
-#, c-format
-msgid "%s has set mode %s on user %s."
-msgstr ""
+#~ msgid "Server"
+#~ msgstr "伺服器"
 
-#: src/net/manaserv/chathandler.cpp:322
-#, c-format
-msgid "%s has kicked %s."
-msgstr ""
+#~ msgid "Logger"
+#~ msgstr "記錄器"
 
-#: src/net/manaserv/chathandler.cpp:327
-#, fuzzy
-msgid "Unknown channel event."
-msgstr "不明指令"
+#~ msgid "Hyperlink"
+#~ msgstr "超連結"
 
-#: src/net/manaserv/generalhandler.cpp:100
-#, c-format
-msgid "Willpower %+d"
-msgstr "意志力 %+d"
+#~ msgid "Being"
+#~ msgstr "物件"
 
-#: src/net/manaserv/generalhandler.cpp:171
-#, fuzzy
-msgid "Willpower"
-msgstr "意志力:"
+#~ msgid "Other Players' Names"
+#~ msgstr "其他使用者名字"
 
-#: src/net/manaserv/guildhandler.cpp:81
-msgid "Guild created."
-msgstr "公會已成立."
+#~ msgid "Own Name"
+#~ msgstr "我的名字"
 
-#: src/net/manaserv/guildhandler.cpp:86
-msgid "Error creating guild."
-msgstr "創建公會時發生錯誤."
+#~ msgid "GM Names"
+#~ msgstr "遊戲管理者名字"
 
-#: src/net/manaserv/guildhandler.cpp:96
-msgid "Invite sent."
-msgstr "發出邀請."
+#~ msgid "NPCs"
+#~ msgstr "電腦"
 
-#: src/net/manaserv/guildhandler.cpp:203
-msgid "Member was promoted successfully."
-msgstr "成功提升會員."
+#~ msgid "Monsters"
+#~ msgstr "怪物"
 
-#: src/net/manaserv/guildhandler.cpp:208
-msgid "Failed to promote member."
-msgstr "無法提升會員."
+#~ msgid "Unknown Item Type"
+#~ msgstr "不明物品類型"
 
-#: src/net/manaserv/loginhandler.cpp:87
-#, fuzzy
-msgid "Wrong magic_token."
-msgstr "錯誤的魔法代號"
+#~ msgid "Generics"
+#~ msgstr "一般"
 
-#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
-#, fuzzy
-msgid "Already logged in."
-msgstr "已經登入"
+#~ msgid "Hats"
+#~ msgstr "帽子"
 
-#: src/net/manaserv/loginhandler.cpp:93 src/net/manaserv/loginhandler.cpp:272
-#, fuzzy
-msgid "Server is full."
-msgstr "伺服器人數已滿"
+#~ msgid "Usables"
+#~ msgstr "可使用的"
+
+#~ msgid "Shirts"
+#~ msgstr "內衣"
 
-#: src/net/manaserv/loginhandler.cpp:118
 #, fuzzy
-msgid "New password incorrect."
-msgstr "新密碼不正確"
+#~ msgid "One Handed Weapons"
+#~ msgstr "單手武器"
 
-#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
-msgid "Account not connected. Please login first."
-msgstr "帳號還沒連線,請先登入"
+#~ msgid "Pants"
+#~ msgstr "褲子"
 
-#: src/net/manaserv/loginhandler.cpp:149
-#, fuzzy
-msgid "New email address incorrect."
-msgstr "新的郵件位址不正確"
+#~ msgid "Shoes"
+#~ msgstr "鞋子"
 
-#: src/net/manaserv/loginhandler.cpp:152
 #, fuzzy
-msgid "Old email address incorrect."
-msgstr "舊得郵件位址不正確"
+#~ msgid "Two Handed Weapons"
+#~ msgstr "單手武器"
 
-#: src/net/manaserv/loginhandler.cpp:158
-#, fuzzy
-msgid "The new email address already exists."
-msgstr "電子郵件已經被註冊"
+#~ msgid "Shields"
+#~ msgstr "盾牌"
 
-#: src/net/manaserv/loginhandler.cpp:239
-msgid ""
-"Client registration is not allowed. Please contact server administration."
-msgstr ""
+#~ msgid "Rings"
+#~ msgstr "戒指"
 
-#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
-#, fuzzy
-msgid "Client version is too old."
-msgstr "遊戲版本太老舊!!"
+#~ msgid "Necklaces"
+#~ msgstr "腕甲"
 
-#: src/net/manaserv/loginhandler.cpp:266
-#, fuzzy
-msgid "Wrong username or password."
-msgstr "錯誤的帳號或密碼"
+#~ msgid "Arms"
+#~ msgstr "武器"
 
-#: src/net/manaserv/loginhandler.cpp:275
-msgid "Login attempt too soon after previous attempt."
-msgstr ""
+#~ msgid "Ammo"
+#~ msgstr "箭"
 
-#: src/net/manaserv/loginhandler.cpp:303
-#, fuzzy
-msgid "Wrong username, password or email address."
-msgstr "錯誤的帳號或密碼及電子郵件"
+#~ msgid "Particle Effects"
+#~ msgstr "粒子效果"
+
+#~ msgid "Pickup Notification"
+#~ msgstr "撿拾通知"
+
+#~ msgid "Exp Notification"
+#~ msgstr "經驗值通知"
 
-#: src/net/manaserv/loginhandler.cpp:306
 #, fuzzy
-msgid "Username already exists."
-msgstr "名字已經有人使用"
+#~ msgid "Player Hits Monster"
+#~ msgstr "玩家攻擊怪物"
 
-#: src/net/manaserv/loginhandler.cpp:309
 #, fuzzy
-msgid "Email address already exists."
-msgstr "電子郵件已經存在"
+#~ msgid "Monster Hits Player"
+#~ msgstr "怪物攻擊玩家"
 
-#: src/net/manaserv/loginhandler.cpp:312
-msgid "You took too long with the captcha or your response was incorrect."
-msgstr ""
+#~ msgid "Critical Hit"
+#~ msgstr "致命一擊"
 
-#: src/net/manaserv/partyhandler.cpp:88
-msgid "Joined party."
-msgstr "參加派對."
+#~ msgid "Misses"
+#~ msgstr "失誤"
 
-#: src/net/manaserv/partyhandler.cpp:106
-#, c-format
-msgid "%s joined the party."
-msgstr "%s 參加了這個派對."
+#~ msgid "HP Bar"
+#~ msgstr "血量"
 
-#: src/net/manaserv/partyhandler.cpp:123
-#, fuzzy, c-format
-msgid "%s rejected your invite."
-msgstr "%s 拒絕您的邀請。"
+#~ msgid "3/4 HP Bar"
+#~ msgstr "3/4 血量"
 
-#: src/net/manaserv/tradehandler.cpp:96
-msgid "Accepting incoming trade requests."
-msgstr "接受傳入的交易要求."
+#~ msgid "1/2 HP Bar"
+#~ msgstr "1/2 血量"
 
-#: src/net/manaserv/tradehandler.cpp:98
-msgid "Ignoring incoming trade requests."
-msgstr "拒絕傳入的交易要求."
+#~ msgid "1/4 HP Bar"
+#~ msgstr "1/4 血量"
 
-#: src/net/manaserv/tradehandler.cpp:135
-#, c-format
-msgid "Trading with %s"
-msgstr "與 %s 交易."
+#, fuzzy
+#~ msgid "HP"
+#~ msgstr "體力 :"
 
-#: src/playerrelations.cpp:304
 #, fuzzy
-msgid "Completely ignore"
-msgstr "@@ignore|完全忽視 %s@@"
+#~ msgid "MP"
+#~ msgstr "魔力:"
 
-#: src/playerrelations.cpp:318
-msgid "Print '...'"
-msgstr ""
+#, fuzzy
+#~ msgid "Exp"
+#~ msgstr "經驗值:"
 
-#: src/playerrelations.cpp:334
-msgid "Blink name"
-msgstr ""
+#, fuzzy
+#~ msgid "Money"
+#~ msgstr "金錢：%d"
 
-#: src/playerrelations.cpp:371
-msgid "Floating '...' bubble"
-msgstr ""
+#, fuzzy
+#~ msgid "Job"
+#~ msgstr "職業:"
 
-#: src/playerrelations.cpp:374
-msgid "Floating bubble"
-msgstr ""
+#, fuzzy
+#~ msgid "Level"
+#~ msgstr "等級：%d"
 
-#: src/resources/itemdb.cpp:52
-#, c-format
-msgid "Attack %+d"
-msgstr "攻擊 %+d"
+#, fuzzy
+#~ msgid "Access denied."
+#~ msgstr "存取被拒"
 
-#: src/resources/itemdb.cpp:53
-#, c-format
-msgid "Defense %+d"
-msgstr "防禦 %+d"
+#, fuzzy
+#~ msgid "Unknown failure to select character."
+#~ msgstr "選擇角色發生不明的失敗"
 
-#: src/resources/itemdb.cpp:54
-#, c-format
-msgid "HP %+d"
-msgstr "體力%+d"
+#~ msgid "Inviting like this isn't supported at the moment."
+#~ msgstr "此時無法支援邀請"
 
-#: src/resources/itemdb.cpp:55
-#, c-format
-msgid "MP %+d"
-msgstr "魔力%+d"
+#~ msgid "Willpower:"
+#~ msgstr "意志力:"
 
-#: src/resources/itemdb.cpp:114
-msgid "Unknown item"
-msgstr "不明的物品"
+#~ msgid "Willpower %+d"
+#~ msgstr "意志力 %+d"
 
-#: src/resources/itemdb.cpp:158 src/resources/monsterdb.cpp:45
-#: src/resources/monsterdb.cpp:67
-msgid "unnamed"
-msgstr "未知物品"
+#, fuzzy
+#~ msgid "Willpower"
+#~ msgstr "意志力:"
+
+#, fuzzy
+#~ msgid "Server is full."
+#~ msgstr "伺服器人數已滿"
 
 #~ msgid "no"
 #~ msgstr "否"
author	Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer>	2010-12-13 20:05:52 +0100
committer	Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer>	2010-12-13 20:05:52 +0100
commit	d92eb6c97f7b148b0b3b390bb93ea89179b614c8 (patch)
tree	e9534424b9c8c46e2ed231e371dd8f24d40e8fda /po
parent	12214ad30d89cc4dc033b1ef912c4072dd80927e (diff)
download	mana-client-d92eb6c97f7b148b0b3b390bb93ea89179b614c8.tar.gz mana-client-d92eb6c97f7b148b0b3b390bb93ea89179b614c8.tar.bz2 mana-client-d92eb6c97f7b148b0b3b390bb93ea89179b614c8.tar.xz mana-client-d92eb6c97f7b148b0b3b390bb93ea89179b614c8.zip