Rebuild translations.

14 files changed, 16617 insertions, 8363 deletions

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 01fa8e017..2c70112ff 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -46,7 +46,9 @@ src/gui/setupitem.cpp
 src/gui/setup_joystick.cpp
 src/gui/setup_keyboard.cpp
 src/gui/setup_other.cpp
+src/gui/setup_perfomance.cpp
 src/gui/setup_players.cpp
+src/gui/setup_relations.cpp
 src/gui/setup_theme.cpp
 src/gui/setup_video.cpp
 src/gui/shopwindow.cpp
@@ -75,6 +77,18 @@ src/localplayer.cpp
 src/log.h
 src/main.cpp
 src/net/ea/buysellhandler.cpp
+src/net/ea/charserverhandler.cpp
+src/net/ea/chathandler.cpp
+src/net/ea/gamehandler.cpp
+src/net/ea/gui/guildtab.cpp
+src/net/ea/guildhandler.cpp
+src/net/ea/gui/partytab.cpp
+src/net/ea/inventoryhandler.cpp
+src/net/ea/loginhandler.cpp
+src/net/ea/partyhandler.cpp
+src/net/ea/playerhandler.cpp
+src/net/ea/specialhandler.cpp
+src/net/ea/tradehandler.cpp
 src/net/manaserv/attributes.cpp
 src/net/manaserv/beinghandler.cpp
 src/net/manaserv/charhandler.cpp
@@ -86,20 +100,9 @@ src/net/manaserv/playerhandler.cpp
 src/net/manaserv/tradehandler.cpp
 src/net/tmwa/adminhandler.cpp
 src/net/tmwa/buysellhandler.cpp
-src/net/tmwa/charserverhandler.cpp
-src/net/tmwa/chathandler.cpp
-src/net/tmwa/gamehandler.cpp
 src/net/tmwa/generalhandler.cpp
-src/net/tmwa/gui/guildtab.cpp
-src/net/tmwa/guildhandler.cpp
-src/net/tmwa/gui/partytab.cpp
-src/net/tmwa/inventoryhandler.cpp
-src/net/tmwa/loginhandler.cpp
 src/net/tmwa/network.cpp
 src/net/tmwa/partyhandler.cpp
-src/net/tmwa/playerhandler.cpp
-src/net/tmwa/specialhandler.cpp
-src/net/tmwa/tradehandler.cpp
 src/playerrelations.cpp
 src/resources/beinginfo.cpp
 src/resources/itemdb.cpp
diff --git a/po/de.po b/po/de.po
index 301b721c5..f5895a339 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-08 04:26+0300\n"
+"POT-Creation-Date: 2011-08-10 01:11+0300\n"
 "PO-Revision-Date: 2011-06-20 00:31+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: German (http://www.transifex.net/projects/p/manaplus/team/"
@@ -24,25 +24,25 @@ msgstr ""
 msgid "Visible on map"
 msgstr ""
 
-#: src/being.cpp:541
+#: src/being.cpp:542
 msgid "dodge"
 msgstr "ausweichen"
 
-#: src/being.cpp:541
+#: src/being.cpp:542
 msgid "miss"
 msgstr "verfehlt"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1513
+#: src/being.cpp:1514
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1518
+#: src/being.cpp:1519
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:825 src/gui/setup.cpp:51 src/gui/windowmenu.cpp:100
+#: src/client.cpp:825 src/gui/setup.cpp:53 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Einstellungen"
 
@@ -74,7 +74,8 @@ msgstr ""
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
-#: src/gui/unregisterdialog.cpp:137 src/net/manaserv/charhandler.cpp:184
+#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
+#: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "Fehler"
@@ -150,7 +151,7 @@ msgstr ""
 msgid "Requesting to join channel %s."
 msgstr "Erbitte Erlaubnis, Kanal %s betreten zu dürfen."
 
-#: src/commandhandler.cpp:445
+#: src/commandhandler.cpp:445 src/net/ea/gui/partytab.cpp:125
 msgid "Party name is missing."
 msgstr "Name der Party fehlt."
 
@@ -361,35 +362,35 @@ msgstr ""
 msgid "Comment: %s"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:265
+#: src/gui/botcheckerwindow.cpp:266
 msgid "Bot Checker"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:295 src/gui/setup_players.cpp:64
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
 msgid "Name"
 msgstr "Name"
 
-#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:130
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:130
 #: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:604
 #: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
 msgid "Attack"
 msgstr "Angriff"
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:275
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:275
 #: src/keyboardconfig.cpp:62
 msgid "Talk"
 msgstr "Sprechen"
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:241
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:241
 #: src/gui/popupmenu.cpp:280 src/gui/popupmenu.cpp:661
 msgid "Move"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:299
+#: src/gui/botcheckerwindow.cpp:300
 msgid "Result"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:309 src/gui/npcdialog.cpp:123
+#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:123
 msgid "Reset"
 msgstr "Zurücksetzten"
 
@@ -458,8 +459,8 @@ msgstr "Verkaufen"
 #: src/gui/popupmenu.cpp:1731 src/gui/popupmenu.cpp:1774
 #: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1849
 #: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1935
-#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:68
-#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:237
+#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:70
+#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:238
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
 #: src/gui/updatewindow.cpp:157
 msgid "Cancel"
@@ -628,8 +629,8 @@ msgid "Enter password:"
 msgstr ""
 
 #: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
-#: src/gui/setup_players.cpp:251 src/gui/shopwindow.cpp:120
-#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:240
+#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120
+#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:241
 msgid "Delete"
 msgstr "Löschen"
 
@@ -703,10 +704,10 @@ msgid "rainbow 3"
 msgstr ""
 
 #: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
-#: src/gui/logindialog.cpp:78 src/gui/setup_players.cpp:220
-#: src/gui/setup_theme.cpp:71 src/gui/setup_theme.cpp:125
-#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:101
-#: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:159
+#: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
+#: src/gui/setup_theme.cpp:72 src/gui/setup_theme.cpp:126
+#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
+#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
 msgid "???"
 msgstr "???"
 
@@ -897,7 +898,7 @@ msgstr ""
 msgid "Auto open this window"
 msgstr ""
 
-#: src/gui/editdialog.cpp:46 src/gui/itemamountwindow.cpp:208
+#: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
 #: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "Ok"
@@ -981,7 +982,7 @@ msgstr "Gewicht:"
 
 #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
 #: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1724
-#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:69
+#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:71
 msgid "Store"
 msgstr "Einlagern"
 
@@ -1040,91 +1041,91 @@ msgstr ""
 msgid "Weight: %s"
 msgstr "Gewicht: %s"
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
+#: src/gui/killstats.cpp:46 src/gui/windowmenu.cpp:69
 msgid "Kill stats"
 msgstr ""
 
-#: src/gui/killstats.cpp:63
+#: src/gui/killstats.cpp:64
 msgid "Reset stats"
 msgstr ""
 
-#: src/gui/killstats.cpp:64
+#: src/gui/killstats.cpp:65
 msgid "Reset timer"
 msgstr ""
 
-#: src/gui/killstats.cpp:68 src/gui/killstats.cpp:204
+#: src/gui/killstats.cpp:69 src/gui/killstats.cpp:205
 #, c-format
 msgid "Level: %d at %f%%"
 msgstr ""
 
-#: src/gui/killstats.cpp:72 src/gui/killstats.cpp:209
+#: src/gui/killstats.cpp:73 src/gui/killstats.cpp:210
 #, c-format
 msgid "Exp: %d/%d Left: %d"
 msgstr ""
 
-#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:215
-#: src/gui/killstats.cpp:224
+#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:216
+#: src/gui/killstats.cpp:225
 #, c-format
 msgid "1%% = %d exp, avg mob for 1%%: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:141
-#: src/gui/killstats.cpp:233
+#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:142
+#: src/gui/killstats.cpp:234
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:80 src/gui/killstats.cpp:143
-#: src/gui/killstats.cpp:219 src/gui/killstats.cpp:229
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
+#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:230
 #, c-format
 msgid "Avg Exp: %s, No. of avg mob to next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:161
-#: src/gui/killstats.cpp:236
+#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:162
+#: src/gui/killstats.cpp:237
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:88 src/gui/killstats.cpp:93
-#: src/gui/killstats.cpp:288 src/gui/killstats.cpp:304
-#: src/gui/killstats.cpp:322
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:89 src/gui/killstats.cpp:94
+#: src/gui/killstats.cpp:289 src/gui/killstats.cpp:305
+#: src/gui/killstats.cpp:323
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
+#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/gui/killstats.cpp:99 src/gui/killstats.cpp:240
+#: src/gui/killstats.cpp:100 src/gui/killstats.cpp:241
 msgid "Last kill exp:"
 msgstr ""
 
-#: src/gui/killstats.cpp:101 src/gui/killstats.cpp:354
-#: src/gui/killstats.cpp:360 src/gui/killstats.cpp:366
-#: src/gui/killstats.cpp:371
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:355
+#: src/gui/killstats.cpp:361 src/gui/killstats.cpp:367
+#: src/gui/killstats.cpp:372
 msgid "Time before jacko spawn:"
 msgstr ""
 
-#: src/gui/killstats.cpp:293 src/gui/killstats.cpp:300
-#: src/gui/killstats.cpp:310 src/gui/killstats.cpp:317
-#: src/gui/killstats.cpp:329 src/gui/killstats.cpp:336
+#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:301
+#: src/gui/killstats.cpp:311 src/gui/killstats.cpp:318
+#: src/gui/killstats.cpp:330 src/gui/killstats.cpp:337
 #, c-format
 msgid "  Time for next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:360
+#: src/gui/killstats.cpp:361
 #, c-format
 msgid "%s %d?"
 msgstr ""
 
-#: src/gui/killstats.cpp:366
+#: src/gui/killstats.cpp:367
 msgid "jacko spawning"
 msgstr ""
 
@@ -1793,34 +1794,38 @@ msgid "Tabs"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:96
+msgid "Put all whispers in tabs"
+msgstr "Alle privaten Nachrichten in Tabs öffnen"
+
+#: src/gui/setup_chat.cpp:99
 msgid "Log magic messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:99
+#: src/gui/setup_chat.cpp:102
 msgid "Show server messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:102
+#: src/gui/setup_chat.cpp:105
 msgid "Enable trade tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:105
+#: src/gui/setup_chat.cpp:108
 msgid "Enable battle tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:108
+#: src/gui/setup_chat.cpp:111
 msgid "Show battle events"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:111
+#: src/gui/setup_chat.cpp:114
 msgid "Resize chat tabs if need"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:115
+#: src/gui/setup_chat.cpp:118
 msgid "Time"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:117
+#: src/gui/setup_chat.cpp:120
 msgid "Use local time"
 msgstr ""
 
@@ -1871,16 +1876,15 @@ msgstr "Blau: "
 msgid "Alpha:"
 msgstr ""
 
-#: src/gui/setup.cpp:67
+#: src/gui/setup.cpp:69
 msgid "Apply"
 msgstr "Anwenden"
 
-#: src/gui/setup.cpp:70
+#: src/gui/setup.cpp:72
 msgid "Reset Windows"
 msgstr "Fenster zurücksetzen"
 
 #: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
-#: src/gui/setup_players.cpp:334
 msgid "Edit"
 msgstr ""
 
@@ -2090,149 +2094,202 @@ msgstr ""
 msgid "Show background"
 msgstr ""
 
-#: src/gui/setup_players.cpp:65
-msgid "Relation"
-msgstr "Beziehung"
+#: src/gui/setup_perfomance.cpp:48
+msgid "Perfomance"
+msgstr ""
 
-#: src/gui/setup_players.cpp:70
-msgid "Neutral"
-msgstr "Neutral"
+#: src/gui/setup_perfomance.cpp:55
+msgid "Better perfomance (enable for better perfomance)"
+msgstr ""
 
-#: src/gui/setup_players.cpp:71
-msgid "Friend"
-msgstr "Freund"
+#: src/gui/setup_perfomance.cpp:58
+msgid "Auto adjust perfomance"
+msgstr ""
 
-#: src/gui/setup_players.cpp:72
-msgid "Disregarded"
-msgstr "Unbeachtet"
+#: src/gui/setup_perfomance.cpp:61
+msgid "Show beings transparency"
+msgstr ""
 
-#: src/gui/setup_players.cpp:73
-msgid "Ignored"
-msgstr "Ignoriert"
+#: src/gui/setup_perfomance.cpp:64
+msgid "Hw acceleration"
+msgstr ""
 
-#: src/gui/setup_players.cpp:74
-msgid "Erased"
+#: src/gui/setup_perfomance.cpp:67
+msgid "Enable opacity cache (Software, can use many memory)"
 msgstr ""
 
-#: src/gui/setup_players.cpp:247
-msgid "Allow trading"
-msgstr "Handeln erlauben"
+#: src/gui/setup_perfomance.cpp:70
+msgid "Enable map reduce (Software)"
+msgstr ""
 
-#: src/gui/setup_players.cpp:249
-msgid "Allow whispers"
-msgstr "Flüstern erlauben"
+#: src/gui/setup_perfomance.cpp:73
+msgid "Better quality (disable for better perfomance)"
+msgstr ""
 
-#: src/gui/setup_players.cpp:252
-msgid "Old"
+#: src/gui/setup_perfomance.cpp:76
+msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr ""
 
-#: src/gui/setup_players.cpp:254
-msgid "Put all whispers in tabs"
-msgstr "Alle privaten Nachrichten in Tabs öffnen"
+#: src/gui/setup_perfomance.cpp:80
+msgid "Enable reorder sprites."
+msgstr ""
 
-#: src/gui/setup_players.cpp:257
-msgid "Show gender"
+#: src/gui/setup_perfomance.cpp:83
+msgid "Small memory (enable for lower memory usage)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:86
+msgid "Disable advanced beings caching (Software)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:89
+msgid "Disable beings caching (Software)"
 msgstr ""
 
-#: src/gui/setup_players.cpp:267
+#: src/gui/setup_players.cpp:48
 msgid "Players"
 msgstr "Spieler"
 
-#: src/gui/setup_players.cpp:292
-msgid "When ignoring:"
-msgstr "Wenn ignorierend:"
+#: src/gui/setup_players.cpp:54
+msgid "Show gender"
+msgstr ""
 
-#: src/gui/setup_players.cpp:315
+#: src/gui/setup_players.cpp:57
 msgid "Show level"
 msgstr ""
 
-#: src/gui/setup_players.cpp:319
+#: src/gui/setup_players.cpp:60
 msgid "Show own name"
 msgstr ""
 
-#: src/gui/setup_players.cpp:323
+#: src/gui/setup_players.cpp:63
 msgid "Target dead players"
 msgstr ""
 
-#: src/gui/setup_players.cpp:327
+#: src/gui/setup_players.cpp:66
+msgid "Visible names"
+msgstr "Sichtbare Namen"
+
+#: src/gui/setup_players.cpp:69
 msgid "Secure trades"
 msgstr ""
 
-#: src/gui/setup_players.cpp:331 src/gui/setup_players.cpp:523
+#: src/gui/setup_players.cpp:72
 msgid "Unsecure chars in names"
 msgstr ""
 
-#: src/gui/setup_players.cpp:336
-msgid "Visible names"
-msgstr "Sichtbare Namen"
-
-#: src/gui/setup_players.cpp:341
+#: src/gui/setup_players.cpp:75
 #, fuzzy
 msgid "Show statuses"
 msgstr "Status"
 
-#: src/gui/setup_theme.cpp:105
-msgid "Tiny (10)"
+#: src/gui/setup_relations.cpp:65
+msgid "Relation"
+msgstr "Beziehung"
+
+#: src/gui/setup_relations.cpp:70
+msgid "Neutral"
+msgstr "Neutral"
+
+#: src/gui/setup_relations.cpp:71
+msgid "Friend"
+msgstr "Freund"
+
+#: src/gui/setup_relations.cpp:72
+msgid "Disregarded"
+msgstr "Unbeachtet"
+
+#: src/gui/setup_relations.cpp:73
+msgid "Ignored"
+msgstr "Ignoriert"
+
+#: src/gui/setup_relations.cpp:74
+msgid "Erased"
 msgstr ""
 
+#: src/gui/setup_relations.cpp:239
+msgid "Allow trading"
+msgstr "Handeln erlauben"
+
+#: src/gui/setup_relations.cpp:241
+msgid "Allow whispers"
+msgstr "Flüstern erlauben"
+
+#: src/gui/setup_relations.cpp:244
+msgid "Old"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:246
+#, fuzzy
+msgid "Relations"
+msgstr "Beziehung"
+
+#: src/gui/setup_relations.cpp:271
+msgid "When ignoring:"
+msgstr "Wenn ignorierend:"
+
 #: src/gui/setup_theme.cpp:106
-msgid "Small (11)"
+msgid "Tiny (10)"
 msgstr ""
 
 #: src/gui/setup_theme.cpp:107
-msgid "Medium (12)"
+msgid "Small (11)"
 msgstr ""
 
 #: src/gui/setup_theme.cpp:108
-msgid "Large (13)"
+msgid "Medium (12)"
 msgstr ""
 
 #: src/gui/setup_theme.cpp:109
-msgid "Big (14)"
+msgid "Large (13)"
 msgstr ""
 
 #: src/gui/setup_theme.cpp:110
+msgid "Big (14)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:111
 msgid "Huge (15)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:140
+#: src/gui/setup_theme.cpp:141
 msgid "Theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:142
+#: src/gui/setup_theme.cpp:143
 msgid "Gui theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:144
 msgid "Main Font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:144
+#: src/gui/setup_theme.cpp:145
 msgid "Bold font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:146
 msgid "Particle font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:147
 msgid "Help font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:148
 msgid "Secure font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:175
+#: src/gui/setup_theme.cpp:176
 msgid "Font size"
 msgstr "Schriftgröße"
 
-#: src/gui/setup_theme.cpp:281
+#: src/gui/setup_theme.cpp:282
 msgid "Theme Changed"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:282 src/gui/setup_video.cpp:670
-#: src/gui/setup_video.cpp:675
+#: src/gui/setup_theme.cpp:283 src/gui/setup_video.cpp:619
+#: src/gui/setup_video.cpp:624
 msgid "Restart your client for the change to take effect."
 msgstr "Starte das Spiel neu um die Änderungen zu übernehmen."
 
@@ -2284,138 +2341,118 @@ msgstr "Mittel"
 msgid "max"
 msgstr "max"
 
-#: src/gui/setup_video.cpp:293
+#: src/gui/setup_video.cpp:288
 msgid "Full screen"
 msgstr "Vollbild"
 
-#: src/gui/setup_video.cpp:294
-msgid "Hw acceleration"
-msgstr ""
-
-#: src/gui/setup_video.cpp:295
+#: src/gui/setup_video.cpp:289
 msgid "Custom cursor"
 msgstr "Benutzerdefinierter Zeiger"
 
-#: src/gui/setup_video.cpp:297
+#: src/gui/setup_video.cpp:291
 msgid "Particle effects"
 msgstr "Partikeleffekte"
 
-#: src/gui/setup_video.cpp:299
+#: src/gui/setup_video.cpp:293
 msgid "Show pickup notification"
 msgstr "Benachrichtigung beim Aufheben"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:301
+#: src/gui/setup_video.cpp:295
 msgid "in chat"
 msgstr "im Chatfenster"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:303
+#: src/gui/setup_video.cpp:297
 msgid "as particle"
 msgstr "als Partikeleffekt"
 
-#: src/gui/setup_video.cpp:305
-msgid "Enable opacity cache"
-msgstr ""
-
-#: src/gui/setup_video.cpp:306
-msgid "Enable map reduce"
-msgstr ""
-
-#: src/gui/setup_video.cpp:308
-msgid "Auto adjust perfomance"
-msgstr ""
-
-#: src/gui/setup_video.cpp:310
-msgid "Show beings transparency"
-msgstr ""
-
-#: src/gui/setup_video.cpp:315
+#: src/gui/setup_video.cpp:302
 msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:319 src/gui/setup_video.cpp:356
-#: src/gui/setup_video.cpp:607 src/gui/setup_video.cpp:760
+#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
+#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709
 msgid "Alt FPS limit: "
 msgstr ""
 
-#: src/gui/setup_video.cpp:328
+#: src/gui/setup_video.cpp:315
 msgid "Video"
 msgstr "Video"
 
-#: src/gui/setup_video.cpp:334
+#: src/gui/setup_video.cpp:321
 msgid "Overhead text"
 msgstr "Chat über Spielern"
 
-#: src/gui/setup_video.cpp:335
+#: src/gui/setup_video.cpp:322
 msgid "Gui opacity"
 msgstr "GUI Transparenz"
 
-#: src/gui/setup_video.cpp:336
+#: src/gui/setup_video.cpp:323
 msgid "Ambient FX"
 msgstr "Hintergrundeffekte"
 
-#: src/gui/setup_video.cpp:337
+#: src/gui/setup_video.cpp:324
 msgid "Particle detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:354 src/gui/setup_video.cpp:357
-#: src/gui/setup_video.cpp:606 src/gui/setup_video.cpp:747
-#: src/gui/setup_video.cpp:758
+#: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
+#: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
+#: src/gui/setup_video.cpp:707
 msgid "None"
 msgstr ""
 
-#: src/gui/setup_video.cpp:511
+#: src/gui/setup_video.cpp:484
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:517
+#: src/gui/setup_video.cpp:490
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:528
+#: src/gui/setup_video.cpp:501
 msgid "Switching to Full Screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:529
+#: src/gui/setup_video.cpp:502
 msgid "Restart needed for changes to take effect."
 msgstr "Änderungen treten erst nach einem Neustart des Programms in Kraft."
 
-#: src/gui/setup_video.cpp:541
+#: src/gui/setup_video.cpp:514
 msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:542
+#: src/gui/setup_video.cpp:515
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 "Änderungen an OpenGL werden erst nach einem Neustart der Anwendung "
 "übernommen."
 
-#: src/gui/setup_video.cpp:653
+#: src/gui/setup_video.cpp:602
 msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:654
+#: src/gui/setup_video.cpp:603
 msgid "Enter new resolution:                "
 msgstr ""
 
-#: src/gui/setup_video.cpp:669 src/gui/setup_video.cpp:674
+#: src/gui/setup_video.cpp:618 src/gui/setup_video.cpp:623
 msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:672
+#: src/gui/setup_video.cpp:621
 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:705
+#: src/gui/setup_video.cpp:654
 msgid "Particle Effect Settings Changed."
 msgstr ""
 
-#: src/gui/setup_video.cpp:706
+#: src/gui/setup_video.cpp:655
 msgid "Changes will take effect on map change."
 msgstr "Änderung werden beim nächsten Kartenwechsel übernommen."
 
@@ -2444,7 +2481,8 @@ msgstr ""
 msgid "Show links in announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:723 src/net/manaserv/tradehandler.cpp:127
+#: src/gui/shopwindow.cpp:723 src/net/ea/tradehandler.cpp:106
+#: src/net/manaserv/tradehandler.cpp:127
 msgid "Request for Trade"
 msgstr "Erbitte einen Handel"
 
@@ -2486,7 +2524,7 @@ msgstr ""
 msgid "Lvl: %d (%+d)"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:117
+#: src/gui/socialwindow.cpp:117 src/net/ea/gui/guildtab.cpp:52
 msgid "Guild"
 msgstr "Gilde"
 
@@ -2518,7 +2556,7 @@ msgstr ""
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:215
+#: src/gui/socialwindow.cpp:215 src/net/ea/gui/partytab.cpp:50
 msgid "Party"
 msgstr "Party"
 
@@ -2680,243 +2718,243 @@ msgstr ""
 msgid "Specials"
 msgstr "Special"
 
-#: src/gui/statuspopup.cpp:196
+#: src/gui/statuspopup.cpp:197
 msgid "(D) default moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:201
+#: src/gui/statuspopup.cpp:202
 msgid "(I) invert moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:206
+#: src/gui/statuspopup.cpp:207
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:211
+#: src/gui/statuspopup.cpp:212
 msgid "(C) moves with crazy moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:216
+#: src/gui/statuspopup.cpp:217
 msgid "(d) double normal + crazy"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:221
+#: src/gui/statuspopup.cpp:222
 msgid "(?) move"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:239
+#: src/gui/statuspopup.cpp:240
 msgid "(a) custom crazy move"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:243
+#: src/gui/statuspopup.cpp:244
 msgid "(?) crazy move"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:253
+#: src/gui/statuspopup.cpp:254
 msgid "(0) default moves to target"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:258
+#: src/gui/statuspopup.cpp:259
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:263
+#: src/gui/statuspopup.cpp:264
 msgid "(2) moves to target in distance 2"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:268
+#: src/gui/statuspopup.cpp:269
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:273
+#: src/gui/statuspopup.cpp:274
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:278
+#: src/gui/statuspopup.cpp:279
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:283
+#: src/gui/statuspopup.cpp:284
 msgid "(A) moves to target in attack range"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:288
+#: src/gui/statuspopup.cpp:289
 msgid "(?) move to target"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:296
+#: src/gui/statuspopup.cpp:297
 msgid "(D) default follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:300
+#: src/gui/statuspopup.cpp:301
 msgid "(R) relative follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:304
+#: src/gui/statuspopup.cpp:305
 msgid "(M) mirror follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:308
+#: src/gui/statuspopup.cpp:309
 msgid "(P) pet follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:312
+#: src/gui/statuspopup.cpp:313
 msgid "(?) unknown follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:321 src/gui/statuspopup.cpp:344
+#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345
 msgid "(D) default attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:326
+#: src/gui/statuspopup.cpp:327
 msgid "(s) switch attack without shield"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:331
+#: src/gui/statuspopup.cpp:332
 msgid "(S) switch attack with shield"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:335 src/gui/statuspopup.cpp:360
+#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
 msgid "(?) attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:348
+#: src/gui/statuspopup.cpp:349
 msgid "(G) go and attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:352
+#: src/gui/statuspopup.cpp:353
 msgid "(A) go, attack, pickup"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:356
+#: src/gui/statuspopup.cpp:357
 msgid "(d) without auto attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:374
+#: src/gui/statuspopup.cpp:375
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:378
+#: src/gui/statuspopup.cpp:379
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:382
+#: src/gui/statuspopup.cpp:383
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:386
+#: src/gui/statuspopup.cpp:387
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:390
+#: src/gui/statuspopup.cpp:391
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:394
+#: src/gui/statuspopup.cpp:395
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:398
+#: src/gui/statuspopup.cpp:399
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:402
+#: src/gui/statuspopup.cpp:403
 msgid "(?) pick up"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:411
+#: src/gui/statuspopup.cpp:412
 msgid "(N) normal map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:415
+#: src/gui/statuspopup.cpp:416
 msgid "(D) debug map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:419
+#: src/gui/statuspopup.cpp:420
 msgid "(u) ultra map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:423
+#: src/gui/statuspopup.cpp:424
 msgid "(U) ultra map view 2"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:427
+#: src/gui/statuspopup.cpp:428
 msgid "(e) empty map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:431
+#: src/gui/statuspopup.cpp:432
 msgid "(b) black & white map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:435
+#: src/gui/statuspopup.cpp:436
 msgid "(?) map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:443
+#: src/gui/statuspopup.cpp:444
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:448
+#: src/gui/statuspopup.cpp:449
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:453
+#: src/gui/statuspopup.cpp:454
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:458
+#: src/gui/statuspopup.cpp:459
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:463
+#: src/gui/statuspopup.cpp:464
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:467
+#: src/gui/statuspopup.cpp:468
 msgid "(?) magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:476
+#: src/gui/statuspopup.cpp:477
 msgid "(D) default imitation"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:480
+#: src/gui/statuspopup.cpp:481
 msgid "(O) outfits imitation"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:484
+#: src/gui/statuspopup.cpp:485
 msgid "(?) imitation"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:493
+#: src/gui/statuspopup.cpp:494
 msgid "(O) on keyboard"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:496
+#: src/gui/statuspopup.cpp:497
 msgid "(A) away"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:499 src/gui/statuspopup.cpp:519
+#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
 msgid "(?) away"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:507
+#: src/gui/statuspopup.cpp:508
 msgid "(G) game camera mode"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:511
+#: src/gui/statuspopup.cpp:512
 msgid "(F) free camera mode"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:515
+#: src/gui/statuspopup.cpp:516
 msgid "(D) design camera mode"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:526
+#: src/gui/statuspopup.cpp:527
 msgid "Game modifiers are disabled"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:531
+#: src/gui/statuspopup.cpp:532
 msgid "Game modifiers are enabled"
 msgstr ""
 
@@ -3095,87 +3133,87 @@ msgstr ""
 msgid "(O)"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:112
+#: src/gui/textcommandeditor.cpp:113
 msgid "No Target"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:113
+#: src/gui/textcommandeditor.cpp:114
 msgid "Allow Target"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:114
+#: src/gui/textcommandeditor.cpp:115
 msgid "Need Target"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:119
+#: src/gui/textcommandeditor.cpp:120
 msgid "General Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:120
+#: src/gui/textcommandeditor.cpp:121
 msgid "Life Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:121
+#: src/gui/textcommandeditor.cpp:122
 msgid "War Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:122
+#: src/gui/textcommandeditor.cpp:123
 msgid "Transmute Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:123
+#: src/gui/textcommandeditor.cpp:124
 msgid "Nature Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:124
+#: src/gui/textcommandeditor.cpp:125
 msgid "Astral Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:167
+#: src/gui/textcommandeditor.cpp:168
 msgid "Command Editor"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:184
+#: src/gui/textcommandeditor.cpp:185
 msgid "magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:188
+#: src/gui/textcommandeditor.cpp:189
 msgid "other"
 msgstr "andere"
 
-#: src/gui/textcommandeditor.cpp:193
+#: src/gui/textcommandeditor.cpp:194
 msgid "Symbol:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:196
+#: src/gui/textcommandeditor.cpp:197
 msgid "Command:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:199
+#: src/gui/textcommandeditor.cpp:200
 msgid "Mana:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:205
+#: src/gui/textcommandeditor.cpp:206
 msgid "Target Type:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:211
+#: src/gui/textcommandeditor.cpp:212
 msgid "Icon:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:217
+#: src/gui/textcommandeditor.cpp:218
 msgid "Magic level:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:223
+#: src/gui/textcommandeditor.cpp:224
 msgid "Magic School:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:229
+#: src/gui/textcommandeditor.cpp:230
 msgid "School level:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:234
+#: src/gui/textcommandeditor.cpp:235
 msgid "Save"
 msgstr ""
 
@@ -3405,23 +3443,23 @@ msgstr ""
 msgid "Road Point"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:470
+#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:471
 msgid "Who Is Online - Updating"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:100
+#: src/gui/whoisonline.cpp:101
 msgid "Update"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:293
+#: src/gui/whoisonline.cpp:294
 msgid "Who Is Online - "
 msgstr ""
 
-#: src/gui/whoisonline.cpp:484
+#: src/gui/whoisonline.cpp:485
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:515
+#: src/gui/whoisonline.cpp:516
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -3486,6 +3524,7 @@ msgid "This command makes <nick> a channel operator."
 msgstr "Dieser Befehl macht Spieler <Name> zu einem Moderator des Kanals"
 
 #: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
+#: src/net/ea/gui/guildtab.cpp:69 src/net/ea/gui/partytab.cpp:85
 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 "
@@ -4222,82 +4261,535 @@ msgstr "Vielen Dank für den Einkauf."
 msgid "Unable to buy."
 msgstr "Kauf fehlgeschlagen."
 
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
-msgid "Strength"
-msgstr "Stärke"
+#: src/net/ea/charserverhandler.cpp:63
+msgid "Strength:"
+msgstr "Stärke:"
 
-#: src/net/manaserv/attributes.cpp:167
-#, c-format
-msgid "Strength %+.1f"
+#: src/net/ea/charserverhandler.cpp:64
+msgid "Agility:"
+msgstr "Agilität:"
+
+#: src/net/ea/charserverhandler.cpp:65
+msgid "Vitality:"
+msgstr "Vitalität:"
+
+#: src/net/ea/charserverhandler.cpp:66
+msgid "Intelligence:"
+msgstr "Intelligenz:"
+
+#: src/net/ea/charserverhandler.cpp:67
+msgid "Dexterity:"
+msgstr "Geschicklichkeit:"
+
+#: src/net/ea/charserverhandler.cpp:68
+msgid "Luck:"
+msgstr "Glück:"
+
+#: src/net/ea/charserverhandler.cpp:102
+msgid "Access denied. Most likely, there are too many players on this server."
+msgstr "Zugriff verweigert. Wahrscheinlich zu viele Spieler auf dem Server."
+
+#: src/net/ea/charserverhandler.cpp:106
+msgid "Cannot use this ID."
+msgstr "Kann diese ID nicht benutzen"
+
+#: src/net/ea/charserverhandler.cpp:109
+#, fuzzy
+msgid "Unknown char-server failure."
+msgstr "Unbekannter Fehler"
+
+#: src/net/ea/charserverhandler.cpp:138
+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/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
-msgid "Agility"
-msgstr "Beweglichkeit"
+#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:237
+#, fuzzy
+msgid "Wrong name."
+msgstr "Fehlerhaftes Magiemerkmal"
 
-#: src/net/manaserv/attributes.cpp:180
+#: src/net/ea/charserverhandler.cpp:145
+msgid "Incorrect stats."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:148
+msgid "Incorrect hair."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:151
+#, fuzzy
+msgid "Incorrect slot."
+msgstr "Kein freier Slot."
+
+#: src/net/ea/charserverhandler.cpp:166 src/net/manaserv/charhandler.cpp:210
+msgid "Info"
+msgstr "Info"
+
+#: src/net/ea/charserverhandler.cpp:166
+msgid "Character deleted."
+msgstr "Spieler gelöscht."
+
+#: src/net/ea/charserverhandler.cpp:172
+msgid "Failed to delete character."
+msgstr "Spieler konnte nicht gelöscht werden."
+
+#: src/net/ea/chathandler.cpp:60 src/net/ea/chathandler.cpp:66
+#: src/net/ea/chathandler.cpp:71 src/net/ea/chathandler.cpp:77
+#: src/net/ea/chathandler.cpp:82 src/net/ea/chathandler.cpp:88
+#: src/net/ea/chathandler.cpp:95 src/net/ea/chathandler.cpp:101
+msgid "Channels are not supported!"
+msgstr "Kanäle werden nicht unterstützt!"
+
+#: src/net/ea/chathandler.cpp:128
 #, c-format
-msgid "Agility %+.1f"
+msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
-msgid "Dexterity"
-msgstr "Ausdauer"
+#: src/net/ea/chathandler.cpp:136
+#, c-format
+msgid "Whisper could not be sent, ignored by %s."
+msgstr ""
 
-#: src/net/manaserv/attributes.cpp:193
+#: src/net/ea/chathandler.cpp:348
+msgid "MVP player."
+msgstr "Spieler"
+
+#: src/net/ea/chathandler.cpp:352
+#, fuzzy
+msgid "MVP player: "
+msgstr "Spieler"
+
+#: src/net/ea/gamehandler.cpp:86
 #, c-format
-msgid "Dexterity %+.1f"
+msgid "Online users: %d"
+msgstr "Benutzer online: %d"
+
+#: src/net/ea/gamehandler.cpp:98
+msgid "Game"
+msgstr "Spiel"
+
+#: src/net/ea/gamehandler.cpp:98
+#, fuzzy
+msgid "Request to quit denied!"
+msgstr "Erbitte einen Handel"
+
+#: src/net/ea/gui/guildtab.cpp:67 src/net/ea/gui/partytab.cpp:83
+msgid "Command: /invite <nick>"
+msgstr "Befehl: /invite <Name>"
+
+#: src/net/ea/gui/guildtab.cpp:68
+#, 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:74 src/net/ea/gui/partytab.cpp:90
+msgid "Command: /leave"
+msgstr "Befehl: /leave"
+
+#: src/net/ea/gui/guildtab.cpp:75
+#, 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:135 src/net/ea/gui/partytab.cpp:69
+msgid "/help > Display this help."
+msgstr "/help > Diese Hilfe anzeigen"
+
+#: src/net/ea/gui/guildtab.cpp:136
+#, fuzzy
+msgid "/invite > Invite a player to your guild"
+msgstr "/invite > Lade einen Spieler zu Deiner Party ein"
+
+#: src/net/ea/gui/guildtab.cpp:137
+#, 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:138
+#, fuzzy
+msgid "/kick > Kick some one from the guild you are in"
+msgstr "/kick > Werfe jemanden aus Deiner Party"
+
+#: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
+msgid "Guild created."
+msgstr "Gilde erstellt."
+
+#: src/net/ea/guildhandler.cpp:88 src/net/ea/guildhandler.cpp:93
+#, fuzzy
+msgid "You are already in guild."
+msgstr "Fehler beim Erstellen der Gilde."
+
+#: src/net/ea/guildhandler.cpp:98
+msgid "Emperium check failed."
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
-msgid "Vitality"
-msgstr "Gesundheit"
+#: src/net/ea/guildhandler.cpp:103
+#, fuzzy
+msgid "Unknown server response."
+msgstr "Unbekannter Fehler"
 
-#: src/net/manaserv/attributes.cpp:206
+#: src/net/ea/guildhandler.cpp:180
+#, fuzzy, c-format
+msgid "Guild name: %s"
+msgstr "Gildenname"
+
+#: src/net/ea/guildhandler.cpp:182
+#, fuzzy, c-format
+msgid "Guild master: %s"
+msgstr "Gildenname"
+
+#: src/net/ea/guildhandler.cpp:184
+#, fuzzy, c-format
+msgid "Guild level: %d"
+msgstr "Stufe: %d"
+
+#: src/net/ea/guildhandler.cpp:186
+#, fuzzy, c-format
+msgid "Online members: %d"
+msgstr "Benutzer online: %d"
+
+#: src/net/ea/guildhandler.cpp:188
 #, c-format
-msgid "Vitality %+.1f"
+msgid "Max members: %d"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
-msgid "Intelligence"
-msgstr "Intelligenz"
+#: src/net/ea/guildhandler.cpp:190
+#, fuzzy, c-format
+msgid "Average level: %d"
+msgstr "Stufe: %d"
 
-#: src/net/manaserv/attributes.cpp:219
+#: src/net/ea/guildhandler.cpp:192
+#, fuzzy, c-format
+msgid "Guild exp: %d"
+msgstr "Gildenname"
+
+#: src/net/ea/guildhandler.cpp:194
+#, fuzzy, c-format
+msgid "Guild next exp: %d"
+msgstr "Gilde erstellt."
+
+#: src/net/ea/guildhandler.cpp:196
+#, fuzzy, c-format
+msgid "Guild castle: %s"
+msgstr "Gilde erstellt."
+
+#: src/net/ea/guildhandler.cpp:402
+msgid "Could not inivte user to guild."
+msgstr "Konnte User nicht in Gilde einladen."
+
+#: src/net/ea/guildhandler.cpp:406
+#, fuzzy
+msgid "User rejected guild invite."
+msgstr "%s hat Deine Einladung zurückgewiesen."
+
+#: src/net/ea/guildhandler.cpp:410
+#, fuzzy
+msgid "User is now part of your guild."
+msgstr "%s ist nun Mitglied Deiner Party."
+
+#: src/net/ea/guildhandler.cpp:414
+msgid "Your guild is full."
+msgstr "Deine Gilde ist voll."
+
+#: src/net/ea/guildhandler.cpp:418
+msgid "Unknown guild invite response."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:438
+#, fuzzy
+msgid "You have left the guild."
+msgstr "Du hast die Party verlassen."
+
+#: src/net/ea/guildhandler.cpp:452
+#, fuzzy, c-format
+msgid "%s has left your guild."
+msgstr "%s hat Deine Party verlassen."
+
+#: src/net/ea/guildhandler.cpp:483
+msgid "You was kicked from guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:496
+#, fuzzy, c-format
+msgid "%s has kicked from your guild."
+msgstr "%s hat %s gekickt."
+
+#: src/net/ea/gui/partytab.cpp:70
+msgid "/invite > Invite a player to your party"
+msgstr "/invite > Lade einen Spieler zu Deiner Party ein"
+
+#: src/net/ea/gui/partytab.cpp:71
+msgid "/leave > Leave the party you are in"
+msgstr "/leave > Verlasse die Party, in der Du Mitglied bist"
+
+#: src/net/ea/gui/partytab.cpp:72
+msgid "/kick > Kick some one from the party you are in"
+msgstr "/kick > Werfe jemanden aus Deiner Party"
+
+#: src/net/ea/gui/partytab.cpp:73
+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:74
+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:84
+msgid "This command invites <nick> to party with you."
+msgstr "Dieser Befehl lädt Spieler <Name> zu einer Party mit Dir ein."
+
+#: src/net/ea/gui/partytab.cpp:91
+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:95
+msgid "Command: /item <policy>"
+msgstr "Befehl: /item <Wert>"
+
+#: src/net/ea/gui/partytab.cpp:97
+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:98
+msgid ""
+"<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
+"\"0\", \"no\", \"false\" to disable item sharing."
+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:101
+msgid "Command: /item"
+msgstr "Befehl: /item"
+
+#: src/net/ea/gui/partytab.cpp:102
+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:107
+msgid "Command: /exp <policy>"
+msgstr "Befehl: /exp <Wert>"
+
+#: src/net/ea/gui/partytab.cpp:108
+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:110
+msgid ""
+"<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
+"sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
+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:113
+msgid "Command: /exp"
+msgstr "Befehl: /exp"
+
+#: src/net/ea/gui/partytab.cpp:114
+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:148 src/net/ea/partyhandler.cpp:286
+msgid "Item sharing enabled."
+msgstr "Teilen von Gegenständen aktiviert."
+
+#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:296
+msgid "Item sharing disabled."
+msgstr "Teilen von Gegenständen deaktiviert."
+
+#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:306
+msgid "Item sharing not possible."
+msgstr "Teilen von Gegenständen nicht möglich."
+
+#: src/net/ea/gui/partytab.cpp:157
+#, fuzzy
+msgid "Item sharing unknown."
+msgstr "Teilen von Gegenständen aktiviert."
+
+#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:248
+msgid "Experience sharing enabled."
+msgstr "Teilen der Erfahrungspunkte aktiviert."
+
+#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:258
+msgid "Experience sharing disabled."
+msgstr "Teilen der Erfahrungspunkte deaktiviert."
+
+#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:268
+msgid "Experience sharing not possible."
+msgstr "Teilen der Erfahrungspunkte nicht möglich."
+
+#: src/net/ea/gui/partytab.cpp:196
+#, fuzzy
+msgid "Experience sharing unknown."
+msgstr "Teilen der Erfahrungspunkte aktiviert."
+
+#: src/net/ea/inventoryhandler.cpp:407
+msgid "Failed to use item."
+msgstr "Gegenstand konnte nicht benutzt werden."
+
+#: src/net/ea/inventoryhandler.cpp:580
+msgid "Unable to equip."
+msgstr "Kann Gegenstand nicht Ausrüsten."
+
+#: src/net/ea/loginhandler.cpp:131
+msgid "Account was not found. Please re-login."
+msgstr "Account konnte nicht gefunden werden. Bitte melde dich erneut an."
+
+#: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127
+msgid "Old password incorrect."
+msgstr "Altes Passwort fehlerhaft"
+
+#: src/net/ea/loginhandler.cpp:137
+msgid "New password too short."
+msgstr "Das neue Passwort ist zu kurz"
+
+#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:243
+#: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
+#: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
+#: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
+msgid "Unknown error."
+msgstr "Unbekannter Fehler"
+
+#: src/net/ea/loginhandler.cpp:205
+msgid "Unregistered ID."
+msgstr "Unbekannte ID"
+
+#: src/net/ea/loginhandler.cpp:208
+msgid "Wrong password."
+msgstr "Falsches Passwort"
+
+#: src/net/ea/loginhandler.cpp:211
+msgid "Account expired."
+msgstr "Account abgelaufen"
+
+#: src/net/ea/loginhandler.cpp:214
+msgid "Rejected from server."
+msgstr "Vom Server zurückgewiesen"
+
+#: src/net/ea/loginhandler.cpp:217
+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:221
+#, fuzzy
+msgid "Client too old."
+msgstr "Die Version des Spiels ist zu alt"
+
+#: src/net/ea/loginhandler.cpp:224
 #, c-format
-msgid "Intelligence %+.1f"
+msgid ""
+"You have been temporarily banned from the game until %s.\n"
+"Please contact the GM team via the forums."
 msgstr ""
+"Du wurdest zeitweise, bis %s vom Spiel ausgeschlossen.\n"
+"Bitte wende dich mittels des Forums an das GM Team."
 
-#: src/net/manaserv/attributes.cpp:225
-msgid "Willpower"
-msgstr "Willenskraft:"
+#: src/net/ea/loginhandler.cpp:231
+msgid "Server overpopulated."
+msgstr ""
 
-#: src/net/manaserv/attributes.cpp:232
+#: src/net/ea/loginhandler.cpp:234
+msgid "This user name is already taken."
+msgstr "Dieser Spielername ist bereits vergeben"
+
+#: src/net/ea/loginhandler.cpp:240
+#, fuzzy
+msgid "Username permanently erased."
+msgstr "Benutzername bereits vorhanden"
+
+#: src/net/ea/partyhandler.cpp:82
+msgid "Could not create party."
+msgstr "Konnte Party nicht erstellen."
+
+#: src/net/ea/partyhandler.cpp:84
+msgid "Party successfully created."
+msgstr "Party erfolgreich erstellt."
+
+#: src/net/ea/partyhandler.cpp:140
+#, fuzzy, c-format
+msgid "%s has joined your party."
+msgstr "%s hat Deine Party verlassen."
+
+#: src/net/ea/partyhandler.cpp:176
 #, c-format
-msgid "Willpower %+.1f"
+msgid "%s is already a member of a party."
+msgstr "%s ist bereits Mitglied einer Party."
+
+#: src/net/ea/partyhandler.cpp:181
+#, c-format
+msgid "%s refused your invitation."
+msgstr "%s hat Deine Einladung zurückgewiesen."
+
+#: src/net/ea/partyhandler.cpp:186
+#, c-format
+msgid "%s is now a member of your party."
+msgstr "%s ist nun Mitglied Deiner Party."
+
+#: src/net/ea/partyhandler.cpp:191
+#, c-format
+msgid "%s can't join your party because party is full."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/partyhandler.cpp:196
+#, c-format
+msgid "QQQ Unknown invite response for %s."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:356
+msgid "You have left the party."
+msgstr "Du hast die Party verlassen."
+
+#: src/net/ea/partyhandler.cpp:368
+#, c-format
+msgid "%s has left your party."
+msgstr "%s hat Deine Party verlassen."
+
+#: src/net/ea/partyhandler.cpp:444
+#, c-format
+msgid "An unknown member tried to say: %s"
+msgstr "Ein unbekanntes Mitglied hat versucht, \"%s\" zu sagen."
+
+#: src/net/ea/playerhandler.cpp:95 src/net/manaserv/beinghandler.cpp:315
 msgid "You are dead."
 msgstr "Ach ja: Du bist Tot."
 
-#: src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:316
 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:318
+#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:318
 msgid "You are not that alive anymore."
 msgstr "Du bist nicht länger lebendig."
 
-#: src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:319
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr "Die kalten Hände des Sensemanns greifen nach Deiner Seele."
 
-#: src/net/manaserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:320
 msgid "Game Over!"
 msgstr "Game Over!"
 
-#: src/net/manaserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:101
+msgid "Insert coin to continue."
+msgstr "Gib eine Münze ein um weiter zuspielen."
+
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:321
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
@@ -4305,7 +4797,7 @@ msgstr ""
 "Nein, Kinder. Euer Charakter ist nicht tot. Er... ähm... ist zu einem "
 "besserem Ort gegangen."
 
-#: src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:323
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
@@ -4313,33 +4805,323 @@ 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:325
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:325
 msgid "I guess this did not run too well."
 msgstr "Ich glaube, das war nicht so gut."
 
-#: src/net/manaserv/beinghandler.cpp:326
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:326
 msgid "Do you want your possessions identified?"
 msgstr "Möchtest du eine Auflistung Deiner Verletzungen?"
 
-#: src/net/manaserv/beinghandler.cpp:327
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:327
 msgid "Sadly, no trace of you was ever found..."
 msgstr "Leider wurde niemals eine Spur von Dir gefunden..."
 
-#: src/net/manaserv/beinghandler.cpp:329
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:329
 msgid "Annihilated."
 msgstr "Vernichtet."
 
-#: src/net/manaserv/beinghandler.cpp:330
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:330
 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:332
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:332
 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 ein "
 "paar Neue."
 
+#: src/net/ea/playerhandler.cpp:119
+msgid "You're not dead yet. You're just resting."
+msgstr "Du bist nicht tot. Du erholst Dich bloß."
+
+#: src/net/ea/playerhandler.cpp:120
+msgid "You are no more."
+msgstr "Du bist nicht mehr."
+
+#: src/net/ea/playerhandler.cpp:121
+msgid "You have ceased to be."
+msgstr "Du hast Dich entschieden, dem Irdischen zu entsagen."
+
+#: src/net/ea/playerhandler.cpp:122
+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:123
+msgid "You're a stiff."
+msgstr "Du bist ein wenig steif."
+
+#: src/net/ea/playerhandler.cpp:124
+msgid "Bereft of life, you rest in peace."
+msgstr "Des Lebens beraubt ruhst Du in Frieden."
+
+#: src/net/ea/playerhandler.cpp:125
+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:126
+msgid "Your metabolic processes are now history."
+msgstr "Deine Körperfunktionen sind nun Geschichte."
+
+#: src/net/ea/playerhandler.cpp:127
+msgid "You're off the twig."
+msgstr "Du kriegst nichts mehr mit."
+
+#: src/net/ea/playerhandler.cpp:128
+msgid "You've kicked the bucket."
+msgstr "Jetzt passt Du in 'nen Eimer."
+
+#: src/net/ea/playerhandler.cpp:129
+msgid ""
+"You've shuffled off your mortal coil, run down the curtain and joined the "
+"bleedin' choir invisibile."
+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:131
+msgid "You are an ex-player."
+msgstr "Du warst einmal ein Spieler."
+
+#: src/net/ea/playerhandler.cpp:132
+msgid "You're pining for the fjords."
+msgstr "Du schmachtest nach den Fjorden."
+
+#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
+#: src/net/ea/playerhandler.cpp:425
+msgid "Message"
+msgstr "Nachricht"
+
+#: src/net/ea/playerhandler.cpp:337
+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:347
+#, fuzzy
+msgid "You are carrying less than half your weight. You can regain health."
+msgstr ""
+"Du trägst mehr als die Hälfte Deiner Tragkraft. Du kannst Dich nicht mehr "
+"heilen."
+
+#: src/net/ea/playerhandler.cpp:451
+#, c-format
+msgid "You picked up %s."
+msgstr "Du hast %s aufgehoben "
+
+#: src/net/ea/playerhandler.cpp:457
+#, fuzzy, c-format
+msgid "You spent %s."
+msgstr "Du hast %s aufgehoben "
+
+#: src/net/ea/playerhandler.cpp:501
+msgid "Cannot raise skill!"
+msgstr "Kann Skill nicht erhöhen!"
+
+#: src/net/ea/playerhandler.cpp:618
+msgid "Equip arrows first."
+msgstr "Rüste dich zuerst mit Pfeilen aus."
+
+#: src/net/ea/specialhandler.cpp:149
+msgid "Trade failed!"
+msgstr "Handel fehlgeschlagen!"
+
+#: src/net/ea/specialhandler.cpp:152
+msgid "Emote failed!"
+msgstr "Emote fehlgeschlagen!"
+
+#: src/net/ea/specialhandler.cpp:155
+msgid "Sit failed!"
+msgstr "Sitzen fehlgeschlagen!"
+
+#: src/net/ea/specialhandler.cpp:158
+msgid "Chat creating failed!"
+msgstr "Chat-Erstellung fehlgeschlagen!"
+
+#: src/net/ea/specialhandler.cpp:161
+msgid "Could not join party!"
+msgstr "Kann der Gruppe nicht beitreten!"
+
+#: src/net/ea/specialhandler.cpp:164
+msgid "Cannot shout!"
+msgstr "Kann nicht rufen!"
+
+#: src/net/ea/specialhandler.cpp:177
+msgid "You have not yet reached a high enough lvl!"
+msgstr "Dein Level ist noch nicht hoch genug!"
+
+#: src/net/ea/specialhandler.cpp:181
+msgid "Insufficient HP!"
+msgstr "Nicht genug HP!"
+
+#: src/net/ea/specialhandler.cpp:184
+msgid "Insufficient SP!"
+msgstr "Nicht genug SP!"
+
+#: src/net/ea/specialhandler.cpp:187
+msgid "You have no memos!"
+msgstr "Keine Memos vorhanden!"
+
+#: src/net/ea/specialhandler.cpp:190
+msgid "You cannot do that right now!"
+msgstr "Du kannst dies momentan nicht tun!"
+
+#: src/net/ea/specialhandler.cpp:193
+msgid "Seems you need more money... ;-)"
+msgstr "Es scheint, als bräuchtest Du mehr Geld... ;-)"
+
+#: src/net/ea/specialhandler.cpp:196
+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:200
+msgid "You need another red gem!"
+msgstr "Du brauchst noch einen roten Edelstein!"
+
+#: src/net/ea/specialhandler.cpp:203
+msgid "You need another blue gem!"
+msgstr "Du brauchst noch einen blauen Edelstein!"
+
+#: src/net/ea/specialhandler.cpp:206
+msgid "You're carrying to much to do this!"
+msgstr "Du schleppst zu viel herum um das zu machen!"
+
+#: src/net/ea/specialhandler.cpp:209
+msgid "Huh? What's that?"
+msgstr "Eha? Was ist das?"
+
+#: src/net/ea/specialhandler.cpp:220
+msgid "Warp failed..."
+msgstr "Warp fehlgeschlagen..."
+
+#: src/net/ea/specialhandler.cpp:223
+msgid "Could not steal anything..."
+msgstr "Konnte nichts stehlen..."
+
+#: src/net/ea/specialhandler.cpp:226
+msgid "Poison had no effect..."
+msgstr "Das Gift hatte keine Wirkung..."
+
+#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:128
+#, 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:130
+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:134
+msgid "Trading isn't possible. Character doesn't exist."
+msgstr "Handel nicht möglich. Spieler existiert nicht."
+
+#: src/net/ea/tradehandler.cpp:138
+msgid "Trade cancelled due to an unknown reason."
+msgstr "Handel aus unbekanntem Grund abgebrochen"
+
+#: src/net/ea/tradehandler.cpp:146
+#, c-format
+msgid "Trade: You and %s"
+msgstr "Handel: Du und %s"
+
+#: src/net/ea/tradehandler.cpp:156
+#, c-format
+msgid "Trade with %s cancelled."
+msgstr "Handel mit %s abgebrochen."
+
+#: src/net/ea/tradehandler.cpp:169
+msgid "Unhandled trade cancel packet."
+msgstr "Übergangenes Handelsabbruchspaket."
+
+#: src/net/ea/tradehandler.cpp:231
+msgid "Failed adding item. Trade partner is over weighted."
+msgstr ""
+"Gegenstand konnte nicht hinzugefügt werden. Handelspartner ist überladen."
+
+#: src/net/ea/tradehandler.cpp:236
+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:241
+#, fuzzy
+msgid "Failed adding item. You can't trade this item."
+msgstr ""
+"Gegenstand konnte nicht hinzugefügt werden. Du kannst keinen weiteren dieser "
+"Gegenstände hinzufügen."
+
+#: src/net/ea/tradehandler.cpp:245
+msgid "Failed adding item for unknown reason."
+msgstr "Gegenstand konnte nicht hinzugefügt werden. Unbekannter Fehler."
+
+#: src/net/ea/tradehandler.cpp:264 src/net/manaserv/tradehandler.cpp:160
+msgid "Trade canceled."
+msgstr "Handel abgebrochen."
+
+#: src/net/ea/tradehandler.cpp:275 src/net/manaserv/tradehandler.cpp:167
+msgid "Trade completed."
+msgstr "Handel abgeschlossen."
+
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
+msgid "Strength"
+msgstr "Stärke"
+
+#: src/net/manaserv/attributes.cpp:167
+#, c-format
+msgid "Strength %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
+msgid "Agility"
+msgstr "Beweglichkeit"
+
+#: src/net/manaserv/attributes.cpp:180
+#, c-format
+msgid "Agility %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
+msgid "Dexterity"
+msgstr "Ausdauer"
+
+#: src/net/manaserv/attributes.cpp:193
+#, c-format
+msgid "Dexterity %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
+msgid "Vitality"
+msgstr "Gesundheit"
+
+#: src/net/manaserv/attributes.cpp:206
+#, c-format
+msgid "Vitality %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
+msgid "Intelligence"
+msgstr "Intelligenz"
+
+#: src/net/manaserv/attributes.cpp:219
+#, c-format
+msgid "Intelligence %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:225
+msgid "Willpower"
+msgstr "Willenskraft:"
+
+#: src/net/manaserv/attributes.cpp:232
+#, c-format
+msgid "Willpower %+.1f"
+msgstr ""
+
 #: src/net/manaserv/beinghandler.cpp:337
 msgid "Press OK to respawn."
 msgstr "Drücke \"OK\" um neu anzufangen."
@@ -4393,16 +5175,6 @@ msgstr ""
 msgid "Invalid slot number."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
-#: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
-#: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
-msgid "Unknown error."
-msgstr "Unbekannter Fehler"
-
-#: src/net/manaserv/charhandler.cpp:210
-msgid "Info"
-msgstr "Info"
-
 #: src/net/manaserv/charhandler.cpp:210
 msgid "Player deleted."
 msgstr "Spieler gelöscht"
@@ -4466,10 +5238,6 @@ msgstr "%s hat %s gekickt."
 msgid "Unknown channel event."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:85
-msgid "Guild created."
-msgstr "Gilde erstellt."
-
 #: src/net/manaserv/guildhandler.cpp:90
 msgid "Error creating guild."
 msgstr "Fehler beim Erstellen der Gilde."
@@ -4502,10 +5270,6 @@ msgstr ""
 msgid "New password incorrect."
 msgstr "Neues Passwort fehlerhaft"
 
-#: src/net/manaserv/loginhandler.cpp:127
-msgid "Old password incorrect."
-msgstr "Altes Passwort fehlerhaft"
-
 #: src/net/manaserv/loginhandler.cpp:131 src/net/manaserv/loginhandler.cpp:163
 msgid "Account not connected. Please login first."
 msgstr "Account nicht verbunden. Bitte melde Dich zuerst an."
@@ -4584,24 +5348,11 @@ msgstr "Akzeptiere eingehende Handelsanfragen."
 msgid "Ignoring incoming trade requests."
 msgstr "Ignoriere eingehende Handelsanfragen."
 
-#: src/net/manaserv/tradehandler.cpp:128
-#, 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:146
 #, c-format
 msgid "Trading with %s"
 msgstr "Handele mit %s"
 
-#: src/net/manaserv/tradehandler.cpp:160
-msgid "Trade canceled."
-msgstr "Handel abgebrochen."
-
-#: src/net/manaserv/tradehandler.cpp:167
-msgid "Trade completed."
-msgstr "Handel abgeschlossen."
-
 #: src/net/tmwa/adminhandler.cpp:70
 msgid "Kick failed!"
 msgstr "Spieler konnte nicht aus dem Kanal geworfen werden!"
@@ -4792,376 +5543,3 @@ msgstr "MP %+d"
 #: src/resources/itemdb.cpp:171
 msgid "Unknown item"
 msgstr "Unbekannter Gegenstand"
-
-#~ msgid ""
-#~ "Access denied. Most likely, there are too many players on this server."
-#~ msgstr "Zugriff verweigert. Wahrscheinlich zu viele Spieler auf dem Server."
-
-#~ msgid "Cannot use this ID."
-#~ msgstr "Kann diese ID nicht benutzen"
-
-#~ msgid "Failed to create character. Most likely the name is already taken."
-#~ msgstr ""
-#~ "Charakter konnte nicht erstellt werden. Wahrscheinlich ist der Name "
-#~ "bereits vergeben."
-
-#~ msgid "Character deleted."
-#~ msgstr "Spieler gelöscht."
-
-#~ msgid "Failed to delete character."
-#~ msgstr "Spieler konnte nicht gelöscht werden."
-
-#~ msgid "Strength:"
-#~ msgstr "Stärke:"
-
-#~ msgid "Agility:"
-#~ msgstr "Agilität:"
-
-#~ msgid "Vitality:"
-#~ msgstr "Vitalität:"
-
-#~ msgid "Intelligence:"
-#~ msgstr "Intelligenz:"
-
-#~ msgid "Dexterity:"
-#~ msgstr "Geschicklichkeit:"
-
-#~ msgid "Luck:"
-#~ msgstr "Glück:"
-
-#~ msgid "MVP player."
-#~ msgstr "Spieler"
-
-#~ msgid "Channels are not supported!"
-#~ msgstr "Kanäle werden nicht unterstützt!"
-
-#~ msgid "Online users: %d"
-#~ msgstr "Benutzer online: %d"
-
-#~ msgid "Game"
-#~ msgstr "Spiel"
-
-#~ msgid "/help > Display this help."
-#~ msgstr "/help > Diese Hilfe anzeigen"
-
-#~ msgid "Command: /invite <nick>"
-#~ msgstr "Befehl: /invite <Name>"
-
-#~ msgid "Command: /leave"
-#~ msgstr "Befehl: /leave"
-
-#~ msgid "Could not inivte user to guild."
-#~ msgstr "Konnte User nicht in Gilde einladen."
-
-#~ msgid "Your guild is full."
-#~ msgstr "Deine Gilde ist voll."
-
-#~ msgid "/invite > Invite a player to your party"
-#~ msgstr "/invite > Lade einen Spieler zu Deiner Party ein"
-
-#~ msgid "/leave > Leave the party you are in"
-#~ msgstr "/leave > Verlasse die Party, in der Du Mitglied bist"
-
-#~ msgid "/kick > Kick some one from the party you are in"
-#~ msgstr "/kick > Werfe jemanden aus Deiner Party"
-
-#~ msgid "/item > Show/change party item sharing options"
-#~ msgstr ""
-#~ "/item > Zeige oder ändere die Optionen zum Teilen der Gegenstände in der "
-#~ "Party"
-
-#~ msgid "/exp > Show/change party experience sharing options"
-#~ msgstr ""
-#~ "/exp > Zeige oder ändere die Optionen zum Teilen der Erfahrungspunkte in "
-#~ "der Party"
-
-#~ msgid "This command invites <nick> to party with you."
-#~ msgstr "Dieser Befehl lädt Spieler <Name> zu einer Party mit Dir ein."
-
-#~ msgid "This command causes the player to leave the party."
-#~ msgstr "Dieser Befehl lässt Dich die Party verlassen"
-
-#~ msgid "Command: /item <policy>"
-#~ msgstr "Befehl: /item <Wert>"
-
-#~ msgid "This command changes the party's item sharing policy."
-#~ msgstr ""
-#~ "Dieser Befehl ändert die Einstellungen zum Teilen von Gegenständen in "
-#~ "einer Party."
-
-#~ msgid ""
-#~ "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, "
-#~ "or \"0\", \"no\", \"false\" to disable item sharing."
-#~ msgstr ""
-#~ "<Wert> darf enthalten: \"1\",\"yes\" oder \"true\" um das Teilen von "
-#~ "Gegenständen zu erlauben, \"0\",\"no\" oder \"false\" um es zu verbieten."
-
-#~ msgid "Command: /item"
-#~ msgstr "Befehl: /item"
-
-#~ 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."
-
-#~ msgid "Command: /exp <policy>"
-#~ msgstr "Befehl: /exp <Wert>"
-
-#~ msgid "This command changes the party's experience sharing policy."
-#~ msgstr ""
-#~ "Dieser Befehl ändert das Teilen der Erfahrungspunkte in einer Party."
-
-#~ msgid ""
-#~ "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
-#~ "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
-#~ msgstr ""
-#~ "Gültige Werte für <Wert> sind: \"1\",\"yes\",\"true\" um das Teilen zu "
-#~ "erlauben, \"0\",\"no\",\"false\" verbieten es."
-
-#~ msgid "Command: /exp"
-#~ msgstr "Befehl: /exp"
-
-#~ 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."
-
-#~ msgid "Item sharing enabled."
-#~ msgstr "Teilen von Gegenständen aktiviert."
-
-#~ msgid "Item sharing disabled."
-#~ msgstr "Teilen von Gegenständen deaktiviert."
-
-#~ msgid "Item sharing not possible."
-#~ msgstr "Teilen von Gegenständen nicht möglich."
-
-#~ msgid "Experience sharing enabled."
-#~ msgstr "Teilen der Erfahrungspunkte aktiviert."
-
-#~ msgid "Experience sharing disabled."
-#~ msgstr "Teilen der Erfahrungspunkte deaktiviert."
-
-#~ msgid "Experience sharing not possible."
-#~ msgstr "Teilen der Erfahrungspunkte nicht möglich."
-
-#~ msgid "Failed to use item."
-#~ msgstr "Gegenstand konnte nicht benutzt werden."
-
-#~ msgid "Unable to equip."
-#~ msgstr "Kann Gegenstand nicht Ausrüsten."
-
-#~ msgid "Account was not found. Please re-login."
-#~ msgstr "Account konnte nicht gefunden werden. Bitte melde dich erneut an."
-
-#~ msgid "New password too short."
-#~ msgstr "Das neue Passwort ist zu kurz"
-
-#~ msgid "Unregistered ID."
-#~ msgstr "Unbekannte ID"
-
-#~ msgid "Wrong password."
-#~ msgstr "Falsches Passwort"
-
-#~ msgid "Account expired."
-#~ msgstr "Account abgelaufen"
-
-#~ msgid "Rejected from server."
-#~ msgstr "Vom Server zurückgewiesen"
-
-#~ 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."
-
-#~ msgid ""
-#~ "You have been temporarily banned from the game until %s.\n"
-#~ "Please contact the GM team via the forums."
-#~ msgstr ""
-#~ "Du wurdest zeitweise, bis %s vom Spiel ausgeschlossen.\n"
-#~ "Bitte wende dich mittels des Forums an das GM Team."
-
-#~ msgid "This user name is already taken."
-#~ msgstr "Dieser Spielername ist bereits vergeben"
-
-#~ msgid "Could not create party."
-#~ msgstr "Konnte Party nicht erstellen."
-
-#~ msgid "Party successfully created."
-#~ msgstr "Party erfolgreich erstellt."
-
-#~ msgid "%s is already a member of a party."
-#~ msgstr "%s ist bereits Mitglied einer Party."
-
-#~ msgid "%s refused your invitation."
-#~ msgstr "%s hat Deine Einladung zurückgewiesen."
-
-#~ msgid "%s is now a member of your party."
-#~ msgstr "%s ist nun Mitglied Deiner Party."
-
-#~ msgid "You have left the party."
-#~ msgstr "Du hast die Party verlassen."
-
-#~ msgid "%s has left your party."
-#~ msgstr "%s hat Deine Party verlassen."
-
-#~ msgid "An unknown member tried to say: %s"
-#~ msgstr "Ein unbekanntes Mitglied hat versucht, \"%s\" zu sagen."
-
-#~ msgid "Insert coin to continue."
-#~ msgstr "Gib eine Münze ein um weiter zuspielen."
-
-#~ msgid "You're not dead yet. You're just resting."
-#~ msgstr "Du bist nicht tot. Du erholst Dich bloß."
-
-#~ msgid "You are no more."
-#~ msgstr "Du bist nicht mehr."
-
-#~ msgid "You have ceased to be."
-#~ msgstr "Du hast Dich entschieden, dem Irdischen zu entsagen."
-
-#~ msgid "You've expired and gone to meet your maker."
-#~ msgstr "Deine Zeit ist abgelaufen. Zeit, deinem Schöpfer gegenüberzutreten."
-
-#~ msgid "You're a stiff."
-#~ msgstr "Du bist ein wenig steif."
-
-#~ msgid "Bereft of life, you rest in peace."
-#~ msgstr "Des Lebens beraubt ruhst Du in Frieden."
-
-#~ 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."
-
-#~ msgid "Your metabolic processes are now history."
-#~ msgstr "Deine Körperfunktionen sind nun Geschichte."
-
-#~ msgid "You're off the twig."
-#~ msgstr "Du kriegst nichts mehr mit."
-
-#~ msgid "You've kicked the bucket."
-#~ msgstr "Jetzt passt Du in 'nen Eimer."
-
-#~ msgid ""
-#~ "You've shuffled off your mortal coil, run down the curtain and joined the "
-#~ "bleedin' choir invisibile."
-#~ msgstr ""
-#~ "Du hast Deine sterbliche Hülle abgelegt, der Schleier legt sich über Dich "
-#~ "und Du trittst dem Chor der blutenden Unsichtbaren bei."
-
-#~ msgid "You are an ex-player."
-#~ msgstr "Du warst einmal ein Spieler."
-
-#~ msgid "You're pining for the fjords."
-#~ msgstr "Du schmachtest nach den Fjorden."
-
-#~ msgid "Message"
-#~ msgstr "Nachricht"
-
-#~ 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."
-
-#~ msgid "You picked up %s."
-#~ msgstr "Du hast %s aufgehoben "
-
-#~ msgid "Cannot raise skill!"
-#~ msgstr "Kann Skill nicht erhöhen!"
-
-#~ msgid "Equip arrows first."
-#~ msgstr "Rüste dich zuerst mit Pfeilen aus."
-
-#~ msgid "Trade failed!"
-#~ msgstr "Handel fehlgeschlagen!"
-
-#~ msgid "Emote failed!"
-#~ msgstr "Emote fehlgeschlagen!"
-
-#~ msgid "Sit failed!"
-#~ msgstr "Sitzen fehlgeschlagen!"
-
-#~ msgid "Chat creating failed!"
-#~ msgstr "Chat-Erstellung fehlgeschlagen!"
-
-#~ msgid "Could not join party!"
-#~ msgstr "Kann der Gruppe nicht beitreten!"
-
-#~ msgid "Cannot shout!"
-#~ msgstr "Kann nicht rufen!"
-
-#~ msgid "You have not yet reached a high enough lvl!"
-#~ msgstr "Dein Level ist noch nicht hoch genug!"
-
-#~ msgid "Insufficient HP!"
-#~ msgstr "Nicht genug HP!"
-
-#~ msgid "Insufficient SP!"
-#~ msgstr "Nicht genug SP!"
-
-#~ msgid "You have no memos!"
-#~ msgstr "Keine Memos vorhanden!"
-
-#~ msgid "You cannot do that right now!"
-#~ msgstr "Du kannst dies momentan nicht tun!"
-
-#~ msgid "Seems you need more money... ;-)"
-#~ msgstr "Es scheint, als bräuchtest Du mehr Geld... ;-)"
-
-#~ msgid "You cannot use this skill with that kind of weapon!"
-#~ msgstr "Du kannst diese Fähigkeit nicht mit dieser Waffenart benutzen!"
-
-#~ msgid "You need another red gem!"
-#~ msgstr "Du brauchst noch einen roten Edelstein!"
-
-#~ msgid "You need another blue gem!"
-#~ msgstr "Du brauchst noch einen blauen Edelstein!"
-
-#~ msgid "You're carrying to much to do this!"
-#~ msgstr "Du schleppst zu viel herum um das zu machen!"
-
-#~ msgid "Huh? What's that?"
-#~ msgstr "Eha? Was ist das?"
-
-#~ msgid "Warp failed..."
-#~ msgstr "Warp fehlgeschlagen..."
-
-#~ msgid "Could not steal anything..."
-#~ msgstr "Konnte nichts stehlen..."
-
-#~ msgid "Poison had no effect..."
-#~ msgstr "Das Gift hatte keine Wirkung..."
-
-#~ msgid "Trading isn't possible. Trade partner is too far away."
-#~ msgstr "Handel nicht möglich. Handelspartner ist zu weit weg."
-
-#~ msgid "Trading isn't possible. Character doesn't exist."
-#~ msgstr "Handel nicht möglich. Spieler existiert nicht."
-
-#~ msgid "Trade cancelled due to an unknown reason."
-#~ msgstr "Handel aus unbekanntem Grund abgebrochen"
-
-#~ msgid "Trade: You and %s"
-#~ msgstr "Handel: Du und %s"
-
-#~ msgid "Trade with %s cancelled."
-#~ msgstr "Handel mit %s abgebrochen."
-
-#~ msgid "Unhandled trade cancel packet."
-#~ msgstr "Übergangenes Handelsabbruchspaket."
-
-#~ msgid "Failed adding item. Trade partner is over weighted."
-#~ msgstr ""
-#~ "Gegenstand konnte nicht hinzugefügt werden. Handelspartner ist überladen."
-
-#~ msgid "Failed adding item. Trade partner has no free slot."
-#~ msgstr ""
-#~ "Gegenstand konnte nicht hinzugefügt werden. Handelspartner hat keinen "
-#~ "freien Platz mehr."
-
-#~ msgid "Failed adding item for unknown reason."
-#~ msgstr "Gegenstand konnte nicht hinzugefügt werden. Unbekannter Fehler."
diff --git a/po/es.po b/po/es.po
index 4077b9e44..a2dd1aad5 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Nelson  <nelson6eeduardo65@gmail.com>, 2011.
 # Nelson Martell <nelson6e65-manaplus@yahoo.es>, 2011.
 # Nelson Martell <nelson6eeduardo65@gmail.com>, 2011.
@@ -11,39 +11,40 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-08 04:26+0300\n"
+"POT-Creation-Date: 2011-08-10 01:11+0300\n"
 "PO-Revision-Date: 2011-08-08 01:29+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
-"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/manaplus/team/es/)\n"
+"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/"
+"manaplus/team/es/)\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: src/actorspritemanager.cpp:1034
 msgid "Visible on map"
 msgstr "Visible sobre el mapa"
 
-#: src/being.cpp:541
+#: src/being.cpp:542
 msgid "dodge"
 msgstr "evade"
 
-#: src/being.cpp:541
+#: src/being.cpp:542
 msgid "miss"
 msgstr "falla"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1513
+#: src/being.cpp:1514
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1518
+#: src/being.cpp:1519
 msgid "I"
 msgstr "I"
 
-#: src/client.cpp:825 src/gui/setup.cpp:51 src/gui/windowmenu.cpp:100
+#: src/client.cpp:825 src/gui/setup.cpp:53 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Configuración"
 
@@ -75,7 +76,8 @@ msgstr "Cambiando servidores del juego"
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
-#: src/gui/unregisterdialog.cpp:137 src/net/manaserv/charhandler.cpp:184
+#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
+#: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "Error"
@@ -139,8 +141,8 @@ msgstr "¡No puedes enviar susurros vacíos!"
 #: src/commandhandler.cpp:409
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
-" you."
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
+"you."
 msgstr ""
 "¡No se puede crear una pestaña de susurro para el nick \"%s\"! O bien ya "
 "existe, o eres tú."
@@ -150,7 +152,7 @@ msgstr ""
 msgid "Requesting to join channel %s."
 msgstr "Solicitando la entrada del canal %s."
 
-#: src/commandhandler.cpp:445
+#: src/commandhandler.cpp:445 src/net/ea/gui/partytab.cpp:125
 msgid "Party name is missing."
 msgstr "Falta el nombre del grupo."
 
@@ -297,7 +299,8 @@ msgstr "Imágenes de recurso huérfano:"
 #: src/commandhandler.h:40
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr "Opciones para /%s son \"yes\" | \"no\", \"true\" | \"false\", \"1\" | \"0\"."
+msgstr ""
+"Opciones para /%s son \"yes\" | \"no\", \"true\" | \"false\", \"1\" | \"0\"."
 
 #: src/game.cpp:246 src/gui/widgets/chattab.cpp:410
 msgid "General"
@@ -360,35 +363,35 @@ msgstr "Rango PVP: %d"
 msgid "Comment: %s"
 msgstr "Comentario: %s"
 
-#: src/gui/botcheckerwindow.cpp:265
+#: src/gui/botcheckerwindow.cpp:266
 msgid "Bot Checker"
 msgstr "Bot Checker"
 
-#: src/gui/botcheckerwindow.cpp:295 src/gui/setup_players.cpp:64
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
 msgid "Name"
 msgstr "Nombre"
 
-#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:130
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:130
 #: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:604
 #: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
 msgid "Attack"
 msgstr "Atacar"
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:275
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:275
 #: src/keyboardconfig.cpp:62
 msgid "Talk"
 msgstr "Hablar"
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:241
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:241
 #: src/gui/popupmenu.cpp:280 src/gui/popupmenu.cpp:661
 msgid "Move"
 msgstr "Mover"
 
-#: src/gui/botcheckerwindow.cpp:299
+#: src/gui/botcheckerwindow.cpp:300
 msgid "Result"
 msgstr "Resultado"
 
-#: src/gui/botcheckerwindow.cpp:309 src/gui/npcdialog.cpp:123
+#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:123
 msgid "Reset"
 msgstr "Restablecer"
 
@@ -457,8 +460,8 @@ msgstr "Vender"
 #: src/gui/popupmenu.cpp:1731 src/gui/popupmenu.cpp:1774
 #: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1849
 #: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1935
-#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:68
-#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:237
+#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:70
+#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:238
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
 #: src/gui/updatewindow.cpp:157
 msgid "Cancel"
@@ -627,8 +630,8 @@ msgid "Enter password:"
 msgstr "Ingrese contraseña:"
 
 #: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
-#: src/gui/setup_players.cpp:251 src/gui/shopwindow.cpp:120
-#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:240
+#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120
+#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:241
 msgid "Delete"
 msgstr "Borrar"
 
@@ -702,10 +705,10 @@ msgid "rainbow 3"
 msgstr "arco iris 3"
 
 #: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
-#: src/gui/logindialog.cpp:78 src/gui/setup_players.cpp:220
-#: src/gui/setup_theme.cpp:71 src/gui/setup_theme.cpp:125
-#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:101
-#: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:159
+#: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
+#: src/gui/setup_theme.cpp:72 src/gui/setup_theme.cpp:126
+#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
+#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
 msgid "???"
 msgstr "???"
 
@@ -896,7 +899,7 @@ msgstr "Siguiente >"
 msgid "Auto open this window"
 msgstr "Abrir automáticamente esta ventana"
 
-#: src/gui/editdialog.cpp:46 src/gui/itemamountwindow.cpp:208
+#: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
 #: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "OK"
@@ -980,7 +983,7 @@ msgstr "Peso:"
 
 #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
 #: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1724
-#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:69
+#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:71
 msgid "Store"
 msgstr "Almacenar"
 
@@ -1039,91 +1042,91 @@ msgstr ", "
 msgid "Weight: %s"
 msgstr "Peso: %s"
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
+#: src/gui/killstats.cpp:46 src/gui/windowmenu.cpp:69
 msgid "Kill stats"
 msgstr "Estadísticas"
 
-#: src/gui/killstats.cpp:63
+#: src/gui/killstats.cpp:64
 msgid "Reset stats"
 msgstr "Restablecer estadísticas"
 
-#: src/gui/killstats.cpp:64
+#: src/gui/killstats.cpp:65
 msgid "Reset timer"
 msgstr "Restablecer cronometrador"
 
-#: src/gui/killstats.cpp:68 src/gui/killstats.cpp:204
+#: src/gui/killstats.cpp:69 src/gui/killstats.cpp:205
 #, c-format
 msgid "Level: %d at %f%%"
 msgstr "Nivel: %d de %f%%"
 
-#: src/gui/killstats.cpp:72 src/gui/killstats.cpp:209
+#: src/gui/killstats.cpp:73 src/gui/killstats.cpp:210
 #, c-format
 msgid "Exp: %d/%d Left: %d"
 msgstr "Exp: %d/%d Queda: %d"
 
-#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:215
-#: src/gui/killstats.cpp:224
+#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:216
+#: src/gui/killstats.cpp:225
 #, c-format
 msgid "1%% = %d exp, avg mob for 1%%: %s"
 msgstr "1%% = %d exp, prom. pandilla para 1%%: %s"
 
-#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:141
-#: src/gui/killstats.cpp:233
+#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:142
+#: src/gui/killstats.cpp:234
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr "Muertes: %s, exp. total: %s"
 
-#: src/gui/killstats.cpp:80 src/gui/killstats.cpp:143
-#: src/gui/killstats.cpp:219 src/gui/killstats.cpp:229
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
+#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:230
 #, c-format
 msgid "Avg Exp: %s, No. of avg mob to next level: %s"
 msgstr "Prom. Exp: %s, Prom. de pandilla para siguiente nivel: %s"
 
-#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:161
-#: src/gui/killstats.cpp:236
+#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:162
+#: src/gui/killstats.cpp:237
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr "Matanza/Mín: %s, Exp/Mín: %s"
 
-#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:88 src/gui/killstats.cpp:93
-#: src/gui/killstats.cpp:288 src/gui/killstats.cpp:304
-#: src/gui/killstats.cpp:322
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:89 src/gui/killstats.cpp:94
+#: src/gui/killstats.cpp:289 src/gui/killstats.cpp:305
+#: src/gui/killstats.cpp:323
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
 msgstr[0] "Rapidez de experiencia por %d minuto: %s"
 msgstr[1] "Rapidez de experiencia por %d minutos: %s"
 
-#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
+#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
 msgstr[0] "Tiempo para el siguiente nivel por %d minuto: %s"
 msgstr[1] "Tiempo para el siguiente nivel por %d minutos: %s"
 
-#: src/gui/killstats.cpp:99 src/gui/killstats.cpp:240
+#: src/gui/killstats.cpp:100 src/gui/killstats.cpp:241
 msgid "Last kill exp:"
 msgstr "Exp de último monstruo eliminado:"
 
-#: src/gui/killstats.cpp:101 src/gui/killstats.cpp:354
-#: src/gui/killstats.cpp:360 src/gui/killstats.cpp:366
-#: src/gui/killstats.cpp:371
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:355
+#: src/gui/killstats.cpp:361 src/gui/killstats.cpp:367
+#: src/gui/killstats.cpp:372
 msgid "Time before jacko spawn:"
 msgstr "Tiempo antes de que jacko desove:"
 
-#: src/gui/killstats.cpp:293 src/gui/killstats.cpp:300
-#: src/gui/killstats.cpp:310 src/gui/killstats.cpp:317
-#: src/gui/killstats.cpp:329 src/gui/killstats.cpp:336
+#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:301
+#: src/gui/killstats.cpp:311 src/gui/killstats.cpp:318
+#: src/gui/killstats.cpp:330 src/gui/killstats.cpp:337
 #, c-format
 msgid "  Time for next level: %s"
 msgstr "  Tiempo para el siguiente nivel: %s"
 
-#: src/gui/killstats.cpp:360
+#: src/gui/killstats.cpp:361
 #, c-format
 msgid "%s %d?"
 msgstr "¿%s %d?"
 
-#: src/gui/killstats.cpp:366
+#: src/gui/killstats.cpp:367
 msgid "jacko spawning"
 msgstr "desove de jacko"
 
@@ -1788,34 +1791,38 @@ msgid "Tabs"
 msgstr "Pestañas"
 
 #: src/gui/setup_chat.cpp:96
+msgid "Put all whispers in tabs"
+msgstr "Mostrar nuevos susurros en pestañas"
+
+#: src/gui/setup_chat.cpp:99
 msgid "Log magic messages in debug tab"
 msgstr "Registrar mensajes de magia en la pestaña del depurador"
 
-#: src/gui/setup_chat.cpp:99
+#: src/gui/setup_chat.cpp:102
 msgid "Show server messages in debug tab"
 msgstr "Mostrar los mensajes del servidor en la pestaña del depurador"
 
-#: src/gui/setup_chat.cpp:102
+#: src/gui/setup_chat.cpp:105
 msgid "Enable trade tab"
 msgstr "Habilitar pestaña de intercambio"
 
-#: src/gui/setup_chat.cpp:105
+#: src/gui/setup_chat.cpp:108
 msgid "Enable battle tab"
 msgstr "Habilitar pestaña de batalla"
 
-#: src/gui/setup_chat.cpp:108
+#: src/gui/setup_chat.cpp:111
 msgid "Show battle events"
 msgstr "Mostrar eventos de batalla"
 
-#: src/gui/setup_chat.cpp:111
+#: src/gui/setup_chat.cpp:114
 msgid "Resize chat tabs if need"
 msgstr "Si hace falta, cambia el tamaño de pestañas del chat"
 
-#: src/gui/setup_chat.cpp:115
+#: src/gui/setup_chat.cpp:118
 msgid "Time"
 msgstr "Tiempo"
 
-#: src/gui/setup_chat.cpp:117
+#: src/gui/setup_chat.cpp:120
 msgid "Use local time"
 msgstr "Usar hora local"
 
@@ -1866,16 +1873,15 @@ msgstr "Azul:"
 msgid "Alpha:"
 msgstr "Alpha:"
 
-#: src/gui/setup.cpp:67
+#: src/gui/setup.cpp:69
 msgid "Apply"
 msgstr "Aplicar"
 
-#: src/gui/setup.cpp:70
+#: src/gui/setup.cpp:72
 msgid "Reset Windows"
 msgstr "Restaurar Ventanas"
 
 #: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
-#: src/gui/setup_players.cpp:334
 msgid "Edit"
 msgstr "Editar"
 
@@ -2083,148 +2089,203 @@ msgstr "Ocultar los objetos escudos"
 msgid "Show background"
 msgstr "Mostrar fondo"
 
-#: src/gui/setup_players.cpp:65
-msgid "Relation"
-msgstr "Relación"
+#: src/gui/setup_perfomance.cpp:48
+msgid "Perfomance"
+msgstr ""
 
-#: src/gui/setup_players.cpp:70
-msgid "Neutral"
-msgstr "Neutral"
+#: src/gui/setup_perfomance.cpp:55
+msgid "Better perfomance (enable for better perfomance)"
+msgstr ""
 
-#: src/gui/setup_players.cpp:71
-msgid "Friend"
-msgstr "Amigo"
+#: src/gui/setup_perfomance.cpp:58
+msgid "Auto adjust perfomance"
+msgstr ""
 
-#: src/gui/setup_players.cpp:72
-msgid "Disregarded"
-msgstr "Desatendido"
+#: src/gui/setup_perfomance.cpp:61
+msgid "Show beings transparency"
+msgstr ""
 
-#: src/gui/setup_players.cpp:73
-msgid "Ignored"
-msgstr "Ignorado"
+#: src/gui/setup_perfomance.cpp:64
+msgid "Hw acceleration"
+msgstr "Aceleración de hardware"
 
-#: src/gui/setup_players.cpp:74
-msgid "Erased"
-msgstr "Borrado"
+#: src/gui/setup_perfomance.cpp:67
+msgid "Enable opacity cache (Software, can use many memory)"
+msgstr ""
 
-#: src/gui/setup_players.cpp:247
-msgid "Allow trading"
-msgstr "Permitir intercambios"
+#: src/gui/setup_perfomance.cpp:70
+#, fuzzy
+msgid "Enable map reduce (Software)"
+msgstr "Habilitar reducción del mapa"
 
-#: src/gui/setup_players.cpp:249
-msgid "Allow whispers"
-msgstr "Permitir mensajes privados"
+#: src/gui/setup_perfomance.cpp:73
+msgid "Better quality (disable for better perfomance)"
+msgstr ""
 
-#: src/gui/setup_players.cpp:252
-msgid "Old"
-msgstr "Viejo"
+#: src/gui/setup_perfomance.cpp:76
+msgid "Enable alpha channel fix (Software, can be very slow)"
+msgstr ""
 
-#: src/gui/setup_players.cpp:254
-msgid "Put all whispers in tabs"
-msgstr "Mostrar nuevos susurros en pestañas"
+#: src/gui/setup_perfomance.cpp:80
+#, fuzzy
+msgid "Enable reorder sprites."
+msgstr "Habilitar los ataques colaterales de servidor"
 
-#: src/gui/setup_players.cpp:257
-msgid "Show gender"
-msgstr "Mostrar género"
+#: src/gui/setup_perfomance.cpp:83
+msgid "Small memory (enable for lower memory usage)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:86
+msgid "Disable advanced beings caching (Software)"
+msgstr ""
 
-#: src/gui/setup_players.cpp:267
+#: src/gui/setup_perfomance.cpp:89
+msgid "Disable beings caching (Software)"
+msgstr ""
+
+#: src/gui/setup_players.cpp:48
 msgid "Players"
 msgstr "Jugadores"
 
-#: src/gui/setup_players.cpp:292
-msgid "When ignoring:"
-msgstr "Cuando se ignora a alguien:"
+#: src/gui/setup_players.cpp:54
+msgid "Show gender"
+msgstr "Mostrar género"
 
-#: src/gui/setup_players.cpp:315
+#: src/gui/setup_players.cpp:57
 msgid "Show level"
 msgstr "Mostrar nivel"
 
-#: src/gui/setup_players.cpp:319
+#: src/gui/setup_players.cpp:60
 msgid "Show own name"
 msgstr "Mostrar nombre propio"
 
-#: src/gui/setup_players.cpp:323
+#: src/gui/setup_players.cpp:63
 msgid "Target dead players"
 msgstr "Apuntar a jugadores muertos"
 
-#: src/gui/setup_players.cpp:327
+#: src/gui/setup_players.cpp:66
+msgid "Visible names"
+msgstr "Nombres Visibles"
+
+#: src/gui/setup_players.cpp:69
 msgid "Secure trades"
 msgstr "Intercambios seguros"
 
-#: src/gui/setup_players.cpp:331 src/gui/setup_players.cpp:523
+#: src/gui/setup_players.cpp:72
 msgid "Unsecure chars in names"
 msgstr "Carácteres inseguros en los nombres"
 
-#: src/gui/setup_players.cpp:336
-msgid "Visible names"
-msgstr "Nombres Visibles"
-
-#: src/gui/setup_players.cpp:341
+#: src/gui/setup_players.cpp:75
 msgid "Show statuses"
 msgstr "Mostrar estados"
 
-#: src/gui/setup_theme.cpp:105
+#: src/gui/setup_relations.cpp:65
+msgid "Relation"
+msgstr "Relación"
+
+#: src/gui/setup_relations.cpp:70
+msgid "Neutral"
+msgstr "Neutral"
+
+#: src/gui/setup_relations.cpp:71
+msgid "Friend"
+msgstr "Amigo"
+
+#: src/gui/setup_relations.cpp:72
+msgid "Disregarded"
+msgstr "Desatendido"
+
+#: src/gui/setup_relations.cpp:73
+msgid "Ignored"
+msgstr "Ignorado"
+
+#: src/gui/setup_relations.cpp:74
+msgid "Erased"
+msgstr "Borrado"
+
+#: src/gui/setup_relations.cpp:239
+msgid "Allow trading"
+msgstr "Permitir intercambios"
+
+#: src/gui/setup_relations.cpp:241
+msgid "Allow whispers"
+msgstr "Permitir mensajes privados"
+
+#: src/gui/setup_relations.cpp:244
+msgid "Old"
+msgstr "Viejo"
+
+#: src/gui/setup_relations.cpp:246
+#, fuzzy
+msgid "Relations"
+msgstr "Relación"
+
+#: src/gui/setup_relations.cpp:271
+msgid "When ignoring:"
+msgstr "Cuando se ignora a alguien:"
+
+#: src/gui/setup_theme.cpp:106
 msgid "Tiny (10)"
 msgstr "Diminuto (10)"
 
-#: src/gui/setup_theme.cpp:106
+#: src/gui/setup_theme.cpp:107
 msgid "Small (11)"
 msgstr "Pequeño (11)"
 
-#: src/gui/setup_theme.cpp:107
+#: src/gui/setup_theme.cpp:108
 msgid "Medium (12)"
 msgstr "Medio (12)"
 
-#: src/gui/setup_theme.cpp:108
+#: src/gui/setup_theme.cpp:109
 msgid "Large (13)"
 msgstr "Extenso (13)"
 
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:110
 msgid "Big (14)"
 msgstr "Grande (14)"
 
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:111
 msgid "Huge (15)"
 msgstr "Enorme (15)"
 
-#: src/gui/setup_theme.cpp:140
+#: src/gui/setup_theme.cpp:141
 msgid "Theme"
 msgstr "Tema"
 
-#: src/gui/setup_theme.cpp:142
+#: src/gui/setup_theme.cpp:143
 msgid "Gui theme"
 msgstr "Tema de interfáz gráfica"
 
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:144
 msgid "Main Font"
 msgstr "Fuente principal"
 
-#: src/gui/setup_theme.cpp:144
+#: src/gui/setup_theme.cpp:145
 msgid "Bold font"
 msgstr "Fuente negrita"
 
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:146
 msgid "Particle font"
 msgstr "Fuente de partícula"
 
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:147
 msgid "Help font"
 msgstr "Fuente de la ayuda"
 
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:148
 msgid "Secure font"
 msgstr "Fuente segura"
 
-#: src/gui/setup_theme.cpp:175
+#: src/gui/setup_theme.cpp:176
 msgid "Font size"
 msgstr "Tamaño de fuente"
 
-#: src/gui/setup_theme.cpp:281
+#: src/gui/setup_theme.cpp:282
 msgid "Theme Changed"
 msgstr "Tema cambiado"
 
-#: src/gui/setup_theme.cpp:282 src/gui/setup_video.cpp:670
-#: src/gui/setup_video.cpp:675
+#: src/gui/setup_theme.cpp:283 src/gui/setup_video.cpp:619
+#: src/gui/setup_video.cpp:624
 msgid "Restart your client for the change to take effect."
 msgstr "Reincie el juego para que los cambios tengan efecto."
 
@@ -2276,137 +2337,117 @@ msgstr "medio"
 msgid "max"
 msgstr "máximo"
 
-#: src/gui/setup_video.cpp:293
+#: src/gui/setup_video.cpp:288
 msgid "Full screen"
 msgstr "Pantalla completa"
 
-#: src/gui/setup_video.cpp:294
-msgid "Hw acceleration"
-msgstr "Aceleración de hardware"
-
-#: src/gui/setup_video.cpp:295
+#: src/gui/setup_video.cpp:289
 msgid "Custom cursor"
 msgstr "Cursor propio"
 
-#: src/gui/setup_video.cpp:297
+#: src/gui/setup_video.cpp:291
 msgid "Particle effects"
 msgstr "Efectos de partículas"
 
-#: src/gui/setup_video.cpp:299
+#: src/gui/setup_video.cpp:293
 msgid "Show pickup notification"
 msgstr "Mostrar aviso al coger algo"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:301
+#: src/gui/setup_video.cpp:295
 msgid "in chat"
 msgstr "en chat"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:303
+#: src/gui/setup_video.cpp:297
 msgid "as particle"
 msgstr "como partícula"
 
-#: src/gui/setup_video.cpp:305
-msgid "Enable opacity cache"
-msgstr "Habilitar caché de opacidad"
-
-#: src/gui/setup_video.cpp:306
-msgid "Enable map reduce"
-msgstr "Habilitar reducción del mapa"
-
-#: src/gui/setup_video.cpp:308
-msgid "Auto adjust perfomance"
-msgstr ""
-
-#: src/gui/setup_video.cpp:310
-msgid "Show beings transparency"
-msgstr ""
-
-#: src/gui/setup_video.cpp:315
+#: src/gui/setup_video.cpp:302
 msgid "FPS limit:"
 msgstr "Limite FPS:"
 
-#: src/gui/setup_video.cpp:319 src/gui/setup_video.cpp:356
-#: src/gui/setup_video.cpp:607 src/gui/setup_video.cpp:760
+#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
+#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709
 msgid "Alt FPS limit: "
 msgstr "Limites alternativas FPS: "
 
-#: src/gui/setup_video.cpp:328
+#: src/gui/setup_video.cpp:315
 msgid "Video"
 msgstr "Vídeo"
 
-#: src/gui/setup_video.cpp:334
+#: src/gui/setup_video.cpp:321
 msgid "Overhead text"
 msgstr "Sobrecarga de texto"
 
-#: src/gui/setup_video.cpp:335
+#: src/gui/setup_video.cpp:322
 msgid "Gui opacity"
 msgstr "Opacidad de interfaz"
 
-#: src/gui/setup_video.cpp:336
+#: src/gui/setup_video.cpp:323
 msgid "Ambient FX"
 msgstr "Ambiente FX"
 
-#: src/gui/setup_video.cpp:337
+#: src/gui/setup_video.cpp:324
 msgid "Particle detail"
 msgstr "Detalle de partículas"
 
-#: src/gui/setup_video.cpp:354 src/gui/setup_video.cpp:357
-#: src/gui/setup_video.cpp:606 src/gui/setup_video.cpp:747
-#: src/gui/setup_video.cpp:758
+#: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
+#: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
+#: src/gui/setup_video.cpp:707
 msgid "None"
 msgstr "Nada"
 
-#: src/gui/setup_video.cpp:511
+#: src/gui/setup_video.cpp:484
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 "Fallo al cambiar para el modo ventana y fallo al restaurar el modo anterior!"
 
-#: src/gui/setup_video.cpp:517
+#: src/gui/setup_video.cpp:490
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 "Fallo al cambiar para el modo ventana completa y fallo al restaurar el modo "
 "anterior!"
 
-#: src/gui/setup_video.cpp:528
+#: src/gui/setup_video.cpp:501
 msgid "Switching to Full Screen"
 msgstr "Cambiando a pantalla completa"
 
-#: src/gui/setup_video.cpp:529
+#: src/gui/setup_video.cpp:502
 msgid "Restart needed for changes to take effect."
 msgstr "Reinicio necesario para que los cambios tengan su efecto."
 
-#: src/gui/setup_video.cpp:541
+#: src/gui/setup_video.cpp:514
 msgid "Changing to OpenGL"
 msgstr "Cambiando a OpenGL"
 
-#: src/gui/setup_video.cpp:542
+#: src/gui/setup_video.cpp:515
 msgid "Applying change to OpenGL requires restart."
 msgstr "Aplicar el intercambio a OpenGL requiere reiniciar el juego."
 
-#: src/gui/setup_video.cpp:653
+#: src/gui/setup_video.cpp:602
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Resolución personalizada (ejemplo: 1024x768)"
 
-#: src/gui/setup_video.cpp:654
+#: src/gui/setup_video.cpp:603
 msgid "Enter new resolution:                "
 msgstr "Ingrese la nueva resolución:                "
 
-#: src/gui/setup_video.cpp:669 src/gui/setup_video.cpp:674
+#: src/gui/setup_video.cpp:618 src/gui/setup_video.cpp:623
 msgid "Screen Resolution Changed"
 msgstr "Resolución de pantalla cambiada"
 
-#: src/gui/setup_video.cpp:672
+#: src/gui/setup_video.cpp:621
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr "Algunas ventanas deben ser movidas a una resolución más baja."
 
-#: src/gui/setup_video.cpp:705
+#: src/gui/setup_video.cpp:654
 msgid "Particle Effect Settings Changed."
 msgstr "Configuración del efecto de las partículas cambiado."
 
-#: src/gui/setup_video.cpp:706
+#: src/gui/setup_video.cpp:655
 msgid "Changes will take effect on map change."
 msgstr "Los cambios tendran efecto cuando se cambie de mapa."
 
@@ -2435,7 +2476,8 @@ msgstr "Anunciar"
 msgid "Show links in announce"
 msgstr "Mostrar enlaces en anuncio"
 
-#: src/gui/shopwindow.cpp:723 src/net/manaserv/tradehandler.cpp:127
+#: src/gui/shopwindow.cpp:723 src/net/ea/tradehandler.cpp:106
+#: src/net/manaserv/tradehandler.cpp:127
 msgid "Request for Trade"
 msgstr "Propuesta de intercambio"
 
@@ -2477,7 +2519,7 @@ msgstr "Nivel: %d"
 msgid "Lvl: %d (%+d)"
 msgstr "Nivel: %d (%+d)"
 
-#: src/gui/socialwindow.cpp:117
+#: src/gui/socialwindow.cpp:117 src/net/ea/gui/guildtab.cpp:52
 msgid "Guild"
 msgstr "gremio"
 
@@ -2509,7 +2551,7 @@ msgstr "¿Dejar el Gremio?"
 msgid "Are you sure you want to leave guild %s?"
 msgstr "¿Estás seguro de que quieres dejar el gremio %s?"
 
-#: src/gui/socialwindow.cpp:215
+#: src/gui/socialwindow.cpp:215 src/net/ea/gui/partytab.cpp:50
 msgid "Party"
 msgstr "Grupo"
 
@@ -2671,243 +2713,243 @@ msgstr "Escoja el nombre del grupo."
 msgid "Specials"
 msgstr "Especiales"
 
-#: src/gui/statuspopup.cpp:196
+#: src/gui/statuspopup.cpp:197
 msgid "(D) default moves"
 msgstr "(D) moverse predeterminado"
 
-#: src/gui/statuspopup.cpp:201
+#: src/gui/statuspopup.cpp:202
 msgid "(I) invert moves"
 msgstr "(I) moverse invertido"
 
-#: src/gui/statuspopup.cpp:206
+#: src/gui/statuspopup.cpp:207
 msgid "(c) moves with some crazy moves"
 msgstr "(c) moverse con algunos movimientos locos"
 
-#: src/gui/statuspopup.cpp:211
+#: src/gui/statuspopup.cpp:212
 msgid "(C) moves with crazy moves"
 msgstr "(C) moverse con movimientos locos"
 
-#: src/gui/statuspopup.cpp:216
+#: src/gui/statuspopup.cpp:217
 msgid "(d) double normal + crazy"
 msgstr "(d) doble normal + loco"
 
-#: src/gui/statuspopup.cpp:221
+#: src/gui/statuspopup.cpp:222
 msgid "(?) move"
 msgstr "(?) maniobra"
 
-#: src/gui/statuspopup.cpp:239
+#: src/gui/statuspopup.cpp:240
 msgid "(a) custom crazy move"
 msgstr "(a) maniobra alocada personalizada"
 
-#: src/gui/statuspopup.cpp:243
+#: src/gui/statuspopup.cpp:244
 msgid "(?) crazy move"
 msgstr "(?) maniobra loca"
 
-#: src/gui/statuspopup.cpp:253
+#: src/gui/statuspopup.cpp:254
 msgid "(0) default moves to target"
 msgstr "(0) moverse por defecto hacia el objetivo"
 
-#: src/gui/statuspopup.cpp:258
+#: src/gui/statuspopup.cpp:259
 msgid "(1) moves to target in distance 1"
 msgstr "(1) moverse al objetivo en distancia 1"
 
-#: src/gui/statuspopup.cpp:263
+#: src/gui/statuspopup.cpp:264
 msgid "(2) moves to target in distance 2"
 msgstr "(2) moverse al objetivo en distancia 2"
 
-#: src/gui/statuspopup.cpp:268
+#: src/gui/statuspopup.cpp:269
 msgid "(3) moves to target in distance 3"
 msgstr "(3) moverse al objetivo en distancia 3"
 
-#: src/gui/statuspopup.cpp:273
+#: src/gui/statuspopup.cpp:274
 msgid "(5) moves to target in distance 5"
 msgstr "(5) moverse al objetivo en distancia 5"
 
-#: src/gui/statuspopup.cpp:278
+#: src/gui/statuspopup.cpp:279
 msgid "(7) moves to target in distance 7"
 msgstr "(7) moverse al objetivo en distancia 7"
 
-#: src/gui/statuspopup.cpp:283
+#: src/gui/statuspopup.cpp:284
 msgid "(A) moves to target in attack range"
 msgstr "(A) desplazarse al objetivo en el rango de ataque"
 
-#: src/gui/statuspopup.cpp:288
+#: src/gui/statuspopup.cpp:289
 msgid "(?) move to target"
 msgstr "(?) mover al objetivo"
 
-#: src/gui/statuspopup.cpp:296
+#: src/gui/statuspopup.cpp:297
 msgid "(D) default follow"
 msgstr "(D) seguimiento predeterminado"
 
-#: src/gui/statuspopup.cpp:300
+#: src/gui/statuspopup.cpp:301
 msgid "(R) relative follow"
 msgstr "(R) seguimiento relativo"
 
-#: src/gui/statuspopup.cpp:304
+#: src/gui/statuspopup.cpp:305
 msgid "(M) mirror follow"
 msgstr "(M) seguimiento tipo espejo"
 
-#: src/gui/statuspopup.cpp:308
+#: src/gui/statuspopup.cpp:309
 msgid "(P) pet follow"
 msgstr "(P) seguimiento como mascota"
 
-#: src/gui/statuspopup.cpp:312
+#: src/gui/statuspopup.cpp:313
 msgid "(?) unknown follow"
 msgstr "(?) seguimiento desconoicido"
 
-#: src/gui/statuspopup.cpp:321 src/gui/statuspopup.cpp:344
+#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345
 msgid "(D) default attack"
 msgstr "(D) ataque predeterminado"
 
-#: src/gui/statuspopup.cpp:326
+#: src/gui/statuspopup.cpp:327
 msgid "(s) switch attack without shield"
 msgstr "(s) intercambiar ataque sin escudo"
 
-#: src/gui/statuspopup.cpp:331
+#: src/gui/statuspopup.cpp:332
 msgid "(S) switch attack with shield"
 msgstr "(S)  intercambiar ataque con escudo"
 
-#: src/gui/statuspopup.cpp:335 src/gui/statuspopup.cpp:360
+#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
 msgid "(?) attack"
 msgstr "(?) atacar"
 
-#: src/gui/statuspopup.cpp:348
+#: src/gui/statuspopup.cpp:349
 msgid "(G) go and attack"
 msgstr "(G) ir y atacar"
 
-#: src/gui/statuspopup.cpp:352
+#: src/gui/statuspopup.cpp:353
 msgid "(A) go, attack, pickup"
 msgstr "(A) ir, atacar, recoger"
 
-#: src/gui/statuspopup.cpp:356
+#: src/gui/statuspopup.cpp:357
 msgid "(d) without auto attack"
 msgstr "(d) sin atacar automáticamente"
 
-#: src/gui/statuspopup.cpp:374
+#: src/gui/statuspopup.cpp:375
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) recoger a 1x1 celdas (pequeño)"
 
-#: src/gui/statuspopup.cpp:378
+#: src/gui/statuspopup.cpp:379
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) recoger a 2x1 celdas (predeterminado)"
 
-#: src/gui/statuspopup.cpp:382
+#: src/gui/statuspopup.cpp:383
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) recoger interesadamente a 2x3 celda"
 
-#: src/gui/statuspopup.cpp:386
+#: src/gui/statuspopup.cpp:387
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) recoger a 3x3 celdas"
 
-#: src/gui/statuspopup.cpp:390
+#: src/gui/statuspopup.cpp:391
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) ir y recoger en distancia 4"
 
-#: src/gui/statuspopup.cpp:394
+#: src/gui/statuspopup.cpp:395
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) ir y recoger en distancia 8"
 
-#: src/gui/statuspopup.cpp:398
+#: src/gui/statuspopup.cpp:399
 msgid "(A) go and pick up in max distance"
 msgstr "(A) ir y recoger a máxima distancia"
 
-#: src/gui/statuspopup.cpp:402
+#: src/gui/statuspopup.cpp:403
 msgid "(?) pick up"
 msgstr "(?) recoger"
 
-#: src/gui/statuspopup.cpp:411
+#: src/gui/statuspopup.cpp:412
 msgid "(N) normal map view"
 msgstr "(N) vista normal del mapa"
 
-#: src/gui/statuspopup.cpp:415
+#: src/gui/statuspopup.cpp:416
 msgid "(D) debug map view"
 msgstr "(D) vista depurar del mapa"
 
-#: src/gui/statuspopup.cpp:419
+#: src/gui/statuspopup.cpp:420
 msgid "(u) ultra map view"
 msgstr "(u) ultra vista del mapa"
 
-#: src/gui/statuspopup.cpp:423
+#: src/gui/statuspopup.cpp:424
 msgid "(U) ultra map view 2"
 msgstr "(U) ultra vista del mapa 2"
 
-#: src/gui/statuspopup.cpp:427
+#: src/gui/statuspopup.cpp:428
 msgid "(e) empty map view"
 msgstr "(e) vista vacía del mapa"
 
-#: src/gui/statuspopup.cpp:431
+#: src/gui/statuspopup.cpp:432
 msgid "(b) black & white map view"
 msgstr "(b) vista del mapa en blanco y negro"
 
-#: src/gui/statuspopup.cpp:435
+#: src/gui/statuspopup.cpp:436
 msgid "(?) map view"
 msgstr "(?) vista del mapa"
 
-#: src/gui/statuspopup.cpp:443
+#: src/gui/statuspopup.cpp:444
 msgid "(f) use #flar for magic attack"
 msgstr "(f) usar #flar para ataque mágico"
 
-#: src/gui/statuspopup.cpp:448
+#: src/gui/statuspopup.cpp:449
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) usar #chiza para ataque mágico"
 
-#: src/gui/statuspopup.cpp:453
+#: src/gui/statuspopup.cpp:454
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) usar #ingrav para ataque mágico"
 
-#: src/gui/statuspopup.cpp:458
+#: src/gui/statuspopup.cpp:459
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) usar #frillyar para ataque mágico"
 
-#: src/gui/statuspopup.cpp:463
+#: src/gui/statuspopup.cpp:464
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) usar #upmarmu para ataque mágico"
 
-#: src/gui/statuspopup.cpp:467
+#: src/gui/statuspopup.cpp:468
 msgid "(?) magic attack"
 msgstr "(?) ataque mágico"
 
-#: src/gui/statuspopup.cpp:476
+#: src/gui/statuspopup.cpp:477
 msgid "(D) default imitation"
 msgstr "(D) imitación predeterminada"
 
-#: src/gui/statuspopup.cpp:480
+#: src/gui/statuspopup.cpp:481
 msgid "(O) outfits imitation"
 msgstr "(O) imitación de conjuntos"
 
-#: src/gui/statuspopup.cpp:484
+#: src/gui/statuspopup.cpp:485
 msgid "(?) imitation"
 msgstr "(?) imitación"
 
-#: src/gui/statuspopup.cpp:493
+#: src/gui/statuspopup.cpp:494
 msgid "(O) on keyboard"
 msgstr "(O) en el teclado"
 
-#: src/gui/statuspopup.cpp:496
+#: src/gui/statuspopup.cpp:497
 msgid "(A) away"
 msgstr "(A) lejos del teclado"
 
-#: src/gui/statuspopup.cpp:499 src/gui/statuspopup.cpp:519
+#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
 msgid "(?) away"
 msgstr "(?) afuera"
 
-#: src/gui/statuspopup.cpp:507
+#: src/gui/statuspopup.cpp:508
 msgid "(G) game camera mode"
 msgstr "(G) modo de cámara de juego"
 
-#: src/gui/statuspopup.cpp:511
+#: src/gui/statuspopup.cpp:512
 msgid "(F) free camera mode"
 msgstr "(F) modo de cámara libre"
 
-#: src/gui/statuspopup.cpp:515
+#: src/gui/statuspopup.cpp:516
 msgid "(D) design camera mode"
 msgstr "(D) Definir el modo operativo de la cámara"
 
-#: src/gui/statuspopup.cpp:526
+#: src/gui/statuspopup.cpp:527
 msgid "Game modifiers are disabled"
 msgstr "Modificadores del juego están deshabilitados"
 
-#: src/gui/statuspopup.cpp:531
+#: src/gui/statuspopup.cpp:532
 msgid "Game modifiers are enabled"
 msgstr "Modificadores del juego están habilitados"
 
@@ -3086,87 +3128,87 @@ msgstr "(b)"
 msgid "(O)"
 msgstr "(O)"
 
-#: src/gui/textcommandeditor.cpp:112
+#: src/gui/textcommandeditor.cpp:113
 msgid "No Target"
 msgstr "Ningún objetivo"
 
-#: src/gui/textcommandeditor.cpp:113
+#: src/gui/textcommandeditor.cpp:114
 msgid "Allow Target"
 msgstr "Permitir fijar objetivo"
 
-#: src/gui/textcommandeditor.cpp:114
+#: src/gui/textcommandeditor.cpp:115
 msgid "Need Target"
 msgstr "Necesita fijar objetivo."
 
-#: src/gui/textcommandeditor.cpp:119
+#: src/gui/textcommandeditor.cpp:120
 msgid "General Magic"
 msgstr "Magia General"
 
-#: src/gui/textcommandeditor.cpp:120
+#: src/gui/textcommandeditor.cpp:121
 msgid "Life Magic"
 msgstr "Magia de Vida"
 
-#: src/gui/textcommandeditor.cpp:121
+#: src/gui/textcommandeditor.cpp:122
 msgid "War Magic"
 msgstr "Magia Bélica"
 
-#: src/gui/textcommandeditor.cpp:122
+#: src/gui/textcommandeditor.cpp:123
 msgid "Transmute Magic"
 msgstr "Magia de Transmutación"
 
-#: src/gui/textcommandeditor.cpp:123
+#: src/gui/textcommandeditor.cpp:124
 msgid "Nature Magic"
 msgstr "Magia de Naturaleza"
 
-#: src/gui/textcommandeditor.cpp:124
+#: src/gui/textcommandeditor.cpp:125
 msgid "Astral Magic"
 msgstr "Magia Astral"
 
-#: src/gui/textcommandeditor.cpp:167
+#: src/gui/textcommandeditor.cpp:168
 msgid "Command Editor"
 msgstr "Editor de comando"
 
-#: src/gui/textcommandeditor.cpp:184
+#: src/gui/textcommandeditor.cpp:185
 msgid "magic"
 msgstr "magia"
 
-#: src/gui/textcommandeditor.cpp:188
+#: src/gui/textcommandeditor.cpp:189
 msgid "other"
 msgstr "otro"
 
-#: src/gui/textcommandeditor.cpp:193
+#: src/gui/textcommandeditor.cpp:194
 msgid "Symbol:"
 msgstr "Símbolo:"
 
-#: src/gui/textcommandeditor.cpp:196
+#: src/gui/textcommandeditor.cpp:197
 msgid "Command:"
 msgstr "Comando:"
 
-#: src/gui/textcommandeditor.cpp:199
+#: src/gui/textcommandeditor.cpp:200
 msgid "Mana:"
 msgstr "Maná:"
 
-#: src/gui/textcommandeditor.cpp:205
+#: src/gui/textcommandeditor.cpp:206
 msgid "Target Type:"
 msgstr "Tipo de objetivo:"
 
-#: src/gui/textcommandeditor.cpp:211
+#: src/gui/textcommandeditor.cpp:212
 msgid "Icon:"
 msgstr "Ícono:"
 
-#: src/gui/textcommandeditor.cpp:217
+#: src/gui/textcommandeditor.cpp:218
 msgid "Magic level:"
 msgstr "Nivel de Magia:"
 
-#: src/gui/textcommandeditor.cpp:223
+#: src/gui/textcommandeditor.cpp:224
 msgid "Magic School:"
 msgstr "Escuela de Magia:"
 
-#: src/gui/textcommandeditor.cpp:229
+#: src/gui/textcommandeditor.cpp:230
 msgid "School level:"
 msgstr "Nivel de Escuela:"
 
-#: src/gui/textcommandeditor.cpp:234
+#: src/gui/textcommandeditor.cpp:235
 msgid "Save"
 msgstr "Guardar"
 
@@ -3204,8 +3246,7 @@ msgid "Change"
 msgstr "Cambiar"
 
 #: src/gui/tradewindow.cpp:332
-msgid ""
-"Failed adding item. You can not overlap one kind of item on the window."
+msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Fallo al añadir objeto. No puedes añadir más de un mismo tipo de objeto en "
 "la ventana."
@@ -3397,23 +3438,23 @@ msgstr "Limites de Lugar de Inicio"
 msgid "Road Point"
 msgstr "Mostrar camino"
 
-#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:470
+#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:471
 msgid "Who Is Online - Updating"
 msgstr "Quién está conectado - Actualizando"
 
-#: src/gui/whoisonline.cpp:100
+#: src/gui/whoisonline.cpp:101
 msgid "Update"
 msgstr "Actualizar"
 
-#: src/gui/whoisonline.cpp:293
+#: src/gui/whoisonline.cpp:294
 msgid "Who Is Online - "
 msgstr "Quienes están conectados - "
 
-#: src/gui/whoisonline.cpp:484
+#: src/gui/whoisonline.cpp:485
 msgid "Who Is Online - error"
 msgstr "Quienes están conectados - error"
 
-#: src/gui/whoisonline.cpp:515
+#: src/gui/whoisonline.cpp:516
 msgid "Who Is Online - Update"
 msgstr "Quienes están conectados - Actualizar"
 
@@ -3478,6 +3519,7 @@ msgid "This command makes <nick> a channel operator."
 msgstr "Hacer al jugador <nick> operador del canal."
 
 #: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
+#: src/net/ea/gui/guildtab.cpp:69 src/net/ea/gui/partytab.cpp:85
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr "Si el <nick> posee espacios, enciérrelo entre comillas dobles (\")."
 
@@ -3552,8 +3594,7 @@ msgid "Command: /unignore <player>"
 msgstr "Comando: /unignore <jugador>"
 
 #: src/gui/widgets/whispertab.cpp:131
-msgid ""
-"This command stops ignoring the other player if they are being ignored."
+msgid "This command stops ignoring the other player if they are being ignored."
 msgstr "Este comando para de ignorar al jugador si había sido ignorado."
 
 #: src/gui/windowmenu.cpp:65
@@ -4216,81 +4257,549 @@ msgstr "Gracias por comprar."
 msgid "Unable to buy."
 msgstr "Incapaz de comprar."
 
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
-msgid "Strength"
+#: src/net/ea/charserverhandler.cpp:63
+#, fuzzy
+msgid "Strength:"
 msgstr "Fuerza"
 
-#: src/net/manaserv/attributes.cpp:167
+#: src/net/ea/charserverhandler.cpp:64
+#, fuzzy
+msgid "Agility:"
+msgstr "Agilidad"
+
+#: src/net/ea/charserverhandler.cpp:65
+#, fuzzy
+msgid "Vitality:"
+msgstr "Vitalidad"
+
+#: src/net/ea/charserverhandler.cpp:66
+#, fuzzy
+msgid "Intelligence:"
+msgstr "Inteligencia"
+
+#: src/net/ea/charserverhandler.cpp:67
+#, fuzzy
+msgid "Dexterity:"
+msgstr "Destreza"
+
+#: src/net/ea/charserverhandler.cpp:68
+#, fuzzy
+msgid "Luck:"
+msgstr "Suerte"
+
+#: src/net/ea/charserverhandler.cpp:102
+msgid "Access denied. Most likely, there are too many players on this server."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:106
+#, fuzzy
+msgid "Cannot use this ID."
+msgstr "¡No puedes enviar susurros vacíos!"
+
+#: src/net/ea/charserverhandler.cpp:109
+#, fuzzy
+msgid "Unknown char-server failure."
+msgstr "Error desconocido."
+
+#: src/net/ea/charserverhandler.cpp:138
+msgid "Failed to create character. Most likely the name is already taken."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:237
+#, fuzzy
+msgid "Wrong name."
+msgstr "Error de Token-mágico ."
+
+#: src/net/ea/charserverhandler.cpp:145
+#, fuzzy
+msgid "Incorrect stats."
+msgstr "Contraseña incorrecta"
+
+#: src/net/ea/charserverhandler.cpp:148
+#, fuzzy
+msgid "Incorrect hair."
+msgstr "Contraseña incorrecta"
+
+#: src/net/ea/charserverhandler.cpp:151
+#, fuzzy
+msgid "Incorrect slot."
+msgstr "Contraseña incorrecta"
+
+#: src/net/ea/charserverhandler.cpp:166 src/net/manaserv/charhandler.cpp:210
+msgid "Info"
+msgstr "Información"
+
+#: src/net/ea/charserverhandler.cpp:166
+#, fuzzy
+msgid "Character deleted."
+msgstr "Personaje eliminado."
+
+#: src/net/ea/charserverhandler.cpp:172
+#, fuzzy
+msgid "Failed to delete character."
+msgstr "Ingrese la contraseña para borrar el personaje"
+
+#: src/net/ea/chathandler.cpp:60 src/net/ea/chathandler.cpp:66
+#: src/net/ea/chathandler.cpp:71 src/net/ea/chathandler.cpp:77
+#: src/net/ea/chathandler.cpp:82 src/net/ea/chathandler.cpp:88
+#: src/net/ea/chathandler.cpp:95 src/net/ea/chathandler.cpp:101
+msgid "Channels are not supported!"
+msgstr ""
+
+#: src/net/ea/chathandler.cpp:128
 #, c-format
-msgid "Strength %+.1f"
-msgstr "Fuerza %+.1f"
+msgid "Whisper could not be sent, %s is offline."
+msgstr ""
 
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
-msgid "Agility"
-msgstr "Agilidad"
+#: src/net/ea/chathandler.cpp:136
+#, fuzzy, c-format
+msgid "Whisper could not be sent, ignored by %s."
+msgstr "¡Al jugador no se le puede dejar de ignorar!"
 
-#: src/net/manaserv/attributes.cpp:180
+#: src/net/ea/chathandler.cpp:348
+#, fuzzy
+msgid "MVP player."
+msgstr "Jugador"
+
+#: src/net/ea/chathandler.cpp:352
+#, fuzzy
+msgid "MVP player: "
+msgstr "Jugador"
+
+#: src/net/ea/gamehandler.cpp:86
 #, c-format
-msgid "Agility %+.1f"
-msgstr "Agilidad %+.1f"
+msgid "Online users: %d"
+msgstr ""
 
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
-msgid "Dexterity"
-msgstr "Destreza"
+#: src/net/ea/gamehandler.cpp:98
+msgid "Game"
+msgstr ""
 
-#: src/net/manaserv/attributes.cpp:193
+#: src/net/ea/gamehandler.cpp:98
+#, fuzzy
+msgid "Request to quit denied!"
+msgstr "Propuesta de intercambio"
+
+#: src/net/ea/gui/guildtab.cpp:67 src/net/ea/gui/partytab.cpp:83
+#, fuzzy
+msgid "Command: /invite <nick>"
+msgstr "Comando: /kick <nick>"
+
+#: src/net/ea/gui/guildtab.cpp:68
+#, fuzzy
+msgid "This command invites <nick> to the guild you're in."
+msgstr "Hacer al jugador <nick> operador del canal."
+
+#: src/net/ea/gui/guildtab.cpp:74 src/net/ea/gui/partytab.cpp:90
+#, fuzzy
+msgid "Command: /leave"
+msgstr "Comando: /close"
+
+#: src/net/ea/gui/guildtab.cpp:75
+#, fuzzy
+msgid "This command causes the player to leave the guild."
+msgstr "Este comando establece el tema a <mensaje> ."
+
+#: src/net/ea/gui/guildtab.cpp:135 src/net/ea/gui/partytab.cpp:69
+#, fuzzy
+msgid "/help > Display this help."
+msgstr "  -h --help           : Muestra la ayuda"
+
+#: src/net/ea/gui/guildtab.cpp:136
+msgid "/invite > Invite a player to your guild"
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:137
+msgid "/leave > Leave the guild you are in"
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:138
+#, fuzzy
+msgid "/kick > Kick some one from the guild you are in"
+msgstr "/kick > Expulsar un usuario del canal"
+
+#: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
+msgid "Guild created."
+msgstr "Gremio creado."
+
+#: src/net/ea/guildhandler.cpp:88 src/net/ea/guildhandler.cpp:93
+#, fuzzy
+msgid "You are already in guild."
+msgstr "Error al crear el gremio."
+
+#: src/net/ea/guildhandler.cpp:98
+msgid "Emperium check failed."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:103
+#, fuzzy
+msgid "Unknown server response."
+msgstr "Error desconocido."
+
+#: src/net/ea/guildhandler.cpp:180
+#, fuzzy, c-format
+msgid "Guild name: %s"
+msgstr "Gremio: %s"
+
+#: src/net/ea/guildhandler.cpp:182
+#, fuzzy, c-format
+msgid "Guild master: %s"
+msgstr "Gremio: %s"
+
+#: src/net/ea/guildhandler.cpp:184
+#, fuzzy, c-format
+msgid "Guild level: %d"
+msgstr "Nivel: %d"
+
+#: src/net/ea/guildhandler.cpp:186
 #, c-format
-msgid "Dexterity %+.1f"
-msgstr "Destreza %+.1f"
+msgid "Online members: %d"
+msgstr ""
 
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
-msgid "Vitality"
-msgstr "Vitalidad"
+#: src/net/ea/guildhandler.cpp:188
+#, c-format
+msgid "Max members: %d"
+msgstr ""
 
-#: src/net/manaserv/attributes.cpp:206
+#: src/net/ea/guildhandler.cpp:190
+#, fuzzy, c-format
+msgid "Average level: %d"
+msgstr "Nivel de Magia:"
+
+#: src/net/ea/guildhandler.cpp:192
+#, fuzzy, c-format
+msgid "Guild exp: %d"
+msgstr "Gremio: %s"
+
+#: src/net/ea/guildhandler.cpp:194
+#, fuzzy, c-format
+msgid "Guild next exp: %d"
+msgstr "Gremio creado."
+
+#: src/net/ea/guildhandler.cpp:196
+#, fuzzy, c-format
+msgid "Guild castle: %s"
+msgstr "Gremio: %s"
+
+#: src/net/ea/guildhandler.cpp:402
+#, fuzzy
+msgid "Could not inivte user to guild."
+msgstr "Invita al jugador %s para su gremio %s."
+
+#: src/net/ea/guildhandler.cpp:406
+#, fuzzy
+msgid "User rejected guild invite."
+msgstr "%s canceló tu invitación."
+
+#: src/net/ea/guildhandler.cpp:410
+msgid "User is now part of your guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:414
+msgid "Your guild is full."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:418
+#, fuzzy
+msgid "Unknown guild invite response."
+msgstr "Aceptada la invitación al gremio de  %s."
+
+#: src/net/ea/guildhandler.cpp:438
+msgid "You have left the guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:452
+#, fuzzy, c-format
+msgid "%s has left your guild."
+msgstr "Escoja el nombre de su gremio."
+
+#: src/net/ea/guildhandler.cpp:483
+#, fuzzy
+msgid "You was kicked from guild."
+msgstr "Sacar del gremio"
+
+#: src/net/ea/guildhandler.cpp:496
+#, fuzzy, c-format
+msgid "%s has kicked from your guild."
+msgstr "%s expulsó a %s."
+
+#: src/net/ea/gui/partytab.cpp:70
+msgid "/invite > Invite a player to your party"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:71
+msgid "/leave > Leave the party you are in"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:72
+#, fuzzy
+msgid "/kick > Kick some one from the party you are in"
+msgstr "/kick > Expulsar un usuario del canal"
+
+#: src/net/ea/gui/partytab.cpp:73
+msgid "/item > Show/change party item sharing options"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:74
+msgid "/exp > Show/change party experience sharing options"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:84
+#, fuzzy
+msgid "This command invites <nick> to party with you."
+msgstr "Expulsar <nick> del canal."
+
+#: src/net/ea/gui/partytab.cpp:91
+#, fuzzy
+msgid "This command causes the player to leave the party."
+msgstr "Este comando establece el tema a <mensaje> ."
+
+#: src/net/ea/gui/partytab.cpp:95
+#, fuzzy
+msgid "Command: /item <policy>"
+msgstr "Comando: /kick <nick>"
+
+#: src/net/ea/gui/partytab.cpp:97
+#, fuzzy
+msgid "This command changes the party's item sharing policy."
+msgstr "Mostrar los usuarios en este canal."
+
+#: src/net/ea/gui/partytab.cpp:98
+msgid ""
+"<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
+"\"0\", \"no\", \"false\" to disable item sharing."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:101
+#, fuzzy
+msgid "Command: /item"
+msgstr "Comando: /quit"
+
+#: src/net/ea/gui/partytab.cpp:102
+#, fuzzy
+msgid "This command displays the party's current item sharing policy."
+msgstr "Salir del canal."
+
+#: src/net/ea/gui/partytab.cpp:107
+#, fuzzy
+msgid "Command: /exp <policy>"
+msgstr "Comando: /op <nick>"
+
+#: src/net/ea/gui/partytab.cpp:108
+#, fuzzy
+msgid "This command changes the party's experience sharing policy."
+msgstr "Salir del canal."
+
+#: src/net/ea/gui/partytab.cpp:110
+msgid ""
+"<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
+"sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:113
+#, fuzzy
+msgid "Command: /exp"
+msgstr "Comando: /users"
+
+#: src/net/ea/gui/partytab.cpp:114
+#, fuzzy
+msgid "This command displays the party's current experience sharing policy."
+msgstr "Salir del canal."
+
+#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:286
+msgid "Item sharing enabled."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:296
+msgid "Item sharing disabled."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:306
+msgid "Item sharing not possible."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:157
+msgid "Item sharing unknown."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:248
+msgid "Experience sharing enabled."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:258
+msgid "Experience sharing disabled."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:268
+msgid "Experience sharing not possible."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:196
+msgid "Experience sharing unknown."
+msgstr ""
+
+#: src/net/ea/inventoryhandler.cpp:407
+#, fuzzy
+msgid "Failed to use item."
+msgstr "Error al cambiar estado del miembro."
+
+#: src/net/ea/inventoryhandler.cpp:580
+#, fuzzy
+msgid "Unable to equip."
+msgstr "Incapaz de comprar."
+
+#: src/net/ea/loginhandler.cpp:131
+#, fuzzy
+msgid "Account was not found. Please re-login."
+msgstr "Cuenta no conectada. Por favor conéctate primero."
+
+#: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127
+msgid "Old password incorrect."
+msgstr "Contrasena antigua incorrecta."
+
+#: src/net/ea/loginhandler.cpp:137
+#, fuzzy
+msgid "New password too short."
+msgstr "Nueva contraseña incorrecta."
+
+#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:243
+#: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
+#: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
+#: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
+msgid "Unknown error."
+msgstr "Error desconocido."
+
+#: src/net/ea/loginhandler.cpp:205
+#, fuzzy
+msgid "Unregistered ID."
+msgstr "Cancelar Registro"
+
+#: src/net/ea/loginhandler.cpp:208
+#, fuzzy
+msgid "Wrong password."
+msgstr "Nombre de usuario o contraseña incorrectos."
+
+#: src/net/ea/loginhandler.cpp:211
+#, fuzzy
+msgid "Account expired."
+msgstr "Cuenta Baneada."
+
+#: src/net/ea/loginhandler.cpp:214
+#, fuzzy
+msgid "Rejected from server."
+msgstr "¡Desconectado del servidor!"
+
+#: src/net/ea/loginhandler.cpp:217
+msgid ""
+"You have been permanently banned from the game. Please contact the GM team."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:221
+#, fuzzy
+msgid "Client too old."
+msgstr "La version del cliente es demasiado antigua."
+
+#: src/net/ea/loginhandler.cpp:224
 #, c-format
-msgid "Vitality %+.1f"
-msgstr "Vitalidad %+.1f"
+msgid ""
+"You have been temporarily banned from the game until %s.\n"
+"Please contact the GM team via the forums."
+msgstr ""
 
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
-msgid "Intelligence"
-msgstr "Inteligencia"
+#: src/net/ea/loginhandler.cpp:231
+msgid "Server overpopulated."
+msgstr ""
 
-#: src/net/manaserv/attributes.cpp:219
+#: src/net/ea/loginhandler.cpp:234
+#, fuzzy
+msgid "This user name is already taken."
+msgstr "Ya hay alguien conectado con esta cuenta."
+
+#: src/net/ea/loginhandler.cpp:240
+#, fuzzy
+msgid "Username permanently erased."
+msgstr "Usuario ya existe."
+
+#: src/net/ea/partyhandler.cpp:82
+#, fuzzy
+msgid "Could not create party."
+msgstr "Crear grupo"
+
+#: src/net/ea/partyhandler.cpp:84
+#, fuzzy
+msgid "Party successfully created."
+msgstr "¡Jugador borrado con éxito!"
+
+#: src/net/ea/partyhandler.cpp:140
+#, fuzzy, c-format
+msgid "%s has joined your party."
+msgstr "%s no está en tu grupo!"
+
+#: src/net/ea/partyhandler.cpp:176
 #, c-format
-msgid "Intelligence %+.1f"
-msgstr "Inteligencia %+.1f"
+msgid "%s is already a member of a party."
+msgstr ""
 
-#: src/net/manaserv/attributes.cpp:225
-msgid "Willpower"
-msgstr "Fuerza de voluntad"
+#: src/net/ea/partyhandler.cpp:181
+#, fuzzy, c-format
+msgid "%s refused your invitation."
+msgstr "%s canceló tu invitación."
 
-#: src/net/manaserv/attributes.cpp:232
+#: src/net/ea/partyhandler.cpp:186
+#, fuzzy, c-format
+msgid "%s is now a member of your party."
+msgstr "%s no está en tu grupo!"
+
+#: src/net/ea/partyhandler.cpp:191
 #, c-format
-msgid "Willpower %+.1f"
-msgstr "Voluntad %+.1f"
+msgid "%s can't join your party because party is full."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:196
+#, c-format
+msgid "QQQ Unknown invite response for %s."
+msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/partyhandler.cpp:356
+#, fuzzy
+msgid "You have left the party."
+msgstr "Has sido invitado para unirte al grupo %s."
+
+#: src/net/ea/partyhandler.cpp:368
+#, fuzzy, c-format
+msgid "%s has left your party."
+msgstr "%s no está en tu grupo!"
+
+#: src/net/ea/partyhandler.cpp:444
+#, c-format
+msgid "An unknown member tried to say: %s"
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:95 src/net/manaserv/beinghandler.cpp:315
 msgid "You are dead."
 msgstr "Estás muerto"
 
-#: src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:316
 msgid "We regret to inform you that your character was killed in battle."
 msgstr "Lamentamos informarte de que tu personaje fue aniquilado en combate."
 
-#: src/net/manaserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:318
 msgid "You are not that alive anymore."
 msgstr "Ya no estás tan vivo..."
 
-#: src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:319
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr "Las manos frías de la muerte se están apoderando de tu alma."
 
-#: src/net/manaserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:320
 msgid "Game Over!"
 msgstr "Fin Del Juego!"
 
-#: src/net/manaserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:101
+msgid "Insert coin to continue."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:321
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
@@ -4298,7 +4807,7 @@ msgstr ""
 "No, niños. Tu jugador no murió realmente. Solo... eeeh... fue a un lugar "
 "mejor ."
 
-#: src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:323
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
@@ -4306,31 +4815,321 @@ msgstr ""
 "¡Parece que tu plan de romper las armas de tus enemigos con tu garganta "
 "falló!"
 
-#: src/net/manaserv/beinghandler.cpp:325
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:325
 msgid "I guess this did not run too well."
 msgstr "Creo que esto no fue muy bien."
 
-#: src/net/manaserv/beinghandler.cpp:326
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:326
 msgid "Do you want your possessions identified?"
 msgstr "¿Quieres que tus posesiones sean identificadas?"
 
-#: src/net/manaserv/beinghandler.cpp:327
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:327
 msgid "Sadly, no trace of you was ever found..."
 msgstr "Desgraciadamente, nada de ti fue encontrado..."
 
-#: src/net/manaserv/beinghandler.cpp:329
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:329
 msgid "Annihilated."
 msgstr "Aniquilado."
 
-#: src/net/manaserv/beinghandler.cpp:330
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:330
 msgid "Looks like you got your head handed to you."
 msgstr "Parece que te tiraron tu cabeza a tus manos."
 
-#: src/net/manaserv/beinghandler.cpp:332
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:332
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr "Parece que te asustaste , revive en otro cuerpo y sigue tu aventura ."
 
+#: src/net/ea/playerhandler.cpp:119
+msgid "You're not dead yet. You're just resting."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:120
+#, fuzzy
+msgid "You are no more."
+msgstr "Estás muerto"
+
+#: src/net/ea/playerhandler.cpp:121
+#, fuzzy
+msgid "You have ceased to be."
+msgstr "Estás muerto"
+
+#: src/net/ea/playerhandler.cpp:122
+msgid "You've expired and gone to meet your maker."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:123
+msgid "You're a stiff."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:124
+msgid "Bereft of life, you rest in peace."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:125
+msgid "If you weren't so animated, you'd be pushing up the daisies."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:126
+msgid "Your metabolic processes are now history."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:127
+msgid "You're off the twig."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:128
+msgid "You've kicked the bucket."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:129
+msgid ""
+"You've shuffled off your mortal coil, run down the curtain and joined the "
+"bleedin' choir invisibile."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:131
+#, fuzzy
+msgid "You are an ex-player."
+msgstr "Estás muerto"
+
+#: src/net/ea/playerhandler.cpp:132
+msgid "You're pining for the fjords."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
+#: src/net/ea/playerhandler.cpp:425
+#, fuzzy
+msgid "Message"
+msgstr "Mensajes"
+
+#: src/net/ea/playerhandler.cpp:337
+msgid ""
+"You are carrying more than half your weight. You are unable to regain health."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:347
+msgid "You are carrying less than half your weight. You can regain health."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:451
+#, fuzzy, c-format
+msgid "You picked up %s."
+msgstr "Usted cogió un/a %d [@@%d|%s@@]."
+
+#: src/net/ea/playerhandler.cpp:457
+#, fuzzy, c-format
+msgid "You spent %s."
+msgstr "Tú recibes %s"
+
+#: src/net/ea/playerhandler.cpp:501
+msgid "Cannot raise skill!"
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:618
+#, fuzzy
+msgid "Equip arrows first."
+msgstr "Quitárselo antes"
+
+#: src/net/ea/specialhandler.cpp:149
+#, fuzzy
+msgid "Trade failed!"
+msgstr "Intercambio Cancelado."
+
+#: src/net/ea/specialhandler.cpp:152
+#, fuzzy
+msgid "Emote failed!"
+msgstr "Error al expulsar!"
+
+#: src/net/ea/specialhandler.cpp:155
+#, fuzzy
+msgid "Sit failed!"
+msgstr "Error al expulsar!"
+
+#: src/net/ea/specialhandler.cpp:158
+#, fuzzy
+msgid "Chat creating failed!"
+msgstr "Fallo en la autentificación."
+
+#: src/net/ea/specialhandler.cpp:161
+#, fuzzy
+msgid "Could not join party!"
+msgstr "%s no está en tu grupo!"
+
+#: src/net/ea/specialhandler.cpp:164
+msgid "Cannot shout!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:177
+msgid "You have not yet reached a high enough lvl!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:181
+msgid "Insufficient HP!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:184
+msgid "Insufficient SP!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:187
+#, fuzzy
+msgid "You have no memos!"
+msgstr "No tienes dinero suficiente."
+
+#: src/net/ea/specialhandler.cpp:190
+#, fuzzy
+msgid "You cannot do that right now!"
+msgstr "Ya no estás tan vivo..."
+
+#: src/net/ea/specialhandler.cpp:193
+msgid "Seems you need more money... ;-)"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:196
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:200
+msgid "You need another red gem!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:203
+msgid "You need another blue gem!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:206
+msgid "You're carrying to much to do this!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:209
+msgid "Huh? What's that?"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:220
+msgid "Warp failed..."
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:223
+msgid "Could not steal anything..."
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:226
+msgid "Poison had no effect..."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:128
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
+msgstr "%s quiere comerciar contigo, aceptas?"
+
+#: src/net/ea/tradehandler.cpp:130
+msgid "Trading isn't possible. Trade partner is too far away."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:134
+msgid "Trading isn't possible. Character doesn't exist."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:138
+msgid "Trade cancelled due to an unknown reason."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:146
+#, fuzzy, c-format
+msgid "Trade: You and %s"
+msgstr "Intercambio: Tú"
+
+#: src/net/ea/tradehandler.cpp:156
+#, fuzzy, c-format
+msgid "Trade with %s cancelled."
+msgstr "Intercambio Cancelado."
+
+#: src/net/ea/tradehandler.cpp:169
+msgid "Unhandled trade cancel packet."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:231
+msgid "Failed adding item. Trade partner is over weighted."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:236
+msgid "Failed adding item. Trade partner has no free slot."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:241
+#, fuzzy
+msgid "Failed adding item. You can't trade this item."
+msgstr ""
+"Fallo al añadir objeto. No puedes añadir más de un mismo tipo de objeto en "
+"la ventana."
+
+#: src/net/ea/tradehandler.cpp:245
+msgid "Failed adding item for unknown reason."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:264 src/net/manaserv/tradehandler.cpp:160
+msgid "Trade canceled."
+msgstr "Intercambio Cancelado."
+
+#: src/net/ea/tradehandler.cpp:275 src/net/manaserv/tradehandler.cpp:167
+msgid "Trade completed."
+msgstr "Intercambio Realizado."
+
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
+msgid "Strength"
+msgstr "Fuerza"
+
+#: src/net/manaserv/attributes.cpp:167
+#, c-format
+msgid "Strength %+.1f"
+msgstr "Fuerza %+.1f"
+
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
+msgid "Agility"
+msgstr "Agilidad"
+
+#: src/net/manaserv/attributes.cpp:180
+#, c-format
+msgid "Agility %+.1f"
+msgstr "Agilidad %+.1f"
+
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
+msgid "Dexterity"
+msgstr "Destreza"
+
+#: src/net/manaserv/attributes.cpp:193
+#, c-format
+msgid "Dexterity %+.1f"
+msgstr "Destreza %+.1f"
+
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
+msgid "Vitality"
+msgstr "Vitalidad"
+
+#: src/net/manaserv/attributes.cpp:206
+#, c-format
+msgid "Vitality %+.1f"
+msgstr "Vitalidad %+.1f"
+
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
+msgid "Intelligence"
+msgstr "Inteligencia"
+
+#: src/net/manaserv/attributes.cpp:219
+#, c-format
+msgid "Intelligence %+.1f"
+msgstr "Inteligencia %+.1f"
+
+#: src/net/manaserv/attributes.cpp:225
+msgid "Willpower"
+msgstr "Fuerza de voluntad"
+
+#: src/net/manaserv/attributes.cpp:232
+#, c-format
+msgid "Willpower %+.1f"
+msgstr "Voluntad %+.1f"
+
 #: src/net/manaserv/beinghandler.cpp:337
 msgid "Press OK to respawn."
 msgstr "Pulsa OK para reaparecer."
@@ -4386,16 +5185,6 @@ msgstr ""
 msgid "Invalid slot number."
 msgstr "Número de ranura equivocado."
 
-#: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
-#: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
-#: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
-msgid "Unknown error."
-msgstr "Error desconocido."
-
-#: src/net/manaserv/charhandler.cpp:210
-msgid "Info"
-msgstr "Información"
-
 #: src/net/manaserv/charhandler.cpp:210
 msgid "Player deleted."
 msgstr "Personaje eliminado."
@@ -4459,10 +5248,6 @@ msgstr "%s expulsó a %s."
 msgid "Unknown channel event."
 msgstr "Evento de canal desconocido."
 
-#: src/net/manaserv/guildhandler.cpp:85
-msgid "Guild created."
-msgstr "Gremio creado."
-
 #: src/net/manaserv/guildhandler.cpp:90
 msgid "Error creating guild."
 msgstr "Error al crear el gremio."
@@ -4495,10 +5280,6 @@ msgstr "Cuenta Baneada."
 msgid "New password incorrect."
 msgstr "Nueva contraseña incorrecta."
 
-#: src/net/manaserv/loginhandler.cpp:127
-msgid "Old password incorrect."
-msgstr "Contrasena antigua incorrecta."
-
 #: src/net/manaserv/loginhandler.cpp:131 src/net/manaserv/loginhandler.cpp:163
 msgid "Account not connected. Please login first."
 msgstr "Cuenta no conectada. Por favor conéctate primero."
@@ -4576,24 +5357,11 @@ msgstr "Aceptar propuestas de intercambio entrantes."
 msgid "Ignoring incoming trade requests."
 msgstr "Ignorar las propuestas de intercambio entrantes."
 
-#: src/net/manaserv/tradehandler.cpp:128
-#, c-format
-msgid "%s wants to trade with you, do you accept?"
-msgstr "%s quiere comerciar contigo, aceptas?"
-
 #: src/net/manaserv/tradehandler.cpp:146
 #, c-format
 msgid "Trading with %s"
 msgstr "Intercambiando con %s"
 
-#: src/net/manaserv/tradehandler.cpp:160
-msgid "Trade canceled."
-msgstr "Intercambio Cancelado."
-
-#: src/net/manaserv/tradehandler.cpp:167
-msgid "Trade completed."
-msgstr "Intercambio Realizado."
-
 #: src/net/tmwa/adminhandler.cpp:70
 msgid "Kick failed!"
 msgstr "Error al expulsar!"
@@ -4785,4 +5553,5 @@ msgstr "PM %+d"
 msgid "Unknown item"
 msgstr "Objeto desconocido"
 
-
+#~ msgid "Enable opacity cache"
+#~ msgstr "Habilitar caché de opacidad"
diff --git a/po/fi.po b/po/fi.po
index 40923cdc2..3a3ccb234 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,46 +1,46 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Sini Ruohomaa <sini.ruohomaa@iki.fi>, 2011.
 # Andrei Karas <akaras@inbox.ru>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-08 04:26+0300\n"
+"POT-Creation-Date: 2011-08-10 01:11+0300\n"
 "PO-Revision-Date: 2011-08-08 01:29+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: fi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: src/actorspritemanager.cpp:1034
 msgid "Visible on map"
 msgstr "Näkyvillä kartalla"
 
-#: src/being.cpp:541
+#: src/being.cpp:542
 msgid "dodge"
 msgstr "väistö"
 
-#: src/being.cpp:541
+#: src/being.cpp:542
 msgid "miss"
 msgstr "huti"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1513
+#: src/being.cpp:1514
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1518
+#: src/being.cpp:1519
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:825 src/gui/setup.cpp:51 src/gui/windowmenu.cpp:100
+#: src/client.cpp:825 src/gui/setup.cpp:53 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Asetukset"
 
@@ -72,7 +72,8 @@ msgstr "Vaihdan pelipalvelinta"
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
-#: src/gui/unregisterdialog.cpp:137 src/net/manaserv/charhandler.cpp:184
+#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
+#: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "Virhe"
@@ -136,18 +137,18 @@ msgstr "Et voi lähettää tyhjiä kuiskauksia!"
 #: src/commandhandler.cpp:409
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
-" you."
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
+"you."
 msgstr ""
-"Kuiskausvälilehden luonti nimelle \"%s\" epäonnistui! Se on joko jo auki tai"
-" käytit omaa nimeäsi."
+"Kuiskausvälilehden luonti nimelle \"%s\" epäonnistui! Se on joko jo auki tai "
+"käytit omaa nimeäsi."
 
 #: src/commandhandler.cpp:429
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Pyyntö liittyä kanavalle %s lähetetty."
 
-#: src/commandhandler.cpp:445
+#: src/commandhandler.cpp:445 src/net/ea/gui/partytab.cpp:125
 msgid "Party name is missing."
 msgstr "Ryhmän nimi puuttuu."
 
@@ -295,8 +296,8 @@ msgstr "Orvot resurssikuvat:"
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
-"Vaihtoehdot komennolle /%s ovat \"yes\" (kyllä), \"no\" (ei) tai vastaavasti"
-" \"true\", \"false\", \"1\" tai \"0\"."
+"Vaihtoehdot komennolle /%s ovat \"yes\" (kyllä), \"no\" (ei) tai vastaavasti "
+"\"true\", \"false\", \"1\" tai \"0\"."
 
 #: src/game.cpp:246 src/gui/widgets/chattab.cpp:410
 msgid "General"
@@ -359,35 +360,35 @@ msgstr "PvP-taso: %d"
 msgid "Comment: %s"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:265
+#: src/gui/botcheckerwindow.cpp:266
 msgid "Bot Checker"
 msgstr "Bottitutka"
 
-#: src/gui/botcheckerwindow.cpp:295 src/gui/setup_players.cpp:64
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
 msgid "Name"
 msgstr "Nimi"
 
-#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:130
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:130
 #: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:604
 #: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
 msgid "Attack"
 msgstr "Hyökkää"
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:275
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:275
 #: src/keyboardconfig.cpp:62
 msgid "Talk"
 msgstr "Keskustele"
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:241
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:241
 #: src/gui/popupmenu.cpp:280 src/gui/popupmenu.cpp:661
 msgid "Move"
 msgstr "Liiku"
 
-#: src/gui/botcheckerwindow.cpp:299
+#: src/gui/botcheckerwindow.cpp:300
 msgid "Result"
 msgstr "Tulos"
 
-#: src/gui/botcheckerwindow.cpp:309 src/gui/npcdialog.cpp:123
+#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:123
 msgid "Reset"
 msgstr "Nollaa"
 
@@ -456,8 +457,8 @@ msgstr "Myy"
 #: src/gui/popupmenu.cpp:1731 src/gui/popupmenu.cpp:1774
 #: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1849
 #: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1935
-#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:68
-#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:237
+#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:70
+#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:238
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
 #: src/gui/updatewindow.cpp:157
 msgid "Cancel"
@@ -626,8 +627,8 @@ msgid "Enter password:"
 msgstr "Salasana:"
 
 #: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
-#: src/gui/setup_players.cpp:251 src/gui/shopwindow.cpp:120
-#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:240
+#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120
+#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:241
 msgid "Delete"
 msgstr "Poista"
 
@@ -701,10 +702,10 @@ msgid "rainbow 3"
 msgstr "sateenkaari 3"
 
 #: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
-#: src/gui/logindialog.cpp:78 src/gui/setup_players.cpp:220
-#: src/gui/setup_theme.cpp:71 src/gui/setup_theme.cpp:125
-#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:101
-#: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:159
+#: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
+#: src/gui/setup_theme.cpp:72 src/gui/setup_theme.cpp:126
+#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
+#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
 msgid "???"
 msgstr "???"
 
@@ -895,7 +896,7 @@ msgstr ""
 msgid "Auto open this window"
 msgstr ""
 
-#: src/gui/editdialog.cpp:46 src/gui/itemamountwindow.cpp:208
+#: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
 #: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "Ok"
@@ -979,7 +980,7 @@ msgstr "Paino:"
 
 #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
 #: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1724
-#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:69
+#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:71
 msgid "Store"
 msgstr "Varastoi"
 
@@ -1038,91 +1039,91 @@ msgstr ", "
 msgid "Weight: %s"
 msgstr "Paino: %s"
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
+#: src/gui/killstats.cpp:46 src/gui/windowmenu.cpp:69
 msgid "Kill stats"
 msgstr "Tappotilastot"
 
-#: src/gui/killstats.cpp:63
+#: src/gui/killstats.cpp:64
 msgid "Reset stats"
 msgstr "Nollaa tiedot"
 
-#: src/gui/killstats.cpp:64
+#: src/gui/killstats.cpp:65
 msgid "Reset timer"
 msgstr "Nollaa ajastin"
 
-#: src/gui/killstats.cpp:68 src/gui/killstats.cpp:204
+#: src/gui/killstats.cpp:69 src/gui/killstats.cpp:205
 #, c-format
 msgid "Level: %d at %f%%"
 msgstr ""
 
-#: src/gui/killstats.cpp:72 src/gui/killstats.cpp:209
+#: src/gui/killstats.cpp:73 src/gui/killstats.cpp:210
 #, c-format
 msgid "Exp: %d/%d Left: %d"
 msgstr ""
 
-#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:215
-#: src/gui/killstats.cpp:224
+#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:216
+#: src/gui/killstats.cpp:225
 #, c-format
 msgid "1%% = %d exp, avg mob for 1%%: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:141
-#: src/gui/killstats.cpp:233
+#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:142
+#: src/gui/killstats.cpp:234
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:80 src/gui/killstats.cpp:143
-#: src/gui/killstats.cpp:219 src/gui/killstats.cpp:229
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
+#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:230
 #, c-format
 msgid "Avg Exp: %s, No. of avg mob to next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:161
-#: src/gui/killstats.cpp:236
+#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:162
+#: src/gui/killstats.cpp:237
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:88 src/gui/killstats.cpp:93
-#: src/gui/killstats.cpp:288 src/gui/killstats.cpp:304
-#: src/gui/killstats.cpp:322
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:89 src/gui/killstats.cpp:94
+#: src/gui/killstats.cpp:289 src/gui/killstats.cpp:305
+#: src/gui/killstats.cpp:323
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
+#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/gui/killstats.cpp:99 src/gui/killstats.cpp:240
+#: src/gui/killstats.cpp:100 src/gui/killstats.cpp:241
 msgid "Last kill exp:"
 msgstr ""
 
-#: src/gui/killstats.cpp:101 src/gui/killstats.cpp:354
-#: src/gui/killstats.cpp:360 src/gui/killstats.cpp:366
-#: src/gui/killstats.cpp:371
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:355
+#: src/gui/killstats.cpp:361 src/gui/killstats.cpp:367
+#: src/gui/killstats.cpp:372
 msgid "Time before jacko spawn:"
 msgstr ""
 
-#: src/gui/killstats.cpp:293 src/gui/killstats.cpp:300
-#: src/gui/killstats.cpp:310 src/gui/killstats.cpp:317
-#: src/gui/killstats.cpp:329 src/gui/killstats.cpp:336
+#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:301
+#: src/gui/killstats.cpp:311 src/gui/killstats.cpp:318
+#: src/gui/killstats.cpp:330 src/gui/killstats.cpp:337
 #, c-format
 msgid "  Time for next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:360
+#: src/gui/killstats.cpp:361
 #, c-format
 msgid "%s %d?"
 msgstr ""
 
-#: src/gui/killstats.cpp:366
+#: src/gui/killstats.cpp:367
 msgid "jacko spawning"
 msgstr ""
 
@@ -1723,8 +1724,8 @@ msgstr "Huomaa"
 #: src/gui/setup_audio.cpp:120
 msgid "You may have to restart your client if you want to download new music"
 msgstr ""
-"Voit joutua uudelleenkäynnistämään asiakasohjelmasi, jos haluat ladata uudet"
-" musiikit"
+"Voit joutua uudelleenkäynnistämään asiakasohjelmasi, jos haluat ladata uudet "
+"musiikit"
 
 #: src/gui/setup_audio.cpp:133
 msgid "Sound Engine"
@@ -1787,34 +1788,38 @@ msgid "Tabs"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:96
+msgid "Put all whispers in tabs"
+msgstr "Laita kaikki kuiskaukset välilehtiin"
+
+#: src/gui/setup_chat.cpp:99
 msgid "Log magic messages in debug tab"
 msgstr "Kirjaa magiaviestit debug-välilehdelle"
 
-#: src/gui/setup_chat.cpp:99
+#: src/gui/setup_chat.cpp:102
 msgid "Show server messages in debug tab"
 msgstr "Näytä palvelinviestit debug-välilehdellä"
 
-#: src/gui/setup_chat.cpp:102
+#: src/gui/setup_chat.cpp:105
 msgid "Enable trade tab"
 msgstr "Ota kaupankäyntivälilehti käyttöön"
 
-#: src/gui/setup_chat.cpp:105
+#: src/gui/setup_chat.cpp:108
 msgid "Enable battle tab"
 msgstr "Ota taisteluvälilehti käyttöön"
 
-#: src/gui/setup_chat.cpp:108
+#: src/gui/setup_chat.cpp:111
 msgid "Show battle events"
 msgstr "Näytä taistelutapahtumat"
 
-#: src/gui/setup_chat.cpp:111
+#: src/gui/setup_chat.cpp:114
 msgid "Resize chat tabs if need"
 msgstr "Muuta välilehden kokoa tarpeen mukaan"
 
-#: src/gui/setup_chat.cpp:115
+#: src/gui/setup_chat.cpp:118
 msgid "Time"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:117
+#: src/gui/setup_chat.cpp:120
 msgid "Use local time"
 msgstr ""
 
@@ -1865,16 +1870,15 @@ msgstr "Sininen:"
 msgid "Alpha:"
 msgstr "Alfa:"
 
-#: src/gui/setup.cpp:67
+#: src/gui/setup.cpp:69
 msgid "Apply"
 msgstr "Hyväksy"
 
-#: src/gui/setup.cpp:70
+#: src/gui/setup.cpp:72
 msgid "Reset Windows"
 msgstr "Palauta ikkunoiden oletusasetukset"
 
 #: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
-#: src/gui/setup_players.cpp:334
 msgid "Edit"
 msgstr "Muokkaa"
 
@@ -2082,148 +2086,202 @@ msgstr "Piilota kilpihahmo"
 msgid "Show background"
 msgstr "Näytä tausta"
 
-#: src/gui/setup_players.cpp:65
-msgid "Relation"
-msgstr "Relaatio"
+#: src/gui/setup_perfomance.cpp:48
+msgid "Perfomance"
+msgstr ""
 
-#: src/gui/setup_players.cpp:70
-msgid "Neutral"
-msgstr "Neutraali"
+#: src/gui/setup_perfomance.cpp:55
+msgid "Better perfomance (enable for better perfomance)"
+msgstr ""
 
-#: src/gui/setup_players.cpp:71
-msgid "Friend"
-msgstr "Ystävä"
+#: src/gui/setup_perfomance.cpp:58
+msgid "Auto adjust perfomance"
+msgstr ""
 
-#: src/gui/setup_players.cpp:72
-msgid "Disregarded"
-msgstr "Vaimennettu"
+#: src/gui/setup_perfomance.cpp:61
+msgid "Show beings transparency"
+msgstr ""
 
-#: src/gui/setup_players.cpp:73
-msgid "Ignored"
-msgstr "Huomiotta jätetty"
+#: src/gui/setup_perfomance.cpp:64
+msgid "Hw acceleration"
+msgstr "Rautakiihdytys"
 
-#: src/gui/setup_players.cpp:74
-msgid "Erased"
-msgstr "Pyyhitty"
+#: src/gui/setup_perfomance.cpp:67
+msgid "Enable opacity cache (Software, can use many memory)"
+msgstr ""
 
-#: src/gui/setup_players.cpp:247
-msgid "Allow trading"
-msgstr "Salli kaupakäynti"
+#: src/gui/setup_perfomance.cpp:70
+msgid "Enable map reduce (Software)"
+msgstr ""
 
-#: src/gui/setup_players.cpp:249
-msgid "Allow whispers"
-msgstr "Salli kuiskaukset"
+#: src/gui/setup_perfomance.cpp:73
+msgid "Better quality (disable for better perfomance)"
+msgstr ""
 
-#: src/gui/setup_players.cpp:252
-msgid "Old"
-msgstr "Vanha"
+#: src/gui/setup_perfomance.cpp:76
+msgid "Enable alpha channel fix (Software, can be very slow)"
+msgstr ""
 
-#: src/gui/setup_players.cpp:254
-msgid "Put all whispers in tabs"
-msgstr "Laita kaikki kuiskaukset välilehtiin"
+#: src/gui/setup_perfomance.cpp:80
+#, fuzzy
+msgid "Enable reorder sprites."
+msgstr "Ota käyttöön palvelinpuolen hyökkäys"
 
-#: src/gui/setup_players.cpp:257
-msgid "Show gender"
-msgstr "Näytä sukupuoli"
+#: src/gui/setup_perfomance.cpp:83
+msgid "Small memory (enable for lower memory usage)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:86
+msgid "Disable advanced beings caching (Software)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:89
+msgid "Disable beings caching (Software)"
+msgstr ""
 
-#: src/gui/setup_players.cpp:267
+#: src/gui/setup_players.cpp:48
 msgid "Players"
 msgstr "Pelaajat"
 
-#: src/gui/setup_players.cpp:292
-msgid "When ignoring:"
-msgstr "Kun jätät huomiotta:"
+#: src/gui/setup_players.cpp:54
+msgid "Show gender"
+msgstr "Näytä sukupuoli"
 
-#: src/gui/setup_players.cpp:315
+#: src/gui/setup_players.cpp:57
 msgid "Show level"
 msgstr "Näytä taso"
 
-#: src/gui/setup_players.cpp:319
+#: src/gui/setup_players.cpp:60
 msgid "Show own name"
 msgstr "Näytä oma nimi"
 
-#: src/gui/setup_players.cpp:323
+#: src/gui/setup_players.cpp:63
 msgid "Target dead players"
 msgstr "Ota kuolleetkin pelaajat kohteiksi"
 
-#: src/gui/setup_players.cpp:327
+#: src/gui/setup_players.cpp:66
+msgid "Visible names"
+msgstr "Näytä nimet"
+
+#: src/gui/setup_players.cpp:69
 msgid "Secure trades"
 msgstr "Turvaa kaupat"
 
-#: src/gui/setup_players.cpp:331 src/gui/setup_players.cpp:523
+#: src/gui/setup_players.cpp:72
 msgid "Unsecure chars in names"
 msgstr ""
 
-#: src/gui/setup_players.cpp:336
-msgid "Visible names"
-msgstr "Näytä nimet"
-
-#: src/gui/setup_players.cpp:341
+#: src/gui/setup_players.cpp:75
 msgid "Show statuses"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:105
+#: src/gui/setup_relations.cpp:65
+msgid "Relation"
+msgstr "Relaatio"
+
+#: src/gui/setup_relations.cpp:70
+msgid "Neutral"
+msgstr "Neutraali"
+
+#: src/gui/setup_relations.cpp:71
+msgid "Friend"
+msgstr "Ystävä"
+
+#: src/gui/setup_relations.cpp:72
+msgid "Disregarded"
+msgstr "Vaimennettu"
+
+#: src/gui/setup_relations.cpp:73
+msgid "Ignored"
+msgstr "Huomiotta jätetty"
+
+#: src/gui/setup_relations.cpp:74
+msgid "Erased"
+msgstr "Pyyhitty"
+
+#: src/gui/setup_relations.cpp:239
+msgid "Allow trading"
+msgstr "Salli kaupakäynti"
+
+#: src/gui/setup_relations.cpp:241
+msgid "Allow whispers"
+msgstr "Salli kuiskaukset"
+
+#: src/gui/setup_relations.cpp:244
+msgid "Old"
+msgstr "Vanha"
+
+#: src/gui/setup_relations.cpp:246
+#, fuzzy
+msgid "Relations"
+msgstr "Relaatio"
+
+#: src/gui/setup_relations.cpp:271
+msgid "When ignoring:"
+msgstr "Kun jätät huomiotta:"
+
+#: src/gui/setup_theme.cpp:106
 msgid "Tiny (10)"
 msgstr "Pikkiriikkinen (10)"
 
-#: src/gui/setup_theme.cpp:106
+#: src/gui/setup_theme.cpp:107
 msgid "Small (11)"
 msgstr "Pieni (11)"
 
-#: src/gui/setup_theme.cpp:107
+#: src/gui/setup_theme.cpp:108
 msgid "Medium (12)"
 msgstr "Keskikokoinen (12)"
 
-#: src/gui/setup_theme.cpp:108
+#: src/gui/setup_theme.cpp:109
 msgid "Large (13)"
 msgstr "Kookas (13)"
 
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:110
 msgid "Big (14)"
 msgstr "Suuri (14)"
 
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:111
 msgid "Huge (15)"
 msgstr "Jättimäinen (15)"
 
-#: src/gui/setup_theme.cpp:140
+#: src/gui/setup_theme.cpp:141
 msgid "Theme"
 msgstr "Teema"
 
-#: src/gui/setup_theme.cpp:142
+#: src/gui/setup_theme.cpp:143
 msgid "Gui theme"
 msgstr "Käyttöliittymän teema"
 
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:144
 msgid "Main Font"
 msgstr "Pääkirjasin"
 
-#: src/gui/setup_theme.cpp:144
+#: src/gui/setup_theme.cpp:145
 msgid "Bold font"
 msgstr "Lihavoitu kirjasin"
 
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:146
 msgid "Particle font"
 msgstr "Hiukkaskirjasin"
 
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:147
 msgid "Help font"
 msgstr "Ohjekirjasin"
 
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:148
 msgid "Secure font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:175
+#: src/gui/setup_theme.cpp:176
 msgid "Font size"
 msgstr "Kirjasimen koko"
 
-#: src/gui/setup_theme.cpp:281
+#: src/gui/setup_theme.cpp:282
 msgid "Theme Changed"
 msgstr "Ulkoasua muutettu"
 
-#: src/gui/setup_theme.cpp:282 src/gui/setup_video.cpp:670
-#: src/gui/setup_video.cpp:675
+#: src/gui/setup_theme.cpp:283 src/gui/setup_video.cpp:619
+#: src/gui/setup_video.cpp:624
 msgid "Restart your client for the change to take effect."
 msgstr "Käynnistä ohjelma uudelleen, jotta muutos astuu voimaan."
 
@@ -2275,136 +2333,115 @@ msgstr "keskitaso"
 msgid "max"
 msgstr "maksimi"
 
-#: src/gui/setup_video.cpp:293
+#: src/gui/setup_video.cpp:288
 msgid "Full screen"
 msgstr "Kokoruututila"
 
-#: src/gui/setup_video.cpp:294
-msgid "Hw acceleration"
-msgstr "Rautakiihdytys"
-
-#: src/gui/setup_video.cpp:295
+#: src/gui/setup_video.cpp:289
 msgid "Custom cursor"
 msgstr "Tyylitelty hiiren osoitin"
 
-#: src/gui/setup_video.cpp:297
+#: src/gui/setup_video.cpp:291
 msgid "Particle effects"
 msgstr "Hiukkastehosteet"
 
-#: src/gui/setup_video.cpp:299
+#: src/gui/setup_video.cpp:293
 msgid "Show pickup notification"
 msgstr "Näytä ottoviesti"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:301
+#: src/gui/setup_video.cpp:295
 msgid "in chat"
 msgstr "keskusteluikkunassa"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:303
+#: src/gui/setup_video.cpp:297
 msgid "as particle"
 msgstr "leijuvana"
 
-#: src/gui/setup_video.cpp:305
-msgid "Enable opacity cache"
-msgstr "Ota käyttöön läpinäkyvyysvälimuisti"
-
-#: src/gui/setup_video.cpp:306
-msgid "Enable map reduce"
-msgstr ""
-
-#: src/gui/setup_video.cpp:308
-msgid "Auto adjust perfomance"
-msgstr ""
-
-#: src/gui/setup_video.cpp:310
-msgid "Show beings transparency"
-msgstr ""
-
-#: src/gui/setup_video.cpp:315
+#: src/gui/setup_video.cpp:302
 msgid "FPS limit:"
 msgstr "Piirtonopeusrajoitin (FPS):"
 
-#: src/gui/setup_video.cpp:319 src/gui/setup_video.cpp:356
-#: src/gui/setup_video.cpp:607 src/gui/setup_video.cpp:760
+#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
+#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709
 msgid "Alt FPS limit: "
 msgstr "Vaihtoehtoinen FPS-rajoitin:"
 
-#: src/gui/setup_video.cpp:328
+#: src/gui/setup_video.cpp:315
 msgid "Video"
 msgstr "Kuva"
 
-#: src/gui/setup_video.cpp:334
+#: src/gui/setup_video.cpp:321
 msgid "Overhead text"
 msgstr "Tekstinä yläpuolella"
 
-#: src/gui/setup_video.cpp:335
+#: src/gui/setup_video.cpp:322
 msgid "Gui opacity"
 msgstr "Käyttöliittymän läpinäkyvyys"
 
-#: src/gui/setup_video.cpp:336
+#: src/gui/setup_video.cpp:323
 msgid "Ambient FX"
 msgstr "Taustaäänet"
 
-#: src/gui/setup_video.cpp:337
+#: src/gui/setup_video.cpp:324
 msgid "Particle detail"
 msgstr "Hiukkastehosteiden yksityiskohtaisuus"
 
-#: src/gui/setup_video.cpp:354 src/gui/setup_video.cpp:357
-#: src/gui/setup_video.cpp:606 src/gui/setup_video.cpp:747
-#: src/gui/setup_video.cpp:758
+#: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
+#: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
+#: src/gui/setup_video.cpp:707
 msgid "None"
 msgstr "-"
 
-#: src/gui/setup_video.cpp:511
+#: src/gui/setup_video.cpp:484
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
-msgstr ""
-"Ikkunoituun tilaan vaihto epäonnistui, samoin paluu edelliseen tilaan!"
+msgstr "Ikkunoituun tilaan vaihto epäonnistui, samoin paluu edelliseen tilaan!"
 
-#: src/gui/setup_video.cpp:517
+#: src/gui/setup_video.cpp:490
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr "Kokoruututilaan vaihto epäonnistui, samoin paluu edelliseen tilaan!"
 
-#: src/gui/setup_video.cpp:528
+#: src/gui/setup_video.cpp:501
 msgid "Switching to Full Screen"
 msgstr "Vaihdan kokoruututilaan"
 
-#: src/gui/setup_video.cpp:529
+#: src/gui/setup_video.cpp:502
 msgid "Restart needed for changes to take effect."
 msgstr "Ohjelma pitää käynnistää uudelleen, jotta muutokset astuvat voimaan."
 
-#: src/gui/setup_video.cpp:541
+#: src/gui/setup_video.cpp:514
 msgid "Changing to OpenGL"
 msgstr "Vaihdetaan käyttämään OpenGL:ää"
 
-#: src/gui/setup_video.cpp:542
+#: src/gui/setup_video.cpp:515
 msgid "Applying change to OpenGL requires restart."
 msgstr "OpenGL -asetuksen muutos vaatii ohjelman uudelleenkäynnistyksen."
 
-#: src/gui/setup_video.cpp:653
+#: src/gui/setup_video.cpp:602
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Oma tarkkuus (esim. 1024x768)"
 
-#: src/gui/setup_video.cpp:654
+#: src/gui/setup_video.cpp:603
 msgid "Enter new resolution:                "
 msgstr "Anna uusi tarkkuus:                  "
 
-#: src/gui/setup_video.cpp:669 src/gui/setup_video.cpp:674
+#: src/gui/setup_video.cpp:618 src/gui/setup_video.cpp:623
 msgid "Screen Resolution Changed"
 msgstr "Ikkunan koko vaihdettu"
 
-#: src/gui/setup_video.cpp:672
+#: src/gui/setup_video.cpp:621
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 "Joitakin ikkunoita on siirretty, jotta ne mahtuvat pienemmälle ruudulle."
 
-#: src/gui/setup_video.cpp:705
+#: src/gui/setup_video.cpp:654
 msgid "Particle Effect Settings Changed."
 msgstr "Hiukkastehosteiden asetuksia on muutettu."
 
-#: src/gui/setup_video.cpp:706
+#: src/gui/setup_video.cpp:655
 msgid "Changes will take effect on map change."
 msgstr "Muutokset astuvat voimaan kartan vaihtuessa."
 
@@ -2433,7 +2470,8 @@ msgstr "Ilmoita"
 msgid "Show links in announce"
 msgstr "Näytä linkit ilmoituksessa"
 
-#: src/gui/shopwindow.cpp:723 src/net/manaserv/tradehandler.cpp:127
+#: src/gui/shopwindow.cpp:723 src/net/ea/tradehandler.cpp:106
+#: src/net/manaserv/tradehandler.cpp:127
 msgid "Request for Trade"
 msgstr "Kaupantekoehdotus"
 
@@ -2475,7 +2513,7 @@ msgstr "Taso: %d"
 msgid "Lvl: %d (%+d)"
 msgstr "Taso: %d (%+d)"
 
-#: src/gui/socialwindow.cpp:117
+#: src/gui/socialwindow.cpp:117 src/net/ea/gui/guildtab.cpp:52
 msgid "Guild"
 msgstr "Kilta"
 
@@ -2507,7 +2545,7 @@ msgstr "Eroa killasta?"
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Haluatko varmasti erota killasta %s?"
 
-#: src/gui/socialwindow.cpp:215
+#: src/gui/socialwindow.cpp:215 src/net/ea/gui/partytab.cpp:50
 msgid "Party"
 msgstr "Ryhmä"
 
@@ -2669,243 +2707,243 @@ msgstr "Anna ryhmällesi nimi."
 msgid "Specials"
 msgstr "Erikoisuudet"
 
-#: src/gui/statuspopup.cpp:196
+#: src/gui/statuspopup.cpp:197
 msgid "(D) default moves"
 msgstr "(D) oletusliikkeet"
 
-#: src/gui/statuspopup.cpp:201
+#: src/gui/statuspopup.cpp:202
 msgid "(I) invert moves"
 msgstr "(I) käännetyt liikkeet"
 
-#: src/gui/statuspopup.cpp:206
+#: src/gui/statuspopup.cpp:207
 msgid "(c) moves with some crazy moves"
 msgstr "(c) liikkuu osin villiliikkein"
 
-#: src/gui/statuspopup.cpp:211
+#: src/gui/statuspopup.cpp:212
 msgid "(C) moves with crazy moves"
 msgstr "(C) liikkuu villiliikkein"
 
-#: src/gui/statuspopup.cpp:216
+#: src/gui/statuspopup.cpp:217
 msgid "(d) double normal + crazy"
 msgstr "(d) tuplaa tavallinen + villi"
 
-#: src/gui/statuspopup.cpp:221
+#: src/gui/statuspopup.cpp:222
 msgid "(?) move"
 msgstr "(?) liiku"
 
-#: src/gui/statuspopup.cpp:239
+#: src/gui/statuspopup.cpp:240
 msgid "(a) custom crazy move"
 msgstr "(a) oma villiliike"
 
-#: src/gui/statuspopup.cpp:243
+#: src/gui/statuspopup.cpp:244
 msgid "(?) crazy move"
 msgstr "(?) villiliike"
 
-#: src/gui/statuspopup.cpp:253
+#: src/gui/statuspopup.cpp:254
 msgid "(0) default moves to target"
 msgstr "(0) oletussiirtymä kohteen luo"
 
-#: src/gui/statuspopup.cpp:258
+#: src/gui/statuspopup.cpp:259
 msgid "(1) moves to target in distance 1"
 msgstr "(1) siirry kohteen luo etäisyydellä 1"
 
-#: src/gui/statuspopup.cpp:263
+#: src/gui/statuspopup.cpp:264
 msgid "(2) moves to target in distance 2"
 msgstr "(2) siirry kohteen luo etäisyydellä 2"
 
-#: src/gui/statuspopup.cpp:268
+#: src/gui/statuspopup.cpp:269
 msgid "(3) moves to target in distance 3"
 msgstr "(3) siirry kohteen luo etäisyydellä 3"
 
-#: src/gui/statuspopup.cpp:273
+#: src/gui/statuspopup.cpp:274
 msgid "(5) moves to target in distance 5"
 msgstr "(5) siirry kohteen luo etäisyydellä 5"
 
-#: src/gui/statuspopup.cpp:278
+#: src/gui/statuspopup.cpp:279
 msgid "(7) moves to target in distance 7"
 msgstr "(7) siirry kohteen luo etäisyydellä 7"
 
-#: src/gui/statuspopup.cpp:283
+#: src/gui/statuspopup.cpp:284
 msgid "(A) moves to target in attack range"
 msgstr "(A) siirry kohteen luo hyökkäyskantamalla"
 
-#: src/gui/statuspopup.cpp:288
+#: src/gui/statuspopup.cpp:289
 msgid "(?) move to target"
 msgstr "(?) siirry kohteen luo"
 
-#: src/gui/statuspopup.cpp:296
+#: src/gui/statuspopup.cpp:297
 msgid "(D) default follow"
 msgstr "(D) oletusseuraaminen"
 
-#: src/gui/statuspopup.cpp:300
+#: src/gui/statuspopup.cpp:301
 msgid "(R) relative follow"
 msgstr "(R) suhteellinen seuraaminen"
 
-#: src/gui/statuspopup.cpp:304
+#: src/gui/statuspopup.cpp:305
 msgid "(M) mirror follow"
 msgstr "(M) peilikuvaseuraaminen"
 
-#: src/gui/statuspopup.cpp:308
+#: src/gui/statuspopup.cpp:309
 msgid "(P) pet follow"
 msgstr "(P) lemmikkiseuraaminen"
 
-#: src/gui/statuspopup.cpp:312
+#: src/gui/statuspopup.cpp:313
 msgid "(?) unknown follow"
 msgstr "(?) tuntematon seuraaminen"
 
-#: src/gui/statuspopup.cpp:321 src/gui/statuspopup.cpp:344
+#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345
 msgid "(D) default attack"
 msgstr "(D) oletushyökkäys"
 
-#: src/gui/statuspopup.cpp:326
+#: src/gui/statuspopup.cpp:327
 msgid "(s) switch attack without shield"
 msgstr "(s) vaihda hyökkäystä, ei kilpeä"
 
-#: src/gui/statuspopup.cpp:331
+#: src/gui/statuspopup.cpp:332
 msgid "(S) switch attack with shield"
 msgstr "(S) vaihda hyökkäystä, kilpi mukana"
 
-#: src/gui/statuspopup.cpp:335 src/gui/statuspopup.cpp:360
+#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
 msgid "(?) attack"
 msgstr "(?) hyökkäys"
 
-#: src/gui/statuspopup.cpp:348
+#: src/gui/statuspopup.cpp:349
 msgid "(G) go and attack"
 msgstr "(G) mene ja hyökkää"
 
-#: src/gui/statuspopup.cpp:352
+#: src/gui/statuspopup.cpp:353
 msgid "(A) go, attack, pickup"
 msgstr "(A) mene, hyökkää, nosta"
 
-#: src/gui/statuspopup.cpp:356
+#: src/gui/statuspopup.cpp:357
 msgid "(d) without auto attack"
 msgstr "(d) ei automaattista hyökkäystä"
 
-#: src/gui/statuspopup.cpp:374
+#: src/gui/statuspopup.cpp:375
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) pieni nosto 1x1 ruutua"
 
-#: src/gui/statuspopup.cpp:378
+#: src/gui/statuspopup.cpp:379
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) oletusnosto 2x1 ruutua"
 
-#: src/gui/statuspopup.cpp:382
+#: src/gui/statuspopup.cpp:383
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) nosto edestä 2x3 ruutua"
 
-#: src/gui/statuspopup.cpp:386
+#: src/gui/statuspopup.cpp:387
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) nosto 3x3 ruutua"
 
-#: src/gui/statuspopup.cpp:390
+#: src/gui/statuspopup.cpp:391
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) mene ja nosta etäisyydellä 4"
 
-#: src/gui/statuspopup.cpp:394
+#: src/gui/statuspopup.cpp:395
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) mene ja nosta etäisyydellä 8"
 
-#: src/gui/statuspopup.cpp:398
+#: src/gui/statuspopup.cpp:399
 msgid "(A) go and pick up in max distance"
 msgstr "(A) mene ja nosta maksimietäisyydellä"
 
-#: src/gui/statuspopup.cpp:402
+#: src/gui/statuspopup.cpp:403
 msgid "(?) pick up"
 msgstr "(?) nosta"
 
-#: src/gui/statuspopup.cpp:411
+#: src/gui/statuspopup.cpp:412
 msgid "(N) normal map view"
 msgstr "(N) normaali karttanäkymä"
 
-#: src/gui/statuspopup.cpp:415
+#: src/gui/statuspopup.cpp:416
 msgid "(D) debug map view"
 msgstr "(D) debug-karttanäkymä"
 
-#: src/gui/statuspopup.cpp:419
+#: src/gui/statuspopup.cpp:420
 msgid "(u) ultra map view"
 msgstr "(u) ultra-karttanäkymä"
 
-#: src/gui/statuspopup.cpp:423
+#: src/gui/statuspopup.cpp:424
 msgid "(U) ultra map view 2"
 msgstr "(U) ultra-karttanäkymä 2"
 
-#: src/gui/statuspopup.cpp:427
+#: src/gui/statuspopup.cpp:428
 msgid "(e) empty map view"
 msgstr "(e) tyhjä karttanäkymä"
 
-#: src/gui/statuspopup.cpp:431
+#: src/gui/statuspopup.cpp:432
 msgid "(b) black & white map view"
 msgstr "(b) mustavalkoinen karttanäkymä"
 
-#: src/gui/statuspopup.cpp:435
+#: src/gui/statuspopup.cpp:436
 msgid "(?) map view"
 msgstr "(?) karttanäkymä"
 
-#: src/gui/statuspopup.cpp:443
+#: src/gui/statuspopup.cpp:444
 msgid "(f) use #flar for magic attack"
 msgstr "(f) #flar taikahyökkäyksenä"
 
-#: src/gui/statuspopup.cpp:448
+#: src/gui/statuspopup.cpp:449
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) #chiza taikahyökkäyksenä"
 
-#: src/gui/statuspopup.cpp:453
+#: src/gui/statuspopup.cpp:454
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) #ingrav taikahyökkäyksenä"
 
-#: src/gui/statuspopup.cpp:458
+#: src/gui/statuspopup.cpp:459
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) #frillyar taikahyökkäyksenä"
 
-#: src/gui/statuspopup.cpp:463
+#: src/gui/statuspopup.cpp:464
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) #upmarmu taikahyökkäyksenä"
 
-#: src/gui/statuspopup.cpp:467
+#: src/gui/statuspopup.cpp:468
 msgid "(?) magic attack"
 msgstr "(?) taikahyökkäys"
 
-#: src/gui/statuspopup.cpp:476
+#: src/gui/statuspopup.cpp:477
 msgid "(D) default imitation"
 msgstr "(D) oletusmatkinta"
 
-#: src/gui/statuspopup.cpp:480
+#: src/gui/statuspopup.cpp:481
 msgid "(O) outfits imitation"
 msgstr "(O) asun matkinta"
 
-#: src/gui/statuspopup.cpp:484
+#: src/gui/statuspopup.cpp:485
 msgid "(?) imitation"
 msgstr "(?) matkinta"
 
-#: src/gui/statuspopup.cpp:493
+#: src/gui/statuspopup.cpp:494
 msgid "(O) on keyboard"
 msgstr "(O) paikalla"
 
-#: src/gui/statuspopup.cpp:496
+#: src/gui/statuspopup.cpp:497
 msgid "(A) away"
 msgstr "(A) poissa"
 
-#: src/gui/statuspopup.cpp:499 src/gui/statuspopup.cpp:519
+#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
 msgid "(?) away"
 msgstr "(?) poissaolo"
 
-#: src/gui/statuspopup.cpp:507
+#: src/gui/statuspopup.cpp:508
 msgid "(G) game camera mode"
 msgstr "(G) pelin kameratila"
 
-#: src/gui/statuspopup.cpp:511
+#: src/gui/statuspopup.cpp:512
 msgid "(F) free camera mode"
 msgstr "(F) vapaa kamera"
 
-#: src/gui/statuspopup.cpp:515
+#: src/gui/statuspopup.cpp:516
 msgid "(D) design camera mode"
 msgstr "(D) suunnittelukamera"
 
-#: src/gui/statuspopup.cpp:526
+#: src/gui/statuspopup.cpp:527
 msgid "Game modifiers are disabled"
 msgstr "Pelimuokkaimet poissa käytöstä"
 
-#: src/gui/statuspopup.cpp:531
+#: src/gui/statuspopup.cpp:532
 msgid "Game modifiers are enabled"
 msgstr "Pelimuokkaimet käytössä"
 
@@ -3084,87 +3122,87 @@ msgstr "(b)"
 msgid "(O)"
 msgstr "(O)"
 
-#: src/gui/textcommandeditor.cpp:112
+#: src/gui/textcommandeditor.cpp:113
 msgid "No Target"
 msgstr "Ei kohdetta"
 
-#: src/gui/textcommandeditor.cpp:113
+#: src/gui/textcommandeditor.cpp:114
 msgid "Allow Target"
 msgstr "Salli kohde"
 
-#: src/gui/textcommandeditor.cpp:114
+#: src/gui/textcommandeditor.cpp:115
 msgid "Need Target"
 msgstr "Tarvitsee kohteen"
 
-#: src/gui/textcommandeditor.cpp:119
+#: src/gui/textcommandeditor.cpp:120
 msgid "General Magic"
 msgstr "Yleismagia"
 
-#: src/gui/textcommandeditor.cpp:120
+#: src/gui/textcommandeditor.cpp:121
 msgid "Life Magic"
 msgstr "Elämämagia"
 
-#: src/gui/textcommandeditor.cpp:121
+#: src/gui/textcommandeditor.cpp:122
 msgid "War Magic"
 msgstr "Sotamagia"
 
-#: src/gui/textcommandeditor.cpp:122
+#: src/gui/textcommandeditor.cpp:123
 msgid "Transmute Magic"
 msgstr "Muovausmagia"
 
-#: src/gui/textcommandeditor.cpp:123
+#: src/gui/textcommandeditor.cpp:124
 msgid "Nature Magic"
 msgstr "Luontomagia"
 
-#: src/gui/textcommandeditor.cpp:124
+#: src/gui/textcommandeditor.cpp:125
 msgid "Astral Magic"
 msgstr "Astraalimagia"
 
-#: src/gui/textcommandeditor.cpp:167
+#: src/gui/textcommandeditor.cpp:168
 msgid "Command Editor"
 msgstr "Komentomuokkain"
 
-#: src/gui/textcommandeditor.cpp:184
+#: src/gui/textcommandeditor.cpp:185
 msgid "magic"
 msgstr "magia"
 
-#: src/gui/textcommandeditor.cpp:188
+#: src/gui/textcommandeditor.cpp:189
 msgid "other"
 msgstr "muu"
 
-#: src/gui/textcommandeditor.cpp:193
+#: src/gui/textcommandeditor.cpp:194
 msgid "Symbol:"
 msgstr "Symboli:"
 
-#: src/gui/textcommandeditor.cpp:196
+#: src/gui/textcommandeditor.cpp:197
 msgid "Command:"
 msgstr "Komento:"
 
-#: src/gui/textcommandeditor.cpp:199
+#: src/gui/textcommandeditor.cpp:200
 msgid "Mana:"
 msgstr "Mana:"
 
-#: src/gui/textcommandeditor.cpp:205
+#: src/gui/textcommandeditor.cpp:206
 msgid "Target Type:"
 msgstr "Kohdetyyppi:"
 
-#: src/gui/textcommandeditor.cpp:211
+#: src/gui/textcommandeditor.cpp:212
 msgid "Icon:"
 msgstr "Kuvake:"
 
-#: src/gui/textcommandeditor.cpp:217
+#: src/gui/textcommandeditor.cpp:218
 msgid "Magic level:"
 msgstr "Magiataso:"
 
-#: src/gui/textcommandeditor.cpp:223
+#: src/gui/textcommandeditor.cpp:224
 msgid "Magic School:"
 msgstr "Magian koulukunta:"
 
-#: src/gui/textcommandeditor.cpp:229
+#: src/gui/textcommandeditor.cpp:230
 msgid "School level:"
 msgstr "Koulukunnan taso:"
 
-#: src/gui/textcommandeditor.cpp:234
+#: src/gui/textcommandeditor.cpp:235
 msgid "Save"
 msgstr "Tallenna"
 
@@ -3202,8 +3240,7 @@ msgid "Change"
 msgstr "Muuta"
 
 #: src/gui/tradewindow.cpp:332
-msgid ""
-"Failed adding item. You can not overlap one kind of item on the window."
+msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr "Tavaran lisääminen epäonnistui, limittämisongelma."
 
 #: src/gui/tradewindow.cpp:377
@@ -3393,23 +3430,23 @@ msgstr "Kotipaikan raja"
 msgid "Road Point"
 msgstr "Väyläpiste"
 
-#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:470
+#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:471
 msgid "Who Is Online - Updating"
 msgstr "Kuka on linjoila - päivitän"
 
-#: src/gui/whoisonline.cpp:100
+#: src/gui/whoisonline.cpp:101
 msgid "Update"
 msgstr "Päivitä"
 
-#: src/gui/whoisonline.cpp:293
+#: src/gui/whoisonline.cpp:294
 msgid "Who Is Online - "
 msgstr "Kuka on linjoilla - "
 
-#: src/gui/whoisonline.cpp:484
+#: src/gui/whoisonline.cpp:485
 msgid "Who Is Online - error"
 msgstr "Kuka on linjoilla - virhe"
 
-#: src/gui/whoisonline.cpp:515
+#: src/gui/whoisonline.cpp:516
 msgid "Who Is Online - Update"
 msgstr "Kuka on linjoilla - päivitä"
 
@@ -3474,6 +3511,7 @@ msgid "This command makes <nick> a channel operator."
 msgstr "Tämä komento tekee annetunnimisestä käyttäjästä kanavaoperaattorin."
 
 #: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
+#: src/net/ea/gui/guildtab.cpp:69 src/net/ea/gui/partytab.cpp:85
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr "Jos nimessä on välilyöntejä, laita sen ympärille lainausmerkit (\")."
 
@@ -3548,8 +3586,7 @@ msgid "Command: /unignore <player>"
 msgstr "Komento: /unignore <pelaajan nimi>"
 
 #: src/gui/widgets/whispertab.cpp:131
-msgid ""
-"This command stops ignoring the other player if they are being ignored."
+msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 "Tämä komento huomioi pelaajan taas, jos tämä on ensin jätetty huomiotta."
 
@@ -4214,81 +4251,549 @@ msgstr "Kiitos kaupoista."
 msgid "Unable to buy."
 msgstr "Ostaminen epäonnistui."
 
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
-msgid "Strength"
+#: src/net/ea/charserverhandler.cpp:63
+#, fuzzy
+msgid "Strength:"
 msgstr "Voima"
 
-#: src/net/manaserv/attributes.cpp:167
+#: src/net/ea/charserverhandler.cpp:64
+#, fuzzy
+msgid "Agility:"
+msgstr "Ketteryys"
+
+#: src/net/ea/charserverhandler.cpp:65
+#, fuzzy
+msgid "Vitality:"
+msgstr "Elinvoima"
+
+#: src/net/ea/charserverhandler.cpp:66
+#, fuzzy
+msgid "Intelligence:"
+msgstr "Älykkyys"
+
+#: src/net/ea/charserverhandler.cpp:67
+#, fuzzy
+msgid "Dexterity:"
+msgstr "Näppäryys"
+
+#: src/net/ea/charserverhandler.cpp:68
+#, fuzzy
+msgid "Luck:"
+msgstr "Tuuri"
+
+#: src/net/ea/charserverhandler.cpp:102
+msgid "Access denied. Most likely, there are too many players on this server."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:106
+#, fuzzy
+msgid "Cannot use this ID."
+msgstr "Et voi lähettää tyhjiä kuiskauksia!"
+
+#: src/net/ea/charserverhandler.cpp:109
+#, fuzzy
+msgid "Unknown char-server failure."
+msgstr "Tuntematon virhe."
+
+#: src/net/ea/charserverhandler.cpp:138
+msgid "Failed to create character. Most likely the name is already taken."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:237
+#, fuzzy
+msgid "Wrong name."
+msgstr "Väärä taikalipuke (magic_token)."
+
+#: src/net/ea/charserverhandler.cpp:145
+#, fuzzy
+msgid "Incorrect stats."
+msgstr "Väärä salasana"
+
+#: src/net/ea/charserverhandler.cpp:148
+#, fuzzy
+msgid "Incorrect hair."
+msgstr "Väärä salasana"
+
+#: src/net/ea/charserverhandler.cpp:151
+#, fuzzy
+msgid "Incorrect slot."
+msgstr "Väärä salasana"
+
+#: src/net/ea/charserverhandler.cpp:166 src/net/manaserv/charhandler.cpp:210
+msgid "Info"
+msgstr "Tietoja"
+
+#: src/net/ea/charserverhandler.cpp:166
+#, fuzzy
+msgid "Character deleted."
+msgstr "Hahmo poistettu."
+
+#: src/net/ea/charserverhandler.cpp:172
+#, fuzzy
+msgid "Failed to delete character."
+msgstr "Anna salasana hahmon poistamiseksi"
+
+#: src/net/ea/chathandler.cpp:60 src/net/ea/chathandler.cpp:66
+#: src/net/ea/chathandler.cpp:71 src/net/ea/chathandler.cpp:77
+#: src/net/ea/chathandler.cpp:82 src/net/ea/chathandler.cpp:88
+#: src/net/ea/chathandler.cpp:95 src/net/ea/chathandler.cpp:101
+msgid "Channels are not supported!"
+msgstr ""
+
+#: src/net/ea/chathandler.cpp:128
 #, c-format
-msgid "Strength %+.1f"
-msgstr "Voima %+.1f"
+msgid "Whisper could not be sent, %s is offline."
+msgstr ""
 
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
-msgid "Agility"
-msgstr "Ketteryys"
+#: src/net/ea/chathandler.cpp:136
+#, fuzzy, c-format
+msgid "Whisper could not be sent, ignored by %s."
+msgstr "Pelaajan uudelleenhuomiointi epäonnistui."
 
-#: src/net/manaserv/attributes.cpp:180
+#: src/net/ea/chathandler.cpp:348
+#, fuzzy
+msgid "MVP player."
+msgstr "Pelaajat"
+
+#: src/net/ea/chathandler.cpp:352
+#, fuzzy
+msgid "MVP player: "
+msgstr "Pelaajat"
+
+#: src/net/ea/gamehandler.cpp:86
 #, c-format
-msgid "Agility %+.1f"
-msgstr "Ketteryys %+.1f"
+msgid "Online users: %d"
+msgstr ""
 
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
-msgid "Dexterity"
-msgstr "Näppäryys"
+#: src/net/ea/gamehandler.cpp:98
+msgid "Game"
+msgstr ""
 
-#: src/net/manaserv/attributes.cpp:193
+#: src/net/ea/gamehandler.cpp:98
+#, fuzzy
+msgid "Request to quit denied!"
+msgstr "Kaupantekoehdotus"
+
+#: src/net/ea/gui/guildtab.cpp:67 src/net/ea/gui/partytab.cpp:83
+#, fuzzy
+msgid "Command: /invite <nick>"
+msgstr "Komento: /kick <nimi>"
+
+#: src/net/ea/gui/guildtab.cpp:68
+#, fuzzy
+msgid "This command invites <nick> to the guild you're in."
+msgstr "Tämä komento tekee annetunnimisestä käyttäjästä kanavaoperaattorin."
+
+#: src/net/ea/gui/guildtab.cpp:74 src/net/ea/gui/partytab.cpp:90
+#, fuzzy
+msgid "Command: /leave"
+msgstr "Komento: /close"
+
+#: src/net/ea/gui/guildtab.cpp:75
+#, fuzzy
+msgid "This command causes the player to leave the guild."
+msgstr "Tämä komento asettaa aihekentän arvoksi <viesti>."
+
+#: src/net/ea/gui/guildtab.cpp:135 src/net/ea/gui/partytab.cpp:69
+#, fuzzy
+msgid "/help > Display this help."
+msgstr "  -h --help           : Näytä tämä ohje"
+
+#: src/net/ea/gui/guildtab.cpp:136
+msgid "/invite > Invite a player to your guild"
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:137
+msgid "/leave > Leave the guild you are in"
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:138
+#, fuzzy
+msgid "/kick > Kick some one from the guild you are in"
+msgstr "/kick > Poista käyttäjä kanavalta"
+
+#: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
+msgid "Guild created."
+msgstr "Kilta luotu."
+
+#: src/net/ea/guildhandler.cpp:88 src/net/ea/guildhandler.cpp:93
+#, fuzzy
+msgid "You are already in guild."
+msgstr "Killan luonti epäonnistui."
+
+#: src/net/ea/guildhandler.cpp:98
+msgid "Emperium check failed."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:103
+#, fuzzy
+msgid "Unknown server response."
+msgstr "Tuntematon virhe."
+
+#: src/net/ea/guildhandler.cpp:180
+#, fuzzy, c-format
+msgid "Guild name: %s"
+msgstr "Kilta: %s"
+
+#: src/net/ea/guildhandler.cpp:182
+#, fuzzy, c-format
+msgid "Guild master: %s"
+msgstr "Kilta: %s"
+
+#: src/net/ea/guildhandler.cpp:184
+#, fuzzy, c-format
+msgid "Guild level: %d"
+msgstr "Taso: %d"
+
+#: src/net/ea/guildhandler.cpp:186
 #, c-format
-msgid "Dexterity %+.1f"
-msgstr "Näppäryys %+.1f"
+msgid "Online members: %d"
+msgstr ""
 
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
-msgid "Vitality"
-msgstr "Elinvoima"
+#: src/net/ea/guildhandler.cpp:188
+#, c-format
+msgid "Max members: %d"
+msgstr ""
 
-#: src/net/manaserv/attributes.cpp:206
+#: src/net/ea/guildhandler.cpp:190
+#, fuzzy, c-format
+msgid "Average level: %d"
+msgstr "Magiataso:"
+
+#: src/net/ea/guildhandler.cpp:192
+#, fuzzy, c-format
+msgid "Guild exp: %d"
+msgstr "Kilta: %s"
+
+#: src/net/ea/guildhandler.cpp:194
+#, fuzzy, c-format
+msgid "Guild next exp: %d"
+msgstr "Kilta luotu."
+
+#: src/net/ea/guildhandler.cpp:196
+#, fuzzy, c-format
+msgid "Guild castle: %s"
+msgstr "Kilta: %s"
+
+#: src/net/ea/guildhandler.cpp:402
+#, fuzzy
+msgid "Could not inivte user to guild."
+msgstr "Kutsuit käyttäjän %s kiltaan %s."
+
+#: src/net/ea/guildhandler.cpp:406
+#, fuzzy
+msgid "User rejected guild invite."
+msgstr "%s ei ottanut kutsuasi vastaan."
+
+#: src/net/ea/guildhandler.cpp:410
+msgid "User is now part of your guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:414
+msgid "Your guild is full."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:418
+#, fuzzy
+msgid "Unknown guild invite response."
+msgstr "Otit vastaan kiltakutsun pelaajalta %s."
+
+#: src/net/ea/guildhandler.cpp:438
+msgid "You have left the guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:452
+#, fuzzy, c-format
+msgid "%s has left your guild."
+msgstr "Valitse killallesi nimi."
+
+#: src/net/ea/guildhandler.cpp:483
+#, fuzzy
+msgid "You was kicked from guild."
+msgstr "Potki killasta"
+
+#: src/net/ea/guildhandler.cpp:496
+#, fuzzy, c-format
+msgid "%s has kicked from your guild."
+msgstr "%s potkaisi käyttäjän %s ulos."
+
+#: src/net/ea/gui/partytab.cpp:70
+msgid "/invite > Invite a player to your party"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:71
+msgid "/leave > Leave the party you are in"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:72
+#, fuzzy
+msgid "/kick > Kick some one from the party you are in"
+msgstr "/kick > Poista käyttäjä kanavalta"
+
+#: src/net/ea/gui/partytab.cpp:73
+msgid "/item > Show/change party item sharing options"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:74
+msgid "/exp > Show/change party experience sharing options"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:84
+#, fuzzy
+msgid "This command invites <nick> to party with you."
+msgstr "Tämä komento poistaa annetunnimisen hahmon kanavalta."
+
+#: src/net/ea/gui/partytab.cpp:91
+#, fuzzy
+msgid "This command causes the player to leave the party."
+msgstr "Tämä komento asettaa aihekentän arvoksi <viesti>."
+
+#: src/net/ea/gui/partytab.cpp:95
+#, fuzzy
+msgid "Command: /item <policy>"
+msgstr "Komento: /kick <nimi>"
+
+#: src/net/ea/gui/partytab.cpp:97
+#, fuzzy
+msgid "This command changes the party's item sharing policy."
+msgstr "Tämä komento näyttää käyttäjät kanavalla."
+
+#: src/net/ea/gui/partytab.cpp:98
+msgid ""
+"<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
+"\"0\", \"no\", \"false\" to disable item sharing."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:101
+#, fuzzy
+msgid "Command: /item"
+msgstr "Komento: /quit"
+
+#: src/net/ea/gui/partytab.cpp:102
+#, fuzzy
+msgid "This command displays the party's current item sharing policy."
+msgstr "Tällä komennolla poistut kanvalta."
+
+#: src/net/ea/gui/partytab.cpp:107
+#, fuzzy
+msgid "Command: /exp <policy>"
+msgstr "Komento: /op <nimi>"
+
+#: src/net/ea/gui/partytab.cpp:108
+#, fuzzy
+msgid "This command changes the party's experience sharing policy."
+msgstr "Tällä komennolla poistut kanvalta."
+
+#: src/net/ea/gui/partytab.cpp:110
+msgid ""
+"<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
+"sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:113
+#, fuzzy
+msgid "Command: /exp"
+msgstr "Komento: /users"
+
+#: src/net/ea/gui/partytab.cpp:114
+#, fuzzy
+msgid "This command displays the party's current experience sharing policy."
+msgstr "Tällä komennolla poistut kanvalta."
+
+#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:286
+msgid "Item sharing enabled."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:296
+msgid "Item sharing disabled."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:306
+msgid "Item sharing not possible."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:157
+msgid "Item sharing unknown."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:248
+msgid "Experience sharing enabled."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:258
+msgid "Experience sharing disabled."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:268
+msgid "Experience sharing not possible."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:196
+msgid "Experience sharing unknown."
+msgstr ""
+
+#: src/net/ea/inventoryhandler.cpp:407
+#, fuzzy
+msgid "Failed to use item."
+msgstr "Jäsenen ylennys epäonnistui."
+
+#: src/net/ea/inventoryhandler.cpp:580
+#, fuzzy
+msgid "Unable to equip."
+msgstr "Ostaminen epäonnistui."
+
+#: src/net/ea/loginhandler.cpp:131
+#, fuzzy
+msgid "Account was not found. Please re-login."
+msgstr "Tiliin ei ole yhteyttä. Ole hyvä ja kirjaudu ensin sisään."
+
+#: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127
+msgid "Old password incorrect."
+msgstr "Vanha salsana on väärä."
+
+#: src/net/ea/loginhandler.cpp:137
+#, fuzzy
+msgid "New password too short."
+msgstr "Uusi salasana on väärä."
+
+#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:243
+#: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
+#: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
+#: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
+msgid "Unknown error."
+msgstr "Tuntematon virhe."
+
+#: src/net/ea/loginhandler.cpp:205
+#, fuzzy
+msgid "Unregistered ID."
+msgstr "Poista palvelimelta"
+
+#: src/net/ea/loginhandler.cpp:208
+#, fuzzy
+msgid "Wrong password."
+msgstr "Väärä käyttäjätunnus tai salasana."
+
+#: src/net/ea/loginhandler.cpp:211
+#, fuzzy
+msgid "Account expired."
+msgstr "Tili porttikiellossa."
+
+#: src/net/ea/loginhandler.cpp:214
+#, fuzzy
+msgid "Rejected from server."
+msgstr "Yhteys palvelimeen katkesi!"
+
+#: src/net/ea/loginhandler.cpp:217
+msgid ""
+"You have been permanently banned from the game. Please contact the GM team."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:221
+#, fuzzy
+msgid "Client too old."
+msgstr "Asiakasohjelman versio on liian vanha."
+
+#: src/net/ea/loginhandler.cpp:224
 #, c-format
-msgid "Vitality %+.1f"
-msgstr "Elinvoima %+.1f"
+msgid ""
+"You have been temporarily banned from the game until %s.\n"
+"Please contact the GM team via the forums."
+msgstr ""
 
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
-msgid "Intelligence"
-msgstr "Älykkyys"
+#: src/net/ea/loginhandler.cpp:231
+msgid "Server overpopulated."
+msgstr ""
 
-#: src/net/manaserv/attributes.cpp:219
+#: src/net/ea/loginhandler.cpp:234
+#, fuzzy
+msgid "This user name is already taken."
+msgstr "Tällä tunnuksella on jo kirjauduttu."
+
+#: src/net/ea/loginhandler.cpp:240
+#, fuzzy
+msgid "Username permanently erased."
+msgstr "Käyttäjätunnus on jo käytössä."
+
+#: src/net/ea/partyhandler.cpp:82
+#, fuzzy
+msgid "Could not create party."
+msgstr "Luo ryhmä"
+
+#: src/net/ea/partyhandler.cpp:84
+#, fuzzy
+msgid "Party successfully created."
+msgstr "Pelaaja pyyhitty."
+
+#: src/net/ea/partyhandler.cpp:140
+#, fuzzy, c-format
+msgid "%s has joined your party."
+msgstr "%s ei ole ryhmässäsi!"
+
+#: src/net/ea/partyhandler.cpp:176
 #, c-format
-msgid "Intelligence %+.1f"
-msgstr "Älykkyys %+.1f"
+msgid "%s is already a member of a party."
+msgstr ""
 
-#: src/net/manaserv/attributes.cpp:225
-msgid "Willpower"
-msgstr "Tahdonvoima"
+#: src/net/ea/partyhandler.cpp:181
+#, fuzzy, c-format
+msgid "%s refused your invitation."
+msgstr "%s ei ottanut kutsuasi vastaan."
 
-#: src/net/manaserv/attributes.cpp:232
+#: src/net/ea/partyhandler.cpp:186
+#, fuzzy, c-format
+msgid "%s is now a member of your party."
+msgstr "%s ei ole ryhmässäsi!"
+
+#: src/net/ea/partyhandler.cpp:191
 #, c-format
-msgid "Willpower %+.1f"
-msgstr "Tahdonvoima %+.1f"
+msgid "%s can't join your party because party is full."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:196
+#, c-format
+msgid "QQQ Unknown invite response for %s."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:356
+#, fuzzy
+msgid "You have left the party."
+msgstr "Sinut on kutsuttu liittymään ryhmään %s."
+
+#: src/net/ea/partyhandler.cpp:368
+#, fuzzy, c-format
+msgid "%s has left your party."
+msgstr "%s ei ole ryhmässäsi!"
 
-#: src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/partyhandler.cpp:444
+#, c-format
+msgid "An unknown member tried to say: %s"
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:95 src/net/manaserv/beinghandler.cpp:315
 msgid "You are dead."
 msgstr "Olet kuollut."
 
-#: src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:316
 msgid "We regret to inform you that your character was killed in battle."
 msgstr "Ikävä kyllä joudumme kertomaan hahmosi kuolleen taistelussa."
 
-#: src/net/manaserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:318
 msgid "You are not that alive anymore."
 msgstr "Et ole enää erityisen elossa."
 
-#: src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:319
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr "Tuonelasta käy sieluusi kylmä viima."
 
-#: src/net/manaserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:320
 msgid "Game Over!"
 msgstr "Se siitä!"
 
-#: src/net/manaserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:101
+msgid "Insert coin to continue."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:321
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
@@ -4296,7 +4801,7 @@ msgstr ""
 "Ei, lapsikullat. Hahmonne ei oikeasti kuollut. Se... öhm... meni parempaan "
 "paikkaan."
 
-#: src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:323
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
@@ -4304,31 +4809,318 @@ msgstr ""
 "Ovela suunnitelmasi rikkoa vastustajiesi aseet iskemällä ne omaan kurkkuusi "
 "epäonnistui."
 
-#: src/net/manaserv/beinghandler.cpp:325
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:325
 msgid "I guess this did not run too well."
 msgstr "Ei tainnut mennä kovin lujaa."
 
-#: src/net/manaserv/beinghandler.cpp:326
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:326
 msgid "Do you want your possessions identified?"
 msgstr "Haluatko tietää mitä rojua kanniskelit oikeasti mukanasi?"
 
-#: src/net/manaserv/beinghandler.cpp:327
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:327
 msgid "Sadly, no trace of you was ever found..."
 msgstr "Ikävä kyllä sinusta ei jäänyt lopulta jälkeäkään löydettäväksi..."
 
-#: src/net/manaserv/beinghandler.cpp:329
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:329
 msgid "Annihilated."
 msgstr "Pim! Olet annihiloitu."
 
-#: src/net/manaserv/beinghandler.cpp:330
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:330
 msgid "Looks like you got your head handed to you."
 msgstr "Jäi näköjään oma pää vetävän käteen."
 
-#: src/net/manaserv/beinghandler.cpp:332
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:332
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr "Peballeen meni taas, vedä raatosi vessasta alas ja hanki uusi."
 
+#: src/net/ea/playerhandler.cpp:119
+msgid "You're not dead yet. You're just resting."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:120
+#, fuzzy
+msgid "You are no more."
+msgstr "Olet kuollut."
+
+#: src/net/ea/playerhandler.cpp:121
+#, fuzzy
+msgid "You have ceased to be."
+msgstr "Olet kuollut."
+
+#: src/net/ea/playerhandler.cpp:122
+msgid "You've expired and gone to meet your maker."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:123
+msgid "You're a stiff."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:124
+msgid "Bereft of life, you rest in peace."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:125
+msgid "If you weren't so animated, you'd be pushing up the daisies."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:126
+msgid "Your metabolic processes are now history."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:127
+msgid "You're off the twig."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:128
+msgid "You've kicked the bucket."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:129
+msgid ""
+"You've shuffled off your mortal coil, run down the curtain and joined the "
+"bleedin' choir invisibile."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:131
+#, fuzzy
+msgid "You are an ex-player."
+msgstr "Olet kuollut."
+
+#: src/net/ea/playerhandler.cpp:132
+msgid "You're pining for the fjords."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
+#: src/net/ea/playerhandler.cpp:425
+msgid "Message"
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:337
+msgid ""
+"You are carrying more than half your weight. You are unable to regain health."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:347
+msgid "You are carrying less than half your weight. You can regain health."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:451
+#, fuzzy, c-format
+msgid "You picked up %s."
+msgstr "[@@%2$d|%3$s@@] (%1$d kpl) otettu."
+
+#: src/net/ea/playerhandler.cpp:457
+#, fuzzy, c-format
+msgid "You spent %s."
+msgstr "Saat %s"
+
+#: src/net/ea/playerhandler.cpp:501
+msgid "Cannot raise skill!"
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:618
+#, fuzzy
+msgid "Equip arrows first."
+msgstr "Riisu ensin"
+
+#: src/net/ea/specialhandler.cpp:149
+#, fuzzy
+msgid "Trade failed!"
+msgstr "Kaupat peruttu."
+
+#: src/net/ea/specialhandler.cpp:152
+#, fuzzy
+msgid "Emote failed!"
+msgstr "Potkiminen epäonnistui!"
+
+#: src/net/ea/specialhandler.cpp:155
+#, fuzzy
+msgid "Sit failed!"
+msgstr "Potkiminen epäonnistui!"
+
+#: src/net/ea/specialhandler.cpp:158
+#, fuzzy
+msgid "Chat creating failed!"
+msgstr "Tunnistus epäonnistui."
+
+#: src/net/ea/specialhandler.cpp:161
+#, fuzzy
+msgid "Could not join party!"
+msgstr "%s ei ole ryhmässäsi!"
+
+#: src/net/ea/specialhandler.cpp:164
+msgid "Cannot shout!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:177
+msgid "You have not yet reached a high enough lvl!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:181
+msgid "Insufficient HP!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:184
+msgid "Insufficient SP!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:187
+#, fuzzy
+msgid "You have no memos!"
+msgstr "Sinulla ei ole tarpeeksi rahaa."
+
+#: src/net/ea/specialhandler.cpp:190
+#, fuzzy
+msgid "You cannot do that right now!"
+msgstr "Et ole enää erityisen elossa."
+
+#: src/net/ea/specialhandler.cpp:193
+msgid "Seems you need more money... ;-)"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:196
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:200
+msgid "You need another red gem!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:203
+msgid "You need another blue gem!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:206
+msgid "You're carrying to much to do this!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:209
+msgid "Huh? What's that?"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:220
+msgid "Warp failed..."
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:223
+msgid "Could not steal anything..."
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:226
+msgid "Poison had no effect..."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:128
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
+msgstr "%s haluaa tehdä kauppaa kanssasi, katsotko tarjouksen?"
+
+#: src/net/ea/tradehandler.cpp:130
+msgid "Trading isn't possible. Trade partner is too far away."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:134
+msgid "Trading isn't possible. Character doesn't exist."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:138
+msgid "Trade cancelled due to an unknown reason."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:146
+#, fuzzy, c-format
+msgid "Trade: You and %s"
+msgstr "Kauppa: Sinä"
+
+#: src/net/ea/tradehandler.cpp:156
+#, fuzzy, c-format
+msgid "Trade with %s cancelled."
+msgstr "Kaupat peruttu."
+
+#: src/net/ea/tradehandler.cpp:169
+msgid "Unhandled trade cancel packet."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:231
+msgid "Failed adding item. Trade partner is over weighted."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:236
+msgid "Failed adding item. Trade partner has no free slot."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:241
+#, fuzzy
+msgid "Failed adding item. You can't trade this item."
+msgstr "Tavaran lisääminen epäonnistui, limittämisongelma."
+
+#: src/net/ea/tradehandler.cpp:245
+msgid "Failed adding item for unknown reason."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:264 src/net/manaserv/tradehandler.cpp:160
+msgid "Trade canceled."
+msgstr "Kaupat peruttu."
+
+#: src/net/ea/tradehandler.cpp:275 src/net/manaserv/tradehandler.cpp:167
+msgid "Trade completed."
+msgstr "Kaupat tuli."
+
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
+msgid "Strength"
+msgstr "Voima"
+
+#: src/net/manaserv/attributes.cpp:167
+#, c-format
+msgid "Strength %+.1f"
+msgstr "Voima %+.1f"
+
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
+msgid "Agility"
+msgstr "Ketteryys"
+
+#: src/net/manaserv/attributes.cpp:180
+#, c-format
+msgid "Agility %+.1f"
+msgstr "Ketteryys %+.1f"
+
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
+msgid "Dexterity"
+msgstr "Näppäryys"
+
+#: src/net/manaserv/attributes.cpp:193
+#, c-format
+msgid "Dexterity %+.1f"
+msgstr "Näppäryys %+.1f"
+
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
+msgid "Vitality"
+msgstr "Elinvoima"
+
+#: src/net/manaserv/attributes.cpp:206
+#, c-format
+msgid "Vitality %+.1f"
+msgstr "Elinvoima %+.1f"
+
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
+msgid "Intelligence"
+msgstr "Älykkyys"
+
+#: src/net/manaserv/attributes.cpp:219
+#, c-format
+msgid "Intelligence %+.1f"
+msgstr "Älykkyys %+.1f"
+
+#: src/net/manaserv/attributes.cpp:225
+msgid "Willpower"
+msgstr "Tahdonvoima"
+
+#: src/net/manaserv/attributes.cpp:232
+#, c-format
+msgid "Willpower %+.1f"
+msgstr "Tahdonvoima %+.1f"
+
 #: src/net/manaserv/beinghandler.cpp:337
 msgid "Press OK to respawn."
 msgstr "Paina OK syntyäksesi uudelleen."
@@ -4382,16 +5174,6 @@ msgstr "Ainakin yksi arvo on sallitun alueen (%u - %u) ulkopuolella."
 msgid "Invalid slot number."
 msgstr "Paikan numero ei kelpaa."
 
-#: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
-#: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
-#: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
-msgid "Unknown error."
-msgstr "Tuntematon virhe."
-
-#: src/net/manaserv/charhandler.cpp:210
-msgid "Info"
-msgstr "Tietoja"
-
 #: src/net/manaserv/charhandler.cpp:210
 msgid "Player deleted."
 msgstr "Hahmo poistettu."
@@ -4455,10 +5237,6 @@ msgstr "%s potkaisi käyttäjän %s ulos."
 msgid "Unknown channel event."
 msgstr "Tuntematon kanavatapahtuma."
 
-#: src/net/manaserv/guildhandler.cpp:85
-msgid "Guild created."
-msgstr "Kilta luotu."
-
 #: src/net/manaserv/guildhandler.cpp:90
 msgid "Error creating guild."
 msgstr "Killan luonti epäonnistui."
@@ -4491,10 +5269,6 @@ msgstr "Tili porttikiellossa."
 msgid "New password incorrect."
 msgstr "Uusi salasana on väärä."
 
-#: src/net/manaserv/loginhandler.cpp:127
-msgid "Old password incorrect."
-msgstr "Vanha salsana on väärä."
-
 #: src/net/manaserv/loginhandler.cpp:131 src/net/manaserv/loginhandler.cpp:163
 msgid "Account not connected. Please login first."
 msgstr "Tiliin ei ole yhteyttä. Ole hyvä ja kirjaudu ensin sisään."
@@ -4574,24 +5348,11 @@ msgstr "Hyväksyt tulevat kaupantekoehdotukset."
 msgid "Ignoring incoming trade requests."
 msgstr "Jätät tulevat kaupantekoehdotukset huomiotta."
 
-#: src/net/manaserv/tradehandler.cpp:128
-#, c-format
-msgid "%s wants to trade with you, do you accept?"
-msgstr "%s haluaa tehdä kauppaa kanssasi, katsotko tarjouksen?"
-
 #: src/net/manaserv/tradehandler.cpp:146
 #, c-format
 msgid "Trading with %s"
 msgstr "Kaupantekoa pelaajan %s kanssa"
 
-#: src/net/manaserv/tradehandler.cpp:160
-msgid "Trade canceled."
-msgstr "Kaupat peruttu."
-
-#: src/net/manaserv/tradehandler.cpp:167
-msgid "Trade completed."
-msgstr "Kaupat tuli."
-
 #: src/net/tmwa/adminhandler.cpp:70
 msgid "Kick failed!"
 msgstr "Potkiminen epäonnistui!"
@@ -4783,4 +5544,5 @@ msgstr "MP %+d"
 msgid "Unknown item"
 msgstr "Tuntematon tavara"
 
-
+#~ msgid "Enable opacity cache"
+#~ msgstr "Ota käyttöön läpinäkyvyysvälimuisti"
diff --git a/po/fr.po b/po/fr.po
index 746948d6e..2cbb719b3 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 #   <antoinebcn@hotmail.com>, 2011.
 # Jumpy <antoinebcn@hotmail.com>, 2011.
 # Bernard  <nard@bh28.net>, 2011.
@@ -10,39 +10,40 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-08 04:26+0300\n"
-"PO-Revision-Date: 2011-08-08 01:29+0000\n"
-"Last-Translator: akaras <akaras@inbox.ru>\n"
-"Language-Team: French (http://www.transifex.net/projects/p/manaplus/team/fr/)\n"
+"POT-Creation-Date: 2011-08-10 01:11+0300\n"
+"PO-Revision-Date: 2011-08-08 20:35+0000\n"
+"Last-Translator: Jumpy <antoinebcn@hotmail.com>\n"
+"Language-Team: French (http://www.transifex.net/projects/p/manaplus/team/"
+"fr/)\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
 #: src/actorspritemanager.cpp:1034
 msgid "Visible on map"
 msgstr "Visible sur la carte"
 
-#: src/being.cpp:541
+#: src/being.cpp:542
 msgid "dodge"
 msgstr "esquivé"
 
-#: src/being.cpp:541
+#: src/being.cpp:542
 msgid "miss"
 msgstr "raté"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1513
+#: src/being.cpp:1514
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1518
+#: src/being.cpp:1519
 msgid "I"
 msgstr "I"
 
-#: src/client.cpp:825 src/gui/setup.cpp:51 src/gui/windowmenu.cpp:100
+#: src/client.cpp:825 src/gui/setup.cpp:53 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Configuration"
 
@@ -74,7 +75,8 @@ msgstr "Changement de serveur de jeu"
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
-#: src/gui/unregisterdialog.cpp:137 src/net/manaserv/charhandler.cpp:184
+#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
+#: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "Erreur"
@@ -139,18 +141,18 @@ msgstr "Vous ne pouvez pas envoyer de messages vides."
 #: src/commandhandler.cpp:409
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
-" you."
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
+"you."
 msgstr ""
-"Vous ne pouvez créer une nouvelle fenêtre de message privé avec le nom "
-"\"%s\". Soit elle existe déjà, soit il s'agit de vous même."
+"Vous ne pouvez créer une nouvelle fenêtre de message privé avec le nom \"%s"
+"\". Soit elle existe déjà, soit il s'agit de vous même."
 
 #: src/commandhandler.cpp:429
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Demande de rejoindre le canal %s."
 
-#: src/commandhandler.cpp:445
+#: src/commandhandler.cpp:445 src/net/ea/gui/partytab.cpp:125
 msgid "Party name is missing."
 msgstr "Le nom du groupe est manquant."
 
@@ -298,7 +300,8 @@ msgstr "Images des ressources non affectées :"
 #: src/commandhandler.h:40
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr "Les options de /%s sont \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgstr ""
+"Les options de /%s sont \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 
 #: src/game.cpp:246 src/gui/widgets/chattab.cpp:410
 msgid "General"
@@ -362,35 +365,35 @@ msgstr "Rang PvP : %d"
 msgid "Comment: %s"
 msgstr "Commentaire : %s"
 
-#: src/gui/botcheckerwindow.cpp:265
+#: src/gui/botcheckerwindow.cpp:266
 msgid "Bot Checker"
 msgstr "Testeur de Robot"
 
-#: src/gui/botcheckerwindow.cpp:295 src/gui/setup_players.cpp:64
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
 msgid "Name"
 msgstr "Nom"
 
-#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:130
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:130
 #: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:604
 #: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
 msgid "Attack"
 msgstr "Attaquer"
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:275
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:275
 #: src/keyboardconfig.cpp:62
 msgid "Talk"
 msgstr "Parler"
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:241
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:241
 #: src/gui/popupmenu.cpp:280 src/gui/popupmenu.cpp:661
 msgid "Move"
 msgstr "Déplacement"
 
-#: src/gui/botcheckerwindow.cpp:299
+#: src/gui/botcheckerwindow.cpp:300
 msgid "Result"
 msgstr "Résultat"
 
-#: src/gui/botcheckerwindow.cpp:309 src/gui/npcdialog.cpp:123
+#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:123
 msgid "Reset"
 msgstr "Réinitialiser"
 
@@ -459,8 +462,8 @@ msgstr "Vendre"
 #: src/gui/popupmenu.cpp:1731 src/gui/popupmenu.cpp:1774
 #: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1849
 #: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1935
-#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:68
-#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:237
+#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:70
+#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:238
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
 #: src/gui/updatewindow.cpp:157
 msgid "Cancel"
@@ -629,8 +632,8 @@ msgid "Enter password:"
 msgstr "Entrer le mot de passe :"
 
 #: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
-#: src/gui/setup_players.cpp:251 src/gui/shopwindow.cpp:120
-#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:240
+#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120
+#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:241
 msgid "Delete"
 msgstr "Supprimer"
 
@@ -704,10 +707,10 @@ msgid "rainbow 3"
 msgstr "arc en ciel 3"
 
 #: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
-#: src/gui/logindialog.cpp:78 src/gui/setup_players.cpp:220
-#: src/gui/setup_theme.cpp:71 src/gui/setup_theme.cpp:125
-#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:101
-#: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:159
+#: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
+#: src/gui/setup_theme.cpp:72 src/gui/setup_theme.cpp:126
+#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
+#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
 msgid "???"
 msgstr "???"
 
@@ -898,7 +901,7 @@ msgstr "Suivant >"
 msgid "Auto open this window"
 msgstr "Ouverture automatique de cette fenêtre"
 
-#: src/gui/editdialog.cpp:46 src/gui/itemamountwindow.cpp:208
+#: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
 #: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "Ok"
@@ -982,7 +985,7 @@ msgstr "Poids :"
 
 #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
 #: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1724
-#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:69
+#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:71
 msgid "Store"
 msgstr "Entreposer"
 
@@ -1041,91 +1044,91 @@ msgstr ","
 msgid "Weight: %s"
 msgstr "Poids : %s"
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
+#: src/gui/killstats.cpp:46 src/gui/windowmenu.cpp:69
 msgid "Kill stats"
 msgstr "Statistiques"
 
-#: src/gui/killstats.cpp:63
+#: src/gui/killstats.cpp:64
 msgid "Reset stats"
 msgstr "RaZ stats"
 
-#: src/gui/killstats.cpp:64
+#: src/gui/killstats.cpp:65
 msgid "Reset timer"
 msgstr "RaZ temps"
 
-#: src/gui/killstats.cpp:68 src/gui/killstats.cpp:204
+#: src/gui/killstats.cpp:69 src/gui/killstats.cpp:205
 #, c-format
 msgid "Level: %d at %f%%"
 msgstr "Niveau : %d à %f%%"
 
-#: src/gui/killstats.cpp:72 src/gui/killstats.cpp:209
+#: src/gui/killstats.cpp:73 src/gui/killstats.cpp:210
 #, c-format
 msgid "Exp: %d/%d Left: %d"
 msgstr "Exp : %d/%d Reste : %d"
 
-#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:215
-#: src/gui/killstats.cpp:224
+#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:216
+#: src/gui/killstats.cpp:225
 #, c-format
 msgid "1%% = %d exp, avg mob for 1%%: %s"
 msgstr "1%% = %d Moyenne des monstres tués 1%% : %s"
 
-#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:141
-#: src/gui/killstats.cpp:233
+#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:142
+#: src/gui/killstats.cpp:234
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr "Nbre Tués : %s, total exp : %s"
 
-#: src/gui/killstats.cpp:80 src/gui/killstats.cpp:143
-#: src/gui/killstats.cpp:219 src/gui/killstats.cpp:229
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
+#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:230
 #, c-format
 msgid "Avg Exp: %s, No. of avg mob to next level: %s"
 msgstr "Moyenne Exp: %s, Nombre de monstres pour le prochain niveau : %s"
 
-#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:161
-#: src/gui/killstats.cpp:236
+#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:162
+#: src/gui/killstats.cpp:237
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr "Tués/Min : %s, Exp/Min : %s"
 
-#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:88 src/gui/killstats.cpp:93
-#: src/gui/killstats.cpp:288 src/gui/killstats.cpp:304
-#: src/gui/killstats.cpp:322
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:89 src/gui/killstats.cpp:94
+#: src/gui/killstats.cpp:289 src/gui/killstats.cpp:305
+#: src/gui/killstats.cpp:323
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
 msgstr[0] "Rapidité exp pour %d min : %s"
 msgstr[1] "Rapidité exp pour %d min : %s"
 
-#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
+#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
 msgstr[0] "Temps pour le prochain niveau %d min : %s"
 msgstr[1] "Temps pour le prochain niveau %d min : %s"
 
-#: src/gui/killstats.cpp:99 src/gui/killstats.cpp:240
+#: src/gui/killstats.cpp:100 src/gui/killstats.cpp:241
 msgid "Last kill exp:"
 msgstr "Exp du dernier tué :"
 
-#: src/gui/killstats.cpp:101 src/gui/killstats.cpp:354
-#: src/gui/killstats.cpp:360 src/gui/killstats.cpp:366
-#: src/gui/killstats.cpp:371
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:355
+#: src/gui/killstats.cpp:361 src/gui/killstats.cpp:367
+#: src/gui/killstats.cpp:372
 msgid "Time before jacko spawn:"
 msgstr "Temps avant l'arrivée de Jack0 :"
 
-#: src/gui/killstats.cpp:293 src/gui/killstats.cpp:300
-#: src/gui/killstats.cpp:310 src/gui/killstats.cpp:317
-#: src/gui/killstats.cpp:329 src/gui/killstats.cpp:336
+#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:301
+#: src/gui/killstats.cpp:311 src/gui/killstats.cpp:318
+#: src/gui/killstats.cpp:330 src/gui/killstats.cpp:337
 #, c-format
 msgid "  Time for next level: %s"
 msgstr "  Temps pour le prochain niveau : %s"
 
-#: src/gui/killstats.cpp:360
+#: src/gui/killstats.cpp:361
 #, c-format
 msgid "%s %d?"
 msgstr "%s %d?"
 
-#: src/gui/killstats.cpp:366
+#: src/gui/killstats.cpp:367
 msgid "jacko spawning"
 msgstr "Arrivée de Jack0"
 
@@ -1789,34 +1792,38 @@ msgid "Tabs"
 msgstr "Fenêtre"
 
 #: src/gui/setup_chat.cpp:96
+msgid "Put all whispers in tabs"
+msgstr "Placer tous les messages privés dans des onglets"
+
+#: src/gui/setup_chat.cpp:99
 msgid "Log magic messages in debug tab"
 msgstr "Messages de magie dans l'onglet \"informations\""
 
-#: src/gui/setup_chat.cpp:99
+#: src/gui/setup_chat.cpp:102
 msgid "Show server messages in debug tab"
 msgstr "Afficher les messages du serveur dans l'onglet \"informations\""
 
-#: src/gui/setup_chat.cpp:102
+#: src/gui/setup_chat.cpp:105
 msgid "Enable trade tab"
 msgstr "Activer la boite de dialogue d'échanges"
 
-#: src/gui/setup_chat.cpp:105
+#: src/gui/setup_chat.cpp:108
 msgid "Enable battle tab"
 msgstr "Activer l'onglet de combat"
 
-#: src/gui/setup_chat.cpp:108
+#: src/gui/setup_chat.cpp:111
 msgid "Show battle events"
 msgstr "Afficher les événements de combat"
 
-#: src/gui/setup_chat.cpp:111
+#: src/gui/setup_chat.cpp:114
 msgid "Resize chat tabs if need"
 msgstr "Si besoin est, changer la taille des fenêtre de dialogue"
 
-#: src/gui/setup_chat.cpp:115
+#: src/gui/setup_chat.cpp:118
 msgid "Time"
 msgstr "Temps"
 
-#: src/gui/setup_chat.cpp:117
+#: src/gui/setup_chat.cpp:120
 msgid "Use local time"
 msgstr "Utiliser l’horaire local"
 
@@ -1867,16 +1874,15 @@ msgstr "Bleu : "
 msgid "Alpha:"
 msgstr "Opacité : "
 
-#: src/gui/setup.cpp:67
+#: src/gui/setup.cpp:69
 msgid "Apply"
 msgstr "Appliquer"
 
-#: src/gui/setup.cpp:70
+#: src/gui/setup.cpp:72
 msgid "Reset Windows"
 msgstr "Rétablir les fenêtres"
 
 #: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
-#: src/gui/setup_players.cpp:334
 msgid "Edit"
 msgstr "Éditer"
 
@@ -2084,148 +2090,203 @@ msgstr "Cacher le bouclier"
 msgid "Show background"
 msgstr "Montrer le fond"
 
-#: src/gui/setup_players.cpp:65
-msgid "Relation"
-msgstr "Relation"
+#: src/gui/setup_perfomance.cpp:48
+msgid "Perfomance"
+msgstr ""
 
-#: src/gui/setup_players.cpp:70
-msgid "Neutral"
-msgstr "Neutre"
+#: src/gui/setup_perfomance.cpp:55
+msgid "Better perfomance (enable for better perfomance)"
+msgstr ""
 
-#: src/gui/setup_players.cpp:71
-msgid "Friend"
-msgstr "Ami"
+#: src/gui/setup_perfomance.cpp:58
+msgid "Auto adjust perfomance"
+msgstr "Ajustement automatique des performances"
 
-#: src/gui/setup_players.cpp:72
-msgid "Disregarded"
-msgstr "Négligé"
+#: src/gui/setup_perfomance.cpp:61
+msgid "Show beings transparency"
+msgstr "Montrer les êtres en transparence"
 
-#: src/gui/setup_players.cpp:73
-msgid "Ignored"
-msgstr "Ignoré"
+#: src/gui/setup_perfomance.cpp:64
+msgid "Hw acceleration"
+msgstr "Accélération matériel"
 
-#: src/gui/setup_players.cpp:74
-msgid "Erased"
-msgstr "Effacé"
+#: src/gui/setup_perfomance.cpp:67
+msgid "Enable opacity cache (Software, can use many memory)"
+msgstr ""
 
-#: src/gui/setup_players.cpp:247
-msgid "Allow trading"
-msgstr "Autoriser les échanges"
+#: src/gui/setup_perfomance.cpp:70
+#, fuzzy
+msgid "Enable map reduce (Software)"
+msgstr "Authoriser la réduction des cartes"
 
-#: src/gui/setup_players.cpp:249
-msgid "Allow whispers"
-msgstr "Autoriser les messages privés"
+#: src/gui/setup_perfomance.cpp:73
+msgid "Better quality (disable for better perfomance)"
+msgstr ""
 
-#: src/gui/setup_players.cpp:252
-msgid "Old"
-msgstr "Ancien"
+#: src/gui/setup_perfomance.cpp:76
+msgid "Enable alpha channel fix (Software, can be very slow)"
+msgstr ""
 
-#: src/gui/setup_players.cpp:254
-msgid "Put all whispers in tabs"
-msgstr "Placer tous les messages privés dans des onglets"
+#: src/gui/setup_perfomance.cpp:80
+#, fuzzy
+msgid "Enable reorder sprites."
+msgstr "Activer l'attaque de la part du serveur"
 
-#: src/gui/setup_players.cpp:257
-msgid "Show gender"
-msgstr "Afficher le genre"
+#: src/gui/setup_perfomance.cpp:83
+msgid "Small memory (enable for lower memory usage)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:86
+msgid "Disable advanced beings caching (Software)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:89
+msgid "Disable beings caching (Software)"
+msgstr ""
 
-#: src/gui/setup_players.cpp:267
+#: src/gui/setup_players.cpp:48
 msgid "Players"
 msgstr "Joueurs"
 
-#: src/gui/setup_players.cpp:292
-msgid "When ignoring:"
-msgstr "Quand ignoré :"
+#: src/gui/setup_players.cpp:54
+msgid "Show gender"
+msgstr "Afficher le genre"
 
-#: src/gui/setup_players.cpp:315
+#: src/gui/setup_players.cpp:57
 msgid "Show level"
 msgstr "Afficher le niveau"
 
-#: src/gui/setup_players.cpp:319
+#: src/gui/setup_players.cpp:60
 msgid "Show own name"
 msgstr "Afficher son propre nom"
 
-#: src/gui/setup_players.cpp:323
+#: src/gui/setup_players.cpp:63
 msgid "Target dead players"
 msgstr "Cibler les joueurs morts"
 
-#: src/gui/setup_players.cpp:327
+#: src/gui/setup_players.cpp:66
+msgid "Visible names"
+msgstr "Afficher les noms"
+
+#: src/gui/setup_players.cpp:69
 msgid "Secure trades"
 msgstr "Protection des échanges"
 
-#: src/gui/setup_players.cpp:331 src/gui/setup_players.cpp:523
+#: src/gui/setup_players.cpp:72
 msgid "Unsecure chars in names"
 msgstr "Caractère à risque dans le nom"
 
-#: src/gui/setup_players.cpp:336
-msgid "Visible names"
-msgstr "Afficher les noms"
-
-#: src/gui/setup_players.cpp:341
+#: src/gui/setup_players.cpp:75
 msgid "Show statuses"
 msgstr "Montrer les Status"
 
-#: src/gui/setup_theme.cpp:105
+#: src/gui/setup_relations.cpp:65
+msgid "Relation"
+msgstr "Relation"
+
+#: src/gui/setup_relations.cpp:70
+msgid "Neutral"
+msgstr "Neutre"
+
+#: src/gui/setup_relations.cpp:71
+msgid "Friend"
+msgstr "Ami"
+
+#: src/gui/setup_relations.cpp:72
+msgid "Disregarded"
+msgstr "Négligé"
+
+#: src/gui/setup_relations.cpp:73
+msgid "Ignored"
+msgstr "Ignoré"
+
+#: src/gui/setup_relations.cpp:74
+msgid "Erased"
+msgstr "Effacé"
+
+#: src/gui/setup_relations.cpp:239
+msgid "Allow trading"
+msgstr "Autoriser les échanges"
+
+#: src/gui/setup_relations.cpp:241
+msgid "Allow whispers"
+msgstr "Autoriser les messages privés"
+
+#: src/gui/setup_relations.cpp:244
+msgid "Old"
+msgstr "Ancien"
+
+#: src/gui/setup_relations.cpp:246
+#, fuzzy
+msgid "Relations"
+msgstr "Relation"
+
+#: src/gui/setup_relations.cpp:271
+msgid "When ignoring:"
+msgstr "Quand ignoré :"
+
+#: src/gui/setup_theme.cpp:106
 msgid "Tiny (10)"
 msgstr "Minuscule (10)"
 
-#: src/gui/setup_theme.cpp:106
+#: src/gui/setup_theme.cpp:107
 msgid "Small (11)"
 msgstr "Petite (11)"
 
-#: src/gui/setup_theme.cpp:107
+#: src/gui/setup_theme.cpp:108
 msgid "Medium (12)"
 msgstr "Moyenne (12)"
 
-#: src/gui/setup_theme.cpp:108
+#: src/gui/setup_theme.cpp:109
 msgid "Large (13)"
 msgstr "Grande (13)"
 
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:110
 msgid "Big (14)"
 msgstr "Grand (14)"
 
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:111
 msgid "Huge (15)"
 msgstr "Immense (15)"
 
-#: src/gui/setup_theme.cpp:140
+#: src/gui/setup_theme.cpp:141
 msgid "Theme"
 msgstr "Thème"
 
-#: src/gui/setup_theme.cpp:142
+#: src/gui/setup_theme.cpp:143
 msgid "Gui theme"
 msgstr "Thème de l'interface"
 
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:144
 msgid "Main Font"
 msgstr "Police principale"
 
-#: src/gui/setup_theme.cpp:144
+#: src/gui/setup_theme.cpp:145
 msgid "Bold font"
 msgstr "Police grasse"
 
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:146
 msgid "Particle font"
 msgstr "Taille des effets de particules"
 
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:147
 msgid "Help font"
 msgstr "Police de l'aide"
 
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:148
 msgid "Secure font"
 msgstr "Police sécurisée"
 
-#: src/gui/setup_theme.cpp:175
+#: src/gui/setup_theme.cpp:176
 msgid "Font size"
 msgstr "Taille de police"
 
-#: src/gui/setup_theme.cpp:281
+#: src/gui/setup_theme.cpp:282
 msgid "Theme Changed"
 msgstr "Thème changé"
 
-#: src/gui/setup_theme.cpp:282 src/gui/setup_video.cpp:670
-#: src/gui/setup_video.cpp:675
+#: src/gui/setup_theme.cpp:283 src/gui/setup_video.cpp:619
+#: src/gui/setup_video.cpp:624
 msgid "Restart your client for the change to take effect."
 msgstr "Redémarrez le jeu pour que les changements soient appliqués."
 
@@ -2277,142 +2338,122 @@ msgstr "moyen"
 msgid "max"
 msgstr "max"
 
-#: src/gui/setup_video.cpp:293
+#: src/gui/setup_video.cpp:288
 msgid "Full screen"
 msgstr "Plein écran"
 
-#: src/gui/setup_video.cpp:294
-msgid "Hw acceleration"
-msgstr "Accélération matériel"
-
-#: src/gui/setup_video.cpp:295
+#: src/gui/setup_video.cpp:289
 msgid "Custom cursor"
 msgstr "Curseur personnalisé"
 
-#: src/gui/setup_video.cpp:297
+#: src/gui/setup_video.cpp:291
 msgid "Particle effects"
 msgstr "Effets de particules"
 
-#: src/gui/setup_video.cpp:299
+#: src/gui/setup_video.cpp:293
 msgid "Show pickup notification"
 msgstr "Afficher les messages de ramassage"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:301
+#: src/gui/setup_video.cpp:295
 msgid "in chat"
 msgstr "dans la conversation"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:303
+#: src/gui/setup_video.cpp:297
 msgid "as particle"
 msgstr "avec des particules"
 
-#: src/gui/setup_video.cpp:305
-msgid "Enable opacity cache"
-msgstr "Activer le cache transparence"
-
-#: src/gui/setup_video.cpp:306
-msgid "Enable map reduce"
-msgstr "Authoriser la réduction des cartes"
-
-#: src/gui/setup_video.cpp:308
-msgid "Auto adjust perfomance"
-msgstr ""
-
-#: src/gui/setup_video.cpp:310
-msgid "Show beings transparency"
-msgstr ""
-
-#: src/gui/setup_video.cpp:315
+#: src/gui/setup_video.cpp:302
 msgid "FPS limit:"
 msgstr "Limite FPS :"
 
-#: src/gui/setup_video.cpp:319 src/gui/setup_video.cpp:356
-#: src/gui/setup_video.cpp:607 src/gui/setup_video.cpp:760
+#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
+#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709
 msgid "Alt FPS limit: "
 msgstr "Alterner les limites FPS"
 
-#: src/gui/setup_video.cpp:328
+#: src/gui/setup_video.cpp:315
 msgid "Video"
 msgstr "Vidéo"
 
-#: src/gui/setup_video.cpp:334
+#: src/gui/setup_video.cpp:321
 msgid "Overhead text"
 msgstr "Texte aérien"
 
-#: src/gui/setup_video.cpp:335
+#: src/gui/setup_video.cpp:322
 msgid "Gui opacity"
 msgstr "Opacité de l'interface"
 
-#: src/gui/setup_video.cpp:336
+#: src/gui/setup_video.cpp:323
 msgid "Ambient FX"
 msgstr "Effets ambiants"
 
-#: src/gui/setup_video.cpp:337
+#: src/gui/setup_video.cpp:324
 msgid "Particle detail"
 msgstr "Détail des particules"
 
-#: src/gui/setup_video.cpp:354 src/gui/setup_video.cpp:357
-#: src/gui/setup_video.cpp:606 src/gui/setup_video.cpp:747
-#: src/gui/setup_video.cpp:758
+#: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
+#: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
+#: src/gui/setup_video.cpp:707
 msgid "None"
 msgstr "Rien"
 
-#: src/gui/setup_video.cpp:511
+#: src/gui/setup_video.cpp:484
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 "Impossible de passer en mode fenêtré, et l'ancienne résolution n'est "
 "également pas accessible !"
 
-#: src/gui/setup_video.cpp:517
+#: src/gui/setup_video.cpp:490
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 "Impossible de passer en mode plein-écran, et l'ancienne résolution n'est "
 "également pas accessible !"
 
-#: src/gui/setup_video.cpp:528
+#: src/gui/setup_video.cpp:501
 msgid "Switching to Full Screen"
 msgstr "Passage en plein écran"
 
-#: src/gui/setup_video.cpp:529
+#: src/gui/setup_video.cpp:502
 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:541
+#: src/gui/setup_video.cpp:514
 msgid "Changing to OpenGL"
 msgstr "Activation d'OpenGL"
 
-#: src/gui/setup_video.cpp:542
+#: src/gui/setup_video.cpp:515
 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:653
+#: src/gui/setup_video.cpp:602
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Résolution personnalisée (Exemple : 1024x768)"
 
-#: src/gui/setup_video.cpp:654
+#: src/gui/setup_video.cpp:603
 msgid "Enter new resolution:                "
 msgstr "Entrer la nouvelle résolution : "
 
-#: src/gui/setup_video.cpp:669 src/gui/setup_video.cpp:674
+#: src/gui/setup_video.cpp:618 src/gui/setup_video.cpp:623
 msgid "Screen Resolution Changed"
 msgstr "Résolution de l'écran modifiée"
 
-#: src/gui/setup_video.cpp:672
+#: src/gui/setup_video.cpp:621
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 "Certaines fenêtres pourraient être modifiées pour coïncider à la résolution "
 "réduite."
 
-#: src/gui/setup_video.cpp:705
+#: src/gui/setup_video.cpp:654
 msgid "Particle Effect Settings Changed."
 msgstr "Paramètres d'effet de particules modifiés."
 
-#: src/gui/setup_video.cpp:706
+#: src/gui/setup_video.cpp:655
 msgid "Changes will take effect on map change."
 msgstr "Les changements seront appliqués au changement de carte."
 
@@ -2441,7 +2482,8 @@ msgstr "Annoncer"
 msgid "Show links in announce"
 msgstr "Montrer les liens dans l'annonce"
 
-#: src/gui/shopwindow.cpp:723 src/net/manaserv/tradehandler.cpp:127
+#: src/gui/shopwindow.cpp:723 src/net/ea/tradehandler.cpp:106
+#: src/net/manaserv/tradehandler.cpp:127
 msgid "Request for Trade"
 msgstr "Demande d'échange"
 
@@ -2483,7 +2525,7 @@ msgstr "Niveau : %d"
 msgid "Lvl: %d (%+d)"
 msgstr "Niveau : %d (%+d)"
 
-#: src/gui/socialwindow.cpp:117
+#: src/gui/socialwindow.cpp:117 src/net/ea/gui/guildtab.cpp:52
 msgid "Guild"
 msgstr "Guilde"
 
@@ -2515,7 +2557,7 @@ msgstr "Quitter la guilde ?"
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Êtes-vous sûr de vouloir quitter la guilde %s ?"
 
-#: src/gui/socialwindow.cpp:215
+#: src/gui/socialwindow.cpp:215 src/net/ea/gui/partytab.cpp:50
 msgid "Party"
 msgstr "Groupe"
 
@@ -2624,8 +2666,8 @@ msgstr "Choisissez le nom de la guilde."
 #: src/gui/socialwindow.cpp:1309
 msgid "Received guild request, but one already exists."
 msgstr ""
-"Vous avez reçu une invitation pour rejoindre une guilde, mais vous êtes déjà"
-" dans une."
+"Vous avez reçu une invitation pour rejoindre une guilde, mais vous êtes déjà "
+"dans une."
 
 #: src/gui/socialwindow.cpp:1315
 #, c-format
@@ -2681,243 +2723,243 @@ msgstr "Choisissez le nom du groupe."
 msgid "Specials"
 msgstr "Cpt. spéciales"
 
-#: src/gui/statuspopup.cpp:196
+#: src/gui/statuspopup.cpp:197
 msgid "(D) default moves"
 msgstr "(D) Mouvements par défaut"
 
-#: src/gui/statuspopup.cpp:201
+#: src/gui/statuspopup.cpp:202
 msgid "(I) invert moves"
 msgstr "(I) Mouvements inversés"
 
-#: src/gui/statuspopup.cpp:206
+#: src/gui/statuspopup.cpp:207
 msgid "(c) moves with some crazy moves"
 msgstr "(c) Mouvements un peu fous"
 
-#: src/gui/statuspopup.cpp:211
+#: src/gui/statuspopup.cpp:212
 msgid "(C) moves with crazy moves"
 msgstr "(C) Mouvement complètement fous"
 
-#: src/gui/statuspopup.cpp:216
+#: src/gui/statuspopup.cpp:217
 msgid "(d) double normal + crazy"
 msgstr "(d) double normal et fou"
 
-#: src/gui/statuspopup.cpp:221
+#: src/gui/statuspopup.cpp:222
 msgid "(?) move"
 msgstr "(?) Mouvements"
 
-#: src/gui/statuspopup.cpp:239
+#: src/gui/statuspopup.cpp:240
 msgid "(a) custom crazy move"
 msgstr "(a) Mouvements fous personnalisés"
 
-#: src/gui/statuspopup.cpp:243
+#: src/gui/statuspopup.cpp:244
 msgid "(?) crazy move"
 msgstr "(?) Mouvements fous"
 
-#: src/gui/statuspopup.cpp:253
+#: src/gui/statuspopup.cpp:254
 msgid "(0) default moves to target"
 msgstr "(0) Aller à la cible distante par défaut"
 
-#: src/gui/statuspopup.cpp:258
+#: src/gui/statuspopup.cpp:259
 msgid "(1) moves to target in distance 1"
 msgstr "(1) Aller à la cible en distante de 1"
 
-#: src/gui/statuspopup.cpp:263
+#: src/gui/statuspopup.cpp:264
 msgid "(2) moves to target in distance 2"
 msgstr "(2) Aller vers la cible jusqu'à 2 de distance"
 
-#: src/gui/statuspopup.cpp:268
+#: src/gui/statuspopup.cpp:269
 msgid "(3) moves to target in distance 3"
 msgstr "(3)  Aller à la cible en distante de 3"
 
-#: src/gui/statuspopup.cpp:273
+#: src/gui/statuspopup.cpp:274
 msgid "(5) moves to target in distance 5"
 msgstr "(5)  Aller à la cible en distante de 5"
 
-#: src/gui/statuspopup.cpp:278
+#: src/gui/statuspopup.cpp:279
 msgid "(7) moves to target in distance 7"
 msgstr "(7) Aller à la cible en distante de 7"
 
-#: src/gui/statuspopup.cpp:283
+#: src/gui/statuspopup.cpp:284
 msgid "(A) moves to target in attack range"
 msgstr "(A) Aller à la cible dans le champ d'attaque"
 
-#: src/gui/statuspopup.cpp:288
+#: src/gui/statuspopup.cpp:289
 msgid "(?) move to target"
 msgstr "(?) Aller à la cible"
 
-#: src/gui/statuspopup.cpp:296
+#: src/gui/statuspopup.cpp:297
 msgid "(D) default follow"
 msgstr "(D) Suivre : défaut"
 
-#: src/gui/statuspopup.cpp:300
+#: src/gui/statuspopup.cpp:301
 msgid "(R) relative follow"
 msgstr "(R) Suivre: mouvement relatif"
 
-#: src/gui/statuspopup.cpp:304
+#: src/gui/statuspopup.cpp:305
 msgid "(M) mirror follow"
 msgstr "(M) Suivre effet miroir"
 
-#: src/gui/statuspopup.cpp:308
+#: src/gui/statuspopup.cpp:309
 msgid "(P) pet follow"
 msgstr "(P) Suivre comme un toutou"
 
-#: src/gui/statuspopup.cpp:312
+#: src/gui/statuspopup.cpp:313
 msgid "(?) unknown follow"
 msgstr "(?) Suivre : mode inconnu"
 
-#: src/gui/statuspopup.cpp:321 src/gui/statuspopup.cpp:344
+#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345
 msgid "(D) default attack"
 msgstr "(D) Attaque : défaut"
 
-#: src/gui/statuspopup.cpp:326
+#: src/gui/statuspopup.cpp:327
 msgid "(s) switch attack without shield"
 msgstr "(s) Attaquer sans protection"
 
-#: src/gui/statuspopup.cpp:331
+#: src/gui/statuspopup.cpp:332
 msgid "(S) switch attack with shield"
 msgstr "(S) Attaquer avec protection"
 
-#: src/gui/statuspopup.cpp:335 src/gui/statuspopup.cpp:360
+#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
 msgid "(?) attack"
 msgstr "(?) Attaque"
 
-#: src/gui/statuspopup.cpp:348
+#: src/gui/statuspopup.cpp:349
 msgid "(G) go and attack"
 msgstr "(G) Se déplacer et attaquer"
 
-#: src/gui/statuspopup.cpp:352
+#: src/gui/statuspopup.cpp:353
 msgid "(A) go, attack, pickup"
 msgstr "(A) Se déplacer, attaquer et ramasser"
 
-#: src/gui/statuspopup.cpp:356
+#: src/gui/statuspopup.cpp:357
 msgid "(d) without auto attack"
 msgstr "(d) Sans attaque automatique"
 
-#: src/gui/statuspopup.cpp:374
+#: src/gui/statuspopup.cpp:375
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) Ramassage sur 1x1 case"
 
-#: src/gui/statuspopup.cpp:378
+#: src/gui/statuspopup.cpp:379
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) Ramassage par défaut sur 2x1 cases"
 
-#: src/gui/statuspopup.cpp:382
+#: src/gui/statuspopup.cpp:383
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) Ramassage avant sur  2x3 cases"
 
-#: src/gui/statuspopup.cpp:386
+#: src/gui/statuspopup.cpp:387
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) Ramassage sur 3x3 cases"
 
-#: src/gui/statuspopup.cpp:390
+#: src/gui/statuspopup.cpp:391
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) Aller et ramasser jusqu'à 4 de distance"
 
-#: src/gui/statuspopup.cpp:394
+#: src/gui/statuspopup.cpp:395
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) Aller et ramasser jusqu'à 8 de distance"
 
-#: src/gui/statuspopup.cpp:398
+#: src/gui/statuspopup.cpp:399
 msgid "(A) go and pick up in max distance"
 msgstr "(A) Aller et ramasser jusqu'à la distance max"
 
-#: src/gui/statuspopup.cpp:402
+#: src/gui/statuspopup.cpp:403
 msgid "(?) pick up"
 msgstr "(?) Ramassage"
 
-#: src/gui/statuspopup.cpp:411
+#: src/gui/statuspopup.cpp:412
 msgid "(N) normal map view"
 msgstr "(N) Vue normale du jeu"
 
-#: src/gui/statuspopup.cpp:415
+#: src/gui/statuspopup.cpp:416
 msgid "(D) debug map view"
 msgstr "(D) Vue du jeu mode déverminage"
 
-#: src/gui/statuspopup.cpp:419
+#: src/gui/statuspopup.cpp:420
 msgid "(u) ultra map view"
 msgstr "(u) Vue du jeu mode Ultra 1"
 
-#: src/gui/statuspopup.cpp:423
+#: src/gui/statuspopup.cpp:424
 msgid "(U) ultra map view 2"
 msgstr "(u) Vue du jeu mode Ultra 2"
 
-#: src/gui/statuspopup.cpp:427
+#: src/gui/statuspopup.cpp:428
 msgid "(e) empty map view"
 msgstr "(e) Vue de la carte vide"
 
-#: src/gui/statuspopup.cpp:431
+#: src/gui/statuspopup.cpp:432
 msgid "(b) black & white map view"
 msgstr "(b) Vue de la carte en N&B"
 
-#: src/gui/statuspopup.cpp:435
+#: src/gui/statuspopup.cpp:436
 msgid "(?) map view"
 msgstr "(?) Carte"
 
-#: src/gui/statuspopup.cpp:443
+#: src/gui/statuspopup.cpp:444
 msgid "(f) use #flar for magic attack"
 msgstr "(f) Utiliser #flar comme sort d'attaque"
 
-#: src/gui/statuspopup.cpp:448
+#: src/gui/statuspopup.cpp:449
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) Utiliser #chiza comme sort d'attaque"
 
-#: src/gui/statuspopup.cpp:453
+#: src/gui/statuspopup.cpp:454
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) Utiliser #ingrav comme sort d'attaque"
 
-#: src/gui/statuspopup.cpp:458
+#: src/gui/statuspopup.cpp:459
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) Utiliser #frillyar comme sort d'attaque"
 
-#: src/gui/statuspopup.cpp:463
+#: src/gui/statuspopup.cpp:464
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) Utiliser #upmarmu comme sort d'attaque"
 
-#: src/gui/statuspopup.cpp:467
+#: src/gui/statuspopup.cpp:468
 msgid "(?) magic attack"
 msgstr "(?) Sorts d'attaque"
 
-#: src/gui/statuspopup.cpp:476
+#: src/gui/statuspopup.cpp:477
 msgid "(D) default imitation"
 msgstr "(D) Imitation par défaut"
 
-#: src/gui/statuspopup.cpp:480
+#: src/gui/statuspopup.cpp:481
 msgid "(O) outfits imitation"
 msgstr "(O) Imiter les équipements"
 
-#: src/gui/statuspopup.cpp:484
+#: src/gui/statuspopup.cpp:485
 msgid "(?) imitation"
 msgstr "(?) Imitation"
 
-#: src/gui/statuspopup.cpp:493
+#: src/gui/statuspopup.cpp:494
 msgid "(O) on keyboard"
 msgstr "(O) Présent sur le jeu"
 
-#: src/gui/statuspopup.cpp:496
+#: src/gui/statuspopup.cpp:497
 msgid "(A) away"
 msgstr "(A) Absent"
 
-#: src/gui/statuspopup.cpp:499 src/gui/statuspopup.cpp:519
+#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
 msgid "(?) away"
 msgstr "(?) Absent"
 
-#: src/gui/statuspopup.cpp:507
+#: src/gui/statuspopup.cpp:508
 msgid "(G) game camera mode"
 msgstr "(G) Mode camera du jeu"
 
-#: src/gui/statuspopup.cpp:511
+#: src/gui/statuspopup.cpp:512
 msgid "(F) free camera mode"
 msgstr "(F) Mode camera libre"
 
-#: src/gui/statuspopup.cpp:515
+#: src/gui/statuspopup.cpp:516
 msgid "(D) design camera mode"
 msgstr "(D) Définir le mode camera"
 
-#: src/gui/statuspopup.cpp:526
+#: src/gui/statuspopup.cpp:527
 msgid "Game modifiers are disabled"
 msgstr "Modificateurs de mode de jeu désactivés"
 
-#: src/gui/statuspopup.cpp:531
+#: src/gui/statuspopup.cpp:532
 msgid "Game modifiers are enabled"
 msgstr "Modificateurs de mode de jeu activés"
 
@@ -3096,87 +3138,87 @@ msgstr "(b)"
 msgid "(O)"
 msgstr "(O)"
 
-#: src/gui/textcommandeditor.cpp:112
+#: src/gui/textcommandeditor.cpp:113
 msgid "No Target"
 msgstr "Pas de cible"
 
-#: src/gui/textcommandeditor.cpp:113
+#: src/gui/textcommandeditor.cpp:114
 msgid "Allow Target"
 msgstr "Autoriser le ciblage"
 
-#: src/gui/textcommandeditor.cpp:114
+#: src/gui/textcommandeditor.cpp:115
 msgid "Need Target"
 msgstr "Nécessite une cible"
 
-#: src/gui/textcommandeditor.cpp:119
+#: src/gui/textcommandeditor.cpp:120
 msgid "General Magic"
 msgstr "Magie générale"
 
-#: src/gui/textcommandeditor.cpp:120
+#: src/gui/textcommandeditor.cpp:121
 msgid "Life Magic"
 msgstr "Magie de Vie"
 
-#: src/gui/textcommandeditor.cpp:121
+#: src/gui/textcommandeditor.cpp:122
 msgid "War Magic"
 msgstr "Magie de Guerre"
 
-#: src/gui/textcommandeditor.cpp:122
+#: src/gui/textcommandeditor.cpp:123
 msgid "Transmute Magic"
 msgstr "Magie de Transmutation"
 
-#: src/gui/textcommandeditor.cpp:123
+#: src/gui/textcommandeditor.cpp:124
 msgid "Nature Magic"
 msgstr "Magie de la Nature"
 
-#: src/gui/textcommandeditor.cpp:124
+#: src/gui/textcommandeditor.cpp:125
 msgid "Astral Magic"
 msgstr "Magie Astrale"
 
-#: src/gui/textcommandeditor.cpp:167
+#: src/gui/textcommandeditor.cpp:168
 msgid "Command Editor"
 msgstr "Éditeur de commande"
 
-#: src/gui/textcommandeditor.cpp:184
+#: src/gui/textcommandeditor.cpp:185
 msgid "magic"
 msgstr "Magie"
 
-#: src/gui/textcommandeditor.cpp:188
+#: src/gui/textcommandeditor.cpp:189
 msgid "other"
 msgstr "Autre"
 
-#: src/gui/textcommandeditor.cpp:193
+#: src/gui/textcommandeditor.cpp:194
 msgid "Symbol:"
 msgstr "Symbole : "
 
-#: src/gui/textcommandeditor.cpp:196
+#: src/gui/textcommandeditor.cpp:197
 msgid "Command:"
 msgstr "Commande :"
 
-#: src/gui/textcommandeditor.cpp:199
+#: src/gui/textcommandeditor.cpp:200
 msgid "Mana:"
 msgstr "Mana : "
 
-#: src/gui/textcommandeditor.cpp:205
+#: src/gui/textcommandeditor.cpp:206
 msgid "Target Type:"
 msgstr "Type de cible"
 
-#: src/gui/textcommandeditor.cpp:211
+#: src/gui/textcommandeditor.cpp:212
 msgid "Icon:"
 msgstr "Icône : "
 
-#: src/gui/textcommandeditor.cpp:217
+#: src/gui/textcommandeditor.cpp:218
 msgid "Magic level:"
 msgstr "Niveau de Magie :"
 
-#: src/gui/textcommandeditor.cpp:223
+#: src/gui/textcommandeditor.cpp:224
 msgid "Magic School:"
 msgstr "École de magie : "
 
-#: src/gui/textcommandeditor.cpp:229
+#: src/gui/textcommandeditor.cpp:230
 msgid "School level:"
 msgstr "Niveau scolaire : "
 
-#: src/gui/textcommandeditor.cpp:234
+#: src/gui/textcommandeditor.cpp:235
 msgid "Save"
 msgstr "Sauvegarder"
 
@@ -3214,8 +3256,7 @@ msgid "Change"
 msgstr "Changer"
 
 #: src/gui/tradewindow.cpp:332
-msgid ""
-"Failed adding item. You can not overlap one kind of item on the window."
+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."
@@ -3407,23 +3448,23 @@ msgstr "Limites de votre position"
 msgid "Road Point"
 msgstr "Étape"
 
-#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:470
+#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:471
 msgid "Who Is Online - Updating"
 msgstr "Qui est en ligne - Mise à jour"
 
-#: src/gui/whoisonline.cpp:100
+#: src/gui/whoisonline.cpp:101
 msgid "Update"
 msgstr "Mise à jour"
 
-#: src/gui/whoisonline.cpp:293
+#: src/gui/whoisonline.cpp:294
 msgid "Who Is Online - "
 msgstr "Qui est en ligne - "
 
-#: src/gui/whoisonline.cpp:484
+#: src/gui/whoisonline.cpp:485
 msgid "Who Is Online - error"
 msgstr "Qui est en ligne - Erreur"
 
-#: src/gui/whoisonline.cpp:515
+#: src/gui/whoisonline.cpp:516
 msgid "Who Is Online - Update"
 msgstr "Qui est en ligne - Mise à jour"
 
@@ -3457,8 +3498,7 @@ msgstr "Commande : /users"
 
 #: src/gui/widgets/channeltab.cpp:67
 msgid "This command shows the users in this channel."
-msgstr ""
-"Cette commande affiche la liste d'utilisateurs présents dans ce salon."
+msgstr "Cette commande affiche la liste d'utilisateurs présents dans ce salon."
 
 #: src/gui/widgets/channeltab.cpp:71
 msgid "Command: /topic <message>"
@@ -3491,6 +3531,7 @@ msgstr ""
 "Cette commande donne les droit d'opérateur du salon à <nom du personnage>"
 
 #: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
+#: src/net/ea/gui/guildtab.cpp:69 src/net/ea/gui/partytab.cpp:85
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 "Si le <nom du personnage> contient des espaces, entourez le de guillemets "
@@ -3567,10 +3608,8 @@ msgid "Command: /unignore <player>"
 msgstr "Commande : /unignore <joueur>"
 
 #: src/gui/widgets/whispertab.cpp:131
-msgid ""
-"This command stops ignoring the other player if they are being ignored."
-msgstr ""
-"Cette commande vous fait cesser d'ignorer un joueur si c'était le cas."
+msgid "This command stops ignoring the other player if they are being ignored."
+msgstr "Cette commande vous fait cesser d'ignorer un joueur si c'était le cas."
 
 #: src/gui/windowmenu.cpp:65
 msgid "BC"
@@ -3928,7 +3967,7 @@ msgstr "Onglet de conversation suivant"
 
 #: src/keyboardconfig.cpp:278
 msgid "Close current Chat Tab"
-msgstr ""
+msgstr "Fermer la fenêtre de dialogue ouverte"
 
 #: src/keyboardconfig.cpp:280
 msgid "Previous chat line"
@@ -4217,8 +4256,7 @@ msgstr ""
 
 #: src/main.cpp:71
 msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr ""
-"      --screenshot-dir : Répertoire à utiliser pour les imprime-écrans"
+msgstr "      --screenshot-dir : Répertoire à utiliser pour les imprime-écrans"
 
 #: src/main.cpp:72
 msgid "     --safemode       : Start game in safe mode"
@@ -4240,83 +4278,552 @@ msgstr "Merci de votre achat."
 msgid "Unable to buy."
 msgstr "Incapable d'acheter."
 
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
-msgid "Strength"
+#: src/net/ea/charserverhandler.cpp:63
+#, fuzzy
+msgid "Strength:"
 msgstr "Force"
 
-#: src/net/manaserv/attributes.cpp:167
+#: src/net/ea/charserverhandler.cpp:64
+#, fuzzy
+msgid "Agility:"
+msgstr "Agilité"
+
+#: src/net/ea/charserverhandler.cpp:65
+#, fuzzy
+msgid "Vitality:"
+msgstr "Vitalité"
+
+#: src/net/ea/charserverhandler.cpp:66
+#, fuzzy
+msgid "Intelligence:"
+msgstr "Intelligence"
+
+#: src/net/ea/charserverhandler.cpp:67
+#, fuzzy
+msgid "Dexterity:"
+msgstr "Dextérité"
+
+#: src/net/ea/charserverhandler.cpp:68
+#, fuzzy
+msgid "Luck:"
+msgstr "Chance"
+
+#: src/net/ea/charserverhandler.cpp:102
+msgid "Access denied. Most likely, there are too many players on this server."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:106
+#, fuzzy
+msgid "Cannot use this ID."
+msgstr "Vous ne pouvez pas envoyer de messages vides."
+
+#: src/net/ea/charserverhandler.cpp:109
+#, fuzzy
+msgid "Unknown char-server failure."
+msgstr "Erreur inconnue."
+
+#: src/net/ea/charserverhandler.cpp:138
+msgid "Failed to create character. Most likely the name is already taken."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:237
+#, fuzzy
+msgid "Wrong name."
+msgstr "Mauvais jeton de sécurité."
+
+#: src/net/ea/charserverhandler.cpp:145
+#, fuzzy
+msgid "Incorrect stats."
+msgstr "Mot de passe incorrect"
+
+#: src/net/ea/charserverhandler.cpp:148
+#, fuzzy
+msgid "Incorrect hair."
+msgstr "Mot de passe incorrect"
+
+#: src/net/ea/charserverhandler.cpp:151
+#, fuzzy
+msgid "Incorrect slot."
+msgstr "Mot de passe incorrect"
+
+#: src/net/ea/charserverhandler.cpp:166 src/net/manaserv/charhandler.cpp:210
+msgid "Info"
+msgstr "Informations"
+
+#: src/net/ea/charserverhandler.cpp:166
+#, fuzzy
+msgid "Character deleted."
+msgstr "Joueur effacé."
+
+#: src/net/ea/charserverhandler.cpp:172
+#, fuzzy
+msgid "Failed to delete character."
+msgstr "Entrer le mot de passe pour effacer le personnage"
+
+#: src/net/ea/chathandler.cpp:60 src/net/ea/chathandler.cpp:66
+#: src/net/ea/chathandler.cpp:71 src/net/ea/chathandler.cpp:77
+#: src/net/ea/chathandler.cpp:82 src/net/ea/chathandler.cpp:88
+#: src/net/ea/chathandler.cpp:95 src/net/ea/chathandler.cpp:101
+msgid "Channels are not supported!"
+msgstr ""
+
+#: src/net/ea/chathandler.cpp:128
 #, c-format
-msgid "Strength %+.1f"
-msgstr "Force %+.1f"
+msgid "Whisper could not be sent, %s is offline."
+msgstr ""
 
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
-msgid "Agility"
-msgstr "Agilité"
+#: src/net/ea/chathandler.cpp:136
+#, fuzzy, c-format
+msgid "Whisper could not be sent, ignored by %s."
+msgstr "Vous n'avez pas pu enlever le statut ignoré de ce joueur !"
 
-#: src/net/manaserv/attributes.cpp:180
+#: src/net/ea/chathandler.cpp:348
+#, fuzzy
+msgid "MVP player."
+msgstr "Joueur"
+
+#: src/net/ea/chathandler.cpp:352
+#, fuzzy
+msgid "MVP player: "
+msgstr "Joueur"
+
+#: src/net/ea/gamehandler.cpp:86
 #, c-format
-msgid "Agility %+.1f"
-msgstr "Agilité %+.1f"
+msgid "Online users: %d"
+msgstr ""
 
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
-msgid "Dexterity"
-msgstr "Dextérité"
+#: src/net/ea/gamehandler.cpp:98
+msgid "Game"
+msgstr ""
 
-#: src/net/manaserv/attributes.cpp:193
+#: src/net/ea/gamehandler.cpp:98
+#, fuzzy
+msgid "Request to quit denied!"
+msgstr "Demande d'échange"
+
+#: src/net/ea/gui/guildtab.cpp:67 src/net/ea/gui/partytab.cpp:83
+#, fuzzy
+msgid "Command: /invite <nick>"
+msgstr "Commande : /kick <nom du personnage>"
+
+#: src/net/ea/gui/guildtab.cpp:68
+#, fuzzy
+msgid "This command invites <nick> to the guild you're in."
+msgstr ""
+"Cette commande donne les droit d'opérateur du salon à <nom du personnage>"
+
+#: src/net/ea/gui/guildtab.cpp:74 src/net/ea/gui/partytab.cpp:90
+#, fuzzy
+msgid "Command: /leave"
+msgstr "Commande : /close"
+
+#: src/net/ea/gui/guildtab.cpp:75
+#, fuzzy
+msgid "This command causes the player to leave the guild."
+msgstr "Cette commande change le sujet du salon en <message>"
+
+#: src/net/ea/gui/guildtab.cpp:135 src/net/ea/gui/partytab.cpp:69
+#, fuzzy
+msgid "/help > Display this help."
+msgstr "  -h --help : Montre cette rubrique d'aide"
+
+#: src/net/ea/gui/guildtab.cpp:136
+msgid "/invite > Invite a player to your guild"
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:137
+msgid "/leave > Leave the guild you are in"
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:138
+#, fuzzy
+msgid "/kick > Kick some one from the guild you are in"
+msgstr "/kick > Sortir un utilisateur du salon"
+
+#: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
+msgid "Guild created."
+msgstr "Guilde créée."
+
+#: src/net/ea/guildhandler.cpp:88 src/net/ea/guildhandler.cpp:93
+#, fuzzy
+msgid "You are already in guild."
+msgstr "Erreur lors de la création de la guilde."
+
+#: src/net/ea/guildhandler.cpp:98
+msgid "Emperium check failed."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:103
+#, fuzzy
+msgid "Unknown server response."
+msgstr "Erreur inconnue."
+
+#: src/net/ea/guildhandler.cpp:180
+#, fuzzy, c-format
+msgid "Guild name: %s"
+msgstr "Guilde : %s"
+
+#: src/net/ea/guildhandler.cpp:182
+#, fuzzy, c-format
+msgid "Guild master: %s"
+msgstr "Guilde : %s"
+
+#: src/net/ea/guildhandler.cpp:184
+#, fuzzy, c-format
+msgid "Guild level: %d"
+msgstr "Niveau : %d"
+
+#: src/net/ea/guildhandler.cpp:186
 #, c-format
-msgid "Dexterity %+.1f"
-msgstr "Dextérité %+.1f"
+msgid "Online members: %d"
+msgstr ""
 
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
-msgid "Vitality"
-msgstr "Vitalité"
+#: src/net/ea/guildhandler.cpp:188
+#, c-format
+msgid "Max members: %d"
+msgstr ""
 
-#: src/net/manaserv/attributes.cpp:206
+#: src/net/ea/guildhandler.cpp:190
+#, fuzzy, c-format
+msgid "Average level: %d"
+msgstr "Niveau de Magie :"
+
+#: src/net/ea/guildhandler.cpp:192
+#, fuzzy, c-format
+msgid "Guild exp: %d"
+msgstr "Guilde : %s"
+
+#: src/net/ea/guildhandler.cpp:194
+#, fuzzy, c-format
+msgid "Guild next exp: %d"
+msgstr "Guilde créée."
+
+#: src/net/ea/guildhandler.cpp:196
+#, fuzzy, c-format
+msgid "Guild castle: %s"
+msgstr "Guilde : %s"
+
+#: src/net/ea/guildhandler.cpp:402
+#, fuzzy
+msgid "Could not inivte user to guild."
+msgstr "Le joueur %s a été invité dans la guilde %s."
+
+#: src/net/ea/guildhandler.cpp:406
+#, fuzzy
+msgid "User rejected guild invite."
+msgstr "%s a refusé votre invitation."
+
+#: src/net/ea/guildhandler.cpp:410
+msgid "User is now part of your guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:414
+msgid "Your guild is full."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:418
+#, fuzzy
+msgid "Unknown guild invite response."
+msgstr "Invitation dans la guilde acceptée de la part de %s."
+
+#: src/net/ea/guildhandler.cpp:438
+msgid "You have left the guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:452
+#, fuzzy, c-format
+msgid "%s has left your guild."
+msgstr "Choisissez le nom de la guilde."
+
+#: src/net/ea/guildhandler.cpp:483
+#, fuzzy
+msgid "You was kicked from guild."
+msgstr "Sortir de la guilde"
+
+#: src/net/ea/guildhandler.cpp:496
+#, fuzzy, c-format
+msgid "%s has kicked from your guild."
+msgstr "%s a renvoyé %s."
+
+#: src/net/ea/gui/partytab.cpp:70
+msgid "/invite > Invite a player to your party"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:71
+msgid "/leave > Leave the party you are in"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:72
+#, fuzzy
+msgid "/kick > Kick some one from the party you are in"
+msgstr "/kick > Sortir un utilisateur du salon"
+
+#: src/net/ea/gui/partytab.cpp:73
+msgid "/item > Show/change party item sharing options"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:74
+msgid "/exp > Show/change party experience sharing options"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:84
+#, fuzzy
+msgid "This command invites <nick> to party with you."
+msgstr "Cette commande sort <nom du personnage> du salon."
+
+#: src/net/ea/gui/partytab.cpp:91
+#, fuzzy
+msgid "This command causes the player to leave the party."
+msgstr "Cette commande change le sujet du salon en <message>"
+
+#: src/net/ea/gui/partytab.cpp:95
+#, fuzzy
+msgid "Command: /item <policy>"
+msgstr "Commande : /kick <nom du personnage>"
+
+#: src/net/ea/gui/partytab.cpp:97
+#, fuzzy
+msgid "This command changes the party's item sharing policy."
+msgstr "Cette commande affiche la liste d'utilisateurs présents dans ce salon."
+
+#: src/net/ea/gui/partytab.cpp:98
+msgid ""
+"<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
+"\"0\", \"no\", \"false\" to disable item sharing."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:101
+#, fuzzy
+msgid "Command: /item"
+msgstr "Commande : /quit"
+
+#: src/net/ea/gui/partytab.cpp:102
+#, fuzzy
+msgid "This command displays the party's current item sharing policy."
+msgstr "Cette commande quitte le salon."
+
+#: src/net/ea/gui/partytab.cpp:107
+#, fuzzy
+msgid "Command: /exp <policy>"
+msgstr "Commande : /op <nom du personnage>"
+
+#: src/net/ea/gui/partytab.cpp:108
+#, fuzzy
+msgid "This command changes the party's experience sharing policy."
+msgstr "Cette commande quitte le salon."
+
+#: src/net/ea/gui/partytab.cpp:110
+msgid ""
+"<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
+"sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:113
+#, fuzzy
+msgid "Command: /exp"
+msgstr "Commande : /users"
+
+#: src/net/ea/gui/partytab.cpp:114
+#, fuzzy
+msgid "This command displays the party's current experience sharing policy."
+msgstr "Cette commande quitte le salon."
+
+#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:286
+msgid "Item sharing enabled."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:296
+msgid "Item sharing disabled."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:306
+msgid "Item sharing not possible."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:157
+msgid "Item sharing unknown."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:248
+msgid "Experience sharing enabled."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:258
+msgid "Experience sharing disabled."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:268
+msgid "Experience sharing not possible."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:196
+msgid "Experience sharing unknown."
+msgstr ""
+
+#: src/net/ea/inventoryhandler.cpp:407
+#, fuzzy
+msgid "Failed to use item."
+msgstr "Échec lors de la promotion du membre"
+
+#: src/net/ea/inventoryhandler.cpp:580
+#, fuzzy
+msgid "Unable to equip."
+msgstr "Incapable d'acheter."
+
+#: src/net/ea/loginhandler.cpp:131
+#, fuzzy
+msgid "Account was not found. Please re-login."
+msgstr "Compte non connecté. Identifiez-vous tout d'abord."
+
+#: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127
+msgid "Old password incorrect."
+msgstr "Ancien mot de passe incorrect."
+
+#: src/net/ea/loginhandler.cpp:137
+#, fuzzy
+msgid "New password too short."
+msgstr "Nouveau mot de passe incorrect."
+
+#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:243
+#: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
+#: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
+#: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
+msgid "Unknown error."
+msgstr "Erreur inconnue."
+
+#: src/net/ea/loginhandler.cpp:205
+#, fuzzy
+msgid "Unregistered ID."
+msgstr "Se désinscrire"
+
+#: src/net/ea/loginhandler.cpp:208
+#, fuzzy
+msgid "Wrong password."
+msgstr "Mauvais nom d'utilisateur ou mot de passe."
+
+#: src/net/ea/loginhandler.cpp:211
+#, fuzzy
+msgid "Account expired."
+msgstr "Compte banni."
+
+#: src/net/ea/loginhandler.cpp:214
+#, fuzzy
+msgid "Rejected from server."
+msgstr "Vous avez été déconnecté du serveur !"
+
+#: src/net/ea/loginhandler.cpp:217
+msgid ""
+"You have been permanently banned from the game. Please contact the GM team."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:221
+#, fuzzy
+msgid "Client too old."
+msgstr "La version de votre client est trop ancienne."
+
+#: src/net/ea/loginhandler.cpp:224
 #, c-format
-msgid "Vitality %+.1f"
-msgstr "Vitalité %+.1f"
+msgid ""
+"You have been temporarily banned from the game until %s.\n"
+"Please contact the GM team via the forums."
+msgstr ""
 
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
-msgid "Intelligence"
-msgstr "Intelligence"
+#: src/net/ea/loginhandler.cpp:231
+msgid "Server overpopulated."
+msgstr ""
 
-#: src/net/manaserv/attributes.cpp:219
+#: src/net/ea/loginhandler.cpp:234
+#, fuzzy
+msgid "This user name is already taken."
+msgstr "Ce compte est déjà connecté."
+
+#: src/net/ea/loginhandler.cpp:240
+#, fuzzy
+msgid "Username permanently erased."
+msgstr "Ce nom d'utilisateur existe déjà."
+
+#: src/net/ea/partyhandler.cpp:82
+#, fuzzy
+msgid "Could not create party."
+msgstr "Créer un groupe"
+
+#: src/net/ea/partyhandler.cpp:84
+#, fuzzy
+msgid "Party successfully created."
+msgstr "Joueur éliminé avec succès !"
+
+#: src/net/ea/partyhandler.cpp:140
+#, fuzzy, c-format
+msgid "%s has joined your party."
+msgstr "%s n'est pas membre de votre groupe !"
+
+#: src/net/ea/partyhandler.cpp:176
 #, c-format
-msgid "Intelligence %+.1f"
-msgstr "Intelligence %+.1f"
+msgid "%s is already a member of a party."
+msgstr ""
 
-#: src/net/manaserv/attributes.cpp:225
-msgid "Willpower"
-msgstr "Volonté"
+#: src/net/ea/partyhandler.cpp:181
+#, fuzzy, c-format
+msgid "%s refused your invitation."
+msgstr "%s a refusé votre invitation."
 
-#: src/net/manaserv/attributes.cpp:232
+#: src/net/ea/partyhandler.cpp:186
+#, fuzzy, c-format
+msgid "%s is now a member of your party."
+msgstr "%s n'est pas membre de votre groupe !"
+
+#: src/net/ea/partyhandler.cpp:191
 #, c-format
-msgid "Willpower %+.1f"
-msgstr "Volonté %+.1f"
+msgid "%s can't join your party because party is full."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:196
+#, c-format
+msgid "QQQ Unknown invite response for %s."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:356
+#, fuzzy
+msgid "You have left the party."
+msgstr "Vous avez été invité à rejoindre le groupe %s."
+
+#: src/net/ea/partyhandler.cpp:368
+#, fuzzy, c-format
+msgid "%s has left your party."
+msgstr "%s n'est pas membre de votre groupe !"
 
-#: src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/partyhandler.cpp:444
+#, c-format
+msgid "An unknown member tried to say: %s"
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:95 src/net/manaserv/beinghandler.cpp:315
 msgid "You are dead."
 msgstr "Vous êtes mort."
 
-#: src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:316
 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:318
+#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:318
 msgid "You are not that alive anymore."
 msgstr "Vous n'êtes plus vraiment en vie."
 
-#: src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:319
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr "Les mains gelées de la faucheuse viennent réclamer ton âme."
 
-#: src/net/manaserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:320
 msgid "Game Over!"
 msgstr "Fin de la partie !"
 
-#: src/net/manaserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:101
+msgid "Insert coin to continue."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:321
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
@@ -4324,7 +4831,7 @@ msgstr ""
 "Non, mon enfant. Ton personnage n'est pas vraiment mort... Il... enfin,... "
 "il... est parti dans un monde meilleur."
 
-#: src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:323
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
@@ -4332,33 +4839,323 @@ msgstr ""
 "Votre tentative de casser l'arme de votre ennemi en la frappant avec votre "
 "gorge a échoué."
 
-#: src/net/manaserv/beinghandler.cpp:325
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:325
 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:326
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:326
 msgid "Do you want your possessions identified?"
 msgstr "Voulez-vous que vos biens soient identifiés ?"
 
-#: src/net/manaserv/beinghandler.cpp:327
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:327
 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:329
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:329
 msgid "Annihilated."
 msgstr "Vaporisé."
 
-#: src/net/manaserv/beinghandler.cpp:330
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:330
 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:332
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:332
 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:119
+msgid "You're not dead yet. You're just resting."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:120
+#, fuzzy
+msgid "You are no more."
+msgstr "Vous êtes mort."
+
+#: src/net/ea/playerhandler.cpp:121
+#, fuzzy
+msgid "You have ceased to be."
+msgstr "Vous êtes mort."
+
+#: src/net/ea/playerhandler.cpp:122
+msgid "You've expired and gone to meet your maker."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:123
+msgid "You're a stiff."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:124
+msgid "Bereft of life, you rest in peace."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:125
+msgid "If you weren't so animated, you'd be pushing up the daisies."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:126
+msgid "Your metabolic processes are now history."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:127
+msgid "You're off the twig."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:128
+msgid "You've kicked the bucket."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:129
+msgid ""
+"You've shuffled off your mortal coil, run down the curtain and joined the "
+"bleedin' choir invisibile."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:131
+#, fuzzy
+msgid "You are an ex-player."
+msgstr "Vous êtes mort."
+
+#: src/net/ea/playerhandler.cpp:132
+msgid "You're pining for the fjords."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
+#: src/net/ea/playerhandler.cpp:425
+#, fuzzy
+msgid "Message"
+msgstr "Messages"
+
+#: src/net/ea/playerhandler.cpp:337
+msgid ""
+"You are carrying more than half your weight. You are unable to regain health."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:347
+msgid "You are carrying less than half your weight. You can regain health."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:451
+#, fuzzy, c-format
+msgid "You picked up %s."
+msgstr "Vous avez ramassé %d [@@%d|%s@@]."
+
+#: src/net/ea/playerhandler.cpp:457
+#, fuzzy, c-format
+msgid "You spent %s."
+msgstr "Vous recevez %s"
+
+#: src/net/ea/playerhandler.cpp:501
+msgid "Cannot raise skill!"
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:618
+#, fuzzy
+msgid "Equip arrows first."
+msgstr "Retirer d'abord l'équipement"
+
+#: src/net/ea/specialhandler.cpp:149
+#, fuzzy
+msgid "Trade failed!"
+msgstr "Échange annulé."
+
+#: src/net/ea/specialhandler.cpp:152
+#, fuzzy
+msgid "Emote failed!"
+msgstr "Impossible de sortir la personne !"
+
+#: src/net/ea/specialhandler.cpp:155
+#, fuzzy
+msgid "Sit failed!"
+msgstr "Impossible de sortir la personne !"
+
+#: src/net/ea/specialhandler.cpp:158
+#, fuzzy
+msgid "Chat creating failed!"
+msgstr "Échec de l'authentification."
+
+#: src/net/ea/specialhandler.cpp:161
+#, fuzzy
+msgid "Could not join party!"
+msgstr "%s n'est pas membre de votre groupe !"
+
+#: src/net/ea/specialhandler.cpp:164
+msgid "Cannot shout!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:177
+msgid "You have not yet reached a high enough lvl!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:181
+msgid "Insufficient HP!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:184
+msgid "Insufficient SP!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:187
+#, fuzzy
+msgid "You have no memos!"
+msgstr "Vous n'avez pas assez d'argent."
+
+#: src/net/ea/specialhandler.cpp:190
+#, fuzzy
+msgid "You cannot do that right now!"
+msgstr "Vous n'êtes plus vraiment en vie."
+
+#: src/net/ea/specialhandler.cpp:193
+msgid "Seems you need more money... ;-)"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:196
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:200
+msgid "You need another red gem!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:203
+msgid "You need another blue gem!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:206
+msgid "You're carrying to much to do this!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:209
+msgid "Huh? What's that?"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:220
+msgid "Warp failed..."
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:223
+msgid "Could not steal anything..."
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:226
+msgid "Poison had no effect..."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:128
+#, 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:130
+msgid "Trading isn't possible. Trade partner is too far away."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:134
+msgid "Trading isn't possible. Character doesn't exist."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:138
+msgid "Trade cancelled due to an unknown reason."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:146
+#, fuzzy, c-format
+msgid "Trade: You and %s"
+msgstr "Échange : Vous"
+
+#: src/net/ea/tradehandler.cpp:156
+#, fuzzy, c-format
+msgid "Trade with %s cancelled."
+msgstr "Échange annulé."
+
+#: src/net/ea/tradehandler.cpp:169
+msgid "Unhandled trade cancel packet."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:231
+msgid "Failed adding item. Trade partner is over weighted."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:236
+msgid "Failed adding item. Trade partner has no free slot."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:241
+#, fuzzy
+msgid "Failed adding item. You can't trade this item."
+msgstr ""
+"L'objet ne peux être ajouté. Vous ne pouvez ajouter deux fois le même objet "
+"dans cette fenêtre."
+
+#: src/net/ea/tradehandler.cpp:245
+msgid "Failed adding item for unknown reason."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:264 src/net/manaserv/tradehandler.cpp:160
+msgid "Trade canceled."
+msgstr "Échange annulé."
+
+#: src/net/ea/tradehandler.cpp:275 src/net/manaserv/tradehandler.cpp:167
+msgid "Trade completed."
+msgstr "Échange finalisé."
+
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
+msgid "Strength"
+msgstr "Force"
+
+#: src/net/manaserv/attributes.cpp:167
+#, c-format
+msgid "Strength %+.1f"
+msgstr "Force %+.1f"
+
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
+msgid "Agility"
+msgstr "Agilité"
+
+#: src/net/manaserv/attributes.cpp:180
+#, c-format
+msgid "Agility %+.1f"
+msgstr "Agilité %+.1f"
+
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
+msgid "Dexterity"
+msgstr "Dextérité"
+
+#: src/net/manaserv/attributes.cpp:193
+#, c-format
+msgid "Dexterity %+.1f"
+msgstr "Dextérité %+.1f"
+
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
+msgid "Vitality"
+msgstr "Vitalité"
+
+#: src/net/manaserv/attributes.cpp:206
+#, c-format
+msgid "Vitality %+.1f"
+msgstr "Vitalité %+.1f"
+
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
+msgid "Intelligence"
+msgstr "Intelligence"
+
+#: src/net/manaserv/attributes.cpp:219
+#, c-format
+msgid "Intelligence %+.1f"
+msgstr "Intelligence %+.1f"
+
+#: src/net/manaserv/attributes.cpp:225
+msgid "Willpower"
+msgstr "Volonté"
+
+#: src/net/manaserv/attributes.cpp:232
+#, c-format
+msgid "Willpower %+.1f"
+msgstr "Volonté %+.1f"
+
 #: src/net/manaserv/beinghandler.cpp:337
 msgid "Press OK to respawn."
 msgstr "Cliquez OK pour revivre"
@@ -4414,16 +5211,6 @@ msgstr ""
 msgid "Invalid slot number."
 msgstr "Numéro de case invalide."
 
-#: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
-#: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
-#: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
-msgid "Unknown error."
-msgstr "Erreur inconnue."
-
-#: src/net/manaserv/charhandler.cpp:210
-msgid "Info"
-msgstr "Informations"
-
 #: src/net/manaserv/charhandler.cpp:210
 msgid "Player deleted."
 msgstr "Joueur effacé."
@@ -4487,10 +5274,6 @@ msgstr "%s a renvoyé %s."
 msgid "Unknown channel event."
 msgstr "Événement inconnu dans le canal."
 
-#: src/net/manaserv/guildhandler.cpp:85
-msgid "Guild created."
-msgstr "Guilde créée."
-
 #: src/net/manaserv/guildhandler.cpp:90
 msgid "Error creating guild."
 msgstr "Erreur lors de la création de la guilde."
@@ -4523,10 +5306,6 @@ msgstr "Compte banni."
 msgid "New password incorrect."
 msgstr "Nouveau mot de passe incorrect."
 
-#: src/net/manaserv/loginhandler.cpp:127
-msgid "Old password incorrect."
-msgstr "Ancien mot de passe incorrect."
-
 #: src/net/manaserv/loginhandler.cpp:131 src/net/manaserv/loginhandler.cpp:163
 msgid "Account not connected. Please login first."
 msgstr "Compte non connecté. Identifiez-vous tout d'abord."
@@ -4608,24 +5387,11 @@ msgstr "Accepter les demandes d'échanges."
 msgid "Ignoring incoming trade requests."
 msgstr "Ignorer les demandes d'échanges."
 
-#: src/net/manaserv/tradehandler.cpp:128
-#, 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:146
 #, c-format
 msgid "Trading with %s"
 msgstr "Échange avec %s"
 
-#: src/net/manaserv/tradehandler.cpp:160
-msgid "Trade canceled."
-msgstr "Échange annulé."
-
-#: src/net/manaserv/tradehandler.cpp:167
-msgid "Trade completed."
-msgstr "Échange finalisé."
-
 #: src/net/tmwa/adminhandler.cpp:70
 msgid "Kick failed!"
 msgstr "Impossible de sortir la personne !"
@@ -4817,4 +5583,5 @@ msgstr "PM %+d"
 msgid "Unknown item"
 msgstr "Objet inconnu"
 
-
+#~ msgid "Enable opacity cache"
+#~ msgstr "Activer le cache transparence"
diff --git a/po/hr.po b/po/hr.po
index a1dc5999a..66c582ca8 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-08 04:26+0300\n"
+"POT-Creation-Date: 2011-08-10 01:11+0300\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"
@@ -25,26 +25,26 @@ msgstr ""
 msgid "Visible on map"
 msgstr "Vidljiva imena"
 
-#: src/being.cpp:541
+#: src/being.cpp:542
 msgid "dodge"
 msgstr ""
 
-#: src/being.cpp:541
+#: src/being.cpp:542
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1513
+#: src/being.cpp:1514
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1518
+#: src/being.cpp:1519
 #, fuzzy
 msgid "I"
 msgstr "Je"
 
-#: src/client.cpp:825 src/gui/setup.cpp:51 src/gui/windowmenu.cpp:100
+#: src/client.cpp:825 src/gui/setup.cpp:53 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Podešavanje"
 
@@ -81,7 +81,8 @@ msgstr "Server"
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
-#: src/gui/unregisterdialog.cpp:137 src/net/manaserv/charhandler.cpp:184
+#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
+#: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "Greška"
@@ -160,7 +161,7 @@ msgstr ""
 msgid "Requesting to join channel %s."
 msgstr "Zahtjev za pridruživanje kanalu %s."
 
-#: src/commandhandler.cpp:445
+#: src/commandhandler.cpp:445 src/net/ea/gui/partytab.cpp:125
 msgid "Party name is missing."
 msgstr "Ime partije nedostaje."
 
@@ -390,37 +391,37 @@ msgstr ""
 msgid "Comment: %s"
 msgstr "Naredba: /list"
 
-#: src/gui/botcheckerwindow.cpp:265
+#: src/gui/botcheckerwindow.cpp:266
 #, fuzzy
 msgid "Bot Checker"
 msgstr "Chat Prozor"
 
-#: src/gui/botcheckerwindow.cpp:295 src/gui/setup_players.cpp:64
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
 msgid "Name"
 msgstr "Ime"
 
-#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:130
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:130
 #: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:604
 #: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
 msgid "Attack"
 msgstr "Napad"
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:275
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:275
 #: src/keyboardconfig.cpp:62
 msgid "Talk"
 msgstr "Govori"
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:241
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:241
 #: src/gui/popupmenu.cpp:280 src/gui/popupmenu.cpp:661
 #, fuzzy
 msgid "Move"
 msgstr "Pomakni Gore"
 
-#: src/gui/botcheckerwindow.cpp:299
+#: src/gui/botcheckerwindow.cpp:300
 msgid "Result"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:309 src/gui/npcdialog.cpp:123
+#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:123
 msgid "Reset"
 msgstr "Poništi"
 
@@ -489,8 +490,8 @@ msgstr "Prodaj"
 #: src/gui/popupmenu.cpp:1731 src/gui/popupmenu.cpp:1774
 #: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1849
 #: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1935
-#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:68
-#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:237
+#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:70
+#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:238
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
 #: src/gui/updatewindow.cpp:157
 msgid "Cancel"
@@ -668,8 +669,8 @@ msgid "Enter password:"
 msgstr "Pogrešna lozinka"
 
 #: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
-#: src/gui/setup_players.cpp:251 src/gui/shopwindow.cpp:120
-#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:240
+#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120
+#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:241
 msgid "Delete"
 msgstr "Obriši"
 
@@ -753,10 +754,10 @@ msgid "rainbow 3"
 msgstr "Duga"
 
 #: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
-#: src/gui/logindialog.cpp:78 src/gui/setup_players.cpp:220
-#: src/gui/setup_theme.cpp:71 src/gui/setup_theme.cpp:125
-#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:101
-#: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:159
+#: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
+#: src/gui/setup_theme.cpp:72 src/gui/setup_theme.cpp:126
+#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
+#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
 msgid "???"
 msgstr "???"
 
@@ -966,7 +967,7 @@ msgstr "Slijedeći"
 msgid "Auto open this window"
 msgstr ""
 
-#: src/gui/editdialog.cpp:46 src/gui/itemamountwindow.cpp:208
+#: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
 #: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "U redu"
@@ -1054,7 +1055,7 @@ msgstr "Težina:"
 
 #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
 #: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1724
-#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:69
+#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:71
 msgid "Store"
 msgstr "Pohrani"
 
@@ -1114,58 +1115,58 @@ msgstr ""
 msgid "Weight: %s"
 msgstr "Težina: "
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
+#: src/gui/killstats.cpp:46 src/gui/windowmenu.cpp:69
 #, fuzzy
 msgid "Kill stats"
 msgstr "Prozor Statusa"
 
-#: src/gui/killstats.cpp:63
+#: src/gui/killstats.cpp:64
 #, fuzzy
 msgid "Reset stats"
 msgstr "Poništi"
 
-#: src/gui/killstats.cpp:64
+#: src/gui/killstats.cpp:65
 #, fuzzy
 msgid "Reset timer"
 msgstr "Poništi"
 
-#: src/gui/killstats.cpp:68 src/gui/killstats.cpp:204
+#: src/gui/killstats.cpp:69 src/gui/killstats.cpp:205
 #, fuzzy, c-format
 msgid "Level: %d at %f%%"
 msgstr "Nivo: %d"
 
-#: src/gui/killstats.cpp:72 src/gui/killstats.cpp:209
+#: src/gui/killstats.cpp:73 src/gui/killstats.cpp:210
 #, c-format
 msgid "Exp: %d/%d Left: %d"
 msgstr ""
 
-#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:215
-#: src/gui/killstats.cpp:224
+#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:216
+#: src/gui/killstats.cpp:225
 #, c-format
 msgid "1%% = %d exp, avg mob for 1%%: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:141
-#: src/gui/killstats.cpp:233
+#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:142
+#: src/gui/killstats.cpp:234
 #, fuzzy, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr "Cijena: %s / Ukupno: %s"
 
-#: src/gui/killstats.cpp:80 src/gui/killstats.cpp:143
-#: src/gui/killstats.cpp:219 src/gui/killstats.cpp:229
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
+#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:230
 #, c-format
 msgid "Avg Exp: %s, No. of avg mob to next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:161
-#: src/gui/killstats.cpp:236
+#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:162
+#: src/gui/killstats.cpp:237
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:88 src/gui/killstats.cpp:93
-#: src/gui/killstats.cpp:288 src/gui/killstats.cpp:304
-#: src/gui/killstats.cpp:322
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:89 src/gui/killstats.cpp:94
+#: src/gui/killstats.cpp:289 src/gui/killstats.cpp:305
+#: src/gui/killstats.cpp:323
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
@@ -1173,7 +1174,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
+#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
@@ -1181,29 +1182,29 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/gui/killstats.cpp:99 src/gui/killstats.cpp:240
+#: src/gui/killstats.cpp:100 src/gui/killstats.cpp:241
 msgid "Last kill exp:"
 msgstr ""
 
-#: src/gui/killstats.cpp:101 src/gui/killstats.cpp:354
-#: src/gui/killstats.cpp:360 src/gui/killstats.cpp:366
-#: src/gui/killstats.cpp:371
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:355
+#: src/gui/killstats.cpp:361 src/gui/killstats.cpp:367
+#: src/gui/killstats.cpp:372
 msgid "Time before jacko spawn:"
 msgstr ""
 
-#: src/gui/killstats.cpp:293 src/gui/killstats.cpp:300
-#: src/gui/killstats.cpp:310 src/gui/killstats.cpp:317
-#: src/gui/killstats.cpp:329 src/gui/killstats.cpp:336
+#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:301
+#: src/gui/killstats.cpp:311 src/gui/killstats.cpp:318
+#: src/gui/killstats.cpp:330 src/gui/killstats.cpp:337
 #, c-format
 msgid "  Time for next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:360
+#: src/gui/killstats.cpp:361
 #, c-format
 msgid "%s %d?"
 msgstr ""
 
-#: src/gui/killstats.cpp:366
+#: src/gui/killstats.cpp:367
 msgid "jacko spawning"
 msgstr ""
 
@@ -1931,38 +1932,42 @@ msgid "Tabs"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:96
+msgid "Put all whispers in tabs"
+msgstr "Stavi sve šapate u kartice"
+
+#: src/gui/setup_chat.cpp:99
 msgid "Log magic messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:99
+#: src/gui/setup_chat.cpp:102
 msgid "Show server messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:102
+#: src/gui/setup_chat.cpp:105
 #, fuzzy
 msgid "Enable trade tab"
 msgstr "Ne može se kupiti"
 
-#: src/gui/setup_chat.cpp:105
+#: src/gui/setup_chat.cpp:108
 #, fuzzy
 msgid "Enable battle tab"
 msgstr "Ne može se kupiti"
 
-#: src/gui/setup_chat.cpp:108
+#: src/gui/setup_chat.cpp:111
 #, fuzzy
 msgid "Show battle events"
 msgstr "Prikaži ime"
 
-#: src/gui/setup_chat.cpp:111
+#: src/gui/setup_chat.cpp:114
 #, fuzzy
 msgid "Resize chat tabs if need"
 msgstr "Sljedeća Chat Kartica"
 
-#: src/gui/setup_chat.cpp:115
+#: src/gui/setup_chat.cpp:118
 msgid "Time"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:117
+#: src/gui/setup_chat.cpp:120
 msgid "Use local time"
 msgstr ""
 
@@ -2018,16 +2023,15 @@ msgstr "Plava: "
 msgid "Alpha:"
 msgstr ""
 
-#: src/gui/setup.cpp:67
+#: src/gui/setup.cpp:69
 msgid "Apply"
 msgstr "Primjeni"
 
-#: src/gui/setup.cpp:70
+#: src/gui/setup.cpp:72
 msgid "Reset Windows"
 msgstr "Ponovno pokreni prozore"
 
 #: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
-#: src/gui/setup_players.cpp:334
 msgid "Edit"
 msgstr ""
 
@@ -2250,162 +2254,218 @@ msgstr ""
 msgid "Show background"
 msgstr "Pozadina"
 
-#: src/gui/setup_players.cpp:65
-msgid "Relation"
-msgstr "Odnos"
+#: src/gui/setup_perfomance.cpp:48
+msgid "Perfomance"
+msgstr ""
 
-#: src/gui/setup_players.cpp:70
-msgid "Neutral"
-msgstr "Neutralno"
+#: src/gui/setup_perfomance.cpp:55
+msgid "Better perfomance (enable for better perfomance)"
+msgstr ""
 
-#: src/gui/setup_players.cpp:71
-msgid "Friend"
-msgstr "Prijatelj"
+#: src/gui/setup_perfomance.cpp:58
+msgid "Auto adjust perfomance"
+msgstr ""
 
-#: src/gui/setup_players.cpp:72
-msgid "Disregarded"
-msgstr "Zanemareno"
+#: src/gui/setup_perfomance.cpp:61
+msgid "Show beings transparency"
+msgstr ""
 
-#: src/gui/setup_players.cpp:73
-msgid "Ignored"
-msgstr "Ignorirano"
+#: src/gui/setup_perfomance.cpp:64
+#, fuzzy
+msgid "Hw acceleration"
+msgstr "Odnos"
 
-#: src/gui/setup_players.cpp:74
-msgid "Erased"
+#: src/gui/setup_perfomance.cpp:67
+msgid "Enable opacity cache (Software, can use many memory)"
 msgstr ""
 
-#: src/gui/setup_players.cpp:247
-msgid "Allow trading"
-msgstr "Dozvoli trgovanje"
-
-#: src/gui/setup_players.cpp:249
-msgid "Allow whispers"
-msgstr "Dozvoli šapate"
+#: src/gui/setup_perfomance.cpp:70
+#, fuzzy
+msgid "Enable map reduce (Software)"
+msgstr "Omogući igraću palicu"
 
-#: src/gui/setup_players.cpp:252
-msgid "Old"
+#: src/gui/setup_perfomance.cpp:73
+msgid "Better quality (disable for better perfomance)"
 msgstr ""
 
-#: src/gui/setup_players.cpp:254
-msgid "Put all whispers in tabs"
-msgstr "Stavi sve šapate u kartice"
+#: src/gui/setup_perfomance.cpp:76
+msgid "Enable alpha channel fix (Software, can be very slow)"
+msgstr ""
 
-#: src/gui/setup_players.cpp:257
+#: src/gui/setup_perfomance.cpp:80
 #, fuzzy
-msgid "Show gender"
-msgstr "Prikaži ime"
+msgid "Enable reorder sprites."
+msgstr "Ne može se kupiti"
+
+#: src/gui/setup_perfomance.cpp:83
+msgid "Small memory (enable for lower memory usage)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:86
+msgid "Disable advanced beings caching (Software)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:89
+msgid "Disable beings caching (Software)"
+msgstr ""
 
-#: src/gui/setup_players.cpp:267
+#: src/gui/setup_players.cpp:48
 msgid "Players"
 msgstr "Igrači"
 
-#: src/gui/setup_players.cpp:292
-msgid "When ignoring:"
-msgstr "Kad ignorira:"
+#: src/gui/setup_players.cpp:54
+#, fuzzy
+msgid "Show gender"
+msgstr "Prikaži ime"
 
-#: src/gui/setup_players.cpp:315
+#: src/gui/setup_players.cpp:57
 #, fuzzy
 msgid "Show level"
 msgstr "Prikaži ime"
 
-#: src/gui/setup_players.cpp:319
+#: src/gui/setup_players.cpp:60
 #, fuzzy
 msgid "Show own name"
 msgstr "Prikaži ime"
 
-#: src/gui/setup_players.cpp:323
+#: src/gui/setup_players.cpp:63
 #, fuzzy
 msgid "Target dead players"
 msgstr "Ciljaj Igrača"
 
-#: src/gui/setup_players.cpp:327
+#: src/gui/setup_players.cpp:66
+msgid "Visible names"
+msgstr "Vidljiva imena"
+
+#: src/gui/setup_players.cpp:69
 #, fuzzy
 msgid "Secure trades"
 msgstr "Složi se za trgovanje"
 
-#: src/gui/setup_players.cpp:331 src/gui/setup_players.cpp:523
+#: src/gui/setup_players.cpp:72
 msgid "Unsecure chars in names"
 msgstr ""
 
-#: src/gui/setup_players.cpp:336
-msgid "Visible names"
-msgstr "Vidljiva imena"
-
-#: src/gui/setup_players.cpp:341
+#: src/gui/setup_players.cpp:75
 #, fuzzy
 msgid "Show statuses"
 msgstr "Prikaži ime"
 
-#: src/gui/setup_theme.cpp:105
+#: src/gui/setup_relations.cpp:65
+msgid "Relation"
+msgstr "Odnos"
+
+#: src/gui/setup_relations.cpp:70
+msgid "Neutral"
+msgstr "Neutralno"
+
+#: src/gui/setup_relations.cpp:71
+msgid "Friend"
+msgstr "Prijatelj"
+
+#: src/gui/setup_relations.cpp:72
+msgid "Disregarded"
+msgstr "Zanemareno"
+
+#: src/gui/setup_relations.cpp:73
+msgid "Ignored"
+msgstr "Ignorirano"
+
+#: src/gui/setup_relations.cpp:74
+msgid "Erased"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:239
+msgid "Allow trading"
+msgstr "Dozvoli trgovanje"
+
+#: src/gui/setup_relations.cpp:241
+msgid "Allow whispers"
+msgstr "Dozvoli šapate"
+
+#: src/gui/setup_relations.cpp:244
+msgid "Old"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:246
+#, fuzzy
+msgid "Relations"
+msgstr "Odnos"
+
+#: src/gui/setup_relations.cpp:271
+msgid "When ignoring:"
+msgstr "Kad ignorira:"
+
+#: src/gui/setup_theme.cpp:106
 #, fuzzy
 msgid "Tiny (10)"
 msgstr "Sićušno"
 
-#: src/gui/setup_theme.cpp:106
+#: src/gui/setup_theme.cpp:107
 #, fuzzy
 msgid "Small (11)"
 msgstr "Maleno"
 
-#: src/gui/setup_theme.cpp:107
+#: src/gui/setup_theme.cpp:108
 #, fuzzy
 msgid "Medium (12)"
 msgstr "Srednje"
 
-#: src/gui/setup_theme.cpp:108
+#: src/gui/setup_theme.cpp:109
 #, fuzzy
 msgid "Large (13)"
 msgstr "Veliko"
 
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:110
 msgid "Big (14)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:111
 msgid "Huge (15)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:140
+#: src/gui/setup_theme.cpp:141
 msgid "Theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:142
+#: src/gui/setup_theme.cpp:143
 msgid "Gui theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:144
 msgid "Main Font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:144
+#: src/gui/setup_theme.cpp:145
 msgid "Bold font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:146
 #, fuzzy
 msgid "Particle font"
 msgstr "Efekti Čestica"
 
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:147
 #, fuzzy
 msgid "Help font"
 msgstr "Pomoć"
 
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:148
 #, fuzzy
 msgid "Secure font"
 msgstr "Složi se za trgovanje"
 
-#: src/gui/setup_theme.cpp:175
+#: src/gui/setup_theme.cpp:176
 msgid "Font size"
 msgstr "Veličina fonta"
 
-#: src/gui/setup_theme.cpp:281
+#: src/gui/setup_theme.cpp:282
 #, fuzzy
 msgid "Theme Changed"
 msgstr "Izmijeni"
 
-#: src/gui/setup_theme.cpp:282 src/gui/setup_video.cpp:670
-#: src/gui/setup_video.cpp:675
+#: src/gui/setup_theme.cpp:283 src/gui/setup_video.cpp:619
+#: src/gui/setup_video.cpp:624
 msgid "Restart your client for the change to take effect."
 msgstr "Ponovo pokrenite klijent da bi promjene bile efektne."
 
@@ -2459,145 +2519,122 @@ msgstr "srednje"
 msgid "max"
 msgstr "max"
 
-#: src/gui/setup_video.cpp:293
+#: src/gui/setup_video.cpp:288
 msgid "Full screen"
 msgstr "Pregled na čitavom ekranu"
 
-#: src/gui/setup_video.cpp:294
-#, fuzzy
-msgid "Hw acceleration"
-msgstr "Odnos"
-
-#: src/gui/setup_video.cpp:295
+#: src/gui/setup_video.cpp:289
 msgid "Custom cursor"
 msgstr "Vlastiti kursor"
 
-#: src/gui/setup_video.cpp:297
+#: src/gui/setup_video.cpp:291
 msgid "Particle effects"
 msgstr "Efekt čestica"
 
-#: src/gui/setup_video.cpp:299
+#: src/gui/setup_video.cpp:293
 msgid "Show pickup notification"
 msgstr "Prikaži obavijesti o prikupljanju."
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:301
+#: src/gui/setup_video.cpp:295
 msgid "in chat"
 msgstr "u chat-u"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:303
+#: src/gui/setup_video.cpp:297
 msgid "as particle"
 msgstr "kao čestica"
 
-#: src/gui/setup_video.cpp:305
-#, fuzzy
-msgid "Enable opacity cache"
-msgstr "Omogući igraću palicu"
-
-#: src/gui/setup_video.cpp:306
-#, fuzzy
-msgid "Enable map reduce"
-msgstr "Omogući igraću palicu"
-
-#: src/gui/setup_video.cpp:308
-msgid "Auto adjust perfomance"
-msgstr ""
-
-#: src/gui/setup_video.cpp:310
-msgid "Show beings transparency"
-msgstr ""
-
-#: src/gui/setup_video.cpp:315
+#: src/gui/setup_video.cpp:302
 #, fuzzy
 msgid "FPS limit:"
 msgstr "Ograničenje sličica u sekundi"
 
-#: src/gui/setup_video.cpp:319 src/gui/setup_video.cpp:356
-#: src/gui/setup_video.cpp:607 src/gui/setup_video.cpp:760
+#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
+#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709
 #, fuzzy
 msgid "Alt FPS limit: "
 msgstr "Ograničenje sličica u sekundi"
 
-#: src/gui/setup_video.cpp:328
+#: src/gui/setup_video.cpp:315
 msgid "Video"
 msgstr "Slika"
 
-#: src/gui/setup_video.cpp:334
+#: src/gui/setup_video.cpp:321
 msgid "Overhead text"
 msgstr "Tekst iznad glave"
 
-#: src/gui/setup_video.cpp:335
+#: src/gui/setup_video.cpp:322
 msgid "Gui opacity"
 msgstr "Prozirnost sučelja"
 
-#: src/gui/setup_video.cpp:336
+#: src/gui/setup_video.cpp:323
 msgid "Ambient FX"
 msgstr "Efekti okruženja"
 
-#: src/gui/setup_video.cpp:337
+#: src/gui/setup_video.cpp:324
 #, fuzzy
 msgid "Particle detail"
 msgstr "Detalji Čestica"
 
-#: src/gui/setup_video.cpp:354 src/gui/setup_video.cpp:357
-#: src/gui/setup_video.cpp:606 src/gui/setup_video.cpp:747
-#: src/gui/setup_video.cpp:758
+#: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
+#: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
+#: src/gui/setup_video.cpp:707
 #, fuzzy
 msgid "None"
 msgstr "Ne"
 
-#: src/gui/setup_video.cpp:511
+#: src/gui/setup_video.cpp:484
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:517
+#: src/gui/setup_video.cpp:490
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:528
+#: src/gui/setup_video.cpp:501
 #, fuzzy
 msgid "Switching to Full Screen"
 msgstr "Prebacivanje u pregled na čitavom ekranu"
 
-#: src/gui/setup_video.cpp:529
+#: src/gui/setup_video.cpp:502
 msgid "Restart needed for changes to take effect."
 msgstr "Potrebno je ponovno pokrenuti klijent za izvršavanje promjena."
 
-#: src/gui/setup_video.cpp:541
+#: src/gui/setup_video.cpp:514
 #, fuzzy
 msgid "Changing to OpenGL"
 msgstr "Promjena OpenGL-a"
 
-#: src/gui/setup_video.cpp:542
+#: src/gui/setup_video.cpp:515
 msgid "Applying change to OpenGL requires restart."
 msgstr "Izmjene OpenGL-a zahtjevaju ponovno pokretanje klijenta."
 
-#: src/gui/setup_video.cpp:653
+#: src/gui/setup_video.cpp:602
 msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:654
+#: src/gui/setup_video.cpp:603
 msgid "Enter new resolution:                "
 msgstr ""
 
-#: src/gui/setup_video.cpp:669 src/gui/setup_video.cpp:674
+#: src/gui/setup_video.cpp:618 src/gui/setup_video.cpp:623
 #, fuzzy
 msgid "Screen Resolution Changed"
 msgstr "Rezolucija Ekrana promijenjena"
 
-#: src/gui/setup_video.cpp:672
+#: src/gui/setup_video.cpp:621
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:705
+#: src/gui/setup_video.cpp:654
 #, fuzzy
 msgid "Particle Effect Settings Changed."
 msgstr "Postavke efekta čestica su promijenjene."
 
-#: src/gui/setup_video.cpp:706
+#: src/gui/setup_video.cpp:655
 msgid "Changes will take effect on map change."
 msgstr "Promjene će stupiti na snagu na promjeni karte."
 
@@ -2626,7 +2663,8 @@ msgstr ""
 msgid "Show links in announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:723 src/net/manaserv/tradehandler.cpp:127
+#: src/gui/shopwindow.cpp:723 src/net/ea/tradehandler.cpp:106
+#: src/net/manaserv/tradehandler.cpp:127
 msgid "Request for Trade"
 msgstr "Zahtjev za Trgovanje"
 
@@ -2668,7 +2706,7 @@ msgstr "Nivo: %d"
 msgid "Lvl: %d (%+d)"
 msgstr "Nivo: %d"
 
-#: src/gui/socialwindow.cpp:117
+#: src/gui/socialwindow.cpp:117 src/net/ea/gui/guildtab.cpp:52
 msgid "Guild"
 msgstr "Ceh"
 
@@ -2701,7 +2739,7 @@ msgstr "Formiraj Ceh"
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Jeste li sigurni da želite odustati?"
 
-#: src/gui/socialwindow.cpp:215
+#: src/gui/socialwindow.cpp:215 src/net/ea/gui/partytab.cpp:50
 msgid "Party"
 msgstr "Partija"
 
@@ -2876,250 +2914,250 @@ msgstr "Izaberite vaš server"
 msgid "Specials"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:196
+#: src/gui/statuspopup.cpp:197
 msgid "(D) default moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:201
+#: src/gui/statuspopup.cpp:202
 msgid "(I) invert moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:206
+#: src/gui/statuspopup.cpp:207
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:211
+#: src/gui/statuspopup.cpp:212
 msgid "(C) moves with crazy moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:216
+#: src/gui/statuspopup.cpp:217
 msgid "(d) double normal + crazy"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:221
+#: src/gui/statuspopup.cpp:222
 msgid "(?) move"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:239
+#: src/gui/statuspopup.cpp:240
 msgid "(a) custom crazy move"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:243
+#: src/gui/statuspopup.cpp:244
 msgid "(?) crazy move"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:253
+#: src/gui/statuspopup.cpp:254
 msgid "(0) default moves to target"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:258
+#: src/gui/statuspopup.cpp:259
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:263
+#: src/gui/statuspopup.cpp:264
 #, fuzzy
 msgid "(2) moves to target in distance 2"
 msgstr "Pomakni Ulijevo"
 
-#: src/gui/statuspopup.cpp:268
+#: src/gui/statuspopup.cpp:269
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:273
+#: src/gui/statuspopup.cpp:274
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:278
+#: src/gui/statuspopup.cpp:279
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:283
+#: src/gui/statuspopup.cpp:284
 msgid "(A) moves to target in attack range"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:288
+#: src/gui/statuspopup.cpp:289
 #, fuzzy
 msgid "(?) move to target"
 msgstr "Pomakni Ulijevo"
 
-#: src/gui/statuspopup.cpp:296
+#: src/gui/statuspopup.cpp:297
 msgid "(D) default follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:300
+#: src/gui/statuspopup.cpp:301
 msgid "(R) relative follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:304
+#: src/gui/statuspopup.cpp:305
 msgid "(M) mirror follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:308
+#: src/gui/statuspopup.cpp:309
 msgid "(P) pet follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:312
+#: src/gui/statuspopup.cpp:313
 msgid "(?) unknown follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:321 src/gui/statuspopup.cpp:344
+#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345
 msgid "(D) default attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:326
+#: src/gui/statuspopup.cpp:327
 msgid "(s) switch attack without shield"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:331
+#: src/gui/statuspopup.cpp:332
 msgid "(S) switch attack with shield"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:335 src/gui/statuspopup.cpp:360
+#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
 #, fuzzy
 msgid "(?) attack"
 msgstr "Napad"
 
-#: src/gui/statuspopup.cpp:348
+#: src/gui/statuspopup.cpp:349
 msgid "(G) go and attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:352
+#: src/gui/statuspopup.cpp:353
 msgid "(A) go, attack, pickup"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:356
+#: src/gui/statuspopup.cpp:357
 #, fuzzy
 msgid "(d) without auto attack"
 msgstr "Promijeni lika"
 
-#: src/gui/statuspopup.cpp:374
+#: src/gui/statuspopup.cpp:375
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:378
+#: src/gui/statuspopup.cpp:379
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:382
+#: src/gui/statuspopup.cpp:383
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:386
+#: src/gui/statuspopup.cpp:387
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:390
+#: src/gui/statuspopup.cpp:391
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:394
+#: src/gui/statuspopup.cpp:395
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:398
+#: src/gui/statuspopup.cpp:399
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:402
+#: src/gui/statuspopup.cpp:403
 msgid "(?) pick up"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:411
+#: src/gui/statuspopup.cpp:412
 msgid "(N) normal map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:415
+#: src/gui/statuspopup.cpp:416
 msgid "(D) debug map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:419
+#: src/gui/statuspopup.cpp:420
 msgid "(u) ultra map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:423
+#: src/gui/statuspopup.cpp:424
 msgid "(U) ultra map view 2"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:427
+#: src/gui/statuspopup.cpp:428
 msgid "(e) empty map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:431
+#: src/gui/statuspopup.cpp:432
 msgid "(b) black & white map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:435
+#: src/gui/statuspopup.cpp:436
 msgid "(?) map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:443
+#: src/gui/statuspopup.cpp:444
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:448
+#: src/gui/statuspopup.cpp:449
 #, fuzzy
 msgid "(c) use #chiza for magic attack"
 msgstr "Promijeni lika"
 
-#: src/gui/statuspopup.cpp:453
+#: src/gui/statuspopup.cpp:454
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:458
+#: src/gui/statuspopup.cpp:459
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:463
+#: src/gui/statuspopup.cpp:464
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:467
+#: src/gui/statuspopup.cpp:468
 #, fuzzy
 msgid "(?) magic attack"
 msgstr "Promijeni lika"
 
-#: src/gui/statuspopup.cpp:476
+#: src/gui/statuspopup.cpp:477
 msgid "(D) default imitation"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:480
+#: src/gui/statuspopup.cpp:481
 msgid "(O) outfits imitation"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:484
+#: src/gui/statuspopup.cpp:485
 msgid "(?) imitation"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:493
+#: src/gui/statuspopup.cpp:494
 #, fuzzy
 msgid "(O) on keyboard"
 msgstr "Tipkovnica"
 
-#: src/gui/statuspopup.cpp:496
+#: src/gui/statuspopup.cpp:497
 msgid "(A) away"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:499 src/gui/statuspopup.cpp:519
+#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
 msgid "(?) away"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:507
+#: src/gui/statuspopup.cpp:508
 msgid "(G) game camera mode"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:511
+#: src/gui/statuspopup.cpp:512
 msgid "(F) free camera mode"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:515
+#: src/gui/statuspopup.cpp:516
 msgid "(D) design camera mode"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:526
+#: src/gui/statuspopup.cpp:527
 msgid "Game modifiers are disabled"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:531
+#: src/gui/statuspopup.cpp:532
 msgid "Game modifiers are enabled"
 msgstr ""
 
@@ -3298,99 +3336,99 @@ msgstr ""
 msgid "(O)"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:112
+#: src/gui/textcommandeditor.cpp:113
 #, fuzzy
 msgid "No Target"
 msgstr "Pomakni Ulijevo"
 
-#: src/gui/textcommandeditor.cpp:113
+#: src/gui/textcommandeditor.cpp:114
 #, fuzzy
 msgid "Allow Target"
 msgstr "Dozvoli trgovanje"
 
-#: src/gui/textcommandeditor.cpp:114
+#: src/gui/textcommandeditor.cpp:115
 #, fuzzy
 msgid "Need Target"
 msgstr "Pomakni Ulijevo"
 
-#: src/gui/textcommandeditor.cpp:119
+#: src/gui/textcommandeditor.cpp:120
 #, fuzzy
 msgid "General Magic"
 msgstr "Općenito"
 
-#: src/gui/textcommandeditor.cpp:120
+#: src/gui/textcommandeditor.cpp:121
 #, fuzzy
 msgid "Life Magic"
 msgstr "Magija"
 
-#: src/gui/textcommandeditor.cpp:121
+#: src/gui/textcommandeditor.cpp:122
 #, fuzzy
 msgid "War Magic"
 msgstr "Magija"
 
-#: src/gui/textcommandeditor.cpp:122
+#: src/gui/textcommandeditor.cpp:123
 msgid "Transmute Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:123
+#: src/gui/textcommandeditor.cpp:124
 msgid "Nature Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:124
+#: src/gui/textcommandeditor.cpp:125
 msgid "Astral Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:167
+#: src/gui/textcommandeditor.cpp:168
 #, fuzzy
 msgid "Command Editor"
 msgstr "Naredba: /item"
 
-#: src/gui/textcommandeditor.cpp:184
+#: src/gui/textcommandeditor.cpp:185
 #, fuzzy
 msgid "magic"
 msgstr "Magija"
 
-#: src/gui/textcommandeditor.cpp:188
+#: src/gui/textcommandeditor.cpp:189
 msgid "other"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:193
+#: src/gui/textcommandeditor.cpp:194
 msgid "Symbol:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:196
+#: src/gui/textcommandeditor.cpp:197
 #, fuzzy
 msgid "Command:"
 msgstr "Naredba: /who"
 
-#: src/gui/textcommandeditor.cpp:199
+#: src/gui/textcommandeditor.cpp:200
 msgid "Mana:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:205
+#: src/gui/textcommandeditor.cpp:206
 #, fuzzy
 msgid "Target Type:"
 msgstr "Ciljaj Igrača"
 
-#: src/gui/textcommandeditor.cpp:211
+#: src/gui/textcommandeditor.cpp:212
 msgid "Icon:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:217
+#: src/gui/textcommandeditor.cpp:218
 #, fuzzy
 msgid "Magic level:"
 msgstr "Najviša razina"
 
-#: src/gui/textcommandeditor.cpp:223
+#: src/gui/textcommandeditor.cpp:224
 msgid "Magic School:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:229
+#: src/gui/textcommandeditor.cpp:230
 #, fuzzy
 msgid "School level:"
 msgstr "Prikaži ime"
 
-#: src/gui/textcommandeditor.cpp:234
+#: src/gui/textcommandeditor.cpp:235
 msgid "Save"
 msgstr ""
 
@@ -3638,23 +3676,23 @@ msgstr ""
 msgid "Road Point"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:470
+#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:471
 msgid "Who Is Online - Updating"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:100
+#: src/gui/whoisonline.cpp:101
 msgid "Update"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:293
+#: src/gui/whoisonline.cpp:294
 msgid "Who Is Online - "
 msgstr ""
 
-#: src/gui/whoisonline.cpp:484
+#: src/gui/whoisonline.cpp:485
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:515
+#: src/gui/whoisonline.cpp:516
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -3719,6 +3757,7 @@ msgid "This command makes <nick> a channel operator."
 msgstr "Ova naredba čini <nadimak> operatorom kanala."
 
 #: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
+#: src/net/ea/gui/guildtab.cpp:69 src/net/ea/gui/partytab.cpp:85
 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 (\")."
@@ -4508,120 +4547,863 @@ msgstr "Hvala za kupnju."
 msgid "Unable to buy."
 msgstr "Ne može se kupiti"
 
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
-msgid "Strength"
-msgstr "Snaga"
+#: src/net/ea/charserverhandler.cpp:63
+msgid "Strength:"
+msgstr "Snaga:"
 
-#: src/net/manaserv/attributes.cpp:167
+#: src/net/ea/charserverhandler.cpp:64
+msgid "Agility:"
+msgstr "Okretnost:"
+
+#: src/net/ea/charserverhandler.cpp:65
+msgid "Vitality:"
+msgstr "Vitalnost:"
+
+#: src/net/ea/charserverhandler.cpp:66
+msgid "Intelligence:"
+msgstr "Inteligencija:"
+
+#: src/net/ea/charserverhandler.cpp:67
+msgid "Dexterity:"
+msgstr "Spretnost:"
+
+#: src/net/ea/charserverhandler.cpp:68
+msgid "Luck:"
+msgstr "Sreća:"
+
+#: src/net/ea/charserverhandler.cpp:102
+msgid "Access denied. Most likely, there are too many players on this server."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:106
+#, fuzzy
+msgid "Cannot use this ID."
+msgstr "Ne mogu koristiti ovaj ID"
+
+#: src/net/ea/charserverhandler.cpp:109
+#, fuzzy
+msgid "Unknown char-server failure."
+msgstr "Nepoznata greška"
+
+#: src/net/ea/charserverhandler.cpp:138
+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:142 src/net/ea/loginhandler.cpp:237
+#, fuzzy
+msgid "Wrong name."
+msgstr "Pogrešan magični_simbol"
+
+#: src/net/ea/charserverhandler.cpp:145
+#, fuzzy
+msgid "Incorrect stats."
+msgstr "Pogrešna lozinka"
+
+#: src/net/ea/charserverhandler.cpp:148
+#, fuzzy
+msgid "Incorrect hair."
+msgstr "Pogrešna lozinka"
+
+#: src/net/ea/charserverhandler.cpp:151
+#, fuzzy
+msgid "Incorrect slot."
+msgstr "Pogrešna lozinka"
+
+#: src/net/ea/charserverhandler.cpp:166 src/net/manaserv/charhandler.cpp:210
+msgid "Info"
+msgstr "Info"
+
+#: src/net/ea/charserverhandler.cpp:166
+msgid "Character deleted."
+msgstr "Lik izbrisan."
+
+#: src/net/ea/charserverhandler.cpp:172
+msgid "Failed to delete character."
+msgstr "Neuspješno brisanje znaka."
+
+#: src/net/ea/chathandler.cpp:60 src/net/ea/chathandler.cpp:66
+#: src/net/ea/chathandler.cpp:71 src/net/ea/chathandler.cpp:77
+#: src/net/ea/chathandler.cpp:82 src/net/ea/chathandler.cpp:88
+#: src/net/ea/chathandler.cpp:95 src/net/ea/chathandler.cpp:101
+msgid "Channels are not supported!"
+msgstr "Kanali nisu podržani!"
+
+#: src/net/ea/chathandler.cpp:128
 #, fuzzy, c-format
-msgid "Strength %+.1f"
-msgstr "Snaga %+d"
+msgid "Whisper could not be sent, %s is offline."
+msgstr "Šapat nije mogao biti poslan, korisnik je offline."
 
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
-msgid "Agility"
-msgstr "Okretnost"
+#: src/net/ea/chathandler.cpp:136
+#, 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/manaserv/attributes.cpp:180
+#: src/net/ea/chathandler.cpp:348
+#, fuzzy
+msgid "MVP player."
+msgstr "Igrač"
+
+#: src/net/ea/chathandler.cpp:352
+#, fuzzy
+msgid "MVP player: "
+msgstr "Igrač"
+
+#: src/net/ea/gamehandler.cpp:86
+#, c-format
+msgid "Online users: %d"
+msgstr ""
+
+#: src/net/ea/gamehandler.cpp:98
+#, fuzzy
+msgid "Game"
+msgstr "Ime"
+
+#: src/net/ea/gamehandler.cpp:98
+#, fuzzy
+msgid "Request to quit denied!"
+msgstr "Zahtjev za Trgovanje"
+
+#: src/net/ea/gui/guildtab.cpp:67 src/net/ea/gui/partytab.cpp:83
+msgid "Command: /invite <nick>"
+msgstr "Naredba: /invite <nick>"
+
+#: src/net/ea/gui/guildtab.cpp:68
+#, 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:74 src/net/ea/gui/partytab.cpp:90
+msgid "Command: /leave"
+msgstr "Naredba: /leave"
+
+#: src/net/ea/gui/guildtab.cpp:75
+#, fuzzy
+msgid "This command causes the player to leave the guild."
+msgstr "Ova naredba postavlja temu za <message>."
+
+#: src/net/ea/gui/guildtab.cpp:135 src/net/ea/gui/partytab.cpp:69
+msgid "/help > Display this help."
+msgstr "/help > Prikaži ovu pomoć."
+
+#: src/net/ea/gui/guildtab.cpp:136
+#, fuzzy
+msgid "/invite > Invite a player to your guild"
+msgstr "/invite > Pozovite igrače na vašu partiju"
+
+#: src/net/ea/gui/guildtab.cpp:137
+#, fuzzy
+msgid "/leave > Leave the guild you are in"
+msgstr "/leave > Napustite partiju u kojoj ste"
+
+#: src/net/ea/gui/guildtab.cpp:138
+#, fuzzy
+msgid "/kick > Kick some one from the guild you are in"
+msgstr "/kick > Šutnite nekog iz partije u kojoj ste"
+
+#: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
+msgid "Guild created."
+msgstr "Ceh, ustanovljen."
+
+#: src/net/ea/guildhandler.cpp:88 src/net/ea/guildhandler.cpp:93
+#, fuzzy
+msgid "You are already in guild."
+msgstr "Pogreška pri ustanovljavanju ceha."
+
+#: src/net/ea/guildhandler.cpp:98
+msgid "Emperium check failed."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:103
+#, fuzzy
+msgid "Unknown server response."
+msgstr "Nepoznata greška"
+
+#: src/net/ea/guildhandler.cpp:180
 #, fuzzy, c-format
-msgid "Agility %+.1f"
-msgstr "Okretnost %+d"
+msgid "Guild name: %s"
+msgstr "Ceh"
 
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
-msgid "Dexterity"
-msgstr "Spretnost"
+#: src/net/ea/guildhandler.cpp:182
+#, fuzzy, c-format
+msgid "Guild master: %s"
+msgstr "Ceh"
 
-#: src/net/manaserv/attributes.cpp:193
+#: src/net/ea/guildhandler.cpp:184
 #, fuzzy, c-format
-msgid "Dexterity %+.1f"
-msgstr "Spretnost %+d"
+msgid "Guild level: %d"
+msgstr "Nivo: %d"
 
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
-msgid "Vitality"
-msgstr "Vitalnost"
+#: src/net/ea/guildhandler.cpp:186
+#, c-format
+msgid "Online members: %d"
+msgstr ""
 
-#: src/net/manaserv/attributes.cpp:206
+#: src/net/ea/guildhandler.cpp:188
+#, c-format
+msgid "Max members: %d"
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:190
 #, fuzzy, c-format
-msgid "Vitality %+.1f"
-msgstr "Vitalnost %+d"
+msgid "Average level: %d"
+msgstr "Najviša razina"
 
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
-msgid "Intelligence"
-msgstr "Inteligencija"
+#: src/net/ea/guildhandler.cpp:192
+#, fuzzy, c-format
+msgid "Guild exp: %d"
+msgstr "Ceh"
 
-#: src/net/manaserv/attributes.cpp:219
+#: src/net/ea/guildhandler.cpp:194
 #, fuzzy, c-format
-msgid "Intelligence %+.1f"
-msgstr "Inteligencija %+d"
+msgid "Guild next exp: %d"
+msgstr "Ceh, ustanovljen."
 
-#: src/net/manaserv/attributes.cpp:225
+#: src/net/ea/guildhandler.cpp:196
+#, fuzzy, c-format
+msgid "Guild castle: %s"
+msgstr "Ceh, ustanovljen."
+
+#: src/net/ea/guildhandler.cpp:402
+msgid "Could not inivte user to guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:406
 #, fuzzy
-msgid "Willpower"
-msgstr "Snaga volje:"
+msgid "User rejected guild invite."
+msgstr "%s je odbio vašu pozivnicu."
 
-#: src/net/manaserv/attributes.cpp:232
+#: src/net/ea/guildhandler.cpp:410
+#, fuzzy
+msgid "User is now part of your guild."
+msgstr "%s je sada član vaše partije."
+
+#: src/net/ea/guildhandler.cpp:414
+msgid "Your guild is full."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:418
+#, fuzzy
+msgid "Unknown guild invite response."
+msgstr "Nepoznata greška"
+
+#: src/net/ea/guildhandler.cpp:438
+#, fuzzy
+msgid "You have left the guild."
+msgstr "Napustili ste partiju."
+
+#: src/net/ea/guildhandler.cpp:452
 #, fuzzy, c-format
-msgid "Willpower %+.1f"
-msgstr "Snaga Volje %+d"
+msgid "%s has left your guild."
+msgstr "%s je napustio/la vašu partiju."
+
+#: src/net/ea/guildhandler.cpp:483
+#, fuzzy
+msgid "You was kicked from guild."
+msgstr "%s je sada član vaše partije."
+
+#: src/net/ea/guildhandler.cpp:496
+#, fuzzy, c-format
+msgid "%s has kicked from your guild."
+msgstr "%s je sada član vaše partije."
+
+#: src/net/ea/gui/partytab.cpp:70
+msgid "/invite > Invite a player to your party"
+msgstr "/invite > Pozovite igrače na vašu partiju"
+
+#: src/net/ea/gui/partytab.cpp:71
+msgid "/leave > Leave the party you are in"
+msgstr "/leave > Napustite partiju u kojoj ste"
+
+#: src/net/ea/gui/partytab.cpp:72
+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:73
+#, fuzzy
+msgid "/item > Show/change party item sharing options"
+msgstr ""
+"Ova naredba mijenja politiku korištenja zajedničkih predmete u partiji."
+
+#: src/net/ea/gui/partytab.cpp:74
+msgid "/exp > Show/change party experience sharing options"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:84
+msgid "This command invites <nick> to party with you."
+msgstr "Ova naredba poziva <nick> na partiju sa vama."
+
+#: src/net/ea/gui/partytab.cpp:91
+#, fuzzy
+msgid "This command causes the player to leave the party."
+msgstr "Ova naredba postavlja temu za <message>."
+
+#: src/net/ea/gui/partytab.cpp:95
+msgid "Command: /item <policy>"
+msgstr "Naredba: /item <policy>"
+
+#: src/net/ea/gui/partytab.cpp:97
+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:98
+msgid ""
+"<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
+"\"0\", \"no\", \"false\" to disable item sharing."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:101
+msgid "Command: /item"
+msgstr "Naredba: /item"
+
+#: src/net/ea/gui/partytab.cpp:102
+#, fuzzy
+msgid "This command displays the party's current item sharing policy."
+msgstr ""
+"Ova naredba mijenja politiku korištenja zajedničkih predmete u partiji."
+
+#: src/net/ea/gui/partytab.cpp:107
+msgid "Command: /exp <policy>"
+msgstr "Naredba: /exp <policy>"
 
-#: src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/gui/partytab.cpp:108
+#, fuzzy
+msgid "This command changes the party's experience sharing policy."
+msgstr ""
+"Ova naredba mijenja politiku korištenja zajedničkih predmete u partiji."
+
+#: src/net/ea/gui/partytab.cpp:110
+msgid ""
+"<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
+"sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:113
+msgid "Command: /exp"
+msgstr "Naredba: /exp"
+
+#: src/net/ea/gui/partytab.cpp:114
+#, fuzzy
+msgid "This command displays the party's current experience sharing policy."
+msgstr ""
+"Ova naredba mijenja politiku korištenja zajedničkih predmete u partiji."
+
+#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:286
+msgid "Item sharing enabled."
+msgstr "Dijeljenje predmeta je omogućeno.moguće."
+
+#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:296
+msgid "Item sharing disabled."
+msgstr "Dijeljenje predmeta je onemogućeno."
+
+#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:306
+msgid "Item sharing not possible."
+msgstr "Dijeljenje predmeta nije moguće."
+
+#: src/net/ea/gui/partytab.cpp:157
+#, fuzzy
+msgid "Item sharing unknown."
+msgstr "Dijeljenje predmeta je omogućeno.moguće."
+
+#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:248
+#, fuzzy
+msgid "Experience sharing enabled."
+msgstr "Dijeljenje predmeta je omogućeno.moguće."
+
+#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:258
+#, fuzzy
+msgid "Experience sharing disabled."
+msgstr "Dijeljenje predmeta je onemogućeno."
+
+#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:268
+#, fuzzy
+msgid "Experience sharing not possible."
+msgstr "Dijeljenje predmeta nije moguće."
+
+#: src/net/ea/gui/partytab.cpp:196
+#, fuzzy
+msgid "Experience sharing unknown."
+msgstr "Dijeljenje predmeta je omogućeno.moguće."
+
+#: src/net/ea/inventoryhandler.cpp:407
+msgid "Failed to use item."
+msgstr "Neuspješno korištenje predmeta."
+
+#: src/net/ea/inventoryhandler.cpp:580
+msgid "Unable to equip."
+msgstr "Nije moguće opremiti."
+
+#: src/net/ea/loginhandler.cpp:131
+msgid "Account was not found. Please re-login."
+msgstr "Račun nije pronađen. Molimo, ponovno se prijavite."
+
+#: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127
+#, fuzzy
+msgid "Old password incorrect."
+msgstr "Stara lozinka je netočna"
+
+#: src/net/ea/loginhandler.cpp:137
+#, fuzzy
+msgid "New password too short."
+msgstr "Nova lozinka je prekratka"
+
+#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:243
+#: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
+#: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
+#: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
+#, fuzzy
+msgid "Unknown error."
+msgstr "Nepoznata greška"
+
+#: src/net/ea/loginhandler.cpp:205
+#, fuzzy
+msgid "Unregistered ID."
+msgstr "Neregistriran ID"
+
+#: src/net/ea/loginhandler.cpp:208
+#, fuzzy
+msgid "Wrong password."
+msgstr "Pogrešna lozinka"
+
+#: src/net/ea/loginhandler.cpp:211
+#, fuzzy
+msgid "Account expired."
+msgstr "Račun je istekao"
+
+#: src/net/ea/loginhandler.cpp:214
+#, fuzzy
+msgid "Rejected from server."
+msgstr "Odbijeno od poslužitelja"
+
+#: src/net/ea/loginhandler.cpp:217
+msgid ""
+"You have been permanently banned from the game. Please contact the GM team."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:221
+#, fuzzy
+msgid "Client too old."
+msgstr "Verzija klijenta je prestara"
+
+#: src/net/ea/loginhandler.cpp:224
+#, c-format
+msgid ""
+"You have been temporarily banned from the game until %s.\n"
+"Please contact the GM team via the forums."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:231
+msgid "Server overpopulated."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:234
+#, fuzzy
+msgid "This user name is already taken."
+msgstr "Ovo korisničko ime je već zauzeto"
+
+#: src/net/ea/loginhandler.cpp:240
+#, fuzzy
+msgid "Username permanently erased."
+msgstr "Korisničko ime već postoji"
+
+#: src/net/ea/partyhandler.cpp:82
+msgid "Could not create party."
+msgstr "Nije se mogla napraviti partija."
+
+#: src/net/ea/partyhandler.cpp:84
+msgid "Party successfully created."
+msgstr "Partija je uspješno kreirana."
+
+#: src/net/ea/partyhandler.cpp:140
+#, fuzzy, c-format
+msgid "%s has joined your party."
+msgstr "%s je napustio/la vašu partiju."
+
+#: src/net/ea/partyhandler.cpp:176
+#, c-format
+msgid "%s is already a member of a party."
+msgstr "%s je već član partije."
+
+#: src/net/ea/partyhandler.cpp:181
+#, c-format
+msgid "%s refused your invitation."
+msgstr "%s je odbio vašu pozivnicu."
+
+#: src/net/ea/partyhandler.cpp:186
+#, c-format
+msgid "%s is now a member of your party."
+msgstr "%s je sada član vaše partije."
+
+#: src/net/ea/partyhandler.cpp:191
+#, c-format
+msgid "%s can't join your party because party is full."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:196
+#, fuzzy, c-format
+msgid "QQQ Unknown invite response for %s."
+msgstr "Nepoznata greška"
+
+#: src/net/ea/partyhandler.cpp:356
+msgid "You have left the party."
+msgstr "Napustili ste partiju."
+
+#: src/net/ea/partyhandler.cpp:368
+#, c-format
+msgid "%s has left your party."
+msgstr "%s je napustio/la vašu partiju."
+
+#: src/net/ea/partyhandler.cpp:444
+#, c-format
+msgid "An unknown member tried to say: %s"
+msgstr "Nepoznati član pokušava reći: %s"
+
+#: src/net/ea/playerhandler.cpp:95 src/net/manaserv/beinghandler.cpp:315
 msgid "You are dead."
 msgstr "Vi ste mrtvi."
 
-#: src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:316
 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:318
+#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:318
 msgid "You are not that alive anymore."
 msgstr "Niste više tako živi."
 
-#: src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:319
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:320
 msgid "Game Over!"
 msgstr "Kraj Igre!"
 
-#: src/net/manaserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:101
+msgid "Insert coin to continue."
+msgstr "Ubacite žeton za nastavak."
+
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:321
 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:323
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:323
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:325
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:325
 msgid "I guess this did not run too well."
 msgstr "Predpostavljam da ovo nije išlo previše dobro."
 
-#: src/net/manaserv/beinghandler.cpp:326
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:326
 msgid "Do you want your possessions identified?"
 msgstr "Želite li svoju imovinu identificirati?"
 
-#: src/net/manaserv/beinghandler.cpp:327
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:327
 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:329
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:329
 msgid "Annihilated."
 msgstr "Uništen."
 
-#: src/net/manaserv/beinghandler.cpp:330
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:330
 msgid "Looks like you got your head handed to you."
 msgstr "Izgleda da su vam predali vašu glavu."
 
-#: src/net/manaserv/beinghandler.cpp:332
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:332
 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:119
+msgid "You're not dead yet. You're just resting."
+msgstr "Niste još mrtvi. Samo se odmarate."
+
+#: src/net/ea/playerhandler.cpp:120
+msgid "You are no more."
+msgstr "Nema vas više."
+
+#: src/net/ea/playerhandler.cpp:121
+msgid "You have ceased to be."
+msgstr "Prestali ste postojati."
+
+#: src/net/ea/playerhandler.cpp:122
+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:123
+msgid "You're a stiff."
+msgstr "Ukočili ste se."
+
+#: src/net/ea/playerhandler.cpp:124
+msgid "Bereft of life, you rest in peace."
+msgstr "Lišeni života, počivate u miru."
+
+#: src/net/ea/playerhandler.cpp:125
+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:126
+msgid "Your metabolic processes are now history."
+msgstr "Vaši metabolički procesi su sad povijest."
+
+#: src/net/ea/playerhandler.cpp:127
+msgid "You're off the twig."
+msgstr "Pali ste s grančice."
+
+#: src/net/ea/playerhandler.cpp:128
+msgid "You've kicked the bucket."
+msgstr "Vi ste šutirali sić."
+
+#: src/net/ea/playerhandler.cpp:129
+msgid ""
+"You've shuffled off your mortal coil, run down the curtain and joined the "
+"bleedin' choir invisibile."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:131
+msgid "You are an ex-player."
+msgstr "Vi ste bivši igrač."
+
+#: src/net/ea/playerhandler.cpp:132
+msgid "You're pining for the fjords."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
+#: src/net/ea/playerhandler.cpp:425
+msgid "Message"
+msgstr "Poruka"
+
+#: src/net/ea/playerhandler.cpp:337
+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:347
+#, fuzzy
+msgid "You are carrying less than half your weight. You can regain health."
+msgstr ""
+"Nosite više od pola svoje težine. Niste u mogućnosti kako bi povratili "
+"zdravlje."
+
+#: src/net/ea/playerhandler.cpp:451
+#, fuzzy, c-format
+msgid "You picked up %s."
+msgstr "Pokupili ste "
+
+#: src/net/ea/playerhandler.cpp:457
+#, fuzzy, c-format
+msgid "You spent %s."
+msgstr "Vi dobijete %s."
+
+#: src/net/ea/playerhandler.cpp:501
+msgid "Cannot raise skill!"
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:618
+msgid "Equip arrows first."
+msgstr "Prvo se opremite strijelama."
+
+#: src/net/ea/specialhandler.cpp:149
+msgid "Trade failed!"
+msgstr "Neuspjela razmjena!"
+
+#: src/net/ea/specialhandler.cpp:152
+msgid "Emote failed!"
+msgstr "Neuspjelo korištenje emotea!"
+
+#: src/net/ea/specialhandler.cpp:155
+msgid "Sit failed!"
+msgstr "Neuspjelo sjedanje!"
+
+#: src/net/ea/specialhandler.cpp:158
+msgid "Chat creating failed!"
+msgstr "Neuspjelo stvaranje lika!"
+
+#: src/net/ea/specialhandler.cpp:161
+msgid "Could not join party!"
+msgstr "Neuspjelo priključivanje družini!"
+
+#: src/net/ea/specialhandler.cpp:164
+msgid "Cannot shout!"
+msgstr "Neuspjelo vikanje!"
+
+#: src/net/ea/specialhandler.cpp:177
+msgid "You have not yet reached a high enough lvl!"
+msgstr "Još nisi dosegao/la dovoljno visok nivo!"
+
+#: src/net/ea/specialhandler.cpp:181
+msgid "Insufficient HP!"
+msgstr "Nedovoljno zdravlja!"
+
+#: src/net/ea/specialhandler.cpp:184
+msgid "Insufficient SP!"
+msgstr "Nedovoljno SP-a!"
+
+#: src/net/ea/specialhandler.cpp:187
+msgid "You have no memos!"
+msgstr "Nemaš podsjetnika!"
+
+#: src/net/ea/specialhandler.cpp:190
+msgid "You cannot do that right now!"
+msgstr "Ne možeš to učiniti sad!"
+
+#: src/net/ea/specialhandler.cpp:193
+msgid "Seems you need more money... ;-)"
+msgstr "Čini se da trebate više novca... ;-)"
+
+#: src/net/ea/specialhandler.cpp:196
+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:200
+msgid "You need another red gem!"
+msgstr "Trebaš još jedan crveni dragulj!"
+
+#: src/net/ea/specialhandler.cpp:203
+msgid "You need another blue gem!"
+msgstr "Trebaš još jedan plavi dragulj!"
+
+#: src/net/ea/specialhandler.cpp:206
+msgid "You're carrying to much to do this!"
+msgstr "Nosiš previše predmeta da bi učinio to!"
+
+#: src/net/ea/specialhandler.cpp:209
+msgid "Huh? What's that?"
+msgstr "Ha? Što je to?"
+
+#: src/net/ea/specialhandler.cpp:220
+msgid "Warp failed..."
+msgstr "Skok nije uspio..."
+
+#: src/net/ea/specialhandler.cpp:223
+msgid "Could not steal anything..."
+msgstr "Krađa nije uspjela..."
+
+#: src/net/ea/specialhandler.cpp:226
+msgid "Poison had no effect..."
+msgstr "Otrov nije uspio..."
+
+#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:128
+#, 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:130
+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:134
+msgid "Trading isn't possible. Character doesn't exist."
+msgstr "Trgovanje nije moguće. Lik ne postoji."
+
+#: src/net/ea/tradehandler.cpp:138
+msgid "Trade cancelled due to an unknown reason."
+msgstr "Trgovanje otkazano zbog nepoznatih razloga."
+
+#: src/net/ea/tradehandler.cpp:146
+#, c-format
+msgid "Trade: You and %s"
+msgstr "Trgujte: Vi i %s"
+
+#: src/net/ea/tradehandler.cpp:156
+#, c-format
+msgid "Trade with %s cancelled."
+msgstr "Trgovanje s %s otkazano."
+
+#: src/net/ea/tradehandler.cpp:169
+msgid "Unhandled trade cancel packet."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:231
+msgid "Failed adding item. Trade partner is over weighted."
+msgstr "Neuspješno dodavanje predmeta. Trgovinski partner je preopterećen."
+
+#: src/net/ea/tradehandler.cpp:236
+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:241
+#, fuzzy
+msgid "Failed adding item. You can't trade this item."
+msgstr "Neuspješno dodavanje predmeta. Trgovinski partner je preopterećen."
+
+#: src/net/ea/tradehandler.cpp:245
+msgid "Failed adding item for unknown reason."
+msgstr "Neuspješno dodavanje predmeta, iz nepoznatog razloga."
+
+#: src/net/ea/tradehandler.cpp:264 src/net/manaserv/tradehandler.cpp:160
+msgid "Trade canceled."
+msgstr "Otkazano trgovanje."
+
+#: src/net/ea/tradehandler.cpp:275 src/net/manaserv/tradehandler.cpp:167
+msgid "Trade completed."
+msgstr "Trgovanje je završeno."
+
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
+msgid "Strength"
+msgstr "Snaga"
+
+#: src/net/manaserv/attributes.cpp:167
+#, fuzzy, c-format
+msgid "Strength %+.1f"
+msgstr "Snaga %+d"
+
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
+msgid "Agility"
+msgstr "Okretnost"
+
+#: src/net/manaserv/attributes.cpp:180
+#, fuzzy, c-format
+msgid "Agility %+.1f"
+msgstr "Okretnost %+d"
+
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
+msgid "Dexterity"
+msgstr "Spretnost"
+
+#: src/net/manaserv/attributes.cpp:193
+#, fuzzy, c-format
+msgid "Dexterity %+.1f"
+msgstr "Spretnost %+d"
+
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
+msgid "Vitality"
+msgstr "Vitalnost"
+
+#: src/net/manaserv/attributes.cpp:206
+#, fuzzy, c-format
+msgid "Vitality %+.1f"
+msgstr "Vitalnost %+d"
+
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
+msgid "Intelligence"
+msgstr "Inteligencija"
+
+#: src/net/manaserv/attributes.cpp:219
+#, fuzzy, c-format
+msgid "Intelligence %+.1f"
+msgstr "Inteligencija %+d"
+
+#: src/net/manaserv/attributes.cpp:225
+#, fuzzy
+msgid "Willpower"
+msgstr "Snaga volje:"
+
+#: src/net/manaserv/attributes.cpp:232
+#, fuzzy, c-format
+msgid "Willpower %+.1f"
+msgstr "Snaga Volje %+d"
+
 #: src/net/manaserv/beinghandler.cpp:337
 msgid "Press OK to respawn."
 msgstr ""
@@ -4680,17 +5462,6 @@ msgstr ""
 msgid "Invalid slot number."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
-#: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
-#: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
-#, fuzzy
-msgid "Unknown error."
-msgstr "Nepoznata greška"
-
-#: src/net/manaserv/charhandler.cpp:210
-msgid "Info"
-msgstr "Info"
-
 #: src/net/manaserv/charhandler.cpp:210
 #, fuzzy
 msgid "Player deleted."
@@ -4760,10 +5531,6 @@ msgstr ""
 msgid "Unknown channel event."
 msgstr "Nepoznata naredba."
 
-#: src/net/manaserv/guildhandler.cpp:85
-msgid "Guild created."
-msgstr "Ceh, ustanovljen."
-
 #: src/net/manaserv/guildhandler.cpp:90
 msgid "Error creating guild."
 msgstr "Pogreška pri ustanovljavanju ceha."
@@ -4800,11 +5567,6 @@ msgstr "Račun je istekao"
 msgid "New password incorrect."
 msgstr "Nova lozinka je netočna"
 
-#: src/net/manaserv/loginhandler.cpp:127
-#, fuzzy
-msgid "Old password incorrect."
-msgstr "Stara lozinka je netočna"
-
 #: src/net/manaserv/loginhandler.cpp:131 src/net/manaserv/loginhandler.cpp:163
 msgid "Account not connected. Please login first."
 msgstr "Račun nije priključen. Molimo prvo se prijavite."
@@ -4889,24 +5651,11 @@ msgstr "Prihvaćanje dolaznih zahtjeva za trgovanje."
 msgid "Ignoring incoming trade requests."
 msgstr "Ignoriranje nadolazećih zahtjeva za trgovanje."
 
-#: src/net/manaserv/tradehandler.cpp:128
-#, 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:146
 #, c-format
 msgid "Trading with %s"
 msgstr "Trgovanje s %s"
 
-#: src/net/manaserv/tradehandler.cpp:160
-msgid "Trade canceled."
-msgstr "Otkazano trgovanje."
-
-#: src/net/manaserv/tradehandler.cpp:167
-msgid "Trade completed."
-msgstr "Trgovanje je završeno."
-
 #: src/net/tmwa/adminhandler.cpp:70
 msgid "Kick failed!"
 msgstr "Šut nije uspio!"
@@ -5116,413 +5865,8 @@ msgid "Unknown item"
 msgstr "Nepoznati predmet"
 
 #, fuzzy
-#~ msgid "Cannot use this ID."
-#~ msgstr "Ne mogu koristiti ovaj ID"
-
-#, fuzzy
-#~ msgid "Unknown char-server failure."
-#~ msgstr "Nepoznata greška"
-
-#~ msgid "Failed to create character. Most likely the name is already taken."
-#~ msgstr "Ne mogu stvoriti lik. Najvjerojatnije je ime već zauzeto."
-
-#, fuzzy
-#~ msgid "Wrong name."
-#~ msgstr "Pogrešan magični_simbol"
-
-#~ msgid "Character deleted."
-#~ msgstr "Lik izbrisan."
-
-#~ msgid "Failed to delete character."
-#~ msgstr "Neuspješno brisanje znaka."
-
-#~ msgid "Strength:"
-#~ msgstr "Snaga:"
-
-#~ msgid "Agility:"
-#~ msgstr "Okretnost:"
-
-#~ msgid "Vitality:"
-#~ msgstr "Vitalnost:"
-
-#~ msgid "Intelligence:"
-#~ msgstr "Inteligencija:"
-
-#~ msgid "Dexterity:"
-#~ msgstr "Spretnost:"
-
-#~ msgid "Luck:"
-#~ msgstr "Sreća:"
-
-#, fuzzy
-#~ msgid "Whisper could not be sent, %s is offline."
-#~ msgstr "Šapat nije mogao biti poslan, korisnik je offline."
-
-#, fuzzy
-#~ msgid "Whisper could not be sent, ignored by %s."
-#~ msgstr "Šapat nije mogao biti poslan, ignorirani ste od strane korisnika."
-
-#, fuzzy
-#~ msgid "MVP player."
-#~ msgstr "Igrač"
-
-#, fuzzy
-#~ msgid "MVP player: "
-#~ msgstr "Igrač"
-
-#~ msgid "Channels are not supported!"
-#~ msgstr "Kanali nisu podržani!"
-
-#, fuzzy
-#~ msgid "Game"
-#~ msgstr "Ime"
-
-#, fuzzy
-#~ msgid "Request to quit denied!"
-#~ msgstr "Zahtjev za Trgovanje"
-
-#~ msgid "/help > Display this help."
-#~ msgstr "/help > Prikaži ovu pomoć."
-
-#, fuzzy
-#~ msgid "/invite > Invite a player to your guild"
-#~ msgstr "/invite > Pozovite igrače na vašu partiju"
-
-#, fuzzy
-#~ msgid "/leave > Leave the guild you are in"
-#~ msgstr "/leave > Napustite partiju u kojoj ste"
-
-#, fuzzy
-#~ msgid "/kick > Kick some one from the guild you are in"
-#~ msgstr "/kick > Šutnite nekog iz partije u kojoj ste"
-
-#~ msgid "Command: /invite <nick>"
-#~ msgstr "Naredba: /invite <nick>"
-
-#, fuzzy
-#~ msgid "This command invites <nick> to the guild you're in."
-#~ msgstr "Ova naredba poziva <nick> na partiju sa vama."
-
-#~ msgid "Command: /leave"
-#~ msgstr "Naredba: /leave"
-
-#, fuzzy
-#~ msgid "This command causes the player to leave the guild."
-#~ msgstr "Ova naredba postavlja temu za <message>."
-
-#, fuzzy
-#~ msgid "You are already in guild."
-#~ msgstr "Pogreška pri ustanovljavanju ceha."
-
-#, fuzzy
-#~ msgid "Unknown server response."
-#~ msgstr "Nepoznata greška"
-
-#, fuzzy
-#~ msgid "Guild name: %s"
-#~ msgstr "Ceh"
-
-#, fuzzy
-#~ msgid "Guild master: %s"
-#~ msgstr "Ceh"
-
-#, fuzzy
-#~ msgid "Guild level: %d"
-#~ msgstr "Nivo: %d"
-
-#, fuzzy
-#~ msgid "Average level: %d"
-#~ msgstr "Najviša razina"
-
-#, fuzzy
-#~ msgid "Guild exp: %d"
-#~ msgstr "Ceh"
-
-#, fuzzy
-#~ msgid "Guild next exp: %d"
-#~ msgstr "Ceh, ustanovljen."
-
-#, fuzzy
-#~ msgid "Guild castle: %s"
-#~ msgstr "Ceh, ustanovljen."
-
-#, fuzzy
-#~ msgid "User is now part of your guild."
-#~ msgstr "%s je sada član vaše partije."
-
-#, fuzzy
-#~ msgid "You have left the guild."
-#~ msgstr "Napustili ste partiju."
-
-#, fuzzy
-#~ msgid "%s has left your guild."
-#~ msgstr "%s je napustio/la vašu partiju."
-
-#, fuzzy
-#~ msgid "%s has kicked from your guild."
-#~ msgstr "%s je sada član vaše partije."
-
-#~ msgid "/invite > Invite a player to your party"
-#~ msgstr "/invite > Pozovite igrače na vašu partiju"
-
-#~ msgid "/leave > Leave the party you are in"
-#~ msgstr "/leave > Napustite partiju u kojoj ste"
-
-#~ msgid "/kick > Kick some one from the party you are in"
-#~ msgstr "/kick > Šutnite nekog iz partije u kojoj ste"
-
-#~ msgid "This command invites <nick> to party with you."
-#~ msgstr "Ova naredba poziva <nick> na partiju sa vama."
-
-#~ msgid "Command: /item <policy>"
-#~ msgstr "Naredba: /item <policy>"
-
-#~ msgid "This command changes the party's item sharing policy."
-#~ msgstr ""
-#~ "Ova naredba mijenja politiku korištenja zajedničkih predmete u partiji."
-
-#~ msgid "Command: /item"
-#~ msgstr "Naredba: /item"
-
-#~ msgid "Command: /exp <policy>"
-#~ msgstr "Naredba: /exp <policy>"
-
-#~ msgid "Command: /exp"
-#~ msgstr "Naredba: /exp"
-
-#~ msgid "Item sharing enabled."
-#~ msgstr "Dijeljenje predmeta je omogućeno.moguće."
-
-#~ msgid "Item sharing disabled."
-#~ msgstr "Dijeljenje predmeta je onemogućeno."
-
-#~ msgid "Item sharing not possible."
-#~ msgstr "Dijeljenje predmeta nije moguće."
-
-#, fuzzy
-#~ msgid "Item sharing unknown."
-#~ msgstr "Dijeljenje predmeta je omogućeno.moguće."
-
-#~ msgid "Failed to use item."
-#~ msgstr "Neuspješno korištenje predmeta."
-
-#~ msgid "Unable to equip."
-#~ msgstr "Nije moguće opremiti."
-
-#~ msgid "Account was not found. Please re-login."
-#~ msgstr "Račun nije pronađen. Molimo, ponovno se prijavite."
-
-#, fuzzy
-#~ msgid "New password too short."
-#~ msgstr "Nova lozinka je prekratka"
-
-#, fuzzy
-#~ msgid "Unregistered ID."
-#~ msgstr "Neregistriran ID"
-
-#, fuzzy
-#~ msgid "Wrong password."
-#~ msgstr "Pogrešna lozinka"
-
-#, fuzzy
-#~ msgid "Account expired."
-#~ msgstr "Račun je istekao"
-
-#, fuzzy
-#~ msgid "Rejected from server."
-#~ msgstr "Odbijeno od poslužitelja"
-
-#, fuzzy
-#~ msgid "Client too old."
-#~ msgstr "Verzija klijenta je prestara"
-
-#, fuzzy
-#~ msgid "This user name is already taken."
-#~ msgstr "Ovo korisničko ime je već zauzeto"
-
-#, fuzzy
-#~ msgid "Username permanently erased."
-#~ msgstr "Korisničko ime već postoji"
-
-#~ msgid "Could not create party."
-#~ msgstr "Nije se mogla napraviti partija."
-
-#~ msgid "Party successfully created."
-#~ msgstr "Partija je uspješno kreirana."
-
-#, fuzzy
-#~ msgid "%s has joined your party."
-#~ msgstr "%s je napustio/la vašu partiju."
-
-#~ msgid "%s is already a member of a party."
-#~ msgstr "%s je već član partije."
-
-#~ msgid "%s refused your invitation."
-#~ msgstr "%s je odbio vašu pozivnicu."
-
-#~ msgid "%s is now a member of your party."
-#~ msgstr "%s je sada član vaše partije."
-
-#~ msgid "You have left the party."
-#~ msgstr "Napustili ste partiju."
-
-#~ msgid "%s has left your party."
-#~ msgstr "%s je napustio/la vašu partiju."
-
-#~ msgid "An unknown member tried to say: %s"
-#~ msgstr "Nepoznati član pokušava reći: %s"
-
-#~ msgid "Insert coin to continue."
-#~ msgstr "Ubacite žeton za nastavak."
-
-#~ msgid "You're not dead yet. You're just resting."
-#~ msgstr "Niste još mrtvi. Samo se odmarate."
-
-#~ msgid "You are no more."
-#~ msgstr "Nema vas više."
-
-#~ msgid "You have ceased to be."
-#~ msgstr "Prestali ste postojati."
-
-#~ msgid "You've expired and gone to meet your maker."
-#~ msgstr "Istekao vam je rok i otišli ste upoznati svog stvoritelja."
-
-#~ msgid "You're a stiff."
-#~ msgstr "Ukočili ste se."
-
-#~ msgid "Bereft of life, you rest in peace."
-#~ msgstr "Lišeni života, počivate u miru."
-
-#~ 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."
-
-#~ msgid "Your metabolic processes are now history."
-#~ msgstr "Vaši metabolički procesi su sad povijest."
-
-#~ msgid "You're off the twig."
-#~ msgstr "Pali ste s grančice."
-
-#~ msgid "You've kicked the bucket."
-#~ msgstr "Vi ste šutirali sić."
-
-#~ msgid "You are an ex-player."
-#~ msgstr "Vi ste bivši igrač."
-
-#~ msgid "Message"
-#~ msgstr "Poruka"
-
-#~ 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."
-
-#, fuzzy
-#~ msgid "You are carrying less than half your weight. You can regain health."
-#~ msgstr ""
-#~ "Nosite više od pola svoje težine. Niste u mogućnosti kako bi povratili "
-#~ "zdravlje."
-
-#, fuzzy
-#~ msgid "You picked up %s."
-#~ msgstr "Pokupili ste "
-
-#, fuzzy
-#~ msgid "You spent %s."
-#~ msgstr "Vi dobijete %s."
-
-#~ msgid "Equip arrows first."
-#~ msgstr "Prvo se opremite strijelama."
-
-#~ msgid "Trade failed!"
-#~ msgstr "Neuspjela razmjena!"
-
-#~ msgid "Emote failed!"
-#~ msgstr "Neuspjelo korištenje emotea!"
-
-#~ msgid "Sit failed!"
-#~ msgstr "Neuspjelo sjedanje!"
-
-#~ msgid "Chat creating failed!"
-#~ msgstr "Neuspjelo stvaranje lika!"
-
-#~ msgid "Could not join party!"
-#~ msgstr "Neuspjelo priključivanje družini!"
-
-#~ msgid "Cannot shout!"
-#~ msgstr "Neuspjelo vikanje!"
-
-#~ msgid "You have not yet reached a high enough lvl!"
-#~ msgstr "Još nisi dosegao/la dovoljno visok nivo!"
-
-#~ msgid "Insufficient HP!"
-#~ msgstr "Nedovoljno zdravlja!"
-
-#~ msgid "Insufficient SP!"
-#~ msgstr "Nedovoljno SP-a!"
-
-#~ msgid "You have no memos!"
-#~ msgstr "Nemaš podsjetnika!"
-
-#~ msgid "You cannot do that right now!"
-#~ msgstr "Ne možeš to učiniti sad!"
-
-#~ msgid "Seems you need more money... ;-)"
-#~ msgstr "Čini se da trebate više novca... ;-)"
-
-#~ msgid "You cannot use this skill with that kind of weapon!"
-#~ msgstr "Ne možeš koristiti tu vještinu s tim oružjem!"
-
-#~ msgid "You need another red gem!"
-#~ msgstr "Trebaš još jedan crveni dragulj!"
-
-#~ msgid "You need another blue gem!"
-#~ msgstr "Trebaš još jedan plavi dragulj!"
-
-#~ msgid "You're carrying to much to do this!"
-#~ msgstr "Nosiš previše predmeta da bi učinio to!"
-
-#~ msgid "Huh? What's that?"
-#~ msgstr "Ha? Što je to?"
-
-#~ msgid "Warp failed..."
-#~ msgstr "Skok nije uspio..."
-
-#~ msgid "Could not steal anything..."
-#~ msgstr "Krađa nije uspjela..."
-
-#~ msgid "Poison had no effect..."
-#~ msgstr "Otrov nije uspio..."
-
-#~ msgid "Trading isn't possible. Trade partner is too far away."
-#~ msgstr "Trgovanje nije moguće. Trgovački partner je predaleko."
-
-#~ msgid "Trading isn't possible. Character doesn't exist."
-#~ msgstr "Trgovanje nije moguće. Lik ne postoji."
-
-#~ msgid "Trade cancelled due to an unknown reason."
-#~ msgstr "Trgovanje otkazano zbog nepoznatih razloga."
-
-#~ msgid "Trade: You and %s"
-#~ msgstr "Trgujte: Vi i %s"
-
-#~ msgid "Trade with %s cancelled."
-#~ msgstr "Trgovanje s %s otkazano."
-
-#~ msgid "Failed adding item. Trade partner is over weighted."
-#~ msgstr "Neuspješno dodavanje predmeta. Trgovinski partner je preopterećen."
-
-#~ msgid "Failed adding item. Trade partner has no free slot."
-#~ msgstr ""
-#~ "Neuspješno dodavanje predmeta. Trgovinski partner nema slobodnog prostora."
-
-#, fuzzy
-#~ msgid "Failed adding item. You can't trade this item."
-#~ msgstr "Neuspješno dodavanje predmeta. Trgovinski partner je preopterećen."
-
-#~ msgid "Failed adding item for unknown reason."
-#~ msgstr "Neuspješno dodavanje predmeta, iz nepoznatog razloga."
+#~ msgid "Enable opacity cache"
+#~ msgstr "Omogući igraću palicu"
 
 #, fuzzy
 #~ msgid "Level: "
diff --git a/po/hu.po b/po/hu.po
index 97331ec07..6ce8af09d 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-08 04:26+0300\n"
+"POT-Creation-Date: 2011-08-10 01:11+0300\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"
@@ -24,26 +24,26 @@ msgstr ""
 msgid "Visible on map"
 msgstr "Látható nevek"
 
-#: src/being.cpp:541
+#: src/being.cpp:542
 msgid "dodge"
 msgstr ""
 
-#: src/being.cpp:541
+#: src/being.cpp:542
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1513
+#: src/being.cpp:1514
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1518
+#: src/being.cpp:1519
 #, fuzzy
 msgid "I"
 msgstr "Is"
 
-#: src/client.cpp:825 src/gui/setup.cpp:51 src/gui/windowmenu.cpp:100
+#: src/client.cpp:825 src/gui/setup.cpp:53 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Beállítások"
 
@@ -80,7 +80,8 @@ msgstr "Szerver"
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
-#: src/gui/unregisterdialog.cpp:137 src/net/manaserv/charhandler.cpp:184
+#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
+#: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "Hiba"
@@ -158,7 +159,7 @@ msgstr ""
 msgid "Requesting to join channel %s."
 msgstr "Kapcsolódási kérelem a %s nevű csatornába."
 
-#: src/commandhandler.cpp:445
+#: src/commandhandler.cpp:445 src/net/ea/gui/partytab.cpp:125
 msgid "Party name is missing."
 msgstr "A csapatnév hiányzik."
 
@@ -385,37 +386,37 @@ msgstr ""
 msgid "Comment: %s"
 msgstr "Parancs: /list"
 
-#: src/gui/botcheckerwindow.cpp:265
+#: src/gui/botcheckerwindow.cpp:266
 #, fuzzy
 msgid "Bot Checker"
 msgstr "Chat Ablak"
 
-#: src/gui/botcheckerwindow.cpp:295 src/gui/setup_players.cpp:64
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
 msgid "Name"
 msgstr "Név"
 
-#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:130
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:130
 #: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:604
 #: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
 msgid "Attack"
 msgstr "Támadás"
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:275
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:275
 #: src/keyboardconfig.cpp:62
 msgid "Talk"
 msgstr "Csevegés"
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:241
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:241
 #: src/gui/popupmenu.cpp:280 src/gui/popupmenu.cpp:661
 #, fuzzy
 msgid "Move"
 msgstr "Mozgás felfelé"
 
-#: src/gui/botcheckerwindow.cpp:299
+#: src/gui/botcheckerwindow.cpp:300
 msgid "Result"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:309 src/gui/npcdialog.cpp:123
+#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:123
 msgid "Reset"
 msgstr "Alaphelyzet"
 
@@ -484,8 +485,8 @@ msgstr "Eladás"
 #: src/gui/popupmenu.cpp:1731 src/gui/popupmenu.cpp:1774
 #: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1849
 #: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1935
-#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:68
-#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:237
+#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:70
+#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:238
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
 #: src/gui/updatewindow.cpp:157
 msgid "Cancel"
@@ -663,8 +664,8 @@ msgid "Enter password:"
 msgstr "Hibás jelszó"
 
 #: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
-#: src/gui/setup_players.cpp:251 src/gui/shopwindow.cpp:120
-#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:240
+#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120
+#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:241
 msgid "Delete"
 msgstr "Törlés"
 
@@ -749,10 +750,10 @@ msgid "rainbow 3"
 msgstr "Szivárvány"
 
 #: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
-#: src/gui/logindialog.cpp:78 src/gui/setup_players.cpp:220
-#: src/gui/setup_theme.cpp:71 src/gui/setup_theme.cpp:125
-#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:101
-#: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:159
+#: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
+#: src/gui/setup_theme.cpp:72 src/gui/setup_theme.cpp:126
+#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
+#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
 msgid "???"
 msgstr "???"
 
@@ -962,7 +963,7 @@ msgstr "Következő"
 msgid "Auto open this window"
 msgstr ""
 
-#: src/gui/editdialog.cpp:46 src/gui/itemamountwindow.cpp:208
+#: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
 #: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "Ok"
@@ -1050,7 +1051,7 @@ msgstr "Súly:"
 
 #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
 #: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1724
-#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:69
+#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:71
 msgid "Store"
 msgstr "Raktároz"
 
@@ -1110,94 +1111,94 @@ msgstr ""
 msgid "Weight: %s"
 msgstr "Súly: "
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
+#: src/gui/killstats.cpp:46 src/gui/windowmenu.cpp:69
 #, fuzzy
 msgid "Kill stats"
 msgstr "Sztátusz Ablak"
 
-#: src/gui/killstats.cpp:63
+#: src/gui/killstats.cpp:64
 #, fuzzy
 msgid "Reset stats"
 msgstr "Alaphelyzet"
 
-#: src/gui/killstats.cpp:64
+#: src/gui/killstats.cpp:65
 #, fuzzy
 msgid "Reset timer"
 msgstr "Alaphelyzet"
 
-#: src/gui/killstats.cpp:68 src/gui/killstats.cpp:204
+#: src/gui/killstats.cpp:69 src/gui/killstats.cpp:205
 #, fuzzy, c-format
 msgid "Level: %d at %f%%"
 msgstr "Szint: %d"
 
-#: src/gui/killstats.cpp:72 src/gui/killstats.cpp:209
+#: src/gui/killstats.cpp:73 src/gui/killstats.cpp:210
 #, c-format
 msgid "Exp: %d/%d Left: %d"
 msgstr ""
 
-#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:215
-#: src/gui/killstats.cpp:224
+#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:216
+#: src/gui/killstats.cpp:225
 #, c-format
 msgid "1%% = %d exp, avg mob for 1%%: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:141
-#: src/gui/killstats.cpp:233
+#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:142
+#: src/gui/killstats.cpp:234
 #, fuzzy, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr "Ár: %s / Teljes: %s"
 
-#: src/gui/killstats.cpp:80 src/gui/killstats.cpp:143
-#: src/gui/killstats.cpp:219 src/gui/killstats.cpp:229
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
+#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:230
 #, c-format
 msgid "Avg Exp: %s, No. of avg mob to next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:161
-#: src/gui/killstats.cpp:236
+#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:162
+#: src/gui/killstats.cpp:237
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:88 src/gui/killstats.cpp:93
-#: src/gui/killstats.cpp:288 src/gui/killstats.cpp:304
-#: src/gui/killstats.cpp:322
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:89 src/gui/killstats.cpp:94
+#: src/gui/killstats.cpp:289 src/gui/killstats.cpp:305
+#: src/gui/killstats.cpp:323
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
+#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/gui/killstats.cpp:99 src/gui/killstats.cpp:240
+#: src/gui/killstats.cpp:100 src/gui/killstats.cpp:241
 msgid "Last kill exp:"
 msgstr ""
 
-#: src/gui/killstats.cpp:101 src/gui/killstats.cpp:354
-#: src/gui/killstats.cpp:360 src/gui/killstats.cpp:366
-#: src/gui/killstats.cpp:371
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:355
+#: src/gui/killstats.cpp:361 src/gui/killstats.cpp:367
+#: src/gui/killstats.cpp:372
 msgid "Time before jacko spawn:"
 msgstr ""
 
-#: src/gui/killstats.cpp:293 src/gui/killstats.cpp:300
-#: src/gui/killstats.cpp:310 src/gui/killstats.cpp:317
-#: src/gui/killstats.cpp:329 src/gui/killstats.cpp:336
+#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:301
+#: src/gui/killstats.cpp:311 src/gui/killstats.cpp:318
+#: src/gui/killstats.cpp:330 src/gui/killstats.cpp:337
 #, c-format
 msgid "  Time for next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:360
+#: src/gui/killstats.cpp:361
 #, c-format
 msgid "%s %d?"
 msgstr ""
 
-#: src/gui/killstats.cpp:366
+#: src/gui/killstats.cpp:367
 msgid "jacko spawning"
 msgstr ""
 
@@ -1925,38 +1926,42 @@ msgid "Tabs"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:96
+msgid "Put all whispers in tabs"
+msgstr "Privátok fülekbe tétele"
+
+#: src/gui/setup_chat.cpp:99
 msgid "Log magic messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:99
+#: src/gui/setup_chat.cpp:102
 msgid "Show server messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:102
+#: src/gui/setup_chat.cpp:105
 #, fuzzy
 msgid "Enable trade tab"
 msgstr "Nem tudod megvenni."
 
-#: src/gui/setup_chat.cpp:105
+#: src/gui/setup_chat.cpp:108
 #, fuzzy
 msgid "Enable battle tab"
 msgstr "Nem tudod megvenni."
 
-#: src/gui/setup_chat.cpp:108
+#: src/gui/setup_chat.cpp:111
 #, fuzzy
 msgid "Show battle events"
 msgstr "A név mutatása"
 
-#: src/gui/setup_chat.cpp:111
+#: src/gui/setup_chat.cpp:114
 #, fuzzy
 msgid "Resize chat tabs if need"
 msgstr "Következő Chat Fül"
 
-#: src/gui/setup_chat.cpp:115
+#: src/gui/setup_chat.cpp:118
 msgid "Time"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:117
+#: src/gui/setup_chat.cpp:120
 msgid "Use local time"
 msgstr ""
 
@@ -2012,16 +2017,15 @@ msgstr "Kék: "
 msgid "Alpha:"
 msgstr ""
 
-#: src/gui/setup.cpp:67
+#: src/gui/setup.cpp:69
 msgid "Apply"
 msgstr "Alkalmaz"
 
-#: src/gui/setup.cpp:70
+#: src/gui/setup.cpp:72
 msgid "Reset Windows"
 msgstr "Ablakok alaphelyzetbe"
 
 #: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
-#: src/gui/setup_players.cpp:334
 msgid "Edit"
 msgstr ""
 
@@ -2244,162 +2248,218 @@ msgstr ""
 msgid "Show background"
 msgstr "Háttér"
 
-#: src/gui/setup_players.cpp:65
-msgid "Relation"
-msgstr "Kapcsolat"
+#: src/gui/setup_perfomance.cpp:48
+msgid "Perfomance"
+msgstr ""
 
-#: src/gui/setup_players.cpp:70
-msgid "Neutral"
-msgstr "Semleges"
+#: src/gui/setup_perfomance.cpp:55
+msgid "Better perfomance (enable for better perfomance)"
+msgstr ""
 
-#: src/gui/setup_players.cpp:71
-msgid "Friend"
-msgstr "Barát"
+#: src/gui/setup_perfomance.cpp:58
+msgid "Auto adjust perfomance"
+msgstr ""
 
-#: src/gui/setup_players.cpp:72
-msgid "Disregarded"
-msgstr "Semmibevett"
+#: src/gui/setup_perfomance.cpp:61
+msgid "Show beings transparency"
+msgstr ""
 
-#: src/gui/setup_players.cpp:73
-msgid "Ignored"
-msgstr "Tiltott"
+#: src/gui/setup_perfomance.cpp:64
+#, fuzzy
+msgid "Hw acceleration"
+msgstr "Kapcsolat"
 
-#: src/gui/setup_players.cpp:74
-msgid "Erased"
+#: src/gui/setup_perfomance.cpp:67
+msgid "Enable opacity cache (Software, can use many memory)"
 msgstr ""
 
-#: src/gui/setup_players.cpp:247
-msgid "Allow trading"
-msgstr "Üzletelés engedélyezése"
-
-#: src/gui/setup_players.cpp:249
-msgid "Allow whispers"
-msgstr "Privát engedélyezése"
+#: src/gui/setup_perfomance.cpp:70
+#, fuzzy
+msgid "Enable map reduce (Software)"
+msgstr "Joystick engedélyezése"
 
-#: src/gui/setup_players.cpp:252
-msgid "Old"
+#: src/gui/setup_perfomance.cpp:73
+msgid "Better quality (disable for better perfomance)"
 msgstr ""
 
-#: src/gui/setup_players.cpp:254
-msgid "Put all whispers in tabs"
-msgstr "Privátok fülekbe tétele"
+#: src/gui/setup_perfomance.cpp:76
+msgid "Enable alpha channel fix (Software, can be very slow)"
+msgstr ""
 
-#: src/gui/setup_players.cpp:257
+#: src/gui/setup_perfomance.cpp:80
 #, fuzzy
-msgid "Show gender"
-msgstr "A név mutatása"
+msgid "Enable reorder sprites."
+msgstr "Nem tudod megvenni."
+
+#: src/gui/setup_perfomance.cpp:83
+msgid "Small memory (enable for lower memory usage)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:86
+msgid "Disable advanced beings caching (Software)"
+msgstr ""
 
-#: src/gui/setup_players.cpp:267
+#: src/gui/setup_perfomance.cpp:89
+msgid "Disable beings caching (Software)"
+msgstr ""
+
+#: src/gui/setup_players.cpp:48
 msgid "Players"
 msgstr "Játékosok"
 
-#: src/gui/setup_players.cpp:292
-msgid "When ignoring:"
-msgstr "Ha ignorolva van:"
+#: src/gui/setup_players.cpp:54
+#, fuzzy
+msgid "Show gender"
+msgstr "A név mutatása"
 
-#: src/gui/setup_players.cpp:315
+#: src/gui/setup_players.cpp:57
 #, fuzzy
 msgid "Show level"
 msgstr "A név mutatása"
 
-#: src/gui/setup_players.cpp:319
+#: src/gui/setup_players.cpp:60
 #, fuzzy
 msgid "Show own name"
 msgstr "A név mutatása"
 
-#: src/gui/setup_players.cpp:323
+#: src/gui/setup_players.cpp:63
 #, fuzzy
 msgid "Target dead players"
 msgstr "Játékost Kijelöl"
 
-#: src/gui/setup_players.cpp:327
+#: src/gui/setup_players.cpp:66
+msgid "Visible names"
+msgstr "Látható nevek"
+
+#: src/gui/setup_players.cpp:69
 #, fuzzy
 msgid "Secure trades"
 msgstr "Üzlet elfogadása"
 
-#: src/gui/setup_players.cpp:331 src/gui/setup_players.cpp:523
+#: src/gui/setup_players.cpp:72
 msgid "Unsecure chars in names"
 msgstr ""
 
-#: src/gui/setup_players.cpp:336
-msgid "Visible names"
-msgstr "Látható nevek"
-
-#: src/gui/setup_players.cpp:341
+#: src/gui/setup_players.cpp:75
 #, fuzzy
 msgid "Show statuses"
 msgstr "A név mutatása"
 
-#: src/gui/setup_theme.cpp:105
+#: src/gui/setup_relations.cpp:65
+msgid "Relation"
+msgstr "Kapcsolat"
+
+#: src/gui/setup_relations.cpp:70
+msgid "Neutral"
+msgstr "Semleges"
+
+#: src/gui/setup_relations.cpp:71
+msgid "Friend"
+msgstr "Barát"
+
+#: src/gui/setup_relations.cpp:72
+msgid "Disregarded"
+msgstr "Semmibevett"
+
+#: src/gui/setup_relations.cpp:73
+msgid "Ignored"
+msgstr "Tiltott"
+
+#: src/gui/setup_relations.cpp:74
+msgid "Erased"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:239
+msgid "Allow trading"
+msgstr "Üzletelés engedélyezése"
+
+#: src/gui/setup_relations.cpp:241
+msgid "Allow whispers"
+msgstr "Privát engedélyezése"
+
+#: src/gui/setup_relations.cpp:244
+msgid "Old"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:246
+#, fuzzy
+msgid "Relations"
+msgstr "Kapcsolat"
+
+#: src/gui/setup_relations.cpp:271
+msgid "When ignoring:"
+msgstr "Ha ignorolva van:"
+
+#: src/gui/setup_theme.cpp:106
 #, fuzzy
 msgid "Tiny (10)"
 msgstr "Apró"
 
-#: src/gui/setup_theme.cpp:106
+#: src/gui/setup_theme.cpp:107
 #, fuzzy
 msgid "Small (11)"
 msgstr "Kicsi"
 
-#: src/gui/setup_theme.cpp:107
+#: src/gui/setup_theme.cpp:108
 #, fuzzy
 msgid "Medium (12)"
 msgstr "Közepes"
 
-#: src/gui/setup_theme.cpp:108
+#: src/gui/setup_theme.cpp:109
 #, fuzzy
 msgid "Large (13)"
 msgstr "Nagy"
 
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:110
 msgid "Big (14)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:111
 msgid "Huge (15)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:140
+#: src/gui/setup_theme.cpp:141
 msgid "Theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:142
+#: src/gui/setup_theme.cpp:143
 msgid "Gui theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:144
 msgid "Main Font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:144
+#: src/gui/setup_theme.cpp:145
 msgid "Bold font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:146
 #, fuzzy
 msgid "Particle font"
 msgstr "Effektek"
 
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:147
 #, fuzzy
 msgid "Help font"
 msgstr "Súgó"
 
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:148
 #, fuzzy
 msgid "Secure font"
 msgstr "Üzlet elfogadása"
 
-#: src/gui/setup_theme.cpp:175
+#: src/gui/setup_theme.cpp:176
 msgid "Font size"
 msgstr "Betűméret"
 
-#: src/gui/setup_theme.cpp:281
+#: src/gui/setup_theme.cpp:282
 #, fuzzy
 msgid "Theme Changed"
 msgstr "Változtatás"
 
-#: src/gui/setup_theme.cpp:282 src/gui/setup_video.cpp:670
-#: src/gui/setup_video.cpp:675
+#: src/gui/setup_theme.cpp:283 src/gui/setup_video.cpp:619
+#: src/gui/setup_video.cpp:624
 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."
 
@@ -2453,147 +2513,124 @@ msgstr "közepes"
 msgid "max"
 msgstr "max."
 
-#: src/gui/setup_video.cpp:293
+#: src/gui/setup_video.cpp:288
 msgid "Full screen"
 msgstr "Teljes képernyő"
 
-#: src/gui/setup_video.cpp:294
-#, fuzzy
-msgid "Hw acceleration"
-msgstr "Kapcsolat"
-
-#: src/gui/setup_video.cpp:295
+#: src/gui/setup_video.cpp:289
 msgid "Custom cursor"
 msgstr "Egyéni kurzor"
 
-#: src/gui/setup_video.cpp:297
+#: src/gui/setup_video.cpp:291
 msgid "Particle effects"
 msgstr "Játékbéli effektek"
 
-#: src/gui/setup_video.cpp:299
+#: src/gui/setup_video.cpp:293
 msgid "Show pickup notification"
 msgstr "Értesítés tárgy felvételkor"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:301
+#: src/gui/setup_video.cpp:295
 msgid "in chat"
 msgstr "Chat-en belül"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:303
+#: src/gui/setup_video.cpp:297
 msgid "as particle"
 msgstr "Karakter felett"
 
-#: src/gui/setup_video.cpp:305
-#, fuzzy
-msgid "Enable opacity cache"
-msgstr "Joystick engedélyezése"
-
-#: src/gui/setup_video.cpp:306
-#, fuzzy
-msgid "Enable map reduce"
-msgstr "Joystick engedélyezése"
-
-#: src/gui/setup_video.cpp:308
-msgid "Auto adjust perfomance"
-msgstr ""
-
-#: src/gui/setup_video.cpp:310
-msgid "Show beings transparency"
-msgstr ""
-
-#: src/gui/setup_video.cpp:315
+#: src/gui/setup_video.cpp:302
 #, fuzzy
 msgid "FPS limit:"
 msgstr "FPS Limit:"
 
-#: src/gui/setup_video.cpp:319 src/gui/setup_video.cpp:356
-#: src/gui/setup_video.cpp:607 src/gui/setup_video.cpp:760
+#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
+#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709
 #, fuzzy
 msgid "Alt FPS limit: "
 msgstr "FPS Limit:"
 
-#: src/gui/setup_video.cpp:328
+#: src/gui/setup_video.cpp:315
 msgid "Video"
 msgstr "Videó"
 
-#: src/gui/setup_video.cpp:334
+#: src/gui/setup_video.cpp:321
 msgid "Overhead text"
 msgstr "Fej feletti szöveg"
 
-#: src/gui/setup_video.cpp:335
+#: src/gui/setup_video.cpp:322
 msgid "Gui opacity"
 msgstr "Menük áttetszősége"
 
-#: src/gui/setup_video.cpp:336
+#: src/gui/setup_video.cpp:323
 msgid "Ambient FX"
 msgstr "Környezeti effektek"
 
-#: src/gui/setup_video.cpp:337
+#: src/gui/setup_video.cpp:324
 #, fuzzy
 msgid "Particle detail"
 msgstr "Effektek részletessége"
 
-#: src/gui/setup_video.cpp:354 src/gui/setup_video.cpp:357
-#: src/gui/setup_video.cpp:606 src/gui/setup_video.cpp:747
-#: src/gui/setup_video.cpp:758
+#: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
+#: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
+#: src/gui/setup_video.cpp:707
 #, fuzzy
 msgid "None"
 msgstr "Nem"
 
-#: src/gui/setup_video.cpp:511
+#: src/gui/setup_video.cpp:484
 #, 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:517
+#: src/gui/setup_video.cpp:490
 #, 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:528
+#: src/gui/setup_video.cpp:501
 #, fuzzy
 msgid "Switching to Full Screen"
 msgstr "Átállás teljes képernyőre"
 
-#: src/gui/setup_video.cpp:529
+#: src/gui/setup_video.cpp:502
 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:541
+#: src/gui/setup_video.cpp:514
 #, fuzzy
 msgid "Changing to OpenGL"
 msgstr "OpenGL átállítása"
 
-#: src/gui/setup_video.cpp:542
+#: src/gui/setup_video.cpp:515
 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:653
+#: src/gui/setup_video.cpp:602
 msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:654
+#: src/gui/setup_video.cpp:603
 msgid "Enter new resolution:                "
 msgstr ""
 
-#: src/gui/setup_video.cpp:669 src/gui/setup_video.cpp:674
+#: src/gui/setup_video.cpp:618 src/gui/setup_video.cpp:623
 #, fuzzy
 msgid "Screen Resolution Changed"
 msgstr "A képernyő felbontása megváltozott"
 
-#: src/gui/setup_video.cpp:672
+#: src/gui/setup_video.cpp:621
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:705
+#: src/gui/setup_video.cpp:654
 #, fuzzy
 msgid "Particle Effect Settings Changed."
 msgstr "Effektek beállítása megváltozott."
 
-#: src/gui/setup_video.cpp:706
+#: src/gui/setup_video.cpp:655
 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."
 
@@ -2622,7 +2659,8 @@ msgstr ""
 msgid "Show links in announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:723 src/net/manaserv/tradehandler.cpp:127
+#: src/gui/shopwindow.cpp:723 src/net/ea/tradehandler.cpp:106
+#: src/net/manaserv/tradehandler.cpp:127
 msgid "Request for Trade"
 msgstr "Üzleti ajánlat"
 
@@ -2664,7 +2702,7 @@ msgstr "Szint: %d"
 msgid "Lvl: %d (%+d)"
 msgstr "Szint: %d"
 
-#: src/gui/socialwindow.cpp:117
+#: src/gui/socialwindow.cpp:117 src/net/ea/gui/guildtab.cpp:52
 msgid "Guild"
 msgstr "Klán"
 
@@ -2697,7 +2735,7 @@ msgstr "Klán létrehozása"
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Biztos, hogy ki szeretne lépni?"
 
-#: src/gui/socialwindow.cpp:215
+#: src/gui/socialwindow.cpp:215 src/net/ea/gui/partytab.cpp:50
 msgid "Party"
 msgstr "Csapat"
 
@@ -2872,250 +2910,250 @@ msgstr "Válassz szervert"
 msgid "Specials"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:196
+#: src/gui/statuspopup.cpp:197
 msgid "(D) default moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:201
+#: src/gui/statuspopup.cpp:202
 msgid "(I) invert moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:206
+#: src/gui/statuspopup.cpp:207
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:211
+#: src/gui/statuspopup.cpp:212
 msgid "(C) moves with crazy moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:216
+#: src/gui/statuspopup.cpp:217
 msgid "(d) double normal + crazy"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:221
+#: src/gui/statuspopup.cpp:222
 msgid "(?) move"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:239
+#: src/gui/statuspopup.cpp:240
 msgid "(a) custom crazy move"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:243
+#: src/gui/statuspopup.cpp:244
 msgid "(?) crazy move"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:253
+#: src/gui/statuspopup.cpp:254
 msgid "(0) default moves to target"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:258
+#: src/gui/statuspopup.cpp:259
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:263
+#: src/gui/statuspopup.cpp:264
 #, fuzzy
 msgid "(2) moves to target in distance 2"
 msgstr "Mozgás balra"
 
-#: src/gui/statuspopup.cpp:268
+#: src/gui/statuspopup.cpp:269
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:273
+#: src/gui/statuspopup.cpp:274
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:278
+#: src/gui/statuspopup.cpp:279
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:283
+#: src/gui/statuspopup.cpp:284
 msgid "(A) moves to target in attack range"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:288
+#: src/gui/statuspopup.cpp:289
 #, fuzzy
 msgid "(?) move to target"
 msgstr "Mozgás balra"
 
-#: src/gui/statuspopup.cpp:296
+#: src/gui/statuspopup.cpp:297
 msgid "(D) default follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:300
+#: src/gui/statuspopup.cpp:301
 msgid "(R) relative follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:304
+#: src/gui/statuspopup.cpp:305
 msgid "(M) mirror follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:308
+#: src/gui/statuspopup.cpp:309
 msgid "(P) pet follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:312
+#: src/gui/statuspopup.cpp:313
 msgid "(?) unknown follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:321 src/gui/statuspopup.cpp:344
+#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345
 msgid "(D) default attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:326
+#: src/gui/statuspopup.cpp:327
 msgid "(s) switch attack without shield"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:331
+#: src/gui/statuspopup.cpp:332
 msgid "(S) switch attack with shield"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:335 src/gui/statuspopup.cpp:360
+#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
 #, fuzzy
 msgid "(?) attack"
 msgstr "Támadás"
 
-#: src/gui/statuspopup.cpp:348
+#: src/gui/statuspopup.cpp:349
 msgid "(G) go and attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:352
+#: src/gui/statuspopup.cpp:353
 msgid "(A) go, attack, pickup"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:356
+#: src/gui/statuspopup.cpp:357
 #, fuzzy
 msgid "(d) without auto attack"
 msgstr "Karakter változtatása"
 
-#: src/gui/statuspopup.cpp:374
+#: src/gui/statuspopup.cpp:375
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:378
+#: src/gui/statuspopup.cpp:379
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:382
+#: src/gui/statuspopup.cpp:383
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:386
+#: src/gui/statuspopup.cpp:387
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:390
+#: src/gui/statuspopup.cpp:391
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:394
+#: src/gui/statuspopup.cpp:395
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:398
+#: src/gui/statuspopup.cpp:399
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:402
+#: src/gui/statuspopup.cpp:403
 msgid "(?) pick up"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:411
+#: src/gui/statuspopup.cpp:412
 msgid "(N) normal map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:415
+#: src/gui/statuspopup.cpp:416
 msgid "(D) debug map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:419
+#: src/gui/statuspopup.cpp:420
 msgid "(u) ultra map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:423
+#: src/gui/statuspopup.cpp:424
 msgid "(U) ultra map view 2"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:427
+#: src/gui/statuspopup.cpp:428
 msgid "(e) empty map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:431
+#: src/gui/statuspopup.cpp:432
 msgid "(b) black & white map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:435
+#: src/gui/statuspopup.cpp:436
 msgid "(?) map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:443
+#: src/gui/statuspopup.cpp:444
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:448
+#: src/gui/statuspopup.cpp:449
 #, fuzzy
 msgid "(c) use #chiza for magic attack"
 msgstr "Karakter változtatása"
 
-#: src/gui/statuspopup.cpp:453
+#: src/gui/statuspopup.cpp:454
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:458
+#: src/gui/statuspopup.cpp:459
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:463
+#: src/gui/statuspopup.cpp:464
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:467
+#: src/gui/statuspopup.cpp:468
 #, fuzzy
 msgid "(?) magic attack"
 msgstr "Karakter változtatása"
 
-#: src/gui/statuspopup.cpp:476
+#: src/gui/statuspopup.cpp:477
 msgid "(D) default imitation"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:480
+#: src/gui/statuspopup.cpp:481
 msgid "(O) outfits imitation"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:484
+#: src/gui/statuspopup.cpp:485
 msgid "(?) imitation"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:493
+#: src/gui/statuspopup.cpp:494
 #, fuzzy
 msgid "(O) on keyboard"
 msgstr "Billentyűzet"
 
-#: src/gui/statuspopup.cpp:496
+#: src/gui/statuspopup.cpp:497
 msgid "(A) away"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:499 src/gui/statuspopup.cpp:519
+#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
 msgid "(?) away"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:507
+#: src/gui/statuspopup.cpp:508
 msgid "(G) game camera mode"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:511
+#: src/gui/statuspopup.cpp:512
 msgid "(F) free camera mode"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:515
+#: src/gui/statuspopup.cpp:516
 msgid "(D) design camera mode"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:526
+#: src/gui/statuspopup.cpp:527
 msgid "Game modifiers are disabled"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:531
+#: src/gui/statuspopup.cpp:532
 msgid "Game modifiers are enabled"
 msgstr ""
 
@@ -3294,99 +3332,99 @@ msgstr ""
 msgid "(O)"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:112
+#: src/gui/textcommandeditor.cpp:113
 #, fuzzy
 msgid "No Target"
 msgstr "Mozgás balra"
 
-#: src/gui/textcommandeditor.cpp:113
+#: src/gui/textcommandeditor.cpp:114
 #, fuzzy
 msgid "Allow Target"
 msgstr "Üzletelés engedélyezése"
 
-#: src/gui/textcommandeditor.cpp:114
+#: src/gui/textcommandeditor.cpp:115
 #, fuzzy
 msgid "Need Target"
 msgstr "Mozgás balra"
 
-#: src/gui/textcommandeditor.cpp:119
+#: src/gui/textcommandeditor.cpp:120
 #, fuzzy
 msgid "General Magic"
 msgstr "Általános"
 
-#: src/gui/textcommandeditor.cpp:120
+#: src/gui/textcommandeditor.cpp:121
 #, fuzzy
 msgid "Life Magic"
 msgstr "Mágia"
 
-#: src/gui/textcommandeditor.cpp:121
+#: src/gui/textcommandeditor.cpp:122
 #, fuzzy
 msgid "War Magic"
 msgstr "Mágia"
 
-#: src/gui/textcommandeditor.cpp:122
+#: src/gui/textcommandeditor.cpp:123
 msgid "Transmute Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:123
+#: src/gui/textcommandeditor.cpp:124
 msgid "Nature Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:124
+#: src/gui/textcommandeditor.cpp:125
 msgid "Astral Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:167
+#: src/gui/textcommandeditor.cpp:168
 #, fuzzy
 msgid "Command Editor"
 msgstr "Parancs: /item"
 
-#: src/gui/textcommandeditor.cpp:184
+#: src/gui/textcommandeditor.cpp:185
 #, fuzzy
 msgid "magic"
 msgstr "Mágia"
 
-#: src/gui/textcommandeditor.cpp:188
+#: src/gui/textcommandeditor.cpp:189
 msgid "other"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:193
+#: src/gui/textcommandeditor.cpp:194
 msgid "Symbol:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:196
+#: src/gui/textcommandeditor.cpp:197
 #, fuzzy
 msgid "Command:"
 msgstr "Parancs: /who"
 
-#: src/gui/textcommandeditor.cpp:199
+#: src/gui/textcommandeditor.cpp:200
 msgid "Mana:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:205
+#: src/gui/textcommandeditor.cpp:206
 #, fuzzy
 msgid "Target Type:"
 msgstr "Játékost Kijelöl"
 
-#: src/gui/textcommandeditor.cpp:211
+#: src/gui/textcommandeditor.cpp:212
 msgid "Icon:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:217
+#: src/gui/textcommandeditor.cpp:218
 #, fuzzy
 msgid "Magic level:"
 msgstr "Max. szint"
 
-#: src/gui/textcommandeditor.cpp:223
+#: src/gui/textcommandeditor.cpp:224
 msgid "Magic School:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:229
+#: src/gui/textcommandeditor.cpp:230
 #, fuzzy
 msgid "School level:"
 msgstr "A név mutatása"
 
-#: src/gui/textcommandeditor.cpp:234
+#: src/gui/textcommandeditor.cpp:235
 msgid "Save"
 msgstr ""
 
@@ -3635,23 +3673,23 @@ msgstr ""
 msgid "Road Point"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:470
+#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:471
 msgid "Who Is Online - Updating"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:100
+#: src/gui/whoisonline.cpp:101
 msgid "Update"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:293
+#: src/gui/whoisonline.cpp:294
 msgid "Who Is Online - "
 msgstr ""
 
-#: src/gui/whoisonline.cpp:484
+#: src/gui/whoisonline.cpp:485
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:515
+#: src/gui/whoisonline.cpp:516
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -3717,6 +3755,7 @@ msgstr ""
 "Ez a parancs a <név> alatt megadott személyt csatorna operátorrá teszi."
 
 #: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
+#: src/net/ea/gui/guildtab.cpp:69 src/net/ea/gui/partytab.cpp:85
 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. (\")."
@@ -4510,82 +4549,539 @@ msgstr "Öröm volt veled üzletet kötni!"
 msgid "Unable to buy."
 msgstr "Nem tudod megvenni."
 
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
-msgid "Strength"
-msgstr "Erő"
+#: src/net/ea/charserverhandler.cpp:63
+msgid "Strength:"
+msgstr "Erő:"
 
-#: src/net/manaserv/attributes.cpp:167
+#: src/net/ea/charserverhandler.cpp:64
+msgid "Agility:"
+msgstr "Mozgékonyság:"
+
+#: src/net/ea/charserverhandler.cpp:65
+msgid "Vitality:"
+msgstr "Egészség:"
+
+#: src/net/ea/charserverhandler.cpp:66
+msgid "Intelligence:"
+msgstr "Intelligencia:"
+
+#: src/net/ea/charserverhandler.cpp:67
+msgid "Dexterity:"
+msgstr "Ügyesség:"
+
+#: src/net/ea/charserverhandler.cpp:68
+msgid "Luck:"
+msgstr "Szerencse:"
+
+#: src/net/ea/charserverhandler.cpp:102
+msgid "Access denied. Most likely, there are too many players on this server."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:106
+#, fuzzy
+msgid "Cannot use this ID."
+msgstr "Nem használhatod ez a nevet."
+
+#: src/net/ea/charserverhandler.cpp:109
+#, fuzzy
+msgid "Unknown char-server failure."
+msgstr "Ismeretlen hiba"
+
+#: src/net/ea/charserverhandler.cpp:138
+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:142 src/net/ea/loginhandler.cpp:237
+#, fuzzy
+msgid "Wrong name."
+msgstr "Helytelen magic_token"
+
+#: src/net/ea/charserverhandler.cpp:145
+#, fuzzy
+msgid "Incorrect stats."
+msgstr "Hibás jelszó"
+
+#: src/net/ea/charserverhandler.cpp:148
+#, fuzzy
+msgid "Incorrect hair."
+msgstr "Hibás jelszó"
+
+#: src/net/ea/charserverhandler.cpp:151
+#, fuzzy
+msgid "Incorrect slot."
+msgstr "Hibás jelszó"
+
+#: src/net/ea/charserverhandler.cpp:166 src/net/manaserv/charhandler.cpp:210
+msgid "Info"
+msgstr "Infó"
+
+#: src/net/ea/charserverhandler.cpp:166
+msgid "Character deleted."
+msgstr "Karakter törölve."
+
+#: src/net/ea/charserverhandler.cpp:172
+msgid "Failed to delete character."
+msgstr "Karakter törlése sikertelen."
+
+#: src/net/ea/chathandler.cpp:60 src/net/ea/chathandler.cpp:66
+#: src/net/ea/chathandler.cpp:71 src/net/ea/chathandler.cpp:77
+#: src/net/ea/chathandler.cpp:82 src/net/ea/chathandler.cpp:88
+#: src/net/ea/chathandler.cpp:95 src/net/ea/chathandler.cpp:101
+msgid "Channels are not supported!"
+msgstr "A csatornák le vannak tiltva!"
+
+#: src/net/ea/chathandler.cpp:128
 #, fuzzy, c-format
-msgid "Strength %+.1f"
-msgstr "Erő %+d"
+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/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
-msgid "Agility"
-msgstr "Mozgékonyság"
+#: src/net/ea/chathandler.cpp:136
+#, 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/manaserv/attributes.cpp:180
+#: src/net/ea/chathandler.cpp:348
+#, fuzzy
+msgid "MVP player."
+msgstr "Játékos"
+
+#: src/net/ea/chathandler.cpp:352
+#, fuzzy
+msgid "MVP player: "
+msgstr "Játékos"
+
+#: src/net/ea/gamehandler.cpp:86
+#, c-format
+msgid "Online users: %d"
+msgstr ""
+
+#: src/net/ea/gamehandler.cpp:98
+#, fuzzy
+msgid "Game"
+msgstr "Név"
+
+#: src/net/ea/gamehandler.cpp:98
+#, fuzzy
+msgid "Request to quit denied!"
+msgstr "Üzleti ajánlat"
+
+#: src/net/ea/gui/guildtab.cpp:67 src/net/ea/gui/partytab.cpp:83
+msgid "Command: /invite <nick>"
+msgstr "Parancs: /invite <név>"
+
+#: src/net/ea/gui/guildtab.cpp:68
+#, 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:74 src/net/ea/gui/partytab.cpp:90
+msgid "Command: /leave"
+msgstr "Parancs: /leave"
+
+#: src/net/ea/gui/guildtab.cpp:75
+#, 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:135 src/net/ea/gui/partytab.cpp:69
+msgid "/help > Display this help."
+msgstr "/help > Megmutatja ezt a súgót."
+
+#: src/net/ea/gui/guildtab.cpp:136
+#, 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:137
+#, fuzzy
+msgid "/leave > Leave the guild you are in"
+msgstr "/leave > Jelenlegi csapat elhagyása"
+
+#: src/net/ea/gui/guildtab.cpp:138
+#, fuzzy
+msgid "/kick > Kick some one from the guild you are in"
+msgstr "/kick > Valaki kirúgása a csapatból"
+
+#: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
+msgid "Guild created."
+msgstr "Klán létrehozva."
+
+#: src/net/ea/guildhandler.cpp:88 src/net/ea/guildhandler.cpp:93
+#, fuzzy
+msgid "You are already in guild."
+msgstr "Hiba a klán létrehozása közben."
+
+#: src/net/ea/guildhandler.cpp:98
+msgid "Emperium check failed."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:103
+#, fuzzy
+msgid "Unknown server response."
+msgstr "%s részéről ismeretlen válasz a meghívásra."
+
+#: src/net/ea/guildhandler.cpp:180
 #, fuzzy, c-format
-msgid "Agility %+.1f"
-msgstr "Mozgékonyság %+d"
+msgid "Guild name: %s"
+msgstr "Klán"
 
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
-msgid "Dexterity"
-msgstr "Ügyesség"
+#: src/net/ea/guildhandler.cpp:182
+#, fuzzy, c-format
+msgid "Guild master: %s"
+msgstr "Klán"
 
-#: src/net/manaserv/attributes.cpp:193
+#: src/net/ea/guildhandler.cpp:184
 #, fuzzy, c-format
-msgid "Dexterity %+.1f"
-msgstr "Ügyesség %+d"
+msgid "Guild level: %d"
+msgstr "Szint: %d"
 
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
-msgid "Vitality"
-msgstr "Egészség"
+#: src/net/ea/guildhandler.cpp:186
+#, c-format
+msgid "Online members: %d"
+msgstr ""
 
-#: src/net/manaserv/attributes.cpp:206
+#: src/net/ea/guildhandler.cpp:188
+#, c-format
+msgid "Max members: %d"
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:190
 #, fuzzy, c-format
-msgid "Vitality %+.1f"
-msgstr "Egészség %+d"
+msgid "Average level: %d"
+msgstr "Max. szint"
 
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
-msgid "Intelligence"
-msgstr "Intelligencia"
+#: src/net/ea/guildhandler.cpp:192
+#, fuzzy, c-format
+msgid "Guild exp: %d"
+msgstr "Klán"
 
-#: src/net/manaserv/attributes.cpp:219
+#: src/net/ea/guildhandler.cpp:194
 #, fuzzy, c-format
-msgid "Intelligence %+.1f"
-msgstr "Intelligencia %+d"
+msgid "Guild next exp: %d"
+msgstr "Klán létrehozva."
 
-#: src/net/manaserv/attributes.cpp:225
+#: src/net/ea/guildhandler.cpp:196
+#, fuzzy, c-format
+msgid "Guild castle: %s"
+msgstr "Klán létrehozva."
+
+#: src/net/ea/guildhandler.cpp:402
+msgid "Could not inivte user to guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:406
 #, fuzzy
-msgid "Willpower"
-msgstr "Akaraterő:"
+msgid "User rejected guild invite."
+msgstr "%s visszautasította a csapatba hívást."
 
-#: src/net/manaserv/attributes.cpp:232
+#: src/net/ea/guildhandler.cpp:410
+#, fuzzy
+msgid "User is now part of your guild."
+msgstr "%s mostantól a csapatod tagja."
+
+#: src/net/ea/guildhandler.cpp:414
+msgid "Your guild is full."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:418
+#, fuzzy
+msgid "Unknown guild invite response."
+msgstr "%s részéről ismeretlen válasz a meghívásra."
+
+#: src/net/ea/guildhandler.cpp:438
+#, fuzzy
+msgid "You have left the guild."
+msgstr "Kiléptél a csapatból."
+
+#: src/net/ea/guildhandler.cpp:452
 #, fuzzy, c-format
-msgid "Willpower %+.1f"
-msgstr "Akaraterő: %+d"
+msgid "%s has left your guild."
+msgstr "%s elhagyta a csapatot."
+
+#: src/net/ea/guildhandler.cpp:483
+#, fuzzy
+msgid "You was kicked from guild."
+msgstr "%s mostantól a csapatod tagja."
+
+#: src/net/ea/guildhandler.cpp:496
+#, fuzzy, c-format
+msgid "%s has kicked from your guild."
+msgstr "%s mostantól a csapatod tagja."
+
+#: src/net/ea/gui/partytab.cpp:70
+msgid "/invite > Invite a player to your party"
+msgstr "/invite > Játékos meghívása a csapatba"
+
+#: src/net/ea/gui/partytab.cpp:71
+msgid "/leave > Leave the party you are in"
+msgstr "/leave > Jelenlegi csapat elhagyása"
+
+#: src/net/ea/gui/partytab.cpp:72
+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:73
+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:74
+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:84
+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/net/ea/gui/partytab.cpp:91
+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:95
+msgid "Command: /item <policy>"
+msgstr "Parancs: /item <szabály>"
 
-#: src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/gui/partytab.cpp:97
+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:98
+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."
+
+#: src/net/ea/gui/partytab.cpp:101
+msgid "Command: /item"
+msgstr "Parancs: /item"
+
+#: src/net/ea/gui/partytab.cpp:102
+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:107
+msgid "Command: /exp <policy>"
+msgstr "Parancs: /exp <szabály>"
+
+#: src/net/ea/gui/partytab.cpp:108
+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:110
+msgid ""
+"<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
+"sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
+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:113
+msgid "Command: /exp"
+msgstr "Parancs: /exp"
+
+#: src/net/ea/gui/partytab.cpp:114
+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:148 src/net/ea/partyhandler.cpp:286
+msgid "Item sharing enabled."
+msgstr "Tárgy megosztás engedélyezve."
+
+#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:296
+msgid "Item sharing disabled."
+msgstr "Tárgy megosztás tiltva."
+
+#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:306
+msgid "Item sharing not possible."
+msgstr "A tárgy megosztás nem lehetséges."
+
+#: src/net/ea/gui/partytab.cpp:157
+#, fuzzy
+msgid "Item sharing unknown."
+msgstr "Tárgy megosztás engedélyezve."
+
+#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:248
+msgid "Experience sharing enabled."
+msgstr "Tapasztalat megosztás engedélyezve."
+
+#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:258
+msgid "Experience sharing disabled."
+msgstr "Tapasztalat megosztás tiltva."
+
+#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:268
+msgid "Experience sharing not possible."
+msgstr "A tapasztalat megosztás nem lehetséges."
+
+#: src/net/ea/gui/partytab.cpp:196
+#, fuzzy
+msgid "Experience sharing unknown."
+msgstr "Tapasztalat megosztás engedélyezve."
+
+#: src/net/ea/inventoryhandler.cpp:407
+msgid "Failed to use item."
+msgstr "Nem tudod bevetni a tárgyat."
+
+#: src/net/ea/inventoryhandler.cpp:580
+msgid "Unable to equip."
+msgstr "Nem tudod használni."
+
+#: src/net/ea/loginhandler.cpp:131
+msgid "Account was not found. Please re-login."
+msgstr "Fiók nem található. Kérem jelentkezzen be újra."
+
+#: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127
+#, fuzzy
+msgid "Old password incorrect."
+msgstr "A régi jelszó hibás"
+
+#: src/net/ea/loginhandler.cpp:137
+#, fuzzy
+msgid "New password too short."
+msgstr "Az új jelszó túl rövid"
+
+#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:243
+#: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
+#: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
+#: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
+#, fuzzy
+msgid "Unknown error."
+msgstr "Ismeretlen hiba"
+
+#: src/net/ea/loginhandler.cpp:205
+#, fuzzy
+msgid "Unregistered ID."
+msgstr "Az ID nincs regisztrálva"
+
+#: src/net/ea/loginhandler.cpp:208
+#, fuzzy
+msgid "Wrong password."
+msgstr "Hibás jelszó"
+
+#: src/net/ea/loginhandler.cpp:211
+#, fuzzy
+msgid "Account expired."
+msgstr "A fiók lejárt"
+
+#: src/net/ea/loginhandler.cpp:214
+#, fuzzy
+msgid "Rejected from server."
+msgstr "Visszautasított a szerver"
+
+#: src/net/ea/loginhandler.cpp:217
+#, fuzzy
+msgid ""
+"You have been permanently banned from the game. Please contact the GM team."
+msgstr ""
+"Véglegesen kitiltottak a szerverről. Kérlek vedd fel a kapcsolatot a GM "
+"csapattal."
+
+#: src/net/ea/loginhandler.cpp:221
+#, fuzzy
+msgid "Client too old."
+msgstr "A kliens verziója túl régi"
+
+#: src/net/ea/loginhandler.cpp:224
+#, c-format
+msgid ""
+"You have been temporarily banned from the game until %s.\n"
+"Please contact the GM team via the forums."
+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:231
+msgid "Server overpopulated."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:234
+#, fuzzy
+msgid "This user name is already taken."
+msgstr "Ez a felhasználónév már foglalt."
+
+#: src/net/ea/loginhandler.cpp:240
+#, fuzzy
+msgid "Username permanently erased."
+msgstr "A felhasználónév foglalt"
+
+#: src/net/ea/partyhandler.cpp:82
+msgid "Could not create party."
+msgstr "Nem tudtad a csapatot létrehozni."
+
+#: src/net/ea/partyhandler.cpp:84
+msgid "Party successfully created."
+msgstr "Csapat létrehozása sikeres."
+
+#: src/net/ea/partyhandler.cpp:140
+#, fuzzy, c-format
+msgid "%s has joined your party."
+msgstr "%s elhagyta a csapatot."
+
+#: src/net/ea/partyhandler.cpp:176
+#, c-format
+msgid "%s is already a member of a party."
+msgstr "%s eleve tagja a csapatnak."
+
+#: src/net/ea/partyhandler.cpp:181
+#, c-format
+msgid "%s refused your invitation."
+msgstr "%s visszautasította a csapatba hívást."
+
+#: src/net/ea/partyhandler.cpp:186
+#, c-format
+msgid "%s is now a member of your party."
+msgstr "%s mostantól a csapatod tagja."
+
+#: src/net/ea/partyhandler.cpp:191
+#, c-format
+msgid "%s can't join your party because party is full."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:196
+#, fuzzy, c-format
+msgid "QQQ Unknown invite response for %s."
+msgstr "%s részéről ismeretlen válasz a meghívásra."
+
+#: src/net/ea/partyhandler.cpp:356
+msgid "You have left the party."
+msgstr "Kiléptél a csapatból."
+
+#: src/net/ea/partyhandler.cpp:368
+#, c-format
+msgid "%s has left your party."
+msgstr "%s elhagyta a csapatot."
+
+#: src/net/ea/partyhandler.cpp:444
+#, c-format
+msgid "An unknown member tried to say: %s"
+msgstr "Egy ismeretlen csapattárs mondja: %s"
+
+#: src/net/ea/playerhandler.cpp:95 src/net/manaserv/beinghandler.cpp:315
 msgid "You are dead."
 msgstr "Meghaltál."
 
-#: src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:316
 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:318
+#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:318
 msgid "You are not that alive anymore."
 msgstr "Nem vagy már az élők sorában."
 
-#: src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:319
 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:320
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:320
 msgid "Game Over!"
 msgstr "Vége a játéknak!"
 
-#: src/net/manaserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:101
+msgid "Insert coin to continue."
+msgstr "Dobj be egy érmét a folytatáshoz."
+
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:321
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
@@ -4593,7 +5089,7 @@ msgstr ""
 "Nem, gyerekek. A karakter nem meghalt, ..ööö... hanem egy szebb világba "
 "került."
 
-#: src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:323
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
@@ -4601,31 +5097,311 @@ msgstr ""
 "A tervet, amiben a torkoddal támadsz az ellenség kardjába sikertelennek "
 "bizonyult."
 
-#: src/net/manaserv/beinghandler.cpp:325
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:325
 msgid "I guess this did not run too well."
 msgstr "Úgy látszik nem futottál túl gyorsan."
 
-#: src/net/manaserv/beinghandler.cpp:326
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:326
 msgid "Do you want your possessions identified?"
 msgstr "Meg akarod bánni a bűneid?"
 
-#: src/net/manaserv/beinghandler.cpp:327
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:327
 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:329
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:329
 msgid "Annihilated."
 msgstr "Megöltek."
 
-#: src/net/manaserv/beinghandler.cpp:330
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:330
 msgid "Looks like you got your head handed to you."
 msgstr "Kezedbe adták a fejed."
 
-#: src/net/manaserv/beinghandler.cpp:332
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:332
 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:119
+msgid "You're not dead yet. You're just resting."
+msgstr "Nem haltál meg...csak alszol..."
+
+#: src/net/ea/playerhandler.cpp:120
+msgid "You are no more."
+msgstr "Nem létezel többé."
+
+#: src/net/ea/playerhandler.cpp:121
+msgid "You have ceased to be."
+msgstr "Megszüntél létezni."
+
+#: src/net/ea/playerhandler.cpp:122
+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:123
+msgid "You're a stiff."
+msgstr "Hulla vagy."
+
+#: src/net/ea/playerhandler.cpp:124
+msgid "Bereft of life, you rest in peace."
+msgstr "Megfosztottak az életedtől. Nyugodj békében."
+
+#: src/net/ea/playerhandler.cpp:125
+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:126
+msgid "Your metabolic processes are now history."
+msgstr "Történelem vagy."
+
+#: src/net/ea/playerhandler.cpp:127
+msgid "You're off the twig."
+msgstr "Elég gallyul nézel ki."
+
+#: src/net/ea/playerhandler.cpp:128
+msgid "You've kicked the bucket."
+msgstr "Feldobtad a talpad."
+
+#: src/net/ea/playerhandler.cpp:129
+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:131
+msgid "You are an ex-player."
+msgstr "Ex-játékos lettél."
+
+#: src/net/ea/playerhandler.cpp:132
+msgid "You're pining for the fjords."
+msgstr "Az örök búzamezőkön kaszálgatsz."
+
+#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
+#: src/net/ea/playerhandler.cpp:425
+msgid "Message"
+msgstr "Üzenet"
+
+#: src/net/ea/playerhandler.cpp:337
+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:347
+#, fuzzy
+msgid "You are carrying less than half your weight. You can 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:451
+#, fuzzy, c-format
+msgid "You picked up %s."
+msgstr "Zsákmányod "
+
+#: src/net/ea/playerhandler.cpp:457
+#, fuzzy, c-format
+msgid "You spent %s."
+msgstr "Kapott tárgy: %s."
+
+#: src/net/ea/playerhandler.cpp:501
+msgid "Cannot raise skill!"
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:618
+msgid "Equip arrows first."
+msgstr "Előbb tegyél be nyílvesszőt."
+
+#: src/net/ea/specialhandler.cpp:149
+msgid "Trade failed!"
+msgstr "Üzlet sikertelen!"
+
+#: src/net/ea/specialhandler.cpp:152
+msgid "Emote failed!"
+msgstr "Hangulatjel küldése sikertelen!"
+
+#: src/net/ea/specialhandler.cpp:155
+msgid "Sit failed!"
+msgstr "Ülés sikertelen!"
+
+#: src/net/ea/specialhandler.cpp:158
+msgid "Chat creating failed!"
+msgstr "Beszélgetés létrehozása sikertelen."
+
+#: src/net/ea/specialhandler.cpp:161
+msgid "Could not join party!"
+msgstr "Nem tudsz csatlakozni a csapatba."
+
+#: src/net/ea/specialhandler.cpp:164
+msgid "Cannot shout!"
+msgstr "Nem tudsz ordítani!"
+
+#: src/net/ea/specialhandler.cpp:177
+msgid "You have not yet reached a high enough lvl!"
+msgstr "Nem érted még el a megfelelő szintet!"
+
+#: src/net/ea/specialhandler.cpp:181
+msgid "Insufficient HP!"
+msgstr "Kevés az életed!"
+
+#: src/net/ea/specialhandler.cpp:184
+msgid "Insufficient SP!"
+msgstr "Kimerültél."
+
+#: src/net/ea/specialhandler.cpp:187
+msgid "You have no memos!"
+msgstr "Nincs feljegyzésed."
+
+#: src/net/ea/specialhandler.cpp:190
+msgid "You cannot do that right now!"
+msgstr "Most nem csinálhatod!"
+
+#: src/net/ea/specialhandler.cpp:193
+msgid "Seems you need more money... ;-)"
+msgstr "Úgy néz ki több pénzre van szükséged... ;)"
+
+#: src/net/ea/specialhandler.cpp:196
+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:200
+msgid "You need another red gem!"
+msgstr "Egy másik piros kőre van szükséged!"
+
+#: src/net/ea/specialhandler.cpp:203
+msgid "You need another blue gem!"
+msgstr "Egy másik kék kőre van szükséged!"
+
+#: src/net/ea/specialhandler.cpp:206
+msgid "You're carrying to much to do this!"
+msgstr "Túl sok dolgot cipelsz, hogy ezt csináld!"
+
+#: src/net/ea/specialhandler.cpp:209
+msgid "Huh? What's that?"
+msgstr "Huh? Mi volt ez?"
+
+#: src/net/ea/specialhandler.cpp:220
+msgid "Warp failed..."
+msgstr "Teleport sikertelen..."
+
+#: src/net/ea/specialhandler.cpp:223
+msgid "Could not steal anything..."
+msgstr "Nem tudsz semmit ellopni..."
+
+#: src/net/ea/specialhandler.cpp:226
+msgid "Poison had no effect..."
+msgstr "A méregnek nem volt hatása..."
+
+#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:128
+#, 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:130
+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:134
+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:138
+msgid "Trade cancelled due to an unknown reason."
+msgstr "Az üzlet ismeretlen okból megszakadt."
+
+#: src/net/ea/tradehandler.cpp:146
+#, c-format
+msgid "Trade: You and %s"
+msgstr "Üzlet: Te és %s"
+
+#: src/net/ea/tradehandler.cpp:156
+#, c-format
+msgid "Trade with %s cancelled."
+msgstr "Te és %s üzlete megszakadt."
+
+#: src/net/ea/tradehandler.cpp:169
+#, fuzzy
+msgid "Unhandled trade cancel packet."
+msgstr "Lekezeletlen üzlet elutasító csomag."
+
+#: src/net/ea/tradehandler.cpp:231
+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:236
+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:241
+#, fuzzy
+msgid "Failed adding item. You can't trade this item."
+msgstr ""
+"Hiba a tárgy hozzáadásakor. Nem tudod rárakni az egyik tárgyat a másikra."
+
+#: src/net/ea/tradehandler.cpp:245
+msgid "Failed adding item for unknown reason."
+msgstr "Ismeretlen okból a tárgy hozzáadása sikertelen."
+
+#: src/net/ea/tradehandler.cpp:264 src/net/manaserv/tradehandler.cpp:160
+msgid "Trade canceled."
+msgstr "Az üzlet megszakadt."
+
+#: src/net/ea/tradehandler.cpp:275 src/net/manaserv/tradehandler.cpp:167
+msgid "Trade completed."
+msgstr "Sikeres üzlet."
+
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
+msgid "Strength"
+msgstr "Erő"
+
+#: src/net/manaserv/attributes.cpp:167
+#, fuzzy, c-format
+msgid "Strength %+.1f"
+msgstr "Erő %+d"
+
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
+msgid "Agility"
+msgstr "Mozgékonyság"
+
+#: src/net/manaserv/attributes.cpp:180
+#, fuzzy, c-format
+msgid "Agility %+.1f"
+msgstr "Mozgékonyság %+d"
+
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
+msgid "Dexterity"
+msgstr "Ügyesség"
+
+#: src/net/manaserv/attributes.cpp:193
+#, fuzzy, c-format
+msgid "Dexterity %+.1f"
+msgstr "Ügyesség %+d"
+
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
+msgid "Vitality"
+msgstr "Egészség"
+
+#: src/net/manaserv/attributes.cpp:206
+#, fuzzy, c-format
+msgid "Vitality %+.1f"
+msgstr "Egészség %+d"
+
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
+msgid "Intelligence"
+msgstr "Intelligencia"
+
+#: src/net/manaserv/attributes.cpp:219
+#, fuzzy, c-format
+msgid "Intelligence %+.1f"
+msgstr "Intelligencia %+d"
+
+#: src/net/manaserv/attributes.cpp:225
+#, fuzzy
+msgid "Willpower"
+msgstr "Akaraterő:"
+
+#: src/net/manaserv/attributes.cpp:232
+#, fuzzy, c-format
+msgid "Willpower %+.1f"
+msgstr "Akaraterő: %+d"
+
 #: src/net/manaserv/beinghandler.cpp:337
 #, fuzzy
 msgid "Press OK to respawn."
@@ -4685,17 +5461,6 @@ msgstr ""
 msgid "Invalid slot number."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
-#: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
-#: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
-#, fuzzy
-msgid "Unknown error."
-msgstr "Ismeretlen hiba"
-
-#: src/net/manaserv/charhandler.cpp:210
-msgid "Info"
-msgstr "Infó"
-
 #: src/net/manaserv/charhandler.cpp:210
 #, fuzzy
 msgid "Player deleted."
@@ -4765,10 +5530,6 @@ msgstr ""
 msgid "Unknown channel event."
 msgstr "Ismeretlen parancs."
 
-#: src/net/manaserv/guildhandler.cpp:85
-msgid "Guild created."
-msgstr "Klán létrehozva."
-
 #: src/net/manaserv/guildhandler.cpp:90
 msgid "Error creating guild."
 msgstr "Hiba a klán létrehozása közben."
@@ -4805,11 +5566,6 @@ msgstr "A fiók lejárt"
 msgid "New password incorrect."
 msgstr "Az új jelszó hibás"
 
-#: src/net/manaserv/loginhandler.cpp:127
-#, fuzzy
-msgid "Old password incorrect."
-msgstr "A régi jelszó hibás"
-
 #: src/net/manaserv/loginhandler.cpp:131 src/net/manaserv/loginhandler.cpp:163
 msgid "Account not connected. Please login first."
 msgstr "A fiók nem kapcsolódott. Kérlek jelentkezz be előbb."
@@ -4894,24 +5650,11 @@ msgstr "Elfogadod a bejövő üzleti ajánlatokat."
 msgid "Ignoring incoming trade requests."
 msgstr "Elutasítod a bejövő üzleti ajánlatokat."
 
-#: src/net/manaserv/tradehandler.cpp:128
-#, 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:146
 #, c-format
 msgid "Trading with %s"
 msgstr "Üzlet Te és %s között"
 
-#: src/net/manaserv/tradehandler.cpp:160
-msgid "Trade canceled."
-msgstr "Az üzlet megszakadt."
-
-#: src/net/manaserv/tradehandler.cpp:167
-msgid "Trade completed."
-msgstr "Sikeres üzlet."
-
 #: src/net/tmwa/adminhandler.cpp:70
 msgid "Kick failed!"
 msgstr "Kirúgás sikertelen!"
@@ -5121,493 +5864,8 @@ msgid "Unknown item"
 msgstr "Ismeretlen tárgy"
 
 #, fuzzy
-#~ msgid "Cannot use this ID."
-#~ msgstr "Nem használhatod ez a nevet."
-
-#, fuzzy
-#~ msgid "Unknown char-server failure."
-#~ msgstr "Ismeretlen hiba"
-
-#~ 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."
-
-#, fuzzy
-#~ msgid "Wrong name."
-#~ msgstr "Helytelen magic_token"
-
-#~ msgid "Character deleted."
-#~ msgstr "Karakter törölve."
-
-#~ msgid "Failed to delete character."
-#~ msgstr "Karakter törlése sikertelen."
-
-#~ msgid "Strength:"
-#~ msgstr "Erő:"
-
-#~ msgid "Agility:"
-#~ msgstr "Mozgékonyság:"
-
-#~ msgid "Vitality:"
-#~ msgstr "Egészség:"
-
-#~ msgid "Intelligence:"
-#~ msgstr "Intelligencia:"
-
-#~ msgid "Dexterity:"
-#~ msgstr "Ügyesség:"
-
-#~ msgid "Luck:"
-#~ msgstr "Szerencse:"
-
-#, fuzzy
-#~ 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ő."
-
-#, fuzzy
-#~ msgid "Whisper could not be sent, ignored by %s."
-#~ msgstr "A privát üzenet nem lett elküldve, mert le lettél tiltva."
-
-#, fuzzy
-#~ msgid "MVP player."
-#~ msgstr "Játékos"
-
-#, fuzzy
-#~ msgid "MVP player: "
-#~ msgstr "Játékos"
-
-#~ msgid "Channels are not supported!"
-#~ msgstr "A csatornák le vannak tiltva!"
-
-#, fuzzy
-#~ msgid "Game"
-#~ msgstr "Név"
-
-#, fuzzy
-#~ msgid "Request to quit denied!"
-#~ msgstr "Üzleti ajánlat"
-
-#~ msgid "/help > Display this help."
-#~ msgstr "/help > Megmutatja ezt a súgót."
-
-#, fuzzy
-#~ msgid "/invite > Invite a player to your guild"
-#~ msgstr "/invite > Játékos meghívása a csapatba"
-
-#, fuzzy
-#~ msgid "/leave > Leave the guild you are in"
-#~ msgstr "/leave > Jelenlegi csapat elhagyása"
-
-#, fuzzy
-#~ msgid "/kick > Kick some one from the guild you are in"
-#~ msgstr "/kick > Valaki kirúgása a csapatból"
-
-#~ msgid "Command: /invite <nick>"
-#~ msgstr "Parancs: /invite <név>"
-
-#, 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."
-
-#~ msgid "Command: /leave"
-#~ msgstr "Parancs: /leave"
-
-#, fuzzy
-#~ msgid "This command causes the player to leave the guild."
-#~ msgstr "Ezzel a paranccsal a játékos elhagyja a csapatát."
-
-#, fuzzy
-#~ msgid "You are already in guild."
-#~ msgstr "Hiba a klán létrehozása közben."
-
-#, fuzzy
-#~ msgid "Unknown server response."
-#~ msgstr "%s részéről ismeretlen válasz a meghívásra."
-
-#, fuzzy
-#~ msgid "Guild name: %s"
-#~ msgstr "Klán"
-
-#, fuzzy
-#~ msgid "Guild master: %s"
-#~ msgstr "Klán"
-
-#, fuzzy
-#~ msgid "Guild level: %d"
-#~ msgstr "Szint: %d"
-
-#, fuzzy
-#~ msgid "Average level: %d"
-#~ msgstr "Max. szint"
-
-#, fuzzy
-#~ msgid "Guild exp: %d"
-#~ msgstr "Klán"
-
-#, fuzzy
-#~ msgid "Guild next exp: %d"
-#~ msgstr "Klán létrehozva."
-
-#, fuzzy
-#~ msgid "Guild castle: %s"
-#~ msgstr "Klán létrehozva."
-
-#, fuzzy
-#~ msgid "User is now part of your guild."
-#~ msgstr "%s mostantól a csapatod tagja."
-
-#, fuzzy
-#~ msgid "Unknown guild invite response."
-#~ msgstr "%s részéről ismeretlen válasz a meghívásra."
-
-#, fuzzy
-#~ msgid "You have left the guild."
-#~ msgstr "Kiléptél a csapatból."
-
-#, fuzzy
-#~ msgid "%s has left your guild."
-#~ msgstr "%s elhagyta a csapatot."
-
-#, fuzzy
-#~ msgid "%s has kicked from your guild."
-#~ msgstr "%s mostantól a csapatod tagja."
-
-#~ msgid "/invite > Invite a player to your party"
-#~ msgstr "/invite > Játékos meghívása a csapatba"
-
-#~ msgid "/leave > Leave the party you are in"
-#~ msgstr "/leave > Jelenlegi csapat elhagyása"
-
-#~ msgid "/kick > Kick some one from the party you are in"
-#~ msgstr "/kick > Valaki kirúgása a csapatból"
-
-#~ msgid "/item > Show/change party item sharing options"
-#~ msgstr "/item > Tárgyak elosztását nézhetjük/átállíthatjuk vele"
-
-#~ msgid "/exp > Show/change party experience sharing options"
-#~ msgstr "/exp > Tapasztalat elosztását nézhetjük/átállíthatjuk vele"
-
-#~ 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."
-
-#~ msgid "This command causes the player to leave the party."
-#~ msgstr "Ezzel a paranccsal a játékos elhagyja a csapatát."
-
-#~ msgid "Command: /item <policy>"
-#~ msgstr "Parancs: /item <szabály>"
-
-#~ 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."
-
-#~ 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."
-
-#~ msgid "Command: /item"
-#~ msgstr "Parancs: /item"
-
-#~ 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."
-
-#~ msgid "Command: /exp <policy>"
-#~ msgstr "Parancs: /exp <szabály>"
-
-#~ 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."
-
-#~ msgid ""
-#~ "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
-#~ "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
-#~ msgstr ""
-#~ "<szabály> lehet \"1\", \"yes\", \"true\" a tapasztalat megosztásához, "
-#~ "vagy \"0\", \"no\", \"false\" a tapasztalat megosztásának kikapcsolásához."
-
-#~ msgid "Command: /exp"
-#~ msgstr "Parancs: /exp"
-
-#~ msgid "This command displays the party's current experience sharing policy."
-#~ msgstr ""
-#~ "Ez a parancs megmutatja a csapat jelenlegi tapasztalatmegosztási-"
-#~ "szabályát."
-
-#~ msgid "Item sharing enabled."
-#~ msgstr "Tárgy megosztás engedélyezve."
-
-#~ msgid "Item sharing disabled."
-#~ msgstr "Tárgy megosztás tiltva."
-
-#~ msgid "Item sharing not possible."
-#~ msgstr "A tárgy megosztás nem lehetséges."
-
-#, fuzzy
-#~ msgid "Item sharing unknown."
-#~ msgstr "Tárgy megosztás engedélyezve."
-
-#~ msgid "Experience sharing enabled."
-#~ msgstr "Tapasztalat megosztás engedélyezve."
-
-#~ msgid "Experience sharing disabled."
-#~ msgstr "Tapasztalat megosztás tiltva."
-
-#~ msgid "Experience sharing not possible."
-#~ msgstr "A tapasztalat megosztás nem lehetséges."
-
-#, fuzzy
-#~ msgid "Experience sharing unknown."
-#~ msgstr "Tapasztalat megosztás engedélyezve."
-
-#~ msgid "Failed to use item."
-#~ msgstr "Nem tudod bevetni a tárgyat."
-
-#~ msgid "Unable to equip."
-#~ msgstr "Nem tudod használni."
-
-#~ msgid "Account was not found. Please re-login."
-#~ msgstr "Fiók nem található. Kérem jelentkezzen be újra."
-
-#, fuzzy
-#~ msgid "New password too short."
-#~ msgstr "Az új jelszó túl rövid"
-
-#, fuzzy
-#~ msgid "Unregistered ID."
-#~ msgstr "Az ID nincs regisztrálva"
-
-#, fuzzy
-#~ msgid "Wrong password."
-#~ msgstr "Hibás jelszó"
-
-#, fuzzy
-#~ msgid "Account expired."
-#~ msgstr "A fiók lejárt"
-
-#, fuzzy
-#~ msgid "Rejected from server."
-#~ msgstr "Visszautasított a szerver"
-
-#, fuzzy
-#~ msgid ""
-#~ "You have been permanently banned from the game. Please contact the GM "
-#~ "team."
-#~ msgstr ""
-#~ "Véglegesen kitiltottak a szerverről. Kérlek vedd fel a kapcsolatot a GM "
-#~ "csapattal."
-
-#, fuzzy
-#~ msgid "Client too old."
-#~ msgstr "A kliens verziója túl régi"
-
-#~ msgid ""
-#~ "You have been temporarily banned from the game until %s.\n"
-#~ "Please contact the GM team via the forums."
-#~ 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."
-
-#, fuzzy
-#~ msgid "This user name is already taken."
-#~ msgstr "Ez a felhasználónév már foglalt."
-
-#, fuzzy
-#~ msgid "Username permanently erased."
-#~ msgstr "A felhasználónév foglalt"
-
-#~ msgid "Could not create party."
-#~ msgstr "Nem tudtad a csapatot létrehozni."
-
-#~ msgid "Party successfully created."
-#~ msgstr "Csapat létrehozása sikeres."
-
-#, fuzzy
-#~ msgid "%s has joined your party."
-#~ msgstr "%s elhagyta a csapatot."
-
-#~ msgid "%s is already a member of a party."
-#~ msgstr "%s eleve tagja a csapatnak."
-
-#~ msgid "%s refused your invitation."
-#~ msgstr "%s visszautasította a csapatba hívást."
-
-#~ msgid "%s is now a member of your party."
-#~ msgstr "%s mostantól a csapatod tagja."
-
-#, fuzzy
-#~ msgid "QQQ Unknown invite response for %s."
-#~ msgstr "%s részéről ismeretlen válasz a meghívásra."
-
-#~ msgid "You have left the party."
-#~ msgstr "Kiléptél a csapatból."
-
-#~ msgid "%s has left your party."
-#~ msgstr "%s elhagyta a csapatot."
-
-#~ msgid "An unknown member tried to say: %s"
-#~ msgstr "Egy ismeretlen csapattárs mondja: %s"
-
-#~ msgid "Insert coin to continue."
-#~ msgstr "Dobj be egy érmét a folytatáshoz."
-
-#~ msgid "You're not dead yet. You're just resting."
-#~ msgstr "Nem haltál meg...csak alszol..."
-
-#~ msgid "You are no more."
-#~ msgstr "Nem létezel többé."
-
-#~ msgid "You have ceased to be."
-#~ msgstr "Megszüntél létezni."
-
-#~ msgid "You've expired and gone to meet your maker."
-#~ msgstr "Véged és elindultál találkozni a készítőddel."
-
-#~ msgid "You're a stiff."
-#~ msgstr "Hulla vagy."
-
-#~ msgid "Bereft of life, you rest in peace."
-#~ msgstr "Megfosztottak az életedtől. Nyugodj békében."
-
-#~ msgid "If you weren't so animated, you'd be pushing up the daisies."
-#~ msgstr "Szép vagy mikor alszol..."
-
-#~ msgid "Your metabolic processes are now history."
-#~ msgstr "Történelem vagy."
-
-#~ msgid "You're off the twig."
-#~ msgstr "Elég gallyul nézel ki."
-
-#~ msgid "You've kicked the bucket."
-#~ msgstr "Feldobtad a talpad."
-
-#~ 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."
-
-#~ msgid "You are an ex-player."
-#~ msgstr "Ex-játékos lettél."
-
-#~ msgid "You're pining for the fjords."
-#~ msgstr "Az örök búzamezőkön kaszálgatsz."
-
-#~ msgid "Message"
-#~ msgstr "Üzenet"
-
-#~ 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."
-
-#, fuzzy
-#~ msgid "You are carrying less than half your weight. You can regain health."
-#~ msgstr "Több tárgy van nálad mint a súlyod fele. Nem töltődik az életed."
-
-#, fuzzy
-#~ msgid "You picked up %s."
-#~ msgstr "Zsákmányod "
-
-#, fuzzy
-#~ msgid "You spent %s."
-#~ msgstr "Kapott tárgy: %s."
-
-#~ msgid "Equip arrows first."
-#~ msgstr "Előbb tegyél be nyílvesszőt."
-
-#~ msgid "Trade failed!"
-#~ msgstr "Üzlet sikertelen!"
-
-#~ msgid "Emote failed!"
-#~ msgstr "Hangulatjel küldése sikertelen!"
-
-#~ msgid "Sit failed!"
-#~ msgstr "Ülés sikertelen!"
-
-#~ msgid "Chat creating failed!"
-#~ msgstr "Beszélgetés létrehozása sikertelen."
-
-#~ msgid "Could not join party!"
-#~ msgstr "Nem tudsz csatlakozni a csapatba."
-
-#~ msgid "Cannot shout!"
-#~ msgstr "Nem tudsz ordítani!"
-
-#~ msgid "You have not yet reached a high enough lvl!"
-#~ msgstr "Nem érted még el a megfelelő szintet!"
-
-#~ msgid "Insufficient HP!"
-#~ msgstr "Kevés az életed!"
-
-#~ msgid "Insufficient SP!"
-#~ msgstr "Kimerültél."
-
-#~ msgid "You have no memos!"
-#~ msgstr "Nincs feljegyzésed."
-
-#~ msgid "You cannot do that right now!"
-#~ msgstr "Most nem csinálhatod!"
-
-#~ msgid "Seems you need more money... ;-)"
-#~ msgstr "Úgy néz ki több pénzre van szükséged... ;)"
-
-#~ msgid "You cannot use this skill with that kind of weapon!"
-#~ msgstr "Ezzel a fegyverrel nem tudod ezt a képességet használni!"
-
-#~ msgid "You need another red gem!"
-#~ msgstr "Egy másik piros kőre van szükséged!"
-
-#~ msgid "You need another blue gem!"
-#~ msgstr "Egy másik kék kőre van szükséged!"
-
-#~ msgid "You're carrying to much to do this!"
-#~ msgstr "Túl sok dolgot cipelsz, hogy ezt csináld!"
-
-#~ msgid "Huh? What's that?"
-#~ msgstr "Huh? Mi volt ez?"
-
-#~ msgid "Warp failed..."
-#~ msgstr "Teleport sikertelen..."
-
-#~ msgid "Could not steal anything..."
-#~ msgstr "Nem tudsz semmit ellopni..."
-
-#~ msgid "Poison had no effect..."
-#~ msgstr "A méregnek nem volt hatása..."
-
-#~ msgid "Trading isn't possible. Trade partner is too far away."
-#~ msgstr "Az üzlet nem lehetséges. A partner túl messze van."
-
-#~ msgid "Trading isn't possible. Character doesn't exist."
-#~ msgstr "Az üzlet nem lehetséges. A partner nem létezik."
-
-#~ msgid "Trade cancelled due to an unknown reason."
-#~ msgstr "Az üzlet ismeretlen okból megszakadt."
-
-#~ msgid "Trade: You and %s"
-#~ msgstr "Üzlet: Te és %s"
-
-#~ msgid "Trade with %s cancelled."
-#~ msgstr "Te és %s üzlete megszakadt."
-
-#, fuzzy
-#~ msgid "Unhandled trade cancel packet."
-#~ msgstr "Lekezeletlen üzlet elutasító csomag."
-
-#~ msgid "Failed adding item. Trade partner is over weighted."
-#~ msgstr "Tárgy hozzáadása sikertelen. Az üzleti partner túl van terhelve."
-
-#~ msgid "Failed adding item. Trade partner has no free slot."
-#~ msgstr "Tárgy hozzáadása sikertelen. Az üzleti partnernek nincs elég helye."
-
-#, fuzzy
-#~ msgid "Failed adding item. You can't trade this item."
-#~ msgstr ""
-#~ "Hiba a tárgy hozzáadásakor. Nem tudod rárakni az egyik tárgyat a másikra."
-
-#~ msgid "Failed adding item for unknown reason."
-#~ msgstr "Ismeretlen okból a tárgy hozzáadása sikertelen."
+#~ msgid "Enable opacity cache"
+#~ msgstr "Joystick engedélyezése"
 
 #, fuzzy
 #~ msgid "Level: "
diff --git a/po/id.po b/po/id.po
index 18553e4fe..759e63557 100644
--- a/po/id.po
+++ b/po/id.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 #   <adjieps@yahoo.com>, 2011.
 #   <Genesis_Junior@yahoo.com>, 2011.
 # Andrei Karas <akaras@inbox.ru>, 2011.
@@ -9,39 +9,40 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-08 04:26+0300\n"
+"POT-Creation-Date: 2011-08-10 01:11+0300\n"
 "PO-Revision-Date: 2011-08-08 01:29+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
-"Language-Team: Indonesian (http://www.transifex.net/projects/p/manaplus/team/id/)\n"
+"Language-Team: Indonesian (http://www.transifex.net/projects/p/manaplus/team/"
+"id/)\n"
+"Language: id\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: id\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
 #: src/actorspritemanager.cpp:1034
 msgid "Visible on map"
 msgstr "Terlihat di peta"
 
-#: src/being.cpp:541
+#: src/being.cpp:542
 msgid "dodge"
 msgstr "Menghindar"
 
-#: src/being.cpp:541
+#: src/being.cpp:542
 msgid "miss"
 msgstr "Luput"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1513
+#: src/being.cpp:1514
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1518
+#: src/being.cpp:1519
 msgid "I"
 msgstr "l"
 
-#: src/client.cpp:825 src/gui/setup.cpp:51 src/gui/windowmenu.cpp:100
+#: src/client.cpp:825 src/gui/setup.cpp:53 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Pengaturan"
 
@@ -73,7 +74,8 @@ msgstr "Pergantian server"
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
-#: src/gui/unregisterdialog.cpp:137 src/net/manaserv/charhandler.cpp:184
+#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
+#: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "Kesalahan"
@@ -137,8 +139,8 @@ msgstr "Tidak dapat mengirimkan pesan tanpa nama"
 #: src/commandhandler.cpp:409
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
-" you."
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
+"you."
 msgstr ""
 "Tidak dapat membuat kolom whisper baru untuk nama \"%s\"! nama telah ada, "
 "atau nama anda sendiri"
@@ -148,7 +150,7 @@ msgstr ""
 msgid "Requesting to join channel %s."
 msgstr "Meminta untuk masuk ke channel %s."
 
-#: src/commandhandler.cpp:445
+#: src/commandhandler.cpp:445 src/net/ea/gui/partytab.cpp:125
 msgid "Party name is missing."
 msgstr "Nama kelompok tidak dapat di temukan"
 
@@ -290,7 +292,8 @@ msgstr ""
 #: src/commandhandler.h:40
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr "Pilihan untuk /%s adalah \"ya\", \"tidak\", \"benar\",\"salah\", \"1\",\"0\"."
+msgstr ""
+"Pilihan untuk /%s adalah \"ya\", \"tidak\", \"benar\",\"salah\", \"1\",\"0\"."
 
 #: src/game.cpp:246 src/gui/widgets/chattab.cpp:410
 msgid "General"
@@ -353,35 +356,35 @@ msgstr "Peringkat Pvp: %d"
 msgid "Comment: %s"
 msgstr "Komentar: %s"
 
-#: src/gui/botcheckerwindow.cpp:265
+#: src/gui/botcheckerwindow.cpp:266
 msgid "Bot Checker"
 msgstr "Pengecek Bot"
 
-#: src/gui/botcheckerwindow.cpp:295 src/gui/setup_players.cpp:64
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
 msgid "Name"
 msgstr "Nama"
 
-#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:130
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:130
 #: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:604
 #: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
 msgid "Attack"
 msgstr "Pukul"
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:275
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:275
 #: src/keyboardconfig.cpp:62
 msgid "Talk"
 msgstr "Berbicara"
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:241
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:241
 #: src/gui/popupmenu.cpp:280 src/gui/popupmenu.cpp:661
 msgid "Move"
 msgstr "Jalan"
 
-#: src/gui/botcheckerwindow.cpp:299
+#: src/gui/botcheckerwindow.cpp:300
 msgid "Result"
 msgstr "Hasil"
 
-#: src/gui/botcheckerwindow.cpp:309 src/gui/npcdialog.cpp:123
+#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:123
 msgid "Reset"
 msgstr "Reset"
 
@@ -450,8 +453,8 @@ msgstr "Jual"
 #: src/gui/popupmenu.cpp:1731 src/gui/popupmenu.cpp:1774
 #: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1849
 #: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1935
-#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:68
-#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:237
+#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:70
+#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:238
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
 #: src/gui/updatewindow.cpp:157
 msgid "Cancel"
@@ -620,8 +623,8 @@ msgid "Enter password:"
 msgstr "Masukkan sandi"
 
 #: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
-#: src/gui/setup_players.cpp:251 src/gui/shopwindow.cpp:120
-#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:240
+#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120
+#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:241
 msgid "Delete"
 msgstr "Hapus"
 
@@ -695,10 +698,10 @@ msgid "rainbow 3"
 msgstr "pelangi 3"
 
 #: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
-#: src/gui/logindialog.cpp:78 src/gui/setup_players.cpp:220
-#: src/gui/setup_theme.cpp:71 src/gui/setup_theme.cpp:125
-#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:101
-#: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:159
+#: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
+#: src/gui/setup_theme.cpp:72 src/gui/setup_theme.cpp:126
+#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
+#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
 msgid "???"
 msgstr "???"
 
@@ -889,7 +892,7 @@ msgstr "Selanjutnya"
 msgid "Auto open this window"
 msgstr "Buka jendela otomatis"
 
-#: src/gui/editdialog.cpp:46 src/gui/itemamountwindow.cpp:208
+#: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
 #: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "OK"
@@ -973,7 +976,7 @@ msgstr "Berat"
 
 #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
 #: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1724
-#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:69
+#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:71
 msgid "Store"
 msgstr "Simpan"
 
@@ -1032,89 +1035,89 @@ msgstr ","
 msgid "Weight: %s"
 msgstr "Berat: %s"
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
+#: src/gui/killstats.cpp:46 src/gui/windowmenu.cpp:69
 msgid "Kill stats"
 msgstr "Stat membunuh"
 
-#: src/gui/killstats.cpp:63
+#: src/gui/killstats.cpp:64
 msgid "Reset stats"
 msgstr "Atur ulang stats"
 
-#: src/gui/killstats.cpp:64
+#: src/gui/killstats.cpp:65
 msgid "Reset timer"
 msgstr "Atur ulang penghitung waktu"
 
-#: src/gui/killstats.cpp:68 src/gui/killstats.cpp:204
+#: src/gui/killstats.cpp:69 src/gui/killstats.cpp:205
 #, c-format
 msgid "Level: %d at %f%%"
 msgstr "Level: %d pada %f%%"
 
-#: src/gui/killstats.cpp:72 src/gui/killstats.cpp:209
+#: src/gui/killstats.cpp:73 src/gui/killstats.cpp:210
 #, c-format
 msgid "Exp: %d/%d Left: %d"
 msgstr "Exp: %d%d Tersisa:%d"
 
-#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:215
-#: src/gui/killstats.cpp:224
+#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:216
+#: src/gui/killstats.cpp:225
 #, c-format
 msgid "1%% = %d exp, avg mob for 1%%: %s"
 msgstr "%%= %d exp, rata-rata mob untuk 1%%: %s"
 
-#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:141
-#: src/gui/killstats.cpp:233
+#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:142
+#: src/gui/killstats.cpp:234
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr "Membunuh: %s, exp total: %s"
 
-#: src/gui/killstats.cpp:80 src/gui/killstats.cpp:143
-#: src/gui/killstats.cpp:219 src/gui/killstats.cpp:229
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
+#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:230
 #, c-format
 msgid "Avg Exp: %s, No. of avg mob to next level: %s"
 msgstr "Rata-rata: %s, No. dari rata-rata mob ke level selanjutnya: %s"
 
-#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:161
-#: src/gui/killstats.cpp:236
+#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:162
+#: src/gui/killstats.cpp:237
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr "Membunuh/menit: %s, Exp/menit: %s"
 
-#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:88 src/gui/killstats.cpp:93
-#: src/gui/killstats.cpp:288 src/gui/killstats.cpp:304
-#: src/gui/killstats.cpp:322
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:89 src/gui/killstats.cpp:94
+#: src/gui/killstats.cpp:289 src/gui/killstats.cpp:305
+#: src/gui/killstats.cpp:323
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
 msgstr[0] "Kecepatan Exp per %d menit: %s"
 
-#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
+#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
 msgstr[0] "Waktu sebelum naik ke level selanjutnya %d menit: %s"
 
-#: src/gui/killstats.cpp:99 src/gui/killstats.cpp:240
+#: src/gui/killstats.cpp:100 src/gui/killstats.cpp:241
 msgid "Last kill exp:"
 msgstr "Exp terakhir"
 
-#: src/gui/killstats.cpp:101 src/gui/killstats.cpp:354
-#: src/gui/killstats.cpp:360 src/gui/killstats.cpp:366
-#: src/gui/killstats.cpp:371
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:355
+#: src/gui/killstats.cpp:361 src/gui/killstats.cpp:367
+#: src/gui/killstats.cpp:372
 msgid "Time before jacko spawn:"
 msgstr "waktu sebelum Jacko kembali"
 
-#: src/gui/killstats.cpp:293 src/gui/killstats.cpp:300
-#: src/gui/killstats.cpp:310 src/gui/killstats.cpp:317
-#: src/gui/killstats.cpp:329 src/gui/killstats.cpp:336
+#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:301
+#: src/gui/killstats.cpp:311 src/gui/killstats.cpp:318
+#: src/gui/killstats.cpp:330 src/gui/killstats.cpp:337
 #, c-format
 msgid "  Time for next level: %s"
 msgstr "waktu untuk ke level selanjutnya: %s"
 
-#: src/gui/killstats.cpp:360
+#: src/gui/killstats.cpp:361
 #, c-format
 msgid "%s %d?"
 msgstr "%s %d?"
 
-#: src/gui/killstats.cpp:366
+#: src/gui/killstats.cpp:367
 msgid "jacko spawning"
 msgstr "Jacko bertelur"
 
@@ -1777,34 +1780,38 @@ msgid "Tabs"
 msgstr "Tab"
 
 #: src/gui/setup_chat.cpp:96
+msgid "Put all whispers in tabs"
+msgstr "Masukkan semua bisikan kedalam tab"
+
+#: src/gui/setup_chat.cpp:99
 msgid "Log magic messages in debug tab"
 msgstr "Riwayat pesan sihir di jendela debug"
 
-#: src/gui/setup_chat.cpp:99
+#: src/gui/setup_chat.cpp:102
 msgid "Show server messages in debug tab"
 msgstr "Tujukkan pesan server di jendela debug"
 
-#: src/gui/setup_chat.cpp:102
+#: src/gui/setup_chat.cpp:105
 msgid "Enable trade tab"
 msgstr "Perbolehkan jendela transkaksi/trade"
 
-#: src/gui/setup_chat.cpp:105
+#: src/gui/setup_chat.cpp:108
 msgid "Enable battle tab"
 msgstr "Perbolehkan jendela pertarungan"
 
-#: src/gui/setup_chat.cpp:108
+#: src/gui/setup_chat.cpp:111
 msgid "Show battle events"
 msgstr "Tunjukkan event pertarungan"
 
-#: src/gui/setup_chat.cpp:111
+#: src/gui/setup_chat.cpp:114
 msgid "Resize chat tabs if need"
 msgstr "Atur besar jendela obrolan apabila dibutuhkan"
 
-#: src/gui/setup_chat.cpp:115
+#: src/gui/setup_chat.cpp:118
 msgid "Time"
 msgstr "Waktu"
 
-#: src/gui/setup_chat.cpp:117
+#: src/gui/setup_chat.cpp:120
 msgid "Use local time"
 msgstr "Pengunaan waktu lokal"
 
@@ -1855,16 +1862,15 @@ msgstr "Biru:"
 msgid "Alpha:"
 msgstr "Alpha:"
 
-#: src/gui/setup.cpp:67
+#: src/gui/setup.cpp:69
 msgid "Apply"
 msgstr "Terapkan"
 
-#: src/gui/setup.cpp:70
+#: src/gui/setup.cpp:72
 msgid "Reset Windows"
 msgstr "Atur ulang jendela"
 
 #: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
-#: src/gui/setup_players.cpp:334
 msgid "Edit"
 msgstr "Ganti"
 
@@ -2072,148 +2078,202 @@ msgstr ""
 msgid "Show background"
 msgstr "Perlihatkan latar belakang"
 
-#: src/gui/setup_players.cpp:65
-msgid "Relation"
-msgstr "Hubungan"
+#: src/gui/setup_perfomance.cpp:48
+msgid "Perfomance"
+msgstr ""
 
-#: src/gui/setup_players.cpp:70
-msgid "Neutral"
-msgstr "Netral"
+#: src/gui/setup_perfomance.cpp:55
+msgid "Better perfomance (enable for better perfomance)"
+msgstr ""
 
-#: src/gui/setup_players.cpp:71
-msgid "Friend"
-msgstr "Teman"
+#: src/gui/setup_perfomance.cpp:58
+msgid "Auto adjust perfomance"
+msgstr ""
 
-#: src/gui/setup_players.cpp:72
-msgid "Disregarded"
-msgstr "Diabaikan"
+#: src/gui/setup_perfomance.cpp:61
+msgid "Show beings transparency"
+msgstr ""
 
-#: src/gui/setup_players.cpp:73
-msgid "Ignored"
-msgstr "Ditolak"
+#: src/gui/setup_perfomance.cpp:64
+msgid "Hw acceleration"
+msgstr "Akselerasi perangkat keras"
 
-#: src/gui/setup_players.cpp:74
-msgid "Erased"
-msgstr "Dihapus"
+#: src/gui/setup_perfomance.cpp:67
+msgid "Enable opacity cache (Software, can use many memory)"
+msgstr ""
 
-#: src/gui/setup_players.cpp:247
-msgid "Allow trading"
-msgstr "Perbolehkan penukaran"
+#: src/gui/setup_perfomance.cpp:70
+msgid "Enable map reduce (Software)"
+msgstr ""
 
-#: src/gui/setup_players.cpp:249
-msgid "Allow whispers"
-msgstr "Perbolehkan berbisik"
+#: src/gui/setup_perfomance.cpp:73
+msgid "Better quality (disable for better perfomance)"
+msgstr ""
 
-#: src/gui/setup_players.cpp:252
-msgid "Old"
-msgstr "Lama"
+#: src/gui/setup_perfomance.cpp:76
+msgid "Enable alpha channel fix (Software, can be very slow)"
+msgstr ""
 
-#: src/gui/setup_players.cpp:254
-msgid "Put all whispers in tabs"
-msgstr "Masukkan semua bisikan kedalam tab"
+#: src/gui/setup_perfomance.cpp:80
+#, fuzzy
+msgid "Enable reorder sprites."
+msgstr "Perbolehkan jendela transkaksi/trade"
 
-#: src/gui/setup_players.cpp:257
-msgid "Show gender"
-msgstr "Perlihatkan jenis kelamin"
+#: src/gui/setup_perfomance.cpp:83
+msgid "Small memory (enable for lower memory usage)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:86
+msgid "Disable advanced beings caching (Software)"
+msgstr ""
 
-#: src/gui/setup_players.cpp:267
+#: src/gui/setup_perfomance.cpp:89
+msgid "Disable beings caching (Software)"
+msgstr ""
+
+#: src/gui/setup_players.cpp:48
 msgid "Players"
 msgstr "Pemain"
 
-#: src/gui/setup_players.cpp:292
-msgid "When ignoring:"
-msgstr "Ketika menolak:"
+#: src/gui/setup_players.cpp:54
+msgid "Show gender"
+msgstr "Perlihatkan jenis kelamin"
 
-#: src/gui/setup_players.cpp:315
+#: src/gui/setup_players.cpp:57
 msgid "Show level"
 msgstr "Perlihatkan Level"
 
-#: src/gui/setup_players.cpp:319
+#: src/gui/setup_players.cpp:60
 msgid "Show own name"
 msgstr "Perlihatkan nama sendiri"
 
-#: src/gui/setup_players.cpp:323
+#: src/gui/setup_players.cpp:63
 msgid "Target dead players"
 msgstr "Target pemain yang mati"
 
-#: src/gui/setup_players.cpp:327
+#: src/gui/setup_players.cpp:66
+msgid "Visible names"
+msgstr "Nama yang tampak"
+
+#: src/gui/setup_players.cpp:69
 msgid "Secure trades"
 msgstr "Pertukaran yang aman"
 
-#: src/gui/setup_players.cpp:331 src/gui/setup_players.cpp:523
+#: src/gui/setup_players.cpp:72
 msgid "Unsecure chars in names"
 msgstr "Penggunaan karakter yang tidak diperbolehkan pada nama"
 
-#: src/gui/setup_players.cpp:336
-msgid "Visible names"
-msgstr "Nama yang tampak"
-
-#: src/gui/setup_players.cpp:341
+#: src/gui/setup_players.cpp:75
 msgid "Show statuses"
 msgstr "Perlihatkan status"
 
-#: src/gui/setup_theme.cpp:105
+#: src/gui/setup_relations.cpp:65
+msgid "Relation"
+msgstr "Hubungan"
+
+#: src/gui/setup_relations.cpp:70
+msgid "Neutral"
+msgstr "Netral"
+
+#: src/gui/setup_relations.cpp:71
+msgid "Friend"
+msgstr "Teman"
+
+#: src/gui/setup_relations.cpp:72
+msgid "Disregarded"
+msgstr "Diabaikan"
+
+#: src/gui/setup_relations.cpp:73
+msgid "Ignored"
+msgstr "Ditolak"
+
+#: src/gui/setup_relations.cpp:74
+msgid "Erased"
+msgstr "Dihapus"
+
+#: src/gui/setup_relations.cpp:239
+msgid "Allow trading"
+msgstr "Perbolehkan penukaran"
+
+#: src/gui/setup_relations.cpp:241
+msgid "Allow whispers"
+msgstr "Perbolehkan berbisik"
+
+#: src/gui/setup_relations.cpp:244
+msgid "Old"
+msgstr "Lama"
+
+#: src/gui/setup_relations.cpp:246
+#, fuzzy
+msgid "Relations"
+msgstr "Hubungan"
+
+#: src/gui/setup_relations.cpp:271
+msgid "When ignoring:"
+msgstr "Ketika menolak:"
+
+#: src/gui/setup_theme.cpp:106
 msgid "Tiny (10)"
 msgstr "Sangat kecil (10)"
 
-#: src/gui/setup_theme.cpp:106
+#: src/gui/setup_theme.cpp:107
 msgid "Small (11)"
 msgstr "Kecil (11)"
 
-#: src/gui/setup_theme.cpp:107
+#: src/gui/setup_theme.cpp:108
 msgid "Medium (12)"
 msgstr "Sedang (12)"
 
-#: src/gui/setup_theme.cpp:108
+#: src/gui/setup_theme.cpp:109
 msgid "Large (13)"
 msgstr "Besar (13)"
 
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:110
 msgid "Big (14)"
 msgstr "Sangat besar (14)"
 
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:111
 msgid "Huge (15)"
 msgstr "Sangat besar sekali (15)"
 
-#: src/gui/setup_theme.cpp:140
+#: src/gui/setup_theme.cpp:141
 msgid "Theme"
 msgstr "Tema"
 
-#: src/gui/setup_theme.cpp:142
+#: src/gui/setup_theme.cpp:143
 msgid "Gui theme"
 msgstr "Tema Gui"
 
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:144
 msgid "Main Font"
 msgstr "Jenis huruf utama"
 
-#: src/gui/setup_theme.cpp:144
+#: src/gui/setup_theme.cpp:145
 msgid "Bold font"
 msgstr "Jenis huruf tebal"
 
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:146
 msgid "Particle font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:147
 msgid "Help font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:148
 msgid "Secure font"
 msgstr "Jenis huruf/Karakter yang diperbolehkan"
 
-#: src/gui/setup_theme.cpp:175
+#: src/gui/setup_theme.cpp:176
 msgid "Font size"
 msgstr "Ukuran huruf"
 
-#: src/gui/setup_theme.cpp:281
+#: src/gui/setup_theme.cpp:282
 msgid "Theme Changed"
 msgstr "Tema diganti"
 
-#: src/gui/setup_theme.cpp:282 src/gui/setup_video.cpp:670
-#: src/gui/setup_video.cpp:675
+#: src/gui/setup_theme.cpp:283 src/gui/setup_video.cpp:619
+#: src/gui/setup_video.cpp:624
 msgid "Restart your client for the change to take effect."
 msgstr "Restart client anda untuk memberikan efek."
 
@@ -2265,134 +2325,114 @@ msgstr "sedang"
 msgid "max"
 msgstr "maksimal"
 
-#: src/gui/setup_video.cpp:293
+#: src/gui/setup_video.cpp:288
 msgid "Full screen"
 msgstr "Layar penuh"
 
-#: src/gui/setup_video.cpp:294
-msgid "Hw acceleration"
-msgstr "Akselerasi perangkat keras"
-
-#: src/gui/setup_video.cpp:295
+#: src/gui/setup_video.cpp:289
 msgid "Custom cursor"
 msgstr "Modifikasi kursor"
 
-#: src/gui/setup_video.cpp:297
+#: src/gui/setup_video.cpp:291
 msgid "Particle effects"
 msgstr "Efek partikel"
 
-#: src/gui/setup_video.cpp:299
+#: src/gui/setup_video.cpp:293
 msgid "Show pickup notification"
 msgstr "Perlihatkan notifikasi pengambilan item"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:301
+#: src/gui/setup_video.cpp:295
 msgid "in chat"
 msgstr "dalam obrolan"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:303
+#: src/gui/setup_video.cpp:297
 msgid "as particle"
 msgstr "sebagai partikel"
 
-#: src/gui/setup_video.cpp:305
-msgid "Enable opacity cache"
-msgstr ""
-
-#: src/gui/setup_video.cpp:306
-msgid "Enable map reduce"
-msgstr ""
-
-#: src/gui/setup_video.cpp:308
-msgid "Auto adjust perfomance"
-msgstr ""
-
-#: src/gui/setup_video.cpp:310
-msgid "Show beings transparency"
-msgstr ""
-
-#: src/gui/setup_video.cpp:315
+#: src/gui/setup_video.cpp:302
 msgid "FPS limit:"
 msgstr "Batas FPS:"
 
-#: src/gui/setup_video.cpp:319 src/gui/setup_video.cpp:356
-#: src/gui/setup_video.cpp:607 src/gui/setup_video.cpp:760
+#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
+#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709
 msgid "Alt FPS limit: "
 msgstr "batas Alt FPS:"
 
-#: src/gui/setup_video.cpp:328
+#: src/gui/setup_video.cpp:315
 msgid "Video"
 msgstr "Video"
 
-#: src/gui/setup_video.cpp:334
+#: src/gui/setup_video.cpp:321
 msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:335
+#: src/gui/setup_video.cpp:322
 msgid "Gui opacity"
 msgstr ""
 
-#: src/gui/setup_video.cpp:336
+#: src/gui/setup_video.cpp:323
 msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_video.cpp:337
+#: src/gui/setup_video.cpp:324
 msgid "Particle detail"
 msgstr "Detil partikel"
 
-#: src/gui/setup_video.cpp:354 src/gui/setup_video.cpp:357
-#: src/gui/setup_video.cpp:606 src/gui/setup_video.cpp:747
-#: src/gui/setup_video.cpp:758
+#: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
+#: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
+#: src/gui/setup_video.cpp:707
 msgid "None"
 msgstr "Tidak ada"
 
-#: src/gui/setup_video.cpp:511
+#: src/gui/setup_video.cpp:484
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:517
+#: src/gui/setup_video.cpp:490
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:528
+#: src/gui/setup_video.cpp:501
 msgid "Switching to Full Screen"
 msgstr "Mengubah ke mode Layar penuh"
 
-#: src/gui/setup_video.cpp:529
+#: src/gui/setup_video.cpp:502
 msgid "Restart needed for changes to take effect."
 msgstr "Memulai dari awal di butuhkan untuk melihat efek"
 
-#: src/gui/setup_video.cpp:541
+#: src/gui/setup_video.cpp:514
 msgid "Changing to OpenGL"
 msgstr "Mengubah ke OpenGL"
 
-#: src/gui/setup_video.cpp:542
+#: src/gui/setup_video.cpp:515
 msgid "Applying change to OpenGL requires restart."
 msgstr "Mendaftar perubahan ke OpenGL membutuhkan memulai dari awal"
 
-#: src/gui/setup_video.cpp:653
+#: src/gui/setup_video.cpp:602
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Modifikasi resolusi (contoh: 1024x768)"
 
-#: src/gui/setup_video.cpp:654
+#: src/gui/setup_video.cpp:603
 msgid "Enter new resolution:                "
 msgstr "Masukkan resolusi baru:"
 
-#: src/gui/setup_video.cpp:669 src/gui/setup_video.cpp:674
+#: src/gui/setup_video.cpp:618 src/gui/setup_video.cpp:623
 msgid "Screen Resolution Changed"
 msgstr "Resolusi layar diubah"
 
-#: src/gui/setup_video.cpp:672
+#: src/gui/setup_video.cpp:621
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:705
+#: src/gui/setup_video.cpp:654
 msgid "Particle Effect Settings Changed."
 msgstr "Pengaturan efek partikel diubah"
 
-#: src/gui/setup_video.cpp:706
+#: src/gui/setup_video.cpp:655
 msgid "Changes will take effect on map change."
 msgstr "Perubahan akan memberikan efek saat pergantian peta."
 
@@ -2421,7 +2461,8 @@ msgstr "Umumkan"
 msgid "Show links in announce"
 msgstr "Perlihatkan link di Umumkan"
 
-#: src/gui/shopwindow.cpp:723 src/net/manaserv/tradehandler.cpp:127
+#: src/gui/shopwindow.cpp:723 src/net/ea/tradehandler.cpp:106
+#: src/net/manaserv/tradehandler.cpp:127
 msgid "Request for Trade"
 msgstr "Meminta untuk menukar"
 
@@ -2463,7 +2504,7 @@ msgstr "Level: %d"
 msgid "Lvl: %d (%+d)"
 msgstr "Level: %d (%+d)"
 
-#: src/gui/socialwindow.cpp:117
+#: src/gui/socialwindow.cpp:117 src/net/ea/gui/guildtab.cpp:52
 msgid "Guild"
 msgstr "Organisasi"
 
@@ -2495,7 +2536,7 @@ msgstr "Tinggalkan organisasi?"
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Apakah anda yakin ingin meninggalkan organisasi %s?"
 
-#: src/gui/socialwindow.cpp:215
+#: src/gui/socialwindow.cpp:215 src/net/ea/gui/partytab.cpp:50
 msgid "Party"
 msgstr "Kelompok"
 
@@ -2657,243 +2698,243 @@ msgstr ""
 msgid "Specials"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:196
+#: src/gui/statuspopup.cpp:197
 msgid "(D) default moves"
 msgstr "(D) jalan normal"
 
-#: src/gui/statuspopup.cpp:201
+#: src/gui/statuspopup.cpp:202
 msgid "(I) invert moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:206
+#: src/gui/statuspopup.cpp:207
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:211
+#: src/gui/statuspopup.cpp:212
 msgid "(C) moves with crazy moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:216
+#: src/gui/statuspopup.cpp:217
 msgid "(d) double normal + crazy"
 msgstr "(d) normal ganda + mode gila"
 
-#: src/gui/statuspopup.cpp:221
+#: src/gui/statuspopup.cpp:222
 msgid "(?) move"
 msgstr "(?) jalan"
 
-#: src/gui/statuspopup.cpp:239
+#: src/gui/statuspopup.cpp:240
 msgid "(a) custom crazy move"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:243
+#: src/gui/statuspopup.cpp:244
 msgid "(?) crazy move"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:253
+#: src/gui/statuspopup.cpp:254
 msgid "(0) default moves to target"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:258
+#: src/gui/statuspopup.cpp:259
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:263
+#: src/gui/statuspopup.cpp:264
 msgid "(2) moves to target in distance 2"
 msgstr "(2) jalan ke target di jarak 2"
 
-#: src/gui/statuspopup.cpp:268
+#: src/gui/statuspopup.cpp:269
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:273
+#: src/gui/statuspopup.cpp:274
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:278
+#: src/gui/statuspopup.cpp:279
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:283
+#: src/gui/statuspopup.cpp:284
 msgid "(A) moves to target in attack range"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:288
+#: src/gui/statuspopup.cpp:289
 msgid "(?) move to target"
 msgstr "(?)bergerak ke target"
 
-#: src/gui/statuspopup.cpp:296
+#: src/gui/statuspopup.cpp:297
 msgid "(D) default follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:300
+#: src/gui/statuspopup.cpp:301
 msgid "(R) relative follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:304
+#: src/gui/statuspopup.cpp:305
 msgid "(M) mirror follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:308
+#: src/gui/statuspopup.cpp:309
 msgid "(P) pet follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:312
+#: src/gui/statuspopup.cpp:313
 msgid "(?) unknown follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:321 src/gui/statuspopup.cpp:344
+#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345
 msgid "(D) default attack"
 msgstr "(D) pukulan normal"
 
-#: src/gui/statuspopup.cpp:326
+#: src/gui/statuspopup.cpp:327
 msgid "(s) switch attack without shield"
 msgstr "(s) ganti pukulan tanpa pelindung"
 
-#: src/gui/statuspopup.cpp:331
+#: src/gui/statuspopup.cpp:332
 msgid "(S) switch attack with shield"
 msgstr "(S) pukulan dengan pelindung"
 
-#: src/gui/statuspopup.cpp:335 src/gui/statuspopup.cpp:360
+#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
 msgid "(?) attack"
 msgstr "(?)serangan"
 
-#: src/gui/statuspopup.cpp:348
+#: src/gui/statuspopup.cpp:349
 msgid "(G) go and attack"
 msgstr "(G) jalan dan serang"
 
-#: src/gui/statuspopup.cpp:352
+#: src/gui/statuspopup.cpp:353
 msgid "(A) go, attack, pickup"
 msgstr "(A) jalan, serang, ambil"
 
-#: src/gui/statuspopup.cpp:356
+#: src/gui/statuspopup.cpp:357
 msgid "(d) without auto attack"
 msgstr "(d) tanpa penyerangan otomatis"
 
-#: src/gui/statuspopup.cpp:374
+#: src/gui/statuspopup.cpp:375
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:378
+#: src/gui/statuspopup.cpp:379
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:382
+#: src/gui/statuspopup.cpp:383
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:386
+#: src/gui/statuspopup.cpp:387
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:390
+#: src/gui/statuspopup.cpp:391
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:394
+#: src/gui/statuspopup.cpp:395
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:398
+#: src/gui/statuspopup.cpp:399
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:402
+#: src/gui/statuspopup.cpp:403
 msgid "(?) pick up"
 msgstr "(?)mengambil"
 
-#: src/gui/statuspopup.cpp:411
+#: src/gui/statuspopup.cpp:412
 msgid "(N) normal map view"
 msgstr "(N) penampilan peta normal"
 
-#: src/gui/statuspopup.cpp:415
+#: src/gui/statuspopup.cpp:416
 msgid "(D) debug map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:419
+#: src/gui/statuspopup.cpp:420
 msgid "(u) ultra map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:423
+#: src/gui/statuspopup.cpp:424
 msgid "(U) ultra map view 2"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:427
+#: src/gui/statuspopup.cpp:428
 msgid "(e) empty map view"
 msgstr "(e) penampilan peta kosong"
 
-#: src/gui/statuspopup.cpp:431
+#: src/gui/statuspopup.cpp:432
 msgid "(b) black & white map view"
 msgstr "(b)penampilan peta hitam & putih"
 
-#: src/gui/statuspopup.cpp:435
+#: src/gui/statuspopup.cpp:436
 msgid "(?) map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:443
+#: src/gui/statuspopup.cpp:444
 msgid "(f) use #flar for magic attack"
 msgstr "(f) gunakan #flar untuk serangan magic"
 
-#: src/gui/statuspopup.cpp:448
+#: src/gui/statuspopup.cpp:449
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) gunakan #chiza untuk serangan magic"
 
-#: src/gui/statuspopup.cpp:453
+#: src/gui/statuspopup.cpp:454
 msgid "(I) use #ingrav for magic attack"
 msgstr "(l) gunakan #ingrav untuk serangan magic"
 
-#: src/gui/statuspopup.cpp:458
+#: src/gui/statuspopup.cpp:459
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) gunakan #frillyar untuk serangan magic"
 
-#: src/gui/statuspopup.cpp:463
+#: src/gui/statuspopup.cpp:464
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) gunakan #upmarmu untuk serangan magic"
 
-#: src/gui/statuspopup.cpp:467
+#: src/gui/statuspopup.cpp:468
 msgid "(?) magic attack"
 msgstr "(?) serangan magic"
 
-#: src/gui/statuspopup.cpp:476
+#: src/gui/statuspopup.cpp:477
 msgid "(D) default imitation"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:480
+#: src/gui/statuspopup.cpp:481
 msgid "(O) outfits imitation"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:484
+#: src/gui/statuspopup.cpp:485
 msgid "(?) imitation"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:493
+#: src/gui/statuspopup.cpp:494
 msgid "(O) on keyboard"
 msgstr "(O) pada keyboard"
 
-#: src/gui/statuspopup.cpp:496
+#: src/gui/statuspopup.cpp:497
 msgid "(A) away"
 msgstr "(A) pergi"
 
-#: src/gui/statuspopup.cpp:499 src/gui/statuspopup.cpp:519
+#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
 msgid "(?) away"
 msgstr "(?) pergi"
 
-#: src/gui/statuspopup.cpp:507
+#: src/gui/statuspopup.cpp:508
 msgid "(G) game camera mode"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:511
+#: src/gui/statuspopup.cpp:512
 msgid "(F) free camera mode"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:515
+#: src/gui/statuspopup.cpp:516
 msgid "(D) design camera mode"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:526
+#: src/gui/statuspopup.cpp:527
 msgid "Game modifiers are disabled"
 msgstr "Perombakan game tidak diperbolehkan"
 
-#: src/gui/statuspopup.cpp:531
+#: src/gui/statuspopup.cpp:532
 msgid "Game modifiers are enabled"
 msgstr "Perombakan game diperbolehkan"
 
@@ -3072,87 +3113,87 @@ msgstr "(b)"
 msgid "(O)"
 msgstr "(O)"
 
-#: src/gui/textcommandeditor.cpp:112
+#: src/gui/textcommandeditor.cpp:113
 msgid "No Target"
 msgstr "Tidak ada target"
 
-#: src/gui/textcommandeditor.cpp:113
+#: src/gui/textcommandeditor.cpp:114
 msgid "Allow Target"
 msgstr "Perbolehkan Target"
 
-#: src/gui/textcommandeditor.cpp:114
+#: src/gui/textcommandeditor.cpp:115
 msgid "Need Target"
 msgstr "Membutuhkan Target"
 
-#: src/gui/textcommandeditor.cpp:119
+#: src/gui/textcommandeditor.cpp:120
 msgid "General Magic"
 msgstr "Sihir dasar"
 
-#: src/gui/textcommandeditor.cpp:120
+#: src/gui/textcommandeditor.cpp:121
 msgid "Life Magic"
 msgstr "Sihir kehidupan"
 
-#: src/gui/textcommandeditor.cpp:121
+#: src/gui/textcommandeditor.cpp:122
 msgid "War Magic"
 msgstr "Sihir perang"
 
-#: src/gui/textcommandeditor.cpp:122
+#: src/gui/textcommandeditor.cpp:123
 msgid "Transmute Magic"
 msgstr "Sihir transmutasi"
 
-#: src/gui/textcommandeditor.cpp:123
+#: src/gui/textcommandeditor.cpp:124
 msgid "Nature Magic"
 msgstr "Sihir alam"
 
-#: src/gui/textcommandeditor.cpp:124
+#: src/gui/textcommandeditor.cpp:125
 msgid "Astral Magic"
 msgstr "Sihir Astral"
 
-#: src/gui/textcommandeditor.cpp:167
+#: src/gui/textcommandeditor.cpp:168
 msgid "Command Editor"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:184
+#: src/gui/textcommandeditor.cpp:185
 msgid "magic"
 msgstr "sihir"
 
-#: src/gui/textcommandeditor.cpp:188
+#: src/gui/textcommandeditor.cpp:189
 msgid "other"
 msgstr "lainnya"
 
-#: src/gui/textcommandeditor.cpp:193
+#: src/gui/textcommandeditor.cpp:194
 msgid "Symbol:"
 msgstr "Simbol:"
 
-#: src/gui/textcommandeditor.cpp:196
+#: src/gui/textcommandeditor.cpp:197
 msgid "Command:"
 msgstr "Perintah:"
 
-#: src/gui/textcommandeditor.cpp:199
+#: src/gui/textcommandeditor.cpp:200
 msgid "Mana:"
 msgstr "Mana:"
 
-#: src/gui/textcommandeditor.cpp:205
+#: src/gui/textcommandeditor.cpp:206
 msgid "Target Type:"
 msgstr "Tipe target:"
 
-#: src/gui/textcommandeditor.cpp:211
+#: src/gui/textcommandeditor.cpp:212
 msgid "Icon:"
 msgstr "Ikon:"
 
-#: src/gui/textcommandeditor.cpp:217
+#: src/gui/textcommandeditor.cpp:218
 msgid "Magic level:"
 msgstr "Level sihir:"
 
-#: src/gui/textcommandeditor.cpp:223
+#: src/gui/textcommandeditor.cpp:224
 msgid "Magic School:"
 msgstr "Sekolah sihir:"
 
-#: src/gui/textcommandeditor.cpp:229
+#: src/gui/textcommandeditor.cpp:230
 msgid "School level:"
 msgstr "Level sekolah:"
 
-#: src/gui/textcommandeditor.cpp:234
+#: src/gui/textcommandeditor.cpp:235
 msgid "Save"
 msgstr "Simpan"
 
@@ -3190,8 +3231,7 @@ msgid "Change"
 msgstr "Ubah"
 
 #: src/gui/tradewindow.cpp:332
-msgid ""
-"Failed adding item. You can not overlap one kind of item on the window."
+msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
 #: src/gui/tradewindow.cpp:377
@@ -3381,23 +3421,23 @@ msgstr ""
 msgid "Road Point"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:470
+#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:471
 msgid "Who Is Online - Updating"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:100
+#: src/gui/whoisonline.cpp:101
 msgid "Update"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:293
+#: src/gui/whoisonline.cpp:294
 msgid "Who Is Online - "
 msgstr ""
 
-#: src/gui/whoisonline.cpp:484
+#: src/gui/whoisonline.cpp:485
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:515
+#: src/gui/whoisonline.cpp:516
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -3462,6 +3502,7 @@ msgid "This command makes <nick> a channel operator."
 msgstr ""
 
 #: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
+#: src/net/ea/gui/guildtab.cpp:69 src/net/ea/gui/partytab.cpp:85
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr "Jika <nama> mempunyai spasi, ditutup dengan tanda (\")."
 
@@ -3532,8 +3573,7 @@ msgid "Command: /unignore <player>"
 msgstr "perintah: /unignore <nama pemain>"
 
 #: src/gui/widgets/whispertab.cpp:131
-msgid ""
-"This command stops ignoring the other player if they are being ignored."
+msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
 #: src/gui/windowmenu.cpp:65
@@ -4193,117 +4233,836 @@ msgstr ""
 msgid "Unable to buy."
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
-msgid "Strength"
+#: src/net/ea/charserverhandler.cpp:63
+msgid "Strength:"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:167
+#: src/net/ea/charserverhandler.cpp:64
+msgid "Agility:"
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:65
+msgid "Vitality:"
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:66
+msgid "Intelligence:"
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:67
+msgid "Dexterity:"
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:68
+msgid "Luck:"
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:102
+msgid "Access denied. Most likely, there are too many players on this server."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:106
+#, fuzzy
+msgid "Cannot use this ID."
+msgstr "Tidak dapat mengirimkan pesan tanpa nama"
+
+#: src/net/ea/charserverhandler.cpp:109
+msgid "Unknown char-server failure."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:138
+msgid "Failed to create character. Most likely the name is already taken."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:237
+msgid "Wrong name."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:145
+#, fuzzy
+msgid "Incorrect stats."
+msgstr "Sandi tidak benar"
+
+#: src/net/ea/charserverhandler.cpp:148
+#, fuzzy
+msgid "Incorrect hair."
+msgstr "Sandi tidak benar"
+
+#: src/net/ea/charserverhandler.cpp:151
+#, fuzzy
+msgid "Incorrect slot."
+msgstr "Sandi tidak benar"
+
+#: src/net/ea/charserverhandler.cpp:166 src/net/manaserv/charhandler.cpp:210
+msgid "Info"
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:166
+#, fuzzy
+msgid "Character deleted."
+msgstr "Konfirmasi penghapusan karakter"
+
+#: src/net/ea/charserverhandler.cpp:172
+#, fuzzy
+msgid "Failed to delete character."
+msgstr "Masukan Sandi untuk menghapus karakter"
+
+#: src/net/ea/chathandler.cpp:60 src/net/ea/chathandler.cpp:66
+#: src/net/ea/chathandler.cpp:71 src/net/ea/chathandler.cpp:77
+#: src/net/ea/chathandler.cpp:82 src/net/ea/chathandler.cpp:88
+#: src/net/ea/chathandler.cpp:95 src/net/ea/chathandler.cpp:101
+msgid "Channels are not supported!"
+msgstr ""
+
+#: src/net/ea/chathandler.cpp:128
 #, c-format
-msgid "Strength %+.1f"
+msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
-msgid "Agility"
+#: src/net/ea/chathandler.cpp:136
+#, fuzzy, c-format
+msgid "Whisper could not be sent, ignored by %s."
+msgstr "Pemain tidak dapat diabaikan"
+
+#: src/net/ea/chathandler.cpp:348
+#, fuzzy
+msgid "MVP player."
+msgstr "Pemain"
+
+#: src/net/ea/chathandler.cpp:352
+#, fuzzy
+msgid "MVP player: "
+msgstr "Pemain"
+
+#: src/net/ea/gamehandler.cpp:86
+#, c-format
+msgid "Online users: %d"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:180
+#: src/net/ea/gamehandler.cpp:98
+msgid "Game"
+msgstr ""
+
+#: src/net/ea/gamehandler.cpp:98
+#, fuzzy
+msgid "Request to quit denied!"
+msgstr "Meminta untuk menukar"
+
+#: src/net/ea/gui/guildtab.cpp:67 src/net/ea/gui/partytab.cpp:83
+#, fuzzy
+msgid "Command: /invite <nick>"
+msgstr "perintah: /unignore <nama pemain>"
+
+#: src/net/ea/gui/guildtab.cpp:68
+msgid "This command invites <nick> to the guild you're in."
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:74 src/net/ea/gui/partytab.cpp:90
+#, fuzzy
+msgid "Command: /leave"
+msgstr "Perintah:"
+
+#: src/net/ea/gui/guildtab.cpp:75
+msgid "This command causes the player to leave the guild."
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:135 src/net/ea/gui/partytab.cpp:69
+msgid "/help > Display this help."
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:136
+msgid "/invite > Invite a player to your guild"
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:137
+msgid "/leave > Leave the guild you are in"
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:138
+msgid "/kick > Kick some one from the guild you are in"
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
+msgid "Guild created."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:88 src/net/ea/guildhandler.cpp:93
+msgid "You are already in guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:98
+msgid "Emperium check failed."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:103
+msgid "Unknown server response."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:180
+#, fuzzy, c-format
+msgid "Guild name: %s"
+msgstr "Organisasi: %s"
+
+#: src/net/ea/guildhandler.cpp:182
+#, fuzzy, c-format
+msgid "Guild master: %s"
+msgstr "Organisasi: %s"
+
+#: src/net/ea/guildhandler.cpp:184
+#, fuzzy, c-format
+msgid "Guild level: %d"
+msgstr "Tingkatan: %d"
+
+#: src/net/ea/guildhandler.cpp:186
 #, c-format
-msgid "Agility %+.1f"
+msgid "Online members: %d"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
-msgid "Dexterity"
+#: src/net/ea/guildhandler.cpp:188
+#, c-format
+msgid "Max members: %d"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:193
+#: src/net/ea/guildhandler.cpp:190
+#, fuzzy, c-format
+msgid "Average level: %d"
+msgstr "Level sihir:"
+
+#: src/net/ea/guildhandler.cpp:192
+#, fuzzy, c-format
+msgid "Guild exp: %d"
+msgstr "Organisasi: %s"
+
+#: src/net/ea/guildhandler.cpp:194
 #, c-format
-msgid "Dexterity %+.1f"
+msgid "Guild next exp: %d"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
-msgid "Vitality"
+#: src/net/ea/guildhandler.cpp:196
+#, fuzzy, c-format
+msgid "Guild castle: %s"
+msgstr "Organisasi: %s"
+
+#: src/net/ea/guildhandler.cpp:402
+#, fuzzy
+msgid "Could not inivte user to guild."
+msgstr "Pengguna yang diajak %s ke organisasi %s."
+
+#: src/net/ea/guildhandler.cpp:406
+msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:206
+#: src/net/ea/guildhandler.cpp:410
+msgid "User is now part of your guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:414
+msgid "Your guild is full."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:418
+msgid "Unknown guild invite response."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:438
+msgid "You have left the guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:452
 #, c-format
-msgid "Vitality %+.1f"
+msgid "%s has left your guild."
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
-msgid "Intelligence"
+#: src/net/ea/guildhandler.cpp:483
+#, fuzzy
+msgid "You was kicked from guild."
+msgstr "Keluarkan dari organisasi"
+
+#: src/net/ea/guildhandler.cpp:496
+#, fuzzy, c-format
+msgid "%s has kicked from your guild."
+msgstr "Keluarkan dari organisasi"
+
+#: src/net/ea/gui/partytab.cpp:70
+msgid "/invite > Invite a player to your party"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:219
+#: src/net/ea/gui/partytab.cpp:71
+msgid "/leave > Leave the party you are in"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:72
+msgid "/kick > Kick some one from the party you are in"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:73
+msgid "/item > Show/change party item sharing options"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:74
+msgid "/exp > Show/change party experience sharing options"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:84
+msgid "This command invites <nick> to party with you."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:91
+msgid "This command causes the player to leave the party."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:95
+#, fuzzy
+msgid "Command: /item <policy>"
+msgstr "perintah: /unignore <nama pemain>"
+
+#: src/net/ea/gui/partytab.cpp:97
+msgid "This command changes the party's item sharing policy."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:98
+msgid ""
+"<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
+"\"0\", \"no\", \"false\" to disable item sharing."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:101
+#, fuzzy
+msgid "Command: /item"
+msgstr "Perintah:"
+
+#: src/net/ea/gui/partytab.cpp:102
+msgid "This command displays the party's current item sharing policy."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:107
+#, fuzzy
+msgid "Command: /exp <policy>"
+msgstr "perintah: /unignore <nama pemain>"
+
+#: src/net/ea/gui/partytab.cpp:108
+msgid "This command changes the party's experience sharing policy."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:110
+msgid ""
+"<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
+"sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:113
+#, fuzzy
+msgid "Command: /exp"
+msgstr "Perintah:"
+
+#: src/net/ea/gui/partytab.cpp:114
+msgid "This command displays the party's current experience sharing policy."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:286
+msgid "Item sharing enabled."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:296
+msgid "Item sharing disabled."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:306
+msgid "Item sharing not possible."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:157
+msgid "Item sharing unknown."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:248
+msgid "Experience sharing enabled."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:258
+msgid "Experience sharing disabled."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:268
+msgid "Experience sharing not possible."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:196
+msgid "Experience sharing unknown."
+msgstr ""
+
+#: src/net/ea/inventoryhandler.cpp:407
+#, fuzzy
+msgid "Failed to use item."
+msgstr "Mencoba mengambil item yang tidak lagi ada"
+
+#: src/net/ea/inventoryhandler.cpp:580
+#, fuzzy
+msgid "Unable to equip."
+msgstr "Lepaskan"
+
+#: src/net/ea/loginhandler.cpp:131
+msgid "Account was not found. Please re-login."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127
+msgid "Old password incorrect."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:137
+msgid "New password too short."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:243
+#: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
+#: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
+#: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
+msgid "Unknown error."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:205
+#, fuzzy
+msgid "Unregistered ID."
+msgstr "Tidak jadi mendaftar"
+
+#: src/net/ea/loginhandler.cpp:208
+#, fuzzy
+msgid "Wrong password."
+msgstr "Masukkan sandi"
+
+#: src/net/ea/loginhandler.cpp:211
+msgid "Account expired."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:214
+msgid "Rejected from server."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:217
+msgid ""
+"You have been permanently banned from the game. Please contact the GM team."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:221
+msgid "Client too old."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:224
 #, c-format
-msgid "Intelligence %+.1f"
+msgid ""
+"You have been temporarily banned from the game until %s.\n"
+"Please contact the GM team via the forums."
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:225
-msgid "Willpower"
+#: src/net/ea/loginhandler.cpp:231
+msgid "Server overpopulated."
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:232
+#: src/net/ea/loginhandler.cpp:234
+msgid "This user name is already taken."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:240
+msgid "Username permanently erased."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:82
+msgid "Could not create party."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:84
+#, fuzzy
+msgid "Party successfully created."
+msgstr "Pemain telah berhasil dihapus"
+
+#: src/net/ea/partyhandler.cpp:140
 #, c-format
-msgid "Willpower %+.1f"
+msgid "%s has joined your party."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:176
+#, c-format
+msgid "%s is already a member of a party."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:181
+#, c-format
+msgid "%s refused your invitation."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:186
+#, c-format
+msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/partyhandler.cpp:191
+#, c-format
+msgid "%s can't join your party because party is full."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:196
+#, c-format
+msgid "QQQ Unknown invite response for %s."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:356
+msgid "You have left the party."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:368
+#, c-format
+msgid "%s has left your party."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:444
+#, c-format
+msgid "An unknown member tried to say: %s"
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:95 src/net/manaserv/beinghandler.cpp:315
 msgid "You are dead."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:316
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:318
 msgid "You are not that alive anymore."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:319
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:320
 msgid "Game Over!"
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:101
+msgid "Insert coin to continue."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:321
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:323
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:325
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:325
 msgid "I guess this did not run too well."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:326
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:326
 msgid "Do you want your possessions identified?"
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:327
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:327
 msgid "Sadly, no trace of you was ever found..."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:329
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:329
 msgid "Annihilated."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:330
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:330
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:332
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:332
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
 
+#: src/net/ea/playerhandler.cpp:119
+msgid "You're not dead yet. You're just resting."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:120
+#, fuzzy
+msgid "You are no more."
+msgstr "Anda tidak memiliki cukup uang."
+
+#: src/net/ea/playerhandler.cpp:121
+msgid "You have ceased to be."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:122
+msgid "You've expired and gone to meet your maker."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:123
+msgid "You're a stiff."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:124
+msgid "Bereft of life, you rest in peace."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:125
+msgid "If you weren't so animated, you'd be pushing up the daisies."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:126
+msgid "Your metabolic processes are now history."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:127
+msgid "You're off the twig."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:128
+msgid "You've kicked the bucket."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:129
+msgid ""
+"You've shuffled off your mortal coil, run down the curtain and joined the "
+"bleedin' choir invisibile."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:131
+#, fuzzy
+msgid "You are an ex-player."
+msgstr "Target pemain yang mati"
+
+#: src/net/ea/playerhandler.cpp:132
+msgid "You're pining for the fjords."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
+#: src/net/ea/playerhandler.cpp:425
+#, fuzzy
+msgid "Message"
+msgstr "Pesan"
+
+#: src/net/ea/playerhandler.cpp:337
+msgid ""
+"You are carrying more than half your weight. You are unable to regain health."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:347
+msgid "You are carrying less than half your weight. You can regain health."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:451
+#, c-format
+msgid "You picked up %s."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:457
+#, fuzzy, c-format
+msgid "You spent %s."
+msgstr "Kamu mendapatkan %s"
+
+#: src/net/ea/playerhandler.cpp:501
+msgid "Cannot raise skill!"
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:618
+#, fuzzy
+msgid "Equip arrows first."
+msgstr "Copot lebih dahulu"
+
+#: src/net/ea/specialhandler.cpp:149
+msgid "Trade failed!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:152
+msgid "Emote failed!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:155
+#, fuzzy
+msgid "Sit failed!"
+msgstr "Gagal menyimpan screenshot!"
+
+#: src/net/ea/specialhandler.cpp:158
+#, fuzzy
+msgid "Chat creating failed!"
+msgstr "Gagal menyimpan screenshot!"
+
+#: src/net/ea/specialhandler.cpp:161
+#, fuzzy
+msgid "Could not join party!"
+msgstr "Tidak dapat menampilkan peta"
+
+#: src/net/ea/specialhandler.cpp:164
+msgid "Cannot shout!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:177
+msgid "You have not yet reached a high enough lvl!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:181
+msgid "Insufficient HP!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:184
+msgid "Insufficient SP!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:187
+#, fuzzy
+msgid "You have no memos!"
+msgstr "Anda tidak memiliki cukup uang."
+
+#: src/net/ea/specialhandler.cpp:190
+msgid "You cannot do that right now!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:193
+msgid "Seems you need more money... ;-)"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:196
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:200
+msgid "You need another red gem!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:203
+msgid "You need another blue gem!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:206
+msgid "You're carrying to much to do this!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:209
+msgid "Huh? What's that?"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:220
+msgid "Warp failed..."
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:223
+msgid "Could not steal anything..."
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:226
+msgid "Poison had no effect..."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:128
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:130
+msgid "Trading isn't possible. Trade partner is too far away."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:134
+msgid "Trading isn't possible. Character doesn't exist."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:138
+msgid "Trade cancelled due to an unknown reason."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:146
+#, fuzzy, c-format
+msgid "Trade: You and %s"
+msgstr "Tukar: Anda"
+
+#: src/net/ea/tradehandler.cpp:156
+#, c-format
+msgid "Trade with %s cancelled."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:169
+msgid "Unhandled trade cancel packet."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:231
+msgid "Failed adding item. Trade partner is over weighted."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:236
+msgid "Failed adding item. Trade partner has no free slot."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:241
+msgid "Failed adding item. You can't trade this item."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:245
+msgid "Failed adding item for unknown reason."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:264 src/net/manaserv/tradehandler.cpp:160
+msgid "Trade canceled."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:275 src/net/manaserv/tradehandler.cpp:167
+msgid "Trade completed."
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
+msgid "Strength"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:167
+#, c-format
+msgid "Strength %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
+msgid "Agility"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:180
+#, c-format
+msgid "Agility %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
+msgid "Dexterity"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:193
+#, c-format
+msgid "Dexterity %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
+msgid "Vitality"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:206
+#, c-format
+msgid "Vitality %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
+msgid "Intelligence"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:219
+#, c-format
+msgid "Intelligence %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:225
+msgid "Willpower"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:232
+#, c-format
+msgid "Willpower %+.1f"
+msgstr ""
+
 #: src/net/manaserv/beinghandler.cpp:337
 msgid "Press OK to respawn."
 msgstr ""
@@ -4357,16 +5116,6 @@ msgstr ""
 msgid "Invalid slot number."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
-#: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
-#: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
-msgid "Unknown error."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:210
-msgid "Info"
-msgstr ""
-
 #: src/net/manaserv/charhandler.cpp:210
 msgid "Player deleted."
 msgstr ""
@@ -4430,10 +5179,6 @@ msgstr ""
 msgid "Unknown channel event."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:85
-msgid "Guild created."
-msgstr ""
-
 #: src/net/manaserv/guildhandler.cpp:90
 msgid "Error creating guild."
 msgstr ""
@@ -4466,10 +5211,6 @@ msgstr ""
 msgid "New password incorrect."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:127
-msgid "Old password incorrect."
-msgstr ""
-
 #: src/net/manaserv/loginhandler.cpp:131 src/net/manaserv/loginhandler.cpp:163
 msgid "Account not connected. Please login first."
 msgstr ""
@@ -4545,24 +5286,11 @@ msgstr ""
 msgid "Ignoring incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:128
-#, c-format
-msgid "%s wants to trade with you, do you accept?"
-msgstr ""
-
 #: src/net/manaserv/tradehandler.cpp:146
 #, c-format
 msgid "Trading with %s"
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:160
-msgid "Trade canceled."
-msgstr ""
-
-#: src/net/manaserv/tradehandler.cpp:167
-msgid "Trade completed."
-msgstr ""
-
 #: src/net/tmwa/adminhandler.cpp:70
 msgid "Kick failed!"
 msgstr ""
@@ -4753,5 +5481,3 @@ msgstr "MP %+d"
 #: src/resources/itemdb.cpp:171
 msgid "Unknown item"
 msgstr ""
-
-
diff --git a/po/manaplus.pot b/po/manaplus.pot
index 71f69d332..7a08621e7 100644
--- a/po/manaplus.pot
+++ b/po/manaplus.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-08 04:26+0300\n"
+"POT-Creation-Date: 2011-08-10 01:11+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -22,25 +22,25 @@ msgstr ""
 msgid "Visible on map"
 msgstr ""
 
-#: src/being.cpp:541
+#: src/being.cpp:542
 msgid "dodge"
 msgstr ""
 
-#: src/being.cpp:541
+#: src/being.cpp:542
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1513
+#: src/being.cpp:1514
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1518
+#: src/being.cpp:1519
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:825 src/gui/setup.cpp:51 src/gui/windowmenu.cpp:100
+#: src/client.cpp:825 src/gui/setup.cpp:53 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr ""
 
@@ -72,7 +72,8 @@ msgstr ""
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
-#: src/gui/unregisterdialog.cpp:137 src/net/manaserv/charhandler.cpp:184
+#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
+#: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr ""
@@ -145,7 +146,7 @@ msgstr ""
 msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:445
+#: src/commandhandler.cpp:445 src/net/ea/gui/partytab.cpp:125
 msgid "Party name is missing."
 msgstr ""
 
@@ -355,35 +356,35 @@ msgstr ""
 msgid "Comment: %s"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:265
+#: src/gui/botcheckerwindow.cpp:266
 msgid "Bot Checker"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:295 src/gui/setup_players.cpp:64
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
 msgid "Name"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:130
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:130
 #: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:604
 #: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
 msgid "Attack"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:275
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:275
 #: src/keyboardconfig.cpp:62
 msgid "Talk"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:241
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:241
 #: src/gui/popupmenu.cpp:280 src/gui/popupmenu.cpp:661
 msgid "Move"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:299
+#: src/gui/botcheckerwindow.cpp:300
 msgid "Result"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:309 src/gui/npcdialog.cpp:123
+#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:123
 msgid "Reset"
 msgstr ""
 
@@ -452,8 +453,8 @@ msgstr ""
 #: src/gui/popupmenu.cpp:1731 src/gui/popupmenu.cpp:1774
 #: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1849
 #: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1935
-#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:68
-#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:237
+#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:70
+#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:238
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
 #: src/gui/updatewindow.cpp:157
 msgid "Cancel"
@@ -622,8 +623,8 @@ msgid "Enter password:"
 msgstr ""
 
 #: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
-#: src/gui/setup_players.cpp:251 src/gui/shopwindow.cpp:120
-#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:240
+#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120
+#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:241
 msgid "Delete"
 msgstr ""
 
@@ -697,10 +698,10 @@ msgid "rainbow 3"
 msgstr ""
 
 #: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
-#: src/gui/logindialog.cpp:78 src/gui/setup_players.cpp:220
-#: src/gui/setup_theme.cpp:71 src/gui/setup_theme.cpp:125
-#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:101
-#: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:159
+#: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
+#: src/gui/setup_theme.cpp:72 src/gui/setup_theme.cpp:126
+#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
+#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
 msgid "???"
 msgstr ""
 
@@ -891,7 +892,7 @@ msgstr ""
 msgid "Auto open this window"
 msgstr ""
 
-#: src/gui/editdialog.cpp:46 src/gui/itemamountwindow.cpp:208
+#: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
 #: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr ""
@@ -975,7 +976,7 @@ msgstr ""
 
 #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
 #: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1724
-#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:69
+#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:71
 msgid "Store"
 msgstr ""
 
@@ -1034,91 +1035,91 @@ msgstr ""
 msgid "Weight: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
+#: src/gui/killstats.cpp:46 src/gui/windowmenu.cpp:69
 msgid "Kill stats"
 msgstr ""
 
-#: src/gui/killstats.cpp:63
+#: src/gui/killstats.cpp:64
 msgid "Reset stats"
 msgstr ""
 
-#: src/gui/killstats.cpp:64
+#: src/gui/killstats.cpp:65
 msgid "Reset timer"
 msgstr ""
 
-#: src/gui/killstats.cpp:68 src/gui/killstats.cpp:204
+#: src/gui/killstats.cpp:69 src/gui/killstats.cpp:205
 #, c-format
 msgid "Level: %d at %f%%"
 msgstr ""
 
-#: src/gui/killstats.cpp:72 src/gui/killstats.cpp:209
+#: src/gui/killstats.cpp:73 src/gui/killstats.cpp:210
 #, c-format
 msgid "Exp: %d/%d Left: %d"
 msgstr ""
 
-#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:215
-#: src/gui/killstats.cpp:224
+#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:216
+#: src/gui/killstats.cpp:225
 #, c-format
 msgid "1%% = %d exp, avg mob for 1%%: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:141
-#: src/gui/killstats.cpp:233
+#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:142
+#: src/gui/killstats.cpp:234
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:80 src/gui/killstats.cpp:143
-#: src/gui/killstats.cpp:219 src/gui/killstats.cpp:229
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
+#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:230
 #, c-format
 msgid "Avg Exp: %s, No. of avg mob to next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:161
-#: src/gui/killstats.cpp:236
+#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:162
+#: src/gui/killstats.cpp:237
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:88 src/gui/killstats.cpp:93
-#: src/gui/killstats.cpp:288 src/gui/killstats.cpp:304
-#: src/gui/killstats.cpp:322
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:89 src/gui/killstats.cpp:94
+#: src/gui/killstats.cpp:289 src/gui/killstats.cpp:305
+#: src/gui/killstats.cpp:323
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
+#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/gui/killstats.cpp:99 src/gui/killstats.cpp:240
+#: src/gui/killstats.cpp:100 src/gui/killstats.cpp:241
 msgid "Last kill exp:"
 msgstr ""
 
-#: src/gui/killstats.cpp:101 src/gui/killstats.cpp:354
-#: src/gui/killstats.cpp:360 src/gui/killstats.cpp:366
-#: src/gui/killstats.cpp:371
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:355
+#: src/gui/killstats.cpp:361 src/gui/killstats.cpp:367
+#: src/gui/killstats.cpp:372
 msgid "Time before jacko spawn:"
 msgstr ""
 
-#: src/gui/killstats.cpp:293 src/gui/killstats.cpp:300
-#: src/gui/killstats.cpp:310 src/gui/killstats.cpp:317
-#: src/gui/killstats.cpp:329 src/gui/killstats.cpp:336
+#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:301
+#: src/gui/killstats.cpp:311 src/gui/killstats.cpp:318
+#: src/gui/killstats.cpp:330 src/gui/killstats.cpp:337
 #, c-format
 msgid "  Time for next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:360
+#: src/gui/killstats.cpp:361
 #, c-format
 msgid "%s %d?"
 msgstr ""
 
-#: src/gui/killstats.cpp:366
+#: src/gui/killstats.cpp:367
 msgid "jacko spawning"
 msgstr ""
 
@@ -1781,34 +1782,38 @@ msgid "Tabs"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:96
-msgid "Log magic messages in debug tab"
+msgid "Put all whispers in tabs"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:99
-msgid "Show server messages in debug tab"
+msgid "Log magic messages in debug tab"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:102
-msgid "Enable trade tab"
+msgid "Show server messages in debug tab"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:105
-msgid "Enable battle tab"
+msgid "Enable trade tab"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:108
-msgid "Show battle events"
+msgid "Enable battle tab"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:111
+msgid "Show battle events"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:114
 msgid "Resize chat tabs if need"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:115
+#: src/gui/setup_chat.cpp:118
 msgid "Time"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:117
+#: src/gui/setup_chat.cpp:120
 msgid "Use local time"
 msgstr ""
 
@@ -1859,16 +1864,15 @@ msgstr ""
 msgid "Alpha:"
 msgstr ""
 
-#: src/gui/setup.cpp:67
+#: src/gui/setup.cpp:69
 msgid "Apply"
 msgstr ""
 
-#: src/gui/setup.cpp:70
+#: src/gui/setup.cpp:72
 msgid "Reset Windows"
 msgstr ""
 
 #: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
-#: src/gui/setup_players.cpp:334
 msgid "Edit"
 msgstr ""
 
@@ -2076,148 +2080,200 @@ msgstr ""
 msgid "Show background"
 msgstr ""
 
-#: src/gui/setup_players.cpp:65
-msgid "Relation"
+#: src/gui/setup_perfomance.cpp:48
+msgid "Perfomance"
 msgstr ""
 
-#: src/gui/setup_players.cpp:70
-msgid "Neutral"
+#: src/gui/setup_perfomance.cpp:55
+msgid "Better perfomance (enable for better perfomance)"
 msgstr ""
 
-#: src/gui/setup_players.cpp:71
-msgid "Friend"
+#: src/gui/setup_perfomance.cpp:58
+msgid "Auto adjust perfomance"
 msgstr ""
 
-#: src/gui/setup_players.cpp:72
-msgid "Disregarded"
+#: src/gui/setup_perfomance.cpp:61
+msgid "Show beings transparency"
 msgstr ""
 
-#: src/gui/setup_players.cpp:73
-msgid "Ignored"
+#: src/gui/setup_perfomance.cpp:64
+msgid "Hw acceleration"
 msgstr ""
 
-#: src/gui/setup_players.cpp:74
-msgid "Erased"
+#: src/gui/setup_perfomance.cpp:67
+msgid "Enable opacity cache (Software, can use many memory)"
 msgstr ""
 
-#: src/gui/setup_players.cpp:247
-msgid "Allow trading"
+#: src/gui/setup_perfomance.cpp:70
+msgid "Enable map reduce (Software)"
 msgstr ""
 
-#: src/gui/setup_players.cpp:249
-msgid "Allow whispers"
+#: src/gui/setup_perfomance.cpp:73
+msgid "Better quality (disable for better perfomance)"
 msgstr ""
 
-#: src/gui/setup_players.cpp:252
-msgid "Old"
+#: src/gui/setup_perfomance.cpp:76
+msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr ""
 
-#: src/gui/setup_players.cpp:254
-msgid "Put all whispers in tabs"
+#: src/gui/setup_perfomance.cpp:80
+msgid "Enable reorder sprites."
 msgstr ""
 
-#: src/gui/setup_players.cpp:257
-msgid "Show gender"
+#: src/gui/setup_perfomance.cpp:83
+msgid "Small memory (enable for lower memory usage)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:86
+msgid "Disable advanced beings caching (Software)"
 msgstr ""
 
-#: src/gui/setup_players.cpp:267
+#: src/gui/setup_perfomance.cpp:89
+msgid "Disable beings caching (Software)"
+msgstr ""
+
+#: src/gui/setup_players.cpp:48
 msgid "Players"
 msgstr ""
 
-#: src/gui/setup_players.cpp:292
-msgid "When ignoring:"
+#: src/gui/setup_players.cpp:54
+msgid "Show gender"
 msgstr ""
 
-#: src/gui/setup_players.cpp:315
+#: src/gui/setup_players.cpp:57
 msgid "Show level"
 msgstr ""
 
-#: src/gui/setup_players.cpp:319
+#: src/gui/setup_players.cpp:60
 msgid "Show own name"
 msgstr ""
 
-#: src/gui/setup_players.cpp:323
+#: src/gui/setup_players.cpp:63
 msgid "Target dead players"
 msgstr ""
 
-#: src/gui/setup_players.cpp:327
+#: src/gui/setup_players.cpp:66
+msgid "Visible names"
+msgstr ""
+
+#: src/gui/setup_players.cpp:69
 msgid "Secure trades"
 msgstr ""
 
-#: src/gui/setup_players.cpp:331 src/gui/setup_players.cpp:523
+#: src/gui/setup_players.cpp:72
 msgid "Unsecure chars in names"
 msgstr ""
 
-#: src/gui/setup_players.cpp:336
-msgid "Visible names"
+#: src/gui/setup_players.cpp:75
+msgid "Show statuses"
 msgstr ""
 
-#: src/gui/setup_players.cpp:341
-msgid "Show statuses"
+#: src/gui/setup_relations.cpp:65
+msgid "Relation"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:105
-msgid "Tiny (10)"
+#: src/gui/setup_relations.cpp:70
+msgid "Neutral"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:71
+msgid "Friend"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:72
+msgid "Disregarded"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:73
+msgid "Ignored"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:74
+msgid "Erased"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:239
+msgid "Allow trading"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:241
+msgid "Allow whispers"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:244
+msgid "Old"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:246
+msgid "Relations"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:271
+msgid "When ignoring:"
 msgstr ""
 
 #: src/gui/setup_theme.cpp:106
-msgid "Small (11)"
+msgid "Tiny (10)"
 msgstr ""
 
 #: src/gui/setup_theme.cpp:107
-msgid "Medium (12)"
+msgid "Small (11)"
 msgstr ""
 
 #: src/gui/setup_theme.cpp:108
-msgid "Large (13)"
+msgid "Medium (12)"
 msgstr ""
 
 #: src/gui/setup_theme.cpp:109
-msgid "Big (14)"
+msgid "Large (13)"
 msgstr ""
 
 #: src/gui/setup_theme.cpp:110
+msgid "Big (14)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:111
 msgid "Huge (15)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:140
+#: src/gui/setup_theme.cpp:141
 msgid "Theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:142
+#: src/gui/setup_theme.cpp:143
 msgid "Gui theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:144
 msgid "Main Font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:144
+#: src/gui/setup_theme.cpp:145
 msgid "Bold font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:146
 msgid "Particle font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:147
 msgid "Help font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:148
 msgid "Secure font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:175
+#: src/gui/setup_theme.cpp:176
 msgid "Font size"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:281
+#: src/gui/setup_theme.cpp:282
 msgid "Theme Changed"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:282 src/gui/setup_video.cpp:670
-#: src/gui/setup_video.cpp:675
+#: src/gui/setup_theme.cpp:283 src/gui/setup_video.cpp:619
+#: src/gui/setup_video.cpp:624
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
@@ -2269,134 +2325,114 @@ msgstr ""
 msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:293
+#: src/gui/setup_video.cpp:288
 msgid "Full screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:294
-msgid "Hw acceleration"
-msgstr ""
-
-#: src/gui/setup_video.cpp:295
+#: src/gui/setup_video.cpp:289
 msgid "Custom cursor"
 msgstr ""
 
-#: src/gui/setup_video.cpp:297
+#: src/gui/setup_video.cpp:291
 msgid "Particle effects"
 msgstr ""
 
-#: src/gui/setup_video.cpp:299
+#: src/gui/setup_video.cpp:293
 msgid "Show pickup notification"
 msgstr ""
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:301
+#: src/gui/setup_video.cpp:295
 msgid "in chat"
 msgstr ""
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:303
+#: src/gui/setup_video.cpp:297
 msgid "as particle"
 msgstr ""
 
-#: src/gui/setup_video.cpp:305
-msgid "Enable opacity cache"
-msgstr ""
-
-#: src/gui/setup_video.cpp:306
-msgid "Enable map reduce"
-msgstr ""
-
-#: src/gui/setup_video.cpp:308
-msgid "Auto adjust perfomance"
-msgstr ""
-
-#: src/gui/setup_video.cpp:310
-msgid "Show beings transparency"
-msgstr ""
-
-#: src/gui/setup_video.cpp:315
+#: src/gui/setup_video.cpp:302
 msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:319 src/gui/setup_video.cpp:356
-#: src/gui/setup_video.cpp:607 src/gui/setup_video.cpp:760
+#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
+#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709
 msgid "Alt FPS limit: "
 msgstr ""
 
-#: src/gui/setup_video.cpp:328
+#: src/gui/setup_video.cpp:315
 msgid "Video"
 msgstr ""
 
-#: src/gui/setup_video.cpp:334
+#: src/gui/setup_video.cpp:321
 msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:335
+#: src/gui/setup_video.cpp:322
 msgid "Gui opacity"
 msgstr ""
 
-#: src/gui/setup_video.cpp:336
+#: src/gui/setup_video.cpp:323
 msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_video.cpp:337
+#: src/gui/setup_video.cpp:324
 msgid "Particle detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:354 src/gui/setup_video.cpp:357
-#: src/gui/setup_video.cpp:606 src/gui/setup_video.cpp:747
-#: src/gui/setup_video.cpp:758
+#: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
+#: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
+#: src/gui/setup_video.cpp:707
 msgid "None"
 msgstr ""
 
-#: src/gui/setup_video.cpp:511
+#: src/gui/setup_video.cpp:484
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:517
+#: src/gui/setup_video.cpp:490
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:528
+#: src/gui/setup_video.cpp:501
 msgid "Switching to Full Screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:529
+#: src/gui/setup_video.cpp:502
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:541
+#: src/gui/setup_video.cpp:514
 msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:542
+#: src/gui/setup_video.cpp:515
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#: src/gui/setup_video.cpp:653
+#: src/gui/setup_video.cpp:602
 msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:654
+#: src/gui/setup_video.cpp:603
 msgid "Enter new resolution:                "
 msgstr ""
 
-#: src/gui/setup_video.cpp:669 src/gui/setup_video.cpp:674
+#: src/gui/setup_video.cpp:618 src/gui/setup_video.cpp:623
 msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:672
+#: src/gui/setup_video.cpp:621
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:705
+#: src/gui/setup_video.cpp:654
 msgid "Particle Effect Settings Changed."
 msgstr ""
 
-#: src/gui/setup_video.cpp:706
+#: src/gui/setup_video.cpp:655
 msgid "Changes will take effect on map change."
 msgstr ""
 
@@ -2425,7 +2461,8 @@ msgstr ""
 msgid "Show links in announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:723 src/net/manaserv/tradehandler.cpp:127
+#: src/gui/shopwindow.cpp:723 src/net/ea/tradehandler.cpp:106
+#: src/net/manaserv/tradehandler.cpp:127
 msgid "Request for Trade"
 msgstr ""
 
@@ -2467,7 +2504,7 @@ msgstr ""
 msgid "Lvl: %d (%+d)"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:117
+#: src/gui/socialwindow.cpp:117 src/net/ea/gui/guildtab.cpp:52
 msgid "Guild"
 msgstr ""
 
@@ -2499,7 +2536,7 @@ msgstr ""
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:215
+#: src/gui/socialwindow.cpp:215 src/net/ea/gui/partytab.cpp:50
 msgid "Party"
 msgstr ""
 
@@ -2661,243 +2698,243 @@ msgstr ""
 msgid "Specials"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:196
+#: src/gui/statuspopup.cpp:197
 msgid "(D) default moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:201
+#: src/gui/statuspopup.cpp:202
 msgid "(I) invert moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:206
+#: src/gui/statuspopup.cpp:207
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:211
+#: src/gui/statuspopup.cpp:212
 msgid "(C) moves with crazy moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:216
+#: src/gui/statuspopup.cpp:217
 msgid "(d) double normal + crazy"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:221
+#: src/gui/statuspopup.cpp:222
 msgid "(?) move"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:239
+#: src/gui/statuspopup.cpp:240
 msgid "(a) custom crazy move"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:243
+#: src/gui/statuspopup.cpp:244
 msgid "(?) crazy move"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:253
+#: src/gui/statuspopup.cpp:254
 msgid "(0) default moves to target"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:258
+#: src/gui/statuspopup.cpp:259
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:263
+#: src/gui/statuspopup.cpp:264
 msgid "(2) moves to target in distance 2"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:268
+#: src/gui/statuspopup.cpp:269
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:273
+#: src/gui/statuspopup.cpp:274
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:278
+#: src/gui/statuspopup.cpp:279
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:283
+#: src/gui/statuspopup.cpp:284
 msgid "(A) moves to target in attack range"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:288
+#: src/gui/statuspopup.cpp:289
 msgid "(?) move to target"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:296
+#: src/gui/statuspopup.cpp:297
 msgid "(D) default follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:300
+#: src/gui/statuspopup.cpp:301
 msgid "(R) relative follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:304
+#: src/gui/statuspopup.cpp:305
 msgid "(M) mirror follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:308
+#: src/gui/statuspopup.cpp:309
 msgid "(P) pet follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:312
+#: src/gui/statuspopup.cpp:313
 msgid "(?) unknown follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:321 src/gui/statuspopup.cpp:344
+#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345
 msgid "(D) default attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:326
+#: src/gui/statuspopup.cpp:327
 msgid "(s) switch attack without shield"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:331
+#: src/gui/statuspopup.cpp:332
 msgid "(S) switch attack with shield"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:335 src/gui/statuspopup.cpp:360
+#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
 msgid "(?) attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:348
+#: src/gui/statuspopup.cpp:349
 msgid "(G) go and attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:352
+#: src/gui/statuspopup.cpp:353
 msgid "(A) go, attack, pickup"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:356
+#: src/gui/statuspopup.cpp:357
 msgid "(d) without auto attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:374
+#: src/gui/statuspopup.cpp:375
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:378
+#: src/gui/statuspopup.cpp:379
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:382
+#: src/gui/statuspopup.cpp:383
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:386
+#: src/gui/statuspopup.cpp:387
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:390
+#: src/gui/statuspopup.cpp:391
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:394
+#: src/gui/statuspopup.cpp:395
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:398
+#: src/gui/statuspopup.cpp:399
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:402
+#: src/gui/statuspopup.cpp:403
 msgid "(?) pick up"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:411
+#: src/gui/statuspopup.cpp:412
 msgid "(N) normal map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:415
+#: src/gui/statuspopup.cpp:416
 msgid "(D) debug map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:419
+#: src/gui/statuspopup.cpp:420
 msgid "(u) ultra map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:423
+#: src/gui/statuspopup.cpp:424
 msgid "(U) ultra map view 2"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:427
+#: src/gui/statuspopup.cpp:428
 msgid "(e) empty map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:431
+#: src/gui/statuspopup.cpp:432
 msgid "(b) black & white map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:435
+#: src/gui/statuspopup.cpp:436
 msgid "(?) map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:443
+#: src/gui/statuspopup.cpp:444
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:448
+#: src/gui/statuspopup.cpp:449
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:453
+#: src/gui/statuspopup.cpp:454
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:458
+#: src/gui/statuspopup.cpp:459
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:463
+#: src/gui/statuspopup.cpp:464
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:467
+#: src/gui/statuspopup.cpp:468
 msgid "(?) magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:476
+#: src/gui/statuspopup.cpp:477
 msgid "(D) default imitation"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:480
+#: src/gui/statuspopup.cpp:481
 msgid "(O) outfits imitation"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:484
+#: src/gui/statuspopup.cpp:485
 msgid "(?) imitation"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:493
+#: src/gui/statuspopup.cpp:494
 msgid "(O) on keyboard"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:496
+#: src/gui/statuspopup.cpp:497
 msgid "(A) away"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:499 src/gui/statuspopup.cpp:519
+#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
 msgid "(?) away"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:507
+#: src/gui/statuspopup.cpp:508
 msgid "(G) game camera mode"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:511
+#: src/gui/statuspopup.cpp:512
 msgid "(F) free camera mode"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:515
+#: src/gui/statuspopup.cpp:516
 msgid "(D) design camera mode"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:526
+#: src/gui/statuspopup.cpp:527
 msgid "Game modifiers are disabled"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:531
+#: src/gui/statuspopup.cpp:532
 msgid "Game modifiers are enabled"
 msgstr ""
 
@@ -3076,87 +3113,87 @@ msgstr ""
 msgid "(O)"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:112
+#: src/gui/textcommandeditor.cpp:113
 msgid "No Target"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:113
+#: src/gui/textcommandeditor.cpp:114
 msgid "Allow Target"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:114
+#: src/gui/textcommandeditor.cpp:115
 msgid "Need Target"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:119
+#: src/gui/textcommandeditor.cpp:120
 msgid "General Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:120
+#: src/gui/textcommandeditor.cpp:121
 msgid "Life Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:121
+#: src/gui/textcommandeditor.cpp:122
 msgid "War Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:122
+#: src/gui/textcommandeditor.cpp:123
 msgid "Transmute Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:123
+#: src/gui/textcommandeditor.cpp:124
 msgid "Nature Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:124
+#: src/gui/textcommandeditor.cpp:125
 msgid "Astral Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:167
+#: src/gui/textcommandeditor.cpp:168
 msgid "Command Editor"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:184
+#: src/gui/textcommandeditor.cpp:185
 msgid "magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:188
+#: src/gui/textcommandeditor.cpp:189
 msgid "other"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:193
+#: src/gui/textcommandeditor.cpp:194
 msgid "Symbol:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:196
+#: src/gui/textcommandeditor.cpp:197
 msgid "Command:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:199
+#: src/gui/textcommandeditor.cpp:200
 msgid "Mana:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:205
+#: src/gui/textcommandeditor.cpp:206
 msgid "Target Type:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:211
+#: src/gui/textcommandeditor.cpp:212
 msgid "Icon:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:217
+#: src/gui/textcommandeditor.cpp:218
 msgid "Magic level:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:223
+#: src/gui/textcommandeditor.cpp:224
 msgid "Magic School:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:229
+#: src/gui/textcommandeditor.cpp:230
 msgid "School level:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:234
+#: src/gui/textcommandeditor.cpp:235
 msgid "Save"
 msgstr ""
 
@@ -3384,23 +3421,23 @@ msgstr ""
 msgid "Road Point"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:470
+#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:471
 msgid "Who Is Online - Updating"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:100
+#: src/gui/whoisonline.cpp:101
 msgid "Update"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:293
+#: src/gui/whoisonline.cpp:294
 msgid "Who Is Online - "
 msgstr ""
 
-#: src/gui/whoisonline.cpp:484
+#: src/gui/whoisonline.cpp:485
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:515
+#: src/gui/whoisonline.cpp:516
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -3465,6 +3502,7 @@ msgid "This command makes <nick> a channel operator."
 msgstr ""
 
 #: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
+#: src/net/ea/gui/guildtab.cpp:69 src/net/ea/gui/partytab.cpp:85
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
@@ -4196,117 +4234,806 @@ msgstr ""
 msgid "Unable to buy."
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
-msgid "Strength"
+#: src/net/ea/charserverhandler.cpp:63
+msgid "Strength:"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:167
+#: src/net/ea/charserverhandler.cpp:64
+msgid "Agility:"
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:65
+msgid "Vitality:"
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:66
+msgid "Intelligence:"
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:67
+msgid "Dexterity:"
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:68
+msgid "Luck:"
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:102
+msgid "Access denied. Most likely, there are too many players on this server."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:106
+msgid "Cannot use this ID."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:109
+msgid "Unknown char-server failure."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:138
+msgid "Failed to create character. Most likely the name is already taken."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:237
+msgid "Wrong name."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:145
+msgid "Incorrect stats."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:148
+msgid "Incorrect hair."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:151
+msgid "Incorrect slot."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:166 src/net/manaserv/charhandler.cpp:210
+msgid "Info"
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:166
+msgid "Character deleted."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:172
+msgid "Failed to delete character."
+msgstr ""
+
+#: src/net/ea/chathandler.cpp:60 src/net/ea/chathandler.cpp:66
+#: src/net/ea/chathandler.cpp:71 src/net/ea/chathandler.cpp:77
+#: src/net/ea/chathandler.cpp:82 src/net/ea/chathandler.cpp:88
+#: src/net/ea/chathandler.cpp:95 src/net/ea/chathandler.cpp:101
+msgid "Channels are not supported!"
+msgstr ""
+
+#: src/net/ea/chathandler.cpp:128
 #, c-format
-msgid "Strength %+.1f"
+msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
-msgid "Agility"
+#: src/net/ea/chathandler.cpp:136
+#, c-format
+msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:180
+#: src/net/ea/chathandler.cpp:348
+msgid "MVP player."
+msgstr ""
+
+#: src/net/ea/chathandler.cpp:352
+msgid "MVP player: "
+msgstr ""
+
+#: src/net/ea/gamehandler.cpp:86
 #, c-format
-msgid "Agility %+.1f"
+msgid "Online users: %d"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
-msgid "Dexterity"
+#: src/net/ea/gamehandler.cpp:98
+msgid "Game"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:193
+#: src/net/ea/gamehandler.cpp:98
+msgid "Request to quit denied!"
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:67 src/net/ea/gui/partytab.cpp:83
+msgid "Command: /invite <nick>"
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:68
+msgid "This command invites <nick> to the guild you're in."
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:74 src/net/ea/gui/partytab.cpp:90
+msgid "Command: /leave"
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:75
+msgid "This command causes the player to leave the guild."
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:135 src/net/ea/gui/partytab.cpp:69
+msgid "/help > Display this help."
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:136
+msgid "/invite > Invite a player to your guild"
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:137
+msgid "/leave > Leave the guild you are in"
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:138
+msgid "/kick > Kick some one from the guild you are in"
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
+msgid "Guild created."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:88 src/net/ea/guildhandler.cpp:93
+msgid "You are already in guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:98
+msgid "Emperium check failed."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:103
+msgid "Unknown server response."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:180
 #, c-format
-msgid "Dexterity %+.1f"
+msgid "Guild name: %s"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
-msgid "Vitality"
+#: src/net/ea/guildhandler.cpp:182
+#, c-format
+msgid "Guild master: %s"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:206
+#: src/net/ea/guildhandler.cpp:184
 #, c-format
-msgid "Vitality %+.1f"
+msgid "Guild level: %d"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
-msgid "Intelligence"
+#: src/net/ea/guildhandler.cpp:186
+#, c-format
+msgid "Online members: %d"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:219
+#: src/net/ea/guildhandler.cpp:188
 #, c-format
-msgid "Intelligence %+.1f"
+msgid "Max members: %d"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:225
-msgid "Willpower"
+#: src/net/ea/guildhandler.cpp:190
+#, c-format
+msgid "Average level: %d"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:232
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
-msgid "Willpower %+.1f"
+msgid "Guild exp: %d"
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:194
+#, c-format
+msgid "Guild next exp: %d"
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:196
+#, c-format
+msgid "Guild castle: %s"
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:402
+msgid "Could not inivte user to guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:406
+msgid "User rejected guild invite."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:410
+msgid "User is now part of your guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:414
+msgid "Your guild is full."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:418
+msgid "Unknown guild invite response."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:438
+msgid "You have left the guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:452
+#, c-format
+msgid "%s has left your guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:483
+msgid "You was kicked from guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:496
+#, c-format
+msgid "%s has kicked from your guild."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:70
+msgid "/invite > Invite a player to your party"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:71
+msgid "/leave > Leave the party you are in"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:72
+msgid "/kick > Kick some one from the party you are in"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:73
+msgid "/item > Show/change party item sharing options"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:74
+msgid "/exp > Show/change party experience sharing options"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:84
+msgid "This command invites <nick> to party with you."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:91
+msgid "This command causes the player to leave the party."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:95
+msgid "Command: /item <policy>"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:97
+msgid "This command changes the party's item sharing policy."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:98
+msgid ""
+"<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
+"\"0\", \"no\", \"false\" to disable item sharing."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:101
+msgid "Command: /item"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:102
+msgid "This command displays the party's current item sharing policy."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:107
+msgid "Command: /exp <policy>"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:108
+msgid "This command changes the party's experience sharing policy."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:110
+msgid ""
+"<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
+"sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:113
+msgid "Command: /exp"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:114
+msgid "This command displays the party's current experience sharing policy."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:286
+msgid "Item sharing enabled."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:296
+msgid "Item sharing disabled."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:306
+msgid "Item sharing not possible."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:157
+msgid "Item sharing unknown."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:248
+msgid "Experience sharing enabled."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:258
+msgid "Experience sharing disabled."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:268
+msgid "Experience sharing not possible."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:196
+msgid "Experience sharing unknown."
+msgstr ""
+
+#: src/net/ea/inventoryhandler.cpp:407
+msgid "Failed to use item."
+msgstr ""
+
+#: src/net/ea/inventoryhandler.cpp:580
+msgid "Unable to equip."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:131
+msgid "Account was not found. Please re-login."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127
+msgid "Old password incorrect."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:137
+msgid "New password too short."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:243
+#: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
+#: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
+#: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
+msgid "Unknown error."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:205
+msgid "Unregistered ID."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/loginhandler.cpp:208
+msgid "Wrong password."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:211
+msgid "Account expired."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:214
+msgid "Rejected from server."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:217
+msgid ""
+"You have been permanently banned from the game. Please contact the GM team."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:221
+msgid "Client too old."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:224
+#, c-format
+msgid ""
+"You have been temporarily banned from the game until %s.\n"
+"Please contact the GM team via the forums."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:231
+msgid "Server overpopulated."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:234
+msgid "This user name is already taken."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:240
+msgid "Username permanently erased."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:82
+msgid "Could not create party."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:84
+msgid "Party successfully created."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:140
+#, c-format
+msgid "%s has joined your party."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:176
+#, c-format
+msgid "%s is already a member of a party."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:181
+#, c-format
+msgid "%s refused your invitation."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:186
+#, c-format
+msgid "%s is now a member of your party."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:191
+#, c-format
+msgid "%s can't join your party because party is full."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:196
+#, c-format
+msgid "QQQ Unknown invite response for %s."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:356
+msgid "You have left the party."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:368
+#, c-format
+msgid "%s has left your party."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:444
+#, c-format
+msgid "An unknown member tried to say: %s"
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:95 src/net/manaserv/beinghandler.cpp:315
 msgid "You are dead."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:316
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:318
 msgid "You are not that alive anymore."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:319
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:320
 msgid "Game Over!"
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:101
+msgid "Insert coin to continue."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:321
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:323
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:325
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:325
 msgid "I guess this did not run too well."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:326
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:326
 msgid "Do you want your possessions identified?"
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:327
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:327
 msgid "Sadly, no trace of you was ever found..."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:329
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:329
 msgid "Annihilated."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:330
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:330
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:332
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:332
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
 
+#: src/net/ea/playerhandler.cpp:119
+msgid "You're not dead yet. You're just resting."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:120
+msgid "You are no more."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:121
+msgid "You have ceased to be."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:122
+msgid "You've expired and gone to meet your maker."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:123
+msgid "You're a stiff."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:124
+msgid "Bereft of life, you rest in peace."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:125
+msgid "If you weren't so animated, you'd be pushing up the daisies."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:126
+msgid "Your metabolic processes are now history."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:127
+msgid "You're off the twig."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:128
+msgid "You've kicked the bucket."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:129
+msgid ""
+"You've shuffled off your mortal coil, run down the curtain and joined the "
+"bleedin' choir invisibile."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:131
+msgid "You are an ex-player."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:132
+msgid "You're pining for the fjords."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
+#: src/net/ea/playerhandler.cpp:425
+msgid "Message"
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:337
+msgid ""
+"You are carrying more than half your weight. You are unable to regain health."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:347
+msgid "You are carrying less than half your weight. You can regain health."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:451
+#, c-format
+msgid "You picked up %s."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:457
+#, c-format
+msgid "You spent %s."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:501
+msgid "Cannot raise skill!"
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:618
+msgid "Equip arrows first."
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:149
+msgid "Trade failed!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:152
+msgid "Emote failed!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:155
+msgid "Sit failed!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:158
+msgid "Chat creating failed!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:161
+msgid "Could not join party!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:164
+msgid "Cannot shout!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:177
+msgid "You have not yet reached a high enough lvl!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:181
+msgid "Insufficient HP!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:184
+msgid "Insufficient SP!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:187
+msgid "You have no memos!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:190
+msgid "You cannot do that right now!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:193
+msgid "Seems you need more money... ;-)"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:196
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:200
+msgid "You need another red gem!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:203
+msgid "You need another blue gem!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:206
+msgid "You're carrying to much to do this!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:209
+msgid "Huh? What's that?"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:220
+msgid "Warp failed..."
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:223
+msgid "Could not steal anything..."
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:226
+msgid "Poison had no effect..."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:128
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:130
+msgid "Trading isn't possible. Trade partner is too far away."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:134
+msgid "Trading isn't possible. Character doesn't exist."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:138
+msgid "Trade cancelled due to an unknown reason."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:146
+#, c-format
+msgid "Trade: You and %s"
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:156
+#, c-format
+msgid "Trade with %s cancelled."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:169
+msgid "Unhandled trade cancel packet."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:231
+msgid "Failed adding item. Trade partner is over weighted."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:236
+msgid "Failed adding item. Trade partner has no free slot."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:241
+msgid "Failed adding item. You can't trade this item."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:245
+msgid "Failed adding item for unknown reason."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:264 src/net/manaserv/tradehandler.cpp:160
+msgid "Trade canceled."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:275 src/net/manaserv/tradehandler.cpp:167
+msgid "Trade completed."
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
+msgid "Strength"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:167
+#, c-format
+msgid "Strength %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
+msgid "Agility"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:180
+#, c-format
+msgid "Agility %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
+msgid "Dexterity"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:193
+#, c-format
+msgid "Dexterity %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
+msgid "Vitality"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:206
+#, c-format
+msgid "Vitality %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
+msgid "Intelligence"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:219
+#, c-format
+msgid "Intelligence %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:225
+msgid "Willpower"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:232
+#, c-format
+msgid "Willpower %+.1f"
+msgstr ""
+
 #: src/net/manaserv/beinghandler.cpp:337
 msgid "Press OK to respawn."
 msgstr ""
@@ -4360,16 +5087,6 @@ msgstr ""
 msgid "Invalid slot number."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
-#: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
-#: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
-msgid "Unknown error."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:210
-msgid "Info"
-msgstr ""
-
 #: src/net/manaserv/charhandler.cpp:210
 msgid "Player deleted."
 msgstr ""
@@ -4433,10 +5150,6 @@ msgstr ""
 msgid "Unknown channel event."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:85
-msgid "Guild created."
-msgstr ""
-
 #: src/net/manaserv/guildhandler.cpp:90
 msgid "Error creating guild."
 msgstr ""
@@ -4469,10 +5182,6 @@ msgstr ""
 msgid "New password incorrect."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:127
-msgid "Old password incorrect."
-msgstr ""
-
 #: src/net/manaserv/loginhandler.cpp:131 src/net/manaserv/loginhandler.cpp:163
 msgid "Account not connected. Please login first."
 msgstr ""
@@ -4548,24 +5257,11 @@ msgstr ""
 msgid "Ignoring incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:128
-#, c-format
-msgid "%s wants to trade with you, do you accept?"
-msgstr ""
-
 #: src/net/manaserv/tradehandler.cpp:146
 #, c-format
 msgid "Trading with %s"
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:160
-msgid "Trade canceled."
-msgstr ""
-
-#: src/net/manaserv/tradehandler.cpp:167
-msgid "Trade completed."
-msgstr ""
-
 #: src/net/tmwa/adminhandler.cpp:70
 msgid "Kick failed!"
 msgstr ""
diff --git a/po/nl_BE.po b/po/nl_BE.po
index 66bae7216..187b8cbc3 100644
--- a/po/nl_BE.po
+++ b/po/nl_BE.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-08 04:26+0300\n"
-"PO-Revision-Date: 2011-06-20 00:31+0000\n"
-"Last-Translator: akaras <akaras@inbox.ru>\n"
+"POT-Creation-Date: 2011-08-10 01:11+0300\n"
+"PO-Revision-Date: 2011-08-08 22:18+0000\n"
+"Last-Translator: AL13N <maarten.vanraes@gmail.com>\n"
 "Language-Team: Dutch (Belgium/Flemish) (http://www.transifex.net/projects/p/"
 "manaplus/team/nl_BE/)\n"
 "Language: nl_BE\n"
@@ -23,25 +23,25 @@ msgstr ""
 msgid "Visible on map"
 msgstr ""
 
-#: src/being.cpp:541
+#: src/being.cpp:542
 msgid "dodge"
 msgstr "ontwijkt"
 
-#: src/being.cpp:541
+#: src/being.cpp:542
 msgid "miss"
 msgstr "mist"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1513
+#: src/being.cpp:1514
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1518
+#: src/being.cpp:1519
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:825 src/gui/setup.cpp:51 src/gui/windowmenu.cpp:100
+#: src/client.cpp:825 src/gui/setup.cpp:53 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Configureren"
 
@@ -73,7 +73,8 @@ msgstr "Wijzigen spelservers"
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
-#: src/gui/unregisterdialog.cpp:137 src/net/manaserv/charhandler.cpp:184
+#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
+#: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "Fout"
@@ -148,7 +149,7 @@ msgstr ""
 msgid "Requesting to join channel %s."
 msgstr "Aanvragen om bij kanaal %s toegevoegd te worden."
 
-#: src/commandhandler.cpp:445
+#: src/commandhandler.cpp:445 src/net/ea/gui/partytab.cpp:125
 msgid "Party name is missing."
 msgstr "Groepsnaam ontbreekt."
 
@@ -183,7 +184,7 @@ msgstr "vriend"
 
 #: src/commandhandler.cpp:560
 msgid "disregarded"
-msgstr "genegeerd"
+msgstr "geen rekening mee houden"
 
 #: src/commandhandler.cpp:565
 msgid "neutral"
@@ -359,35 +360,35 @@ msgstr "Pvp rang: %d"
 msgid "Comment: %s"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:265
+#: src/gui/botcheckerwindow.cpp:266
 msgid "Bot Checker"
 msgstr "Bot Controleerder"
 
-#: src/gui/botcheckerwindow.cpp:295 src/gui/setup_players.cpp:64
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
 msgid "Name"
 msgstr "Naam"
 
-#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:130
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:130
 #: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:604
 #: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
 msgid "Attack"
 msgstr "Aanvallen"
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:275
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:275
 #: src/keyboardconfig.cpp:62
 msgid "Talk"
 msgstr "Spreken"
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:241
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:241
 #: src/gui/popupmenu.cpp:280 src/gui/popupmenu.cpp:661
 msgid "Move"
 msgstr "Beweeg"
 
-#: src/gui/botcheckerwindow.cpp:299
+#: src/gui/botcheckerwindow.cpp:300
 msgid "Result"
 msgstr "Resultaat"
 
-#: src/gui/botcheckerwindow.cpp:309 src/gui/npcdialog.cpp:123
+#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:123
 msgid "Reset"
 msgstr "Reset"
 
@@ -456,8 +457,8 @@ msgstr "Verkopen"
 #: src/gui/popupmenu.cpp:1731 src/gui/popupmenu.cpp:1774
 #: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1849
 #: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1935
-#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:68
-#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:237
+#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:70
+#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:238
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
 #: src/gui/updatewindow.cpp:157
 msgid "Cancel"
@@ -607,7 +608,7 @@ msgstr "Verwissel Login"
 #: src/gui/charselectdialog.cpp:153 src/gui/unregisterdialog.cpp:50
 #: src/gui/unregisterdialog.cpp:58
 msgid "Unregister"
-msgstr "Registreren"
+msgstr "Registratie verwijderen"
 
 #: src/gui/charselectdialog.cpp:162
 msgid "Change Email"
@@ -626,8 +627,8 @@ msgid "Enter password:"
 msgstr ""
 
 #: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
-#: src/gui/setup_players.cpp:251 src/gui/shopwindow.cpp:120
-#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:240
+#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120
+#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:241
 msgid "Delete"
 msgstr "Verwijderen"
 
@@ -701,10 +702,10 @@ msgid "rainbow 3"
 msgstr "regenboog 3"
 
 #: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
-#: src/gui/logindialog.cpp:78 src/gui/setup_players.cpp:220
-#: src/gui/setup_theme.cpp:71 src/gui/setup_theme.cpp:125
-#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:101
-#: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:159
+#: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
+#: src/gui/setup_theme.cpp:72 src/gui/setup_theme.cpp:126
+#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
+#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
 msgid "???"
 msgstr "???"
 
@@ -744,7 +745,7 @@ msgstr "Map"
 
 #: src/gui/debugwindow.cpp:71
 msgid "Target"
-msgstr ""
+msgstr "Doel"
 
 #: src/gui/debugwindow.cpp:72
 msgid "Net"
@@ -895,7 +896,7 @@ msgstr ""
 msgid "Auto open this window"
 msgstr ""
 
-#: src/gui/editdialog.cpp:46 src/gui/itemamountwindow.cpp:208
+#: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
 #: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "OK"
@@ -979,7 +980,7 @@ msgstr "Gewicht:"
 
 #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
 #: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1724
-#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:69
+#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:71
 msgid "Store"
 msgstr "Opslaan"
 
@@ -1038,91 +1039,91 @@ msgstr ", "
 msgid "Weight: %s"
 msgstr "Gewicht: %s"
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
+#: src/gui/killstats.cpp:46 src/gui/windowmenu.cpp:69
 msgid "Kill stats"
 msgstr "Doden statistieken"
 
-#: src/gui/killstats.cpp:63
+#: src/gui/killstats.cpp:64
 msgid "Reset stats"
 msgstr "Herzet statistieken"
 
-#: src/gui/killstats.cpp:64
+#: src/gui/killstats.cpp:65
 msgid "Reset timer"
 msgstr "Herzet timer"
 
-#: src/gui/killstats.cpp:68 src/gui/killstats.cpp:204
+#: src/gui/killstats.cpp:69 src/gui/killstats.cpp:205
 #, c-format
 msgid "Level: %d at %f%%"
 msgstr ""
 
-#: src/gui/killstats.cpp:72 src/gui/killstats.cpp:209
+#: src/gui/killstats.cpp:73 src/gui/killstats.cpp:210
 #, c-format
 msgid "Exp: %d/%d Left: %d"
 msgstr ""
 
-#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:215
-#: src/gui/killstats.cpp:224
+#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:216
+#: src/gui/killstats.cpp:225
 #, c-format
 msgid "1%% = %d exp, avg mob for 1%%: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:141
-#: src/gui/killstats.cpp:233
+#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:142
+#: src/gui/killstats.cpp:234
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:80 src/gui/killstats.cpp:143
-#: src/gui/killstats.cpp:219 src/gui/killstats.cpp:229
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
+#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:230
 #, c-format
 msgid "Avg Exp: %s, No. of avg mob to next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:161
-#: src/gui/killstats.cpp:236
+#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:162
+#: src/gui/killstats.cpp:237
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:88 src/gui/killstats.cpp:93
-#: src/gui/killstats.cpp:288 src/gui/killstats.cpp:304
-#: src/gui/killstats.cpp:322
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:89 src/gui/killstats.cpp:94
+#: src/gui/killstats.cpp:289 src/gui/killstats.cpp:305
+#: src/gui/killstats.cpp:323
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
+#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/gui/killstats.cpp:99 src/gui/killstats.cpp:240
+#: src/gui/killstats.cpp:100 src/gui/killstats.cpp:241
 msgid "Last kill exp:"
 msgstr ""
 
-#: src/gui/killstats.cpp:101 src/gui/killstats.cpp:354
-#: src/gui/killstats.cpp:360 src/gui/killstats.cpp:366
-#: src/gui/killstats.cpp:371
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:355
+#: src/gui/killstats.cpp:361 src/gui/killstats.cpp:367
+#: src/gui/killstats.cpp:372
 msgid "Time before jacko spawn:"
 msgstr ""
 
-#: src/gui/killstats.cpp:293 src/gui/killstats.cpp:300
-#: src/gui/killstats.cpp:310 src/gui/killstats.cpp:317
-#: src/gui/killstats.cpp:329 src/gui/killstats.cpp:336
+#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:301
+#: src/gui/killstats.cpp:311 src/gui/killstats.cpp:318
+#: src/gui/killstats.cpp:330 src/gui/killstats.cpp:337
 #, c-format
 msgid "  Time for next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:360
+#: src/gui/killstats.cpp:361
 #, c-format
 msgid "%s %d?"
 msgstr ""
 
-#: src/gui/killstats.cpp:366
+#: src/gui/killstats.cpp:367
 msgid "jacko spawning"
 msgstr ""
 
@@ -1161,7 +1162,7 @@ msgstr "Update:"
 
 #: src/gui/logindialog.cpp:121 src/gui/register.cpp:66 src/gui/register.cpp:81
 msgid "Register"
-msgstr "Aanmelden"
+msgstr "Registreren"
 
 #: src/gui/logindialog.cpp:122
 msgid "Change Server"
@@ -1286,7 +1287,7 @@ msgstr ""
 #: src/gui/popupmenu.cpp:617 src/gui/popupmenu.cpp:625
 #: src/gui/popupmenu.cpp:649
 msgid "Disregard"
-msgstr ""
+msgstr "Geen rekening mee houden"
 
 #: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
 #: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:173
@@ -1375,9 +1376,8 @@ msgstr ""
 
 #: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:447
 #: src/gui/popupmenu.cpp:684
-#, fuzzy
 msgid "Sell (?)"
-msgstr "Verkopen"
+msgstr ""
 
 #: src/gui/popupmenu.cpp:292
 msgid "Kick"
@@ -1624,9 +1624,8 @@ msgid "Choose Your Server"
 msgstr "Kies Uw Server"
 
 #: src/gui/serverdialog.cpp:239
-#, fuzzy
 msgid "Choose Your Server  *** SAFE MODE ***"
-msgstr "Kies Uw Server"
+msgstr ""
 
 #: src/gui/serverdialog.cpp:244
 msgid "Port:"
@@ -1745,9 +1744,8 @@ msgid "Show chat colors list"
 msgstr "Toon chat kleurenlijst"
 
 #: src/gui/setup_chat.cpp:64
-#, fuzzy
 msgid "Commands"
-msgstr "Commando: /users"
+msgstr ""
 
 #: src/gui/setup_chat.cpp:66
 msgid "Allow magic and GM commands in all chat tabs"
@@ -1778,9 +1776,8 @@ msgid "Show chat history"
 msgstr "Toon chat geschiedenis"
 
 #: src/gui/setup_chat.cpp:88
-#, fuzzy
 msgid "Messages"
-msgstr "Bericht"
+msgstr ""
 
 #: src/gui/setup_chat.cpp:90
 msgid "Hide shop messages"
@@ -1791,34 +1788,38 @@ msgid "Tabs"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:96
-msgid "Log magic messages in debug tab"
+msgid "Put all whispers in tabs"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:99
+msgid "Log magic messages in debug tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:102
 msgid "Show server messages in debug tab"
 msgstr "Toon server berichten in de debug tab"
 
-#: src/gui/setup_chat.cpp:102
+#: src/gui/setup_chat.cpp:105
 msgid "Enable trade tab"
 msgstr "Zet handle tab aan"
 
-#: src/gui/setup_chat.cpp:105
+#: src/gui/setup_chat.cpp:108
 msgid "Enable battle tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:108
+#: src/gui/setup_chat.cpp:111
 msgid "Show battle events"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:111
+#: src/gui/setup_chat.cpp:114
 msgid "Resize chat tabs if need"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:115
+#: src/gui/setup_chat.cpp:118
 msgid "Time"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:117
+#: src/gui/setup_chat.cpp:120
 msgid "Use local time"
 msgstr ""
 
@@ -1869,16 +1870,15 @@ msgstr "Blauw:"
 msgid "Alpha:"
 msgstr "Alfa:"
 
-#: src/gui/setup.cpp:67
+#: src/gui/setup.cpp:69
 msgid "Apply"
 msgstr "Toepassen"
 
-#: src/gui/setup.cpp:70
+#: src/gui/setup.cpp:72
 msgid "Reset Windows"
 msgstr "Vensters in beginstand"
 
 #: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
-#: src/gui/setup_players.cpp:334
 msgid "Edit"
 msgstr "Wijzig"
 
@@ -1940,15 +1940,15 @@ msgstr "Toon aangebrachte schade aan monsters"
 
 #: src/gui/setup_other.cpp:51
 msgid "Auto target only reachable monsters"
-msgstr ""
+msgstr "Automatisch enkel bereikbare monsters viseren"
 
 #: src/gui/setup_other.cpp:54
 msgid "Highlight monster attack range"
-msgstr ""
+msgstr "Markeer het aanvalsbereik van de monsters"
 
 #: src/gui/setup_other.cpp:58
 msgid "Show monster hp bar"
-msgstr ""
+msgstr "Toon hp statusbalk van monsters"
 
 #: src/gui/setup_other.cpp:61
 msgid "Cycle monster targets"
@@ -1968,7 +1968,7 @@ msgstr "Markeer vloer voorwerpen"
 
 #: src/gui/setup_other.cpp:76
 msgid "Highlight player attack range"
-msgstr ""
+msgstr "Markeer het aanvalsbereik van de speler"
 
 #: src/gui/setup_other.cpp:79
 msgid "Show extended minimaps"
@@ -1992,7 +1992,7 @@ msgstr ""
 
 #: src/gui/setup_other.cpp:94
 msgid "Attack while moving"
-msgstr ""
+msgstr "Aanvallen tijdens verplaatsen"
 
 #: src/gui/setup_other.cpp:97
 msgid "Sync player move"
@@ -2003,17 +2003,16 @@ msgid "Crazy move A program"
 msgstr ""
 
 #: src/gui/setup_other.cpp:104
-#, fuzzy
 msgid "Player"
-msgstr "Spelers"
+msgstr ""
 
 #: src/gui/setup_other.cpp:106
 msgid "Show own hp bar"
-msgstr ""
+msgstr "Toon hp statusbalk van jezelf"
 
 #: src/gui/setup_other.cpp:109
 msgid "Enable quick stats"
-msgstr ""
+msgstr "Zet snelle statistieken aan"
 
 #: src/gui/setup_other.cpp:112
 msgid "Cycle player targets"
@@ -2040,17 +2039,16 @@ msgid "Enable attack filter"
 msgstr ""
 
 #: src/gui/setup_other.cpp:130
-#, fuzzy
 msgid "Enable advert protocol"
-msgstr "Zet handle tab aan"
+msgstr ""
 
 #: src/gui/setup_other.cpp:136
 msgid "Accept sell/buy requests"
-msgstr ""
+msgstr "Accepteer koop/verkoop aanvragen"
 
 #: src/gui/setup_other.cpp:139
 msgid "Enable shop mode"
-msgstr ""
+msgstr "shop modus aanzetten"
 
 #: src/gui/setup_other.cpp:145
 msgid "Log NPC dialogue"
@@ -2088,149 +2086,202 @@ msgstr ""
 msgid "Show background"
 msgstr ""
 
-#: src/gui/setup_players.cpp:65
-msgid "Relation"
-msgstr "Relatie"
+#: src/gui/setup_perfomance.cpp:48
+msgid "Perfomance"
+msgstr ""
 
-#: src/gui/setup_players.cpp:70
-msgid "Neutral"
-msgstr "Neutraal"
+#: src/gui/setup_perfomance.cpp:55
+msgid "Better perfomance (enable for better perfomance)"
+msgstr ""
 
-#: src/gui/setup_players.cpp:71
-msgid "Friend"
-msgstr "Vriend"
+#: src/gui/setup_perfomance.cpp:58
+msgid "Auto adjust perfomance"
+msgstr ""
 
-#: src/gui/setup_players.cpp:72
-msgid "Disregarded"
+#: src/gui/setup_perfomance.cpp:61
+msgid "Show beings transparency"
 msgstr ""
 
-#: src/gui/setup_players.cpp:73
-msgid "Ignored"
-msgstr "Genegeerd"
+#: src/gui/setup_perfomance.cpp:64
+msgid "Hw acceleration"
+msgstr "Hw acceleratie"
 
-#: src/gui/setup_players.cpp:74
-msgid "Erased"
+#: src/gui/setup_perfomance.cpp:67
+msgid "Enable opacity cache (Software, can use many memory)"
 msgstr ""
 
-#: src/gui/setup_players.cpp:247
-msgid "Allow trading"
-msgstr "Handelen toestaan"
+#: src/gui/setup_perfomance.cpp:70
+msgid "Enable map reduce (Software)"
+msgstr ""
 
-#: src/gui/setup_players.cpp:249
-msgid "Allow whispers"
-msgstr "Fluisteren toestaan"
+#: src/gui/setup_perfomance.cpp:73
+msgid "Better quality (disable for better perfomance)"
+msgstr ""
 
-#: src/gui/setup_players.cpp:252
-msgid "Old"
+#: src/gui/setup_perfomance.cpp:76
+msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr ""
 
-#: src/gui/setup_players.cpp:254
-msgid "Put all whispers in tabs"
+#: src/gui/setup_perfomance.cpp:80
+#, fuzzy
+msgid "Enable reorder sprites."
+msgstr "Zet handle tab aan"
+
+#: src/gui/setup_perfomance.cpp:83
+msgid "Small memory (enable for lower memory usage)"
 msgstr ""
 
-#: src/gui/setup_players.cpp:257
-msgid "Show gender"
-msgstr "Toon geslacht"
+#: src/gui/setup_perfomance.cpp:86
+msgid "Disable advanced beings caching (Software)"
+msgstr ""
 
-#: src/gui/setup_players.cpp:267
+#: src/gui/setup_perfomance.cpp:89
+msgid "Disable beings caching (Software)"
+msgstr ""
+
+#: src/gui/setup_players.cpp:48
 msgid "Players"
 msgstr "Spelers"
 
-#: src/gui/setup_players.cpp:292
-msgid "When ignoring:"
-msgstr "Tijdens negeren:"
+#: src/gui/setup_players.cpp:54
+msgid "Show gender"
+msgstr "Toon geslacht"
 
-#: src/gui/setup_players.cpp:315
+#: src/gui/setup_players.cpp:57
 msgid "Show level"
 msgstr "Toon niveau"
 
-#: src/gui/setup_players.cpp:319
+#: src/gui/setup_players.cpp:60
 msgid "Show own name"
 msgstr "Toon eigen naam"
 
-#: src/gui/setup_players.cpp:323
+#: src/gui/setup_players.cpp:63
 msgid "Target dead players"
-msgstr ""
+msgstr "Viseer dode spelers"
 
-#: src/gui/setup_players.cpp:327
+#: src/gui/setup_players.cpp:66
+msgid "Visible names"
+msgstr "Zichtbare namen"
+
+#: src/gui/setup_players.cpp:69
 msgid "Secure trades"
 msgstr ""
 
-#: src/gui/setup_players.cpp:331 src/gui/setup_players.cpp:523
+#: src/gui/setup_players.cpp:72
 msgid "Unsecure chars in names"
 msgstr ""
 
-#: src/gui/setup_players.cpp:336
-msgid "Visible names"
-msgstr "Zichtbare namen"
+#: src/gui/setup_players.cpp:75
+msgid "Show statuses"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:65
+msgid "Relation"
+msgstr "Relatie"
+
+#: src/gui/setup_relations.cpp:70
+msgid "Neutral"
+msgstr "Neutraal"
+
+#: src/gui/setup_relations.cpp:71
+msgid "Friend"
+msgstr "Vriend"
+
+#: src/gui/setup_relations.cpp:72
+msgid "Disregarded"
+msgstr "Geen rekening mee houden"
+
+#: src/gui/setup_relations.cpp:73
+msgid "Ignored"
+msgstr "Genegeerd"
+
+#: src/gui/setup_relations.cpp:74
+msgid "Erased"
+msgstr "Gewist"
+
+#: src/gui/setup_relations.cpp:239
+msgid "Allow trading"
+msgstr "Handelen toestaan"
+
+#: src/gui/setup_relations.cpp:241
+msgid "Allow whispers"
+msgstr "Fluisteren toestaan"
+
+#: src/gui/setup_relations.cpp:244
+msgid "Old"
+msgstr "Oud"
 
-#: src/gui/setup_players.cpp:341
+#: src/gui/setup_relations.cpp:246
 #, fuzzy
-msgid "Show statuses"
-msgstr "Toon Voorwerpen"
+msgid "Relations"
+msgstr "Relatie"
+
+#: src/gui/setup_relations.cpp:271
+msgid "When ignoring:"
+msgstr "Tijdens negeren:"
 
-#: src/gui/setup_theme.cpp:105
+#: src/gui/setup_theme.cpp:106
 msgid "Tiny (10)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:106
+#: src/gui/setup_theme.cpp:107
 msgid "Small (11)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:107
+#: src/gui/setup_theme.cpp:108
 msgid "Medium (12)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:108
+#: src/gui/setup_theme.cpp:109
 msgid "Large (13)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:110
 msgid "Big (14)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:111
 msgid "Huge (15)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:140
+#: src/gui/setup_theme.cpp:141
 msgid "Theme"
-msgstr ""
+msgstr "Thema"
 
-#: src/gui/setup_theme.cpp:142
+#: src/gui/setup_theme.cpp:143
 msgid "Gui theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:144
 msgid "Main Font"
-msgstr ""
+msgstr "Standaard Lettertype"
 
-#: src/gui/setup_theme.cpp:144
+#: src/gui/setup_theme.cpp:145
 msgid "Bold font"
-msgstr ""
+msgstr "Vet lettertype"
 
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:146
 msgid "Particle font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:147
 msgid "Help font"
-msgstr ""
+msgstr "Help lettertype"
 
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:148
 msgid "Secure font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:175
+#: src/gui/setup_theme.cpp:176
 msgid "Font size"
 msgstr "Lettergrootte"
 
-#: src/gui/setup_theme.cpp:281
+#: src/gui/setup_theme.cpp:282
 msgid "Theme Changed"
-msgstr ""
+msgstr "Thema is gewijzigd"
 
-#: src/gui/setup_theme.cpp:282 src/gui/setup_video.cpp:670
-#: src/gui/setup_video.cpp:675
+#: src/gui/setup_theme.cpp:283 src/gui/setup_video.cpp:619
+#: src/gui/setup_video.cpp:624
 msgid "Restart your client for the change to take effect."
 msgstr "Herstart de client om de wijzigingen in werking te doen treden."
 
@@ -2282,137 +2333,116 @@ msgstr "gemiddeld"
 msgid "max"
 msgstr "max"
 
-#: src/gui/setup_video.cpp:293
+#: src/gui/setup_video.cpp:288
 msgid "Full screen"
 msgstr "Volledig scherm"
 
-#: src/gui/setup_video.cpp:294
-msgid "Hw acceleration"
-msgstr "Hw acceleratie"
-
-#: src/gui/setup_video.cpp:295
+#: src/gui/setup_video.cpp:289
 msgid "Custom cursor"
 msgstr "Aangepaste cursor"
 
-#: src/gui/setup_video.cpp:297
+#: src/gui/setup_video.cpp:291
 msgid "Particle effects"
 msgstr "Deeltjes effecten"
 
-#: src/gui/setup_video.cpp:299
+#: src/gui/setup_video.cpp:293
 msgid "Show pickup notification"
 msgstr "Notificatie bij oprapen weergeven"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:301
+#: src/gui/setup_video.cpp:295
 msgid "in chat"
 msgstr "in chat"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:303
+#: src/gui/setup_video.cpp:297
 msgid "as particle"
 msgstr "als deeltje"
 
-#: src/gui/setup_video.cpp:305
-msgid "Enable opacity cache"
-msgstr ""
-
-#: src/gui/setup_video.cpp:306
-#, fuzzy
-msgid "Enable map reduce"
-msgstr "Zet muziek aan"
-
-#: src/gui/setup_video.cpp:308
-msgid "Auto adjust perfomance"
-msgstr ""
-
-#: src/gui/setup_video.cpp:310
-msgid "Show beings transparency"
-msgstr ""
-
-#: src/gui/setup_video.cpp:315
+#: src/gui/setup_video.cpp:302
 msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:319 src/gui/setup_video.cpp:356
-#: src/gui/setup_video.cpp:607 src/gui/setup_video.cpp:760
+#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
+#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709
 msgid "Alt FPS limit: "
 msgstr ""
 
-#: src/gui/setup_video.cpp:328
+#: src/gui/setup_video.cpp:315
 msgid "Video"
 msgstr "Video"
 
-#: src/gui/setup_video.cpp:334
+#: src/gui/setup_video.cpp:321
 msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:335
+#: src/gui/setup_video.cpp:322
 msgid "Gui opacity"
 msgstr "Dekking van de GUI"
 
-#: src/gui/setup_video.cpp:336
+#: src/gui/setup_video.cpp:323
 msgid "Ambient FX"
 msgstr "Omgevingseffecten"
 
-#: src/gui/setup_video.cpp:337
+#: src/gui/setup_video.cpp:324
 msgid "Particle detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:354 src/gui/setup_video.cpp:357
-#: src/gui/setup_video.cpp:606 src/gui/setup_video.cpp:747
-#: src/gui/setup_video.cpp:758
+#: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
+#: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
+#: src/gui/setup_video.cpp:707
 msgid "None"
 msgstr "Geen"
 
-#: src/gui/setup_video.cpp:511
+#: src/gui/setup_video.cpp:484
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:517
+#: src/gui/setup_video.cpp:490
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:528
+#: src/gui/setup_video.cpp:501
 msgid "Switching to Full Screen"
 msgstr "Verwisselen naar Volledig Scherm"
 
-#: src/gui/setup_video.cpp:529
+#: src/gui/setup_video.cpp:502
 msgid "Restart needed for changes to take effect."
 msgstr "De veranderingen worden pas actief na opnieuw opstarten"
 
-#: src/gui/setup_video.cpp:541
+#: src/gui/setup_video.cpp:514
 msgid "Changing to OpenGL"
 msgstr "Verwisselen naar OpenGL"
 
-#: src/gui/setup_video.cpp:542
+#: src/gui/setup_video.cpp:515
 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:653
+#: src/gui/setup_video.cpp:602
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Manuele resolutie (voorbeeld: 1024x768)"
 
-#: src/gui/setup_video.cpp:654
+#: src/gui/setup_video.cpp:603
 msgid "Enter new resolution:                "
 msgstr "Geef een nieuwe resolutie:                "
 
-#: src/gui/setup_video.cpp:669 src/gui/setup_video.cpp:674
+#: src/gui/setup_video.cpp:618 src/gui/setup_video.cpp:623
 msgid "Screen Resolution Changed"
 msgstr "Scherm Resolutie is gewijzigd"
 
-#: src/gui/setup_video.cpp:672
+#: src/gui/setup_video.cpp:621
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 "Enkele vensters kunnen verplaatst worden om te passen in de omlaag gebrachte "
 "resolutie"
 
-#: src/gui/setup_video.cpp:705
+#: src/gui/setup_video.cpp:654
 msgid "Particle Effect Settings Changed."
 msgstr ""
 
-#: src/gui/setup_video.cpp:706
+#: src/gui/setup_video.cpp:655
 msgid "Changes will take effect on map change."
 msgstr "Wijzigingen treden in werking bij het wisselen van map."
 
@@ -2441,7 +2471,8 @@ msgstr ""
 msgid "Show links in announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:723 src/net/manaserv/tradehandler.cpp:127
+#: src/gui/shopwindow.cpp:723 src/net/ea/tradehandler.cpp:106
+#: src/net/manaserv/tradehandler.cpp:127
 msgid "Request for Trade"
 msgstr "Handel aanvragen"
 
@@ -2476,14 +2507,14 @@ msgstr ""
 #: src/gui/skilldialog.cpp:492 src/gui/skilldialog.cpp:545
 #, c-format
 msgid "Lvl: %d"
-msgstr ""
+msgstr "Niv: %d"
 
 #: src/gui/skilldialog.cpp:537
 #, c-format
 msgid "Lvl: %d (%+d)"
-msgstr ""
+msgstr "Niv: %d (%+d)"
 
-#: src/gui/socialwindow.cpp:117
+#: src/gui/socialwindow.cpp:117 src/net/ea/gui/guildtab.cpp:52
 msgid "Guild"
 msgstr "Guild"
 
@@ -2515,7 +2546,7 @@ msgstr "Verlaten Guild?"
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Bent u zeker dat u guild %s wilt verlaten?"
 
-#: src/gui/socialwindow.cpp:215
+#: src/gui/socialwindow.cpp:215 src/net/ea/gui/partytab.cpp:50
 msgid "Party"
 msgstr "Groep"
 
@@ -2549,7 +2580,7 @@ msgstr ""
 
 #: src/gui/socialwindow.cpp:521
 msgid "Nav"
-msgstr ""
+msgstr "Nav"
 
 #: src/gui/socialwindow.cpp:799
 msgid "Atk"
@@ -2577,7 +2608,7 @@ msgstr ""
 
 #: src/gui/socialwindow.cpp:1013 src/gui/windowmenu.cpp:93
 msgid "Social"
-msgstr ""
+msgstr "Sociaal"
 
 #: src/gui/socialwindow.cpp:1034
 msgid "Invite"
@@ -2606,20 +2637,20 @@ msgstr ""
 #: src/gui/socialwindow.cpp:1257
 #, c-format
 msgid "Creating guild called %s."
-msgstr ""
+msgstr "Maken van guild %s."
 
 #: src/gui/socialwindow.cpp:1280
 #, c-format
 msgid "Creating party called %s."
-msgstr ""
+msgstr "Maken van groep %s."
 
 #: src/gui/socialwindow.cpp:1294
 msgid "Guild Name"
-msgstr ""
+msgstr "Guild Naam"
 
 #: src/gui/socialwindow.cpp:1295
 msgid "Choose your guild's name."
-msgstr ""
+msgstr "Kies uw guild naam"
 
 #: src/gui/socialwindow.cpp:1309
 msgid "Received guild request, but one already exists."
@@ -2677,243 +2708,243 @@ msgstr "Kies uw groepsnaam."
 msgid "Specials"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:196
+#: src/gui/statuspopup.cpp:197
 msgid "(D) default moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:201
+#: src/gui/statuspopup.cpp:202
 msgid "(I) invert moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:206
+#: src/gui/statuspopup.cpp:207
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:211
+#: src/gui/statuspopup.cpp:212
 msgid "(C) moves with crazy moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:216
+#: src/gui/statuspopup.cpp:217
 msgid "(d) double normal + crazy"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:221
+#: src/gui/statuspopup.cpp:222
 msgid "(?) move"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:239
+#: src/gui/statuspopup.cpp:240
 msgid "(a) custom crazy move"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:243
+#: src/gui/statuspopup.cpp:244
 msgid "(?) crazy move"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:253
+#: src/gui/statuspopup.cpp:254
 msgid "(0) default moves to target"
-msgstr ""
+msgstr "(0) standaard bewegingen tot aan doel"
 
-#: src/gui/statuspopup.cpp:258
+#: src/gui/statuspopup.cpp:259
 msgid "(1) moves to target in distance 1"
-msgstr ""
+msgstr "(1) bewegen tot aan doel in bereik 1"
 
-#: src/gui/statuspopup.cpp:263
+#: src/gui/statuspopup.cpp:264
 msgid "(2) moves to target in distance 2"
-msgstr ""
+msgstr "(2) bewegen tot aan doel in bereik 2"
 
-#: src/gui/statuspopup.cpp:268
+#: src/gui/statuspopup.cpp:269
 msgid "(3) moves to target in distance 3"
-msgstr ""
+msgstr "(3) bewegen tot aan doel in bereik 3"
 
-#: src/gui/statuspopup.cpp:273
+#: src/gui/statuspopup.cpp:274
 msgid "(5) moves to target in distance 5"
-msgstr ""
+msgstr "(5) bewegen tot aan doel in bereik 5"
 
-#: src/gui/statuspopup.cpp:278
+#: src/gui/statuspopup.cpp:279
 msgid "(7) moves to target in distance 7"
-msgstr ""
+msgstr "(7) bewegen tot aan doel in bereik 7"
 
-#: src/gui/statuspopup.cpp:283
+#: src/gui/statuspopup.cpp:284
 msgid "(A) moves to target in attack range"
-msgstr ""
+msgstr "(A) beweeg tot aan doel in aanvalsbereik"
 
-#: src/gui/statuspopup.cpp:288
+#: src/gui/statuspopup.cpp:289
 msgid "(?) move to target"
-msgstr ""
+msgstr "(?) beweeg tot aan doel"
 
-#: src/gui/statuspopup.cpp:296
+#: src/gui/statuspopup.cpp:297
 msgid "(D) default follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:300
+#: src/gui/statuspopup.cpp:301
 msgid "(R) relative follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:304
+#: src/gui/statuspopup.cpp:305
 msgid "(M) mirror follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:308
+#: src/gui/statuspopup.cpp:309
 msgid "(P) pet follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:312
+#: src/gui/statuspopup.cpp:313
 msgid "(?) unknown follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:321 src/gui/statuspopup.cpp:344
+#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345
 msgid "(D) default attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:326
+#: src/gui/statuspopup.cpp:327
 msgid "(s) switch attack without shield"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:331
+#: src/gui/statuspopup.cpp:332
 msgid "(S) switch attack with shield"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:335 src/gui/statuspopup.cpp:360
+#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
 msgid "(?) attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:348
+#: src/gui/statuspopup.cpp:349
 msgid "(G) go and attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:352
+#: src/gui/statuspopup.cpp:353
 msgid "(A) go, attack, pickup"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:356
+#: src/gui/statuspopup.cpp:357
 msgid "(d) without auto attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:374
+#: src/gui/statuspopup.cpp:375
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:378
+#: src/gui/statuspopup.cpp:379
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:382
+#: src/gui/statuspopup.cpp:383
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:386
+#: src/gui/statuspopup.cpp:387
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:390
+#: src/gui/statuspopup.cpp:391
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:394
+#: src/gui/statuspopup.cpp:395
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:398
+#: src/gui/statuspopup.cpp:399
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:402
+#: src/gui/statuspopup.cpp:403
 msgid "(?) pick up"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:411
+#: src/gui/statuspopup.cpp:412
 msgid "(N) normal map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:415
+#: src/gui/statuspopup.cpp:416
 msgid "(D) debug map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:419
+#: src/gui/statuspopup.cpp:420
 msgid "(u) ultra map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:423
+#: src/gui/statuspopup.cpp:424
 msgid "(U) ultra map view 2"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:427
+#: src/gui/statuspopup.cpp:428
 msgid "(e) empty map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:431
+#: src/gui/statuspopup.cpp:432
 msgid "(b) black & white map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:435
+#: src/gui/statuspopup.cpp:436
 msgid "(?) map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:443
+#: src/gui/statuspopup.cpp:444
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:448
+#: src/gui/statuspopup.cpp:449
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:453
+#: src/gui/statuspopup.cpp:454
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:458
+#: src/gui/statuspopup.cpp:459
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:463
+#: src/gui/statuspopup.cpp:464
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:467
+#: src/gui/statuspopup.cpp:468
 msgid "(?) magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:476
+#: src/gui/statuspopup.cpp:477
 msgid "(D) default imitation"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:480
+#: src/gui/statuspopup.cpp:481
 msgid "(O) outfits imitation"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:484
+#: src/gui/statuspopup.cpp:485
 msgid "(?) imitation"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:493
+#: src/gui/statuspopup.cpp:494
 msgid "(O) on keyboard"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:496
+#: src/gui/statuspopup.cpp:497
 msgid "(A) away"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:499 src/gui/statuspopup.cpp:519
+#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
 msgid "(?) away"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:507
+#: src/gui/statuspopup.cpp:508
 msgid "(G) game camera mode"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:511
+#: src/gui/statuspopup.cpp:512
 msgid "(F) free camera mode"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:515
+#: src/gui/statuspopup.cpp:516
 msgid "(D) design camera mode"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:526
+#: src/gui/statuspopup.cpp:527
 msgid "Game modifiers are disabled"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:531
+#: src/gui/statuspopup.cpp:532
 msgid "Game modifiers are enabled"
 msgstr ""
 
@@ -2958,7 +2989,7 @@ msgstr ""
 #: src/gui/statuswindow.cpp:254
 #, c-format
 msgid "Level: %d (GM %d)"
-msgstr ""
+msgstr "Niveau: %d (GM %d)"
 
 #: src/gui/statuswindow.cpp:310
 #, c-format
@@ -3092,89 +3123,89 @@ msgstr ""
 msgid "(O)"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:112
+#: src/gui/textcommandeditor.cpp:113
 msgid "No Target"
-msgstr ""
+msgstr "Geen Doel"
 
-#: src/gui/textcommandeditor.cpp:113
+#: src/gui/textcommandeditor.cpp:114
 msgid "Allow Target"
-msgstr ""
+msgstr "Doel Toestaan"
 
-#: src/gui/textcommandeditor.cpp:114
+#: src/gui/textcommandeditor.cpp:115
 msgid "Need Target"
-msgstr ""
+msgstr "Heeft Doel Nodig"
 
-#: src/gui/textcommandeditor.cpp:119
+#: src/gui/textcommandeditor.cpp:120
 msgid "General Magic"
-msgstr ""
+msgstr "Algemene Magie"
 
-#: src/gui/textcommandeditor.cpp:120
+#: src/gui/textcommandeditor.cpp:121
 msgid "Life Magic"
-msgstr ""
+msgstr "Levensmagie"
 
-#: src/gui/textcommandeditor.cpp:121
+#: src/gui/textcommandeditor.cpp:122
 msgid "War Magic"
-msgstr ""
+msgstr "Oorlogsmagie"
 
-#: src/gui/textcommandeditor.cpp:122
+#: src/gui/textcommandeditor.cpp:123
 msgid "Transmute Magic"
-msgstr ""
+msgstr "Wijzigingsmagie"
 
-#: src/gui/textcommandeditor.cpp:123
+#: src/gui/textcommandeditor.cpp:124
 msgid "Nature Magic"
-msgstr ""
+msgstr "Natuursmagie"
 
-#: src/gui/textcommandeditor.cpp:124
+#: src/gui/textcommandeditor.cpp:125
 msgid "Astral Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:167
+#: src/gui/textcommandeditor.cpp:168
 msgid "Command Editor"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:184
+#: src/gui/textcommandeditor.cpp:185
 msgid "magic"
-msgstr ""
+msgstr "magie"
 
-#: src/gui/textcommandeditor.cpp:188
+#: src/gui/textcommandeditor.cpp:189
 msgid "other"
-msgstr ""
+msgstr "ander"
 
-#: src/gui/textcommandeditor.cpp:193
+#: src/gui/textcommandeditor.cpp:194
 msgid "Symbol:"
-msgstr ""
+msgstr "Symbool:"
 
-#: src/gui/textcommandeditor.cpp:196
+#: src/gui/textcommandeditor.cpp:197
 msgid "Command:"
-msgstr ""
+msgstr "Commando:"
 
-#: src/gui/textcommandeditor.cpp:199
+#: src/gui/textcommandeditor.cpp:200
 msgid "Mana:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:205
+#: src/gui/textcommandeditor.cpp:206
 msgid "Target Type:"
-msgstr ""
+msgstr "Doel Type:"
 
-#: src/gui/textcommandeditor.cpp:211
+#: src/gui/textcommandeditor.cpp:212
 msgid "Icon:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:217
+#: src/gui/textcommandeditor.cpp:218
 msgid "Magic level:"
-msgstr ""
+msgstr "Magie niveau:"
 
-#: src/gui/textcommandeditor.cpp:223
+#: src/gui/textcommandeditor.cpp:224
 msgid "Magic School:"
-msgstr ""
+msgstr "Magie School:"
 
-#: src/gui/textcommandeditor.cpp:229
+#: src/gui/textcommandeditor.cpp:230
 msgid "School level:"
-msgstr ""
+msgstr "School niveau:"
 
-#: src/gui/textcommandeditor.cpp:234
+#: src/gui/textcommandeditor.cpp:235
 msgid "Save"
-msgstr ""
+msgstr "Bewaren"
 
 #: src/gui/tradewindow.cpp:60
 msgid "Propose trade"
@@ -3199,7 +3230,7 @@ msgstr "Handel: Jij"
 #: src/gui/tradewindow.cpp:110 src/gui/tradewindow.cpp:166
 #, c-format
 msgid "You get %s"
-msgstr ""
+msgstr "U krijgt %s"
 
 #: src/gui/tradewindow.cpp:111
 msgid "You give:"
@@ -3238,17 +3269,17 @@ msgstr "Spelen"
 
 #: src/gui/updatewindow.cpp:556
 msgid "##1  The update process is incomplete."
-msgstr "##1 Het updateproces is onvolledig."
+msgstr "##1  Het updateproces is onvolledig."
 
 #. TRANSLATORS: Continues "you try again later.".
 #: src/gui/updatewindow.cpp:558
 msgid "##1  It is strongly recommended that"
-msgstr "##1 Het is ten sterkste aanbevolen dat"
+msgstr "##1  Het is ten sterkste aanbevolen dat"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
 #: src/gui/updatewindow.cpp:560
 msgid "##1  you try again later."
-msgstr ""
+msgstr "##1  probeer later opnieuw."
 
 #: src/gui/updatewindow.cpp:686
 msgid "Completed"
@@ -3260,19 +3291,19 @@ msgstr "Wezen"
 
 #: src/gui/userpalette.cpp:117
 msgid "Friend Names"
-msgstr ""
+msgstr "Namen van vrienden"
 
 #: src/gui/userpalette.cpp:118
 msgid "Disregarded Names"
-msgstr ""
+msgstr "Namen van geen belang"
 
 #: src/gui/userpalette.cpp:119
 msgid "Ignored Names"
-msgstr ""
+msgstr "Genegeerde Namen"
 
 #: src/gui/userpalette.cpp:120
 msgid "Erased Names"
-msgstr ""
+msgstr "Verwijderde Namen"
 
 #: src/gui/userpalette.cpp:121
 msgid "Other Players' Names"
@@ -3380,15 +3411,15 @@ msgstr ""
 
 #: src/gui/userpalette.cpp:159
 msgid "Local Player Attack Range"
-msgstr ""
+msgstr "Aanvalsbereik van speler"
 
 #: src/gui/userpalette.cpp:161
 msgid "Local Player Attack Range Border"
-msgstr ""
+msgstr "Aanvalsbereikrand van speler"
 
 #: src/gui/userpalette.cpp:163
 msgid "Monster Attack Range"
-msgstr ""
+msgstr "Aanvalsbereik van monster"
 
 #: src/gui/userpalette.cpp:165
 msgid "Home Place"
@@ -3402,25 +3433,25 @@ msgstr ""
 msgid "Road Point"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:470
+#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:471
 msgid "Who Is Online - Updating"
-msgstr ""
+msgstr "Wie Is Online - Bijwerken"
 
-#: src/gui/whoisonline.cpp:100
+#: src/gui/whoisonline.cpp:101
 msgid "Update"
-msgstr ""
+msgstr "Bijwerken"
 
-#: src/gui/whoisonline.cpp:293
+#: src/gui/whoisonline.cpp:294
 msgid "Who Is Online - "
-msgstr ""
+msgstr "Wie Is Online - "
 
-#: src/gui/whoisonline.cpp:484
+#: src/gui/whoisonline.cpp:485
 msgid "Who Is Online - error"
-msgstr ""
+msgstr "Wie Is Online - fout"
 
-#: src/gui/whoisonline.cpp:515
+#: src/gui/whoisonline.cpp:516
 msgid "Who Is Online - Update"
-msgstr ""
+msgstr "Wie Is Online - Bijgewerkt"
 
 #: src/gui/widgets/battletab.cpp:45
 msgid "Battle"
@@ -3485,6 +3516,7 @@ msgid "This command makes <nick> a channel operator."
 msgstr "Dit commando maakt van <nick> een kanaalbeheerder."
 
 #: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
+#: src/net/ea/gui/guildtab.cpp:69 src/net/ea/gui/partytab.cpp:85
 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 "
@@ -3524,15 +3556,15 @@ msgstr "Globale aankondiging van %s:"
 #: src/gui/widgets/chattab.cpp:184
 #, c-format
 msgid "%s whispers: %s"
-msgstr ""
+msgstr "%s fluistert: %s"
 
 #: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
-msgstr ""
+msgstr "/ignore > Negeer de andere speler"
 
 #: src/gui/widgets/whispertab.cpp:108
 msgid "/unignore > Stop ignoring the other player"
-msgstr ""
+msgstr "/unignore > Stop met de andere speler te negeren"
 
 #: src/gui/widgets/whispertab.cpp:109
 msgid "/close > Close the whisper tab"
@@ -3548,11 +3580,13 @@ msgstr "Dit commando sluit de huidige fluistertab."
 
 #: src/gui/widgets/whispertab.cpp:124
 msgid "Command: /ignore"
-msgstr ""
+msgstr "Commando: /ignore"
 
 #: src/gui/widgets/whispertab.cpp:125
 msgid "This command ignores the other player regardless of current relations."
 msgstr ""
+"Dit commando negeert de andere speler niettegenstaande enige huidige "
+"relaties."
 
 #: src/gui/widgets/whispertab.cpp:130
 msgid "Command: /unignore <player>"
@@ -3561,6 +3595,7 @@ msgstr "Commando: /unignore <speler>"
 #: src/gui/widgets/whispertab.cpp:131
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
+"Dit commando stop met de andere speler te negeren als deze genegeerd werd."
 
 #: src/gui/windowmenu.cpp:65
 msgid "BC"
@@ -3576,7 +3611,7 @@ msgstr ""
 
 #: src/gui/windowmenu.cpp:67
 msgid "Who is online"
-msgstr ""
+msgstr "Wie is online"
 
 #: src/gui/windowmenu.cpp:69
 msgid "KS"
@@ -3644,7 +3679,7 @@ msgstr ""
 
 #: src/gui/worldselectdialog.cpp:77
 msgid "Select World"
-msgstr ""
+msgstr "Selecteer Wereld"
 
 #: src/gui/worldselectdialog.cpp:82
 msgid "Change Login"
@@ -3652,7 +3687,7 @@ msgstr "Wijzig Login"
 
 #: src/gui/worldselectdialog.cpp:83
 msgid "Choose World"
-msgstr ""
+msgstr "Kies Wereld"
 
 #: src/inventory.cpp:248
 msgid "Storage"
@@ -3684,11 +3719,11 @@ msgstr "Viseren en Aanvallen"
 
 #: src/keyboardconfig.cpp:51
 msgid "Move to Target"
-msgstr ""
+msgstr "Beweeg tot aan Doel"
 
 #: src/keyboardconfig.cpp:53
 msgid "Change Move to Target type"
-msgstr ""
+msgstr "Wijzig Bewegen tot aan Doel type"
 
 #: src/keyboardconfig.cpp:55
 msgid "Move to Home location"
@@ -3712,7 +3747,7 @@ msgstr "Aanval stoppen"
 
 #: src/keyboardconfig.cpp:64
 msgid "Target Closest"
-msgstr ""
+msgstr "Dichtsbijzijnde viseren"
 
 #: src/keyboardconfig.cpp:66
 msgid "Target NPC"
@@ -3917,9 +3952,8 @@ msgid "Next Chat Tab"
 msgstr "Volgende chattab"
 
 #: src/keyboardconfig.cpp:278
-#, fuzzy
 msgid "Close current Chat Tab"
-msgstr "Volgende chattab"
+msgstr ""
 
 #: src/keyboardconfig.cpp:280
 msgid "Previous chat line"
@@ -3987,7 +4021,7 @@ msgstr "Wissel Snel Neerleggingsteller"
 
 #: src/keyboardconfig.cpp:311
 msgid "Quick heal target or self"
-msgstr ""
+msgstr "Snel jezelf of iemand anders genezen"
 
 #: src/keyboardconfig.cpp:313
 msgid "Use #itenplz spell"
@@ -4221,83 +4255,534 @@ msgstr "Bedankt voor de aankopen."
 msgid "Unable to buy."
 msgstr "Kan niets kopen."
 
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
-msgid "Strength"
+#: src/net/ea/charserverhandler.cpp:63
+#, fuzzy
+msgid "Strength:"
 msgstr "Kracht"
 
-#: src/net/manaserv/attributes.cpp:167
+#: src/net/ea/charserverhandler.cpp:64
+#, fuzzy
+msgid "Agility:"
+msgstr "Behendigheid"
+
+#: src/net/ea/charserverhandler.cpp:65
+#, fuzzy
+msgid "Vitality:"
+msgstr "Vitaliteit"
+
+#: src/net/ea/charserverhandler.cpp:66
+#, fuzzy
+msgid "Intelligence:"
+msgstr "Intelligentie"
+
+#: src/net/ea/charserverhandler.cpp:67
+#, fuzzy
+msgid "Dexterity:"
+msgstr "Vaardigheid"
+
+#: src/net/ea/charserverhandler.cpp:68
+#, fuzzy
+msgid "Luck:"
+msgstr "Geluk"
+
+#: src/net/ea/charserverhandler.cpp:102
+msgid "Access denied. Most likely, there are too many players on this server."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:106
+#, fuzzy
+msgid "Cannot use this ID."
+msgstr "Kan geen lege berichten sturen!"
+
+#: src/net/ea/charserverhandler.cpp:109
+msgid "Unknown char-server failure."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:138
+msgid "Failed to create character. Most likely the name is already taken."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:237
+msgid "Wrong name."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:145
+msgid "Incorrect stats."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:148
+msgid "Incorrect hair."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:151
+msgid "Incorrect slot."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:166 src/net/manaserv/charhandler.cpp:210
+msgid "Info"
+msgstr "Info"
+
+#: src/net/ea/charserverhandler.cpp:166
+#, fuzzy
+msgid "Character deleted."
+msgstr "Bevestig het verwijderen van het personage"
+
+#: src/net/ea/charserverhandler.cpp:172
+#, fuzzy
+msgid "Failed to delete character."
+msgstr "Je naam moet uit tenminste 4 tekens bestaan"
+
+#: src/net/ea/chathandler.cpp:60 src/net/ea/chathandler.cpp:66
+#: src/net/ea/chathandler.cpp:71 src/net/ea/chathandler.cpp:77
+#: src/net/ea/chathandler.cpp:82 src/net/ea/chathandler.cpp:88
+#: src/net/ea/chathandler.cpp:95 src/net/ea/chathandler.cpp:101
+msgid "Channels are not supported!"
+msgstr ""
+
+#: src/net/ea/chathandler.cpp:128
 #, c-format
-msgid "Strength %+.1f"
+msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
-msgid "Agility"
-msgstr "Behendigheid"
+#: src/net/ea/chathandler.cpp:136
+#, fuzzy, c-format
+msgid "Whisper could not be sent, ignored by %s."
+msgstr "Speler kan niet worden genegeerd!"
 
-#: src/net/manaserv/attributes.cpp:180
+#: src/net/ea/chathandler.cpp:348
+#, fuzzy
+msgid "MVP player."
+msgstr "Spelers"
+
+#: src/net/ea/chathandler.cpp:352
+#, fuzzy
+msgid "MVP player: "
+msgstr "Spelers"
+
+#: src/net/ea/gamehandler.cpp:86
 #, c-format
-msgid "Agility %+.1f"
+msgid "Online users: %d"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
-msgid "Dexterity"
-msgstr "Vaardigheid"
+#: src/net/ea/gamehandler.cpp:98
+msgid "Game"
+msgstr ""
 
-#: src/net/manaserv/attributes.cpp:193
+#: src/net/ea/gamehandler.cpp:98
+#, fuzzy
+msgid "Request to quit denied!"
+msgstr "Handel aanvragen"
+
+#: src/net/ea/gui/guildtab.cpp:67 src/net/ea/gui/partytab.cpp:83
+#, fuzzy
+msgid "Command: /invite <nick>"
+msgstr "Commando: /kick <nick>"
+
+#: src/net/ea/gui/guildtab.cpp:68
+#, fuzzy
+msgid "This command invites <nick> to the guild you're in."
+msgstr "Dit commando maakt van <nick> een kanaalbeheerder."
+
+#: src/net/ea/gui/guildtab.cpp:74 src/net/ea/gui/partytab.cpp:90
+#, fuzzy
+msgid "Command: /leave"
+msgstr "Commando: /close"
+
+#: src/net/ea/gui/guildtab.cpp:75
+#, fuzzy
+msgid "This command causes the player to leave the guild."
+msgstr "Dit commando zet het onderwerp naar <bericht>."
+
+#: src/net/ea/gui/guildtab.cpp:135 src/net/ea/gui/partytab.cpp:69
+msgid "/help > Display this help."
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:136
+msgid "/invite > Invite a player to your guild"
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:137
+msgid "/leave > Leave the guild you are in"
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:138
+#, fuzzy
+msgid "/kick > Kick some one from the guild you are in"
+msgstr "/kick > Verwijdert een gebruiker van het kanaal"
+
+#: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
+msgid "Guild created."
+msgstr "Guild aangemaakt."
+
+#: src/net/ea/guildhandler.cpp:88 src/net/ea/guildhandler.cpp:93
+#, fuzzy
+msgid "You are already in guild."
+msgstr "Fout bij het creëren van guild."
+
+#: src/net/ea/guildhandler.cpp:98
+msgid "Emperium check failed."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:103
+msgid "Unknown server response."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:180
+#, fuzzy, c-format
+msgid "Guild name: %s"
+msgstr "Gilde: %s"
+
+#: src/net/ea/guildhandler.cpp:182
+#, fuzzy, c-format
+msgid "Guild master: %s"
+msgstr "Gilde: %s"
+
+#: src/net/ea/guildhandler.cpp:184
+#, fuzzy, c-format
+msgid "Guild level: %d"
+msgstr "Level: %d"
+
+#: src/net/ea/guildhandler.cpp:186
 #, c-format
-msgid "Dexterity %+.1f"
+msgid "Online members: %d"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
-msgid "Vitality"
-msgstr "Vitaliteit"
+#: src/net/ea/guildhandler.cpp:188
+#, c-format
+msgid "Max members: %d"
+msgstr ""
 
-#: src/net/manaserv/attributes.cpp:206
+#: src/net/ea/guildhandler.cpp:190
+#, fuzzy, c-format
+msgid "Average level: %d"
+msgstr "Magie niveau:"
+
+#: src/net/ea/guildhandler.cpp:192
+#, fuzzy, c-format
+msgid "Guild exp: %d"
+msgstr "Gilde: %s"
+
+#: src/net/ea/guildhandler.cpp:194
+#, fuzzy, c-format
+msgid "Guild next exp: %d"
+msgstr "Guild aangemaakt."
+
+#: src/net/ea/guildhandler.cpp:196
+#, fuzzy, c-format
+msgid "Guild castle: %s"
+msgstr "Gilde: %s"
+
+#: src/net/ea/guildhandler.cpp:402
+#, fuzzy
+msgid "Could not inivte user to guild."
+msgstr "gebruiker %s uitgenodigd in guild %s."
+
+#: src/net/ea/guildhandler.cpp:406
+msgid "User rejected guild invite."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:410
+msgid "User is now part of your guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:414
+msgid "Your guild is full."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:418
+msgid "Unknown guild invite response."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:438
+msgid "You have left the guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:452
+#, fuzzy, c-format
+msgid "%s has left your guild."
+msgstr "Kies uw guild naam"
+
+#: src/net/ea/guildhandler.cpp:483
+msgid "You was kicked from guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:496
 #, c-format
-msgid "Vitality %+.1f"
+msgid "%s has kicked from your guild."
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
-msgid "Intelligence"
-msgstr "Intelligentie"
+#: src/net/ea/gui/partytab.cpp:70
+msgid "/invite > Invite a player to your party"
+msgstr ""
 
-#: src/net/manaserv/attributes.cpp:219
+#: src/net/ea/gui/partytab.cpp:71
+msgid "/leave > Leave the party you are in"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:72
+#, fuzzy
+msgid "/kick > Kick some one from the party you are in"
+msgstr "/kick > Verwijdert een gebruiker van het kanaal"
+
+#: src/net/ea/gui/partytab.cpp:73
+msgid "/item > Show/change party item sharing options"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:74
+msgid "/exp > Show/change party experience sharing options"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:84
+#, fuzzy
+msgid "This command invites <nick> to party with you."
+msgstr "Dit commando maakt <nick> het kanaal verlaten."
+
+#: src/net/ea/gui/partytab.cpp:91
+#, fuzzy
+msgid "This command causes the player to leave the party."
+msgstr "Dit commando zet het onderwerp naar <bericht>."
+
+#: src/net/ea/gui/partytab.cpp:95
+#, fuzzy
+msgid "Command: /item <policy>"
+msgstr "Commando: /kick <nick>"
+
+#: src/net/ea/gui/partytab.cpp:97
+#, fuzzy
+msgid "This command changes the party's item sharing policy."
+msgstr "Dit commando geeft de gebruikers in het kanaal weer."
+
+#: src/net/ea/gui/partytab.cpp:98
+msgid ""
+"<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
+"\"0\", \"no\", \"false\" to disable item sharing."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:101
+#, fuzzy
+msgid "Command: /item"
+msgstr "Commando: /quit"
+
+#: src/net/ea/gui/partytab.cpp:102
+#, fuzzy
+msgid "This command displays the party's current item sharing policy."
+msgstr "Dit commando verlaat het huidige kanaal."
+
+#: src/net/ea/gui/partytab.cpp:107
+#, fuzzy
+msgid "Command: /exp <policy>"
+msgstr "Commando: /op <nick>"
+
+#: src/net/ea/gui/partytab.cpp:108
+#, fuzzy
+msgid "This command changes the party's experience sharing policy."
+msgstr "Dit commando verlaat het huidige kanaal."
+
+#: src/net/ea/gui/partytab.cpp:110
+msgid ""
+"<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
+"sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:113
+#, fuzzy
+msgid "Command: /exp"
+msgstr "Commando: /users"
+
+#: src/net/ea/gui/partytab.cpp:114
+#, fuzzy
+msgid "This command displays the party's current experience sharing policy."
+msgstr "Dit commando verlaat het huidige kanaal."
+
+#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:286
+msgid "Item sharing enabled."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:296
+msgid "Item sharing disabled."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:306
+msgid "Item sharing not possible."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:157
+msgid "Item sharing unknown."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:248
+msgid "Experience sharing enabled."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:258
+msgid "Experience sharing disabled."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:268
+msgid "Experience sharing not possible."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:196
+msgid "Experience sharing unknown."
+msgstr ""
+
+#: src/net/ea/inventoryhandler.cpp:407
+#, fuzzy
+msgid "Failed to use item."
+msgstr "Kon lid niet promoveren."
+
+#: src/net/ea/inventoryhandler.cpp:580
+#, fuzzy
+msgid "Unable to equip."
+msgstr "Kan niets kopen."
+
+#: src/net/ea/loginhandler.cpp:131
+#, fuzzy
+msgid "Account was not found. Please re-login."
+msgstr "Account niet verbonden. Log eerst in aub."
+
+#: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127
+msgid "Old password incorrect."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:137
+msgid "New password too short."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:243
+#: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
+#: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
+#: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
+msgid "Unknown error."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:205
+#, fuzzy
+msgid "Unregistered ID."
+msgstr "Registratie verwijderen"
+
+#: src/net/ea/loginhandler.cpp:208
+#, fuzzy
+msgid "Wrong password."
+msgstr "Wijzig wachtwoord"
+
+#: src/net/ea/loginhandler.cpp:211
+msgid "Account expired."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:214
+#, fuzzy
+msgid "Rejected from server."
+msgstr "De verbinding met de server werd verbroken!"
+
+#: src/net/ea/loginhandler.cpp:217
+msgid ""
+"You have been permanently banned from the game. Please contact the GM team."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:221
+msgid "Client too old."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:224
 #, c-format
-msgid "Intelligence %+.1f"
+msgid ""
+"You have been temporarily banned from the game until %s.\n"
+"Please contact the GM team via the forums."
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:225
-msgid "Willpower"
+#: src/net/ea/loginhandler.cpp:231
+msgid "Server overpopulated."
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:232
+#: src/net/ea/loginhandler.cpp:234
+msgid "This user name is already taken."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:240
+msgid "Username permanently erased."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:82
+msgid "Could not create party."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:84
+#, fuzzy
+msgid "Party successfully created."
+msgstr "Speler succesvol verwijderd!"
+
+#: src/net/ea/partyhandler.cpp:140
+#, fuzzy, c-format
+msgid "%s has joined your party."
+msgstr "%s is niet in jouw groep!"
+
+#: src/net/ea/partyhandler.cpp:176
 #, c-format
-msgid "Willpower %+.1f"
+msgid "%s is already a member of a party."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:181
+#, c-format
+msgid "%s refused your invitation."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:186
+#, fuzzy, c-format
+msgid "%s is now a member of your party."
+msgstr "%s is niet in jouw groep!"
+
+#: src/net/ea/partyhandler.cpp:191
+#, c-format
+msgid "%s can't join your party because party is full."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:196
+#, c-format
+msgid "QQQ Unknown invite response for %s."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:356
+msgid "You have left the party."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/partyhandler.cpp:368
+#, fuzzy, c-format
+msgid "%s has left your party."
+msgstr "%s is niet in jouw groep!"
+
+#: src/net/ea/partyhandler.cpp:444
+#, c-format
+msgid "An unknown member tried to say: %s"
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:95 src/net/manaserv/beinghandler.cpp:315
 msgid "You are dead."
 msgstr "Je bent dood."
 
-#: src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:316
 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:318
+#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:318
 msgid "You are not that alive anymore."
 msgstr "Je bent niet langer levend."
 
-#: src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:319
 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:320
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:320
 msgid "Game Over!"
 msgstr "Game Over!"
 
-#: src/net/manaserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:101
+msgid "Insert coin to continue."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:321
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
@@ -4305,7 +4790,7 @@ msgstr ""
 "Neen, kinderen. Jouw personage is niet echt gestorven. Het... euhm... is "
 "naar een beter plaats gegaan."
 
-#: src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:323
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
@@ -4313,32 +4798,321 @@ msgstr ""
 "Jouw plan om vijandelijke wapens te vernietignen door ermee tegen jouw keel "
 "te slaan is mislukt."
 
-#: src/net/manaserv/beinghandler.cpp:325
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:325
 msgid "I guess this did not run too well."
 msgstr "Dit verliep niet zoals gepland."
 
-#: src/net/manaserv/beinghandler.cpp:326
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:326
 msgid "Do you want your possessions identified?"
 msgstr "Wil je dat jouw bezittingen geïdentificeerd worden?"
 
-#: src/net/manaserv/beinghandler.cpp:327
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:327
 msgid "Sadly, no trace of you was ever found..."
 msgstr "Spijtig genoeg, was er geen spoor van jou gevonden..."
 
-#: src/net/manaserv/beinghandler.cpp:329
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:329
 msgid "Annihilated."
 msgstr "Verslagen"
 
-#: src/net/manaserv/beinghandler.cpp:330
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:330
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:332
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:332
 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:119
+msgid "You're not dead yet. You're just resting."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:120
+#, fuzzy
+msgid "You are no more."
+msgstr "Je bent dood."
+
+#: src/net/ea/playerhandler.cpp:121
+#, fuzzy
+msgid "You have ceased to be."
+msgstr "Je bent dood."
+
+#: src/net/ea/playerhandler.cpp:122
+msgid "You've expired and gone to meet your maker."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:123
+msgid "You're a stiff."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:124
+msgid "Bereft of life, you rest in peace."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:125
+msgid "If you weren't so animated, you'd be pushing up the daisies."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:126
+msgid "Your metabolic processes are now history."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:127
+msgid "You're off the twig."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:128
+msgid "You've kicked the bucket."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:129
+msgid ""
+"You've shuffled off your mortal coil, run down the curtain and joined the "
+"bleedin' choir invisibile."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:131
+#, fuzzy
+msgid "You are an ex-player."
+msgstr "Je bent dood."
+
+#: src/net/ea/playerhandler.cpp:132
+msgid "You're pining for the fjords."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
+#: src/net/ea/playerhandler.cpp:425
+msgid "Message"
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:337
+msgid ""
+"You are carrying more than half your weight. You are unable to regain health."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:347
+msgid "You are carrying less than half your weight. You can regain health."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:451
+#, c-format
+msgid "You picked up %s."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:457
+#, fuzzy, c-format
+msgid "You spent %s."
+msgstr "U krijgt %s"
+
+#: src/net/ea/playerhandler.cpp:501
+msgid "Cannot raise skill!"
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:618
+#, fuzzy
+msgid "Equip arrows first."
+msgstr "Verwijder uitrusting eerst"
+
+#: src/net/ea/specialhandler.cpp:149
+#, fuzzy
+msgid "Trade failed!"
+msgstr "Handel geannuleerd."
+
+#: src/net/ea/specialhandler.cpp:152
+#, fuzzy
+msgid "Emote failed!"
+msgstr "Kick gefaald!"
+
+#: src/net/ea/specialhandler.cpp:155
+#, fuzzy
+msgid "Sit failed!"
+msgstr "Kick gefaald!"
+
+#: src/net/ea/specialhandler.cpp:158
+#, fuzzy
+msgid "Chat creating failed!"
+msgstr "Fout bij het creëren van guild."
+
+#: src/net/ea/specialhandler.cpp:161
+#, fuzzy
+msgid "Could not join party!"
+msgstr "%s is niet in jouw groep!"
+
+#: src/net/ea/specialhandler.cpp:164
+msgid "Cannot shout!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:177
+msgid "You have not yet reached a high enough lvl!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:181
+msgid "Insufficient HP!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:184
+msgid "Insufficient SP!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:187
+#, fuzzy
+msgid "You have no memos!"
+msgstr "Je hebt niet genoeg geld."
+
+#: src/net/ea/specialhandler.cpp:190
+#, fuzzy
+msgid "You cannot do that right now!"
+msgstr "Je bent niet langer levend."
+
+#: src/net/ea/specialhandler.cpp:193
+msgid "Seems you need more money... ;-)"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:196
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:200
+msgid "You need another red gem!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:203
+msgid "You need another blue gem!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:206
+msgid "You're carrying to much to do this!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:209
+msgid "Huh? What's that?"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:220
+msgid "Warp failed..."
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:223
+msgid "Could not steal anything..."
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:226
+msgid "Poison had no effect..."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:128
+#, 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:130
+msgid "Trading isn't possible. Trade partner is too far away."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:134
+msgid "Trading isn't possible. Character doesn't exist."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:138
+msgid "Trade cancelled due to an unknown reason."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:146
+#, fuzzy, c-format
+msgid "Trade: You and %s"
+msgstr "Handel: Jij"
+
+#: src/net/ea/tradehandler.cpp:156
+#, fuzzy, c-format
+msgid "Trade with %s cancelled."
+msgstr "Handel geannuleerd."
+
+#: src/net/ea/tradehandler.cpp:169
+msgid "Unhandled trade cancel packet."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:231
+msgid "Failed adding item. Trade partner is over weighted."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:236
+msgid "Failed adding item. Trade partner has no free slot."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:241
+#, fuzzy
+msgid "Failed adding item. You can't trade this item."
+msgstr ""
+"Kan dat voorwerp niet toevoegen. Je kan één type voorwerp niet overlappen in "
+"het venster."
+
+#: src/net/ea/tradehandler.cpp:245
+msgid "Failed adding item for unknown reason."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:264 src/net/manaserv/tradehandler.cpp:160
+msgid "Trade canceled."
+msgstr "Handel geannuleerd."
+
+#: src/net/ea/tradehandler.cpp:275 src/net/manaserv/tradehandler.cpp:167
+msgid "Trade completed."
+msgstr "Handel voltooid."
+
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
+msgid "Strength"
+msgstr "Kracht"
+
+#: src/net/manaserv/attributes.cpp:167
+#, c-format
+msgid "Strength %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
+msgid "Agility"
+msgstr "Behendigheid"
+
+#: src/net/manaserv/attributes.cpp:180
+#, c-format
+msgid "Agility %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
+msgid "Dexterity"
+msgstr "Vaardigheid"
+
+#: src/net/manaserv/attributes.cpp:193
+#, c-format
+msgid "Dexterity %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
+msgid "Vitality"
+msgstr "Vitaliteit"
+
+#: src/net/manaserv/attributes.cpp:206
+#, c-format
+msgid "Vitality %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
+msgid "Intelligence"
+msgstr "Intelligentie"
+
+#: src/net/manaserv/attributes.cpp:219
+#, c-format
+msgid "Intelligence %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:225
+msgid "Willpower"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:232
+#, c-format
+msgid "Willpower %+.1f"
+msgstr ""
+
 #: src/net/manaserv/beinghandler.cpp:337
 msgid "Press OK to respawn."
 msgstr "Klik OK om opnieuw te verschijnen."
@@ -4392,16 +5166,6 @@ msgstr ""
 msgid "Invalid slot number."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
-#: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
-#: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
-msgid "Unknown error."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:210
-msgid "Info"
-msgstr "Info"
-
 #: src/net/manaserv/charhandler.cpp:210
 msgid "Player deleted."
 msgstr ""
@@ -4465,10 +5229,6 @@ msgstr ""
 msgid "Unknown channel event."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:85
-msgid "Guild created."
-msgstr "Guild aangemaakt."
-
 #: src/net/manaserv/guildhandler.cpp:90
 msgid "Error creating guild."
 msgstr "Fout bij het creëren van guild."
@@ -4501,10 +5261,6 @@ msgstr ""
 msgid "New password incorrect."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:127
-msgid "Old password incorrect."
-msgstr ""
-
 #: src/net/manaserv/loginhandler.cpp:131 src/net/manaserv/loginhandler.cpp:163
 msgid "Account not connected. Please login first."
 msgstr "Account niet verbonden. Log eerst in aub."
@@ -4525,6 +5281,7 @@ msgstr ""
 msgid ""
 "Client registration is not allowed. Please contact server administration."
 msgstr ""
+"Client registratie is niet toegestaan. Contacteer aub de server adminstratie."
 
 #: src/net/manaserv/loginhandler.cpp:275 src/net/manaserv/loginhandler.cpp:312
 msgid "Client version is too old."
@@ -4580,24 +5337,11 @@ msgstr "Inkomende handelsaanvragen accepteren."
 msgid "Ignoring incoming trade requests."
 msgstr "Inkomende handelsaanvragen negeren."
 
-#: src/net/manaserv/tradehandler.cpp:128
-#, 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:146
 #, c-format
 msgid "Trading with %s"
 msgstr "Handelen met %s"
 
-#: src/net/manaserv/tradehandler.cpp:160
-msgid "Trade canceled."
-msgstr "Handel geannuleerd."
-
-#: src/net/manaserv/tradehandler.cpp:167
-msgid "Trade completed."
-msgstr "Handel voltooid."
-
 #: src/net/tmwa/adminhandler.cpp:70
 msgid "Kick failed!"
 msgstr "Kick gefaald!"
@@ -4788,291 +5532,3 @@ msgstr "Magie %+d"
 #: src/resources/itemdb.cpp:171
 msgid "Unknown item"
 msgstr "Onbekend voorwerp"
-
-#~ msgid "Failed to create character. Most likely the name is already taken."
-#~ msgstr "Kan personage niet aanmaken. Waarschijnlijk bestaat de naam al."
-
-#~ msgid "Character deleted."
-#~ msgstr "Personage verwijderd."
-
-#~ msgid "Failed to delete character."
-#~ msgstr "Kon personage niet verwijderen."
-
-#~ msgid "Strength:"
-#~ msgstr "Sterkte:"
-
-#~ msgid "Agility:"
-#~ msgstr "Agiliteit:"
-
-#~ msgid "Vitality:"
-#~ msgstr "Vitaliteit:"
-
-#~ msgid "Intelligence:"
-#~ msgstr "Intelligentie:"
-
-#~ msgid "Dexterity:"
-#~ msgstr "Dexteriteit:"
-
-#~ msgid "Luck:"
-#~ msgstr "Geluk:"
-
-#~ msgid "Channels are not supported!"
-#~ msgstr "Kanalen worden niet ondersteund!"
-
-#~ msgid "/help > Display this help."
-#~ msgstr "/help > Geeft deze help weer."
-
-#~ msgid "Command: /invite <nick>"
-#~ msgstr "Commando: /invite <nick>"
-
-#~ msgid "Command: /leave"
-#~ msgstr "Commando: /leave"
-
-#~ msgid "/invite > Invite a player to your party"
-#~ msgstr "/invite > Nodig een speler uit voor jouw groep"
-
-#~ msgid "/leave > Leave the party you are in"
-#~ msgstr "/leave > Verlaat de groep waarin je je bevindt"
-
-#~ msgid "/kick > Kick some one from the party you are in"
-#~ msgstr "/kick > Verwijder iemand vanuit de groep waarin je bent"
-
-#~ msgid "/item > Show/change party item sharing options"
-#~ msgstr "/item > Geeft weer/wijzigt de opties voor voorwerpdeling"
-
-#~ msgid "/exp > Show/change party experience sharing options"
-#~ msgstr "/exp > Geeft weer/wijzigt de ervaringsdelingsopties"
-
-#~ msgid "This command invites <nick> to party with you."
-#~ msgstr "Dit commando nodigt <nick> uit om een groep te vormen met jou."
-
-#~ msgid "This command causes the player to leave the party."
-#~ msgstr "Dit commando zorgt ervoor dat de speler de groep verlaat."
-
-#~ msgid "Command: /item <policy>"
-#~ msgstr "Commando: /item <beleid>"
-
-#~ msgid "This command changes the party's item sharing policy."
-#~ msgstr "Dit commando wijzigt het voorwerpdelingsbeleid van de groep."
-
-#~ 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\"."
-
-#~ msgid "Command: /item"
-#~ msgstr "Commando: /item"
-
-#~ msgid "This command displays the party's current item sharing policy."
-#~ msgstr ""
-#~ "Dit commando geeft het huidige voorwerpdelingsbeleid van de groep weer."
-
-#~ msgid "Command: /exp <policy>"
-#~ msgstr "Commando: /exp <beleid>"
-
-#~ msgid "This command changes the party's experience sharing policy."
-#~ msgstr "Dit commando wijzigt het ervaringsdelingsbeleid van de groep."
-
-#~ 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\"."
-
-#~ msgid "Command: /exp"
-#~ msgstr "Commando: /exp"
-
-#~ msgid "This command displays the party's current experience sharing policy."
-#~ msgstr ""
-#~ "Dit commando geeft het huidige ervaringsdelingbeleid van de groep weer."
-
-#~ msgid "Item sharing enabled."
-#~ msgstr "Voorwerpdeling ingeschakeld."
-
-#~ msgid "Item sharing disabled."
-#~ msgstr "Voorwerpdeling uitgeschakeld."
-
-#~ msgid "Item sharing not possible."
-#~ msgstr "Voorwerpdeling is niet mogelijk."
-
-#~ msgid "Item sharing unknown."
-#~ msgstr "Voorwerpdeling onbekend."
-
-#~ msgid "Experience sharing enabled."
-#~ msgstr "Ervaringsdeling ingeschakeld."
-
-#~ msgid "Experience sharing disabled."
-#~ msgstr "Ervaringsdeling uitgeschakeld."
-
-#~ msgid "Experience sharing not possible."
-#~ msgstr "Ervaringsdeling is niet mogelijk."
-
-#~ msgid "Failed to use item."
-#~ msgstr "Kan voorwerp niet gebruiken."
-
-#~ msgid "Unable to equip."
-#~ msgstr "Kan dit niet uitrusten."
-
-#~ msgid "Account was not found. Please re-login."
-#~ msgstr "Account was niet gevonden. Probeer opnieuw in te loggen aub."
-
-#~ msgid ""
-#~ "You have been temporarily banned from the game until %s.\n"
-#~ "Please contact the GM team via the forums."
-#~ msgstr ""
-#~ "Je bent tijdelijk geband van het spel tot %s.\n"
-#~ "Neem aub contact op met het GM team via de forums."
-
-#~ msgid "Could not create party."
-#~ msgstr "Kan geen groep aanmaken."
-
-#~ msgid "Party successfully created."
-#~ msgstr "Groep succesvol aangemaakt."
-
-#~ msgid "%s is already a member of a party."
-#~ msgstr "%s is al een lid van een groep."
-
-#~ msgid "%s refused your invitation."
-#~ msgstr "%s wees jouw uitnodiging af."
-
-#~ msgid "%s is now a member of your party."
-#~ msgstr "%s is nu een lid van jouw groep."
-
-#~ msgid "You have left the party."
-#~ msgstr "Je hebt de groep verlaten."
-
-#~ msgid "%s has left your party."
-#~ msgstr "%s heeft jouw groep verlaten."
-
-#~ msgid "An unknown member tried to say: %s"
-#~ msgstr "Een onbekend lid probeerde te zeggen: %s"
-
-#~ msgid "Insert coin to continue."
-#~ msgstr "Werp een muntstuk in om verder te spelen."
-
-#~ msgid "You're not dead yet. You're just resting."
-#~ msgstr "Je bent nog niet dood. Je bent maar aan het rusten."
-
-#~ msgid "You are no more."
-#~ msgstr "Je bent niet langer."
-
-#~ msgid "You have ceased to be."
-#~ msgstr "Je hebt opgehouden te zijn."
-
-#~ msgid "You've expired and gone to meet your maker."
-#~ msgstr "Je bent verlopen en gaat een bezoekje maken bij jouw schepper."
-
-#~ msgid "You're a stiff."
-#~ msgstr "Je bent stokstijf."
-
-#~ msgid "Bereft of life, you rest in peace."
-#~ msgstr "Beroofd van het leven, rust je in vrede."
-
-#~ msgid "Your metabolic processes are now history."
-#~ msgstr "Jouw metabolische processen behoren nu tot het verleden."
-
-#~ msgid "You are an ex-player."
-#~ msgstr "Je bent een ex-speler."
-
-#~ msgid "Message"
-#~ msgstr "Bericht"
-
-#~ 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."
-
-#~ msgid "Trade failed!"
-#~ msgstr "Handel mislukte!"
-
-#~ msgid "Emote failed!"
-#~ msgstr "Emoticon gefaald!"
-
-#~ msgid "Sit failed!"
-#~ msgstr "Zitten niet mogelijk!"
-
-#~ msgid "Chat creating failed!"
-#~ msgstr "Chatcreatie mislukte!"
-
-#~ msgid "Could not join party!"
-#~ msgstr "Kan je niet bij de groep voegen!"
-
-#~ msgid "Cannot shout!"
-#~ msgstr "Kan niet roepen!"
-
-#~ msgid "You have not yet reached a high enough lvl!"
-#~ msgstr "Je hebt nog geen hoog genoeg level bereikt!"
-
-#~ msgid "Insufficient HP!"
-#~ msgstr "Onvoldoende leven!"
-
-#~ msgid "Insufficient SP!"
-#~ msgstr "Onvoldoende Vaardigheidspunten!"
-
-#~ msgid "You have no memos!"
-#~ msgstr "Je hebt geen memo's!"
-
-#~ msgid "You cannot do that right now!"
-#~ msgstr "Je kan dat nu niet doen!"
-
-#~ msgid "Seems you need more money... ;-)"
-#~ msgstr "Het lijkt erop dat je meer geld nodig hebt... ;-)"
-
-#~ msgid "You cannot use this skill with that kind of weapon!"
-#~ msgstr "Je kan die vaardigheid niet gebruiken met dit type wapen!"
-
-#~ msgid "You need another red gem!"
-#~ msgstr "Je hebt een andere rode edelsteen nodig!"
-
-#~ msgid "You need another blue gem!"
-#~ msgstr "Je hebt een andere blauwe edelsteen nodig!"
-
-#~ msgid "You're carrying to much to do this!"
-#~ msgstr "Je draagt teveel bij je om dit te doen!"
-
-#~ msgid "Huh? What's that?"
-#~ msgstr "Huh? Wat is dat?"
-
-#~ msgid "Warp failed..."
-#~ msgstr "Warp mislukt..."
-
-#~ msgid "Could not steal anything..."
-#~ msgstr "Kon niets stelen..."
-
-#~ msgid "Poison had no effect..."
-#~ msgstr "Gif had geen effect..."
-
-#~ msgid "Trading isn't possible. Trade partner is too far away."
-#~ msgstr "Handelen is niet mogelijk. Partner is te ver weg."
-
-#~ msgid "Trading isn't possible. Character doesn't exist."
-#~ msgstr "Handelen is niet mogelijk. Personage bestaat niet."
-
-#~ msgid "Trade cancelled due to an unknown reason."
-#~ msgstr "Handel onderbroken vanwege een onbekende reden."
-
-#~ msgid "Trade: You and %s"
-#~ msgstr "Handelen: Jij en %s"
-
-#~ msgid "Trade with %s cancelled."
-#~ msgstr "Handel met %s geannuleerd."
-
-#~ msgid "Failed adding item. Trade partner is over weighted."
-#~ msgstr "Kan voorwerp niet toevoegen. Handelspartner is al te zwaar beladen."
-
-#~ msgid "Failed adding item. Trade partner has no free slot."
-#~ msgstr "Kan voorwerp niet toevoegen. Handelspartner heeft geen vrij slot."
-
-#~ msgid "Failed adding item. You can't trade this item."
-#~ msgstr ""
-#~ "Gefaald om voorwerp toe te voegen. U kan dit voorwerp niet verhandelen."
-
-#~ msgid "Failed adding item for unknown reason."
-#~ msgstr "Kan voorwerp niet toevoegen voor een onbekende reden."
diff --git a/po/pt.po b/po/pt.po
index cc6685284..235e159ae 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 #   <freya.df@gmail.com>, 2011.
 # freya <freya.df@gmail.com>, 2011.
 # Andrei Karas <akaras@inbox.ru>, 2011.
@@ -9,39 +9,40 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-08 04:26+0300\n"
+"POT-Creation-Date: 2011-08-10 01:11+0300\n"
 "PO-Revision-Date: 2011-08-08 01:29+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
-"Language-Team: Portuguese (http://www.transifex.net/projects/p/manaplus/team/pt/)\n"
+"Language-Team: Portuguese (http://www.transifex.net/projects/p/manaplus/team/"
+"pt/)\n"
+"Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: pt\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: src/actorspritemanager.cpp:1034
 msgid "Visible on map"
 msgstr "Visivel no mapa"
 
-#: src/being.cpp:541
+#: src/being.cpp:542
 msgid "dodge"
 msgstr "desviou"
 
-#: src/being.cpp:541
+#: src/being.cpp:542
 msgid "miss"
 msgstr "errou"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1513
+#: src/being.cpp:1514
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1518
+#: src/being.cpp:1519
 msgid "I"
 msgstr "l"
 
-#: src/client.cpp:825 src/gui/setup.cpp:51 src/gui/windowmenu.cpp:100
+#: src/client.cpp:825 src/gui/setup.cpp:53 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Configurar"
 
@@ -73,7 +74,8 @@ msgstr "Mudando servidores do jogo"
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
-#: src/gui/unregisterdialog.cpp:137 src/net/manaserv/charhandler.cpp:184
+#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
+#: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "Erro"
@@ -137,18 +139,18 @@ msgstr "Não é possível enviar mensagens privadas vazias!"
 #: src/commandhandler.cpp:409
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
-" you."
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
+"you."
 msgstr ""
-"Não é possível  criar uma aba de mensagem privada para o nick \"%s\"! Ou ela"
-" já existe ou é você mesmo."
+"Não é possível  criar uma aba de mensagem privada para o nick \"%s\"! Ou ela "
+"já existe ou é você mesmo."
 
 #: src/commandhandler.cpp:429
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Solicitando entrada no canal %s."
 
-#: src/commandhandler.cpp:445
+#: src/commandhandler.cpp:445 src/net/ea/gui/partytab.cpp:125
 msgid "Party name is missing."
 msgstr "Falta o nome do grupo."
 
@@ -295,7 +297,8 @@ msgstr "Recursos de imagens orfãos:"
 #: src/commandhandler.h:40
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr "Opções para /%s são \"yes\" e \"no\", \"true\" e \"false\", \"1\" e \"0\"."
+msgstr ""
+"Opções para /%s são \"yes\" e \"no\", \"true\" e \"false\", \"1\" e \"0\"."
 
 #: src/game.cpp:246 src/gui/widgets/chattab.cpp:410
 msgid "General"
@@ -358,35 +361,35 @@ msgstr "Posição no PVP: %d"
 msgid "Comment: %s"
 msgstr "Comentário: %s"
 
-#: src/gui/botcheckerwindow.cpp:265
+#: src/gui/botcheckerwindow.cpp:266
 msgid "Bot Checker"
 msgstr "Analizador de bot"
 
-#: src/gui/botcheckerwindow.cpp:295 src/gui/setup_players.cpp:64
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
 msgid "Name"
 msgstr "Nome"
 
-#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:130
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:130
 #: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:604
 #: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
 msgid "Attack"
 msgstr "Atacar"
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:275
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:275
 #: src/keyboardconfig.cpp:62
 msgid "Talk"
 msgstr "Falar"
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:241
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:241
 #: src/gui/popupmenu.cpp:280 src/gui/popupmenu.cpp:661
 msgid "Move"
 msgstr "Mover"
 
-#: src/gui/botcheckerwindow.cpp:299
+#: src/gui/botcheckerwindow.cpp:300
 msgid "Result"
 msgstr "Resultado"
 
-#: src/gui/botcheckerwindow.cpp:309 src/gui/npcdialog.cpp:123
+#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:123
 msgid "Reset"
 msgstr "Resetar"
 
@@ -455,8 +458,8 @@ msgstr "Vender"
 #: src/gui/popupmenu.cpp:1731 src/gui/popupmenu.cpp:1774
 #: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1849
 #: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1935
-#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:68
-#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:237
+#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:70
+#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:238
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
 #: src/gui/updatewindow.cpp:157
 msgid "Cancel"
@@ -625,8 +628,8 @@ msgid "Enter password:"
 msgstr "Entre com a senha"
 
 #: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
-#: src/gui/setup_players.cpp:251 src/gui/shopwindow.cpp:120
-#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:240
+#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120
+#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:241
 msgid "Delete"
 msgstr "Excluir"
 
@@ -700,10 +703,10 @@ msgid "rainbow 3"
 msgstr "arco-íris 3"
 
 #: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
-#: src/gui/logindialog.cpp:78 src/gui/setup_players.cpp:220
-#: src/gui/setup_theme.cpp:71 src/gui/setup_theme.cpp:125
-#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:101
-#: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:159
+#: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
+#: src/gui/setup_theme.cpp:72 src/gui/setup_theme.cpp:126
+#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
+#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
 msgid "???"
 msgstr "???"
 
@@ -894,7 +897,7 @@ msgstr "Próximo >"
 msgid "Auto open this window"
 msgstr "Abrir automaticamente esta janela"
 
-#: src/gui/editdialog.cpp:46 src/gui/itemamountwindow.cpp:208
+#: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
 #: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "OK"
@@ -978,7 +981,7 @@ msgstr "Peso:"
 
 #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
 #: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1724
-#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:69
+#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:71
 msgid "Store"
 msgstr "Armazenar"
 
@@ -1037,91 +1040,91 @@ msgstr ", "
 msgid "Weight: %s"
 msgstr "Peso: %s"
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
+#: src/gui/killstats.cpp:46 src/gui/windowmenu.cpp:69
 msgid "Kill stats"
 msgstr "Estatísticas"
 
-#: src/gui/killstats.cpp:63
+#: src/gui/killstats.cpp:64
 msgid "Reset stats"
 msgstr "Resetar Status"
 
-#: src/gui/killstats.cpp:64
+#: src/gui/killstats.cpp:65
 msgid "Reset timer"
 msgstr "Resetar tempo"
 
-#: src/gui/killstats.cpp:68 src/gui/killstats.cpp:204
+#: src/gui/killstats.cpp:69 src/gui/killstats.cpp:205
 #, c-format
 msgid "Level: %d at %f%%"
 msgstr "Nível: %d em %f%%"
 
-#: src/gui/killstats.cpp:72 src/gui/killstats.cpp:209
+#: src/gui/killstats.cpp:73 src/gui/killstats.cpp:210
 #, c-format
 msgid "Exp: %d/%d Left: %d"
 msgstr "Exp: %d%d faltando: %d"
 
-#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:215
-#: src/gui/killstats.cpp:224
+#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:216
+#: src/gui/killstats.cpp:225
 #, c-format
 msgid "1%% = %d exp, avg mob for 1%%: %s"
 msgstr "1%% = %d exp, avg mob para 1%%: %s"
 
-#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:141
-#: src/gui/killstats.cpp:233
+#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:142
+#: src/gui/killstats.cpp:234
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr "Mortes: %s, total exp: %s"
 
-#: src/gui/killstats.cpp:80 src/gui/killstats.cpp:143
-#: src/gui/killstats.cpp:219 src/gui/killstats.cpp:229
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
+#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:230
 #, c-format
 msgid "Avg Exp: %s, No. of avg mob to next level: %s"
 msgstr "Avg Exp: %s, No de avg mob para o próximo nível: %s"
 
-#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:161
-#: src/gui/killstats.cpp:236
+#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:162
+#: src/gui/killstats.cpp:237
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr "Mortes/Min: %s Exp/Min: %s"
 
-#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:88 src/gui/killstats.cpp:93
-#: src/gui/killstats.cpp:288 src/gui/killstats.cpp:304
-#: src/gui/killstats.cpp:322
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:89 src/gui/killstats.cpp:94
+#: src/gui/killstats.cpp:289 src/gui/killstats.cpp:305
+#: src/gui/killstats.cpp:323
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
 msgstr[0] "Velocidade de exp por %d min: %s"
 msgstr[1] "Velocidade de exp por %d mins: %s"
 
-#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
+#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
 msgstr[0] "Tempo para próximo nível por %d min: %s"
 msgstr[1] "Tempo para próximo nível por %d mins: %s"
 
-#: src/gui/killstats.cpp:99 src/gui/killstats.cpp:240
+#: src/gui/killstats.cpp:100 src/gui/killstats.cpp:241
 msgid "Last kill exp:"
 msgstr "Exp de última morte:"
 
-#: src/gui/killstats.cpp:101 src/gui/killstats.cpp:354
-#: src/gui/killstats.cpp:360 src/gui/killstats.cpp:366
-#: src/gui/killstats.cpp:371
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:355
+#: src/gui/killstats.cpp:361 src/gui/killstats.cpp:367
+#: src/gui/killstats.cpp:372
 msgid "Time before jacko spawn:"
 msgstr "Tempo para próximo JackO:"
 
-#: src/gui/killstats.cpp:293 src/gui/killstats.cpp:300
-#: src/gui/killstats.cpp:310 src/gui/killstats.cpp:317
-#: src/gui/killstats.cpp:329 src/gui/killstats.cpp:336
+#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:301
+#: src/gui/killstats.cpp:311 src/gui/killstats.cpp:318
+#: src/gui/killstats.cpp:330 src/gui/killstats.cpp:337
 #, c-format
 msgid "  Time for next level: %s"
 msgstr "Tempo para próximo nível:  %s"
 
-#: src/gui/killstats.cpp:360
+#: src/gui/killstats.cpp:361
 #, c-format
 msgid "%s %d?"
 msgstr "%s %d?"
 
-#: src/gui/killstats.cpp:366
+#: src/gui/killstats.cpp:367
 msgid "jacko spawning"
 msgstr "JackOvai aparecer"
 
@@ -1785,34 +1788,38 @@ msgid "Tabs"
 msgstr "Abas"
 
 #: src/gui/setup_chat.cpp:96
+msgid "Put all whispers in tabs"
+msgstr "Deixar as mensagens privadas em abas"
+
+#: src/gui/setup_chat.cpp:99
 msgid "Log magic messages in debug tab"
 msgstr "Salvar comandos de feitiços na aba do Depurador"
 
-#: src/gui/setup_chat.cpp:99
+#: src/gui/setup_chat.cpp:102
 msgid "Show server messages in debug tab"
 msgstr "Mostrar as mensagens do servidor na aba do Depurador"
 
-#: src/gui/setup_chat.cpp:102
+#: src/gui/setup_chat.cpp:105
 msgid "Enable trade tab"
 msgstr "Habilitar aba de negociação"
 
-#: src/gui/setup_chat.cpp:105
+#: src/gui/setup_chat.cpp:108
 msgid "Enable battle tab"
 msgstr "Habilitar aba de batalha"
 
-#: src/gui/setup_chat.cpp:108
+#: src/gui/setup_chat.cpp:111
 msgid "Show battle events"
 msgstr "Mostrar eventos de batalha"
 
-#: src/gui/setup_chat.cpp:111
+#: src/gui/setup_chat.cpp:114
 msgid "Resize chat tabs if need"
 msgstr "Redimensionar as abas de chat caso precisar"
 
-#: src/gui/setup_chat.cpp:115
+#: src/gui/setup_chat.cpp:118
 msgid "Time"
 msgstr "Tempo"
 
-#: src/gui/setup_chat.cpp:117
+#: src/gui/setup_chat.cpp:120
 msgid "Use local time"
 msgstr "Usar hora local"
 
@@ -1863,16 +1870,15 @@ msgstr "Azul:"
 msgid "Alpha:"
 msgstr "Alpha:"
 
-#: src/gui/setup.cpp:67
+#: src/gui/setup.cpp:69
 msgid "Apply"
 msgstr "Aplicar"
 
-#: src/gui/setup.cpp:70
+#: src/gui/setup.cpp:72
 msgid "Reset Windows"
 msgstr "Restaurar janelas"
 
 #: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
-#: src/gui/setup_players.cpp:334
 msgid "Edit"
 msgstr "Editar"
 
@@ -2080,148 +2086,203 @@ msgstr "Ocultar sprite de escudo"
 msgid "Show background"
 msgstr "Mostrar imagem de fundo"
 
-#: src/gui/setup_players.cpp:65
-msgid "Relation"
-msgstr "Relação"
+#: src/gui/setup_perfomance.cpp:48
+msgid "Perfomance"
+msgstr ""
 
-#: src/gui/setup_players.cpp:70
-msgid "Neutral"
-msgstr "Neutro"
+#: src/gui/setup_perfomance.cpp:55
+msgid "Better perfomance (enable for better perfomance)"
+msgstr ""
 
-#: src/gui/setup_players.cpp:71
-msgid "Friend"
-msgstr "Amigo"
+#: src/gui/setup_perfomance.cpp:58
+msgid "Auto adjust perfomance"
+msgstr ""
 
-#: src/gui/setup_players.cpp:72
-msgid "Disregarded"
-msgstr "Desconsiderado"
+#: src/gui/setup_perfomance.cpp:61
+msgid "Show beings transparency"
+msgstr ""
 
-#: src/gui/setup_players.cpp:73
-msgid "Ignored"
-msgstr "Ignorado"
+#: src/gui/setup_perfomance.cpp:64
+msgid "Hw acceleration"
+msgstr "Aceleração por HW"
 
-#: src/gui/setup_players.cpp:74
-msgid "Erased"
-msgstr "Apagado"
+#: src/gui/setup_perfomance.cpp:67
+msgid "Enable opacity cache (Software, can use many memory)"
+msgstr ""
 
-#: src/gui/setup_players.cpp:247
-msgid "Allow trading"
-msgstr "Permitir negociações"
+#: src/gui/setup_perfomance.cpp:70
+#, fuzzy
+msgid "Enable map reduce (Software)"
+msgstr "Habilitar redução de mapa"
 
-#: src/gui/setup_players.cpp:249
-msgid "Allow whispers"
-msgstr "Permitir mensagens particulares"
+#: src/gui/setup_perfomance.cpp:73
+msgid "Better quality (disable for better perfomance)"
+msgstr ""
 
-#: src/gui/setup_players.cpp:252
-msgid "Old"
-msgstr "Antigo"
+#: src/gui/setup_perfomance.cpp:76
+msgid "Enable alpha channel fix (Software, can be very slow)"
+msgstr ""
 
-#: src/gui/setup_players.cpp:254
-msgid "Put all whispers in tabs"
-msgstr "Deixar as mensagens privadas em abas"
+#: src/gui/setup_perfomance.cpp:80
+#, fuzzy
+msgid "Enable reorder sprites."
+msgstr "Habilitar ataque do lado do servidor"
 
-#: src/gui/setup_players.cpp:257
-msgid "Show gender"
-msgstr "Mostrar gênero"
+#: src/gui/setup_perfomance.cpp:83
+msgid "Small memory (enable for lower memory usage)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:86
+msgid "Disable advanced beings caching (Software)"
+msgstr ""
 
-#: src/gui/setup_players.cpp:267
+#: src/gui/setup_perfomance.cpp:89
+msgid "Disable beings caching (Software)"
+msgstr ""
+
+#: src/gui/setup_players.cpp:48
 msgid "Players"
 msgstr "Jogadores"
 
-#: src/gui/setup_players.cpp:292
-msgid "When ignoring:"
-msgstr "Quando ignorar:"
+#: src/gui/setup_players.cpp:54
+msgid "Show gender"
+msgstr "Mostrar gênero"
 
-#: src/gui/setup_players.cpp:315
+#: src/gui/setup_players.cpp:57
 msgid "Show level"
 msgstr "Mostrar nível"
 
-#: src/gui/setup_players.cpp:319
+#: src/gui/setup_players.cpp:60
 msgid "Show own name"
 msgstr "Mostrar o próprio nome"
 
-#: src/gui/setup_players.cpp:323
+#: src/gui/setup_players.cpp:63
 msgid "Target dead players"
 msgstr "Jogadores mortos como alvo"
 
-#: src/gui/setup_players.cpp:327
+#: src/gui/setup_players.cpp:66
+msgid "Visible names"
+msgstr "Nomes visíveis"
+
+#: src/gui/setup_players.cpp:69
 msgid "Secure trades"
 msgstr "Trocas seguras"
 
-#: src/gui/setup_players.cpp:331 src/gui/setup_players.cpp:523
+#: src/gui/setup_players.cpp:72
 msgid "Unsecure chars in names"
 msgstr "Letras de nome inseguras"
 
-#: src/gui/setup_players.cpp:336
-msgid "Visible names"
-msgstr "Nomes visíveis"
-
-#: src/gui/setup_players.cpp:341
+#: src/gui/setup_players.cpp:75
 msgid "Show statuses"
 msgstr "Ver status"
 
-#: src/gui/setup_theme.cpp:105
+#: src/gui/setup_relations.cpp:65
+msgid "Relation"
+msgstr "Relação"
+
+#: src/gui/setup_relations.cpp:70
+msgid "Neutral"
+msgstr "Neutro"
+
+#: src/gui/setup_relations.cpp:71
+msgid "Friend"
+msgstr "Amigo"
+
+#: src/gui/setup_relations.cpp:72
+msgid "Disregarded"
+msgstr "Desconsiderado"
+
+#: src/gui/setup_relations.cpp:73
+msgid "Ignored"
+msgstr "Ignorado"
+
+#: src/gui/setup_relations.cpp:74
+msgid "Erased"
+msgstr "Apagado"
+
+#: src/gui/setup_relations.cpp:239
+msgid "Allow trading"
+msgstr "Permitir negociações"
+
+#: src/gui/setup_relations.cpp:241
+msgid "Allow whispers"
+msgstr "Permitir mensagens particulares"
+
+#: src/gui/setup_relations.cpp:244
+msgid "Old"
+msgstr "Antigo"
+
+#: src/gui/setup_relations.cpp:246
+#, fuzzy
+msgid "Relations"
+msgstr "Relação"
+
+#: src/gui/setup_relations.cpp:271
+msgid "When ignoring:"
+msgstr "Quando ignorar:"
+
+#: src/gui/setup_theme.cpp:106
 msgid "Tiny (10)"
 msgstr "Minúsculo (10)"
 
-#: src/gui/setup_theme.cpp:106
+#: src/gui/setup_theme.cpp:107
 msgid "Small (11)"
 msgstr "Pequeno (11)"
 
-#: src/gui/setup_theme.cpp:107
+#: src/gui/setup_theme.cpp:108
 msgid "Medium (12)"
 msgstr "Médio (12)"
 
-#: src/gui/setup_theme.cpp:108
+#: src/gui/setup_theme.cpp:109
 msgid "Large (13)"
 msgstr "Largo (13)"
 
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:110
 msgid "Big (14)"
 msgstr "Grande (14)"
 
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:111
 msgid "Huge (15)"
 msgstr "Enorme (15)"
 
-#: src/gui/setup_theme.cpp:140
+#: src/gui/setup_theme.cpp:141
 msgid "Theme"
 msgstr "Tema"
 
-#: src/gui/setup_theme.cpp:142
+#: src/gui/setup_theme.cpp:143
 msgid "Gui theme"
 msgstr "Tema"
 
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:144
 msgid "Main Font"
 msgstr "Fonte"
 
-#: src/gui/setup_theme.cpp:144
+#: src/gui/setup_theme.cpp:145
 msgid "Bold font"
 msgstr "Fonte negrito"
 
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:146
 msgid "Particle font"
 msgstr "Fonte de particulas"
 
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:147
 msgid "Help font"
 msgstr "Fonte de ajuda"
 
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:148
 msgid "Secure font"
 msgstr "Fonte Segura"
 
-#: src/gui/setup_theme.cpp:175
+#: src/gui/setup_theme.cpp:176
 msgid "Font size"
 msgstr "Tamanho da fonte"
 
-#: src/gui/setup_theme.cpp:281
+#: src/gui/setup_theme.cpp:282
 msgid "Theme Changed"
 msgstr "Tema alterado"
 
-#: src/gui/setup_theme.cpp:282 src/gui/setup_video.cpp:670
-#: src/gui/setup_video.cpp:675
+#: src/gui/setup_theme.cpp:283 src/gui/setup_video.cpp:619
+#: src/gui/setup_video.cpp:624
 msgid "Restart your client for the change to take effect."
 msgstr "Reincie o cliente para que as mudanças surtam efeito."
 
@@ -2273,138 +2334,118 @@ msgstr "médio"
 msgid "max"
 msgstr "máximo"
 
-#: src/gui/setup_video.cpp:293
+#: src/gui/setup_video.cpp:288
 msgid "Full screen"
 msgstr "Tela cheia"
 
-#: src/gui/setup_video.cpp:294
-msgid "Hw acceleration"
-msgstr "Aceleração por HW"
-
-#: src/gui/setup_video.cpp:295
+#: src/gui/setup_video.cpp:289
 msgid "Custom cursor"
 msgstr "Cursor customizado"
 
-#: src/gui/setup_video.cpp:297
+#: src/gui/setup_video.cpp:291
 msgid "Particle effects"
 msgstr "Efeitos de partícula"
 
-#: src/gui/setup_video.cpp:299
+#: src/gui/setup_video.cpp:293
 msgid "Show pickup notification"
 msgstr "Mostrar aviso ao pegar algo"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:301
+#: src/gui/setup_video.cpp:295
 msgid "in chat"
 msgstr "em chat"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:303
+#: src/gui/setup_video.cpp:297
 msgid "as particle"
 msgstr "como partícula"
 
-#: src/gui/setup_video.cpp:305
-msgid "Enable opacity cache"
-msgstr "Habilitar cache de opacidade"
-
-#: src/gui/setup_video.cpp:306
-msgid "Enable map reduce"
-msgstr "Habilitar redução de mapa"
-
-#: src/gui/setup_video.cpp:308
-msgid "Auto adjust perfomance"
-msgstr ""
-
-#: src/gui/setup_video.cpp:310
-msgid "Show beings transparency"
-msgstr ""
-
-#: src/gui/setup_video.cpp:315
+#: src/gui/setup_video.cpp:302
 msgid "FPS limit:"
 msgstr "Limite FPS:"
 
-#: src/gui/setup_video.cpp:319 src/gui/setup_video.cpp:356
-#: src/gui/setup_video.cpp:607 src/gui/setup_video.cpp:760
+#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
+#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709
 msgid "Alt FPS limit: "
 msgstr "Limite FPS alt: "
 
-#: src/gui/setup_video.cpp:328
+#: src/gui/setup_video.cpp:315
 msgid "Video"
 msgstr "Vídeo"
 
-#: src/gui/setup_video.cpp:334
+#: src/gui/setup_video.cpp:321
 msgid "Overhead text"
 msgstr "Texto sobrescrito como:"
 
-#: src/gui/setup_video.cpp:335
+#: src/gui/setup_video.cpp:322
 msgid "Gui opacity"
 msgstr "Opacidade"
 
-#: src/gui/setup_video.cpp:336
+#: src/gui/setup_video.cpp:323
 msgid "Ambient FX"
 msgstr "Ambiente FX"
 
-#: src/gui/setup_video.cpp:337
+#: src/gui/setup_video.cpp:324
 msgid "Particle detail"
 msgstr "Detalhe de partículas"
 
-#: src/gui/setup_video.cpp:354 src/gui/setup_video.cpp:357
-#: src/gui/setup_video.cpp:606 src/gui/setup_video.cpp:747
-#: src/gui/setup_video.cpp:758
+#: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
+#: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
+#: src/gui/setup_video.cpp:707
 msgid "None"
 msgstr "Nenhum"
 
-#: src/gui/setup_video.cpp:511
+#: src/gui/setup_video.cpp:484
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 "Falha ao mudar para o modo janela e falha na restauração do modo anterior!"
 
-#: src/gui/setup_video.cpp:517
+#: src/gui/setup_video.cpp:490
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 "Falha ao mudar para o modo tela cheia e falha na restauração do modo "
 "anterior!"
 
-#: src/gui/setup_video.cpp:528
+#: src/gui/setup_video.cpp:501
 msgid "Switching to Full Screen"
 msgstr "Mudando para tela cheia"
 
-#: src/gui/setup_video.cpp:529
+#: src/gui/setup_video.cpp:502
 msgid "Restart needed for changes to take effect."
 msgstr "É preciso reiniciar para as mudanças terem efeito."
 
-#: src/gui/setup_video.cpp:541
+#: src/gui/setup_video.cpp:514
 msgid "Changing to OpenGL"
 msgstr "Mudando para OpenGL"
 
-#: src/gui/setup_video.cpp:542
+#: src/gui/setup_video.cpp:515
 msgid "Applying change to OpenGL requires restart."
 msgstr "Mudanças no OpenGL requerem o reinício do jogo."
 
-#: src/gui/setup_video.cpp:653
+#: src/gui/setup_video.cpp:602
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Resolução customizada (exemplo 1024x768)"
 
-#: src/gui/setup_video.cpp:654
+#: src/gui/setup_video.cpp:603
 msgid "Enter new resolution:                "
 msgstr "Escolha a nova resolução                "
 
-#: src/gui/setup_video.cpp:669 src/gui/setup_video.cpp:674
+#: src/gui/setup_video.cpp:618 src/gui/setup_video.cpp:623
 msgid "Screen Resolution Changed"
 msgstr "Resolução de tela alterada"
 
-#: src/gui/setup_video.cpp:672
+#: src/gui/setup_video.cpp:621
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 "Algumas janelas podem ser movidas para se adequar à resolução mais baixa."
 
-#: src/gui/setup_video.cpp:705
+#: src/gui/setup_video.cpp:654
 msgid "Particle Effect Settings Changed."
 msgstr "Configurações de efeito de partícula modificadas."
 
-#: src/gui/setup_video.cpp:706
+#: src/gui/setup_video.cpp:655
 msgid "Changes will take effect on map change."
 msgstr "As mudanças terão efeito ao mudar de mapa."
 
@@ -2433,7 +2474,8 @@ msgstr "Anúncio"
 msgid "Show links in announce"
 msgstr "Mostrar links em anúncio"
 
-#: src/gui/shopwindow.cpp:723 src/net/manaserv/tradehandler.cpp:127
+#: src/gui/shopwindow.cpp:723 src/net/ea/tradehandler.cpp:106
+#: src/net/manaserv/tradehandler.cpp:127
 msgid "Request for Trade"
 msgstr "Proposta de negociação"
 
@@ -2475,7 +2517,7 @@ msgstr "Nível: %d"
 msgid "Lvl: %d (%+d)"
 msgstr "Nível: %d (%+d)"
 
-#: src/gui/socialwindow.cpp:117
+#: src/gui/socialwindow.cpp:117 src/net/ea/gui/guildtab.cpp:52
 msgid "Guild"
 msgstr "Guilda"
 
@@ -2507,7 +2549,7 @@ msgstr "Sair da guilda?"
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Tem certeza que deseja sair da guilda %s?"
 
-#: src/gui/socialwindow.cpp:215
+#: src/gui/socialwindow.cpp:215 src/net/ea/gui/partytab.cpp:50
 msgid "Party"
 msgstr "Grupo"
 
@@ -2669,243 +2711,243 @@ msgstr "Escolha o nome do seu grupo."
 msgid "Specials"
 msgstr "Especiais"
 
-#: src/gui/statuspopup.cpp:196
+#: src/gui/statuspopup.cpp:197
 msgid "(D) default moves"
 msgstr "(D) movimentos padrão"
 
-#: src/gui/statuspopup.cpp:201
+#: src/gui/statuspopup.cpp:202
 msgid "(I) invert moves"
 msgstr "(l) inserir movimentos"
 
-#: src/gui/statuspopup.cpp:206
+#: src/gui/statuspopup.cpp:207
 msgid "(c) moves with some crazy moves"
 msgstr "(c) Alguns movimentos loucos"
 
-#: src/gui/statuspopup.cpp:211
+#: src/gui/statuspopup.cpp:212
 msgid "(C) moves with crazy moves"
 msgstr "(C) Movimentos loucos"
 
-#: src/gui/statuspopup.cpp:216
+#: src/gui/statuspopup.cpp:217
 msgid "(d) double normal + crazy"
 msgstr "(d) dobro normal + louco"
 
-#: src/gui/statuspopup.cpp:221
+#: src/gui/statuspopup.cpp:222
 msgid "(?) move"
 msgstr "(?) mover"
 
-#: src/gui/statuspopup.cpp:239
+#: src/gui/statuspopup.cpp:240
 msgid "(a) custom crazy move"
 msgstr "(a) movimentos loucos customizados"
 
-#: src/gui/statuspopup.cpp:243
+#: src/gui/statuspopup.cpp:244
 msgid "(?) crazy move"
 msgstr "(?) movimentos loucos"
 
-#: src/gui/statuspopup.cpp:253
+#: src/gui/statuspopup.cpp:254
 msgid "(0) default moves to target"
 msgstr "(0) Mover ao alvo padrão"
 
-#: src/gui/statuspopup.cpp:258
+#: src/gui/statuspopup.cpp:259
 msgid "(1) moves to target in distance 1"
 msgstr "(1) Mover ao alvo com distância 1"
 
-#: src/gui/statuspopup.cpp:263
+#: src/gui/statuspopup.cpp:264
 msgid "(2) moves to target in distance 2"
 msgstr "(2) mover ao alvo em distância 2"
 
-#: src/gui/statuspopup.cpp:268
+#: src/gui/statuspopup.cpp:269
 msgid "(3) moves to target in distance 3"
 msgstr "(3) Mover ao alvo com distância 3"
 
-#: src/gui/statuspopup.cpp:273
+#: src/gui/statuspopup.cpp:274
 msgid "(5) moves to target in distance 5"
 msgstr "(5) Mover ao alvo com distância 5"
 
-#: src/gui/statuspopup.cpp:278
+#: src/gui/statuspopup.cpp:279
 msgid "(7) moves to target in distance 7"
 msgstr "(7) Mover ao alvo com distância 7"
 
-#: src/gui/statuspopup.cpp:283
+#: src/gui/statuspopup.cpp:284
 msgid "(A) moves to target in attack range"
 msgstr "(A)  Mover ao alvo com a distância de ataque"
 
-#: src/gui/statuspopup.cpp:288
+#: src/gui/statuspopup.cpp:289
 msgid "(?) move to target"
 msgstr "(?)  Mover ao alvo"
 
-#: src/gui/statuspopup.cpp:296
+#: src/gui/statuspopup.cpp:297
 msgid "(D) default follow"
 msgstr "(D) Seguir em modo padrão"
 
-#: src/gui/statuspopup.cpp:300
+#: src/gui/statuspopup.cpp:301
 msgid "(R) relative follow"
 msgstr "(R) Seguir em modo relativo"
 
-#: src/gui/statuspopup.cpp:304
+#: src/gui/statuspopup.cpp:305
 msgid "(M) mirror follow"
 msgstr "(M) Seguir em modo espelhado"
 
-#: src/gui/statuspopup.cpp:308
+#: src/gui/statuspopup.cpp:309
 msgid "(P) pet follow"
 msgstr "(P) Seguir em modo animal de extimação"
 
-#: src/gui/statuspopup.cpp:312
+#: src/gui/statuspopup.cpp:313
 msgid "(?) unknown follow"
 msgstr "(?) Seguir em modo desconhecido"
 
-#: src/gui/statuspopup.cpp:321 src/gui/statuspopup.cpp:344
+#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345
 msgid "(D) default attack"
 msgstr "(D) Ataque padrão"
 
-#: src/gui/statuspopup.cpp:326
+#: src/gui/statuspopup.cpp:327
 msgid "(s) switch attack without shield"
 msgstr "(s) Trocar ataque sem escudo"
 
-#: src/gui/statuspopup.cpp:331
+#: src/gui/statuspopup.cpp:332
 msgid "(S) switch attack with shield"
 msgstr "(S) Trocar ataque com escudo"
 
-#: src/gui/statuspopup.cpp:335 src/gui/statuspopup.cpp:360
+#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
 msgid "(?) attack"
 msgstr "(?) Ataque"
 
-#: src/gui/statuspopup.cpp:348
+#: src/gui/statuspopup.cpp:349
 msgid "(G) go and attack"
 msgstr "(G) Ir e atacar"
 
-#: src/gui/statuspopup.cpp:352
+#: src/gui/statuspopup.cpp:353
 msgid "(A) go, attack, pickup"
 msgstr "(A) Ir, atacar, pegar"
 
-#: src/gui/statuspopup.cpp:356
+#: src/gui/statuspopup.cpp:357
 msgid "(d) without auto attack"
 msgstr "(d) sem auto ataque"
 
-#: src/gui/statuspopup.cpp:374
+#: src/gui/statuspopup.cpp:375
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) Pequeno pegar 1x1 celulas"
 
-#: src/gui/statuspopup.cpp:378
+#: src/gui/statuspopup.cpp:379
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) Pegar padrão 2x1 células"
 
-#: src/gui/statuspopup.cpp:382
+#: src/gui/statuspopup.cpp:383
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) Pegar em frente 2x3 células"
 
-#: src/gui/statuspopup.cpp:386
+#: src/gui/statuspopup.cpp:387
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) Pegar 3x3 células"
 
-#: src/gui/statuspopup.cpp:390
+#: src/gui/statuspopup.cpp:391
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) Ir e pegar em distância 4"
 
-#: src/gui/statuspopup.cpp:394
+#: src/gui/statuspopup.cpp:395
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) Ir e pegar em distância 8"
 
-#: src/gui/statuspopup.cpp:398
+#: src/gui/statuspopup.cpp:399
 msgid "(A) go and pick up in max distance"
 msgstr "(A) Ir e pegar em distância mâxima"
 
-#: src/gui/statuspopup.cpp:402
+#: src/gui/statuspopup.cpp:403
 msgid "(?) pick up"
 msgstr "(?) Pegar item"
 
-#: src/gui/statuspopup.cpp:411
+#: src/gui/statuspopup.cpp:412
 msgid "(N) normal map view"
 msgstr "(N) Visualizardor de mapa normal"
 
-#: src/gui/statuspopup.cpp:415
+#: src/gui/statuspopup.cpp:416
 msgid "(D) debug map view"
 msgstr "(D) Visualizador de mapa depurador"
 
-#: src/gui/statuspopup.cpp:419
+#: src/gui/statuspopup.cpp:420
 msgid "(u) ultra map view"
 msgstr "(u) Visualizador de mapa ultra"
 
-#: src/gui/statuspopup.cpp:423
+#: src/gui/statuspopup.cpp:424
 msgid "(U) ultra map view 2"
 msgstr "(U) Visualizador de mapa ultra 2"
 
-#: src/gui/statuspopup.cpp:427
+#: src/gui/statuspopup.cpp:428
 msgid "(e) empty map view"
 msgstr "(e) Visualizador de mapa vazio"
 
-#: src/gui/statuspopup.cpp:431
+#: src/gui/statuspopup.cpp:432
 msgid "(b) black & white map view"
 msgstr "(b) Visualizador de mapa preto e branco"
 
-#: src/gui/statuspopup.cpp:435
+#: src/gui/statuspopup.cpp:436
 msgid "(?) map view"
 msgstr "(?) Visualizador de mapa"
 
-#: src/gui/statuspopup.cpp:443
+#: src/gui/statuspopup.cpp:444
 msgid "(f) use #flar for magic attack"
 msgstr "(f) Usar #flar para feitiço de ataque"
 
-#: src/gui/statuspopup.cpp:448
+#: src/gui/statuspopup.cpp:449
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) Usar #chiza para feitiço de ataque"
 
-#: src/gui/statuspopup.cpp:453
+#: src/gui/statuspopup.cpp:454
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) Usar #ingrav para feitiço de ataque"
 
-#: src/gui/statuspopup.cpp:458
+#: src/gui/statuspopup.cpp:459
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) Usar #frillyar para feitiço de ataque"
 
-#: src/gui/statuspopup.cpp:463
+#: src/gui/statuspopup.cpp:464
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) Usar #upmarmu para feitiço de ataque"
 
-#: src/gui/statuspopup.cpp:467
+#: src/gui/statuspopup.cpp:468
 msgid "(?) magic attack"
 msgstr "(?) Feitiço de ataque"
 
-#: src/gui/statuspopup.cpp:476
+#: src/gui/statuspopup.cpp:477
 msgid "(D) default imitation"
 msgstr "(D) Mímica padrão"
 
-#: src/gui/statuspopup.cpp:480
+#: src/gui/statuspopup.cpp:481
 msgid "(O) outfits imitation"
 msgstr "(O) Mímica de roupas"
 
-#: src/gui/statuspopup.cpp:484
+#: src/gui/statuspopup.cpp:485
 msgid "(?) imitation"
 msgstr "(?) Mímica"
 
-#: src/gui/statuspopup.cpp:493
+#: src/gui/statuspopup.cpp:494
 msgid "(O) on keyboard"
 msgstr "(O) No teclado"
 
-#: src/gui/statuspopup.cpp:496
+#: src/gui/statuspopup.cpp:497
 msgid "(A) away"
 msgstr "(A) Ausente"
 
-#: src/gui/statuspopup.cpp:499 src/gui/statuspopup.cpp:519
+#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
 msgid "(?) away"
 msgstr "(?) Ausente"
 
-#: src/gui/statuspopup.cpp:507
+#: src/gui/statuspopup.cpp:508
 msgid "(G) game camera mode"
 msgstr "(G) Modo de jogo câmera"
 
-#: src/gui/statuspopup.cpp:511
+#: src/gui/statuspopup.cpp:512
 msgid "(F) free camera mode"
 msgstr "(F) Modo de jogo câmera livre"
 
-#: src/gui/statuspopup.cpp:515
+#: src/gui/statuspopup.cpp:516
 msgid "(D) design camera mode"
 msgstr "(D)  Modo de jogo câmera design"
 
-#: src/gui/statuspopup.cpp:526
+#: src/gui/statuspopup.cpp:527
 msgid "Game modifiers are disabled"
 msgstr "Modificadores de jogo desativados"
 
-#: src/gui/statuspopup.cpp:531
+#: src/gui/statuspopup.cpp:532
 msgid "Game modifiers are enabled"
 msgstr "Modificadores de jogo ativados"
 
@@ -3084,87 +3126,87 @@ msgstr "(b)"
 msgid "(O)"
 msgstr "(O)"
 
-#: src/gui/textcommandeditor.cpp:112
+#: src/gui/textcommandeditor.cpp:113
 msgid "No Target"
 msgstr "Sem alvo"
 
-#: src/gui/textcommandeditor.cpp:113
+#: src/gui/textcommandeditor.cpp:114
 msgid "Allow Target"
 msgstr "Permitir alvo"
 
-#: src/gui/textcommandeditor.cpp:114
+#: src/gui/textcommandeditor.cpp:115
 msgid "Need Target"
 msgstr "Precisa de alvo"
 
-#: src/gui/textcommandeditor.cpp:119
+#: src/gui/textcommandeditor.cpp:120
 msgid "General Magic"
 msgstr "Magia geral"
 
-#: src/gui/textcommandeditor.cpp:120
+#: src/gui/textcommandeditor.cpp:121
 msgid "Life Magic"
 msgstr "Magia Vida"
 
-#: src/gui/textcommandeditor.cpp:121
+#: src/gui/textcommandeditor.cpp:122
 msgid "War Magic"
 msgstr "Magia Guerra"
 
-#: src/gui/textcommandeditor.cpp:122
+#: src/gui/textcommandeditor.cpp:123
 msgid "Transmute Magic"
 msgstr "Magia Transmutação"
 
-#: src/gui/textcommandeditor.cpp:123
+#: src/gui/textcommandeditor.cpp:124
 msgid "Nature Magic"
 msgstr "Magia Natureza"
 
-#: src/gui/textcommandeditor.cpp:124
+#: src/gui/textcommandeditor.cpp:125
 msgid "Astral Magic"
 msgstr "Magia Astral"
 
-#: src/gui/textcommandeditor.cpp:167
+#: src/gui/textcommandeditor.cpp:168
 msgid "Command Editor"
 msgstr "Editor de comandos"
 
-#: src/gui/textcommandeditor.cpp:184
+#: src/gui/textcommandeditor.cpp:185
 msgid "magic"
 msgstr "Feitiço"
 
-#: src/gui/textcommandeditor.cpp:188
+#: src/gui/textcommandeditor.cpp:189
 msgid "other"
 msgstr "Outro"
 
-#: src/gui/textcommandeditor.cpp:193
+#: src/gui/textcommandeditor.cpp:194
 msgid "Symbol:"
 msgstr "Símbolo: "
 
-#: src/gui/textcommandeditor.cpp:196
+#: src/gui/textcommandeditor.cpp:197
 msgid "Command:"
 msgstr "Comando:"
 
-#: src/gui/textcommandeditor.cpp:199
+#: src/gui/textcommandeditor.cpp:200
 msgid "Mana:"
 msgstr "Mana:"
 
-#: src/gui/textcommandeditor.cpp:205
+#: src/gui/textcommandeditor.cpp:206
 msgid "Target Type:"
 msgstr "Tipo de alvo:"
 
-#: src/gui/textcommandeditor.cpp:211
+#: src/gui/textcommandeditor.cpp:212
 msgid "Icon:"
 msgstr "Icone:"
 
-#: src/gui/textcommandeditor.cpp:217
+#: src/gui/textcommandeditor.cpp:218
 msgid "Magic level:"
 msgstr "Nível mágico:"
 
-#: src/gui/textcommandeditor.cpp:223
+#: src/gui/textcommandeditor.cpp:224
 msgid "Magic School:"
 msgstr "Escola de Feitiço:"
 
-#: src/gui/textcommandeditor.cpp:229
+#: src/gui/textcommandeditor.cpp:230
 msgid "School level:"
 msgstr "Nível da escola:"
 
-#: src/gui/textcommandeditor.cpp:234
+#: src/gui/textcommandeditor.cpp:235
 msgid "Save"
 msgstr "Salvar"
 
@@ -3202,8 +3244,7 @@ msgid "Change"
 msgstr "Mudar"
 
 #: src/gui/tradewindow.cpp:332
-msgid ""
-"Failed adding item. You can not overlap one kind of item on the window."
+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 este tipo de item na janela."
 
@@ -3394,23 +3435,23 @@ msgstr "Borda do Lugar Inicial"
 msgid "Road Point"
 msgstr "Ponto de estrada"
 
-#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:470
+#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:471
 msgid "Who Is Online - Updating"
 msgstr "Quem está online - Atualizando"
 
-#: src/gui/whoisonline.cpp:100
+#: src/gui/whoisonline.cpp:101
 msgid "Update"
 msgstr "Atualizar"
 
-#: src/gui/whoisonline.cpp:293
+#: src/gui/whoisonline.cpp:294
 msgid "Who Is Online - "
 msgstr "Quem está online - "
 
-#: src/gui/whoisonline.cpp:484
+#: src/gui/whoisonline.cpp:485
 msgid "Who Is Online - error"
 msgstr "Quem está online - Erro"
 
-#: src/gui/whoisonline.cpp:515
+#: src/gui/whoisonline.cpp:516
 msgid "Who Is Online - Update"
 msgstr "Quem está online - Atualizado"
 
@@ -3475,6 +3516,7 @@ msgid "This command makes <nick> a channel operator."
 msgstr "Tornar <nick> operador do canal."
 
 #: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
+#: src/net/ea/gui/guildtab.cpp:69 src/net/ea/gui/partytab.cpp:85
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr "Se <nick> possuir espaços, coloque entre aspas (\")."
 
@@ -3546,8 +3588,7 @@ msgid "Command: /unignore <player>"
 msgstr "Comando: /unignore <jogador>"
 
 #: src/gui/widgets/whispertab.cpp:131
-msgid ""
-"This command stops ignoring the other player if they are being ignored."
+msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 "Este comando para de ignorar o outro jogador se ele estiver sendo ignorado."
 
@@ -4215,81 +4256,549 @@ msgstr "Obrigado pela compra."
 msgid "Unable to buy."
 msgstr "Impossível comprar."
 
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
-msgid "Strength"
+#: src/net/ea/charserverhandler.cpp:63
+#, fuzzy
+msgid "Strength:"
 msgstr "Força"
 
-#: src/net/manaserv/attributes.cpp:167
+#: src/net/ea/charserverhandler.cpp:64
+#, fuzzy
+msgid "Agility:"
+msgstr "Agilidade"
+
+#: src/net/ea/charserverhandler.cpp:65
+#, fuzzy
+msgid "Vitality:"
+msgstr "Vitalidade"
+
+#: src/net/ea/charserverhandler.cpp:66
+#, fuzzy
+msgid "Intelligence:"
+msgstr "Inteligência"
+
+#: src/net/ea/charserverhandler.cpp:67
+#, fuzzy
+msgid "Dexterity:"
+msgstr "Destreza"
+
+#: src/net/ea/charserverhandler.cpp:68
+#, fuzzy
+msgid "Luck:"
+msgstr "Sorte"
+
+#: src/net/ea/charserverhandler.cpp:102
+msgid "Access denied. Most likely, there are too many players on this server."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:106
+#, fuzzy
+msgid "Cannot use this ID."
+msgstr "Não é possível enviar mensagens privadas vazias!"
+
+#: src/net/ea/charserverhandler.cpp:109
+#, fuzzy
+msgid "Unknown char-server failure."
+msgstr "Erro desconhecido."
+
+#: src/net/ea/charserverhandler.cpp:138
+msgid "Failed to create character. Most likely the name is already taken."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:237
+#, fuzzy
+msgid "Wrong name."
+msgstr "Token-mágico errado."
+
+#: src/net/ea/charserverhandler.cpp:145
+#, fuzzy
+msgid "Incorrect stats."
+msgstr "Senha Incorreta"
+
+#: src/net/ea/charserverhandler.cpp:148
+#, fuzzy
+msgid "Incorrect hair."
+msgstr "Senha Incorreta"
+
+#: src/net/ea/charserverhandler.cpp:151
+#, fuzzy
+msgid "Incorrect slot."
+msgstr "Senha Incorreta"
+
+#: src/net/ea/charserverhandler.cpp:166 src/net/manaserv/charhandler.cpp:210
+msgid "Info"
+msgstr "Informações"
+
+#: src/net/ea/charserverhandler.cpp:166
+#, fuzzy
+msgid "Character deleted."
+msgstr "Personagem deletado."
+
+#: src/net/ea/charserverhandler.cpp:172
+#, fuzzy
+msgid "Failed to delete character."
+msgstr "Entre com a Senha para Deletar o usuario"
+
+#: src/net/ea/chathandler.cpp:60 src/net/ea/chathandler.cpp:66
+#: src/net/ea/chathandler.cpp:71 src/net/ea/chathandler.cpp:77
+#: src/net/ea/chathandler.cpp:82 src/net/ea/chathandler.cpp:88
+#: src/net/ea/chathandler.cpp:95 src/net/ea/chathandler.cpp:101
+msgid "Channels are not supported!"
+msgstr ""
+
+#: src/net/ea/chathandler.cpp:128
 #, c-format
-msgid "Strength %+.1f"
-msgstr "Força %+.1f"
+msgid "Whisper could not be sent, %s is offline."
+msgstr ""
 
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
-msgid "Agility"
-msgstr "Agilidade"
+#: src/net/ea/chathandler.cpp:136
+#, fuzzy, c-format
+msgid "Whisper could not be sent, ignored by %s."
+msgstr "Não foi possível deixar de ignorar o jogador!"
 
-#: src/net/manaserv/attributes.cpp:180
+#: src/net/ea/chathandler.cpp:348
+#, fuzzy
+msgid "MVP player."
+msgstr "Jogador"
+
+#: src/net/ea/chathandler.cpp:352
+#, fuzzy
+msgid "MVP player: "
+msgstr "Jogador"
+
+#: src/net/ea/gamehandler.cpp:86
 #, c-format
-msgid "Agility %+.1f"
-msgstr "Agilidade %+.1f"
+msgid "Online users: %d"
+msgstr ""
 
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
-msgid "Dexterity"
-msgstr "Destreza"
+#: src/net/ea/gamehandler.cpp:98
+msgid "Game"
+msgstr ""
 
-#: src/net/manaserv/attributes.cpp:193
+#: src/net/ea/gamehandler.cpp:98
+#, fuzzy
+msgid "Request to quit denied!"
+msgstr "Proposta de negociação"
+
+#: src/net/ea/gui/guildtab.cpp:67 src/net/ea/gui/partytab.cpp:83
+#, fuzzy
+msgid "Command: /invite <nick>"
+msgstr "Comando: /kick <nick>"
+
+#: src/net/ea/gui/guildtab.cpp:68
+#, fuzzy
+msgid "This command invites <nick> to the guild you're in."
+msgstr "Tornar <nick> operador do canal."
+
+#: src/net/ea/gui/guildtab.cpp:74 src/net/ea/gui/partytab.cpp:90
+#, fuzzy
+msgid "Command: /leave"
+msgstr "Comando: /close"
+
+#: src/net/ea/gui/guildtab.cpp:75
+#, fuzzy
+msgid "This command causes the player to leave the guild."
+msgstr "Seta <mensagem> como o tópico."
+
+#: src/net/ea/gui/guildtab.cpp:135 src/net/ea/gui/partytab.cpp:69
+#, fuzzy
+msgid "/help > Display this help."
+msgstr "  -h --help           : Exibe esta ajuda"
+
+#: src/net/ea/gui/guildtab.cpp:136
+msgid "/invite > Invite a player to your guild"
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:137
+msgid "/leave > Leave the guild you are in"
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:138
+#, fuzzy
+msgid "/kick > Kick some one from the guild you are in"
+msgstr "/kick > Expulsa um usuário do canal"
+
+#: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
+msgid "Guild created."
+msgstr "Guilda criada."
+
+#: src/net/ea/guildhandler.cpp:88 src/net/ea/guildhandler.cpp:93
+#, fuzzy
+msgid "You are already in guild."
+msgstr "Erro ao criar Guilda."
+
+#: src/net/ea/guildhandler.cpp:98
+msgid "Emperium check failed."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:103
+#, fuzzy
+msgid "Unknown server response."
+msgstr "Erro desconhecido."
+
+#: src/net/ea/guildhandler.cpp:180
+#, fuzzy, c-format
+msgid "Guild name: %s"
+msgstr "Guilda: %s"
+
+#: src/net/ea/guildhandler.cpp:182
+#, fuzzy, c-format
+msgid "Guild master: %s"
+msgstr "Guilda: %s"
+
+#: src/net/ea/guildhandler.cpp:184
+#, fuzzy, c-format
+msgid "Guild level: %d"
+msgstr "Nível: %d"
+
+#: src/net/ea/guildhandler.cpp:186
 #, c-format
-msgid "Dexterity %+.1f"
-msgstr "Destreza %+.1f"
+msgid "Online members: %d"
+msgstr ""
 
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
-msgid "Vitality"
-msgstr "Vitalidade"
+#: src/net/ea/guildhandler.cpp:188
+#, c-format
+msgid "Max members: %d"
+msgstr ""
 
-#: src/net/manaserv/attributes.cpp:206
+#: src/net/ea/guildhandler.cpp:190
+#, fuzzy, c-format
+msgid "Average level: %d"
+msgstr "Nível mágico:"
+
+#: src/net/ea/guildhandler.cpp:192
+#, fuzzy, c-format
+msgid "Guild exp: %d"
+msgstr "Guilda: %s"
+
+#: src/net/ea/guildhandler.cpp:194
+#, fuzzy, c-format
+msgid "Guild next exp: %d"
+msgstr "Guilda criada."
+
+#: src/net/ea/guildhandler.cpp:196
+#, fuzzy, c-format
+msgid "Guild castle: %s"
+msgstr "Guilda: %s"
+
+#: src/net/ea/guildhandler.cpp:402
+#, fuzzy
+msgid "Could not inivte user to guild."
+msgstr "Convidou o jogador %s para a guilda %s."
+
+#: src/net/ea/guildhandler.cpp:406
+#, fuzzy
+msgid "User rejected guild invite."
+msgstr "%s recusou seu convite."
+
+#: src/net/ea/guildhandler.cpp:410
+msgid "User is now part of your guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:414
+msgid "Your guild is full."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:418
+#, fuzzy
+msgid "Unknown guild invite response."
+msgstr "Aceitou convite para a guilda de  %s."
+
+#: src/net/ea/guildhandler.cpp:438
+msgid "You have left the guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:452
+#, fuzzy, c-format
+msgid "%s has left your guild."
+msgstr "Escolha o nome da sua guilda."
+
+#: src/net/ea/guildhandler.cpp:483
+#, fuzzy
+msgid "You was kicked from guild."
+msgstr "Chutar da Guilda"
+
+#: src/net/ea/guildhandler.cpp:496
+#, fuzzy, c-format
+msgid "%s has kicked from your guild."
+msgstr "%s expulsou %s."
+
+#: src/net/ea/gui/partytab.cpp:70
+msgid "/invite > Invite a player to your party"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:71
+msgid "/leave > Leave the party you are in"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:72
+#, fuzzy
+msgid "/kick > Kick some one from the party you are in"
+msgstr "/kick > Expulsa um usuário do canal"
+
+#: src/net/ea/gui/partytab.cpp:73
+msgid "/item > Show/change party item sharing options"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:74
+msgid "/exp > Show/change party experience sharing options"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:84
+#, fuzzy
+msgid "This command invites <nick> to party with you."
+msgstr "Retirar <nick> do canal."
+
+#: src/net/ea/gui/partytab.cpp:91
+#, fuzzy
+msgid "This command causes the player to leave the party."
+msgstr "Seta <mensagem> como o tópico."
+
+#: src/net/ea/gui/partytab.cpp:95
+#, fuzzy
+msgid "Command: /item <policy>"
+msgstr "Comando: /kick <nick>"
+
+#: src/net/ea/gui/partytab.cpp:97
+#, fuzzy
+msgid "This command changes the party's item sharing policy."
+msgstr "Mostra os usuários neste canal."
+
+#: src/net/ea/gui/partytab.cpp:98
+msgid ""
+"<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
+"\"0\", \"no\", \"false\" to disable item sharing."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:101
+#, fuzzy
+msgid "Command: /item"
+msgstr "Comando: /quit"
+
+#: src/net/ea/gui/partytab.cpp:102
+#, fuzzy
+msgid "This command displays the party's current item sharing policy."
+msgstr "Sair do canal."
+
+#: src/net/ea/gui/partytab.cpp:107
+#, fuzzy
+msgid "Command: /exp <policy>"
+msgstr "Comando: /op <nick>"
+
+#: src/net/ea/gui/partytab.cpp:108
+#, fuzzy
+msgid "This command changes the party's experience sharing policy."
+msgstr "Sair do canal."
+
+#: src/net/ea/gui/partytab.cpp:110
+msgid ""
+"<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
+"sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:113
+#, fuzzy
+msgid "Command: /exp"
+msgstr "Comando: /users"
+
+#: src/net/ea/gui/partytab.cpp:114
+#, fuzzy
+msgid "This command displays the party's current experience sharing policy."
+msgstr "Sair do canal."
+
+#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:286
+msgid "Item sharing enabled."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:296
+msgid "Item sharing disabled."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:306
+msgid "Item sharing not possible."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:157
+msgid "Item sharing unknown."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:248
+msgid "Experience sharing enabled."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:258
+msgid "Experience sharing disabled."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:268
+msgid "Experience sharing not possible."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:196
+msgid "Experience sharing unknown."
+msgstr ""
+
+#: src/net/ea/inventoryhandler.cpp:407
+#, fuzzy
+msgid "Failed to use item."
+msgstr "Erro ao promover o membro."
+
+#: src/net/ea/inventoryhandler.cpp:580
+#, fuzzy
+msgid "Unable to equip."
+msgstr "Impossível comprar."
+
+#: src/net/ea/loginhandler.cpp:131
+#, fuzzy
+msgid "Account was not found. Please re-login."
+msgstr "Conta não conectada. Por favor, efetue o login primeiro."
+
+#: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127
+msgid "Old password incorrect."
+msgstr "Senha antiga incorreta."
+
+#: src/net/ea/loginhandler.cpp:137
+#, fuzzy
+msgid "New password too short."
+msgstr "Nova senha incorreta."
+
+#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:243
+#: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
+#: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
+#: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
+msgid "Unknown error."
+msgstr "Erro desconhecido."
+
+#: src/net/ea/loginhandler.cpp:205
+#, fuzzy
+msgid "Unregistered ID."
+msgstr "Cancelar Registro"
+
+#: src/net/ea/loginhandler.cpp:208
+#, fuzzy
+msgid "Wrong password."
+msgstr "Nome de usuário ou senha inválidos."
+
+#: src/net/ea/loginhandler.cpp:211
+#, fuzzy
+msgid "Account expired."
+msgstr "Conta banida."
+
+#: src/net/ea/loginhandler.cpp:214
+#, fuzzy
+msgid "Rejected from server."
+msgstr "Você foi desconectado do servidor!"
+
+#: src/net/ea/loginhandler.cpp:217
+msgid ""
+"You have been permanently banned from the game. Please contact the GM team."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:221
+#, fuzzy
+msgid "Client too old."
+msgstr "Versão do cliente é muito antiga."
+
+#: src/net/ea/loginhandler.cpp:224
 #, c-format
-msgid "Vitality %+.1f"
-msgstr "Vitalidade %+.1f"
+msgid ""
+"You have been temporarily banned from the game until %s.\n"
+"Please contact the GM team via the forums."
+msgstr ""
 
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
-msgid "Intelligence"
-msgstr "Inteligência"
+#: src/net/ea/loginhandler.cpp:231
+msgid "Server overpopulated."
+msgstr ""
 
-#: src/net/manaserv/attributes.cpp:219
+#: src/net/ea/loginhandler.cpp:234
+#, fuzzy
+msgid "This user name is already taken."
+msgstr "Existe alguém conectado a esta conta."
+
+#: src/net/ea/loginhandler.cpp:240
+#, fuzzy
+msgid "Username permanently erased."
+msgstr "Nome de usuário já existe."
+
+#: src/net/ea/partyhandler.cpp:82
+#, fuzzy
+msgid "Could not create party."
+msgstr "Criar grupo"
+
+#: src/net/ea/partyhandler.cpp:84
+#, fuzzy
+msgid "Party successfully created."
+msgstr "Jogador apagado com sucesso!"
+
+#: src/net/ea/partyhandler.cpp:140
+#, fuzzy, c-format
+msgid "%s has joined your party."
+msgstr "%s não está em seu grupo!"
+
+#: src/net/ea/partyhandler.cpp:176
 #, c-format
-msgid "Intelligence %+.1f"
-msgstr "Intelegência %+.1f"
+msgid "%s is already a member of a party."
+msgstr ""
 
-#: src/net/manaserv/attributes.cpp:225
-msgid "Willpower"
-msgstr "Força de Vontade"
+#: src/net/ea/partyhandler.cpp:181
+#, fuzzy, c-format
+msgid "%s refused your invitation."
+msgstr "%s recusou seu convite."
 
-#: src/net/manaserv/attributes.cpp:232
+#: src/net/ea/partyhandler.cpp:186
+#, fuzzy, c-format
+msgid "%s is now a member of your party."
+msgstr "%s não está em seu grupo!"
+
+#: src/net/ea/partyhandler.cpp:191
 #, c-format
-msgid "Willpower %+.1f"
-msgstr "Força de Vontade %+.1f"
+msgid "%s can't join your party because party is full."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:196
+#, c-format
+msgid "QQQ Unknown invite response for %s."
+msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/partyhandler.cpp:356
+#, fuzzy
+msgid "You have left the party."
+msgstr "Você foi convidado para entrar no grupo %s."
+
+#: src/net/ea/partyhandler.cpp:368
+#, fuzzy, c-format
+msgid "%s has left your party."
+msgstr "%s não está em seu grupo!"
+
+#: src/net/ea/partyhandler.cpp:444
+#, c-format
+msgid "An unknown member tried to say: %s"
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:95 src/net/manaserv/beinghandler.cpp:315
 msgid "You are dead."
 msgstr "Você está morto."
 
-#: src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:316
 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:318
+#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:318
 msgid "You are not that alive anymore."
 msgstr "Você não me parece assim tão vivo."
 
-#: src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:319
 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:320
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:320
 msgid "Game Over!"
 msgstr "Fim de jogo!"
 
-#: src/net/manaserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:101
+msgid "Insert coin to continue."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:321
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
@@ -4297,38 +4806,327 @@ msgstr ""
 "Não, criança. Seu personagem não morreu de verdade. Ele... err... foi para "
 "um lugar melhor."
 
-#: src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:323
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 "Seu plano de quebrar a arma de seu inimigo com a sua cabeça não deu certo."
 
-#: src/net/manaserv/beinghandler.cpp:325
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:325
 msgid "I guess this did not run too well."
 msgstr "Eu acho que as coisas não correram tão bem."
 
-#: src/net/manaserv/beinghandler.cpp:326
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:326
 msgid "Do you want your possessions identified?"
 msgstr "Você quer uma identificação de suas posses?"
 
-#: src/net/manaserv/beinghandler.cpp:327
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:327
 msgid "Sadly, no trace of you was ever found..."
 msgstr "Infelizmente, seus traços nunca foram encontrados..."
 
-#: src/net/manaserv/beinghandler.cpp:329
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:329
 msgid "Annihilated."
 msgstr "Aniquilado."
 
-#: src/net/manaserv/beinghandler.cpp:330
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:330
 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:332
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:332
 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:119
+msgid "You're not dead yet. You're just resting."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:120
+#, fuzzy
+msgid "You are no more."
+msgstr "Você está morto."
+
+#: src/net/ea/playerhandler.cpp:121
+#, fuzzy
+msgid "You have ceased to be."
+msgstr "Você está morto."
+
+#: src/net/ea/playerhandler.cpp:122
+msgid "You've expired and gone to meet your maker."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:123
+msgid "You're a stiff."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:124
+msgid "Bereft of life, you rest in peace."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:125
+msgid "If you weren't so animated, you'd be pushing up the daisies."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:126
+msgid "Your metabolic processes are now history."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:127
+msgid "You're off the twig."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:128
+msgid "You've kicked the bucket."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:129
+msgid ""
+"You've shuffled off your mortal coil, run down the curtain and joined the "
+"bleedin' choir invisibile."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:131
+#, fuzzy
+msgid "You are an ex-player."
+msgstr "Você está morto."
+
+#: src/net/ea/playerhandler.cpp:132
+msgid "You're pining for the fjords."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
+#: src/net/ea/playerhandler.cpp:425
+#, fuzzy
+msgid "Message"
+msgstr "Mensagens"
+
+#: src/net/ea/playerhandler.cpp:337
+msgid ""
+"You are carrying more than half your weight. You are unable to regain health."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:347
+msgid "You are carrying less than half your weight. You can regain health."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:451
+#, fuzzy, c-format
+msgid "You picked up %s."
+msgstr "Você pegou %d [@@%d|%s@@]."
+
+#: src/net/ea/playerhandler.cpp:457
+#, fuzzy, c-format
+msgid "You spent %s."
+msgstr "Você pegou %s"
+
+#: src/net/ea/playerhandler.cpp:501
+msgid "Cannot raise skill!"
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:618
+#, fuzzy
+msgid "Equip arrows first."
+msgstr "Desequipar antes"
+
+#: src/net/ea/specialhandler.cpp:149
+#, fuzzy
+msgid "Trade failed!"
+msgstr "Negociação cancelada."
+
+#: src/net/ea/specialhandler.cpp:152
+#, fuzzy
+msgid "Emote failed!"
+msgstr "Erro na expulsão!"
+
+#: src/net/ea/specialhandler.cpp:155
+#, fuzzy
+msgid "Sit failed!"
+msgstr "Erro na expulsão!"
+
+#: src/net/ea/specialhandler.cpp:158
+#, fuzzy
+msgid "Chat creating failed!"
+msgstr "Falha de autenticação."
+
+#: src/net/ea/specialhandler.cpp:161
+#, fuzzy
+msgid "Could not join party!"
+msgstr "%s não está em seu grupo!"
+
+#: src/net/ea/specialhandler.cpp:164
+msgid "Cannot shout!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:177
+msgid "You have not yet reached a high enough lvl!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:181
+msgid "Insufficient HP!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:184
+msgid "Insufficient SP!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:187
+#, fuzzy
+msgid "You have no memos!"
+msgstr "Você não tem dinheiro suficiente."
+
+#: src/net/ea/specialhandler.cpp:190
+#, fuzzy
+msgid "You cannot do that right now!"
+msgstr "Você não me parece assim tão vivo."
+
+#: src/net/ea/specialhandler.cpp:193
+msgid "Seems you need more money... ;-)"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:196
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:200
+msgid "You need another red gem!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:203
+msgid "You need another blue gem!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:206
+msgid "You're carrying to much to do this!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:209
+msgid "Huh? What's that?"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:220
+msgid "Warp failed..."
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:223
+msgid "Could not steal anything..."
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:226
+msgid "Poison had no effect..."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:128
+#, 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:130
+msgid "Trading isn't possible. Trade partner is too far away."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:134
+msgid "Trading isn't possible. Character doesn't exist."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:138
+msgid "Trade cancelled due to an unknown reason."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:146
+#, fuzzy, c-format
+msgid "Trade: You and %s"
+msgstr "Negócio: você"
+
+#: src/net/ea/tradehandler.cpp:156
+#, fuzzy, c-format
+msgid "Trade with %s cancelled."
+msgstr "Negociação cancelada."
+
+#: src/net/ea/tradehandler.cpp:169
+msgid "Unhandled trade cancel packet."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:231
+msgid "Failed adding item. Trade partner is over weighted."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:236
+msgid "Failed adding item. Trade partner has no free slot."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:241
+#, fuzzy
+msgid "Failed adding item. You can't trade this item."
+msgstr ""
+"Falha ao adicionar item. Você não pode duplicar este tipo de item na janela."
+
+#: src/net/ea/tradehandler.cpp:245
+msgid "Failed adding item for unknown reason."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:264 src/net/manaserv/tradehandler.cpp:160
+msgid "Trade canceled."
+msgstr "Negociação cancelada."
+
+#: src/net/ea/tradehandler.cpp:275 src/net/manaserv/tradehandler.cpp:167
+msgid "Trade completed."
+msgstr "Negociação realizada."
+
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
+msgid "Strength"
+msgstr "Força"
+
+#: src/net/manaserv/attributes.cpp:167
+#, c-format
+msgid "Strength %+.1f"
+msgstr "Força %+.1f"
+
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
+msgid "Agility"
+msgstr "Agilidade"
+
+#: src/net/manaserv/attributes.cpp:180
+#, c-format
+msgid "Agility %+.1f"
+msgstr "Agilidade %+.1f"
+
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
+msgid "Dexterity"
+msgstr "Destreza"
+
+#: src/net/manaserv/attributes.cpp:193
+#, c-format
+msgid "Dexterity %+.1f"
+msgstr "Destreza %+.1f"
+
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
+msgid "Vitality"
+msgstr "Vitalidade"
+
+#: src/net/manaserv/attributes.cpp:206
+#, c-format
+msgid "Vitality %+.1f"
+msgstr "Vitalidade %+.1f"
+
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
+msgid "Intelligence"
+msgstr "Inteligência"
+
+#: src/net/manaserv/attributes.cpp:219
+#, c-format
+msgid "Intelligence %+.1f"
+msgstr "Intelegência %+.1f"
+
+#: src/net/manaserv/attributes.cpp:225
+msgid "Willpower"
+msgstr "Força de Vontade"
+
+#: src/net/manaserv/attributes.cpp:232
+#, c-format
+msgid "Willpower %+.1f"
+msgstr "Força de Vontade %+.1f"
+
 #: src/net/manaserv/beinghandler.cpp:337
 msgid "Press OK to respawn."
 msgstr "Clique em OK para repopular."
@@ -4382,16 +5180,6 @@ msgstr "O status está muito longe do permitido (%u - %u)"
 msgid "Invalid slot number."
 msgstr "Número de slot inválido."
 
-#: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
-#: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
-#: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
-msgid "Unknown error."
-msgstr "Erro desconhecido."
-
-#: src/net/manaserv/charhandler.cpp:210
-msgid "Info"
-msgstr "Informações"
-
 #: src/net/manaserv/charhandler.cpp:210
 msgid "Player deleted."
 msgstr "Personagem deletado."
@@ -4455,10 +5243,6 @@ msgstr "%s expulsou %s."
 msgid "Unknown channel event."
 msgstr "Evento de canal desconhecido."
 
-#: src/net/manaserv/guildhandler.cpp:85
-msgid "Guild created."
-msgstr "Guilda criada."
-
 #: src/net/manaserv/guildhandler.cpp:90
 msgid "Error creating guild."
 msgstr "Erro ao criar Guilda."
@@ -4491,10 +5275,6 @@ msgstr "Conta banida."
 msgid "New password incorrect."
 msgstr "Nova senha incorreta."
 
-#: src/net/manaserv/loginhandler.cpp:127
-msgid "Old password incorrect."
-msgstr "Senha antiga incorreta."
-
 #: src/net/manaserv/loginhandler.cpp:131 src/net/manaserv/loginhandler.cpp:163
 msgid "Account not connected. Please login first."
 msgstr "Conta não conectada. Por favor, efetue o login primeiro."
@@ -4572,24 +5352,11 @@ msgstr "Aceitando propostas de negócios."
 msgid "Ignoring incoming trade requests."
 msgstr "Ignorando propostas de negócios."
 
-#: src/net/manaserv/tradehandler.cpp:128
-#, 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:146
 #, c-format
 msgid "Trading with %s"
 msgstr "Negociando com %s"
 
-#: src/net/manaserv/tradehandler.cpp:160
-msgid "Trade canceled."
-msgstr "Negociação cancelada."
-
-#: src/net/manaserv/tradehandler.cpp:167
-msgid "Trade completed."
-msgstr "Negociação realizada."
-
 #: src/net/tmwa/adminhandler.cpp:70
 msgid "Kick failed!"
 msgstr "Erro na expulsão!"
@@ -4781,4 +5548,5 @@ msgstr "MP %+d"
 msgid "Unknown item"
 msgstr "Item desconhecido"
 
-
+#~ msgid "Enable opacity cache"
+#~ msgstr "Habilitar cache de opacidade"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 20477c255..efcc414e5 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 #   <alasmirt@gmail.com>, 2011.
 # alastrim <alasmirt@gmail.com>, 2011.
 #   <freya.df@gmail.com>, 2011.
@@ -11,39 +11,40 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-08 04:26+0300\n"
+"POT-Creation-Date: 2011-08-10 01:11+0300\n"
 "PO-Revision-Date: 2011-08-08 01:29+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
-"Language-Team: Portuguese (Brazilian) (http://www.transifex.net/projects/p/manaplus/team/pt_BR/)\n"
+"Language-Team: Portuguese (Brazilian) (http://www.transifex.net/projects/p/"
+"manaplus/team/pt_BR/)\n"
+"Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
 #: src/actorspritemanager.cpp:1034
 msgid "Visible on map"
 msgstr "Mapa visivel "
 
-#: src/being.cpp:541
+#: src/being.cpp:542
 msgid "dodge"
 msgstr "desviou"
 
-#: src/being.cpp:541
+#: src/being.cpp:542
 msgid "miss"
 msgstr "errou"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1513
+#: src/being.cpp:1514
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1518
+#: src/being.cpp:1519
 msgid "I"
 msgstr "I"
 
-#: src/client.cpp:825 src/gui/setup.cpp:51 src/gui/windowmenu.cpp:100
+#: src/client.cpp:825 src/gui/setup.cpp:53 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Configurar"
 
@@ -75,7 +76,8 @@ msgstr "Mudando servidores do jogo"
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
-#: src/gui/unregisterdialog.cpp:137 src/net/manaserv/charhandler.cpp:184
+#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
+#: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "Erro"
@@ -139,18 +141,18 @@ msgstr "Não é possível enviar mensagens privadas vazias!"
 #: src/commandhandler.cpp:409
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
-" you."
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
+"you."
 msgstr ""
-"Não é possível  criar uma aba de mensagem privada para o nick \"%s\"! Ou ela"
-" já existe ou é você mesmo."
+"Não é possível  criar uma aba de mensagem privada para o nick \"%s\"! Ou ela "
+"já existe ou é você mesmo."
 
 #: src/commandhandler.cpp:429
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Solicitando entrada no canal %s."
 
-#: src/commandhandler.cpp:445
+#: src/commandhandler.cpp:445 src/net/ea/gui/partytab.cpp:125
 msgid "Party name is missing."
 msgstr "Falta o nome do grupo."
 
@@ -297,7 +299,8 @@ msgstr "Recurso de imagem orfão:"
 #: src/commandhandler.h:40
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr "Opções para /%s são \"yes\" e \"no\", \"true\" e \"false\", \"1\" e \"0\"."
+msgstr ""
+"Opções para /%s são \"yes\" e \"no\", \"true\" e \"false\", \"1\" e \"0\"."
 
 #: src/game.cpp:246 src/gui/widgets/chattab.cpp:410
 msgid "General"
@@ -360,35 +363,35 @@ msgstr "Posição no PVP: %d"
 msgid "Comment: %s"
 msgstr "Comentário: %s"
 
-#: src/gui/botcheckerwindow.cpp:265
+#: src/gui/botcheckerwindow.cpp:266
 msgid "Bot Checker"
 msgstr "Analizador de bot"
 
-#: src/gui/botcheckerwindow.cpp:295 src/gui/setup_players.cpp:64
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
 msgid "Name"
 msgstr "Nome"
 
-#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:130
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:130
 #: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:604
 #: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
 msgid "Attack"
 msgstr "Atacar"
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:275
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:275
 #: src/keyboardconfig.cpp:62
 msgid "Talk"
 msgstr "Falar"
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:241
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:241
 #: src/gui/popupmenu.cpp:280 src/gui/popupmenu.cpp:661
 msgid "Move"
 msgstr "Mover"
 
-#: src/gui/botcheckerwindow.cpp:299
+#: src/gui/botcheckerwindow.cpp:300
 msgid "Result"
 msgstr "Resultado"
 
-#: src/gui/botcheckerwindow.cpp:309 src/gui/npcdialog.cpp:123
+#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:123
 msgid "Reset"
 msgstr "Resetar"
 
@@ -457,8 +460,8 @@ msgstr "Vender"
 #: src/gui/popupmenu.cpp:1731 src/gui/popupmenu.cpp:1774
 #: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1849
 #: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1935
-#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:68
-#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:237
+#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:70
+#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:238
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
 #: src/gui/updatewindow.cpp:157
 msgid "Cancel"
@@ -627,8 +630,8 @@ msgid "Enter password:"
 msgstr "Entre com a senha:"
 
 #: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
-#: src/gui/setup_players.cpp:251 src/gui/shopwindow.cpp:120
-#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:240
+#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120
+#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:241
 msgid "Delete"
 msgstr "Excluir"
 
@@ -702,10 +705,10 @@ msgid "rainbow 3"
 msgstr "arco-íris 3"
 
 #: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
-#: src/gui/logindialog.cpp:78 src/gui/setup_players.cpp:220
-#: src/gui/setup_theme.cpp:71 src/gui/setup_theme.cpp:125
-#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:101
-#: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:159
+#: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
+#: src/gui/setup_theme.cpp:72 src/gui/setup_theme.cpp:126
+#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
+#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
 msgid "???"
 msgstr "???"
 
@@ -896,7 +899,7 @@ msgstr "Próximo >"
 msgid "Auto open this window"
 msgstr "Auto abrir esta janela"
 
-#: src/gui/editdialog.cpp:46 src/gui/itemamountwindow.cpp:208
+#: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
 #: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "OK"
@@ -980,7 +983,7 @@ msgstr "Peso:"
 
 #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
 #: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1724
-#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:69
+#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:71
 msgid "Store"
 msgstr "Armazenar"
 
@@ -1039,91 +1042,91 @@ msgstr ", "
 msgid "Weight: %s"
 msgstr "Peso: %s"
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
+#: src/gui/killstats.cpp:46 src/gui/windowmenu.cpp:69
 msgid "Kill stats"
 msgstr "Estatísticas"
 
-#: src/gui/killstats.cpp:63
+#: src/gui/killstats.cpp:64
 msgid "Reset stats"
 msgstr "Resetar Status"
 
-#: src/gui/killstats.cpp:64
+#: src/gui/killstats.cpp:65
 msgid "Reset timer"
 msgstr "Resetar tempo"
 
-#: src/gui/killstats.cpp:68 src/gui/killstats.cpp:204
+#: src/gui/killstats.cpp:69 src/gui/killstats.cpp:205
 #, c-format
 msgid "Level: %d at %f%%"
 msgstr "Nível: %d em %f%%"
 
-#: src/gui/killstats.cpp:72 src/gui/killstats.cpp:209
+#: src/gui/killstats.cpp:73 src/gui/killstats.cpp:210
 #, c-format
 msgid "Exp: %d/%d Left: %d"
 msgstr "Exp: %d%d Falta: %d"
 
-#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:215
-#: src/gui/killstats.cpp:224
+#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:216
+#: src/gui/killstats.cpp:225
 #, c-format
 msgid "1%% = %d exp, avg mob for 1%%: %s"
 msgstr "1%% = %d ex, avg mob por 1%%: %s"
 
-#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:141
-#: src/gui/killstats.cpp:233
+#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:142
+#: src/gui/killstats.cpp:234
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr "Mortes: %s Total exp: %s"
 
-#: src/gui/killstats.cpp:80 src/gui/killstats.cpp:143
-#: src/gui/killstats.cpp:219 src/gui/killstats.cpp:229
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
+#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:230
 #, c-format
 msgid "Avg Exp: %s, No. of avg mob to next level: %s"
 msgstr "Avg Exp: %s No. de avg mob para próximo nível: %s"
 
-#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:161
-#: src/gui/killstats.cpp:236
+#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:162
+#: src/gui/killstats.cpp:237
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr "Mortes/Min: %s Exp/Min: %s"
 
-#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:88 src/gui/killstats.cpp:93
-#: src/gui/killstats.cpp:288 src/gui/killstats.cpp:304
-#: src/gui/killstats.cpp:322
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:89 src/gui/killstats.cpp:94
+#: src/gui/killstats.cpp:289 src/gui/killstats.cpp:305
+#: src/gui/killstats.cpp:323
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
 msgstr[0] "Velocidade de exp por %d min: %s"
 msgstr[1] "Velocidade de exp por %d mins: %s"
 
-#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
+#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
 msgstr[0] "Tempo para o próximo nível %d min: %s "
 msgstr[1] "Tempo para o próximo nível %d mins: %s "
 
-#: src/gui/killstats.cpp:99 src/gui/killstats.cpp:240
+#: src/gui/killstats.cpp:100 src/gui/killstats.cpp:241
 msgid "Last kill exp:"
 msgstr "Ultim exp por morte:"
 
-#: src/gui/killstats.cpp:101 src/gui/killstats.cpp:354
-#: src/gui/killstats.cpp:360 src/gui/killstats.cpp:366
-#: src/gui/killstats.cpp:371
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:355
+#: src/gui/killstats.cpp:361 src/gui/killstats.cpp:367
+#: src/gui/killstats.cpp:372
 msgid "Time before jacko spawn:"
 msgstr "Tempo para próxima aparição do JackO:"
 
-#: src/gui/killstats.cpp:293 src/gui/killstats.cpp:300
-#: src/gui/killstats.cpp:310 src/gui/killstats.cpp:317
-#: src/gui/killstats.cpp:329 src/gui/killstats.cpp:336
+#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:301
+#: src/gui/killstats.cpp:311 src/gui/killstats.cpp:318
+#: src/gui/killstats.cpp:330 src/gui/killstats.cpp:337
 #, c-format
 msgid "  Time for next level: %s"
 msgstr "Tempo para próximo nível: %s"
 
-#: src/gui/killstats.cpp:360
+#: src/gui/killstats.cpp:361
 #, c-format
 msgid "%s %d?"
 msgstr "%s %d?"
 
-#: src/gui/killstats.cpp:366
+#: src/gui/killstats.cpp:367
 msgid "jacko spawning"
 msgstr "Aparição do JackO"
 
@@ -1787,34 +1790,38 @@ msgid "Tabs"
 msgstr "Abas"
 
 #: src/gui/setup_chat.cpp:96
+msgid "Put all whispers in tabs"
+msgstr "Deixar as mensagens privadas em abas"
+
+#: src/gui/setup_chat.cpp:99
 msgid "Log magic messages in debug tab"
 msgstr "Salvar comandos de feitiços na aba do Depurador"
 
-#: src/gui/setup_chat.cpp:99
+#: src/gui/setup_chat.cpp:102
 msgid "Show server messages in debug tab"
 msgstr "Mostrar as mensagens do servidor na aba do Depurador"
 
-#: src/gui/setup_chat.cpp:102
+#: src/gui/setup_chat.cpp:105
 msgid "Enable trade tab"
 msgstr "Habilitar aba de negociação"
 
-#: src/gui/setup_chat.cpp:105
+#: src/gui/setup_chat.cpp:108
 msgid "Enable battle tab"
 msgstr "Habilitar aba de batalha"
 
-#: src/gui/setup_chat.cpp:108
+#: src/gui/setup_chat.cpp:111
 msgid "Show battle events"
 msgstr "Mostrar eventos de batalha"
 
-#: src/gui/setup_chat.cpp:111
+#: src/gui/setup_chat.cpp:114
 msgid "Resize chat tabs if need"
 msgstr "Redimensionar aba de chat caso precisar"
 
-#: src/gui/setup_chat.cpp:115
+#: src/gui/setup_chat.cpp:118
 msgid "Time"
 msgstr "Tempo"
 
-#: src/gui/setup_chat.cpp:117
+#: src/gui/setup_chat.cpp:120
 msgid "Use local time"
 msgstr "Usar tempo local"
 
@@ -1865,16 +1872,15 @@ msgstr "Azul:"
 msgid "Alpha:"
 msgstr "Alpha:"
 
-#: src/gui/setup.cpp:67
+#: src/gui/setup.cpp:69
 msgid "Apply"
 msgstr "Aplicar"
 
-#: src/gui/setup.cpp:70
+#: src/gui/setup.cpp:72
 msgid "Reset Windows"
 msgstr "Restaurar janelas"
 
 #: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
-#: src/gui/setup_players.cpp:334
 msgid "Edit"
 msgstr "Editar"
 
@@ -2082,148 +2088,203 @@ msgstr "Ocultar sprite de escudo"
 msgid "Show background"
 msgstr "Mostrar imagem de fundo"
 
-#: src/gui/setup_players.cpp:65
-msgid "Relation"
-msgstr "Relação"
+#: src/gui/setup_perfomance.cpp:48
+msgid "Perfomance"
+msgstr ""
 
-#: src/gui/setup_players.cpp:70
-msgid "Neutral"
-msgstr "Neutro"
+#: src/gui/setup_perfomance.cpp:55
+msgid "Better perfomance (enable for better perfomance)"
+msgstr ""
 
-#: src/gui/setup_players.cpp:71
-msgid "Friend"
-msgstr "Amigo"
+#: src/gui/setup_perfomance.cpp:58
+msgid "Auto adjust perfomance"
+msgstr ""
 
-#: src/gui/setup_players.cpp:72
-msgid "Disregarded"
-msgstr "Desconsiderado"
+#: src/gui/setup_perfomance.cpp:61
+msgid "Show beings transparency"
+msgstr ""
 
-#: src/gui/setup_players.cpp:73
-msgid "Ignored"
-msgstr "Ignorado"
+#: src/gui/setup_perfomance.cpp:64
+msgid "Hw acceleration"
+msgstr "Aceleração por HW"
 
-#: src/gui/setup_players.cpp:74
-msgid "Erased"
-msgstr "Apagado"
+#: src/gui/setup_perfomance.cpp:67
+msgid "Enable opacity cache (Software, can use many memory)"
+msgstr ""
 
-#: src/gui/setup_players.cpp:247
-msgid "Allow trading"
-msgstr "Permitir negociações"
+#: src/gui/setup_perfomance.cpp:70
+#, fuzzy
+msgid "Enable map reduce (Software)"
+msgstr "Habilitar a redução de mapa"
 
-#: src/gui/setup_players.cpp:249
-msgid "Allow whispers"
-msgstr "Permitir mensagens particulares"
+#: src/gui/setup_perfomance.cpp:73
+msgid "Better quality (disable for better perfomance)"
+msgstr ""
 
-#: src/gui/setup_players.cpp:252
-msgid "Old"
-msgstr "Antigo"
+#: src/gui/setup_perfomance.cpp:76
+msgid "Enable alpha channel fix (Software, can be very slow)"
+msgstr ""
 
-#: src/gui/setup_players.cpp:254
-msgid "Put all whispers in tabs"
-msgstr "Deixar as mensagens privadas em abas"
+#: src/gui/setup_perfomance.cpp:80
+#, fuzzy
+msgid "Enable reorder sprites."
+msgstr "Habilitar ataque do lado do servidor"
 
-#: src/gui/setup_players.cpp:257
-msgid "Show gender"
-msgstr "Mostrar gênero"
+#: src/gui/setup_perfomance.cpp:83
+msgid "Small memory (enable for lower memory usage)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:86
+msgid "Disable advanced beings caching (Software)"
+msgstr ""
 
-#: src/gui/setup_players.cpp:267
+#: src/gui/setup_perfomance.cpp:89
+msgid "Disable beings caching (Software)"
+msgstr ""
+
+#: src/gui/setup_players.cpp:48
 msgid "Players"
 msgstr "Jogadores"
 
-#: src/gui/setup_players.cpp:292
-msgid "When ignoring:"
-msgstr "Quando ignorar:"
+#: src/gui/setup_players.cpp:54
+msgid "Show gender"
+msgstr "Mostrar gênero"
 
-#: src/gui/setup_players.cpp:315
+#: src/gui/setup_players.cpp:57
 msgid "Show level"
 msgstr "Mostrar nível"
 
-#: src/gui/setup_players.cpp:319
+#: src/gui/setup_players.cpp:60
 msgid "Show own name"
 msgstr "Mostrar o próprio nome"
 
-#: src/gui/setup_players.cpp:323
+#: src/gui/setup_players.cpp:63
 msgid "Target dead players"
 msgstr "Jogadores mortos como alvo"
 
-#: src/gui/setup_players.cpp:327
+#: src/gui/setup_players.cpp:66
+msgid "Visible names"
+msgstr "Nomes visíveis"
+
+#: src/gui/setup_players.cpp:69
 msgid "Secure trades"
 msgstr "Trocas seguras"
 
-#: src/gui/setup_players.cpp:331 src/gui/setup_players.cpp:523
+#: src/gui/setup_players.cpp:72
 msgid "Unsecure chars in names"
 msgstr "Letras inseguras no nome"
 
-#: src/gui/setup_players.cpp:336
-msgid "Visible names"
-msgstr "Nomes visíveis"
-
-#: src/gui/setup_players.cpp:341
+#: src/gui/setup_players.cpp:75
 msgid "Show statuses"
 msgstr "Mostrar status"
 
-#: src/gui/setup_theme.cpp:105
+#: src/gui/setup_relations.cpp:65
+msgid "Relation"
+msgstr "Relação"
+
+#: src/gui/setup_relations.cpp:70
+msgid "Neutral"
+msgstr "Neutro"
+
+#: src/gui/setup_relations.cpp:71
+msgid "Friend"
+msgstr "Amigo"
+
+#: src/gui/setup_relations.cpp:72
+msgid "Disregarded"
+msgstr "Desconsiderado"
+
+#: src/gui/setup_relations.cpp:73
+msgid "Ignored"
+msgstr "Ignorado"
+
+#: src/gui/setup_relations.cpp:74
+msgid "Erased"
+msgstr "Apagado"
+
+#: src/gui/setup_relations.cpp:239
+msgid "Allow trading"
+msgstr "Permitir negociações"
+
+#: src/gui/setup_relations.cpp:241
+msgid "Allow whispers"
+msgstr "Permitir mensagens particulares"
+
+#: src/gui/setup_relations.cpp:244
+msgid "Old"
+msgstr "Antigo"
+
+#: src/gui/setup_relations.cpp:246
+#, fuzzy
+msgid "Relations"
+msgstr "Relação"
+
+#: src/gui/setup_relations.cpp:271
+msgid "When ignoring:"
+msgstr "Quando ignorar:"
+
+#: src/gui/setup_theme.cpp:106
 msgid "Tiny (10)"
 msgstr "Minúsculo (10)"
 
-#: src/gui/setup_theme.cpp:106
+#: src/gui/setup_theme.cpp:107
 msgid "Small (11)"
 msgstr "Pequeno (11)"
 
-#: src/gui/setup_theme.cpp:107
+#: src/gui/setup_theme.cpp:108
 msgid "Medium (12)"
 msgstr "Médio (12)"
 
-#: src/gui/setup_theme.cpp:108
+#: src/gui/setup_theme.cpp:109
 msgid "Large (13)"
 msgstr "Largo (13)"
 
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:110
 msgid "Big (14)"
 msgstr "Grande (14)"
 
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:111
 msgid "Huge (15)"
 msgstr "Enorme (15)"
 
-#: src/gui/setup_theme.cpp:140
+#: src/gui/setup_theme.cpp:141
 msgid "Theme"
 msgstr "Tema"
 
-#: src/gui/setup_theme.cpp:142
+#: src/gui/setup_theme.cpp:143
 msgid "Gui theme"
 msgstr "Tema"
 
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:144
 msgid "Main Font"
 msgstr "Fonte"
 
-#: src/gui/setup_theme.cpp:144
+#: src/gui/setup_theme.cpp:145
 msgid "Bold font"
 msgstr "Fonte negrito"
 
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:146
 msgid "Particle font"
 msgstr "Fonte de particulas"
 
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:147
 msgid "Help font"
 msgstr "Fonte de ajuda"
 
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:148
 msgid "Secure font"
 msgstr "Fonte segura"
 
-#: src/gui/setup_theme.cpp:175
+#: src/gui/setup_theme.cpp:176
 msgid "Font size"
 msgstr "Tamanho da fonte"
 
-#: src/gui/setup_theme.cpp:281
+#: src/gui/setup_theme.cpp:282
 msgid "Theme Changed"
 msgstr "Tema alterado"
 
-#: src/gui/setup_theme.cpp:282 src/gui/setup_video.cpp:670
-#: src/gui/setup_video.cpp:675
+#: src/gui/setup_theme.cpp:283 src/gui/setup_video.cpp:619
+#: src/gui/setup_video.cpp:624
 msgid "Restart your client for the change to take effect."
 msgstr "Reincie o cliente para que as mudanças surtam efeito."
 
@@ -2275,138 +2336,118 @@ msgstr "médio"
 msgid "max"
 msgstr "máximo"
 
-#: src/gui/setup_video.cpp:293
+#: src/gui/setup_video.cpp:288
 msgid "Full screen"
 msgstr "Tela cheia"
 
-#: src/gui/setup_video.cpp:294
-msgid "Hw acceleration"
-msgstr "Aceleração por HW"
-
-#: src/gui/setup_video.cpp:295
+#: src/gui/setup_video.cpp:289
 msgid "Custom cursor"
 msgstr "Cursor customizado"
 
-#: src/gui/setup_video.cpp:297
+#: src/gui/setup_video.cpp:291
 msgid "Particle effects"
 msgstr "Efeitos de partícula"
 
-#: src/gui/setup_video.cpp:299
+#: src/gui/setup_video.cpp:293
 msgid "Show pickup notification"
 msgstr "Mostrar aviso ao pegar algo"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:301
+#: src/gui/setup_video.cpp:295
 msgid "in chat"
 msgstr "em chat"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:303
+#: src/gui/setup_video.cpp:297
 msgid "as particle"
 msgstr "como partícula"
 
-#: src/gui/setup_video.cpp:305
-msgid "Enable opacity cache"
-msgstr "Habilitar cache de opacidade"
-
-#: src/gui/setup_video.cpp:306
-msgid "Enable map reduce"
-msgstr "Habilitar a redução de mapa"
-
-#: src/gui/setup_video.cpp:308
-msgid "Auto adjust perfomance"
-msgstr ""
-
-#: src/gui/setup_video.cpp:310
-msgid "Show beings transparency"
-msgstr ""
-
-#: src/gui/setup_video.cpp:315
+#: src/gui/setup_video.cpp:302
 msgid "FPS limit:"
 msgstr "Limite FPS:"
 
-#: src/gui/setup_video.cpp:319 src/gui/setup_video.cpp:356
-#: src/gui/setup_video.cpp:607 src/gui/setup_video.cpp:760
+#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
+#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709
 msgid "Alt FPS limit: "
 msgstr "Limite FPS alt: "
 
-#: src/gui/setup_video.cpp:328
+#: src/gui/setup_video.cpp:315
 msgid "Video"
 msgstr "Vídeo"
 
-#: src/gui/setup_video.cpp:334
+#: src/gui/setup_video.cpp:321
 msgid "Overhead text"
 msgstr "Texto sobrescrito como:"
 
-#: src/gui/setup_video.cpp:335
+#: src/gui/setup_video.cpp:322
 msgid "Gui opacity"
 msgstr "Opacidade"
 
-#: src/gui/setup_video.cpp:336
+#: src/gui/setup_video.cpp:323
 msgid "Ambient FX"
 msgstr "Ambiente FX"
 
-#: src/gui/setup_video.cpp:337
+#: src/gui/setup_video.cpp:324
 msgid "Particle detail"
 msgstr "Detalhe de partículas"
 
-#: src/gui/setup_video.cpp:354 src/gui/setup_video.cpp:357
-#: src/gui/setup_video.cpp:606 src/gui/setup_video.cpp:747
-#: src/gui/setup_video.cpp:758
+#: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
+#: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
+#: src/gui/setup_video.cpp:707
 msgid "None"
 msgstr "Nenhum"
 
-#: src/gui/setup_video.cpp:511
+#: src/gui/setup_video.cpp:484
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 "Falha ao mudar para o modo janela e falha na restauração do modo anterior!"
 
-#: src/gui/setup_video.cpp:517
+#: src/gui/setup_video.cpp:490
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 "Falha ao mudar para o modo tela cheia e falha na restauração do modo "
 "anterior!"
 
-#: src/gui/setup_video.cpp:528
+#: src/gui/setup_video.cpp:501
 msgid "Switching to Full Screen"
 msgstr "Mudando para tela cheia"
 
-#: src/gui/setup_video.cpp:529
+#: src/gui/setup_video.cpp:502
 msgid "Restart needed for changes to take effect."
 msgstr "É preciso reiniciar para as mudanças terem efeito."
 
-#: src/gui/setup_video.cpp:541
+#: src/gui/setup_video.cpp:514
 msgid "Changing to OpenGL"
 msgstr "Mudando para OpenGL"
 
-#: src/gui/setup_video.cpp:542
+#: src/gui/setup_video.cpp:515
 msgid "Applying change to OpenGL requires restart."
 msgstr "Mudanças no OpenGL requerem o reinício do jogo."
 
-#: src/gui/setup_video.cpp:653
+#: src/gui/setup_video.cpp:602
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Resolução customizada (exemplo 1024x768)"
 
-#: src/gui/setup_video.cpp:654
+#: src/gui/setup_video.cpp:603
 msgid "Enter new resolution:                "
 msgstr "Escolha a nova resolução                "
 
-#: src/gui/setup_video.cpp:669 src/gui/setup_video.cpp:674
+#: src/gui/setup_video.cpp:618 src/gui/setup_video.cpp:623
 msgid "Screen Resolution Changed"
 msgstr "Resolução de tela alterada"
 
-#: src/gui/setup_video.cpp:672
+#: src/gui/setup_video.cpp:621
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 "Algumas janelas podem ser movidas para se adequar à resolução mais baixa."
 
-#: src/gui/setup_video.cpp:705
+#: src/gui/setup_video.cpp:654
 msgid "Particle Effect Settings Changed."
 msgstr "Configurações de efeito de partícula modificadas."
 
-#: src/gui/setup_video.cpp:706
+#: src/gui/setup_video.cpp:655
 msgid "Changes will take effect on map change."
 msgstr "As mudanças terão efeito ao mudar de mapa."
 
@@ -2435,7 +2476,8 @@ msgstr "Anúncio"
 msgid "Show links in announce"
 msgstr "Mostrar links em anúncio"
 
-#: src/gui/shopwindow.cpp:723 src/net/manaserv/tradehandler.cpp:127
+#: src/gui/shopwindow.cpp:723 src/net/ea/tradehandler.cpp:106
+#: src/net/manaserv/tradehandler.cpp:127
 msgid "Request for Trade"
 msgstr "Proposta de negociação"
 
@@ -2477,7 +2519,7 @@ msgstr "Nível: %d"
 msgid "Lvl: %d (%+d)"
 msgstr "Nível: %d (%+d)"
 
-#: src/gui/socialwindow.cpp:117
+#: src/gui/socialwindow.cpp:117 src/net/ea/gui/guildtab.cpp:52
 msgid "Guild"
 msgstr "Guilda"
 
@@ -2509,7 +2551,7 @@ msgstr "Sair da guilda?"
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Tem certeza que deseja sair da guilda %s?"
 
-#: src/gui/socialwindow.cpp:215
+#: src/gui/socialwindow.cpp:215 src/net/ea/gui/partytab.cpp:50
 msgid "Party"
 msgstr "Grupo"
 
@@ -2671,243 +2713,243 @@ msgstr "Escolha o nome do seu grupo."
 msgid "Specials"
 msgstr "Especiais"
 
-#: src/gui/statuspopup.cpp:196
+#: src/gui/statuspopup.cpp:197
 msgid "(D) default moves"
 msgstr "(D) movimentos padrão"
 
-#: src/gui/statuspopup.cpp:201
+#: src/gui/statuspopup.cpp:202
 msgid "(I) invert moves"
 msgstr "(l) inserir movimentos"
 
-#: src/gui/statuspopup.cpp:206
+#: src/gui/statuspopup.cpp:207
 msgid "(c) moves with some crazy moves"
 msgstr "(c) Alguns movimentos loucos"
 
-#: src/gui/statuspopup.cpp:211
+#: src/gui/statuspopup.cpp:212
 msgid "(C) moves with crazy moves"
 msgstr "(C) Movimentos loucos"
 
-#: src/gui/statuspopup.cpp:216
+#: src/gui/statuspopup.cpp:217
 msgid "(d) double normal + crazy"
 msgstr "(d) dobro normal + louco"
 
-#: src/gui/statuspopup.cpp:221
+#: src/gui/statuspopup.cpp:222
 msgid "(?) move"
 msgstr "(?) mover"
 
-#: src/gui/statuspopup.cpp:239
+#: src/gui/statuspopup.cpp:240
 msgid "(a) custom crazy move"
 msgstr "(a) movimentos loucos customizados"
 
-#: src/gui/statuspopup.cpp:243
+#: src/gui/statuspopup.cpp:244
 msgid "(?) crazy move"
 msgstr "(?) Movimentos loucos"
 
-#: src/gui/statuspopup.cpp:253
+#: src/gui/statuspopup.cpp:254
 msgid "(0) default moves to target"
 msgstr "(0) Mover ao alvo padrão"
 
-#: src/gui/statuspopup.cpp:258
+#: src/gui/statuspopup.cpp:259
 msgid "(1) moves to target in distance 1"
 msgstr "(1) Mover ao alvo com distância 1"
 
-#: src/gui/statuspopup.cpp:263
+#: src/gui/statuspopup.cpp:264
 msgid "(2) moves to target in distance 2"
 msgstr "(2) mover ao alvo em distância 2"
 
-#: src/gui/statuspopup.cpp:268
+#: src/gui/statuspopup.cpp:269
 msgid "(3) moves to target in distance 3"
 msgstr "(3) Mover ao alvo com distância 3"
 
-#: src/gui/statuspopup.cpp:273
+#: src/gui/statuspopup.cpp:274
 msgid "(5) moves to target in distance 5"
 msgstr "(5) Mover ao alvo com distância 5"
 
-#: src/gui/statuspopup.cpp:278
+#: src/gui/statuspopup.cpp:279
 msgid "(7) moves to target in distance 7"
 msgstr "(7) Mover ao alvo com distância 7"
 
-#: src/gui/statuspopup.cpp:283
+#: src/gui/statuspopup.cpp:284
 msgid "(A) moves to target in attack range"
 msgstr "(A)  Mover ao alvo com a distância de ataque"
 
-#: src/gui/statuspopup.cpp:288
+#: src/gui/statuspopup.cpp:289
 msgid "(?) move to target"
 msgstr "(?) Mover ao alvo"
 
-#: src/gui/statuspopup.cpp:296
+#: src/gui/statuspopup.cpp:297
 msgid "(D) default follow"
 msgstr "(D) Seguir em modo padrão"
 
-#: src/gui/statuspopup.cpp:300
+#: src/gui/statuspopup.cpp:301
 msgid "(R) relative follow"
 msgstr "(R) Seguir em modo relativo"
 
-#: src/gui/statuspopup.cpp:304
+#: src/gui/statuspopup.cpp:305
 msgid "(M) mirror follow"
 msgstr "(M) Seguir em modo espelhado"
 
-#: src/gui/statuspopup.cpp:308
+#: src/gui/statuspopup.cpp:309
 msgid "(P) pet follow"
 msgstr "(P) Seguir em modo animal de extimação"
 
-#: src/gui/statuspopup.cpp:312
+#: src/gui/statuspopup.cpp:313
 msgid "(?) unknown follow"
 msgstr "(?) Seguir em modo desconhecido"
 
-#: src/gui/statuspopup.cpp:321 src/gui/statuspopup.cpp:344
+#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345
 msgid "(D) default attack"
 msgstr "(D) Ataque padrão"
 
-#: src/gui/statuspopup.cpp:326
+#: src/gui/statuspopup.cpp:327
 msgid "(s) switch attack without shield"
 msgstr "(s) Trocar ataque sem escudo"
 
-#: src/gui/statuspopup.cpp:331
+#: src/gui/statuspopup.cpp:332
 msgid "(S) switch attack with shield"
 msgstr "(S) Trocar ataque com escudo"
 
-#: src/gui/statuspopup.cpp:335 src/gui/statuspopup.cpp:360
+#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
 msgid "(?) attack"
 msgstr "(?) Ataque"
 
-#: src/gui/statuspopup.cpp:348
+#: src/gui/statuspopup.cpp:349
 msgid "(G) go and attack"
 msgstr "(G) Ir e atacar"
 
-#: src/gui/statuspopup.cpp:352
+#: src/gui/statuspopup.cpp:353
 msgid "(A) go, attack, pickup"
 msgstr "(A) Ir, atacar, pegar"
 
-#: src/gui/statuspopup.cpp:356
+#: src/gui/statuspopup.cpp:357
 msgid "(d) without auto attack"
 msgstr "(d) sem auto ataque"
 
-#: src/gui/statuspopup.cpp:374
+#: src/gui/statuspopup.cpp:375
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) Pequeno pegar 1x1 celulas"
 
-#: src/gui/statuspopup.cpp:378
+#: src/gui/statuspopup.cpp:379
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) Pegar padrão 2x1 células"
 
-#: src/gui/statuspopup.cpp:382
+#: src/gui/statuspopup.cpp:383
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) Pegar em frente 2x3 células"
 
-#: src/gui/statuspopup.cpp:386
+#: src/gui/statuspopup.cpp:387
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) Pegar 3x3 células"
 
-#: src/gui/statuspopup.cpp:390
+#: src/gui/statuspopup.cpp:391
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) Ir e pegar em distância 4"
 
-#: src/gui/statuspopup.cpp:394
+#: src/gui/statuspopup.cpp:395
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) Ir e pegar em distância 8"
 
-#: src/gui/statuspopup.cpp:398
+#: src/gui/statuspopup.cpp:399
 msgid "(A) go and pick up in max distance"
 msgstr "(A) Ir e pegar em distância mâxima"
 
-#: src/gui/statuspopup.cpp:402
+#: src/gui/statuspopup.cpp:403
 msgid "(?) pick up"
 msgstr "(?) Pegar item"
 
-#: src/gui/statuspopup.cpp:411
+#: src/gui/statuspopup.cpp:412
 msgid "(N) normal map view"
 msgstr "(N) Visualizardor de mapa normal"
 
-#: src/gui/statuspopup.cpp:415
+#: src/gui/statuspopup.cpp:416
 msgid "(D) debug map view"
 msgstr "(D) Visualizador de mapa depurador"
 
-#: src/gui/statuspopup.cpp:419
+#: src/gui/statuspopup.cpp:420
 msgid "(u) ultra map view"
 msgstr "(u) Visualizador de mapa ultra"
 
-#: src/gui/statuspopup.cpp:423
+#: src/gui/statuspopup.cpp:424
 msgid "(U) ultra map view 2"
 msgstr "(U) Visualizador de mapa ultra 2"
 
-#: src/gui/statuspopup.cpp:427
+#: src/gui/statuspopup.cpp:428
 msgid "(e) empty map view"
 msgstr "(e) Visualizador de mapa vazio"
 
-#: src/gui/statuspopup.cpp:431
+#: src/gui/statuspopup.cpp:432
 msgid "(b) black & white map view"
 msgstr "(b) Visualizador de mapa preto e branco"
 
-#: src/gui/statuspopup.cpp:435
+#: src/gui/statuspopup.cpp:436
 msgid "(?) map view"
 msgstr "(?) Visualizador de mapa"
 
-#: src/gui/statuspopup.cpp:443
+#: src/gui/statuspopup.cpp:444
 msgid "(f) use #flar for magic attack"
 msgstr "(f) Usar #flar para feitiço de ataque"
 
-#: src/gui/statuspopup.cpp:448
+#: src/gui/statuspopup.cpp:449
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) Usar #chiza para feitiço de ataque"
 
-#: src/gui/statuspopup.cpp:453
+#: src/gui/statuspopup.cpp:454
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) Usar #ingrav para feitiço de ataque"
 
-#: src/gui/statuspopup.cpp:458
+#: src/gui/statuspopup.cpp:459
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) Usar #frillyar para feitiço de ataque"
 
-#: src/gui/statuspopup.cpp:463
+#: src/gui/statuspopup.cpp:464
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) Usar #upmarmu para feitiço de ataque"
 
-#: src/gui/statuspopup.cpp:467
+#: src/gui/statuspopup.cpp:468
 msgid "(?) magic attack"
 msgstr "(?) Feitiço de ataque"
 
-#: src/gui/statuspopup.cpp:476
+#: src/gui/statuspopup.cpp:477
 msgid "(D) default imitation"
 msgstr "(D) Mímica padrão"
 
-#: src/gui/statuspopup.cpp:480
+#: src/gui/statuspopup.cpp:481
 msgid "(O) outfits imitation"
 msgstr "(O) Mímica de roupas"
 
-#: src/gui/statuspopup.cpp:484
+#: src/gui/statuspopup.cpp:485
 msgid "(?) imitation"
 msgstr "(?) Mímica"
 
-#: src/gui/statuspopup.cpp:493
+#: src/gui/statuspopup.cpp:494
 msgid "(O) on keyboard"
 msgstr "(O) No teclado"
 
-#: src/gui/statuspopup.cpp:496
+#: src/gui/statuspopup.cpp:497
 msgid "(A) away"
 msgstr "(A) Ausente"
 
-#: src/gui/statuspopup.cpp:499 src/gui/statuspopup.cpp:519
+#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
 msgid "(?) away"
 msgstr "(?) Ausente"
 
-#: src/gui/statuspopup.cpp:507
+#: src/gui/statuspopup.cpp:508
 msgid "(G) game camera mode"
 msgstr "(G) Modo de jogo câmera"
 
-#: src/gui/statuspopup.cpp:511
+#: src/gui/statuspopup.cpp:512
 msgid "(F) free camera mode"
 msgstr "(F) Modo de jogo câmera livre"
 
-#: src/gui/statuspopup.cpp:515
+#: src/gui/statuspopup.cpp:516
 msgid "(D) design camera mode"
 msgstr "(D)  Modo de jogo câmera design"
 
-#: src/gui/statuspopup.cpp:526
+#: src/gui/statuspopup.cpp:527
 msgid "Game modifiers are disabled"
 msgstr "Modificadores de jogo desativados"
 
-#: src/gui/statuspopup.cpp:531
+#: src/gui/statuspopup.cpp:532
 msgid "Game modifiers are enabled"
 msgstr "Modificadores de jogo desativados"
 
@@ -3086,87 +3128,87 @@ msgstr "(b)"
 msgid "(O)"
 msgstr "(O)"
 
-#: src/gui/textcommandeditor.cpp:112
+#: src/gui/textcommandeditor.cpp:113
 msgid "No Target"
 msgstr "Sem alvo"
 
-#: src/gui/textcommandeditor.cpp:113
+#: src/gui/textcommandeditor.cpp:114
 msgid "Allow Target"
 msgstr "Permitir alvo"
 
-#: src/gui/textcommandeditor.cpp:114
+#: src/gui/textcommandeditor.cpp:115
 msgid "Need Target"
 msgstr "Precisa de alvo"
 
-#: src/gui/textcommandeditor.cpp:119
+#: src/gui/textcommandeditor.cpp:120
 msgid "General Magic"
 msgstr "Magia geral"
 
-#: src/gui/textcommandeditor.cpp:120
+#: src/gui/textcommandeditor.cpp:121
 msgid "Life Magic"
 msgstr "Magia Vida"
 
-#: src/gui/textcommandeditor.cpp:121
+#: src/gui/textcommandeditor.cpp:122
 msgid "War Magic"
 msgstr "Magia Guerra"
 
-#: src/gui/textcommandeditor.cpp:122
+#: src/gui/textcommandeditor.cpp:123
 msgid "Transmute Magic"
 msgstr "Magia Transmutação"
 
-#: src/gui/textcommandeditor.cpp:123
+#: src/gui/textcommandeditor.cpp:124
 msgid "Nature Magic"
 msgstr "Magia Natureza"
 
-#: src/gui/textcommandeditor.cpp:124
+#: src/gui/textcommandeditor.cpp:125
 msgid "Astral Magic"
 msgstr "Magia Astral"
 
-#: src/gui/textcommandeditor.cpp:167
+#: src/gui/textcommandeditor.cpp:168
 msgid "Command Editor"
 msgstr "Editor de comandos"
 
-#: src/gui/textcommandeditor.cpp:184
+#: src/gui/textcommandeditor.cpp:185
 msgid "magic"
 msgstr "Feitiço"
 
-#: src/gui/textcommandeditor.cpp:188
+#: src/gui/textcommandeditor.cpp:189
 msgid "other"
 msgstr "Outro"
 
-#: src/gui/textcommandeditor.cpp:193
+#: src/gui/textcommandeditor.cpp:194
 msgid "Symbol:"
 msgstr "Símbolo: "
 
-#: src/gui/textcommandeditor.cpp:196
+#: src/gui/textcommandeditor.cpp:197
 msgid "Command:"
 msgstr "Comando:"
 
-#: src/gui/textcommandeditor.cpp:199
+#: src/gui/textcommandeditor.cpp:200
 msgid "Mana:"
 msgstr "Mana:"
 
-#: src/gui/textcommandeditor.cpp:205
+#: src/gui/textcommandeditor.cpp:206
 msgid "Target Type:"
 msgstr "Tipo de alvo:"
 
-#: src/gui/textcommandeditor.cpp:211
+#: src/gui/textcommandeditor.cpp:212
 msgid "Icon:"
 msgstr "Icone:"
 
-#: src/gui/textcommandeditor.cpp:217
+#: src/gui/textcommandeditor.cpp:218
 msgid "Magic level:"
 msgstr "Nível mágico:"
 
-#: src/gui/textcommandeditor.cpp:223
+#: src/gui/textcommandeditor.cpp:224
 msgid "Magic School:"
 msgstr "Escola de Feitiço:"
 
-#: src/gui/textcommandeditor.cpp:229
+#: src/gui/textcommandeditor.cpp:230
 msgid "School level:"
 msgstr "Nível da escola:"
 
-#: src/gui/textcommandeditor.cpp:234
+#: src/gui/textcommandeditor.cpp:235
 msgid "Save"
 msgstr "Salvar"
 
@@ -3204,8 +3246,7 @@ msgid "Change"
 msgstr "Mudar"
 
 #: src/gui/tradewindow.cpp:332
-msgid ""
-"Failed adding item. You can not overlap one kind of item on the window."
+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 este tipo de item na janela."
 
@@ -3396,23 +3437,23 @@ msgstr "Borda do Lugar Inicial"
 msgid "Road Point"
 msgstr "Ponto de estrada"
 
-#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:470
+#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:471
 msgid "Who Is Online - Updating"
 msgstr "Quem está online - Atualizando"
 
-#: src/gui/whoisonline.cpp:100
+#: src/gui/whoisonline.cpp:101
 msgid "Update"
 msgstr "Atualizar"
 
-#: src/gui/whoisonline.cpp:293
+#: src/gui/whoisonline.cpp:294
 msgid "Who Is Online - "
 msgstr "Quem está online - "
 
-#: src/gui/whoisonline.cpp:484
+#: src/gui/whoisonline.cpp:485
 msgid "Who Is Online - error"
 msgstr "Quem está online - Erro"
 
-#: src/gui/whoisonline.cpp:515
+#: src/gui/whoisonline.cpp:516
 msgid "Who Is Online - Update"
 msgstr "Quem está online - Atualizado"
 
@@ -3477,6 +3518,7 @@ msgid "This command makes <nick> a channel operator."
 msgstr "Tornar <nick> operador do canal."
 
 #: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
+#: src/net/ea/gui/guildtab.cpp:69 src/net/ea/gui/partytab.cpp:85
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr "Se <nick> possuir espaços, coloque entre aspas (\")."
 
@@ -3548,8 +3590,7 @@ msgid "Command: /unignore <player>"
 msgstr "Comando: /unignore <jogador>"
 
 #: src/gui/widgets/whispertab.cpp:131
-msgid ""
-"This command stops ignoring the other player if they are being ignored."
+msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 "Este comando para de ignorar o outro jogador se ele estiver sendo ignorado."
 
@@ -4217,81 +4258,549 @@ msgstr "Obrigado pela compra."
 msgid "Unable to buy."
 msgstr "Impossível comprar."
 
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
-msgid "Strength"
+#: src/net/ea/charserverhandler.cpp:63
+#, fuzzy
+msgid "Strength:"
 msgstr "Força"
 
-#: src/net/manaserv/attributes.cpp:167
+#: src/net/ea/charserverhandler.cpp:64
+#, fuzzy
+msgid "Agility:"
+msgstr "Agilidade"
+
+#: src/net/ea/charserverhandler.cpp:65
+#, fuzzy
+msgid "Vitality:"
+msgstr "Vitalidade"
+
+#: src/net/ea/charserverhandler.cpp:66
+#, fuzzy
+msgid "Intelligence:"
+msgstr "Inteligência"
+
+#: src/net/ea/charserverhandler.cpp:67
+#, fuzzy
+msgid "Dexterity:"
+msgstr "Destreza"
+
+#: src/net/ea/charserverhandler.cpp:68
+#, fuzzy
+msgid "Luck:"
+msgstr "Sorte"
+
+#: src/net/ea/charserverhandler.cpp:102
+msgid "Access denied. Most likely, there are too many players on this server."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:106
+#, fuzzy
+msgid "Cannot use this ID."
+msgstr "Não é possível enviar mensagens privadas vazias!"
+
+#: src/net/ea/charserverhandler.cpp:109
+#, fuzzy
+msgid "Unknown char-server failure."
+msgstr "Erro desconhecido."
+
+#: src/net/ea/charserverhandler.cpp:138
+msgid "Failed to create character. Most likely the name is already taken."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:237
+#, fuzzy
+msgid "Wrong name."
+msgstr "Token-mágico errado."
+
+#: src/net/ea/charserverhandler.cpp:145
+#, fuzzy
+msgid "Incorrect stats."
+msgstr "Senha incorreta"
+
+#: src/net/ea/charserverhandler.cpp:148
+#, fuzzy
+msgid "Incorrect hair."
+msgstr "Senha incorreta"
+
+#: src/net/ea/charserverhandler.cpp:151
+#, fuzzy
+msgid "Incorrect slot."
+msgstr "Senha incorreta"
+
+#: src/net/ea/charserverhandler.cpp:166 src/net/manaserv/charhandler.cpp:210
+msgid "Info"
+msgstr "Informações"
+
+#: src/net/ea/charserverhandler.cpp:166
+#, fuzzy
+msgid "Character deleted."
+msgstr "Personagem deletado."
+
+#: src/net/ea/charserverhandler.cpp:172
+#, fuzzy
+msgid "Failed to delete character."
+msgstr "Entre com a senha para apagar o personagem"
+
+#: src/net/ea/chathandler.cpp:60 src/net/ea/chathandler.cpp:66
+#: src/net/ea/chathandler.cpp:71 src/net/ea/chathandler.cpp:77
+#: src/net/ea/chathandler.cpp:82 src/net/ea/chathandler.cpp:88
+#: src/net/ea/chathandler.cpp:95 src/net/ea/chathandler.cpp:101
+msgid "Channels are not supported!"
+msgstr ""
+
+#: src/net/ea/chathandler.cpp:128
 #, c-format
-msgid "Strength %+.1f"
-msgstr "Força %+.1f"
+msgid "Whisper could not be sent, %s is offline."
+msgstr ""
 
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
-msgid "Agility"
-msgstr "Agilidade"
+#: src/net/ea/chathandler.cpp:136
+#, fuzzy, c-format
+msgid "Whisper could not be sent, ignored by %s."
+msgstr "Não foi possível deixar de ignorar o jogador!"
 
-#: src/net/manaserv/attributes.cpp:180
+#: src/net/ea/chathandler.cpp:348
+#, fuzzy
+msgid "MVP player."
+msgstr "Jogador"
+
+#: src/net/ea/chathandler.cpp:352
+#, fuzzy
+msgid "MVP player: "
+msgstr "Jogador"
+
+#: src/net/ea/gamehandler.cpp:86
 #, c-format
-msgid "Agility %+.1f"
-msgstr "Agilidade %+.1f"
+msgid "Online users: %d"
+msgstr ""
 
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
-msgid "Dexterity"
-msgstr "Destreza"
+#: src/net/ea/gamehandler.cpp:98
+msgid "Game"
+msgstr ""
 
-#: src/net/manaserv/attributes.cpp:193
+#: src/net/ea/gamehandler.cpp:98
+#, fuzzy
+msgid "Request to quit denied!"
+msgstr "Proposta de negociação"
+
+#: src/net/ea/gui/guildtab.cpp:67 src/net/ea/gui/partytab.cpp:83
+#, fuzzy
+msgid "Command: /invite <nick>"
+msgstr "Comando: /kick <nick>"
+
+#: src/net/ea/gui/guildtab.cpp:68
+#, fuzzy
+msgid "This command invites <nick> to the guild you're in."
+msgstr "Tornar <nick> operador do canal."
+
+#: src/net/ea/gui/guildtab.cpp:74 src/net/ea/gui/partytab.cpp:90
+#, fuzzy
+msgid "Command: /leave"
+msgstr "Comando: /close"
+
+#: src/net/ea/gui/guildtab.cpp:75
+#, fuzzy
+msgid "This command causes the player to leave the guild."
+msgstr "Seta <mensagem> como o tópico."
+
+#: src/net/ea/gui/guildtab.cpp:135 src/net/ea/gui/partytab.cpp:69
+#, fuzzy
+msgid "/help > Display this help."
+msgstr "  -h --help           : Exibe esta ajuda"
+
+#: src/net/ea/gui/guildtab.cpp:136
+msgid "/invite > Invite a player to your guild"
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:137
+msgid "/leave > Leave the guild you are in"
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:138
+#, fuzzy
+msgid "/kick > Kick some one from the guild you are in"
+msgstr "/kick > Expulsa um usuário do canal"
+
+#: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
+msgid "Guild created."
+msgstr "Guilda criada."
+
+#: src/net/ea/guildhandler.cpp:88 src/net/ea/guildhandler.cpp:93
+#, fuzzy
+msgid "You are already in guild."
+msgstr "Erro ao criar Guilda."
+
+#: src/net/ea/guildhandler.cpp:98
+msgid "Emperium check failed."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:103
+#, fuzzy
+msgid "Unknown server response."
+msgstr "Erro desconhecido."
+
+#: src/net/ea/guildhandler.cpp:180
+#, fuzzy, c-format
+msgid "Guild name: %s"
+msgstr "Guilda: %s"
+
+#: src/net/ea/guildhandler.cpp:182
+#, fuzzy, c-format
+msgid "Guild master: %s"
+msgstr "Guilda: %s"
+
+#: src/net/ea/guildhandler.cpp:184
+#, fuzzy, c-format
+msgid "Guild level: %d"
+msgstr "Nível: %d"
+
+#: src/net/ea/guildhandler.cpp:186
 #, c-format
-msgid "Dexterity %+.1f"
-msgstr "Destreza %+.1f"
+msgid "Online members: %d"
+msgstr ""
 
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
-msgid "Vitality"
-msgstr "Vitalidade"
+#: src/net/ea/guildhandler.cpp:188
+#, c-format
+msgid "Max members: %d"
+msgstr ""
 
-#: src/net/manaserv/attributes.cpp:206
+#: src/net/ea/guildhandler.cpp:190
+#, fuzzy, c-format
+msgid "Average level: %d"
+msgstr "Nível mágico:"
+
+#: src/net/ea/guildhandler.cpp:192
+#, fuzzy, c-format
+msgid "Guild exp: %d"
+msgstr "Guilda: %s"
+
+#: src/net/ea/guildhandler.cpp:194
+#, fuzzy, c-format
+msgid "Guild next exp: %d"
+msgstr "Guilda criada."
+
+#: src/net/ea/guildhandler.cpp:196
+#, fuzzy, c-format
+msgid "Guild castle: %s"
+msgstr "Guilda: %s"
+
+#: src/net/ea/guildhandler.cpp:402
+#, fuzzy
+msgid "Could not inivte user to guild."
+msgstr "Convidou o jogador %s para a guilda %s."
+
+#: src/net/ea/guildhandler.cpp:406
+#, fuzzy
+msgid "User rejected guild invite."
+msgstr "%s recusou seu convite."
+
+#: src/net/ea/guildhandler.cpp:410
+msgid "User is now part of your guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:414
+msgid "Your guild is full."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:418
+#, fuzzy
+msgid "Unknown guild invite response."
+msgstr "Aceitou convite para a guilda de  %s."
+
+#: src/net/ea/guildhandler.cpp:438
+msgid "You have left the guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:452
+#, fuzzy, c-format
+msgid "%s has left your guild."
+msgstr "Escolha o nome da sua guilda."
+
+#: src/net/ea/guildhandler.cpp:483
+#, fuzzy
+msgid "You was kicked from guild."
+msgstr "Expulsar da guilda"
+
+#: src/net/ea/guildhandler.cpp:496
+#, fuzzy, c-format
+msgid "%s has kicked from your guild."
+msgstr "%s expulsou %s."
+
+#: src/net/ea/gui/partytab.cpp:70
+msgid "/invite > Invite a player to your party"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:71
+msgid "/leave > Leave the party you are in"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:72
+#, fuzzy
+msgid "/kick > Kick some one from the party you are in"
+msgstr "/kick > Expulsa um usuário do canal"
+
+#: src/net/ea/gui/partytab.cpp:73
+msgid "/item > Show/change party item sharing options"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:74
+msgid "/exp > Show/change party experience sharing options"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:84
+#, fuzzy
+msgid "This command invites <nick> to party with you."
+msgstr "Retirar <nick> do canal."
+
+#: src/net/ea/gui/partytab.cpp:91
+#, fuzzy
+msgid "This command causes the player to leave the party."
+msgstr "Seta <mensagem> como o tópico."
+
+#: src/net/ea/gui/partytab.cpp:95
+#, fuzzy
+msgid "Command: /item <policy>"
+msgstr "Comando: /kick <nick>"
+
+#: src/net/ea/gui/partytab.cpp:97
+#, fuzzy
+msgid "This command changes the party's item sharing policy."
+msgstr "Mostra os usuários neste canal."
+
+#: src/net/ea/gui/partytab.cpp:98
+msgid ""
+"<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
+"\"0\", \"no\", \"false\" to disable item sharing."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:101
+#, fuzzy
+msgid "Command: /item"
+msgstr "Comando: /quit"
+
+#: src/net/ea/gui/partytab.cpp:102
+#, fuzzy
+msgid "This command displays the party's current item sharing policy."
+msgstr "Sair do canal."
+
+#: src/net/ea/gui/partytab.cpp:107
+#, fuzzy
+msgid "Command: /exp <policy>"
+msgstr "Comando: /op <nick>"
+
+#: src/net/ea/gui/partytab.cpp:108
+#, fuzzy
+msgid "This command changes the party's experience sharing policy."
+msgstr "Sair do canal."
+
+#: src/net/ea/gui/partytab.cpp:110
+msgid ""
+"<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
+"sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:113
+#, fuzzy
+msgid "Command: /exp"
+msgstr "Comando: /users"
+
+#: src/net/ea/gui/partytab.cpp:114
+#, fuzzy
+msgid "This command displays the party's current experience sharing policy."
+msgstr "Sair do canal."
+
+#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:286
+msgid "Item sharing enabled."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:296
+msgid "Item sharing disabled."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:306
+msgid "Item sharing not possible."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:157
+msgid "Item sharing unknown."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:248
+msgid "Experience sharing enabled."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:258
+msgid "Experience sharing disabled."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:268
+msgid "Experience sharing not possible."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:196
+msgid "Experience sharing unknown."
+msgstr ""
+
+#: src/net/ea/inventoryhandler.cpp:407
+#, fuzzy
+msgid "Failed to use item."
+msgstr "Erro ao promover o membro."
+
+#: src/net/ea/inventoryhandler.cpp:580
+#, fuzzy
+msgid "Unable to equip."
+msgstr "Impossível comprar."
+
+#: src/net/ea/loginhandler.cpp:131
+#, fuzzy
+msgid "Account was not found. Please re-login."
+msgstr "Conta não conectada. Por favor, efetue o login primeiro."
+
+#: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127
+msgid "Old password incorrect."
+msgstr "Senha antiga incorreta."
+
+#: src/net/ea/loginhandler.cpp:137
+#, fuzzy
+msgid "New password too short."
+msgstr "Nova senha incorreta."
+
+#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:243
+#: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
+#: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
+#: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
+msgid "Unknown error."
+msgstr "Erro desconhecido."
+
+#: src/net/ea/loginhandler.cpp:205
+#, fuzzy
+msgid "Unregistered ID."
+msgstr "Cancelar Registro"
+
+#: src/net/ea/loginhandler.cpp:208
+#, fuzzy
+msgid "Wrong password."
+msgstr "Nome de usuário ou senha inválidos."
+
+#: src/net/ea/loginhandler.cpp:211
+#, fuzzy
+msgid "Account expired."
+msgstr "Conta banida."
+
+#: src/net/ea/loginhandler.cpp:214
+#, fuzzy
+msgid "Rejected from server."
+msgstr "Você foi desconectado do servidor!"
+
+#: src/net/ea/loginhandler.cpp:217
+msgid ""
+"You have been permanently banned from the game. Please contact the GM team."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:221
+#, fuzzy
+msgid "Client too old."
+msgstr "Versão do cliente é muito antiga."
+
+#: src/net/ea/loginhandler.cpp:224
 #, c-format
-msgid "Vitality %+.1f"
-msgstr "Vitalidade %+.1f"
+msgid ""
+"You have been temporarily banned from the game until %s.\n"
+"Please contact the GM team via the forums."
+msgstr ""
 
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
-msgid "Intelligence"
-msgstr "Inteligência"
+#: src/net/ea/loginhandler.cpp:231
+msgid "Server overpopulated."
+msgstr ""
 
-#: src/net/manaserv/attributes.cpp:219
+#: src/net/ea/loginhandler.cpp:234
+#, fuzzy
+msgid "This user name is already taken."
+msgstr "Existe alguém conectado a esta conta."
+
+#: src/net/ea/loginhandler.cpp:240
+#, fuzzy
+msgid "Username permanently erased."
+msgstr "Nome de usuário já existe."
+
+#: src/net/ea/partyhandler.cpp:82
+#, fuzzy
+msgid "Could not create party."
+msgstr "Criar grupo"
+
+#: src/net/ea/partyhandler.cpp:84
+#, fuzzy
+msgid "Party successfully created."
+msgstr "Jogador apagado com sucesso!"
+
+#: src/net/ea/partyhandler.cpp:140
+#, fuzzy, c-format
+msgid "%s has joined your party."
+msgstr "%s não está em seu grupo!"
+
+#: src/net/ea/partyhandler.cpp:176
 #, c-format
-msgid "Intelligence %+.1f"
-msgstr "Intelegência %+.1f"
+msgid "%s is already a member of a party."
+msgstr ""
 
-#: src/net/manaserv/attributes.cpp:225
-msgid "Willpower"
-msgstr "Força de Vontade"
+#: src/net/ea/partyhandler.cpp:181
+#, fuzzy, c-format
+msgid "%s refused your invitation."
+msgstr "%s recusou seu convite."
 
-#: src/net/manaserv/attributes.cpp:232
+#: src/net/ea/partyhandler.cpp:186
+#, fuzzy, c-format
+msgid "%s is now a member of your party."
+msgstr "%s não está em seu grupo!"
+
+#: src/net/ea/partyhandler.cpp:191
 #, c-format
-msgid "Willpower %+.1f"
-msgstr "Força de Vontade %+.1f"
+msgid "%s can't join your party because party is full."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:196
+#, c-format
+msgid "QQQ Unknown invite response for %s."
+msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/partyhandler.cpp:356
+#, fuzzy
+msgid "You have left the party."
+msgstr "Você foi convidado para entrar no grupo %s."
+
+#: src/net/ea/partyhandler.cpp:368
+#, fuzzy, c-format
+msgid "%s has left your party."
+msgstr "%s não está em seu grupo!"
+
+#: src/net/ea/partyhandler.cpp:444
+#, c-format
+msgid "An unknown member tried to say: %s"
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:95 src/net/manaserv/beinghandler.cpp:315
 msgid "You are dead."
 msgstr "Você está morto."
 
-#: src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:316
 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:318
+#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:318
 msgid "You are not that alive anymore."
 msgstr "Você não me parece assim tão vivo."
 
-#: src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:319
 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:320
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:320
 msgid "Game Over!"
 msgstr "Fim de jogo!"
 
-#: src/net/manaserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:101
+msgid "Insert coin to continue."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:321
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
@@ -4299,38 +4808,327 @@ msgstr ""
 "Não, criança. Seu personagem não morreu de verdade. Ele... err... foi para "
 "um lugar melhor."
 
-#: src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:323
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 "Seu plano de quebrar a arma de seu inimigo com a sua cabeça não deu certo."
 
-#: src/net/manaserv/beinghandler.cpp:325
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:325
 msgid "I guess this did not run too well."
 msgstr "Eu acho que as coisas não correram tão bem."
 
-#: src/net/manaserv/beinghandler.cpp:326
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:326
 msgid "Do you want your possessions identified?"
 msgstr "Você quer uma identificação de suas posses?"
 
-#: src/net/manaserv/beinghandler.cpp:327
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:327
 msgid "Sadly, no trace of you was ever found..."
 msgstr "Infelizmente, seus traços nunca foram encontrados..."
 
-#: src/net/manaserv/beinghandler.cpp:329
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:329
 msgid "Annihilated."
 msgstr "Aniquilado."
 
-#: src/net/manaserv/beinghandler.cpp:330
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:330
 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:332
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:332
 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:119
+msgid "You're not dead yet. You're just resting."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:120
+#, fuzzy
+msgid "You are no more."
+msgstr "Você está morto."
+
+#: src/net/ea/playerhandler.cpp:121
+#, fuzzy
+msgid "You have ceased to be."
+msgstr "Você está morto."
+
+#: src/net/ea/playerhandler.cpp:122
+msgid "You've expired and gone to meet your maker."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:123
+msgid "You're a stiff."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:124
+msgid "Bereft of life, you rest in peace."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:125
+msgid "If you weren't so animated, you'd be pushing up the daisies."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:126
+msgid "Your metabolic processes are now history."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:127
+msgid "You're off the twig."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:128
+msgid "You've kicked the bucket."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:129
+msgid ""
+"You've shuffled off your mortal coil, run down the curtain and joined the "
+"bleedin' choir invisibile."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:131
+#, fuzzy
+msgid "You are an ex-player."
+msgstr "Você está morto."
+
+#: src/net/ea/playerhandler.cpp:132
+msgid "You're pining for the fjords."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
+#: src/net/ea/playerhandler.cpp:425
+#, fuzzy
+msgid "Message"
+msgstr "Mensagens"
+
+#: src/net/ea/playerhandler.cpp:337
+msgid ""
+"You are carrying more than half your weight. You are unable to regain health."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:347
+msgid "You are carrying less than half your weight. You can regain health."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:451
+#, fuzzy, c-format
+msgid "You picked up %s."
+msgstr "Você pegou %d [@@%d|%s@@]."
+
+#: src/net/ea/playerhandler.cpp:457
+#, fuzzy, c-format
+msgid "You spent %s."
+msgstr "Você pegou %s"
+
+#: src/net/ea/playerhandler.cpp:501
+msgid "Cannot raise skill!"
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:618
+#, fuzzy
+msgid "Equip arrows first."
+msgstr "Desequipar antes"
+
+#: src/net/ea/specialhandler.cpp:149
+#, fuzzy
+msgid "Trade failed!"
+msgstr "Negociação cancelada."
+
+#: src/net/ea/specialhandler.cpp:152
+#, fuzzy
+msgid "Emote failed!"
+msgstr "Erro na expulsão!"
+
+#: src/net/ea/specialhandler.cpp:155
+#, fuzzy
+msgid "Sit failed!"
+msgstr "Erro na expulsão!"
+
+#: src/net/ea/specialhandler.cpp:158
+#, fuzzy
+msgid "Chat creating failed!"
+msgstr "Falha de autenticação."
+
+#: src/net/ea/specialhandler.cpp:161
+#, fuzzy
+msgid "Could not join party!"
+msgstr "%s não está em seu grupo!"
+
+#: src/net/ea/specialhandler.cpp:164
+msgid "Cannot shout!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:177
+msgid "You have not yet reached a high enough lvl!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:181
+msgid "Insufficient HP!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:184
+msgid "Insufficient SP!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:187
+#, fuzzy
+msgid "You have no memos!"
+msgstr "Você não tem dinheiro suficiente."
+
+#: src/net/ea/specialhandler.cpp:190
+#, fuzzy
+msgid "You cannot do that right now!"
+msgstr "Você não me parece assim tão vivo."
+
+#: src/net/ea/specialhandler.cpp:193
+msgid "Seems you need more money... ;-)"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:196
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:200
+msgid "You need another red gem!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:203
+msgid "You need another blue gem!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:206
+msgid "You're carrying to much to do this!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:209
+msgid "Huh? What's that?"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:220
+msgid "Warp failed..."
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:223
+msgid "Could not steal anything..."
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:226
+msgid "Poison had no effect..."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:128
+#, 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:130
+msgid "Trading isn't possible. Trade partner is too far away."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:134
+msgid "Trading isn't possible. Character doesn't exist."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:138
+msgid "Trade cancelled due to an unknown reason."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:146
+#, fuzzy, c-format
+msgid "Trade: You and %s"
+msgstr "Negócio: você"
+
+#: src/net/ea/tradehandler.cpp:156
+#, fuzzy, c-format
+msgid "Trade with %s cancelled."
+msgstr "Negociação cancelada."
+
+#: src/net/ea/tradehandler.cpp:169
+msgid "Unhandled trade cancel packet."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:231
+msgid "Failed adding item. Trade partner is over weighted."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:236
+msgid "Failed adding item. Trade partner has no free slot."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:241
+#, fuzzy
+msgid "Failed adding item. You can't trade this item."
+msgstr ""
+"Falha ao adicionar item. Você não pode duplicar este tipo de item na janela."
+
+#: src/net/ea/tradehandler.cpp:245
+msgid "Failed adding item for unknown reason."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:264 src/net/manaserv/tradehandler.cpp:160
+msgid "Trade canceled."
+msgstr "Negociação cancelada."
+
+#: src/net/ea/tradehandler.cpp:275 src/net/manaserv/tradehandler.cpp:167
+msgid "Trade completed."
+msgstr "Negociação realizada."
+
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
+msgid "Strength"
+msgstr "Força"
+
+#: src/net/manaserv/attributes.cpp:167
+#, c-format
+msgid "Strength %+.1f"
+msgstr "Força %+.1f"
+
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
+msgid "Agility"
+msgstr "Agilidade"
+
+#: src/net/manaserv/attributes.cpp:180
+#, c-format
+msgid "Agility %+.1f"
+msgstr "Agilidade %+.1f"
+
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
+msgid "Dexterity"
+msgstr "Destreza"
+
+#: src/net/manaserv/attributes.cpp:193
+#, c-format
+msgid "Dexterity %+.1f"
+msgstr "Destreza %+.1f"
+
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
+msgid "Vitality"
+msgstr "Vitalidade"
+
+#: src/net/manaserv/attributes.cpp:206
+#, c-format
+msgid "Vitality %+.1f"
+msgstr "Vitalidade %+.1f"
+
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
+msgid "Intelligence"
+msgstr "Inteligência"
+
+#: src/net/manaserv/attributes.cpp:219
+#, c-format
+msgid "Intelligence %+.1f"
+msgstr "Intelegência %+.1f"
+
+#: src/net/manaserv/attributes.cpp:225
+msgid "Willpower"
+msgstr "Força de Vontade"
+
+#: src/net/manaserv/attributes.cpp:232
+#, c-format
+msgid "Willpower %+.1f"
+msgstr "Força de Vontade %+.1f"
+
 #: src/net/manaserv/beinghandler.cpp:337
 msgid "Press OK to respawn."
 msgstr "Clique em OK para repopular."
@@ -4384,16 +5182,6 @@ msgstr "Seu estatus está longe do permitido (%u - %u)"
 msgid "Invalid slot number."
 msgstr "Número de slot inválido."
 
-#: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
-#: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
-#: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
-msgid "Unknown error."
-msgstr "Erro desconhecido."
-
-#: src/net/manaserv/charhandler.cpp:210
-msgid "Info"
-msgstr "Informações"
-
 #: src/net/manaserv/charhandler.cpp:210
 msgid "Player deleted."
 msgstr "Personagem deletado."
@@ -4457,10 +5245,6 @@ msgstr "%s expulsou %s."
 msgid "Unknown channel event."
 msgstr "Evento de canal desconhecido."
 
-#: src/net/manaserv/guildhandler.cpp:85
-msgid "Guild created."
-msgstr "Guilda criada."
-
 #: src/net/manaserv/guildhandler.cpp:90
 msgid "Error creating guild."
 msgstr "Erro ao criar Guilda."
@@ -4493,10 +5277,6 @@ msgstr "Conta banida."
 msgid "New password incorrect."
 msgstr "Nova senha incorreta."
 
-#: src/net/manaserv/loginhandler.cpp:127
-msgid "Old password incorrect."
-msgstr "Senha antiga incorreta."
-
 #: src/net/manaserv/loginhandler.cpp:131 src/net/manaserv/loginhandler.cpp:163
 msgid "Account not connected. Please login first."
 msgstr "Conta não conectada. Por favor, efetue o login primeiro."
@@ -4574,24 +5354,11 @@ msgstr "Aceitando propostas de negócios."
 msgid "Ignoring incoming trade requests."
 msgstr "Ignorando propostas de negócios."
 
-#: src/net/manaserv/tradehandler.cpp:128
-#, 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:146
 #, c-format
 msgid "Trading with %s"
 msgstr "Negociando com %s"
 
-#: src/net/manaserv/tradehandler.cpp:160
-msgid "Trade canceled."
-msgstr "Negociação cancelada."
-
-#: src/net/manaserv/tradehandler.cpp:167
-msgid "Trade completed."
-msgstr "Negociação realizada."
-
 #: src/net/tmwa/adminhandler.cpp:70
 msgid "Kick failed!"
 msgstr "Erro na expulsão!"
@@ -4783,4 +5550,5 @@ msgstr "MP %+d"
 msgid "Unknown item"
 msgstr "Item desconhecido"
 
-
+#~ msgid "Enable opacity cache"
+#~ msgstr "Habilitar cache de opacidade"
diff --git a/po/ru.po b/po/ru.po
index 4a013b7c5..4e777b63e 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 #   <reslayer@mail.ru>, 2011.
 #   <Necromong@inbox.ru>, 2011.
 # Necromonger <Necromong@inbox.ru>, 2011.
@@ -10,39 +10,41 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-08 04:26+0300\n"
+"POT-Creation-Date: 2011-08-10 01:11+0300\n"
 "PO-Revision-Date: 2011-08-08 01:31+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
-"Language-Team: Russian (http://www.transifex.net/projects/p/manaplus/team/ru/)\n"
+"Language-Team: Russian (http://www.transifex.net/projects/p/manaplus/team/"
+"ru/)\n"
+"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ru\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"
 
 #: src/actorspritemanager.cpp:1034
 msgid "Visible on map"
 msgstr "Видимые на карте"
 
-#: src/being.cpp:541
+#: src/being.cpp:542
 msgid "dodge"
 msgstr "уворот"
 
-#: src/being.cpp:541
+#: src/being.cpp:542
 msgid "miss"
 msgstr "промах"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1513
+#: src/being.cpp:1514
 msgid "A"
 msgstr "О"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1518
+#: src/being.cpp:1519
 msgid "I"
 msgstr "Б"
 
-#: src/client.cpp:825 src/gui/setup.cpp:51 src/gui/windowmenu.cpp:100
+#: src/client.cpp:825 src/gui/setup.cpp:53 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Настройка"
 
@@ -74,7 +76,8 @@ msgstr "Смена игрового сервера"
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
-#: src/gui/unregisterdialog.cpp:137 src/net/manaserv/charhandler.cpp:184
+#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
+#: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "Ошибка"
@@ -138,18 +141,18 @@ msgstr "Нельзя отправлять пустые сообщения!"
 #: src/commandhandler.cpp:409
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
-" you."
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
+"you."
 msgstr ""
-"Невозможно создать вкладку для личного общения с игроком \"%s\"! Или вкладка"
-" уже создана, или этот игрок Вы сами."
+"Невозможно создать вкладку для личного общения с игроком \"%s\"! Или вкладка "
+"уже создана, или этот игрок Вы сами."
 
 #: src/commandhandler.cpp:429
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Запрос на присоединение к каналу %s."
 
-#: src/commandhandler.cpp:445
+#: src/commandhandler.cpp:445 src/net/ea/gui/partytab.cpp:125
 msgid "Party name is missing."
 msgstr "Не указано название группы"
 
@@ -301,7 +304,9 @@ msgstr "Удаленных изображений:"
 #: src/commandhandler.h:40
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr "/%s может принимать значение \"yes\", \"no\", \"true\", \"false\", \"1\" или \"0\"."
+msgstr ""
+"/%s может принимать значение \"yes\", \"no\", \"true\", \"false\", \"1\" или "
+"\"0\"."
 
 #: src/game.cpp:246 src/gui/widgets/chattab.cpp:410
 msgid "General"
@@ -364,35 +369,35 @@ msgstr "PvP ранг: %d"
 msgid "Comment: %s"
 msgstr "Комментарий: %s"
 
-#: src/gui/botcheckerwindow.cpp:265
+#: src/gui/botcheckerwindow.cpp:266
 msgid "Bot Checker"
 msgstr "Окно детектора ботов"
 
-#: src/gui/botcheckerwindow.cpp:295 src/gui/setup_players.cpp:64
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
 msgid "Name"
 msgstr "Имя"
 
-#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:130
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:130
 #: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:604
 #: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
 msgid "Attack"
 msgstr "Атака"
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:275
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:275
 #: src/keyboardconfig.cpp:62
 msgid "Talk"
 msgstr "Разговор"
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:241
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:241
 #: src/gui/popupmenu.cpp:280 src/gui/popupmenu.cpp:661
 msgid "Move"
 msgstr "Движение"
 
-#: src/gui/botcheckerwindow.cpp:299
+#: src/gui/botcheckerwindow.cpp:300
 msgid "Result"
 msgstr "Результат"
 
-#: src/gui/botcheckerwindow.cpp:309 src/gui/npcdialog.cpp:123
+#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:123
 msgid "Reset"
 msgstr "Сбросить"
 
@@ -461,8 +466,8 @@ msgstr "Продать"
 #: src/gui/popupmenu.cpp:1731 src/gui/popupmenu.cpp:1774
 #: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1849
 #: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1935
-#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:68
-#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:237
+#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:70
+#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:238
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
 #: src/gui/updatewindow.cpp:157
 msgid "Cancel"
@@ -631,8 +636,8 @@ msgid "Enter password:"
 msgstr "Введите пароль:"
 
 #: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
-#: src/gui/setup_players.cpp:251 src/gui/shopwindow.cpp:120
-#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:240
+#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120
+#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:241
 msgid "Delete"
 msgstr "Удалить"
 
@@ -706,10 +711,10 @@ msgid "rainbow 3"
 msgstr "радуга 3"
 
 #: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
-#: src/gui/logindialog.cpp:78 src/gui/setup_players.cpp:220
-#: src/gui/setup_theme.cpp:71 src/gui/setup_theme.cpp:125
-#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:101
-#: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:159
+#: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
+#: src/gui/setup_theme.cpp:72 src/gui/setup_theme.cpp:126
+#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
+#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
 msgid "???"
 msgstr "???"
 
@@ -900,7 +905,7 @@ msgstr "Следующий >"
 msgid "Auto open this window"
 msgstr "Автоматически открывать это окно"
 
-#: src/gui/editdialog.cpp:46 src/gui/itemamountwindow.cpp:208
+#: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
 #: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "ОК"
@@ -984,7 +989,7 @@ msgstr "Вес:"
 
 #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
 #: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1724
-#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:69
+#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:71
 msgid "Store"
 msgstr "Сохранить"
 
@@ -1043,55 +1048,55 @@ msgstr ","
 msgid "Weight: %s"
 msgstr "Вес: %s"
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
+#: src/gui/killstats.cpp:46 src/gui/windowmenu.cpp:69
 msgid "Kill stats"
 msgstr "Окно статистики атак"
 
-#: src/gui/killstats.cpp:63
+#: src/gui/killstats.cpp:64
 msgid "Reset stats"
 msgstr "Сбросить стат."
 
-#: src/gui/killstats.cpp:64
+#: src/gui/killstats.cpp:65
 msgid "Reset timer"
 msgstr "Сбросить таймер"
 
-#: src/gui/killstats.cpp:68 src/gui/killstats.cpp:204
+#: src/gui/killstats.cpp:69 src/gui/killstats.cpp:205
 #, c-format
 msgid "Level: %d at %f%%"
 msgstr "Уровень: %d на %f%%"
 
-#: src/gui/killstats.cpp:72 src/gui/killstats.cpp:209
+#: src/gui/killstats.cpp:73 src/gui/killstats.cpp:210
 #, c-format
 msgid "Exp: %d/%d Left: %d"
 msgstr "Опыт: %d/%d Осталось: %d"
 
-#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:215
-#: src/gui/killstats.cpp:224
+#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:216
+#: src/gui/killstats.cpp:225
 #, c-format
 msgid "1%% = %d exp, avg mob for 1%%: %s"
 msgstr "1%% = %d опыта, среднее кол-во мобов для 1%%: %s"
 
-#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:141
-#: src/gui/killstats.cpp:233
+#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:142
+#: src/gui/killstats.cpp:234
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr "Убийств: %s, опыта: %s"
 
-#: src/gui/killstats.cpp:80 src/gui/killstats.cpp:143
-#: src/gui/killstats.cpp:219 src/gui/killstats.cpp:229
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
+#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:230
 #, c-format
 msgid "Avg Exp: %s, No. of avg mob to next level: %s"
 msgstr "Средний опыт: %s, среднее кол-во мобов до след. уровня: %s"
 
-#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:161
-#: src/gui/killstats.cpp:236
+#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:162
+#: src/gui/killstats.cpp:237
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr "Убийств в минуту: %s, Опыта в минуту: %s"
 
-#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:88 src/gui/killstats.cpp:93
-#: src/gui/killstats.cpp:288 src/gui/killstats.cpp:304
-#: src/gui/killstats.cpp:322
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:89 src/gui/killstats.cpp:94
+#: src/gui/killstats.cpp:289 src/gui/killstats.cpp:305
+#: src/gui/killstats.cpp:323
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
@@ -1099,7 +1104,7 @@ msgstr[0] "Опыт за %d мин.: %s"
 msgstr[1] "Опыт за %d мин.: %s"
 msgstr[2] "Опыт за %d мин.: %s"
 
-#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
+#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
@@ -1107,29 +1112,29 @@ msgstr[0] "Время до следующего уровня в мин. %d: %s"
 msgstr[1] "Время до следующего уровня в мин. %d: %s"
 msgstr[2] "Время до следующего уровня в мин. %d: %s"
 
-#: src/gui/killstats.cpp:99 src/gui/killstats.cpp:240
+#: src/gui/killstats.cpp:100 src/gui/killstats.cpp:241
 msgid "Last kill exp:"
 msgstr "Опыт за последнее убийство:"
 
-#: src/gui/killstats.cpp:101 src/gui/killstats.cpp:354
-#: src/gui/killstats.cpp:360 src/gui/killstats.cpp:366
-#: src/gui/killstats.cpp:371
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:355
+#: src/gui/killstats.cpp:361 src/gui/killstats.cpp:367
+#: src/gui/killstats.cpp:372
 msgid "Time before jacko spawn:"
 msgstr "Время до появления jacko:"
 
-#: src/gui/killstats.cpp:293 src/gui/killstats.cpp:300
-#: src/gui/killstats.cpp:310 src/gui/killstats.cpp:317
-#: src/gui/killstats.cpp:329 src/gui/killstats.cpp:336
+#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:301
+#: src/gui/killstats.cpp:311 src/gui/killstats.cpp:318
+#: src/gui/killstats.cpp:330 src/gui/killstats.cpp:337
 #, c-format
 msgid "  Time for next level: %s"
 msgstr "  Время до следующего уровня: %s"
 
-#: src/gui/killstats.cpp:360
+#: src/gui/killstats.cpp:361
 #, c-format
 msgid "%s %d?"
 msgstr "%s %d?"
 
-#: src/gui/killstats.cpp:366
+#: src/gui/killstats.cpp:367
 msgid "jacko spawning"
 msgstr "jacko появляется"
 
@@ -1793,34 +1798,38 @@ msgid "Tabs"
 msgstr "Страницы"
 
 #: src/gui/setup_chat.cpp:96
+msgid "Put all whispers in tabs"
+msgstr "Личные сообщения во вкладках"
+
+#: src/gui/setup_chat.cpp:99
 msgid "Log magic messages in debug tab"
 msgstr "Оставлять сообщения магии на вкладке отладки"
 
-#: src/gui/setup_chat.cpp:99
+#: src/gui/setup_chat.cpp:102
 msgid "Show server messages in debug tab"
 msgstr "Показывать сообщения сервера на вкладке отладки"
 
-#: src/gui/setup_chat.cpp:102
+#: src/gui/setup_chat.cpp:105
 msgid "Enable trade tab"
 msgstr "Включить вкладки торговли"
 
-#: src/gui/setup_chat.cpp:105
+#: src/gui/setup_chat.cpp:108
 msgid "Enable battle tab"
 msgstr "Включить вкладку боя"
 
-#: src/gui/setup_chat.cpp:108
+#: src/gui/setup_chat.cpp:111
 msgid "Show battle events"
 msgstr "Показать сообщения боя"
 
-#: src/gui/setup_chat.cpp:111
+#: src/gui/setup_chat.cpp:114
 msgid "Resize chat tabs if need"
 msgstr "Подгонять размер чата"
 
-#: src/gui/setup_chat.cpp:115
+#: src/gui/setup_chat.cpp:118
 msgid "Time"
 msgstr "Время"
 
-#: src/gui/setup_chat.cpp:117
+#: src/gui/setup_chat.cpp:120
 msgid "Use local time"
 msgstr "Использовать местное время"
 
@@ -1871,16 +1880,15 @@ msgstr "Синий:"
 msgid "Alpha:"
 msgstr "Прозрачность:"
 
-#: src/gui/setup.cpp:67
+#: src/gui/setup.cpp:69
 msgid "Apply"
 msgstr "Применить"
 
-#: src/gui/setup.cpp:70
+#: src/gui/setup.cpp:72
 msgid "Reset Windows"
 msgstr "Сбросить расположение окон"
 
 #: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
-#: src/gui/setup_players.cpp:334
 msgid "Edit"
 msgstr "Изменить"
 
@@ -2088,148 +2096,203 @@ msgstr "Спрятать картинку счита"
 msgid "Show background"
 msgstr "Показать фон"
 
-#: src/gui/setup_players.cpp:65
-msgid "Relation"
-msgstr "Отношение"
+#: src/gui/setup_perfomance.cpp:48
+msgid "Perfomance"
+msgstr ""
 
-#: src/gui/setup_players.cpp:70
-msgid "Neutral"
-msgstr "Нейтральное"
+#: src/gui/setup_perfomance.cpp:55
+msgid "Better perfomance (enable for better perfomance)"
+msgstr ""
 
-#: src/gui/setup_players.cpp:71
-msgid "Friend"
-msgstr "Друг"
+#: src/gui/setup_perfomance.cpp:58
+msgid "Auto adjust perfomance"
+msgstr "Автоматически подстраивать производительность"
 
-#: src/gui/setup_players.cpp:72
-msgid "Disregarded"
-msgstr "Пренебрегаемый"
+#: src/gui/setup_perfomance.cpp:61
+msgid "Show beings transparency"
+msgstr "Отображать прозрачность на персонажах и монстрах"
 
-#: src/gui/setup_players.cpp:73
-msgid "Ignored"
-msgstr "Игнорировано"
+#: src/gui/setup_perfomance.cpp:64
+msgid "Hw acceleration"
+msgstr "Аппаратное ускорение"
 
-#: src/gui/setup_players.cpp:74
-msgid "Erased"
-msgstr "Стерт"
+#: src/gui/setup_perfomance.cpp:67
+msgid "Enable opacity cache (Software, can use many memory)"
+msgstr ""
 
-#: src/gui/setup_players.cpp:247
-msgid "Allow trading"
-msgstr "Разрешить торговлю"
+#: src/gui/setup_perfomance.cpp:70
+#, fuzzy
+msgid "Enable map reduce (Software)"
+msgstr "Включить режим сжатия карты"
 
-#: src/gui/setup_players.cpp:249
-msgid "Allow whispers"
-msgstr "Разрешить шептание"
+#: src/gui/setup_perfomance.cpp:73
+msgid "Better quality (disable for better perfomance)"
+msgstr ""
 
-#: src/gui/setup_players.cpp:252
-msgid "Old"
-msgstr "Старые"
+#: src/gui/setup_perfomance.cpp:76
+msgid "Enable alpha channel fix (Software, can be very slow)"
+msgstr ""
 
-#: src/gui/setup_players.cpp:254
-msgid "Put all whispers in tabs"
-msgstr "Личные сообщения во вкладках"
+#: src/gui/setup_perfomance.cpp:80
+#, fuzzy
+msgid "Enable reorder sprites."
+msgstr "Включить серверную атаку"
 
-#: src/gui/setup_players.cpp:257
-msgid "Show gender"
-msgstr "Показать пол"
+#: src/gui/setup_perfomance.cpp:83
+msgid "Small memory (enable for lower memory usage)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:86
+msgid "Disable advanced beings caching (Software)"
+msgstr ""
 
-#: src/gui/setup_players.cpp:267
+#: src/gui/setup_perfomance.cpp:89
+msgid "Disable beings caching (Software)"
+msgstr ""
+
+#: src/gui/setup_players.cpp:48
 msgid "Players"
 msgstr "Игроки"
 
-#: src/gui/setup_players.cpp:292
-msgid "When ignoring:"
-msgstr "Когда игнорируется:"
+#: src/gui/setup_players.cpp:54
+msgid "Show gender"
+msgstr "Показать пол"
 
-#: src/gui/setup_players.cpp:315
+#: src/gui/setup_players.cpp:57
 msgid "Show level"
 msgstr "Показать уровень"
 
-#: src/gui/setup_players.cpp:319
+#: src/gui/setup_players.cpp:60
 msgid "Show own name"
 msgstr "Показать свое имя"
 
-#: src/gui/setup_players.cpp:323
+#: src/gui/setup_players.cpp:63
 msgid "Target dead players"
 msgstr "Наводить фокус на мертвых игроков"
 
-#: src/gui/setup_players.cpp:327
+#: src/gui/setup_players.cpp:66
+msgid "Visible names"
+msgstr "Видимые имена"
+
+#: src/gui/setup_players.cpp:69
 msgid "Secure trades"
 msgstr "Защитить торговлю"
 
-#: src/gui/setup_players.cpp:331 src/gui/setup_players.cpp:523
+#: src/gui/setup_players.cpp:72
 msgid "Unsecure chars in names"
 msgstr "Небезопасные символы"
 
-#: src/gui/setup_players.cpp:336
-msgid "Visible names"
-msgstr "Видимые имена"
-
-#: src/gui/setup_players.cpp:341
+#: src/gui/setup_players.cpp:75
 msgid "Show statuses"
 msgstr "Показывать статусы"
 
-#: src/gui/setup_theme.cpp:105
+#: src/gui/setup_relations.cpp:65
+msgid "Relation"
+msgstr "Отношение"
+
+#: src/gui/setup_relations.cpp:70
+msgid "Neutral"
+msgstr "Нейтральное"
+
+#: src/gui/setup_relations.cpp:71
+msgid "Friend"
+msgstr "Друг"
+
+#: src/gui/setup_relations.cpp:72
+msgid "Disregarded"
+msgstr "Пренебрегаемый"
+
+#: src/gui/setup_relations.cpp:73
+msgid "Ignored"
+msgstr "Игнорировано"
+
+#: src/gui/setup_relations.cpp:74
+msgid "Erased"
+msgstr "Стерт"
+
+#: src/gui/setup_relations.cpp:239
+msgid "Allow trading"
+msgstr "Разрешить торговлю"
+
+#: src/gui/setup_relations.cpp:241
+msgid "Allow whispers"
+msgstr "Разрешить шептание"
+
+#: src/gui/setup_relations.cpp:244
+msgid "Old"
+msgstr "Старые"
+
+#: src/gui/setup_relations.cpp:246
+#, fuzzy
+msgid "Relations"
+msgstr "Отношение"
+
+#: src/gui/setup_relations.cpp:271
+msgid "When ignoring:"
+msgstr "Когда игнорируется:"
+
+#: src/gui/setup_theme.cpp:106
 msgid "Tiny (10)"
 msgstr "Маленький (10)"
 
-#: src/gui/setup_theme.cpp:106
+#: src/gui/setup_theme.cpp:107
 msgid "Small (11)"
 msgstr "Маленький (11)"
 
-#: src/gui/setup_theme.cpp:107
+#: src/gui/setup_theme.cpp:108
 msgid "Medium (12)"
 msgstr "Средний (12)"
 
-#: src/gui/setup_theme.cpp:108
+#: src/gui/setup_theme.cpp:109
 msgid "Large (13)"
 msgstr "Большой (13)"
 
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:110
 msgid "Big (14)"
 msgstr "Боьшой (14)"
 
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:111
 msgid "Huge (15)"
 msgstr "Огромный (15)"
 
-#: src/gui/setup_theme.cpp:140
+#: src/gui/setup_theme.cpp:141
 msgid "Theme"
 msgstr "Тема"
 
-#: src/gui/setup_theme.cpp:142
+#: src/gui/setup_theme.cpp:143
 msgid "Gui theme"
 msgstr "Тема интерфейса"
 
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:144
 msgid "Main Font"
 msgstr "Основной шрифт"
 
-#: src/gui/setup_theme.cpp:144
+#: src/gui/setup_theme.cpp:145
 msgid "Bold font"
 msgstr "Жирный шрифт"
 
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:146
 msgid "Particle font"
 msgstr "Шрифт частиц"
 
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:147
 msgid "Help font"
 msgstr "Шрифт помощи"
 
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:148
 msgid "Secure font"
 msgstr "Безопасный шрифт"
 
-#: src/gui/setup_theme.cpp:175
+#: src/gui/setup_theme.cpp:176
 msgid "Font size"
 msgstr "Размер шрифта"
 
-#: src/gui/setup_theme.cpp:281
+#: src/gui/setup_theme.cpp:282
 msgid "Theme Changed"
 msgstr "Тема изменена"
 
-#: src/gui/setup_theme.cpp:282 src/gui/setup_video.cpp:670
-#: src/gui/setup_video.cpp:675
+#: src/gui/setup_theme.cpp:283 src/gui/setup_video.cpp:619
+#: src/gui/setup_video.cpp:624
 msgid "Restart your client for the change to take effect."
 msgstr "Перезегрузите игру дабы изменения вступили в силу."
 
@@ -2281,140 +2344,120 @@ msgstr "средне"
 msgid "max"
 msgstr "макс."
 
-#: src/gui/setup_video.cpp:293
+#: src/gui/setup_video.cpp:288
 msgid "Full screen"
 msgstr "На полный экран"
 
-#: src/gui/setup_video.cpp:294
-msgid "Hw acceleration"
-msgstr "Аппаратное ускорение"
-
-#: src/gui/setup_video.cpp:295
+#: src/gui/setup_video.cpp:289
 msgid "Custom cursor"
 msgstr "Игровой курсор"
 
-#: src/gui/setup_video.cpp:297
+#: src/gui/setup_video.cpp:291
 msgid "Particle effects"
 msgstr "Эффекты частиц"
 
-#: src/gui/setup_video.cpp:299
+#: src/gui/setup_video.cpp:293
 msgid "Show pickup notification"
 msgstr "Показать уведомление о подборе предмета"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:301
+#: src/gui/setup_video.cpp:295
 msgid "in chat"
 msgstr "в чате"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:303
+#: src/gui/setup_video.cpp:297
 msgid "as particle"
 msgstr "как частицу"
 
-#: src/gui/setup_video.cpp:305
-msgid "Enable opacity cache"
-msgstr "Включить кеш прозрачности"
-
-#: src/gui/setup_video.cpp:306
-msgid "Enable map reduce"
-msgstr "Включить режим сжатия карты"
-
-#: src/gui/setup_video.cpp:308
-msgid "Auto adjust perfomance"
-msgstr "Автоматически подстраивать производительность"
-
-#: src/gui/setup_video.cpp:310
-msgid "Show beings transparency"
-msgstr "Отображать прозрачность на персонажах и монстрах"
-
-#: src/gui/setup_video.cpp:315
+#: src/gui/setup_video.cpp:302
 msgid "FPS limit:"
 msgstr "Ограничить кадр/с:"
 
-#: src/gui/setup_video.cpp:319 src/gui/setup_video.cpp:356
-#: src/gui/setup_video.cpp:607 src/gui/setup_video.cpp:760
+#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
+#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709
 msgid "Alt FPS limit: "
 msgstr "Альтер. ограничить кадр/с: "
 
-#: src/gui/setup_video.cpp:328
+#: src/gui/setup_video.cpp:315
 msgid "Video"
 msgstr "Видео"
 
-#: src/gui/setup_video.cpp:334
+#: src/gui/setup_video.cpp:321
 msgid "Overhead text"
 msgstr "Текст над головами"
 
-#: src/gui/setup_video.cpp:335
+#: src/gui/setup_video.cpp:322
 msgid "Gui opacity"
 msgstr "Непрозрачность интерфейса"
 
-#: src/gui/setup_video.cpp:336
+#: src/gui/setup_video.cpp:323
 msgid "Ambient FX"
 msgstr "Эффекты окружающей среды"
 
-#: src/gui/setup_video.cpp:337
+#: src/gui/setup_video.cpp:324
 msgid "Particle detail"
 msgstr "Детализация частиц"
 
-#: src/gui/setup_video.cpp:354 src/gui/setup_video.cpp:357
-#: src/gui/setup_video.cpp:606 src/gui/setup_video.cpp:747
-#: src/gui/setup_video.cpp:758
+#: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
+#: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
+#: src/gui/setup_video.cpp:707
 msgid "None"
 msgstr "Нет"
 
-#: src/gui/setup_video.cpp:511
+#: src/gui/setup_video.cpp:484
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
-"Не удалось переключиться в оконный режим. Восстановить старый режим также не"
-" удалось!"
+"Не удалось переключиться в оконный режим. Восстановить старый режим также не "
+"удалось!"
 
-#: src/gui/setup_video.cpp:517
+#: src/gui/setup_video.cpp:490
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 "Не удалось переключиться в полноэкранный режим. Восстановить старый режим "
 "также не удалось!"
 
-#: src/gui/setup_video.cpp:528
+#: src/gui/setup_video.cpp:501
 msgid "Switching to Full Screen"
 msgstr "Переключение в полноэкранный режим"
 
-#: src/gui/setup_video.cpp:529
+#: src/gui/setup_video.cpp:502
 msgid "Restart needed for changes to take effect."
 msgstr "Для вступления в силу выбранных настроек требуется перезагрузка игры."
 
-#: src/gui/setup_video.cpp:541
+#: src/gui/setup_video.cpp:514
 msgid "Changing to OpenGL"
 msgstr "Переключение на OpenGL"
 
-#: src/gui/setup_video.cpp:542
+#: src/gui/setup_video.cpp:515
 msgid "Applying change to OpenGL requires restart."
 msgstr "Для изменения режима OpenGL необходима перезагрузки игры."
 
-#: src/gui/setup_video.cpp:653
+#: src/gui/setup_video.cpp:602
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Свое разрешение (например: 1024х768)"
 
-#: src/gui/setup_video.cpp:654
+#: src/gui/setup_video.cpp:603
 msgid "Enter new resolution:                "
 msgstr "Новое разрешение:                   "
 
-#: src/gui/setup_video.cpp:669 src/gui/setup_video.cpp:674
+#: src/gui/setup_video.cpp:618 src/gui/setup_video.cpp:623
 msgid "Screen Resolution Changed"
 msgstr "Разрешение экрана изменено"
 
-#: src/gui/setup_video.cpp:672
+#: src/gui/setup_video.cpp:621
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 "Некоторые окна могут быть сдвинуты, чтобы уместиться на экране при меньшем "
 "разрешении"
 
-#: src/gui/setup_video.cpp:705
+#: src/gui/setup_video.cpp:654
 msgid "Particle Effect Settings Changed."
 msgstr "Настройки эффектов частиц изменены."
 
-#: src/gui/setup_video.cpp:706
+#: src/gui/setup_video.cpp:655
 msgid "Changes will take effect on map change."
 msgstr "Изменения вступят в силу после загрузки новой карты."
 
@@ -2443,7 +2486,8 @@ msgstr "Анонс"
 msgid "Show links in announce"
 msgstr "Показывать ссылки"
 
-#: src/gui/shopwindow.cpp:723 src/net/manaserv/tradehandler.cpp:127
+#: src/gui/shopwindow.cpp:723 src/net/ea/tradehandler.cpp:106
+#: src/net/manaserv/tradehandler.cpp:127
 msgid "Request for Trade"
 msgstr "Запрос на Торговлю"
 
@@ -2485,7 +2529,7 @@ msgstr "Уровень: %d"
 msgid "Lvl: %d (%+d)"
 msgstr "Уровень: %d (%+d)"
 
-#: src/gui/socialwindow.cpp:117
+#: src/gui/socialwindow.cpp:117 src/net/ea/gui/guildtab.cpp:52
 msgid "Guild"
 msgstr "Гильдия"
 
@@ -2517,7 +2561,7 @@ msgstr "Покинуть Гильдию?"
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Вы действительно хотите выйти из гильдии %s?"
 
-#: src/gui/socialwindow.cpp:215
+#: src/gui/socialwindow.cpp:215 src/net/ea/gui/partytab.cpp:50
 msgid "Party"
 msgstr "Группа"
 
@@ -2679,243 +2723,243 @@ msgstr "Выберите имя будущей группы."
 msgid "Specials"
 msgstr "Особые"
 
-#: src/gui/statuspopup.cpp:196
+#: src/gui/statuspopup.cpp:197
 msgid "(D) default moves"
 msgstr "(D) движения по умолчанию"
 
-#: src/gui/statuspopup.cpp:201
+#: src/gui/statuspopup.cpp:202
 msgid "(I) invert moves"
 msgstr "(I) обратное движение"
 
-#: src/gui/statuspopup.cpp:206
+#: src/gui/statuspopup.cpp:207
 msgid "(c) moves with some crazy moves"
 msgstr "(c) обычное движение иногда с сумашедшими движениями"
 
-#: src/gui/statuspopup.cpp:211
+#: src/gui/statuspopup.cpp:212
 msgid "(C) moves with crazy moves"
 msgstr "(C) движение с сумашедшими движениями"
 
-#: src/gui/statuspopup.cpp:216
+#: src/gui/statuspopup.cpp:217
 msgid "(d) double normal + crazy"
 msgstr "(d) нормальные и сумашедшие движения"
 
-#: src/gui/statuspopup.cpp:221
+#: src/gui/statuspopup.cpp:222
 msgid "(?) move"
 msgstr "(?) неизвестное движение"
 
-#: src/gui/statuspopup.cpp:239
+#: src/gui/statuspopup.cpp:240
 msgid "(a) custom crazy move"
 msgstr "(a) пользовательские сумашедшие движения"
 
-#: src/gui/statuspopup.cpp:243
+#: src/gui/statuspopup.cpp:244
 msgid "(?) crazy move"
 msgstr "(?) неизвестные сумасшедшие движения"
 
-#: src/gui/statuspopup.cpp:253
+#: src/gui/statuspopup.cpp:254
 msgid "(0) default moves to target"
 msgstr "(0) обычное движение к цели"
 
-#: src/gui/statuspopup.cpp:258
+#: src/gui/statuspopup.cpp:259
 msgid "(1) moves to target in distance 1"
 msgstr "(1) движение к цели на расстояние 1"
 
-#: src/gui/statuspopup.cpp:263
+#: src/gui/statuspopup.cpp:264
 msgid "(2) moves to target in distance 2"
 msgstr "(2) движение к цели на расстояние 2"
 
-#: src/gui/statuspopup.cpp:268
+#: src/gui/statuspopup.cpp:269
 msgid "(3) moves to target in distance 3"
 msgstr "(3) движение к цели на расстояние 3"
 
-#: src/gui/statuspopup.cpp:273
+#: src/gui/statuspopup.cpp:274
 msgid "(5) moves to target in distance 5"
 msgstr "(5) движение к цели на расстояние 5"
 
-#: src/gui/statuspopup.cpp:278
+#: src/gui/statuspopup.cpp:279
 msgid "(7) moves to target in distance 7"
 msgstr "(7) движение к цели на расстояние 7"
 
-#: src/gui/statuspopup.cpp:283
+#: src/gui/statuspopup.cpp:284
 msgid "(A) moves to target in attack range"
 msgstr "(A) движение к цели на расстояние атаки"
 
-#: src/gui/statuspopup.cpp:288
+#: src/gui/statuspopup.cpp:289
 msgid "(?) move to target"
 msgstr "(?) неизвестное движение к цели"
 
-#: src/gui/statuspopup.cpp:296
+#: src/gui/statuspopup.cpp:297
 msgid "(D) default follow"
 msgstr "(D) следование по умолчанию"
 
-#: src/gui/statuspopup.cpp:300
+#: src/gui/statuspopup.cpp:301
 msgid "(R) relative follow"
 msgstr "(R) относительное следование"
 
-#: src/gui/statuspopup.cpp:304
+#: src/gui/statuspopup.cpp:305
 msgid "(M) mirror follow"
 msgstr "(M) зеркальное следование"
 
-#: src/gui/statuspopup.cpp:308
+#: src/gui/statuspopup.cpp:309
 msgid "(P) pet follow"
 msgstr "(P) следование как животное"
 
-#: src/gui/statuspopup.cpp:312
+#: src/gui/statuspopup.cpp:313
 msgid "(?) unknown follow"
 msgstr "(?) неизвестное следование"
 
-#: src/gui/statuspopup.cpp:321 src/gui/statuspopup.cpp:344
+#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345
 msgid "(D) default attack"
 msgstr "(D) обычная атака"
 
-#: src/gui/statuspopup.cpp:326
+#: src/gui/statuspopup.cpp:327
 msgid "(s) switch attack without shield"
 msgstr "(s) переключение атаки без щита"
 
-#: src/gui/statuspopup.cpp:331
+#: src/gui/statuspopup.cpp:332
 msgid "(S) switch attack with shield"
 msgstr "(S) переключение атаки со щитом"
 
-#: src/gui/statuspopup.cpp:335 src/gui/statuspopup.cpp:360
+#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
 msgid "(?) attack"
 msgstr "(?) неизвестная атака"
 
-#: src/gui/statuspopup.cpp:348
+#: src/gui/statuspopup.cpp:349
 msgid "(G) go and attack"
 msgstr "(G) идти и атаковать"
 
-#: src/gui/statuspopup.cpp:352
+#: src/gui/statuspopup.cpp:353
 msgid "(A) go, attack, pickup"
 msgstr "(A) идти, атаковать, собирать"
 
-#: src/gui/statuspopup.cpp:356
+#: src/gui/statuspopup.cpp:357
 msgid "(d) without auto attack"
 msgstr "(d) без автоатаки"
 
-#: src/gui/statuspopup.cpp:374
+#: src/gui/statuspopup.cpp:375
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) поднятие в области 1x1"
 
-#: src/gui/statuspopup.cpp:378
+#: src/gui/statuspopup.cpp:379
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) поднятие из области 2x1"
 
-#: src/gui/statuspopup.cpp:382
+#: src/gui/statuspopup.cpp:383
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) поднятие из области спереди 2x3"
 
-#: src/gui/statuspopup.cpp:386
+#: src/gui/statuspopup.cpp:387
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) поднятие из области 3x3"
 
-#: src/gui/statuspopup.cpp:390
+#: src/gui/statuspopup.cpp:391
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) движение и поднятие на расстоянии 4"
 
-#: src/gui/statuspopup.cpp:394
+#: src/gui/statuspopup.cpp:395
 msgid "(G) go and pick up in distance 8"
 msgstr "(g) движение и поднятие на расстоянии 8"
 
-#: src/gui/statuspopup.cpp:398
+#: src/gui/statuspopup.cpp:399
 msgid "(A) go and pick up in max distance"
 msgstr "(A) движение и поднятие на максимальном расстоянии"
 
-#: src/gui/statuspopup.cpp:402
+#: src/gui/statuspopup.cpp:403
 msgid "(?) pick up"
 msgstr "(?) неизвестный режим поднятия"
 
-#: src/gui/statuspopup.cpp:411
+#: src/gui/statuspopup.cpp:412
 msgid "(N) normal map view"
 msgstr "(N) обычный режим карты"
 
-#: src/gui/statuspopup.cpp:415
+#: src/gui/statuspopup.cpp:416
 msgid "(D) debug map view"
 msgstr "(D) отладочный режим карты"
 
-#: src/gui/statuspopup.cpp:419
+#: src/gui/statuspopup.cpp:420
 msgid "(u) ultra map view"
 msgstr "(u) специальный режим карты"
 
-#: src/gui/statuspopup.cpp:423
+#: src/gui/statuspopup.cpp:424
 msgid "(U) ultra map view 2"
 msgstr "(U) специальный режим карты 2"
 
-#: src/gui/statuspopup.cpp:427
+#: src/gui/statuspopup.cpp:428
 msgid "(e) empty map view"
 msgstr "(e) режим пустой карты"
 
-#: src/gui/statuspopup.cpp:431
+#: src/gui/statuspopup.cpp:432
 msgid "(b) black & white map view"
 msgstr "(b) черно-белый режим карты"
 
-#: src/gui/statuspopup.cpp:435
+#: src/gui/statuspopup.cpp:436
 msgid "(?) map view"
 msgstr "(?) неизвестный режим карты"
 
-#: src/gui/statuspopup.cpp:443
+#: src/gui/statuspopup.cpp:444
 msgid "(f) use #flar for magic attack"
 msgstr "(f) использовать #flar для атаки"
 
-#: src/gui/statuspopup.cpp:448
+#: src/gui/statuspopup.cpp:449
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) использовать #chiza для атаки"
 
-#: src/gui/statuspopup.cpp:453
+#: src/gui/statuspopup.cpp:454
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) использовать #ingrav для атаки"
 
-#: src/gui/statuspopup.cpp:458
+#: src/gui/statuspopup.cpp:459
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) использовать #frillyar для атаки"
 
-#: src/gui/statuspopup.cpp:463
+#: src/gui/statuspopup.cpp:464
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) использовать #upmarmu для атаки"
 
-#: src/gui/statuspopup.cpp:467
+#: src/gui/statuspopup.cpp:468
 msgid "(?) magic attack"
 msgstr "(?) неизвестная магическая атака"
 
-#: src/gui/statuspopup.cpp:476
+#: src/gui/statuspopup.cpp:477
 msgid "(D) default imitation"
 msgstr "(D) имитация по умолчанию"
 
-#: src/gui/statuspopup.cpp:480
+#: src/gui/statuspopup.cpp:481
 msgid "(O) outfits imitation"
 msgstr "(O) имитация нарядов"
 
-#: src/gui/statuspopup.cpp:484
+#: src/gui/statuspopup.cpp:485
 msgid "(?) imitation"
 msgstr "(?) неизвестная имитация"
 
-#: src/gui/statuspopup.cpp:493
+#: src/gui/statuspopup.cpp:494
 msgid "(O) on keyboard"
 msgstr "(O) возле компьютера"
 
-#: src/gui/statuspopup.cpp:496
+#: src/gui/statuspopup.cpp:497
 msgid "(A) away"
 msgstr "(A) отошел"
 
-#: src/gui/statuspopup.cpp:499 src/gui/statuspopup.cpp:519
+#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
 msgid "(?) away"
 msgstr "(?) неизвестный режим отошел"
 
-#: src/gui/statuspopup.cpp:507
+#: src/gui/statuspopup.cpp:508
 msgid "(G) game camera mode"
 msgstr "(G) игровая камера"
 
-#: src/gui/statuspopup.cpp:511
+#: src/gui/statuspopup.cpp:512
 msgid "(F) free camera mode"
 msgstr "(F) свободная камера"
 
-#: src/gui/statuspopup.cpp:515
+#: src/gui/statuspopup.cpp:516
 msgid "(D) design camera mode"
 msgstr "(D) камера в режиме разработки"
 
-#: src/gui/statuspopup.cpp:526
+#: src/gui/statuspopup.cpp:527
 msgid "Game modifiers are disabled"
 msgstr "Игровые модификаторы выключены"
 
-#: src/gui/statuspopup.cpp:531
+#: src/gui/statuspopup.cpp:532
 msgid "Game modifiers are enabled"
 msgstr "Игровые модификаторы включены"
 
@@ -3094,87 +3138,87 @@ msgstr "(b)"
 msgid "(O)"
 msgstr "(O)"
 
-#: src/gui/textcommandeditor.cpp:112
+#: src/gui/textcommandeditor.cpp:113
 msgid "No Target"
 msgstr "Без цели"
 
-#: src/gui/textcommandeditor.cpp:113
+#: src/gui/textcommandeditor.cpp:114
 msgid "Allow Target"
 msgstr "Разрешить цель"
 
-#: src/gui/textcommandeditor.cpp:114
+#: src/gui/textcommandeditor.cpp:115
 msgid "Need Target"
 msgstr "Необходима цель"
 
-#: src/gui/textcommandeditor.cpp:119
+#: src/gui/textcommandeditor.cpp:120
 msgid "General Magic"
 msgstr "Общая Магия"
 
-#: src/gui/textcommandeditor.cpp:120
+#: src/gui/textcommandeditor.cpp:121
 msgid "Life Magic"
 msgstr "Магия Жизни"
 
-#: src/gui/textcommandeditor.cpp:121
+#: src/gui/textcommandeditor.cpp:122
 msgid "War Magic"
 msgstr "Боевая Магия"
 
-#: src/gui/textcommandeditor.cpp:122
+#: src/gui/textcommandeditor.cpp:123
 msgid "Transmute Magic"
 msgstr "Магия Трансформации"
 
-#: src/gui/textcommandeditor.cpp:123
+#: src/gui/textcommandeditor.cpp:124
 msgid "Nature Magic"
 msgstr "Магия Природы"
 
-#: src/gui/textcommandeditor.cpp:124
+#: src/gui/textcommandeditor.cpp:125
 msgid "Astral Magic"
 msgstr "Астральная магия"
 
-#: src/gui/textcommandeditor.cpp:167
+#: src/gui/textcommandeditor.cpp:168
 msgid "Command Editor"
 msgstr "Редактор команд"
 
-#: src/gui/textcommandeditor.cpp:184
+#: src/gui/textcommandeditor.cpp:185
 msgid "magic"
 msgstr "Магия"
 
-#: src/gui/textcommandeditor.cpp:188
+#: src/gui/textcommandeditor.cpp:189
 msgid "other"
 msgstr "Другое"
 
-#: src/gui/textcommandeditor.cpp:193
+#: src/gui/textcommandeditor.cpp:194
 msgid "Symbol:"
 msgstr "Символ:"
 
-#: src/gui/textcommandeditor.cpp:196
+#: src/gui/textcommandeditor.cpp:197
 msgid "Command:"
 msgstr "Команда:"
 
-#: src/gui/textcommandeditor.cpp:199
+#: src/gui/textcommandeditor.cpp:200
 msgid "Mana:"
 msgstr "Мана:"
 
-#: src/gui/textcommandeditor.cpp:205
+#: src/gui/textcommandeditor.cpp:206
 msgid "Target Type:"
 msgstr "Тип цели:"
 
-#: src/gui/textcommandeditor.cpp:211
+#: src/gui/textcommandeditor.cpp:212
 msgid "Icon:"
 msgstr "Картинка:"
 
-#: src/gui/textcommandeditor.cpp:217
+#: src/gui/textcommandeditor.cpp:218
 msgid "Magic level:"
 msgstr "Уровень Магии:"
 
-#: src/gui/textcommandeditor.cpp:223
+#: src/gui/textcommandeditor.cpp:224
 msgid "Magic School:"
 msgstr "Школа Магии:"
 
-#: src/gui/textcommandeditor.cpp:229
+#: src/gui/textcommandeditor.cpp:230
 msgid "School level:"
 msgstr "Уровень школы:"
 
-#: src/gui/textcommandeditor.cpp:234
+#: src/gui/textcommandeditor.cpp:235
 msgid "Save"
 msgstr "Сохранить"
 
@@ -3212,8 +3256,7 @@ msgid "Change"
 msgstr "Сменить"
 
 #: src/gui/tradewindow.cpp:332
-msgid ""
-"Failed adding item. You can not overlap one kind of item on the window."
+msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Отказано в добавлении предмета. Вы не можете добавить какой-либо вид "
 "объектов более одного раза."
@@ -3405,23 +3448,23 @@ msgstr "Бордюр домашней позиции"
 msgid "Road Point"
 msgstr "Точка дороги"
 
-#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:470
+#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:471
 msgid "Who Is Online - Updating"
 msgstr "Кто онлайн - обновление"
 
-#: src/gui/whoisonline.cpp:100
+#: src/gui/whoisonline.cpp:101
 msgid "Update"
 msgstr "Обновить"
 
-#: src/gui/whoisonline.cpp:293
+#: src/gui/whoisonline.cpp:294
 msgid "Who Is Online - "
 msgstr "Кто онлайн - "
 
-#: src/gui/whoisonline.cpp:484
+#: src/gui/whoisonline.cpp:485
 msgid "Who Is Online - error"
 msgstr "Кто онлайн - ошибка"
 
-#: src/gui/whoisonline.cpp:515
+#: src/gui/whoisonline.cpp:516
 msgid "Who Is Online - Update"
 msgstr "Кто онлайн - обновление"
 
@@ -3486,6 +3529,7 @@ msgid "This command makes <nick> a channel operator."
 msgstr "Эта Команда делает <пользователь> оператором канала."
 
 #: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
+#: src/net/ea/gui/guildtab.cpp:69 src/net/ea/gui/partytab.cpp:85
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr "Если ник содержит пробелы, заключите его в кавычки (\")."
 
@@ -3551,16 +3595,15 @@ msgstr "Команда: /ignore"
 #: src/gui/widgets/whispertab.cpp:125
 msgid "This command ignores the other player regardless of current relations."
 msgstr ""
-"Эта команда позволяет игнорировать другого игрока вне зависимости от текущих"
-" отношений с ним."
+"Эта команда позволяет игнорировать другого игрока вне зависимости от текущих "
+"отношений с ним."
 
 #: src/gui/widgets/whispertab.cpp:130
 msgid "Command: /unignore <player>"
 msgstr "Команда: /unignore <игрок>"
 
 #: src/gui/widgets/whispertab.cpp:131
-msgid ""
-"This command stops ignoring the other player if they are being ignored."
+msgid "This command stops ignoring the other player if they are being ignored."
 msgstr "Эта команда прекращает игнорирование другого игрока."
 
 #: src/gui/windowmenu.cpp:65
@@ -4225,81 +4268,549 @@ msgstr "Спасибо за покупку!"
 msgid "Unable to buy."
 msgstr "Низзя купить!"
 
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
-msgid "Strength"
+#: src/net/ea/charserverhandler.cpp:63
+#, fuzzy
+msgid "Strength:"
 msgstr "Сила (str)"
 
-#: src/net/manaserv/attributes.cpp:167
+#: src/net/ea/charserverhandler.cpp:64
+#, fuzzy
+msgid "Agility:"
+msgstr "Выносливость (agi)"
+
+#: src/net/ea/charserverhandler.cpp:65
+#, fuzzy
+msgid "Vitality:"
+msgstr "Живучесть (vit)"
+
+#: src/net/ea/charserverhandler.cpp:66
+#, fuzzy
+msgid "Intelligence:"
+msgstr "Интеллект (int)"
+
+#: src/net/ea/charserverhandler.cpp:67
+#, fuzzy
+msgid "Dexterity:"
+msgstr "Ловкость (dex)"
+
+#: src/net/ea/charserverhandler.cpp:68
+#, fuzzy
+msgid "Luck:"
+msgstr "Удача (luk)"
+
+#: src/net/ea/charserverhandler.cpp:102
+msgid "Access denied. Most likely, there are too many players on this server."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:106
+#, fuzzy
+msgid "Cannot use this ID."
+msgstr "Нельзя отправлять пустые сообщения!"
+
+#: src/net/ea/charserverhandler.cpp:109
+#, fuzzy
+msgid "Unknown char-server failure."
+msgstr "Неизвестная ошибка."
+
+#: src/net/ea/charserverhandler.cpp:138
+msgid "Failed to create character. Most likely the name is already taken."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:237
+#, fuzzy
+msgid "Wrong name."
+msgstr "Ошибочный magic_token."
+
+#: src/net/ea/charserverhandler.cpp:145
+#, fuzzy
+msgid "Incorrect stats."
+msgstr "Нправильный пароль"
+
+#: src/net/ea/charserverhandler.cpp:148
+#, fuzzy
+msgid "Incorrect hair."
+msgstr "Нправильный пароль"
+
+#: src/net/ea/charserverhandler.cpp:151
+#, fuzzy
+msgid "Incorrect slot."
+msgstr "Нправильный пароль"
+
+#: src/net/ea/charserverhandler.cpp:166 src/net/manaserv/charhandler.cpp:210
+msgid "Info"
+msgstr "Сведения"
+
+#: src/net/ea/charserverhandler.cpp:166
+#, fuzzy
+msgid "Character deleted."
+msgstr "Игрок удален."
+
+#: src/net/ea/charserverhandler.cpp:172
+#, fuzzy
+msgid "Failed to delete character."
+msgstr "Введите пароль для удаления персонажа"
+
+#: src/net/ea/chathandler.cpp:60 src/net/ea/chathandler.cpp:66
+#: src/net/ea/chathandler.cpp:71 src/net/ea/chathandler.cpp:77
+#: src/net/ea/chathandler.cpp:82 src/net/ea/chathandler.cpp:88
+#: src/net/ea/chathandler.cpp:95 src/net/ea/chathandler.cpp:101
+msgid "Channels are not supported!"
+msgstr ""
+
+#: src/net/ea/chathandler.cpp:128
 #, c-format
-msgid "Strength %+.1f"
-msgstr "Сила (str) %+.1f"
+msgid "Whisper could not be sent, %s is offline."
+msgstr ""
 
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
-msgid "Agility"
-msgstr "Выносливость (agi)"
+#: src/net/ea/chathandler.cpp:136
+#, fuzzy, c-format
+msgid "Whisper could not be sent, ignored by %s."
+msgstr "Игрок не может быть удален из списка игнорирования!"
 
-#: src/net/manaserv/attributes.cpp:180
+#: src/net/ea/chathandler.cpp:348
+#, fuzzy
+msgid "MVP player."
+msgstr "Игрок"
+
+#: src/net/ea/chathandler.cpp:352
+#, fuzzy
+msgid "MVP player: "
+msgstr "Игрок"
+
+#: src/net/ea/gamehandler.cpp:86
 #, c-format
-msgid "Agility %+.1f"
-msgstr "Выносливость (agi) %+.1f"
+msgid "Online users: %d"
+msgstr ""
 
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
-msgid "Dexterity"
-msgstr "Ловкость (dex)"
+#: src/net/ea/gamehandler.cpp:98
+msgid "Game"
+msgstr ""
 
-#: src/net/manaserv/attributes.cpp:193
+#: src/net/ea/gamehandler.cpp:98
+#, fuzzy
+msgid "Request to quit denied!"
+msgstr "Запрос на Торговлю"
+
+#: src/net/ea/gui/guildtab.cpp:67 src/net/ea/gui/partytab.cpp:83
+#, fuzzy
+msgid "Command: /invite <nick>"
+msgstr "Команда: /kick <ник>"
+
+#: src/net/ea/gui/guildtab.cpp:68
+#, fuzzy
+msgid "This command invites <nick> to the guild you're in."
+msgstr "Эта Команда делает <пользователь> оператором канала."
+
+#: src/net/ea/gui/guildtab.cpp:74 src/net/ea/gui/partytab.cpp:90
+#, fuzzy
+msgid "Command: /leave"
+msgstr "Команда: /close"
+
+#: src/net/ea/gui/guildtab.cpp:75
+#, fuzzy
+msgid "This command causes the player to leave the guild."
+msgstr "Задает тему для <сообщение>."
+
+#: src/net/ea/gui/guildtab.cpp:135 src/net/ea/gui/partytab.cpp:69
+#, fuzzy
+msgid "/help > Display this help."
+msgstr "  -h --help           : Показать эту справку"
+
+#: src/net/ea/gui/guildtab.cpp:136
+msgid "/invite > Invite a player to your guild"
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:137
+msgid "/leave > Leave the guild you are in"
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:138
+#, fuzzy
+msgid "/kick > Kick some one from the guild you are in"
+msgstr "/kick > Вышвырнуть пользователя с канала"
+
+#: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
+msgid "Guild created."
+msgstr "Гильдия создана."
+
+#: src/net/ea/guildhandler.cpp:88 src/net/ea/guildhandler.cpp:93
+#, fuzzy
+msgid "You are already in guild."
+msgstr "Ошибка создания гильдии"
+
+#: src/net/ea/guildhandler.cpp:98
+msgid "Emperium check failed."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:103
+#, fuzzy
+msgid "Unknown server response."
+msgstr "Неизвестная ошибка."
+
+#: src/net/ea/guildhandler.cpp:180
+#, fuzzy, c-format
+msgid "Guild name: %s"
+msgstr "Гильдия: %s"
+
+#: src/net/ea/guildhandler.cpp:182
+#, fuzzy, c-format
+msgid "Guild master: %s"
+msgstr "Гильдия: %s"
+
+#: src/net/ea/guildhandler.cpp:184
+#, fuzzy, c-format
+msgid "Guild level: %d"
+msgstr "Уровень: %d"
+
+#: src/net/ea/guildhandler.cpp:186
 #, c-format
-msgid "Dexterity %+.1f"
-msgstr "Ловкость (dex) %+.1f"
+msgid "Online members: %d"
+msgstr ""
 
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
-msgid "Vitality"
-msgstr "Живучесть (vit)"
+#: src/net/ea/guildhandler.cpp:188
+#, c-format
+msgid "Max members: %d"
+msgstr ""
 
-#: src/net/manaserv/attributes.cpp:206
+#: src/net/ea/guildhandler.cpp:190
+#, fuzzy, c-format
+msgid "Average level: %d"
+msgstr "Уровень Магии:"
+
+#: src/net/ea/guildhandler.cpp:192
+#, fuzzy, c-format
+msgid "Guild exp: %d"
+msgstr "Гильдия: %s"
+
+#: src/net/ea/guildhandler.cpp:194
+#, fuzzy, c-format
+msgid "Guild next exp: %d"
+msgstr "Гильдия создана."
+
+#: src/net/ea/guildhandler.cpp:196
+#, fuzzy, c-format
+msgid "Guild castle: %s"
+msgstr "Гильдия: %s"
+
+#: src/net/ea/guildhandler.cpp:402
+#, fuzzy
+msgid "Could not inivte user to guild."
+msgstr "Пользователь %s приглашен в гильдию %s."
+
+#: src/net/ea/guildhandler.cpp:406
+#, fuzzy
+msgid "User rejected guild invite."
+msgstr "%s Отклоняет Ваше приглашение."
+
+#: src/net/ea/guildhandler.cpp:410
+msgid "User is now part of your guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:414
+msgid "Your guild is full."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:418
+#, fuzzy
+msgid "Unknown guild invite response."
+msgstr "Принято приглашение в гильдию от %s."
+
+#: src/net/ea/guildhandler.cpp:438
+msgid "You have left the guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:452
+#, fuzzy, c-format
+msgid "%s has left your guild."
+msgstr "Выберите имя для гильдии."
+
+#: src/net/ea/guildhandler.cpp:483
+#, fuzzy
+msgid "You was kicked from guild."
+msgstr "Выкинуть из гильдии"
+
+#: src/net/ea/guildhandler.cpp:496
+#, fuzzy, c-format
+msgid "%s has kicked from your guild."
+msgstr "%s был вышвырнут %s"
+
+#: src/net/ea/gui/partytab.cpp:70
+msgid "/invite > Invite a player to your party"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:71
+msgid "/leave > Leave the party you are in"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:72
+#, fuzzy
+msgid "/kick > Kick some one from the party you are in"
+msgstr "/kick > Вышвырнуть пользователя с канала"
+
+#: src/net/ea/gui/partytab.cpp:73
+msgid "/item > Show/change party item sharing options"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:74
+msgid "/exp > Show/change party experience sharing options"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:84
+#, fuzzy
+msgid "This command invites <nick> to party with you."
+msgstr "Эта команда заставляет <ник> покинуть канал."
+
+#: src/net/ea/gui/partytab.cpp:91
+#, fuzzy
+msgid "This command causes the player to leave the party."
+msgstr "Задает тему для <сообщение>."
+
+#: src/net/ea/gui/partytab.cpp:95
+#, fuzzy
+msgid "Command: /item <policy>"
+msgstr "Команда: /kick <ник>"
+
+#: src/net/ea/gui/partytab.cpp:97
+#, fuzzy
+msgid "This command changes the party's item sharing policy."
+msgstr "Эта Команда показывает пользователей канала"
+
+#: src/net/ea/gui/partytab.cpp:98
+msgid ""
+"<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
+"\"0\", \"no\", \"false\" to disable item sharing."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:101
+#, fuzzy
+msgid "Command: /item"
+msgstr "Команда: /quit"
+
+#: src/net/ea/gui/partytab.cpp:102
+#, fuzzy
+msgid "This command displays the party's current item sharing policy."
+msgstr "Команда покинуть текущий канал"
+
+#: src/net/ea/gui/partytab.cpp:107
+#, fuzzy
+msgid "Command: /exp <policy>"
+msgstr "Команда: /op <имя>"
+
+#: src/net/ea/gui/partytab.cpp:108
+#, fuzzy
+msgid "This command changes the party's experience sharing policy."
+msgstr "Команда покинуть текущий канал"
+
+#: src/net/ea/gui/partytab.cpp:110
+msgid ""
+"<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
+"sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:113
+#, fuzzy
+msgid "Command: /exp"
+msgstr "Комманды: /users"
+
+#: src/net/ea/gui/partytab.cpp:114
+#, fuzzy
+msgid "This command displays the party's current experience sharing policy."
+msgstr "Команда покинуть текущий канал"
+
+#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:286
+msgid "Item sharing enabled."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:296
+msgid "Item sharing disabled."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:306
+msgid "Item sharing not possible."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:157
+msgid "Item sharing unknown."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:248
+msgid "Experience sharing enabled."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:258
+msgid "Experience sharing disabled."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:268
+msgid "Experience sharing not possible."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:196
+msgid "Experience sharing unknown."
+msgstr ""
+
+#: src/net/ea/inventoryhandler.cpp:407
+#, fuzzy
+msgid "Failed to use item."
+msgstr "Не удалось повысить члена гильдии."
+
+#: src/net/ea/inventoryhandler.cpp:580
+#, fuzzy
+msgid "Unable to equip."
+msgstr "Низзя купить!"
+
+#: src/net/ea/loginhandler.cpp:131
+#, fuzzy
+msgid "Account was not found. Please re-login."
+msgstr "Вы не вошли под своим именем. Пожалуйста, авторизуйтесь"
+
+#: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127
+msgid "Old password incorrect."
+msgstr "Старый пароль указан неверно."
+
+#: src/net/ea/loginhandler.cpp:137
+#, fuzzy
+msgid "New password too short."
+msgstr "Новый пароль указан неверно"
+
+#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:243
+#: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
+#: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
+#: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
+msgid "Unknown error."
+msgstr "Неизвестная ошибка."
+
+#: src/net/ea/loginhandler.cpp:205
+#, fuzzy
+msgid "Unregistered ID."
+msgstr "Удалить регистрацию"
+
+#: src/net/ea/loginhandler.cpp:208
+#, fuzzy
+msgid "Wrong password."
+msgstr "Неверное имя пользователя или пароль."
+
+#: src/net/ea/loginhandler.cpp:211
+#, fuzzy
+msgid "Account expired."
+msgstr "Учетная запись заблокирована (бан)."
+
+#: src/net/ea/loginhandler.cpp:214
+#, fuzzy
+msgid "Rejected from server."
+msgstr "Отключено от сервера!"
+
+#: src/net/ea/loginhandler.cpp:217
+msgid ""
+"You have been permanently banned from the game. Please contact the GM team."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:221
+#, fuzzy
+msgid "Client too old."
+msgstr "Версия клиент-программы устарела."
+
+#: src/net/ea/loginhandler.cpp:224
 #, c-format
-msgid "Vitality %+.1f"
-msgstr "Живучесть (vit) %+.1f"
+msgid ""
+"You have been temporarily banned from the game until %s.\n"
+"Please contact the GM team via the forums."
+msgstr ""
 
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
-msgid "Intelligence"
-msgstr "Интеллект (int)"
+#: src/net/ea/loginhandler.cpp:231
+msgid "Server overpopulated."
+msgstr ""
 
-#: src/net/manaserv/attributes.cpp:219
+#: src/net/ea/loginhandler.cpp:234
+#, fuzzy
+msgid "This user name is already taken."
+msgstr "Этот аккаунт уже в сети."
+
+#: src/net/ea/loginhandler.cpp:240
+#, fuzzy
+msgid "Username permanently erased."
+msgstr "Пользователь с таким именем уже существует."
+
+#: src/net/ea/partyhandler.cpp:82
+#, fuzzy
+msgid "Could not create party."
+msgstr "Создать группу"
+
+#: src/net/ea/partyhandler.cpp:84
+#, fuzzy
+msgid "Party successfully created."
+msgstr "Игрок удален!"
+
+#: src/net/ea/partyhandler.cpp:140
+#, fuzzy, c-format
+msgid "%s has joined your party."
+msgstr "%s не в группе!"
+
+#: src/net/ea/partyhandler.cpp:176
 #, c-format
-msgid "Intelligence %+.1f"
-msgstr "Интеллект (int) %+.1f"
+msgid "%s is already a member of a party."
+msgstr ""
 
-#: src/net/manaserv/attributes.cpp:225
-msgid "Willpower"
-msgstr "Воля"
+#: src/net/ea/partyhandler.cpp:181
+#, fuzzy, c-format
+msgid "%s refused your invitation."
+msgstr "%s Отклоняет Ваше приглашение."
 
-#: src/net/manaserv/attributes.cpp:232
+#: src/net/ea/partyhandler.cpp:186
+#, fuzzy, c-format
+msgid "%s is now a member of your party."
+msgstr "%s не в группе!"
+
+#: src/net/ea/partyhandler.cpp:191
 #, c-format
-msgid "Willpower %+.1f"
-msgstr "Воля (wil) %+.1f"
+msgid "%s can't join your party because party is full."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:196
+#, c-format
+msgid "QQQ Unknown invite response for %s."
+msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/partyhandler.cpp:356
+#, fuzzy
+msgid "You have left the party."
+msgstr "Вас приглашают присоединиться к группе %s."
+
+#: src/net/ea/partyhandler.cpp:368
+#, fuzzy, c-format
+msgid "%s has left your party."
+msgstr "%s не в группе!"
+
+#: src/net/ea/partyhandler.cpp:444
+#, c-format
+msgid "An unknown member tried to say: %s"
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:95 src/net/manaserv/beinghandler.cpp:315
 msgid "You are dead."
 msgstr "Вы мертвы."
 
-#: src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:316
 msgid "We regret to inform you that your character was killed in battle."
 msgstr "С грустью сообщаем вам, что Ваш персонаж пал в бою."
 
-#: src/net/manaserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:318
 msgid "You are not that alive anymore."
 msgstr "Вас больше нет среди живых."
 
-#: src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:319
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr "Холодные руки Смерти извлекают Вашу душу."
 
-#: src/net/manaserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:320
 msgid "Game Over!"
 msgstr "Игра Окончена!"
 
-#: src/net/manaserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:101
+msgid "Insert coin to continue."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:321
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
@@ -4307,37 +4818,327 @@ msgstr ""
 "Нет, детки. Ваш персонаж на самом деле не умер. Он...эммм...ушел в лучший "
 "мир."
 
-#: src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:323
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr "Ваш план сломать оружие врагов о свое горло провалился."
 
-#: src/net/manaserv/beinghandler.cpp:325
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:325
 msgid "I guess this did not run too well."
 msgstr "Похоже, это было не слишком хорошо."
 
-#: src/net/manaserv/beinghandler.cpp:326
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:326
 msgid "Do you want your possessions identified?"
 msgstr "Хочешь, предскажу твою судьбу?"
 
-#: src/net/manaserv/beinghandler.cpp:327
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:327
 msgid "Sadly, no trace of you was ever found..."
 msgstr "Грустно, Вас вряд ли когда-нибудь найдут..."
 
-#: src/net/manaserv/beinghandler.cpp:329
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:329
 msgid "Annihilated."
 msgstr "Уничтожен."
 
-#: src/net/manaserv/beinghandler.cpp:330
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:330
 msgid "Looks like you got your head handed to you."
 msgstr "Похоже, Вам отдали Вашу голову."
 
-#: src/net/manaserv/beinghandler.cpp:332
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:332
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr "Вы опять пролетели, выбросите своё тело в трубу, и получите другое."
 
+#: src/net/ea/playerhandler.cpp:119
+msgid "You're not dead yet. You're just resting."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:120
+#, fuzzy
+msgid "You are no more."
+msgstr "Вы мертвы."
+
+#: src/net/ea/playerhandler.cpp:121
+#, fuzzy
+msgid "You have ceased to be."
+msgstr "Вы мертвы."
+
+#: src/net/ea/playerhandler.cpp:122
+msgid "You've expired and gone to meet your maker."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:123
+msgid "You're a stiff."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:124
+msgid "Bereft of life, you rest in peace."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:125
+msgid "If you weren't so animated, you'd be pushing up the daisies."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:126
+msgid "Your metabolic processes are now history."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:127
+msgid "You're off the twig."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:128
+msgid "You've kicked the bucket."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:129
+msgid ""
+"You've shuffled off your mortal coil, run down the curtain and joined the "
+"bleedin' choir invisibile."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:131
+#, fuzzy
+msgid "You are an ex-player."
+msgstr "Вы мертвы."
+
+#: src/net/ea/playerhandler.cpp:132
+msgid "You're pining for the fjords."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
+#: src/net/ea/playerhandler.cpp:425
+#, fuzzy
+msgid "Message"
+msgstr "Сообщения"
+
+#: src/net/ea/playerhandler.cpp:337
+msgid ""
+"You are carrying more than half your weight. You are unable to regain health."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:347
+msgid "You are carrying less than half your weight. You can regain health."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:451
+#, fuzzy, c-format
+msgid "You picked up %s."
+msgstr "Вы подняли %d [@@%d|%s@@]."
+
+#: src/net/ea/playerhandler.cpp:457
+#, fuzzy, c-format
+msgid "You spent %s."
+msgstr "Вы получаете %s."
+
+#: src/net/ea/playerhandler.cpp:501
+msgid "Cannot raise skill!"
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:618
+#, fuzzy
+msgid "Equip arrows first."
+msgstr "Сначала снять"
+
+#: src/net/ea/specialhandler.cpp:149
+#, fuzzy
+msgid "Trade failed!"
+msgstr "Торговля отменена."
+
+#: src/net/ea/specialhandler.cpp:152
+#, fuzzy
+msgid "Emote failed!"
+msgstr "Не удалось вышвырнуть!"
+
+#: src/net/ea/specialhandler.cpp:155
+#, fuzzy
+msgid "Sit failed!"
+msgstr "Не удалось вышвырнуть!"
+
+#: src/net/ea/specialhandler.cpp:158
+#, fuzzy
+msgid "Chat creating failed!"
+msgstr "Ошибка авторизации."
+
+#: src/net/ea/specialhandler.cpp:161
+#, fuzzy
+msgid "Could not join party!"
+msgstr "%s не в группе!"
+
+#: src/net/ea/specialhandler.cpp:164
+msgid "Cannot shout!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:177
+msgid "You have not yet reached a high enough lvl!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:181
+msgid "Insufficient HP!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:184
+msgid "Insufficient SP!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:187
+#, fuzzy
+msgid "You have no memos!"
+msgstr "У вас недостаточно денег"
+
+#: src/net/ea/specialhandler.cpp:190
+#, fuzzy
+msgid "You cannot do that right now!"
+msgstr "Вас больше нет среди живых."
+
+#: src/net/ea/specialhandler.cpp:193
+msgid "Seems you need more money... ;-)"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:196
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:200
+msgid "You need another red gem!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:203
+msgid "You need another blue gem!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:206
+msgid "You're carrying to much to do this!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:209
+msgid "Huh? What's that?"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:220
+msgid "Warp failed..."
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:223
+msgid "Could not steal anything..."
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:226
+msgid "Poison had no effect..."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:128
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
+msgstr "%s хочет торговать с Вами, Вы принимаете предложение?"
+
+#: src/net/ea/tradehandler.cpp:130
+msgid "Trading isn't possible. Trade partner is too far away."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:134
+msgid "Trading isn't possible. Character doesn't exist."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:138
+msgid "Trade cancelled due to an unknown reason."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:146
+#, fuzzy, c-format
+msgid "Trade: You and %s"
+msgstr "Торговля: Вы"
+
+#: src/net/ea/tradehandler.cpp:156
+#, fuzzy, c-format
+msgid "Trade with %s cancelled."
+msgstr "Торговля отменена."
+
+#: src/net/ea/tradehandler.cpp:169
+msgid "Unhandled trade cancel packet."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:231
+msgid "Failed adding item. Trade partner is over weighted."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:236
+msgid "Failed adding item. Trade partner has no free slot."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:241
+#, fuzzy
+msgid "Failed adding item. You can't trade this item."
+msgstr ""
+"Отказано в добавлении предмета. Вы не можете добавить какой-либо вид "
+"объектов более одного раза."
+
+#: src/net/ea/tradehandler.cpp:245
+msgid "Failed adding item for unknown reason."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:264 src/net/manaserv/tradehandler.cpp:160
+msgid "Trade canceled."
+msgstr "Торговля отменена."
+
+#: src/net/ea/tradehandler.cpp:275 src/net/manaserv/tradehandler.cpp:167
+msgid "Trade completed."
+msgstr "Торговля завершена."
+
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
+msgid "Strength"
+msgstr "Сила (str)"
+
+#: src/net/manaserv/attributes.cpp:167
+#, c-format
+msgid "Strength %+.1f"
+msgstr "Сила (str) %+.1f"
+
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
+msgid "Agility"
+msgstr "Выносливость (agi)"
+
+#: src/net/manaserv/attributes.cpp:180
+#, c-format
+msgid "Agility %+.1f"
+msgstr "Выносливость (agi) %+.1f"
+
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
+msgid "Dexterity"
+msgstr "Ловкость (dex)"
+
+#: src/net/manaserv/attributes.cpp:193
+#, c-format
+msgid "Dexterity %+.1f"
+msgstr "Ловкость (dex) %+.1f"
+
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
+msgid "Vitality"
+msgstr "Живучесть (vit)"
+
+#: src/net/manaserv/attributes.cpp:206
+#, c-format
+msgid "Vitality %+.1f"
+msgstr "Живучесть (vit) %+.1f"
+
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
+msgid "Intelligence"
+msgstr "Интеллект (int)"
+
+#: src/net/manaserv/attributes.cpp:219
+#, c-format
+msgid "Intelligence %+.1f"
+msgstr "Интеллект (int) %+.1f"
+
+#: src/net/manaserv/attributes.cpp:225
+msgid "Willpower"
+msgstr "Воля"
+
+#: src/net/manaserv/attributes.cpp:232
+#, c-format
+msgid "Willpower %+.1f"
+msgstr "Воля (wil) %+.1f"
+
 #: src/net/manaserv/beinghandler.cpp:337
 msgid "Press OK to respawn."
 msgstr "Нажмите ОК, чтобы возродиться."
@@ -4393,16 +5194,6 @@ msgstr ""
 msgid "Invalid slot number."
 msgstr "Некорректный номер слота."
 
-#: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
-#: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
-#: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
-msgid "Unknown error."
-msgstr "Неизвестная ошибка."
-
-#: src/net/manaserv/charhandler.cpp:210
-msgid "Info"
-msgstr "Сведения"
-
 #: src/net/manaserv/charhandler.cpp:210
 msgid "Player deleted."
 msgstr "Игрок удален."
@@ -4466,10 +5257,6 @@ msgstr "%s был вышвырнут %s"
 msgid "Unknown channel event."
 msgstr "Неизвестное событие на канале."
 
-#: src/net/manaserv/guildhandler.cpp:85
-msgid "Guild created."
-msgstr "Гильдия создана."
-
 #: src/net/manaserv/guildhandler.cpp:90
 msgid "Error creating guild."
 msgstr "Ошибка создания гильдии"
@@ -4502,10 +5289,6 @@ msgstr "Учетная запись заблокирована (бан)."
 msgid "New password incorrect."
 msgstr "Новый пароль указан неверно"
 
-#: src/net/manaserv/loginhandler.cpp:127
-msgid "Old password incorrect."
-msgstr "Старый пароль указан неверно."
-
 #: src/net/manaserv/loginhandler.cpp:131 src/net/manaserv/loginhandler.cpp:163
 msgid "Account not connected. Please login first."
 msgstr "Вы не вошли под своим именем. Пожалуйста, авторизуйтесь"
@@ -4585,24 +5368,11 @@ msgstr "Принимать входящие предложения торгов�
 msgid "Ignoring incoming trade requests."
 msgstr "Игнорировать входящие предложения торговли."
 
-#: src/net/manaserv/tradehandler.cpp:128
-#, c-format
-msgid "%s wants to trade with you, do you accept?"
-msgstr "%s хочет торговать с Вами, Вы принимаете предложение?"
-
 #: src/net/manaserv/tradehandler.cpp:146
 #, c-format
 msgid "Trading with %s"
 msgstr "Торговля с %s"
 
-#: src/net/manaserv/tradehandler.cpp:160
-msgid "Trade canceled."
-msgstr "Торговля отменена."
-
-#: src/net/manaserv/tradehandler.cpp:167
-msgid "Trade completed."
-msgstr "Торговля завершена."
-
 #: src/net/tmwa/adminhandler.cpp:70
 msgid "Kick failed!"
 msgstr "Не удалось вышвырнуть!"
@@ -4794,4 +5564,5 @@ msgstr "Мана %+d"
 msgid "Unknown item"
 msgstr "Неизвестный предмет"
 
-
+#~ msgid "Enable opacity cache"
+#~ msgstr "Включить кеш прозрачности"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index e8e52e5a6..2adbb8e63 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,3966 +1,4754 @@
-# Simplified Chinese translation for mana
-# Copyright (c) 2008 Rosetta Contributors and Canonical Ltd 2008
-# This file is distributed under the same license as the mana package.
-#
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2008.
-# Hong Hao <oahong@gmail.com>, 2009.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR The ManaPlus Developers
+# This file is distributed under the same license as the PACKAGE package.
+# 
+#   <colorfullife81@gmail.com>, 2011.
+# Andrei Karas <akaras@inbox.ru>, 2011.
 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"
-"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"
+"Project-Id-Version: ManaPlus\n"
+"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
+"POT-Creation-Date: 2011-08-08 04:26+0300\n"
+"PO-Revision-Date: 2011-08-09 06:12+0000\n"
+"Last-Translator: colorful <colorfullife81@gmail.com>\n"
+"Language-Team: Chinese (China) (http://www.transifex.net/projects/p/manaplus/team/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-"X-Poedit-Country: China\n"
-"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
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: src/actorspritemanager.cpp:1034
+msgid "Visible on map"
+msgstr ""
+
+#: src/being.cpp:541
+msgid "dodge"
+msgstr ""
+
+#: src/being.cpp:541
+msgid "miss"
+msgstr ""
+
+#. TRANSLATORS: this away status writed in player nick
+#: src/being.cpp:1513
+msgid "A"
+msgstr ""
+
+#. TRANSLATORS: this inactive status writed in player nick
+#: src/being.cpp:1518
+msgid "I"
+msgstr ""
+
+#: src/client.cpp:825 src/gui/setup.cpp:51 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "设置"
 
-#: src/client.cpp:623
-#, fuzzy
+#: src/client.cpp:908
 msgid "Connecting to server"
-msgstr "正在连接 地图 服务器..."
+msgstr ""
 
-#: src/client.cpp:650
-#, fuzzy
+#: src/client.cpp:939
 msgid "Logging in"
 msgstr "登录"
 
-#: src/client.cpp:683
+#: src/client.cpp:972
 msgid "Entering game world"
-msgstr ""
+msgstr "进入游戏世界"
 
-#: src/client.cpp:739
-#, fuzzy
+#: src/client.cpp:1072
 msgid "Requesting characters"
-msgstr "选择角色"
+msgstr "请求字符"
 
-#: src/client.cpp:768
-#, fuzzy
+#: src/client.cpp:1103
 msgid "Connecting to the game server"
-msgstr "正在连接 地图 服务器..."
-
-#: src/client.cpp:799 src/client.cpp:806 src/client.cpp:940
-#: 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
+msgstr "连接到游戏服务器"
+
+#: src/client.cpp:1113
+msgid "Changing game servers"
+msgstr "更改游戏服务器"
+
+#: src/client.cpp:1150 src/client.cpp:1157 src/client.cpp:1294
+#: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
+#: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
+#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
+#: src/gui/unregisterdialog.cpp:137 src/net/manaserv/charhandler.cpp:184
+#: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "错误"
 
-#: src/client.cpp:815
+#: src/client.cpp:1166
 msgid "Requesting registration details"
-msgstr ""
+msgstr "申请登记的详细信息"
 
-#: src/client.cpp:842
-#, fuzzy
+#: src/client.cpp:1193
 msgid "Password Change"
-msgstr "密码："
+msgstr "密码更改"
 
-#: src/client.cpp:843
+#: src/client.cpp:1194
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:862
-#, fuzzy
+#: src/client.cpp:1213
 msgid "Email Change"
-msgstr "改变"
+msgstr ""
 
-#: src/client.cpp:863
-#, fuzzy
+#: src/client.cpp:1214
 msgid "Email changed successfully!"
-msgstr "会员晋升成功。"
+msgstr ""
 
-#: src/client.cpp:883
-#, fuzzy
+#: src/client.cpp:1234
 msgid "Unregister Successful"
-msgstr "注销"
+msgstr ""
 
-#: src/client.cpp:884
+#: src/client.cpp:1235
 msgid "Farewell, come back any time..."
-msgstr ""
+msgstr "永别了，任何时候回来... ..."
 
-#: src/client.cpp:1007 src/client.cpp:1030
+#: src/client.cpp:1424 src/client.cpp:1454 src/client.cpp:1498
+#: src/client.cpp:1919
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1119
-#, fuzzy, c-format
+#: src/client.cpp:1629
+#, c-format
 msgid "Invalid update host: %s"
-msgstr "无效的更新主机： "
+msgstr ""
 
-#: src/client.cpp:1153 src/client.cpp:1159
+#: src/client.cpp:1663 src/client.cpp:1669
 msgid "Error creating updates directory!"
 msgstr "创建更新目录错误！"
 
-#: src/commandhandler.cpp:127 src/commandhandler.cpp:308
+#: src/client.cpp:1690
+#, c-format
+msgid "Error: %s doesn't exist and can't be created! Exiting."
+msgstr ""
+
+#: src/commandhandler.cpp:301
 msgid "Unknown command."
 msgstr "未知命令。"
 
-#: src/commandhandler.cpp:156
-msgid "-- Help --"
-msgstr "-- 帮助 --"
-
-#: src/commandhandler.cpp:157
-msgid "/help > Display this help"
-msgstr "/help > 显示此帮助"
-
-#: src/commandhandler.cpp:159
-msgid "/where > Display map name"
-msgstr "/where > 显示地图名"
-
-#: src/commandhandler.cpp:160
-msgid "/who > Display number of online users"
-msgstr "/who > 显示在线用户数"
-
-#: src/commandhandler.cpp:161
-msgid "/me > Tell something about yourself"
-msgstr "/me > 自我介绍"
-
-#: src/commandhandler.cpp:163
-msgid "/clear > Clears this window"
-msgstr "/clear > 清除此窗口"
-
-#: src/commandhandler.cpp:165
-msgid "/msg > Send a private message to a user"
-msgstr "/msg > 发送私人信息给用户"
+#: src/commandhandler.cpp:401
+msgid "Cannot send empty whispers!"
+msgstr "无法发送空白密语！"
 
-#: src/commandhandler.cpp:166
-msgid "/whisper > Alias of msg"
-msgstr "/whisper > msg的别名"
+#: src/commandhandler.cpp:409
+#, c-format
+msgid ""
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
+" you."
+msgstr "无法同 \"%s\" 建立一个私人谈话标签页！或者已经存在，或者那就是自己。"
 
-#: src/commandhandler.cpp:167
-msgid "/w > Alias of msg"
-msgstr "/w > msg的别名"
+#: src/commandhandler.cpp:429
+#, c-format
+msgid "Requesting to join channel %s."
+msgstr "请求加入频道%s。"
 
-#: src/commandhandler.cpp:168
-msgid "/query > Makes a tab for private messages with another user"
-msgstr "/query > 为和其他用户之间的私密信息开启一个新的标签页"
+#: src/commandhandler.cpp:445
+msgid "Party name is missing."
+msgstr "帮会名称缺失。"
 
-#: src/commandhandler.cpp:169
-msgid "/q > Alias of query"
-msgstr "/q > query的别名"
+#: src/commandhandler.cpp:456
+msgid "Guild name is missing."
+msgstr "公会名称是缺少的。"
 
-#: src/commandhandler.cpp:171
-msgid "/ignore > ignore a player"
-msgstr ""
+#: src/commandhandler.cpp:469 src/commandhandler.cpp:576
+#: src/commandhandler.cpp:617 src/commandhandler.cpp:647
+msgid "Please specify a name."
+msgstr "请指定一个名称。"
 
-#: src/commandhandler.cpp:172
-msgid "/unignore > stop ignoring a player"
+#: src/commandhandler.cpp:510
+msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:174
-msgid "/list > Display all public channels"
-msgstr "/list > 显示所有公共频道"
-
-#: src/commandhandler.cpp:175
-msgid "/join > Join or create a channel"
-msgstr "/join > 加入或者创建一个新的频道"
-
-#: src/commandhandler.cpp:177
-#, fuzzy
-msgid "/createparty > Create a new party"
-msgstr "/create > 创建一个新的帮会"
-
-#: src/commandhandler.cpp:178
-msgid "/party > Invite a user to party"
-msgstr "邀请一个用户加入队伍"
-
-#: src/commandhandler.cpp:180
-msgid "/record > Start recording the chat to an external file"
-msgstr "/record > 开始记录聊天至外部文件"
-
-#: src/commandhandler.cpp:181
-msgid "/toggle > Determine whether <return> toggles the chat log"
-msgstr "/toggle > 确定<回车>键是否切换聊天日志"
-
-#: src/commandhandler.cpp:182
-msgid "/present > Get list of players present (sent to chat log, if logging)"
-msgstr "/present > 获取列席的玩家列表（若开启logging，则发送到聊天日志）"
-
-#: src/commandhandler.cpp:184
-msgid "/announce > Global announcement (GM only)"
-msgstr "/announce > 全局通告（限GM使用）"
-
-#: src/commandhandler.cpp:188
-msgid "For more information, type /help <command>."
-msgstr "输入 /help <命令>，获取更多信息。"
-
-#: src/commandhandler.cpp:192
-msgid "Command: /help"
-msgstr "命令： /help"
-
-#: src/commandhandler.cpp:193
-msgid "This command displays a list of all commands available."
-msgstr "该命令可显示所有可用命令。"
-
-#: src/commandhandler.cpp:194
-msgid "Command: /help <command>"
-msgstr "命令： /help <命令>"
-
-#: src/commandhandler.cpp:195
-msgid "This command displays help on <command>."
-msgstr "该命令显现<命令>的帮助信息"
-
-#: src/commandhandler.cpp:203
-msgid "Command: /announce <msg>"
-msgstr "命令： /announce <信息>"
-
-#: src/commandhandler.cpp:204
-msgid "*** only available to a GM ***"
-msgstr "*** 只有GM可用 ***"
-
-#: src/commandhandler.cpp:205
-msgid "This command sends the message <msg> to all players currently online."
-msgstr "该命令会发送<信息>给所有在线用户。"
-
-#: src/commandhandler.cpp:210
-msgid "Command: /clear"
-msgstr "命令： /clear"
-
-#: src/commandhandler.cpp:211
-msgid "This command clears the chat log of previous chat."
-msgstr "该命令可清除历史聊天记录。"
-
-#: src/commandhandler.cpp:215
-#, fuzzy
-msgid "Command: /ignore <player>"
-msgstr "命令：/item <策略>"
-
-#: src/commandhandler.cpp:216
-#, fuzzy
-msgid "This command ignores the given player regardless of current relations."
-msgstr "该条命令可显现当前在线用户总数。"
-
-#: src/commandhandler.cpp:221
-msgid "Command: /join <channel>"
-msgstr "命令：/join <频道>"
-
-#: src/commandhandler.cpp:222
-msgid "This command makes you enter <channel>."
-msgstr "该命令让您进入<频道>。"
-
-#: src/commandhandler.cpp:223
-msgid "If <channel> doesn't exist, it's created."
-msgstr "如果<频道>不存在，自动创建。"
-
-#: src/commandhandler.cpp:227
-msgid "Command: /list"
-msgstr "命令：/list"
-
-#: src/commandhandler.cpp:228
-msgid "This command shows a list of all channels."
-msgstr "改命令列出所有频道列表。"
-
-#: src/commandhandler.cpp:232
-msgid "Command: /me <message>"
-msgstr "命令：/me <信息>"
-
-#: src/commandhandler.cpp:233
-msgid "This command tell others you are (doing) <msg>."
-msgstr "该命令告诉别人你正在（做）<信息>。"
-
-#: src/commandhandler.cpp:237
-msgid "Command: /msg <nick> <message>"
-msgstr "命令：/msg <昵称><信息>"
-
-#: src/commandhandler.cpp:238
-msgid "Command: /whisper <nick> <message>"
-msgstr "命令：/whisper <昵称><信息>"
-
-#: src/commandhandler.cpp:239
-msgid "Command: /w <nick> <message>"
-msgstr "命令：/w <昵称><信息>"
-
-#: src/commandhandler.cpp:240
-msgid "This command sends the text <message> to <nick>."
-msgstr "该命令发送文本<信息>给<昵称>。"
-
-#: src/commandhandler.cpp:241 src/commandhandler.cpp:260
-#: 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
-msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
-msgstr "如果<昵称>之间有空格，用双引号(\")括起来。"
-
-#: src/commandhandler.cpp:246
-msgid "Command: /query <nick>"
-msgstr "命令：/query <昵称>"
-
-#: src/commandhandler.cpp:247
-msgid "Command: /q <nick>"
-msgstr "命令：/q <昵称>"
-
-#: src/commandhandler.cpp:248
-msgid "This command tries to make a tab for whispers betweenyou and <nick>."
-msgstr "该命令尝试为您和<昵称>之间的密语开启一个新的标签。"
-
-#: src/commandhandler.cpp:253
-#, fuzzy
-msgid "Command: /createparty <name>"
-msgstr "命令：/create <帮会名>"
-
-#: src/commandhandler.cpp:254
-#, fuzzy
-msgid "This command creates a new party called <name>."
-msgstr "这些命令创建一个被称为<帮会名>的新帮会。"
-
-#: src/commandhandler.cpp:258
-msgid "Command: /party <nick>"
-msgstr "命令：/party <昵称>"
-
-#: src/commandhandler.cpp:259 src/net/ea/gui/partytab.cpp:74
-msgid "This command invites <nick> to party with you."
-msgstr "该命令邀请<昵称>和你聚会。"
-
-#: src/commandhandler.cpp:265
-msgid "Command: /present"
-msgstr "命令： /present"
-
-#: src/commandhandler.cpp:266
-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:510
+msgid "Message closes chat."
+msgstr "讯息关闭聊天。"
 
-#: src/commandhandler.cpp:272
-msgid "Command: /record <filename>"
-msgstr "命令： /record <文件名>"
+#: src/commandhandler.cpp:521
+msgid "Return now toggles chat."
+msgstr "<回车>键现在切换聊天。"
 
-#: src/commandhandler.cpp:273
-msgid "This command starts recording the chat log to the file <filename>."
-msgstr "该命令开始记录聊天日志至文件<文件名>。"
+#: src/commandhandler.cpp:527
+msgid "Message now closes chat."
+msgstr "讯息现在关闭聊天。"
 
-#: src/commandhandler.cpp:275
-msgid "Command: /record"
-msgstr "命令: /record"
+#: src/commandhandler.cpp:555
+msgid "friend"
+msgstr ""
 
-#: src/commandhandler.cpp:276
-msgid "This command finishes a recording session."
-msgstr "此命令结束将此会话记录"
+#: src/commandhandler.cpp:560
+msgid "disregarded"
+msgstr "无视"
 
-#: src/commandhandler.cpp:280
-msgid "Command: /toggle <state>"
-msgstr "命令: /toggle <状态>"
+#: src/commandhandler.cpp:565
+msgid "neutral"
+msgstr "中性"
 
-#: src/commandhandler.cpp:281
-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:584
+#, c-format
+msgid "Player already %s!"
+msgstr "玩家已经%s!"
 
-#: src/commandhandler.cpp:283
-msgid ""
-"<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:598
+#, c-format
+msgid "Player successfully %s!"
+msgstr "玩家成功%s!"
 
-#: src/commandhandler.cpp:286
-msgid "Command: /toggle"
-msgstr "命令: /toggle"
+#: src/commandhandler.cpp:606
+#, c-format
+msgid "Player could not be %s!"
+msgstr ""
 
-#: src/commandhandler.cpp:287
-msgid "This command displays the return toggle status."
-msgstr "该命令显示<回车>键切换状态"
+#: src/commandhandler.cpp:628
+msgid "Player wasn't ignored!"
+msgstr "是不能忽视的！"
 
-#: src/commandhandler.cpp:291 src/gui/widgets/whispertab.cpp:93
-#, fuzzy
-msgid "Command: /unignore <player>"
-msgstr "命令：/item <策略>"
+#: src/commandhandler.cpp:635
+msgid "Player no longer ignored!"
+msgstr "玩家不再被忽略！"
 
-#: src/commandhandler.cpp:292
-msgid "This command stops ignoring the given player if they are being ignored"
+#: src/commandhandler.cpp:637
+msgid "Player could not be unignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:297
-msgid "Command: /where"
-msgstr "命令: /where"
+#: src/commandhandler.cpp:654
+msgid "Player already erased!"
+msgstr ""
 
-#: src/commandhandler.cpp:298
-msgid "This command displays the name of the current map."
-msgstr "该条命令显示当前地图名。"
+#: src/commandhandler.cpp:665
+msgid "Player successfully erased!"
+msgstr ""
 
-#: src/commandhandler.cpp:302
-msgid "Command: /who"
-msgstr "命令： /who"
+#: src/commandhandler.cpp:667
+msgid "Player could not be erased!"
+msgstr ""
 
-#: src/commandhandler.cpp:303
-msgid "This command displays the number of players currently online."
-msgstr "该条命令可显现当前在线用户总数。"
+#: src/commandhandler.cpp:960 src/commandhandler.cpp:1006
+#, c-format
+msgid "Client uptime: %s"
+msgstr ""
 
-#: src/commandhandler.cpp:309
-msgid "Type /help for a list of commands."
-msgstr "输入 /help 获取命令列表。"
+#: src/commandhandler.cpp:970
+#, c-format
+msgid "%d week"
+msgid_plural "%d weeks"
+msgstr[0] ""
 
-#: src/commandhandler.cpp:375
-msgid "Cannot send empty whispers!"
-msgstr "无法发送空白密语！"
+#: src/commandhandler.cpp:979
+#, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] ""
 
-#: src/commandhandler.cpp:383
+#: src/commandhandler.cpp:987
 #, c-format
-msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
-"you."
-msgstr "无法同 \"%s\" 建立一个私人谈话标签页！或者已经存在，或者那就是自己。"
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] ""
 
-#: src/commandhandler.cpp:397
+#: src/commandhandler.cpp:995
 #, c-format
-msgid "Requesting to join channel %s."
-msgstr "请求加入频道%s。"
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] ""
 
-#: src/commandhandler.cpp:410 src/net/ea/gui/partytab.cpp:109
-msgid "Party name is missing."
-msgstr "帮会名称缺失。"
+#: src/commandhandler.cpp:1003
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] ""
 
-#: src/commandhandler.cpp:423 src/commandhandler.cpp:471
-#: src/commandhandler.cpp:493
-msgid "Please specify a name."
+#: src/commandhandler.cpp:1082
+msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:441
-msgid "Return toggles chat."
+#: src/commandhandler.cpp:1094
+msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:441
-msgid "Message closes chat."
-msgstr "讯息关闭聊天。"
-
-#: src/commandhandler.cpp:450
-msgid "Return now toggles chat."
-msgstr "<回车>键现在切换聊天。"
-
-#: src/commandhandler.cpp:454
-msgid "Message now closes chat."
-msgstr "讯息现在关闭聊天。"
-
-#: src/commandhandler.cpp:477
-msgid "Player already ignored!"
+#: src/commandhandler.cpp:1098
+msgid "Created:"
 msgstr ""
 
-#: src/commandhandler.cpp:484
-#, fuzzy
-msgid "Player successfully ignored!"
-msgstr "帮会创建成功。"
-
-#: src/commandhandler.cpp:486
-#, fuzzy
-msgid "Player could not be ignored!"
-msgstr "密语无法发送，你已被用户忽略。"
-
-#: src/commandhandler.cpp:501
-msgid "Player wasn't ignored!"
+#: src/commandhandler.cpp:1100
+msgid "Deleted:"
 msgstr ""
 
-#: src/commandhandler.cpp:506
-msgid "Player no longer ignored!"
+#: src/commandhandler.cpp:1147 src/commandhandler.cpp:1154
+msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:508
-#, fuzzy
-msgid "Player could not be unignored!"
-msgstr "密语无法发送，你已被用户忽略。"
+#: src/commandhandler.cpp:1149 src/commandhandler.cpp:1156
+msgid "Resource orphaned images:"
+msgstr ""
 
-#: src/commandhandler.h:31
+#: src/commandhandler.h:40
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr "/%s的选项是\"yes\"，\"no\"，\"true\"，\"false\"，\"1\"，\"0\"。"
 
-#: src/game.cpp:172
+#: src/game.cpp:246 src/gui/widgets/chattab.cpp:410
 msgid "General"
 msgstr "常规"
 
-#: src/game.cpp:326
-#, fuzzy
+#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
+msgid "Debug"
+msgstr ""
+
+#: src/game.cpp:475
 msgid "Screenshot saved as "
-msgstr "屏幕快照保存至 ~/"
+msgstr "截图保存为"
 
-#: src/game.cpp:331
+#: src/game.cpp:483
 msgid "Saving screenshot failed!"
 msgstr "保存屏幕快照失败！"
 
-#: src/game.cpp:355
-#, fuzzy
+#: src/game.cpp:523
 msgid "The connection to the server was lost."
-msgstr "与服务器连接丢失,程序将会退出."
+msgstr "服务器的连接丢失。"
 
-#: src/game.cpp:360
+#: src/game.cpp:537
 msgid "Network Error"
 msgstr "网络错误"
 
-#: src/game.cpp:705
+#: src/game.cpp:1184
 msgid "Ignoring incoming trade requests"
 msgstr "忽略新进的交易请求"
 
-#: src/game.cpp:712
+#: src/game.cpp:1191
 msgid "Accepting incoming trade requests"
 msgstr "接受传入的交易请求"
 
-#: src/game.cpp:946
-#, fuzzy
+#: src/game.cpp:1576
 msgid "Could Not Load Map"
-msgstr "无法加载地图"
+msgstr "不能加载地图"
 
-#: src/game.cpp:947
+#: src/game.cpp:1577
 #, c-format
 msgid "Error while loading %s"
 msgstr "加载%s时出现错误"
 
-#: src/gui/beingpopup.cpp:75
-#, fuzzy, c-format
+#: src/gui/beingpopup.cpp:118
+#, c-format
 msgid "Party: %s"
-msgstr "帮会（%s）"
+msgstr ""
 
-#: src/gui/buy.cpp:49 src/gui/buy.cpp:78 src/gui/buysell.cpp:47
+#: src/gui/beingpopup.cpp:132
+#, c-format
+msgid "Guild: %s"
+msgstr ""
+
+#: src/gui/beingpopup.cpp:145
+#, c-format
+msgid "Pvp rank: %d"
+msgstr ""
+
+#: src/gui/beingpopup.cpp:156
+#, c-format
+msgid "Comment: %s"
+msgstr ""
+
+#: src/gui/botcheckerwindow.cpp:265
+msgid "Bot Checker"
+msgstr "机器人检查"
+
+#: src/gui/botcheckerwindow.cpp:295 src/gui/setup_players.cpp:64
+msgid "Name"
+msgstr "姓名"
+
+#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:130
+#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:604
+#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
+msgid "Attack"
+msgstr "攻击"
+
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:275
+#: src/keyboardconfig.cpp:62
+msgid "Talk"
+msgstr "说话"
+
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:241
+#: src/gui/popupmenu.cpp:280 src/gui/popupmenu.cpp:661
+msgid "Move"
+msgstr "移动"
+
+#: src/gui/botcheckerwindow.cpp:299
+msgid "Result"
+msgstr "结果"
+
+#: src/gui/botcheckerwindow.cpp:309 src/gui/npcdialog.cpp:123
+msgid "Reset"
+msgstr "重置"
+
+#: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
+#: src/gui/popupmenu.cpp:277 src/gui/popupmenu.cpp:675
 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/buydialog.cpp:88 src/gui/buydialog.cpp:302
+#: src/gui/selldialog.cpp:87 src/gui/selldialog.cpp:324
 #, 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/buydialog.cpp:93 src/gui/itemamountwindow.cpp:207
+#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:113
+#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:940
 msgid "+"
-msgstr ""
+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/buydialog.cpp:96 src/gui/itemamountwindow.cpp:206
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:114
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:952
 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/buydialog.cpp:98 src/gui/quitdialog.cpp:49
+#: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
+#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:285
+#: src/keyboardconfig.cpp:290
 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/buydialog.cpp:99 src/gui/selldialog.cpp:94
+#: src/gui/statuswindow.cpp:490 src/gui/statuswindow.cpp:539
+#: src/gui/statuswindow.cpp:939 src/gui/statuswindow.cpp:970
 msgid "Max"
 msgstr "最大"
 
-#: src/gui/buysell.cpp:38
+#: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
+#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:134
 msgid "Shop"
 msgstr "商店"
 
-#: src/gui/buysell.cpp:47 src/gui/sell.cpp:49 src/gui/sell.cpp:76
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:258
+#: src/gui/popupmenu.cpp:278 src/gui/popupmenu.cpp:677
+#: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
+#: src/gui/selldialog.cpp:92
 msgid "Sell"
 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/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/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
+#: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
+#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
+#: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:330
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:453
+#: src/gui/popupmenu.cpp:480 src/gui/popupmenu.cpp:499
+#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:532
+#: src/gui/popupmenu.cpp:736 src/gui/popupmenu.cpp:760
+#: src/gui/popupmenu.cpp:1647 src/gui/popupmenu.cpp:1675
+#: src/gui/popupmenu.cpp:1731 src/gui/popupmenu.cpp:1774
+#: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1849
+#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1935
+#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:68
+#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:237
+#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
+#: src/gui/updatewindow.cpp:157
 msgid "Cancel"
 msgstr "取消"
 
-#: src/gui/changeemaildialog.cpp:45 src/gui/changeemaildialog.cpp:54
+#: src/gui/changeemaildialog.cpp:48 src/gui/changeemaildialog.cpp:57
 msgid "Change Email Address"
 msgstr "更换Email地址"
 
-#: src/gui/changeemaildialog.cpp:49 src/gui/changepassworddialog.cpp:52
+#: src/gui/changeemaildialog.cpp:52 src/gui/changepassworddialog.cpp:55
 #, c-format
 msgid "Account: %s"
 msgstr "帐号：%s"
 
-#: src/gui/changeemaildialog.cpp:51
-#, fuzzy
+#: src/gui/changeemaildialog.cpp:54
 msgid "Type new email address twice:"
-msgstr "输入新Email地址两次:"
+msgstr "两次新的电子邮件地址："
 
-#: src/gui/changeemaildialog.cpp:127
-#, fuzzy, c-format
+#: src/gui/changeemaildialog.cpp:132
+#, c-format
 msgid "The new email address needs to be at least %d characters long."
-msgstr "用户名至少需要%d个字符。"
+msgstr "新的电子邮件地址，需要至少%d个字符长。"
 
-#: src/gui/changeemaildialog.cpp:134
-#, fuzzy, c-format
+#: src/gui/changeemaildialog.cpp:139
+#, c-format
 msgid "The new email address needs to be less than %d characters long."
-msgstr "用户名不能少于%d个字符"
+msgstr "新的电子邮件地址必须小于%d个字符长。"
 
-#: src/gui/changeemaildialog.cpp:141
-#, fuzzy
+#: src/gui/changeemaildialog.cpp:146
 msgid "The email address entries mismatch."
-msgstr "新电子邮件地址已经存在。"
+msgstr "电子邮件地址不匹配。"
 
-#: src/gui/changepassworddialog.cpp:47 src/gui/changepassworddialog.cpp:56
-#: src/gui/charselectdialog.cpp:128
+#: src/gui/changepassworddialog.cpp:50 src/gui/changepassworddialog.cpp:59
+#: src/gui/charselectdialog.cpp:140
 msgid "Change Password"
 msgstr "更换密码"
 
-#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:53
-#: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
+#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:95
+#: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56
 msgid "Password:"
 msgstr "密码："
 
-#: src/gui/changepassworddialog.cpp:63
-#, fuzzy
+#: src/gui/changepassworddialog.cpp:66
 msgid "Type new password twice:"
-msgstr "输入新密码两次:"
+msgstr "输入两次新密码："
 
-#: src/gui/changepassworddialog.cpp:110
+#: src/gui/changepassworddialog.cpp:114
 msgid "Enter the old password first."
-msgstr ""
+msgstr "先输入旧密码。"
 
-#: src/gui/changepassworddialog.cpp:116
-#, fuzzy, c-format
+#: src/gui/changepassworddialog.cpp:120
+#, c-format
 msgid "The new password needs to be at least %d characters long."
-msgstr "密码需要至少%d个字符"
+msgstr ""
 
-#: src/gui/changepassworddialog.cpp:123
-#, fuzzy, c-format
+#: src/gui/changepassworddialog.cpp:127
+#, c-format
 msgid "The new password needs to be less than %d characters long."
-msgstr "密码不能少于%d个字符。"
+msgstr ""
 
-#: src/gui/changepassworddialog.cpp:130
+#: src/gui/changepassworddialog.cpp:134
 msgid "The new password entries mismatch."
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:53
+#: src/gui/charcreatedialog.cpp:58
 msgid "Create Character"
 msgstr "创建角色"
 
-#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:52
-#: src/gui/register.cpp:67
+#: src/gui/charcreatedialog.cpp:73 src/gui/logindialog.cpp:94
+#: src/gui/register.cpp:75
 msgid "Name:"
 msgstr "姓名"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
-#: src/gui/outfitwindow.cpp:67
+#: src/gui/charcreatedialog.cpp:76 src/gui/charcreatedialog.cpp:81
+#: src/gui/charcreatedialog.cpp:87 src/gui/outfitwindow.cpp:81
 msgid ">"
-msgstr ""
+msgstr ">"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
-#: src/gui/outfitwindow.cpp:66
+#: src/gui/charcreatedialog.cpp:79 src/gui/charcreatedialog.cpp:82
+#: src/gui/charcreatedialog.cpp:88 src/gui/outfitwindow.cpp:80
 msgid "<"
-msgstr ""
+msgstr "<"
 
-#: src/gui/charcreatedialog.cpp:74
-#, fuzzy
+#: src/gui/charcreatedialog.cpp:80
 msgid "Hair color:"
-msgstr "发色："
+msgstr "头发颜色："
 
-#: src/gui/charcreatedialog.cpp:77
-#, fuzzy
+#: src/gui/charcreatedialog.cpp:83
 msgid "Hair style:"
 msgstr "发型："
 
-#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:397
-#: src/gui/socialwindow.cpp:296
+#: src/gui/charcreatedialog.cpp:89
+msgid "Race:"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:92 src/gui/charselectdialog.cpp:479
+#: src/gui/socialwindow.cpp:1033
 msgid "Create"
 msgstr "建立"
 
-#: src/gui/charcreatedialog.cpp:80 src/gui/register.cpp:90
+#: src/gui/charcreatedialog.cpp:94 src/gui/register.cpp:98
 msgid "Male"
 msgstr "帅哥"
 
-#: src/gui/charcreatedialog.cpp:81 src/gui/register.cpp:91
+#: src/gui/charcreatedialog.cpp:95 src/gui/register.cpp:99
 msgid "Female"
 msgstr "美女"
 
-#: src/gui/charcreatedialog.cpp:99 src/gui/charcreatedialog.cpp:251
+#: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:300
 #, c-format
 msgid "Please distribute %d points"
 msgstr "请分发%d点数"
 
-#: src/gui/charcreatedialog.cpp:178
+#: src/gui/charcreatedialog.cpp:219
 msgid "Your name needs to be at least 4 characters."
 msgstr "你的名字需要至少4个字符"
 
-#: src/gui/charcreatedialog.cpp:242
+#: src/gui/charcreatedialog.cpp:291
 msgid "Character stats OK"
 msgstr "角色状态可以"
 
-#: src/gui/charcreatedialog.cpp:256
+#: src/gui/charcreatedialog.cpp:305
 #, c-format
 msgid "Please remove %d points"
 msgstr "请删除%d点数"
 
-#: src/gui/charselectdialog.cpp:69
+#: src/gui/charselectdialog.cpp:77
 msgid "Confirm Character Delete"
 msgstr "确认删除角色"
 
-#: src/gui/charselectdialog.cpp:70
+#: src/gui/charselectdialog.cpp:78
 msgid "Are you sure you want to delete this character?"
 msgstr "你确定想删除这个角色？"
 
-#: src/gui/charselectdialog.cpp:117
+#: src/gui/charselectdialog.cpp:126
 msgid "Account and Character Management"
 msgstr "帐号和角色管理"
 
-#: src/gui/charselectdialog.cpp:127
+#: src/gui/charselectdialog.cpp:139
 msgid "Switch Login"
-msgstr ""
+msgstr "q登录"
 
-#: src/gui/charselectdialog.cpp:141 src/gui/unregisterdialog.cpp:47
-#: src/gui/unregisterdialog.cpp:55
+#: src/gui/charselectdialog.cpp:153 src/gui/unregisterdialog.cpp:50
+#: src/gui/unregisterdialog.cpp:58
 msgid "Unregister"
 msgstr "注销"
 
-#: src/gui/charselectdialog.cpp:150
-#, fuzzy
+#: src/gui/charselectdialog.cpp:162
 msgid "Change Email"
-msgstr "更换Email地址"
+msgstr ""
+
+#: src/gui/charselectdialog.cpp:254
+msgid "Incorrect password"
+msgstr ""
 
-#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:185
-#: src/gui/setup_players.cpp:230
+#: src/gui/charselectdialog.cpp:287
+msgid "Enter password for deleting character"
+msgstr ""
+
+#: src/gui/charselectdialog.cpp:287
+msgid "Enter password:"
+msgstr ""
+
+#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
+#: src/gui/setup_players.cpp:251 src/gui/shopwindow.cpp:120
+#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:240
 msgid "Delete"
 msgstr "删除"
 
-#: src/gui/charselectdialog.cpp:387
-#, fuzzy
+#: src/gui/charselectdialog.cpp:467
 msgid "Choose"
-msgstr "关闭"
+msgstr "选择"
+
+#: src/gui/charselectdialog.cpp:470
+#, c-format
+msgid "Level %d"
+msgstr ""
 
-#: src/gui/charselectdialog.cpp:399 src/gui/charselectdialog.cpp:400
+#: src/gui/charselectdialog.cpp:481 src/gui/charselectdialog.cpp:482
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:77 src/gui/palette.cpp:96
+#: src/gui/chatwindow.cpp:112
+msgid "default"
+msgstr "默认"
+
+#: src/gui/chatwindow.cpp:113
+msgid "black"
+msgstr "黑色"
+
+#: src/gui/chatwindow.cpp:114
+msgid "red"
+msgstr "红色"
+
+#: src/gui/chatwindow.cpp:115
+msgid "green"
+msgstr "绿色"
+
+#: src/gui/chatwindow.cpp:116
+msgid "blue"
+msgstr "蓝色"
+
+#: src/gui/chatwindow.cpp:117
+msgid "gold"
+msgstr "金"
+
+#: src/gui/chatwindow.cpp:118
+msgid "yellow"
+msgstr "黄色"
+
+#: src/gui/chatwindow.cpp:119
+msgid "pink"
+msgstr "粉红色"
+
+#: src/gui/chatwindow.cpp:120
+msgid "purple"
+msgstr "紫"
+
+#: src/gui/chatwindow.cpp:121
+msgid "grey"
+msgstr "灰色"
+
+#: src/gui/chatwindow.cpp:122
+msgid "brown"
+msgstr "棕色"
+
+#: src/gui/chatwindow.cpp:123
+msgid "rainbow 1"
+msgstr "彩虹1"
+
+#: src/gui/chatwindow.cpp:124
+msgid "rainbow 2"
+msgstr "彩虹2"
+
+#: src/gui/chatwindow.cpp:125
+msgid "rainbow 3"
+msgstr "彩虹3"
+
+#: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
+#: src/gui/logindialog.cpp:78 src/gui/setup_players.cpp:220
+#: src/gui/setup_theme.cpp:71 src/gui/setup_theme.cpp:125
+#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:101
+#: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:159
+msgid "???"
+msgstr "？？？"
+
+#: src/gui/chatwindow.cpp:152 src/gui/setup_chat.cpp:48
 msgid "Chat"
 msgstr "聊天"
 
-#: src/gui/chat.cpp:287
-#, fuzzy, c-format
+#: src/gui/chatwindow.cpp:605
+#, c-format
 msgid "Present: %s; %d players are present."
-msgstr "%d 玩家出席。"
-
-#: src/gui/chat.cpp:305
-msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:469
+#: src/gui/chatwindow.cpp:988
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "对%s密语到：%s"
 
-#: src/gui/confirmdialog.cpp:42
+#: src/gui/confirmdialog.cpp:47
 msgid "Yes"
 msgstr "是"
 
-#: src/gui/confirmdialog.cpp:43
+#: src/gui/confirmdialog.cpp:48
 msgid "No"
 msgstr "否"
 
-#: src/gui/debugwindow.cpp:43
-msgid "Debug"
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
+#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:377
+#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:619
+#: src/gui/popupmenu.cpp:627
+msgid "Ignore"
+msgstr "忽略"
+
+#: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
+#: src/gui/setup_other.cpp:65
+msgid "Map"
+msgstr "地图"
+
+#: src/gui/debugwindow.cpp:71
+msgid "Target"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:72
+msgid "Net"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:145 src/gui/debugwindow.cpp:220
+#: src/gui/debugwindow.cpp:249
+msgid "Music:"
+msgstr "音乐："
+
+#: src/gui/debugwindow.cpp:146 src/gui/debugwindow.cpp:224
+#: src/gui/debugwindow.cpp:251
+msgid "Map:"
+msgstr "地图："
+
+#: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
+#: src/gui/debugwindow.cpp:250
+msgid "Minimap:"
+msgstr "小地图："
+
+#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:218
+#: src/gui/debugwindow.cpp:247
+msgid "Cursor:"
+msgstr "光标："
+
+#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:201
+#: src/gui/debugwindow.cpp:206
+msgid "Player Position:"
+msgstr "的位置："
+
+#: src/gui/debugwindow.cpp:152
+msgid "Particle count:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:56
+#: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:235
+#: src/gui/debugwindow.cpp:254
+msgid "Map actors count:"
+msgstr "地图演员数："
+
+#: src/gui/debugwindow.cpp:162 src/gui/debugwindow.cpp:173
 #, c-format
-msgid "%d FPS (OpenGL)"
+msgid "%d FPS (Software)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:61 src/gui/debugwindow.cpp:64
+#: src/gui/debugwindow.cpp:166
+#, c-format
+msgid "%d FPS (fast OpenGL)"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:169
+#, c-format
+msgid "%d FPS (old OpenGL)"
+msgstr "%d FPS (旧的OpenGL)"
+
+#: src/gui/debugwindow.cpp:176
 #, c-format
 msgid "%d FPS"
+msgstr "%d的FPS"
+
+#: src/gui/debugwindow.cpp:188 src/gui/debugwindow.cpp:240
+msgid "Textures count:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:65 src/gui/debugwindow.cpp:104
-#, fuzzy, c-format
-msgid "Music: %s"
-msgstr "主题：%s"
+#: src/gui/debugwindow.cpp:231
+#, c-format
+msgid "Particle count: %d"
+msgstr "粒子数：%d个"
+
+#: src/gui/debugwindow.cpp:268 src/gui/debugwindow.cpp:299
+#: src/gui/debugwindow.cpp:343
+msgid "Target:"
+msgstr "目标："
+
+#: src/gui/debugwindow.cpp:269 src/gui/debugwindow.cpp:304
+#: src/gui/debugwindow.cpp:344
+msgid "Target Id:"
+msgstr "目标ID："
+
+#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:308
+#: src/gui/debugwindow.cpp:313 src/gui/debugwindow.cpp:345
+msgid "Target Level:"
+msgstr "目标水平："
+
+#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:316
+#: src/gui/debugwindow.cpp:346
+msgid "Target Party:"
+msgstr ""
 
-#: src/gui/debugwindow.cpp:66 src/gui/debugwindow.cpp:108
-#, fuzzy, c-format
-msgid "Map: %s"
-msgstr "姓名：%s"
+#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:319
+#: src/gui/debugwindow.cpp:347
+msgid "Target Guild:"
+msgstr ""
 
-#: src/gui/debugwindow.cpp:67 src/gui/debugwindow.cpp:106
-#, fuzzy, c-format
-msgid "Minimap: %s"
-msgstr "小地图"
+#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:333
+#: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:348
+msgid "Attack delay:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:323
+#: src/gui/debugwindow.cpp:349
+msgid "Minimal hit:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:325
+#: src/gui/debugwindow.cpp:350
+msgid "Maximum hit:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:327
+#: src/gui/debugwindow.cpp:351
+msgid "Critical hit:"
+msgstr ""
 
-#: src/gui/debugwindow.cpp:68 src/gui/debugwindow.cpp:99
+#: src/gui/debugwindow.cpp:385 src/gui/debugwindow.cpp:390
 #, c-format
-msgid "Cursor: (%d, %d)"
+msgid "Ping: %s ms"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:69 src/gui/debugwindow.cpp:111
-#, fuzzy, c-format
-msgid "Particle count: %d"
-msgstr "粒子效果"
+#: src/gui/debugwindow.cpp:393
+#, c-format
+msgid "In: %d bytes/s"
+msgstr ""
 
-#: src/gui/debugwindow.cpp:116
-#, fuzzy, c-format
-msgid "Particle detail: %s"
-msgstr "纹理细节"
+#: src/gui/debugwindow.cpp:395
+#, c-format
+msgid "Out: %d bytes/s"
+msgstr ""
 
-#: src/gui/debugwindow.cpp:121
-#, fuzzy, c-format
-msgid "Ambient FX: %s"
-msgstr "环境音效"
+#: src/gui/didyouknowwindow.cpp:47
+msgid "Did You Know?"
+msgstr ""
+
+#: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
+#: src/gui/inventorywindow.cpp:175 src/gui/npcdialog.cpp:53
+#: src/gui/popupmenu.cpp:547 src/gui/shopwindow.cpp:111
+msgid "Close"
+msgstr "关闭"
+
+#: src/gui/didyouknowwindow.cpp:62
+msgid "< Previous"
+msgstr ""
+
+#: src/gui/didyouknowwindow.cpp:63
+msgid "Next >"
+msgstr ""
+
+#: src/gui/didyouknowwindow.cpp:64
+msgid "Auto open this window"
+msgstr ""
 
-#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:56
+#: src/gui/editdialog.cpp:46 src/gui/itemamountwindow.cpp:208
+#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
+msgid "OK"
+msgstr "确定"
+
+#: src/gui/equipmentwindow.cpp:78 src/gui/windowmenu.cpp:74
 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:103 src/gui/inventorywindow.cpp:130
+#: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
+#: src/gui/popupmenu.cpp:1606 src/gui/popupmenu.cpp:1701
+#: src/gui/popupmenu.cpp:1746
 msgid "Unequip"
 msgstr "卸下装备"
 
-#: src/gui/help.cpp:36
+#: src/gui/helpwindow.cpp:43
 msgid "Help"
 msgstr "帮助"
 
-#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:73
-msgid "Close"
-msgstr "关闭"
-
-#: src/gui/inventorywindow.cpp:56 src/gui/windowmenu.cpp:57
+#: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76
+#: src/inventory.cpp:246
 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:104
+msgid "Slots:"
+msgstr "槽："
+
+#: src/gui/inventorywindow.cpp:115
+msgid "Filter:"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:116
+msgid "Sort:"
+msgstr "排序："
+
+#: src/gui/inventorywindow.cpp:122
+msgid "na"
+msgstr "na"
+
+#: src/gui/inventorywindow.cpp:123
+msgid "az"
+msgstr "az"
+
+#: src/gui/inventorywindow.cpp:124
+msgid "id"
+msgstr "id"
+
+#: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:513
+#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1608
+#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1748
 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:129 src/gui/inventorywindow.cpp:514
+#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1611
+#: src/gui/popupmenu.cpp:1670 src/gui/popupmenu.cpp:1707
+#: src/gui/popupmenu.cpp:1751
 msgid "Use"
 msgstr "使用"
 
-#: src/gui/inventorywindow.cpp:83 src/gui/inventorywindow.cpp:308
-#: src/gui/popupmenu.cpp:380
-#, fuzzy
+#: src/gui/inventorywindow.cpp:143 src/gui/inventorywindow.cpp:619
+#: src/gui/popupmenu.cpp:1615 src/gui/popupmenu.cpp:1712
+#: src/gui/popupmenu.cpp:1755
 msgid "Drop..."
-msgstr "丢弃"
+msgstr "掉落... ..."
 
-#: src/gui/inventorywindow.cpp:84 src/gui/popupmenu.cpp:386
+#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1624
+#: src/gui/popupmenu.cpp:1721 src/gui/popupmenu.cpp:1764
 msgid "Split"
 msgstr "分离"
 
-#: src/gui/inventorywindow.cpp:85 src/gui/outfitwindow.cpp:51
+#: src/gui/inventorywindow.cpp:145 src/gui/outfitwindow.cpp:59
+#: src/gui/popupmenu.cpp:508
 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:148
 msgid "Weight:"
 msgstr "重量："
 
-#: src/gui/inventorywindow.cpp:310 src/gui/popupmenu.cpp:382
+#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
+#: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1724
+#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:69
+msgid "Store"
+msgstr "存储"
+
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1631
+msgid "Retrieve"
+msgstr "取回"
+
+#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1620
+#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1760
+#: src/gui/windowmenu.cpp:97
 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
-msgid "OK"
-msgstr "确定"
-
-#: src/gui/itemamount.cpp:102
+#: src/gui/itemamountwindow.cpp:210
 msgid "All"
 msgstr "全部"
 
-#: src/gui/itemamount.cpp:128
+#: src/gui/itemamountwindow.cpp:261
 msgid "Select amount of items to trade."
 msgstr "请选择交易的物品数量。"
 
-#: src/gui/itemamount.cpp:131
+#: src/gui/itemamountwindow.cpp:264
 msgid "Select amount of items to drop."
 msgstr "请选择丢弃的物品数量。"
 
-#: src/gui/itemamount.cpp:134
+#: src/gui/itemamountwindow.cpp:267
 msgid "Select amount of items to store."
 msgstr "请选择存储的物品数量。"
 
-#: src/gui/itemamount.cpp:137
+#: src/gui/itemamountwindow.cpp:270
 msgid "Select amount of items to retrieve."
 msgstr "请选择取回的物品数量。"
 
-#: src/gui/itemamount.cpp:140
+#: src/gui/itemamountwindow.cpp:273
 msgid "Select amount of items to split."
 msgstr "请选择你分离的物品的数量"
 
-#: src/gui/itempopup.cpp:92
-#, fuzzy, c-format
+#: src/gui/itemamountwindow.cpp:276
+msgid "Add to buy shop."
+msgstr ""
+
+#: src/gui/itemamountwindow.cpp:279
+msgid "Add to sell shop."
+msgstr ""
+
+#: src/gui/itemamountwindow.cpp:282
+msgid "Unknown."
+msgstr "未知。"
+
+#: src/gui/itempopup.cpp:176 src/gui/itempopup.cpp:182
+msgid ", "
+msgstr ""
+
+#: src/gui/itempopup.cpp:192
+#, c-format
 msgid "Weight: %s"
-msgstr "重量： "
+msgstr "重量：%s"
+
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
+msgid "Kill stats"
+msgstr "杀敌统计"
+
+#: src/gui/killstats.cpp:63
+msgid "Reset stats"
+msgstr ""
+
+#: src/gui/killstats.cpp:64
+msgid "Reset timer"
+msgstr "复位定时器"
+
+#: src/gui/killstats.cpp:68 src/gui/killstats.cpp:204
+#, c-format
+msgid "Level: %d at %f%%"
+msgstr ""
+
+#: src/gui/killstats.cpp:72 src/gui/killstats.cpp:209
+#, c-format
+msgid "Exp: %d/%d Left: %d"
+msgstr ""
+
+#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:215
+#: src/gui/killstats.cpp:224
+#, c-format
+msgid "1%% = %d exp, avg mob for 1%%: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:141
+#: src/gui/killstats.cpp:233
+#, c-format
+msgid "Kills: %s, total exp: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:80 src/gui/killstats.cpp:143
+#: src/gui/killstats.cpp:219 src/gui/killstats.cpp:229
+#, c-format
+msgid "Avg Exp: %s, No. of avg mob to next level: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:161
+#: src/gui/killstats.cpp:236
+#, c-format
+msgid "Kills/Min: %s, Exp/Min: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:88 src/gui/killstats.cpp:93
+#: src/gui/killstats.cpp:288 src/gui/killstats.cpp:304
+#: src/gui/killstats.cpp:322
+#, c-format
+msgid "Exp speed per %d min: %s"
+msgid_plural "Exp speed per %d min: %s"
+msgstr[0] ""
+
+#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
+#, c-format
+msgid "Time for next level per %d min: %s"
+msgid_plural "Time for next level per %d min: %s"
+msgstr[0] ""
+
+#: src/gui/killstats.cpp:99 src/gui/killstats.cpp:240
+msgid "Last kill exp:"
+msgstr ""
+
+#: src/gui/killstats.cpp:101 src/gui/killstats.cpp:354
+#: src/gui/killstats.cpp:360 src/gui/killstats.cpp:366
+#: src/gui/killstats.cpp:371
+msgid "Time before jacko spawn:"
+msgstr ""
+
+#: src/gui/killstats.cpp:293 src/gui/killstats.cpp:300
+#: src/gui/killstats.cpp:310 src/gui/killstats.cpp:317
+#: src/gui/killstats.cpp:329 src/gui/killstats.cpp:336
+#, c-format
+msgid "  Time for next level: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:360
+#, c-format
+msgid "%s %d?"
+msgstr ""
 
-#: src/gui/login.cpp:49 src/gui/login.cpp:61
+#: src/gui/killstats.cpp:366
+msgid "jacko spawning"
+msgstr ""
+
+#: src/gui/logindialog.cpp:59
+msgid "Normal"
+msgstr "正常"
+
+#: src/gui/logindialog.cpp:60
+msgid "Auto Close"
+msgstr "自动关闭"
+
+#: src/gui/logindialog.cpp:61
+msgid "Skip"
+msgstr "跳过"
+
+#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:123
 msgid "Login"
 msgstr "登录"
 
-#: src/gui/login.cpp:58
-#, fuzzy
+#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:243
+#: src/gui/widgets/chattab.cpp:173
+msgid "Server:"
+msgstr "服务器："
+
+#: src/gui/logindialog.cpp:96
+msgid "Custom update host"
+msgstr "自定义更新主机"
+
+#: src/gui/logindialog.cpp:110
 msgid "Remember username"
-msgstr "保存用户名"
+msgstr "记住用户名"
 
-#: src/gui/login.cpp:59 src/gui/register.cpp:58 src/gui/register.cpp:73
+#: src/gui/logindialog.cpp:111
+msgid "Update:"
+msgstr "更新日期："
+
+#: src/gui/logindialog.cpp:121 src/gui/register.cpp:66 src/gui/register.cpp:81
 msgid "Register"
 msgstr "注册"
 
-#: src/gui/login.cpp:60
-#, fuzzy
+#: src/gui/logindialog.cpp:122
 msgid "Change Server"
-msgstr "服务器"
+msgstr "更改服务器"
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
-msgid "Map"
-msgstr "地图"
+#: src/gui/ministatus.cpp:59
+msgid "health bar"
+msgstr ""
+
+#: src/gui/ministatus.cpp:65
+msgid "mana bar"
+msgstr ""
+
+#: src/gui/ministatus.cpp:77
+msgid "experience bar"
+msgstr ""
+
+#: src/gui/ministatus.cpp:83
+msgid "job bar"
+msgstr ""
+
+#: src/gui/ministatus.cpp:92
+msgid "weight bar"
+msgstr ""
 
-#: src/gui/npcdialog.cpp:44
+#: src/gui/ministatus.cpp:95
+msgid "inventory slots bar"
+msgstr ""
+
+#: src/gui/ministatus.cpp:98
+msgid "money bar"
+msgstr ""
+
+#: src/gui/ministatus.cpp:101
+msgid "arrows bar"
+msgstr ""
+
+#: src/gui/ministatus.cpp:104
+msgid "status bar"
+msgstr ""
+
+#: src/gui/ministatus.cpp:296 src/gui/ministatus.cpp:336
+msgid "Need"
+msgstr "需要"
+
+#: src/gui/npcdialog.cpp:51
 msgid "Waiting for server"
 msgstr "等待服务器中"
 
-#: src/gui/npcdialog.cpp:45
+#: src/gui/npcdialog.cpp:52
 msgid "Next"
 msgstr "下一个"
 
-#: src/gui/npcdialog.cpp:47
+#: src/gui/npcdialog.cpp:54
 msgid "Submit"
 msgstr "提交"
 
-#: src/gui/npcdialog.cpp:52 src/gui/npcpostdialog.cpp:41
+#: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
+#: src/gui/setup_other.cpp:143
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:110
-msgid "Reset"
-msgstr "重置"
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:549
+msgid "Clear"
+msgstr "清除"
 
-#. TRANSLATORS: Please leave the \n sequences intact.
-#: src/gui/npcdialog.cpp:171
-#, fuzzy
-msgid ""
-"\n"
-"> Next\n"
-msgstr "下一个"
+#: src/gui/npcdialog.cpp:222
+msgid "> Next"
+msgstr ""
 
-#: src/gui/npcpostdialog.cpp:47
+#: src/gui/npcpostdialog.cpp:48
 msgid "To:"
 msgstr "至："
 
-#: src/gui/npcpostdialog.cpp:54
+#: src/gui/npcpostdialog.cpp:55
 msgid "Send"
 msgstr "发送"
 
-#: src/gui/npcpostdialog.cpp:96
+#: src/gui/npcpostdialog.cpp:99
 msgid "Failed to send as sender or letter invalid."
 msgstr "发送信件失败或者信件无效。"
 
-#: src/gui/outfitwindow.cpp:68 src/gui/outfitwindow.cpp:141
-#: src/gui/outfitwindow.cpp:154
+#: src/gui/outfitwindow.cpp:82 src/gui/outfitwindow.cpp:886
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:70
-#, fuzzy
+#: src/gui/outfitwindow.cpp:84 src/gui/outfitwindow.cpp:888
+#, c-format
+msgid "Key: %s"
+msgstr ""
+
+#: src/gui/outfitwindow.cpp:87
 msgid "Unequip first"
-msgstr "卸下装备"
+msgstr ""
 
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:143
-msgid "Text"
-msgstr "文本"
+#: src/gui/outfitwindow.cpp:90
+msgid "Away outfit"
+msgstr ""
 
-#: src/gui/palette.cpp:82
-msgid "Text Shadow"
-msgstr "文本阴影"
+#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:603
+#: src/gui/widgets/tradetab.cpp:44
+msgid "Trade"
+msgstr "交易"
 
-#: src/gui/palette.cpp:83
-msgid "Text Outline"
-msgstr "文本轮廓"
+#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:368
+msgid "Whisper"
+msgstr ""
 
-#: src/gui/palette.cpp:84
-msgid "Progress Bar Labels"
-msgstr "进度条标签"
+#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:608
+msgid "Heal"
+msgstr ""
 
-#: src/gui/palette.cpp:85
-msgid "Buttons"
+#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:374
+#: src/gui/popupmenu.cpp:615
+msgid "Be friend"
 msgstr ""
 
-#: src/gui/palette.cpp:86
-msgid "Disabled Buttons"
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:153
+#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:376
+#: src/gui/popupmenu.cpp:382 src/gui/popupmenu.cpp:401
+#: src/gui/popupmenu.cpp:617 src/gui/popupmenu.cpp:625
+#: src/gui/popupmenu.cpp:649
+msgid "Disregard"
 msgstr ""
 
-#: src/gui/palette.cpp:87
-msgid "Tabs"
+#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:173
+#: src/gui/popupmenu.cpp:378 src/gui/popupmenu.cpp:384
+#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:396
+#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:628
+#: src/gui/popupmenu.cpp:636 src/gui/popupmenu.cpp:642
+msgid "Erase"
 msgstr ""
 
-#: src/gui/palette.cpp:89
-msgid "Background"
-msgstr "背景"
+#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:171
+#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:388
+#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:400
+#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
+#: src/gui/popupmenu.cpp:647
+msgid "Unignore"
+msgstr ""
 
-#: src/gui/palette.cpp:91
-msgid "Highlight"
-msgstr "突出显示"
+#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:182
+#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:635 src/gui/popupmenu.cpp:651
+#: src/playerrelations.cpp:400
+msgid "Completely ignore"
+msgstr "完全忽略"
 
-#: src/gui/palette.cpp:92
-msgid "Tab Highlight"
-msgstr "标签加亮"
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:411
+#: src/gui/popupmenu.cpp:659
+msgid "Follow"
+msgstr ""
 
-#: src/gui/palette.cpp:93
-#, fuzzy
-msgid "Item Too Expensive"
-msgstr "物品太昂贵"
+#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:412
+#: src/gui/popupmenu.cpp:660
+msgid "Imitation"
+msgstr ""
 
-#: src/gui/palette.cpp:94
-#, fuzzy
-msgid "Item Is Equipped"
-msgstr "物品已装备"
+#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:697
+msgid "Invite to party"
+msgstr ""
 
-#: src/gui/palette.cpp:97
-msgid "GM"
-msgstr "GM"
+#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:421
+#: src/gui/popupmenu.cpp:702
+msgid "Kick from party"
+msgstr ""
 
-#: src/gui/palette.cpp:98
-msgid "Player"
-msgstr "玩家"
+#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:432
+#: src/gui/popupmenu.cpp:716
+msgid "Kick from guild"
+msgstr ""
 
-#: src/gui/palette.cpp:99
-msgid "Whisper"
-msgstr "密语"
+#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:434
+#: src/gui/popupmenu.cpp:718
+msgid "Change pos in guild"
+msgstr ""
 
-#: src/gui/palette.cpp:100
-msgid "Is"
-msgstr "是"
+#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:439
+#: src/gui/popupmenu.cpp:724
+msgid "Invite to guild"
+msgstr ""
 
-#: src/gui/palette.cpp:101 src/net/ea/gui/partytab.cpp:43
-msgid "Party"
-msgstr "帮会"
+#: src/gui/popupmenu.cpp:238
+msgid "Kick player"
+msgstr ""
 
-#: src/gui/palette.cpp:102 src/net/ea/gui/guildtab.cpp:45
-msgid "Guild"
-msgstr "帮会"
+#: src/gui/popupmenu.cpp:240
+msgid "Nuke"
+msgstr ""
 
-#: src/gui/palette.cpp:103
-msgid "Server"
-msgstr "服务器"
+#: src/gui/popupmenu.cpp:243 src/gui/popupmenu.cpp:662
+msgid "Show Items"
+msgstr ""
 
-#: src/gui/palette.cpp:104
-msgid "Logger"
-msgstr "记录器"
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:663
+#: src/gui/popupmenu.cpp:1932
+msgid "Undress"
+msgstr ""
 
-#: src/gui/palette.cpp:105
-msgid "Hyperlink"
-msgstr "超链接"
+#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:665 src/gui/popupmenu.cpp:732
+msgid "Add comment"
+msgstr ""
 
-# need more contents!!!
-#: src/gui/palette.cpp:107
-msgid "Being"
-msgstr "存在"
+#: src/gui/popupmenu.cpp:264 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:682
+msgid "Buy (?)"
+msgstr ""
 
-#: src/gui/palette.cpp:108
-msgid "Other Players' Names"
-msgstr "其他玩家名"
+#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:447
+#: src/gui/popupmenu.cpp:684
+msgid "Sell (?)"
+msgstr ""
 
-#: src/gui/palette.cpp:109
-msgid "Own Name"
-msgstr "自己的名字"
+#: src/gui/popupmenu.cpp:292
+msgid "Kick"
+msgstr ""
 
-#: src/gui/palette.cpp:110
-msgid "GM Names"
-msgstr "GM名"
+#: src/gui/popupmenu.cpp:303
+msgid "Remove from attack list"
+msgstr ""
 
-#: src/gui/palette.cpp:111
-msgid "NPCs"
-msgstr "NPCs"
+#: src/gui/popupmenu.cpp:309
+msgid "Add to priority attack list"
+msgstr ""
 
-#: src/gui/palette.cpp:112
-msgid "Monsters"
-msgstr "怪物"
+#: src/gui/popupmenu.cpp:311
+msgid "Add to attack list"
+msgstr ""
 
-#: src/gui/palette.cpp:114
-msgid "Unknown Item Type"
-msgstr "未知物品类型"
+#: src/gui/popupmenu.cpp:314
+msgid "Add to ignore list"
+msgstr ""
 
-#: src/gui/palette.cpp:115
-msgid "Generics"
-msgstr "一般的"
+#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:450
+msgid "Add name to chat"
+msgstr ""
 
-#: src/gui/palette.cpp:116
-msgid "Hats"
-msgstr "帽子"
+#: src/gui/popupmenu.cpp:476
+msgid "Pick up"
+msgstr ""
 
-#: src/gui/palette.cpp:117
-msgid "Usables"
-msgstr "可用的"
+#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:1645
+#: src/gui/popupmenu.cpp:1725 src/gui/popupmenu.cpp:1768
+msgid "Add to chat"
+msgstr "加入聊天"
 
-#: src/gui/palette.cpp:118
-msgid "Shirts"
-msgstr "衬衫"
+#: src/gui/popupmenu.cpp:494
+msgid "Map Item"
+msgstr "地图项"
 
-#: src/gui/palette.cpp:119
-#, fuzzy
-msgid "One Handed Weapons"
-msgstr "单手武器"
+#: src/gui/popupmenu.cpp:495
+msgid "Rename"
+msgstr ""
 
-#: src/gui/palette.cpp:120
-msgid "Pants"
-msgstr "裤子"
+#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:1885
+#: src/gui/popupmenu.cpp:1903 src/gui/popupmenu.cpp:1908
+msgid "Remove"
+msgstr ""
 
-#: src/gui/palette.cpp:121
-msgid "Shoes"
-msgstr "鞋子"
+#: src/gui/popupmenu.cpp:510
+msgid "Load old outfits"
+msgstr ""
 
-#: src/gui/palette.cpp:122
-#, fuzzy
-msgid "Two Handed Weapons"
-msgstr "单手武器"
+#: src/gui/popupmenu.cpp:526 src/gui/windowmenu.cpp:96
+msgid "Spells"
+msgstr "法术"
 
-#: src/gui/palette.cpp:123
-msgid "Shields"
-msgstr "盾"
+#: src/gui/popupmenu.cpp:528
+msgid "Load old spells"
+msgstr ""
 
-#: src/gui/palette.cpp:124
-msgid "Rings"
-msgstr "指环"
+#: src/gui/popupmenu.cpp:529
+msgid "Edit spell"
+msgstr ""
 
-#: src/gui/palette.cpp:125
-msgid "Necklaces"
-msgstr "项链"
+#: src/gui/popupmenu.cpp:555
+msgid "Disable highlight"
+msgstr "禁用"
 
-#: src/gui/palette.cpp:126
-msgid "Arms"
-msgstr "武器"
+#: src/gui/popupmenu.cpp:560
+msgid "Enable highlight"
+msgstr "启用突出"
 
-#: src/gui/palette.cpp:127
-msgid "Ammo"
-msgstr "弹药"
+#: src/gui/popupmenu.cpp:565
+msgid "Dont remove name"
+msgstr ""
 
-#: src/gui/palette.cpp:129
-msgid "Particle Effects"
-msgstr "粒子效果"
+#: src/gui/popupmenu.cpp:570
+msgid "Remove name"
+msgstr ""
 
-#: src/gui/palette.cpp:130
-msgid "Pickup Notification"
-msgstr "拾起通知"
+#: src/gui/popupmenu.cpp:575
+msgid "Enable away"
+msgstr ""
 
-#: src/gui/palette.cpp:131
-msgid "Exp Notification"
-msgstr "到期通知"
+#: src/gui/popupmenu.cpp:580
+msgid "Disable away"
+msgstr ""
 
-#: src/gui/palette.cpp:133
-#, fuzzy
-msgid "Player Hits Monster"
-msgstr "玩家攻击怪兽"
+#: src/gui/popupmenu.cpp:586 src/gui/socialwindow.cpp:1035
+msgid "Leave"
+msgstr "留下"
 
-#: src/gui/palette.cpp:135
-#, fuzzy
-msgid "Monster Hits Player"
-msgstr "怪兽击打玩家"
+#: src/gui/popupmenu.cpp:744
+msgid "Change guild position"
+msgstr "更改公会的立场"
 
-#: src/gui/palette.cpp:136
-msgid "Critical Hit"
-msgstr "会心一击"
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1166
+msgid "Rename map sign          "
+msgstr "重命名的地图标志"
 
-#: src/gui/palette.cpp:137
-msgid "Misses"
-msgstr "失误"
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1168
+msgid "Name:                    "
+msgstr "名称："
 
-#: src/gui/palette.cpp:139
-msgid "HP Bar"
-msgstr "HP条"
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1218
+msgid "Player comment            "
+msgstr ""
 
-#: src/gui/palette.cpp:140
-msgid "3/4 HP Bar"
-msgstr "3/4 HP条"
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1220
+msgid "Comment:                      "
+msgstr ""
 
-#: src/gui/palette.cpp:141
-msgid "1/2 HP Bar"
-msgstr "1/2 HP条"
+#: src/gui/popupmenu.cpp:1570
+msgid "Add to trade"
+msgstr ""
 
-#: src/gui/palette.cpp:142
-msgid "1/4 HP Bar"
-msgstr "1/4 HP条"
+#: src/gui/popupmenu.cpp:1576
+msgid "Add to trade 10"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:84
-#, fuzzy, c-format
-msgid "Trade with %s..."
-msgstr "与%s交易中"
+#: src/gui/popupmenu.cpp:1579
+msgid "Add to trade half"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:161
-#, fuzzy, c-format
-msgid "Attack %s"
-msgstr "攻击 %+d"
+#: src/gui/popupmenu.cpp:1581
+msgid "Add to trade all"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:92
-#, fuzzy, c-format
-msgid "Whisper %s"
-msgstr "密语"
+#: src/gui/popupmenu.cpp:1593
+msgid "Store 10"
+msgstr "商店10"
 
-#: src/gui/popupmenu.cpp:101
-#, fuzzy, c-format
-msgid "Befriend %s"
-msgstr "@@friend|和%s成为朋友@@"
+#: src/gui/popupmenu.cpp:1596
+msgid "Store half"
+msgstr "商店的一半"
 
-#: src/gui/popupmenu.cpp:106
-#, fuzzy, c-format
-msgid "Disregard %s"
-msgstr "被忽视的"
+#: src/gui/popupmenu.cpp:1598
+msgid "Store all"
+msgstr "商店所有"
 
-#: src/gui/popupmenu.cpp:109
-#, fuzzy, c-format
-msgid "Ignore %s"
-msgstr "忽略"
+#: src/gui/popupmenu.cpp:1616 src/gui/popupmenu.cpp:1713
+#: src/gui/popupmenu.cpp:1756
+msgid "Drop all"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:115 src/gui/popupmenu.cpp:124
-#, c-format
-msgid "Unignore %s"
+#: src/gui/popupmenu.cpp:1637
+msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:118
-#, fuzzy, c-format
-msgid "Completely ignore %s"
-msgstr "@@ignore|完全忽略%s@@"
+#: src/gui/popupmenu.cpp:1640
+msgid "Retrieve half"
+msgstr "找回一半"
 
-#: src/gui/popupmenu.cpp:130
-#, c-format
-msgid "Follow %s"
-msgstr ""
+#: src/gui/popupmenu.cpp:1642
+msgid "Retrieve all"
+msgstr "检索所有"
 
-#: src/gui/popupmenu.cpp:133
-#, fuzzy, c-format
-msgid "Invite %s to join your guild"
-msgstr "@@guild|邀请%s加入你的工会@@"
+#: src/gui/popupmenu.cpp:1673 src/gui/popupmenu.cpp:1729
+msgid "Load old item shortcuts"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:137
-#, fuzzy, c-format
-msgid "Invite %s to join your party"
-msgstr "@@party|邀请%s加入你的帮会@@"
+#: src/gui/popupmenu.cpp:1772
+msgid "Load old drop shortcuts"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:144
-#, fuzzy
-msgid "Kick player"
-msgstr "踢出失败！"
+#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1833
+msgid "Hide"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:153
-#, fuzzy, c-format
-msgid "Talk to %s"
-msgstr "@@talk|和%s交谈@@"
+#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1839
+msgid "Show"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:166
-#, fuzzy
-msgid "Kick monster"
-msgstr "@@admin-kick|踢掉怪物@@"
+#: src/gui/popupmenu.cpp:1846
+msgid "Reset yellow bar"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:174
-#, fuzzy
-msgid "Add name to chat"
-msgstr "@@name|添加姓名至聊天@@"
+#: src/gui/popupmenu.cpp:1848
+msgid "Copy to chat"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:191
-#, fuzzy, c-format
-msgid "Pick up %s"
-msgstr "捡起"
+#: src/gui/popupmenu.cpp:1865 src/gui/socialwindow.cpp:854
+#: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
+msgid "(default)"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:400
-#, fuzzy
-msgid "Add to chat"
-msgstr "@@chat|添加到聊天@@"
+#: src/gui/popupmenu.cpp:1877 src/gui/popupmenu.cpp:1895
+msgid "Move up"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:70
-msgid "Store"
-msgstr "存储"
+#: src/gui/popupmenu.cpp:1882 src/gui/popupmenu.cpp:1900
+msgid "Move down"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:71
-msgid "Retrieve"
-msgstr "取回"
+#: src/gui/quitdialog.cpp:56
+msgid "Save state"
+msgstr "保存状态"
 
-#: src/gui/quitdialog.cpp:44
+#: src/gui/quitdialog.cpp:57
 msgid "Switch server"
 msgstr "交换服务器"
 
-#: src/gui/quitdialog.cpp:45
+#: src/gui/quitdialog.cpp:58
 msgid "Switch character"
 msgstr "交换角色"
 
-#: src/gui/recorder.cpp:87
-msgid "Finishing recording."
-msgstr "结束录制。"
-
-#: src/gui/recorder.cpp:91
-msgid "Not currently recording."
-msgstr "不在当前录制中。"
-
-#: src/gui/recorder.cpp:96
-msgid "Already recording."
-msgstr "已经录制中。"
-
-#: src/gui/recorder.cpp:104
-msgid "Starting to record..."
-msgstr "开始录制……"
-
-#: src/gui/recorder.cpp:112
-msgid "Failed to start recording."
-msgstr "开始录制失败。"
-
-#: src/gui/recorder.h:38
-msgid "Recording..."
-msgstr "录制中……"
-
-#: src/gui/recorder.h:39
-msgid "Stop recording"
-msgstr "停止录制"
-
-#: src/gui/register.cpp:69
+#: src/gui/register.cpp:77
 msgid "Confirm:"
 msgstr "确认："
 
-#: src/gui/register.cpp:100
+#: src/gui/register.cpp:108
 msgid "Email:"
 msgstr "电子邮件"
 
-#: src/gui/register.cpp:166
+#: src/gui/register.cpp:176
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "用户名至少需要%d个字符。"
 
-#: src/gui/register.cpp:174
+#: src/gui/register.cpp:184
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "用户名不能少于%d个字符"
 
-#: src/gui/register.cpp:182 src/gui/unregisterdialog.cpp:117
+#: src/gui/register.cpp:192 src/gui/unregisterdialog.cpp:121
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "密码需要至少%d个字符"
 
-#: src/gui/register.cpp:190 src/gui/unregisterdialog.cpp:124
+#: src/gui/register.cpp:200 src/gui/unregisterdialog.cpp:128
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "密码不能少于%d个字符。"
 
-#: src/gui/register.cpp:197
+#: src/gui/register.cpp:207
 msgid "Passwords do not match."
 msgstr "密码不一致."
 
-#: src/gui/serverdialog.cpp:134
-#, fuzzy
+#: src/gui/serverdialog.cpp:228
 msgid "Choose Your Server"
-msgstr "选择你的服务器"
+msgstr "选择您的服务器"
 
-#: src/gui/serverdialog.cpp:141 src/gui/widgets/chattab.cpp:139
-msgid "Server:"
-msgstr "服务器："
+#: src/gui/serverdialog.cpp:239
+msgid "Choose Your Server  *** SAFE MODE ***"
+msgstr ""
 
-#: src/gui/serverdialog.cpp:142
+#: src/gui/serverdialog.cpp:244
 msgid "Port:"
 msgstr "端口："
 
-#: src/gui/serverdialog.cpp:143
-#, fuzzy
+#: src/gui/serverdialog.cpp:248
+msgid "Use same ip for game sub servers"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:262
 msgid "Server type:"
-msgstr "服务器："
+msgstr "服务器类型："
+
+#: src/gui/serverdialog.cpp:286
+msgid "Load"
+msgstr "负载"
 
-#: src/gui/serverdialog.cpp:183
-#, fuzzy
+#: src/gui/serverdialog.cpp:287
 msgid "Connect"
-msgstr "连接中..."
+msgstr "连接"
 
-#: src/gui/serverdialog.cpp:184
-#, fuzzy
+#: src/gui/serverdialog.cpp:288
 msgid "Custom Server"
-msgstr "自定义鼠标"
+msgstr "自定义服务器"
 
-#: src/gui/serverdialog.cpp:262
+#: src/gui/serverdialog.cpp:393
 msgid "Please type both the address and the port of a server."
 msgstr "请输入服务器的IP地址和端口"
 
-#: src/gui/serverdialog.cpp:411
+#: src/gui/serverdialog.cpp:551
 #, c-format
 msgid "Downloading server list...%2.2f%%"
-msgstr ""
+msgstr "下载服务器列表...%2.2f%%"
 
-#: src/gui/serverdialog.cpp:417
-#, fuzzy
+#: src/gui/serverdialog.cpp:556
 msgid "Waiting for server..."
-msgstr "等待服务器中"
+msgstr "等待服务器..."
 
-#: src/gui/serverdialog.cpp:421
+#: src/gui/serverdialog.cpp:560
 msgid "Preparing download"
+msgstr "准备下载"
+
+#: src/gui/serverdialog.cpp:564
+msgid "Error retreiving server list!"
+msgstr "错误retreiving的服务器列表！"
+
+#: src/gui/serverdialog.cpp:662
+msgid "requires a newer version"
+msgstr "需要较新版本"
+
+#: src/gui/serverdialog.cpp:664
+#, c-format
+msgid "requires v%s"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:42
-msgid "Sound"
-msgstr "声音"
+#: src/gui/setup_audio.cpp:50
+msgid "Enable Audio"
+msgstr "启用音频"
+
+#: src/gui/setup_audio.cpp:51
+msgid "Enable game sfx"
+msgstr "启用游戏SFX"
+
+#: src/gui/setup_audio.cpp:52
+msgid "Enable gui sfx"
+msgstr "启用GUI SFX"
+
+#: src/gui/setup_audio.cpp:53
+msgid "Enable music"
+msgstr "启用音乐"
 
-#: src/gui/setup_audio.cpp:43
+#: src/gui/setup_audio.cpp:54
+msgid "Enable mumble voice chat"
+msgstr "启用语音聊天"
+
+#: src/gui/setup_audio.cpp:56
 msgid "Download music"
-msgstr ""
+msgstr "下载音乐"
 
-#: src/gui/setup_audio.cpp:47
+#: src/gui/setup_audio.cpp:61
 msgid "Audio"
 msgstr "音频"
 
-#: src/gui/setup_audio.cpp:50
+#: src/gui/setup_audio.cpp:64
 msgid "Sfx volume"
 msgstr "音效声量"
 
-#: src/gui/setup_audio.cpp:51
+#: src/gui/setup_audio.cpp:65
 msgid "Music volume"
 msgstr "音乐声量"
 
-#: src/gui/setup_audio.cpp:94
-#, fuzzy
+#: src/gui/setup_audio.cpp:120
 msgid "Notice"
-msgstr "无文本"
+msgstr ""
 
-#: src/gui/setup_audio.cpp:94
+#: src/gui/setup_audio.cpp:120
 msgid "You may have to restart your client if you want to download new music"
-msgstr ""
+msgstr "如果你想下载新音乐,您必须重新启动您的客!"
 
-#: src/gui/setup_audio.cpp:106
+#: src/gui/setup_audio.cpp:133
 msgid "Sound Engine"
+msgstr "声音引擎"
+
+#: src/gui/setup_chat.cpp:55 src/gui/setup_colors.cpp:54
+msgid "Colors"
+msgstr "颜色"
+
+#: src/gui/setup_chat.cpp:57
+msgid "Remove colors from received chat messages"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:44
-msgid "This is what the color looks like"
-msgstr "这就是该色彩看起来的样子"
+#: src/gui/setup_chat.cpp:60
+msgid "Show chat colors list"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:64
+msgid "Commands"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:66
+msgid "Allow magic and GM commands in all chat tabs"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:70
+msgid "Limits"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:72
+msgid "Limit max chars in chat line"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:75
+msgid "Limit max lines in chat"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:79
+msgid "Logs"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:81
+msgid "Enable chat Log"
+msgstr "启用聊天记录"
+
+#: src/gui/setup_chat.cpp:84
+msgid "Show chat history"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:88
+msgid "Messages"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:90
+msgid "Hide shop messages"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:94
+msgid "Tabs"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:96
+msgid "Log magic messages in debug tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:99
+msgid "Show server messages in debug tab"
+msgstr "在调试选项卡中显示服务器的消息"
+
+#: src/gui/setup_chat.cpp:102
+msgid "Enable trade tab"
+msgstr "标签"
+
+#: src/gui/setup_chat.cpp:105
+msgid "Enable battle tab"
+msgstr "启用战斗“选项卡"
+
+#: src/gui/setup_chat.cpp:108
+msgid "Show battle events"
+msgstr "显示的战斗事件"
+
+#: src/gui/setup_chat.cpp:111
+msgid "Resize chat tabs if need"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:115
+msgid "Time"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:117
+msgid "Use local time"
+msgstr ""
 
 #: src/gui/setup_colors.cpp:49
-msgid "Colors"
-msgstr "颜色"
+msgid "This is what the color looks like"
+msgstr "这就是该色彩看起来的样子"
 
-#: src/gui/setup_colors.cpp:70
-#, fuzzy
+#: src/gui/setup_colors.cpp:75
 msgid "Type:"
-msgstr "类型： "
+msgstr ""
 
-#: src/gui/setup_colors.cpp:81 src/gui/setup_colors.cpp:433
+#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:407
 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:88 src/gui/setup_colors.cpp:89
+#: src/gui/setup_colors.cpp:408
 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:90 src/gui/setup_colors.cpp:91
+#: src/gui/setup_colors.cpp:409
 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:92 src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:409
 msgid "Spectrum"
 msgstr "色谱"
 
-#: src/gui/setup_colors.cpp:92
-#, fuzzy
+#: src/gui/setup_colors.cpp:97 src/gui/setup_colors.cpp:319
 msgid "Delay:"
-msgstr "显示： "
+msgstr "延迟："
 
-#: src/gui/setup_colors.cpp:107
-#, fuzzy
+#: src/gui/setup_colors.cpp:112
 msgid "Red:"
-msgstr "红： "
+msgstr "红色："
 
-#: src/gui/setup_colors.cpp:122
-#, fuzzy
+#: src/gui/setup_colors.cpp:127
 msgid "Green:"
-msgstr "绿： "
+msgstr "绿色："
 
-#: src/gui/setup_colors.cpp:137
-#, fuzzy
+#: src/gui/setup_colors.cpp:142
 msgid "Blue:"
-msgstr "蓝： "
+msgstr "蓝色："
+
+#: src/gui/setup_colors.cpp:314
+msgid "Alpha:"
+msgstr ""
 
-#: src/gui/setup.cpp:51
+#: src/gui/setup.cpp:67
 msgid "Apply"
 msgstr "应用"
 
-#: src/gui/setup.cpp:51
+#: src/gui/setup.cpp:70
 msgid "Reset Windows"
 msgstr "重置窗口"
 
-#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:78
+#: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
+#: src/gui/setup_players.cpp:334
+msgid "Edit"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
 msgstr "按下开始校准按钮"
 
-#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:76
+#: src/gui/setup_joystick.cpp:41 src/gui/setup_joystick.cpp:77
 msgid "Calibrate"
 msgstr "校准"
 
-#: src/gui/setup_joystick.cpp:39
+#: src/gui/setup_joystick.cpp:42
 msgid "Enable joystick"
 msgstr "启用游戏杆"
 
-#: src/gui/setup_joystick.cpp:41
+#: src/gui/setup_joystick.cpp:44
 msgid "Joystick"
 msgstr "游戏杆"
 
-#: src/gui/setup_joystick.cpp:83
+#: src/gui/setup_joystick.cpp:84
 msgid "Stop"
 msgstr "停止"
 
-#: src/gui/setup_joystick.cpp:84
+#: src/gui/setup_joystick.cpp:85
 msgid "Rotate the stick"
 msgstr "旋转手柄"
 
-#: src/gui/setup_keyboard.cpp:77
+#: src/gui/setup_keyboard.cpp:80
 msgid "Keyboard"
 msgstr "键盘"
 
-#: src/gui/setup_keyboard.cpp:86
+#: src/gui/setup_keyboard.cpp:89
 msgid "Assign"
 msgstr "分配"
 
-#: src/gui/setup_keyboard.cpp:90
+#: src/gui/setup_keyboard.cpp:93
+msgid "Unassign"
+msgstr "取消分配"
+
+#: src/gui/setup_keyboard.cpp:97
 msgid "Default"
 msgstr "预设"
 
-#: src/gui/setup_keyboard.cpp:119
+#: src/gui/setup_keyboard.cpp:133
 msgid "Key Conflict(s) Detected."
 msgstr "检测到按键冲突。"
 
-#: src/gui/setup_players.cpp:57
-msgid "Name"
-msgstr "姓名"
+#: src/gui/setup_other.cpp:40
+msgid "Misc"
+msgstr ""
+
+#: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:125
+msgid "Monsters"
+msgstr "怪物"
+
+#: src/gui/setup_other.cpp:48
+msgid "Show damage inflicted to monsters"
+msgstr "显示损坏造成的，以怪物"
+
+#: src/gui/setup_other.cpp:51
+msgid "Auto target only reachable monsters"
+msgstr ""
 
-#: src/gui/setup_players.cpp:58
+#: src/gui/setup_other.cpp:54
+msgid "Highlight monster attack range"
+msgstr "突出显示怪物的攻击范围"
+
+#: src/gui/setup_other.cpp:58
+msgid "Show monster hp bar"
+msgstr "显示怪物HP栏"
+
+#: src/gui/setup_other.cpp:61
+msgid "Cycle monster targets"
+msgstr ""
+
+#: src/gui/setup_other.cpp:67
+msgid "Show warps particles"
+msgstr ""
+
+#: src/gui/setup_other.cpp:70
+msgid "Highlight map portals"
+msgstr "突出显示的地图门户网站"
+
+#: src/gui/setup_other.cpp:73
+msgid "Highlight floor items"
+msgstr "突出地板项目"
+
+#: src/gui/setup_other.cpp:76
+msgid "Highlight player attack range"
+msgstr "突出显示球员的攻击范围"
+
+#: src/gui/setup_other.cpp:79
+msgid "Show extended minimaps"
+msgstr ""
+
+#: src/gui/setup_other.cpp:82
+msgid "Draw path"
+msgstr "绘制路径"
+
+#: src/gui/setup_other.cpp:85
+msgid "Draw hotkeys on map"
+msgstr ""
+
+#: src/gui/setup_other.cpp:89
+msgid "Moving"
+msgstr ""
+
+#: src/gui/setup_other.cpp:91
+msgid "Auto fix position"
+msgstr "自动修复的位置"
+
+#: src/gui/setup_other.cpp:94
+msgid "Attack while moving"
+msgstr ""
+
+#: src/gui/setup_other.cpp:97
+msgid "Sync player move"
+msgstr "同步播放移动"
+
+#: src/gui/setup_other.cpp:100
+msgid "Crazy move A program"
+msgstr "疯狂的举动的程序"
+
+#: src/gui/setup_other.cpp:104
+msgid "Player"
+msgstr ""
+
+#: src/gui/setup_other.cpp:106
+msgid "Show own hp bar"
+msgstr "显示自己的HP栏"
+
+#: src/gui/setup_other.cpp:109
+msgid "Enable quick stats"
+msgstr "启用快速统计"
+
+#: src/gui/setup_other.cpp:112
+msgid "Cycle player targets"
+msgstr ""
+
+#: src/gui/setup_other.cpp:115
+msgid "Show job exp messages"
+msgstr ""
+
+#: src/gui/setup_other.cpp:118
+msgid "Show players popups"
+msgstr ""
+
+#: src/gui/setup_other.cpp:121
+msgid "Afk message"
+msgstr ""
+
+#: src/gui/setup_other.cpp:124
+msgid "Show job"
+msgstr "显示工作"
+
+#: src/gui/setup_other.cpp:127
+msgid "Enable attack filter"
+msgstr ""
+
+#: src/gui/setup_other.cpp:130
+msgid "Enable advert protocol"
+msgstr ""
+
+#: src/gui/setup_other.cpp:136
+msgid "Accept sell/buy requests"
+msgstr "接受出售/购买请求"
+
+#: src/gui/setup_other.cpp:139
+msgid "Enable shop mode"
+msgstr ""
+
+#: src/gui/setup_other.cpp:145
+msgid "Log NPC dialogue"
+msgstr "NPC对话"
+
+#: src/gui/setup_other.cpp:149
+msgid "Other"
+msgstr ""
+
+#: src/gui/setup_other.cpp:151
+msgid "Enable server side attack"
+msgstr ""
+
+#: src/gui/setup_other.cpp:154
+msgid "Enable bot checker"
+msgstr "启用BOT检查"
+
+#: src/gui/setup_other.cpp:157
+msgid "Enable buggy servers protection"
+msgstr ""
+
+#: src/gui/setup_other.cpp:160
+msgid "Enable debug log"
+msgstr "启用调试日志"
+
+#: src/gui/setup_other.cpp:163
+msgid "Low traffic mode"
+msgstr "低流量模式"
+
+#: src/gui/setup_other.cpp:166
+msgid "Hide shield sprite"
+msgstr ""
+
+#: src/gui/setup_other.cpp:169
+msgid "Show background"
+msgstr ""
+
+#: src/gui/setup_players.cpp:65
 msgid "Relation"
 msgstr "关系"
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:70
 msgid "Neutral"
 msgstr "中立"
 
-#: src/gui/setup_players.cpp:64
+#: src/gui/setup_players.cpp:71
 msgid "Friend"
 msgstr "好友"
 
-#: src/gui/setup_players.cpp:65
+#: src/gui/setup_players.cpp:72
 msgid "Disregarded"
 msgstr "被忽视的"
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_players.cpp:73
 msgid "Ignored"
 msgstr "忽略"
 
-#: src/gui/setup_players.cpp:208 src/gui/setup_video.cpp:132
-msgid "???"
-msgstr "？？？"
+#: src/gui/setup_players.cpp:74
+msgid "Erased"
+msgstr ""
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_players.cpp:247
 msgid "Allow trading"
 msgstr "允许交易"
 
-#: src/gui/setup_players.cpp:228
+#: src/gui/setup_players.cpp:249
 msgid "Allow whispers"
 msgstr "允许密语"
 
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:252
+msgid "Old"
+msgstr ""
+
+#: src/gui/setup_players.cpp:254
 msgid "Put all whispers in tabs"
 msgstr "将所有密语放于标签夜"
 
-#: src/gui/setup_players.cpp:234
-#, fuzzy
+#: src/gui/setup_players.cpp:257
 msgid "Show gender"
-msgstr "显示姓名"
+msgstr ""
 
-#: src/gui/setup_players.cpp:236
+#: src/gui/setup_players.cpp:267
 msgid "Players"
 msgstr "玩家"
 
-#: src/gui/setup_players.cpp:261
+#: src/gui/setup_players.cpp:292
 msgid "When ignoring:"
 msgstr "当忽略时："
 
-#: src/gui/setup_video.cpp:113
-msgid "Tiny"
-msgstr "微小"
+#: src/gui/setup_players.cpp:315
+msgid "Show level"
+msgstr "显示水平"
+
+#: src/gui/setup_players.cpp:319
+msgid "Show own name"
+msgstr "显示自己的名字"
+
+#: src/gui/setup_players.cpp:323
+msgid "Target dead players"
+msgstr "目标死球员"
+
+#: src/gui/setup_players.cpp:327
+msgid "Secure trades"
+msgstr ""
+
+#: src/gui/setup_players.cpp:331 src/gui/setup_players.cpp:523
+msgid "Unsecure chars in names"
+msgstr ""
+
+#: src/gui/setup_players.cpp:336
+msgid "Visible names"
+msgstr "可见姓名"
+
+#: src/gui/setup_players.cpp:341
+msgid "Show statuses"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:105
+msgid "Tiny (10)"
+msgstr "小（10）"
+
+#: src/gui/setup_theme.cpp:106
+msgid "Small (11)"
+msgstr "小 (11)"
+
+#: src/gui/setup_theme.cpp:107
+msgid "Medium (12)"
+msgstr "中 (12)"
+
+#: src/gui/setup_theme.cpp:108
+msgid "Large (13)"
+msgstr "大 (13)"
+
+#: src/gui/setup_theme.cpp:109
+msgid "Big (14)"
+msgstr "大(14)"
 
-#: src/gui/setup_video.cpp:114
-msgid "Small"
-msgstr "小"
+#: src/gui/setup_theme.cpp:110
+msgid "Huge (15)"
+msgstr "巨大的 (15)"
 
-#: src/gui/setup_video.cpp:115
-msgid "Medium"
-msgstr "中等"
+#: src/gui/setup_theme.cpp:140
+msgid "Theme"
+msgstr "主题"
 
-#: src/gui/setup_video.cpp:116
-msgid "Large"
-msgstr "大"
+#: src/gui/setup_theme.cpp:142
+msgid "Gui theme"
+msgstr "桂主题"
 
-#: src/gui/setup_video.cpp:142
+#: src/gui/setup_theme.cpp:143
+msgid "Main Font"
+msgstr "主要字体"
+
+#: src/gui/setup_theme.cpp:144
+msgid "Bold font"
+msgstr "加粗字体"
+
+#: src/gui/setup_theme.cpp:145
+msgid "Particle font"
+msgstr "粒子字体"
+
+#: src/gui/setup_theme.cpp:146
+msgid "Help font"
+msgstr "帮助字体"
+
+#: src/gui/setup_theme.cpp:147
+msgid "Secure font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:175
+msgid "Font size"
+msgstr "字体大小"
+
+#: src/gui/setup_theme.cpp:281
+msgid "Theme Changed"
+msgstr "主题更改"
+
+#: src/gui/setup_theme.cpp:282 src/gui/setup_video.cpp:670
+#: src/gui/setup_video.cpp:675
+msgid "Restart your client for the change to take effect."
+msgstr "重启您的游戏客户端以使变更生效。"
+
+#: src/gui/setup_video.cpp:194
+msgid "Software"
+msgstr "软件"
+
+#: src/gui/setup_video.cpp:195
+msgid "Fast OpenGL"
+msgstr "快速的OpenGL"
+
+#: src/gui/setup_video.cpp:196
+msgid "Safe OpenGL"
+msgstr "安全的OpenGL"
+
+#: src/gui/setup_video.cpp:223
 msgid "No text"
 msgstr "无文本"
 
-#: src/gui/setup_video.cpp:144
+#: src/gui/setup_video.cpp:225
+msgid "Text"
+msgstr "文本"
+
+#: src/gui/setup_video.cpp:227
 msgid "Bubbles, no names"
 msgstr "气泡，无名"
 
-#: src/gui/setup_video.cpp:145
+#: src/gui/setup_video.cpp:229
 msgid "Bubbles with names"
 msgstr "有名气泡"
 
-#: src/gui/setup_video.cpp:157
+#: src/gui/setup_video.cpp:242
 msgid "off"
 msgstr "关闭"
 
-#: src/gui/setup_video.cpp:158 src/gui/setup_video.cpp:171
+#: src/gui/setup_video.cpp:244 src/gui/setup_video.cpp:261
 msgid "low"
 msgstr "低"
 
-#: src/gui/setup_video.cpp:159 src/gui/setup_video.cpp:173
+#: src/gui/setup_video.cpp:246 src/gui/setup_video.cpp:265
 msgid "high"
 msgstr "高"
 
-#: src/gui/setup_video.cpp:172
+#: src/gui/setup_video.cpp:263
 msgid "medium"
 msgstr "中"
 
-#: src/gui/setup_video.cpp:174
+#: src/gui/setup_video.cpp:267
 msgid "max"
 msgstr "最大"
 
-#: src/gui/setup_video.cpp:196
+#: src/gui/setup_video.cpp:293
 msgid "Full screen"
 msgstr "全屏"
 
-#: src/gui/setup_video.cpp:197
-msgid "OpenGL"
-msgstr "OpenGL"
+#: src/gui/setup_video.cpp:294
+msgid "Hw acceleration"
+msgstr "硬件加速"
 
-#: src/gui/setup_video.cpp:198
+#: src/gui/setup_video.cpp:295
 msgid "Custom cursor"
 msgstr "自定义鼠标"
 
-#: src/gui/setup_video.cpp:200
-msgid "Visible names"
-msgstr "可见姓名"
-
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:297
 msgid "Particle effects"
 msgstr "粒子效果"
 
-#: src/gui/setup_video.cpp:204
-#, fuzzy
-msgid "Show own name"
-msgstr "显示姓名"
-
-#: src/gui/setup_video.cpp:205
+#: src/gui/setup_video.cpp:299
 msgid "Show pickup notification"
 msgstr "显示拾起通知"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:207
+#: src/gui/setup_video.cpp:301
 msgid "in chat"
 msgstr "聊天中"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:209
+#: src/gui/setup_video.cpp:303
 msgid "as particle"
 msgstr "作为发射武器"
 
-#: src/gui/setup_video.cpp:214
-#, fuzzy
+#: src/gui/setup_video.cpp:305
+msgid "Enable opacity cache"
+msgstr ""
+
+#: src/gui/setup_video.cpp:306
+msgid "Enable map reduce"
+msgstr ""
+
+#: src/gui/setup_video.cpp:308
+msgid "Auto adjust perfomance"
+msgstr ""
+
+#: src/gui/setup_video.cpp:310
+msgid "Show beings transparency"
+msgstr ""
+
+#: src/gui/setup_video.cpp:315
 msgid "FPS limit:"
-msgstr "FPS限制："
+msgstr ""
 
-#: src/gui/setup_video.cpp:225
+#: src/gui/setup_video.cpp:319 src/gui/setup_video.cpp:356
+#: src/gui/setup_video.cpp:607 src/gui/setup_video.cpp:760
+msgid "Alt FPS limit: "
+msgstr ""
+
+#: src/gui/setup_video.cpp:328
 msgid "Video"
 msgstr "视频"
 
-#: src/gui/setup_video.cpp:227
-#, fuzzy
-msgid "Show monster damage"
-msgstr "显示姓名"
-
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:334
 msgid "Overhead text"
 msgstr "头顶文字"
 
-#: src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:335
 msgid "Gui opacity"
 msgstr "Gui 透明度"
 
-#: src/gui/setup_video.cpp:235
+#: src/gui/setup_video.cpp:336
 msgid "Ambient FX"
 msgstr "环境音效"
 
-#: src/gui/setup_video.cpp:236
-#, fuzzy
+#: src/gui/setup_video.cpp:337
 msgid "Particle detail"
-msgstr "纹理细节"
-
-#: src/gui/setup_video.cpp:237
-msgid "Font size"
-msgstr "字体大小"
+msgstr ""
 
-#: src/gui/setup_video.cpp:251 src/gui/setup_video.cpp:454
-#: src/gui/setup_video.cpp:568
-#, fuzzy
+#: src/gui/setup_video.cpp:354 src/gui/setup_video.cpp:357
+#: src/gui/setup_video.cpp:606 src/gui/setup_video.cpp:747
+#: src/gui/setup_video.cpp:758
 msgid "None"
-msgstr "否"
+msgstr ""
 
-#: src/gui/setup_video.cpp:381
+#: src/gui/setup_video.cpp:511
 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:517
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:398
-#, fuzzy
+#: src/gui/setup_video.cpp:528
 msgid "Switching to Full Screen"
-msgstr "切换到全屏"
+msgstr ""
 
-#: src/gui/setup_video.cpp:399
+#: src/gui/setup_video.cpp:529
 msgid "Restart needed for changes to take effect."
 msgstr "重启生效"
 
-#: src/gui/setup_video.cpp:411
-#, fuzzy
+#: src/gui/setup_video.cpp:541
 msgid "Changing to OpenGL"
-msgstr "改变成OpenGL"
+msgstr ""
 
-#: src/gui/setup_video.cpp:412
+#: src/gui/setup_video.cpp:542
 msgid "Applying change to OpenGL requires restart."
 msgstr "运用改变为OpenGL需要重新开始"
 
-#: src/gui/setup_video.cpp:486 src/gui/setup_video.cpp:491
-#, fuzzy
-msgid "Screen Resolution Changed"
-msgstr "分辨率已变更"
+#: src/gui/setup_video.cpp:653
+msgid "Custom resolution (example: 1024x768)"
+msgstr "自定义分辨率 (例如: 1024x768)"
 
-#: src/gui/setup_video.cpp:487 src/gui/setup_video.cpp:492
-msgid "Restart your client for the change to take effect."
-msgstr "重启您的游戏客户端以使变更生效。"
+#: src/gui/setup_video.cpp:654
+msgid "Enter new resolution:                "
+msgstr "输入新的分辨率:"
 
-#: src/gui/setup_video.cpp:489
+#: src/gui/setup_video.cpp:669 src/gui/setup_video.cpp:674
+msgid "Screen Resolution Changed"
+msgstr ""
+
+#: src/gui/setup_video.cpp:672
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:522
-#, fuzzy
+#: src/gui/setup_video.cpp:705
 msgid "Particle Effect Settings Changed."
-msgstr "粒子效果设置已变更。"
+msgstr ""
 
-#: src/gui/setup_video.cpp:523
+#: src/gui/setup_video.cpp:706
 msgid "Changes will take effect on map change."
 msgstr "变更会在地图更换时生效。"
 
-#: src/gui/skilldialog.cpp:197 src/gui/windowmenu.cpp:58
+#: src/gui/shopwindow.cpp:74
+msgid "Personal Shop"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:116
+msgid "Buy items"
+msgstr "购买物品"
+
+#: src/gui/shopwindow.cpp:117
+msgid "Sell items"
+msgstr "出售物品"
+
+#: src/gui/shopwindow.cpp:119 src/gui/shopwindow.cpp:122
+#: src/gui/tradewindow.cpp:88
+msgid "Add"
+msgstr "添加"
+
+#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
+msgid "Announce"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:125
+msgid "Show links in announce"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:723 src/net/manaserv/tradehandler.cpp:127
+msgid "Request for Trade"
+msgstr "请求交易"
+
+#: src/gui/shopwindow.cpp:724
+#, c-format
+msgid "%s wants to %s %s do you accept?"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:81
 msgid "Skills"
 msgstr "技能"
 
-#: src/gui/skilldialog.cpp:208
+#: src/gui/skilldialog.cpp:283
 msgid "Up"
 msgstr "升级"
 
-#: src/gui/skilldialog.cpp:262
-#, fuzzy, c-format
+#: src/gui/skilldialog.cpp:336
+#, c-format
 msgid "Skill points available: %d"
-msgstr "技能点数：%d"
+msgstr "技能点：%d个"
 
-#: src/gui/skilldialog.cpp:314
-#, fuzzy, c-format
+#: src/gui/skilldialog.cpp:413
+#, c-format
 msgid "Skill Set %d"
-msgstr "技能点数：%d"
+msgstr ""
 
-#: src/gui/skilldialog.cpp:323
-#, fuzzy, c-format
+#: src/gui/skilldialog.cpp:425
+#, c-format
 msgid "Skill %d"
-msgstr "技能"
-
-#: src/gui/skilldialog.cpp:405
-#, fuzzy, c-format
-msgid "Lvl: %d (%+d)"
-msgstr "等级：%d"
+msgstr "技能为%d"
 
-#: src/gui/skilldialog.cpp:416
-#, fuzzy, c-format
+#: src/gui/skilldialog.cpp:492 src/gui/skilldialog.cpp:545
+#, c-format
 msgid "Lvl: %d"
-msgstr "等级：%d"
+msgstr "等级: %d"
+
+#: src/gui/skilldialog.cpp:537
+#, c-format
+msgid "Lvl: %d (%+d)"
+msgstr "等级: %d（%+d）"
 
 #: src/gui/socialwindow.cpp:117
+msgid "Guild"
+msgstr "帮会"
+
+#: src/gui/socialwindow.cpp:146
 #, c-format
 msgid "Invited user %s to guild %s."
-msgstr ""
+msgstr "邀请用户%s加入公会%s"
 
-#: src/gui/socialwindow.cpp:126
-#, fuzzy, c-format
+#: src/gui/socialwindow.cpp:160
+#, c-format
 msgid "Guild %s quit requested."
-msgstr "帮会已创建"
+msgstr "退出公会%s的请求。"
 
-#: src/gui/socialwindow.cpp:136
+#: src/gui/socialwindow.cpp:187
 msgid "Member Invite to Guild"
-msgstr ""
+msgstr "会员邀请到公会"
 
-#: src/gui/socialwindow.cpp:137
+#: src/gui/socialwindow.cpp:188
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:146
-#, fuzzy
+#: src/gui/socialwindow.cpp:197
 msgid "Leave Guild?"
-msgstr "创建帮会"
+msgstr "离开公会？"
 
-#: src/gui/socialwindow.cpp:147
-#, fuzzy, c-format
+#: src/gui/socialwindow.cpp:198
+#, c-format
 msgid "Are you sure you want to leave guild %s?"
-msgstr "确定退出游戏？"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:182
-#, fuzzy, c-format
+#: src/gui/socialwindow.cpp:215
+msgid "Party"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:243
+#, c-format
 msgid "Invited user %s to party."
-msgstr "邀请一个用户加入队伍"
+msgstr "邀请用户%s加入团队."
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:257
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:199
-#, fuzzy
+#: src/gui/socialwindow.cpp:284
 msgid "Member Invite to Party"
-msgstr "邀请一个用户加入队伍"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:200
+#: src/gui/socialwindow.cpp:285
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:209
+#: src/gui/socialwindow.cpp:294
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:210
-#, fuzzy, c-format
+#: src/gui/socialwindow.cpp:295
+#, c-format
 msgid "Are you sure you want to leave party %s?"
-msgstr "确定退出游戏？"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:521
+msgid "Nav"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:799
+msgid "Atk"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:840
+msgid "Priority mobs"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:872
+msgid "Attack mobs"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:907
+msgid "Ignore mobs"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:239
+#: src/gui/socialwindow.cpp:970
 msgid "Create Guild"
 msgstr "创建帮会"
 
-#: src/gui/socialwindow.cpp:240 src/gui/socialwindow.cpp:564
-#, fuzzy
+#: src/gui/socialwindow.cpp:971 src/gui/socialwindow.cpp:1387
 msgid "Create Party"
-msgstr "创建角色"
+msgstr "建立党"
 
-#: src/gui/socialwindow.cpp:279 src/gui/windowmenu.cpp:60
+#: src/gui/socialwindow.cpp:1013 src/gui/windowmenu.cpp:93
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:297
-#, fuzzy
+#: src/gui/socialwindow.cpp:1034
 msgid "Invite"
-msgstr "邀请用户"
-
-#: src/gui/socialwindow.cpp:298
-#, fuzzy
-msgid "Leave"
-msgstr "大"
+msgstr "邀请"
 
-#: src/gui/socialwindow.cpp:394
-#, fuzzy, c-format
+#: src/gui/socialwindow.cpp:1176
+#, c-format
 msgid "Accepted party invite from %s."
-msgstr "接受%s的邀请。"
+msgstr "接受%s团队的邀请."
 
-#: src/gui/socialwindow.cpp:400
-#, fuzzy, c-format
+#: src/gui/socialwindow.cpp:1186
+#, c-format
 msgid "Rejected party invite from %s."
-msgstr "拒绝%s的邀请。"
+msgstr "拒绝%s的团队邀请."
 
-#: src/gui/socialwindow.cpp:413
-#, fuzzy, c-format
+#: src/gui/socialwindow.cpp:1203
+#, c-format
 msgid "Accepted guild invite from %s."
-msgstr "接受%s的邀请。"
+msgstr "已接受公会邀请来自%s."
 
-#: src/gui/socialwindow.cpp:419
-#, fuzzy, c-format
+#: src/gui/socialwindow.cpp:1213
+#, c-format
 msgid "Rejected guild invite from %s."
-msgstr "拒绝%s的邀请。"
+msgstr "拒绝%s的公会邀请."
 
-#: src/gui/socialwindow.cpp:463
+#: src/gui/socialwindow.cpp:1257
 #, c-format
 msgid "Creating guild called %s."
-msgstr ""
+msgstr "创建公会的名为%s"
 
-#: src/gui/socialwindow.cpp:477
+#: src/gui/socialwindow.cpp:1280
 #, c-format
 msgid "Creating party called %s."
-msgstr ""
+msgstr "创建团队名字为%s的"
 
-#: src/gui/socialwindow.cpp:484
-#, fuzzy
+#: src/gui/socialwindow.cpp:1294
 msgid "Guild Name"
-msgstr "帮会"
+msgstr "公会名称"
 
-#: src/gui/socialwindow.cpp:485
-#, fuzzy
+#: src/gui/socialwindow.cpp:1295
 msgid "Choose your guild's name."
-msgstr "选择你的服务器"
+msgstr "选择你的公会的名字."
 
-#: src/gui/socialwindow.cpp:497
-#, fuzzy
+#: src/gui/socialwindow.cpp:1309
 msgid "Received guild request, but one already exists."
-msgstr "接受到一个已经存在的帮会邀请。"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:502
-#, fuzzy, c-format
+#: src/gui/socialwindow.cpp:1315
+#, c-format
 msgid "%s has invited you to join the guild %s."
-msgstr "%s已经邀请你加入帮会%s。"
+msgstr "%s邀请你加入公会%s"
 
-#: src/gui/socialwindow.cpp:507
-#, fuzzy
+#: src/gui/socialwindow.cpp:1321
 msgid "Accept Guild Invite"
-msgstr "接受帮会邀请"
+msgstr "接受邀请"
 
-#: src/gui/socialwindow.cpp:519
+#: src/gui/socialwindow.cpp:1336
 msgid "Received party request, but one already exists."
 msgstr "接受到一个已经存在的帮会邀请。"
 
-#: src/gui/socialwindow.cpp:529
-#, fuzzy
+#: src/gui/socialwindow.cpp:1347
 msgid "You have been invited you to join a party."
-msgstr "%s已经邀请你加入他们的帮会。"
+msgstr "您已被邀请您加入党。"
 
-#: src/gui/socialwindow.cpp:533
-#, fuzzy, c-format
+#: src/gui/socialwindow.cpp:1351
+#, c-format
 msgid "You have been invited to join the %s party."
-msgstr "%s已经邀请你加入帮会%s。"
+msgstr "您已被邀请加入%s的团队。"
 
-#: src/gui/socialwindow.cpp:541
+#: src/gui/socialwindow.cpp:1359
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s已经邀请你加入他们的帮会。"
 
-#: src/gui/socialwindow.cpp:546
+#: src/gui/socialwindow.cpp:1364
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s已经邀请你加入帮会%s。"
 
-#: src/gui/socialwindow.cpp:554
+#: src/gui/socialwindow.cpp:1373
 msgid "Accept Party Invite"
 msgstr "接受帮会邀请"
 
-#: src/gui/socialwindow.cpp:565
+#: src/gui/socialwindow.cpp:1388
 msgid "Cannot create party. You are already in a party"
-msgstr ""
+msgstr "无法建立团队.您已经在一个队伍中了"
 
-#: src/gui/socialwindow.cpp:570
-#, fuzzy
+#: src/gui/socialwindow.cpp:1393
 msgid "Party Name"
-msgstr "帮会"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:571
-#, fuzzy
+#: src/gui/socialwindow.cpp:1394
 msgid "Choose your party's name."
-msgstr "选择你的服务器"
+msgstr "选择n的名称。"
 
-#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:59
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:88
 msgid "Specials"
+msgstr "特价商品"
+
+#: src/gui/statuspopup.cpp:196
+msgid "(D) default moves"
 msgstr ""
 
-#: src/gui/specialswindow.cpp:174
-#, c-format
-msgid "Specials Set %d"
+#: src/gui/statuspopup.cpp:201
+msgid "(I) invert moves"
 msgstr ""
 
-#: src/gui/specialswindow.cpp:191
-#, c-format
-msgid "Special %d"
+#: src/gui/statuspopup.cpp:206
+msgid "(c) moves with some crazy moves"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:211
+msgid "(C) moves with crazy moves"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:216
+msgid "(d) double normal + crazy"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:221
+msgid "(?) move"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:239
+msgid "(a) custom crazy move"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:243
+msgid "(?) crazy move"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:253
+msgid "(0) default moves to target"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:258
+msgid "(1) moves to target in distance 1"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:263
+msgid "(2) moves to target in distance 2"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:268
+msgid "(3) moves to target in distance 3"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:273
+msgid "(5) moves to target in distance 5"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:278
+msgid "(7) moves to target in distance 7"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:283
+msgid "(A) moves to target in attack range"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:288
+msgid "(?) move to target"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:296
+msgid "(D) default follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:300
+msgid "(R) relative follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:304
+msgid "(M) mirror follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:308
+msgid "(P) pet follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:312
+msgid "(?) unknown follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:321 src/gui/statuspopup.cpp:344
+msgid "(D) default attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:326
+msgid "(s) switch attack without shield"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:331
+msgid "(S) switch attack with shield"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:335 src/gui/statuspopup.cpp:360
+msgid "(?) attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:348
+msgid "(G) go and attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:352
+msgid "(A) go, attack, pickup"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:356
+msgid "(d) without auto attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:374
+msgid "(S) small pick up 1x1 cells"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:378
+msgid "(D) default pick up 2x1 cells"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:382
+msgid "(F) forward pick up 2x3 cells"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:386
+msgid "(3) pick up 3x3 cells"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:390
+msgid "(g) go and pick up in distance 4"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:394
+msgid "(G) go and pick up in distance 8"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:398
+msgid "(A) go and pick up in max distance"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:402
+msgid "(?) pick up"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:411
+msgid "(N) normal map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:415
+msgid "(D) debug map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:419
+msgid "(u) ultra map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:423
+msgid "(U) ultra map view 2"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:427
+msgid "(e) empty map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:431
+msgid "(b) black & white map view"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:99 src/gui/statuswindow.cpp:247
+#: src/gui/statuspopup.cpp:435
+msgid "(?) map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:443
+msgid "(f) use #flar for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:448
+msgid "(c) use #chiza for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:453
+msgid "(I) use #ingrav for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:458
+msgid "(F) use #frillyar for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:463
+msgid "(U) use #upmarmu for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:467
+msgid "(?) magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:476
+msgid "(D) default imitation"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:480
+msgid "(O) outfits imitation"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:484
+msgid "(?) imitation"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:493
+msgid "(O) on keyboard"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:496
+msgid "(A) away"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:499 src/gui/statuspopup.cpp:519
+msgid "(?) away"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:507
+msgid "(G) game camera mode"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:511
+msgid "(F) free camera mode"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:515
+msgid "(D) design camera mode"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:526
+msgid "Game modifiers are disabled"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:531
+msgid "Game modifiers are enabled"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:133 src/gui/statuswindow.cpp:259
+#: src/gui/statuswindow.cpp:322
 #, c-format
 msgid "Level: %d"
 msgstr "等级：%d"
 
-#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:211
+#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:245
+#: src/gui/statuswindow.cpp:289
 #, c-format
 msgid "Money: %s"
 msgstr "金币: %s"
 
-#: src/gui/statuswindow.cpp:102
+#: src/gui/statuswindow.cpp:140
 msgid "HP:"
 msgstr "HP："
 
-#: src/gui/statuswindow.cpp:107
+#: src/gui/statuswindow.cpp:147
 msgid "Exp:"
 msgstr "经验："
 
-#: src/gui/statuswindow.cpp:112
+#: src/gui/statuswindow.cpp:161
 msgid "MP:"
 msgstr "MP："
 
-#: src/gui/statuswindow.cpp:132 src/gui/statuswindow.cpp:219
+#: src/gui/statuswindow.cpp:193 src/gui/statuswindow.cpp:372
 #, c-format
 msgid "Job: %d"
 msgstr "职业：%d"
 
-#: src/gui/statuswindow.cpp:133
+#: src/gui/statuswindow.cpp:194
 msgid "Job:"
 msgstr "职业："
 
-#: src/gui/statuswindow.cpp:194
-#, fuzzy
-msgid "HP"
-msgstr "HP："
+#: src/gui/statuswindow.cpp:248 src/gui/statuswindow.cpp:296
+#, c-format
+msgid "Character points: %d"
+msgstr "角色可用点: %d"
 
-#: src/gui/statuswindow.cpp:200
-#, fuzzy
-msgid "MP"
-msgstr "MP："
+#: src/gui/statuswindow.cpp:254
+#, c-format
+msgid "Level: %d (GM %d)"
+msgstr "级别:%d (GM %d)"
 
-#: src/gui/statuswindow.cpp:206
-#, fuzzy
-msgid "Exp"
-msgstr "经验："
+#: src/gui/statuswindow.cpp:310
+#, c-format
+msgid "Correction points: %d"
+msgstr ""
 
-#: src/gui/statuswindow.cpp:215
-#, fuzzy
-msgid "Money"
-msgstr "金钱：%d"
+#: src/gui/statuswindow.cpp:633 src/gui/statuswindow.cpp:698
+#: src/gui/statuswindow.cpp:718 src/gui/statuswindow.cpp:734
+#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:809
+#: src/gui/statuswindow.cpp:832 src/gui/statuswindow.cpp:851
+msgid "(D)"
+msgstr ""
 
-#: src/gui/statuswindow.cpp:225
-#, fuzzy
-msgid "Job"
-msgstr "职业："
+#: src/gui/statuswindow.cpp:636 src/gui/statuswindow.cpp:759
+msgid "(I)"
+msgstr ""
 
-#: src/gui/statuswindow.cpp:229
-#, fuzzy, c-format
-msgid "Character points: %d"
-msgstr "角色状态可以"
+#: src/gui/statuswindow.cpp:639 src/gui/statuswindow.cpp:756
+msgid "(c)"
+msgstr ""
 
-#: src/gui/statuswindow.cpp:235
-#, fuzzy, c-format
-msgid "Correction points: %d"
-msgstr "技能点数：%d"
+#: src/gui/statuswindow.cpp:642
+msgid "(C)"
+msgstr ""
 
-#: src/gui/statuswindow.cpp:251
-#, fuzzy
-msgid "Level"
-msgstr "等级：%d"
+#: src/gui/statuswindow.cpp:645 src/gui/statuswindow.cpp:743
+msgid "(d)"
+msgstr ""
 
-#: src/gui/storagewindow.cpp:58
-msgid "Storage"
-msgstr "仓库"
+#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:662
+#: src/gui/statuswindow.cpp:691 src/gui/statuswindow.cpp:710
+#: src/gui/statuswindow.cpp:727 src/gui/statuswindow.cpp:746
+#: src/gui/statuswindow.cpp:768 src/gui/statuswindow.cpp:798
+#: src/gui/statuswindow.cpp:824 src/gui/statuswindow.cpp:838
+#: src/gui/statuswindow.cpp:854 src/gui/statuswindow.cpp:867
+msgid "(?)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:659
+msgid "(a)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:670
+msgid "(0)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:673
+msgid "(1)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:676
+msgid "(2)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:679 src/gui/statuswindow.cpp:786
+msgid "(3)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:682
+msgid "(5)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:685
+msgid "(7)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:688 src/gui/statuswindow.cpp:740
+#: src/gui/statuswindow.cpp:795 src/gui/statuswindow.cpp:864
+msgid "(A)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:701
+msgid "(R)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:704
+msgid "(M)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:707
+msgid "(P)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:721
+msgid "(s)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:724 src/gui/statuswindow.cpp:777
+msgid "(S)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:792
+#: src/gui/statuswindow.cpp:845
+msgid "(G)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:753
+msgid "(f)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:762 src/gui/statuswindow.cpp:783
+#: src/gui/statuswindow.cpp:848
+msgid "(F)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:765 src/gui/statuswindow.cpp:815
+msgid "(U)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:789
+msgid "(g)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:806
+msgid "(N)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:812
+msgid "(u)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:818
+msgid "(e)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:821
+msgid "(b)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:835 src/gui/statuswindow.cpp:861
+msgid "(O)"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:112
+msgid "No Target"
+msgstr "没有目标"
+
+#: src/gui/textcommandeditor.cpp:113
+msgid "Allow Target"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:114
+msgid "Need Target"
+msgstr ""
 
-#: src/gui/trade.cpp:52
+#: src/gui/textcommandeditor.cpp:119
+msgid "General Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:120
+msgid "Life Magic"
+msgstr "生活魔术"
+
+#: src/gui/textcommandeditor.cpp:121
+msgid "War Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:122
+msgid "Transmute Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:123
+msgid "Nature Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:124
+msgid "Astral Magic"
+msgstr "星芒魔术"
+
+#: src/gui/textcommandeditor.cpp:167
+msgid "Command Editor"
+msgstr "命令编辑器"
+
+#: src/gui/textcommandeditor.cpp:184
+msgid "magic"
+msgstr "魔术"
+
+#: src/gui/textcommandeditor.cpp:188
+msgid "other"
+msgstr "其他"
+
+#: src/gui/textcommandeditor.cpp:193
+msgid "Symbol:"
+msgstr "符号："
+
+#: src/gui/textcommandeditor.cpp:196
+msgid "Command:"
+msgstr "命令："
+
+#: src/gui/textcommandeditor.cpp:199
+msgid "Mana:"
+msgstr "法力："
+
+#: src/gui/textcommandeditor.cpp:205
+msgid "Target Type:"
+msgstr "目标类型："
+
+#: src/gui/textcommandeditor.cpp:211
+msgid "Icon:"
+msgstr "图示："
+
+#: src/gui/textcommandeditor.cpp:217
+msgid "Magic level:"
+msgstr "魔法等级："
+
+#: src/gui/textcommandeditor.cpp:223
+msgid "Magic School:"
+msgstr "魔法学院："
+
+#: src/gui/textcommandeditor.cpp:229
+msgid "School level:"
+msgstr "学校层次："
+
+#: src/gui/textcommandeditor.cpp:234
+msgid "Save"
+msgstr "保存"
+
+#: src/gui/tradewindow.cpp:60
 msgid "Propose trade"
 msgstr "打算交易"
 
-#: src/gui/trade.cpp:53
+#: src/gui/tradewindow.cpp:61
 msgid "Confirmed. Waiting..."
 msgstr "已确认。等待中……"
 
-#: src/gui/trade.cpp:54
+#: src/gui/tradewindow.cpp:62
 msgid "Agree trade"
 msgstr "同意交易"
 
-#: src/gui/trade.cpp:55
+#: src/gui/tradewindow.cpp:63
 msgid "Agreed. Waiting..."
 msgstr "已同意。等待中……"
 
-#: src/gui/trade.cpp:58
+#: src/gui/tradewindow.cpp:66
 msgid "Trade: You"
 msgstr "交易：你"
 
-#: src/gui/trade.cpp:74 src/gui/trade.cpp:75
-msgid "Trade"
-msgstr "交易"
-
-#: src/gui/trade.cpp:77
-msgid "Add"
-msgstr "添加"
-
-#: src/gui/trade.cpp:99 src/gui/trade.cpp:135
-#, fuzzy, c-format
+#: src/gui/tradewindow.cpp:110 src/gui/tradewindow.cpp:166
+#, c-format
 msgid "You get %s"
-msgstr "你得到%s。"
+msgstr "你得到%s"
 
-#: src/gui/trade.cpp:100
+#: src/gui/tradewindow.cpp:111
 msgid "You give:"
 msgstr "你给予："
 
-#: src/gui/trade.cpp:104
+#: src/gui/tradewindow.cpp:115
 msgid "Change"
 msgstr "改变"
 
-#: src/gui/trade.cpp:275
-msgid "Failed adding item. You can not overlap one kind of item on the window."
+#: src/gui/tradewindow.cpp:332
+msgid ""
+"Failed adding item. You can not overlap one kind of item on the window."
 msgstr "添加物品失败。你不能覆盖窗口中的该类物品。"
 
-#: src/gui/trade.cpp:318
+#: src/gui/tradewindow.cpp:377
 msgid "You don't have enough money."
 msgstr "你没有足够的钱币."
 
-#: src/gui/unregisterdialog.cpp:51
+#: src/gui/unregisterdialog.cpp:54
 #, c-format
 msgid "Name: %s"
 msgstr "姓名：%s"
 
-#: src/gui/updatewindow.cpp:124
+#: src/gui/updatewindow.cpp:136
 msgid "Updating..."
 msgstr "更新..."
 
-#: src/gui/updatewindow.cpp:142
+#: src/gui/updatewindow.cpp:155
 msgid "Connecting..."
 msgstr "连接中..."
 
-#: src/gui/updatewindow.cpp:145
+#: src/gui/updatewindow.cpp:158
 msgid "Play"
 msgstr "开始"
 
-#: src/gui/updatewindow.cpp:405
+#: src/gui/updatewindow.cpp:556
 msgid "##1  The update process is incomplete."
 msgstr "##1 更新过程不完整。"
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:407
+#: src/gui/updatewindow.cpp:558
 msgid "##1  It is strongly recommended that"
 msgstr "##1 强烈建议"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:409
-#, fuzzy
+#: src/gui/updatewindow.cpp:560
 msgid "##1  you try again later."
-msgstr "##1 您稍候再次尝试"
+msgstr ""
 
-#: src/gui/updatewindow.cpp:501
+#: src/gui/updatewindow.cpp:686
 msgid "Completed"
 msgstr "已完成"
 
-#: src/gui/widgets/channeltab.cpp:49
+#: src/gui/userpalette.cpp:116
+msgid "Being"
+msgstr "存在"
+
+#: src/gui/userpalette.cpp:117
+msgid "Friend Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:118
+msgid "Disregarded Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:119
+msgid "Ignored Names"
+msgstr "忽略名称"
+
+#: src/gui/userpalette.cpp:120
+msgid "Erased Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:121
+msgid "Other Players' Names"
+msgstr "其他玩家名"
+
+#: src/gui/userpalette.cpp:122
+msgid "Own Name"
+msgstr "自己的名字"
+
+#: src/gui/userpalette.cpp:123
+msgid "GM Names"
+msgstr "GM名"
+
+#: src/gui/userpalette.cpp:124
+msgid "NPCs"
+msgstr "NPCs"
+
+#: src/gui/userpalette.cpp:126
+msgid "Monster HP bar"
+msgstr "怪物的HPl"
+
+#: src/gui/userpalette.cpp:128
+msgid "Monster HP bar (second color)"
+msgstr "怪物的HP指示栏(第二个颜色)"
+
+#: src/gui/userpalette.cpp:129
+msgid "Party Members"
+msgstr ""
+
+#: src/gui/userpalette.cpp:130
+msgid "Guild Members"
+msgstr "公会成员"
+
+#: src/gui/userpalette.cpp:131
+msgid "Particle Effects"
+msgstr "粒子效果"
+
+#: src/gui/userpalette.cpp:132
+msgid "Pickup Notification"
+msgstr "拾起通知"
+
+#: src/gui/userpalette.cpp:133
+msgid "Exp Notification"
+msgstr "到期通知"
+
+#: src/gui/userpalette.cpp:134
+msgid "Player HP bar"
+msgstr "玩家惠普酒吧"
+
+#: src/gui/userpalette.cpp:136
+msgid "Player HP bar (second color)"
+msgstr "玩家HP指示栏(第二个颜色)"
+
+#: src/gui/userpalette.cpp:137
+msgid "Player Hits Monster"
+msgstr "玩家怪物"
+
+#: src/gui/userpalette.cpp:138
+msgid "Monster Hits Player"
+msgstr "怪物点击播放器"
+
+#: src/gui/userpalette.cpp:140
+msgid "Other Player Hits Local Player"
+msgstr "其他玩家点击本土球员"
+
+#: src/gui/userpalette.cpp:141
+msgid "Critical Hit"
+msgstr "会心一击"
+
+#: src/gui/userpalette.cpp:143
+msgid "Local Player Hits Monster"
+msgstr ""
+
+#: src/gui/userpalette.cpp:145
+msgid "Local Player Critical Hit"
+msgstr "当前玩家"
+
+#: src/gui/userpalette.cpp:147
+msgid "Local Player Miss"
+msgstr ""
+
+#: src/gui/userpalette.cpp:148
+msgid "Misses"
+msgstr "失误"
+
+#: src/gui/userpalette.cpp:149
+msgid "Portal Highlight"
+msgstr "门户高亮"
+
+#: src/gui/userpalette.cpp:151
+msgid "Default collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:153
+msgid "Air collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:155
+msgid "Water collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:157
+msgid "Walkable Highlight"
+msgstr "步行高亮"
+
+#: src/gui/userpalette.cpp:159
+msgid "Local Player Attack Range"
+msgstr ""
+
+#: src/gui/userpalette.cpp:161
+msgid "Local Player Attack Range Border"
+msgstr ""
+
+#: src/gui/userpalette.cpp:163
+msgid "Monster Attack Range"
+msgstr ""
+
+#: src/gui/userpalette.cpp:165
+msgid "Home Place"
+msgstr "家居广场"
+
+#: src/gui/userpalette.cpp:167
+msgid "Home Place Border"
+msgstr "家居广场边界"
+
+#: src/gui/userpalette.cpp:169
+msgid "Road Point"
+msgstr "路点"
+
+#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:470
+msgid "Who Is Online - Updating"
+msgstr "谁在线 - 更新"
+
+#: src/gui/whoisonline.cpp:100
+msgid "Update"
+msgstr "更新"
+
+#: src/gui/whoisonline.cpp:293
+msgid "Who Is Online - "
+msgstr "谁在线 -"
+
+#: src/gui/whoisonline.cpp:484
+msgid "Who Is Online - error"
+msgstr "谁在线 - 错误"
+
+#: src/gui/whoisonline.cpp:515
+msgid "Who Is Online - Update"
+msgstr ""
+
+#: src/gui/widgets/battletab.cpp:45
+msgid "Battle"
+msgstr ""
+
+#: src/gui/widgets/channeltab.cpp:52
 msgid "/users > Lists the users in the current channel"
 msgstr "/usr > 列出当前频道的用户"
 
-#: src/gui/widgets/channeltab.cpp:50
+#: src/gui/widgets/channeltab.cpp:53
 msgid "/topic > Set the topic of the current channel"
 msgstr "/topic > 设置当前聊天频道的主题"
 
-#: src/gui/widgets/channeltab.cpp:51
+#: src/gui/widgets/channeltab.cpp:54
 msgid "/quit > Leave a channel"
 msgstr "/quit > 离开频道"
 
-#: src/gui/widgets/channeltab.cpp:52
+#: src/gui/widgets/channeltab.cpp:55
 msgid "/op > Make a user a channel operator"
 msgstr "/op > 使用户称为频道管理员"
 
-#: src/gui/widgets/channeltab.cpp:53
+#: src/gui/widgets/channeltab.cpp:56
 msgid "/kick > Kick a user from the channel"
 msgstr "/kick > 把用户踢出频道"
 
-#: src/gui/widgets/channeltab.cpp:63
+#: src/gui/widgets/channeltab.cpp:66
 msgid "Command: /users"
 msgstr "命令：/users"
 
-#: src/gui/widgets/channeltab.cpp:64
+#: src/gui/widgets/channeltab.cpp:67
 msgid "This command shows the users in this channel."
 msgstr "该命令显示当前频道的用户"
 
-#: src/gui/widgets/channeltab.cpp:68
+#: src/gui/widgets/channeltab.cpp:71
 msgid "Command: /topic <message>"
 msgstr "命令：/topic <讯息>"
 
-#: src/gui/widgets/channeltab.cpp:69
+#: src/gui/widgets/channeltab.cpp:72
 msgid "This command sets the topic to <message>."
 msgstr "该命令设置主题为<讯息>"
 
-#: src/gui/widgets/channeltab.cpp:73
+#: src/gui/widgets/channeltab.cpp:76
 msgid "Command: /quit"
 msgstr "命令：/quit"
 
-#: src/gui/widgets/channeltab.cpp:74
+#: src/gui/widgets/channeltab.cpp:77
 msgid "This command leaves the current channel."
 msgstr "该命令离开当前频道"
 
-#: src/gui/widgets/channeltab.cpp:75
+#: src/gui/widgets/channeltab.cpp:78
 msgid "If you're the last person in the channel, it will be deleted."
 msgstr "如果你是该频道的最后成员，离开后该频道将被删除。"
 
-#: src/gui/widgets/channeltab.cpp:80
+#: src/gui/widgets/channeltab.cpp:83
 msgid "Command: /op <nick>"
 msgstr "命令：/op <昵称>"
 
-#: src/gui/widgets/channeltab.cpp:81
+#: src/gui/widgets/channeltab.cpp:84
 msgid "This command makes <nick> a channel operator."
 msgstr "该命令使<昵称>成为频道管理员。"
 
-#: src/gui/widgets/channeltab.cpp:84
+#: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+msgstr "如果<昵称>之间有空格，用双引号(\")括起来。"
+
+#: src/gui/widgets/channeltab.cpp:87
 msgid "Channel operators can kick and op other users from the channel."
 msgstr "频道管理员可以踢出或者op频道内的其他用户"
 
-#: src/gui/widgets/channeltab.cpp:89
+#: src/gui/widgets/channeltab.cpp:92
 msgid "Command: /kick <nick>"
 msgstr "命令：/kick <昵称>"
 
-#: src/gui/widgets/channeltab.cpp:90
+#: src/gui/widgets/channeltab.cpp:93
 msgid "This command makes <nick> leave the channel."
 msgstr "该命令致使<昵称>离开频道。"
 
-#: src/gui/widgets/channeltab.cpp:119
+#: src/gui/widgets/channeltab.cpp:118
 msgid "Need a user to op!"
 msgstr "需要一个用户来操作"
 
-#: src/gui/widgets/channeltab.cpp:126
+#: src/gui/widgets/channeltab.cpp:125
 msgid "Need a user to kick!"
 msgstr "踢人时需要指定用户！"
 
-#: src/gui/widgets/chattab.cpp:118
+#: src/gui/widgets/chattab.cpp:151
 msgid "Global announcement:"
 msgstr "全局公告："
 
-#: src/gui/widgets/chattab.cpp:124
+#: src/gui/widgets/chattab.cpp:157
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "%s 全局公告："
 
-#: src/gui/widgets/chattab.cpp:150
-#, fuzzy, c-format
+#: src/gui/widgets/chattab.cpp:184
+#, c-format
 msgid "%s whispers: %s"
-msgstr "%s悄悄的对您说： "
+msgstr "%s私语:%s"
 
-#: src/gui/widgets/whispertab.cpp:51
-msgid "Cannot send empty chat!"
-msgstr "无法发送空白信息！"
-
-#: src/gui/widgets/whispertab.cpp:70
+#: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
-msgstr ""
+msgstr "/ignore > "
 
-#: src/gui/widgets/whispertab.cpp:71
+#: src/gui/widgets/whispertab.cpp:108
 msgid "/unignore > Stop ignoring the other player"
-msgstr ""
+msgstr "/unignore > 停止忽视了其他"
 
-#: src/gui/widgets/whispertab.cpp:72
+#: src/gui/widgets/whispertab.cpp:109
 msgid "/close > Close the whisper tab"
 msgstr "/close > 关闭密语标签页"
 
-#: src/gui/widgets/whispertab.cpp:82
+#: src/gui/widgets/whispertab.cpp:119
 msgid "Command: /close"
 msgstr "命令: /close"
 
-#: src/gui/widgets/whispertab.cpp:83
+#: src/gui/widgets/whispertab.cpp:120
 msgid "This command closes the current whisper tab."
 msgstr "该命令关闭当前密语标签页。"
 
-#: src/gui/widgets/whispertab.cpp:87
-#, fuzzy
+#: src/gui/widgets/whispertab.cpp:124
 msgid "Command: /ignore"
-msgstr "命令：/item"
+msgstr "命令：/ignore"
 
-#: src/gui/widgets/whispertab.cpp:88
-#, fuzzy
+#: src/gui/widgets/whispertab.cpp:125
 msgid "This command ignores the other player regardless of current relations."
-msgstr "该条命令可显现当前在线用户总数。"
+msgstr "此命令忽略了其他，不管目前的关系。"
 
-#: src/gui/widgets/whispertab.cpp:94
-#, fuzzy
-msgid "This command stops ignoring the other player if they are being ignored."
-msgstr "该命令开始记录聊天日志至文件<文件名>。"
+#: src/gui/widgets/whispertab.cpp:130
+msgid "Command: /unignore <player>"
+msgstr "命令: /uninore <>"
+
+#: src/gui/widgets/whispertab.cpp:131
+msgid ""
+"This command stops ignoring the other player if they are being ignored."
+msgstr "此命令将停止忽视了其他的球员，如果他们被忽略了。"
+
+#: src/gui/windowmenu.cpp:65
+msgid "BC"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:65
+msgid "Bot checker"
+msgstr ""
 
-#: src/gui/windowmenu.cpp:55
+#: src/gui/windowmenu.cpp:67
+msgid "ONL"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:67
+msgid "Who is online"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:69
+msgid "KS"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:71
+msgid "Smilies"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:73
+msgid "STA"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:73
 msgid "Status"
 msgstr "状态"
 
-#: src/gui/windowmenu.cpp:61
-msgid "Shortcut"
-msgstr "快捷键"
+#: src/gui/windowmenu.cpp:74
+msgid "EQU"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:76
+msgid "INV"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:81
+msgid "SKI"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:88
+msgid "SPE"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:93
+msgid "SOC"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:94
+msgid "SH"
+msgstr ""
 
-#: src/gui/worldselectdialog.cpp:71
-#, fuzzy
+#: src/gui/windowmenu.cpp:94
+msgid "Shortcuts"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:96
+msgid "SP"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:97
+msgid "DR"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:98
+msgid "YK"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:98
+msgid "Did you know"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:100
+msgid "SET"
+msgstr ""
+
+#: src/gui/worldselectdialog.cpp:77
 msgid "Select World"
-msgstr "选择OK"
+msgstr "选择世界"
 
-#: src/gui/worldselectdialog.cpp:76
-#, fuzzy
+#: src/gui/worldselectdialog.cpp:82
 msgid "Change Login"
-msgstr "改变"
+msgstr ""
 
-#: src/gui/worldselectdialog.cpp:77
-#, fuzzy
+#: src/gui/worldselectdialog.cpp:83
 msgid "Choose World"
-msgstr "选择你的服务器"
+msgstr ""
+
+#: src/inventory.cpp:248
+msgid "Storage"
+msgstr ""
+
+#: src/inventory.cpp:250
+msgid "Cart"
+msgstr ""
 
-#: src/keyboardconfig.cpp:40
+#: src/keyboardconfig.cpp:43
 msgid "Move Up"
 msgstr "向上移动"
 
-#: src/keyboardconfig.cpp:41
+#: src/keyboardconfig.cpp:44
 msgid "Move Down"
 msgstr "向下移动"
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:45
 msgid "Move Left"
 msgstr "向左移动"
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:46
 msgid "Move Right"
 msgstr "向右移动"
 
-#: src/keyboardconfig.cpp:44 src/net/ea/generalhandler.cpp:223
-msgid "Attack"
-msgstr "攻击"
-
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:49
 msgid "Target & Attack"
 msgstr "对准并攻击"
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:51
+msgid "Move to Target"
+msgstr "移动到目标"
+
+#: src/keyboardconfig.cpp:53
+msgid "Change Move to Target type"
+msgstr "更改移动到目标类型"
+
+#: src/keyboardconfig.cpp:55
+msgid "Move to Home location"
+msgstr "移动到首页位置"
+
+#: src/keyboardconfig.cpp:57
+msgid "Set home location"
+msgstr "设为首页位置"
+
+#: src/keyboardconfig.cpp:59
+msgid "Move to navigation point"
+msgstr "移动导航点"
+
+#: src/keyboardconfig.cpp:61
 msgid "Smilie"
 msgstr "笑脸"
 
-#: src/keyboardconfig.cpp:47
-msgid "Talk"
-msgstr "说话"
-
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:63
 msgid "Stop Attack"
 msgstr "停止攻击"
 
-#: src/keyboardconfig.cpp:49
-#, fuzzy
-msgid "Target Monster"
-msgstr "对准最近目标"
+#: src/keyboardconfig.cpp:64
+msgid "Target Closest"
+msgstr "目标最接近"
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboardconfig.cpp:66
 msgid "Target NPC"
 msgstr "目标NPC"
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:67
 msgid "Target Player"
 msgstr "目标玩家"
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:69
 msgid "Pickup"
 msgstr "捡起"
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:70
+msgid "Change Pickup Type"
+msgstr "更改皮卡型"
+
+#: src/keyboardconfig.cpp:72
 msgid "Hide Windows"
 msgstr "隐藏窗口"
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:74
 msgid "Sit"
 msgstr "坐下"
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:75
 msgid "Screenshot"
 msgstr "屏幕快照"
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:76
 msgid "Enable/Disable Trading"
 msgstr "开启/关闭交易"
 
-#: src/keyboardconfig.cpp:57
-msgid "Find Path to Mouse"
-msgstr ""
+#: src/keyboardconfig.cpp:78
+msgid "Change Map View Mode"
+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:80
+msgid "Item Shortcuts Key"
+msgstr "项目的快捷方式键"
+
+#: src/keyboardconfig.cpp:82 src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:88
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:92
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:98 src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:102 src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:106 src/keyboardconfig.cpp:108
+#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:113
+#: src/keyboardconfig.cpp:115 src/keyboardconfig.cpp:117
+#: src/keyboardconfig.cpp:119 src/keyboardconfig.cpp:121
+#: src/keyboardconfig.cpp:360
 #, c-format
 msgid "Item Shortcut %d"
 msgstr "物品快捷 %d"
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:122
 msgid "Help Window"
 msgstr "帮助窗口"
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:124
 msgid "Status Window"
 msgstr "状态窗口"
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:126
 msgid "Inventory Window"
 msgstr "物品栏窗口"
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:128
 msgid "Equipment Window"
 msgstr "装备窗口"
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:130
 msgid "Skill Window"
 msgstr "技能窗口"
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:132
 msgid "Minimap Window"
 msgstr "小地图窗口"
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:134
 msgid "Chat Window"
 msgstr "聊天窗口"
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:136
 msgid "Item Shortcut Window"
 msgstr "物品快捷窗口"
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:138
 msgid "Setup Window"
 msgstr "设置窗口"
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:140
 msgid "Debug Window"
 msgstr "Debug窗口"
 
-#: src/keyboardconfig.cpp:80
-#, fuzzy
+#: src/keyboardconfig.cpp:142
 msgid "Social Window"
-msgstr "技能窗口"
+msgstr ""
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:144
 msgid "Emote Shortcut Window"
 msgstr "表情快捷窗口"
 
-#: src/keyboardconfig.cpp:82
-#, fuzzy
+#: src/keyboardconfig.cpp:146
 msgid "Outfits Window"
-msgstr "状态窗口"
+msgstr "装具窗口"
 
-#: src/keyboardconfig.cpp:83
-msgid "Wear Outfit"
+#: src/keyboardconfig.cpp:148
+msgid "Shop Window"
+msgstr "橱窗"
+
+#: src/keyboardconfig.cpp:150
+msgid "Quick drop Window"
+msgstr "快速下拉窗口"
+
+#: src/keyboardconfig.cpp:152
+msgid "Kill Stats Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
-msgid "Copy Outfit"
+#: src/keyboardconfig.cpp:154
+msgid "Commands Window"
+msgstr "命令的窗口"
+
+#: src/keyboardconfig.cpp:156
+msgid "Bot Checker Window"
+msgstr "BOT检查窗口"
+
+#: src/keyboardconfig.cpp:159
+msgid "Who Is Online Window"
 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:161
+msgid "Did you know Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:164
+msgid "Previous Social Tab"
+msgstr ""
+
+#: src/keyboardconfig.cpp:166
+msgid "Next Social Tab"
+msgstr ""
+
+#: src/keyboardconfig.cpp:168 src/keyboardconfig.cpp:170
+#: src/keyboardconfig.cpp:172 src/keyboardconfig.cpp:174
+#: src/keyboardconfig.cpp:176 src/keyboardconfig.cpp:178
+#: src/keyboardconfig.cpp:180 src/keyboardconfig.cpp:182
+#: src/keyboardconfig.cpp:184 src/keyboardconfig.cpp:186
+#: src/keyboardconfig.cpp:188 src/keyboardconfig.cpp:190
+#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
+#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
+#: src/keyboardconfig.cpp:201 src/keyboardconfig.cpp:203
+#: src/keyboardconfig.cpp:205 src/keyboardconfig.cpp:207
+#: src/keyboardconfig.cpp:209 src/keyboardconfig.cpp:211
+#: src/keyboardconfig.cpp:213 src/keyboardconfig.cpp:215
+#: src/keyboardconfig.cpp:217 src/keyboardconfig.cpp:220
+#: src/keyboardconfig.cpp:223 src/keyboardconfig.cpp:226
+#: src/keyboardconfig.cpp:228 src/keyboardconfig.cpp:230
+#: src/keyboardconfig.cpp:232 src/keyboardconfig.cpp:234
+#: src/keyboardconfig.cpp:236 src/keyboardconfig.cpp:238
+#: src/keyboardconfig.cpp:240 src/keyboardconfig.cpp:242
+#: src/keyboardconfig.cpp:244 src/keyboardconfig.cpp:247
+#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
+#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
+#: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:259
+#: src/keyboardconfig.cpp:355
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "表情快捷键为 %d"
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:261
+msgid "Wear Outfit"
+msgstr ""
+
+#: src/keyboardconfig.cpp:263
+msgid "Copy Outfit"
+msgstr ""
+
+#: src/keyboardconfig.cpp:265
+msgid "Copy equipped to Outfit"
+msgstr ""
+
+#: src/keyboardconfig.cpp:267
 msgid "Toggle Chat"
 msgstr "切换聊天"
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:269
 msgid "Scroll Chat Up"
 msgstr "向上滚动聊天记录"
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:271
 msgid "Scroll Chat Down"
 msgstr "向下滚动聊天记录"
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:273
 msgid "Previous Chat Tab"
 msgstr "上一个聊天窗口标签页"
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:275
 msgid "Next Chat Tab"
 msgstr "下一个聊天窗口标签页"
 
-#: src/keyboardconfig.cpp:102
-msgid "Select OK"
-msgstr "选择OK"
-
-#: src/keyboardconfig.cpp:104
-msgid "Ignore input 1"
-msgstr "忽略输入1"
-
-#: src/keyboardconfig.cpp:105
-msgid "Ignore input 2"
-msgstr "忽略输入2"
-
-#: src/keyboardconfig.cpp:178
-#, fuzzy, c-format
-msgid ""
-"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
-"strange behaviour."
-msgstr "解决按键冲突，否者游戏过程中可能发生奇怪行为。"
-
-#: src/localplayer.cpp:913
-msgid "Unable to pick up item."
-msgstr "无法拾取物品。"
-
-#. TRANSLATORS: This sentence may be translated differently
-#. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:922
-#, 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
-msgid "mana [options] [mana-file]"
+#: src/keyboardconfig.cpp:278
+msgid "Close current Chat Tab"
 msgstr ""
 
-#: src/main.cpp:44
-msgid "Options:"
-msgstr "选项："
-
-#: src/main.cpp:45
-#, fuzzy
-msgid "  -v --version        : Display the version"
-msgstr "  -v --version\t:显示版本号"
-
-#: src/main.cpp:46
-#, fuzzy
-msgid "  -h --help           : Display this help"
-msgstr "  -h --help\t: 显示该帮助"
-
-#: src/main.cpp:47
-#, fuzzy
-msgid "  -C --config-dir     : Configuration directory to use"
-msgstr "  -C --config-file\t: 使用的配置文件"
-
-#: src/main.cpp:48
-#, fuzzy
-msgid "  -U --username       : Login with this username"
-msgstr "  -U --username\t:以该用户名登录游戏"
-
-#: src/main.cpp:49
-#, fuzzy
-msgid "  -P --password       : Login with this password"
-msgstr "  -P --password\t: 以该密码登录"
-
-#: src/main.cpp:50
-#, fuzzy
-msgid "  -c --character      : Login with this character"
-msgstr "  -c --character\t: 以该角色登录"
-
-#: src/main.cpp:51
-#, fuzzy
-msgid "  -s --server         : Login server name or IP"
-msgstr "  -s --server\t: 登录服务器名或IP"
-
-#: src/main.cpp:52
-#, fuzzy
-msgid "  -p --port           : Login server port"
-msgstr "  -p --port\t: 登录服务器端口"
-
-#: src/main.cpp:53
-#, fuzzy
-msgid "     --update-host    : Use this update host"
-msgstr "  -H --update-host\t: 使用该更新主机"
-
-#: src/main.cpp:54
-#, fuzzy
-msgid "  -D --default        : Choose default character server and character"
-msgstr "  -D --default\t: 选择某人角色服务器和角色"
-
-#: src/main.cpp:56
-#, fuzzy
-msgid "  -u --skip-update    : Skip the update downloads"
-msgstr "  -u --skip-update\t:跳过下载更新"
-
-#: src/main.cpp:57
-#, fuzzy
-msgid "  -d --data           : Directory to load game data from"
-msgstr "  -d --data\t: 从此目录加载游戏数据"
-
-#: src/main.cpp:58
-#, fuzzy
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
-msgstr "  -S --home-dir\t: 用该目录作为家目录"
-
-#: src/main.cpp:59
-#, fuzzy
-msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr "  -S --home-dir\t: 用该目录作为家目录"
-
-#: src/main.cpp:61
-#, fuzzy
-msgid "     --no-opengl      : Disable OpenGL for this session"
-msgstr "  -O --no-opengl\t:为该次会话关闭OpenGL"
+#: src/keyboardconfig.cpp:280
+msgid "Previous chat line"
+msgstr ""
 
-#: src/net/ea/adminhandler.cpp:63
-msgid "Kick failed!"
-msgstr "踢出失败！"
+#: src/keyboardconfig.cpp:282
+msgid "Next chat line"
+msgstr ""
 
-#: src/net/ea/adminhandler.cpp:65
-msgid "Kick succeeded!"
-msgstr "成功踢出！"
+#: src/keyboardconfig.cpp:284
+msgid "Chat Auto Complete"
+msgstr "自动完成交谈"
 
-#: src/net/ea/buysellhandler.cpp:110
-msgid "Nothing to sell."
-msgstr "无物可供出售。"
+#: src/keyboardconfig.cpp:286
+msgid "Deactivate Chat Input"
+msgstr "停用聊天输入"
 
-#: src/net/ea/buysellhandler.cpp:117
-msgid "Thanks for buying."
-msgstr "谢谢你的购买。"
+#: src/keyboardconfig.cpp:288
+msgid "Select OK"
+msgstr "选择OK"
 
-#: src/net/ea/buysellhandler.cpp:124
-msgid "Unable to buy."
-msgstr "无法购买。"
+#: src/keyboardconfig.cpp:291
+msgid "Ignore input 1"
+msgstr "忽略输入1"
 
-#: src/net/ea/buysellhandler.cpp:130
-msgid "Thanks for selling."
-msgstr "感谢您的出售。"
+#: src/keyboardconfig.cpp:293
+msgid "Ignore input 2"
+msgstr "忽略输入2"
 
-#: src/net/ea/buysellhandler.cpp:132
-msgid "Unable to sell."
-msgstr "无法出售."
+#: src/keyboardconfig.cpp:295
+msgid "Direct Up"
+msgstr "直接向上"
 
-#: src/net/ea/charserverhandler.cpp:103
-#, fuzzy
-msgid "Access denied."
-msgstr "访问被拒绝"
+#: src/keyboardconfig.cpp:296
+msgid "Direct Down"
+msgstr "直接下"
 
-#: src/net/ea/charserverhandler.cpp:106
-#, fuzzy
-msgid "Cannot use this ID."
-msgstr "不能使用该ID"
+#: src/keyboardconfig.cpp:298
+msgid "Direct Left"
+msgstr "直接离开"
 
-#: src/net/ea/charserverhandler.cpp:109
-#, fuzzy
-msgid "Unknown failure to select character."
-msgstr "选择人物时遇到未知错误"
+#: src/keyboardconfig.cpp:299
+msgid "Direct Right"
+msgstr "直接对"
 
-#: src/net/ea/charserverhandler.cpp:135
-msgid "Failed to create character. Most likely the name is already taken."
-msgstr "创建角色失败。很可能名称已被占用。"
+#: src/keyboardconfig.cpp:301
+msgid "Crazy moves"
+msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:147 src/net/manaserv/charhandler.cpp:187
-msgid "Info"
-msgstr "信息"
+#: src/keyboardconfig.cpp:303
+msgid "Change Crazy Move mode"
+msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:147
-msgid "Character deleted."
-msgstr "角色已删除。"
+#: src/keyboardconfig.cpp:305
+msgid "Quick Drop N Items from 0 slot"
+msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:152
-msgid "Failed to delete character."
-msgstr "删除角色失败。"
+#: src/keyboardconfig.cpp:307
+msgid "Quick Drop N Items"
+msgstr "快速下降序号项目"
 
-#: src/net/ea/charserverhandler.cpp:237 src/net/manaserv/charhandler.cpp:263
-msgid "Strength:"
-msgstr "力量："
+#: src/keyboardconfig.cpp:309
+msgid "Switch Quick Drop Counter"
+msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:238 src/net/manaserv/charhandler.cpp:264
-msgid "Agility:"
-msgstr "敏捷："
+#: src/keyboardconfig.cpp:311
+msgid "Quick heal target or self"
+msgstr "快速愈合的目标或自我"
 
-#: src/net/ea/charserverhandler.cpp:239 src/net/manaserv/charhandler.cpp:266
-msgid "Vitality:"
-msgstr "生命："
+#: src/keyboardconfig.cpp:313
+msgid "Use #itenplz spell"
+msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:240 src/net/manaserv/charhandler.cpp:267
-msgid "Intelligence:"
-msgstr "智力："
+#: src/keyboardconfig.cpp:315
+msgid "Use magic attack"
+msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:241 src/net/manaserv/charhandler.cpp:265
-msgid "Dexterity:"
-msgstr "灵巧："
+#: src/keyboardconfig.cpp:317
+msgid "Switch magic attack"
+msgstr "切换魔法攻击"
 
-#: src/net/ea/charserverhandler.cpp:242
-msgid "Luck:"
-msgstr "幸运："
+#: src/keyboardconfig.cpp:319
+msgid "Change move type"
+msgstr "更改移动类型"
 
-#: src/net/ea/chathandler.cpp:80
-msgid "Whisper could not be sent, user is offline."
-msgstr "密语无法发送，用户已离线。"
+#: src/keyboardconfig.cpp:321
+msgid "Change Attack Weapon Type"
+msgstr "更改攻击型武器"
 
-#: src/net/ea/chathandler.cpp:84
-msgid "Whisper could not be sent, ignored by user."
-msgstr "密语无法发送，你已被用户忽略。"
+#: src/keyboardconfig.cpp:323
+msgid "Change Attack Type"
+msgstr "更改攻击类型"
 
-#: src/net/ea/chathandler.cpp:171
-#, fuzzy
-msgid "MVP player."
-msgstr "玩家"
+#: src/keyboardconfig.cpp:325
+msgid "Change Follow mode"
+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
-msgid "Channels are not supported!"
-msgstr "聊天频道不被支持！"
+#: src/keyboardconfig.cpp:327
+msgid "Change Imitation mode"
+msgstr "更改仿模式"
 
-#: src/net/ea/gamehandler.cpp:86
-#, c-format
-msgid "Online users: %d"
+#: src/keyboardconfig.cpp:330
+msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:100
-#, fuzzy
-msgid "Game"
-msgstr "姓名"
-
-#: src/net/ea/gamehandler.cpp:100
-#, fuzzy
-msgid "Request to quit denied!"
-msgstr "请求交易"
+#: src/keyboardconfig.cpp:331
+msgid "On / Off audio"
+msgstr "开/关 音频"
 
-#: src/net/ea/generalhandler.cpp:102 src/net/manaserv/generalhandler.cpp:95
-#, c-format
-msgid "Strength %+d"
-msgstr "力量 %+d"
-
-#: src/net/ea/generalhandler.cpp:103 src/net/manaserv/generalhandler.cpp:96
-#, c-format
-msgid "Agility %+d"
-msgstr "敏捷 %+d"
+#: src/keyboardconfig.cpp:333
+msgid "Enable / Disable away mode"
+msgstr ""
 
-#: src/net/ea/generalhandler.cpp:104 src/net/manaserv/generalhandler.cpp:98
-#, c-format
-msgid "Vitality %+d"
-msgstr "生命 %+d"
+#: src/keyboardconfig.cpp:335
+msgid "Emulate right click from keyboard"
+msgstr "从键盘模拟右键单击"
 
-#: src/net/ea/generalhandler.cpp:105 src/net/manaserv/generalhandler.cpp:99
-#, c-format
-msgid "Intelligence %+d"
-msgstr "智慧 %+d"
+#: src/keyboardconfig.cpp:337
+msgid "Toggle camera mode"
+msgstr "切换模式"
 
-#: src/net/ea/generalhandler.cpp:106 src/net/manaserv/generalhandler.cpp:97
-#, c-format
-msgid "Dexterity %+d"
-msgstr "敏捷 %+d"
+#: src/keyboardconfig.cpp:339
+msgid "Modifier key"
+msgstr ""
 
-#: src/net/ea/generalhandler.cpp:107
+#: src/keyboardconfig.cpp:411
 #, c-format
-msgid "Luck %+d"
-msgstr "幸运 %+d"
-
-#: src/net/ea/generalhandler.cpp:130
-#, fuzzy
-msgid "Authentication failed."
-msgstr "验证失败"
-
-#: src/net/ea/generalhandler.cpp:133
-#, fuzzy
-msgid "No servers available."
-msgstr "无可用服务器"
-
-#: src/net/ea/generalhandler.cpp:137
-#, fuzzy
-msgid "Someone else is trying to use this account."
-msgstr "某人正在尝试使用该帐号"
-
-#: src/net/ea/generalhandler.cpp:140
-#, fuzzy
-msgid "This account is already logged in."
-msgstr "该帐号已经登录"
-
-#: src/net/ea/generalhandler.cpp:143
-#, fuzzy
-msgid "Speed hack detected."
-msgstr "检测到调速作弊"
-
-#: src/net/ea/generalhandler.cpp:146
-#, fuzzy
-msgid "Duplicated login."
-msgstr "重复登录"
-
-#: src/net/ea/generalhandler.cpp:149
-#, fuzzy
-msgid "Unknown connection error."
-msgstr "未知连接错误"
-
-#: src/net/ea/generalhandler.cpp:205
-msgid "Got disconnected from server!"
-msgstr "和服务器失去连接"
-
-#: src/net/ea/generalhandler.cpp:216 src/net/manaserv/generalhandler.cpp:166
-msgid "Strength"
-msgstr "力量"
-
-#: src/net/ea/generalhandler.cpp:217 src/net/manaserv/generalhandler.cpp:167
-msgid "Agility"
-msgstr "敏捷"
-
-#: src/net/ea/generalhandler.cpp:218 src/net/manaserv/generalhandler.cpp:169
-msgid "Vitality"
-msgstr "生命"
-
-#: src/net/ea/generalhandler.cpp:219 src/net/manaserv/generalhandler.cpp:170
-msgid "Intelligence"
-msgstr "智慧"
-
-#: src/net/ea/generalhandler.cpp:220 src/net/manaserv/generalhandler.cpp:168
-msgid "Dexterity"
-msgstr "敏捷"
-
-#: src/net/ea/generalhandler.cpp:221
-msgid "Luck"
-msgstr "幸运"
-
-#: src/net/ea/generalhandler.cpp:224
-#, fuzzy
-msgid "Defense"
-msgstr "防御："
-
-#: src/net/ea/generalhandler.cpp:225
-#, fuzzy
-msgid "M.Attack"
-msgstr "魔攻："
-
-#: src/net/ea/generalhandler.cpp:226
-#, fuzzy
-msgid "M.Defense"
-msgstr "魔防："
-
-#: src/net/ea/generalhandler.cpp:227
-#, fuzzy, c-format
-msgid "% Accuracy"
-msgstr "% Ac精确度："
-
-#: src/net/ea/generalhandler.cpp:228
-#, fuzzy, c-format
-msgid "% Evade"
-msgstr "% E回避率："
-
-#: src/net/ea/generalhandler.cpp:229
-#, fuzzy, c-format
-msgid "% Critical"
-msgstr "会心一击"
+msgid ""
+"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
+"strange behaviour."
+msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:61 src/net/ea/gui/partytab.cpp:59
-msgid "/help > Display this help."
-msgstr "/help > 显示该帮助信息。"
-
-#: src/net/ea/gui/guildtab.cpp:62
-#, fuzzy
-msgid "/invite > Invite a player to your guild"
-msgstr "/invite > 邀请某一玩家加入您的帮会"
-
-#: src/net/ea/gui/guildtab.cpp:63
-#, fuzzy
-msgid "/leave > Leave the guild you are in"
-msgstr "/leave > 离开你所在的帮会"
-
-#: src/net/ea/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
-msgid "Command: /invite <nick>"
-msgstr "命令：/invite <昵称>"
-
-#: src/net/ea/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
-msgid "Command: /leave"
-msgstr "命令：/leave"
-
-#: src/net/ea/gui/guildtab.cpp:81
-#, fuzzy
-msgid "This command causes the player to leave the guild."
-msgstr "该命令致使玩家离开帮会"
-
-#: src/net/ea/gui/guildtab.cpp:89
-#, fuzzy
-msgid "Guild name is missing."
-msgstr "帮会名称缺失。"
+#: src/localplayer.cpp:371
+msgid "You were killed by "
+msgstr "你被打死"
 
-#: src/net/ea/guildhandler.cpp:293
-msgid "Could not inivte user to guild."
+#: src/localplayer.cpp:1402
+msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:298
-msgid "User rejected guild invite."
+#: src/localplayer.cpp:1404
+msgid "Item is too heavy."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:303
-#, fuzzy
-msgid "User is now part of your guild."
-msgstr "%s现在是你帮会中的成员了。"
+#: src/localplayer.cpp:1406
+msgid "Item is too far away."
+msgstr ""
 
-#: src/net/ea/guildhandler.cpp:308
-msgid "Your guild is full."
+#: src/localplayer.cpp:1408
+msgid "Inventory is full."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:313
-#, fuzzy
-msgid "Unknown guild invite response."
-msgstr "未知邀请应答%s。"
+#: src/localplayer.cpp:1410
+msgid "Stack is too big."
+msgstr ""
 
-#: src/net/ea/guildhandler.cpp:390
-msgid "Guild creation isn't supported yet."
+#: src/localplayer.cpp:1413
+msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:60
-msgid "/invite > Invite a player to your party"
-msgstr "/invite > 邀请某一玩家加入您的帮会"
+#: src/localplayer.cpp:1416
+msgid "Unknown problem picking up item."
+msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:61
-msgid "/leave > Leave the party you are in"
-msgstr "/leave > 离开你所在的帮会"
+#. TRANSLATORS: %d is number,
+#. [@@%d|%s@@] - here player can see link to item
+#: src/localplayer.cpp:1440
+#, c-format
+msgid "You picked up %d [@@%d|%s@@]."
+msgid_plural "You picked up %d [@@%d|%s@@]."
+msgstr[0] ""
 
-#: src/net/ea/gui/partytab.cpp:62
-msgid "/kick > Kick some one from the party you are in"
-msgstr "/kick > 把某人踢出你所在的帮会"
+#: src/localplayer.cpp:3174
+msgid "Away"
+msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:63
-msgid "/item > Show/change party item sharing options"
-msgstr "/item > 显示/改变帮会项目共享选项"
+#: src/localplayer.cpp:3478
+msgid "Follow: "
+msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:64
-msgid "/exp > Show/change party experience sharing options"
-msgstr "/exp > 显示/改变帮会经验共享选项"
+#: src/localplayer.cpp:3480 src/localplayer.cpp:3495
+msgid "Follow canceled"
+msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:81
-msgid "This command causes the player to leave the party."
-msgstr "该命令致使玩家离开帮会"
+#: src/localplayer.cpp:3487
+msgid "Imitation: "
+msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:85
-msgid "Command: /item <policy>"
-msgstr "命令：/item <策略>"
+#: src/localplayer.cpp:3489 src/localplayer.cpp:3497
+msgid "Imitation canceled"
+msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:86
-msgid "This command changes the party's item sharing policy."
-msgstr "改命令改变帮会的物品共享策略。"
+#: src/localplayer.cpp:3849
+msgid "You see "
+msgstr "你看"
 
-#: src/net/ea/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."
+#: src/main.cpp:47
+msgid "manaplus [options] [mana-file]"
 msgstr ""
-"<策略>可以为“1”，“yes”，“true”其中之一以开启物品共享，或者 是\"0\",\"no\","
-"\"false\"用来禁止物品共享。"
 
-#: src/net/ea/gui/partytab.cpp:90
-msgid "Command: /item"
-msgstr "命令：/item"
+#: src/main.cpp:48
+msgid "[mana-file] : The mana file is an XML file (.mana)"
+msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:91
-msgid "This command displays the party's current item sharing policy."
-msgstr "该命令显示帮会现有的物品共享策略。"
+#: src/main.cpp:49
+msgid "              used to set custom parameters"
+msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:95
-msgid "Command: /exp <policy>"
-msgstr "命令：/exp <策略>"
+#: src/main.cpp:50
+msgid "              to the manaplus client."
+msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:96
-msgid "This command changes the party's experience sharing policy."
-msgstr "该命令改变帮会的经验共享策略。"
+#: src/main.cpp:52
+msgid "Options:"
+msgstr "选项："
 
-#: src/net/ea/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."
+#: src/main.cpp:53
+msgid "  -l --log-file       : Log file to use"
 msgstr ""
-"<策略>可以为“1”，“yes”，“true”其中之一以开启经验共享，或者 是\"0\",\"no\","
-"\"false\"用来关闭经验共享。"
 
-#: src/net/ea/gui/partytab.cpp:100
-msgid "Command: /exp"
-msgstr "命令：/exp"
-
-#: src/net/ea/gui/partytab.cpp:101
-msgid "This command displays the party's current experience sharing policy."
-msgstr "该命令显示帮会现有的经验共享策略。"
+#: src/main.cpp:54
+msgid "  -L --chat-log-dir   : Chat log dir to use"
+msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:132 src/net/ea/partyhandler.cpp:198
-msgid "Item sharing enabled."
-msgstr "物品共享开启。"
+#: src/main.cpp:55
+msgid "  -v --version        : Display the version"
+msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:135 src/net/ea/partyhandler.cpp:204
-msgid "Item sharing disabled."
-msgstr "物品共享关闭。"
+#: src/main.cpp:56
+msgid "  -h --help           : Display this help"
+msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:138 src/net/ea/partyhandler.cpp:210
-msgid "Item sharing not possible."
-msgstr "物品共享不可能。"
+#: src/main.cpp:57
+msgid "  -C --config-dir     : Configuration directory to use"
+msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:141
-#, fuzzy
-msgid "Item sharing unknown."
-msgstr "物品共享开启。"
+#: src/main.cpp:58
+msgid "  -U --username       : Login with this username"
+msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:167 src/net/ea/partyhandler.cpp:174
-msgid "Experience sharing enabled."
-msgstr "经验共享开启。"
+#: src/main.cpp:59
+msgid "  -P --password       : Login with this password"
+msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:170 src/net/ea/partyhandler.cpp:180
-msgid "Experience sharing disabled."
-msgstr "经验共享关闭。"
+#: src/main.cpp:60
+msgid "  -c --character      : Login with this character"
+msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:173 src/net/ea/partyhandler.cpp:186
-msgid "Experience sharing not possible."
-msgstr "经验共享不可能。"
+#: src/main.cpp:61
+msgid "  -s --server         : Login server name or IP"
+msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:176
-#, fuzzy
-msgid "Experience sharing unknown."
-msgstr "经验共享开启。"
+#: src/main.cpp:62
+msgid "  -p --port           : Login server port"
+msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:281
-msgid "Failed to use item."
-msgstr "使用物品失败。"
+#: src/main.cpp:63
+msgid "     --update-host    : Use this update host"
+msgstr "--update-host:    使用此更新主机"
 
-#: src/net/ea/inventoryhandler.cpp:391
-msgid "Unable to equip."
-msgstr "无法装备。"
+#: src/main.cpp:64
+msgid "  -D --default        : Choose default character server and character"
+msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:402
-msgid "Unable to unequip."
-msgstr "无法卸载装备。"
+#: src/main.cpp:66
+msgid "  -u --skip-update    : Skip the update downloads"
+msgstr ""
 
-#: src/net/ea/loginhandler.cpp:79
-msgid "Account was not found. Please re-login."
-msgstr "帐号不存在。请重新登录。"
+#: src/main.cpp:67
+msgid "  -d --data           : Directory to load game data from"
+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
-#, 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
-#, fuzzy
-msgid "Unregistered ID."
-msgstr "未注册ID"
-
-#: src/net/ea/loginhandler.cpp:152
-#, fuzzy
-msgid "Wrong password."
-msgstr "错误的密码"
-
-#: src/net/ea/loginhandler.cpp:155
-#, fuzzy
-msgid "Account expired."
-msgstr "帐号期满"
-
-#: src/net/ea/loginhandler.cpp:158
-#, fuzzy
-msgid "Rejected from server."
-msgstr "登录请求被拒绝"
-
-#: src/net/ea/loginhandler.cpp:161
-#, fuzzy
-msgid ""
-"You have been permanently banned from the game. Please contact the GM team."
-msgstr "你已被永久性禁止游戏。请联系GM团队。"
+#: src/main.cpp:69
+msgid "  -L --localdata-dir  : Directory to use as local data directory"
+msgstr ""
 
-#: src/net/ea/loginhandler.cpp:165
-#, c-format
-msgid ""
-"You have been temporarily banned from the game until %s.\n"
-"Please contact the GM team via the forums."
+#: src/main.cpp:71
+msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
-"你被暂时禁止进入游戏直到%s.\n"
-"请通过论坛联系GM组"
 
-#: src/net/ea/loginhandler.cpp:172
-#, fuzzy
-msgid "This user name is already taken."
-msgstr "该用户名已被使用"
+#: src/main.cpp:72
+msgid "     --safemode       : Start game in safe mode"
+msgstr ""
 
-#: src/net/ea/network.cpp:145
-msgid "Empty address given to Network::connect()!"
+#: src/main.cpp:74
+msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
-#: src/net/ea/network.cpp:345
-#, fuzzy
-msgid "Unable to resolve host \""
-msgstr "无法出售."
+#: src/net/ea/buysellhandler.cpp:163
+msgid "Nothing to sell."
+msgstr "无物可供出售。"
 
-#: src/net/ea/network.cpp:414
-#, fuzzy
-msgid "Connection to server terminated. "
-msgstr "正在连接 地图 服务器..."
+#: src/net/ea/buysellhandler.cpp:171
+msgid "Thanks for buying."
+msgstr "谢谢你的购买。"
 
-#: src/net/ea/partyhandler.cpp:81
-msgid "Could not create party."
-msgstr "无法创建帮会。"
+#: src/net/ea/buysellhandler.cpp:179
+msgid "Unable to buy."
+msgstr "无法购买。"
 
-#: src/net/ea/partyhandler.cpp:84
-msgid "Party successfully created."
-msgstr "帮会创建成功。"
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
+msgid "Strength"
+msgstr "力量"
 
-#: src/net/ea/partyhandler.cpp:118
+#: src/net/manaserv/attributes.cpp:167
 #, c-format
-msgid "%s is already a member of a party."
-msgstr "%s已经是你的帮会成员了。"
+msgid "Strength %+.1f"
+msgstr "力量%+.1f"
 
-#: src/net/ea/partyhandler.cpp:122
-#, c-format
-msgid "%s refused your invitation."
-msgstr "%s拒绝了您的邀请。"
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
+msgid "Agility"
+msgstr "敏捷"
 
-#: src/net/ea/partyhandler.cpp:126
+#: src/net/manaserv/attributes.cpp:180
 #, c-format
-msgid "%s is now a member of your party."
-msgstr "%s现在是你帮会中的成员了。"
+msgid "Agility %+.1f"
+msgstr "敏捷 %+.1f"
+
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
+msgid "Dexterity"
+msgstr "灵巧"
 
-#: src/net/ea/partyhandler.cpp:130
+#: src/net/manaserv/attributes.cpp:193
 #, c-format
-msgid "Unknown invite response for %s."
-msgstr "未知邀请应答%s。"
+msgid "Dexterity %+.1f"
+msgstr "灵巧%+.1f"
 
-#: src/net/ea/partyhandler.cpp:238
-msgid "You have left the party."
-msgstr "你以退出帮会"
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
+msgid "Vitality"
+msgstr "活力"
 
-#: src/net/ea/partyhandler.cpp:249
+#: src/net/manaserv/attributes.cpp:206
 #, c-format
-msgid "%s has left your party."
-msgstr "%s已经离开你的帮会。"
+msgid "Vitality %+.1f"
+msgstr "活力%+.1f"
 
-#: src/net/ea/partyhandler.cpp:301
-#, c-format
-msgid "An unknown member tried to say: %s"
-msgstr "一未知成员尝试说：%s"
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
+msgid "Intelligence"
+msgstr "情报"
 
-#: src/net/ea/partyhandler.cpp:329
-msgid "Inviting like this isn't supported at the moment."
-msgstr "这种方式的邀请暂时不支持。"
+#: src/net/manaserv/attributes.cpp:219
+#, c-format
+msgid "Intelligence %+.1f"
+msgstr "智慧%+.1f"
 
-#: src/net/ea/partyhandler.cpp:334
-msgid "You can only inivte when you are in a party!"
-msgstr ""
+#: src/net/manaserv/attributes.cpp:225
+msgid "Willpower"
+msgstr "意志"
 
-#: src/net/ea/partyhandler.cpp:365
+#: src/net/manaserv/attributes.cpp:232
 #, c-format
-msgid "%s is not in your party!"
-msgstr "%s不在你的帮会中！"
+msgid "Willpower %+.1f"
+msgstr "意志力%+.1f"
 
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:304
+#: src/net/manaserv/beinghandler.cpp:315
 msgid "You are dead."
 msgstr "你已玩完了。"
 
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:305
+#: src/net/manaserv/beinghandler.cpp:316
 msgid "We regret to inform you that your character was killed in battle."
 msgstr "很遗憾的告诉您，您的角色在战斗中死亡了"
 
-#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:307
+#: src/net/manaserv/beinghandler.cpp:318
 msgid "You are not that alive anymore."
 msgstr "你再也不是那样的生机勃勃了。"
 
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:308
+#: src/net/manaserv/beinghandler.cpp:319
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:309
+#: src/net/manaserv/beinghandler.cpp:320
 msgid "Game Over!"
 msgstr "游戏结束！"
 
-#: src/net/ea/playerhandler.cpp:105
-msgid "Insert coin to continue."
-msgstr "投入游戏币继续。"
-
-#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:310
+#: src/net/manaserv/beinghandler.cpp:321
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr "不，孩子。你的角色没有真正死亡。他……呃……不过是去了一个更好的地方而已。"
 
-#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:312
+#: src/net/manaserv/beinghandler.cpp:323
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:314
+#: src/net/manaserv/beinghandler.cpp:325
 msgid "I guess this did not run too well."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:315
+#: src/net/manaserv/beinghandler.cpp:326
 msgid "Do you want your possessions identified?"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:316
+#: src/net/manaserv/beinghandler.cpp:327
 msgid "Sadly, no trace of you was ever found..."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:317
+#: src/net/manaserv/beinghandler.cpp:329
 msgid "Annihilated."
 msgstr "被消灭了。"
 
-#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:318
+#: src/net/manaserv/beinghandler.cpp:330
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:120 src/net/manaserv/beinghandler.cpp:319
+#: src/net/manaserv/beinghandler.cpp:332
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:123
-msgid "You're not dead yet. You're just resting."
-msgstr "你还没死，你只是在休息"
-
-#: src/net/ea/playerhandler.cpp:124
-msgid "You are no more."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:125
-msgid "You have ceased to be."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:126
-msgid "You've expired and gone to meet your maker."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:127
-msgid "You're a stiff."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:128
-msgid "Bereft of life, you rest in peace."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:129
-msgid "If you weren't so animated, you'd be pushing up the daisies."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:130
-msgid "Your metabolic processes are now history."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:131
-msgid "You're off the twig."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:132
-msgid "You've kicked the bucket."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:133
-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
-msgid "You are an ex-player."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:136
-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
-msgid "Message"
-msgstr "讯息"
-
-#: src/net/ea/playerhandler.cpp:250
-msgid ""
-"You are carrying more than half your weight. You are unable to regain health."
-msgstr "你已携带超过半数负重。无法回复健康（体力）"
-
-#: src/net/ea/playerhandler.cpp:333
-#, fuzzy, c-format
-msgid "You picked up %s."
-msgstr "你捡起 "
-
-#: src/net/ea/playerhandler.cpp:369
-msgid "Cannot raise skill!"
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:532
-msgid "Equip arrows first."
-msgstr "请先装备弓箭。"
-
-#: src/net/ea/specialhandler.cpp:147
-msgid "Trade failed!"
-msgstr "交易失败！"
-
-#: src/net/ea/specialhandler.cpp:150
-msgid "Emote failed!"
-msgstr "发送表情失败！"
-
-#: src/net/ea/specialhandler.cpp:153
-msgid "Sit failed!"
-msgstr "原地休息失败！"
-
-#: src/net/ea/specialhandler.cpp:156
-msgid "Chat creating failed!"
-msgstr "聊天创建失败！"
-
-#: src/net/ea/specialhandler.cpp:159
-msgid "Could not join party!"
-msgstr "不能加入工会！"
-
-#: src/net/ea/specialhandler.cpp:162
-msgid "Cannot shout!"
-msgstr "无法呼喊！"
-
-#: src/net/ea/specialhandler.cpp:171
-msgid "You have not yet reached a high enough lvl!"
-msgstr "你还没有达到足够的等级！"
-
-#: src/net/ea/specialhandler.cpp:174
-msgid "Insufficient HP!"
-msgstr "HP不足！"
-
-#: src/net/ea/specialhandler.cpp:177
-msgid "Insufficient SP!"
-msgstr "SP不足！"
-
-#: src/net/ea/specialhandler.cpp:180
-msgid "You have no memos!"
-msgstr "没有备忘录"
-
-#: src/net/ea/specialhandler.cpp:183
-msgid "You cannot do that right now!"
-msgstr "你无法办到！"
-
-#: src/net/ea/specialhandler.cpp:186
-msgid "Seems you need more money... ;-)"
-msgstr "看起来需要更多金币…… ;-)"
-
-#: src/net/ea/specialhandler.cpp:189
-msgid "You cannot use this skill with that kind of weapon!"
-msgstr "此武器无法用来使用此项技能！"
-
-#: src/net/ea/specialhandler.cpp:192
-msgid "You need another red gem!"
-msgstr "你需要另一颗红宝石！"
-
-#: src/net/ea/specialhandler.cpp:195
-msgid "You need another blue gem!"
-msgstr "你需要另一颗蓝宝石！"
-
-#: src/net/ea/specialhandler.cpp:198
-msgid "You're carrying to much to do this!"
-msgstr "你已负重太多，无法办到！"
-
-#: src/net/ea/specialhandler.cpp:201
-msgid "Huh? What's that?"
-msgstr "啊？那是什么？"
-
-#: src/net/ea/specialhandler.cpp:210
-msgid "Warp failed..."
-msgstr "传送失败..."
-
-#: src/net/ea/specialhandler.cpp:213
-msgid "Could not steal anything..."
-msgstr "无法偷取任何物品..."
-
-#: src/net/ea/specialhandler.cpp:216
-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
-msgid "Trading isn't possible. Trade partner is too far away."
-msgstr "交易不可能进行。与交易伙伴太过太过遥远"
-
-#: src/net/ea/tradehandler.cpp:128
-msgid "Trading isn't possible. Character doesn't exist."
-msgstr "交易不可能进行。角色不存在。"
-
-#: src/net/ea/tradehandler.cpp:132
-msgid "Trade cancelled due to an unknown reason."
-msgstr "交易取消因不明原因。"
-
-#: src/net/ea/tradehandler.cpp:137
-#, c-format
-msgid "Trade: You and %s"
-msgstr "交易：您和%s"
-
-#: src/net/ea/tradehandler.cpp:144
-#, c-format
-msgid "Trade with %s cancelled."
-msgstr "与%s的交易被取消。"
-
-#: src/net/ea/tradehandler.cpp:153
-msgid "Unhandled trade cancel packet."
-msgstr "未处理的交易取消分组。"
-
-#: src/net/ea/tradehandler.cpp:202
-msgid "Failed adding item. Trade partner is over weighted."
-msgstr "添加项目失败。交易伙伴已经负重太多。"
-
-#: src/net/ea/tradehandler.cpp:207
-msgid "Failed adding item. Trade partner has no free slot."
-msgstr "添加项目失败。交易伙伴无空闲槽存放物品。"
-
-#: src/net/ea/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
+#: src/net/manaserv/beinghandler.cpp:337
 msgid "Press OK to respawn."
-msgstr " 按OK重新开始"
+msgstr "按确定以重生。"
 
-#: src/net/manaserv/beinghandler.cpp:325
-#, fuzzy
+#: src/net/manaserv/beinghandler.cpp:338
 msgid "You Died"
-msgstr "你完蛋了"
+msgstr "你死了"
 
-#: src/net/manaserv/charhandler.cpp:128 src/net/manaserv/charhandler.cpp:196
-#, fuzzy
+#: src/net/manaserv/charhandler.cpp:145 src/net/manaserv/charhandler.cpp:219
 msgid "Not logged in."
-msgstr "已经登录"
+msgstr "未登录。"
 
-#: src/net/manaserv/charhandler.cpp:131
+#: src/net/manaserv/charhandler.cpp:148
 msgid "No empty slot."
-msgstr ""
+msgstr "无空槽。"
 
-#: src/net/manaserv/charhandler.cpp:134
+#: src/net/manaserv/charhandler.cpp:151
 msgid "Invalid name."
-msgstr ""
+msgstr "名称无效。"
 
-#: src/net/manaserv/charhandler.cpp:137
-#, fuzzy
+#: src/net/manaserv/charhandler.cpp:154
 msgid "Character's name already exists."
-msgstr "用户名已存在"
+msgstr "人物的名字已经存在。"
 
-#: src/net/manaserv/charhandler.cpp:140
+#: src/net/manaserv/charhandler.cpp:157
 msgid "Invalid hairstyle."
-msgstr ""
+msgstr "无效的发型。"
 
-#: src/net/manaserv/charhandler.cpp:143
+#: src/net/manaserv/charhandler.cpp:160
 msgid "Invalid hair color."
-msgstr ""
+msgstr "头发的颜色无效。"
 
-#: src/net/manaserv/charhandler.cpp:146
+#: src/net/manaserv/charhandler.cpp:163
 msgid "Invalid gender."
-msgstr ""
+msgstr "无效的性别。"
 
-#: src/net/manaserv/charhandler.cpp:149
-#, fuzzy
+#: src/net/manaserv/charhandler.cpp:166
 msgid "Character's stats are too high."
-msgstr "角色状态可以"
+msgstr "字符的统计太高。"
 
-#: src/net/manaserv/charhandler.cpp:152
-#, fuzzy
+#: src/net/manaserv/charhandler.cpp:169
 msgid "Character's stats are too low."
-msgstr "角色状态可以"
+msgstr "字符的统计过低。"
 
-#: src/net/manaserv/charhandler.cpp:155
-msgid "One stat is zero."
+#: src/net/manaserv/charhandler.cpp:172
+#, c-format
+msgid "At least one stat is out of the permitted range: (%u - %u)."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:187
-#, fuzzy
+#: src/net/manaserv/charhandler.cpp:178
+msgid "Invalid slot number."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
+#: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
+#: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
+msgid "Unknown error."
+msgstr "未知的错误。"
+
+#: src/net/manaserv/charhandler.cpp:210
+msgid "Info"
+msgstr "信息"
+
+#: src/net/manaserv/charhandler.cpp:210
 msgid "Player deleted."
-msgstr "角色已删除。"
+msgstr "删除。"
 
-#: src/net/manaserv/charhandler.cpp:199
-#, fuzzy
+#: src/net/manaserv/charhandler.cpp:222
 msgid "Selection out of range."
-msgstr "请选择交易的物品数量。"
+msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:202
-#, fuzzy, c-format
+#: src/net/manaserv/charhandler.cpp:225
+#, c-format
 msgid "Unknown error (%d)."
-msgstr "未明错误"
+msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:242
+#: src/net/manaserv/charhandler.cpp:261
 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
+#: src/net/manaserv/chathandler.cpp:186 src/net/manaserv/chathandler.cpp:309
+#: src/net/manaserv/guildhandler.cpp:265
 #, c-format
 msgid "Topic: %s"
 msgstr "主题：%s"
 
-#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
-#, fuzzy
+#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:269
 msgid "Players in this channel:"
-msgstr "玩家攻击怪兽"
+msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:201
-#, fuzzy
+#: src/net/manaserv/chathandler.cpp:208
 msgid "Error joining channel."
-msgstr "命令：/join <频道>"
+msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:207
-#, fuzzy
+#: src/net/manaserv/chathandler.cpp:214
 msgid "Listing channels."
-msgstr "请求加入频道%s。"
+msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:219
+#: src/net/manaserv/chathandler.cpp:226
 msgid "End of channel list."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:291
-#, fuzzy, c-format
+#: src/net/manaserv/chathandler.cpp:299
+#, c-format
 msgid "%s entered the channel."
-msgstr "%s加入了帮会。"
+msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:296
+#: src/net/manaserv/chathandler.cpp:304
 #, c-format
 msgid "%s left the channel."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:312
+#: src/net/manaserv/chathandler.cpp:320
 #, c-format
 msgid "%s has set mode %s on user %s."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:322
+#: src/net/manaserv/chathandler.cpp:331
 #, c-format
 msgid "%s has kicked %s."
-msgstr ""
+msgstr "%s已被%s踢出"
 
-#: src/net/manaserv/chathandler.cpp:327
-#, fuzzy
+#: src/net/manaserv/chathandler.cpp:337
 msgid "Unknown channel event."
-msgstr "未知命令。"
-
-#: src/net/manaserv/generalhandler.cpp:100
-#, c-format
-msgid "Willpower %+d"
-msgstr "意志力 %+d"
-
-#: src/net/manaserv/generalhandler.cpp:171
-#, fuzzy
-msgid "Willpower"
-msgstr "意志力："
+msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:81
+#: src/net/manaserv/guildhandler.cpp:85
 msgid "Guild created."
 msgstr "帮会已创建"
 
-#: src/net/manaserv/guildhandler.cpp:86
+#: src/net/manaserv/guildhandler.cpp:90
 msgid "Error creating guild."
-msgstr ""
+msgstr "创建公会时发生错误。"
 
-#: src/net/manaserv/guildhandler.cpp:96
+#: src/net/manaserv/guildhandler.cpp:100
 msgid "Invite sent."
 msgstr "邀请已发送。"
 
-#: src/net/manaserv/guildhandler.cpp:203
+#: src/net/manaserv/guildhandler.cpp:207
 msgid "Member was promoted successfully."
 msgstr "会员晋升成功。"
 
-#: src/net/manaserv/guildhandler.cpp:208
+#: src/net/manaserv/guildhandler.cpp:212
 msgid "Failed to promote member."
 msgstr "晋升会员失败。"
 
-#: src/net/manaserv/loginhandler.cpp:87
-#, fuzzy
+#: src/net/manaserv/loginhandler.cpp:93
 msgid "Wrong magic_token."
-msgstr "错误的 magic_token"
+msgstr "错误magic_token。"
 
-#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
-#, fuzzy
+#: src/net/manaserv/loginhandler.cpp:96 src/net/manaserv/loginhandler.cpp:281
 msgid "Already logged in."
-msgstr "已经登录"
+msgstr "已登录。"
 
-#: src/net/manaserv/loginhandler.cpp:93 src/net/manaserv/loginhandler.cpp:272
-#, fuzzy
-msgid "Server is full."
-msgstr "服务器满载"
+#: src/net/manaserv/loginhandler.cpp:99
+msgid "Account banned."
+msgstr "帐户被禁止。"
 
-#: src/net/manaserv/loginhandler.cpp:118
-#, fuzzy
+#: src/net/manaserv/loginhandler.cpp:124
 msgid "New password incorrect."
-msgstr "新密码错误"
+msgstr "新密码不正确。"
 
-#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
+#: src/net/manaserv/loginhandler.cpp:127
+msgid "Old password incorrect."
+msgstr "旧密码不正确。"
+
+#: src/net/manaserv/loginhandler.cpp:131 src/net/manaserv/loginhandler.cpp:163
 msgid "Account not connected. Please login first."
 msgstr "账户未连接。请先登录。"
 
-#: src/net/manaserv/loginhandler.cpp:149
-#, fuzzy
+#: src/net/manaserv/loginhandler.cpp:156
 msgid "New email address incorrect."
-msgstr "新电子邮件地址不正确"
+msgstr "新的电子邮件地址不正确。"
 
-#: src/net/manaserv/loginhandler.cpp:152
-#, fuzzy
+#: src/net/manaserv/loginhandler.cpp:159
 msgid "Old email address incorrect."
-msgstr "原电子邮件地址不正确"
+msgstr "旧的电子邮件地址不正确。"
 
-#: src/net/manaserv/loginhandler.cpp:158
-#, fuzzy
+#: src/net/manaserv/loginhandler.cpp:167
 msgid "The new email address already exists."
-msgstr "新电子邮件地址已经存在。"
+msgstr "新的电子邮件地址已存在。"
 
-#: src/net/manaserv/loginhandler.cpp:239
+#: src/net/manaserv/loginhandler.cpp:249
 msgid ""
 "Client registration is not allowed. Please contact server administration."
-msgstr ""
+msgstr "客户端注册是不允许的。请联系服务器管理。"
 
-#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
-#, fuzzy
+#: src/net/manaserv/loginhandler.cpp:275 src/net/manaserv/loginhandler.cpp:312
 msgid "Client version is too old."
-msgstr "客户端版本太旧"
+msgstr "客户端版本太旧。"
 
-#: src/net/manaserv/loginhandler.cpp:266
-#, fuzzy
+#: src/net/manaserv/loginhandler.cpp:278
 msgid "Wrong username or password."
-msgstr "错误的用户名或密码"
+msgstr "用户名或密码错误。"
 
-#: src/net/manaserv/loginhandler.cpp:275
+#: src/net/manaserv/loginhandler.cpp:284
+msgid "Account banned"
+msgstr "帐户被禁止"
+
+#: src/net/manaserv/loginhandler.cpp:287
 msgid "Login attempt too soon after previous attempt."
-msgstr ""
+msgstr "登录尝试后，以前的尝试还为时过早。"
 
-#: src/net/manaserv/loginhandler.cpp:303
-#, fuzzy
+#: src/net/manaserv/loginhandler.cpp:315
 msgid "Wrong username, password or email address."
-msgstr "错误的用户名，密码或者电子邮件地址"
+msgstr "错误的用户名，密码或电子邮件地址。"
 
-#: src/net/manaserv/loginhandler.cpp:306
-#, fuzzy
+#: src/net/manaserv/loginhandler.cpp:318
 msgid "Username already exists."
-msgstr "用户名已存在"
+msgstr "用户名已存在。"
 
-#: src/net/manaserv/loginhandler.cpp:309
-#, fuzzy
+#: src/net/manaserv/loginhandler.cpp:321
 msgid "Email address already exists."
-msgstr "电子邮件地址已存在"
+msgstr "电子邮件地址已存在。"
 
-#: src/net/manaserv/loginhandler.cpp:312
+#: src/net/manaserv/loginhandler.cpp:324
 msgid "You took too long with the captcha or your response was incorrect."
-msgstr ""
+msgstr "你的时间太长与CAPTCHA或你的反应是不正确的。"
 
-#: src/net/manaserv/partyhandler.cpp:88
+#: src/net/manaserv/partyhandler.cpp:90
 msgid "Joined party."
 msgstr "加入了帮会。"
 
-#: src/net/manaserv/partyhandler.cpp:106
+#: src/net/manaserv/partyhandler.cpp:108
 #, c-format
 msgid "%s joined the party."
 msgstr "%s加入了帮会。"
 
-#: src/net/manaserv/partyhandler.cpp:123
-#, fuzzy, c-format
+#: src/net/manaserv/partyhandler.cpp:126
+#, c-format
 msgid "%s rejected your invite."
-msgstr "%s拒绝了您的邀请。"
+msgstr "%s的拒绝你的邀请。"
 
-#: src/net/manaserv/tradehandler.cpp:96
+#: src/net/manaserv/tradehandler.cpp:107
 msgid "Accepting incoming trade requests."
 msgstr "正在接受交易请求"
 
-#: src/net/manaserv/tradehandler.cpp:98
+#: src/net/manaserv/tradehandler.cpp:109
 msgid "Ignoring incoming trade requests."
 msgstr "忽略交易请求"
 
-#: src/net/manaserv/tradehandler.cpp:135
+#: src/net/manaserv/tradehandler.cpp:128
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
+msgstr "%s想和您进行交易，是否接受？"
+
+#: src/net/manaserv/tradehandler.cpp:146
 #, c-format
 msgid "Trading with %s"
 msgstr "与%s交易中"
 
-#: src/playerrelations.cpp:304
-#, fuzzy
-msgid "Completely ignore"
-msgstr "@@ignore|完全忽略%s@@"
+#: src/net/manaserv/tradehandler.cpp:160
+msgid "Trade canceled."
+msgstr "交易取消。"
 
-#: src/playerrelations.cpp:318
-msgid "Print '...'"
-msgstr ""
+#: src/net/manaserv/tradehandler.cpp:167
+msgid "Trade completed."
+msgstr "交易完成。"
 
-#: src/playerrelations.cpp:334
-msgid "Blink name"
-msgstr ""
+#: src/net/tmwa/adminhandler.cpp:70
+msgid "Kick failed!"
+msgstr "踢出失败！"
 
-#: src/playerrelations.cpp:371
-msgid "Floating '...' bubble"
-msgstr ""
+#: src/net/tmwa/adminhandler.cpp:72
+msgid "Kick succeeded!"
+msgstr "成功踢出！"
 
-#: src/playerrelations.cpp:374
-msgid "Floating bubble"
+#: src/net/tmwa/buysellhandler.cpp:133
+msgid "Thanks for selling."
+msgstr "感谢您的出售。"
+
+#: src/net/tmwa/buysellhandler.cpp:137
+msgid "Unable to sell."
+msgstr "无法出售."
+
+#: src/net/tmwa/buysellhandler.cpp:140
+msgid "Unable to sell while trading."
+msgstr "不能出售，交易。"
+
+#: src/net/tmwa/buysellhandler.cpp:143
+msgid "Unable to sell unsellable item."
 msgstr ""
 
-#: src/resources/itemdb.cpp:52
+#: src/net/tmwa/generalhandler.cpp:109
 #, c-format
-msgid "Attack %+d"
-msgstr "攻击 %+d"
+msgid "Strength %+d"
+msgstr "力量 %+d"
 
-#: src/resources/itemdb.cpp:53
+#: src/net/tmwa/generalhandler.cpp:110
 #, c-format
-msgid "Defense %+d"
-msgstr "防护 %+d"
+msgid "Agility %+d"
+msgstr "敏捷 %+d"
 
-#: src/resources/itemdb.cpp:54
+#: src/net/tmwa/generalhandler.cpp:111
 #, c-format
-msgid "HP %+d"
-msgstr "HP %+d"
+msgid "Vitality %+d"
+msgstr "生命 %+d"
 
-#: src/resources/itemdb.cpp:55
+#: src/net/tmwa/generalhandler.cpp:112
 #, c-format
-msgid "MP %+d"
-msgstr "MP %+d"
-
-#: src/resources/itemdb.cpp:114
-msgid "Unknown item"
-msgstr "未知物品"
-
-#: src/resources/itemdb.cpp:158 src/resources/monsterdb.cpp:45
-#: src/resources/monsterdb.cpp:67
-msgid "unnamed"
-msgstr "未知怪兽"
-
-#~ msgid "no"
-#~ msgstr "不"
-
-#~ msgid "Buddy"
-#~ msgstr "好友"
-
-#~ msgid "Buddy List"
-#~ msgstr "好友列表"
-
-#~ msgid "Description: %s"
-#~ msgstr "描述：%s"
-
-#~ msgid "Effect: %s"
-#~ msgstr "效果：%s"
-
-#~ msgid "Previous"
-#~ msgstr "上一个"
-
-#~ msgid "New"
-#~ msgstr "新建"
-
-#~ msgid "Job Level: %d"
-#~ msgstr "职业等级：%d"
-
-#~ msgid "Present: "
-#~ msgstr "出席： "
-
-#~ msgid "Quit Guild"
-#~ msgstr "退出帮会"
-
-#~ msgid "Ok"
-#~ msgstr "确定"
-
-#~ msgid "Recent:"
-#~ msgstr "最近的"
-
-#~ msgid "Magic"
-#~ msgstr "魔法"
-
-#~ msgid "Cast Test Spell 1"
-#~ msgstr "释放测试符咒1"
-
-#~ msgid "Cast Test Spell 2"
-#~ msgstr "释放测试符咒2"
-
-#~ msgid "Cast Test Spell 3"
-#~ msgstr "释放测试符咒3"
-
-#~ msgid "2 Handed Weapons"
-#~ msgstr "双手武器"
-
-#~ msgid "@@trade|Trade With %s@@"
-#~ msgstr "@@trade|与%s交易@@"
-
-#~ msgid "@@attack|Attack %s@@"
-#~ msgstr "@@attack|攻击%s@@"
-
-#~ msgid "@@disregard|Disregard %s@@"
-#~ msgstr "@@disregard|忽视%s@@"
-
-#~ msgid "@@ignore|Ignore %s@@"
-#~ msgstr "@@ignore|忽略%s@@"
-
-#~ msgid "@@unignore|Un-Ignore %s@@"
-#~ msgstr "@@unignore|Un-Ignore %s@@"
-
-#~ msgid "@@cancel|Cancel@@"
-#~ msgstr "@@cancel|取消@@"
-
-#~ msgid "@@pickup|Pick up %s@@"
-#~ msgstr "@@pickup|捡起%s@@"
-
-#~ msgid "@@use|Unequip@@"
-#~ msgstr "@@use|卸载@@"
-
-#~ msgid "@@use|Equip@@"
-#~ msgstr "@@use|装备@@"
-
-#~ msgid "@@use|Use@@"
-#~ msgstr "@@use|使用@@"
-
-#~ msgid "@@drop|Drop@@"
-#~ msgstr "@@drop|丢弃@@"
-
-#~ msgid "@@split|Split@@"
-#~ msgstr "@@split|分离@@"
-
-#~ msgid "@@store|Store@@"
-#~ msgstr "@@store|存贮@@"
-
-#~ msgid "Select Server"
-#~ msgstr "选择服务器"
-
-#~ msgid "Failed to switch to "
-#~ msgstr "切换到此时失败： "
-
-#~ msgid "windowed"
-#~ msgstr "窗口化"
-
-#~ msgid "fullscreen"
-#~ msgstr "全屏"
-
-#~ msgid "Mystery Skill"
-#~ msgstr "神秘技能"
-
-#~ msgid "Weapons"
-#~ msgstr "武器"
-
-#~ msgid "Crafts"
-#~ msgstr "技艺"
-
-#~ msgid "Stats"
-#~ msgstr "状态"
-
-#~ msgid "Total"
-#~ msgstr "总计"
+msgid "Intelligence %+d"
+msgstr "智慧 %+d"
 
-#~ msgid "Cost"
-#~ msgstr "花费"
+#: src/net/tmwa/generalhandler.cpp:113
+#, c-format
+msgid "Dexterity %+d"
+msgstr "敏捷 %+d"
 
-#~ msgid "Attack:"
-#~ msgstr "攻击:"
+#: src/net/tmwa/generalhandler.cpp:114
+#, c-format
+msgid "Luck %+d"
+msgstr "幸运 %+d"
 
-#~ msgid "% Reflex:"
-#~ msgstr "% 伤害反射："
+#: src/net/tmwa/generalhandler.cpp:140
+msgid "Authentication failed."
+msgstr "身份验证失败。"
 
-#~ msgid "Remaining Status Points: %d"
-#~ msgstr "剩余状态点数：%d"
+#: src/net/tmwa/generalhandler.cpp:143
+msgid "No servers available."
+msgstr "没有可用的服务器。"
 
-#~ msgid "Max level"
-#~ msgstr "最大等级"
+#: src/net/tmwa/generalhandler.cpp:147
+msgid "Someone else is trying to use this account."
+msgstr "别人尝试使用该帐户。"
 
-#~ msgid "curl error "
-#~ msgstr "curl错误 "
+#: src/net/tmwa/generalhandler.cpp:150
+msgid "This account is already logged in."
+msgstr "此帐户已登录。"
 
-#~ msgid " host: "
-#~ msgstr " 主机： "
+#: src/net/tmwa/generalhandler.cpp:153
+msgid "Speed hack detected."
+msgstr "检测速度劈。"
 
-#~ msgid "Guilds"
-#~ msgstr "工会"
+#: src/net/tmwa/generalhandler.cpp:156
+msgid "Duplicated login."
+msgstr "重复登录。"
 
-#~ msgid "Buddys"
-#~ msgstr "好友"
+#: src/net/tmwa/generalhandler.cpp:159
+msgid "Unknown connection error."
+msgstr ""
 
-#~ msgid "Party Window"
-#~ msgstr "帮会窗口"
+#: src/net/tmwa/generalhandler.cpp:232
+msgid "Got disconnected from server!"
+msgstr "和服务器失去连接"
 
-#~ msgid "Unarmed"
-#~ msgstr "徒手的"
+#: src/net/tmwa/generalhandler.cpp:264
+msgid "Luck"
+msgstr "幸运"
 
-#~ msgid "Knife"
-#~ msgstr "匕首"
+#: src/net/tmwa/generalhandler.cpp:267
+msgid "Defense"
+msgstr "国防"
 
-#~ msgid "Sword"
-#~ msgstr "剑"
+#: src/net/tmwa/generalhandler.cpp:268
+msgid "M.Attack"
+msgstr ""
 
-# 长斧？
-#~ msgid "Polearm"
-#~ msgstr "戟"
+#: src/net/tmwa/generalhandler.cpp:269
+msgid "M.Defense"
+msgstr ""
 
-#~ msgid "Staff"
-#~ msgstr "工作人员"
+#: src/net/tmwa/generalhandler.cpp:271
+#, no-c-format
+msgid "% Accuracy"
+msgstr "％精度"
 
-#~ msgid "Whip"
-#~ msgstr "抖动"
+#: src/net/tmwa/generalhandler.cpp:273
+#, no-c-format
+msgid "% Evade"
+msgstr "％闪避"
 
-#~ msgid "Bow"
-#~ msgstr "弓"
+#: src/net/tmwa/generalhandler.cpp:275
+#, no-c-format
+msgid "% Critical"
+msgstr "％"
 
-#~ msgid "Shooting"
-#~ msgstr "射击"
+#: src/net/tmwa/generalhandler.cpp:276
+msgid "Attack Delay"
+msgstr "攻击延迟"
 
-#~ msgid "Mace"
-#~ msgstr "狼牙棒"
+#: src/net/tmwa/generalhandler.cpp:278
+msgid "Walk Delay"
+msgstr "步行延迟"
 
-#~ msgid "Axe"
-#~ msgstr "斧头"
+#: src/net/tmwa/generalhandler.cpp:280
+msgid "Attack Range"
+msgstr "攻击范围"
 
-#~ msgid "Thrown"
-#~ msgstr "投掷"
+#: src/net/tmwa/network.cpp:152
+msgid "Empty address given to Network::connect()!"
+msgstr "空的地址给网络：连接（）！"
 
-#~ msgid "Unknown Skill"
-#~ msgstr "未知技能"
+#: src/net/tmwa/network.cpp:356
+msgid "Unable to resolve host \""
+msgstr ""
 
-#~ msgid " can't be created, but it doesn't exist! Exiting."
-#~ msgstr " 不能被创建，不存在！退出中。"
+#: src/net/tmwa/network.cpp:426
+msgid "Connection to server terminated. "
+msgstr "连接到服务器终止。"
 
-#~ msgid "Couldn't set "
-#~ msgstr "无法设置 "
+#: src/net/tmwa/partyhandler.cpp:171
+#, c-format
+msgid "%s is not in your party!"
+msgstr "%s不在你的帮会中！"
 
-#~ msgid " video mode: "
-#~ msgstr " 视频模式： "
+#: src/playerrelations.cpp:414
+msgid "Print '...'"
+msgstr ""
 
-#~ msgid "mana"
-#~ msgstr "mana"
+#: src/playerrelations.cpp:434
+msgid "Blink name"
+msgstr ""
 
-#~ msgid "Connecting to character server..."
-#~ msgstr "正在连接 角色 服务器..."
+#: src/playerrelations.cpp:478
+msgid "Floating '...' bubble"
+msgstr ""
 
-#~ msgid "Connecting to account server..."
-#~ msgstr "正在连接 帐号 服务器..."
+#: src/playerrelations.cpp:481
+msgid "Floating bubble"
+msgstr ""
 
-#~ msgid "/new > Alias of create"
-#~ msgstr "/new > create之别名"
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:248
+#: src/resources/monsterdb.cpp:84
+msgid "unnamed"
+msgstr "未知怪兽"
 
-#~ msgid "Command: /new <party-name>"
-#~ msgstr "命令： /new <帮会名>"
+#: src/resources/itemdb.cpp:65
+#, c-format
+msgid "Attack %+d"
+msgstr "攻击 %+d"
 
-#~ msgid "a"
-#~ msgstr "一个"
+#: src/resources/itemdb.cpp:66
+#, c-format
+msgid "Defense %+d"
+msgstr "防护 %+d"
 
-#~ msgid "Unnamed"
-#~ msgstr "未知物品"
+#: src/resources/itemdb.cpp:67
+#, c-format
+msgid "HP %+d"
+msgstr "HP %+d"
 
-#~ msgid "@@pickup|Pick Up %s@@"
-#~ msgstr "@@捡起|捡起%s@@"
+#: src/resources/itemdb.cpp:68
+#, c-format
+msgid "MP %+d"
+msgstr "MP %+d"
 
-#~ msgid "Save player list"
-#~ msgstr "保存玩家列表"
+#: src/resources/itemdb.cpp:171
+msgid "Unknown item"
+msgstr "未知物品"
 
-#~ msgid "Scroll laziness"
-#~ msgstr "Scroll laziness"
 
-#~ msgid "Scroll radius"
-#~ msgstr "滑动半径"