Update fr and de translations from mana commits. Also rebuild po files.

commit 27cdfc3e15846983ee877ac74c0fcc87b118bf15 (refs/remotes/mana/0.5)
Author: Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer>
Date:   Tue Jan 11 22:47:21 2011 +0100

    Updated the French translation thanks to Whistler.

commit da4e63f493d2da37a6f69bd35f7d2d435c986fb8
Author: Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer>
Date:   Tue Jan 11 22:41:03 2011 +0100

    Updated the German translation thanks to Matt.

15 files changed, 2520 insertions, 1766 deletions

diff --git a/po/da.po b/po/da.po
index 67b255a5d..a0b1baa47 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2011-01-06 03:06+0200\n"
+"POT-Creation-Date: 2011-01-13 21:49+0200\n"
 "PO-Revision-Date: 2009-07-25 17:33+0000\n"
 "Last-Translator: Niels L Ellegaard <niels.ellegaard@gmail.com>\n"
 "Language-Team: Danish <none@none.none>\n"
@@ -63,10 +63,10 @@ msgstr "Server"
 #: src/client.cpp:1029 src/client.cpp:1036 src/client.cpp:1171
 #: src/gui/changeemaildialog.cpp:154 src/gui/changepassworddialog.cpp:144
 #: src/gui/charcreatedialog.cpp:185 src/gui/register.cpp:225
-#: src/gui/serverdialog.cpp:350 src/gui/unregisterdialog.cpp:134
+#: src/gui/serverdialog.cpp:355 src/gui/unregisterdialog.cpp:134
 #: src/net/manaserv/charhandler.cpp:183 src/net/manaserv/charhandler.cpp:226
-#: src/net/tmwa/charserverhandler.cpp:137
-#: src/net/tmwa/charserverhandler.cpp:154
+#: src/net/tmwa/charserverhandler.cpp:161
+#: src/net/tmwa/charserverhandler.cpp:177
 msgid "Error"
 msgstr "Fejl"
 
@@ -743,7 +743,7 @@ msgid "-"
 msgstr ""
 
 #: src/gui/buy.cpp:95 src/gui/quitdialog.cpp:43 src/gui/quitdialog.cpp:48
-#: src/gui/quitdialog.cpp:49 src/gui/sell.cpp:90 src/gui/serverdialog.cpp:244
+#: src/gui/quitdialog.cpp:49 src/gui/sell.cpp:90 src/gui/serverdialog.cpp:248
 #: src/keyboardconfig.cpp:275
 msgid "Quit"
 msgstr "Afslut"
@@ -754,7 +754,7 @@ msgid "Max"
 msgstr "Maks"
 
 #: src/gui/buysell.cpp:37 src/gui/buysell.cpp:46
-#: src/gui/inventorywindow.cpp:112
+#: src/gui/inventorywindow.cpp:134
 msgid "Shop"
 msgstr "butik"
 
@@ -927,7 +927,7 @@ msgstr "Frameld"
 msgid "Change Email"
 msgstr "Skift e-mail adresse"
 
-#: src/gui/charselectdialog.cpp:375 src/gui/serverdialog.cpp:248
+#: src/gui/charselectdialog.cpp:375 src/gui/serverdialog.cpp:252
 #: src/gui/setup_players.cpp:242 src/gui/shopwindow.cpp:117
 #: src/gui/shopwindow.cpp:120 src/gui/textcommandeditor.cpp:234
 msgid "Delete"
@@ -1175,8 +1175,8 @@ msgstr "OK"
 msgid "Equipment"
 msgstr "Udstyr"
 
-#: src/gui/equipmentwindow.cpp:91 src/gui/inventorywindow.cpp:96
-#: src/gui/inventorywindow.cpp:393 src/gui/inventorywindow.cpp:402
+#: src/gui/equipmentwindow.cpp:91 src/gui/inventorywindow.cpp:118
+#: src/gui/inventorywindow.cpp:443 src/gui/inventorywindow.cpp:452
 #: src/gui/popupmenu.cpp:1070 src/gui/popupmenu.cpp:1169
 #: src/gui/popupmenu.cpp:1209
 msgid "Unequip"
@@ -1186,68 +1186,77 @@ msgstr "Tag af"
 msgid "Help"
 msgstr "Hjælp"
 
-#: src/gui/help.cpp:52 src/gui/inventorywindow.cpp:135
+#: src/gui/help.cpp:52 src/gui/inventorywindow.cpp:163
 #: src/gui/npcdialog.cpp:48 src/gui/shopwindow.cpp:108
 msgid "Close"
 msgstr "Luk"
 
-#: src/gui/inventorywindow.cpp:62 src/gui/windowmenu.cpp:72
+#: src/gui/inventorywindow.cpp:65 src/gui/windowmenu.cpp:72
 msgid "Inventory"
 msgstr "Inventarliste"
 
-#: src/gui/inventorywindow.cpp:62
+#: src/gui/inventorywindow.cpp:65
 msgid "Storage"
 msgstr "Opbevaret"
 
-#: src/gui/inventorywindow.cpp:89
+#: src/gui/inventorywindow.cpp:92
 msgid "Slots:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:94 src/gui/inventorywindow.cpp:395
-#: src/gui/inventorywindow.cpp:404 src/gui/popupmenu.cpp:1072
+#: src/gui/inventorywindow.cpp:103
+msgid "Filter:"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:104
+#, fuzzy
+msgid "Sort:"
+msgstr "Port:"
+
+#: src/gui/inventorywindow.cpp:116 src/gui/inventorywindow.cpp:445
+#: src/gui/inventorywindow.cpp:454 src/gui/popupmenu.cpp:1072
 #: src/gui/popupmenu.cpp:1171 src/gui/popupmenu.cpp:1211
 msgid "Equip"
 msgstr "Tag på"
 
-#: src/gui/inventorywindow.cpp:95 src/gui/inventorywindow.cpp:396
-#: src/gui/inventorywindow.cpp:400 src/gui/popupmenu.cpp:1075
+#: src/gui/inventorywindow.cpp:117 src/gui/inventorywindow.cpp:446
+#: src/gui/inventorywindow.cpp:450 src/gui/popupmenu.cpp:1075
 #: src/gui/popupmenu.cpp:1144 src/gui/popupmenu.cpp:1175
 #: src/gui/popupmenu.cpp:1214
 msgid "Use"
 msgstr "Brug"
 
-#: src/gui/inventorywindow.cpp:109 src/gui/inventorywindow.cpp:499
+#: src/gui/inventorywindow.cpp:131 src/gui/inventorywindow.cpp:549
 #: src/gui/popupmenu.cpp:1078 src/gui/popupmenu.cpp:1179
 #: src/gui/popupmenu.cpp:1217
 #, fuzzy
 msgid "Drop..."
 msgstr "Smid"
 
-#: src/gui/inventorywindow.cpp:110 src/gui/popupmenu.cpp:1083
+#: src/gui/inventorywindow.cpp:132 src/gui/popupmenu.cpp:1083
 #: src/gui/popupmenu.cpp:1184 src/gui/popupmenu.cpp:1222
 msgid "Split"
 msgstr "Opdel"
 
-#: src/gui/inventorywindow.cpp:111 src/gui/outfitwindow.cpp:56
+#: src/gui/inventorywindow.cpp:133 src/gui/outfitwindow.cpp:56
 #: src/gui/popupmenu.cpp:409
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:114
+#: src/gui/inventorywindow.cpp:136
 msgid "Weight:"
 msgstr "Vægt:"
 
-#: src/gui/inventorywindow.cpp:133 src/gui/inventorywindow.cpp:490
+#: src/gui/inventorywindow.cpp:161 src/gui/inventorywindow.cpp:540
 #: src/gui/popupmenu.cpp:1087 src/gui/popupmenu.cpp:1187
 #: src/gui/popupmenu.cpp:1225 src/gui/setup.cpp:65
 msgid "Store"
 msgstr "Gem på lager"
 
-#: src/gui/inventorywindow.cpp:134 src/gui/popupmenu.cpp:1106
+#: src/gui/inventorywindow.cpp:162 src/gui/popupmenu.cpp:1106
 msgid "Retrieve"
 msgstr "Hent fra lager"
 
-#: src/gui/inventorywindow.cpp:501 src/gui/popupmenu.cpp:1080
+#: src/gui/inventorywindow.cpp:551 src/gui/popupmenu.cpp:1080
 #: src/gui/popupmenu.cpp:1181 src/gui/popupmenu.cpp:1219
 #: src/gui/windowmenu.cpp:91
 msgid "Drop"
@@ -1436,7 +1445,7 @@ msgstr ""
 msgid "Login"
 msgstr "Log Ind"
 
-#: src/gui/login.cpp:87 src/gui/serverdialog.cpp:221
+#: src/gui/login.cpp:87 src/gui/serverdialog.cpp:222
 #: src/gui/widgets/chattab.cpp:166
 msgid "Server:"
 msgstr "Server:"
@@ -1863,56 +1872,60 @@ msgstr "De indtastede adgangskoder stemmer ikke overens."
 msgid "Choose Your Server"
 msgstr "Vælg din server"
 
-#: src/gui/serverdialog.cpp:222
+#: src/gui/serverdialog.cpp:223
 msgid "Port:"
 msgstr "Port:"
 
-#: src/gui/serverdialog.cpp:223
+#: src/gui/serverdialog.cpp:224
 #, fuzzy
 msgid "Server type:"
 msgstr "Server:"
 
-#: src/gui/serverdialog.cpp:245
+#: src/gui/serverdialog.cpp:227
+msgid "Use same ip for game sub servers"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:249
 msgid "Load"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:246
+#: src/gui/serverdialog.cpp:250
 #, fuzzy
 msgid "Connect"
 msgstr "Opretter forbindelse..."
 
-#: src/gui/serverdialog.cpp:247
+#: src/gui/serverdialog.cpp:251
 #, fuzzy
 msgid "Custom Server"
 msgstr "Brugerdefineret cursor"
 
-#: src/gui/serverdialog.cpp:351
+#: src/gui/serverdialog.cpp:356
 msgid "Please type both the address and the port of a server."
 msgstr "Skriv både adressen og porten på serveren."
 
-#: src/gui/serverdialog.cpp:482
+#: src/gui/serverdialog.cpp:488
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:488
+#: src/gui/serverdialog.cpp:494
 #, fuzzy
 msgid "Waiting for server..."
 msgstr "Venter på serveren"
 
-#: src/gui/serverdialog.cpp:492
+#: src/gui/serverdialog.cpp:498
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:496
+#: src/gui/serverdialog.cpp:502
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:593
+#: src/gui/serverdialog.cpp:599
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:595
+#: src/gui/serverdialog.cpp:601
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -3905,7 +3918,7 @@ msgstr[1] "Du samlede %s [@@%d|%s@@] op."
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:3617
+#: src/localplayer.cpp:3618
 #, fuzzy
 msgid "You see "
 msgstr "Du får %s."
@@ -4074,28 +4087,28 @@ msgstr "Viljestyrke:"
 msgid "Willpower %+.1f"
 msgstr "Viljestyrke:"
 
-#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:104
+#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:105
 msgid "You are dead."
 msgstr "Du er død."
 
-#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:105
+#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:106
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 "Vi beklager at måtte informere dig, om at din karakter var dræbt i kamp."
 
-#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:107
+#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:108
 msgid "You are not that alive anymore."
 msgstr "Du er ikke så levende som du engang har været."
 
-#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:108
+#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:109
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr "Manden med leen griber ud efter din sjæl."
 
-#: src/net/manaserv/beinghandler.cpp:319 src/net/tmwa/playerhandler.cpp:109
+#: src/net/manaserv/beinghandler.cpp:319 src/net/tmwa/playerhandler.cpp:110
 msgid "Game Over!"
 msgstr "Game Over!"
 
-#: src/net/manaserv/beinghandler.cpp:320 src/net/tmwa/playerhandler.cpp:111
+#: src/net/manaserv/beinghandler.cpp:320 src/net/tmwa/playerhandler.cpp:112
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
@@ -4103,33 +4116,33 @@ msgstr ""
 "Nej, børn. Din karakter døde ikke rigtigt. Den.. err... tog til et bedre "
 "sted."
 
-#: src/net/manaserv/beinghandler.cpp:322 src/net/tmwa/playerhandler.cpp:113
+#: src/net/manaserv/beinghandler.cpp:322 src/net/tmwa/playerhandler.cpp:114
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr "Din plan om at smadre fjendens våben, ved at benytte din hals fejlede."
 
-#: src/net/manaserv/beinghandler.cpp:324 src/net/tmwa/playerhandler.cpp:115
+#: src/net/manaserv/beinghandler.cpp:324 src/net/tmwa/playerhandler.cpp:116
 msgid "I guess this did not run too well."
 msgstr "Jeg går ud fra at dette ikke gik alt for godt."
 
-#: src/net/manaserv/beinghandler.cpp:325 src/net/tmwa/playerhandler.cpp:117
+#: src/net/manaserv/beinghandler.cpp:325 src/net/tmwa/playerhandler.cpp:118
 msgid "Do you want your possessions identified?"
 msgstr "Du vil gerne have dine ejendele identificeret?"
 
-#: src/net/manaserv/beinghandler.cpp:326 src/net/tmwa/playerhandler.cpp:119
+#: src/net/manaserv/beinghandler.cpp:326 src/net/tmwa/playerhandler.cpp:120
 msgid "Sadly, no trace of you was ever found..."
 msgstr "Desværre, blev der aldrig fundet noget spor efter dig..."
 
-#: src/net/manaserv/beinghandler.cpp:328 src/net/tmwa/playerhandler.cpp:121
+#: src/net/manaserv/beinghandler.cpp:328 src/net/tmwa/playerhandler.cpp:122
 msgid "Annihilated."
 msgstr "Udslettet."
 
-#: src/net/manaserv/beinghandler.cpp:329 src/net/tmwa/playerhandler.cpp:123
+#: src/net/manaserv/beinghandler.cpp:329 src/net/tmwa/playerhandler.cpp:124
 msgid "Looks like you got your head handed to you."
 msgstr "Det ser ud til at du fik du hoved udleveret til dig."
 
-#: src/net/manaserv/beinghandler.cpp:331 src/net/tmwa/playerhandler.cpp:125
+#: src/net/manaserv/beinghandler.cpp:331 src/net/tmwa/playerhandler.cpp:126
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr "Du kvajede dig igen, smid din krop ned i kloakken og find dig en ny."
@@ -4196,12 +4209,12 @@ msgstr ""
 #: src/net/manaserv/charhandler.cpp:180 src/net/manaserv/loginhandler.cpp:98
 #: src/net/manaserv/loginhandler.cpp:130 src/net/manaserv/loginhandler.cpp:166
 #: src/net/manaserv/loginhandler.cpp:286 src/net/manaserv/loginhandler.cpp:323
-#: src/net/tmwa/loginhandler.cpp:99 src/net/tmwa/loginhandler.cpp:187
+#: src/net/tmwa/loginhandler.cpp:99 src/net/tmwa/loginhandler.cpp:190
 #, fuzzy
 msgid "Unknown error."
 msgstr "Ukendt fejl"
 
-#: src/net/manaserv/charhandler.cpp:209 src/net/tmwa/charserverhandler.cpp:149
+#: src/net/manaserv/charhandler.cpp:209 src/net/tmwa/charserverhandler.cpp:172
 msgid "Info"
 msgstr "Info"
 
@@ -4440,61 +4453,88 @@ msgstr "Tak for købet."
 msgid "Unable to buy."
 msgstr "Du kan ikke købe."
 
-#: src/net/tmwa/buysellhandler.cpp:143
+#: src/net/tmwa/buysellhandler.cpp:145
 msgid "Thanks for selling."
 msgstr "Tak for en god handel."
 
-#: src/net/tmwa/buysellhandler.cpp:145
+#: src/net/tmwa/buysellhandler.cpp:149
 msgid "Unable to sell."
 msgstr "Kunne ikke sælge."
 
-#: src/net/tmwa/charserverhandler.cpp:106
+#: src/net/tmwa/buysellhandler.cpp:152
+#, fuzzy
+msgid "Unable to sell while trading."
+msgstr "Kunne ikke sælge."
+
+#: src/net/tmwa/buysellhandler.cpp:155
+#, fuzzy
+msgid "Unable to sell unsellable item."
+msgstr "Kunne ikke sælge."
+
+#: src/net/tmwa/charserverhandler.cpp:109
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:110
+#: src/net/tmwa/charserverhandler.cpp:113
 #, fuzzy
 msgid "Cannot use this ID."
 msgstr "Kan ikke bruge denne ID"
 
-#: src/net/tmwa/charserverhandler.cpp:113
+#: src/net/tmwa/charserverhandler.cpp:116
 #, fuzzy
 msgid "Unknown char-server failure."
 msgstr "Ukendt fejl"
 
-#: src/net/tmwa/charserverhandler.cpp:137
+#: src/net/tmwa/charserverhandler.cpp:145
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr "Karakteren kunne ikke oprettes. Måske er navnet allerede brug."
 
-#: src/net/tmwa/charserverhandler.cpp:149
+#: src/net/tmwa/charserverhandler.cpp:149 src/net/tmwa/loginhandler.cpp:187
+#, fuzzy
+msgid "Wrong name."
+msgstr "Forkert magic_token"
+
+#: src/net/tmwa/charserverhandler.cpp:152
+msgid "Incorrect stats."
+msgstr ""
+
+#: src/net/tmwa/charserverhandler.cpp:155
+msgid "Incorrect hair."
+msgstr ""
+
+#: src/net/tmwa/charserverhandler.cpp:158
+msgid "Incorrect slot."
+msgstr ""
+
+#: src/net/tmwa/charserverhandler.cpp:172
 msgid "Character deleted."
 msgstr "Karakteren er slettet"
 
-#: src/net/tmwa/charserverhandler.cpp:154
+#: src/net/tmwa/charserverhandler.cpp:177
 msgid "Failed to delete character."
 msgstr "Kunne ikke slette karakteren."
 
-#: src/net/tmwa/charserverhandler.cpp:286
+#: src/net/tmwa/charserverhandler.cpp:317
 msgid "Strength:"
 msgstr "Styrke:"
 
-#: src/net/tmwa/charserverhandler.cpp:287
+#: src/net/tmwa/charserverhandler.cpp:318
 msgid "Agility:"
 msgstr "Adræthed:"
 
-#: src/net/tmwa/charserverhandler.cpp:288
+#: src/net/tmwa/charserverhandler.cpp:319
 msgid "Vitality:"
 msgstr "Helbred:"
 
-#: src/net/tmwa/charserverhandler.cpp:289
+#: src/net/tmwa/charserverhandler.cpp:320
 msgid "Intelligence:"
 msgstr "Intelligens:"
 
-#: src/net/tmwa/charserverhandler.cpp:290
+#: src/net/tmwa/charserverhandler.cpp:321
 msgid "Dexterity:"
 msgstr "Behændighed:"
 
-#: src/net/tmwa/charserverhandler.cpp:291
+#: src/net/tmwa/charserverhandler.cpp:322
 msgid "Luck:"
 msgstr "Held:"
 
@@ -4901,11 +4941,11 @@ msgstr "Deling af exp kunne ikke slås til."
 msgid "Experience sharing unknown."
 msgstr "Fra nu af deler partyet experience points."
 
-#: src/net/tmwa/inventoryhandler.cpp:334
+#: src/net/tmwa/inventoryhandler.cpp:343
 msgid "Failed to use item."
 msgstr "Du kunne ikke bruge denne genstand."
 
-#: src/net/tmwa/inventoryhandler.cpp:457
+#: src/net/tmwa/inventoryhandler.cpp:472
 msgid "Unable to equip."
 msgstr ""
 
@@ -5024,95 +5064,95 @@ msgstr "Et ukendt medlem forsøgte at sige: %s"
 msgid "%s is not in your party!"
 msgstr "%s er ikke medlem af din gruppe!"
 
-#: src/net/tmwa/playerhandler.cpp:110
+#: src/net/tmwa/playerhandler.cpp:111
 msgid "Insert coin to continue."
 msgstr "Indsæt en mønt for at fortsætte."
 
-#: src/net/tmwa/playerhandler.cpp:128
+#: src/net/tmwa/playerhandler.cpp:129
 msgid "You're not dead yet. You're just resting."
 msgstr "Du er ikke død endnu. Du hviler dig bare."
 
-#: src/net/tmwa/playerhandler.cpp:129
+#: src/net/tmwa/playerhandler.cpp:130
 msgid "You are no more."
 msgstr "Du er ikke mere."
 
-#: src/net/tmwa/playerhandler.cpp:130
+#: src/net/tmwa/playerhandler.cpp:131
 msgid "You have ceased to be."
 msgstr "Du er holdt op med at være til."
 
-#: src/net/tmwa/playerhandler.cpp:131
+#: src/net/tmwa/playerhandler.cpp:132
 msgid "You've expired and gone to meet your maker."
 msgstr "Du er udløbet og er gået hen for at møde din skaber."
 
-#: src/net/tmwa/playerhandler.cpp:132
+#: src/net/tmwa/playerhandler.cpp:133
 msgid "You're a stiff."
 msgstr "Du er en hård nød at knække, men desværre død."
 
-#: src/net/tmwa/playerhandler.cpp:133
+#: src/net/tmwa/playerhandler.cpp:134
 msgid "Bereft of life, you rest in peace."
 msgstr "Du siver langtsomt ud af din krop, du kan nu endelig slappe af."
 
-#: src/net/tmwa/playerhandler.cpp:134
+#: src/net/tmwa/playerhandler.cpp:135
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 "Hvis det ikke var fordi du var så animeret, kunne du sikker imponere Chuck "
 "Norris."
 
-#: src/net/tmwa/playerhandler.cpp:135
+#: src/net/tmwa/playerhandler.cpp:136
 msgid "Your metabolic processes are now history."
 msgstr "Din tid er ovre."
 
-#: src/net/tmwa/playerhandler.cpp:136
+#: src/net/tmwa/playerhandler.cpp:137
 msgid "You're off the twig."
 msgstr "Drik noget syre."
 
-#: src/net/tmwa/playerhandler.cpp:137
+#: src/net/tmwa/playerhandler.cpp:138
 msgid "You've kicked the bucket."
 msgstr "Du har stillet træskoene."
 
-#: src/net/tmwa/playerhandler.cpp:138
+#: src/net/tmwa/playerhandler.cpp:139
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr "Du har spist af dødens pølse for den sidste gang."
 
-#: src/net/tmwa/playerhandler.cpp:140
+#: src/net/tmwa/playerhandler.cpp:141
 msgid "You are an ex-player."
 msgstr "Du er en forhenværende spiller."
 
-#: src/net/tmwa/playerhandler.cpp:141
+#: src/net/tmwa/playerhandler.cpp:142
 msgid "You're pining for the fjords."
 msgstr "Du er tabt bag en vogn."
 
-#: src/net/tmwa/playerhandler.cpp:327 src/net/tmwa/playerhandler.cpp:336
-#: src/net/tmwa/playerhandler.cpp:415
+#: src/net/tmwa/playerhandler.cpp:330 src/net/tmwa/playerhandler.cpp:339
+#: src/net/tmwa/playerhandler.cpp:418
 msgid "Message"
 msgstr "Besked"
 
-#: src/net/tmwa/playerhandler.cpp:328
+#: src/net/tmwa/playerhandler.cpp:331
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:337
+#: src/net/tmwa/playerhandler.cpp:340
 msgid "You are carrying less than half your weight. You are can regain health."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:442
+#: src/net/tmwa/playerhandler.cpp:445
 #, fuzzy, c-format
 msgid "You picked up %s."
 msgstr "Du samlede op "
 
-#: src/net/tmwa/playerhandler.cpp:448
+#: src/net/tmwa/playerhandler.cpp:451
 #, fuzzy, c-format
 msgid "You spent %s."
 msgstr "Du får %s."
 
-#: src/net/tmwa/playerhandler.cpp:493
+#: src/net/tmwa/playerhandler.cpp:496
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:613
+#: src/net/tmwa/playerhandler.cpp:616
 msgid "Equip arrows first."
 msgstr ""
 
@@ -5264,32 +5304,32 @@ msgstr ""
 msgid "Floating bubble"
 msgstr ""
 
-#: src/resources/beinginfo.cpp:32 src/resources/itemdb.cpp:210
+#: src/resources/beinginfo.cpp:32 src/resources/itemdb.cpp:223
 #: src/resources/monsterdb.cpp:78
 msgid "unnamed"
 msgstr "unavngivet"
 
-#: src/resources/itemdb.cpp:55
+#: src/resources/itemdb.cpp:57
 #, c-format
 msgid "Attack %+d"
 msgstr "Angreb %+d"
 
-#: src/resources/itemdb.cpp:56
+#: src/resources/itemdb.cpp:58
 #, c-format
 msgid "Defense %+d"
 msgstr "Forsvar %+d"
 
-#: src/resources/itemdb.cpp:57
+#: src/resources/itemdb.cpp:59
 #, c-format
 msgid "HP %+d"
 msgstr "HP %+d"
 
-#: src/resources/itemdb.cpp:58
+#: src/resources/itemdb.cpp:60
 #, c-format
 msgid "MP %+d"
 msgstr "MP %+d"
 
-#: src/resources/itemdb.cpp:155
+#: src/resources/itemdb.cpp:152
 msgid "Unknown item"
 msgstr "Ukendt genstand"
 
diff --git a/po/de.po b/po/de.po
index 9a061834e..197bb041a 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,17 +1,25 @@
+# #-#-#-#-#  po_de.po (The Mana World 0.1.0)  #-#-#-#-#
 # German translation of The Mana World.
-# Copyright (C) 2007-2009 The Mana World Development Team
-# Copyright (C) 2010 The Mana Development Team
+# Copyright (C) 2007 The Mana World Development Team
+# This file is distributed under the same license as the The Mana World package.
+#
+# Matthias Hartmann <hartmann.matthias@gmail.com>, 2007; 2011.
+# Jonathan Raphael Joachim Kolberg, 2009, 2010.
+# seeseekey <seeseekey@googlemail.com>, 2009.
+# #-#-#-#-#  de.po (The Mana World 0.1.0)  #-#-#-#-#
+# German translation of The Mana World.
+# Copyright (C) 2007 The Mana World Development Team
 # This file is distributed under the same license as the The Mana World package.
 #
 # Matthias Hartmann <hartmann.matthias@gmail.com>, 2007.
 # Jonathan Raphael Joachim Kolberg, 2009, 2010.
 # seeseekey <seeseekey@googlemail.com>, 2009.
-# Andrej, 2009.
+#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: The Mana World 0.1.0\n"
 "Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2011-01-06 03:06+0200\n"
+"POT-Creation-Date: 2011-01-13 21:49+0200\n"
 "PO-Revision-Date: 2010-01-02 15:26+0000\n"
 "Last-Translator: Jonathan Raphael Joachim Kolberg\n"
 "Language-Team: Deutsch <kde-i18n-de@kde.org>\n"
@@ -19,6 +27,12 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"#-#-#-#-#  po_de.po (The Mana World 0.1.0)  #-#-#-#-#\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Launchpad-Export-Date: 2009-06-02 17:48+0000\n"
+"X-Generator: Lokalize 1.0\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"#-#-#-#-#  de.po (The Mana World 0.1.0)  #-#-#-#-#\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Launchpad-Export-Date: 2009-06-02 17:48+0000\n"
 "X-Generator: Lokalize 1.0\n"
@@ -48,7 +62,7 @@ msgstr "Anmelden"
 
 #: src/client.cpp:862
 msgid "Entering game world"
-msgstr ""
+msgstr "Betrete die Spielwelt"
 
 #: src/client.cpp:953
 #, fuzzy
@@ -68,16 +82,16 @@ msgstr "Wechsle den Server"
 #: src/client.cpp:1029 src/client.cpp:1036 src/client.cpp:1171
 #: src/gui/changeemaildialog.cpp:154 src/gui/changepassworddialog.cpp:144
 #: src/gui/charcreatedialog.cpp:185 src/gui/register.cpp:225
-#: src/gui/serverdialog.cpp:350 src/gui/unregisterdialog.cpp:134
+#: src/gui/serverdialog.cpp:355 src/gui/unregisterdialog.cpp:134
 #: src/net/manaserv/charhandler.cpp:183 src/net/manaserv/charhandler.cpp:226
-#: src/net/tmwa/charserverhandler.cpp:137
-#: src/net/tmwa/charserverhandler.cpp:154
+#: src/net/tmwa/charserverhandler.cpp:161
+#: src/net/tmwa/charserverhandler.cpp:177
 msgid "Error"
 msgstr "Fehler"
 
 #: src/client.cpp:1045
 msgid "Requesting registration details"
-msgstr ""
+msgstr "Fordere Registrierungsdetails an"
 
 #: src/client.cpp:1072
 msgid "Password Change"
@@ -108,7 +122,7 @@ msgstr "Leb wohl und komme jeder Zeit wieder..."
 #: src/client.cpp:1297 src/client.cpp:1323 src/client.cpp:1367
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
-msgstr ""
+msgstr "%s existiert nicht und kann nicht erstellt werden! Beende."
 
 #: src/client.cpp:1494
 #, fuzzy, c-format
@@ -120,9 +134,9 @@ msgid "Error creating updates directory!"
 msgstr "Fehler beim Erstellen des Verzeichnisses für Updates!"
 
 #: src/client.cpp:1555
-#, c-format
+#, fuzzy, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
-msgstr ""
+msgstr "%s existiert nicht und kann nicht erstellt werden! Beende."
 
 #: src/commandhandler.cpp:264 src/commandhandler.cpp:477
 msgid "Unknown command."
@@ -176,35 +190,41 @@ msgstr "/q > Ersatz für query"
 #: src/commandhandler.cpp:310
 msgid "/away > Tell the other whispering players you're away from keyboard."
 msgstr ""
+"/away > Teilt den anderen flüsternden Spielern deine Abwesenheit von der "
+"Tastatur mit."
 
 #: src/commandhandler.cpp:313
 msgid "/ignore > ignore a player"
-msgstr ""
+msgstr "/ignore > Ignoriere einen Spieler"
 
 #: src/commandhandler.cpp:314
 msgid "/unignore > stop ignoring a player"
-msgstr ""
+msgstr "/unignore > Ignorierung eines Spielers aufheben"
 
 #: src/commandhandler.cpp:315
 #, fuzzy
 msgid "/ignoreall > Ignore all opened whisper tabs"
-msgstr "/close > Schließe einen privaten Tab"
+msgstr "/ignore > Anderen Spieler ignorieren"
 
 #: src/commandhandler.cpp:316
+#, fuzzy
 msgid "/erase > Erase a player"
-msgstr ""
+msgstr "/ignore > Ignoriere einen Spieler"
 
 #: src/commandhandler.cpp:317
+#, fuzzy
 msgid "/befriend > Be friend a player"
-msgstr ""
+msgstr "/ignore > Ignoriere einen Spieler"
 
 #: src/commandhandler.cpp:318
+#, fuzzy
 msgid "/desregard > Disregard a player"
-msgstr ""
+msgstr "/ignore > Ignoriere einen Spieler"
 
 #: src/commandhandler.cpp:319
+#, fuzzy
 msgid "/neutral > Neutral a player"
-msgstr ""
+msgstr "/ignore > Ignoriere einen Spieler"
 
 #: src/commandhandler.cpp:321
 msgid "/list > Display all public channels"
@@ -240,7 +260,7 @@ msgstr ""
 
 #: src/commandhandler.cpp:333
 msgid "/announce > Global announcement (GM only)"
-msgstr "/announce > Globale Ansage (Nur von GMs nutzbar)"
+msgstr "/announce > Globale Ansage (Nur von GM's nutzbar)"
 
 #: src/commandhandler.cpp:335
 #, fuzzy
@@ -280,8 +300,9 @@ msgid "/imitation > Imitate player"
 msgstr ""
 
 #: src/commandhandler.cpp:346
+#, fuzzy
 msgid "/heal > Heal player"
-msgstr ""
+msgstr "/ignore > Ignoriere einen Spieler"
 
 #: src/commandhandler.cpp:347
 #, fuzzy
@@ -411,7 +432,7 @@ msgstr "Befehl: /w <Name> <Nachricht>"
 
 #: src/commandhandler.cpp:418
 msgid "This command tells you're away from keyboard with the given reason."
-msgstr ""
+msgstr "Dieser Befehl teilt deine Abwesenheit und deren angegebenen Grund mit."
 
 #: src/commandhandler.cpp:420
 #, fuzzy
@@ -501,6 +522,7 @@ msgstr "Befehl: /item <Wert>"
 #: src/commandhandler.cpp:461
 msgid "This command stops ignoring the given player if they are being ignored"
 msgstr ""
+"Dieser Befehl hebt die Ignorierung des angegeben ignorierten Spieler auf."
 
 #: src/commandhandler.cpp:466
 msgid "Command: /where"
@@ -552,7 +574,7 @@ msgstr "Name der Party fehlt."
 #: src/commandhandler.cpp:614 src/commandhandler.cpp:721
 #: src/commandhandler.cpp:762 src/commandhandler.cpp:792
 msgid "Please specify a name."
-msgstr ""
+msgstr "Bitte gib einen Namen an."
 
 #: src/commandhandler.cpp:655
 msgid "Return toggles chat."
@@ -587,7 +609,7 @@ msgstr "Neutral"
 #: src/commandhandler.cpp:729
 #, fuzzy, c-format
 msgid "Player already %s!"
-msgstr "%s ist bereits hier"
+msgstr "Spieler wird bereits ignoriert!"
 
 #: src/commandhandler.cpp:743
 #, fuzzy, c-format
@@ -617,7 +639,7 @@ msgstr ""
 #: src/commandhandler.cpp:799
 #, fuzzy
 msgid "Player already erased!"
-msgstr "%s ist bereits hier"
+msgstr "Spieler wird bereits ignoriert!"
 
 #: src/commandhandler.cpp:810
 #, fuzzy
@@ -642,7 +664,7 @@ msgstr "Öffentlich"
 
 #: src/game.cpp:223 src/gui/debugwindow.cpp:47 src/gui/widgets/chattab.cpp:392
 msgid "Debug"
-msgstr ""
+msgstr "Debug"
 
 #: src/game.cpp:435
 #, fuzzy
@@ -697,9 +719,8 @@ msgid "Pvp rank: %d"
 msgstr ""
 
 #: src/gui/botcheckerwindow.cpp:264
-#, fuzzy
 msgid "Bot Checker"
-msgstr "Gefühlsfenster"
+msgstr ""
 
 #: src/gui/botcheckerwindow.cpp:294 src/gui/setup_players.cpp:59
 msgid "Name"
@@ -753,7 +774,7 @@ msgid "-"
 msgstr "-"
 
 #: src/gui/buy.cpp:95 src/gui/quitdialog.cpp:43 src/gui/quitdialog.cpp:48
-#: src/gui/quitdialog.cpp:49 src/gui/sell.cpp:90 src/gui/serverdialog.cpp:244
+#: src/gui/quitdialog.cpp:49 src/gui/sell.cpp:90 src/gui/serverdialog.cpp:248
 #: src/keyboardconfig.cpp:275
 msgid "Quit"
 msgstr "Beenden"
@@ -764,7 +785,7 @@ msgid "Max"
 msgstr "Max"
 
 #: src/gui/buysell.cpp:37 src/gui/buysell.cpp:46
-#: src/gui/inventorywindow.cpp:112
+#: src/gui/inventorywindow.cpp:134
 msgid "Shop"
 msgstr "Geschäft"
 
@@ -787,7 +808,7 @@ msgstr "Abbrechen"
 
 #: src/gui/changeemaildialog.cpp:45 src/gui/changeemaildialog.cpp:54
 msgid "Change Email Address"
-msgstr "E-MailAdresse ändern"
+msgstr "Email-Adresse ändern"
 
 #: src/gui/changeemaildialog.cpp:49 src/gui/changepassworddialog.cpp:52
 #, c-format
@@ -828,7 +849,7 @@ msgstr "Gib dein neues Passwort zweimal ein:"
 
 #: src/gui/changepassworddialog.cpp:111
 msgid "Enter the old password first."
-msgstr ""
+msgstr "Gib das alte Passwort zuerst an."
 
 #: src/gui/changepassworddialog.cpp:117
 #, c-format
@@ -851,21 +872,21 @@ msgstr "Charakter erstellen"
 #: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:90
 #: src/gui/register.cpp:72
 msgid "Name:"
-msgstr "Name:"
+msgstr "Name :"
 
 #. 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:77
 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:76
 msgid "<"
-msgstr ""
+msgstr "<"
 
 #: src/gui/charcreatedialog.cpp:74
 msgid "Hair color:"
@@ -912,7 +933,7 @@ msgstr "Bestätige Charakter-Löschung"
 
 #: src/gui/charselectdialog.cpp:73
 msgid "Are you sure you want to delete this character?"
-msgstr "Bist Du sicher, dass du diesen Charakter löschen möchtest?"
+msgstr "Bist du sicher, dass du diesen Charakter löschen möchtest?"
 
 #: src/gui/charselectdialog.cpp:121
 msgid "Account and Character Management"
@@ -931,7 +952,7 @@ msgstr "Abmelden"
 msgid "Change Email"
 msgstr "E-Mailadresse ändern"
 
-#: src/gui/charselectdialog.cpp:375 src/gui/serverdialog.cpp:248
+#: src/gui/charselectdialog.cpp:375 src/gui/serverdialog.cpp:252
 #: src/gui/setup_players.cpp:242 src/gui/shopwindow.cpp:117
 #: src/gui/shopwindow.cpp:120 src/gui/textcommandeditor.cpp:234
 msgid "Delete"
@@ -948,16 +969,15 @@ msgstr "Stufe: %d"
 
 #: src/gui/charselectdialog.cpp:447 src/gui/charselectdialog.cpp:448
 msgid "(empty)"
-msgstr ""
+msgstr "(leer)"
 
 #: src/gui/chat.cpp:91
 msgid "default"
 msgstr "Standard"
 
 #: src/gui/chat.cpp:92
-#, fuzzy
 msgid "black"
-msgstr "Glück"
+msgstr ""
 
 #: src/gui/chat.cpp:93
 #, fuzzy
@@ -970,38 +990,33 @@ msgid "green"
 msgstr "Grün: "
 
 #: src/gui/chat.cpp:95
-#, fuzzy
 msgid "blue"
-msgstr "Blau: "
+msgstr ""
 
 #: src/gui/chat.cpp:96
-#, fuzzy
 msgid "gold"
-msgstr "Gilde"
+msgstr ""
 
 #: src/gui/chat.cpp:97
-#, fuzzy
 msgid "yellow"
-msgstr "Niedrig"
+msgstr ""
 
 #: src/gui/chat.cpp:98
-#, fuzzy
 msgid "pink"
-msgstr "Verknüpfung"
+msgstr ""
 
 #: src/gui/chat.cpp:99
 msgid "purple"
 msgstr ""
 
 #: src/gui/chat.cpp:100
-#, fuzzy
 msgid "grey"
-msgstr "Ignoriere"
+msgstr ""
 
 #: src/gui/chat.cpp:101
 #, fuzzy
 msgid "brown"
-msgstr "Bogen"
+msgstr "geworfen"
 
 #: src/gui/chat.cpp:102
 #, fuzzy
@@ -1054,24 +1069,24 @@ msgid "Ignore"
 msgstr "Ignoriert"
 
 #: src/gui/debugwindow.cpp:63 src/gui/debugwindow.cpp:74
-#, c-format
+#, fuzzy, c-format
 msgid "%d FPS (Software)"
-msgstr ""
+msgstr "%d FPS (OpenGL)"
 
 #: src/gui/debugwindow.cpp:67
-#, c-format
+#, fuzzy, c-format
 msgid "%d FPS (fast OpenGL)"
-msgstr ""
+msgstr "%d FPS (OpenGL)"
 
 #: src/gui/debugwindow.cpp:70
-#, c-format
+#, fuzzy, c-format
 msgid "%d FPS (old OpenGL)"
-msgstr ""
+msgstr "%d FPS (OpenGL)"
 
 #: src/gui/debugwindow.cpp:77
 #, c-format
 msgid "%d FPS"
-msgstr ""
+msgstr "%d FPS"
 
 #: src/gui/debugwindow.cpp:78 src/gui/debugwindow.cpp:181
 #: src/gui/debugwindow.cpp:204
@@ -1089,12 +1104,12 @@ msgstr "Karte: "
 #: src/gui/debugwindow.cpp:205
 #, fuzzy
 msgid "Minimap:"
-msgstr "Übersichtskarte"
+msgstr "Übersichtskarte: "
 
 #: src/gui/debugwindow.cpp:81
 #, c-format
 msgid "Cursor: (%d, %d)"
-msgstr ""
+msgstr "Cursor: (%d, %d)"
 
 #: src/gui/debugwindow.cpp:82 src/gui/debugwindow.cpp:192
 #, c-format
@@ -1110,19 +1125,19 @@ msgstr "Spielfigurattribute OK"
 #: src/gui/debugwindow.cpp:131
 #, fuzzy
 msgid "Player Position:"
-msgstr "Spieler trifft Monster"
+msgstr "Spieler"
 
 #: src/gui/debugwindow.cpp:91 src/gui/debugwindow.cpp:138
 #: src/gui/debugwindow.cpp:163
 #, fuzzy
 msgid "Target:"
-msgstr "Laufe nach Links"
+msgstr "NPC anvisieren"
 
 #: src/gui/debugwindow.cpp:92 src/gui/debugwindow.cpp:143
 #: src/gui/debugwindow.cpp:164
 #, fuzzy
 msgid "Target Id:"
-msgstr "Spieler anvisieren"
+msgstr "NPC anvisieren"
 
 #: src/gui/debugwindow.cpp:93 src/gui/debugwindow.cpp:147
 #: src/gui/debugwindow.cpp:152 src/gui/debugwindow.cpp:165
@@ -1140,12 +1155,12 @@ msgstr "Spieler anvisieren"
 #: src/gui/debugwindow.cpp:167
 #, fuzzy
 msgid "Target Guild:"
-msgstr "Spieler anvisieren"
+msgstr "Gilde erstellen"
 
 #: src/gui/debugwindow.cpp:179 src/gui/debugwindow.cpp:202
 #, fuzzy
 msgid "Cursor:"
-msgstr "Benutzerdefinierter Zeiger"
+msgstr "Cursor: (%d, %d)"
 
 #: src/gui/debugwindow.cpp:196 src/gui/debugwindow.cpp:209
 msgid "Map actors count:"
@@ -1180,8 +1195,8 @@ msgstr "Ok"
 msgid "Equipment"
 msgstr "Ausrüstung"
 
-#: src/gui/equipmentwindow.cpp:91 src/gui/inventorywindow.cpp:96
-#: src/gui/inventorywindow.cpp:393 src/gui/inventorywindow.cpp:402
+#: src/gui/equipmentwindow.cpp:91 src/gui/inventorywindow.cpp:118
+#: src/gui/inventorywindow.cpp:443 src/gui/inventorywindow.cpp:452
 #: src/gui/popupmenu.cpp:1070 src/gui/popupmenu.cpp:1169
 #: src/gui/popupmenu.cpp:1209
 msgid "Unequip"
@@ -1191,67 +1206,76 @@ msgstr "Ablegen"
 msgid "Help"
 msgstr "Hilfe"
 
-#: src/gui/help.cpp:52 src/gui/inventorywindow.cpp:135
+#: src/gui/help.cpp:52 src/gui/inventorywindow.cpp:163
 #: src/gui/npcdialog.cpp:48 src/gui/shopwindow.cpp:108
 msgid "Close"
 msgstr "Schließen"
 
-#: src/gui/inventorywindow.cpp:62 src/gui/windowmenu.cpp:72
+#: src/gui/inventorywindow.cpp:65 src/gui/windowmenu.cpp:72
 msgid "Inventory"
 msgstr "Inventar"
 
-#: src/gui/inventorywindow.cpp:62
+#: src/gui/inventorywindow.cpp:65
 msgid "Storage"
 msgstr "Lager"
 
-#: src/gui/inventorywindow.cpp:89
+#: src/gui/inventorywindow.cpp:92
 msgid "Slots:"
 msgstr "Plätze:"
 
-#: src/gui/inventorywindow.cpp:94 src/gui/inventorywindow.cpp:395
-#: src/gui/inventorywindow.cpp:404 src/gui/popupmenu.cpp:1072
+#: src/gui/inventorywindow.cpp:103
+msgid "Filter:"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:104
+#, fuzzy
+msgid "Sort:"
+msgstr "Port:"
+
+#: src/gui/inventorywindow.cpp:116 src/gui/inventorywindow.cpp:445
+#: src/gui/inventorywindow.cpp:454 src/gui/popupmenu.cpp:1072
 #: src/gui/popupmenu.cpp:1171 src/gui/popupmenu.cpp:1211
 msgid "Equip"
 msgstr "Ausrüsten"
 
-#: src/gui/inventorywindow.cpp:95 src/gui/inventorywindow.cpp:396
-#: src/gui/inventorywindow.cpp:400 src/gui/popupmenu.cpp:1075
+#: src/gui/inventorywindow.cpp:117 src/gui/inventorywindow.cpp:446
+#: src/gui/inventorywindow.cpp:450 src/gui/popupmenu.cpp:1075
 #: src/gui/popupmenu.cpp:1144 src/gui/popupmenu.cpp:1175
 #: src/gui/popupmenu.cpp:1214
 msgid "Use"
 msgstr "Benutzen"
 
-#: src/gui/inventorywindow.cpp:109 src/gui/inventorywindow.cpp:499
+#: src/gui/inventorywindow.cpp:131 src/gui/inventorywindow.cpp:549
 #: src/gui/popupmenu.cpp:1078 src/gui/popupmenu.cpp:1179
 #: src/gui/popupmenu.cpp:1217
 msgid "Drop..."
 msgstr "Wegwerfen"
 
-#: src/gui/inventorywindow.cpp:110 src/gui/popupmenu.cpp:1083
+#: src/gui/inventorywindow.cpp:132 src/gui/popupmenu.cpp:1083
 #: src/gui/popupmenu.cpp:1184 src/gui/popupmenu.cpp:1222
 msgid "Split"
 msgstr "Aufteilen"
 
-#: src/gui/inventorywindow.cpp:111 src/gui/outfitwindow.cpp:56
+#: src/gui/inventorywindow.cpp:133 src/gui/outfitwindow.cpp:56
 #: src/gui/popupmenu.cpp:409
 msgid "Outfits"
-msgstr ""
+msgstr "Ausrüstung"
 
-#: src/gui/inventorywindow.cpp:114
+#: src/gui/inventorywindow.cpp:136
 msgid "Weight:"
 msgstr "Gewicht:"
 
-#: src/gui/inventorywindow.cpp:133 src/gui/inventorywindow.cpp:490
+#: src/gui/inventorywindow.cpp:161 src/gui/inventorywindow.cpp:540
 #: src/gui/popupmenu.cpp:1087 src/gui/popupmenu.cpp:1187
 #: src/gui/popupmenu.cpp:1225 src/gui/setup.cpp:65
 msgid "Store"
 msgstr "Einlagern"
 
-#: src/gui/inventorywindow.cpp:134 src/gui/popupmenu.cpp:1106
+#: src/gui/inventorywindow.cpp:162 src/gui/popupmenu.cpp:1106
 msgid "Retrieve"
 msgstr "Abholen"
 
-#: src/gui/inventorywindow.cpp:501 src/gui/popupmenu.cpp:1080
+#: src/gui/inventorywindow.cpp:551 src/gui/popupmenu.cpp:1080
 #: src/gui/popupmenu.cpp:1181 src/gui/popupmenu.cpp:1219
 #: src/gui/windowmenu.cpp:91
 msgid "Drop"
@@ -1271,11 +1295,11 @@ msgstr "Wähle aus, wie viele Gegenstände Du wegwerfen möchtest."
 
 #: src/gui/itemamount.cpp:264
 msgid "Select amount of items to store."
-msgstr "Wähle aus, wie viele Gegenstände Du einlagern möchtest."
+msgstr "Wähle aus, wie viele Gegenstände du einlagern möchtest."
 
 #: src/gui/itemamount.cpp:267
 msgid "Select amount of items to retrieve."
-msgstr "Wähle aus, wie viele Gegenstände Du wieder haben möchtest."
+msgstr "Wähle aus, wie viele Gegenstände du wieder haben möchtest."
 
 #: src/gui/itemamount.cpp:270
 msgid "Select amount of items to split."
@@ -1305,9 +1329,8 @@ msgid "Weight: %s"
 msgstr "Gewicht: %s"
 
 #: src/gui/killstats.cpp:43 src/gui/windowmenu.cpp:65
-#, fuzzy
 msgid "Kill stats"
-msgstr "Statusfenster"
+msgstr ""
 
 #: src/gui/killstats.cpp:61
 #, fuzzy
@@ -1441,7 +1464,7 @@ msgstr ""
 msgid "Login"
 msgstr "Anmelden"
 
-#: src/gui/login.cpp:87 src/gui/serverdialog.cpp:221
+#: src/gui/login.cpp:87 src/gui/serverdialog.cpp:222
 #: src/gui/widgets/chattab.cpp:166
 msgid "Server:"
 msgstr "Server:"
@@ -1449,16 +1472,15 @@ msgstr "Server:"
 #: src/gui/login.cpp:92
 #, fuzzy
 msgid "Custom update host"
-msgstr "Updateserver: "
+msgstr "Ungültiger Updateserver: "
 
 #: src/gui/login.cpp:106
 msgid "Remember username"
 msgstr "Benutzername merken"
 
 #: src/gui/login.cpp:107
-#, fuzzy
 msgid "Update:"
-msgstr "Ungültiger Updateserver: "
+msgstr ""
 
 #: src/gui/login.cpp:116 src/gui/register.cpp:63 src/gui/register.cpp:78
 msgid "Register"
@@ -1474,7 +1496,7 @@ msgstr "Karte"
 
 #: src/gui/ministatus.cpp:196
 msgid "Need"
-msgstr ""
+msgstr "Muss"
 
 #: src/gui/npcdialog.cpp:46
 msgid "Waiting for server"
@@ -1521,7 +1543,7 @@ msgstr "Es misslang den Brief zu senden oder er war ungültig."
 #: src/gui/outfitwindow.cpp:78 src/gui/outfitwindow.cpp:832
 #, c-format
 msgid "Outfit: %d"
-msgstr ""
+msgstr "Ausrüstung: %d"
 
 #: src/gui/outfitwindow.cpp:80 src/gui/outfitwindow.cpp:834
 #, fuzzy, c-format
@@ -1533,8 +1555,9 @@ msgid "Unequip first"
 msgstr "erstes ausziehen"
 
 #: src/gui/outfitwindow.cpp:86
+#, fuzzy
 msgid "Away outfit"
-msgstr ""
+msgstr "Ausrüstung anziehen"
 
 #: src/gui/popupmenu.cpp:116 src/gui/popupmenu.cpp:483
 msgid "@@trade|Trade@@"
@@ -1629,9 +1652,8 @@ msgstr ""
 
 #: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:343
 #: src/gui/popupmenu.cpp:574
-#, fuzzy
 msgid "@@guild|Invite to guild@@"
-msgstr "/party > Lade einen Benutzer zu deiner Party ein"
+msgstr ""
 
 #: src/gui/popupmenu.cpp:209
 msgid "@@admin-kick|Kick player@@"
@@ -1835,7 +1857,7 @@ msgstr "Der Nutzername muss kürzer als %d Zeichen sein."
 #: src/gui/register.cpp:189 src/gui/unregisterdialog.cpp:118
 #, c-format
 msgid "The password needs to be at least %d characters long."
-msgstr "Das Passwort muss aus mindestens %d Zeichen bestehen."
+msgstr "Das Passwort muss aus mindestens %d bestehen."
 
 #: src/gui/register.cpp:197 src/gui/unregisterdialog.cpp:125
 #, c-format
@@ -1850,58 +1872,62 @@ msgstr "Passwörter stimmen nicht überein."
 msgid "Choose Your Server"
 msgstr "Wähle deinen Server"
 
-#: src/gui/serverdialog.cpp:222
+#: src/gui/serverdialog.cpp:223
 msgid "Port:"
 msgstr "Port:"
 
-#: src/gui/serverdialog.cpp:223
+#: src/gui/serverdialog.cpp:224
 #, fuzzy
 msgid "Server type:"
 msgstr "Server:"
 
-#: src/gui/serverdialog.cpp:245
+#: src/gui/serverdialog.cpp:227
+msgid "Use same ip for game sub servers"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:249
 msgid "Load"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:246
+#: src/gui/serverdialog.cpp:250
 msgid "Connect"
 msgstr "Verbinde..."
 
-#: src/gui/serverdialog.cpp:247
+#: src/gui/serverdialog.cpp:251
 #, fuzzy
 msgid "Custom Server"
 msgstr "Benutzerdefinierter Zeiger"
 
-#: src/gui/serverdialog.cpp:351
+#: src/gui/serverdialog.cpp:356
 msgid "Please type both the address and the port of a server."
-msgstr "Bitte die Adresse und den Port eines Servers eingeben."
+msgstr "Bitte die Adresse und den Port eines Servers eingeben"
 
-#: src/gui/serverdialog.cpp:482
+#: src/gui/serverdialog.cpp:488
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Lade Serverliste herunter...%2.2f%%"
 
-#: src/gui/serverdialog.cpp:488
+#: src/gui/serverdialog.cpp:494
 msgid "Waiting for server..."
 msgstr "Warte auf den Server"
 
-#: src/gui/serverdialog.cpp:492
+#: src/gui/serverdialog.cpp:498
 msgid "Preparing download"
 msgstr "Download wird vorbereitet"
 
-#: src/gui/serverdialog.cpp:496
+#: src/gui/serverdialog.cpp:502
 #, fuzzy
 msgid "Error retreiving server list!"
 msgstr "Fehler beim empfangen der Serverliste: %s\n"
 
-#: src/gui/serverdialog.cpp:593
+#: src/gui/serverdialog.cpp:599
 msgid "requires a newer version"
-msgstr ""
+msgstr "benötigt eine neuere Version"
 
-#: src/gui/serverdialog.cpp:595
+#: src/gui/serverdialog.cpp:601
 #, c-format
 msgid "requires v%s"
-msgstr ""
+msgstr "benötigt v%s"
 
 #: src/gui/setup_audio.cpp:46
 msgid "Enable Audio"
@@ -1921,9 +1947,8 @@ msgid "Enable music"
 msgstr "Joystick aktivieren"
 
 #: src/gui/setup_audio.cpp:50
-#, fuzzy
 msgid "Enable mumble voice chat"
-msgstr "Joystick aktivieren"
+msgstr ""
 
 #: src/gui/setup_audio.cpp:52
 msgid "Download music"
@@ -1990,14 +2015,12 @@ msgid "Show chat history"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:100
-#, fuzzy
 msgid "Enable battle tab"
-msgstr "Kauf fehlgeschlagen."
+msgstr ""
 
 #: src/gui/setup_chat.cpp:104
-#, fuzzy
 msgid "Show battle events"
-msgstr "Geschlecht"
+msgstr ""
 
 #: src/gui/setup_chat.cpp:108
 msgid "Show chat colors list"
@@ -2077,7 +2100,7 @@ msgstr "Fenster zurücksetzen"
 
 #: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:76
 msgid "Press the button to start calibration"
-msgstr "Knopf drücken, um die Kalibrierung zu starten"
+msgstr "Knopf drücken um die Kalibrierung zu starten"
 
 #: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:74
 msgid "Calibrate"
@@ -2151,9 +2174,8 @@ msgid "Cycle player targets"
 msgstr ""
 
 #: src/gui/setup_other.cpp:123
-#, fuzzy
 msgid "Cycle monster targets"
-msgstr "Eigener Name"
+msgstr ""
 
 #: src/gui/setup_other.cpp:126
 #, fuzzy
@@ -2170,23 +2192,20 @@ msgid "Crazy move A program"
 msgstr ""
 
 #: src/gui/setup_other.cpp:143
-#, fuzzy
 msgid "Enable shop mode"
-msgstr "Handeln erlauben/verbieten"
+msgstr ""
 
 #: src/gui/setup_other.cpp:147
 msgid "Enable buggy servers protection"
 msgstr ""
 
 #: src/gui/setup_other.cpp:151
-#, fuzzy
 msgid "Enable debug log"
-msgstr "Kauf fehlgeschlagen."
+msgstr ""
 
 #: src/gui/setup_other.cpp:155
-#, fuzzy
 msgid "Enable server side attack"
-msgstr "Kauf fehlgeschlagen."
+msgstr ""
 
 #: src/gui/setup_other.cpp:159
 msgid "Auto fix position"
@@ -2240,9 +2259,8 @@ msgid "Ignored"
 msgstr "Ignoriert"
 
 #: src/gui/setup_players.cpp:69
-#, fuzzy
 msgid "Erased"
-msgstr "Senden"
+msgstr ""
 
 #: src/gui/setup_players.cpp:238
 msgid "Allow trading"
@@ -2400,7 +2418,7 @@ msgstr "Mittel"
 
 #: src/gui/setup_video.cpp:244
 msgid "max"
-msgstr "Maximal"
+msgstr "max"
 
 #: src/gui/setup_video.cpp:276
 msgid "Full screen"
@@ -2425,7 +2443,7 @@ msgstr "Partikeleffekte"
 
 #: src/gui/setup_video.cpp:284
 msgid "Log NPC dialogue"
-msgstr ""
+msgstr "Protokoliere NPC Gespräche"
 
 #: src/gui/setup_video.cpp:285
 msgid "Show pickup notification"
@@ -2467,9 +2485,8 @@ msgid "Show job"
 msgstr "Zeigen"
 
 #: src/gui/setup_video.cpp:301
-#, fuzzy
 msgid "Enable opacity cache"
-msgstr "Joystick aktivieren"
+msgstr ""
 
 #: src/gui/setup_video.cpp:302
 #, fuzzy
@@ -2497,7 +2514,7 @@ msgstr "Chat über Spielern"
 
 #: src/gui/setup_video.cpp:327
 msgid "Gui opacity"
-msgstr "GUI-Transparenz"
+msgstr "GUI Transparenz"
 
 #: src/gui/setup_video.cpp:328
 msgid "Ambient FX"
@@ -2523,13 +2540,13 @@ msgstr "Nein"
 #, fuzzy
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
-msgstr "Auflösung und Wiederherstellung der alten Auflösung schlug fehl!"
+msgstr "und Wiederherstellung der alten Auflösung schlug fehl!"
 
 #: src/gui/setup_video.cpp:534
 #, fuzzy
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
-msgstr "Auflösung und Wiederherstellung der alten Auflösung schlug fehl!"
+msgstr "und Wiederherstellung der alten Auflösung schlug fehl!"
 
 #: src/gui/setup_video.cpp:545
 #, fuzzy
@@ -2612,7 +2629,7 @@ msgstr "Erbitte einen Handel"
 #: src/gui/shopwindow.cpp:707
 #, fuzzy, c-format
 msgid "%s wants to %s %s do you accept?"
-msgstr "%s möchte mit dir handeln, stimmst Du zu?"
+msgstr "%s möchte mit dir handeln, stimmst du zu?"
 
 #: src/gui/skilldialog.cpp:227 src/gui/windowmenu.cpp:77
 msgid "Skills"
@@ -2693,7 +2710,7 @@ msgstr "Spieler %s einladen"
 #: src/gui/socialwindow.cpp:254
 #, c-format
 msgid "Party %s quit requested."
-msgstr ""
+msgstr "Partie %s Auflösung beauftragt."
 
 #: src/gui/socialwindow.cpp:281
 #, fuzzy
@@ -2707,7 +2724,7 @@ msgstr "Wen möchtest du einladen?"
 
 #: src/gui/socialwindow.cpp:291
 msgid "Leave Party?"
-msgstr ""
+msgstr "Partie verlassen?"
 
 #: src/gui/socialwindow.cpp:292
 #, fuzzy, c-format
@@ -2788,7 +2805,7 @@ msgstr "Anfrage für eine Party erhalten, aber du bist bereits in einer Party."
 #: src/gui/socialwindow.cpp:1114
 #, c-format
 msgid "%s has invited you to join the guild %s."
-msgstr "%s hat Dich eingeladen, seiner Gilde %s beizutreten."
+msgstr "%s hat dich eingeladen, seiner Gilde %s beizutreten."
 
 #: src/gui/socialwindow.cpp:1120
 msgid "Accept Guild Invite"
@@ -2824,7 +2841,7 @@ msgstr "Nehme Partyeinladung an"
 
 #: src/gui/socialwindow.cpp:1187
 msgid "Cannot create party. You are already in a party"
-msgstr ""
+msgstr "Konnte keine Partie erstellen. Du bist schon in einer Partie."
 
 #: src/gui/socialwindow.cpp:1192
 #, fuzzy
@@ -2867,11 +2884,11 @@ msgstr "MP:"
 #: src/gui/statuswindow.cpp:186 src/gui/statuswindow.cpp:327
 #, c-format
 msgid "Job: %d"
-msgstr "Beruf: %d"
+msgstr "Job: %d"
 
 #: src/gui/statuswindow.cpp:187
 msgid "Job:"
-msgstr "Beruf:"
+msgstr "Job:"
 
 #: src/gui/statuswindow.cpp:241 src/gui/statuswindow.cpp:285
 #, fuzzy, c-format
@@ -2891,7 +2908,7 @@ msgstr "Fähigkeitspunkte: %d"
 #: src/gui/textcommandeditor.cpp:109
 #, fuzzy
 msgid "No Target"
-msgstr "Laufe nach Links"
+msgstr "NPC anvisieren"
 
 #: src/gui/textcommandeditor.cpp:110
 #, fuzzy
@@ -2974,9 +2991,8 @@ msgid "Magic School:"
 msgstr ""
 
 #: src/gui/textcommandeditor.cpp:223
-#, fuzzy
 msgid "School level:"
-msgstr "Geschlecht"
+msgstr ""
 
 #: src/gui/textcommandeditor.cpp:228
 msgid "Save"
@@ -3087,7 +3103,7 @@ msgstr "Ignoriere %s"
 #: src/gui/userpalette.cpp:115
 #, fuzzy
 msgid "Erased Names"
-msgstr "Senden"
+msgstr "Namen von GM"
 
 #: src/gui/userpalette.cpp:116
 msgid "Other Players' Names"
@@ -3143,13 +3159,14 @@ msgstr "Anzeige der Erfahrungspunkte"
 #: src/gui/userpalette.cpp:129
 #, fuzzy
 msgid "Player HP bar"
-msgstr "Monster trifft Spieler"
+msgstr "Spieler"
 
 #: src/gui/userpalette.cpp:131
 msgid "Player HP bar (second color)"
 msgstr ""
 
 #: src/gui/userpalette.cpp:132
+#, fuzzy
 msgid "Player Hits Monster"
 msgstr "Spieler trifft Monster"
 
@@ -3160,7 +3177,7 @@ msgstr "Monster trifft Spieler"
 #: src/gui/userpalette.cpp:135
 #, fuzzy
 msgid "Other Player Hits Local Player"
-msgstr "Namen anderer Spieler"
+msgstr "Spieler trifft Monster"
 
 #: src/gui/userpalette.cpp:136
 msgid "Critical Hit"
@@ -3174,7 +3191,7 @@ msgstr "Spieler trifft Monster"
 #: src/gui/userpalette.cpp:140
 #, fuzzy
 msgid "Local Player Critical Hit"
-msgstr "Spieler trifft Monster"
+msgstr "Kritischer Treffer"
 
 #: src/gui/userpalette.cpp:142
 #, fuzzy
@@ -3201,12 +3218,14 @@ msgid "Walkable Highlight"
 msgstr "Hervorgehobener Tab"
 
 #: src/gui/userpalette.cpp:150
+#, fuzzy
 msgid "Local Player Attack Range"
-msgstr ""
+msgstr "Spieler trifft Monster"
 
 #: src/gui/userpalette.cpp:152
+#, fuzzy
 msgid "Local Player Attack Range Border"
-msgstr ""
+msgstr "Spieler trifft Monster"
 
 #: src/gui/userpalette.cpp:154
 #, fuzzy
@@ -3252,7 +3271,7 @@ msgstr ""
 
 #: src/gui/widgets/channeltab.cpp:49
 msgid "/users > Lists the users in the current channel"
-msgstr "/users > Zeigt eine Liste der Spieler im aktuellen Kanal"
+msgstr "/users > Zeigt eine Liste der Spiele im aktuellen Kanal"
 
 #: src/gui/widgets/channeltab.cpp:50
 msgid "/topic > Set the topic of the current channel"
@@ -3264,7 +3283,7 @@ msgstr "/quit > Verlasse einen Kanal"
 
 #: src/gui/widgets/channeltab.cpp:52
 msgid "/op > Make a user a channel operator"
-msgstr "/op > Ernenne einen Spieler zum Kanalmoderator"
+msgstr "/op > Ernenne einen Spieler zum Kanalwärter"
 
 #: src/gui/widgets/channeltab.cpp:53
 msgid "/kick > Kick a user from the channel"
@@ -3276,7 +3295,7 @@ msgstr "Befehl: /users"
 
 #: src/gui/widgets/channeltab.cpp:64
 msgid "This command shows the users in this channel."
-msgstr "Dieser Befehl zeigt eine Liste der Spieler im aktuellen Kanal."
+msgstr "Dieser Befehl zeit eine Liste der Spieler im aktuellen Kanal."
 
 #: src/gui/widgets/channeltab.cpp:68
 msgid "Command: /topic <message>"
@@ -3310,7 +3329,7 @@ msgstr "Dieser Befehl macht Spieler <Name> zu einem Moderator des Kanals"
 msgid "Channel operators can kick and op other users from the channel."
 msgstr ""
 "Moderatoren können andere Spieler aus dem Kanal werfen oder ihnen ebenfalls "
-"Moderatorrechte verleihen."
+"Moderator-Rechte verleihen."
 
 #: src/gui/widgets/channeltab.cpp:89
 msgid "Command: /kick <nick>"
@@ -3344,11 +3363,11 @@ msgstr "%s flüstert: "
 
 #: src/gui/widgets/whispertab.cpp:104
 msgid "/ignore > Ignore the other player"
-msgstr ""
+msgstr "/ignore > Anderen Spieler ignorieren"
 
 #: src/gui/widgets/whispertab.cpp:105
 msgid "/unignore > Stop ignoring the other player"
-msgstr ""
+msgstr "/unignore > Anderen Spieler nicht mehr ignorieren"
 
 #: src/gui/widgets/whispertab.cpp:106
 msgid "/close > Close the whisper tab"
@@ -3384,9 +3403,8 @@ msgid "BC"
 msgstr ""
 
 #: src/gui/windowmenu.cpp:61
-#, fuzzy
 msgid "Bot checker"
-msgstr "Gefühlsfenster"
+msgstr ""
 
 #: src/gui/windowmenu.cpp:63
 msgid "ONL"
@@ -3492,7 +3510,7 @@ msgstr "Zielen & Angreifen"
 #: src/keyboardconfig.cpp:48
 #, fuzzy
 msgid "Move to Target"
-msgstr "Laufe nach Links"
+msgstr "NPC anvisieren"
 
 #: src/keyboardconfig.cpp:50
 msgid "Change Move to Target type"
@@ -3558,7 +3576,7 @@ msgstr "Handeln erlauben/verbieten"
 #: src/keyboardconfig.cpp:74
 #, fuzzy
 msgid "Change Map View Mode"
-msgstr "E-MailAdresse ändern"
+msgstr "Passwort ändern"
 
 #: src/keyboardconfig.cpp:76
 #, fuzzy
@@ -3641,7 +3659,7 @@ msgstr "Einstellungen"
 #: src/keyboardconfig.cpp:143
 #, fuzzy
 msgid "Quick drop Window"
-msgstr "Fenster ausblenden"
+msgstr "Einstellungen"
 
 #: src/keyboardconfig.cpp:145
 #, fuzzy
@@ -3700,15 +3718,16 @@ msgstr "Gefühlstaste %d"
 
 #: src/keyboardconfig.cpp:250
 msgid "Wear Outfit"
-msgstr ""
+msgstr "Ausrüstung anziehen"
 
 #: src/keyboardconfig.cpp:252
 msgid "Copy Outfit"
-msgstr ""
+msgstr "Ausrüstung kopieren"
 
 #: src/keyboardconfig.cpp:254
+#, fuzzy
 msgid "Copy Equiped to Outfit"
-msgstr ""
+msgstr "Ausrüstung kopieren"
 
 #: src/keyboardconfig.cpp:256
 msgid "Toggle Chat"
@@ -3838,7 +3857,7 @@ msgstr "Passwort ändern"
 #: src/keyboardconfig.cpp:312
 #, fuzzy
 msgid "Change Imitation mode"
-msgstr "E-MailAdresse ändern"
+msgstr "Email-Adresse ändern"
 
 #: src/keyboardconfig.cpp:315
 msgid "Disbale / Enable Game modifier keys"
@@ -3874,7 +3893,7 @@ msgstr ""
 
 #: src/localplayer.cpp:1305
 msgid "Unable to pick up item."
-msgstr "Kann Gegenstand nicht aufheben."
+msgstr "Kann das nicht aufheben."
 
 #. TRANSLATORS: This sentence may be translated differently
 #. for different grammatical numbers (singular, plural, ...)
@@ -3887,16 +3906,17 @@ msgstr[1] "Du hast %s [@@%d|%s@@] aufgehoben."
 
 #: src/localplayer.cpp:2979
 msgid "Away"
-msgstr ""
+msgstr "Abwesend"
 
-#: src/localplayer.cpp:3617
+#: src/localplayer.cpp:3618
 #, fuzzy
 msgid "You see "
 msgstr "Du erhältst %s."
 
 #: src/main.cpp:44
+#, fuzzy
 msgid "manaplus [options] [mana-file]"
-msgstr ""
+msgstr "mana [Optionen] [mana-Datei]"
 
 #: src/main.cpp:45
 msgid "[mana-file] : The mana file is an XML file (.mana)"
@@ -3926,55 +3946,53 @@ msgstr "  -C --config-file : zu benutzende Konfigurationsdatei"
 
 #: src/main.cpp:52
 msgid "  -v --version        : Display the version"
-msgstr "  -v --version        : Die Version des Spieles anzeigen"
+msgstr "  -v --version : Die Version des Spieles anzeigen"
 
 #: src/main.cpp:53
 msgid "  -h --help           : Display this help"
-msgstr "  - --help           : Zeigt diesen Hilfstext an"
+msgstr "  - --help : Zeigt diesen Hilfstext an"
 
 #: src/main.cpp:54
 #, fuzzy
 msgid "  -C --config-dir     : Configuration directory to use"
-msgstr "  -C --config-file     : zu benutzende Konfigurationsdatei"
+msgstr "  -C --config-file : zu benutzende Konfigurationsdatei"
 
 #: src/main.cpp:55
 msgid "  -U --username       : Login with this username"
-msgstr "  -U --username       : Mit angegebenem Benutzernamen anmelden"
+msgstr "  -U --username : Mit angegebenem Benutzernamen anmelden"
 
 #: src/main.cpp:56
 msgid "  -P --password       : Login with this password"
-msgstr "  -P --password       : Angegebenes Passwort benutzen"
+msgstr "  -P --password : Angegebenes Passwort benutzen"
 
 #: src/main.cpp:57
 msgid "  -c --character      : Login with this character"
-msgstr "  -c --charakter      : Mit angegebenem Spieler anmelden"
+msgstr "  -c --charakter : Mit angegebenem Spieler anmelden"
 
 #: src/main.cpp:58
 msgid "  -s --server         : Login server name or IP"
-msgstr "  -s --server         : Name oder IP-Adresse des Loginservers"
+msgstr "  -s --server : Name oder IP-Adresse des Loginservers"
 
 #: src/main.cpp:59
 msgid "  -p --port           : Login server port"
-msgstr "  -p --port           : Port des Loginservers"
+msgstr "  -p --port : Port des Loginservers"
 
 #: src/main.cpp:60
 #, fuzzy
 msgid "     --update-host    : Use this update host"
-msgstr "  -H --update-host    : Benutze angegebenen Updateserver"
+msgstr "  -H --update-host : Benutze angegebenen Updateserver"
 
 #: src/main.cpp:61
 msgid "  -D --default        : Choose default character server and character"
-msgstr "  -D --default        : Wähle zuletzt benutzten Server und Spieler aus"
+msgstr "  -D --default : Wähle zuletzt benutzten Server und Spieler aus"
 
 #: src/main.cpp:63
 msgid "  -u --skip-update    : Skip the update downloads"
-msgstr "  -u --skip-update    : Überspringe das Herunterladen von Updates"
+msgstr "  -u --skip-update : Überspringe das Herunterladen von Updates"
 
 #: src/main.cpp:64
 msgid "  -d --data           : Directory to load game data from"
-msgstr ""
-"  -d --data           : Datenverzeichnis, aus dem das Spiel geladen werden "
-"soll"
+msgstr "  -d --data : Datenverzeichnis, aus dem das Spiel geladen werden soll"
 
 #: src/main.cpp:66
 #, fuzzy
@@ -3995,7 +4013,7 @@ msgstr ""
 #: src/main.cpp:71
 #, fuzzy
 msgid "     --no-opengl      : Disable OpenGL for this session"
-msgstr "  -O --no-opengl      : OpenGL-Erweiterungen deaktivieren"
+msgstr "  -O --no-opengl : OpenGL-Erweiterungen deaktivieren"
 
 #: src/net/manaserv/attributes.cpp:159 src/net/tmwa/generalhandler.cpp:247
 msgid "Strength"
@@ -4051,28 +4069,28 @@ msgstr "Willenskraft:"
 msgid "Willpower %+.1f"
 msgstr "Willensstärke %+d"
 
-#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:104
+#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:105
 msgid "You are dead."
 msgstr "Ach ja: Du bist Tot."
 
-#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:105
+#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:106
 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:317 src/net/tmwa/playerhandler.cpp:107
+#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:108
 msgid "You are not that alive anymore."
 msgstr "Du bist nicht länger lebendig."
 
-#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:108
+#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:109
 msgid "The cold hands of the grim reaper are grabbing for your soul."
-msgstr "Die kalten Hände des Sensenmanns greifen nach Deiner Seele."
+msgstr "Die kalten Hände des Sensemanns greifen nach Deiner Seele."
 
-#: src/net/manaserv/beinghandler.cpp:319 src/net/tmwa/playerhandler.cpp:109
+#: src/net/manaserv/beinghandler.cpp:319 src/net/tmwa/playerhandler.cpp:110
 msgid "Game Over!"
 msgstr "Game Over!"
 
-#: src/net/manaserv/beinghandler.cpp:320 src/net/tmwa/playerhandler.cpp:111
+#: src/net/manaserv/beinghandler.cpp:320 src/net/tmwa/playerhandler.cpp:112
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
@@ -4080,7 +4098,7 @@ msgstr ""
 "Nein, Kinder. Euer Charakter ist nicht tot. Er... ähm... ist zu einem "
 "besserem Ort gegangen."
 
-#: src/net/manaserv/beinghandler.cpp:322 src/net/tmwa/playerhandler.cpp:113
+#: src/net/manaserv/beinghandler.cpp:322 src/net/tmwa/playerhandler.cpp:114
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
@@ -4088,32 +4106,32 @@ 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:324 src/net/tmwa/playerhandler.cpp:115
+#: src/net/manaserv/beinghandler.cpp:324 src/net/tmwa/playerhandler.cpp:116
 msgid "I guess this did not run too well."
 msgstr "Ich glaube, das war nicht so gut."
 
-#: src/net/manaserv/beinghandler.cpp:325 src/net/tmwa/playerhandler.cpp:117
+#: src/net/manaserv/beinghandler.cpp:325 src/net/tmwa/playerhandler.cpp:118
 msgid "Do you want your possessions identified?"
 msgstr "Möchtest du eine Auflistung Deiner Verletzungen?"
 
-#: src/net/manaserv/beinghandler.cpp:326 src/net/tmwa/playerhandler.cpp:119
+#: src/net/manaserv/beinghandler.cpp:326 src/net/tmwa/playerhandler.cpp:120
 msgid "Sadly, no trace of you was ever found..."
 msgstr "Leider wurde niemals eine Spur von Dir gefunden..."
 
-#: src/net/manaserv/beinghandler.cpp:328 src/net/tmwa/playerhandler.cpp:121
+#: src/net/manaserv/beinghandler.cpp:328 src/net/tmwa/playerhandler.cpp:122
 msgid "Annihilated."
 msgstr "Vernichtet."
 
-#: src/net/manaserv/beinghandler.cpp:329 src/net/tmwa/playerhandler.cpp:123
+#: src/net/manaserv/beinghandler.cpp:329 src/net/tmwa/playerhandler.cpp:124
 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:331 src/net/tmwa/playerhandler.cpp:125
+#: src/net/manaserv/beinghandler.cpp:331 src/net/tmwa/playerhandler.cpp:126
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
-"Du hast schon wieder versagt. Spül Deine Überreste hinunter und hol Dir "
-"einen paar Neue."
+"Du hast schon wieder versagt. Spül Deine Überreste hinunter und hol Dir ein "
+"paar Neue."
 
 #: src/net/manaserv/beinghandler.cpp:336
 msgid "Press OK to respawn."
@@ -4172,11 +4190,11 @@ msgstr "Ungültiger Name."
 #: src/net/manaserv/charhandler.cpp:180 src/net/manaserv/loginhandler.cpp:98
 #: src/net/manaserv/loginhandler.cpp:130 src/net/manaserv/loginhandler.cpp:166
 #: src/net/manaserv/loginhandler.cpp:286 src/net/manaserv/loginhandler.cpp:323
-#: src/net/tmwa/loginhandler.cpp:99 src/net/tmwa/loginhandler.cpp:187
+#: src/net/tmwa/loginhandler.cpp:99 src/net/tmwa/loginhandler.cpp:190
 msgid "Unknown error."
 msgstr "Unbekannter Fehler"
 
-#: src/net/manaserv/charhandler.cpp:209 src/net/tmwa/charserverhandler.cpp:149
+#: src/net/manaserv/charhandler.cpp:209 src/net/tmwa/charserverhandler.cpp:172
 msgid "Info"
 msgstr "Info"
 
@@ -4218,7 +4236,7 @@ msgstr "Liste Kanäle"
 
 #: src/net/manaserv/chathandler.cpp:225
 msgid "End of channel list."
-msgstr ""
+msgstr "Ende der Channel-Liste."
 
 #: src/net/manaserv/chathandler.cpp:298
 #, c-format
@@ -4228,17 +4246,17 @@ msgstr "%s ist dem Kanal beigetreten."
 #: src/net/manaserv/chathandler.cpp:303
 #, c-format
 msgid "%s left the channel."
-msgstr ""
+msgstr "%s hat den Channel verlassen."
 
 #: src/net/manaserv/chathandler.cpp:319
 #, c-format
 msgid "%s has set mode %s on user %s."
-msgstr ""
+msgstr "%s hat den Modus %s auf den Spieler %s gesetzt."
 
 #: src/net/manaserv/chathandler.cpp:330
 #, c-format
 msgid "%s has kicked %s."
-msgstr ""
+msgstr "%s hat %s gekickt."
 
 #: src/net/manaserv/chathandler.cpp:336
 #, fuzzy
@@ -4259,7 +4277,7 @@ msgstr "Einladung gesendet."
 
 #: src/net/manaserv/guildhandler.cpp:206
 msgid "Member was promoted successfully."
-msgstr "Mitglied wurde erfolgreich befördert."
+msgstr "Mitglied wurde erfolgreich Befördert."
 
 #: src/net/manaserv/guildhandler.cpp:211
 msgid "Failed to promote member."
@@ -4306,6 +4324,8 @@ msgstr "Die neue E-Mailadresse ist bereits vorhanden."
 msgid ""
 "Client registration is not allowed. Please contact server administration."
 msgstr ""
+"Client Registrierung wurde deaktiviert. Bitte den Serveradministrator "
+"kontaktieren."
 
 #: src/net/manaserv/loginhandler.cpp:270 src/net/manaserv/loginhandler.cpp:307
 msgid "Client version is too old."
@@ -4322,7 +4342,7 @@ msgstr "Account abgelaufen"
 
 #: src/net/manaserv/loginhandler.cpp:282
 msgid "Login attempt too soon after previous attempt."
-msgstr ""
+msgstr "Anmeldeversuch zu früh nach vorherigem Versuch."
 
 #: src/net/manaserv/loginhandler.cpp:310
 msgid "Wrong username, password or email address."
@@ -4339,6 +4359,7 @@ msgstr "E-Mailadresse bereits vorhanden"
 #: src/net/manaserv/loginhandler.cpp:319
 msgid "You took too long with the captcha or your response was incorrect."
 msgstr ""
+"Du hast für das Captcha zu lange gebraucht oder deine Eingabe war inkorrekt."
 
 #: src/net/manaserv/partyhandler.cpp:89
 msgid "Joined party."
@@ -4365,7 +4386,7 @@ msgstr "Ignoriere eingehende Handelsanfragen."
 #: src/net/manaserv/tradehandler.cpp:127 src/net/tmwa/tradehandler.cpp:122
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
-msgstr "%s möchte mit dir handeln, stimmst Du zu?"
+msgstr "%s möchte mit dir handeln, stimmst du zu?"
 
 #: src/net/manaserv/tradehandler.cpp:145
 #, c-format
@@ -4400,62 +4421,90 @@ msgstr "Vielen Dank für den Einkauf."
 msgid "Unable to buy."
 msgstr "Kauf fehlgeschlagen."
 
-#: src/net/tmwa/buysellhandler.cpp:143
+#: src/net/tmwa/buysellhandler.cpp:145
 msgid "Thanks for selling."
 msgstr "Vielen Dank für den Verkauf."
 
-#: src/net/tmwa/buysellhandler.cpp:145
+#: src/net/tmwa/buysellhandler.cpp:149
 msgid "Unable to sell."
 msgstr "Verkauf fehlgeschlagen."
 
-#: src/net/tmwa/charserverhandler.cpp:106
+#: src/net/tmwa/buysellhandler.cpp:152
+#, fuzzy
+msgid "Unable to sell while trading."
+msgstr "Verkauf fehlgeschlagen."
+
+#: src/net/tmwa/buysellhandler.cpp:155
+#, fuzzy
+msgid "Unable to sell unsellable item."
+msgstr "Kann das nicht aufheben."
+
+#: src/net/tmwa/charserverhandler.cpp:109
 msgid "Access denied. Most likely, there are too many players on this server."
-msgstr ""
+msgstr "Zugriff verweigert. Wahrscheinlich zu viele Spieler auf dem Server."
 
-#: src/net/tmwa/charserverhandler.cpp:110
+#: src/net/tmwa/charserverhandler.cpp:113
 msgid "Cannot use this ID."
 msgstr "Kann diese ID nicht benutzen"
 
-#: src/net/tmwa/charserverhandler.cpp:113
+#: src/net/tmwa/charserverhandler.cpp:116
 #, fuzzy
 msgid "Unknown char-server failure."
 msgstr "Unbekannter Fehler"
 
-#: src/net/tmwa/charserverhandler.cpp:137
+#: src/net/tmwa/charserverhandler.cpp:145
 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/tmwa/charserverhandler.cpp:149
+#: src/net/tmwa/charserverhandler.cpp:149 src/net/tmwa/loginhandler.cpp:187
+#, fuzzy
+msgid "Wrong name."
+msgstr "Fehlerhaftes Magiemerkmal"
+
+#: src/net/tmwa/charserverhandler.cpp:152
+msgid "Incorrect stats."
+msgstr ""
+
+#: src/net/tmwa/charserverhandler.cpp:155
+msgid "Incorrect hair."
+msgstr ""
+
+#: src/net/tmwa/charserverhandler.cpp:158
+#, fuzzy
+msgid "Incorrect slot."
+msgstr "Kein freier Slot."
+
+#: src/net/tmwa/charserverhandler.cpp:172
 msgid "Character deleted."
 msgstr "Spieler gelöscht."
 
-#: src/net/tmwa/charserverhandler.cpp:154
+#: src/net/tmwa/charserverhandler.cpp:177
 msgid "Failed to delete character."
 msgstr "Spieler konnte nicht gelöscht werden."
 
-#: src/net/tmwa/charserverhandler.cpp:286
+#: src/net/tmwa/charserverhandler.cpp:317
 msgid "Strength:"
 msgstr "Stärke:"
 
-#: src/net/tmwa/charserverhandler.cpp:287
+#: src/net/tmwa/charserverhandler.cpp:318
 msgid "Agility:"
 msgstr "Agilität:"
 
-#: src/net/tmwa/charserverhandler.cpp:288
+#: src/net/tmwa/charserverhandler.cpp:319
 msgid "Vitality:"
 msgstr "Vitalität:"
 
-#: src/net/tmwa/charserverhandler.cpp:289
+#: src/net/tmwa/charserverhandler.cpp:320
 msgid "Intelligence:"
 msgstr "Intelligenz:"
 
-#: src/net/tmwa/charserverhandler.cpp:290
+#: src/net/tmwa/charserverhandler.cpp:321
 msgid "Dexterity:"
 msgstr "Geschicklichkeit:"
 
-#: src/net/tmwa/charserverhandler.cpp:291
+#: src/net/tmwa/charserverhandler.cpp:322
 msgid "Luck:"
 msgstr "Glück:"
 
@@ -4532,7 +4581,7 @@ msgstr "Glück %+d"
 
 #: src/net/tmwa/generalhandler.cpp:135
 msgid "Authentication failed."
-msgstr "Authentifizierung fehlgeschlagen"
+msgstr "Authentifizierung verweigert"
 
 #: src/net/tmwa/generalhandler.cpp:138
 msgid "No servers available."
@@ -4601,12 +4650,12 @@ msgstr "Angriff %+d"
 #: src/net/tmwa/generalhandler.cpp:263
 #, fuzzy
 msgid "Walk Delay"
-msgstr "Angriff %+d"
+msgstr "Verzögerung: "
 
 #: src/net/tmwa/generalhandler.cpp:265
 #, fuzzy
 msgid "Attack Range"
-msgstr "Monster trifft Spieler"
+msgstr "Angriffsreichweite"
 
 #: src/net/tmwa/gui/guildtab.cpp:74 src/net/tmwa/gui/partytab.cpp:66
 msgid "/help > Display this help."
@@ -4687,7 +4736,7 @@ msgstr ""
 #: src/net/tmwa/guildhandler.cpp:212
 #, fuzzy, c-format
 msgid "Average level: %d"
-msgstr "Max Level"
+msgstr "Stufe: %d"
 
 #: src/net/tmwa/guildhandler.cpp:214
 #, fuzzy, c-format
@@ -4706,7 +4755,7 @@ msgstr "Gilde erstellt."
 
 #: src/net/tmwa/guildhandler.cpp:433
 msgid "Could not inivte user to guild."
-msgstr ""
+msgstr "Konnte User nicht in Gilde einladen."
 
 #: src/net/tmwa/guildhandler.cpp:438
 #, fuzzy
@@ -4720,7 +4769,7 @@ msgstr "%s ist nun Mitglied Deiner Party."
 
 #: src/net/tmwa/guildhandler.cpp:448
 msgid "Your guild is full."
-msgstr ""
+msgstr "Deine Gilde ist voll."
 
 #: src/net/tmwa/guildhandler.cpp:453
 #, fuzzy
@@ -4744,7 +4793,7 @@ msgstr ""
 #: src/net/tmwa/guildhandler.cpp:535
 #, fuzzy, c-format
 msgid "%s has kicked from your guild."
-msgstr "%s ist nun Mitglied Deiner Party."
+msgstr "%s hat %s gekickt."
 
 #: src/net/tmwa/gui/partytab.cpp:67
 msgid "/invite > Invite a player to your party"
@@ -4862,13 +4911,13 @@ msgstr "Teilen der Erfahrungspunkte nicht möglich."
 msgid "Experience sharing unknown."
 msgstr "Teilen der Erfahrungspunkte aktiviert."
 
-#: src/net/tmwa/inventoryhandler.cpp:334
+#: src/net/tmwa/inventoryhandler.cpp:343
 msgid "Failed to use item."
 msgstr "Gegenstand konnte nicht benutzt werden."
 
-#: src/net/tmwa/inventoryhandler.cpp:457
+#: src/net/tmwa/inventoryhandler.cpp:472
 msgid "Unable to equip."
-msgstr "Kann Gegenstand nicht ausrüsten."
+msgstr "Kann Gegenstand nicht Ausrüsten."
 
 #: src/net/tmwa/loginhandler.cpp:90
 msgid "Account was not found. Please re-login."
@@ -4898,7 +4947,7 @@ 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-"
+"Du wurdest permanent vom Spiel ausgeschlossen. Bitte wende Dich an das GM "
 "Team."
 
 #: src/net/tmwa/loginhandler.cpp:177
@@ -4908,7 +4957,7 @@ msgid ""
 "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."
+"Bitte wende dich mittels des Forums an das GM Team."
 
 #: src/net/tmwa/loginhandler.cpp:184
 msgid "This user name is already taken."
@@ -4916,7 +4965,7 @@ msgstr "Dieser Spielername ist bereits vergeben"
 
 #: src/net/tmwa/network.cpp:147
 msgid "Empty address given to Network::connect()!"
-msgstr ""
+msgstr "Empty address given to Network::connect()!"
 
 #: src/net/tmwa/network.cpp:351
 msgid "Unable to resolve host \""
@@ -4978,53 +5027,53 @@ msgstr "Ein unbekanntes Mitglied hat versucht, \"%s\" zu sagen."
 msgid "%s is not in your party!"
 msgstr "%s ist nicht in Deiner Party!"
 
-#: src/net/tmwa/playerhandler.cpp:110
+#: src/net/tmwa/playerhandler.cpp:111
 msgid "Insert coin to continue."
 msgstr "Gib eine Münze ein um weiter zuspielen."
 
-#: src/net/tmwa/playerhandler.cpp:128
+#: src/net/tmwa/playerhandler.cpp:129
 msgid "You're not dead yet. You're just resting."
 msgstr "Du bist nicht tot. Du erholst Dich bloß."
 
-#: src/net/tmwa/playerhandler.cpp:129
+#: src/net/tmwa/playerhandler.cpp:130
 msgid "You are no more."
 msgstr "Du bist nicht mehr."
 
-#: src/net/tmwa/playerhandler.cpp:130
+#: src/net/tmwa/playerhandler.cpp:131
 msgid "You have ceased to be."
 msgstr "Du hast Dich entschieden, dem Irdischen zu entsagen."
 
-#: src/net/tmwa/playerhandler.cpp:131
+#: src/net/tmwa/playerhandler.cpp:132
 msgid "You've expired and gone to meet your maker."
 msgstr "Deine Zeit ist abgelaufen. Zeit, deinem Schöpfer gegenüberzutreten."
 
-#: src/net/tmwa/playerhandler.cpp:132
+#: src/net/tmwa/playerhandler.cpp:133
 msgid "You're a stiff."
 msgstr "Du bist ein wenig steif."
 
-#: src/net/tmwa/playerhandler.cpp:133
+#: src/net/tmwa/playerhandler.cpp:134
 msgid "Bereft of life, you rest in peace."
 msgstr "Des Lebens beraubt ruhst Du in Frieden."
 
-#: src/net/tmwa/playerhandler.cpp:134
+#: src/net/tmwa/playerhandler.cpp:135
 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/tmwa/playerhandler.cpp:135
+#: src/net/tmwa/playerhandler.cpp:136
 msgid "Your metabolic processes are now history."
 msgstr "Deine Körperfunktionen sind nun Geschichte."
 
-#: src/net/tmwa/playerhandler.cpp:136
+#: src/net/tmwa/playerhandler.cpp:137
 msgid "You're off the twig."
 msgstr "Du kriegst nichts mehr mit."
 
-#: src/net/tmwa/playerhandler.cpp:137
+#: src/net/tmwa/playerhandler.cpp:138
 msgid "You've kicked the bucket."
 msgstr "Jetzt passt Du in 'nen Eimer."
 
-#: src/net/tmwa/playerhandler.cpp:138
+#: src/net/tmwa/playerhandler.cpp:139
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
@@ -5032,48 +5081,48 @@ 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/tmwa/playerhandler.cpp:140
+#: src/net/tmwa/playerhandler.cpp:141
 msgid "You are an ex-player."
 msgstr "Du warst einmal ein Spieler."
 
-#: src/net/tmwa/playerhandler.cpp:141
+#: src/net/tmwa/playerhandler.cpp:142
 msgid "You're pining for the fjords."
 msgstr "Du schmachtest nach den Fjorden."
 
-#: src/net/tmwa/playerhandler.cpp:327 src/net/tmwa/playerhandler.cpp:336
-#: src/net/tmwa/playerhandler.cpp:415
+#: src/net/tmwa/playerhandler.cpp:330 src/net/tmwa/playerhandler.cpp:339
+#: src/net/tmwa/playerhandler.cpp:418
 msgid "Message"
 msgstr "Nachricht"
 
-#: src/net/tmwa/playerhandler.cpp:328
+#: src/net/tmwa/playerhandler.cpp:331
 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/tmwa/playerhandler.cpp:337
+#: src/net/tmwa/playerhandler.cpp:340
 #, fuzzy
 msgid "You are carrying less than half your weight. You are can regain health."
 msgstr ""
 "Du trägst mehr als die Hälfte Deiner Tragkraft. Du kannst Dich nicht mehr "
 "heilen."
 
-#: src/net/tmwa/playerhandler.cpp:442
+#: src/net/tmwa/playerhandler.cpp:445
 #, c-format
 msgid "You picked up %s."
 msgstr "Du hast %s aufgehoben "
 
-#: src/net/tmwa/playerhandler.cpp:448
+#: src/net/tmwa/playerhandler.cpp:451
 #, fuzzy, c-format
 msgid "You spent %s."
 msgstr "Du erhältst %s."
 
-#: src/net/tmwa/playerhandler.cpp:493
+#: src/net/tmwa/playerhandler.cpp:496
 msgid "Cannot raise skill!"
 msgstr "Kann Skill nicht erhöhen!"
 
-#: src/net/tmwa/playerhandler.cpp:613
+#: src/net/tmwa/playerhandler.cpp:616
 msgid "Equip arrows first."
 msgstr "Rüste dich zuerst mit Pfeilen aus."
 
@@ -5083,7 +5132,7 @@ msgstr "Handel fehlgeschlagen!"
 
 #: src/net/tmwa/specialhandler.cpp:152
 msgid "Emote failed!"
-msgstr "Gefühl fehlgeschlagen!"
+msgstr "Emote fehlgeschlagen!"
 
 #: src/net/tmwa/specialhandler.cpp:155
 msgid "Sit failed!"
@@ -5139,11 +5188,11 @@ msgstr "Du brauchst noch einen blauen Edelstein!"
 
 #: src/net/tmwa/specialhandler.cpp:206
 msgid "You're carrying to much to do this!"
-msgstr "Du schleppst zu viel herum, um das zu machen!"
+msgstr "Du schleppst zu viel herum um das zu machen!"
 
 #: src/net/tmwa/specialhandler.cpp:209
 msgid "Huh? What's that?"
-msgstr "Huch? Was ist das?"
+msgstr "Eha? Was ist das?"
 
 #: src/net/tmwa/specialhandler.cpp:220
 msgid "Warp failed..."
@@ -5180,7 +5229,6 @@ msgid "Trade with %s cancelled."
 msgstr "Handel mit %s abgebrochen."
 
 #: src/net/tmwa/tradehandler.cpp:184
-#, fuzzy
 msgid "Unhandled trade cancel packet."
 msgstr "Übergangenes Handelsabbruchspaket."
 
@@ -5212,62 +5260,74 @@ msgstr "@@ignore|Ignoriere %s komplett@@"
 
 #: src/playerrelations.cpp:418
 msgid "Print '...'"
-msgstr ""
+msgstr "Drucke '..'"
 
 #: src/playerrelations.cpp:438
 msgid "Blink name"
-msgstr ""
+msgstr "Blinkender Name"
 
 #: src/playerrelations.cpp:483
 msgid "Floating '...' bubble"
-msgstr ""
+msgstr "Schwebende '...' Blase"
 
 #: src/playerrelations.cpp:486
 msgid "Floating bubble"
-msgstr ""
+msgstr "Schwebende Blase"
 
-#: src/resources/beinginfo.cpp:32 src/resources/itemdb.cpp:210
+#: src/resources/beinginfo.cpp:32 src/resources/itemdb.cpp:223
 #: src/resources/monsterdb.cpp:78
 msgid "unnamed"
 msgstr "unbenannt"
 
-#: src/resources/itemdb.cpp:55
+#: src/resources/itemdb.cpp:57
 #, c-format
 msgid "Attack %+d"
 msgstr "Angriff %+d"
 
-#: src/resources/itemdb.cpp:56
+#: src/resources/itemdb.cpp:58
 #, c-format
 msgid "Defense %+d"
 msgstr "Verteidigung %+d"
 
-#: src/resources/itemdb.cpp:57
+#: src/resources/itemdb.cpp:59
 #, c-format
 msgid "HP %+d"
 msgstr "HP %+d"
 
-#: src/resources/itemdb.cpp:58
+#: src/resources/itemdb.cpp:60
 #, c-format
 msgid "MP %+d"
 msgstr "MP %+d"
 
-#: src/resources/itemdb.cpp:155
+#: src/resources/itemdb.cpp:152
 msgid "Unknown item"
 msgstr "Unbekannter Gegenstand"
 
-#~ msgid "Particle detail: %s"
-#~ msgstr "Partikeldetails: %s"
+#~ msgid "/record > Start recording the chat to an external file"
+#~ msgstr "/record > Starte die Aufzeichnung des Chats in eine Datei"
 
-#~ msgid "Ambient FX: %s"
-#~ msgstr "Hintergrundeffekte: %s"
+#~ msgid "Command: /record <filename>"
+#~ msgstr "Befehl: /record <Dateiname>"
 
-#, fuzzy
-#~ msgid "Emote Shortcut  %d"
-#~ msgstr "Gefühlstaste %d"
+#~ msgid "This command starts recording the chat log to the file <filename>."
+#~ msgstr ""
+#~ "Dieser Befehl startet den Mitschnitt des Chats (Chatlog) in die Datei "
+#~ "<Dateiname>."
 
-#, fuzzy
-#~ msgid "Player position:"
-#~ msgstr "Spieler trifft Monster"
+#~ msgid "Command: /record"
+#~ msgstr "Befehl: /record"
+
+#~ msgid "This command finishes a recording session."
+#~ msgstr "Dieser Befehl beendet den Mitschnitt des Chats."
+
+#~ msgid "Show IP: On"
+#~ msgstr "IP Anzeige: An"
+
+#~ msgid "Show IP: Off"
+#~ msgstr "IP Anzeige: Aus"
+
+#~ msgid "Attendance written to record log."
+#~ msgstr "Anwesenheitsliste wurde ins Chatprotokol geschrieben."
 
 #~ msgid "Music: %s"
 #~ msgstr "Musik: %s"
@@ -5278,29 +5338,59 @@ msgstr "Unbekannter Gegenstand"
 #~ msgid "Minimap: %s"
 #~ msgstr "Übersichtskarte: %s"
 
+#~ msgid "Particle detail: %s"
+#~ msgstr "Partikeldetails: %s"
+
+#~ msgid "Ambient FX: %s"
+#~ msgstr "Hintergrundeffekte: %s"
+
 #, fuzzy
-#~ msgid "Minimap: ?"
-#~ msgstr "Übersichtskarte: "
+#~ msgid "Registration disabled"
+#~ msgstr "Teilen von Gegenständen deaktiviert."
 
-#~ msgid "/record > Start recording the chat to an external file"
-#~ msgstr "/record > Starte die Aufzeichnung des Chats in eine Datei"
+#~ msgid "You need to use the website to register an account for this server."
+#~ msgstr "Du musst auf der Webseite ein Konto für diesen Server erstellen."
 
-#~ msgid "Command: /record <filename>"
-#~ msgstr "Befehl: /record <Dateiname>"
+#~ msgid "Clear log"
+#~ msgstr "Protokoll leeren"
 
-#~ msgid "This command starts recording the chat log to the file <filename>."
-#~ msgstr ""
-#~ "Dieser Befehl startet den Mitschnitt des Chats (Chatlog) in die Datei "
-#~ "<Dateiname>."
+#, fuzzy
+#~ msgid "Trade with %s..."
+#~ msgstr "Handele mit %s"
 
-#~ msgid "Command: /record"
-#~ msgstr "Befehl: /record"
+#~ msgid "Whisper %s"
+#~ msgstr "flüstere %s"
 
-#~ msgid "This command finishes a recording session."
-#~ msgstr "Dieser Befehl beendet den Mitschnitt des Chats."
+#~ msgid "Befriend %s"
+#~ msgstr "Sei Freund von %s"
 
-#~ msgid "Attendance written to record log."
-#~ msgstr "Anwesenheitsliste wurde ins Chatprotokol geschrieben."
+#, fuzzy
+#~ msgid "Disregard %s"
+#~ msgstr "Unbeachtet"
+
+#~ msgid "Unignore %s"
+#~ msgstr "Ignoriere %s nicht mehr"
+
+#~ msgid "Completely ignore %s"
+#~ msgstr "Ignoriere %s komplett"
+
+#~ msgid "Invite %s to join your guild"
+#~ msgstr "Lade %s in deine Gilde ein"
+
+#~ msgid "Invite %s to join your party"
+#~ msgstr "Lade %s in deine Party ein"
+
+#~ msgid "Kick player"
+#~ msgstr "Spieler rauswerfen"
+
+#~ msgid "Talk to %s"
+#~ msgstr "Rede mit %s"
+
+#~ msgid "Kick monster"
+#~ msgstr "Monster töten"
+
+#~ msgid "Pick up %s"
+#~ msgstr "Hebe %s auf"
 
 #~ msgid "Finishing recording."
 #~ msgstr "Aufzeichnung abgeschlossen."
@@ -5323,8 +5413,51 @@ msgstr "Unbekannter Gegenstand"
 #~ msgid "Stop recording"
 #~ msgstr "Stoppe Aufzeichnung"
 
-#~ msgid "Find Path to Mouse"
-#~ msgstr "Finde Weg zum Mauszeiger"
+#~ msgid "Sound"
+#~ msgstr "Ton"
+
+#~ msgid "Disable transparency (Low CPU mode)"
+#~ msgstr "Transparenz deaktivieren (für langsame PCs)"
+
+#, fuzzy
+#~ msgid "Show damage"
+#~ msgstr "Eigener Name"
+
+#~ msgid ""
+#~ "Applying change to OpenGL requires restart. In case OpenGL messes up your "
+#~ "game graphics, restart the game with the command line option \"--no-opengl"
+#~ "\"."
+#~ msgstr ""
+#~ "Der Wechsel zu OpenGL erfordert einen Neustart. Falls mit OpenGL Grafiken "
+#~ "fehlerhaft dargestellt werden sollten bitte das Spiel mit der "
+#~ "Kommandozeilenoption \"--no-opengl\" neustarten."
+
+#~ msgid "Deactivating OpenGL"
+#~ msgstr "Deaktiviere OpenGL"
+
+#, fuzzy
+#~ msgid "Transparency disabled"
+#~ msgstr "Teilen der Erfahrungspunkte deaktiviert."
+
+#~ msgid "You must restart to apply changes."
+#~ msgstr "Bitte neustarten um Änderungen zu übernehmen."
+
+#~ msgid "Transparency enabled"
+#~ msgstr "Transparenz aktiviert."
+
+#~ msgid "Creating guild failed, please choose a shorter name."
+#~ msgstr ""
+#~ "Gilde konnte nicht erstellt werden, bitte einen kürzen Namen wählen."
+
+#~ msgid "Creating party failed, please choose a shorter name."
+#~ msgstr ""
+#~ "Partie konte nicht erstellt werden, bitte einen kürzeren Namen wählen."
+
+#~ msgid "Specials Set %d"
+#~ msgstr "Spezial Sets %d"
+
+#~ msgid "Special %d"
+#~ msgstr "Spezial %d"
 
 #, fuzzy
 #~ msgid "HP"
@@ -5350,25 +5483,30 @@ msgstr "Unbekannter Gegenstand"
 #~ msgid "Level"
 #~ msgstr "Stufe: %d"
 
-#, fuzzy
-#~ msgid "Player successfully ignored!"
-#~ msgstr "Party erfolgreich erstellt."
+#~ msgid "Cannot send empty chat!"
+#~ msgstr "Kann keine leere Nachricht senden!"
 
 #, fuzzy
-#~ msgid "Player could not be ignored!"
-#~ msgstr ""
-#~ "Nachricht konnte nicht gesendet werden, sie wurde vom Spieler ignoriert."
+#~ msgid "Target Monster"
+#~ msgstr "Nächstes Ziel anvisieren"
 
-#, fuzzy
-#~ msgid "  -C --config-file    : Configuration file to use"
-#~ msgstr "  -C --config-file : zu benutzende Konfigurationsdatei"
+#~ msgid "Find Path to Mouse"
+#~ msgstr "Finde Weg zum Mauszeiger"
 
-#, fuzzy
-#~ msgid "  -l --chat-log-dir   : Chat log dir to use"
-#~ msgstr "  -C --config-file : zu benutzende Konfigurationsdatei"
+#~ msgid "One stat is zero."
+#~ msgstr "Ein Statuspunkt ist Null."
 
-#~ msgid "Sound"
-#~ msgstr "Ton"
+#~ msgid "Guild creation isn't supported yet."
+#~ msgstr "Gildenerstellung wird nocht nicht unterstützt."
+
+#~ msgid "Unable to unequip."
+#~ msgstr "Kann Gegenstand nicht ablegen."
+
+#~ msgid "Inviting failed, because you can't see a player called %s."
+#~ msgstr "Einladung fehlgeschlagen, da du den Spieler %s nicht sehen kannst."
+
+#~ msgid "You can only inivte when you are in a party!"
+#~ msgstr "Du kannst nur einladen wenn du in einer Partie bist."
 
 #~ msgid "Access denied."
 #~ msgstr "Zugang verweigert"
@@ -5379,61 +5517,12 @@ msgstr "Unbekannter Gegenstand"
 #~ msgid "Inviting like this isn't supported at the moment."
 #~ msgstr "Einladungen auf diesem Weg werden im Moment nicht unterstützt."
 
-#, fuzzy
-#~ msgid "You can only invite when you are in a party!"
-#~ msgstr "%s hat dich in seine Party eingeladen."
-
 #~ msgid "Willpower:"
 #~ msgstr "Willenskraft:"
 
 #~ msgid "Server is full."
 #~ msgstr "Server ist voll"
 
-#, fuzzy
-#~ msgid "Trade with %s..."
-#~ msgstr "Handele mit %s"
-
-#~ msgid "Whisper %s"
-#~ msgstr "flüstere %s"
-
-#~ msgid "Befriend %s"
-#~ msgstr "Sei Freund von %s"
-
-#, fuzzy
-#~ msgid "Disregard %s"
-#~ msgstr "Unbeachtet"
-
-#~ msgid "Unignore %s"
-#~ msgstr "Ignoriere %s nicht mehr"
-
-#~ msgid "Completely ignore %s"
-#~ msgstr "Ignoriere %s komplett"
-
-#~ msgid "Invite %s to join your guild"
-#~ msgstr "Lade %s in deine Gilde ein"
-
-#~ msgid "Invite %s to join your party"
-#~ msgstr "Lade %s in deine Party ein"
-
-#~ msgid "Talk to %s"
-#~ msgstr "Rede mit %s"
-
-#~ msgid "Kick monster"
-#~ msgstr "Monster töten"
-
-#~ msgid "Pick up %s"
-#~ msgstr "Hebe %s auf"
-
-#~ msgid "Cannot send empty chat!"
-#~ msgstr "Kann keine leere Nachricht senden!"
-
-#, fuzzy
-#~ msgid "Target Monster"
-#~ msgstr "Nächstes Ziel anvisieren"
-
-#~ msgid "Unable to unequip."
-#~ msgstr "Kann Gegenstand nicht ablegen."
-
 #~ msgid "Text Shadow"
 #~ msgstr "Textschatten"
 
@@ -5461,9 +5550,6 @@ msgstr "Unbekannter Gegenstand"
 #~ msgid "GM"
 #~ msgstr "GM"
 
-#~ msgid "Player"
-#~ msgstr "Spieler"
-
 #~ msgid "Whisper"
 #~ msgstr "geflüsterte Nachricht"
 
@@ -5476,6 +5562,9 @@ msgstr "Unbekannter Gegenstand"
 #~ msgid "Logger"
 #~ msgstr "Logger"
 
+#~ msgid "Hyperlink"
+#~ msgstr "Verknüpfung"
+
 #~ msgid "Unknown Item Type"
 #~ msgstr "Unbekannter Gegenstand"
 
@@ -5519,16 +5608,16 @@ msgstr "Unbekannter Gegenstand"
 #~ msgstr "Munition"
 
 #~ msgid "HP Bar"
-#~ msgstr "HP-Leiste"
+#~ msgstr "HP Leiste"
 
 #~ msgid "3/4 HP Bar"
-#~ msgstr "3/4 HP-Leiste"
+#~ msgstr "3/4 HP Leiste"
 
 #~ msgid "1/2 HP Bar"
-#~ msgstr "1/2 HP-Leiste"
+#~ msgstr "1/2 HP Leiste"
 
 #~ msgid "1/4 HP Bar"
-#~ msgstr "1/4 HP-Leiste"
+#~ msgstr "1/4 HP Leiste"
 
 #~ msgid "help"
 #~ msgstr "Hilfe"
@@ -5542,6 +5631,9 @@ msgstr "Unbekannter Gegenstand"
 #~ msgid "whisper"
 #~ msgstr "geflüsterte Nachricht"
 
+#~ msgid "ignore"
+#~ msgstr "Ignoriere"
+
 #~ msgid "unignore"
 #~ msgstr "nicht ignorieren"
 
@@ -5712,12 +5804,18 @@ msgstr "Unbekannter Gegenstand"
 #~ msgid "login"
 #~ msgstr "Anmelden"
 
+#~ msgid "Minimap"
+#~ msgstr "Übersichtskarte"
+
 #~ msgid "NpcText"
 #~ msgstr "NpcText"
 
 #~ msgid "reset"
 #~ msgstr "Zurücksetzten"
 
+#~ msgid "send"
+#~ msgstr "Senden"
+
 #~ msgid "previous"
 #~ msgstr "Zurück"
 
@@ -5740,9 +5838,6 @@ msgstr "Unbekannter Gegenstand"
 #~ msgid "Gradient"
 #~ msgstr "Handeln"
 
-#~ msgid "Delay"
-#~ msgstr "Verzögerung: "
-
 #~ msgid "talk"
 #~ msgstr "Sprechen"
 
@@ -5756,6 +5851,9 @@ msgstr "Unbekannter Gegenstand"
 #~ msgid "disregard"
 #~ msgstr "Unbeachtet"
 
+#~ msgid "guild"
+#~ msgstr "Gilde"
+
 #~ msgid "pickup"
 #~ msgstr "Aufheben"
 
@@ -5946,6 +6044,9 @@ msgstr "Unbekannter Gegenstand"
 #~ msgstr ""
 #~ "Dieser Server besitzt keine %s Datei. Benutze stattdessen die Datei %s"
 
+#~ msgid "%s already here"
+#~ msgstr "%s ist bereits hier"
+
 #, fuzzy
 #~ msgid "users"
 #~ msgstr "benutze"
@@ -6225,6 +6326,9 @@ msgstr "Unbekannter Gegenstand"
 #~ msgid "character"
 #~ msgstr "Spielfigur"
 
+#~ msgid "update-host"
+#~ msgstr "Updateserver: "
+
 #~ msgid "username"
 #~ msgstr "Benutztername"
 
@@ -6265,6 +6369,9 @@ msgstr "Unbekannter Gegenstand"
 #~ msgid "int"
 #~ msgstr "Sitzen"
 
+#~ msgid "luck"
+#~ msgstr "Glück"
+
 #~ msgid "Connection problem: %i"
 #~ msgstr "Verbindungsproblem: %i"
 
@@ -6412,6 +6519,9 @@ msgstr "Unbekannter Gegenstand"
 #~ msgid "whip"
 #~ msgstr "Peitsche"
 
+#~ msgid "bow"
+#~ msgstr "Bogen"
+
 #~ msgid "shooting"
 #~ msgstr "schießen"
 
@@ -6421,9 +6531,6 @@ msgstr "Unbekannter Gegenstand"
 #~ msgid "axe"
 #~ msgstr "Axt"
 
-#~ msgid "thrown"
-#~ msgstr "geworfen"
-
 #~ msgid "ItemDB: Error while loading items.xml!"
 #~ msgstr "Fehler beim Laden von item.xml!"
 
@@ -6439,9 +6546,6 @@ msgstr "Unbekannter Gegenstand"
 #~ msgid "weapon-type"
 #~ msgstr "Waffentyp"
 
-#~ msgid "attack-range"
-#~ msgstr "Angriffsreichweite"
-
 #~ msgid "effect"
 #~ msgstr "Effekt:"
 
@@ -6494,7 +6598,7 @@ msgstr "Unbekannter Gegenstand"
 #~ msgstr "Freundesliste"
 
 #~ msgid "Job Level: %d"
-#~ msgstr "Berufsstufe: %d"
+#~ msgstr "Beruf Stufe: %d"
 
 #~ msgid "Ok"
 #~ msgstr "Ok"
@@ -6512,7 +6616,7 @@ msgstr "Unbekannter Gegenstand"
 #~ msgstr "zweihändige Waffen"
 
 #~ msgid "Failed to switch to "
-#~ msgstr "Konnte Auflösung nicht ändern zu "
+#~ msgstr "Konnte Auflösung nicht ändern in "
 
 #~ msgid "Mystery Skill"
 #~ msgstr "Unbekannter Skill"
@@ -6542,7 +6646,7 @@ msgstr "Unbekannter Gegenstand"
 #~ msgstr "Verbleibende Statuspunkte: %d"
 
 #~ msgid "curl error "
-#~ msgstr "curl-Fehler "
+#~ msgstr "curl fehler "
 
 #~ msgid "Buddys"
 #~ msgstr "Freunde"
diff --git a/po/en_GB.po b/po/en_GB.po
index 09dbc7bb1..759217319 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2011-01-06 03:06+0200\n"
+"POT-Creation-Date: 2011-01-13 21:49+0200\n"
 "PO-Revision-Date: 2010-03-04 21:01+0000\n"
 "Last-Translator: issyl0 <isabell121@gmail.com>\n"
 "Language-Team: English (United Kingdom) <en_GB@li.org>\n"
@@ -63,10 +63,10 @@ msgstr "Server"
 #: src/client.cpp:1029 src/client.cpp:1036 src/client.cpp:1171
 #: src/gui/changeemaildialog.cpp:154 src/gui/changepassworddialog.cpp:144
 #: src/gui/charcreatedialog.cpp:185 src/gui/register.cpp:225
-#: src/gui/serverdialog.cpp:350 src/gui/unregisterdialog.cpp:134
+#: src/gui/serverdialog.cpp:355 src/gui/unregisterdialog.cpp:134
 #: src/net/manaserv/charhandler.cpp:183 src/net/manaserv/charhandler.cpp:226
-#: src/net/tmwa/charserverhandler.cpp:137
-#: src/net/tmwa/charserverhandler.cpp:154
+#: src/net/tmwa/charserverhandler.cpp:161
+#: src/net/tmwa/charserverhandler.cpp:177
 msgid "Error"
 msgstr "Error"
 
@@ -738,7 +738,7 @@ msgid "-"
 msgstr ""
 
 #: src/gui/buy.cpp:95 src/gui/quitdialog.cpp:43 src/gui/quitdialog.cpp:48
-#: src/gui/quitdialog.cpp:49 src/gui/sell.cpp:90 src/gui/serverdialog.cpp:244
+#: src/gui/quitdialog.cpp:49 src/gui/sell.cpp:90 src/gui/serverdialog.cpp:248
 #: src/keyboardconfig.cpp:275
 msgid "Quit"
 msgstr "Exit"
@@ -749,7 +749,7 @@ msgid "Max"
 msgstr "Max"
 
 #: src/gui/buysell.cpp:37 src/gui/buysell.cpp:46
-#: src/gui/inventorywindow.cpp:112
+#: src/gui/inventorywindow.cpp:134
 msgid "Shop"
 msgstr "Shop"
 
@@ -922,7 +922,7 @@ msgstr "Unregister"
 msgid "Change Email"
 msgstr "Change Email Address"
 
-#: src/gui/charselectdialog.cpp:375 src/gui/serverdialog.cpp:248
+#: src/gui/charselectdialog.cpp:375 src/gui/serverdialog.cpp:252
 #: src/gui/setup_players.cpp:242 src/gui/shopwindow.cpp:117
 #: src/gui/shopwindow.cpp:120 src/gui/textcommandeditor.cpp:234
 msgid "Delete"
@@ -1170,8 +1170,8 @@ msgstr "OK"
 msgid "Equipment"
 msgstr "Equipment"
 
-#: src/gui/equipmentwindow.cpp:91 src/gui/inventorywindow.cpp:96
-#: src/gui/inventorywindow.cpp:393 src/gui/inventorywindow.cpp:402
+#: src/gui/equipmentwindow.cpp:91 src/gui/inventorywindow.cpp:118
+#: src/gui/inventorywindow.cpp:443 src/gui/inventorywindow.cpp:452
 #: src/gui/popupmenu.cpp:1070 src/gui/popupmenu.cpp:1169
 #: src/gui/popupmenu.cpp:1209
 msgid "Unequip"
@@ -1181,68 +1181,77 @@ msgstr "Unequip"
 msgid "Help"
 msgstr "Help"
 
-#: src/gui/help.cpp:52 src/gui/inventorywindow.cpp:135
+#: src/gui/help.cpp:52 src/gui/inventorywindow.cpp:163
 #: src/gui/npcdialog.cpp:48 src/gui/shopwindow.cpp:108
 msgid "Close"
 msgstr "Close"
 
-#: src/gui/inventorywindow.cpp:62 src/gui/windowmenu.cpp:72
+#: src/gui/inventorywindow.cpp:65 src/gui/windowmenu.cpp:72
 msgid "Inventory"
 msgstr "Inventory"
 
-#: src/gui/inventorywindow.cpp:62
+#: src/gui/inventorywindow.cpp:65
 msgid "Storage"
 msgstr "Storage"
 
-#: src/gui/inventorywindow.cpp:89
+#: src/gui/inventorywindow.cpp:92
 msgid "Slots:"
 msgstr "Slots:"
 
-#: src/gui/inventorywindow.cpp:94 src/gui/inventorywindow.cpp:395
-#: src/gui/inventorywindow.cpp:404 src/gui/popupmenu.cpp:1072
+#: src/gui/inventorywindow.cpp:103
+msgid "Filter:"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:104
+#, fuzzy
+msgid "Sort:"
+msgstr "Port:"
+
+#: src/gui/inventorywindow.cpp:116 src/gui/inventorywindow.cpp:445
+#: src/gui/inventorywindow.cpp:454 src/gui/popupmenu.cpp:1072
 #: src/gui/popupmenu.cpp:1171 src/gui/popupmenu.cpp:1211
 msgid "Equip"
 msgstr "Equip"
 
-#: src/gui/inventorywindow.cpp:95 src/gui/inventorywindow.cpp:396
-#: src/gui/inventorywindow.cpp:400 src/gui/popupmenu.cpp:1075
+#: src/gui/inventorywindow.cpp:117 src/gui/inventorywindow.cpp:446
+#: src/gui/inventorywindow.cpp:450 src/gui/popupmenu.cpp:1075
 #: src/gui/popupmenu.cpp:1144 src/gui/popupmenu.cpp:1175
 #: src/gui/popupmenu.cpp:1214
 msgid "Use"
 msgstr "Use"
 
-#: src/gui/inventorywindow.cpp:109 src/gui/inventorywindow.cpp:499
+#: src/gui/inventorywindow.cpp:131 src/gui/inventorywindow.cpp:549
 #: src/gui/popupmenu.cpp:1078 src/gui/popupmenu.cpp:1179
 #: src/gui/popupmenu.cpp:1217
 #, fuzzy
 msgid "Drop..."
 msgstr "Drop"
 
-#: src/gui/inventorywindow.cpp:110 src/gui/popupmenu.cpp:1083
+#: src/gui/inventorywindow.cpp:132 src/gui/popupmenu.cpp:1083
 #: src/gui/popupmenu.cpp:1184 src/gui/popupmenu.cpp:1222
 msgid "Split"
 msgstr "Split"
 
-#: src/gui/inventorywindow.cpp:111 src/gui/outfitwindow.cpp:56
+#: src/gui/inventorywindow.cpp:133 src/gui/outfitwindow.cpp:56
 #: src/gui/popupmenu.cpp:409
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:114
+#: src/gui/inventorywindow.cpp:136
 msgid "Weight:"
 msgstr "Weight:"
 
-#: src/gui/inventorywindow.cpp:133 src/gui/inventorywindow.cpp:490
+#: src/gui/inventorywindow.cpp:161 src/gui/inventorywindow.cpp:540
 #: src/gui/popupmenu.cpp:1087 src/gui/popupmenu.cpp:1187
 #: src/gui/popupmenu.cpp:1225 src/gui/setup.cpp:65
 msgid "Store"
 msgstr "Store"
 
-#: src/gui/inventorywindow.cpp:134 src/gui/popupmenu.cpp:1106
+#: src/gui/inventorywindow.cpp:162 src/gui/popupmenu.cpp:1106
 msgid "Retrieve"
 msgstr "Retrieve"
 
-#: src/gui/inventorywindow.cpp:501 src/gui/popupmenu.cpp:1080
+#: src/gui/inventorywindow.cpp:551 src/gui/popupmenu.cpp:1080
 #: src/gui/popupmenu.cpp:1181 src/gui/popupmenu.cpp:1219
 #: src/gui/windowmenu.cpp:91
 msgid "Drop"
@@ -1431,7 +1440,7 @@ msgstr ""
 msgid "Login"
 msgstr "Login"
 
-#: src/gui/login.cpp:87 src/gui/serverdialog.cpp:221
+#: src/gui/login.cpp:87 src/gui/serverdialog.cpp:222
 #: src/gui/widgets/chattab.cpp:166
 msgid "Server:"
 msgstr "Server:"
@@ -1859,56 +1868,60 @@ msgstr "Passwords do not match."
 msgid "Choose Your Server"
 msgstr "Choose your server"
 
-#: src/gui/serverdialog.cpp:222
+#: src/gui/serverdialog.cpp:223
 msgid "Port:"
 msgstr "Port:"
 
-#: src/gui/serverdialog.cpp:223
+#: src/gui/serverdialog.cpp:224
 #, fuzzy
 msgid "Server type:"
 msgstr "Server:"
 
-#: src/gui/serverdialog.cpp:245
+#: src/gui/serverdialog.cpp:227
+msgid "Use same ip for game sub servers"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:249
 msgid "Load"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:246
+#: src/gui/serverdialog.cpp:250
 #, fuzzy
 msgid "Connect"
 msgstr "Connecting..."
 
-#: src/gui/serverdialog.cpp:247
+#: src/gui/serverdialog.cpp:251
 #, fuzzy
 msgid "Custom Server"
 msgstr "Custom cursor"
 
-#: src/gui/serverdialog.cpp:351
+#: src/gui/serverdialog.cpp:356
 msgid "Please type both the address and the port of a server."
 msgstr "Please type both the address and the port of a server."
 
-#: src/gui/serverdialog.cpp:482
+#: src/gui/serverdialog.cpp:488
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:488
+#: src/gui/serverdialog.cpp:494
 #, fuzzy
 msgid "Waiting for server..."
 msgstr "Waiting for server"
 
-#: src/gui/serverdialog.cpp:492
+#: src/gui/serverdialog.cpp:498
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:496
+#: src/gui/serverdialog.cpp:502
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:593
+#: src/gui/serverdialog.cpp:599
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:595
+#: src/gui/serverdialog.cpp:601
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -3892,7 +3905,7 @@ msgstr[1] "You picked up %s [@@%d|%s@@]."
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:3617
+#: src/localplayer.cpp:3618
 #, fuzzy
 msgid "You see "
 msgstr "You get %s."
@@ -4061,27 +4074,27 @@ msgstr "Willpower:"
 msgid "Willpower %+.1f"
 msgstr "Willpower %+d"
 
-#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:104
+#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:105
 msgid "You are dead."
 msgstr "You are dead."
 
-#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:105
+#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:106
 msgid "We regret to inform you that your character was killed in battle."
 msgstr "We regret to inform you that your character was killed in battle."
 
-#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:107
+#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:108
 msgid "You are not that alive anymore."
 msgstr "You are not that alive anymore."
 
-#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:108
+#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:109
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr "The cold hands of the grim reaper are grasping for your soul."
 
-#: src/net/manaserv/beinghandler.cpp:319 src/net/tmwa/playerhandler.cpp:109
+#: src/net/manaserv/beinghandler.cpp:319 src/net/tmwa/playerhandler.cpp:110
 msgid "Game Over!"
 msgstr "Game Over!"
 
-#: src/net/manaserv/beinghandler.cpp:320 src/net/tmwa/playerhandler.cpp:111
+#: src/net/manaserv/beinghandler.cpp:320 src/net/tmwa/playerhandler.cpp:112
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
@@ -4089,7 +4102,7 @@ msgstr ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 
-#: src/net/manaserv/beinghandler.cpp:322 src/net/tmwa/playerhandler.cpp:113
+#: src/net/manaserv/beinghandler.cpp:322 src/net/tmwa/playerhandler.cpp:114
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
@@ -4097,27 +4110,27 @@ msgstr ""
 "Your plan of breaking your enemy's weapon by bashing it with your throat "
 "failed."
 
-#: src/net/manaserv/beinghandler.cpp:324 src/net/tmwa/playerhandler.cpp:115
+#: src/net/manaserv/beinghandler.cpp:324 src/net/tmwa/playerhandler.cpp:116
 msgid "I guess this did not run too well."
 msgstr "I guess this did not run too well."
 
-#: src/net/manaserv/beinghandler.cpp:325 src/net/tmwa/playerhandler.cpp:117
+#: src/net/manaserv/beinghandler.cpp:325 src/net/tmwa/playerhandler.cpp:118
 msgid "Do you want your possessions identified?"
 msgstr "Do you want your possessions identified?"
 
-#: src/net/manaserv/beinghandler.cpp:326 src/net/tmwa/playerhandler.cpp:119
+#: src/net/manaserv/beinghandler.cpp:326 src/net/tmwa/playerhandler.cpp:120
 msgid "Sadly, no trace of you was ever found..."
 msgstr "Sadly, no trace of you was ever found..."
 
-#: src/net/manaserv/beinghandler.cpp:328 src/net/tmwa/playerhandler.cpp:121
+#: src/net/manaserv/beinghandler.cpp:328 src/net/tmwa/playerhandler.cpp:122
 msgid "Annihilated."
 msgstr "Annihilated."
 
-#: src/net/manaserv/beinghandler.cpp:329 src/net/tmwa/playerhandler.cpp:123
+#: src/net/manaserv/beinghandler.cpp:329 src/net/tmwa/playerhandler.cpp:124
 msgid "Looks like you got your head handed to you."
 msgstr "Looks like you got your head handed to you."
 
-#: src/net/manaserv/beinghandler.cpp:331 src/net/tmwa/playerhandler.cpp:125
+#: src/net/manaserv/beinghandler.cpp:331 src/net/tmwa/playerhandler.cpp:126
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
@@ -4186,12 +4199,12 @@ msgstr ""
 #: src/net/manaserv/charhandler.cpp:180 src/net/manaserv/loginhandler.cpp:98
 #: src/net/manaserv/loginhandler.cpp:130 src/net/manaserv/loginhandler.cpp:166
 #: src/net/manaserv/loginhandler.cpp:286 src/net/manaserv/loginhandler.cpp:323
-#: src/net/tmwa/loginhandler.cpp:99 src/net/tmwa/loginhandler.cpp:187
+#: src/net/tmwa/loginhandler.cpp:99 src/net/tmwa/loginhandler.cpp:190
 #, fuzzy
 msgid "Unknown error."
 msgstr "Unknown error"
 
-#: src/net/manaserv/charhandler.cpp:209 src/net/tmwa/charserverhandler.cpp:149
+#: src/net/manaserv/charhandler.cpp:209 src/net/tmwa/charserverhandler.cpp:172
 msgid "Info"
 msgstr "Info"
 
@@ -4431,61 +4444,88 @@ msgstr "Thanks for buying."
 msgid "Unable to buy."
 msgstr "Unable to buy."
 
-#: src/net/tmwa/buysellhandler.cpp:143
+#: src/net/tmwa/buysellhandler.cpp:145
 msgid "Thanks for selling."
 msgstr "Thanks for selling."
 
-#: src/net/tmwa/buysellhandler.cpp:145
+#: src/net/tmwa/buysellhandler.cpp:149
 msgid "Unable to sell."
 msgstr "Unable to sell."
 
-#: src/net/tmwa/charserverhandler.cpp:106
+#: src/net/tmwa/buysellhandler.cpp:152
+#, fuzzy
+msgid "Unable to sell while trading."
+msgstr "Unable to sell."
+
+#: src/net/tmwa/buysellhandler.cpp:155
+#, fuzzy
+msgid "Unable to sell unsellable item."
+msgstr "Unable to pick up item."
+
+#: src/net/tmwa/charserverhandler.cpp:109
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:110
+#: src/net/tmwa/charserverhandler.cpp:113
 #, fuzzy
 msgid "Cannot use this ID."
 msgstr "Cannot use this ID"
 
-#: src/net/tmwa/charserverhandler.cpp:113
+#: src/net/tmwa/charserverhandler.cpp:116
 #, fuzzy
 msgid "Unknown char-server failure."
 msgstr "Unknown error"
 
-#: src/net/tmwa/charserverhandler.cpp:137
+#: src/net/tmwa/charserverhandler.cpp:145
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr "Failed to create character. Most likely the name is already taken."
 
-#: src/net/tmwa/charserverhandler.cpp:149
+#: src/net/tmwa/charserverhandler.cpp:149 src/net/tmwa/loginhandler.cpp:187
+#, fuzzy
+msgid "Wrong name."
+msgstr "Wrong magic_token"
+
+#: src/net/tmwa/charserverhandler.cpp:152
+msgid "Incorrect stats."
+msgstr ""
+
+#: src/net/tmwa/charserverhandler.cpp:155
+msgid "Incorrect hair."
+msgstr ""
+
+#: src/net/tmwa/charserverhandler.cpp:158
+msgid "Incorrect slot."
+msgstr ""
+
+#: src/net/tmwa/charserverhandler.cpp:172
 msgid "Character deleted."
 msgstr "Character deleted."
 
-#: src/net/tmwa/charserverhandler.cpp:154
+#: src/net/tmwa/charserverhandler.cpp:177
 msgid "Failed to delete character."
 msgstr "Failed to delete character."
 
-#: src/net/tmwa/charserverhandler.cpp:286
+#: src/net/tmwa/charserverhandler.cpp:317
 msgid "Strength:"
 msgstr "Strength:"
 
-#: src/net/tmwa/charserverhandler.cpp:287
+#: src/net/tmwa/charserverhandler.cpp:318
 msgid "Agility:"
 msgstr "Agility:"
 
-#: src/net/tmwa/charserverhandler.cpp:288
+#: src/net/tmwa/charserverhandler.cpp:319
 msgid "Vitality:"
 msgstr "Vitality:"
 
-#: src/net/tmwa/charserverhandler.cpp:289
+#: src/net/tmwa/charserverhandler.cpp:320
 msgid "Intelligence:"
 msgstr "Intelligence:"
 
-#: src/net/tmwa/charserverhandler.cpp:290
+#: src/net/tmwa/charserverhandler.cpp:321
 msgid "Dexterity:"
 msgstr "Dexterity:"
 
-#: src/net/tmwa/charserverhandler.cpp:291
+#: src/net/tmwa/charserverhandler.cpp:322
 msgid "Luck:"
 msgstr "Luck:"
 
@@ -4892,11 +4932,11 @@ msgstr "Experience sharing not possible."
 msgid "Experience sharing unknown."
 msgstr "Experience sharing enabled."
 
-#: src/net/tmwa/inventoryhandler.cpp:334
+#: src/net/tmwa/inventoryhandler.cpp:343
 msgid "Failed to use item."
 msgstr "Failed to use item."
 
-#: src/net/tmwa/inventoryhandler.cpp:457
+#: src/net/tmwa/inventoryhandler.cpp:472
 msgid "Unable to equip."
 msgstr "Unable to equip."
 
@@ -5016,51 +5056,51 @@ msgstr "An unknown member tried to say: %s"
 msgid "%s is not in your party!"
 msgstr "%s is not in your party!"
 
-#: src/net/tmwa/playerhandler.cpp:110
+#: src/net/tmwa/playerhandler.cpp:111
 msgid "Insert coin to continue."
 msgstr "Insert coin to continue."
 
-#: src/net/tmwa/playerhandler.cpp:128
+#: src/net/tmwa/playerhandler.cpp:129
 msgid "You're not dead yet. You're just resting."
 msgstr "You're not dead yet. You're just resting."
 
-#: src/net/tmwa/playerhandler.cpp:129
+#: src/net/tmwa/playerhandler.cpp:130
 msgid "You are no more."
 msgstr "You are no more."
 
-#: src/net/tmwa/playerhandler.cpp:130
+#: src/net/tmwa/playerhandler.cpp:131
 msgid "You have ceased to be."
 msgstr "You have ceased to be."
 
-#: src/net/tmwa/playerhandler.cpp:131
+#: src/net/tmwa/playerhandler.cpp:132
 msgid "You've expired and gone to meet your maker."
 msgstr "You've expired and gone to meet your maker."
 
-#: src/net/tmwa/playerhandler.cpp:132
+#: src/net/tmwa/playerhandler.cpp:133
 msgid "You're a stiff."
 msgstr "You're a stiff."
 
-#: src/net/tmwa/playerhandler.cpp:133
+#: src/net/tmwa/playerhandler.cpp:134
 msgid "Bereft of life, you rest in peace."
 msgstr "Bereft of life, you rest in peace."
 
-#: src/net/tmwa/playerhandler.cpp:134
+#: src/net/tmwa/playerhandler.cpp:135
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr "If you weren't so animated, you'd be pushing up the daisies."
 
-#: src/net/tmwa/playerhandler.cpp:135
+#: src/net/tmwa/playerhandler.cpp:136
 msgid "Your metabolic processes are now history."
 msgstr "Your metabolic processes are now history."
 
-#: src/net/tmwa/playerhandler.cpp:136
+#: src/net/tmwa/playerhandler.cpp:137
 msgid "You're off the twig."
 msgstr "You're off the twig."
 
-#: src/net/tmwa/playerhandler.cpp:137
+#: src/net/tmwa/playerhandler.cpp:138
 msgid "You've kicked the bucket."
 msgstr "You've kicked the bucket."
 
-#: src/net/tmwa/playerhandler.cpp:138
+#: src/net/tmwa/playerhandler.cpp:139
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
@@ -5068,48 +5108,48 @@ msgstr ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 
-#: src/net/tmwa/playerhandler.cpp:140
+#: src/net/tmwa/playerhandler.cpp:141
 msgid "You are an ex-player."
 msgstr "You are an ex-player."
 
-#: src/net/tmwa/playerhandler.cpp:141
+#: src/net/tmwa/playerhandler.cpp:142
 msgid "You're pining for the fjords."
 msgstr "You're pining for the fjords."
 
-#: src/net/tmwa/playerhandler.cpp:327 src/net/tmwa/playerhandler.cpp:336
-#: src/net/tmwa/playerhandler.cpp:415
+#: src/net/tmwa/playerhandler.cpp:330 src/net/tmwa/playerhandler.cpp:339
+#: src/net/tmwa/playerhandler.cpp:418
 msgid "Message"
 msgstr "Message"
 
-#: src/net/tmwa/playerhandler.cpp:328
+#: src/net/tmwa/playerhandler.cpp:331
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 "You are carrying more than half your maximum load. You are unable to "
 "automatically regain health."
 
-#: src/net/tmwa/playerhandler.cpp:337
+#: src/net/tmwa/playerhandler.cpp:340
 #, fuzzy
 msgid "You are carrying less than half your weight. You are can regain health."
 msgstr ""
 "You are carrying more than half your maximum load. You are unable to "
 "automatically regain health."
 
-#: src/net/tmwa/playerhandler.cpp:442
+#: src/net/tmwa/playerhandler.cpp:445
 #, fuzzy, c-format
 msgid "You picked up %s."
 msgstr "You picked up "
 
-#: src/net/tmwa/playerhandler.cpp:448
+#: src/net/tmwa/playerhandler.cpp:451
 #, fuzzy, c-format
 msgid "You spent %s."
 msgstr "You get %s."
 
-#: src/net/tmwa/playerhandler.cpp:493
+#: src/net/tmwa/playerhandler.cpp:496
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:613
+#: src/net/tmwa/playerhandler.cpp:616
 msgid "Equip arrows first."
 msgstr "Equip arrows first."
 
@@ -5259,32 +5299,32 @@ msgstr ""
 msgid "Floating bubble"
 msgstr ""
 
-#: src/resources/beinginfo.cpp:32 src/resources/itemdb.cpp:210
+#: src/resources/beinginfo.cpp:32 src/resources/itemdb.cpp:223
 #: src/resources/monsterdb.cpp:78
 msgid "unnamed"
 msgstr "unnamed"
 
-#: src/resources/itemdb.cpp:55
+#: src/resources/itemdb.cpp:57
 #, c-format
 msgid "Attack %+d"
 msgstr "Attack %+d"
 
-#: src/resources/itemdb.cpp:56
+#: src/resources/itemdb.cpp:58
 #, c-format
 msgid "Defense %+d"
 msgstr "Defense %+d"
 
-#: src/resources/itemdb.cpp:57
+#: src/resources/itemdb.cpp:59
 #, c-format
 msgid "HP %+d"
 msgstr "HP %+d"
 
-#: src/resources/itemdb.cpp:58
+#: src/resources/itemdb.cpp:60
 #, c-format
 msgid "MP %+d"
 msgstr "MP %+d"
 
-#: src/resources/itemdb.cpp:155
+#: src/resources/itemdb.cpp:152
 msgid "Unknown item"
 msgstr "Unknown item"
 
diff --git a/po/es.po b/po/es.po
index 3a743aa7f..447deaf54 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2011-01-06 03:06+0200\n"
+"POT-Creation-Date: 2011-01-13 21:49+0200\n"
 "PO-Revision-Date: 2010-12-23 12:08+0100\n"
 "Last-Translator: Yohann Ferreira <yohann ferreira orange fr>\n"
 "Language-Team: Spanish Translator <natsuki.sumon@gmail.com>\n"
@@ -60,10 +60,10 @@ msgstr "Cambiando el servidor del juego"
 #: src/client.cpp:1029 src/client.cpp:1036 src/client.cpp:1171
 #: src/gui/changeemaildialog.cpp:154 src/gui/changepassworddialog.cpp:144
 #: src/gui/charcreatedialog.cpp:185 src/gui/register.cpp:225
-#: src/gui/serverdialog.cpp:350 src/gui/unregisterdialog.cpp:134
+#: src/gui/serverdialog.cpp:355 src/gui/unregisterdialog.cpp:134
 #: src/net/manaserv/charhandler.cpp:183 src/net/manaserv/charhandler.cpp:226
-#: src/net/tmwa/charserverhandler.cpp:137
-#: src/net/tmwa/charserverhandler.cpp:154
+#: src/net/tmwa/charserverhandler.cpp:161
+#: src/net/tmwa/charserverhandler.cpp:177
 msgid "Error"
 msgstr "Error"
 
@@ -727,7 +727,7 @@ msgid "-"
 msgstr "-"
 
 #: src/gui/buy.cpp:95 src/gui/quitdialog.cpp:43 src/gui/quitdialog.cpp:48
-#: src/gui/quitdialog.cpp:49 src/gui/sell.cpp:90 src/gui/serverdialog.cpp:244
+#: src/gui/quitdialog.cpp:49 src/gui/sell.cpp:90 src/gui/serverdialog.cpp:248
 #: src/keyboardconfig.cpp:275
 msgid "Quit"
 msgstr "Salir"
@@ -738,7 +738,7 @@ msgid "Max"
 msgstr "Máximo"
 
 #: src/gui/buysell.cpp:37 src/gui/buysell.cpp:46
-#: src/gui/inventorywindow.cpp:112
+#: src/gui/inventorywindow.cpp:134
 msgid "Shop"
 msgstr "Tienda"
 
@@ -905,7 +905,7 @@ msgstr "Cancelar Registro"
 msgid "Change Email"
 msgstr "Cambiar e-mail"
 
-#: src/gui/charselectdialog.cpp:375 src/gui/serverdialog.cpp:248
+#: src/gui/charselectdialog.cpp:375 src/gui/serverdialog.cpp:252
 #: src/gui/setup_players.cpp:242 src/gui/shopwindow.cpp:117
 #: src/gui/shopwindow.cpp:120 src/gui/textcommandeditor.cpp:234
 msgid "Delete"
@@ -1149,8 +1149,8 @@ msgstr "OK"
 msgid "Equipment"
 msgstr "Equipamento"
 
-#: src/gui/equipmentwindow.cpp:91 src/gui/inventorywindow.cpp:96
-#: src/gui/inventorywindow.cpp:393 src/gui/inventorywindow.cpp:402
+#: src/gui/equipmentwindow.cpp:91 src/gui/inventorywindow.cpp:118
+#: src/gui/inventorywindow.cpp:443 src/gui/inventorywindow.cpp:452
 #: src/gui/popupmenu.cpp:1070 src/gui/popupmenu.cpp:1169
 #: src/gui/popupmenu.cpp:1209
 msgid "Unequip"
@@ -1160,67 +1160,76 @@ msgstr "Quitárselo"
 msgid "Help"
 msgstr "Ayuda"
 
-#: src/gui/help.cpp:52 src/gui/inventorywindow.cpp:135
+#: src/gui/help.cpp:52 src/gui/inventorywindow.cpp:163
 #: src/gui/npcdialog.cpp:48 src/gui/shopwindow.cpp:108
 msgid "Close"
 msgstr "Cerrar"
 
-#: src/gui/inventorywindow.cpp:62 src/gui/windowmenu.cpp:72
+#: src/gui/inventorywindow.cpp:65 src/gui/windowmenu.cpp:72
 msgid "Inventory"
 msgstr "Inventario"
 
-#: src/gui/inventorywindow.cpp:62
+#: src/gui/inventorywindow.cpp:65
 msgid "Storage"
 msgstr "Almacén"
 
-#: src/gui/inventorywindow.cpp:89
+#: src/gui/inventorywindow.cpp:92
 msgid "Slots:"
 msgstr "Espacios:"
 
-#: src/gui/inventorywindow.cpp:94 src/gui/inventorywindow.cpp:395
-#: src/gui/inventorywindow.cpp:404 src/gui/popupmenu.cpp:1072
+#: src/gui/inventorywindow.cpp:103
+msgid "Filter:"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:104
+#, fuzzy
+msgid "Sort:"
+msgstr "Puerto:"
+
+#: src/gui/inventorywindow.cpp:116 src/gui/inventorywindow.cpp:445
+#: src/gui/inventorywindow.cpp:454 src/gui/popupmenu.cpp:1072
 #: src/gui/popupmenu.cpp:1171 src/gui/popupmenu.cpp:1211
 msgid "Equip"
 msgstr "Equipar"
 
-#: src/gui/inventorywindow.cpp:95 src/gui/inventorywindow.cpp:396
-#: src/gui/inventorywindow.cpp:400 src/gui/popupmenu.cpp:1075
+#: src/gui/inventorywindow.cpp:117 src/gui/inventorywindow.cpp:446
+#: src/gui/inventorywindow.cpp:450 src/gui/popupmenu.cpp:1075
 #: src/gui/popupmenu.cpp:1144 src/gui/popupmenu.cpp:1175
 #: src/gui/popupmenu.cpp:1214
 msgid "Use"
 msgstr "Usar"
 
-#: src/gui/inventorywindow.cpp:109 src/gui/inventorywindow.cpp:499
+#: src/gui/inventorywindow.cpp:131 src/gui/inventorywindow.cpp:549
 #: src/gui/popupmenu.cpp:1078 src/gui/popupmenu.cpp:1179
 #: src/gui/popupmenu.cpp:1217
 msgid "Drop..."
 msgstr "Tirar..."
 
-#: src/gui/inventorywindow.cpp:110 src/gui/popupmenu.cpp:1083
+#: src/gui/inventorywindow.cpp:132 src/gui/popupmenu.cpp:1083
 #: src/gui/popupmenu.cpp:1184 src/gui/popupmenu.cpp:1222
 msgid "Split"
 msgstr "Dividir"
 
-#: src/gui/inventorywindow.cpp:111 src/gui/outfitwindow.cpp:56
+#: src/gui/inventorywindow.cpp:133 src/gui/outfitwindow.cpp:56
 #: src/gui/popupmenu.cpp:409
 msgid "Outfits"
 msgstr "Conjuntos"
 
-#: src/gui/inventorywindow.cpp:114
+#: src/gui/inventorywindow.cpp:136
 msgid "Weight:"
 msgstr "Peso:"
 
-#: src/gui/inventorywindow.cpp:133 src/gui/inventorywindow.cpp:490
+#: src/gui/inventorywindow.cpp:161 src/gui/inventorywindow.cpp:540
 #: src/gui/popupmenu.cpp:1087 src/gui/popupmenu.cpp:1187
 #: src/gui/popupmenu.cpp:1225 src/gui/setup.cpp:65
 msgid "Store"
 msgstr "Almacenar"
 
-#: src/gui/inventorywindow.cpp:134 src/gui/popupmenu.cpp:1106
+#: src/gui/inventorywindow.cpp:162 src/gui/popupmenu.cpp:1106
 msgid "Retrieve"
 msgstr "Retirar"
 
-#: src/gui/inventorywindow.cpp:501 src/gui/popupmenu.cpp:1080
+#: src/gui/inventorywindow.cpp:551 src/gui/popupmenu.cpp:1080
 #: src/gui/popupmenu.cpp:1181 src/gui/popupmenu.cpp:1219
 #: src/gui/windowmenu.cpp:91
 msgid "Drop"
@@ -1408,7 +1417,7 @@ msgstr ""
 msgid "Login"
 msgstr "Login"
 
-#: src/gui/login.cpp:87 src/gui/serverdialog.cpp:221
+#: src/gui/login.cpp:87 src/gui/serverdialog.cpp:222
 #: src/gui/widgets/chattab.cpp:166
 msgid "Server:"
 msgstr "Servidor:"
@@ -1827,52 +1836,56 @@ msgstr "Las contraseñas no coinciden."
 msgid "Choose Your Server"
 msgstr "Escoja tu servidor"
 
-#: src/gui/serverdialog.cpp:222
+#: src/gui/serverdialog.cpp:223
 msgid "Port:"
 msgstr "Puerto:"
 
-#: src/gui/serverdialog.cpp:223
+#: src/gui/serverdialog.cpp:224
 msgid "Server type:"
 msgstr "Tipo de servidor:"
 
-#: src/gui/serverdialog.cpp:245
+#: src/gui/serverdialog.cpp:227
+msgid "Use same ip for game sub servers"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:249
 msgid "Load"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:246
+#: src/gui/serverdialog.cpp:250
 msgid "Connect"
 msgstr "Conectar"
 
-#: src/gui/serverdialog.cpp:247
+#: src/gui/serverdialog.cpp:251
 msgid "Custom Server"
 msgstr "Servidor propio"
 
-#: src/gui/serverdialog.cpp:351
+#: src/gui/serverdialog.cpp:356
 msgid "Please type both the address and the port of a server."
 msgstr "Por favor especifique el nombre y el puerto del servidor."
 
-#: src/gui/serverdialog.cpp:482
+#: src/gui/serverdialog.cpp:488
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Bajando la lista de servidores...%2.2f%%"
 
-#: src/gui/serverdialog.cpp:488
+#: src/gui/serverdialog.cpp:494
 msgid "Waiting for server..."
 msgstr "Esperando al servidor..."
 
-#: src/gui/serverdialog.cpp:492
+#: src/gui/serverdialog.cpp:498
 msgid "Preparing download"
 msgstr "Preparando la descarga"
 
-#: src/gui/serverdialog.cpp:496
+#: src/gui/serverdialog.cpp:502
 msgid "Error retreiving server list!"
 msgstr "Error al recuperar la lista de servers!"
 
-#: src/gui/serverdialog.cpp:593
+#: src/gui/serverdialog.cpp:599
 msgid "requires a newer version"
 msgstr "requiere una version mas nueva"
 
-#: src/gui/serverdialog.cpp:595
+#: src/gui/serverdialog.cpp:601
 #, c-format
 msgid "requires v%s"
 msgstr "requiere v%s"
@@ -3816,7 +3829,7 @@ msgstr[1] "Usted Cogió %d [@@%d|%s@@]."
 msgid "Away"
 msgstr "Fuera del Teclado"
 
-#: src/localplayer.cpp:3617
+#: src/localplayer.cpp:3618
 #, fuzzy
 msgid "You see "
 msgstr "Tú recibes %s"
@@ -3970,27 +3983,27 @@ msgstr "Fuerza de voluntad"
 msgid "Willpower %+.1f"
 msgstr "Fuerza de voluntad %+d"
 
-#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:104
+#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:105
 msgid "You are dead."
 msgstr "Estás muerto"
 
-#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:105
+#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:106
 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:317 src/net/tmwa/playerhandler.cpp:107
+#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:108
 msgid "You are not that alive anymore."
 msgstr "Ya no estás tan vivo..."
 
-#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:108
+#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:109
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr "Las frías manos de la muerte se llevaron tu alma su reino."
 
-#: src/net/manaserv/beinghandler.cpp:319 src/net/tmwa/playerhandler.cpp:109
+#: src/net/manaserv/beinghandler.cpp:319 src/net/tmwa/playerhandler.cpp:110
 msgid "Game Over!"
 msgstr "Fin Del Juego!"
 
-#: src/net/manaserv/beinghandler.cpp:320 src/net/tmwa/playerhandler.cpp:111
+#: src/net/manaserv/beinghandler.cpp:320 src/net/tmwa/playerhandler.cpp:112
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
@@ -3998,34 +4011,34 @@ msgstr ""
 "No, niños. Tu jugador no murió realmente. Solo... eeeh... fue a un lugar "
 "mejor ."
 
-#: src/net/manaserv/beinghandler.cpp:322 src/net/tmwa/playerhandler.cpp:113
+#: src/net/manaserv/beinghandler.cpp:322 src/net/tmwa/playerhandler.cpp:114
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 "Parece que tu plan de romper las armas de tus enemigos con tu garganta falló!"
 
-#: src/net/manaserv/beinghandler.cpp:324 src/net/tmwa/playerhandler.cpp:115
+#: src/net/manaserv/beinghandler.cpp:324 src/net/tmwa/playerhandler.cpp:116
 msgid "I guess this did not run too well."
 msgstr "Creo que esto no fue muy bien."
 
-#: src/net/manaserv/beinghandler.cpp:325 src/net/tmwa/playerhandler.cpp:117
+#: src/net/manaserv/beinghandler.cpp:325 src/net/tmwa/playerhandler.cpp:118
 msgid "Do you want your possessions identified?"
 msgstr "Deseas que tus posesiones sean identificadas?"
 
-#: src/net/manaserv/beinghandler.cpp:326 src/net/tmwa/playerhandler.cpp:119
+#: src/net/manaserv/beinghandler.cpp:326 src/net/tmwa/playerhandler.cpp:120
 msgid "Sadly, no trace of you was ever found..."
 msgstr "Desgraciadamente, nada de ti fue encontrado..."
 
-#: src/net/manaserv/beinghandler.cpp:328 src/net/tmwa/playerhandler.cpp:121
+#: src/net/manaserv/beinghandler.cpp:328 src/net/tmwa/playerhandler.cpp:122
 msgid "Annihilated."
 msgstr "Aniquilado."
 
-#: src/net/manaserv/beinghandler.cpp:329 src/net/tmwa/playerhandler.cpp:123
+#: src/net/manaserv/beinghandler.cpp:329 src/net/tmwa/playerhandler.cpp:124
 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:331 src/net/tmwa/playerhandler.cpp:125
+#: src/net/manaserv/beinghandler.cpp:331 src/net/tmwa/playerhandler.cpp:126
 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 ."
@@ -4087,11 +4100,11 @@ msgstr "Nombre no válido."
 #: src/net/manaserv/charhandler.cpp:180 src/net/manaserv/loginhandler.cpp:98
 #: src/net/manaserv/loginhandler.cpp:130 src/net/manaserv/loginhandler.cpp:166
 #: src/net/manaserv/loginhandler.cpp:286 src/net/manaserv/loginhandler.cpp:323
-#: src/net/tmwa/loginhandler.cpp:99 src/net/tmwa/loginhandler.cpp:187
+#: src/net/tmwa/loginhandler.cpp:99 src/net/tmwa/loginhandler.cpp:190
 msgid "Unknown error."
 msgstr "Error desconocido."
 
-#: src/net/manaserv/charhandler.cpp:209 src/net/tmwa/charserverhandler.cpp:149
+#: src/net/manaserv/charhandler.cpp:209 src/net/tmwa/charserverhandler.cpp:172
 msgid "Info"
 msgstr "Información"
 
@@ -4313,59 +4326,87 @@ msgstr "Gracias por comprar."
 msgid "Unable to buy."
 msgstr "Imposible comprar."
 
-#: src/net/tmwa/buysellhandler.cpp:143
+#: src/net/tmwa/buysellhandler.cpp:145
 msgid "Thanks for selling."
 msgstr "Gracias por vender."
 
-#: src/net/tmwa/buysellhandler.cpp:145
+#: src/net/tmwa/buysellhandler.cpp:149
 msgid "Unable to sell."
 msgstr "Imposible vender."
 
-#: src/net/tmwa/charserverhandler.cpp:106
+#: src/net/tmwa/buysellhandler.cpp:152
+#, fuzzy
+msgid "Unable to sell while trading."
+msgstr "Imposible vender."
+
+#: src/net/tmwa/buysellhandler.cpp:155
+#, fuzzy
+msgid "Unable to sell unsellable item."
+msgstr "Imposible coger el objeto."
+
+#: src/net/tmwa/charserverhandler.cpp:109
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr "Acesso denegado.Probablemente es que alla muchos jugadores."
 
-#: src/net/tmwa/charserverhandler.cpp:110
+#: src/net/tmwa/charserverhandler.cpp:113
 msgid "Cannot use this ID."
 msgstr "Imposible usar esta ID."
 
-#: src/net/tmwa/charserverhandler.cpp:113
+#: src/net/tmwa/charserverhandler.cpp:116
 msgid "Unknown char-server failure."
 msgstr "Error desconocido del char-server."
 
-#: src/net/tmwa/charserverhandler.cpp:137
+#: src/net/tmwa/charserverhandler.cpp:145
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr "Error al crear personaje. Probablemente ya esté en uso."
 
-#: src/net/tmwa/charserverhandler.cpp:149
+#: src/net/tmwa/charserverhandler.cpp:149 src/net/tmwa/loginhandler.cpp:187
+#, fuzzy
+msgid "Wrong name."
+msgstr "Error de Token-mágico ."
+
+#: src/net/tmwa/charserverhandler.cpp:152
+msgid "Incorrect stats."
+msgstr ""
+
+#: src/net/tmwa/charserverhandler.cpp:155
+msgid "Incorrect hair."
+msgstr ""
+
+#: src/net/tmwa/charserverhandler.cpp:158
+#, fuzzy
+msgid "Incorrect slot."
+msgstr "Sin espacios"
+
+#: src/net/tmwa/charserverhandler.cpp:172
 msgid "Character deleted."
 msgstr "Personaje Borrado."
 
-#: src/net/tmwa/charserverhandler.cpp:154
+#: src/net/tmwa/charserverhandler.cpp:177
 msgid "Failed to delete character."
 msgstr "Fallo al borrar el personaje."
 
-#: src/net/tmwa/charserverhandler.cpp:286
+#: src/net/tmwa/charserverhandler.cpp:317
 msgid "Strength:"
 msgstr "Fuerza:"
 
-#: src/net/tmwa/charserverhandler.cpp:287
+#: src/net/tmwa/charserverhandler.cpp:318
 msgid "Agility:"
 msgstr "Agilidad:"
 
-#: src/net/tmwa/charserverhandler.cpp:288
+#: src/net/tmwa/charserverhandler.cpp:319
 msgid "Vitality:"
 msgstr "Vitalidad:"
 
-#: src/net/tmwa/charserverhandler.cpp:289
+#: src/net/tmwa/charserverhandler.cpp:320
 msgid "Intelligence:"
 msgstr "Inteligencia:"
 
-#: src/net/tmwa/charserverhandler.cpp:290
+#: src/net/tmwa/charserverhandler.cpp:321
 msgid "Dexterity:"
 msgstr "Destreza:"
 
-#: src/net/tmwa/charserverhandler.cpp:291
+#: src/net/tmwa/charserverhandler.cpp:322
 msgid "Luck:"
 msgstr "Suerte:"
 
@@ -4751,11 +4792,11 @@ msgstr "Imposible compartir experiencia."
 msgid "Experience sharing unknown."
 msgstr "Compartir experiencia desconocido."
 
-#: src/net/tmwa/inventoryhandler.cpp:334
+#: src/net/tmwa/inventoryhandler.cpp:343
 msgid "Failed to use item."
 msgstr "Fallo al usar el objeto."
 
-#: src/net/tmwa/inventoryhandler.cpp:457
+#: src/net/tmwa/inventoryhandler.cpp:472
 msgid "Unable to equip."
 msgstr "Imposible equipar."
 
@@ -4867,51 +4908,51 @@ msgstr "Un miembro desconocido intentó decir: %s"
 msgid "%s is not in your party!"
 msgstr "%s no está en tu grupo!"
 
-#: src/net/tmwa/playerhandler.cpp:110
+#: src/net/tmwa/playerhandler.cpp:111
 msgid "Insert coin to continue."
 msgstr "Inserta moneda para continuar."
 
-#: src/net/tmwa/playerhandler.cpp:128
+#: src/net/tmwa/playerhandler.cpp:129
 msgid "You're not dead yet. You're just resting."
 msgstr "Tu no estás muerto. Sólo estás descansando."
 
-#: src/net/tmwa/playerhandler.cpp:129
+#: src/net/tmwa/playerhandler.cpp:130
 msgid "You are no more."
 msgstr "Tu ya no existes más."
 
-#: src/net/tmwa/playerhandler.cpp:130
+#: src/net/tmwa/playerhandler.cpp:131
 msgid "You have ceased to be."
 msgstr "Parece que dejaste de existir."
 
-#: src/net/tmwa/playerhandler.cpp:131
+#: src/net/tmwa/playerhandler.cpp:132
 msgid "You've expired and gone to meet your maker."
 msgstr "Has expirado e ido a ver al tu creador."
 
-#: src/net/tmwa/playerhandler.cpp:132
+#: src/net/tmwa/playerhandler.cpp:133
 msgid "You're a stiff."
 msgstr "Eres un cadáver."
 
-#: src/net/tmwa/playerhandler.cpp:133
+#: src/net/tmwa/playerhandler.cpp:134
 msgid "Bereft of life, you rest in peace."
 msgstr "Sin vida, descansa en paz."
 
-#: src/net/tmwa/playerhandler.cpp:134
+#: src/net/tmwa/playerhandler.cpp:135
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr "Si no estuvieras tan animado, diría que estás muerto."
 
-#: src/net/tmwa/playerhandler.cpp:135
+#: src/net/tmwa/playerhandler.cpp:136
 msgid "Your metabolic processes are now history."
 msgstr "Tus procesos metabólicos son ya historia."
 
-#: src/net/tmwa/playerhandler.cpp:136
+#: src/net/tmwa/playerhandler.cpp:137
 msgid "You're off the twig."
 msgstr "Estás fuera de tus botas."
 
-#: src/net/tmwa/playerhandler.cpp:137
+#: src/net/tmwa/playerhandler.cpp:138
 msgid "You've kicked the bucket."
 msgstr "Te han echado a patadas."
 
-#: src/net/tmwa/playerhandler.cpp:138
+#: src/net/tmwa/playerhandler.cpp:139
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
@@ -4919,44 +4960,44 @@ msgstr ""
 "Has dejado tu cuerpo mortal, bajado las cortinas y unido al sangriento coro "
 "de los invisibles."
 
-#: src/net/tmwa/playerhandler.cpp:140
+#: src/net/tmwa/playerhandler.cpp:141
 msgid "You are an ex-player."
 msgstr "Eres un ex-jugador."
 
-#: src/net/tmwa/playerhandler.cpp:141
+#: src/net/tmwa/playerhandler.cpp:142
 msgid "You're pining for the fjords."
 msgstr "Estas avanzando... hacia el barranco."
 
-#: src/net/tmwa/playerhandler.cpp:327 src/net/tmwa/playerhandler.cpp:336
-#: src/net/tmwa/playerhandler.cpp:415
+#: src/net/tmwa/playerhandler.cpp:330 src/net/tmwa/playerhandler.cpp:339
+#: src/net/tmwa/playerhandler.cpp:418
 msgid "Message"
 msgstr "Mensaje"
 
-#: src/net/tmwa/playerhandler.cpp:328
+#: src/net/tmwa/playerhandler.cpp:331
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr "Llevas más de la mitad del peso que puedes. No recuperarás PV o PM."
 
-#: src/net/tmwa/playerhandler.cpp:337
+#: src/net/tmwa/playerhandler.cpp:340
 #, fuzzy
 msgid "You are carrying less than half your weight. You are can regain health."
 msgstr "Llevas más de la mitad del peso que puedes. No recuperarás PV o PM."
 
-#: src/net/tmwa/playerhandler.cpp:442
+#: src/net/tmwa/playerhandler.cpp:445
 #, c-format
 msgid "You picked up %s."
 msgstr "Has cogido %s."
 
-#: src/net/tmwa/playerhandler.cpp:448
+#: src/net/tmwa/playerhandler.cpp:451
 #, fuzzy, c-format
 msgid "You spent %s."
 msgstr "Tú recibes %s"
 
-#: src/net/tmwa/playerhandler.cpp:493
+#: src/net/tmwa/playerhandler.cpp:496
 msgid "Cannot raise skill!"
 msgstr "Imposible incrementar!"
 
-#: src/net/tmwa/playerhandler.cpp:613
+#: src/net/tmwa/playerhandler.cpp:616
 msgid "Equip arrows first."
 msgstr "Equipar las flechas primero."
 
@@ -5105,32 +5146,32 @@ msgstr "Burbuja '...' flotante"
 msgid "Floating bubble"
 msgstr "Burbuja Flotante"
 
-#: src/resources/beinginfo.cpp:32 src/resources/itemdb.cpp:210
+#: src/resources/beinginfo.cpp:32 src/resources/itemdb.cpp:223
 #: src/resources/monsterdb.cpp:78
 msgid "unnamed"
 msgstr "Sin Nombre"
 
-#: src/resources/itemdb.cpp:55
+#: src/resources/itemdb.cpp:57
 #, c-format
 msgid "Attack %+d"
 msgstr "Ataque %+d"
 
-#: src/resources/itemdb.cpp:56
+#: src/resources/itemdb.cpp:58
 #, c-format
 msgid "Defense %+d"
 msgstr "Defensa %+d"
 
-#: src/resources/itemdb.cpp:57
+#: src/resources/itemdb.cpp:59
 #, c-format
 msgid "HP %+d"
 msgstr "PV %+d"
 
-#: src/resources/itemdb.cpp:58
+#: src/resources/itemdb.cpp:60
 #, c-format
 msgid "MP %+d"
 msgstr "PM %+d"
 
-#: src/resources/itemdb.cpp:155
+#: src/resources/itemdb.cpp:152
 msgid "Unknown item"
 msgstr "Objeto desconocido"
 
diff --git a/po/fr.po b/po/fr.po
index 15a107ddf..632415859 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -4,18 +4,26 @@
 # Guillaume Melquiond <guillaume.melquiond@gmail.com>, 2007.
 #
 #
+#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: The Mana World 0.1.0\n"
 "Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2011-01-06 03:06+0200\n"
-"PO-Revision-Date: 2010-12-29 00:51+0100\n"
+"POT-Creation-Date: 2011-01-13 21:49+0200\n"
+"PO-Revision-Date: 2011-01-11 22:42+0100\n"
 "Last-Translator: Yohann Ferreira <yohann ferreira orange fr>\n"
 "Language-Team: French <Yohann Ferreira <yohann ferreira orange efer>>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"#-#-#-#-#  fr.po (The Mana World 0.1.0)  #-#-#-#-#\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-Language: French\n"
+"X-Poedit-Country: FRANCE\n"
+"#-#-#-#-#  po_fr rewiew1.po (The Mana World 0.1.0)  #-#-#-#-#\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"
@@ -61,10 +69,10 @@ msgstr "Changement de serveur de jeu"
 #: src/client.cpp:1029 src/client.cpp:1036 src/client.cpp:1171
 #: src/gui/changeemaildialog.cpp:154 src/gui/changepassworddialog.cpp:144
 #: src/gui/charcreatedialog.cpp:185 src/gui/register.cpp:225
-#: src/gui/serverdialog.cpp:350 src/gui/unregisterdialog.cpp:134
+#: src/gui/serverdialog.cpp:355 src/gui/unregisterdialog.cpp:134
 #: src/net/manaserv/charhandler.cpp:183 src/net/manaserv/charhandler.cpp:226
-#: src/net/tmwa/charserverhandler.cpp:137
-#: src/net/tmwa/charserverhandler.cpp:154
+#: src/net/tmwa/charserverhandler.cpp:161
+#: src/net/tmwa/charserverhandler.cpp:177
 msgid "Error"
 msgstr "Erreur"
 
@@ -462,12 +470,18 @@ msgid "Command: /toggle <state>"
 msgstr "Command: /toggle <state>"
 
 #: src/commandhandler.cpp:449
+#, fuzzy
 msgid ""
 "This command sets whether the return key should toggle the chat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
+"#-#-#-#-#  fr.po (The Mana World 0.1.0)  #-#-#-#-#\n"
 "Cette commande définie si la touche entrée doit fermer le fichier "
 "d'enregistrement de la conversation ou si celui-ci se fermera "
+"automatiquement.\n"
+"#-#-#-#-#  po_fr rewiew1.po (The Mana World 0.1.0)  #-#-#-#-#\n"
+"Cette commande définit si la touche entrée doit fermer le fichier "
+"d'enregistrement de la conversation ou si celui-ci se fermera "
 "automatiquement."
 
 #: src/commandhandler.cpp:452
@@ -530,9 +544,13 @@ msgstr ""
 "existe déjà ou il s'agit de vous même."
 
 #: src/commandhandler.cpp:574
-#, c-format
+#, fuzzy, c-format
 msgid "Requesting to join channel %s."
-msgstr "Il vous est demandé de rejoindre le chan %s."
+msgstr ""
+"#-#-#-#-#  fr.po (The Mana World 0.1.0)  #-#-#-#-#\n"
+"Il vous est demandé de rejoindre le chan %s.\n"
+"#-#-#-#-#  po_fr rewiew1.po (The Mana World 0.1.0)  #-#-#-#-#\n"
+"Il vous est demandé de rejoindre le salon %s."
 
 #: src/commandhandler.cpp:590 src/net/tmwa/gui/partytab.cpp:122
 msgid "Party name is missing."
@@ -740,7 +758,7 @@ msgid "-"
 msgstr "-"
 
 #: src/gui/buy.cpp:95 src/gui/quitdialog.cpp:43 src/gui/quitdialog.cpp:48
-#: src/gui/quitdialog.cpp:49 src/gui/sell.cpp:90 src/gui/serverdialog.cpp:244
+#: src/gui/quitdialog.cpp:49 src/gui/sell.cpp:90 src/gui/serverdialog.cpp:248
 #: src/keyboardconfig.cpp:275
 msgid "Quit"
 msgstr "Quitter"
@@ -751,7 +769,7 @@ msgid "Max"
 msgstr "Max."
 
 #: src/gui/buysell.cpp:37 src/gui/buysell.cpp:46
-#: src/gui/inventorywindow.cpp:112
+#: src/gui/inventorywindow.cpp:134
 msgid "Shop"
 msgstr "Magasin"
 
@@ -828,8 +846,13 @@ msgid "The new password needs to be less than %d characters long."
 msgstr "Le mot de passe ne doit pas être plus long que %d caractères."
 
 #: src/gui/changepassworddialog.cpp:131
+#, fuzzy
 msgid "The new password entries mismatch."
-msgstr "Les anciens mots de passe ne correspondent pas."
+msgstr ""
+"#-#-#-#-#  fr.po (The Mana World 0.1.0)  #-#-#-#-#\n"
+"Les anciens mots de passe ne correspondent pas.\n"
+"#-#-#-#-#  po_fr rewiew1.po (The Mana World 0.1.0)  #-#-#-#-#\n"
+"Les nouveaux mots de passe ne correspondent pas."
 
 #: src/gui/charcreatedialog.cpp:53
 msgid "Create Character"
@@ -918,7 +941,7 @@ msgstr "Se désinscrire"
 msgid "Change Email"
 msgstr "Modifier l'adresse email"
 
-#: src/gui/charselectdialog.cpp:375 src/gui/serverdialog.cpp:248
+#: src/gui/charselectdialog.cpp:375 src/gui/serverdialog.cpp:252
 #: src/gui/setup_players.cpp:242 src/gui/shopwindow.cpp:117
 #: src/gui/shopwindow.cpp:120 src/gui/textcommandeditor.cpp:234
 msgid "Delete"
@@ -1162,8 +1185,8 @@ msgstr "Ok"
 msgid "Equipment"
 msgstr "Équipement"
 
-#: src/gui/equipmentwindow.cpp:91 src/gui/inventorywindow.cpp:96
-#: src/gui/inventorywindow.cpp:393 src/gui/inventorywindow.cpp:402
+#: src/gui/equipmentwindow.cpp:91 src/gui/inventorywindow.cpp:118
+#: src/gui/inventorywindow.cpp:443 src/gui/inventorywindow.cpp:452
 #: src/gui/popupmenu.cpp:1070 src/gui/popupmenu.cpp:1169
 #: src/gui/popupmenu.cpp:1209
 msgid "Unequip"
@@ -1173,67 +1196,76 @@ msgstr "Retirer"
 msgid "Help"
 msgstr "Aide"
 
-#: src/gui/help.cpp:52 src/gui/inventorywindow.cpp:135
+#: src/gui/help.cpp:52 src/gui/inventorywindow.cpp:163
 #: src/gui/npcdialog.cpp:48 src/gui/shopwindow.cpp:108
 msgid "Close"
 msgstr "Fermer"
 
-#: src/gui/inventorywindow.cpp:62 src/gui/windowmenu.cpp:72
+#: src/gui/inventorywindow.cpp:65 src/gui/windowmenu.cpp:72
 msgid "Inventory"
 msgstr "Inventaire"
 
-#: src/gui/inventorywindow.cpp:62
+#: src/gui/inventorywindow.cpp:65
 msgid "Storage"
 msgstr "Stockage"
 
-#: src/gui/inventorywindow.cpp:89
+#: src/gui/inventorywindow.cpp:92
 msgid "Slots:"
 msgstr "Cases :"
 
-#: src/gui/inventorywindow.cpp:94 src/gui/inventorywindow.cpp:395
-#: src/gui/inventorywindow.cpp:404 src/gui/popupmenu.cpp:1072
+#: src/gui/inventorywindow.cpp:103
+msgid "Filter:"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:104
+#, fuzzy
+msgid "Sort:"
+msgstr "Port :"
+
+#: src/gui/inventorywindow.cpp:116 src/gui/inventorywindow.cpp:445
+#: src/gui/inventorywindow.cpp:454 src/gui/popupmenu.cpp:1072
 #: src/gui/popupmenu.cpp:1171 src/gui/popupmenu.cpp:1211
 msgid "Equip"
 msgstr "Équiper"
 
-#: src/gui/inventorywindow.cpp:95 src/gui/inventorywindow.cpp:396
-#: src/gui/inventorywindow.cpp:400 src/gui/popupmenu.cpp:1075
+#: src/gui/inventorywindow.cpp:117 src/gui/inventorywindow.cpp:446
+#: src/gui/inventorywindow.cpp:450 src/gui/popupmenu.cpp:1075
 #: src/gui/popupmenu.cpp:1144 src/gui/popupmenu.cpp:1175
 #: src/gui/popupmenu.cpp:1214
 msgid "Use"
 msgstr "Utiliser"
 
-#: src/gui/inventorywindow.cpp:109 src/gui/inventorywindow.cpp:499
+#: src/gui/inventorywindow.cpp:131 src/gui/inventorywindow.cpp:549
 #: src/gui/popupmenu.cpp:1078 src/gui/popupmenu.cpp:1179
 #: src/gui/popupmenu.cpp:1217
 msgid "Drop..."
 msgstr "Jeter..."
 
-#: src/gui/inventorywindow.cpp:110 src/gui/popupmenu.cpp:1083
+#: src/gui/inventorywindow.cpp:132 src/gui/popupmenu.cpp:1083
 #: src/gui/popupmenu.cpp:1184 src/gui/popupmenu.cpp:1222
 msgid "Split"
 msgstr "Partager"
 
-#: src/gui/inventorywindow.cpp:111 src/gui/outfitwindow.cpp:56
+#: src/gui/inventorywindow.cpp:133 src/gui/outfitwindow.cpp:56
 #: src/gui/popupmenu.cpp:409
 msgid "Outfits"
 msgstr "Tenues"
 
-#: src/gui/inventorywindow.cpp:114
+#: src/gui/inventorywindow.cpp:136
 msgid "Weight:"
 msgstr "Poids :"
 
-#: src/gui/inventorywindow.cpp:133 src/gui/inventorywindow.cpp:490
+#: src/gui/inventorywindow.cpp:161 src/gui/inventorywindow.cpp:540
 #: src/gui/popupmenu.cpp:1087 src/gui/popupmenu.cpp:1187
 #: src/gui/popupmenu.cpp:1225 src/gui/setup.cpp:65
 msgid "Store"
 msgstr "Entreposer"
 
-#: src/gui/inventorywindow.cpp:134 src/gui/popupmenu.cpp:1106
+#: src/gui/inventorywindow.cpp:162 src/gui/popupmenu.cpp:1106
 msgid "Retrieve"
 msgstr "Récupérer"
 
-#: src/gui/inventorywindow.cpp:501 src/gui/popupmenu.cpp:1080
+#: src/gui/inventorywindow.cpp:551 src/gui/popupmenu.cpp:1080
 #: src/gui/popupmenu.cpp:1181 src/gui/popupmenu.cpp:1219
 #: src/gui/windowmenu.cpp:91
 msgid "Drop"
@@ -1421,7 +1453,7 @@ msgstr ""
 msgid "Login"
 msgstr "Connexion"
 
-#: src/gui/login.cpp:87 src/gui/serverdialog.cpp:221
+#: src/gui/login.cpp:87 src/gui/serverdialog.cpp:222
 #: src/gui/widgets/chattab.cpp:166
 msgid "Server:"
 msgstr "Serveur :"
@@ -1840,52 +1872,56 @@ msgstr "Les deux mots de passe sont différents"
 msgid "Choose Your Server"
 msgstr "Choisissez le serveur"
 
-#: src/gui/serverdialog.cpp:222
+#: src/gui/serverdialog.cpp:223
 msgid "Port:"
 msgstr "Port :"
 
-#: src/gui/serverdialog.cpp:223
+#: src/gui/serverdialog.cpp:224
 msgid "Server type:"
 msgstr "Type de Serveur :"
 
-#: src/gui/serverdialog.cpp:245
+#: src/gui/serverdialog.cpp:227
+msgid "Use same ip for game sub servers"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:249
 msgid "Load"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:246
+#: src/gui/serverdialog.cpp:250
 msgid "Connect"
 msgstr "Connexion..."
 
-#: src/gui/serverdialog.cpp:247
+#: src/gui/serverdialog.cpp:251
 msgid "Custom Server"
 msgstr "Serveur personnalisé"
 
-#: src/gui/serverdialog.cpp:351
+#: src/gui/serverdialog.cpp:356
 msgid "Please type both the address and the port of a server."
 msgstr "Veuillez entrer l'adresse et le port du serveur."
 
-#: src/gui/serverdialog.cpp:482
+#: src/gui/serverdialog.cpp:488
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Téléchargement de la liste des serveurs...%2.2f%%"
 
-#: src/gui/serverdialog.cpp:488
+#: src/gui/serverdialog.cpp:494
 msgid "Waiting for server..."
 msgstr "En attente du serveur..."
 
-#: src/gui/serverdialog.cpp:492
+#: src/gui/serverdialog.cpp:498
 msgid "Preparing download"
 msgstr "Préparation du téléchargement"
 
-#: src/gui/serverdialog.cpp:496
+#: src/gui/serverdialog.cpp:502
 msgid "Error retreiving server list!"
 msgstr "Erreur lors du téléchargement de la liste !"
 
-#: src/gui/serverdialog.cpp:593
+#: src/gui/serverdialog.cpp:599
 msgid "requires a newer version"
 msgstr "requiert une nouvelle version"
 
-#: src/gui/serverdialog.cpp:595
+#: src/gui/serverdialog.cpp:601
 #, c-format
 msgid "requires v%s"
 msgstr "requiert la v%s"
@@ -2301,7 +2337,11 @@ msgstr "Redémarrez le jeu pour que les changements soient appliqués."
 #: src/gui/setup_video.cpp:143
 #, fuzzy
 msgid "Tiny (10)"
-msgstr "fin"
+msgstr ""
+"#-#-#-#-#  fr.po (The Mana World 0.1.0)  #-#-#-#-#\n"
+"fin\n"
+"#-#-#-#-#  po_fr rewiew1.po (The Mana World 0.1.0)  #-#-#-#-#\n"
+"Fin"
 
 #: src/gui/setup_video.cpp:144
 #, fuzzy
@@ -2533,9 +2573,14 @@ msgid "Screen Resolution Changed"
 msgstr "Résolution de l'écran modifiée"
 
 #: src/gui/setup_video.cpp:716
+#, fuzzy
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
+"#-#-#-#-#  fr.po (The Mana World 0.1.0)  #-#-#-#-#\n"
 "Certaines fenêtre pourraient avoir été recentrée pour correspondre à la "
+"nouvelle résolution.\n"
+"#-#-#-#-#  po_fr rewiew1.po (The Mana World 0.1.0)  #-#-#-#-#\n"
+"Certaines fenêtre pourraient avoir été recentrées pour correspondre à la "
 "nouvelle résolution."
 
 #: src/gui/setup_video.cpp:750
@@ -2740,10 +2785,15 @@ msgid "Choose your guild's name."
 msgstr "Choisissez le nom de la guilde."
 
 #: src/gui/socialwindow.cpp:1108
+#, fuzzy
 msgid "Received guild request, but one already exists."
 msgstr ""
+"#-#-#-#-#  fr.po (The Mana World 0.1.0)  #-#-#-#-#\n"
 "Vous avez reçu une demande pour rejoindre une guilde, mais il en existe déjà "
-"une autre."
+"une autre.\n"
+"#-#-#-#-#  po_fr rewiew1.po (The Mana World 0.1.0)  #-#-#-#-#\n"
+"Vous avez reçu une demande pour rejoindre une guilde, mais il en existe déjà "
+"une."
 
 #: src/gui/socialwindow.cpp:1114
 #, c-format
@@ -3548,8 +3598,13 @@ msgid "Skill Window"
 msgstr "Fenêtre de compétences"
 
 #: src/keyboardconfig.cpp:127
+#, fuzzy
 msgid "Minimap Window"
-msgstr "Fenêtre du plan"
+msgstr ""
+"#-#-#-#-#  fr.po (The Mana World 0.1.0)  #-#-#-#-#\n"
+"Fenêtre du plan\n"
+"#-#-#-#-#  po_fr rewiew1.po (The Mana World 0.1.0)  #-#-#-#-#\n"
+"Fenêtre du miniplan"
 
 #: src/keyboardconfig.cpp:129
 msgid "Chat Window"
@@ -3838,7 +3893,7 @@ msgstr[1] "Vous avez ramassé %d [@@%d|%s@@]."
 msgid "Away"
 msgstr "Inactif"
 
-#: src/localplayer.cpp:3617
+#: src/localplayer.cpp:3618
 #, fuzzy
 msgid "You see "
 msgstr "Vous recevez %s"
@@ -3997,29 +4052,29 @@ msgstr "Volonté"
 msgid "Willpower %+.1f"
 msgstr "Volonté %+d"
 
-#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:104
+#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:105
 msgid "You are dead."
 msgstr "Vous êtes mort."
 
-#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:105
+#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:106
 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:317 src/net/tmwa/playerhandler.cpp:107
+#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:108
 msgid "You are not that alive anymore."
 msgstr "Vous n'êtes plus vraiment en vie."
 
-#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:108
+#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:109
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr "Les mains gelées de la faucheuse viennent réclamer votre âme."
 
-#: src/net/manaserv/beinghandler.cpp:319 src/net/tmwa/playerhandler.cpp:109
+#: src/net/manaserv/beinghandler.cpp:319 src/net/tmwa/playerhandler.cpp:110
 msgid "Game Over!"
 msgstr "Fin de la partie !"
 
-#: src/net/manaserv/beinghandler.cpp:320 src/net/tmwa/playerhandler.cpp:111
+#: src/net/manaserv/beinghandler.cpp:320 src/net/tmwa/playerhandler.cpp:112
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
@@ -4027,7 +4082,7 @@ msgstr ""
 "Non, les  enfants. Ton personnage n'est pas vraiment mort... Il... enfin,.. "
 "il... est parti dans un monde meilleur."
 
-#: src/net/manaserv/beinghandler.cpp:322 src/net/tmwa/playerhandler.cpp:113
+#: src/net/manaserv/beinghandler.cpp:322 src/net/tmwa/playerhandler.cpp:114
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
@@ -4035,27 +4090,27 @@ msgstr ""
 "Votre tentative de casser l'arme de votre ennemi en la frappant avec votre "
 "gorge a échoué."
 
-#: src/net/manaserv/beinghandler.cpp:324 src/net/tmwa/playerhandler.cpp:115
+#: src/net/manaserv/beinghandler.cpp:324 src/net/tmwa/playerhandler.cpp:116
 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:325 src/net/tmwa/playerhandler.cpp:117
+#: src/net/manaserv/beinghandler.cpp:325 src/net/tmwa/playerhandler.cpp:118
 msgid "Do you want your possessions identified?"
 msgstr "Voulez-vous que vos biens soient identifiés ?"
 
-#: src/net/manaserv/beinghandler.cpp:326 src/net/tmwa/playerhandler.cpp:119
+#: src/net/manaserv/beinghandler.cpp:326 src/net/tmwa/playerhandler.cpp:120
 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:328 src/net/tmwa/playerhandler.cpp:121
+#: src/net/manaserv/beinghandler.cpp:328 src/net/tmwa/playerhandler.cpp:122
 msgid "Annihilated."
 msgstr "Vaporisé."
 
-#: src/net/manaserv/beinghandler.cpp:329 src/net/tmwa/playerhandler.cpp:123
+#: src/net/manaserv/beinghandler.cpp:329 src/net/tmwa/playerhandler.cpp:124
 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:331 src/net/tmwa/playerhandler.cpp:125
+#: src/net/manaserv/beinghandler.cpp:331 src/net/tmwa/playerhandler.cpp:126
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
@@ -4063,8 +4118,13 @@ msgstr ""
 "autre."
 
 #: src/net/manaserv/beinghandler.cpp:336
+#, fuzzy
 msgid "Press OK to respawn."
-msgstr " Cliquer sur OK pour ressusciter"
+msgstr ""
+"#-#-#-#-#  fr.po (The Mana World 0.1.0)  #-#-#-#-#\n"
+" Cliquer sur OK pour ressusciter\n"
+"#-#-#-#-#  po_fr rewiew1.po (The Mana World 0.1.0)  #-#-#-#-#\n"
+"Cliquer sur OK pour ressusciter"
 
 #: src/net/manaserv/beinghandler.cpp:337
 msgid "You Died"
@@ -4119,11 +4179,11 @@ msgstr "Nom invalide."
 #: src/net/manaserv/charhandler.cpp:180 src/net/manaserv/loginhandler.cpp:98
 #: src/net/manaserv/loginhandler.cpp:130 src/net/manaserv/loginhandler.cpp:166
 #: src/net/manaserv/loginhandler.cpp:286 src/net/manaserv/loginhandler.cpp:323
-#: src/net/tmwa/loginhandler.cpp:99 src/net/tmwa/loginhandler.cpp:187
+#: src/net/tmwa/loginhandler.cpp:99 src/net/tmwa/loginhandler.cpp:190
 msgid "Unknown error."
 msgstr "Erreur inconnue."
 
-#: src/net/manaserv/charhandler.cpp:209 src/net/tmwa/charserverhandler.cpp:149
+#: src/net/manaserv/charhandler.cpp:209 src/net/tmwa/charserverhandler.cpp:172
 msgid "Info"
 msgstr "Informations"
 
@@ -4290,13 +4350,22 @@ msgstr ""
 "incorrecte."
 
 #: src/net/manaserv/partyhandler.cpp:89
+#, fuzzy
 msgid "Joined party."
-msgstr "Groupe rejoind."
+msgstr ""
+"#-#-#-#-#  fr.po (The Mana World 0.1.0)  #-#-#-#-#\n"
+"Groupe rejoind.\n"
+"#-#-#-#-#  po_fr rewiew1.po (The Mana World 0.1.0)  #-#-#-#-#\n"
+"Groupe rejoint."
 
 #: src/net/manaserv/partyhandler.cpp:107
-#, c-format
+#, fuzzy, c-format
 msgid "%s joined the party."
-msgstr "%s a rejoind le groupe."
+msgstr ""
+"#-#-#-#-#  fr.po (The Mana World 0.1.0)  #-#-#-#-#\n"
+"%s a rejoind le groupe.\n"
+"#-#-#-#-#  po_fr rewiew1.po (The Mana World 0.1.0)  #-#-#-#-#\n"
+"%s a rejoint le groupe."
 
 #: src/net/manaserv/partyhandler.cpp:125
 #, c-format
@@ -4349,61 +4418,99 @@ msgstr "Merci pour votre achat."
 msgid "Unable to buy."
 msgstr "Impossible d'acheter."
 
-#: src/net/tmwa/buysellhandler.cpp:143
+#: src/net/tmwa/buysellhandler.cpp:145
 msgid "Thanks for selling."
 msgstr "Merci pour votre vente."
 
-#: src/net/tmwa/buysellhandler.cpp:145
+#: src/net/tmwa/buysellhandler.cpp:149
 msgid "Unable to sell."
 msgstr "Impossible de vendre."
 
-#: src/net/tmwa/charserverhandler.cpp:106
+#: src/net/tmwa/buysellhandler.cpp:152
+#, fuzzy
+msgid "Unable to sell while trading."
+msgstr "Impossible de vendre."
+
+#: src/net/tmwa/buysellhandler.cpp:155
+#, fuzzy
+msgid "Unable to sell unsellable item."
+msgstr "Impossible de ramasser l'objet."
+
+#: src/net/tmwa/charserverhandler.cpp:109
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr "Accès refusé. Il y a probablement trop de joueurs sur le serveur."
 
-#: src/net/tmwa/charserverhandler.cpp:110
+#: src/net/tmwa/charserverhandler.cpp:113
+#, fuzzy
 msgid "Cannot use this ID."
-msgstr "Impossible d'utiliser cet Id."
+msgstr ""
+"#-#-#-#-#  fr.po (The Mana World 0.1.0)  #-#-#-#-#\n"
+"Impossible d'utiliser cet Id.\n"
+"#-#-#-#-#  po_fr rewiew1.po (The Mana World 0.1.0)  #-#-#-#-#\n"
+"Impossible d'utiliser cette Id."
 
-#: src/net/tmwa/charserverhandler.cpp:113
+#: src/net/tmwa/charserverhandler.cpp:116
+#, fuzzy
 msgid "Unknown char-server failure."
-msgstr "Erreur inconnue provenant du serveur de personnages"
+msgstr ""
+"#-#-#-#-#  fr.po (The Mana World 0.1.0)  #-#-#-#-#\n"
+"Erreur inconnue provenant du serveur de personnages\n"
+"#-#-#-#-#  po_fr rewiew1.po (The Mana World 0.1.0)  #-#-#-#-#\n"
+"Erreur inconnue provenant du serveur de personnages."
 
-#: src/net/tmwa/charserverhandler.cpp:137
+#: src/net/tmwa/charserverhandler.cpp:145
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 "Impossible de créer ce personnage. Il est probable que ce nom soit déjà "
 "utilisé."
 
-#: src/net/tmwa/charserverhandler.cpp:149
+#: src/net/tmwa/charserverhandler.cpp:149 src/net/tmwa/loginhandler.cpp:187
+#, fuzzy
+msgid "Wrong name."
+msgstr "Mauvais jeton de sécurité."
+
+#: src/net/tmwa/charserverhandler.cpp:152
+msgid "Incorrect stats."
+msgstr ""
+
+#: src/net/tmwa/charserverhandler.cpp:155
+msgid "Incorrect hair."
+msgstr ""
+
+#: src/net/tmwa/charserverhandler.cpp:158
+#, fuzzy
+msgid "Incorrect slot."
+msgstr "Pas d'emplacement vide."
+
+#: src/net/tmwa/charserverhandler.cpp:172
 msgid "Character deleted."
 msgstr "Personnage supprimé."
 
-#: src/net/tmwa/charserverhandler.cpp:154
+#: src/net/tmwa/charserverhandler.cpp:177
 msgid "Failed to delete character."
 msgstr "La suppresion du personnage n'a pu s\"effectuer."
 
-#: src/net/tmwa/charserverhandler.cpp:286
+#: src/net/tmwa/charserverhandler.cpp:317
 msgid "Strength:"
 msgstr "Force :"
 
-#: src/net/tmwa/charserverhandler.cpp:287
+#: src/net/tmwa/charserverhandler.cpp:318
 msgid "Agility:"
 msgstr "Agilité :"
 
-#: src/net/tmwa/charserverhandler.cpp:288
+#: src/net/tmwa/charserverhandler.cpp:319
 msgid "Vitality:"
 msgstr "Vitalité :"
 
-#: src/net/tmwa/charserverhandler.cpp:289
+#: src/net/tmwa/charserverhandler.cpp:320
 msgid "Intelligence:"
 msgstr "Intelligence :"
 
-#: src/net/tmwa/charserverhandler.cpp:290
+#: src/net/tmwa/charserverhandler.cpp:321
 msgid "Dexterity:"
 msgstr "Dextérité :"
 
-#: src/net/tmwa/charserverhandler.cpp:291
+#: src/net/tmwa/charserverhandler.cpp:322
 msgid "Luck:"
 msgstr "Chance :"
 
@@ -4669,7 +4776,11 @@ msgstr "Réponse d'invitation à la guilde inconnue."
 #: src/net/tmwa/guildhandler.cpp:475
 #, fuzzy
 msgid "You have left the guild."
-msgstr "vous avez quitté le groupe."
+msgstr ""
+"#-#-#-#-#  fr.po (The Mana World 0.1.0)  #-#-#-#-#\n"
+"vous avez quitté le groupe.\n"
+"#-#-#-#-#  po_fr rewiew1.po (The Mana World 0.1.0)  #-#-#-#-#\n"
+"Vous avez quitté le groupe."
 
 #: src/net/tmwa/guildhandler.cpp:489
 #, fuzzy, c-format
@@ -4794,11 +4905,11 @@ msgstr "Partage d'expérience impossible."
 msgid "Experience sharing unknown."
 msgstr "Paramètre de partage d'expérience inconnu."
 
-#: src/net/tmwa/inventoryhandler.cpp:334
+#: src/net/tmwa/inventoryhandler.cpp:343
 msgid "Failed to use item."
 msgstr "Impossible d'utiliser l'objet."
 
-#: src/net/tmwa/inventoryhandler.cpp:457
+#: src/net/tmwa/inventoryhandler.cpp:472
 msgid "Unable to equip."
 msgstr "Impossible d'équiper cet objet."
 
@@ -4834,13 +4945,17 @@ msgstr ""
 "contact avec l'équipe des GM."
 
 #: src/net/tmwa/loginhandler.cpp:177
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
 msgstr ""
+"#-#-#-#-#  fr.po (The Mana World 0.1.0)  #-#-#-#-#\n"
+"Vous avez été banni temporairement du jeu depuis %s.\n"
+"Merci de contacter un MJ par le forum.\n"
+"#-#-#-#-#  po_fr rewiew1.po (The Mana World 0.1.0)  #-#-#-#-#\n"
 "Vous avez été banni temporairement du jeu depuis %s.\n"
-"Merci de contacter un MJ par le forum."
+"Merci de contacter un GM par le forum."
 
 #: src/net/tmwa/loginhandler.cpp:184
 msgid "This user name is already taken."
@@ -4892,8 +5007,13 @@ msgid "QQQ Unknown invite response for %s."
 msgstr "Réponse d'invitation de %s inconnue."
 
 #: src/net/tmwa/partyhandler.cpp:333
+#, fuzzy
 msgid "You have left the party."
-msgstr "vous avez quitté le groupe."
+msgstr ""
+"#-#-#-#-#  fr.po (The Mana World 0.1.0)  #-#-#-#-#\n"
+"vous avez quitté le groupe.\n"
+"#-#-#-#-#  po_fr rewiew1.po (The Mana World 0.1.0)  #-#-#-#-#\n"
+"Vous avez quitté le groupe."
 
 #: src/net/tmwa/partyhandler.cpp:345
 #, c-format
@@ -4910,53 +5030,58 @@ msgstr "Un membre inconnu a essayé de dire : %s"
 msgid "%s is not in your party!"
 msgstr "%s n'est pas membre de votre groupe !"
 
-#: src/net/tmwa/playerhandler.cpp:110
+#: src/net/tmwa/playerhandler.cpp:111
+#, fuzzy
 msgid "Insert coin to continue."
-msgstr "veuillez insérer une pièce pour continuer."
+msgstr ""
+"#-#-#-#-#  fr.po (The Mana World 0.1.0)  #-#-#-#-#\n"
+"veuillez insérer une pièce pour continuer.\n"
+"#-#-#-#-#  po_fr rewiew1.po (The Mana World 0.1.0)  #-#-#-#-#\n"
+"Veuillez insérer une pièce pour continuer."
 
-#: src/net/tmwa/playerhandler.cpp:128
+#: src/net/tmwa/playerhandler.cpp:129
 msgid "You're not dead yet. You're just resting."
 msgstr "Vous n'êtes pas encore mort. Vous vous reposez seulement."
 
-#: src/net/tmwa/playerhandler.cpp:129
+#: src/net/tmwa/playerhandler.cpp:130
 msgid "You are no more."
 msgstr "Vous n'existez plus."
 
-#: src/net/tmwa/playerhandler.cpp:130
+#: src/net/tmwa/playerhandler.cpp:131
 msgid "You have ceased to be."
 msgstr "Vous avez cessez d'exister."
 
-#: src/net/tmwa/playerhandler.cpp:131
+#: src/net/tmwa/playerhandler.cpp:132
 msgid "You've expired and gone to meet your maker."
 msgstr "Tu es fini. Tu es parti retrouver ton créateur."
 
-#: src/net/tmwa/playerhandler.cpp:132
+#: src/net/tmwa/playerhandler.cpp:133
 msgid "You're a stiff."
 msgstr "Tu es un dur."
 
-#: src/net/tmwa/playerhandler.cpp:133
+#: src/net/tmwa/playerhandler.cpp:134
 msgid "Bereft of life, you rest in peace."
 msgstr "Privé de toute essence de vie, vous reposez en paix."
 
-#: src/net/tmwa/playerhandler.cpp:134
+#: src/net/tmwa/playerhandler.cpp:135
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 "Si tu n'étais pas autant en forme, tu serais en train de manger les "
 "pissenlits par la racine."
 
-#: src/net/tmwa/playerhandler.cpp:135
+#: src/net/tmwa/playerhandler.cpp:136
 msgid "Your metabolic processes are now history."
 msgstr "Vos processus métaboliques appartiennent au passé maintenant."
 
-#: src/net/tmwa/playerhandler.cpp:136
+#: src/net/tmwa/playerhandler.cpp:137
 msgid "You're off the twig."
 msgstr "Tu es en dehors des clous"
 
-#: src/net/tmwa/playerhandler.cpp:137
+#: src/net/tmwa/playerhandler.cpp:138
 msgid "You've kicked the bucket."
 msgstr "Tu viens de toucher le fond."
 
-#: src/net/tmwa/playerhandler.cpp:138
+#: src/net/tmwa/playerhandler.cpp:139
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
@@ -4964,48 +5089,48 @@ msgstr ""
 "Vous êtes sorti de votre enveloppe charnelle et mortelle. Vous avez rejoint "
 "l'armée de l'ombre."
 
-#: src/net/tmwa/playerhandler.cpp:140
+#: src/net/tmwa/playerhandler.cpp:141
 msgid "You are an ex-player."
 msgstr "Tu n'es plus qu'un ancien joueur sans intérêt."
 
-#: src/net/tmwa/playerhandler.cpp:141
+#: src/net/tmwa/playerhandler.cpp:142
 msgid "You're pining for the fjords."
 msgstr "Tu reposes au fond de l'eau."
 
-#: src/net/tmwa/playerhandler.cpp:327 src/net/tmwa/playerhandler.cpp:336
-#: src/net/tmwa/playerhandler.cpp:415
+#: src/net/tmwa/playerhandler.cpp:330 src/net/tmwa/playerhandler.cpp:339
+#: src/net/tmwa/playerhandler.cpp:418
 msgid "Message"
 msgstr "Message"
 
-#: src/net/tmwa/playerhandler.cpp:328
+#: src/net/tmwa/playerhandler.cpp:331
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 "Vous portez plus de la moitié du poids de votre inventaire. Vous n'êtes plus "
 "en mesure de regagner vos points de vie."
 
-#: src/net/tmwa/playerhandler.cpp:337
+#: src/net/tmwa/playerhandler.cpp:340
 #, fuzzy
 msgid "You are carrying less than half your weight. You are can regain health."
 msgstr ""
 "Vous portez plus de la moitié du poids de votre inventaire. Vous n'êtes plus "
 "en mesure de regagner vos points de vie."
 
-#: src/net/tmwa/playerhandler.cpp:442
+#: src/net/tmwa/playerhandler.cpp:445
 #, c-format
 msgid "You picked up %s."
 msgstr "Vous avez ramassé  %s."
 
-#: src/net/tmwa/playerhandler.cpp:448
+#: src/net/tmwa/playerhandler.cpp:451
 #, fuzzy, c-format
 msgid "You spent %s."
 msgstr "Vous recevez %s"
 
-#: src/net/tmwa/playerhandler.cpp:493
+#: src/net/tmwa/playerhandler.cpp:496
 msgid "Cannot raise skill!"
 msgstr "Ne peut pas augmenter la capacité !"
 
-#: src/net/tmwa/playerhandler.cpp:613
+#: src/net/tmwa/playerhandler.cpp:616
 msgid "Equip arrows first."
 msgstr "Equiper en premier les flèches"
 
@@ -5034,8 +5159,13 @@ msgid "Cannot shout!"
 msgstr "Vous ne pouvez pas crier !"
 
 #: src/net/tmwa/specialhandler.cpp:177
+#, fuzzy
 msgid "You have not yet reached a high enough lvl!"
-msgstr "Vous n'avez pas encore atteind le niveau requis !"
+msgstr ""
+"#-#-#-#-#  fr.po (The Mana World 0.1.0)  #-#-#-#-#\n"
+"Vous n'avez pas encore atteind le niveau requis !\n"
+"#-#-#-#-#  po_fr rewiew1.po (The Mana World 0.1.0)  #-#-#-#-#\n"
+"Vous n'avez pas encore atteint le niveau requis !"
 
 #: src/net/tmwa/specialhandler.cpp:181
 msgid "Insufficient HP!"
@@ -5158,32 +5288,32 @@ msgstr "Bulle flottante '...'"
 msgid "Floating bubble"
 msgstr "Bulle flottante"
 
-#: src/resources/beinginfo.cpp:32 src/resources/itemdb.cpp:210
+#: src/resources/beinginfo.cpp:32 src/resources/itemdb.cpp:223
 #: src/resources/monsterdb.cpp:78
 msgid "unnamed"
 msgstr "anonyme"
 
-#: src/resources/itemdb.cpp:55
+#: src/resources/itemdb.cpp:57
 #, c-format
 msgid "Attack %+d"
 msgstr "Attaque %+d"
 
-#: src/resources/itemdb.cpp:56
+#: src/resources/itemdb.cpp:58
 #, c-format
 msgid "Defense %+d"
 msgstr "Défense %+d"
 
-#: src/resources/itemdb.cpp:57
+#: src/resources/itemdb.cpp:59
 #, c-format
 msgid "HP %+d"
 msgstr "PV %+d"
 
-#: src/resources/itemdb.cpp:58
+#: src/resources/itemdb.cpp:60
 #, c-format
 msgid "MP %+d"
 msgstr "PM %+d"
 
-#: src/resources/itemdb.cpp:155
+#: src/resources/itemdb.cpp:152
 msgid "Unknown item"
 msgstr "Objet inconnu"
 
@@ -5360,8 +5490,13 @@ msgstr "Objet inconnu"
 #~ msgid "Unable to unequip."
 #~ msgstr "Impossible de deséquiper cet objet."
 
+#, fuzzy
 #~ msgid "Inviting failed, because you can't see a player called %s."
-#~ msgstr "L'invitation à échouée, le joueur %s n'est pas à portée de vue."
+#~ msgstr ""
+#~ "#-#-#-#-#  fr.po (The Mana World 0.1.0)  #-#-#-#-#\n"
+#~ "L'invitation à échouée, le joueur %s n'est pas à portée de vue.\n"
+#~ "#-#-#-#-#  po_fr rewiew1.po (The Mana World 0.1.0)  #-#-#-#-#\n"
+#~ "L'invitation a échouée, le joueur %s n'est pas à portée de vue."
 
 #~ msgid "You can only inivte when you are in a party!"
 #~ msgstr "Vous ne pouvez inviter que lorsque vous faites partie d'un groupe."
diff --git a/po/hr.po b/po/hr.po
index ca2bf085f..0dcf05e37 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2011-01-06 03:06+0200\n"
+"POT-Creation-Date: 2011-01-13 21:49+0200\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"
@@ -64,10 +64,10 @@ msgstr "Server"
 #: src/client.cpp:1029 src/client.cpp:1036 src/client.cpp:1171
 #: src/gui/changeemaildialog.cpp:154 src/gui/changepassworddialog.cpp:144
 #: src/gui/charcreatedialog.cpp:185 src/gui/register.cpp:225
-#: src/gui/serverdialog.cpp:350 src/gui/unregisterdialog.cpp:134
+#: src/gui/serverdialog.cpp:355 src/gui/unregisterdialog.cpp:134
 #: src/net/manaserv/charhandler.cpp:183 src/net/manaserv/charhandler.cpp:226
-#: src/net/tmwa/charserverhandler.cpp:137
-#: src/net/tmwa/charserverhandler.cpp:154
+#: src/net/tmwa/charserverhandler.cpp:161
+#: src/net/tmwa/charserverhandler.cpp:177
 msgid "Error"
 msgstr "Greška"
 
@@ -734,7 +734,7 @@ msgid "-"
 msgstr ""
 
 #: src/gui/buy.cpp:95 src/gui/quitdialog.cpp:43 src/gui/quitdialog.cpp:48
-#: src/gui/quitdialog.cpp:49 src/gui/sell.cpp:90 src/gui/serverdialog.cpp:244
+#: src/gui/quitdialog.cpp:49 src/gui/sell.cpp:90 src/gui/serverdialog.cpp:248
 #: src/keyboardconfig.cpp:275
 msgid "Quit"
 msgstr "Izlaz"
@@ -745,7 +745,7 @@ msgid "Max"
 msgstr "Max"
 
 #: src/gui/buysell.cpp:37 src/gui/buysell.cpp:46
-#: src/gui/inventorywindow.cpp:112
+#: src/gui/inventorywindow.cpp:134
 msgid "Shop"
 msgstr "Trgovina"
 
@@ -918,7 +918,7 @@ msgstr "Odjavi"
 msgid "Change Email"
 msgstr "Promijeni Email Adresu"
 
-#: src/gui/charselectdialog.cpp:375 src/gui/serverdialog.cpp:248
+#: src/gui/charselectdialog.cpp:375 src/gui/serverdialog.cpp:252
 #: src/gui/setup_players.cpp:242 src/gui/shopwindow.cpp:117
 #: src/gui/shopwindow.cpp:120 src/gui/textcommandeditor.cpp:234
 msgid "Delete"
@@ -1165,8 +1165,8 @@ msgstr "U redu"
 msgid "Equipment"
 msgstr "Oprema"
 
-#: src/gui/equipmentwindow.cpp:91 src/gui/inventorywindow.cpp:96
-#: src/gui/inventorywindow.cpp:393 src/gui/inventorywindow.cpp:402
+#: src/gui/equipmentwindow.cpp:91 src/gui/inventorywindow.cpp:118
+#: src/gui/inventorywindow.cpp:443 src/gui/inventorywindow.cpp:452
 #: src/gui/popupmenu.cpp:1070 src/gui/popupmenu.cpp:1169
 #: src/gui/popupmenu.cpp:1209
 msgid "Unequip"
@@ -1176,68 +1176,77 @@ msgstr "Skini opremu"
 msgid "Help"
 msgstr "Pomoć"
 
-#: src/gui/help.cpp:52 src/gui/inventorywindow.cpp:135
+#: src/gui/help.cpp:52 src/gui/inventorywindow.cpp:163
 #: src/gui/npcdialog.cpp:48 src/gui/shopwindow.cpp:108
 msgid "Close"
 msgstr "Zatvori"
 
-#: src/gui/inventorywindow.cpp:62 src/gui/windowmenu.cpp:72
+#: src/gui/inventorywindow.cpp:65 src/gui/windowmenu.cpp:72
 msgid "Inventory"
 msgstr "Zalihe"
 
-#: src/gui/inventorywindow.cpp:62
+#: src/gui/inventorywindow.cpp:65
 msgid "Storage"
 msgstr "Pohrana"
 
-#: src/gui/inventorywindow.cpp:89
+#: src/gui/inventorywindow.cpp:92
 msgid "Slots:"
 msgstr "Mjesta:"
 
-#: src/gui/inventorywindow.cpp:94 src/gui/inventorywindow.cpp:395
-#: src/gui/inventorywindow.cpp:404 src/gui/popupmenu.cpp:1072
+#: src/gui/inventorywindow.cpp:103
+msgid "Filter:"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:104
+#, fuzzy
+msgid "Sort:"
+msgstr "Port:"
+
+#: src/gui/inventorywindow.cpp:116 src/gui/inventorywindow.cpp:445
+#: src/gui/inventorywindow.cpp:454 src/gui/popupmenu.cpp:1072
 #: src/gui/popupmenu.cpp:1171 src/gui/popupmenu.cpp:1211
 msgid "Equip"
 msgstr "Opremi"
 
-#: src/gui/inventorywindow.cpp:95 src/gui/inventorywindow.cpp:396
-#: src/gui/inventorywindow.cpp:400 src/gui/popupmenu.cpp:1075
+#: src/gui/inventorywindow.cpp:117 src/gui/inventorywindow.cpp:446
+#: src/gui/inventorywindow.cpp:450 src/gui/popupmenu.cpp:1075
 #: src/gui/popupmenu.cpp:1144 src/gui/popupmenu.cpp:1175
 #: src/gui/popupmenu.cpp:1214
 msgid "Use"
 msgstr "Upotrijebi"
 
-#: src/gui/inventorywindow.cpp:109 src/gui/inventorywindow.cpp:499
+#: src/gui/inventorywindow.cpp:131 src/gui/inventorywindow.cpp:549
 #: src/gui/popupmenu.cpp:1078 src/gui/popupmenu.cpp:1179
 #: src/gui/popupmenu.cpp:1217
 #, fuzzy
 msgid "Drop..."
 msgstr "Ispusti"
 
-#: src/gui/inventorywindow.cpp:110 src/gui/popupmenu.cpp:1083
+#: src/gui/inventorywindow.cpp:132 src/gui/popupmenu.cpp:1083
 #: src/gui/popupmenu.cpp:1184 src/gui/popupmenu.cpp:1222
 msgid "Split"
 msgstr "Razdvoji"
 
-#: src/gui/inventorywindow.cpp:111 src/gui/outfitwindow.cpp:56
+#: src/gui/inventorywindow.cpp:133 src/gui/outfitwindow.cpp:56
 #: src/gui/popupmenu.cpp:409
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:114
+#: src/gui/inventorywindow.cpp:136
 msgid "Weight:"
 msgstr "Težina:"
 
-#: src/gui/inventorywindow.cpp:133 src/gui/inventorywindow.cpp:490
+#: src/gui/inventorywindow.cpp:161 src/gui/inventorywindow.cpp:540
 #: src/gui/popupmenu.cpp:1087 src/gui/popupmenu.cpp:1187
 #: src/gui/popupmenu.cpp:1225 src/gui/setup.cpp:65
 msgid "Store"
 msgstr "Pohrani"
 
-#: src/gui/inventorywindow.cpp:134 src/gui/popupmenu.cpp:1106
+#: src/gui/inventorywindow.cpp:162 src/gui/popupmenu.cpp:1106
 msgid "Retrieve"
 msgstr "Preuzmi"
 
-#: src/gui/inventorywindow.cpp:501 src/gui/popupmenu.cpp:1080
+#: src/gui/inventorywindow.cpp:551 src/gui/popupmenu.cpp:1080
 #: src/gui/popupmenu.cpp:1181 src/gui/popupmenu.cpp:1219
 #: src/gui/windowmenu.cpp:91
 msgid "Drop"
@@ -1426,7 +1435,7 @@ msgstr ""
 msgid "Login"
 msgstr "Korisničko ime"
 
-#: src/gui/login.cpp:87 src/gui/serverdialog.cpp:221
+#: src/gui/login.cpp:87 src/gui/serverdialog.cpp:222
 #: src/gui/widgets/chattab.cpp:166
 msgid "Server:"
 msgstr "Poslužitelj:"
@@ -1854,56 +1863,60 @@ msgstr "Lozinke se ne podudaraju."
 msgid "Choose Your Server"
 msgstr "Izaberite vaš server"
 
-#: src/gui/serverdialog.cpp:222
+#: src/gui/serverdialog.cpp:223
 msgid "Port:"
 msgstr "Port:"
 
-#: src/gui/serverdialog.cpp:223
+#: src/gui/serverdialog.cpp:224
 #, fuzzy
 msgid "Server type:"
 msgstr "Poslužitelj:"
 
-#: src/gui/serverdialog.cpp:245
+#: src/gui/serverdialog.cpp:227
+msgid "Use same ip for game sub servers"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:249
 msgid "Load"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:246
+#: src/gui/serverdialog.cpp:250
 #, fuzzy
 msgid "Connect"
 msgstr "Spajanje..."
 
-#: src/gui/serverdialog.cpp:247
+#: src/gui/serverdialog.cpp:251
 #, fuzzy
 msgid "Custom Server"
 msgstr "Vlastiti kursor"
 
-#: src/gui/serverdialog.cpp:351
+#: src/gui/serverdialog.cpp:356
 msgid "Please type both the address and the port of a server."
 msgstr "Molimo upišite adresu poslužitelja i port poslužitelja."
 
-#: src/gui/serverdialog.cpp:482
+#: src/gui/serverdialog.cpp:488
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:488
+#: src/gui/serverdialog.cpp:494
 #, fuzzy
 msgid "Waiting for server..."
 msgstr "Čekanje servera"
 
-#: src/gui/serverdialog.cpp:492
+#: src/gui/serverdialog.cpp:498
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:496
+#: src/gui/serverdialog.cpp:502
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:593
+#: src/gui/serverdialog.cpp:599
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:595
+#: src/gui/serverdialog.cpp:601
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -3884,7 +3897,7 @@ msgstr[1] "Pokupili ste %s [@@%d|%s@@]."
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:3617
+#: src/localplayer.cpp:3618
 #, fuzzy
 msgid "You see "
 msgstr "Vi dobijete %s."
@@ -4052,60 +4065,60 @@ msgstr "Snaga volje:"
 msgid "Willpower %+.1f"
 msgstr "Snaga Volje %+d"
 
-#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:104
+#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:105
 msgid "You are dead."
 msgstr "Vi ste mrtvi."
 
-#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:105
+#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:106
 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:317 src/net/tmwa/playerhandler.cpp:107
+#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:108
 msgid "You are not that alive anymore."
 msgstr "Niste više tako živi."
 
-#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:108
+#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:109
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:319 src/net/tmwa/playerhandler.cpp:109
+#: src/net/manaserv/beinghandler.cpp:319 src/net/tmwa/playerhandler.cpp:110
 msgid "Game Over!"
 msgstr "Kraj Igre!"
 
-#: src/net/manaserv/beinghandler.cpp:320 src/net/tmwa/playerhandler.cpp:111
+#: src/net/manaserv/beinghandler.cpp:320 src/net/tmwa/playerhandler.cpp:112
 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:322 src/net/tmwa/playerhandler.cpp:113
+#: src/net/manaserv/beinghandler.cpp:322 src/net/tmwa/playerhandler.cpp:114
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:324 src/net/tmwa/playerhandler.cpp:115
+#: src/net/manaserv/beinghandler.cpp:324 src/net/tmwa/playerhandler.cpp:116
 msgid "I guess this did not run too well."
 msgstr "Predpostavljam da ovo nije išlo previše dobro."
 
-#: src/net/manaserv/beinghandler.cpp:325 src/net/tmwa/playerhandler.cpp:117
+#: src/net/manaserv/beinghandler.cpp:325 src/net/tmwa/playerhandler.cpp:118
 msgid "Do you want your possessions identified?"
 msgstr "Želite li svoju imovinu identificirati?"
 
-#: src/net/manaserv/beinghandler.cpp:326 src/net/tmwa/playerhandler.cpp:119
+#: src/net/manaserv/beinghandler.cpp:326 src/net/tmwa/playerhandler.cpp:120
 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:328 src/net/tmwa/playerhandler.cpp:121
+#: src/net/manaserv/beinghandler.cpp:328 src/net/tmwa/playerhandler.cpp:122
 msgid "Annihilated."
 msgstr "Uništen."
 
-#: src/net/manaserv/beinghandler.cpp:329 src/net/tmwa/playerhandler.cpp:123
+#: src/net/manaserv/beinghandler.cpp:329 src/net/tmwa/playerhandler.cpp:124
 msgid "Looks like you got your head handed to you."
 msgstr "Izgleda da su vam predali vašu glavu."
 
-#: src/net/manaserv/beinghandler.cpp:331 src/net/tmwa/playerhandler.cpp:125
+#: src/net/manaserv/beinghandler.cpp:331 src/net/tmwa/playerhandler.cpp:126
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
@@ -4172,12 +4185,12 @@ msgstr ""
 #: src/net/manaserv/charhandler.cpp:180 src/net/manaserv/loginhandler.cpp:98
 #: src/net/manaserv/loginhandler.cpp:130 src/net/manaserv/loginhandler.cpp:166
 #: src/net/manaserv/loginhandler.cpp:286 src/net/manaserv/loginhandler.cpp:323
-#: src/net/tmwa/loginhandler.cpp:99 src/net/tmwa/loginhandler.cpp:187
+#: src/net/tmwa/loginhandler.cpp:99 src/net/tmwa/loginhandler.cpp:190
 #, fuzzy
 msgid "Unknown error."
 msgstr "Nepoznata greška"
 
-#: src/net/manaserv/charhandler.cpp:209 src/net/tmwa/charserverhandler.cpp:149
+#: src/net/manaserv/charhandler.cpp:209 src/net/tmwa/charserverhandler.cpp:172
 msgid "Info"
 msgstr "Info"
 
@@ -4417,61 +4430,88 @@ msgstr "Hvala za kupnju."
 msgid "Unable to buy."
 msgstr "Ne može se kupiti"
 
-#: src/net/tmwa/buysellhandler.cpp:143
+#: src/net/tmwa/buysellhandler.cpp:145
 msgid "Thanks for selling."
 msgstr "Hvala za prodaju."
 
-#: src/net/tmwa/buysellhandler.cpp:145
+#: src/net/tmwa/buysellhandler.cpp:149
 msgid "Unable to sell."
 msgstr "Nije moguće prodati."
 
-#: src/net/tmwa/charserverhandler.cpp:106
+#: src/net/tmwa/buysellhandler.cpp:152
+#, fuzzy
+msgid "Unable to sell while trading."
+msgstr "Nije moguće prodati."
+
+#: src/net/tmwa/buysellhandler.cpp:155
+#, fuzzy
+msgid "Unable to sell unsellable item."
+msgstr "Nije moguće prodati."
+
+#: src/net/tmwa/charserverhandler.cpp:109
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:110
+#: src/net/tmwa/charserverhandler.cpp:113
 #, fuzzy
 msgid "Cannot use this ID."
 msgstr "Ne mogu koristiti ovaj ID"
 
-#: src/net/tmwa/charserverhandler.cpp:113
+#: src/net/tmwa/charserverhandler.cpp:116
 #, fuzzy
 msgid "Unknown char-server failure."
 msgstr "Nepoznata greška"
 
-#: src/net/tmwa/charserverhandler.cpp:137
+#: src/net/tmwa/charserverhandler.cpp:145
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr "Ne mogu stvoriti lik. Najvjerojatnije je ime već zauzeto."
 
-#: src/net/tmwa/charserverhandler.cpp:149
+#: src/net/tmwa/charserverhandler.cpp:149 src/net/tmwa/loginhandler.cpp:187
+#, fuzzy
+msgid "Wrong name."
+msgstr "Pogrešan magični_simbol"
+
+#: src/net/tmwa/charserverhandler.cpp:152
+msgid "Incorrect stats."
+msgstr ""
+
+#: src/net/tmwa/charserverhandler.cpp:155
+msgid "Incorrect hair."
+msgstr ""
+
+#: src/net/tmwa/charserverhandler.cpp:158
+msgid "Incorrect slot."
+msgstr ""
+
+#: src/net/tmwa/charserverhandler.cpp:172
 msgid "Character deleted."
 msgstr "Lik izbrisan."
 
-#: src/net/tmwa/charserverhandler.cpp:154
+#: src/net/tmwa/charserverhandler.cpp:177
 msgid "Failed to delete character."
 msgstr "Neuspješno brisanje znaka."
 
-#: src/net/tmwa/charserverhandler.cpp:286
+#: src/net/tmwa/charserverhandler.cpp:317
 msgid "Strength:"
 msgstr "Snaga:"
 
-#: src/net/tmwa/charserverhandler.cpp:287
+#: src/net/tmwa/charserverhandler.cpp:318
 msgid "Agility:"
 msgstr "Okretnost:"
 
-#: src/net/tmwa/charserverhandler.cpp:288
+#: src/net/tmwa/charserverhandler.cpp:319
 msgid "Vitality:"
 msgstr "Vitalnost:"
 
-#: src/net/tmwa/charserverhandler.cpp:289
+#: src/net/tmwa/charserverhandler.cpp:320
 msgid "Intelligence:"
 msgstr "Inteligencija:"
 
-#: src/net/tmwa/charserverhandler.cpp:290
+#: src/net/tmwa/charserverhandler.cpp:321
 msgid "Dexterity:"
 msgstr "Spretnost:"
 
-#: src/net/tmwa/charserverhandler.cpp:291
+#: src/net/tmwa/charserverhandler.cpp:322
 msgid "Luck:"
 msgstr "Sreća:"
 
@@ -4873,11 +4913,11 @@ msgstr ""
 msgid "Experience sharing unknown."
 msgstr ""
 
-#: src/net/tmwa/inventoryhandler.cpp:334
+#: src/net/tmwa/inventoryhandler.cpp:343
 msgid "Failed to use item."
 msgstr "Neuspješno korištenje predmeta."
 
-#: src/net/tmwa/inventoryhandler.cpp:457
+#: src/net/tmwa/inventoryhandler.cpp:472
 msgid "Unable to equip."
 msgstr "Nije moguće opremiti."
 
@@ -4993,98 +5033,98 @@ msgstr "Nepoznati član pokušava reći: %s"
 msgid "%s is not in your party!"
 msgstr "%s nije u vašoj partiji!"
 
-#: src/net/tmwa/playerhandler.cpp:110
+#: src/net/tmwa/playerhandler.cpp:111
 msgid "Insert coin to continue."
 msgstr "Ubacite žeton za nastavak."
 
-#: src/net/tmwa/playerhandler.cpp:128
+#: src/net/tmwa/playerhandler.cpp:129
 msgid "You're not dead yet. You're just resting."
 msgstr "Niste još mrtvi. Samo se odmarate."
 
-#: src/net/tmwa/playerhandler.cpp:129
+#: src/net/tmwa/playerhandler.cpp:130
 msgid "You are no more."
 msgstr "Nema vas više."
 
-#: src/net/tmwa/playerhandler.cpp:130
+#: src/net/tmwa/playerhandler.cpp:131
 msgid "You have ceased to be."
 msgstr "Prestali ste postojati."
 
-#: src/net/tmwa/playerhandler.cpp:131
+#: src/net/tmwa/playerhandler.cpp:132
 msgid "You've expired and gone to meet your maker."
 msgstr "Istekao vam je rok i otišli ste upoznati svog stvoritelja."
 
-#: src/net/tmwa/playerhandler.cpp:132
+#: src/net/tmwa/playerhandler.cpp:133
 msgid "You're a stiff."
 msgstr "Ukočili ste se."
 
-#: src/net/tmwa/playerhandler.cpp:133
+#: src/net/tmwa/playerhandler.cpp:134
 msgid "Bereft of life, you rest in peace."
 msgstr "Lišeni života, počivate u miru."
 
-#: src/net/tmwa/playerhandler.cpp:134
+#: src/net/tmwa/playerhandler.cpp:135
 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/tmwa/playerhandler.cpp:135
+#: src/net/tmwa/playerhandler.cpp:136
 msgid "Your metabolic processes are now history."
 msgstr "Vaši metabolički procesi su sad povijest."
 
-#: src/net/tmwa/playerhandler.cpp:136
+#: src/net/tmwa/playerhandler.cpp:137
 msgid "You're off the twig."
 msgstr "Pali ste s grančice."
 
-#: src/net/tmwa/playerhandler.cpp:137
+#: src/net/tmwa/playerhandler.cpp:138
 msgid "You've kicked the bucket."
 msgstr "Vi ste šutirali sić."
 
-#: src/net/tmwa/playerhandler.cpp:138
+#: src/net/tmwa/playerhandler.cpp:139
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:140
+#: src/net/tmwa/playerhandler.cpp:141
 msgid "You are an ex-player."
 msgstr "Vi ste bivši igrač."
 
-#: src/net/tmwa/playerhandler.cpp:141
+#: src/net/tmwa/playerhandler.cpp:142
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:327 src/net/tmwa/playerhandler.cpp:336
-#: src/net/tmwa/playerhandler.cpp:415
+#: src/net/tmwa/playerhandler.cpp:330 src/net/tmwa/playerhandler.cpp:339
+#: src/net/tmwa/playerhandler.cpp:418
 msgid "Message"
 msgstr "Poruka"
 
-#: src/net/tmwa/playerhandler.cpp:328
+#: src/net/tmwa/playerhandler.cpp:331
 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/tmwa/playerhandler.cpp:337
+#: src/net/tmwa/playerhandler.cpp:340
 #, fuzzy
 msgid "You are carrying less than half your weight. You are can regain health."
 msgstr ""
 "Nosite više od pola svoje težine. Niste u mogućnosti kako bi povratili "
 "zdravlje."
 
-#: src/net/tmwa/playerhandler.cpp:442
+#: src/net/tmwa/playerhandler.cpp:445
 #, fuzzy, c-format
 msgid "You picked up %s."
 msgstr "Pokupili ste "
 
-#: src/net/tmwa/playerhandler.cpp:448
+#: src/net/tmwa/playerhandler.cpp:451
 #, fuzzy, c-format
 msgid "You spent %s."
 msgstr "Vi dobijete %s."
 
-#: src/net/tmwa/playerhandler.cpp:493
+#: src/net/tmwa/playerhandler.cpp:496
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:613
+#: src/net/tmwa/playerhandler.cpp:616
 msgid "Equip arrows first."
 msgstr "Prvo se opremite strijelama."
 
@@ -5233,32 +5273,32 @@ msgstr ""
 msgid "Floating bubble"
 msgstr ""
 
-#: src/resources/beinginfo.cpp:32 src/resources/itemdb.cpp:210
+#: src/resources/beinginfo.cpp:32 src/resources/itemdb.cpp:223
 #: src/resources/monsterdb.cpp:78
 msgid "unnamed"
 msgstr "neimenovano"
 
-#: src/resources/itemdb.cpp:55
+#: src/resources/itemdb.cpp:57
 #, c-format
 msgid "Attack %+d"
 msgstr "Napad %+d"
 
-#: src/resources/itemdb.cpp:56
+#: src/resources/itemdb.cpp:58
 #, c-format
 msgid "Defense %+d"
 msgstr "Obrana %+d"
 
-#: src/resources/itemdb.cpp:57
+#: src/resources/itemdb.cpp:59
 #, c-format
 msgid "HP %+d"
 msgstr "Zdravlje %+d"
 
-#: src/resources/itemdb.cpp:58
+#: src/resources/itemdb.cpp:60
 #, c-format
 msgid "MP %+d"
 msgstr "Mana %+d"
 
-#: src/resources/itemdb.cpp:155
+#: src/resources/itemdb.cpp:152
 msgid "Unknown item"
 msgstr "Nepoznati predmet"
 
diff --git a/po/hu.po b/po/hu.po
index 117ff2fe7..ddc64a122 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2011-01-06 03:06+0200\n"
+"POT-Creation-Date: 2011-01-13 21:49+0200\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"
@@ -63,10 +63,10 @@ msgstr "Szerver"
 #: src/client.cpp:1029 src/client.cpp:1036 src/client.cpp:1171
 #: src/gui/changeemaildialog.cpp:154 src/gui/changepassworddialog.cpp:144
 #: src/gui/charcreatedialog.cpp:185 src/gui/register.cpp:225
-#: src/gui/serverdialog.cpp:350 src/gui/unregisterdialog.cpp:134
+#: src/gui/serverdialog.cpp:355 src/gui/unregisterdialog.cpp:134
 #: src/net/manaserv/charhandler.cpp:183 src/net/manaserv/charhandler.cpp:226
-#: src/net/tmwa/charserverhandler.cpp:137
-#: src/net/tmwa/charserverhandler.cpp:154
+#: src/net/tmwa/charserverhandler.cpp:161
+#: src/net/tmwa/charserverhandler.cpp:177
 msgid "Error"
 msgstr "Hiba"
 
@@ -748,7 +748,7 @@ msgid "-"
 msgstr ""
 
 #: src/gui/buy.cpp:95 src/gui/quitdialog.cpp:43 src/gui/quitdialog.cpp:48
-#: src/gui/quitdialog.cpp:49 src/gui/sell.cpp:90 src/gui/serverdialog.cpp:244
+#: src/gui/quitdialog.cpp:49 src/gui/sell.cpp:90 src/gui/serverdialog.cpp:248
 #: src/keyboardconfig.cpp:275
 msgid "Quit"
 msgstr "Kilépés"
@@ -759,7 +759,7 @@ msgid "Max"
 msgstr "Max."
 
 #: src/gui/buysell.cpp:37 src/gui/buysell.cpp:46
-#: src/gui/inventorywindow.cpp:112
+#: src/gui/inventorywindow.cpp:134
 msgid "Shop"
 msgstr "Üzlet"
 
@@ -932,7 +932,7 @@ msgstr "Regisztráció megszüntetése"
 msgid "Change Email"
 msgstr "Email cím módosírása"
 
-#: src/gui/charselectdialog.cpp:375 src/gui/serverdialog.cpp:248
+#: src/gui/charselectdialog.cpp:375 src/gui/serverdialog.cpp:252
 #: src/gui/setup_players.cpp:242 src/gui/shopwindow.cpp:117
 #: src/gui/shopwindow.cpp:120 src/gui/textcommandeditor.cpp:234
 msgid "Delete"
@@ -1180,8 +1180,8 @@ msgstr "Ok"
 msgid "Equipment"
 msgstr "Felszerelés"
 
-#: src/gui/equipmentwindow.cpp:91 src/gui/inventorywindow.cpp:96
-#: src/gui/inventorywindow.cpp:393 src/gui/inventorywindow.cpp:402
+#: src/gui/equipmentwindow.cpp:91 src/gui/inventorywindow.cpp:118
+#: src/gui/inventorywindow.cpp:443 src/gui/inventorywindow.cpp:452
 #: src/gui/popupmenu.cpp:1070 src/gui/popupmenu.cpp:1169
 #: src/gui/popupmenu.cpp:1209
 msgid "Unequip"
@@ -1191,68 +1191,77 @@ msgstr "Nem használ"
 msgid "Help"
 msgstr "Súgó"
 
-#: src/gui/help.cpp:52 src/gui/inventorywindow.cpp:135
+#: src/gui/help.cpp:52 src/gui/inventorywindow.cpp:163
 #: src/gui/npcdialog.cpp:48 src/gui/shopwindow.cpp:108
 msgid "Close"
 msgstr "Bezár"
 
-#: src/gui/inventorywindow.cpp:62 src/gui/windowmenu.cpp:72
+#: src/gui/inventorywindow.cpp:65 src/gui/windowmenu.cpp:72
 msgid "Inventory"
 msgstr "Táska"
 
-#: src/gui/inventorywindow.cpp:62
+#: src/gui/inventorywindow.cpp:65
 msgid "Storage"
 msgstr "Raktár"
 
-#: src/gui/inventorywindow.cpp:89
+#: src/gui/inventorywindow.cpp:92
 msgid "Slots:"
 msgstr "Hely:"
 
-#: src/gui/inventorywindow.cpp:94 src/gui/inventorywindow.cpp:395
-#: src/gui/inventorywindow.cpp:404 src/gui/popupmenu.cpp:1072
+#: src/gui/inventorywindow.cpp:103
+msgid "Filter:"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:104
+#, fuzzy
+msgid "Sort:"
+msgstr "Port:"
+
+#: src/gui/inventorywindow.cpp:116 src/gui/inventorywindow.cpp:445
+#: src/gui/inventorywindow.cpp:454 src/gui/popupmenu.cpp:1072
 #: src/gui/popupmenu.cpp:1171 src/gui/popupmenu.cpp:1211
 msgid "Equip"
 msgstr "Használ"
 
-#: src/gui/inventorywindow.cpp:95 src/gui/inventorywindow.cpp:396
-#: src/gui/inventorywindow.cpp:400 src/gui/popupmenu.cpp:1075
+#: src/gui/inventorywindow.cpp:117 src/gui/inventorywindow.cpp:446
+#: src/gui/inventorywindow.cpp:450 src/gui/popupmenu.cpp:1075
 #: src/gui/popupmenu.cpp:1144 src/gui/popupmenu.cpp:1175
 #: src/gui/popupmenu.cpp:1214
 msgid "Use"
 msgstr "Bevet"
 
-#: src/gui/inventorywindow.cpp:109 src/gui/inventorywindow.cpp:499
+#: src/gui/inventorywindow.cpp:131 src/gui/inventorywindow.cpp:549
 #: src/gui/popupmenu.cpp:1078 src/gui/popupmenu.cpp:1179
 #: src/gui/popupmenu.cpp:1217
 #, fuzzy
 msgid "Drop..."
 msgstr "Eldob"
 
-#: src/gui/inventorywindow.cpp:110 src/gui/popupmenu.cpp:1083
+#: src/gui/inventorywindow.cpp:132 src/gui/popupmenu.cpp:1083
 #: src/gui/popupmenu.cpp:1184 src/gui/popupmenu.cpp:1222
 msgid "Split"
 msgstr "Felosztás"
 
-#: src/gui/inventorywindow.cpp:111 src/gui/outfitwindow.cpp:56
+#: src/gui/inventorywindow.cpp:133 src/gui/outfitwindow.cpp:56
 #: src/gui/popupmenu.cpp:409
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:114
+#: src/gui/inventorywindow.cpp:136
 msgid "Weight:"
 msgstr "Súly:"
 
-#: src/gui/inventorywindow.cpp:133 src/gui/inventorywindow.cpp:490
+#: src/gui/inventorywindow.cpp:161 src/gui/inventorywindow.cpp:540
 #: src/gui/popupmenu.cpp:1087 src/gui/popupmenu.cpp:1187
 #: src/gui/popupmenu.cpp:1225 src/gui/setup.cpp:65
 msgid "Store"
 msgstr "Raktároz"
 
-#: src/gui/inventorywindow.cpp:134 src/gui/popupmenu.cpp:1106
+#: src/gui/inventorywindow.cpp:162 src/gui/popupmenu.cpp:1106
 msgid "Retrieve"
 msgstr "Magához vesz"
 
-#: src/gui/inventorywindow.cpp:501 src/gui/popupmenu.cpp:1080
+#: src/gui/inventorywindow.cpp:551 src/gui/popupmenu.cpp:1080
 #: src/gui/popupmenu.cpp:1181 src/gui/popupmenu.cpp:1219
 #: src/gui/windowmenu.cpp:91
 msgid "Drop"
@@ -1441,7 +1450,7 @@ msgstr ""
 msgid "Login"
 msgstr "Belépés"
 
-#: src/gui/login.cpp:87 src/gui/serverdialog.cpp:221
+#: src/gui/login.cpp:87 src/gui/serverdialog.cpp:222
 #: src/gui/widgets/chattab.cpp:166
 msgid "Server:"
 msgstr "Szerver:"
@@ -1869,56 +1878,60 @@ msgstr "A jelszavak nem egyeznek."
 msgid "Choose Your Server"
 msgstr "Válassz szervert"
 
-#: src/gui/serverdialog.cpp:222
+#: src/gui/serverdialog.cpp:223
 msgid "Port:"
 msgstr "Port:"
 
-#: src/gui/serverdialog.cpp:223
+#: src/gui/serverdialog.cpp:224
 #, fuzzy
 msgid "Server type:"
 msgstr "Szerver:"
 
-#: src/gui/serverdialog.cpp:245
+#: src/gui/serverdialog.cpp:227
+msgid "Use same ip for game sub servers"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:249
 msgid "Load"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:246
+#: src/gui/serverdialog.cpp:250
 #, fuzzy
 msgid "Connect"
 msgstr "Csatlakozás…"
 
-#: src/gui/serverdialog.cpp:247
+#: src/gui/serverdialog.cpp:251
 #, fuzzy
 msgid "Custom Server"
 msgstr "Egyéni kurzor"
 
-#: src/gui/serverdialog.cpp:351
+#: src/gui/serverdialog.cpp:356
 msgid "Please type both the address and the port of a server."
 msgstr "Kérlek írd be a szerver címét és portját egyaránt."
 
-#: src/gui/serverdialog.cpp:482
+#: src/gui/serverdialog.cpp:488
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:488
+#: src/gui/serverdialog.cpp:494
 #, fuzzy
 msgid "Waiting for server..."
 msgstr "Várakozás a szerverre"
 
-#: src/gui/serverdialog.cpp:492
+#: src/gui/serverdialog.cpp:498
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:496
+#: src/gui/serverdialog.cpp:502
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:593
+#: src/gui/serverdialog.cpp:599
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:595
+#: src/gui/serverdialog.cpp:601
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -3905,7 +3918,7 @@ msgstr[1] "Zsákmányod%s [@@%d|%s@@]."
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:3617
+#: src/localplayer.cpp:3618
 #, fuzzy
 msgid "You see "
 msgstr "Kapott tárgy: %s."
@@ -4074,27 +4087,27 @@ msgstr "Akaraterő:"
 msgid "Willpower %+.1f"
 msgstr "Akaraterő: %+d"
 
-#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:104
+#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:105
 msgid "You are dead."
 msgstr "Meghaltál."
 
-#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:105
+#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:106
 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:317 src/net/tmwa/playerhandler.cpp:107
+#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:108
 msgid "You are not that alive anymore."
 msgstr "Nem vagy már az élők sorában."
 
-#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:108
+#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:109
 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:319 src/net/tmwa/playerhandler.cpp:109
+#: src/net/manaserv/beinghandler.cpp:319 src/net/tmwa/playerhandler.cpp:110
 msgid "Game Over!"
 msgstr "Vége a játéknak!"
 
-#: src/net/manaserv/beinghandler.cpp:320 src/net/tmwa/playerhandler.cpp:111
+#: src/net/manaserv/beinghandler.cpp:320 src/net/tmwa/playerhandler.cpp:112
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
@@ -4102,7 +4115,7 @@ msgstr ""
 "Nem, gyerekek. A karakter nem meghalt, ..ööö... hanem egy szebb világba "
 "került."
 
-#: src/net/manaserv/beinghandler.cpp:322 src/net/tmwa/playerhandler.cpp:113
+#: src/net/manaserv/beinghandler.cpp:322 src/net/tmwa/playerhandler.cpp:114
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
@@ -4110,27 +4123,27 @@ msgstr ""
 "A tervet, amiben a torkoddal támadsz az ellenség kardjába sikertelennek "
 "bizonyult."
 
-#: src/net/manaserv/beinghandler.cpp:324 src/net/tmwa/playerhandler.cpp:115
+#: src/net/manaserv/beinghandler.cpp:324 src/net/tmwa/playerhandler.cpp:116
 msgid "I guess this did not run too well."
 msgstr "Úgy látszik nem futottál túl gyorsan."
 
-#: src/net/manaserv/beinghandler.cpp:325 src/net/tmwa/playerhandler.cpp:117
+#: src/net/manaserv/beinghandler.cpp:325 src/net/tmwa/playerhandler.cpp:118
 msgid "Do you want your possessions identified?"
 msgstr "Meg akarod bánni a bűneid?"
 
-#: src/net/manaserv/beinghandler.cpp:326 src/net/tmwa/playerhandler.cpp:119
+#: src/net/manaserv/beinghandler.cpp:326 src/net/tmwa/playerhandler.cpp:120
 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:328 src/net/tmwa/playerhandler.cpp:121
+#: src/net/manaserv/beinghandler.cpp:328 src/net/tmwa/playerhandler.cpp:122
 msgid "Annihilated."
 msgstr "Megöltek."
 
-#: src/net/manaserv/beinghandler.cpp:329 src/net/tmwa/playerhandler.cpp:123
+#: src/net/manaserv/beinghandler.cpp:329 src/net/tmwa/playerhandler.cpp:124
 msgid "Looks like you got your head handed to you."
 msgstr "Kezedbe adták a fejed."
 
-#: src/net/manaserv/beinghandler.cpp:331 src/net/tmwa/playerhandler.cpp:125
+#: src/net/manaserv/beinghandler.cpp:331 src/net/tmwa/playerhandler.cpp:126
 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."
@@ -4197,12 +4210,12 @@ msgstr ""
 #: src/net/manaserv/charhandler.cpp:180 src/net/manaserv/loginhandler.cpp:98
 #: src/net/manaserv/loginhandler.cpp:130 src/net/manaserv/loginhandler.cpp:166
 #: src/net/manaserv/loginhandler.cpp:286 src/net/manaserv/loginhandler.cpp:323
-#: src/net/tmwa/loginhandler.cpp:99 src/net/tmwa/loginhandler.cpp:187
+#: src/net/tmwa/loginhandler.cpp:99 src/net/tmwa/loginhandler.cpp:190
 #, fuzzy
 msgid "Unknown error."
 msgstr "Ismeretlen hiba"
 
-#: src/net/manaserv/charhandler.cpp:209 src/net/tmwa/charserverhandler.cpp:149
+#: src/net/manaserv/charhandler.cpp:209 src/net/tmwa/charserverhandler.cpp:172
 msgid "Info"
 msgstr "Infó"
 
@@ -4442,61 +4455,88 @@ msgstr "Öröm volt veled üzletet kötni!"
 msgid "Unable to buy."
 msgstr "Nem tudod megvenni."
 
-#: src/net/tmwa/buysellhandler.cpp:143
+#: src/net/tmwa/buysellhandler.cpp:145
 msgid "Thanks for selling."
 msgstr "Öröm volt veled üzletet kötni!"
 
-#: src/net/tmwa/buysellhandler.cpp:145
+#: src/net/tmwa/buysellhandler.cpp:149
 msgid "Unable to sell."
 msgstr "Nem tudod eladni."
 
-#: src/net/tmwa/charserverhandler.cpp:106
+#: src/net/tmwa/buysellhandler.cpp:152
+#, fuzzy
+msgid "Unable to sell while trading."
+msgstr "Nem tudod eladni."
+
+#: src/net/tmwa/buysellhandler.cpp:155
+#, fuzzy
+msgid "Unable to sell unsellable item."
+msgstr "Nem tudod felvenni a tárgyat."
+
+#: src/net/tmwa/charserverhandler.cpp:109
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:110
+#: src/net/tmwa/charserverhandler.cpp:113
 #, fuzzy
 msgid "Cannot use this ID."
 msgstr "Nem használhatod ez a nevet."
 
-#: src/net/tmwa/charserverhandler.cpp:113
+#: src/net/tmwa/charserverhandler.cpp:116
 #, fuzzy
 msgid "Unknown char-server failure."
 msgstr "Ismeretlen hiba"
 
-#: src/net/tmwa/charserverhandler.cpp:137
+#: src/net/tmwa/charserverhandler.cpp:145
 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/tmwa/charserverhandler.cpp:149
+#: src/net/tmwa/charserverhandler.cpp:149 src/net/tmwa/loginhandler.cpp:187
+#, fuzzy
+msgid "Wrong name."
+msgstr "Helytelen magic_token"
+
+#: src/net/tmwa/charserverhandler.cpp:152
+msgid "Incorrect stats."
+msgstr ""
+
+#: src/net/tmwa/charserverhandler.cpp:155
+msgid "Incorrect hair."
+msgstr ""
+
+#: src/net/tmwa/charserverhandler.cpp:158
+msgid "Incorrect slot."
+msgstr ""
+
+#: src/net/tmwa/charserverhandler.cpp:172
 msgid "Character deleted."
 msgstr "Karakter törölve."
 
-#: src/net/tmwa/charserverhandler.cpp:154
+#: src/net/tmwa/charserverhandler.cpp:177
 msgid "Failed to delete character."
 msgstr "Karakter törlése sikertelen."
 
-#: src/net/tmwa/charserverhandler.cpp:286
+#: src/net/tmwa/charserverhandler.cpp:317
 msgid "Strength:"
 msgstr "Erő:"
 
-#: src/net/tmwa/charserverhandler.cpp:287
+#: src/net/tmwa/charserverhandler.cpp:318
 msgid "Agility:"
 msgstr "Mozgékonyság:"
 
-#: src/net/tmwa/charserverhandler.cpp:288
+#: src/net/tmwa/charserverhandler.cpp:319
 msgid "Vitality:"
 msgstr "Egészség:"
 
-#: src/net/tmwa/charserverhandler.cpp:289
+#: src/net/tmwa/charserverhandler.cpp:320
 msgid "Intelligence:"
 msgstr "Intelligencia:"
 
-#: src/net/tmwa/charserverhandler.cpp:290
+#: src/net/tmwa/charserverhandler.cpp:321
 msgid "Dexterity:"
 msgstr "Ügyesség:"
 
-#: src/net/tmwa/charserverhandler.cpp:291
+#: src/net/tmwa/charserverhandler.cpp:322
 msgid "Luck:"
 msgstr "Szerencse:"
 
@@ -4904,11 +4944,11 @@ msgstr "A tapasztalat megosztás nem lehetséges."
 msgid "Experience sharing unknown."
 msgstr "Tapasztalat megosztás engedélyezve."
 
-#: src/net/tmwa/inventoryhandler.cpp:334
+#: src/net/tmwa/inventoryhandler.cpp:343
 msgid "Failed to use item."
 msgstr "Nem tudod bevetni a tárgyat."
 
-#: src/net/tmwa/inventoryhandler.cpp:457
+#: src/net/tmwa/inventoryhandler.cpp:472
 msgid "Unable to equip."
 msgstr "Nem tudod használni."
 
@@ -5029,94 +5069,94 @@ msgstr "Egy ismeretlen csapattárs mondja: %s"
 msgid "%s is not in your party!"
 msgstr "%s nincs a csapatodban!"
 
-#: src/net/tmwa/playerhandler.cpp:110
+#: src/net/tmwa/playerhandler.cpp:111
 msgid "Insert coin to continue."
 msgstr "Dobj be egy érmét a folytatáshoz."
 
-#: src/net/tmwa/playerhandler.cpp:128
+#: src/net/tmwa/playerhandler.cpp:129
 msgid "You're not dead yet. You're just resting."
 msgstr "Nem haltál meg...csak alszol..."
 
-#: src/net/tmwa/playerhandler.cpp:129
+#: src/net/tmwa/playerhandler.cpp:130
 msgid "You are no more."
 msgstr "Nem létezel többé."
 
-#: src/net/tmwa/playerhandler.cpp:130
+#: src/net/tmwa/playerhandler.cpp:131
 msgid "You have ceased to be."
 msgstr "Megszüntél létezni."
 
-#: src/net/tmwa/playerhandler.cpp:131
+#: src/net/tmwa/playerhandler.cpp:132
 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/tmwa/playerhandler.cpp:132
+#: src/net/tmwa/playerhandler.cpp:133
 msgid "You're a stiff."
 msgstr "Hulla vagy."
 
-#: src/net/tmwa/playerhandler.cpp:133
+#: src/net/tmwa/playerhandler.cpp:134
 msgid "Bereft of life, you rest in peace."
 msgstr "Megfosztottak az életedtől. Nyugodj békében."
 
-#: src/net/tmwa/playerhandler.cpp:134
+#: src/net/tmwa/playerhandler.cpp:135
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr "Szép vagy mikor alszol..."
 
-#: src/net/tmwa/playerhandler.cpp:135
+#: src/net/tmwa/playerhandler.cpp:136
 msgid "Your metabolic processes are now history."
 msgstr "Történelem vagy."
 
-#: src/net/tmwa/playerhandler.cpp:136
+#: src/net/tmwa/playerhandler.cpp:137
 msgid "You're off the twig."
 msgstr "Elég gallyul nézel ki."
 
-#: src/net/tmwa/playerhandler.cpp:137
+#: src/net/tmwa/playerhandler.cpp:138
 msgid "You've kicked the bucket."
 msgstr "Feldobtad a talpad."
 
-#: src/net/tmwa/playerhandler.cpp:138
+#: src/net/tmwa/playerhandler.cpp:139
 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/tmwa/playerhandler.cpp:140
+#: src/net/tmwa/playerhandler.cpp:141
 msgid "You are an ex-player."
 msgstr "Ex-játékos lettél."
 
-#: src/net/tmwa/playerhandler.cpp:141
+#: src/net/tmwa/playerhandler.cpp:142
 msgid "You're pining for the fjords."
 msgstr "Az örök búzamezőkön kaszálgatsz."
 
-#: src/net/tmwa/playerhandler.cpp:327 src/net/tmwa/playerhandler.cpp:336
-#: src/net/tmwa/playerhandler.cpp:415
+#: src/net/tmwa/playerhandler.cpp:330 src/net/tmwa/playerhandler.cpp:339
+#: src/net/tmwa/playerhandler.cpp:418
 msgid "Message"
 msgstr "Üzenet"
 
-#: src/net/tmwa/playerhandler.cpp:328
+#: src/net/tmwa/playerhandler.cpp:331
 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/tmwa/playerhandler.cpp:337
+#: src/net/tmwa/playerhandler.cpp:340
 #, fuzzy
 msgid "You are carrying less than half your weight. You are can regain health."
 msgstr "Több tárgy van nálad mint a súlyod fele. Nem töltődik az életed."
 
-#: src/net/tmwa/playerhandler.cpp:442
+#: src/net/tmwa/playerhandler.cpp:445
 #, fuzzy, c-format
 msgid "You picked up %s."
 msgstr "Zsákmányod "
 
-#: src/net/tmwa/playerhandler.cpp:448
+#: src/net/tmwa/playerhandler.cpp:451
 #, fuzzy, c-format
 msgid "You spent %s."
 msgstr "Kapott tárgy: %s."
 
-#: src/net/tmwa/playerhandler.cpp:493
+#: src/net/tmwa/playerhandler.cpp:496
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:613
+#: src/net/tmwa/playerhandler.cpp:616
 msgid "Equip arrows first."
 msgstr "Előbb tegyél be nyílvesszőt."
 
@@ -5266,32 +5306,32 @@ msgstr ""
 msgid "Floating bubble"
 msgstr ""
 
-#: src/resources/beinginfo.cpp:32 src/resources/itemdb.cpp:210
+#: src/resources/beinginfo.cpp:32 src/resources/itemdb.cpp:223
 #: src/resources/monsterdb.cpp:78
 msgid "unnamed"
 msgstr "Névtelen"
 
-#: src/resources/itemdb.cpp:55
+#: src/resources/itemdb.cpp:57
 #, c-format
 msgid "Attack %+d"
 msgstr "Támadás %+d"
 
-#: src/resources/itemdb.cpp:56
+#: src/resources/itemdb.cpp:58
 #, c-format
 msgid "Defense %+d"
 msgstr "Védelem %+d"
 
-#: src/resources/itemdb.cpp:57
+#: src/resources/itemdb.cpp:59
 #, c-format
 msgid "HP %+d"
 msgstr "Élet: %+d"
 
-#: src/resources/itemdb.cpp:58
+#: src/resources/itemdb.cpp:60
 #, c-format
 msgid "MP %+d"
 msgstr "Varázserő %+d"
 
-#: src/resources/itemdb.cpp:155
+#: src/resources/itemdb.cpp:152
 msgid "Unknown item"
 msgstr "Ismeretlen tárgy"
 
diff --git a/po/it.po b/po/it.po
index 648d2d914..5cac2e939 100644
--- a/po/it.po
+++ b/po/it.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Mana World 0.1.0\n"
 "Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2011-01-06 03:06+0200\n"
+"POT-Creation-Date: 2011-01-13 21:49+0200\n"
 "PO-Revision-Date: 2010-02-18 14:01+0000\n"
 "Last-Translator: Gabriel Rota <gabriel.rota@gmail.com>\n"
 "Language-Team: Italian\n"
@@ -65,10 +65,10 @@ msgstr "Server"
 #: src/client.cpp:1029 src/client.cpp:1036 src/client.cpp:1171
 #: src/gui/changeemaildialog.cpp:154 src/gui/changepassworddialog.cpp:144
 #: src/gui/charcreatedialog.cpp:185 src/gui/register.cpp:225
-#: src/gui/serverdialog.cpp:350 src/gui/unregisterdialog.cpp:134
+#: src/gui/serverdialog.cpp:355 src/gui/unregisterdialog.cpp:134
 #: src/net/manaserv/charhandler.cpp:183 src/net/manaserv/charhandler.cpp:226
-#: src/net/tmwa/charserverhandler.cpp:137
-#: src/net/tmwa/charserverhandler.cpp:154
+#: src/net/tmwa/charserverhandler.cpp:161
+#: src/net/tmwa/charserverhandler.cpp:177
 msgid "Error"
 msgstr "Errore"
 
@@ -745,7 +745,7 @@ msgid "-"
 msgstr ""
 
 #: src/gui/buy.cpp:95 src/gui/quitdialog.cpp:43 src/gui/quitdialog.cpp:48
-#: src/gui/quitdialog.cpp:49 src/gui/sell.cpp:90 src/gui/serverdialog.cpp:244
+#: src/gui/quitdialog.cpp:49 src/gui/sell.cpp:90 src/gui/serverdialog.cpp:248
 #: src/keyboardconfig.cpp:275
 msgid "Quit"
 msgstr "Esci"
@@ -756,7 +756,7 @@ msgid "Max"
 msgstr "Massimo"
 
 #: src/gui/buysell.cpp:37 src/gui/buysell.cpp:46
-#: src/gui/inventorywindow.cpp:112
+#: src/gui/inventorywindow.cpp:134
 msgid "Shop"
 msgstr "Negozio"
 
@@ -929,7 +929,7 @@ msgstr "Cancella registrazione"
 msgid "Change Email"
 msgstr "Cambia l'indirizzo Email"
 
-#: src/gui/charselectdialog.cpp:375 src/gui/serverdialog.cpp:248
+#: src/gui/charselectdialog.cpp:375 src/gui/serverdialog.cpp:252
 #: src/gui/setup_players.cpp:242 src/gui/shopwindow.cpp:117
 #: src/gui/shopwindow.cpp:120 src/gui/textcommandeditor.cpp:234
 msgid "Delete"
@@ -1177,8 +1177,8 @@ msgstr "OK"
 msgid "Equipment"
 msgstr "Equipaggiamento"
 
-#: src/gui/equipmentwindow.cpp:91 src/gui/inventorywindow.cpp:96
-#: src/gui/inventorywindow.cpp:393 src/gui/inventorywindow.cpp:402
+#: src/gui/equipmentwindow.cpp:91 src/gui/inventorywindow.cpp:118
+#: src/gui/inventorywindow.cpp:443 src/gui/inventorywindow.cpp:452
 #: src/gui/popupmenu.cpp:1070 src/gui/popupmenu.cpp:1169
 #: src/gui/popupmenu.cpp:1209
 msgid "Unequip"
@@ -1188,68 +1188,77 @@ msgstr "Rimuovi"
 msgid "Help"
 msgstr "Aiuto"
 
-#: src/gui/help.cpp:52 src/gui/inventorywindow.cpp:135
+#: src/gui/help.cpp:52 src/gui/inventorywindow.cpp:163
 #: src/gui/npcdialog.cpp:48 src/gui/shopwindow.cpp:108
 msgid "Close"
 msgstr "Chiudi"
 
-#: src/gui/inventorywindow.cpp:62 src/gui/windowmenu.cpp:72
+#: src/gui/inventorywindow.cpp:65 src/gui/windowmenu.cpp:72
 msgid "Inventory"
 msgstr "Inventario"
 
-#: src/gui/inventorywindow.cpp:62
+#: src/gui/inventorywindow.cpp:65
 msgid "Storage"
 msgstr "Storage"
 
-#: src/gui/inventorywindow.cpp:89
+#: src/gui/inventorywindow.cpp:92
 msgid "Slots:"
 msgstr "Slot:"
 
-#: src/gui/inventorywindow.cpp:94 src/gui/inventorywindow.cpp:395
-#: src/gui/inventorywindow.cpp:404 src/gui/popupmenu.cpp:1072
+#: src/gui/inventorywindow.cpp:103
+msgid "Filter:"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:104
+#, fuzzy
+msgid "Sort:"
+msgstr "Porta:"
+
+#: src/gui/inventorywindow.cpp:116 src/gui/inventorywindow.cpp:445
+#: src/gui/inventorywindow.cpp:454 src/gui/popupmenu.cpp:1072
 #: src/gui/popupmenu.cpp:1171 src/gui/popupmenu.cpp:1211
 msgid "Equip"
 msgstr "Equipaggia"
 
-#: src/gui/inventorywindow.cpp:95 src/gui/inventorywindow.cpp:396
-#: src/gui/inventorywindow.cpp:400 src/gui/popupmenu.cpp:1075
+#: src/gui/inventorywindow.cpp:117 src/gui/inventorywindow.cpp:446
+#: src/gui/inventorywindow.cpp:450 src/gui/popupmenu.cpp:1075
 #: src/gui/popupmenu.cpp:1144 src/gui/popupmenu.cpp:1175
 #: src/gui/popupmenu.cpp:1214
 msgid "Use"
 msgstr "Usa"
 
-#: src/gui/inventorywindow.cpp:109 src/gui/inventorywindow.cpp:499
+#: src/gui/inventorywindow.cpp:131 src/gui/inventorywindow.cpp:549
 #: src/gui/popupmenu.cpp:1078 src/gui/popupmenu.cpp:1179
 #: src/gui/popupmenu.cpp:1217
 #, fuzzy
 msgid "Drop..."
 msgstr "Lascia"
 
-#: src/gui/inventorywindow.cpp:110 src/gui/popupmenu.cpp:1083
+#: src/gui/inventorywindow.cpp:132 src/gui/popupmenu.cpp:1083
 #: src/gui/popupmenu.cpp:1184 src/gui/popupmenu.cpp:1222
 msgid "Split"
 msgstr "Dividi"
 
-#: src/gui/inventorywindow.cpp:111 src/gui/outfitwindow.cpp:56
+#: src/gui/inventorywindow.cpp:133 src/gui/outfitwindow.cpp:56
 #: src/gui/popupmenu.cpp:409
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:114
+#: src/gui/inventorywindow.cpp:136
 msgid "Weight:"
 msgstr "Peso:"
 
-#: src/gui/inventorywindow.cpp:133 src/gui/inventorywindow.cpp:490
+#: src/gui/inventorywindow.cpp:161 src/gui/inventorywindow.cpp:540
 #: src/gui/popupmenu.cpp:1087 src/gui/popupmenu.cpp:1187
 #: src/gui/popupmenu.cpp:1225 src/gui/setup.cpp:65
 msgid "Store"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:134 src/gui/popupmenu.cpp:1106
+#: src/gui/inventorywindow.cpp:162 src/gui/popupmenu.cpp:1106
 msgid "Retrieve"
 msgstr "Recupera"
 
-#: src/gui/inventorywindow.cpp:501 src/gui/popupmenu.cpp:1080
+#: src/gui/inventorywindow.cpp:551 src/gui/popupmenu.cpp:1080
 #: src/gui/popupmenu.cpp:1181 src/gui/popupmenu.cpp:1219
 #: src/gui/windowmenu.cpp:91
 msgid "Drop"
@@ -1438,7 +1447,7 @@ msgstr ""
 msgid "Login"
 msgstr "Autenticazione"
 
-#: src/gui/login.cpp:87 src/gui/serverdialog.cpp:221
+#: src/gui/login.cpp:87 src/gui/serverdialog.cpp:222
 #: src/gui/widgets/chattab.cpp:166
 msgid "Server:"
 msgstr "Server:"
@@ -1864,56 +1873,60 @@ msgstr "Le password non corrispondono."
 msgid "Choose Your Server"
 msgstr "Scegliere il proprio server"
 
-#: src/gui/serverdialog.cpp:222
+#: src/gui/serverdialog.cpp:223
 msgid "Port:"
 msgstr "Porta:"
 
-#: src/gui/serverdialog.cpp:223
+#: src/gui/serverdialog.cpp:224
 #, fuzzy
 msgid "Server type:"
 msgstr "Server:"
 
-#: src/gui/serverdialog.cpp:245
+#: src/gui/serverdialog.cpp:227
+msgid "Use same ip for game sub servers"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:249
 msgid "Load"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:246
+#: src/gui/serverdialog.cpp:250
 #, fuzzy
 msgid "Connect"
 msgstr "Connessione..."
 
-#: src/gui/serverdialog.cpp:247
+#: src/gui/serverdialog.cpp:251
 #, fuzzy
 msgid "Custom Server"
 msgstr "Cursore personalizzato"
 
-#: src/gui/serverdialog.cpp:351
+#: src/gui/serverdialog.cpp:356
 msgid "Please type both the address and the port of a server."
 msgstr "Per favore inserisci l'indirizzo e la porta del server."
 
-#: src/gui/serverdialog.cpp:482
+#: src/gui/serverdialog.cpp:488
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:488
+#: src/gui/serverdialog.cpp:494
 #, fuzzy
 msgid "Waiting for server..."
 msgstr "In attesa del server"
 
-#: src/gui/serverdialog.cpp:492
+#: src/gui/serverdialog.cpp:498
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:496
+#: src/gui/serverdialog.cpp:502
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:593
+#: src/gui/serverdialog.cpp:599
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:595
+#: src/gui/serverdialog.cpp:601
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -3900,7 +3913,7 @@ msgstr[1] "Hai raccolto %s [@@%d|%s@@]."
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:3617
+#: src/localplayer.cpp:3618
 #, fuzzy
 msgid "You see "
 msgstr "Hai ottenuto %s"
@@ -4068,28 +4081,28 @@ msgstr "Volontà:"
 msgid "Willpower %+.1f"
 msgstr "Volontà:"
 
-#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:104
+#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:105
 msgid "You are dead."
 msgstr "Sei morto."
 
-#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:105
+#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:106
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 "Ci dispiace informarti che il tuo personaggio è stato ucciso in battaglia."
 
-#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:107
+#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:108
 msgid "You are not that alive anymore."
 msgstr "Non sei più così vivo."
 
-#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:108
+#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:109
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr "Le fredde mani della morte stanno afferrando la tua anima."
 
-#: src/net/manaserv/beinghandler.cpp:319 src/net/tmwa/playerhandler.cpp:109
+#: src/net/manaserv/beinghandler.cpp:319 src/net/tmwa/playerhandler.cpp:110
 msgid "Game Over!"
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:320 src/net/tmwa/playerhandler.cpp:111
+#: src/net/manaserv/beinghandler.cpp:320 src/net/tmwa/playerhandler.cpp:112
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
@@ -4097,7 +4110,7 @@ msgstr ""
 "No, figliolo. Il tuo personaggio non è veramente morto. È... ehm... andato "
 "in un posto migliore."
 
-#: src/net/manaserv/beinghandler.cpp:322 src/net/tmwa/playerhandler.cpp:113
+#: src/net/manaserv/beinghandler.cpp:322 src/net/tmwa/playerhandler.cpp:114
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
@@ -4105,27 +4118,27 @@ msgstr ""
 "Il tuo piano di spezzare le armi dei tuoi nemici colpendole con la tua gola "
 "ha fallito."
 
-#: src/net/manaserv/beinghandler.cpp:324 src/net/tmwa/playerhandler.cpp:115
+#: src/net/manaserv/beinghandler.cpp:324 src/net/tmwa/playerhandler.cpp:116
 msgid "I guess this did not run too well."
 msgstr "Suppongo non sia andata troppo bene."
 
-#: src/net/manaserv/beinghandler.cpp:325 src/net/tmwa/playerhandler.cpp:117
+#: src/net/manaserv/beinghandler.cpp:325 src/net/tmwa/playerhandler.cpp:118
 msgid "Do you want your possessions identified?"
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:326 src/net/tmwa/playerhandler.cpp:119
+#: src/net/manaserv/beinghandler.cpp:326 src/net/tmwa/playerhandler.cpp:120
 msgid "Sadly, no trace of you was ever found..."
 msgstr "Tristemente, nessuna traccia di te è stata mai trovata..."
 
-#: src/net/manaserv/beinghandler.cpp:328 src/net/tmwa/playerhandler.cpp:121
+#: src/net/manaserv/beinghandler.cpp:328 src/net/tmwa/playerhandler.cpp:122
 msgid "Annihilated."
 msgstr "Annichilito."
 
-#: src/net/manaserv/beinghandler.cpp:329 src/net/tmwa/playerhandler.cpp:123
+#: src/net/manaserv/beinghandler.cpp:329 src/net/tmwa/playerhandler.cpp:124
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:331 src/net/tmwa/playerhandler.cpp:125
+#: src/net/manaserv/beinghandler.cpp:331 src/net/tmwa/playerhandler.cpp:126
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
@@ -4190,12 +4203,12 @@ msgstr ""
 #: src/net/manaserv/charhandler.cpp:180 src/net/manaserv/loginhandler.cpp:98
 #: src/net/manaserv/loginhandler.cpp:130 src/net/manaserv/loginhandler.cpp:166
 #: src/net/manaserv/loginhandler.cpp:286 src/net/manaserv/loginhandler.cpp:323
-#: src/net/tmwa/loginhandler.cpp:99 src/net/tmwa/loginhandler.cpp:187
+#: src/net/tmwa/loginhandler.cpp:99 src/net/tmwa/loginhandler.cpp:190
 #, fuzzy
 msgid "Unknown error."
 msgstr "Errore sconosciuto"
 
-#: src/net/manaserv/charhandler.cpp:209 src/net/tmwa/charserverhandler.cpp:149
+#: src/net/manaserv/charhandler.cpp:209 src/net/tmwa/charserverhandler.cpp:172
 msgid "Info"
 msgstr "Informazioni"
 
@@ -4434,63 +4447,90 @@ msgstr "Grazie per l'acquisto."
 msgid "Unable to buy."
 msgstr "Impossibile acquistare."
 
-#: src/net/tmwa/buysellhandler.cpp:143
+#: src/net/tmwa/buysellhandler.cpp:145
 msgid "Thanks for selling."
 msgstr "Grazie per la vendita."
 
-#: src/net/tmwa/buysellhandler.cpp:145
+#: src/net/tmwa/buysellhandler.cpp:149
 msgid "Unable to sell."
 msgstr "Impossibile vendere."
 
-#: src/net/tmwa/charserverhandler.cpp:106
+#: src/net/tmwa/buysellhandler.cpp:152
+#, fuzzy
+msgid "Unable to sell while trading."
+msgstr "Impossibile vendere."
+
+#: src/net/tmwa/buysellhandler.cpp:155
+#, fuzzy
+msgid "Unable to sell unsellable item."
+msgstr "Impossibile raccogliere l'oggetto."
+
+#: src/net/tmwa/charserverhandler.cpp:109
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:110
+#: src/net/tmwa/charserverhandler.cpp:113
 #, fuzzy
 msgid "Cannot use this ID."
 msgstr "Impossibile usare questo ID"
 
-#: src/net/tmwa/charserverhandler.cpp:113
+#: src/net/tmwa/charserverhandler.cpp:116
 #, fuzzy
 msgid "Unknown char-server failure."
 msgstr "Errore sconosciuto"
 
-#: src/net/tmwa/charserverhandler.cpp:137
+#: src/net/tmwa/charserverhandler.cpp:145
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 "Creazione del personaggio fallita. E' molto probabile che il nome sia già "
 "stato preso."
 
-#: src/net/tmwa/charserverhandler.cpp:149
+#: src/net/tmwa/charserverhandler.cpp:149 src/net/tmwa/loginhandler.cpp:187
+#, fuzzy
+msgid "Wrong name."
+msgstr "Password errata"
+
+#: src/net/tmwa/charserverhandler.cpp:152
+msgid "Incorrect stats."
+msgstr ""
+
+#: src/net/tmwa/charserverhandler.cpp:155
+msgid "Incorrect hair."
+msgstr ""
+
+#: src/net/tmwa/charserverhandler.cpp:158
+msgid "Incorrect slot."
+msgstr ""
+
+#: src/net/tmwa/charserverhandler.cpp:172
 msgid "Character deleted."
 msgstr "Personaggio cancellato."
 
-#: src/net/tmwa/charserverhandler.cpp:154
+#: src/net/tmwa/charserverhandler.cpp:177
 msgid "Failed to delete character."
 msgstr "Cancellazione del personaggio fallita."
 
-#: src/net/tmwa/charserverhandler.cpp:286
+#: src/net/tmwa/charserverhandler.cpp:317
 msgid "Strength:"
 msgstr "Forza:"
 
-#: src/net/tmwa/charserverhandler.cpp:287
+#: src/net/tmwa/charserverhandler.cpp:318
 msgid "Agility:"
 msgstr "Agilità:"
 
-#: src/net/tmwa/charserverhandler.cpp:288
+#: src/net/tmwa/charserverhandler.cpp:319
 msgid "Vitality:"
 msgstr "Vitalità:"
 
-#: src/net/tmwa/charserverhandler.cpp:289
+#: src/net/tmwa/charserverhandler.cpp:320
 msgid "Intelligence:"
 msgstr "Intelligenza:"
 
-#: src/net/tmwa/charserverhandler.cpp:290
+#: src/net/tmwa/charserverhandler.cpp:321
 msgid "Dexterity:"
 msgstr "Destrezza:"
 
-#: src/net/tmwa/charserverhandler.cpp:291
+#: src/net/tmwa/charserverhandler.cpp:322
 msgid "Luck:"
 msgstr "Fortuna:"
 
@@ -4897,11 +4937,11 @@ msgstr "Impossibile condividere l'esperienza."
 msgid "Experience sharing unknown."
 msgstr "Abilitata la condivisione dell'esperienza."
 
-#: src/net/tmwa/inventoryhandler.cpp:334
+#: src/net/tmwa/inventoryhandler.cpp:343
 msgid "Failed to use item."
 msgstr ""
 
-#: src/net/tmwa/inventoryhandler.cpp:457
+#: src/net/tmwa/inventoryhandler.cpp:472
 msgid "Unable to equip."
 msgstr "Impossibile equipaggiare."
 
@@ -5017,98 +5057,98 @@ msgstr ""
 msgid "%s is not in your party!"
 msgstr "%s non è nel tuo party!"
 
-#: src/net/tmwa/playerhandler.cpp:110
+#: src/net/tmwa/playerhandler.cpp:111
 msgid "Insert coin to continue."
 msgstr "Inserisci un gettone per continuare."
 
-#: src/net/tmwa/playerhandler.cpp:128
+#: src/net/tmwa/playerhandler.cpp:129
 msgid "You're not dead yet. You're just resting."
 msgstr "Non sei morto. Stai riposando."
 
-#: src/net/tmwa/playerhandler.cpp:129
+#: src/net/tmwa/playerhandler.cpp:130
 msgid "You are no more."
 msgstr "Non sei più."
 
-#: src/net/tmwa/playerhandler.cpp:130
+#: src/net/tmwa/playerhandler.cpp:131
 msgid "You have ceased to be."
 msgstr "Hai smesso di esistere."
 
-#: src/net/tmwa/playerhandler.cpp:131
+#: src/net/tmwa/playerhandler.cpp:132
 msgid "You've expired and gone to meet your maker."
 msgstr "Sei spirato e sei andato a incontrare il tuo creatore."
 
-#: src/net/tmwa/playerhandler.cpp:132
+#: src/net/tmwa/playerhandler.cpp:133
 msgid "You're a stiff."
 msgstr "Sei cadavere."
 
-#: src/net/tmwa/playerhandler.cpp:133
+#: src/net/tmwa/playerhandler.cpp:134
 msgid "Bereft of life, you rest in peace."
 msgstr "Privato della vita, riposi in pace."
 
-#: src/net/tmwa/playerhandler.cpp:134
+#: src/net/tmwa/playerhandler.cpp:135
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:135
+#: src/net/tmwa/playerhandler.cpp:136
 msgid "Your metabolic processes are now history."
 msgstr "I tuoi processi metabolici sono storia ora."
 
-#: src/net/tmwa/playerhandler.cpp:136
+#: src/net/tmwa/playerhandler.cpp:137
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:137
+#: src/net/tmwa/playerhandler.cpp:138
 msgid "You've kicked the bucket."
 msgstr "Hai tirato le cuoia."
 
-#: src/net/tmwa/playerhandler.cpp:138
+#: src/net/tmwa/playerhandler.cpp:139
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:140
+#: src/net/tmwa/playerhandler.cpp:141
 msgid "You are an ex-player."
 msgstr "Sei un ex-giocatore."
 
-#: src/net/tmwa/playerhandler.cpp:141
+#: src/net/tmwa/playerhandler.cpp:142
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:327 src/net/tmwa/playerhandler.cpp:336
-#: src/net/tmwa/playerhandler.cpp:415
+#: src/net/tmwa/playerhandler.cpp:330 src/net/tmwa/playerhandler.cpp:339
+#: src/net/tmwa/playerhandler.cpp:418
 msgid "Message"
 msgstr "Messaggio"
 
-#: src/net/tmwa/playerhandler.cpp:328
+#: src/net/tmwa/playerhandler.cpp:331
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 "Stai trasportando più della metà del tuo peso. Non puoi recuperare le "
 "energie."
 
-#: src/net/tmwa/playerhandler.cpp:337
+#: src/net/tmwa/playerhandler.cpp:340
 #, fuzzy
 msgid "You are carrying less than half your weight. You are can regain health."
 msgstr ""
 "Stai trasportando più della metà del tuo peso. Non puoi recuperare le "
 "energie."
 
-#: src/net/tmwa/playerhandler.cpp:442
+#: src/net/tmwa/playerhandler.cpp:445
 #, fuzzy, c-format
 msgid "You picked up %s."
 msgstr "Hai raccolto "
 
-#: src/net/tmwa/playerhandler.cpp:448
+#: src/net/tmwa/playerhandler.cpp:451
 #, fuzzy, c-format
 msgid "You spent %s."
 msgstr "Hai ottenuto %s"
 
-#: src/net/tmwa/playerhandler.cpp:493
+#: src/net/tmwa/playerhandler.cpp:496
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:613
+#: src/net/tmwa/playerhandler.cpp:616
 msgid "Equip arrows first."
 msgstr "Equipaggia prima le frecce"
 
@@ -5258,32 +5298,32 @@ msgstr ""
 msgid "Floating bubble"
 msgstr ""
 
-#: src/resources/beinginfo.cpp:32 src/resources/itemdb.cpp:210
+#: src/resources/beinginfo.cpp:32 src/resources/itemdb.cpp:223
 #: src/resources/monsterdb.cpp:78
 msgid "unnamed"
 msgstr ""
 
-#: src/resources/itemdb.cpp:55
+#: src/resources/itemdb.cpp:57
 #, c-format
 msgid "Attack %+d"
 msgstr "Attacco %+d"
 
-#: src/resources/itemdb.cpp:56
+#: src/resources/itemdb.cpp:58
 #, c-format
 msgid "Defense %+d"
 msgstr "Difesa %+d"
 
-#: src/resources/itemdb.cpp:57
+#: src/resources/itemdb.cpp:59
 #, c-format
 msgid "HP %+d"
 msgstr "PF %+d"
 
-#: src/resources/itemdb.cpp:58
+#: src/resources/itemdb.cpp:60
 #, c-format
 msgid "MP %+d"
 msgstr "PM %+d"
 
-#: src/resources/itemdb.cpp:155
+#: src/resources/itemdb.cpp:152
 msgid "Unknown item"
 msgstr "Oggetto sconosciuto"
 
diff --git a/po/manaplus.pot b/po/manaplus.pot
index bfc33f73a..17c4388dc 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: dev@manasource.org\n"
-"POT-Creation-Date: 2011-01-06 03:06+0200\n"
+"POT-Creation-Date: 2011-01-13 21:49+0200\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"
@@ -57,10 +57,10 @@ msgstr ""
 #: src/client.cpp:1029 src/client.cpp:1036 src/client.cpp:1171
 #: src/gui/changeemaildialog.cpp:154 src/gui/changepassworddialog.cpp:144
 #: src/gui/charcreatedialog.cpp:185 src/gui/register.cpp:225
-#: src/gui/serverdialog.cpp:350 src/gui/unregisterdialog.cpp:134
+#: src/gui/serverdialog.cpp:355 src/gui/unregisterdialog.cpp:134
 #: src/net/manaserv/charhandler.cpp:183 src/net/manaserv/charhandler.cpp:226
-#: src/net/tmwa/charserverhandler.cpp:137
-#: src/net/tmwa/charserverhandler.cpp:154
+#: src/net/tmwa/charserverhandler.cpp:161
+#: src/net/tmwa/charserverhandler.cpp:177
 msgid "Error"
 msgstr ""
 
@@ -690,7 +690,7 @@ msgid "-"
 msgstr ""
 
 #: src/gui/buy.cpp:95 src/gui/quitdialog.cpp:43 src/gui/quitdialog.cpp:48
-#: src/gui/quitdialog.cpp:49 src/gui/sell.cpp:90 src/gui/serverdialog.cpp:244
+#: src/gui/quitdialog.cpp:49 src/gui/sell.cpp:90 src/gui/serverdialog.cpp:248
 #: src/keyboardconfig.cpp:275
 msgid "Quit"
 msgstr ""
@@ -701,7 +701,7 @@ msgid "Max"
 msgstr ""
 
 #: src/gui/buysell.cpp:37 src/gui/buysell.cpp:46
-#: src/gui/inventorywindow.cpp:112
+#: src/gui/inventorywindow.cpp:134
 msgid "Shop"
 msgstr ""
 
@@ -868,7 +868,7 @@ msgstr ""
 msgid "Change Email"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:375 src/gui/serverdialog.cpp:248
+#: src/gui/charselectdialog.cpp:375 src/gui/serverdialog.cpp:252
 #: src/gui/setup_players.cpp:242 src/gui/shopwindow.cpp:117
 #: src/gui/shopwindow.cpp:120 src/gui/textcommandeditor.cpp:234
 msgid "Delete"
@@ -1094,8 +1094,8 @@ msgstr ""
 msgid "Equipment"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:91 src/gui/inventorywindow.cpp:96
-#: src/gui/inventorywindow.cpp:393 src/gui/inventorywindow.cpp:402
+#: src/gui/equipmentwindow.cpp:91 src/gui/inventorywindow.cpp:118
+#: src/gui/inventorywindow.cpp:443 src/gui/inventorywindow.cpp:452
 #: src/gui/popupmenu.cpp:1070 src/gui/popupmenu.cpp:1169
 #: src/gui/popupmenu.cpp:1209
 msgid "Unequip"
@@ -1105,67 +1105,75 @@ msgstr ""
 msgid "Help"
 msgstr ""
 
-#: src/gui/help.cpp:52 src/gui/inventorywindow.cpp:135
+#: src/gui/help.cpp:52 src/gui/inventorywindow.cpp:163
 #: src/gui/npcdialog.cpp:48 src/gui/shopwindow.cpp:108
 msgid "Close"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:62 src/gui/windowmenu.cpp:72
+#: src/gui/inventorywindow.cpp:65 src/gui/windowmenu.cpp:72
 msgid "Inventory"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:62
+#: src/gui/inventorywindow.cpp:65
 msgid "Storage"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:89
+#: src/gui/inventorywindow.cpp:92
 msgid "Slots:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:94 src/gui/inventorywindow.cpp:395
-#: src/gui/inventorywindow.cpp:404 src/gui/popupmenu.cpp:1072
+#: src/gui/inventorywindow.cpp:103
+msgid "Filter:"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:104
+msgid "Sort:"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:116 src/gui/inventorywindow.cpp:445
+#: src/gui/inventorywindow.cpp:454 src/gui/popupmenu.cpp:1072
 #: src/gui/popupmenu.cpp:1171 src/gui/popupmenu.cpp:1211
 msgid "Equip"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:95 src/gui/inventorywindow.cpp:396
-#: src/gui/inventorywindow.cpp:400 src/gui/popupmenu.cpp:1075
+#: src/gui/inventorywindow.cpp:117 src/gui/inventorywindow.cpp:446
+#: src/gui/inventorywindow.cpp:450 src/gui/popupmenu.cpp:1075
 #: src/gui/popupmenu.cpp:1144 src/gui/popupmenu.cpp:1175
 #: src/gui/popupmenu.cpp:1214
 msgid "Use"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:109 src/gui/inventorywindow.cpp:499
+#: src/gui/inventorywindow.cpp:131 src/gui/inventorywindow.cpp:549
 #: src/gui/popupmenu.cpp:1078 src/gui/popupmenu.cpp:1179
 #: src/gui/popupmenu.cpp:1217
 msgid "Drop..."
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:110 src/gui/popupmenu.cpp:1083
+#: src/gui/inventorywindow.cpp:132 src/gui/popupmenu.cpp:1083
 #: src/gui/popupmenu.cpp:1184 src/gui/popupmenu.cpp:1222
 msgid "Split"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:111 src/gui/outfitwindow.cpp:56
+#: src/gui/inventorywindow.cpp:133 src/gui/outfitwindow.cpp:56
 #: src/gui/popupmenu.cpp:409
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:114
+#: src/gui/inventorywindow.cpp:136
 msgid "Weight:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:133 src/gui/inventorywindow.cpp:490
+#: src/gui/inventorywindow.cpp:161 src/gui/inventorywindow.cpp:540
 #: src/gui/popupmenu.cpp:1087 src/gui/popupmenu.cpp:1187
 #: src/gui/popupmenu.cpp:1225 src/gui/setup.cpp:65
 msgid "Store"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:134 src/gui/popupmenu.cpp:1106
+#: src/gui/inventorywindow.cpp:162 src/gui/popupmenu.cpp:1106
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:501 src/gui/popupmenu.cpp:1080
+#: src/gui/inventorywindow.cpp:551 src/gui/popupmenu.cpp:1080
 #: src/gui/popupmenu.cpp:1181 src/gui/popupmenu.cpp:1219
 #: src/gui/windowmenu.cpp:91
 msgid "Drop"
@@ -1346,7 +1354,7 @@ msgstr ""
 msgid "Login"
 msgstr ""
 
-#: src/gui/login.cpp:87 src/gui/serverdialog.cpp:221
+#: src/gui/login.cpp:87 src/gui/serverdialog.cpp:222
 #: src/gui/widgets/chattab.cpp:166
 msgid "Server:"
 msgstr ""
@@ -1736,52 +1744,56 @@ msgstr ""
 msgid "Choose Your Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:222
+#: src/gui/serverdialog.cpp:223
 msgid "Port:"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:223
+#: src/gui/serverdialog.cpp:224
 msgid "Server type:"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:245
+#: src/gui/serverdialog.cpp:227
+msgid "Use same ip for game sub servers"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:249
 msgid "Load"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:246
+#: src/gui/serverdialog.cpp:250
 msgid "Connect"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:247
+#: src/gui/serverdialog.cpp:251
 msgid "Custom Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:351
+#: src/gui/serverdialog.cpp:356
 msgid "Please type both the address and the port of a server."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:482
+#: src/gui/serverdialog.cpp:488
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:488
+#: src/gui/serverdialog.cpp:494
 msgid "Waiting for server..."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:492
+#: src/gui/serverdialog.cpp:498
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:496
+#: src/gui/serverdialog.cpp:502
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:593
+#: src/gui/serverdialog.cpp:599
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:595
+#: src/gui/serverdialog.cpp:601
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -3641,7 +3653,7 @@ msgstr[1] ""
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:3617
+#: src/localplayer.cpp:3618
 msgid "You see "
 msgstr ""
 
@@ -3791,59 +3803,59 @@ msgstr ""
 msgid "Willpower %+.1f"
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:104
+#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:105
 msgid "You are dead."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:105
+#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:106
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:107
+#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:108
 msgid "You are not that alive anymore."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:108
+#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:109
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:319 src/net/tmwa/playerhandler.cpp:109
+#: src/net/manaserv/beinghandler.cpp:319 src/net/tmwa/playerhandler.cpp:110
 msgid "Game Over!"
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:320 src/net/tmwa/playerhandler.cpp:111
+#: src/net/manaserv/beinghandler.cpp:320 src/net/tmwa/playerhandler.cpp:112
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:322 src/net/tmwa/playerhandler.cpp:113
+#: src/net/manaserv/beinghandler.cpp:322 src/net/tmwa/playerhandler.cpp:114
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:324 src/net/tmwa/playerhandler.cpp:115
+#: src/net/manaserv/beinghandler.cpp:324 src/net/tmwa/playerhandler.cpp:116
 msgid "I guess this did not run too well."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:325 src/net/tmwa/playerhandler.cpp:117
+#: src/net/manaserv/beinghandler.cpp:325 src/net/tmwa/playerhandler.cpp:118
 msgid "Do you want your possessions identified?"
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:326 src/net/tmwa/playerhandler.cpp:119
+#: src/net/manaserv/beinghandler.cpp:326 src/net/tmwa/playerhandler.cpp:120
 msgid "Sadly, no trace of you was ever found..."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:328 src/net/tmwa/playerhandler.cpp:121
+#: src/net/manaserv/beinghandler.cpp:328 src/net/tmwa/playerhandler.cpp:122
 msgid "Annihilated."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:329 src/net/tmwa/playerhandler.cpp:123
+#: src/net/manaserv/beinghandler.cpp:329 src/net/tmwa/playerhandler.cpp:124
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:331 src/net/tmwa/playerhandler.cpp:125
+#: src/net/manaserv/beinghandler.cpp:331 src/net/tmwa/playerhandler.cpp:126
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
@@ -3904,11 +3916,11 @@ msgstr ""
 #: src/net/manaserv/charhandler.cpp:180 src/net/manaserv/loginhandler.cpp:98
 #: src/net/manaserv/loginhandler.cpp:130 src/net/manaserv/loginhandler.cpp:166
 #: src/net/manaserv/loginhandler.cpp:286 src/net/manaserv/loginhandler.cpp:323
-#: src/net/tmwa/loginhandler.cpp:99 src/net/tmwa/loginhandler.cpp:187
+#: src/net/tmwa/loginhandler.cpp:99 src/net/tmwa/loginhandler.cpp:190
 msgid "Unknown error."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:209 src/net/tmwa/charserverhandler.cpp:149
+#: src/net/manaserv/charhandler.cpp:209 src/net/tmwa/charserverhandler.cpp:172
 msgid "Info"
 msgstr ""
 
@@ -4128,59 +4140,83 @@ msgstr ""
 msgid "Unable to buy."
 msgstr ""
 
-#: src/net/tmwa/buysellhandler.cpp:143
+#: src/net/tmwa/buysellhandler.cpp:145
 msgid "Thanks for selling."
 msgstr ""
 
-#: src/net/tmwa/buysellhandler.cpp:145
+#: src/net/tmwa/buysellhandler.cpp:149
 msgid "Unable to sell."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:106
+#: src/net/tmwa/buysellhandler.cpp:152
+msgid "Unable to sell while trading."
+msgstr ""
+
+#: src/net/tmwa/buysellhandler.cpp:155
+msgid "Unable to sell unsellable item."
+msgstr ""
+
+#: src/net/tmwa/charserverhandler.cpp:109
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:110
+#: src/net/tmwa/charserverhandler.cpp:113
 msgid "Cannot use this ID."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:113
+#: src/net/tmwa/charserverhandler.cpp:116
 msgid "Unknown char-server failure."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:137
+#: src/net/tmwa/charserverhandler.cpp:145
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:149
+#: src/net/tmwa/charserverhandler.cpp:149 src/net/tmwa/loginhandler.cpp:187
+msgid "Wrong name."
+msgstr ""
+
+#: src/net/tmwa/charserverhandler.cpp:152
+msgid "Incorrect stats."
+msgstr ""
+
+#: src/net/tmwa/charserverhandler.cpp:155
+msgid "Incorrect hair."
+msgstr ""
+
+#: src/net/tmwa/charserverhandler.cpp:158
+msgid "Incorrect slot."
+msgstr ""
+
+#: src/net/tmwa/charserverhandler.cpp:172
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:154
+#: src/net/tmwa/charserverhandler.cpp:177
 msgid "Failed to delete character."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:286
+#: src/net/tmwa/charserverhandler.cpp:317
 msgid "Strength:"
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:287
+#: src/net/tmwa/charserverhandler.cpp:318
 msgid "Agility:"
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:288
+#: src/net/tmwa/charserverhandler.cpp:319
 msgid "Vitality:"
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:289
+#: src/net/tmwa/charserverhandler.cpp:320
 msgid "Intelligence:"
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:290
+#: src/net/tmwa/charserverhandler.cpp:321
 msgid "Dexterity:"
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:291
+#: src/net/tmwa/charserverhandler.cpp:322
 msgid "Luck:"
 msgstr ""
 
@@ -4554,11 +4590,11 @@ msgstr ""
 msgid "Experience sharing unknown."
 msgstr ""
 
-#: src/net/tmwa/inventoryhandler.cpp:334
+#: src/net/tmwa/inventoryhandler.cpp:343
 msgid "Failed to use item."
 msgstr ""
 
-#: src/net/tmwa/inventoryhandler.cpp:457
+#: src/net/tmwa/inventoryhandler.cpp:472
 msgid "Unable to equip."
 msgstr ""
 
@@ -4666,93 +4702,93 @@ msgstr ""
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:110
+#: src/net/tmwa/playerhandler.cpp:111
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:128
+#: src/net/tmwa/playerhandler.cpp:129
 msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:129
+#: src/net/tmwa/playerhandler.cpp:130
 msgid "You are no more."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:130
+#: src/net/tmwa/playerhandler.cpp:131
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:131
+#: src/net/tmwa/playerhandler.cpp:132
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:132
+#: src/net/tmwa/playerhandler.cpp:133
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:133
+#: src/net/tmwa/playerhandler.cpp:134
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:134
+#: src/net/tmwa/playerhandler.cpp:135
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:135
+#: src/net/tmwa/playerhandler.cpp:136
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:136
+#: src/net/tmwa/playerhandler.cpp:137
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:137
+#: src/net/tmwa/playerhandler.cpp:138
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:138
+#: src/net/tmwa/playerhandler.cpp:139
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:140
+#: src/net/tmwa/playerhandler.cpp:141
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:141
+#: src/net/tmwa/playerhandler.cpp:142
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:327 src/net/tmwa/playerhandler.cpp:336
-#: src/net/tmwa/playerhandler.cpp:415
+#: src/net/tmwa/playerhandler.cpp:330 src/net/tmwa/playerhandler.cpp:339
+#: src/net/tmwa/playerhandler.cpp:418
 msgid "Message"
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:328
+#: src/net/tmwa/playerhandler.cpp:331
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:337
+#: src/net/tmwa/playerhandler.cpp:340
 msgid "You are carrying less than half your weight. You are can regain health."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:442
+#: src/net/tmwa/playerhandler.cpp:445
 #, c-format
 msgid "You picked up %s."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:448
+#: src/net/tmwa/playerhandler.cpp:451
 #, c-format
 msgid "You spent %s."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:493
+#: src/net/tmwa/playerhandler.cpp:496
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:613
+#: src/net/tmwa/playerhandler.cpp:616
 msgid "Equip arrows first."
 msgstr ""
 
@@ -4898,31 +4934,31 @@ msgstr ""
 msgid "Floating bubble"
 msgstr ""
 
-#: src/resources/beinginfo.cpp:32 src/resources/itemdb.cpp:210
+#: src/resources/beinginfo.cpp:32 src/resources/itemdb.cpp:223
 #: src/resources/monsterdb.cpp:78
 msgid "unnamed"
 msgstr ""
 
-#: src/resources/itemdb.cpp:55
+#: src/resources/itemdb.cpp:57
 #, c-format
 msgid "Attack %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:56
+#: src/resources/itemdb.cpp:58
 #, c-format
 msgid "Defense %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:57
+#: src/resources/itemdb.cpp:59
 #, c-format
 msgid "HP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:58
+#: src/resources/itemdb.cpp:60
 #, c-format
 msgid "MP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:155
+#: src/resources/itemdb.cpp:152
 msgid "Unknown item"
 msgstr ""
diff --git a/po/nl.po b/po/nl.po
index 4d724e6ba..d7568d682 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Mana World 0.1.0\n"
 "Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2011-01-06 03:06+0200\n"
+"POT-Creation-Date: 2011-01-13 21:49+0200\n"
 "PO-Revision-Date: 2009-07-15 12:21+0000\n"
 "Last-Translator: Yentl <y.v.t@scarlet.be>\n"
 "Language-Team: Dutch\n"
@@ -63,10 +63,10 @@ msgstr "Server"
 #: src/client.cpp:1029 src/client.cpp:1036 src/client.cpp:1171
 #: src/gui/changeemaildialog.cpp:154 src/gui/changepassworddialog.cpp:144
 #: src/gui/charcreatedialog.cpp:185 src/gui/register.cpp:225
-#: src/gui/serverdialog.cpp:350 src/gui/unregisterdialog.cpp:134
+#: src/gui/serverdialog.cpp:355 src/gui/unregisterdialog.cpp:134
 #: src/net/manaserv/charhandler.cpp:183 src/net/manaserv/charhandler.cpp:226
-#: src/net/tmwa/charserverhandler.cpp:137
-#: src/net/tmwa/charserverhandler.cpp:154
+#: src/net/tmwa/charserverhandler.cpp:161
+#: src/net/tmwa/charserverhandler.cpp:177
 msgid "Error"
 msgstr "Fout"
 
@@ -742,7 +742,7 @@ msgid "-"
 msgstr ""
 
 #: src/gui/buy.cpp:95 src/gui/quitdialog.cpp:43 src/gui/quitdialog.cpp:48
-#: src/gui/quitdialog.cpp:49 src/gui/sell.cpp:90 src/gui/serverdialog.cpp:244
+#: src/gui/quitdialog.cpp:49 src/gui/sell.cpp:90 src/gui/serverdialog.cpp:248
 #: src/keyboardconfig.cpp:275
 msgid "Quit"
 msgstr "Afsluiten"
@@ -753,7 +753,7 @@ msgid "Max"
 msgstr "Maximum"
 
 #: src/gui/buysell.cpp:37 src/gui/buysell.cpp:46
-#: src/gui/inventorywindow.cpp:112
+#: src/gui/inventorywindow.cpp:134
 msgid "Shop"
 msgstr "Winkel"
 
@@ -926,7 +926,7 @@ msgstr "Registreren"
 msgid "Change Email"
 msgstr "Emailadres wijzigen"
 
-#: src/gui/charselectdialog.cpp:375 src/gui/serverdialog.cpp:248
+#: src/gui/charselectdialog.cpp:375 src/gui/serverdialog.cpp:252
 #: src/gui/setup_players.cpp:242 src/gui/shopwindow.cpp:117
 #: src/gui/shopwindow.cpp:120 src/gui/textcommandeditor.cpp:234
 msgid "Delete"
@@ -1174,8 +1174,8 @@ msgstr "OK"
 msgid "Equipment"
 msgstr "Uitrusting"
 
-#: src/gui/equipmentwindow.cpp:91 src/gui/inventorywindow.cpp:96
-#: src/gui/inventorywindow.cpp:393 src/gui/inventorywindow.cpp:402
+#: src/gui/equipmentwindow.cpp:91 src/gui/inventorywindow.cpp:118
+#: src/gui/inventorywindow.cpp:443 src/gui/inventorywindow.cpp:452
 #: src/gui/popupmenu.cpp:1070 src/gui/popupmenu.cpp:1169
 #: src/gui/popupmenu.cpp:1209
 msgid "Unequip"
@@ -1185,68 +1185,77 @@ msgstr "Afdoen"
 msgid "Help"
 msgstr "Help"
 
-#: src/gui/help.cpp:52 src/gui/inventorywindow.cpp:135
+#: src/gui/help.cpp:52 src/gui/inventorywindow.cpp:163
 #: src/gui/npcdialog.cpp:48 src/gui/shopwindow.cpp:108
 msgid "Close"
 msgstr "Sluiten"
 
-#: src/gui/inventorywindow.cpp:62 src/gui/windowmenu.cpp:72
+#: src/gui/inventorywindow.cpp:65 src/gui/windowmenu.cpp:72
 msgid "Inventory"
 msgstr "Inventaris"
 
-#: src/gui/inventorywindow.cpp:62
+#: src/gui/inventorywindow.cpp:65
 msgid "Storage"
 msgstr "Opslag"
 
-#: src/gui/inventorywindow.cpp:89
+#: src/gui/inventorywindow.cpp:92
 msgid "Slots:"
 msgstr "Sloten:"
 
-#: src/gui/inventorywindow.cpp:94 src/gui/inventorywindow.cpp:395
-#: src/gui/inventorywindow.cpp:404 src/gui/popupmenu.cpp:1072
+#: src/gui/inventorywindow.cpp:103
+msgid "Filter:"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:104
+#, fuzzy
+msgid "Sort:"
+msgstr "Poort:"
+
+#: src/gui/inventorywindow.cpp:116 src/gui/inventorywindow.cpp:445
+#: src/gui/inventorywindow.cpp:454 src/gui/popupmenu.cpp:1072
 #: src/gui/popupmenu.cpp:1171 src/gui/popupmenu.cpp:1211
 msgid "Equip"
 msgstr "Uitrusten"
 
-#: src/gui/inventorywindow.cpp:95 src/gui/inventorywindow.cpp:396
-#: src/gui/inventorywindow.cpp:400 src/gui/popupmenu.cpp:1075
+#: src/gui/inventorywindow.cpp:117 src/gui/inventorywindow.cpp:446
+#: src/gui/inventorywindow.cpp:450 src/gui/popupmenu.cpp:1075
 #: src/gui/popupmenu.cpp:1144 src/gui/popupmenu.cpp:1175
 #: src/gui/popupmenu.cpp:1214
 msgid "Use"
 msgstr "Gebruiken"
 
-#: src/gui/inventorywindow.cpp:109 src/gui/inventorywindow.cpp:499
+#: src/gui/inventorywindow.cpp:131 src/gui/inventorywindow.cpp:549
 #: src/gui/popupmenu.cpp:1078 src/gui/popupmenu.cpp:1179
 #: src/gui/popupmenu.cpp:1217
 #, fuzzy
 msgid "Drop..."
 msgstr "Neerleggen"
 
-#: src/gui/inventorywindow.cpp:110 src/gui/popupmenu.cpp:1083
+#: src/gui/inventorywindow.cpp:132 src/gui/popupmenu.cpp:1083
 #: src/gui/popupmenu.cpp:1184 src/gui/popupmenu.cpp:1222
 msgid "Split"
 msgstr "Splitsen"
 
-#: src/gui/inventorywindow.cpp:111 src/gui/outfitwindow.cpp:56
+#: src/gui/inventorywindow.cpp:133 src/gui/outfitwindow.cpp:56
 #: src/gui/popupmenu.cpp:409
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:114
+#: src/gui/inventorywindow.cpp:136
 msgid "Weight:"
 msgstr "Gewicht:"
 
-#: src/gui/inventorywindow.cpp:133 src/gui/inventorywindow.cpp:490
+#: src/gui/inventorywindow.cpp:161 src/gui/inventorywindow.cpp:540
 #: src/gui/popupmenu.cpp:1087 src/gui/popupmenu.cpp:1187
 #: src/gui/popupmenu.cpp:1225 src/gui/setup.cpp:65
 msgid "Store"
 msgstr "Opslaan"
 
-#: src/gui/inventorywindow.cpp:134 src/gui/popupmenu.cpp:1106
+#: src/gui/inventorywindow.cpp:162 src/gui/popupmenu.cpp:1106
 msgid "Retrieve"
 msgstr "Afhalen"
 
-#: src/gui/inventorywindow.cpp:501 src/gui/popupmenu.cpp:1080
+#: src/gui/inventorywindow.cpp:551 src/gui/popupmenu.cpp:1080
 #: src/gui/popupmenu.cpp:1181 src/gui/popupmenu.cpp:1219
 #: src/gui/windowmenu.cpp:91
 msgid "Drop"
@@ -1435,7 +1444,7 @@ msgstr ""
 msgid "Login"
 msgstr "Inloggen"
 
-#: src/gui/login.cpp:87 src/gui/serverdialog.cpp:221
+#: src/gui/login.cpp:87 src/gui/serverdialog.cpp:222
 #: src/gui/widgets/chattab.cpp:166
 msgid "Server:"
 msgstr "Server:"
@@ -1852,56 +1861,60 @@ msgstr "Wachtwoorden komen niet overeen."
 msgid "Choose Your Server"
 msgstr "Kies jouw server"
 
-#: src/gui/serverdialog.cpp:222
+#: src/gui/serverdialog.cpp:223
 msgid "Port:"
 msgstr "Poort:"
 
-#: src/gui/serverdialog.cpp:223
+#: src/gui/serverdialog.cpp:224
 #, fuzzy
 msgid "Server type:"
 msgstr "Server:"
 
-#: src/gui/serverdialog.cpp:245
+#: src/gui/serverdialog.cpp:227
+msgid "Use same ip for game sub servers"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:249
 msgid "Load"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:246
+#: src/gui/serverdialog.cpp:250
 #, fuzzy
 msgid "Connect"
 msgstr "Verbinden..."
 
-#: src/gui/serverdialog.cpp:247
+#: src/gui/serverdialog.cpp:251
 #, fuzzy
 msgid "Custom Server"
 msgstr "Aangepaste cursor"
 
-#: src/gui/serverdialog.cpp:351
+#: src/gui/serverdialog.cpp:356
 msgid "Please type both the address and the port of a server."
 msgstr "Typ aub zowel het adres van de server, als de poort."
 
-#: src/gui/serverdialog.cpp:482
+#: src/gui/serverdialog.cpp:488
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:488
+#: src/gui/serverdialog.cpp:494
 #, fuzzy
 msgid "Waiting for server..."
 msgstr "Wachten op server"
 
-#: src/gui/serverdialog.cpp:492
+#: src/gui/serverdialog.cpp:498
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:496
+#: src/gui/serverdialog.cpp:502
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:593
+#: src/gui/serverdialog.cpp:599
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:595
+#: src/gui/serverdialog.cpp:601
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -3890,7 +3903,7 @@ msgstr[1] "Je raapte %s [@@%d|%s@@] op."
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:3617
+#: src/localplayer.cpp:3618
 #, fuzzy
 msgid "You see "
 msgstr "Jij krijgt %s."
@@ -4059,29 +4072,29 @@ msgstr "Wilskracht:"
 msgid "Willpower %+.1f"
 msgstr "Wilskracht %+d"
 
-#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:104
+#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:105
 msgid "You are dead."
 msgstr "Je bent dood."
 
-#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:105
+#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:106
 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:317 src/net/tmwa/playerhandler.cpp:107
+#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:108
 msgid "You are not that alive anymore."
 msgstr "Je bent niet langer levend."
 
-#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:108
+#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:109
 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:319 src/net/tmwa/playerhandler.cpp:109
+#: src/net/manaserv/beinghandler.cpp:319 src/net/tmwa/playerhandler.cpp:110
 msgid "Game Over!"
 msgstr "Game Over!"
 
-#: src/net/manaserv/beinghandler.cpp:320 src/net/tmwa/playerhandler.cpp:111
+#: src/net/manaserv/beinghandler.cpp:320 src/net/tmwa/playerhandler.cpp:112
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
@@ -4089,7 +4102,7 @@ msgstr ""
 "Neen, kinderen. Jouw personage is niet echt gestorven. Het... euhm... is "
 "naar een beter plaats gegaan."
 
-#: src/net/manaserv/beinghandler.cpp:322 src/net/tmwa/playerhandler.cpp:113
+#: src/net/manaserv/beinghandler.cpp:322 src/net/tmwa/playerhandler.cpp:114
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
@@ -4097,27 +4110,27 @@ msgstr ""
 "Jouw plan om vijandelijke wapens te vernietignen door ermee tegen jouw keel "
 "te slaan is mislukt."
 
-#: src/net/manaserv/beinghandler.cpp:324 src/net/tmwa/playerhandler.cpp:115
+#: src/net/manaserv/beinghandler.cpp:324 src/net/tmwa/playerhandler.cpp:116
 msgid "I guess this did not run too well."
 msgstr "Dit verliep niet zoals gepland."
 
-#: src/net/manaserv/beinghandler.cpp:325 src/net/tmwa/playerhandler.cpp:117
+#: src/net/manaserv/beinghandler.cpp:325 src/net/tmwa/playerhandler.cpp:118
 msgid "Do you want your possessions identified?"
 msgstr "Wil je dat jouw bezittingen geïdentificeerd worden?"
 
-#: src/net/manaserv/beinghandler.cpp:326 src/net/tmwa/playerhandler.cpp:119
+#: src/net/manaserv/beinghandler.cpp:326 src/net/tmwa/playerhandler.cpp:120
 msgid "Sadly, no trace of you was ever found..."
 msgstr "Spijtig genoeg, was er geen spoor van jou gevonden..."
 
-#: src/net/manaserv/beinghandler.cpp:328 src/net/tmwa/playerhandler.cpp:121
+#: src/net/manaserv/beinghandler.cpp:328 src/net/tmwa/playerhandler.cpp:122
 msgid "Annihilated."
 msgstr "Verslagen"
 
-#: src/net/manaserv/beinghandler.cpp:329 src/net/tmwa/playerhandler.cpp:123
+#: src/net/manaserv/beinghandler.cpp:329 src/net/tmwa/playerhandler.cpp:124
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:331 src/net/tmwa/playerhandler.cpp:125
+#: src/net/manaserv/beinghandler.cpp:331 src/net/tmwa/playerhandler.cpp:126
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
@@ -4185,12 +4198,12 @@ msgstr ""
 #: src/net/manaserv/charhandler.cpp:180 src/net/manaserv/loginhandler.cpp:98
 #: src/net/manaserv/loginhandler.cpp:130 src/net/manaserv/loginhandler.cpp:166
 #: src/net/manaserv/loginhandler.cpp:286 src/net/manaserv/loginhandler.cpp:323
-#: src/net/tmwa/loginhandler.cpp:99 src/net/tmwa/loginhandler.cpp:187
+#: src/net/tmwa/loginhandler.cpp:99 src/net/tmwa/loginhandler.cpp:190
 #, fuzzy
 msgid "Unknown error."
 msgstr "Onbekende foutmelding"
 
-#: src/net/manaserv/charhandler.cpp:209 src/net/tmwa/charserverhandler.cpp:149
+#: src/net/manaserv/charhandler.cpp:209 src/net/tmwa/charserverhandler.cpp:172
 msgid "Info"
 msgstr "Info"
 
@@ -4430,61 +4443,88 @@ msgstr "Bedankt voor de aankopen."
 msgid "Unable to buy."
 msgstr "Kan niets kopen."
 
-#: src/net/tmwa/buysellhandler.cpp:143
+#: src/net/tmwa/buysellhandler.cpp:145
 msgid "Thanks for selling."
 msgstr "Bedankt voor het verkopen."
 
-#: src/net/tmwa/buysellhandler.cpp:145
+#: src/net/tmwa/buysellhandler.cpp:149
 msgid "Unable to sell."
 msgstr "Kan niets verkopen."
 
-#: src/net/tmwa/charserverhandler.cpp:106
+#: src/net/tmwa/buysellhandler.cpp:152
+#, fuzzy
+msgid "Unable to sell while trading."
+msgstr "Kan niets verkopen."
+
+#: src/net/tmwa/buysellhandler.cpp:155
+#, fuzzy
+msgid "Unable to sell unsellable item."
+msgstr "Kan het voorwerp niet oprapen."
+
+#: src/net/tmwa/charserverhandler.cpp:109
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:110
+#: src/net/tmwa/charserverhandler.cpp:113
 #, fuzzy
 msgid "Cannot use this ID."
 msgstr "Kan deze ID niet gebruiken"
 
-#: src/net/tmwa/charserverhandler.cpp:113
+#: src/net/tmwa/charserverhandler.cpp:116
 #, fuzzy
 msgid "Unknown char-server failure."
 msgstr "Onbekende foutmelding"
 
-#: src/net/tmwa/charserverhandler.cpp:137
+#: src/net/tmwa/charserverhandler.cpp:145
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr "Kan personage niet aanmaken. Waarschijnlijk bestaat de naam al."
 
-#: src/net/tmwa/charserverhandler.cpp:149
+#: src/net/tmwa/charserverhandler.cpp:149 src/net/tmwa/loginhandler.cpp:187
+#, fuzzy
+msgid "Wrong name."
+msgstr "Verkeerd magie_teken"
+
+#: src/net/tmwa/charserverhandler.cpp:152
+msgid "Incorrect stats."
+msgstr ""
+
+#: src/net/tmwa/charserverhandler.cpp:155
+msgid "Incorrect hair."
+msgstr ""
+
+#: src/net/tmwa/charserverhandler.cpp:158
+msgid "Incorrect slot."
+msgstr ""
+
+#: src/net/tmwa/charserverhandler.cpp:172
 msgid "Character deleted."
 msgstr "Personage verwijderd."
 
-#: src/net/tmwa/charserverhandler.cpp:154
+#: src/net/tmwa/charserverhandler.cpp:177
 msgid "Failed to delete character."
 msgstr "Kon personage niet verwijderen."
 
-#: src/net/tmwa/charserverhandler.cpp:286
+#: src/net/tmwa/charserverhandler.cpp:317
 msgid "Strength:"
 msgstr "Sterkte:"
 
-#: src/net/tmwa/charserverhandler.cpp:287
+#: src/net/tmwa/charserverhandler.cpp:318
 msgid "Agility:"
 msgstr "Agiliteit:"
 
-#: src/net/tmwa/charserverhandler.cpp:288
+#: src/net/tmwa/charserverhandler.cpp:319
 msgid "Vitality:"
 msgstr "Vitaliteit:"
 
-#: src/net/tmwa/charserverhandler.cpp:289
+#: src/net/tmwa/charserverhandler.cpp:320
 msgid "Intelligence:"
 msgstr "Intelligentie:"
 
-#: src/net/tmwa/charserverhandler.cpp:290
+#: src/net/tmwa/charserverhandler.cpp:321
 msgid "Dexterity:"
 msgstr "Dexteriteit:"
 
-#: src/net/tmwa/charserverhandler.cpp:291
+#: src/net/tmwa/charserverhandler.cpp:322
 msgid "Luck:"
 msgstr "Geluk:"
 
@@ -4895,11 +4935,11 @@ msgstr "Ervaringsdeling is niet mogelijk."
 msgid "Experience sharing unknown."
 msgstr "Ervaringsdeling ingeschakeld."
 
-#: src/net/tmwa/inventoryhandler.cpp:334
+#: src/net/tmwa/inventoryhandler.cpp:343
 msgid "Failed to use item."
 msgstr "Kan voorwerp niet gebruiken."
 
-#: src/net/tmwa/inventoryhandler.cpp:457
+#: src/net/tmwa/inventoryhandler.cpp:472
 msgid "Unable to equip."
 msgstr "Kan dit niet uitrusten."
 
@@ -5019,98 +5059,98 @@ msgstr "Een onbekend lid probeerde te zeggen: %s"
 msgid "%s is not in your party!"
 msgstr "%s is niet in jouw groep!"
 
-#: src/net/tmwa/playerhandler.cpp:110
+#: src/net/tmwa/playerhandler.cpp:111
 msgid "Insert coin to continue."
 msgstr "Werp een muntstuk in om verder te spelen."
 
-#: src/net/tmwa/playerhandler.cpp:128
+#: src/net/tmwa/playerhandler.cpp:129
 msgid "You're not dead yet. You're just resting."
 msgstr "Je bent nog niet dood. Je bent maar aan het rusten."
 
-#: src/net/tmwa/playerhandler.cpp:129
+#: src/net/tmwa/playerhandler.cpp:130
 msgid "You are no more."
 msgstr "Je bent niet langer."
 
-#: src/net/tmwa/playerhandler.cpp:130
+#: src/net/tmwa/playerhandler.cpp:131
 msgid "You have ceased to be."
 msgstr "Je hebt opgehouden te zijn."
 
-#: src/net/tmwa/playerhandler.cpp:131
+#: src/net/tmwa/playerhandler.cpp:132
 msgid "You've expired and gone to meet your maker."
 msgstr "Je bent verlopen en gaat een bezoekje maken bij jouw schepper."
 
-#: src/net/tmwa/playerhandler.cpp:132
+#: src/net/tmwa/playerhandler.cpp:133
 msgid "You're a stiff."
 msgstr "Je bent stokstijf."
 
-#: src/net/tmwa/playerhandler.cpp:133
+#: src/net/tmwa/playerhandler.cpp:134
 msgid "Bereft of life, you rest in peace."
 msgstr "Beroofd van het leven, rust je in vrede."
 
-#: src/net/tmwa/playerhandler.cpp:134
+#: src/net/tmwa/playerhandler.cpp:135
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:135
+#: src/net/tmwa/playerhandler.cpp:136
 msgid "Your metabolic processes are now history."
 msgstr "Jouw metabolische processen behoren nu tot het verleden."
 
-#: src/net/tmwa/playerhandler.cpp:136
+#: src/net/tmwa/playerhandler.cpp:137
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:137
+#: src/net/tmwa/playerhandler.cpp:138
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:138
+#: src/net/tmwa/playerhandler.cpp:139
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:140
+#: src/net/tmwa/playerhandler.cpp:141
 msgid "You are an ex-player."
 msgstr "Je bent een ex-speler."
 
-#: src/net/tmwa/playerhandler.cpp:141
+#: src/net/tmwa/playerhandler.cpp:142
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:327 src/net/tmwa/playerhandler.cpp:336
-#: src/net/tmwa/playerhandler.cpp:415
+#: src/net/tmwa/playerhandler.cpp:330 src/net/tmwa/playerhandler.cpp:339
+#: src/net/tmwa/playerhandler.cpp:418
 msgid "Message"
 msgstr "Bericht"
 
-#: src/net/tmwa/playerhandler.cpp:328
+#: src/net/tmwa/playerhandler.cpp:331
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 "Je draagt meer dan de helft van jouw eigen gewicht. Je kan geen leven "
 "herstellen."
 
-#: src/net/tmwa/playerhandler.cpp:337
+#: src/net/tmwa/playerhandler.cpp:340
 #, fuzzy
 msgid "You are carrying less than half your weight. You are can regain health."
 msgstr ""
 "Je draagt meer dan de helft van jouw eigen gewicht. Je kan geen leven "
 "herstellen."
 
-#: src/net/tmwa/playerhandler.cpp:442
+#: src/net/tmwa/playerhandler.cpp:445
 #, fuzzy, c-format
 msgid "You picked up %s."
 msgstr "Je raapte op: "
 
-#: src/net/tmwa/playerhandler.cpp:448
+#: src/net/tmwa/playerhandler.cpp:451
 #, fuzzy, c-format
 msgid "You spent %s."
 msgstr "Jij krijgt %s."
 
-#: src/net/tmwa/playerhandler.cpp:493
+#: src/net/tmwa/playerhandler.cpp:496
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:613
+#: src/net/tmwa/playerhandler.cpp:616
 msgid "Equip arrows first."
 msgstr ""
 
@@ -5261,32 +5301,32 @@ msgstr ""
 msgid "Floating bubble"
 msgstr ""
 
-#: src/resources/beinginfo.cpp:32 src/resources/itemdb.cpp:210
+#: src/resources/beinginfo.cpp:32 src/resources/itemdb.cpp:223
 #: src/resources/monsterdb.cpp:78
 msgid "unnamed"
 msgstr "naamloos"
 
-#: src/resources/itemdb.cpp:55
+#: src/resources/itemdb.cpp:57
 #, c-format
 msgid "Attack %+d"
 msgstr "Aanval %+d"
 
-#: src/resources/itemdb.cpp:56
+#: src/resources/itemdb.cpp:58
 #, c-format
 msgid "Defense %+d"
 msgstr "Verdediging %+d"
 
-#: src/resources/itemdb.cpp:57
+#: src/resources/itemdb.cpp:59
 #, c-format
 msgid "HP %+d"
 msgstr "Leven %+d"
 
-#: src/resources/itemdb.cpp:58
+#: src/resources/itemdb.cpp:60
 #, c-format
 msgid "MP %+d"
 msgstr "Magie %+d"
 
-#: src/resources/itemdb.cpp:155
+#: src/resources/itemdb.cpp:152
 msgid "Unknown item"
 msgstr "Onbekend voorwerp"
 
diff --git a/po/pl.po b/po/pl.po
index d8c63d973..bb9b6faa0 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Mana World 0.1.0\n"
 "Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2011-01-06 03:06+0200\n"
+"POT-Creation-Date: 2011-01-13 21:49+0200\n"
 "PO-Revision-Date: 2009-09-14 06:59+0000\n"
 "Last-Translator: Maciej Benke <syngress_stc@vp.pl>\n"
 "Language-Team: <pl@li.org>\n"
@@ -66,10 +66,10 @@ msgstr "Serwer"
 #: src/client.cpp:1029 src/client.cpp:1036 src/client.cpp:1171
 #: src/gui/changeemaildialog.cpp:154 src/gui/changepassworddialog.cpp:144
 #: src/gui/charcreatedialog.cpp:185 src/gui/register.cpp:225
-#: src/gui/serverdialog.cpp:350 src/gui/unregisterdialog.cpp:134
+#: src/gui/serverdialog.cpp:355 src/gui/unregisterdialog.cpp:134
 #: src/net/manaserv/charhandler.cpp:183 src/net/manaserv/charhandler.cpp:226
-#: src/net/tmwa/charserverhandler.cpp:137
-#: src/net/tmwa/charserverhandler.cpp:154
+#: src/net/tmwa/charserverhandler.cpp:161
+#: src/net/tmwa/charserverhandler.cpp:177
 msgid "Error"
 msgstr "Błąd"
 
@@ -747,7 +747,7 @@ msgid "-"
 msgstr ""
 
 #: src/gui/buy.cpp:95 src/gui/quitdialog.cpp:43 src/gui/quitdialog.cpp:48
-#: src/gui/quitdialog.cpp:49 src/gui/sell.cpp:90 src/gui/serverdialog.cpp:244
+#: src/gui/quitdialog.cpp:49 src/gui/sell.cpp:90 src/gui/serverdialog.cpp:248
 #: src/keyboardconfig.cpp:275
 msgid "Quit"
 msgstr "Wyjdź"
@@ -758,7 +758,7 @@ msgid "Max"
 msgstr "Maks."
 
 #: src/gui/buysell.cpp:37 src/gui/buysell.cpp:46
-#: src/gui/inventorywindow.cpp:112
+#: src/gui/inventorywindow.cpp:134
 msgid "Shop"
 msgstr "Sklep"
 
@@ -931,7 +931,7 @@ msgstr "Wyrejestruj"
 msgid "Change Email"
 msgstr "Zmień adres Email"
 
-#: src/gui/charselectdialog.cpp:375 src/gui/serverdialog.cpp:248
+#: src/gui/charselectdialog.cpp:375 src/gui/serverdialog.cpp:252
 #: src/gui/setup_players.cpp:242 src/gui/shopwindow.cpp:117
 #: src/gui/shopwindow.cpp:120 src/gui/textcommandeditor.cpp:234
 msgid "Delete"
@@ -1179,8 +1179,8 @@ msgstr "Ok"
 msgid "Equipment"
 msgstr "Ekwipunek"
 
-#: src/gui/equipmentwindow.cpp:91 src/gui/inventorywindow.cpp:96
-#: src/gui/inventorywindow.cpp:393 src/gui/inventorywindow.cpp:402
+#: src/gui/equipmentwindow.cpp:91 src/gui/inventorywindow.cpp:118
+#: src/gui/inventorywindow.cpp:443 src/gui/inventorywindow.cpp:452
 #: src/gui/popupmenu.cpp:1070 src/gui/popupmenu.cpp:1169
 #: src/gui/popupmenu.cpp:1209
 msgid "Unequip"
@@ -1190,68 +1190,77 @@ msgstr "Zdejmij"
 msgid "Help"
 msgstr "Pomoc"
 
-#: src/gui/help.cpp:52 src/gui/inventorywindow.cpp:135
+#: src/gui/help.cpp:52 src/gui/inventorywindow.cpp:163
 #: src/gui/npcdialog.cpp:48 src/gui/shopwindow.cpp:108
 msgid "Close"
 msgstr "Zamknij"
 
-#: src/gui/inventorywindow.cpp:62 src/gui/windowmenu.cpp:72
+#: src/gui/inventorywindow.cpp:65 src/gui/windowmenu.cpp:72
 msgid "Inventory"
 msgstr "Inwentarz"
 
-#: src/gui/inventorywindow.cpp:62
+#: src/gui/inventorywindow.cpp:65
 msgid "Storage"
 msgstr "Magazyn"
 
-#: src/gui/inventorywindow.cpp:89
+#: src/gui/inventorywindow.cpp:92
 msgid "Slots:"
 msgstr "Miejsc:"
 
-#: src/gui/inventorywindow.cpp:94 src/gui/inventorywindow.cpp:395
-#: src/gui/inventorywindow.cpp:404 src/gui/popupmenu.cpp:1072
+#: src/gui/inventorywindow.cpp:103
+msgid "Filter:"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:104
+#, fuzzy
+msgid "Sort:"
+msgstr "Port:"
+
+#: src/gui/inventorywindow.cpp:116 src/gui/inventorywindow.cpp:445
+#: src/gui/inventorywindow.cpp:454 src/gui/popupmenu.cpp:1072
 #: src/gui/popupmenu.cpp:1171 src/gui/popupmenu.cpp:1211
 msgid "Equip"
 msgstr "Załóż"
 
-#: src/gui/inventorywindow.cpp:95 src/gui/inventorywindow.cpp:396
-#: src/gui/inventorywindow.cpp:400 src/gui/popupmenu.cpp:1075
+#: src/gui/inventorywindow.cpp:117 src/gui/inventorywindow.cpp:446
+#: src/gui/inventorywindow.cpp:450 src/gui/popupmenu.cpp:1075
 #: src/gui/popupmenu.cpp:1144 src/gui/popupmenu.cpp:1175
 #: src/gui/popupmenu.cpp:1214
 msgid "Use"
 msgstr "Użyj"
 
-#: src/gui/inventorywindow.cpp:109 src/gui/inventorywindow.cpp:499
+#: src/gui/inventorywindow.cpp:131 src/gui/inventorywindow.cpp:549
 #: src/gui/popupmenu.cpp:1078 src/gui/popupmenu.cpp:1179
 #: src/gui/popupmenu.cpp:1217
 #, fuzzy
 msgid "Drop..."
 msgstr "Upuść"
 
-#: src/gui/inventorywindow.cpp:110 src/gui/popupmenu.cpp:1083
+#: src/gui/inventorywindow.cpp:132 src/gui/popupmenu.cpp:1083
 #: src/gui/popupmenu.cpp:1184 src/gui/popupmenu.cpp:1222
 msgid "Split"
 msgstr "Podziel"
 
-#: src/gui/inventorywindow.cpp:111 src/gui/outfitwindow.cpp:56
+#: src/gui/inventorywindow.cpp:133 src/gui/outfitwindow.cpp:56
 #: src/gui/popupmenu.cpp:409
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:114
+#: src/gui/inventorywindow.cpp:136
 msgid "Weight:"
 msgstr "Waga:"
 
-#: src/gui/inventorywindow.cpp:133 src/gui/inventorywindow.cpp:490
+#: src/gui/inventorywindow.cpp:161 src/gui/inventorywindow.cpp:540
 #: src/gui/popupmenu.cpp:1087 src/gui/popupmenu.cpp:1187
 #: src/gui/popupmenu.cpp:1225 src/gui/setup.cpp:65
 msgid "Store"
 msgstr "Przechowaj"
 
-#: src/gui/inventorywindow.cpp:134 src/gui/popupmenu.cpp:1106
+#: src/gui/inventorywindow.cpp:162 src/gui/popupmenu.cpp:1106
 msgid "Retrieve"
 msgstr "Pobierz"
 
-#: src/gui/inventorywindow.cpp:501 src/gui/popupmenu.cpp:1080
+#: src/gui/inventorywindow.cpp:551 src/gui/popupmenu.cpp:1080
 #: src/gui/popupmenu.cpp:1181 src/gui/popupmenu.cpp:1219
 #: src/gui/windowmenu.cpp:91
 msgid "Drop"
@@ -1440,7 +1449,7 @@ msgstr ""
 msgid "Login"
 msgstr "Użytkownik"
 
-#: src/gui/login.cpp:87 src/gui/serverdialog.cpp:221
+#: src/gui/login.cpp:87 src/gui/serverdialog.cpp:222
 #: src/gui/widgets/chattab.cpp:166
 msgid "Server:"
 msgstr "Serwer:"
@@ -1868,56 +1877,60 @@ msgstr "Hasła nie zgadzają się."
 msgid "Choose Your Server"
 msgstr "Wybierz twój serwer"
 
-#: src/gui/serverdialog.cpp:222
+#: src/gui/serverdialog.cpp:223
 msgid "Port:"
 msgstr "Port:"
 
-#: src/gui/serverdialog.cpp:223
+#: src/gui/serverdialog.cpp:224
 #, fuzzy
 msgid "Server type:"
 msgstr "Serwer:"
 
-#: src/gui/serverdialog.cpp:245
+#: src/gui/serverdialog.cpp:227
+msgid "Use same ip for game sub servers"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:249
 msgid "Load"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:246
+#: src/gui/serverdialog.cpp:250
 #, fuzzy
 msgid "Connect"
 msgstr "Łączenie..."
 
-#: src/gui/serverdialog.cpp:247
+#: src/gui/serverdialog.cpp:251
 #, fuzzy
 msgid "Custom Server"
 msgstr "Własny kursor"
 
-#: src/gui/serverdialog.cpp:351
+#: src/gui/serverdialog.cpp:356
 msgid "Please type both the address and the port of a server."
 msgstr "Proszę wpisać adres i port serwera"
 
-#: src/gui/serverdialog.cpp:482
+#: src/gui/serverdialog.cpp:488
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:488
+#: src/gui/serverdialog.cpp:494
 #, fuzzy
 msgid "Waiting for server..."
 msgstr "Oczekiwanie na serwer"
 
-#: src/gui/serverdialog.cpp:492
+#: src/gui/serverdialog.cpp:498
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:496
+#: src/gui/serverdialog.cpp:502
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:593
+#: src/gui/serverdialog.cpp:599
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:595
+#: src/gui/serverdialog.cpp:601
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -3904,7 +3917,7 @@ msgstr[1] "Podniosłeś %s [@@%d|%s@@]."
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:3617
+#: src/localplayer.cpp:3618
 #, fuzzy
 msgid "You see "
 msgstr "Otrzymujesz %s"
@@ -4073,27 +4086,27 @@ msgstr "Siła woli:"
 msgid "Willpower %+.1f"
 msgstr "Siła woli %+d"
 
-#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:104
+#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:105
 msgid "You are dead."
 msgstr "Jesteś martwy."
 
-#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:105
+#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:106
 msgid "We regret to inform you that your character was killed in battle."
 msgstr "Ubolewamy, inforumując iż twoja postać została zabita w bitwie."
 
-#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:107
+#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:108
 msgid "You are not that alive anymore."
 msgstr "Już nie jesteś taki żywy."
 
-#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:108
+#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:109
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr "Skostniałe łapy ponurego żniwiarza sięgają po twoją duszę."
 
-#: src/net/manaserv/beinghandler.cpp:319 src/net/tmwa/playerhandler.cpp:109
+#: src/net/manaserv/beinghandler.cpp:319 src/net/tmwa/playerhandler.cpp:110
 msgid "Game Over!"
 msgstr "Koniec gry!"
 
-#: src/net/manaserv/beinghandler.cpp:320 src/net/tmwa/playerhandler.cpp:111
+#: src/net/manaserv/beinghandler.cpp:320 src/net/tmwa/playerhandler.cpp:112
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
@@ -4101,7 +4114,7 @@ msgstr ""
 "Nie, dzieci. Wasza postać tak naprawdę nie zginęła. Ona... yyy... udała się "
 "do lepszego miejsca."
 
-#: src/net/manaserv/beinghandler.cpp:322 src/net/tmwa/playerhandler.cpp:113
+#: src/net/manaserv/beinghandler.cpp:322 src/net/tmwa/playerhandler.cpp:114
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
@@ -4109,27 +4122,27 @@ msgstr ""
 "Twój plan zniszczenia broni wrogów poprzez uderzanie o nią twoim gardłem "
 "zawiódł."
 
-#: src/net/manaserv/beinghandler.cpp:324 src/net/tmwa/playerhandler.cpp:115
+#: src/net/manaserv/beinghandler.cpp:324 src/net/tmwa/playerhandler.cpp:116
 msgid "I guess this did not run too well."
 msgstr "Wydaje mi się, iż to nie poszło zbyt dobrze."
 
-#: src/net/manaserv/beinghandler.cpp:325 src/net/tmwa/playerhandler.cpp:117
+#: src/net/manaserv/beinghandler.cpp:325 src/net/tmwa/playerhandler.cpp:118
 msgid "Do you want your possessions identified?"
 msgstr "Czy chesz zidentyfikować twoje rzeczy?"
 
-#: src/net/manaserv/beinghandler.cpp:326 src/net/tmwa/playerhandler.cpp:119
+#: src/net/manaserv/beinghandler.cpp:326 src/net/tmwa/playerhandler.cpp:120
 msgid "Sadly, no trace of you was ever found..."
 msgstr "Niestety, ślad po tobie zaginął..."
 
-#: src/net/manaserv/beinghandler.cpp:328 src/net/tmwa/playerhandler.cpp:121
+#: src/net/manaserv/beinghandler.cpp:328 src/net/tmwa/playerhandler.cpp:122
 msgid "Annihilated."
 msgstr "Unicestwiony."
 
-#: src/net/manaserv/beinghandler.cpp:329 src/net/tmwa/playerhandler.cpp:123
+#: src/net/manaserv/beinghandler.cpp:329 src/net/tmwa/playerhandler.cpp:124
 msgid "Looks like you got your head handed to you."
 msgstr "Wygląda na to, że podano tobie twoją głowę."
 
-#: src/net/manaserv/beinghandler.cpp:331 src/net/tmwa/playerhandler.cpp:125
+#: src/net/manaserv/beinghandler.cpp:331 src/net/tmwa/playerhandler.cpp:126
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr "Znowu nawaliłeś, wrzuć swoje ciało do rur i weź sobie nowe."
@@ -4196,12 +4209,12 @@ msgstr ""
 #: src/net/manaserv/charhandler.cpp:180 src/net/manaserv/loginhandler.cpp:98
 #: src/net/manaserv/loginhandler.cpp:130 src/net/manaserv/loginhandler.cpp:166
 #: src/net/manaserv/loginhandler.cpp:286 src/net/manaserv/loginhandler.cpp:323
-#: src/net/tmwa/loginhandler.cpp:99 src/net/tmwa/loginhandler.cpp:187
+#: src/net/tmwa/loginhandler.cpp:99 src/net/tmwa/loginhandler.cpp:190
 #, fuzzy
 msgid "Unknown error."
 msgstr "Nieznany błąd"
 
-#: src/net/manaserv/charhandler.cpp:209 src/net/tmwa/charserverhandler.cpp:149
+#: src/net/manaserv/charhandler.cpp:209 src/net/tmwa/charserverhandler.cpp:172
 msgid "Info"
 msgstr "Info"
 
@@ -4441,62 +4454,89 @@ msgstr "Dziękuję za kupno."
 msgid "Unable to buy."
 msgstr "Nie można kupić."
 
-#: src/net/tmwa/buysellhandler.cpp:143
+#: src/net/tmwa/buysellhandler.cpp:145
 msgid "Thanks for selling."
 msgstr "Dziękuję za sprzedaż."
 
-#: src/net/tmwa/buysellhandler.cpp:145
+#: src/net/tmwa/buysellhandler.cpp:149
 msgid "Unable to sell."
 msgstr "Nie można sprzedać."
 
-#: src/net/tmwa/charserverhandler.cpp:106
+#: src/net/tmwa/buysellhandler.cpp:152
+#, fuzzy
+msgid "Unable to sell while trading."
+msgstr "Nie można sprzedać."
+
+#: src/net/tmwa/buysellhandler.cpp:155
+#, fuzzy
+msgid "Unable to sell unsellable item."
+msgstr "Nie można podnieść przedmiotu."
+
+#: src/net/tmwa/charserverhandler.cpp:109
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:110
+#: src/net/tmwa/charserverhandler.cpp:113
 #, fuzzy
 msgid "Cannot use this ID."
 msgstr "Nie można uzyć tego ID"
 
-#: src/net/tmwa/charserverhandler.cpp:113
+#: src/net/tmwa/charserverhandler.cpp:116
 #, fuzzy
 msgid "Unknown char-server failure."
 msgstr "Nieznany błąd"
 
-#: src/net/tmwa/charserverhandler.cpp:137
+#: src/net/tmwa/charserverhandler.cpp:145
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 "Utworzenie postaci nie powiodło się. Najprawdopodobniej imię jest już zajęte."
 
-#: src/net/tmwa/charserverhandler.cpp:149
+#: src/net/tmwa/charserverhandler.cpp:149 src/net/tmwa/loginhandler.cpp:187
+#, fuzzy
+msgid "Wrong name."
+msgstr "Zły magic_token"
+
+#: src/net/tmwa/charserverhandler.cpp:152
+msgid "Incorrect stats."
+msgstr ""
+
+#: src/net/tmwa/charserverhandler.cpp:155
+msgid "Incorrect hair."
+msgstr ""
+
+#: src/net/tmwa/charserverhandler.cpp:158
+msgid "Incorrect slot."
+msgstr ""
+
+#: src/net/tmwa/charserverhandler.cpp:172
 msgid "Character deleted."
 msgstr "Usunięto postać."
 
-#: src/net/tmwa/charserverhandler.cpp:154
+#: src/net/tmwa/charserverhandler.cpp:177
 msgid "Failed to delete character."
 msgstr "Usunięcie gracza nie powiodło się."
 
-#: src/net/tmwa/charserverhandler.cpp:286
+#: src/net/tmwa/charserverhandler.cpp:317
 msgid "Strength:"
 msgstr "Siła:"
 
-#: src/net/tmwa/charserverhandler.cpp:287
+#: src/net/tmwa/charserverhandler.cpp:318
 msgid "Agility:"
 msgstr "Zwinność:"
 
-#: src/net/tmwa/charserverhandler.cpp:288
+#: src/net/tmwa/charserverhandler.cpp:319
 msgid "Vitality:"
 msgstr "Witalność:"
 
-#: src/net/tmwa/charserverhandler.cpp:289
+#: src/net/tmwa/charserverhandler.cpp:320
 msgid "Intelligence:"
 msgstr "Inteligencja:"
 
-#: src/net/tmwa/charserverhandler.cpp:290
+#: src/net/tmwa/charserverhandler.cpp:321
 msgid "Dexterity:"
 msgstr "Zręczność:"
 
-#: src/net/tmwa/charserverhandler.cpp:291
+#: src/net/tmwa/charserverhandler.cpp:322
 msgid "Luck:"
 msgstr "Szczęście:"
 
@@ -4904,11 +4944,11 @@ msgstr "Podział doświadczenia nie jest możliwy."
 msgid "Experience sharing unknown."
 msgstr "Podział doświadczenia włączony."
 
-#: src/net/tmwa/inventoryhandler.cpp:334
+#: src/net/tmwa/inventoryhandler.cpp:343
 msgid "Failed to use item."
 msgstr "Użycie przedmiotu nie powiodło się."
 
-#: src/net/tmwa/inventoryhandler.cpp:457
+#: src/net/tmwa/inventoryhandler.cpp:472
 msgid "Unable to equip."
 msgstr "Nie można założyć."
 
@@ -5027,94 +5067,94 @@ msgstr "Nieznany członek próbował powiedzieć: %s"
 msgid "%s is not in your party!"
 msgstr "%s nie jest w twojej grupie!"
 
-#: src/net/tmwa/playerhandler.cpp:110
+#: src/net/tmwa/playerhandler.cpp:111
 msgid "Insert coin to continue."
 msgstr "Wrzuć monetę aby kontynuować."
 
-#: src/net/tmwa/playerhandler.cpp:128
+#: src/net/tmwa/playerhandler.cpp:129
 msgid "You're not dead yet. You're just resting."
 msgstr "Jeszcze nie umarłeś. Po prostu odpoczywasz."
 
-#: src/net/tmwa/playerhandler.cpp:129
+#: src/net/tmwa/playerhandler.cpp:130
 msgid "You are no more."
 msgstr "Więcej ciebie nie ma."
 
-#: src/net/tmwa/playerhandler.cpp:130
+#: src/net/tmwa/playerhandler.cpp:131
 msgid "You have ceased to be."
 msgstr "Przestałeś istnieć."
 
-#: src/net/tmwa/playerhandler.cpp:131
+#: src/net/tmwa/playerhandler.cpp:132
 msgid "You've expired and gone to meet your maker."
 msgstr "Odszedłeś na spotkanie ze swoim stwórcą."
 
-#: src/net/tmwa/playerhandler.cpp:132
+#: src/net/tmwa/playerhandler.cpp:133
 msgid "You're a stiff."
 msgstr "Jesteś sztywniakiem."
 
-#: src/net/tmwa/playerhandler.cpp:133
+#: src/net/tmwa/playerhandler.cpp:134
 msgid "Bereft of life, you rest in peace."
 msgstr "Opuściło cię życie. Teraz spoczywasz w spokoju."
 
-#: src/net/tmwa/playerhandler.cpp:134
+#: src/net/tmwa/playerhandler.cpp:135
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr "Gdybyś nie był taki aktywny, nadal byś zrywał kwiatki."
 
-#: src/net/tmwa/playerhandler.cpp:135
+#: src/net/tmwa/playerhandler.cpp:136
 msgid "Your metabolic processes are now history."
 msgstr "Twoje procesy metaboliczne są teraz historią."
 
-#: src/net/tmwa/playerhandler.cpp:136
+#: src/net/tmwa/playerhandler.cpp:137
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:137
+#: src/net/tmwa/playerhandler.cpp:138
 msgid "You've kicked the bucket."
 msgstr "Kopnąłeś w kalendarz."
 
-#: src/net/tmwa/playerhandler.cpp:138
+#: src/net/tmwa/playerhandler.cpp:139
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:140
+#: src/net/tmwa/playerhandler.cpp:141
 msgid "You are an ex-player."
 msgstr "Jesteś ex-graczem."
 
-#: src/net/tmwa/playerhandler.cpp:141
+#: src/net/tmwa/playerhandler.cpp:142
 msgid "You're pining for the fjords."
 msgstr "Usychasz z tęsknoty za fiordami."
 
-#: src/net/tmwa/playerhandler.cpp:327 src/net/tmwa/playerhandler.cpp:336
-#: src/net/tmwa/playerhandler.cpp:415
+#: src/net/tmwa/playerhandler.cpp:330 src/net/tmwa/playerhandler.cpp:339
+#: src/net/tmwa/playerhandler.cpp:418
 msgid "Message"
 msgstr "Wiadomość"
 
-#: src/net/tmwa/playerhandler.cpp:328
+#: src/net/tmwa/playerhandler.cpp:331
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr "Nosisz więcej, niż połowa twojej wagi. Nie możesz odzyskiwać zdrowia."
 
-#: src/net/tmwa/playerhandler.cpp:337
+#: src/net/tmwa/playerhandler.cpp:340
 #, fuzzy
 msgid "You are carrying less than half your weight. You are can regain health."
 msgstr "Nosisz więcej, niż połowa twojej wagi. Nie możesz odzyskiwać zdrowia."
 
-#: src/net/tmwa/playerhandler.cpp:442
+#: src/net/tmwa/playerhandler.cpp:445
 #, fuzzy, c-format
 msgid "You picked up %s."
 msgstr "Podniosłeś "
 
-#: src/net/tmwa/playerhandler.cpp:448
+#: src/net/tmwa/playerhandler.cpp:451
 #, fuzzy, c-format
 msgid "You spent %s."
 msgstr "Otrzymujesz %s"
 
-#: src/net/tmwa/playerhandler.cpp:493
+#: src/net/tmwa/playerhandler.cpp:496
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:613
+#: src/net/tmwa/playerhandler.cpp:616
 msgid "Equip arrows first."
 msgstr "Najpierw załóż strzały."
 
@@ -5266,32 +5306,32 @@ msgstr ""
 msgid "Floating bubble"
 msgstr ""
 
-#: src/resources/beinginfo.cpp:32 src/resources/itemdb.cpp:210
+#: src/resources/beinginfo.cpp:32 src/resources/itemdb.cpp:223
 #: src/resources/monsterdb.cpp:78
 msgid "unnamed"
 msgstr "nienazwany"
 
-#: src/resources/itemdb.cpp:55
+#: src/resources/itemdb.cpp:57
 #, c-format
 msgid "Attack %+d"
 msgstr "Atak %+d"
 
-#: src/resources/itemdb.cpp:56
+#: src/resources/itemdb.cpp:58
 #, c-format
 msgid "Defense %+d"
 msgstr "Obrona %+d"
 
-#: src/resources/itemdb.cpp:57
+#: src/resources/itemdb.cpp:59
 #, c-format
 msgid "HP %+d"
 msgstr "HP %+d"
 
-#: src/resources/itemdb.cpp:58
+#: src/resources/itemdb.cpp:60
 #, c-format
 msgid "MP %+d"
 msgstr "MP %+d"
 
-#: src/resources/itemdb.cpp:155
+#: src/resources/itemdb.cpp:152
 msgid "Unknown item"
 msgstr "Nieznany przedmiot"
 
diff --git a/po/pt.po b/po/pt.po
index b216fcc80..bca5e2281 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2011-01-06 03:06+0200\n"
+"POT-Creation-Date: 2011-01-13 21:49+0200\n"
 "PO-Revision-Date: 2010-03-05 13:28+0000\n"
 "Last-Translator: Tustiman <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
@@ -63,10 +63,10 @@ msgstr "Servidor"
 #: src/client.cpp:1029 src/client.cpp:1036 src/client.cpp:1171
 #: src/gui/changeemaildialog.cpp:154 src/gui/changepassworddialog.cpp:144
 #: src/gui/charcreatedialog.cpp:185 src/gui/register.cpp:225
-#: src/gui/serverdialog.cpp:350 src/gui/unregisterdialog.cpp:134
+#: src/gui/serverdialog.cpp:355 src/gui/unregisterdialog.cpp:134
 #: src/net/manaserv/charhandler.cpp:183 src/net/manaserv/charhandler.cpp:226
-#: src/net/tmwa/charserverhandler.cpp:137
-#: src/net/tmwa/charserverhandler.cpp:154
+#: src/net/tmwa/charserverhandler.cpp:161
+#: src/net/tmwa/charserverhandler.cpp:177
 msgid "Error"
 msgstr "Erro"
 
@@ -743,7 +743,7 @@ msgid "-"
 msgstr ""
 
 #: src/gui/buy.cpp:95 src/gui/quitdialog.cpp:43 src/gui/quitdialog.cpp:48
-#: src/gui/quitdialog.cpp:49 src/gui/sell.cpp:90 src/gui/serverdialog.cpp:244
+#: src/gui/quitdialog.cpp:49 src/gui/sell.cpp:90 src/gui/serverdialog.cpp:248
 #: src/keyboardconfig.cpp:275
 msgid "Quit"
 msgstr "Sair"
@@ -754,7 +754,7 @@ msgid "Max"
 msgstr "Máximo"
 
 #: src/gui/buysell.cpp:37 src/gui/buysell.cpp:46
-#: src/gui/inventorywindow.cpp:112
+#: src/gui/inventorywindow.cpp:134
 msgid "Shop"
 msgstr "Loja"
 
@@ -927,7 +927,7 @@ msgstr "Remover o Registo"
 msgid "Change Email"
 msgstr "Alterar e-mail"
 
-#: src/gui/charselectdialog.cpp:375 src/gui/serverdialog.cpp:248
+#: src/gui/charselectdialog.cpp:375 src/gui/serverdialog.cpp:252
 #: src/gui/setup_players.cpp:242 src/gui/shopwindow.cpp:117
 #: src/gui/shopwindow.cpp:120 src/gui/textcommandeditor.cpp:234
 msgid "Delete"
@@ -1175,8 +1175,8 @@ msgstr "OK"
 msgid "Equipment"
 msgstr "Equipamento"
 
-#: src/gui/equipmentwindow.cpp:91 src/gui/inventorywindow.cpp:96
-#: src/gui/inventorywindow.cpp:393 src/gui/inventorywindow.cpp:402
+#: src/gui/equipmentwindow.cpp:91 src/gui/inventorywindow.cpp:118
+#: src/gui/inventorywindow.cpp:443 src/gui/inventorywindow.cpp:452
 #: src/gui/popupmenu.cpp:1070 src/gui/popupmenu.cpp:1169
 #: src/gui/popupmenu.cpp:1209
 msgid "Unequip"
@@ -1186,68 +1186,77 @@ msgstr "Desequipar"
 msgid "Help"
 msgstr "Ajuda"
 
-#: src/gui/help.cpp:52 src/gui/inventorywindow.cpp:135
+#: src/gui/help.cpp:52 src/gui/inventorywindow.cpp:163
 #: src/gui/npcdialog.cpp:48 src/gui/shopwindow.cpp:108
 msgid "Close"
 msgstr "Fechar"
 
-#: src/gui/inventorywindow.cpp:62 src/gui/windowmenu.cpp:72
+#: src/gui/inventorywindow.cpp:65 src/gui/windowmenu.cpp:72
 msgid "Inventory"
 msgstr "Inventário"
 
-#: src/gui/inventorywindow.cpp:62
+#: src/gui/inventorywindow.cpp:65
 msgid "Storage"
 msgstr "Armazenamento"
 
-#: src/gui/inventorywindow.cpp:89
+#: src/gui/inventorywindow.cpp:92
 msgid "Slots:"
 msgstr "Entradas:"
 
-#: src/gui/inventorywindow.cpp:94 src/gui/inventorywindow.cpp:395
-#: src/gui/inventorywindow.cpp:404 src/gui/popupmenu.cpp:1072
+#: src/gui/inventorywindow.cpp:103
+msgid "Filter:"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:104
+#, fuzzy
+msgid "Sort:"
+msgstr "Porta:"
+
+#: src/gui/inventorywindow.cpp:116 src/gui/inventorywindow.cpp:445
+#: src/gui/inventorywindow.cpp:454 src/gui/popupmenu.cpp:1072
 #: src/gui/popupmenu.cpp:1171 src/gui/popupmenu.cpp:1211
 msgid "Equip"
 msgstr "Equipar"
 
-#: src/gui/inventorywindow.cpp:95 src/gui/inventorywindow.cpp:396
-#: src/gui/inventorywindow.cpp:400 src/gui/popupmenu.cpp:1075
+#: src/gui/inventorywindow.cpp:117 src/gui/inventorywindow.cpp:446
+#: src/gui/inventorywindow.cpp:450 src/gui/popupmenu.cpp:1075
 #: src/gui/popupmenu.cpp:1144 src/gui/popupmenu.cpp:1175
 #: src/gui/popupmenu.cpp:1214
 msgid "Use"
 msgstr "Usar"
 
-#: src/gui/inventorywindow.cpp:109 src/gui/inventorywindow.cpp:499
+#: src/gui/inventorywindow.cpp:131 src/gui/inventorywindow.cpp:549
 #: src/gui/popupmenu.cpp:1078 src/gui/popupmenu.cpp:1179
 #: src/gui/popupmenu.cpp:1217
 #, fuzzy
 msgid "Drop..."
 msgstr "Largar"
 
-#: src/gui/inventorywindow.cpp:110 src/gui/popupmenu.cpp:1083
+#: src/gui/inventorywindow.cpp:132 src/gui/popupmenu.cpp:1083
 #: src/gui/popupmenu.cpp:1184 src/gui/popupmenu.cpp:1222
 msgid "Split"
 msgstr "Dividir"
 
-#: src/gui/inventorywindow.cpp:111 src/gui/outfitwindow.cpp:56
+#: src/gui/inventorywindow.cpp:133 src/gui/outfitwindow.cpp:56
 #: src/gui/popupmenu.cpp:409
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:114
+#: src/gui/inventorywindow.cpp:136
 msgid "Weight:"
 msgstr "Peso:"
 
-#: src/gui/inventorywindow.cpp:133 src/gui/inventorywindow.cpp:490
+#: src/gui/inventorywindow.cpp:161 src/gui/inventorywindow.cpp:540
 #: src/gui/popupmenu.cpp:1087 src/gui/popupmenu.cpp:1187
 #: src/gui/popupmenu.cpp:1225 src/gui/setup.cpp:65
 msgid "Store"
 msgstr "Guardar"
 
-#: src/gui/inventorywindow.cpp:134 src/gui/popupmenu.cpp:1106
+#: src/gui/inventorywindow.cpp:162 src/gui/popupmenu.cpp:1106
 msgid "Retrieve"
 msgstr "Recuperar"
 
-#: src/gui/inventorywindow.cpp:501 src/gui/popupmenu.cpp:1080
+#: src/gui/inventorywindow.cpp:551 src/gui/popupmenu.cpp:1080
 #: src/gui/popupmenu.cpp:1181 src/gui/popupmenu.cpp:1219
 #: src/gui/windowmenu.cpp:91
 msgid "Drop"
@@ -1436,7 +1445,7 @@ msgstr ""
 msgid "Login"
 msgstr "Autenticar"
 
-#: src/gui/login.cpp:87 src/gui/serverdialog.cpp:221
+#: src/gui/login.cpp:87 src/gui/serverdialog.cpp:222
 #: src/gui/widgets/chattab.cpp:166
 msgid "Server:"
 msgstr "Servidor:"
@@ -1864,56 +1873,60 @@ msgstr "As senhas não coincidem."
 msgid "Choose Your Server"
 msgstr "Selecione seu servidor"
 
-#: src/gui/serverdialog.cpp:222
+#: src/gui/serverdialog.cpp:223
 msgid "Port:"
 msgstr "Porta:"
 
-#: src/gui/serverdialog.cpp:223
+#: src/gui/serverdialog.cpp:224
 #, fuzzy
 msgid "Server type:"
 msgstr "Servidor:"
 
-#: src/gui/serverdialog.cpp:245
+#: src/gui/serverdialog.cpp:227
+msgid "Use same ip for game sub servers"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:249
 msgid "Load"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:246
+#: src/gui/serverdialog.cpp:250
 #, fuzzy
 msgid "Connect"
 msgstr "Conectando..."
 
-#: src/gui/serverdialog.cpp:247
+#: src/gui/serverdialog.cpp:251
 #, fuzzy
 msgid "Custom Server"
 msgstr "Cursor personalizado"
 
-#: src/gui/serverdialog.cpp:351
+#: src/gui/serverdialog.cpp:356
 msgid "Please type both the address and the port of a server."
 msgstr "Por favor escreva o endereço e a porta do servidor."
 
-#: src/gui/serverdialog.cpp:482
+#: src/gui/serverdialog.cpp:488
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:488
+#: src/gui/serverdialog.cpp:494
 #, fuzzy
 msgid "Waiting for server..."
 msgstr "Aguardando servidor"
 
-#: src/gui/serverdialog.cpp:492
+#: src/gui/serverdialog.cpp:498
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:496
+#: src/gui/serverdialog.cpp:502
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:593
+#: src/gui/serverdialog.cpp:599
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:595
+#: src/gui/serverdialog.cpp:601
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -3900,7 +3913,7 @@ msgstr[1] "Você pegou %s [@@%d|%s@@]."
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:3617
+#: src/localplayer.cpp:3618
 #, fuzzy
 msgid "You see "
 msgstr "Você obteve %s"
@@ -4068,27 +4081,27 @@ msgstr "Força de Vontade:"
 msgid "Willpower %+.1f"
 msgstr "Força de vontade %+d"
 
-#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:104
+#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:105
 msgid "You are dead."
 msgstr "Você está morto."
 
-#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:105
+#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:106
 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:317 src/net/tmwa/playerhandler.cpp:107
+#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:108
 msgid "You are not that alive anymore."
 msgstr "Você não está mais vivo."
 
-#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:108
+#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:109
 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:319 src/net/tmwa/playerhandler.cpp:109
+#: src/net/manaserv/beinghandler.cpp:319 src/net/tmwa/playerhandler.cpp:110
 msgid "Game Over!"
 msgstr "Fim de jogo!"
 
-#: src/net/manaserv/beinghandler.cpp:320 src/net/tmwa/playerhandler.cpp:111
+#: src/net/manaserv/beinghandler.cpp:320 src/net/tmwa/playerhandler.cpp:112
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
@@ -4096,7 +4109,7 @@ msgstr ""
 "Não, crianças. Seu personagem não morreu de verdade. Ele... err... foi para "
 "um lugar melhor."
 
-#: src/net/manaserv/beinghandler.cpp:322 src/net/tmwa/playerhandler.cpp:113
+#: src/net/manaserv/beinghandler.cpp:322 src/net/tmwa/playerhandler.cpp:114
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
@@ -4104,27 +4117,27 @@ msgstr ""
 "Seu plano de quebrar as armas de seus inimigos com o seu pescoço não deu "
 "certo."
 
-#: src/net/manaserv/beinghandler.cpp:324 src/net/tmwa/playerhandler.cpp:115
+#: src/net/manaserv/beinghandler.cpp:324 src/net/tmwa/playerhandler.cpp:116
 msgid "I guess this did not run too well."
 msgstr "Eu acho que isso não correu lá muito bem."
 
-#: src/net/manaserv/beinghandler.cpp:325 src/net/tmwa/playerhandler.cpp:117
+#: src/net/manaserv/beinghandler.cpp:325 src/net/tmwa/playerhandler.cpp:118
 msgid "Do you want your possessions identified?"
 msgstr "Você quer uma identificação de suas posses?"
 
-#: src/net/manaserv/beinghandler.cpp:326 src/net/tmwa/playerhandler.cpp:119
+#: src/net/manaserv/beinghandler.cpp:326 src/net/tmwa/playerhandler.cpp:120
 msgid "Sadly, no trace of you was ever found..."
 msgstr "Infelizmente, seus vestigios nunca foram encontrados..."
 
-#: src/net/manaserv/beinghandler.cpp:328 src/net/tmwa/playerhandler.cpp:121
+#: src/net/manaserv/beinghandler.cpp:328 src/net/tmwa/playerhandler.cpp:122
 msgid "Annihilated."
 msgstr "Aniquilado."
 
-#: src/net/manaserv/beinghandler.cpp:329 src/net/tmwa/playerhandler.cpp:123
+#: src/net/manaserv/beinghandler.cpp:329 src/net/tmwa/playerhandler.cpp:124
 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:331 src/net/tmwa/playerhandler.cpp:125
+#: src/net/manaserv/beinghandler.cpp:331 src/net/tmwa/playerhandler.cpp:126
 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."
@@ -4191,12 +4204,12 @@ msgstr ""
 #: src/net/manaserv/charhandler.cpp:180 src/net/manaserv/loginhandler.cpp:98
 #: src/net/manaserv/loginhandler.cpp:130 src/net/manaserv/loginhandler.cpp:166
 #: src/net/manaserv/loginhandler.cpp:286 src/net/manaserv/loginhandler.cpp:323
-#: src/net/tmwa/loginhandler.cpp:99 src/net/tmwa/loginhandler.cpp:187
+#: src/net/tmwa/loginhandler.cpp:99 src/net/tmwa/loginhandler.cpp:190
 #, fuzzy
 msgid "Unknown error."
 msgstr "Erro desconhecido"
 
-#: src/net/manaserv/charhandler.cpp:209 src/net/tmwa/charserverhandler.cpp:149
+#: src/net/manaserv/charhandler.cpp:209 src/net/tmwa/charserverhandler.cpp:172
 msgid "Info"
 msgstr "Info"
 
@@ -4436,61 +4449,88 @@ msgstr "Obrigado pela compra."
 msgid "Unable to buy."
 msgstr "Impossível comprar."
 
-#: src/net/tmwa/buysellhandler.cpp:143
+#: src/net/tmwa/buysellhandler.cpp:145
 msgid "Thanks for selling."
 msgstr "Obrigado pela venda."
 
-#: src/net/tmwa/buysellhandler.cpp:145
+#: src/net/tmwa/buysellhandler.cpp:149
 msgid "Unable to sell."
 msgstr "Impossibilitado de vender."
 
-#: src/net/tmwa/charserverhandler.cpp:106
+#: src/net/tmwa/buysellhandler.cpp:152
+#, fuzzy
+msgid "Unable to sell while trading."
+msgstr "Impossibilitado de vender."
+
+#: src/net/tmwa/buysellhandler.cpp:155
+#, fuzzy
+msgid "Unable to sell unsellable item."
+msgstr "Impossível pegar item."
+
+#: src/net/tmwa/charserverhandler.cpp:109
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:110
+#: src/net/tmwa/charserverhandler.cpp:113
 #, fuzzy
 msgid "Cannot use this ID."
 msgstr "Não é possível usar esta ID"
 
-#: src/net/tmwa/charserverhandler.cpp:113
+#: src/net/tmwa/charserverhandler.cpp:116
 #, fuzzy
 msgid "Unknown char-server failure."
 msgstr "Erro desconhecido"
 
-#: src/net/tmwa/charserverhandler.cpp:137
+#: src/net/tmwa/charserverhandler.cpp:145
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr "Erro ao criar personagem. Provavelmente o nome já está sendo usado."
 
-#: src/net/tmwa/charserverhandler.cpp:149
+#: src/net/tmwa/charserverhandler.cpp:149 src/net/tmwa/loginhandler.cpp:187
+#, fuzzy
+msgid "Wrong name."
+msgstr "Simbolo-mágico errado."
+
+#: src/net/tmwa/charserverhandler.cpp:152
+msgid "Incorrect stats."
+msgstr ""
+
+#: src/net/tmwa/charserverhandler.cpp:155
+msgid "Incorrect hair."
+msgstr ""
+
+#: src/net/tmwa/charserverhandler.cpp:158
+msgid "Incorrect slot."
+msgstr ""
+
+#: src/net/tmwa/charserverhandler.cpp:172
 msgid "Character deleted."
 msgstr "Personagem apagado."
 
-#: src/net/tmwa/charserverhandler.cpp:154
+#: src/net/tmwa/charserverhandler.cpp:177
 msgid "Failed to delete character."
 msgstr "Falha ao apagar personagem."
 
-#: src/net/tmwa/charserverhandler.cpp:286
+#: src/net/tmwa/charserverhandler.cpp:317
 msgid "Strength:"
 msgstr "Força:"
 
-#: src/net/tmwa/charserverhandler.cpp:287
+#: src/net/tmwa/charserverhandler.cpp:318
 msgid "Agility:"
 msgstr "Agilidade:"
 
-#: src/net/tmwa/charserverhandler.cpp:288
+#: src/net/tmwa/charserverhandler.cpp:319
 msgid "Vitality:"
 msgstr "Vitalidade:"
 
-#: src/net/tmwa/charserverhandler.cpp:289
+#: src/net/tmwa/charserverhandler.cpp:320
 msgid "Intelligence:"
 msgstr "Inteligência:"
 
-#: src/net/tmwa/charserverhandler.cpp:290
+#: src/net/tmwa/charserverhandler.cpp:321
 msgid "Dexterity:"
 msgstr "Destreza:"
 
-#: src/net/tmwa/charserverhandler.cpp:291
+#: src/net/tmwa/charserverhandler.cpp:322
 msgid "Luck:"
 msgstr "Sorte:"
 
@@ -4897,11 +4937,11 @@ msgstr "Não é possível partilhar experiência."
 msgid "Experience sharing unknown."
 msgstr "Partilha de experiência habilitado."
 
-#: src/net/tmwa/inventoryhandler.cpp:334
+#: src/net/tmwa/inventoryhandler.cpp:343
 msgid "Failed to use item."
 msgstr "Problemas ao usar item."
 
-#: src/net/tmwa/inventoryhandler.cpp:457
+#: src/net/tmwa/inventoryhandler.cpp:472
 msgid "Unable to equip."
 msgstr "Impossível equipar."
 
@@ -5022,51 +5062,51 @@ msgstr "Um membro desconhecido tentou dizer: %s"
 msgid "%s is not in your party!"
 msgstr "%s não está em seu grupo!"
 
-#: src/net/tmwa/playerhandler.cpp:110
+#: src/net/tmwa/playerhandler.cpp:111
 msgid "Insert coin to continue."
 msgstr "Insira uma moeda para continuar."
 
-#: src/net/tmwa/playerhandler.cpp:128
+#: src/net/tmwa/playerhandler.cpp:129
 msgid "You're not dead yet. You're just resting."
 msgstr "Você não morreu ainda. Está apenas descansando."
 
-#: src/net/tmwa/playerhandler.cpp:129
+#: src/net/tmwa/playerhandler.cpp:130
 msgid "You are no more."
 msgstr "Você não é mais."
 
-#: src/net/tmwa/playerhandler.cpp:130
+#: src/net/tmwa/playerhandler.cpp:131
 msgid "You have ceased to be."
 msgstr "Você deixou de ser."
 
-#: src/net/tmwa/playerhandler.cpp:131
+#: src/net/tmwa/playerhandler.cpp:132
 msgid "You've expired and gone to meet your maker."
 msgstr "Você expirou e foi encontrar o seu criador."
 
-#: src/net/tmwa/playerhandler.cpp:132
+#: src/net/tmwa/playerhandler.cpp:133
 msgid "You're a stiff."
 msgstr "Você é um cadáver."
 
-#: src/net/tmwa/playerhandler.cpp:133
+#: src/net/tmwa/playerhandler.cpp:134
 msgid "Bereft of life, you rest in peace."
 msgstr "Sem vida, descanse em paz."
 
-#: src/net/tmwa/playerhandler.cpp:134
+#: src/net/tmwa/playerhandler.cpp:135
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr "Se não fosse tão animado, estaria comendo grama pela raiz."
 
-#: src/net/tmwa/playerhandler.cpp:135
+#: src/net/tmwa/playerhandler.cpp:136
 msgid "Your metabolic processes are now history."
 msgstr "Seus processos metabólicos são história agora."
 
-#: src/net/tmwa/playerhandler.cpp:136
+#: src/net/tmwa/playerhandler.cpp:137
 msgid "You're off the twig."
 msgstr "Você bateu as botas."
 
-#: src/net/tmwa/playerhandler.cpp:137
+#: src/net/tmwa/playerhandler.cpp:138
 msgid "You've kicked the bucket."
 msgstr "Você chutou o balde."
 
-#: src/net/tmwa/playerhandler.cpp:138
+#: src/net/tmwa/playerhandler.cpp:139
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
@@ -5074,48 +5114,48 @@ msgstr ""
 "Você dispensou seu corpo mortal, abaixou as cortinas e juntou-se ao maldito "
 "coro invisível."
 
-#: src/net/tmwa/playerhandler.cpp:140
+#: src/net/tmwa/playerhandler.cpp:141
 msgid "You are an ex-player."
 msgstr "Você é um ex-jogador"
 
-#: src/net/tmwa/playerhandler.cpp:141
+#: src/net/tmwa/playerhandler.cpp:142
 msgid "You're pining for the fjords."
 msgstr "Você foi desta para melhor."
 
-#: src/net/tmwa/playerhandler.cpp:327 src/net/tmwa/playerhandler.cpp:336
-#: src/net/tmwa/playerhandler.cpp:415
+#: src/net/tmwa/playerhandler.cpp:330 src/net/tmwa/playerhandler.cpp:339
+#: src/net/tmwa/playerhandler.cpp:418
 msgid "Message"
 msgstr "Mensagem"
 
-#: src/net/tmwa/playerhandler.cpp:328
+#: src/net/tmwa/playerhandler.cpp:331
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 "Você está carregando mais que a metade de seu peso. Você não poderá mais "
 "recuperar HP."
 
-#: src/net/tmwa/playerhandler.cpp:337
+#: src/net/tmwa/playerhandler.cpp:340
 #, fuzzy
 msgid "You are carrying less than half your weight. You are can regain health."
 msgstr ""
 "Você está carregando mais que a metade de seu peso. Você não poderá mais "
 "recuperar HP."
 
-#: src/net/tmwa/playerhandler.cpp:442
+#: src/net/tmwa/playerhandler.cpp:445
 #, fuzzy, c-format
 msgid "You picked up %s."
 msgstr "Você pegou "
 
-#: src/net/tmwa/playerhandler.cpp:448
+#: src/net/tmwa/playerhandler.cpp:451
 #, fuzzy, c-format
 msgid "You spent %s."
 msgstr "Você obteve %s"
 
-#: src/net/tmwa/playerhandler.cpp:493
+#: src/net/tmwa/playerhandler.cpp:496
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:613
+#: src/net/tmwa/playerhandler.cpp:616
 msgid "Equip arrows first."
 msgstr "Equipe as flechas primeiro."
 
@@ -5265,32 +5305,32 @@ msgstr ""
 msgid "Floating bubble"
 msgstr ""
 
-#: src/resources/beinginfo.cpp:32 src/resources/itemdb.cpp:210
+#: src/resources/beinginfo.cpp:32 src/resources/itemdb.cpp:223
 #: src/resources/monsterdb.cpp:78
 msgid "unnamed"
 msgstr "sem nome"
 
-#: src/resources/itemdb.cpp:55
+#: src/resources/itemdb.cpp:57
 #, c-format
 msgid "Attack %+d"
 msgstr "Ataque %+d"
 
-#: src/resources/itemdb.cpp:56
+#: src/resources/itemdb.cpp:58
 #, c-format
 msgid "Defense %+d"
 msgstr "Defesa %+d"
 
-#: src/resources/itemdb.cpp:57
+#: src/resources/itemdb.cpp:59
 #, c-format
 msgid "HP %+d"
 msgstr "HP %+d"
 
-#: src/resources/itemdb.cpp:58
+#: src/resources/itemdb.cpp:60
 #, c-format
 msgid "MP %+d"
 msgstr "MP %+d"
 
-#: src/resources/itemdb.cpp:155
+#: src/resources/itemdb.cpp:152
 msgid "Unknown item"
 msgstr "Item desconhecido"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index cd36c55e5..646818694 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2011-01-06 03:06+0200\n"
+"POT-Creation-Date: 2011-01-13 21:49+0200\n"
 "PO-Revision-Date: 2010-02-17 04:42+0000\n"
 "Last-Translator: alms21 <alms21@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
@@ -63,10 +63,10 @@ msgstr "Servidor"
 #: src/client.cpp:1029 src/client.cpp:1036 src/client.cpp:1171
 #: src/gui/changeemaildialog.cpp:154 src/gui/changepassworddialog.cpp:144
 #: src/gui/charcreatedialog.cpp:185 src/gui/register.cpp:225
-#: src/gui/serverdialog.cpp:350 src/gui/unregisterdialog.cpp:134
+#: src/gui/serverdialog.cpp:355 src/gui/unregisterdialog.cpp:134
 #: src/net/manaserv/charhandler.cpp:183 src/net/manaserv/charhandler.cpp:226
-#: src/net/tmwa/charserverhandler.cpp:137
-#: src/net/tmwa/charserverhandler.cpp:154
+#: src/net/tmwa/charserverhandler.cpp:161
+#: src/net/tmwa/charserverhandler.cpp:177
 msgid "Error"
 msgstr "Erro"
 
@@ -743,7 +743,7 @@ msgid "-"
 msgstr ""
 
 #: src/gui/buy.cpp:95 src/gui/quitdialog.cpp:43 src/gui/quitdialog.cpp:48
-#: src/gui/quitdialog.cpp:49 src/gui/sell.cpp:90 src/gui/serverdialog.cpp:244
+#: src/gui/quitdialog.cpp:49 src/gui/sell.cpp:90 src/gui/serverdialog.cpp:248
 #: src/keyboardconfig.cpp:275
 msgid "Quit"
 msgstr "Sair"
@@ -754,7 +754,7 @@ msgid "Max"
 msgstr "Máximo"
 
 #: src/gui/buysell.cpp:37 src/gui/buysell.cpp:46
-#: src/gui/inventorywindow.cpp:112
+#: src/gui/inventorywindow.cpp:134
 msgid "Shop"
 msgstr "Loja"
 
@@ -927,7 +927,7 @@ msgstr "Cancelar Registro"
 msgid "Change Email"
 msgstr "Alterar e-mail"
 
-#: src/gui/charselectdialog.cpp:375 src/gui/serverdialog.cpp:248
+#: src/gui/charselectdialog.cpp:375 src/gui/serverdialog.cpp:252
 #: src/gui/setup_players.cpp:242 src/gui/shopwindow.cpp:117
 #: src/gui/shopwindow.cpp:120 src/gui/textcommandeditor.cpp:234
 msgid "Delete"
@@ -1175,8 +1175,8 @@ msgstr "OK"
 msgid "Equipment"
 msgstr "Equipamento"
 
-#: src/gui/equipmentwindow.cpp:91 src/gui/inventorywindow.cpp:96
-#: src/gui/inventorywindow.cpp:393 src/gui/inventorywindow.cpp:402
+#: src/gui/equipmentwindow.cpp:91 src/gui/inventorywindow.cpp:118
+#: src/gui/inventorywindow.cpp:443 src/gui/inventorywindow.cpp:452
 #: src/gui/popupmenu.cpp:1070 src/gui/popupmenu.cpp:1169
 #: src/gui/popupmenu.cpp:1209
 msgid "Unequip"
@@ -1186,68 +1186,77 @@ msgstr "Desequipar"
 msgid "Help"
 msgstr "Ajuda"
 
-#: src/gui/help.cpp:52 src/gui/inventorywindow.cpp:135
+#: src/gui/help.cpp:52 src/gui/inventorywindow.cpp:163
 #: src/gui/npcdialog.cpp:48 src/gui/shopwindow.cpp:108
 msgid "Close"
 msgstr "Fechar"
 
-#: src/gui/inventorywindow.cpp:62 src/gui/windowmenu.cpp:72
+#: src/gui/inventorywindow.cpp:65 src/gui/windowmenu.cpp:72
 msgid "Inventory"
 msgstr "Inventório"
 
-#: src/gui/inventorywindow.cpp:62
+#: src/gui/inventorywindow.cpp:65
 msgid "Storage"
 msgstr "Armazenamento"
 
-#: src/gui/inventorywindow.cpp:89
+#: src/gui/inventorywindow.cpp:92
 msgid "Slots:"
 msgstr "Entradas:"
 
-#: src/gui/inventorywindow.cpp:94 src/gui/inventorywindow.cpp:395
-#: src/gui/inventorywindow.cpp:404 src/gui/popupmenu.cpp:1072
+#: src/gui/inventorywindow.cpp:103
+msgid "Filter:"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:104
+#, fuzzy
+msgid "Sort:"
+msgstr "Porta:"
+
+#: src/gui/inventorywindow.cpp:116 src/gui/inventorywindow.cpp:445
+#: src/gui/inventorywindow.cpp:454 src/gui/popupmenu.cpp:1072
 #: src/gui/popupmenu.cpp:1171 src/gui/popupmenu.cpp:1211
 msgid "Equip"
 msgstr "Equipar"
 
-#: src/gui/inventorywindow.cpp:95 src/gui/inventorywindow.cpp:396
-#: src/gui/inventorywindow.cpp:400 src/gui/popupmenu.cpp:1075
+#: src/gui/inventorywindow.cpp:117 src/gui/inventorywindow.cpp:446
+#: src/gui/inventorywindow.cpp:450 src/gui/popupmenu.cpp:1075
 #: src/gui/popupmenu.cpp:1144 src/gui/popupmenu.cpp:1175
 #: src/gui/popupmenu.cpp:1214
 msgid "Use"
 msgstr "Usar"
 
-#: src/gui/inventorywindow.cpp:109 src/gui/inventorywindow.cpp:499
+#: src/gui/inventorywindow.cpp:131 src/gui/inventorywindow.cpp:549
 #: src/gui/popupmenu.cpp:1078 src/gui/popupmenu.cpp:1179
 #: src/gui/popupmenu.cpp:1217
 #, fuzzy
 msgid "Drop..."
 msgstr "Descartar"
 
-#: src/gui/inventorywindow.cpp:110 src/gui/popupmenu.cpp:1083
+#: src/gui/inventorywindow.cpp:132 src/gui/popupmenu.cpp:1083
 #: src/gui/popupmenu.cpp:1184 src/gui/popupmenu.cpp:1222
 msgid "Split"
 msgstr "Dividir"
 
-#: src/gui/inventorywindow.cpp:111 src/gui/outfitwindow.cpp:56
+#: src/gui/inventorywindow.cpp:133 src/gui/outfitwindow.cpp:56
 #: src/gui/popupmenu.cpp:409
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:114
+#: src/gui/inventorywindow.cpp:136
 msgid "Weight:"
 msgstr "Peso:"
 
-#: src/gui/inventorywindow.cpp:133 src/gui/inventorywindow.cpp:490
+#: src/gui/inventorywindow.cpp:161 src/gui/inventorywindow.cpp:540
 #: src/gui/popupmenu.cpp:1087 src/gui/popupmenu.cpp:1187
 #: src/gui/popupmenu.cpp:1225 src/gui/setup.cpp:65
 msgid "Store"
 msgstr "Guardar"
 
-#: src/gui/inventorywindow.cpp:134 src/gui/popupmenu.cpp:1106
+#: src/gui/inventorywindow.cpp:162 src/gui/popupmenu.cpp:1106
 msgid "Retrieve"
 msgstr "Retirar"
 
-#: src/gui/inventorywindow.cpp:501 src/gui/popupmenu.cpp:1080
+#: src/gui/inventorywindow.cpp:551 src/gui/popupmenu.cpp:1080
 #: src/gui/popupmenu.cpp:1181 src/gui/popupmenu.cpp:1219
 #: src/gui/windowmenu.cpp:91
 msgid "Drop"
@@ -1436,7 +1445,7 @@ msgstr ""
 msgid "Login"
 msgstr "Login"
 
-#: src/gui/login.cpp:87 src/gui/serverdialog.cpp:221
+#: src/gui/login.cpp:87 src/gui/serverdialog.cpp:222
 #: src/gui/widgets/chattab.cpp:166
 msgid "Server:"
 msgstr "Servidor:"
@@ -1864,56 +1873,60 @@ msgstr "Senhas não conferem."
 msgid "Choose Your Server"
 msgstr "Selecione seu servidor"
 
-#: src/gui/serverdialog.cpp:222
+#: src/gui/serverdialog.cpp:223
 msgid "Port:"
 msgstr "Porta:"
 
-#: src/gui/serverdialog.cpp:223
+#: src/gui/serverdialog.cpp:224
 #, fuzzy
 msgid "Server type:"
 msgstr "Servidor:"
 
-#: src/gui/serverdialog.cpp:245
+#: src/gui/serverdialog.cpp:227
+msgid "Use same ip for game sub servers"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:249
 msgid "Load"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:246
+#: src/gui/serverdialog.cpp:250
 #, fuzzy
 msgid "Connect"
 msgstr "Conectando..."
 
-#: src/gui/serverdialog.cpp:247
+#: src/gui/serverdialog.cpp:251
 #, fuzzy
 msgid "Custom Server"
 msgstr "Cursor customizado"
 
-#: src/gui/serverdialog.cpp:351
+#: src/gui/serverdialog.cpp:356
 msgid "Please type both the address and the port of a server."
 msgstr "Por favor especifique o endereço e a porta do servidor."
 
-#: src/gui/serverdialog.cpp:482
+#: src/gui/serverdialog.cpp:488
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:488
+#: src/gui/serverdialog.cpp:494
 #, fuzzy
 msgid "Waiting for server..."
 msgstr "Aguardando servidor"
 
-#: src/gui/serverdialog.cpp:492
+#: src/gui/serverdialog.cpp:498
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:496
+#: src/gui/serverdialog.cpp:502
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:593
+#: src/gui/serverdialog.cpp:599
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:595
+#: src/gui/serverdialog.cpp:601
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -3901,7 +3914,7 @@ msgstr[1] "Você pegou %s [@@%d|%s@@]."
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:3617
+#: src/localplayer.cpp:3618
 #, fuzzy
 msgid "You see "
 msgstr "Você obteve %s"
@@ -4071,27 +4084,27 @@ msgstr "Força de Vontade:"
 msgid "Willpower %+.1f"
 msgstr "Força de vontade %+d"
 
-#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:104
+#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:105
 msgid "You are dead."
 msgstr "Você está morto."
 
-#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:105
+#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:106
 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:317 src/net/tmwa/playerhandler.cpp:107
+#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:108
 msgid "You are not that alive anymore."
 msgstr "Você não está mais tão vivo."
 
-#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:108
+#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:109
 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:319 src/net/tmwa/playerhandler.cpp:109
+#: src/net/manaserv/beinghandler.cpp:319 src/net/tmwa/playerhandler.cpp:110
 msgid "Game Over!"
 msgstr "Fim de jogo!"
 
-#: src/net/manaserv/beinghandler.cpp:320 src/net/tmwa/playerhandler.cpp:111
+#: src/net/manaserv/beinghandler.cpp:320 src/net/tmwa/playerhandler.cpp:112
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
@@ -4099,7 +4112,7 @@ msgstr ""
 "Não, crianças. Seu personagem não morreu de verdade. Ele... err... foi para "
 "um lugar melhor."
 
-#: src/net/manaserv/beinghandler.cpp:322 src/net/tmwa/playerhandler.cpp:113
+#: src/net/manaserv/beinghandler.cpp:322 src/net/tmwa/playerhandler.cpp:114
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
@@ -4107,27 +4120,27 @@ msgstr ""
 "Seu plano de quebrar as armas de seus inimigos com o seu pescoço não deu "
 "certo."
 
-#: src/net/manaserv/beinghandler.cpp:324 src/net/tmwa/playerhandler.cpp:115
+#: src/net/manaserv/beinghandler.cpp:324 src/net/tmwa/playerhandler.cpp:116
 msgid "I guess this did not run too well."
 msgstr "Eu acho que isso não funcionou muito bem."
 
-#: src/net/manaserv/beinghandler.cpp:325 src/net/tmwa/playerhandler.cpp:117
+#: src/net/manaserv/beinghandler.cpp:325 src/net/tmwa/playerhandler.cpp:118
 msgid "Do you want your possessions identified?"
 msgstr "Você quer uma identificação de suas posses?"
 
-#: src/net/manaserv/beinghandler.cpp:326 src/net/tmwa/playerhandler.cpp:119
+#: src/net/manaserv/beinghandler.cpp:326 src/net/tmwa/playerhandler.cpp:120
 msgid "Sadly, no trace of you was ever found..."
 msgstr "Infelizmente, seus traços nunca foram encontrados..."
 
-#: src/net/manaserv/beinghandler.cpp:328 src/net/tmwa/playerhandler.cpp:121
+#: src/net/manaserv/beinghandler.cpp:328 src/net/tmwa/playerhandler.cpp:122
 msgid "Annihilated."
 msgstr "Aniquilado."
 
-#: src/net/manaserv/beinghandler.cpp:329 src/net/tmwa/playerhandler.cpp:123
+#: src/net/manaserv/beinghandler.cpp:329 src/net/tmwa/playerhandler.cpp:124
 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:331 src/net/tmwa/playerhandler.cpp:125
+#: src/net/manaserv/beinghandler.cpp:331 src/net/tmwa/playerhandler.cpp:126
 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."
@@ -4194,12 +4207,12 @@ msgstr ""
 #: src/net/manaserv/charhandler.cpp:180 src/net/manaserv/loginhandler.cpp:98
 #: src/net/manaserv/loginhandler.cpp:130 src/net/manaserv/loginhandler.cpp:166
 #: src/net/manaserv/loginhandler.cpp:286 src/net/manaserv/loginhandler.cpp:323
-#: src/net/tmwa/loginhandler.cpp:99 src/net/tmwa/loginhandler.cpp:187
+#: src/net/tmwa/loginhandler.cpp:99 src/net/tmwa/loginhandler.cpp:190
 #, fuzzy
 msgid "Unknown error."
 msgstr "Erro desconhecido"
 
-#: src/net/manaserv/charhandler.cpp:209 src/net/tmwa/charserverhandler.cpp:149
+#: src/net/manaserv/charhandler.cpp:209 src/net/tmwa/charserverhandler.cpp:172
 msgid "Info"
 msgstr "Informações"
 
@@ -4439,61 +4452,88 @@ msgstr "Obrigado pela compra."
 msgid "Unable to buy."
 msgstr "Impossível comprar."
 
-#: src/net/tmwa/buysellhandler.cpp:143
+#: src/net/tmwa/buysellhandler.cpp:145
 msgid "Thanks for selling."
 msgstr "Obrigado pela venda."
 
-#: src/net/tmwa/buysellhandler.cpp:145
+#: src/net/tmwa/buysellhandler.cpp:149
 msgid "Unable to sell."
 msgstr "Impossibilitado de vender."
 
-#: src/net/tmwa/charserverhandler.cpp:106
+#: src/net/tmwa/buysellhandler.cpp:152
+#, fuzzy
+msgid "Unable to sell while trading."
+msgstr "Impossibilitado de vender."
+
+#: src/net/tmwa/buysellhandler.cpp:155
+#, fuzzy
+msgid "Unable to sell unsellable item."
+msgstr "Impossível pegar ítem."
+
+#: src/net/tmwa/charserverhandler.cpp:109
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:110
+#: src/net/tmwa/charserverhandler.cpp:113
 #, fuzzy
 msgid "Cannot use this ID."
 msgstr "Não é possível usar este ID"
 
-#: src/net/tmwa/charserverhandler.cpp:113
+#: src/net/tmwa/charserverhandler.cpp:116
 #, fuzzy
 msgid "Unknown char-server failure."
 msgstr "Erro desconhecido"
 
-#: src/net/tmwa/charserverhandler.cpp:137
+#: src/net/tmwa/charserverhandler.cpp:145
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr "Erro ao criar personagem. Provavelmente o nome já está sendo usado."
 
-#: src/net/tmwa/charserverhandler.cpp:149
+#: src/net/tmwa/charserverhandler.cpp:149 src/net/tmwa/loginhandler.cpp:187
+#, fuzzy
+msgid "Wrong name."
+msgstr "Simbolo-mágico errado."
+
+#: src/net/tmwa/charserverhandler.cpp:152
+msgid "Incorrect stats."
+msgstr ""
+
+#: src/net/tmwa/charserverhandler.cpp:155
+msgid "Incorrect hair."
+msgstr ""
+
+#: src/net/tmwa/charserverhandler.cpp:158
+msgid "Incorrect slot."
+msgstr ""
+
+#: src/net/tmwa/charserverhandler.cpp:172
 msgid "Character deleted."
 msgstr "Personagem deletado."
 
-#: src/net/tmwa/charserverhandler.cpp:154
+#: src/net/tmwa/charserverhandler.cpp:177
 msgid "Failed to delete character."
 msgstr "Falha ao deletar personagem."
 
-#: src/net/tmwa/charserverhandler.cpp:286
+#: src/net/tmwa/charserverhandler.cpp:317
 msgid "Strength:"
 msgstr "Força:"
 
-#: src/net/tmwa/charserverhandler.cpp:287
+#: src/net/tmwa/charserverhandler.cpp:318
 msgid "Agility:"
 msgstr "Agilidade:"
 
-#: src/net/tmwa/charserverhandler.cpp:288
+#: src/net/tmwa/charserverhandler.cpp:319
 msgid "Vitality:"
 msgstr "Vitalidade:"
 
-#: src/net/tmwa/charserverhandler.cpp:289
+#: src/net/tmwa/charserverhandler.cpp:320
 msgid "Intelligence:"
 msgstr "Inteligência:"
 
-#: src/net/tmwa/charserverhandler.cpp:290
+#: src/net/tmwa/charserverhandler.cpp:321
 msgid "Dexterity:"
 msgstr "Destreza:"
 
-#: src/net/tmwa/charserverhandler.cpp:291
+#: src/net/tmwa/charserverhandler.cpp:322
 msgid "Luck:"
 msgstr "Sorte"
 
@@ -4903,11 +4943,11 @@ msgstr "Não é possível compartilhar experiência."
 msgid "Experience sharing unknown."
 msgstr "Compartilhamento de experiência habilitado."
 
-#: src/net/tmwa/inventoryhandler.cpp:334
+#: src/net/tmwa/inventoryhandler.cpp:343
 msgid "Failed to use item."
 msgstr "Problemas ao usar ítem."
 
-#: src/net/tmwa/inventoryhandler.cpp:457
+#: src/net/tmwa/inventoryhandler.cpp:472
 msgid "Unable to equip."
 msgstr "Impossível equipar."
 
@@ -5028,51 +5068,51 @@ msgstr "Um membro desconhecido tentou dizer: %s"
 msgid "%s is not in your party!"
 msgstr "%s não está em seu grupo!"
 
-#: src/net/tmwa/playerhandler.cpp:110
+#: src/net/tmwa/playerhandler.cpp:111
 msgid "Insert coin to continue."
 msgstr "Insira uma moeda para continuar."
 
-#: src/net/tmwa/playerhandler.cpp:128
+#: src/net/tmwa/playerhandler.cpp:129
 msgid "You're not dead yet. You're just resting."
 msgstr "Você não morreu ainda. Está apenas descansando."
 
-#: src/net/tmwa/playerhandler.cpp:129
+#: src/net/tmwa/playerhandler.cpp:130
 msgid "You are no more."
 msgstr "Você não é mais."
 
-#: src/net/tmwa/playerhandler.cpp:130
+#: src/net/tmwa/playerhandler.cpp:131
 msgid "You have ceased to be."
 msgstr "Você deixou de ser."
 
-#: src/net/tmwa/playerhandler.cpp:131
+#: src/net/tmwa/playerhandler.cpp:132
 msgid "You've expired and gone to meet your maker."
 msgstr "Você expirou e foi encontrar seu criador."
 
-#: src/net/tmwa/playerhandler.cpp:132
+#: src/net/tmwa/playerhandler.cpp:133
 msgid "You're a stiff."
 msgstr "Você é um cadáver."
 
-#: src/net/tmwa/playerhandler.cpp:133
+#: src/net/tmwa/playerhandler.cpp:134
 msgid "Bereft of life, you rest in peace."
 msgstr "Sem vida, você descansa em paz."
 
-#: src/net/tmwa/playerhandler.cpp:134
+#: src/net/tmwa/playerhandler.cpp:135
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr "Se não fosse tão animado, estaria comendo grama pela raiz."
 
-#: src/net/tmwa/playerhandler.cpp:135
+#: src/net/tmwa/playerhandler.cpp:136
 msgid "Your metabolic processes are now history."
 msgstr "Seus processos metabólicos agora são história."
 
-#: src/net/tmwa/playerhandler.cpp:136
+#: src/net/tmwa/playerhandler.cpp:137
 msgid "You're off the twig."
 msgstr "Você bateu as botas."
 
-#: src/net/tmwa/playerhandler.cpp:137
+#: src/net/tmwa/playerhandler.cpp:138
 msgid "You've kicked the bucket."
 msgstr "Você chutou o balde."
 
-#: src/net/tmwa/playerhandler.cpp:138
+#: src/net/tmwa/playerhandler.cpp:139
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
@@ -5080,48 +5120,48 @@ msgstr ""
 "Você dispensou seu corpo mortal, abaixou as cortinas e juntou-se ao maldito "
 "coro invisível."
 
-#: src/net/tmwa/playerhandler.cpp:140
+#: src/net/tmwa/playerhandler.cpp:141
 msgid "You are an ex-player."
 msgstr "Você é um ex-jogador"
 
-#: src/net/tmwa/playerhandler.cpp:141
+#: src/net/tmwa/playerhandler.cpp:142
 msgid "You're pining for the fjords."
 msgstr "Você foi desta para melhor."
 
-#: src/net/tmwa/playerhandler.cpp:327 src/net/tmwa/playerhandler.cpp:336
-#: src/net/tmwa/playerhandler.cpp:415
+#: src/net/tmwa/playerhandler.cpp:330 src/net/tmwa/playerhandler.cpp:339
+#: src/net/tmwa/playerhandler.cpp:418
 msgid "Message"
 msgstr "Mensagem"
 
-#: src/net/tmwa/playerhandler.cpp:328
+#: src/net/tmwa/playerhandler.cpp:331
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 "Você está carregando mais que a metade de seu peso. Você não poderá mais "
 "recuperar HP."
 
-#: src/net/tmwa/playerhandler.cpp:337
+#: src/net/tmwa/playerhandler.cpp:340
 #, fuzzy
 msgid "You are carrying less than half your weight. You are can regain health."
 msgstr ""
 "Você está carregando mais que a metade de seu peso. Você não poderá mais "
 "recuperar HP."
 
-#: src/net/tmwa/playerhandler.cpp:442
+#: src/net/tmwa/playerhandler.cpp:445
 #, fuzzy, c-format
 msgid "You picked up %s."
 msgstr "Você pegou "
 
-#: src/net/tmwa/playerhandler.cpp:448
+#: src/net/tmwa/playerhandler.cpp:451
 #, fuzzy, c-format
 msgid "You spent %s."
 msgstr "Você obteve %s"
 
-#: src/net/tmwa/playerhandler.cpp:493
+#: src/net/tmwa/playerhandler.cpp:496
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:613
+#: src/net/tmwa/playerhandler.cpp:616
 msgid "Equip arrows first."
 msgstr "Equipe as flechas primeiro."
 
@@ -5271,32 +5311,32 @@ msgstr ""
 msgid "Floating bubble"
 msgstr ""
 
-#: src/resources/beinginfo.cpp:32 src/resources/itemdb.cpp:210
+#: src/resources/beinginfo.cpp:32 src/resources/itemdb.cpp:223
 #: src/resources/monsterdb.cpp:78
 msgid "unnamed"
 msgstr "sem nome"
 
-#: src/resources/itemdb.cpp:55
+#: src/resources/itemdb.cpp:57
 #, c-format
 msgid "Attack %+d"
 msgstr "Ataque %+d"
 
-#: src/resources/itemdb.cpp:56
+#: src/resources/itemdb.cpp:58
 #, c-format
 msgid "Defense %+d"
 msgstr "Defesa %+d"
 
-#: src/resources/itemdb.cpp:57
+#: src/resources/itemdb.cpp:59
 #, c-format
 msgid "HP %+d"
 msgstr "HP %+d"
 
-#: src/resources/itemdb.cpp:58
+#: src/resources/itemdb.cpp:60
 #, c-format
 msgid "MP %+d"
 msgstr "MP %+d"
 
-#: src/resources/itemdb.cpp:155
+#: src/resources/itemdb.cpp:152
 msgid "Unknown item"
 msgstr "Item desconhecido"
 
diff --git a/po/ru.po b/po/ru.po
index ba13d6e51..f710e3739 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2011-01-06 03:06+0200\n"
+"POT-Creation-Date: 2011-01-13 21:49+0200\n"
 "PO-Revision-Date: 2010-11-13 17:01+0300\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -62,10 +62,10 @@ msgstr "Сервер"
 #: src/client.cpp:1029 src/client.cpp:1036 src/client.cpp:1171
 #: src/gui/changeemaildialog.cpp:154 src/gui/changepassworddialog.cpp:144
 #: src/gui/charcreatedialog.cpp:185 src/gui/register.cpp:225
-#: src/gui/serverdialog.cpp:350 src/gui/unregisterdialog.cpp:134
+#: src/gui/serverdialog.cpp:355 src/gui/unregisterdialog.cpp:134
 #: src/net/manaserv/charhandler.cpp:183 src/net/manaserv/charhandler.cpp:226
-#: src/net/tmwa/charserverhandler.cpp:137
-#: src/net/tmwa/charserverhandler.cpp:154
+#: src/net/tmwa/charserverhandler.cpp:161
+#: src/net/tmwa/charserverhandler.cpp:177
 msgid "Error"
 msgstr "Ошибка"
 
@@ -712,7 +712,7 @@ msgid "-"
 msgstr "-"
 
 #: src/gui/buy.cpp:95 src/gui/quitdialog.cpp:43 src/gui/quitdialog.cpp:48
-#: src/gui/quitdialog.cpp:49 src/gui/sell.cpp:90 src/gui/serverdialog.cpp:244
+#: src/gui/quitdialog.cpp:49 src/gui/sell.cpp:90 src/gui/serverdialog.cpp:248
 #: src/keyboardconfig.cpp:275
 msgid "Quit"
 msgstr "Выход"
@@ -723,7 +723,7 @@ msgid "Max"
 msgstr "Макс"
 
 #: src/gui/buysell.cpp:37 src/gui/buysell.cpp:46
-#: src/gui/inventorywindow.cpp:112
+#: src/gui/inventorywindow.cpp:134
 msgid "Shop"
 msgstr "Магазин"
 
@@ -890,7 +890,7 @@ msgstr "Удалить регистрацию"
 msgid "Change Email"
 msgstr "Сменить адрес E-mail"
 
-#: src/gui/charselectdialog.cpp:375 src/gui/serverdialog.cpp:248
+#: src/gui/charselectdialog.cpp:375 src/gui/serverdialog.cpp:252
 #: src/gui/setup_players.cpp:242 src/gui/shopwindow.cpp:117
 #: src/gui/shopwindow.cpp:120 src/gui/textcommandeditor.cpp:234
 msgid "Delete"
@@ -1116,8 +1116,8 @@ msgstr "ОК"
 msgid "Equipment"
 msgstr "Снаряжение"
 
-#: src/gui/equipmentwindow.cpp:91 src/gui/inventorywindow.cpp:96
-#: src/gui/inventorywindow.cpp:393 src/gui/inventorywindow.cpp:402
+#: src/gui/equipmentwindow.cpp:91 src/gui/inventorywindow.cpp:118
+#: src/gui/inventorywindow.cpp:443 src/gui/inventorywindow.cpp:452
 #: src/gui/popupmenu.cpp:1070 src/gui/popupmenu.cpp:1169
 #: src/gui/popupmenu.cpp:1209
 msgid "Unequip"
@@ -1127,67 +1127,76 @@ msgstr "Снять"
 msgid "Help"
 msgstr "Помощь"
 
-#: src/gui/help.cpp:52 src/gui/inventorywindow.cpp:135
+#: src/gui/help.cpp:52 src/gui/inventorywindow.cpp:163
 #: src/gui/npcdialog.cpp:48 src/gui/shopwindow.cpp:108
 msgid "Close"
 msgstr "Закрыть"
 
-#: src/gui/inventorywindow.cpp:62 src/gui/windowmenu.cpp:72
+#: src/gui/inventorywindow.cpp:65 src/gui/windowmenu.cpp:72
 msgid "Inventory"
 msgstr "Инвентарь"
 
-#: src/gui/inventorywindow.cpp:62
+#: src/gui/inventorywindow.cpp:65
 msgid "Storage"
 msgstr "Хранение"
 
-#: src/gui/inventorywindow.cpp:89
+#: src/gui/inventorywindow.cpp:92
 msgid "Slots:"
 msgstr "Вместимость:"
 
-#: src/gui/inventorywindow.cpp:94 src/gui/inventorywindow.cpp:395
-#: src/gui/inventorywindow.cpp:404 src/gui/popupmenu.cpp:1072
+#: src/gui/inventorywindow.cpp:103
+msgid "Filter:"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:104
+#, fuzzy
+msgid "Sort:"
+msgstr "Порт:"
+
+#: src/gui/inventorywindow.cpp:116 src/gui/inventorywindow.cpp:445
+#: src/gui/inventorywindow.cpp:454 src/gui/popupmenu.cpp:1072
 #: src/gui/popupmenu.cpp:1171 src/gui/popupmenu.cpp:1211
 msgid "Equip"
 msgstr "Надеть"
 
-#: src/gui/inventorywindow.cpp:95 src/gui/inventorywindow.cpp:396
-#: src/gui/inventorywindow.cpp:400 src/gui/popupmenu.cpp:1075
+#: src/gui/inventorywindow.cpp:117 src/gui/inventorywindow.cpp:446
+#: src/gui/inventorywindow.cpp:450 src/gui/popupmenu.cpp:1075
 #: src/gui/popupmenu.cpp:1144 src/gui/popupmenu.cpp:1175
 #: src/gui/popupmenu.cpp:1214
 msgid "Use"
 msgstr "Использовать"
 
-#: src/gui/inventorywindow.cpp:109 src/gui/inventorywindow.cpp:499
+#: src/gui/inventorywindow.cpp:131 src/gui/inventorywindow.cpp:549
 #: src/gui/popupmenu.cpp:1078 src/gui/popupmenu.cpp:1179
 #: src/gui/popupmenu.cpp:1217
 msgid "Drop..."
 msgstr "Бросить"
 
-#: src/gui/inventorywindow.cpp:110 src/gui/popupmenu.cpp:1083
+#: src/gui/inventorywindow.cpp:132 src/gui/popupmenu.cpp:1083
 #: src/gui/popupmenu.cpp:1184 src/gui/popupmenu.cpp:1222
 msgid "Split"
 msgstr "Разделить"
 
-#: src/gui/inventorywindow.cpp:111 src/gui/outfitwindow.cpp:56
+#: src/gui/inventorywindow.cpp:133 src/gui/outfitwindow.cpp:56
 #: src/gui/popupmenu.cpp:409
 msgid "Outfits"
 msgstr "Наряды"
 
-#: src/gui/inventorywindow.cpp:114
+#: src/gui/inventorywindow.cpp:136
 msgid "Weight:"
 msgstr "Вес:"
 
-#: src/gui/inventorywindow.cpp:133 src/gui/inventorywindow.cpp:490
+#: src/gui/inventorywindow.cpp:161 src/gui/inventorywindow.cpp:540
 #: src/gui/popupmenu.cpp:1087 src/gui/popupmenu.cpp:1187
 #: src/gui/popupmenu.cpp:1225 src/gui/setup.cpp:65
 msgid "Store"
 msgstr "Сохранить"
 
-#: src/gui/inventorywindow.cpp:134 src/gui/popupmenu.cpp:1106
+#: src/gui/inventorywindow.cpp:162 src/gui/popupmenu.cpp:1106
 msgid "Retrieve"
 msgstr "Получить"
 
-#: src/gui/inventorywindow.cpp:501 src/gui/popupmenu.cpp:1080
+#: src/gui/inventorywindow.cpp:551 src/gui/popupmenu.cpp:1080
 #: src/gui/popupmenu.cpp:1181 src/gui/popupmenu.cpp:1219
 #: src/gui/windowmenu.cpp:91
 msgid "Drop"
@@ -1368,7 +1377,7 @@ msgstr "Пропустить"
 msgid "Login"
 msgstr "Вход"
 
-#: src/gui/login.cpp:87 src/gui/serverdialog.cpp:221
+#: src/gui/login.cpp:87 src/gui/serverdialog.cpp:222
 #: src/gui/widgets/chattab.cpp:166
 msgid "Server:"
 msgstr "Сервер:"
@@ -1760,52 +1769,56 @@ msgstr "Пароли не совпадают."
 msgid "Choose Your Server"
 msgstr "Выберите сервер"
 
-#: src/gui/serverdialog.cpp:222
+#: src/gui/serverdialog.cpp:223
 msgid "Port:"
 msgstr "Порт:"
 
-#: src/gui/serverdialog.cpp:223
+#: src/gui/serverdialog.cpp:224
 msgid "Server type:"
 msgstr "Тип:"
 
-#: src/gui/serverdialog.cpp:245
+#: src/gui/serverdialog.cpp:227
+msgid "Use same ip for game sub servers"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:249
 msgid "Load"
 msgstr "Загрузить"
 
-#: src/gui/serverdialog.cpp:246
+#: src/gui/serverdialog.cpp:250
 msgid "Connect"
 msgstr "Соединится"
 
-#: src/gui/serverdialog.cpp:247
+#: src/gui/serverdialog.cpp:251
 msgid "Custom Server"
 msgstr "Добавить"
 
-#: src/gui/serverdialog.cpp:351
+#: src/gui/serverdialog.cpp:356
 msgid "Please type both the address and the port of a server."
 msgstr "Следует указать адрес и порт сервера."
 
-#: src/gui/serverdialog.cpp:482
+#: src/gui/serverdialog.cpp:488
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Получение списка серверов...%2.2f%%"
 
-#: src/gui/serverdialog.cpp:488
+#: src/gui/serverdialog.cpp:494
 msgid "Waiting for server..."
 msgstr "Ожидание ответа от сервера"
 
-#: src/gui/serverdialog.cpp:492
+#: src/gui/serverdialog.cpp:498
 msgid "Preparing download"
 msgstr "Подготовка к загрузке"
 
-#: src/gui/serverdialog.cpp:496
+#: src/gui/serverdialog.cpp:502
 msgid "Error retreiving server list!"
 msgstr "Не удалось получить список серверов!"
 
-#: src/gui/serverdialog.cpp:593
+#: src/gui/serverdialog.cpp:599
 msgid "requires a newer version"
 msgstr "требуется более новая версия"
 
-#: src/gui/serverdialog.cpp:595
+#: src/gui/serverdialog.cpp:601
 #, c-format
 msgid "requires v%s"
 msgstr "требуется v%s"
@@ -3678,7 +3691,7 @@ msgstr[0] ""
 msgid "Away"
 msgstr "Отошел"
 
-#: src/localplayer.cpp:3617
+#: src/localplayer.cpp:3618
 msgid "You see "
 msgstr "Вы видите "
 
@@ -3829,27 +3842,27 @@ msgstr "Воля"
 msgid "Willpower %+.1f"
 msgstr "Воля (wil) %+.1f"
 
-#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:104
+#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:105
 msgid "You are dead."
 msgstr "Вы мертвы."
 
-#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:105
+#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:106
 msgid "We regret to inform you that your character was killed in battle."
 msgstr "С грустью сообщаем вам, что ваш персонаж пал в бою."
 
-#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:107
+#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:108
 msgid "You are not that alive anymore."
 msgstr "Вас боьше нет среди живых."
 
-#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:108
+#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:109
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr "Холодные руки Смерти извлекают вашу душу."
 
-#: src/net/manaserv/beinghandler.cpp:319 src/net/tmwa/playerhandler.cpp:109
+#: src/net/manaserv/beinghandler.cpp:319 src/net/tmwa/playerhandler.cpp:110
 msgid "Game Over!"
 msgstr "Игра Окончена!"
 
-#: src/net/manaserv/beinghandler.cpp:320 src/net/tmwa/playerhandler.cpp:111
+#: src/net/manaserv/beinghandler.cpp:320 src/net/tmwa/playerhandler.cpp:112
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
@@ -3857,33 +3870,33 @@ msgstr ""
 "Нет, детки. Ваш персонаж на самом деле не умер. Он...эммм...ушел в лучший "
 "мир."
 
-#: src/net/manaserv/beinghandler.cpp:322 src/net/tmwa/playerhandler.cpp:113
+#: src/net/manaserv/beinghandler.cpp:322 src/net/tmwa/playerhandler.cpp:114
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr "Ваш план сломать оружие врагов об свое горло провалился."
 
-#: src/net/manaserv/beinghandler.cpp:324 src/net/tmwa/playerhandler.cpp:115
+#: src/net/manaserv/beinghandler.cpp:324 src/net/tmwa/playerhandler.cpp:116
 msgid "I guess this did not run too well."
 msgstr "Похоже, это было не слишком хорошо."
 
-#: src/net/manaserv/beinghandler.cpp:325 src/net/tmwa/playerhandler.cpp:117
+#: src/net/manaserv/beinghandler.cpp:325 src/net/tmwa/playerhandler.cpp:118
 msgid "Do you want your possessions identified?"
 msgstr "Хочешь предскажу твою судьбу?"
 
-#: src/net/manaserv/beinghandler.cpp:326 src/net/tmwa/playerhandler.cpp:119
+#: src/net/manaserv/beinghandler.cpp:326 src/net/tmwa/playerhandler.cpp:120
 msgid "Sadly, no trace of you was ever found..."
 msgstr "Грустно, вас врятли когда-нибудь найдут..."
 
-#: src/net/manaserv/beinghandler.cpp:328 src/net/tmwa/playerhandler.cpp:121
+#: src/net/manaserv/beinghandler.cpp:328 src/net/tmwa/playerhandler.cpp:122
 msgid "Annihilated."
 msgstr "Уничтожен."
 
-#: src/net/manaserv/beinghandler.cpp:329 src/net/tmwa/playerhandler.cpp:123
+#: src/net/manaserv/beinghandler.cpp:329 src/net/tmwa/playerhandler.cpp:124
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:331 src/net/tmwa/playerhandler.cpp:125
+#: src/net/manaserv/beinghandler.cpp:331 src/net/tmwa/playerhandler.cpp:126
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
@@ -3945,11 +3958,11 @@ msgstr "Имя задано неверно"
 #: src/net/manaserv/charhandler.cpp:180 src/net/manaserv/loginhandler.cpp:98
 #: src/net/manaserv/loginhandler.cpp:130 src/net/manaserv/loginhandler.cpp:166
 #: src/net/manaserv/loginhandler.cpp:286 src/net/manaserv/loginhandler.cpp:323
-#: src/net/tmwa/loginhandler.cpp:99 src/net/tmwa/loginhandler.cpp:187
+#: src/net/tmwa/loginhandler.cpp:99 src/net/tmwa/loginhandler.cpp:190
 msgid "Unknown error."
 msgstr "Неизвестная ошибка."
 
-#: src/net/manaserv/charhandler.cpp:209 src/net/tmwa/charserverhandler.cpp:149
+#: src/net/manaserv/charhandler.cpp:209 src/net/tmwa/charserverhandler.cpp:172
 msgid "Info"
 msgstr "Сведения"
 
@@ -4173,60 +4186,88 @@ msgstr "Спасибо за покупку!"
 msgid "Unable to buy."
 msgstr "Низзя купить!"
 
-#: src/net/tmwa/buysellhandler.cpp:143
+#: src/net/tmwa/buysellhandler.cpp:145
 msgid "Thanks for selling."
 msgstr "Спасибо за продажу!"
 
-#: src/net/tmwa/buysellhandler.cpp:145
+#: src/net/tmwa/buysellhandler.cpp:149
 msgid "Unable to sell."
 msgstr "Нельзя продать."
 
-#: src/net/tmwa/charserverhandler.cpp:106
+#: src/net/tmwa/buysellhandler.cpp:152
+#, fuzzy
+msgid "Unable to sell while trading."
+msgstr "Нельзя продать."
+
+#: src/net/tmwa/buysellhandler.cpp:155
+#, fuzzy
+msgid "Unable to sell unsellable item."
+msgstr "Невозможно подобрать предмет"
+
+#: src/net/tmwa/charserverhandler.cpp:109
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 "В доступе отказано. Скорее всего на этом сервере слишком много игроков."
 
-#: src/net/tmwa/charserverhandler.cpp:110
+#: src/net/tmwa/charserverhandler.cpp:113
 msgid "Cannot use this ID."
 msgstr "Нельзя использовать данный ID"
 
-#: src/net/tmwa/charserverhandler.cpp:113
+#: src/net/tmwa/charserverhandler.cpp:116
 msgid "Unknown char-server failure."
 msgstr "Неизвестная ошибка сервера чата."
 
-#: src/net/tmwa/charserverhandler.cpp:137
+#: src/net/tmwa/charserverhandler.cpp:145
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr "Невозможно создать персонажа. Скорее всего, таке имя уже используется."
 
-#: src/net/tmwa/charserverhandler.cpp:149
+#: src/net/tmwa/charserverhandler.cpp:149 src/net/tmwa/loginhandler.cpp:187
+#, fuzzy
+msgid "Wrong name."
+msgstr "Ошибочный magic_token."
+
+#: src/net/tmwa/charserverhandler.cpp:152
+msgid "Incorrect stats."
+msgstr ""
+
+#: src/net/tmwa/charserverhandler.cpp:155
+msgid "Incorrect hair."
+msgstr ""
+
+#: src/net/tmwa/charserverhandler.cpp:158
+#, fuzzy
+msgid "Incorrect slot."
+msgstr "Нет свободного места."
+
+#: src/net/tmwa/charserverhandler.cpp:172
 msgid "Character deleted."
 msgstr "Персонаж удален"
 
-#: src/net/tmwa/charserverhandler.cpp:154
+#: src/net/tmwa/charserverhandler.cpp:177
 msgid "Failed to delete character."
 msgstr "Невозможно удалить персонажа."
 
-#: src/net/tmwa/charserverhandler.cpp:286
+#: src/net/tmwa/charserverhandler.cpp:317
 msgid "Strength:"
 msgstr "Сила (str):"
 
-#: src/net/tmwa/charserverhandler.cpp:287
+#: src/net/tmwa/charserverhandler.cpp:318
 msgid "Agility:"
 msgstr "Выносливость (agi):"
 
-#: src/net/tmwa/charserverhandler.cpp:288
+#: src/net/tmwa/charserverhandler.cpp:319
 msgid "Vitality:"
 msgstr "Живучесть (vit):"
 
-#: src/net/tmwa/charserverhandler.cpp:289
+#: src/net/tmwa/charserverhandler.cpp:320
 msgid "Intelligence:"
 msgstr "Интеллект (int):"
 
-#: src/net/tmwa/charserverhandler.cpp:290
+#: src/net/tmwa/charserverhandler.cpp:321
 msgid "Dexterity:"
 msgstr "Ловкость (dex):"
 
-#: src/net/tmwa/charserverhandler.cpp:291
+#: src/net/tmwa/charserverhandler.cpp:322
 msgid "Luck:"
 msgstr "Удача (luk):"
 
@@ -4349,17 +4390,14 @@ msgid "M.Defense"
 msgstr "Маг.Защита"
 
 #: src/net/tmwa/generalhandler.cpp:258
-#, no-c-format
 msgid "% Accuracy"
 msgstr "% Точности"
 
 #: src/net/tmwa/generalhandler.cpp:259
-#, no-c-format
 msgid "% Evade"
 msgstr "% Уклонения"
 
 #: src/net/tmwa/generalhandler.cpp:260
-#, no-c-format
 msgid "% Critical"
 msgstr "% Критический удар"
 
@@ -4604,11 +4642,11 @@ msgstr "Обмен опытом невозможен."
 msgid "Experience sharing unknown."
 msgstr "Политика распределения опыта неизвестна."
 
-#: src/net/tmwa/inventoryhandler.cpp:334
+#: src/net/tmwa/inventoryhandler.cpp:343
 msgid "Failed to use item."
 msgstr "Не удалось использовать предмет."
 
-#: src/net/tmwa/inventoryhandler.cpp:457
+#: src/net/tmwa/inventoryhandler.cpp:472
 msgid "Unable to equip."
 msgstr "Нельза экипировать!"
 
@@ -4717,97 +4755,97 @@ msgstr "Неизвестный участник попытался сказат�
 msgid "%s is not in your party!"
 msgstr "%s не в группе!"
 
-#: src/net/tmwa/playerhandler.cpp:110
+#: src/net/tmwa/playerhandler.cpp:111
 msgid "Insert coin to continue."
 msgstr "Опустите монетку для продолжения."
 
-#: src/net/tmwa/playerhandler.cpp:128
+#: src/net/tmwa/playerhandler.cpp:129
 msgid "You're not dead yet. You're just resting."
 msgstr "Вы не мертвы. Вы просто отдыхаете."
 
-#: src/net/tmwa/playerhandler.cpp:129
+#: src/net/tmwa/playerhandler.cpp:130
 msgid "You are no more."
 msgstr "Вас больше нет."
 
-#: src/net/tmwa/playerhandler.cpp:130
+#: src/net/tmwa/playerhandler.cpp:131
 msgid "You have ceased to be."
 msgstr "Вы перестали быть."
 
-#: src/net/tmwa/playerhandler.cpp:131
+#: src/net/tmwa/playerhandler.cpp:132
 msgid "You've expired and gone to meet your maker."
 msgstr "Ваше время истекло, пора встретиться с Создателем."
 
-#: src/net/tmwa/playerhandler.cpp:132
+#: src/net/tmwa/playerhandler.cpp:133
 msgid "You're a stiff."
 msgstr "Вы сдулись."
 
-#: src/net/tmwa/playerhandler.cpp:133
+#: src/net/tmwa/playerhandler.cpp:134
 msgid "Bereft of life, you rest in peace."
 msgstr "Лишенный жизни, покойся с миром."
 
-#: src/net/tmwa/playerhandler.cpp:134
+#: src/net/tmwa/playerhandler.cpp:135
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:135
+#: src/net/tmwa/playerhandler.cpp:136
 msgid "Your metabolic processes are now history."
 msgstr "Ваш обмен веществ стал историей."
 
-#: src/net/tmwa/playerhandler.cpp:136
+#: src/net/tmwa/playerhandler.cpp:137
 msgid "You're off the twig."
 msgstr "Вы упали с ветки."
 
-#: src/net/tmwa/playerhandler.cpp:137
+#: src/net/tmwa/playerhandler.cpp:138
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:138
+#: src/net/tmwa/playerhandler.cpp:139
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:140
+#: src/net/tmwa/playerhandler.cpp:141
 msgid "You are an ex-player."
 msgstr "Вы не жилец"
 
-#: src/net/tmwa/playerhandler.cpp:141
+#: src/net/tmwa/playerhandler.cpp:142
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:327 src/net/tmwa/playerhandler.cpp:336
-#: src/net/tmwa/playerhandler.cpp:415
+#: src/net/tmwa/playerhandler.cpp:330 src/net/tmwa/playerhandler.cpp:339
+#: src/net/tmwa/playerhandler.cpp:418
 msgid "Message"
 msgstr "Сообщение"
 
-#: src/net/tmwa/playerhandler.cpp:328
+#: src/net/tmwa/playerhandler.cpp:331
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 "Вы несете груз больший, чем половина вашей грузоподъемности. Не удалось "
 "восстановить здоровье."
 
-#: src/net/tmwa/playerhandler.cpp:337
+#: src/net/tmwa/playerhandler.cpp:340
 msgid "You are carrying less than half your weight. You are can regain health."
 msgstr ""
 "Вы несете груз меньше, чем половина вашей грузоподъемности. Вы можете "
 "восстановить здоровье."
 
-#: src/net/tmwa/playerhandler.cpp:442
+#: src/net/tmwa/playerhandler.cpp:445
 #, c-format
 msgid "You picked up %s."
 msgstr "Вы получили %s."
 
-#: src/net/tmwa/playerhandler.cpp:448
+#: src/net/tmwa/playerhandler.cpp:451
 #, c-format
 msgid "You spent %s."
 msgstr "Вы потратили %s."
 
-#: src/net/tmwa/playerhandler.cpp:493
+#: src/net/tmwa/playerhandler.cpp:496
 msgid "Cannot raise skill!"
 msgstr "Не удалось увеличить навык!"
 
-#: src/net/tmwa/playerhandler.cpp:613
+#: src/net/tmwa/playerhandler.cpp:616
 msgid "Equip arrows first."
 msgstr "Для начала экипируйтесь стрелами!"
 
@@ -4954,32 +4992,32 @@ msgstr "Плавающий '...' пузырек"
 msgid "Floating bubble"
 msgstr "Плавающий пузырек"
 
-#: src/resources/beinginfo.cpp:32 src/resources/itemdb.cpp:210
+#: src/resources/beinginfo.cpp:32 src/resources/itemdb.cpp:223
 #: src/resources/monsterdb.cpp:78
 msgid "unnamed"
 msgstr "безымянный"
 
-#: src/resources/itemdb.cpp:55
+#: src/resources/itemdb.cpp:57
 #, c-format
 msgid "Attack %+d"
 msgstr "Атака %+d"
 
-#: src/resources/itemdb.cpp:56
+#: src/resources/itemdb.cpp:58
 #, c-format
 msgid "Defense %+d"
 msgstr "Защита %+d"
 
-#: src/resources/itemdb.cpp:57
+#: src/resources/itemdb.cpp:59
 #, c-format
 msgid "HP %+d"
 msgstr "HP %+d"
 
-#: src/resources/itemdb.cpp:58
+#: src/resources/itemdb.cpp:60
 #, c-format
 msgid "MP %+d"
 msgstr "Мана %+d"
 
-#: src/resources/itemdb.cpp:155
+#: src/resources/itemdb.cpp:152
 msgid "Unknown item"
 msgstr "Неизвестный предмет"
 
diff --git a/po/sv.po b/po/sv.po
index 306422464..79d2e3051 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2011-01-06 03:06+0200\n"
+"POT-Creation-Date: 2011-01-13 21:49+0200\n"
 "PO-Revision-Date: 2009-07-17 05:36+0000\n"
 "Last-Translator: Kess Vargavind <Unknown>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -63,10 +63,10 @@ msgstr "Server"
 #: src/client.cpp:1029 src/client.cpp:1036 src/client.cpp:1171
 #: src/gui/changeemaildialog.cpp:154 src/gui/changepassworddialog.cpp:144
 #: src/gui/charcreatedialog.cpp:185 src/gui/register.cpp:225
-#: src/gui/serverdialog.cpp:350 src/gui/unregisterdialog.cpp:134
+#: src/gui/serverdialog.cpp:355 src/gui/unregisterdialog.cpp:134
 #: src/net/manaserv/charhandler.cpp:183 src/net/manaserv/charhandler.cpp:226
-#: src/net/tmwa/charserverhandler.cpp:137
-#: src/net/tmwa/charserverhandler.cpp:154
+#: src/net/tmwa/charserverhandler.cpp:161
+#: src/net/tmwa/charserverhandler.cpp:177
 msgid "Error"
 msgstr "Fel"
 
@@ -745,7 +745,7 @@ msgid "-"
 msgstr ""
 
 #: src/gui/buy.cpp:95 src/gui/quitdialog.cpp:43 src/gui/quitdialog.cpp:48
-#: src/gui/quitdialog.cpp:49 src/gui/sell.cpp:90 src/gui/serverdialog.cpp:244
+#: src/gui/quitdialog.cpp:49 src/gui/sell.cpp:90 src/gui/serverdialog.cpp:248
 #: src/keyboardconfig.cpp:275
 msgid "Quit"
 msgstr "Avsluta"
@@ -756,7 +756,7 @@ msgid "Max"
 msgstr "Max"
 
 #: src/gui/buysell.cpp:37 src/gui/buysell.cpp:46
-#: src/gui/inventorywindow.cpp:112
+#: src/gui/inventorywindow.cpp:134
 msgid "Shop"
 msgstr "Affär"
 
@@ -929,7 +929,7 @@ msgstr "Avregistrera"
 msgid "Change Email"
 msgstr "Ändra epostadress"
 
-#: src/gui/charselectdialog.cpp:375 src/gui/serverdialog.cpp:248
+#: src/gui/charselectdialog.cpp:375 src/gui/serverdialog.cpp:252
 #: src/gui/setup_players.cpp:242 src/gui/shopwindow.cpp:117
 #: src/gui/shopwindow.cpp:120 src/gui/textcommandeditor.cpp:234
 msgid "Delete"
@@ -1177,8 +1177,8 @@ msgstr "Okej"
 msgid "Equipment"
 msgstr "Utrustning"
 
-#: src/gui/equipmentwindow.cpp:91 src/gui/inventorywindow.cpp:96
-#: src/gui/inventorywindow.cpp:393 src/gui/inventorywindow.cpp:402
+#: src/gui/equipmentwindow.cpp:91 src/gui/inventorywindow.cpp:118
+#: src/gui/inventorywindow.cpp:443 src/gui/inventorywindow.cpp:452
 #: src/gui/popupmenu.cpp:1070 src/gui/popupmenu.cpp:1169
 #: src/gui/popupmenu.cpp:1209
 msgid "Unequip"
@@ -1188,68 +1188,77 @@ msgstr "Avrusta"
 msgid "Help"
 msgstr "Hjälp"
 
-#: src/gui/help.cpp:52 src/gui/inventorywindow.cpp:135
+#: src/gui/help.cpp:52 src/gui/inventorywindow.cpp:163
 #: src/gui/npcdialog.cpp:48 src/gui/shopwindow.cpp:108
 msgid "Close"
 msgstr "Stäng"
 
-#: src/gui/inventorywindow.cpp:62 src/gui/windowmenu.cpp:72
+#: src/gui/inventorywindow.cpp:65 src/gui/windowmenu.cpp:72
 msgid "Inventory"
 msgstr "Inventarium"
 
-#: src/gui/inventorywindow.cpp:62
+#: src/gui/inventorywindow.cpp:65
 msgid "Storage"
 msgstr "Lagring"
 
-#: src/gui/inventorywindow.cpp:89
+#: src/gui/inventorywindow.cpp:92
 msgid "Slots:"
 msgstr "Utrymme:"
 
-#: src/gui/inventorywindow.cpp:94 src/gui/inventorywindow.cpp:395
-#: src/gui/inventorywindow.cpp:404 src/gui/popupmenu.cpp:1072
+#: src/gui/inventorywindow.cpp:103
+msgid "Filter:"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:104
+#, fuzzy
+msgid "Sort:"
+msgstr "Port:"
+
+#: src/gui/inventorywindow.cpp:116 src/gui/inventorywindow.cpp:445
+#: src/gui/inventorywindow.cpp:454 src/gui/popupmenu.cpp:1072
 #: src/gui/popupmenu.cpp:1171 src/gui/popupmenu.cpp:1211
 msgid "Equip"
 msgstr "Utrusta"
 
-#: src/gui/inventorywindow.cpp:95 src/gui/inventorywindow.cpp:396
-#: src/gui/inventorywindow.cpp:400 src/gui/popupmenu.cpp:1075
+#: src/gui/inventorywindow.cpp:117 src/gui/inventorywindow.cpp:446
+#: src/gui/inventorywindow.cpp:450 src/gui/popupmenu.cpp:1075
 #: src/gui/popupmenu.cpp:1144 src/gui/popupmenu.cpp:1175
 #: src/gui/popupmenu.cpp:1214
 msgid "Use"
 msgstr "Använd"
 
-#: src/gui/inventorywindow.cpp:109 src/gui/inventorywindow.cpp:499
+#: src/gui/inventorywindow.cpp:131 src/gui/inventorywindow.cpp:549
 #: src/gui/popupmenu.cpp:1078 src/gui/popupmenu.cpp:1179
 #: src/gui/popupmenu.cpp:1217
 #, fuzzy
 msgid "Drop..."
 msgstr "Släpp"
 
-#: src/gui/inventorywindow.cpp:110 src/gui/popupmenu.cpp:1083
+#: src/gui/inventorywindow.cpp:132 src/gui/popupmenu.cpp:1083
 #: src/gui/popupmenu.cpp:1184 src/gui/popupmenu.cpp:1222
 msgid "Split"
 msgstr "Dela"
 
-#: src/gui/inventorywindow.cpp:111 src/gui/outfitwindow.cpp:56
+#: src/gui/inventorywindow.cpp:133 src/gui/outfitwindow.cpp:56
 #: src/gui/popupmenu.cpp:409
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:114
+#: src/gui/inventorywindow.cpp:136
 msgid "Weight:"
 msgstr "Vikt:"
 
-#: src/gui/inventorywindow.cpp:133 src/gui/inventorywindow.cpp:490
+#: src/gui/inventorywindow.cpp:161 src/gui/inventorywindow.cpp:540
 #: src/gui/popupmenu.cpp:1087 src/gui/popupmenu.cpp:1187
 #: src/gui/popupmenu.cpp:1225 src/gui/setup.cpp:65
 msgid "Store"
 msgstr "Lagra"
 
-#: src/gui/inventorywindow.cpp:134 src/gui/popupmenu.cpp:1106
+#: src/gui/inventorywindow.cpp:162 src/gui/popupmenu.cpp:1106
 msgid "Retrieve"
 msgstr "Hämta"
 
-#: src/gui/inventorywindow.cpp:501 src/gui/popupmenu.cpp:1080
+#: src/gui/inventorywindow.cpp:551 src/gui/popupmenu.cpp:1080
 #: src/gui/popupmenu.cpp:1181 src/gui/popupmenu.cpp:1219
 #: src/gui/windowmenu.cpp:91
 msgid "Drop"
@@ -1438,7 +1447,7 @@ msgstr ""
 msgid "Login"
 msgstr "Användarnamn"
 
-#: src/gui/login.cpp:87 src/gui/serverdialog.cpp:221
+#: src/gui/login.cpp:87 src/gui/serverdialog.cpp:222
 #: src/gui/widgets/chattab.cpp:166
 msgid "Server:"
 msgstr "Server:"
@@ -1868,56 +1877,60 @@ msgstr "Lösenorden stämmer inte överens."
 msgid "Choose Your Server"
 msgstr "Välj din server"
 
-#: src/gui/serverdialog.cpp:222
+#: src/gui/serverdialog.cpp:223
 msgid "Port:"
 msgstr "Port:"
 
-#: src/gui/serverdialog.cpp:223
+#: src/gui/serverdialog.cpp:224
 #, fuzzy
 msgid "Server type:"
 msgstr "Server:"
 
-#: src/gui/serverdialog.cpp:245
+#: src/gui/serverdialog.cpp:227
+msgid "Use same ip for game sub servers"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:249
 msgid "Load"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:246
+#: src/gui/serverdialog.cpp:250
 #, fuzzy
 msgid "Connect"
 msgstr "Ansluter..."
 
-#: src/gui/serverdialog.cpp:247
+#: src/gui/serverdialog.cpp:251
 #, fuzzy
 msgid "Custom Server"
 msgstr "Särskild muspekare"
 
-#: src/gui/serverdialog.cpp:351
+#: src/gui/serverdialog.cpp:356
 msgid "Please type both the address and the port of a server."
 msgstr "Var vänlig skriv både adressen och porten till en server."
 
-#: src/gui/serverdialog.cpp:482
+#: src/gui/serverdialog.cpp:488
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:488
+#: src/gui/serverdialog.cpp:494
 #, fuzzy
 msgid "Waiting for server..."
 msgstr "Väntar på server"
 
-#: src/gui/serverdialog.cpp:492
+#: src/gui/serverdialog.cpp:498
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:496
+#: src/gui/serverdialog.cpp:502
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:593
+#: src/gui/serverdialog.cpp:599
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:595
+#: src/gui/serverdialog.cpp:601
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -3906,7 +3919,7 @@ msgstr[1] "Du plockade upp %s [@@%d|%s@@]."
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:3617
+#: src/localplayer.cpp:3618
 #, fuzzy
 msgid "You see "
 msgstr "Du får %s."
@@ -4075,28 +4088,28 @@ msgstr "Viljestyrka:"
 msgid "Willpower %+.1f"
 msgstr "Viljekraft %+d"
 
-#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:104
+#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:105
 msgid "You are dead."
 msgstr "Du är död."
 
-#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:105
+#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:106
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 "Vi beklagar att behöva meddela dig om att din karaktär dödades i strid."
 
-#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:107
+#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:108
 msgid "You are not that alive anymore."
 msgstr "Du är inte så värst levande längre."
 
-#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:108
+#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:109
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr "Liemannens svala händer sträcker sig efter din själ."
 
-#: src/net/manaserv/beinghandler.cpp:319 src/net/tmwa/playerhandler.cpp:109
+#: src/net/manaserv/beinghandler.cpp:319 src/net/tmwa/playerhandler.cpp:110
 msgid "Game Over!"
 msgstr "Spelet är slut!"
 
-#: src/net/manaserv/beinghandler.cpp:320 src/net/tmwa/playerhandler.cpp:111
+#: src/net/manaserv/beinghandler.cpp:320 src/net/tmwa/playerhandler.cpp:112
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
@@ -4104,7 +4117,7 @@ msgstr ""
 "Barn, barn. Din karaktär dog egentligen inte. Den… öh… kom till ett bättre "
 "ställe."
 
-#: src/net/manaserv/beinghandler.cpp:322 src/net/tmwa/playerhandler.cpp:113
+#: src/net/manaserv/beinghandler.cpp:322 src/net/tmwa/playerhandler.cpp:114
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
@@ -4112,27 +4125,27 @@ msgstr ""
 "Din plan att ha sönder dina fiendens vapen genom att krossa dem med din hals "
 "misslyckades."
 
-#: src/net/manaserv/beinghandler.cpp:324 src/net/tmwa/playerhandler.cpp:115
+#: src/net/manaserv/beinghandler.cpp:324 src/net/tmwa/playerhandler.cpp:116
 msgid "I guess this did not run too well."
 msgstr "Jag antar att det kunde gått bättre."
 
-#: src/net/manaserv/beinghandler.cpp:325 src/net/tmwa/playerhandler.cpp:117
+#: src/net/manaserv/beinghandler.cpp:325 src/net/tmwa/playerhandler.cpp:118
 msgid "Do you want your possessions identified?"
 msgstr "Vill du att dina tillhörigheter ska identifieras?"
 
-#: src/net/manaserv/beinghandler.cpp:326 src/net/tmwa/playerhandler.cpp:119
+#: src/net/manaserv/beinghandler.cpp:326 src/net/tmwa/playerhandler.cpp:120
 msgid "Sadly, no trace of you was ever found..."
 msgstr "Ledsamt nog så kunde inga spår efter dig någonsin hittas…"
 
-#: src/net/manaserv/beinghandler.cpp:328 src/net/tmwa/playerhandler.cpp:121
+#: src/net/manaserv/beinghandler.cpp:328 src/net/tmwa/playerhandler.cpp:122
 msgid "Annihilated."
 msgstr "Tillintetgjord."
 
-#: src/net/manaserv/beinghandler.cpp:329 src/net/tmwa/playerhandler.cpp:123
+#: src/net/manaserv/beinghandler.cpp:329 src/net/tmwa/playerhandler.cpp:124
 msgid "Looks like you got your head handed to you."
 msgstr "Verkar som att som att någon gav dig ditt huvud."
 
-#: src/net/manaserv/beinghandler.cpp:331 src/net/tmwa/playerhandler.cpp:125
+#: src/net/manaserv/beinghandler.cpp:331 src/net/tmwa/playerhandler.cpp:126
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
@@ -4201,12 +4214,12 @@ msgstr ""
 #: src/net/manaserv/charhandler.cpp:180 src/net/manaserv/loginhandler.cpp:98
 #: src/net/manaserv/loginhandler.cpp:130 src/net/manaserv/loginhandler.cpp:166
 #: src/net/manaserv/loginhandler.cpp:286 src/net/manaserv/loginhandler.cpp:323
-#: src/net/tmwa/loginhandler.cpp:99 src/net/tmwa/loginhandler.cpp:187
+#: src/net/tmwa/loginhandler.cpp:99 src/net/tmwa/loginhandler.cpp:190
 #, fuzzy
 msgid "Unknown error."
 msgstr "Okänt fel"
 
-#: src/net/manaserv/charhandler.cpp:209 src/net/tmwa/charserverhandler.cpp:149
+#: src/net/manaserv/charhandler.cpp:209 src/net/tmwa/charserverhandler.cpp:172
 msgid "Info"
 msgstr "Information"
 
@@ -4446,61 +4459,88 @@ msgstr "Tack för köpet."
 msgid "Unable to buy."
 msgstr "Kan inte köpa."
 
-#: src/net/tmwa/buysellhandler.cpp:143
+#: src/net/tmwa/buysellhandler.cpp:145
 msgid "Thanks for selling."
 msgstr "Tack för en god affär."
 
-#: src/net/tmwa/buysellhandler.cpp:145
+#: src/net/tmwa/buysellhandler.cpp:149
 msgid "Unable to sell."
 msgstr "Kan inte sälja."
 
-#: src/net/tmwa/charserverhandler.cpp:106
+#: src/net/tmwa/buysellhandler.cpp:152
+#, fuzzy
+msgid "Unable to sell while trading."
+msgstr "Kan inte sälja."
+
+#: src/net/tmwa/buysellhandler.cpp:155
+#, fuzzy
+msgid "Unable to sell unsellable item."
+msgstr "Kunde inte plocka upp."
+
+#: src/net/tmwa/charserverhandler.cpp:109
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:110
+#: src/net/tmwa/charserverhandler.cpp:113
 #, fuzzy
 msgid "Cannot use this ID."
 msgstr "Kan inte använda ID"
 
-#: src/net/tmwa/charserverhandler.cpp:113
+#: src/net/tmwa/charserverhandler.cpp:116
 #, fuzzy
 msgid "Unknown char-server failure."
 msgstr "Okänt fel"
 
-#: src/net/tmwa/charserverhandler.cpp:137
+#: src/net/tmwa/charserverhandler.cpp:145
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr "Kan inte skapa karaktär. Troligtvis används namnet av någon annan."
 
-#: src/net/tmwa/charserverhandler.cpp:149
+#: src/net/tmwa/charserverhandler.cpp:149 src/net/tmwa/loginhandler.cpp:187
+#, fuzzy
+msgid "Wrong name."
+msgstr "Fel magic_token"
+
+#: src/net/tmwa/charserverhandler.cpp:152
+msgid "Incorrect stats."
+msgstr ""
+
+#: src/net/tmwa/charserverhandler.cpp:155
+msgid "Incorrect hair."
+msgstr ""
+
+#: src/net/tmwa/charserverhandler.cpp:158
+msgid "Incorrect slot."
+msgstr ""
+
+#: src/net/tmwa/charserverhandler.cpp:172
 msgid "Character deleted."
 msgstr "Karaktär borttagen."
 
-#: src/net/tmwa/charserverhandler.cpp:154
+#: src/net/tmwa/charserverhandler.cpp:177
 msgid "Failed to delete character."
 msgstr "Kunde inte ta bort karaktär."
 
-#: src/net/tmwa/charserverhandler.cpp:286
+#: src/net/tmwa/charserverhandler.cpp:317
 msgid "Strength:"
 msgstr "Styrka:"
 
-#: src/net/tmwa/charserverhandler.cpp:287
+#: src/net/tmwa/charserverhandler.cpp:318
 msgid "Agility:"
 msgstr "Smidighet:"
 
-#: src/net/tmwa/charserverhandler.cpp:288
+#: src/net/tmwa/charserverhandler.cpp:319
 msgid "Vitality:"
 msgstr "Hälsa:"
 
-#: src/net/tmwa/charserverhandler.cpp:289
+#: src/net/tmwa/charserverhandler.cpp:320
 msgid "Intelligence:"
 msgstr "Intelligens:"
 
-#: src/net/tmwa/charserverhandler.cpp:290
+#: src/net/tmwa/charserverhandler.cpp:321
 msgid "Dexterity:"
 msgstr "Skicklighet:"
 
-#: src/net/tmwa/charserverhandler.cpp:291
+#: src/net/tmwa/charserverhandler.cpp:322
 msgid "Luck:"
 msgstr "Tur:"
 
@@ -4911,11 +4951,11 @@ msgstr "Fördelning av erfarenhet ej möjlig."
 msgid "Experience sharing unknown."
 msgstr "Fördelning av erfarenhet aktiverad."
 
-#: src/net/tmwa/inventoryhandler.cpp:334
+#: src/net/tmwa/inventoryhandler.cpp:343
 msgid "Failed to use item."
 msgstr "Kunde inte använda föremål."
 
-#: src/net/tmwa/inventoryhandler.cpp:457
+#: src/net/tmwa/inventoryhandler.cpp:472
 msgid "Unable to equip."
 msgstr "Kan inte utrusta."
 
@@ -5034,95 +5074,95 @@ msgstr "En okänd medlem försökte säga: %s"
 msgid "%s is not in your party!"
 msgstr "%s är inte med i din grupp!"
 
-#: src/net/tmwa/playerhandler.cpp:110
+#: src/net/tmwa/playerhandler.cpp:111
 msgid "Insert coin to continue."
 msgstr "Stoppa i mynt för att fortsätta."
 
-#: src/net/tmwa/playerhandler.cpp:128
+#: src/net/tmwa/playerhandler.cpp:129
 msgid "You're not dead yet. You're just resting."
 msgstr "Du är inte död än. Du vilar bara."
 
-#: src/net/tmwa/playerhandler.cpp:129
+#: src/net/tmwa/playerhandler.cpp:130
 msgid "You are no more."
 msgstr "Du finns inte längre."
 
-#: src/net/tmwa/playerhandler.cpp:130
+#: src/net/tmwa/playerhandler.cpp:131
 msgid "You have ceased to be."
 msgstr "Du har slutat att existera."
 
-#: src/net/tmwa/playerhandler.cpp:131
+#: src/net/tmwa/playerhandler.cpp:132
 msgid "You've expired and gone to meet your maker."
 msgstr "Du är passé och har givit dig av för att träffa din skapare."
 
-#: src/net/tmwa/playerhandler.cpp:132
+#: src/net/tmwa/playerhandler.cpp:133
 msgid "You're a stiff."
 msgstr "Du är en steling."
 
-#: src/net/tmwa/playerhandler.cpp:133
+#: src/net/tmwa/playerhandler.cpp:134
 msgid "Bereft of life, you rest in peace."
 msgstr "Berövad på ditt liv vilar du numera i frid."
 
-#: src/net/tmwa/playerhandler.cpp:134
+#: src/net/tmwa/playerhandler.cpp:135
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 "Om du inte vore så livfull skulle du vara blomnäring vid det här laget."
 
-#: src/net/tmwa/playerhandler.cpp:135
+#: src/net/tmwa/playerhandler.cpp:136
 msgid "Your metabolic processes are now history."
 msgstr "Dina metaboliska processer är nu historia."
 
-#: src/net/tmwa/playerhandler.cpp:136
+#: src/net/tmwa/playerhandler.cpp:137
 msgid "You're off the twig."
 msgstr "Du har trillat av pinn."
 
-#: src/net/tmwa/playerhandler.cpp:137
+#: src/net/tmwa/playerhandler.cpp:138
 msgid "You've kicked the bucket."
 msgstr "Du har kastat in handduken."
 
-#: src/net/tmwa/playerhandler.cpp:138
+#: src/net/tmwa/playerhandler.cpp:139
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr "Du tog ner skylten, kilade runt hörnet och bet i gräset."
 
-#: src/net/tmwa/playerhandler.cpp:140
+#: src/net/tmwa/playerhandler.cpp:141
 msgid "You are an ex-player."
 msgstr "Du är en före detta spelare."
 
-#: src/net/tmwa/playerhandler.cpp:141
+#: src/net/tmwa/playerhandler.cpp:142
 msgid "You're pining for the fjords."
 msgstr "Du har gått till de sälla jaktmarkerna."
 
-#: src/net/tmwa/playerhandler.cpp:327 src/net/tmwa/playerhandler.cpp:336
-#: src/net/tmwa/playerhandler.cpp:415
+#: src/net/tmwa/playerhandler.cpp:330 src/net/tmwa/playerhandler.cpp:339
+#: src/net/tmwa/playerhandler.cpp:418
 msgid "Message"
 msgstr "Meddelande"
 
-#: src/net/tmwa/playerhandler.cpp:328
+#: src/net/tmwa/playerhandler.cpp:331
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr "Du bär mer än halva din vikt på dig. Du kan inte återfå hälsa."
 
-#: src/net/tmwa/playerhandler.cpp:337
+#: src/net/tmwa/playerhandler.cpp:340
 #, fuzzy
 msgid "You are carrying less than half your weight. You are can regain health."
 msgstr "Du bär mer än halva din vikt på dig. Du kan inte återfå hälsa."
 
-#: src/net/tmwa/playerhandler.cpp:442
+#: src/net/tmwa/playerhandler.cpp:445
 #, fuzzy, c-format
 msgid "You picked up %s."
 msgstr "Du plockade upp "
 
-#: src/net/tmwa/playerhandler.cpp:448
+#: src/net/tmwa/playerhandler.cpp:451
 #, fuzzy, c-format
 msgid "You spent %s."
 msgstr "Du får %s."
 
-#: src/net/tmwa/playerhandler.cpp:493
+#: src/net/tmwa/playerhandler.cpp:496
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:613
+#: src/net/tmwa/playerhandler.cpp:616
 msgid "Equip arrows first."
 msgstr "Utrusta dig med pilar först."
 
@@ -5273,32 +5313,32 @@ msgstr ""
 msgid "Floating bubble"
 msgstr ""
 
-#: src/resources/beinginfo.cpp:32 src/resources/itemdb.cpp:210
+#: src/resources/beinginfo.cpp:32 src/resources/itemdb.cpp:223
 #: src/resources/monsterdb.cpp:78
 msgid "unnamed"
 msgstr "namnlös"
 
-#: src/resources/itemdb.cpp:55
+#: src/resources/itemdb.cpp:57
 #, c-format
 msgid "Attack %+d"
 msgstr "Attack %+d"
 
-#: src/resources/itemdb.cpp:56
+#: src/resources/itemdb.cpp:58
 #, c-format
 msgid "Defense %+d"
 msgstr "Försvar %+d"
 
-#: src/resources/itemdb.cpp:57
+#: src/resources/itemdb.cpp:59
 #, c-format
 msgid "HP %+d"
 msgstr "Hälsa %+d"
 
-#: src/resources/itemdb.cpp:58
+#: src/resources/itemdb.cpp:60
 #, c-format
 msgid "MP %+d"
 msgstr "Mana %+d"
 
-#: src/resources/itemdb.cpp:155
+#: src/resources/itemdb.cpp:152
 msgid "Unknown item"
 msgstr "Okänt föremål"