Add gettext to missing strings. Update POTFILES.in

and update russian translation.
author: Andrei Karas <akaras@inbox.ru> 2011-01-05 04:52:43 +0200
committer: Andrei Karas <akaras@inbox.ru> 2011-01-05 04:52:43 +0200
commit: 827f91446c550fdf066cb9bec1d6b15ae8662b78 (patch)
tree: d75fcab56507f26891787f824cf443a248df6bf8 /po
parent: c595f66bc9031fd28e5146a7aaee686b4ecb9c67 (diff)
download: manaverse-827f91446c550fdf066cb9bec1d6b15ae8662b78.tar.gz
manaverse-827f91446c550fdf066cb9bec1d6b15ae8662b78.tar.bz2
manaverse-827f91446c550fdf066cb9bec1d6b15ae8662b78.tar.xz
manaverse-827f91446c550fdf066cb9bec1d6b15ae8662b78.zip
16 files changed, 3118 insertions, 2679 deletions
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 5b66fc2d4..2fa7bb2ce 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,6 +1,7 @@
 # List of source files which contain translatable strings.
 # Generated using: grep "_(" -Irl src | sort
 
+src/being.cpp
 src/client.cpp
 src/commandhandler.cpp
 src/commandhandler.h
@@ -60,6 +61,7 @@ src/gui/unregisterdialog.cpp
 src/gui/updatewindow.cpp
 src/gui/userpalette.cpp
 src/gui/whoisonline.cpp
+src/gui/widgets/battletab.cpp
 src/gui/widgets/channeltab.cpp
 src/gui/widgets/chattab.cpp
 src/gui/widgets/tradetab.cpp
@@ -96,7 +98,9 @@ src/net/tmwa/playerhandler.cpp
 src/net/tmwa/specialhandler.cpp
 src/net/tmwa/tradehandler.cpp
 src/playerrelations.cpp
+src/resources/beinginfo.cpp
 src/resources/itemdb.cpp
+src/resources/mapreader.cpp
 src/resources/monsterdb.cpp
 src/utils/gettext.h
 src/utils/stringutils.h
diff --git a/po/da.po b/po/da.po
index a06bdd149..3d34c177d 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: 2010-12-24 19:29+0200\n"
+"POT-Creation-Date: 2011-01-05 04:50+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"
@@ -19,6 +19,14 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
+#: src/being.cpp:480
+msgid "dodge"
+msgstr ""
+
+#: src/being.cpp:480
+msgid "miss"
+msgstr ""
+
 #: src/client.cpp:724 src/gui/setup.cpp:47 src/gui/windowmenu.cpp:92
 msgid "Setup"
 msgstr "Opsætning"
@@ -54,9 +62,9 @@ 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:179 src/gui/register.cpp:225
+#: src/gui/charcreatedialog.cpp:185 src/gui/register.cpp:225
 #: src/gui/serverdialog.cpp:350 src/gui/unregisterdialog.cpp:134
-#: src/net/manaserv/charhandler.cpp:180 src/net/manaserv/charhandler.cpp:223
+#: src/net/manaserv/charhandler.cpp:183 src/net/manaserv/charhandler.cpp:226
 #: src/net/tmwa/charserverhandler.cpp:137
 #: src/net/tmwa/charserverhandler.cpp:154
 msgid "Error"
@@ -653,12 +661,12 @@ msgstr "Ignorerer indkomne handels anmodninger"
 msgid "Accepting incoming trade requests"
 msgstr "Accepterer indkomne handels anmodninger"
 
-#: src/game.cpp:1373
+#: src/game.cpp:1376
 #, fuzzy
 msgid "Could Not Load Map"
 msgstr "Kunne ikke loade kortet"
 
-#: src/game.cpp:1374
+#: src/game.cpp:1377
 #, c-format
 msgid "Error while loading %s"
 msgstr "Kunne ikke loade %s."
@@ -736,7 +744,7 @@ 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/keyboardconfig.cpp:271
+#: src/keyboardconfig.cpp:275
 msgid "Quit"
 msgstr "Afslut"
 
@@ -758,9 +766,9 @@ msgstr "Sælg"
 #: src/gui/buysell.cpp:62 src/gui/changeemaildialog.cpp:56
 #: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
 #: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:206
-#: src/gui/npcpostdialog.cpp:55 src/gui/popupmenu.cpp:1120
-#: src/gui/popupmenu.cpp:1147 src/gui/popupmenu.cpp:1192
-#: src/gui/popupmenu.cpp:1230 src/gui/quitdialog.cpp:54
+#: src/gui/npcpostdialog.cpp:55 src/gui/popupmenu.cpp:1122
+#: src/gui/popupmenu.cpp:1149 src/gui/popupmenu.cpp:1194
+#: src/gui/popupmenu.cpp:1232 src/gui/quitdialog.cpp:54
 #: src/gui/register.cpp:79 src/gui/setup.cpp:64 src/gui/socialwindow.cpp:786
 #: src/gui/textcommandeditor.cpp:231 src/gui/textdialog.cpp:44
 #: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:153
@@ -862,7 +870,7 @@ msgstr "Hårfarve:"
 msgid "Hair style:"
 msgstr "Frisure:"
 
-#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:437
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:445
 #: src/gui/socialwindow.cpp:846
 msgid "Create"
 msgstr "Opret"
@@ -875,20 +883,20 @@ msgstr "Mand"
 msgid "Female"
 msgstr "Kvinde"
 
-#: src/gui/charcreatedialog.cpp:99 src/gui/charcreatedialog.cpp:251
+#: src/gui/charcreatedialog.cpp:99 src/gui/charcreatedialog.cpp:257
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Du mangler at fordele %d points"
 
-#: src/gui/charcreatedialog.cpp:180
+#: src/gui/charcreatedialog.cpp:186
 msgid "Your name needs to be at least 4 characters."
 msgstr "Dit navn skal være mindst 4 bogstaver langt."
 
-#: src/gui/charcreatedialog.cpp:242
+#: src/gui/charcreatedialog.cpp:248
 msgid "Character stats OK"
 msgstr "Du har brugt alle dine points"
 
-#: src/gui/charcreatedialog.cpp:256
+#: src/gui/charcreatedialog.cpp:262
 #, c-format
 msgid "Please remove %d points"
 msgstr "Du skal fjerne %d points"
@@ -919,18 +927,23 @@ msgstr "Frameld"
 msgid "Change Email"
 msgstr "Skift e-mail adresse"
 
-#: src/gui/charselectdialog.cpp:367 src/gui/serverdialog.cpp:248
+#: src/gui/charselectdialog.cpp:375 src/gui/serverdialog.cpp:248
 #: src/gui/setup_players.cpp:242 src/gui/shopwindow.cpp:117
 #: src/gui/shopwindow.cpp:120 src/gui/textcommandeditor.cpp:234
 msgid "Delete"
 msgstr "Slet"
 
-#: src/gui/charselectdialog.cpp:425
+#: src/gui/charselectdialog.cpp:433
 #, fuzzy
 msgid "Choose"
 msgstr "Luk"
 
-#: src/gui/charselectdialog.cpp:439 src/gui/charselectdialog.cpp:440
+#: src/gui/charselectdialog.cpp:436
+#, fuzzy, c-format
+msgid "Level %d"
+msgstr "Niveau: %d"
+
+#: src/gui/charselectdialog.cpp:447 src/gui/charselectdialog.cpp:448
 msgid "(empty)"
 msgstr ""
 
@@ -1158,14 +1171,14 @@ msgstr ""
 msgid "OK"
 msgstr "OK"
 
-#: src/gui/equipmentwindow.cpp:70 src/gui/windowmenu.cpp:70
+#: src/gui/equipmentwindow.cpp:72 src/gui/windowmenu.cpp:70
 msgid "Equipment"
 msgstr "Udstyr"
 
-#: src/gui/equipmentwindow.cpp:89 src/gui/inventorywindow.cpp:96
+#: src/gui/equipmentwindow.cpp:91 src/gui/inventorywindow.cpp:96
 #: src/gui/inventorywindow.cpp:393 src/gui/inventorywindow.cpp:402
-#: src/gui/popupmenu.cpp:1068 src/gui/popupmenu.cpp:1167
-#: src/gui/popupmenu.cpp:1207
+#: src/gui/popupmenu.cpp:1070 src/gui/popupmenu.cpp:1169
+#: src/gui/popupmenu.cpp:1209
 msgid "Unequip"
 msgstr "Tag af"
 
@@ -1191,32 +1204,32 @@ msgid "Slots:"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:94 src/gui/inventorywindow.cpp:395
-#: src/gui/inventorywindow.cpp:404 src/gui/popupmenu.cpp:1070
-#: src/gui/popupmenu.cpp:1169 src/gui/popupmenu.cpp:1209
+#: src/gui/inventorywindow.cpp:404 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:1073
-#: src/gui/popupmenu.cpp:1142 src/gui/popupmenu.cpp:1173
-#: src/gui/popupmenu.cpp:1212
+#: src/gui/inventorywindow.cpp:400 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/popupmenu.cpp:1076 src/gui/popupmenu.cpp:1177
-#: src/gui/popupmenu.cpp:1215
+#: 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:1081
-#: src/gui/popupmenu.cpp:1182 src/gui/popupmenu.cpp:1220
+#: src/gui/inventorywindow.cpp:110 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/popupmenu.cpp:408
+#: src/gui/popupmenu.cpp:409
 msgid "Outfits"
 msgstr ""
 
@@ -1225,17 +1238,17 @@ msgid "Weight:"
 msgstr "Vægt:"
 
 #: src/gui/inventorywindow.cpp:133 src/gui/inventorywindow.cpp:490
-#: src/gui/popupmenu.cpp:1085 src/gui/popupmenu.cpp:1185
-#: src/gui/popupmenu.cpp:1223 src/gui/setup.cpp:65
+#: 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:1104
+#: src/gui/inventorywindow.cpp:134 src/gui/popupmenu.cpp:1106
 msgid "Retrieve"
 msgstr "Hent fra lager"
 
-#: src/gui/inventorywindow.cpp:501 src/gui/popupmenu.cpp:1078
-#: src/gui/popupmenu.cpp:1179 src/gui/popupmenu.cpp:1217
+#: src/gui/inventorywindow.cpp:501 src/gui/popupmenu.cpp:1080
+#: src/gui/popupmenu.cpp:1181 src/gui/popupmenu.cpp:1219
 #: src/gui/windowmenu.cpp:91
 msgid "Drop"
 msgstr "Smid"
@@ -1474,7 +1487,7 @@ msgstr "Send forespørgsel"
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:447
+#: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:448
 #, fuzzy
 msgid "Clear"
 msgstr "Hellebard"
@@ -1518,286 +1531,286 @@ msgstr "Tag af"
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:116 src/gui/popupmenu.cpp:482
+#: src/gui/popupmenu.cpp:116 src/gui/popupmenu.cpp:483
 #, fuzzy
 msgid "@@trade|Trade@@"
 msgstr "@@trade|Handl med %s@@"
 
 #. TRANSLATORS: Attacking a player.
-#: src/gui/popupmenu.cpp:118 src/gui/popupmenu.cpp:237
-#: src/gui/popupmenu.cpp:483
+#: src/gui/popupmenu.cpp:118 src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:484
 #, fuzzy
 msgid "@@attack|Attack@@"
 msgstr "@@attack|Angrib %s@@"
 
 #. TRANSLATORS: Whispering a player.
-#: src/gui/popupmenu.cpp:120 src/gui/popupmenu.cpp:289
+#: src/gui/popupmenu.cpp:120 src/gui/popupmenu.cpp:290
 #, fuzzy
 msgid "@@whisper|Whisper@@"
 msgstr "@@use|Brug@@"
 
-#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:487
+#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:488
 #, fuzzy
 msgid "@@heal|Heal@@"
 msgstr "@@cancel|Annuller@@"
 
-#: src/gui/popupmenu.cpp:130 src/gui/popupmenu.cpp:295
-#: src/gui/popupmenu.cpp:493
+#: src/gui/popupmenu.cpp:130 src/gui/popupmenu.cpp:296
+#: src/gui/popupmenu.cpp:494
 #, fuzzy
 msgid "@@friend|Befriend@@"
 msgstr "@@retrieve|Hent fra lager@@"
 
-#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:136
-#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:296
-#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:320
-#: src/gui/popupmenu.cpp:494 src/gui/popupmenu.cpp:499
-#: src/gui/popupmenu.cpp:517
+#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:137
+#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:297
+#: src/gui/popupmenu.cpp:303 src/gui/popupmenu.cpp:321
+#: src/gui/popupmenu.cpp:495 src/gui/popupmenu.cpp:501
+#: src/gui/popupmenu.cpp:519
 msgid "@@disregard|Disregard@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:137
-#: src/gui/popupmenu.cpp:297 src/gui/popupmenu.cpp:303
-#: src/gui/popupmenu.cpp:495 src/gui/popupmenu.cpp:500
+#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:138
+#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:304
+#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:502
 #, fuzzy
 msgid "@@ignore|Ignore@@"
 msgstr "@@ignore|Ignorer %s@@"
 
-#: src/gui/popupmenu.cpp:133 src/gui/popupmenu.cpp:138
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:149
-#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:304
-#: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:315
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:501
-#: src/gui/popupmenu.cpp:507 src/gui/popupmenu.cpp:512
+#: src/gui/popupmenu.cpp:133 src/gui/popupmenu.cpp:139
+#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:150
+#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:305
+#: src/gui/popupmenu.cpp:311 src/gui/popupmenu.cpp:316
+#: src/gui/popupmenu.cpp:497 src/gui/popupmenu.cpp:503
+#: src/gui/popupmenu.cpp:509 src/gui/popupmenu.cpp:514
 #, fuzzy
 msgid "@@erase|Erase@@"
 msgstr "@@use|Brug@@"
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:148
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:308
-#: src/gui/popupmenu.cpp:314 src/gui/popupmenu.cpp:319
-#: src/gui/popupmenu.cpp:505 src/gui/popupmenu.cpp:511
-#: src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:143 src/gui/popupmenu.cpp:149
+#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:315 src/gui/popupmenu.cpp:320
+#: src/gui/popupmenu.cpp:507 src/gui/popupmenu.cpp:513
+#: src/gui/popupmenu.cpp:518
 #, fuzzy
 msgid "@@unignore|Unignore@@"
 msgstr "@@unignore|Hold op med at ignorere %s@@"
 
-#: src/gui/popupmenu.cpp:143 src/gui/popupmenu.cpp:155
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:321
-#: src/gui/popupmenu.cpp:506 src/gui/popupmenu.cpp:518
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:156
+#: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:322
+#: src/gui/popupmenu.cpp:508 src/gui/popupmenu.cpp:520
 #, fuzzy
 msgid "@@ignore|Completely ignore@@"
 msgstr "@@ignore||Ignorer %s fuldstændigt@@"
 
-#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:329
-#: src/gui/popupmenu.cpp:526
+#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:330
+#: src/gui/popupmenu.cpp:528
 msgid "@@follow|Follow@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:330
-#: src/gui/popupmenu.cpp:527
+#: src/gui/popupmenu.cpp:165 src/gui/popupmenu.cpp:331
+#: src/gui/popupmenu.cpp:529
 msgid "@@imitation|Imitation@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:174 src/gui/popupmenu.cpp:546
+#: src/gui/popupmenu.cpp:175 src/gui/popupmenu.cpp:548
 #, fuzzy
 msgid "@@party|Invite to party@@"
 msgstr "/party > Inviter en spiller til din gruppe"
 
-#: src/gui/popupmenu.cpp:179 src/gui/popupmenu.cpp:551
+#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:553
 #, fuzzy
 msgid "@@kick party|Kick from party@@"
 msgstr "@@admin-kick|Spark spiller ud@@"
 
-#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:337
-#: src/gui/popupmenu.cpp:565
+#: src/gui/popupmenu.cpp:195 src/gui/popupmenu.cpp:338
+#: src/gui/popupmenu.cpp:567
 #, fuzzy
 msgid "@@guild-kick|Kick from guild@@"
 msgstr "@@admin-kick|Spark spiller ud@@"
 
-#: src/gui/popupmenu.cpp:196 src/gui/popupmenu.cpp:338
-#: src/gui/popupmenu.cpp:567
+#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:339
+#: src/gui/popupmenu.cpp:569
 msgid "@@guild-pos|Change pos in guild >@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:201 src/gui/popupmenu.cpp:342
-#: src/gui/popupmenu.cpp:572
+#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:343
+#: src/gui/popupmenu.cpp:574
 #, fuzzy
 msgid "@@guild|Invite to guild@@"
 msgstr "/party > Inviter en spiller til din gruppe"
 
-#: src/gui/popupmenu.cpp:208
+#: src/gui/popupmenu.cpp:209
 msgid "@@admin-kick|Kick player@@"
 msgstr "@@admin-kick|Spark spiller ud@@"
 
-#: src/gui/popupmenu.cpp:210
+#: src/gui/popupmenu.cpp:211
 msgid "@@nuke|Nuke@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:211 src/gui/popupmenu.cpp:231
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:232
+#: src/gui/popupmenu.cpp:530
 msgid "@@move|Move@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:529
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:531
 #, fuzzy
 msgid "@@undress|Undress@@"
 msgstr "@@unignore|Hold op med at ignorere %s@@"
 
-#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:228
-#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:534
+#: src/gui/popupmenu.cpp:218 src/gui/popupmenu.cpp:229
+#: src/gui/popupmenu.cpp:350 src/gui/popupmenu.cpp:536
 msgid "@@buy|Buy@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:218 src/gui/popupmenu.cpp:229
-#: src/gui/popupmenu.cpp:350 src/gui/popupmenu.cpp:535
+#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:230
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:537
 #, fuzzy
 msgid "@@sell|Sell@@"
 msgstr "@@use|Brug@@"
 
-#: src/gui/popupmenu.cpp:226
+#: src/gui/popupmenu.cpp:227
 #, fuzzy
 msgid "@@talk|Talk@@"
 msgstr "@@attack|Angrib %s@@"
 
-#: src/gui/popupmenu.cpp:240
+#: src/gui/popupmenu.cpp:241
 #, fuzzy
 msgid "@@admin-kick|Kick@@"
 msgstr "@@admin-kick|Spark spiller ud@@"
 
-#: src/gui/popupmenu.cpp:248 src/gui/popupmenu.cpp:353
+#: src/gui/popupmenu.cpp:249 src/gui/popupmenu.cpp:354
 #, fuzzy
 msgid "@@name|Add name to chat@@"
 msgstr "@@name|Tilføj navn til chat@@"
 
-#: src/gui/popupmenu.cpp:252 src/gui/popupmenu.cpp:272
-#: src/gui/popupmenu.cpp:357 src/gui/popupmenu.cpp:380
-#: src/gui/popupmenu.cpp:399 src/gui/popupmenu.cpp:412
-#: src/gui/popupmenu.cpp:430 src/gui/popupmenu.cpp:577
-#: src/gui/popupmenu.cpp:601
+#: src/gui/popupmenu.cpp:253 src/gui/popupmenu.cpp:273
+#: src/gui/popupmenu.cpp:358 src/gui/popupmenu.cpp:381
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:431 src/gui/popupmenu.cpp:579
+#: src/gui/popupmenu.cpp:603
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancel|Annuller@@"
 
-#: src/gui/popupmenu.cpp:267
+#: src/gui/popupmenu.cpp:268
 #, c-format
 msgid "@@player_%u|%s >@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:375
+#: src/gui/popupmenu.cpp:376
 #, fuzzy
 msgid "@@pickup|Pick up@@"
 msgstr "@@pickup|Saml %s op@@"
 
-#: src/gui/popupmenu.cpp:376
+#: src/gui/popupmenu.cpp:377
 #, fuzzy
 msgid "@@chat|Add to chat@@"
 msgstr "@@chat|Tilføj til chat@@"
 
-#: src/gui/popupmenu.cpp:394
+#: src/gui/popupmenu.cpp:395
 msgid "Map Item"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:395
+#: src/gui/popupmenu.cpp:396
 msgid "@@rename map|Rename@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:396
+#: src/gui/popupmenu.cpp:397
 msgid "@@remove map|Remove@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:409
+#: src/gui/popupmenu.cpp:410
 msgid "@@load old outfits|Load old outfits@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:425 src/gui/windowmenu.cpp:90
+#: src/gui/popupmenu.cpp:426 src/gui/windowmenu.cpp:90
 msgid "Spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:426
+#: src/gui/popupmenu.cpp:427
 msgid "@@load old spells|Load old spells@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:427
+#: src/gui/popupmenu.cpp:428
 #, fuzzy
 msgid "@@edit spell|Edit spell@@"
 msgstr "@@use|Brug@@"
 
-#: src/gui/popupmenu.cpp:445
+#: src/gui/popupmenu.cpp:446
 msgid "@@chat close|Close@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:453
+#: src/gui/popupmenu.cpp:454
 #, fuzzy
 msgid "Disable highlight"
 msgstr "Fremhæv tab"
 
-#: src/gui/popupmenu.cpp:459
+#: src/gui/popupmenu.cpp:460
 #, fuzzy
 msgid "Enable highlight"
 msgstr "Fremhæv tab"
 
-#: src/gui/popupmenu.cpp:465
+#: src/gui/popupmenu.cpp:466
 msgid "@@leave party|Leave@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:585
+#: src/gui/popupmenu.cpp:587
 #, fuzzy
 msgid "Change guild position"
 msgstr "Ændre"
 
-#: src/gui/popupmenu.cpp:598
+#: src/gui/popupmenu.cpp:600
 #, c-format
 msgid "@@guild-pos-%d|%s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:942
+#: src/gui/popupmenu.cpp:944
 msgid "Rename map sign          "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:943
+#: src/gui/popupmenu.cpp:945
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1091
+#: src/gui/popupmenu.cpp:1093
 #, fuzzy
 msgid "Store 10"
 msgstr "Gem på lager"
 
-#: src/gui/popupmenu.cpp:1094
+#: src/gui/popupmenu.cpp:1096
 #, fuzzy
 msgid "Store half"
 msgstr "Gem på lager"
 
-#: src/gui/popupmenu.cpp:1096
+#: src/gui/popupmenu.cpp:1098
 #, fuzzy
 msgid "Store all"
 msgstr "Gem på lager"
 
-#: src/gui/popupmenu.cpp:1110
+#: src/gui/popupmenu.cpp:1112
 #, fuzzy
 msgid "Retrieve 10"
 msgstr "Hent fra lager"
 
-#: src/gui/popupmenu.cpp:1113
+#: src/gui/popupmenu.cpp:1115
 #, fuzzy
 msgid "Retrieve half"
 msgstr "Hent fra lager"
 
-#: src/gui/popupmenu.cpp:1115
+#: src/gui/popupmenu.cpp:1117
 #, fuzzy
 msgid "Retrieve all"
 msgstr "Hent fra lager"
 
-#: src/gui/popupmenu.cpp:1118 src/gui/popupmenu.cpp:1186
-#: src/gui/popupmenu.cpp:1224
+#: src/gui/popupmenu.cpp:1120 src/gui/popupmenu.cpp:1188
+#: src/gui/popupmenu.cpp:1226
 #, fuzzy
 msgid "Add to chat"
 msgstr "@@chat|Tilføj til chat@@"
 
-#: src/gui/popupmenu.cpp:1145 src/gui/popupmenu.cpp:1190
+#: src/gui/popupmenu.cpp:1147 src/gui/popupmenu.cpp:1192
 msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1228
+#: src/gui/popupmenu.cpp:1230
 msgid "Load old drop shortcuts"
 msgstr ""
 
@@ -3233,6 +3246,10 @@ msgstr ""
 msgid "Who Is Online - Update"
 msgstr ""
 
+#: src/gui/widgets/battletab.cpp:41
+msgid "Battle"
+msgstr ""
+
 #: src/gui/widgets/channeltab.cpp:49
 msgid "/users > Lists the users in the current channel"
 msgstr "/users > Vis alle brugere på kanalen"
@@ -3678,174 +3695,175 @@ msgstr "Gå til næste chat tab"
 #: src/keyboardconfig.cpp:233 src/keyboardconfig.cpp:236
 #: src/keyboardconfig.cpp:238 src/keyboardconfig.cpp:240
 #: src/keyboardconfig.cpp:242 src/keyboardconfig.cpp:244
+#: src/keyboardconfig.cpp:246 src/keyboardconfig.cpp:248
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:246
+#: src/keyboardconfig.cpp:250
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:248
+#: src/keyboardconfig.cpp:252
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:250
+#: src/keyboardconfig.cpp:254
 msgid "Copy Equiped to Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:252
+#: src/keyboardconfig.cpp:256
 msgid "Toggle Chat"
 msgstr "Slå chat til eller fra"
 
-#: src/keyboardconfig.cpp:254
+#: src/keyboardconfig.cpp:258
 msgid "Scroll Chat Up"
 msgstr "Scroll chat op"
 
-#: src/keyboardconfig.cpp:256
+#: src/keyboardconfig.cpp:260
 msgid "Scroll Chat Down"
 msgstr "Scroll chat ned"
 
-#: src/keyboardconfig.cpp:258
+#: src/keyboardconfig.cpp:262
 msgid "Previous Chat Tab"
 msgstr "Gå til sidste chat tab"
 
-#: src/keyboardconfig.cpp:260
+#: src/keyboardconfig.cpp:264
 msgid "Next Chat Tab"
 msgstr "Gå til næste chat tab"
 
-#: src/keyboardconfig.cpp:262
+#: src/keyboardconfig.cpp:266
 #, fuzzy
 msgid "Previous chat tab line"
 msgstr "Gå til sidste chat tab"
 
-#: src/keyboardconfig.cpp:264
+#: src/keyboardconfig.cpp:268
 #, fuzzy
 msgid "Next chat tab line"
 msgstr "Gå til næste chat tab"
 
-#: src/keyboardconfig.cpp:266
+#: src/keyboardconfig.cpp:270
 msgid "Chat Auto Complete"
 msgstr ""
 
-#: src/keyboardconfig.cpp:268
+#: src/keyboardconfig.cpp:272
 msgid "Deactivate Chat Input"
 msgstr ""
 
-#: src/keyboardconfig.cpp:270
+#: src/keyboardconfig.cpp:274
 msgid "Select OK"
 msgstr "Vælg OK"
 
-#: src/keyboardconfig.cpp:272
+#: src/keyboardconfig.cpp:276
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:274
+#: src/keyboardconfig.cpp:278
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:276
+#: src/keyboardconfig.cpp:280
 msgid "Direct Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:277
+#: src/keyboardconfig.cpp:281
 #, fuzzy
 msgid "Direct Down"
 msgstr "Flyt ned"
 
-#: src/keyboardconfig.cpp:279
+#: src/keyboardconfig.cpp:283
 #, fuzzy
 msgid "Direct Left"
 msgstr "Flyt til venstre"
 
-#: src/keyboardconfig.cpp:280
+#: src/keyboardconfig.cpp:284
 #, fuzzy
 msgid "Direct Right"
 msgstr "Flyt til højre"
 
-#: src/keyboardconfig.cpp:282
+#: src/keyboardconfig.cpp:286
 msgid "Crazy moves"
 msgstr ""
 
-#: src/keyboardconfig.cpp:284
+#: src/keyboardconfig.cpp:288
 msgid "Change Crazy Move mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:286
+#: src/keyboardconfig.cpp:290
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:288
+#: src/keyboardconfig.cpp:292
 msgid "Quick Drop N Items"
 msgstr ""
 
-#: src/keyboardconfig.cpp:290
+#: src/keyboardconfig.cpp:294
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/keyboardconfig.cpp:292
+#: src/keyboardconfig.cpp:296
 msgid "Quick heal target or self"
 msgstr ""
 
-#: src/keyboardconfig.cpp:294
+#: src/keyboardconfig.cpp:298
 msgid "Use #itenplz spell"
 msgstr ""
 
-#: src/keyboardconfig.cpp:296
+#: src/keyboardconfig.cpp:300
 msgid "Use magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboardconfig.cpp:302
 #, fuzzy
 msgid "Switch magic attack"
 msgstr "Skift karakter"
 
-#: src/keyboardconfig.cpp:300
+#: src/keyboardconfig.cpp:304
 #, fuzzy
 msgid "Change move type"
 msgstr "Server"
 
-#: src/keyboardconfig.cpp:302
+#: src/keyboardconfig.cpp:306
 msgid "Change Attack Weapon Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:304
+#: src/keyboardconfig.cpp:308
 #, fuzzy
 msgid "Change Attack Type"
 msgstr "Vælg modstander og angrib"
 
-#: src/keyboardconfig.cpp:306
+#: src/keyboardconfig.cpp:310
 #, fuzzy
 msgid "Change Follow mode"
 msgstr "Skift adgangskode"
 
-#: src/keyboardconfig.cpp:308
+#: src/keyboardconfig.cpp:312
 #, fuzzy
 msgid "Change Imitation mode"
 msgstr "Skift e-mail adresse"
 
-#: src/keyboardconfig.cpp:311
+#: src/keyboardconfig.cpp:315
 msgid "Disbale / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboardconfig.cpp:316
 msgid "On / Off audio"
 msgstr ""
 
-#: src/keyboardconfig.cpp:314
+#: src/keyboardconfig.cpp:318
 #, fuzzy
 msgid "Enable / Disable away mode"
 msgstr "Slå handler fra/til"
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboardconfig.cpp:320
 msgid "Emulate right click from keyboard"
 msgstr ""
 
-#: src/keyboardconfig.cpp:318
+#: src/keyboardconfig.cpp:322
 msgid "Toggle camera mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:380
+#: src/keyboardconfig.cpp:384
 #, fuzzy, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -4112,7 +4130,7 @@ msgstr " Tryk OK for at genopstå"
 msgid "You Died"
 msgstr "Du er død"
 
-#: src/net/manaserv/charhandler.cpp:144 src/net/manaserv/charhandler.cpp:215
+#: src/net/manaserv/charhandler.cpp:144 src/net/manaserv/charhandler.cpp:218
 #, fuzzy
 msgid "Not logged in."
 msgstr "Allerede logget ind"
@@ -4157,7 +4175,11 @@ msgstr "Du har brugt alle dine points"
 msgid "At least one statis out of the permitted range: (%u - %u)."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:177 src/net/manaserv/loginhandler.cpp:98
+#: src/net/manaserv/charhandler.cpp:177
+msgid "Invalid slot number."
+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
@@ -4165,26 +4187,26 @@ msgstr ""
 msgid "Unknown error."
 msgstr "Ukendt fejl"
 
-#: src/net/manaserv/charhandler.cpp:206 src/net/tmwa/charserverhandler.cpp:149
+#: src/net/manaserv/charhandler.cpp:209 src/net/tmwa/charserverhandler.cpp:149
 msgid "Info"
 msgstr "Info"
 
-#: src/net/manaserv/charhandler.cpp:206
+#: src/net/manaserv/charhandler.cpp:209
 #, fuzzy
 msgid "Player deleted."
 msgstr "Karakteren er slettet"
 
-#: src/net/manaserv/charhandler.cpp:218
+#: src/net/manaserv/charhandler.cpp:221
 #, fuzzy
 msgid "Selection out of range."
 msgstr "Vælg hvor mange genstande du vil bytte."
 
-#: src/net/manaserv/charhandler.cpp:221
+#: src/net/manaserv/charhandler.cpp:224
 #, fuzzy, c-format
 msgid "Unknown error (%d)."
 msgstr "Ukendt fejl"
 
-#: src/net/manaserv/charhandler.cpp:257
+#: src/net/manaserv/charhandler.cpp:260
 msgid "No gameservers are available."
 msgstr "Der er ingen tilgængelige spilservere."
 
@@ -4376,11 +4398,11 @@ msgstr "%s vil gerne handle med dig. Accepterer du?"
 msgid "Trading with %s"
 msgstr "Handler med %s"
 
-#: src/net/manaserv/tradehandler.cpp:159 src/net/tmwa/tradehandler.cpp:268
+#: src/net/manaserv/tradehandler.cpp:159 src/net/tmwa/tradehandler.cpp:273
 msgid "Trade canceled."
 msgstr "Handel annulleret."
 
-#: src/net/manaserv/tradehandler.cpp:166 src/net/tmwa/tradehandler.cpp:278
+#: src/net/manaserv/tradehandler.cpp:166 src/net/tmwa/tradehandler.cpp:283
 msgid "Trade completed."
 msgstr "Handel er komplet."
 
@@ -4865,11 +4887,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:329
+#: src/net/tmwa/inventoryhandler.cpp:334
 msgid "Failed to use item."
 msgstr "Du kunne ikke bruge denne genstand."
 
-#: src/net/tmwa/inventoryhandler.cpp:452
+#: src/net/tmwa/inventoryhandler.cpp:457
 msgid "Unable to equip."
 msgstr ""
 
@@ -5196,7 +5218,14 @@ msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 "Fejlede i at tilføje genstand. Handels partneren har ikke flere frie pladser."
 
-#: src/net/tmwa/tradehandler.cpp:250
+#: src/net/tmwa/tradehandler.cpp:251
+#, fuzzy
+msgid "Failed adding item. You cant trade this item."
+msgstr ""
+"Fejlede i at tilføje genstand. Du kan ikke overlappe en slags genstand på "
+"vinduet."
+
+#: src/net/tmwa/tradehandler.cpp:255
 msgid "Failed adding item for unknown reason."
 msgstr "Fejlede i at tilføje genstand af en ukendt grund."
 
@@ -5221,6 +5250,11 @@ msgstr ""
 msgid "Floating bubble"
 msgstr ""
 
+#: src/resources/beinginfo.cpp:32 src/resources/itemdb.cpp:210
+#: src/resources/monsterdb.cpp:78
+msgid "unnamed"
+msgstr "unavngivet"
+
 #: src/resources/itemdb.cpp:55
 #, c-format
 msgid "Attack %+d"
@@ -5245,10 +5279,6 @@ msgstr "MP %+d"
 msgid "Unknown item"
 msgstr "Ukendt genstand"
 
-#: src/resources/itemdb.cpp:210 src/resources/monsterdb.cpp:78
-msgid "unnamed"
-msgstr "unavngivet"
-
 #, fuzzy
 #~ msgid "Particle detail: %s"
 #~ msgstr "Partikeldetaljer"
diff --git a/po/de.po b/po/de.po
index 960d37839..ddadab853 100644
--- a/po/de.po
+++ b/po/de.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Mana World 0.1.0\n"
 "Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2010-12-24 19:29+0200\n"
+"POT-Creation-Date: 2011-01-05 04:50+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"
@@ -24,6 +24,14 @@ msgstr ""
 "X-Generator: Lokalize 1.0\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
+#: src/being.cpp:480
+msgid "dodge"
+msgstr ""
+
+#: src/being.cpp:480
+msgid "miss"
+msgstr "verfehlt"
+
 #: src/client.cpp:724 src/gui/setup.cpp:47 src/gui/windowmenu.cpp:92
 msgid "Setup"
 msgstr "Einstellungen"
@@ -59,9 +67,9 @@ 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:179 src/gui/register.cpp:225
+#: src/gui/charcreatedialog.cpp:185 src/gui/register.cpp:225
 #: src/gui/serverdialog.cpp:350 src/gui/unregisterdialog.cpp:134
-#: src/net/manaserv/charhandler.cpp:180 src/net/manaserv/charhandler.cpp:223
+#: src/net/manaserv/charhandler.cpp:183 src/net/manaserv/charhandler.cpp:226
 #: src/net/tmwa/charserverhandler.cpp:137
 #: src/net/tmwa/charserverhandler.cpp:154
 msgid "Error"
@@ -663,12 +671,12 @@ msgstr "Ignoriere eingehende Handelsanfragen"
 msgid "Accepting incoming trade requests"
 msgstr "Akzeptiere eingehende Handelsanfragen"
 
-#: src/game.cpp:1373
+#: src/game.cpp:1376
 #, fuzzy
 msgid "Could Not Load Map"
 msgstr "Karte konnte nicht geladen werden"
 
-#: src/game.cpp:1374
+#: src/game.cpp:1377
 #, c-format
 msgid "Error while loading %s"
 msgstr "Fehler beim Laden von %s"
@@ -746,7 +754,7 @@ 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/keyboardconfig.cpp:271
+#: src/keyboardconfig.cpp:275
 msgid "Quit"
 msgstr "Beenden"
 
@@ -768,9 +776,9 @@ msgstr "Verkaufen"
 #: src/gui/buysell.cpp:62 src/gui/changeemaildialog.cpp:56
 #: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
 #: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:206
-#: src/gui/npcpostdialog.cpp:55 src/gui/popupmenu.cpp:1120
-#: src/gui/popupmenu.cpp:1147 src/gui/popupmenu.cpp:1192
-#: src/gui/popupmenu.cpp:1230 src/gui/quitdialog.cpp:54
+#: src/gui/npcpostdialog.cpp:55 src/gui/popupmenu.cpp:1122
+#: src/gui/popupmenu.cpp:1149 src/gui/popupmenu.cpp:1194
+#: src/gui/popupmenu.cpp:1232 src/gui/quitdialog.cpp:54
 #: src/gui/register.cpp:79 src/gui/setup.cpp:64 src/gui/socialwindow.cpp:786
 #: src/gui/textcommandeditor.cpp:231 src/gui/textdialog.cpp:44
 #: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:153
@@ -867,7 +875,7 @@ msgstr "Haarfarbe:"
 msgid "Hair style:"
 msgstr "Frisur:"
 
-#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:437
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:445
 #: src/gui/socialwindow.cpp:846
 msgid "Create"
 msgstr "Erstellen"
@@ -880,20 +888,20 @@ msgstr "Männlich"
 msgid "Female"
 msgstr "Weiblich"
 
-#: src/gui/charcreatedialog.cpp:99 src/gui/charcreatedialog.cpp:251
+#: src/gui/charcreatedialog.cpp:99 src/gui/charcreatedialog.cpp:257
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Bitte verteile %d Punkte"
 
-#: src/gui/charcreatedialog.cpp:180
+#: src/gui/charcreatedialog.cpp:186
 msgid "Your name needs to be at least 4 characters."
 msgstr "Dein Name muss aus mindestens 4 Zeichen bestehen."
 
-#: src/gui/charcreatedialog.cpp:242
+#: src/gui/charcreatedialog.cpp:248
 msgid "Character stats OK"
 msgstr "Spielfigurattribute OK"
 
-#: src/gui/charcreatedialog.cpp:256
+#: src/gui/charcreatedialog.cpp:262
 #, c-format
 msgid "Please remove %d points"
 msgstr "Bitte entferne %d Punkte"
@@ -923,17 +931,22 @@ msgstr "Abmelden"
 msgid "Change Email"
 msgstr "E-Mailadresse ändern"
 
-#: src/gui/charselectdialog.cpp:367 src/gui/serverdialog.cpp:248
+#: src/gui/charselectdialog.cpp:375 src/gui/serverdialog.cpp:248
 #: src/gui/setup_players.cpp:242 src/gui/shopwindow.cpp:117
 #: src/gui/shopwindow.cpp:120 src/gui/textcommandeditor.cpp:234
 msgid "Delete"
 msgstr "Löschen"
 
-#: src/gui/charselectdialog.cpp:425
+#: src/gui/charselectdialog.cpp:433
 msgid "Choose"
 msgstr "Wähle"
 
-#: src/gui/charselectdialog.cpp:439 src/gui/charselectdialog.cpp:440
+#: src/gui/charselectdialog.cpp:436
+#, c-format
+msgid "Level %d"
+msgstr "Stufe: %d"
+
+#: src/gui/charselectdialog.cpp:447 src/gui/charselectdialog.cpp:448
 msgid "(empty)"
 msgstr ""
 
@@ -1163,14 +1176,14 @@ msgstr ""
 msgid "OK"
 msgstr "Ok"
 
-#: src/gui/equipmentwindow.cpp:70 src/gui/windowmenu.cpp:70
+#: src/gui/equipmentwindow.cpp:72 src/gui/windowmenu.cpp:70
 msgid "Equipment"
 msgstr "Ausrüstung"
 
-#: src/gui/equipmentwindow.cpp:89 src/gui/inventorywindow.cpp:96
+#: src/gui/equipmentwindow.cpp:91 src/gui/inventorywindow.cpp:96
 #: src/gui/inventorywindow.cpp:393 src/gui/inventorywindow.cpp:402
-#: src/gui/popupmenu.cpp:1068 src/gui/popupmenu.cpp:1167
-#: src/gui/popupmenu.cpp:1207
+#: src/gui/popupmenu.cpp:1070 src/gui/popupmenu.cpp:1169
+#: src/gui/popupmenu.cpp:1209
 msgid "Unequip"
 msgstr "Ablegen"
 
@@ -1196,31 +1209,31 @@ msgid "Slots:"
 msgstr "Plätze:"
 
 #: src/gui/inventorywindow.cpp:94 src/gui/inventorywindow.cpp:395
-#: src/gui/inventorywindow.cpp:404 src/gui/popupmenu.cpp:1070
-#: src/gui/popupmenu.cpp:1169 src/gui/popupmenu.cpp:1209
+#: src/gui/inventorywindow.cpp:404 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:1073
-#: src/gui/popupmenu.cpp:1142 src/gui/popupmenu.cpp:1173
-#: src/gui/popupmenu.cpp:1212
+#: src/gui/inventorywindow.cpp:400 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/popupmenu.cpp:1076 src/gui/popupmenu.cpp:1177
-#: src/gui/popupmenu.cpp:1215
+#: 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:1081
-#: src/gui/popupmenu.cpp:1182 src/gui/popupmenu.cpp:1220
+#: src/gui/inventorywindow.cpp:110 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/popupmenu.cpp:408
+#: src/gui/popupmenu.cpp:409
 msgid "Outfits"
 msgstr ""
 
@@ -1229,17 +1242,17 @@ msgid "Weight:"
 msgstr "Gewicht:"
 
 #: src/gui/inventorywindow.cpp:133 src/gui/inventorywindow.cpp:490
-#: src/gui/popupmenu.cpp:1085 src/gui/popupmenu.cpp:1185
-#: src/gui/popupmenu.cpp:1223 src/gui/setup.cpp:65
+#: 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:1104
+#: src/gui/inventorywindow.cpp:134 src/gui/popupmenu.cpp:1106
 msgid "Retrieve"
 msgstr "Abholen"
 
-#: src/gui/inventorywindow.cpp:501 src/gui/popupmenu.cpp:1078
-#: src/gui/popupmenu.cpp:1179 src/gui/popupmenu.cpp:1217
+#: src/gui/inventorywindow.cpp:501 src/gui/popupmenu.cpp:1080
+#: src/gui/popupmenu.cpp:1181 src/gui/popupmenu.cpp:1219
 #: src/gui/windowmenu.cpp:91
 msgid "Drop"
 msgstr "Wegwerfen"
@@ -1479,7 +1492,7 @@ msgstr "Absenden"
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:447
+#: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:448
 #, fuzzy
 msgid "Clear"
 msgstr "Waffenarm"
@@ -1523,269 +1536,269 @@ msgstr "erstes ausziehen"
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:116 src/gui/popupmenu.cpp:482
+#: src/gui/popupmenu.cpp:116 src/gui/popupmenu.cpp:483
 msgid "@@trade|Trade@@"
 msgstr ""
 
 #. TRANSLATORS: Attacking a player.
-#: src/gui/popupmenu.cpp:118 src/gui/popupmenu.cpp:237
-#: src/gui/popupmenu.cpp:483
+#: src/gui/popupmenu.cpp:118 src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:484
 msgid "@@attack|Attack@@"
 msgstr ""
 
 #. TRANSLATORS: Whispering a player.
-#: src/gui/popupmenu.cpp:120 src/gui/popupmenu.cpp:289
+#: src/gui/popupmenu.cpp:120 src/gui/popupmenu.cpp:290
 msgid "@@whisper|Whisper@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:487
+#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:488
 msgid "@@heal|Heal@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:130 src/gui/popupmenu.cpp:295
-#: src/gui/popupmenu.cpp:493
+#: src/gui/popupmenu.cpp:130 src/gui/popupmenu.cpp:296
+#: src/gui/popupmenu.cpp:494
 msgid "@@friend|Befriend@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:136
-#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:296
-#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:320
-#: src/gui/popupmenu.cpp:494 src/gui/popupmenu.cpp:499
-#: src/gui/popupmenu.cpp:517
+#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:137
+#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:297
+#: src/gui/popupmenu.cpp:303 src/gui/popupmenu.cpp:321
+#: src/gui/popupmenu.cpp:495 src/gui/popupmenu.cpp:501
+#: src/gui/popupmenu.cpp:519
 msgid "@@disregard|Disregard@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:137
-#: src/gui/popupmenu.cpp:297 src/gui/popupmenu.cpp:303
-#: src/gui/popupmenu.cpp:495 src/gui/popupmenu.cpp:500
+#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:138
+#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:304
+#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:502
 msgid "@@ignore|Ignore@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:133 src/gui/popupmenu.cpp:138
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:149
-#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:304
-#: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:315
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:501
-#: src/gui/popupmenu.cpp:507 src/gui/popupmenu.cpp:512
+#: src/gui/popupmenu.cpp:133 src/gui/popupmenu.cpp:139
+#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:150
+#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:305
+#: src/gui/popupmenu.cpp:311 src/gui/popupmenu.cpp:316
+#: src/gui/popupmenu.cpp:497 src/gui/popupmenu.cpp:503
+#: src/gui/popupmenu.cpp:509 src/gui/popupmenu.cpp:514
 msgid "@@erase|Erase@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:148
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:308
-#: src/gui/popupmenu.cpp:314 src/gui/popupmenu.cpp:319
-#: src/gui/popupmenu.cpp:505 src/gui/popupmenu.cpp:511
-#: src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:143 src/gui/popupmenu.cpp:149
+#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:315 src/gui/popupmenu.cpp:320
+#: src/gui/popupmenu.cpp:507 src/gui/popupmenu.cpp:513
+#: src/gui/popupmenu.cpp:518
 msgid "@@unignore|Unignore@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:143 src/gui/popupmenu.cpp:155
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:321
-#: src/gui/popupmenu.cpp:506 src/gui/popupmenu.cpp:518
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:156
+#: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:322
+#: src/gui/popupmenu.cpp:508 src/gui/popupmenu.cpp:520
 #, fuzzy
 msgid "@@ignore|Completely ignore@@"
 msgstr "@@ignore|Ignoriere %s komplett@@"
 
-#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:329
-#: src/gui/popupmenu.cpp:526
+#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:330
+#: src/gui/popupmenu.cpp:528
 msgid "@@follow|Follow@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:330
-#: src/gui/popupmenu.cpp:527
+#: src/gui/popupmenu.cpp:165 src/gui/popupmenu.cpp:331
+#: src/gui/popupmenu.cpp:529
 msgid "@@imitation|Imitation@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:174 src/gui/popupmenu.cpp:546
+#: src/gui/popupmenu.cpp:175 src/gui/popupmenu.cpp:548
 #, fuzzy
 msgid "@@party|Invite to party@@"
 msgstr "/party > Lade einen Benutzer zu deiner Party ein"
 
-#: src/gui/popupmenu.cpp:179 src/gui/popupmenu.cpp:551
+#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:553
 msgid "@@kick party|Kick from party@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:337
-#: src/gui/popupmenu.cpp:565
+#: src/gui/popupmenu.cpp:195 src/gui/popupmenu.cpp:338
+#: src/gui/popupmenu.cpp:567
 msgid "@@guild-kick|Kick from guild@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:196 src/gui/popupmenu.cpp:338
-#: src/gui/popupmenu.cpp:567
+#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:339
+#: src/gui/popupmenu.cpp:569
 msgid "@@guild-pos|Change pos in guild >@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:201 src/gui/popupmenu.cpp:342
-#: src/gui/popupmenu.cpp:572
+#: 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"
 
-#: src/gui/popupmenu.cpp:208
+#: src/gui/popupmenu.cpp:209
 msgid "@@admin-kick|Kick player@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:210
+#: src/gui/popupmenu.cpp:211
 msgid "@@nuke|Nuke@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:211 src/gui/popupmenu.cpp:231
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:232
+#: src/gui/popupmenu.cpp:530
 msgid "@@move|Move@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:529
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:531
 msgid "@@undress|Undress@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:228
-#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:534
+#: src/gui/popupmenu.cpp:218 src/gui/popupmenu.cpp:229
+#: src/gui/popupmenu.cpp:350 src/gui/popupmenu.cpp:536
 msgid "@@buy|Buy@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:218 src/gui/popupmenu.cpp:229
-#: src/gui/popupmenu.cpp:350 src/gui/popupmenu.cpp:535
+#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:230
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:537
 msgid "@@sell|Sell@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:226
+#: src/gui/popupmenu.cpp:227
 msgid "@@talk|Talk@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:240
+#: src/gui/popupmenu.cpp:241
 msgid "@@admin-kick|Kick@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:248 src/gui/popupmenu.cpp:353
+#: src/gui/popupmenu.cpp:249 src/gui/popupmenu.cpp:354
 #, fuzzy
 msgid "@@name|Add name to chat@@"
 msgstr "Füge Namen zu Chat hinzu"
 
-#: src/gui/popupmenu.cpp:252 src/gui/popupmenu.cpp:272
-#: src/gui/popupmenu.cpp:357 src/gui/popupmenu.cpp:380
-#: src/gui/popupmenu.cpp:399 src/gui/popupmenu.cpp:412
-#: src/gui/popupmenu.cpp:430 src/gui/popupmenu.cpp:577
-#: src/gui/popupmenu.cpp:601
+#: src/gui/popupmenu.cpp:253 src/gui/popupmenu.cpp:273
+#: src/gui/popupmenu.cpp:358 src/gui/popupmenu.cpp:381
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:431 src/gui/popupmenu.cpp:579
+#: src/gui/popupmenu.cpp:603
 msgid "@@cancel|Cancel@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:267
+#: src/gui/popupmenu.cpp:268
 #, c-format
 msgid "@@player_%u|%s >@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:375
+#: src/gui/popupmenu.cpp:376
 msgid "@@pickup|Pick up@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:376
+#: src/gui/popupmenu.cpp:377
 #, fuzzy
 msgid "@@chat|Add to chat@@"
 msgstr "Zu Chat hinzufügen"
 
-#: src/gui/popupmenu.cpp:394
+#: src/gui/popupmenu.cpp:395
 msgid "Map Item"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:395
+#: src/gui/popupmenu.cpp:396
 msgid "@@rename map|Rename@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:396
+#: src/gui/popupmenu.cpp:397
 msgid "@@remove map|Remove@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:409
+#: src/gui/popupmenu.cpp:410
 msgid "@@load old outfits|Load old outfits@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:425 src/gui/windowmenu.cpp:90
+#: src/gui/popupmenu.cpp:426 src/gui/windowmenu.cpp:90
 msgid "Spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:426
+#: src/gui/popupmenu.cpp:427
 msgid "@@load old spells|Load old spells@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:427
+#: src/gui/popupmenu.cpp:428
 msgid "@@edit spell|Edit spell@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:445
+#: src/gui/popupmenu.cpp:446
 msgid "@@chat close|Close@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:453
+#: src/gui/popupmenu.cpp:454
 #, fuzzy
 msgid "Disable highlight"
 msgstr "Hervorgehobener Tab"
 
-#: src/gui/popupmenu.cpp:459
+#: src/gui/popupmenu.cpp:460
 #, fuzzy
 msgid "Enable highlight"
 msgstr "Hervorgehobener Tab"
 
-#: src/gui/popupmenu.cpp:465
+#: src/gui/popupmenu.cpp:466
 msgid "@@leave party|Leave@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:585
+#: src/gui/popupmenu.cpp:587
 #, fuzzy
 msgid "Change guild position"
 msgstr "Ändern"
 
-#: src/gui/popupmenu.cpp:598
+#: src/gui/popupmenu.cpp:600
 #, c-format
 msgid "@@guild-pos-%d|%s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:942
+#: src/gui/popupmenu.cpp:944
 msgid "Rename map sign          "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:943
+#: src/gui/popupmenu.cpp:945
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1091
+#: src/gui/popupmenu.cpp:1093
 #, fuzzy
 msgid "Store 10"
 msgstr "Einlagern"
 
-#: src/gui/popupmenu.cpp:1094
+#: src/gui/popupmenu.cpp:1096
 #, fuzzy
 msgid "Store half"
 msgstr "Einlagern"
 
-#: src/gui/popupmenu.cpp:1096
+#: src/gui/popupmenu.cpp:1098
 #, fuzzy
 msgid "Store all"
 msgstr "Einlagern"
 
-#: src/gui/popupmenu.cpp:1110
+#: src/gui/popupmenu.cpp:1112
 #, fuzzy
 msgid "Retrieve 10"
 msgstr "Abholen"
 
-#: src/gui/popupmenu.cpp:1113
+#: src/gui/popupmenu.cpp:1115
 #, fuzzy
 msgid "Retrieve half"
 msgstr "Abholen"
 
-#: src/gui/popupmenu.cpp:1115
+#: src/gui/popupmenu.cpp:1117
 #, fuzzy
 msgid "Retrieve all"
 msgstr "Abholen"
 
-#: src/gui/popupmenu.cpp:1118 src/gui/popupmenu.cpp:1186
-#: src/gui/popupmenu.cpp:1224
+#: src/gui/popupmenu.cpp:1120 src/gui/popupmenu.cpp:1188
+#: src/gui/popupmenu.cpp:1226
 msgid "Add to chat"
 msgstr "Zu Chat hinzufügen"
 
-#: src/gui/popupmenu.cpp:1145 src/gui/popupmenu.cpp:1190
+#: src/gui/popupmenu.cpp:1147 src/gui/popupmenu.cpp:1192
 msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1228
+#: src/gui/popupmenu.cpp:1230
 msgid "Load old drop shortcuts"
 msgstr ""
 
@@ -3219,6 +3232,10 @@ msgstr ""
 msgid "Who Is Online - Update"
 msgstr ""
 
+#: src/gui/widgets/battletab.cpp:41
+msgid "Battle"
+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"
@@ -3662,174 +3679,175 @@ msgstr "Nächster Tab"
 #: src/keyboardconfig.cpp:233 src/keyboardconfig.cpp:236
 #: src/keyboardconfig.cpp:238 src/keyboardconfig.cpp:240
 #: src/keyboardconfig.cpp:242 src/keyboardconfig.cpp:244
+#: src/keyboardconfig.cpp:246 src/keyboardconfig.cpp:248
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "Gefühlstaste %d"
 
-#: src/keyboardconfig.cpp:246
+#: src/keyboardconfig.cpp:250
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:248
+#: src/keyboardconfig.cpp:252
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:250
+#: src/keyboardconfig.cpp:254
 msgid "Copy Equiped to Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:252
+#: src/keyboardconfig.cpp:256
 msgid "Toggle Chat"
 msgstr "Chat ein/aus"
 
-#: src/keyboardconfig.cpp:254
+#: src/keyboardconfig.cpp:258
 msgid "Scroll Chat Up"
 msgstr "Im Chat hochscrollen"
 
-#: src/keyboardconfig.cpp:256
+#: src/keyboardconfig.cpp:260
 msgid "Scroll Chat Down"
 msgstr "Im Chat runter scrollen"
 
-#: src/keyboardconfig.cpp:258
+#: src/keyboardconfig.cpp:262
 msgid "Previous Chat Tab"
 msgstr "Voriger Tab"
 
-#: src/keyboardconfig.cpp:260
+#: src/keyboardconfig.cpp:264
 msgid "Next Chat Tab"
 msgstr "Nächster Tab"
 
-#: src/keyboardconfig.cpp:262
+#: src/keyboardconfig.cpp:266
 #, fuzzy
 msgid "Previous chat tab line"
 msgstr "Voriger Tab"
 
-#: src/keyboardconfig.cpp:264
+#: src/keyboardconfig.cpp:268
 #, fuzzy
 msgid "Next chat tab line"
 msgstr "Nächster Tab"
 
-#: src/keyboardconfig.cpp:266
+#: src/keyboardconfig.cpp:270
 msgid "Chat Auto Complete"
 msgstr ""
 
-#: src/keyboardconfig.cpp:268
+#: src/keyboardconfig.cpp:272
 msgid "Deactivate Chat Input"
 msgstr ""
 
-#: src/keyboardconfig.cpp:270
+#: src/keyboardconfig.cpp:274
 msgid "Select OK"
 msgstr "OK auswählen"
 
-#: src/keyboardconfig.cpp:272
+#: src/keyboardconfig.cpp:276
 msgid "Ignore input 1"
 msgstr "Ignoriere Eingabe 1"
 
-#: src/keyboardconfig.cpp:274
+#: src/keyboardconfig.cpp:278
 msgid "Ignore input 2"
 msgstr "Ignoriere Eingabe 2"
 
-#: src/keyboardconfig.cpp:276
+#: src/keyboardconfig.cpp:280
 msgid "Direct Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:277
+#: src/keyboardconfig.cpp:281
 #, fuzzy
 msgid "Direct Down"
 msgstr "Laufe Runter"
 
-#: src/keyboardconfig.cpp:279
+#: src/keyboardconfig.cpp:283
 #, fuzzy
 msgid "Direct Left"
 msgstr "Laufe nach Links"
 
-#: src/keyboardconfig.cpp:280
+#: src/keyboardconfig.cpp:284
 #, fuzzy
 msgid "Direct Right"
 msgstr "Laufe nach Rechts"
 
-#: src/keyboardconfig.cpp:282
+#: src/keyboardconfig.cpp:286
 msgid "Crazy moves"
 msgstr ""
 
-#: src/keyboardconfig.cpp:284
+#: src/keyboardconfig.cpp:288
 msgid "Change Crazy Move mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:286
+#: src/keyboardconfig.cpp:290
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:288
+#: src/keyboardconfig.cpp:292
 msgid "Quick Drop N Items"
 msgstr ""
 
-#: src/keyboardconfig.cpp:290
+#: src/keyboardconfig.cpp:294
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/keyboardconfig.cpp:292
+#: src/keyboardconfig.cpp:296
 msgid "Quick heal target or self"
 msgstr ""
 
-#: src/keyboardconfig.cpp:294
+#: src/keyboardconfig.cpp:298
 msgid "Use #itenplz spell"
 msgstr ""
 
-#: src/keyboardconfig.cpp:296
+#: src/keyboardconfig.cpp:300
 msgid "Use magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboardconfig.cpp:302
 #, fuzzy
 msgid "Switch magic attack"
 msgstr "Spielfigur wechseln"
 
-#: src/keyboardconfig.cpp:300
+#: src/keyboardconfig.cpp:304
 #, fuzzy
 msgid "Change move type"
 msgstr "Wechsle den Server"
 
-#: src/keyboardconfig.cpp:302
+#: src/keyboardconfig.cpp:306
 msgid "Change Attack Weapon Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:304
+#: src/keyboardconfig.cpp:308
 #, fuzzy
 msgid "Change Attack Type"
 msgstr "Zielen & Angreifen"
 
-#: src/keyboardconfig.cpp:306
+#: src/keyboardconfig.cpp:310
 #, fuzzy
 msgid "Change Follow mode"
 msgstr "Passwort ändern"
 
-#: src/keyboardconfig.cpp:308
+#: src/keyboardconfig.cpp:312
 #, fuzzy
 msgid "Change Imitation mode"
 msgstr "E-MailAdresse ändern"
 
-#: src/keyboardconfig.cpp:311
+#: src/keyboardconfig.cpp:315
 msgid "Disbale / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboardconfig.cpp:316
 msgid "On / Off audio"
 msgstr ""
 
-#: src/keyboardconfig.cpp:314
+#: src/keyboardconfig.cpp:318
 #, fuzzy
 msgid "Enable / Disable away mode"
 msgstr "Handeln erlauben/verbieten"
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboardconfig.cpp:320
 msgid "Emulate right click from keyboard"
 msgstr ""
 
-#: src/keyboardconfig.cpp:318
+#: src/keyboardconfig.cpp:322
 msgid "Toggle camera mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:380
+#: src/keyboardconfig.cpp:384
 #, fuzzy, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -4091,7 +4109,7 @@ msgstr "Drücke \"OK\" um neu anzufangen."
 msgid "You Died"
 msgstr "Du bist tot."
 
-#: src/net/manaserv/charhandler.cpp:144 src/net/manaserv/charhandler.cpp:215
+#: src/net/manaserv/charhandler.cpp:144 src/net/manaserv/charhandler.cpp:218
 msgid "Not logged in."
 msgstr "nicht angemeldet"
 
@@ -4132,32 +4150,37 @@ msgstr "Spielfigurattribute sind zu klein"
 msgid "At least one statis out of the permitted range: (%u - %u)."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:177 src/net/manaserv/loginhandler.cpp:98
+#: src/net/manaserv/charhandler.cpp:177
+#, fuzzy
+msgid "Invalid slot number."
+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
 msgid "Unknown error."
 msgstr "Unbekannter Fehler"
 
-#: src/net/manaserv/charhandler.cpp:206 src/net/tmwa/charserverhandler.cpp:149
+#: src/net/manaserv/charhandler.cpp:209 src/net/tmwa/charserverhandler.cpp:149
 msgid "Info"
 msgstr "Info"
 
-#: src/net/manaserv/charhandler.cpp:206
+#: src/net/manaserv/charhandler.cpp:209
 msgid "Player deleted."
 msgstr "Spieler gelöscht"
 
-#: src/net/manaserv/charhandler.cpp:218
+#: src/net/manaserv/charhandler.cpp:221
 #, fuzzy
 msgid "Selection out of range."
 msgstr "Wähle aus, wie viele Gegenstände Du tauschen möchtest."
 
-#: src/net/manaserv/charhandler.cpp:221
+#: src/net/manaserv/charhandler.cpp:224
 #, fuzzy, c-format
 msgid "Unknown error (%d)."
 msgstr "Unbekannter Fehler"
 
-#: src/net/manaserv/charhandler.cpp:257
+#: src/net/manaserv/charhandler.cpp:260
 msgid "No gameservers are available."
 msgstr "Kein Server verfügbar"
 
@@ -4335,11 +4358,11 @@ msgstr "%s möchte mit dir handeln, stimmst Du zu?"
 msgid "Trading with %s"
 msgstr "Handele mit %s"
 
-#: src/net/manaserv/tradehandler.cpp:159 src/net/tmwa/tradehandler.cpp:268
+#: src/net/manaserv/tradehandler.cpp:159 src/net/tmwa/tradehandler.cpp:273
 msgid "Trade canceled."
 msgstr "Handel abgebrochen."
 
-#: src/net/manaserv/tradehandler.cpp:166 src/net/tmwa/tradehandler.cpp:278
+#: src/net/manaserv/tradehandler.cpp:166 src/net/tmwa/tradehandler.cpp:283
 msgid "Trade completed."
 msgstr "Handel abgeschlossen."
 
@@ -4825,11 +4848,11 @@ msgstr "Teilen der Erfahrungspunkte nicht möglich."
 msgid "Experience sharing unknown."
 msgstr "Teilen der Erfahrungspunkte aktiviert."
 
-#: src/net/tmwa/inventoryhandler.cpp:329
+#: src/net/tmwa/inventoryhandler.cpp:334
 msgid "Failed to use item."
 msgstr "Gegenstand konnte nicht benutzt werden."
 
-#: src/net/tmwa/inventoryhandler.cpp:452
+#: src/net/tmwa/inventoryhandler.cpp:457
 msgid "Unable to equip."
 msgstr "Kann Gegenstand nicht ausrüsten."
 
@@ -5158,7 +5181,14 @@ msgstr ""
 "Gegenstand konnte nicht hinzugefügt werden. Handelspartner hat keinen freien "
 "Platz mehr."
 
-#: src/net/tmwa/tradehandler.cpp:250
+#: src/net/tmwa/tradehandler.cpp:251
+#, fuzzy
+msgid "Failed adding item. You cant trade this item."
+msgstr ""
+"Gegenstand konnte nicht hinzugefügt werden. Du kannst keinen weiteren dieser "
+"Gegenstände hinzufügen."
+
+#: src/net/tmwa/tradehandler.cpp:255
 msgid "Failed adding item for unknown reason."
 msgstr "Gegenstand konnte nicht hinzugefügt werden. Unbekannter Fehler."
 
@@ -5182,6 +5212,11 @@ msgstr ""
 msgid "Floating bubble"
 msgstr ""
 
+#: src/resources/beinginfo.cpp:32 src/resources/itemdb.cpp:210
+#: src/resources/monsterdb.cpp:78
+msgid "unnamed"
+msgstr "unbenannt"
+
 #: src/resources/itemdb.cpp:55
 #, c-format
 msgid "Attack %+d"
@@ -5206,10 +5241,6 @@ msgstr "MP %+d"
 msgid "Unknown item"
 msgstr "Unbekannter Gegenstand"
 
-#: src/resources/itemdb.cpp:210 src/resources/monsterdb.cpp:78
-msgid "unnamed"
-msgstr "unbenannt"
-
 #~ msgid "Particle detail: %s"
 #~ msgstr "Partikeldetails: %s"
 
@@ -5604,9 +5635,6 @@ msgstr "unbenannt"
 #~ msgid "delete"
 #~ msgstr "Löschen"
 
-#~ msgid "Level %d"
-#~ msgstr "Stufe: %d"
-
 #, fuzzy
 #~ msgid "ReturnToggles"
 #~ msgstr "Enter-Taste schließt Chatzeile."
@@ -6435,9 +6463,6 @@ msgstr "unbenannt"
 #~ msgid "large"
 #~ msgstr "groß"
 
-#~ msgid "miss"
-#~ msgstr "verfehlt"
-
 #~ msgid "hurt"
 #~ msgstr "verletzten"
 
diff --git a/po/en_GB.po b/po/en_GB.po
index dcf54645d..d09702bde 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: 2010-12-24 19:29+0200\n"
+"POT-Creation-Date: 2011-01-05 04:50+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"
@@ -19,6 +19,14 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
+#: src/being.cpp:480
+msgid "dodge"
+msgstr ""
+
+#: src/being.cpp:480
+msgid "miss"
+msgstr ""
+
 #: src/client.cpp:724 src/gui/setup.cpp:47 src/gui/windowmenu.cpp:92
 msgid "Setup"
 msgstr "Setup"
@@ -54,9 +62,9 @@ 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:179 src/gui/register.cpp:225
+#: src/gui/charcreatedialog.cpp:185 src/gui/register.cpp:225
 #: src/gui/serverdialog.cpp:350 src/gui/unregisterdialog.cpp:134
-#: src/net/manaserv/charhandler.cpp:180 src/net/manaserv/charhandler.cpp:223
+#: src/net/manaserv/charhandler.cpp:183 src/net/manaserv/charhandler.cpp:226
 #: src/net/tmwa/charserverhandler.cpp:137
 #: src/net/tmwa/charserverhandler.cpp:154
 msgid "Error"
@@ -648,12 +656,12 @@ msgstr "Ignoring incoming trade requests"
 msgid "Accepting incoming trade requests"
 msgstr "Accepting incoming trade requests"
 
-#: src/game.cpp:1373
+#: src/game.cpp:1376
 #, fuzzy
 msgid "Could Not Load Map"
 msgstr "Could not load map"
 
-#: src/game.cpp:1374
+#: src/game.cpp:1377
 #, c-format
 msgid "Error while loading %s"
 msgstr "Error while loading %s"
@@ -731,7 +739,7 @@ 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/keyboardconfig.cpp:271
+#: src/keyboardconfig.cpp:275
 msgid "Quit"
 msgstr "Exit"
 
@@ -753,9 +761,9 @@ msgstr "Sell"
 #: src/gui/buysell.cpp:62 src/gui/changeemaildialog.cpp:56
 #: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
 #: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:206
-#: src/gui/npcpostdialog.cpp:55 src/gui/popupmenu.cpp:1120
-#: src/gui/popupmenu.cpp:1147 src/gui/popupmenu.cpp:1192
-#: src/gui/popupmenu.cpp:1230 src/gui/quitdialog.cpp:54
+#: src/gui/npcpostdialog.cpp:55 src/gui/popupmenu.cpp:1122
+#: src/gui/popupmenu.cpp:1149 src/gui/popupmenu.cpp:1194
+#: src/gui/popupmenu.cpp:1232 src/gui/quitdialog.cpp:54
 #: src/gui/register.cpp:79 src/gui/setup.cpp:64 src/gui/socialwindow.cpp:786
 #: src/gui/textcommandeditor.cpp:231 src/gui/textdialog.cpp:44
 #: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:153
@@ -857,7 +865,7 @@ msgstr "Hair Colour:"
 msgid "Hair style:"
 msgstr "Hair Style:"
 
-#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:437
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:445
 #: src/gui/socialwindow.cpp:846
 msgid "Create"
 msgstr "Create"
@@ -870,20 +878,20 @@ msgstr "Male"
 msgid "Female"
 msgstr "Female"
 
-#: src/gui/charcreatedialog.cpp:99 src/gui/charcreatedialog.cpp:251
+#: src/gui/charcreatedialog.cpp:99 src/gui/charcreatedialog.cpp:257
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Please distribute %d points"
 
-#: src/gui/charcreatedialog.cpp:180
+#: src/gui/charcreatedialog.cpp:186
 msgid "Your name needs to be at least 4 characters."
 msgstr "Your name needs to be at least 4 characters."
 
-#: src/gui/charcreatedialog.cpp:242
+#: src/gui/charcreatedialog.cpp:248
 msgid "Character stats OK"
 msgstr "Character stats OK"
 
-#: src/gui/charcreatedialog.cpp:256
+#: src/gui/charcreatedialog.cpp:262
 #, c-format
 msgid "Please remove %d points"
 msgstr "Please remove %d points"
@@ -914,18 +922,23 @@ msgstr "Unregister"
 msgid "Change Email"
 msgstr "Change Email Address"
 
-#: src/gui/charselectdialog.cpp:367 src/gui/serverdialog.cpp:248
+#: src/gui/charselectdialog.cpp:375 src/gui/serverdialog.cpp:248
 #: src/gui/setup_players.cpp:242 src/gui/shopwindow.cpp:117
 #: src/gui/shopwindow.cpp:120 src/gui/textcommandeditor.cpp:234
 msgid "Delete"
 msgstr "Delete"
 
-#: src/gui/charselectdialog.cpp:425
+#: src/gui/charselectdialog.cpp:433
 #, fuzzy
 msgid "Choose"
 msgstr "Close"
 
-#: src/gui/charselectdialog.cpp:439 src/gui/charselectdialog.cpp:440
+#: src/gui/charselectdialog.cpp:436
+#, fuzzy, c-format
+msgid "Level %d"
+msgstr "Level: %d"
+
+#: src/gui/charselectdialog.cpp:447 src/gui/charselectdialog.cpp:448
 msgid "(empty)"
 msgstr ""
 
@@ -1153,14 +1166,14 @@ msgstr ""
 msgid "OK"
 msgstr "OK"
 
-#: src/gui/equipmentwindow.cpp:70 src/gui/windowmenu.cpp:70
+#: src/gui/equipmentwindow.cpp:72 src/gui/windowmenu.cpp:70
 msgid "Equipment"
 msgstr "Equipment"
 
-#: src/gui/equipmentwindow.cpp:89 src/gui/inventorywindow.cpp:96
+#: src/gui/equipmentwindow.cpp:91 src/gui/inventorywindow.cpp:96
 #: src/gui/inventorywindow.cpp:393 src/gui/inventorywindow.cpp:402
-#: src/gui/popupmenu.cpp:1068 src/gui/popupmenu.cpp:1167
-#: src/gui/popupmenu.cpp:1207
+#: src/gui/popupmenu.cpp:1070 src/gui/popupmenu.cpp:1169
+#: src/gui/popupmenu.cpp:1209
 msgid "Unequip"
 msgstr "Unequip"
 
@@ -1186,32 +1199,32 @@ msgid "Slots:"
 msgstr "Slots:"
 
 #: src/gui/inventorywindow.cpp:94 src/gui/inventorywindow.cpp:395
-#: src/gui/inventorywindow.cpp:404 src/gui/popupmenu.cpp:1070
-#: src/gui/popupmenu.cpp:1169 src/gui/popupmenu.cpp:1209
+#: src/gui/inventorywindow.cpp:404 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:1073
-#: src/gui/popupmenu.cpp:1142 src/gui/popupmenu.cpp:1173
-#: src/gui/popupmenu.cpp:1212
+#: src/gui/inventorywindow.cpp:400 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/popupmenu.cpp:1076 src/gui/popupmenu.cpp:1177
-#: src/gui/popupmenu.cpp:1215
+#: 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:1081
-#: src/gui/popupmenu.cpp:1182 src/gui/popupmenu.cpp:1220
+#: src/gui/inventorywindow.cpp:110 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/popupmenu.cpp:408
+#: src/gui/popupmenu.cpp:409
 msgid "Outfits"
 msgstr ""
 
@@ -1220,17 +1233,17 @@ msgid "Weight:"
 msgstr "Weight:"
 
 #: src/gui/inventorywindow.cpp:133 src/gui/inventorywindow.cpp:490
-#: src/gui/popupmenu.cpp:1085 src/gui/popupmenu.cpp:1185
-#: src/gui/popupmenu.cpp:1223 src/gui/setup.cpp:65
+#: 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:1104
+#: src/gui/inventorywindow.cpp:134 src/gui/popupmenu.cpp:1106
 msgid "Retrieve"
 msgstr "Retrieve"
 
-#: src/gui/inventorywindow.cpp:501 src/gui/popupmenu.cpp:1078
-#: src/gui/popupmenu.cpp:1179 src/gui/popupmenu.cpp:1217
+#: src/gui/inventorywindow.cpp:501 src/gui/popupmenu.cpp:1080
+#: src/gui/popupmenu.cpp:1181 src/gui/popupmenu.cpp:1219
 #: src/gui/windowmenu.cpp:91
 msgid "Drop"
 msgstr "Drop"
@@ -1469,7 +1482,7 @@ msgstr "Submit"
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:447
+#: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:448
 #, fuzzy
 msgid "Clear"
 msgstr "Polearm"
@@ -1513,287 +1526,287 @@ msgstr "Unequip"
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:116 src/gui/popupmenu.cpp:482
+#: src/gui/popupmenu.cpp:116 src/gui/popupmenu.cpp:483
 #, fuzzy
 msgid "@@trade|Trade@@"
 msgstr "@@trade|Trade With %s@@"
 
 #. TRANSLATORS: Attacking a player.
-#: src/gui/popupmenu.cpp:118 src/gui/popupmenu.cpp:237
-#: src/gui/popupmenu.cpp:483
+#: src/gui/popupmenu.cpp:118 src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:484
 #, fuzzy
 msgid "@@attack|Attack@@"
 msgstr "@@attack|Attack %s@@"
 
 #. TRANSLATORS: Whispering a player.
-#: src/gui/popupmenu.cpp:120 src/gui/popupmenu.cpp:289
+#: src/gui/popupmenu.cpp:120 src/gui/popupmenu.cpp:290
 #, fuzzy
 msgid "@@whisper|Whisper@@"
 msgstr "@@use|Use@@"
 
-#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:487
+#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:488
 #, fuzzy
 msgid "@@heal|Heal@@"
 msgstr "@@cancel|Cancel@@"
 
-#: src/gui/popupmenu.cpp:130 src/gui/popupmenu.cpp:295
-#: src/gui/popupmenu.cpp:493
+#: src/gui/popupmenu.cpp:130 src/gui/popupmenu.cpp:296
+#: src/gui/popupmenu.cpp:494
 #, fuzzy
 msgid "@@friend|Befriend@@"
 msgstr "@@retrieve|Retrieve@@"
 
-#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:136
-#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:296
-#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:320
-#: src/gui/popupmenu.cpp:494 src/gui/popupmenu.cpp:499
-#: src/gui/popupmenu.cpp:517
+#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:137
+#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:297
+#: src/gui/popupmenu.cpp:303 src/gui/popupmenu.cpp:321
+#: src/gui/popupmenu.cpp:495 src/gui/popupmenu.cpp:501
+#: src/gui/popupmenu.cpp:519
 #, fuzzy
 msgid "@@disregard|Disregard@@"
 msgstr "@@disregard|Disregard %s@@"
 
-#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:137
-#: src/gui/popupmenu.cpp:297 src/gui/popupmenu.cpp:303
-#: src/gui/popupmenu.cpp:495 src/gui/popupmenu.cpp:500
+#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:138
+#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:304
+#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:502
 #, fuzzy
 msgid "@@ignore|Ignore@@"
 msgstr "@@ignore|Ignore %s@@"
 
-#: src/gui/popupmenu.cpp:133 src/gui/popupmenu.cpp:138
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:149
-#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:304
-#: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:315
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:501
-#: src/gui/popupmenu.cpp:507 src/gui/popupmenu.cpp:512
+#: src/gui/popupmenu.cpp:133 src/gui/popupmenu.cpp:139
+#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:150
+#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:305
+#: src/gui/popupmenu.cpp:311 src/gui/popupmenu.cpp:316
+#: src/gui/popupmenu.cpp:497 src/gui/popupmenu.cpp:503
+#: src/gui/popupmenu.cpp:509 src/gui/popupmenu.cpp:514
 #, fuzzy
 msgid "@@erase|Erase@@"
 msgstr "@@use|Use@@"
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:148
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:308
-#: src/gui/popupmenu.cpp:314 src/gui/popupmenu.cpp:319
-#: src/gui/popupmenu.cpp:505 src/gui/popupmenu.cpp:511
-#: src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:143 src/gui/popupmenu.cpp:149
+#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:315 src/gui/popupmenu.cpp:320
+#: src/gui/popupmenu.cpp:507 src/gui/popupmenu.cpp:513
+#: src/gui/popupmenu.cpp:518
 #, fuzzy
 msgid "@@unignore|Unignore@@"
 msgstr "@@unignore|Un-Ignore %s@@"
 
-#: src/gui/popupmenu.cpp:143 src/gui/popupmenu.cpp:155
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:321
-#: src/gui/popupmenu.cpp:506 src/gui/popupmenu.cpp:518
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:156
+#: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:322
+#: src/gui/popupmenu.cpp:508 src/gui/popupmenu.cpp:520
 #, fuzzy
 msgid "@@ignore|Completely ignore@@"
 msgstr "@@ignore|Completely ignore %s@@"
 
-#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:329
-#: src/gui/popupmenu.cpp:526
+#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:330
+#: src/gui/popupmenu.cpp:528
 msgid "@@follow|Follow@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:330
-#: src/gui/popupmenu.cpp:527
+#: src/gui/popupmenu.cpp:165 src/gui/popupmenu.cpp:331
+#: src/gui/popupmenu.cpp:529
 msgid "@@imitation|Imitation@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:174 src/gui/popupmenu.cpp:546
+#: src/gui/popupmenu.cpp:175 src/gui/popupmenu.cpp:548
 #, fuzzy
 msgid "@@party|Invite to party@@"
 msgstr "/party > Invite a user to party"
 
-#: src/gui/popupmenu.cpp:179 src/gui/popupmenu.cpp:551
+#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:553
 #, fuzzy
 msgid "@@kick party|Kick from party@@"
 msgstr "@@admin-kick|Kick player@@"
 
-#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:337
-#: src/gui/popupmenu.cpp:565
+#: src/gui/popupmenu.cpp:195 src/gui/popupmenu.cpp:338
+#: src/gui/popupmenu.cpp:567
 #, fuzzy
 msgid "@@guild-kick|Kick from guild@@"
 msgstr "@@admin-kick|Kick player@@"
 
-#: src/gui/popupmenu.cpp:196 src/gui/popupmenu.cpp:338
-#: src/gui/popupmenu.cpp:567
+#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:339
+#: src/gui/popupmenu.cpp:569
 msgid "@@guild-pos|Change pos in guild >@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:201 src/gui/popupmenu.cpp:342
-#: src/gui/popupmenu.cpp:572
+#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:343
+#: src/gui/popupmenu.cpp:574
 #, fuzzy
 msgid "@@guild|Invite to guild@@"
 msgstr "/party > Invite a user to party"
 
-#: src/gui/popupmenu.cpp:208
+#: src/gui/popupmenu.cpp:209
 msgid "@@admin-kick|Kick player@@"
 msgstr "@@admin-kick|Kick player@@"
 
-#: src/gui/popupmenu.cpp:210
+#: src/gui/popupmenu.cpp:211
 msgid "@@nuke|Nuke@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:211 src/gui/popupmenu.cpp:231
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:232
+#: src/gui/popupmenu.cpp:530
 msgid "@@move|Move@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:529
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:531
 #, fuzzy
 msgid "@@undress|Undress@@"
 msgstr "@@unignore|Un-Ignore %s@@"
 
-#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:228
-#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:534
+#: src/gui/popupmenu.cpp:218 src/gui/popupmenu.cpp:229
+#: src/gui/popupmenu.cpp:350 src/gui/popupmenu.cpp:536
 msgid "@@buy|Buy@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:218 src/gui/popupmenu.cpp:229
-#: src/gui/popupmenu.cpp:350 src/gui/popupmenu.cpp:535
+#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:230
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:537
 #, fuzzy
 msgid "@@sell|Sell@@"
 msgstr "@@use|Use@@"
 
-#: src/gui/popupmenu.cpp:226
+#: src/gui/popupmenu.cpp:227
 #, fuzzy
 msgid "@@talk|Talk@@"
 msgstr "@@attack|Attack %s@@"
 
-#: src/gui/popupmenu.cpp:240
+#: src/gui/popupmenu.cpp:241
 #, fuzzy
 msgid "@@admin-kick|Kick@@"
 msgstr "@@admin-kick|Kick player@@"
 
-#: src/gui/popupmenu.cpp:248 src/gui/popupmenu.cpp:353
+#: src/gui/popupmenu.cpp:249 src/gui/popupmenu.cpp:354
 #, fuzzy
 msgid "@@name|Add name to chat@@"
 msgstr "@@name|Add name to chat@@"
 
-#: src/gui/popupmenu.cpp:252 src/gui/popupmenu.cpp:272
-#: src/gui/popupmenu.cpp:357 src/gui/popupmenu.cpp:380
-#: src/gui/popupmenu.cpp:399 src/gui/popupmenu.cpp:412
-#: src/gui/popupmenu.cpp:430 src/gui/popupmenu.cpp:577
-#: src/gui/popupmenu.cpp:601
+#: src/gui/popupmenu.cpp:253 src/gui/popupmenu.cpp:273
+#: src/gui/popupmenu.cpp:358 src/gui/popupmenu.cpp:381
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:431 src/gui/popupmenu.cpp:579
+#: src/gui/popupmenu.cpp:603
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancel|Cancel@@"
 
-#: src/gui/popupmenu.cpp:267
+#: src/gui/popupmenu.cpp:268
 #, c-format
 msgid "@@player_%u|%s >@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:375
+#: src/gui/popupmenu.cpp:376
 #, fuzzy
 msgid "@@pickup|Pick up@@"
 msgstr "@@pickup|Pick up %s@@"
 
-#: src/gui/popupmenu.cpp:376
+#: src/gui/popupmenu.cpp:377
 #, fuzzy
 msgid "@@chat|Add to chat@@"
 msgstr "@@chat|Add to chat@@"
 
-#: src/gui/popupmenu.cpp:394
+#: src/gui/popupmenu.cpp:395
 msgid "Map Item"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:395
+#: src/gui/popupmenu.cpp:396
 msgid "@@rename map|Rename@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:396
+#: src/gui/popupmenu.cpp:397
 msgid "@@remove map|Remove@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:409
+#: src/gui/popupmenu.cpp:410
 msgid "@@load old outfits|Load old outfits@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:425 src/gui/windowmenu.cpp:90
+#: src/gui/popupmenu.cpp:426 src/gui/windowmenu.cpp:90
 msgid "Spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:426
+#: src/gui/popupmenu.cpp:427
 msgid "@@load old spells|Load old spells@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:427
+#: src/gui/popupmenu.cpp:428
 #, fuzzy
 msgid "@@edit spell|Edit spell@@"
 msgstr "@@use|Use@@"
 
-#: src/gui/popupmenu.cpp:445
+#: src/gui/popupmenu.cpp:446
 msgid "@@chat close|Close@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:453
+#: src/gui/popupmenu.cpp:454
 #, fuzzy
 msgid "Disable highlight"
 msgstr "Tab Highlight"
 
-#: src/gui/popupmenu.cpp:459
+#: src/gui/popupmenu.cpp:460
 #, fuzzy
 msgid "Enable highlight"
 msgstr "Tab Highlight"
 
-#: src/gui/popupmenu.cpp:465
+#: src/gui/popupmenu.cpp:466
 msgid "@@leave party|Leave@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:585
+#: src/gui/popupmenu.cpp:587
 #, fuzzy
 msgid "Change guild position"
 msgstr "Change"
 
-#: src/gui/popupmenu.cpp:598
+#: src/gui/popupmenu.cpp:600
 #, c-format
 msgid "@@guild-pos-%d|%s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:942
+#: src/gui/popupmenu.cpp:944
 msgid "Rename map sign          "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:943
+#: src/gui/popupmenu.cpp:945
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1091
+#: src/gui/popupmenu.cpp:1093
 #, fuzzy
 msgid "Store 10"
 msgstr "Store"
 
-#: src/gui/popupmenu.cpp:1094
+#: src/gui/popupmenu.cpp:1096
 #, fuzzy
 msgid "Store half"
 msgstr "Store"
 
-#: src/gui/popupmenu.cpp:1096
+#: src/gui/popupmenu.cpp:1098
 #, fuzzy
 msgid "Store all"
 msgstr "Store"
 
-#: src/gui/popupmenu.cpp:1110
+#: src/gui/popupmenu.cpp:1112
 #, fuzzy
 msgid "Retrieve 10"
 msgstr "Retrieve"
 
-#: src/gui/popupmenu.cpp:1113
+#: src/gui/popupmenu.cpp:1115
 #, fuzzy
 msgid "Retrieve half"
 msgstr "Retrieve"
 
-#: src/gui/popupmenu.cpp:1115
+#: src/gui/popupmenu.cpp:1117
 #, fuzzy
 msgid "Retrieve all"
 msgstr "Retrieve"
 
-#: src/gui/popupmenu.cpp:1118 src/gui/popupmenu.cpp:1186
-#: src/gui/popupmenu.cpp:1224
+#: src/gui/popupmenu.cpp:1120 src/gui/popupmenu.cpp:1188
+#: src/gui/popupmenu.cpp:1226
 #, fuzzy
 msgid "Add to chat"
 msgstr "@@chat|Add to chat@@"
 
-#: src/gui/popupmenu.cpp:1145 src/gui/popupmenu.cpp:1190
+#: src/gui/popupmenu.cpp:1147 src/gui/popupmenu.cpp:1192
 msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1228
+#: src/gui/popupmenu.cpp:1230
 msgid "Load old drop shortcuts"
 msgstr ""
 
@@ -3226,6 +3239,10 @@ msgstr ""
 msgid "Who Is Online - Update"
 msgstr ""
 
+#: src/gui/widgets/battletab.cpp:41
+msgid "Battle"
+msgstr ""
+
 #: src/gui/widgets/channeltab.cpp:49
 msgid "/users > Lists the users in the current channel"
 msgstr "/users > Lists the users in the current channel"
@@ -3665,174 +3682,175 @@ msgstr "Next Chat Tab"
 #: src/keyboardconfig.cpp:233 src/keyboardconfig.cpp:236
 #: src/keyboardconfig.cpp:238 src/keyboardconfig.cpp:240
 #: src/keyboardconfig.cpp:242 src/keyboardconfig.cpp:244
+#: src/keyboardconfig.cpp:246 src/keyboardconfig.cpp:248
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "Emote Shortcut %d"
 
-#: src/keyboardconfig.cpp:246
+#: src/keyboardconfig.cpp:250
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:248
+#: src/keyboardconfig.cpp:252
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:250
+#: src/keyboardconfig.cpp:254
 msgid "Copy Equiped to Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:252
+#: src/keyboardconfig.cpp:256
 msgid "Toggle Chat"
 msgstr "Toggle Chat"
 
-#: src/keyboardconfig.cpp:254
+#: src/keyboardconfig.cpp:258
 msgid "Scroll Chat Up"
 msgstr "Scroll Chat Up"
 
-#: src/keyboardconfig.cpp:256
+#: src/keyboardconfig.cpp:260
 msgid "Scroll Chat Down"
 msgstr "Scroll Chat Down"
 
-#: src/keyboardconfig.cpp:258
+#: src/keyboardconfig.cpp:262
 msgid "Previous Chat Tab"
 msgstr "Previous Chat Tab"
 
-#: src/keyboardconfig.cpp:260
+#: src/keyboardconfig.cpp:264
 msgid "Next Chat Tab"
 msgstr "Next Chat Tab"
 
-#: src/keyboardconfig.cpp:262
+#: src/keyboardconfig.cpp:266
 #, fuzzy
 msgid "Previous chat tab line"
 msgstr "Previous Chat Tab"
 
-#: src/keyboardconfig.cpp:264
+#: src/keyboardconfig.cpp:268
 #, fuzzy
 msgid "Next chat tab line"
 msgstr "Next Chat Tab"
 
-#: src/keyboardconfig.cpp:266
+#: src/keyboardconfig.cpp:270
 msgid "Chat Auto Complete"
 msgstr ""
 
-#: src/keyboardconfig.cpp:268
+#: src/keyboardconfig.cpp:272
 msgid "Deactivate Chat Input"
 msgstr ""
 
-#: src/keyboardconfig.cpp:270
+#: src/keyboardconfig.cpp:274
 msgid "Select OK"
 msgstr "Select OK"
 
-#: src/keyboardconfig.cpp:272
+#: src/keyboardconfig.cpp:276
 msgid "Ignore input 1"
 msgstr "Ignore input 1"
 
-#: src/keyboardconfig.cpp:274
+#: src/keyboardconfig.cpp:278
 msgid "Ignore input 2"
 msgstr "Ignore input 2"
 
-#: src/keyboardconfig.cpp:276
+#: src/keyboardconfig.cpp:280
 msgid "Direct Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:277
+#: src/keyboardconfig.cpp:281
 #, fuzzy
 msgid "Direct Down"
 msgstr "Move Down"
 
-#: src/keyboardconfig.cpp:279
+#: src/keyboardconfig.cpp:283
 #, fuzzy
 msgid "Direct Left"
 msgstr "Move Left"
 
-#: src/keyboardconfig.cpp:280
+#: src/keyboardconfig.cpp:284
 #, fuzzy
 msgid "Direct Right"
 msgstr "Move Right"
 
-#: src/keyboardconfig.cpp:282
+#: src/keyboardconfig.cpp:286
 msgid "Crazy moves"
 msgstr ""
 
-#: src/keyboardconfig.cpp:284
+#: src/keyboardconfig.cpp:288
 msgid "Change Crazy Move mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:286
+#: src/keyboardconfig.cpp:290
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:288
+#: src/keyboardconfig.cpp:292
 msgid "Quick Drop N Items"
 msgstr ""
 
-#: src/keyboardconfig.cpp:290
+#: src/keyboardconfig.cpp:294
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/keyboardconfig.cpp:292
+#: src/keyboardconfig.cpp:296
 msgid "Quick heal target or self"
 msgstr ""
 
-#: src/keyboardconfig.cpp:294
+#: src/keyboardconfig.cpp:298
 msgid "Use #itenplz spell"
 msgstr ""
 
-#: src/keyboardconfig.cpp:296
+#: src/keyboardconfig.cpp:300
 msgid "Use magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboardconfig.cpp:302
 #, fuzzy
 msgid "Switch magic attack"
 msgstr "Switch character"
 
-#: src/keyboardconfig.cpp:300
+#: src/keyboardconfig.cpp:304
 #, fuzzy
 msgid "Change move type"
 msgstr "Server"
 
-#: src/keyboardconfig.cpp:302
+#: src/keyboardconfig.cpp:306
 msgid "Change Attack Weapon Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:304
+#: src/keyboardconfig.cpp:308
 #, fuzzy
 msgid "Change Attack Type"
 msgstr "Target & Attack"
 
-#: src/keyboardconfig.cpp:306
+#: src/keyboardconfig.cpp:310
 #, fuzzy
 msgid "Change Follow mode"
 msgstr "Change Password"
 
-#: src/keyboardconfig.cpp:308
+#: src/keyboardconfig.cpp:312
 #, fuzzy
 msgid "Change Imitation mode"
 msgstr "Change Email Address"
 
-#: src/keyboardconfig.cpp:311
+#: src/keyboardconfig.cpp:315
 msgid "Disbale / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboardconfig.cpp:316
 msgid "On / Off audio"
 msgstr ""
 
-#: src/keyboardconfig.cpp:314
+#: src/keyboardconfig.cpp:318
 #, fuzzy
 msgid "Enable / Disable away mode"
 msgstr "Allow/Disallow Trading"
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboardconfig.cpp:320
 msgid "Emulate right click from keyboard"
 msgstr ""
 
-#: src/keyboardconfig.cpp:318
+#: src/keyboardconfig.cpp:322
 msgid "Toggle camera mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:380
+#: src/keyboardconfig.cpp:384
 #, fuzzy, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -4102,7 +4120,7 @@ msgstr " Press OK to respawn"
 msgid "You Died"
 msgstr "You died"
 
-#: src/net/manaserv/charhandler.cpp:144 src/net/manaserv/charhandler.cpp:215
+#: src/net/manaserv/charhandler.cpp:144 src/net/manaserv/charhandler.cpp:218
 #, fuzzy
 msgid "Not logged in."
 msgstr "Already logged in"
@@ -4147,7 +4165,11 @@ msgstr "Character stats OK"
 msgid "At least one statis out of the permitted range: (%u - %u)."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:177 src/net/manaserv/loginhandler.cpp:98
+#: src/net/manaserv/charhandler.cpp:177
+msgid "Invalid slot number."
+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
@@ -4155,26 +4177,26 @@ msgstr ""
 msgid "Unknown error."
 msgstr "Unknown error"
 
-#: src/net/manaserv/charhandler.cpp:206 src/net/tmwa/charserverhandler.cpp:149
+#: src/net/manaserv/charhandler.cpp:209 src/net/tmwa/charserverhandler.cpp:149
 msgid "Info"
 msgstr "Info"
 
-#: src/net/manaserv/charhandler.cpp:206
+#: src/net/manaserv/charhandler.cpp:209
 #, fuzzy
 msgid "Player deleted."
 msgstr "Character deleted."
 
-#: src/net/manaserv/charhandler.cpp:218
+#: src/net/manaserv/charhandler.cpp:221
 #, fuzzy
 msgid "Selection out of range."
 msgstr "Select amount of items to trade."
 
-#: src/net/manaserv/charhandler.cpp:221
+#: src/net/manaserv/charhandler.cpp:224
 #, fuzzy, c-format
 msgid "Unknown error (%d)."
 msgstr "Unknown error"
 
-#: src/net/manaserv/charhandler.cpp:257
+#: src/net/manaserv/charhandler.cpp:260
 msgid "No gameservers are available."
 msgstr "No gameservers are available."
 
@@ -4367,11 +4389,11 @@ msgstr "%s wants to trade with you, do you accept?"
 msgid "Trading with %s"
 msgstr "Trading with %s"
 
-#: src/net/manaserv/tradehandler.cpp:159 src/net/tmwa/tradehandler.cpp:268
+#: src/net/manaserv/tradehandler.cpp:159 src/net/tmwa/tradehandler.cpp:273
 msgid "Trade canceled."
 msgstr "Trade canceled."
 
-#: src/net/manaserv/tradehandler.cpp:166 src/net/tmwa/tradehandler.cpp:278
+#: src/net/manaserv/tradehandler.cpp:166 src/net/tmwa/tradehandler.cpp:283
 msgid "Trade completed."
 msgstr "Trade completed."
 
@@ -4856,11 +4878,11 @@ msgstr "Experience sharing not possible."
 msgid "Experience sharing unknown."
 msgstr "Experience sharing enabled."
 
-#: src/net/tmwa/inventoryhandler.cpp:329
+#: src/net/tmwa/inventoryhandler.cpp:334
 msgid "Failed to use item."
 msgstr "Failed to use item."
 
-#: src/net/tmwa/inventoryhandler.cpp:452
+#: src/net/tmwa/inventoryhandler.cpp:457
 msgid "Unable to equip."
 msgstr "Unable to equip."
 
@@ -5192,7 +5214,13 @@ msgstr "Failed to add item. Trade partner is over weighted."
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr "Failed to add item. Trade partner has no free slot."
 
-#: src/net/tmwa/tradehandler.cpp:250
+#: src/net/tmwa/tradehandler.cpp:251
+#, fuzzy
+msgid "Failed adding item. You cant trade this item."
+msgstr ""
+"Failed adding item. You can not overlap one kind of item on the window."
+
+#: src/net/tmwa/tradehandler.cpp:255
 msgid "Failed adding item for unknown reason."
 msgstr "Failed to add item for unknown reason."
 
@@ -5217,6 +5245,11 @@ msgstr ""
 msgid "Floating bubble"
 msgstr ""
 
+#: src/resources/beinginfo.cpp:32 src/resources/itemdb.cpp:210
+#: src/resources/monsterdb.cpp:78
+msgid "unnamed"
+msgstr "unnamed"
+
 #: src/resources/itemdb.cpp:55
 #, c-format
 msgid "Attack %+d"
@@ -5241,10 +5274,6 @@ msgstr "MP %+d"
 msgid "Unknown item"
 msgstr "Unknown item"
 
-#: src/resources/itemdb.cpp:210 src/resources/monsterdb.cpp:78
-msgid "unnamed"
-msgstr "unnamed"
-
 #, fuzzy
 #~ msgid "Particle detail: %s"
 #~ msgstr "Particle Detail"
diff --git a/po/es.po b/po/es.po
index 20734cb7c..002a142af 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: 2010-12-24 19:29+0200\n"
+"POT-Creation-Date: 2011-01-05 04:50+0200\n"
 "PO-Revision-Date: 2010-02-24 20:55+0000\n"
 "Last-Translator: Miguel de Dios <tres.14159@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -19,6 +19,14 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
+#: src/being.cpp:480
+msgid "dodge"
+msgstr ""
+
+#: src/being.cpp:480
+msgid "miss"
+msgstr ""
+
 #: src/client.cpp:724 src/gui/setup.cpp:47 src/gui/windowmenu.cpp:92
 msgid "Setup"
 msgstr "Configuración"
@@ -54,9 +62,9 @@ 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:179 src/gui/register.cpp:225
+#: src/gui/charcreatedialog.cpp:185 src/gui/register.cpp:225
 #: src/gui/serverdialog.cpp:350 src/gui/unregisterdialog.cpp:134
-#: src/net/manaserv/charhandler.cpp:180 src/net/manaserv/charhandler.cpp:223
+#: src/net/manaserv/charhandler.cpp:183 src/net/manaserv/charhandler.cpp:226
 #: src/net/tmwa/charserverhandler.cpp:137
 #: src/net/tmwa/charserverhandler.cpp:154
 msgid "Error"
@@ -656,12 +664,12 @@ msgstr "Se están ignorando las peticiones de comercio recibidas"
 msgid "Accepting incoming trade requests"
 msgstr "Se están aceptando las peticiones de comercio"
 
-#: src/game.cpp:1373
+#: src/game.cpp:1376
 #, fuzzy
 msgid "Could Not Load Map"
 msgstr "No se pudo cargar el mapa"
 
-#: src/game.cpp:1374
+#: src/game.cpp:1377
 #, c-format
 msgid "Error while loading %s"
 msgstr "Error cargando %s"
@@ -739,7 +747,7 @@ 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/keyboardconfig.cpp:271
+#: src/keyboardconfig.cpp:275
 msgid "Quit"
 msgstr "Salir"
 
@@ -761,9 +769,9 @@ msgstr "Vender"
 #: src/gui/buysell.cpp:62 src/gui/changeemaildialog.cpp:56
 #: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
 #: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:206
-#: src/gui/npcpostdialog.cpp:55 src/gui/popupmenu.cpp:1120
-#: src/gui/popupmenu.cpp:1147 src/gui/popupmenu.cpp:1192
-#: src/gui/popupmenu.cpp:1230 src/gui/quitdialog.cpp:54
+#: src/gui/npcpostdialog.cpp:55 src/gui/popupmenu.cpp:1122
+#: src/gui/popupmenu.cpp:1149 src/gui/popupmenu.cpp:1194
+#: src/gui/popupmenu.cpp:1232 src/gui/quitdialog.cpp:54
 #: src/gui/register.cpp:79 src/gui/setup.cpp:64 src/gui/socialwindow.cpp:786
 #: src/gui/textcommandeditor.cpp:231 src/gui/textdialog.cpp:44
 #: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:153
@@ -865,7 +873,7 @@ msgstr "Color de pelo:"
 msgid "Hair style:"
 msgstr "Corte de pelo:"
 
-#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:437
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:445
 #: src/gui/socialwindow.cpp:846
 msgid "Create"
 msgstr "Crear"
@@ -878,20 +886,20 @@ msgstr "Hombre"
 msgid "Female"
 msgstr "Mujer"
 
-#: src/gui/charcreatedialog.cpp:99 src/gui/charcreatedialog.cpp:251
+#: src/gui/charcreatedialog.cpp:99 src/gui/charcreatedialog.cpp:257
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Distribuya %d puntos"
 
-#: src/gui/charcreatedialog.cpp:180
+#: src/gui/charcreatedialog.cpp:186
 msgid "Your name needs to be at least 4 characters."
 msgstr "El nombre debe tener al menos 4 caracteres."
 
-#: src/gui/charcreatedialog.cpp:242
+#: src/gui/charcreatedialog.cpp:248
 msgid "Character stats OK"
 msgstr "Estadisticas del personaje OK"
 
-#: src/gui/charcreatedialog.cpp:256
+#: src/gui/charcreatedialog.cpp:262
 #, c-format
 msgid "Please remove %d points"
 msgstr "Quitar %d puntos"
@@ -922,18 +930,23 @@ msgstr "Cancelar Cuenta"
 msgid "Change Email"
 msgstr "Cambiar dirección de correo electrónico"
 
-#: src/gui/charselectdialog.cpp:367 src/gui/serverdialog.cpp:248
+#: src/gui/charselectdialog.cpp:375 src/gui/serverdialog.cpp:248
 #: src/gui/setup_players.cpp:242 src/gui/shopwindow.cpp:117
 #: src/gui/shopwindow.cpp:120 src/gui/textcommandeditor.cpp:234
 msgid "Delete"
 msgstr "Eliminar"
 
-#: src/gui/charselectdialog.cpp:425
+#: src/gui/charselectdialog.cpp:433
 #, fuzzy
 msgid "Choose"
 msgstr "Cerrar"
 
-#: src/gui/charselectdialog.cpp:439 src/gui/charselectdialog.cpp:440
+#: src/gui/charselectdialog.cpp:436
+#, fuzzy, c-format
+msgid "Level %d"
+msgstr "Nivel: %d"
+
+#: src/gui/charselectdialog.cpp:447 src/gui/charselectdialog.cpp:448
 msgid "(empty)"
 msgstr ""
 
@@ -1161,14 +1174,14 @@ msgstr ""
 msgid "OK"
 msgstr "Aceptar"
 
-#: src/gui/equipmentwindow.cpp:70 src/gui/windowmenu.cpp:70
+#: src/gui/equipmentwindow.cpp:72 src/gui/windowmenu.cpp:70
 msgid "Equipment"
 msgstr "Equipo"
 
-#: src/gui/equipmentwindow.cpp:89 src/gui/inventorywindow.cpp:96
+#: src/gui/equipmentwindow.cpp:91 src/gui/inventorywindow.cpp:96
 #: src/gui/inventorywindow.cpp:393 src/gui/inventorywindow.cpp:402
-#: src/gui/popupmenu.cpp:1068 src/gui/popupmenu.cpp:1167
-#: src/gui/popupmenu.cpp:1207
+#: src/gui/popupmenu.cpp:1070 src/gui/popupmenu.cpp:1169
+#: src/gui/popupmenu.cpp:1209
 msgid "Unequip"
 msgstr "quitarselo"
 
@@ -1194,32 +1207,32 @@ msgid "Slots:"
 msgstr "Ranuras:"
 
 #: src/gui/inventorywindow.cpp:94 src/gui/inventorywindow.cpp:395
-#: src/gui/inventorywindow.cpp:404 src/gui/popupmenu.cpp:1070
-#: src/gui/popupmenu.cpp:1169 src/gui/popupmenu.cpp:1209
+#: src/gui/inventorywindow.cpp:404 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:1073
-#: src/gui/popupmenu.cpp:1142 src/gui/popupmenu.cpp:1173
-#: src/gui/popupmenu.cpp:1212
+#: src/gui/inventorywindow.cpp:400 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/popupmenu.cpp:1076 src/gui/popupmenu.cpp:1177
-#: src/gui/popupmenu.cpp:1215
+#: src/gui/popupmenu.cpp:1078 src/gui/popupmenu.cpp:1179
+#: src/gui/popupmenu.cpp:1217
 #, fuzzy
 msgid "Drop..."
 msgstr "Tirar"
 
-#: src/gui/inventorywindow.cpp:110 src/gui/popupmenu.cpp:1081
-#: src/gui/popupmenu.cpp:1182 src/gui/popupmenu.cpp:1220
+#: src/gui/inventorywindow.cpp:110 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/popupmenu.cpp:408
+#: src/gui/popupmenu.cpp:409
 msgid "Outfits"
 msgstr ""
 
@@ -1228,17 +1241,17 @@ msgid "Weight:"
 msgstr "Peso:"
 
 #: src/gui/inventorywindow.cpp:133 src/gui/inventorywindow.cpp:490
-#: src/gui/popupmenu.cpp:1085 src/gui/popupmenu.cpp:1185
-#: src/gui/popupmenu.cpp:1223 src/gui/setup.cpp:65
+#: 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:1104
+#: src/gui/inventorywindow.cpp:134 src/gui/popupmenu.cpp:1106
 msgid "Retrieve"
 msgstr "recuperar"
 
-#: src/gui/inventorywindow.cpp:501 src/gui/popupmenu.cpp:1078
-#: src/gui/popupmenu.cpp:1179 src/gui/popupmenu.cpp:1217
+#: src/gui/inventorywindow.cpp:501 src/gui/popupmenu.cpp:1080
+#: src/gui/popupmenu.cpp:1181 src/gui/popupmenu.cpp:1219
 #: src/gui/windowmenu.cpp:91
 msgid "Drop"
 msgstr "Tirar"
@@ -1477,7 +1490,7 @@ msgstr "Enviar"
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:447
+#: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:448
 #, fuzzy
 msgid "Clear"
 msgstr "arma de palo"
@@ -1521,287 +1534,287 @@ msgstr "quitarselo"
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:116 src/gui/popupmenu.cpp:482
+#: src/gui/popupmenu.cpp:116 src/gui/popupmenu.cpp:483
 #, fuzzy
 msgid "@@trade|Trade@@"
 msgstr "@@trade|Comerciar con %s@@"
 
 #. TRANSLATORS: Attacking a player.
-#: src/gui/popupmenu.cpp:118 src/gui/popupmenu.cpp:237
-#: src/gui/popupmenu.cpp:483
+#: src/gui/popupmenu.cpp:118 src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:484
 #, fuzzy
 msgid "@@attack|Attack@@"
 msgstr "@@attack|Atacar a %s@@"
 
 #. TRANSLATORS: Whispering a player.
-#: src/gui/popupmenu.cpp:120 src/gui/popupmenu.cpp:289
+#: src/gui/popupmenu.cpp:120 src/gui/popupmenu.cpp:290
 #, fuzzy
 msgid "@@whisper|Whisper@@"
 msgstr "@@use|Usar@@"
 
-#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:487
+#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:488
 #, fuzzy
 msgid "@@heal|Heal@@"
 msgstr "@@cancel|Cancelar@@"
 
-#: src/gui/popupmenu.cpp:130 src/gui/popupmenu.cpp:295
-#: src/gui/popupmenu.cpp:493
+#: src/gui/popupmenu.cpp:130 src/gui/popupmenu.cpp:296
+#: src/gui/popupmenu.cpp:494
 #, fuzzy
 msgid "@@friend|Befriend@@"
 msgstr "@@retrieve|Recuperar@@"
 
-#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:136
-#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:296
-#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:320
-#: src/gui/popupmenu.cpp:494 src/gui/popupmenu.cpp:499
-#: src/gui/popupmenu.cpp:517
+#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:137
+#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:297
+#: src/gui/popupmenu.cpp:303 src/gui/popupmenu.cpp:321
+#: src/gui/popupmenu.cpp:495 src/gui/popupmenu.cpp:501
+#: src/gui/popupmenu.cpp:519
 #, fuzzy
 msgid "@@disregard|Disregard@@"
 msgstr "@@disregard|ignorar levemente a %s@@"
 
-#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:137
-#: src/gui/popupmenu.cpp:297 src/gui/popupmenu.cpp:303
-#: src/gui/popupmenu.cpp:495 src/gui/popupmenu.cpp:500
+#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:138
+#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:304
+#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:502
 #, fuzzy
 msgid "@@ignore|Ignore@@"
 msgstr "@@ignore|Ignorar del todo a %s@@"
 
-#: src/gui/popupmenu.cpp:133 src/gui/popupmenu.cpp:138
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:149
-#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:304
-#: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:315
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:501
-#: src/gui/popupmenu.cpp:507 src/gui/popupmenu.cpp:512
+#: src/gui/popupmenu.cpp:133 src/gui/popupmenu.cpp:139
+#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:150
+#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:305
+#: src/gui/popupmenu.cpp:311 src/gui/popupmenu.cpp:316
+#: src/gui/popupmenu.cpp:497 src/gui/popupmenu.cpp:503
+#: src/gui/popupmenu.cpp:509 src/gui/popupmenu.cpp:514
 #, fuzzy
 msgid "@@erase|Erase@@"
 msgstr "@@use|Usar@@"
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:148
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:308
-#: src/gui/popupmenu.cpp:314 src/gui/popupmenu.cpp:319
-#: src/gui/popupmenu.cpp:505 src/gui/popupmenu.cpp:511
-#: src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:143 src/gui/popupmenu.cpp:149
+#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:315 src/gui/popupmenu.cpp:320
+#: src/gui/popupmenu.cpp:507 src/gui/popupmenu.cpp:513
+#: src/gui/popupmenu.cpp:518
 #, fuzzy
 msgid "@@unignore|Unignore@@"
 msgstr "@@unignore|dejar de ignorar a  %s@@"
 
-#: src/gui/popupmenu.cpp:143 src/gui/popupmenu.cpp:155
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:321
-#: src/gui/popupmenu.cpp:506 src/gui/popupmenu.cpp:518
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:156
+#: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:322
+#: src/gui/popupmenu.cpp:508 src/gui/popupmenu.cpp:520
 #, fuzzy
 msgid "@@ignore|Completely ignore@@"
 msgstr "@@ignore|ignorar al maximo %s@@"
 
-#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:329
-#: src/gui/popupmenu.cpp:526
+#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:330
+#: src/gui/popupmenu.cpp:528
 msgid "@@follow|Follow@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:330
-#: src/gui/popupmenu.cpp:527
+#: src/gui/popupmenu.cpp:165 src/gui/popupmenu.cpp:331
+#: src/gui/popupmenu.cpp:529
 msgid "@@imitation|Imitation@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:174 src/gui/popupmenu.cpp:546
+#: src/gui/popupmenu.cpp:175 src/gui/popupmenu.cpp:548
 #, fuzzy
 msgid "@@party|Invite to party@@"
 msgstr "/party > Invita a un jugador a entrar en tu grupo"
 
-#: src/gui/popupmenu.cpp:179 src/gui/popupmenu.cpp:551
+#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:553
 #, fuzzy
 msgid "@@kick party|Kick from party@@"
 msgstr "@@admin-kick|expulsar jugador@@"
 
-#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:337
-#: src/gui/popupmenu.cpp:565
+#: src/gui/popupmenu.cpp:195 src/gui/popupmenu.cpp:338
+#: src/gui/popupmenu.cpp:567
 #, fuzzy
 msgid "@@guild-kick|Kick from guild@@"
 msgstr "@@admin-kick|expulsar jugador@@"
 
-#: src/gui/popupmenu.cpp:196 src/gui/popupmenu.cpp:338
-#: src/gui/popupmenu.cpp:567
+#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:339
+#: src/gui/popupmenu.cpp:569
 msgid "@@guild-pos|Change pos in guild >@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:201 src/gui/popupmenu.cpp:342
-#: src/gui/popupmenu.cpp:572
+#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:343
+#: src/gui/popupmenu.cpp:574
 #, fuzzy
 msgid "@@guild|Invite to guild@@"
 msgstr "/party > Invita a un jugador a entrar en tu grupo"
 
-#: src/gui/popupmenu.cpp:208
+#: src/gui/popupmenu.cpp:209
 msgid "@@admin-kick|Kick player@@"
 msgstr "@@admin-kick|expulsar jugador@@"
 
-#: src/gui/popupmenu.cpp:210
+#: src/gui/popupmenu.cpp:211
 msgid "@@nuke|Nuke@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:211 src/gui/popupmenu.cpp:231
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:232
+#: src/gui/popupmenu.cpp:530
 msgid "@@move|Move@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:529
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:531
 #, fuzzy
 msgid "@@undress|Undress@@"
 msgstr "@@unignore|dejar de ignorar a  %s@@"
 
-#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:228
-#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:534
+#: src/gui/popupmenu.cpp:218 src/gui/popupmenu.cpp:229
+#: src/gui/popupmenu.cpp:350 src/gui/popupmenu.cpp:536
 msgid "@@buy|Buy@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:218 src/gui/popupmenu.cpp:229
-#: src/gui/popupmenu.cpp:350 src/gui/popupmenu.cpp:535
+#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:230
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:537
 #, fuzzy
 msgid "@@sell|Sell@@"
 msgstr "@@use|Usar@@"
 
-#: src/gui/popupmenu.cpp:226
+#: src/gui/popupmenu.cpp:227
 #, fuzzy
 msgid "@@talk|Talk@@"
 msgstr "@@attack|Atacar a %s@@"
 
-#: src/gui/popupmenu.cpp:240
+#: src/gui/popupmenu.cpp:241
 #, fuzzy
 msgid "@@admin-kick|Kick@@"
 msgstr "@@admin-kick|expulsar jugador@@"
 
-#: src/gui/popupmenu.cpp:248 src/gui/popupmenu.cpp:353
+#: src/gui/popupmenu.cpp:249 src/gui/popupmenu.cpp:354
 #, fuzzy
 msgid "@@name|Add name to chat@@"
 msgstr "@@name|añadir nombre al chatt@@"
 
-#: src/gui/popupmenu.cpp:252 src/gui/popupmenu.cpp:272
-#: src/gui/popupmenu.cpp:357 src/gui/popupmenu.cpp:380
-#: src/gui/popupmenu.cpp:399 src/gui/popupmenu.cpp:412
-#: src/gui/popupmenu.cpp:430 src/gui/popupmenu.cpp:577
-#: src/gui/popupmenu.cpp:601
+#: src/gui/popupmenu.cpp:253 src/gui/popupmenu.cpp:273
+#: src/gui/popupmenu.cpp:358 src/gui/popupmenu.cpp:381
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:431 src/gui/popupmenu.cpp:579
+#: src/gui/popupmenu.cpp:603
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancel|Cancelar@@"
 
-#: src/gui/popupmenu.cpp:267
+#: src/gui/popupmenu.cpp:268
 #, c-format
 msgid "@@player_%u|%s >@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:375
+#: src/gui/popupmenu.cpp:376
 #, fuzzy
 msgid "@@pickup|Pick up@@"
 msgstr "@@pickup|recoger %s@@"
 
-#: src/gui/popupmenu.cpp:376
+#: src/gui/popupmenu.cpp:377
 #, fuzzy
 msgid "@@chat|Add to chat@@"
 msgstr "@@chat|Añadir al chatt@@"
 
-#: src/gui/popupmenu.cpp:394
+#: src/gui/popupmenu.cpp:395
 msgid "Map Item"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:395
+#: src/gui/popupmenu.cpp:396
 msgid "@@rename map|Rename@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:396
+#: src/gui/popupmenu.cpp:397
 msgid "@@remove map|Remove@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:409
+#: src/gui/popupmenu.cpp:410
 msgid "@@load old outfits|Load old outfits@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:425 src/gui/windowmenu.cpp:90
+#: src/gui/popupmenu.cpp:426 src/gui/windowmenu.cpp:90
 msgid "Spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:426
+#: src/gui/popupmenu.cpp:427
 msgid "@@load old spells|Load old spells@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:427
+#: src/gui/popupmenu.cpp:428
 #, fuzzy
 msgid "@@edit spell|Edit spell@@"
 msgstr "@@use|Usar@@"
 
-#: src/gui/popupmenu.cpp:445
+#: src/gui/popupmenu.cpp:446
 msgid "@@chat close|Close@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:453
+#: src/gui/popupmenu.cpp:454
 #, fuzzy
 msgid "Disable highlight"
 msgstr "Resaltar pestaña"
 
-#: src/gui/popupmenu.cpp:459
+#: src/gui/popupmenu.cpp:460
 #, fuzzy
 msgid "Enable highlight"
 msgstr "Resaltar pestaña"
 
-#: src/gui/popupmenu.cpp:465
+#: src/gui/popupmenu.cpp:466
 msgid "@@leave party|Leave@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:585
+#: src/gui/popupmenu.cpp:587
 #, fuzzy
 msgid "Change guild position"
 msgstr "Modificar"
 
-#: src/gui/popupmenu.cpp:598
+#: src/gui/popupmenu.cpp:600
 #, c-format
 msgid "@@guild-pos-%d|%s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:942
+#: src/gui/popupmenu.cpp:944
 msgid "Rename map sign          "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:943
+#: src/gui/popupmenu.cpp:945
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1091
+#: src/gui/popupmenu.cpp:1093
 #, fuzzy
 msgid "Store 10"
 msgstr "almacenar"
 
-#: src/gui/popupmenu.cpp:1094
+#: src/gui/popupmenu.cpp:1096
 #, fuzzy
 msgid "Store half"
 msgstr "almacenar"
 
-#: src/gui/popupmenu.cpp:1096
+#: src/gui/popupmenu.cpp:1098
 #, fuzzy
 msgid "Store all"
 msgstr "almacenar"
 
-#: src/gui/popupmenu.cpp:1110
+#: src/gui/popupmenu.cpp:1112
 #, fuzzy
 msgid "Retrieve 10"
 msgstr "recuperar"
 
-#: src/gui/popupmenu.cpp:1113
+#: src/gui/popupmenu.cpp:1115
 #, fuzzy
 msgid "Retrieve half"
 msgstr "recuperar"
 
-#: src/gui/popupmenu.cpp:1115
+#: src/gui/popupmenu.cpp:1117
 #, fuzzy
 msgid "Retrieve all"
 msgstr "recuperar"
 
-#: src/gui/popupmenu.cpp:1118 src/gui/popupmenu.cpp:1186
-#: src/gui/popupmenu.cpp:1224
+#: src/gui/popupmenu.cpp:1120 src/gui/popupmenu.cpp:1188
+#: src/gui/popupmenu.cpp:1226
 #, fuzzy
 msgid "Add to chat"
 msgstr "@@chat|Añadir al chatt@@"
 
-#: src/gui/popupmenu.cpp:1145 src/gui/popupmenu.cpp:1190
+#: src/gui/popupmenu.cpp:1147 src/gui/popupmenu.cpp:1192
 msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1228
+#: src/gui/popupmenu.cpp:1230
 msgid "Load old drop shortcuts"
 msgstr ""
 
@@ -3236,6 +3249,10 @@ msgstr ""
 msgid "Who Is Online - Update"
 msgstr ""
 
+#: src/gui/widgets/battletab.cpp:41
+msgid "Battle"
+msgstr ""
+
 #: src/gui/widgets/channeltab.cpp:49
 msgid "/users > Lists the users in the current channel"
 msgstr "/users > muestra los usuarios activos en este canal"
@@ -3679,174 +3696,175 @@ msgstr "chat siguiente"
 #: src/keyboardconfig.cpp:233 src/keyboardconfig.cpp:236
 #: src/keyboardconfig.cpp:238 src/keyboardconfig.cpp:240
 #: src/keyboardconfig.cpp:242 src/keyboardconfig.cpp:244
+#: src/keyboardconfig.cpp:246 src/keyboardconfig.cpp:248
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "atajo a emoticon %d"
 
-#: src/keyboardconfig.cpp:246
+#: src/keyboardconfig.cpp:250
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:248
+#: src/keyboardconfig.cpp:252
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:250
+#: src/keyboardconfig.cpp:254
 msgid "Copy Equiped to Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:252
+#: src/keyboardconfig.cpp:256
 msgid "Toggle Chat"
 msgstr "cambiar chat"
 
-#: src/keyboardconfig.cpp:254
+#: src/keyboardconfig.cpp:258
 msgid "Scroll Chat Up"
 msgstr "chat arriba"
 
-#: src/keyboardconfig.cpp:256
+#: src/keyboardconfig.cpp:260
 msgid "Scroll Chat Down"
 msgstr "chat abajo"
 
-#: src/keyboardconfig.cpp:258
+#: src/keyboardconfig.cpp:262
 msgid "Previous Chat Tab"
 msgstr "chat anterior"
 
-#: src/keyboardconfig.cpp:260
+#: src/keyboardconfig.cpp:264
 msgid "Next Chat Tab"
 msgstr "chat siguiente"
 
-#: src/keyboardconfig.cpp:262
+#: src/keyboardconfig.cpp:266
 #, fuzzy
 msgid "Previous chat tab line"
 msgstr "chat anterior"
 
-#: src/keyboardconfig.cpp:264
+#: src/keyboardconfig.cpp:268
 #, fuzzy
 msgid "Next chat tab line"
 msgstr "chat siguiente"
 
-#: src/keyboardconfig.cpp:266
+#: src/keyboardconfig.cpp:270
 msgid "Chat Auto Complete"
 msgstr ""
 
-#: src/keyboardconfig.cpp:268
+#: src/keyboardconfig.cpp:272
 msgid "Deactivate Chat Input"
 msgstr ""
 
-#: src/keyboardconfig.cpp:270
+#: src/keyboardconfig.cpp:274
 msgid "Select OK"
 msgstr "seleccionar OK"
 
-#: src/keyboardconfig.cpp:272
+#: src/keyboardconfig.cpp:276
 msgid "Ignore input 1"
 msgstr "ignorar entrada 1"
 
-#: src/keyboardconfig.cpp:274
+#: src/keyboardconfig.cpp:278
 msgid "Ignore input 2"
 msgstr "ignorar entrada 2"
 
-#: src/keyboardconfig.cpp:276
+#: src/keyboardconfig.cpp:280
 msgid "Direct Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:277
+#: src/keyboardconfig.cpp:281
 #, fuzzy
 msgid "Direct Down"
 msgstr "mover abajo"
 
-#: src/keyboardconfig.cpp:279
+#: src/keyboardconfig.cpp:283
 #, fuzzy
 msgid "Direct Left"
 msgstr "mover a la izquierda"
 
-#: src/keyboardconfig.cpp:280
+#: src/keyboardconfig.cpp:284
 #, fuzzy
 msgid "Direct Right"
 msgstr "mover a la derecha"
 
-#: src/keyboardconfig.cpp:282
+#: src/keyboardconfig.cpp:286
 msgid "Crazy moves"
 msgstr ""
 
-#: src/keyboardconfig.cpp:284
+#: src/keyboardconfig.cpp:288
 msgid "Change Crazy Move mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:286
+#: src/keyboardconfig.cpp:290
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:288
+#: src/keyboardconfig.cpp:292
 msgid "Quick Drop N Items"
 msgstr ""
 
-#: src/keyboardconfig.cpp:290
+#: src/keyboardconfig.cpp:294
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/keyboardconfig.cpp:292
+#: src/keyboardconfig.cpp:296
 msgid "Quick heal target or self"
 msgstr ""
 
-#: src/keyboardconfig.cpp:294
+#: src/keyboardconfig.cpp:298
 msgid "Use #itenplz spell"
 msgstr ""
 
-#: src/keyboardconfig.cpp:296
+#: src/keyboardconfig.cpp:300
 msgid "Use magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboardconfig.cpp:302
 #, fuzzy
 msgid "Switch magic attack"
 msgstr "Cambiar personaje"
 
-#: src/keyboardconfig.cpp:300
+#: src/keyboardconfig.cpp:304
 #, fuzzy
 msgid "Change move type"
 msgstr "Servidor"
 
-#: src/keyboardconfig.cpp:302
+#: src/keyboardconfig.cpp:306
 msgid "Change Attack Weapon Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:304
+#: src/keyboardconfig.cpp:308
 #, fuzzy
 msgid "Change Attack Type"
 msgstr "objetivo y ataque"
 
-#: src/keyboardconfig.cpp:306
+#: src/keyboardconfig.cpp:310
 #, fuzzy
 msgid "Change Follow mode"
 msgstr "Cambiar Contraseña"
 
-#: src/keyboardconfig.cpp:308
+#: src/keyboardconfig.cpp:312
 #, fuzzy
 msgid "Change Imitation mode"
 msgstr "Cambiar dirección de correo electrónico"
 
-#: src/keyboardconfig.cpp:311
+#: src/keyboardconfig.cpp:315
 msgid "Disbale / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboardconfig.cpp:316
 msgid "On / Off audio"
 msgstr ""
 
-#: src/keyboardconfig.cpp:314
+#: src/keyboardconfig.cpp:318
 #, fuzzy
 msgid "Enable / Disable away mode"
 msgstr "admitir /bloquear intercambios"
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboardconfig.cpp:320
 msgid "Emulate right click from keyboard"
 msgstr ""
 
-#: src/keyboardconfig.cpp:318
+#: src/keyboardconfig.cpp:322
 msgid "Toggle camera mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:380
+#: src/keyboardconfig.cpp:384
 #, fuzzy, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -4115,7 +4133,7 @@ msgstr " Pulsa OK para volver a la vida"
 msgid "You Died"
 msgstr "Has muerto"
 
-#: src/net/manaserv/charhandler.cpp:144 src/net/manaserv/charhandler.cpp:215
+#: src/net/manaserv/charhandler.cpp:144 src/net/manaserv/charhandler.cpp:218
 #, fuzzy
 msgid "Not logged in."
 msgstr "Ya estas conectado"
@@ -4160,7 +4178,11 @@ msgstr "Estadisticas del personaje OK"
 msgid "At least one statis out of the permitted range: (%u - %u)."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:177 src/net/manaserv/loginhandler.cpp:98
+#: src/net/manaserv/charhandler.cpp:177
+msgid "Invalid slot number."
+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
@@ -4168,26 +4190,26 @@ msgstr ""
 msgid "Unknown error."
 msgstr "Error desconocido."
 
-#: src/net/manaserv/charhandler.cpp:206 src/net/tmwa/charserverhandler.cpp:149
+#: src/net/manaserv/charhandler.cpp:209 src/net/tmwa/charserverhandler.cpp:149
 msgid "Info"
 msgstr "informacion"
 
-#: src/net/manaserv/charhandler.cpp:206
+#: src/net/manaserv/charhandler.cpp:209
 #, fuzzy
 msgid "Player deleted."
 msgstr "personaje borrado"
 
-#: src/net/manaserv/charhandler.cpp:218
+#: src/net/manaserv/charhandler.cpp:221
 #, fuzzy
 msgid "Selection out of range."
 msgstr "Seleccione cantidad de objetos para comerciar."
 
-#: src/net/manaserv/charhandler.cpp:221
+#: src/net/manaserv/charhandler.cpp:224
 #, fuzzy, c-format
 msgid "Unknown error (%d)."
 msgstr "Error desconocido."
 
-#: src/net/manaserv/charhandler.cpp:257
+#: src/net/manaserv/charhandler.cpp:260
 msgid "No gameservers are available."
 msgstr "No hay servidores de juego disponibles."
 
@@ -4380,11 +4402,11 @@ msgstr "%s desea realizar un intercambio con usted, acepta?"
 msgid "Trading with %s"
 msgstr "Intercambiar con %s"
 
-#: src/net/manaserv/tradehandler.cpp:159 src/net/tmwa/tradehandler.cpp:268
+#: src/net/manaserv/tradehandler.cpp:159 src/net/tmwa/tradehandler.cpp:273
 msgid "Trade canceled."
 msgstr "Comercio cancelado."
 
-#: src/net/manaserv/tradehandler.cpp:166 src/net/tmwa/tradehandler.cpp:278
+#: src/net/manaserv/tradehandler.cpp:166 src/net/tmwa/tradehandler.cpp:283
 msgid "Trade completed."
 msgstr "Comercio completado."
 
@@ -4870,11 +4892,11 @@ msgstr "Imposible compartir experiencia."
 msgid "Experience sharing unknown."
 msgstr "Compartir experiencia activado."
 
-#: src/net/tmwa/inventoryhandler.cpp:329
+#: src/net/tmwa/inventoryhandler.cpp:334
 msgid "Failed to use item."
 msgstr "No se pudo utilzar el objeto."
 
-#: src/net/tmwa/inventoryhandler.cpp:452
+#: src/net/tmwa/inventoryhandler.cpp:457
 msgid "Unable to equip."
 msgstr "no se pudo equipar"
 
@@ -5205,7 +5227,14 @@ msgstr "No se pudo añadir el objeto. Tu compañero lleva demasiado peso encima.
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr "No se pudo añadir el objeto. Tu compañero no tiene espacio."
 
-#: src/net/tmwa/tradehandler.cpp:250
+#: src/net/tmwa/tradehandler.cpp:251
+#, fuzzy
+msgid "Failed adding item. You cant trade this item."
+msgstr ""
+"no se pudo añadir objeto: No puedes sobreponer un tipo de objeto en la "
+"ventana"
+
+#: src/net/tmwa/tradehandler.cpp:255
 msgid "Failed adding item for unknown reason."
 msgstr "No se pudo añadir el objeto, razon desconocida"
 
@@ -5230,6 +5259,11 @@ msgstr ""
 msgid "Floating bubble"
 msgstr ""
 
+#: src/resources/beinginfo.cpp:32 src/resources/itemdb.cpp:210
+#: src/resources/monsterdb.cpp:78
+msgid "unnamed"
+msgstr "Sin nombre"
+
 #: src/resources/itemdb.cpp:55
 #, c-format
 msgid "Attack %+d"
@@ -5254,10 +5288,6 @@ msgstr "MP %+d"
 msgid "Unknown item"
 msgstr "Objeto desconocido"
 
-#: src/resources/itemdb.cpp:210 src/resources/monsterdb.cpp:78
-msgid "unnamed"
-msgstr "Sin nombre"
-
 #, fuzzy
 #~ msgid "Particle detail: %s"
 #~ msgstr "detalle particulas"
diff --git a/po/fr.po b/po/fr.po
index e67bf1537..799b8e8b0 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Mana World 0.1.0\n"
 "Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2010-12-24 19:29+0200\n"
+"POT-Creation-Date: 2011-01-05 04:50+0200\n"
 "PO-Revision-Date: 2010-01-27 21:27+0000\n"
 "Last-Translator: JVC <Unknown>\n"
 "Language-Team: French\n"
@@ -20,6 +20,14 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
+#: src/being.cpp:480
+msgid "dodge"
+msgstr ""
+
+#: src/being.cpp:480
+msgid "miss"
+msgstr ""
+
 #: src/client.cpp:724 src/gui/setup.cpp:47 src/gui/windowmenu.cpp:92
 msgid "Setup"
 msgstr "Configuration"
@@ -55,9 +63,9 @@ msgstr "Serveur"
 
 #: 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:179 src/gui/register.cpp:225
+#: src/gui/charcreatedialog.cpp:185 src/gui/register.cpp:225
 #: src/gui/serverdialog.cpp:350 src/gui/unregisterdialog.cpp:134
-#: src/net/manaserv/charhandler.cpp:180 src/net/manaserv/charhandler.cpp:223
+#: src/net/manaserv/charhandler.cpp:183 src/net/manaserv/charhandler.cpp:226
 #: src/net/tmwa/charserverhandler.cpp:137
 #: src/net/tmwa/charserverhandler.cpp:154
 msgid "Error"
@@ -664,12 +672,12 @@ msgstr "Ignorer les requêtes d'échanges entrantes"
 msgid "Accepting incoming trade requests"
 msgstr "Accepter les requêtes d'échanges entrantes"
 
-#: src/game.cpp:1373
+#: src/game.cpp:1376
 #, fuzzy
 msgid "Could Not Load Map"
 msgstr "La localisation géographique n'a pu être chargé"
 
-#: src/game.cpp:1374
+#: src/game.cpp:1377
 #, c-format
 msgid "Error while loading %s"
 msgstr "Erreur durant le chargement %s"
@@ -747,7 +755,7 @@ 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/keyboardconfig.cpp:271
+#: src/keyboardconfig.cpp:275
 msgid "Quit"
 msgstr "Quitter"
 
@@ -769,9 +777,9 @@ msgstr "Vendre"
 #: src/gui/buysell.cpp:62 src/gui/changeemaildialog.cpp:56
 #: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
 #: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:206
-#: src/gui/npcpostdialog.cpp:55 src/gui/popupmenu.cpp:1120
-#: src/gui/popupmenu.cpp:1147 src/gui/popupmenu.cpp:1192
-#: src/gui/popupmenu.cpp:1230 src/gui/quitdialog.cpp:54
+#: src/gui/npcpostdialog.cpp:55 src/gui/popupmenu.cpp:1122
+#: src/gui/popupmenu.cpp:1149 src/gui/popupmenu.cpp:1194
+#: src/gui/popupmenu.cpp:1232 src/gui/quitdialog.cpp:54
 #: src/gui/register.cpp:79 src/gui/setup.cpp:64 src/gui/socialwindow.cpp:786
 #: src/gui/textcommandeditor.cpp:231 src/gui/textdialog.cpp:44
 #: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:153
@@ -873,7 +881,7 @@ msgstr "Couleur des cheveux :"
 msgid "Hair style:"
 msgstr "Coupe :"
 
-#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:437
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:445
 #: src/gui/socialwindow.cpp:846
 msgid "Create"
 msgstr "Créer"
@@ -886,20 +894,20 @@ msgstr "Masculin"
 msgid "Female"
 msgstr "Féminin"
 
-#: src/gui/charcreatedialog.cpp:99 src/gui/charcreatedialog.cpp:251
+#: src/gui/charcreatedialog.cpp:99 src/gui/charcreatedialog.cpp:257
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Veuillez distribuer %d points"
 
-#: src/gui/charcreatedialog.cpp:180
+#: src/gui/charcreatedialog.cpp:186
 msgid "Your name needs to be at least 4 characters."
 msgstr "Votre nom doit comporter un minimum de 4 caractères."
 
-#: src/gui/charcreatedialog.cpp:242
+#: src/gui/charcreatedialog.cpp:248
 msgid "Character stats OK"
 msgstr "Caractéristiques du personnage Ok"
 
-#: src/gui/charcreatedialog.cpp:256
+#: src/gui/charcreatedialog.cpp:262
 #, c-format
 msgid "Please remove %d points"
 msgstr "Veuillez retirer %d points"
@@ -930,18 +938,23 @@ msgstr "Se désinscrire"
 msgid "Change Email"
 msgstr "Modifier l'adresse mail"
 
-#: src/gui/charselectdialog.cpp:367 src/gui/serverdialog.cpp:248
+#: src/gui/charselectdialog.cpp:375 src/gui/serverdialog.cpp:248
 #: src/gui/setup_players.cpp:242 src/gui/shopwindow.cpp:117
 #: src/gui/shopwindow.cpp:120 src/gui/textcommandeditor.cpp:234
 msgid "Delete"
 msgstr "Supprimer"
 
-#: src/gui/charselectdialog.cpp:425
+#: src/gui/charselectdialog.cpp:433
 #, fuzzy
 msgid "Choose"
 msgstr "Fermer"
 
-#: src/gui/charselectdialog.cpp:439 src/gui/charselectdialog.cpp:440
+#: src/gui/charselectdialog.cpp:436
+#, fuzzy, c-format
+msgid "Level %d"
+msgstr "Niveau : %d"
+
+#: src/gui/charselectdialog.cpp:447 src/gui/charselectdialog.cpp:448
 msgid "(empty)"
 msgstr ""
 
@@ -1169,14 +1182,14 @@ msgstr ""
 msgid "OK"
 msgstr "Ok"
 
-#: src/gui/equipmentwindow.cpp:70 src/gui/windowmenu.cpp:70
+#: src/gui/equipmentwindow.cpp:72 src/gui/windowmenu.cpp:70
 msgid "Equipment"
 msgstr "Équipement"
 
-#: src/gui/equipmentwindow.cpp:89 src/gui/inventorywindow.cpp:96
+#: src/gui/equipmentwindow.cpp:91 src/gui/inventorywindow.cpp:96
 #: src/gui/inventorywindow.cpp:393 src/gui/inventorywindow.cpp:402
-#: src/gui/popupmenu.cpp:1068 src/gui/popupmenu.cpp:1167
-#: src/gui/popupmenu.cpp:1207
+#: src/gui/popupmenu.cpp:1070 src/gui/popupmenu.cpp:1169
+#: src/gui/popupmenu.cpp:1209
 msgid "Unequip"
 msgstr "Retirer"
 
@@ -1202,32 +1215,32 @@ msgid "Slots:"
 msgstr "Cases :"
 
 #: src/gui/inventorywindow.cpp:94 src/gui/inventorywindow.cpp:395
-#: src/gui/inventorywindow.cpp:404 src/gui/popupmenu.cpp:1070
-#: src/gui/popupmenu.cpp:1169 src/gui/popupmenu.cpp:1209
+#: src/gui/inventorywindow.cpp:404 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:1073
-#: src/gui/popupmenu.cpp:1142 src/gui/popupmenu.cpp:1173
-#: src/gui/popupmenu.cpp:1212
+#: src/gui/inventorywindow.cpp:400 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/popupmenu.cpp:1076 src/gui/popupmenu.cpp:1177
-#: src/gui/popupmenu.cpp:1215
+#: src/gui/popupmenu.cpp:1078 src/gui/popupmenu.cpp:1179
+#: src/gui/popupmenu.cpp:1217
 #, fuzzy
 msgid "Drop..."
 msgstr "Jeter"
 
-#: src/gui/inventorywindow.cpp:110 src/gui/popupmenu.cpp:1081
-#: src/gui/popupmenu.cpp:1182 src/gui/popupmenu.cpp:1220
+#: src/gui/inventorywindow.cpp:110 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/popupmenu.cpp:408
+#: src/gui/popupmenu.cpp:409
 msgid "Outfits"
 msgstr ""
 
@@ -1236,17 +1249,17 @@ msgid "Weight:"
 msgstr "Poids :"
 
 #: src/gui/inventorywindow.cpp:133 src/gui/inventorywindow.cpp:490
-#: src/gui/popupmenu.cpp:1085 src/gui/popupmenu.cpp:1185
-#: src/gui/popupmenu.cpp:1223 src/gui/setup.cpp:65
+#: 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:1104
+#: src/gui/inventorywindow.cpp:134 src/gui/popupmenu.cpp:1106
 msgid "Retrieve"
 msgstr "Récupérer"
 
-#: src/gui/inventorywindow.cpp:501 src/gui/popupmenu.cpp:1078
-#: src/gui/popupmenu.cpp:1179 src/gui/popupmenu.cpp:1217
+#: src/gui/inventorywindow.cpp:501 src/gui/popupmenu.cpp:1080
+#: src/gui/popupmenu.cpp:1181 src/gui/popupmenu.cpp:1219
 #: src/gui/windowmenu.cpp:91
 msgid "Drop"
 msgstr "Jeter"
@@ -1485,7 +1498,7 @@ msgstr "Soumettre"
 msgid "NPC"
 msgstr "PNJ"
 
-#: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:447
+#: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:448
 #, fuzzy
 msgid "Clear"
 msgstr "Pique"
@@ -1529,287 +1542,287 @@ msgstr "Retirer"
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:116 src/gui/popupmenu.cpp:482
+#: src/gui/popupmenu.cpp:116 src/gui/popupmenu.cpp:483
 #, fuzzy
 msgid "@@trade|Trade@@"
 msgstr "@@trade|Troquer avec %s@@"
 
 #. TRANSLATORS: Attacking a player.
-#: src/gui/popupmenu.cpp:118 src/gui/popupmenu.cpp:237
-#: src/gui/popupmenu.cpp:483
+#: src/gui/popupmenu.cpp:118 src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:484
 #, fuzzy
 msgid "@@attack|Attack@@"
 msgstr "@@attack|Attaquer %s@@"
 
 #. TRANSLATORS: Whispering a player.
-#: src/gui/popupmenu.cpp:120 src/gui/popupmenu.cpp:289
+#: src/gui/popupmenu.cpp:120 src/gui/popupmenu.cpp:290
 #, fuzzy
 msgid "@@whisper|Whisper@@"
 msgstr "@@use|Utiliser@@"
 
-#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:487
+#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:488
 #, fuzzy
 msgid "@@heal|Heal@@"
 msgstr "@@cancel|Annuler@@"
 
-#: src/gui/popupmenu.cpp:130 src/gui/popupmenu.cpp:295
-#: src/gui/popupmenu.cpp:493
+#: src/gui/popupmenu.cpp:130 src/gui/popupmenu.cpp:296
+#: src/gui/popupmenu.cpp:494
 #, fuzzy
 msgid "@@friend|Befriend@@"
 msgstr "@@retrieve|Retirer@@"
 
-#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:136
-#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:296
-#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:320
-#: src/gui/popupmenu.cpp:494 src/gui/popupmenu.cpp:499
-#: src/gui/popupmenu.cpp:517
+#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:137
+#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:297
+#: src/gui/popupmenu.cpp:303 src/gui/popupmenu.cpp:321
+#: src/gui/popupmenu.cpp:495 src/gui/popupmenu.cpp:501
+#: src/gui/popupmenu.cpp:519
 #, fuzzy
 msgid "@@disregard|Disregard@@"
 msgstr "@@disregard|Négliger%s@@"
 
-#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:137
-#: src/gui/popupmenu.cpp:297 src/gui/popupmenu.cpp:303
-#: src/gui/popupmenu.cpp:495 src/gui/popupmenu.cpp:500
+#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:138
+#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:304
+#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:502
 #, fuzzy
 msgid "@@ignore|Ignore@@"
 msgstr "@@ignore|Ignorer %s@@"
 
-#: src/gui/popupmenu.cpp:133 src/gui/popupmenu.cpp:138
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:149
-#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:304
-#: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:315
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:501
-#: src/gui/popupmenu.cpp:507 src/gui/popupmenu.cpp:512
+#: src/gui/popupmenu.cpp:133 src/gui/popupmenu.cpp:139
+#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:150
+#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:305
+#: src/gui/popupmenu.cpp:311 src/gui/popupmenu.cpp:316
+#: src/gui/popupmenu.cpp:497 src/gui/popupmenu.cpp:503
+#: src/gui/popupmenu.cpp:509 src/gui/popupmenu.cpp:514
 #, fuzzy
 msgid "@@erase|Erase@@"
 msgstr "@@use|Utiliser@@"
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:148
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:308
-#: src/gui/popupmenu.cpp:314 src/gui/popupmenu.cpp:319
-#: src/gui/popupmenu.cpp:505 src/gui/popupmenu.cpp:511
-#: src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:143 src/gui/popupmenu.cpp:149
+#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:315 src/gui/popupmenu.cpp:320
+#: src/gui/popupmenu.cpp:507 src/gui/popupmenu.cpp:513
+#: src/gui/popupmenu.cpp:518
 #, fuzzy
 msgid "@@unignore|Unignore@@"
 msgstr "@@unignore|Ne plus ignorer %s@@"
 
-#: src/gui/popupmenu.cpp:143 src/gui/popupmenu.cpp:155
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:321
-#: src/gui/popupmenu.cpp:506 src/gui/popupmenu.cpp:518
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:156
+#: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:322
+#: src/gui/popupmenu.cpp:508 src/gui/popupmenu.cpp:520
 #, fuzzy
 msgid "@@ignore|Completely ignore@@"
 msgstr "@@ignore|Complètement ignorer %s@@"
 
-#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:329
-#: src/gui/popupmenu.cpp:526
+#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:330
+#: src/gui/popupmenu.cpp:528
 msgid "@@follow|Follow@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:330
-#: src/gui/popupmenu.cpp:527
+#: src/gui/popupmenu.cpp:165 src/gui/popupmenu.cpp:331
+#: src/gui/popupmenu.cpp:529
 msgid "@@imitation|Imitation@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:174 src/gui/popupmenu.cpp:546
+#: src/gui/popupmenu.cpp:175 src/gui/popupmenu.cpp:548
 #, fuzzy
 msgid "@@party|Invite to party@@"
 msgstr "/party > Invite un utilisateur dans un groupe"
 
-#: src/gui/popupmenu.cpp:179 src/gui/popupmenu.cpp:551
+#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:553
 #, fuzzy
 msgid "@@kick party|Kick from party@@"
 msgstr "@@admin-kick|Kick player@@"
 
-#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:337
-#: src/gui/popupmenu.cpp:565
+#: src/gui/popupmenu.cpp:195 src/gui/popupmenu.cpp:338
+#: src/gui/popupmenu.cpp:567
 #, fuzzy
 msgid "@@guild-kick|Kick from guild@@"
 msgstr "@@admin-kick|Kick player@@"
 
-#: src/gui/popupmenu.cpp:196 src/gui/popupmenu.cpp:338
-#: src/gui/popupmenu.cpp:567
+#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:339
+#: src/gui/popupmenu.cpp:569
 msgid "@@guild-pos|Change pos in guild >@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:201 src/gui/popupmenu.cpp:342
-#: src/gui/popupmenu.cpp:572
+#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:343
+#: src/gui/popupmenu.cpp:574
 #, fuzzy
 msgid "@@guild|Invite to guild@@"
 msgstr "/party > Invite un utilisateur dans un groupe"
 
-#: src/gui/popupmenu.cpp:208
+#: src/gui/popupmenu.cpp:209
 msgid "@@admin-kick|Kick player@@"
 msgstr "@@admin-kick|Kick player@@"
 
-#: src/gui/popupmenu.cpp:210
+#: src/gui/popupmenu.cpp:211
 msgid "@@nuke|Nuke@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:211 src/gui/popupmenu.cpp:231
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:232
+#: src/gui/popupmenu.cpp:530
 msgid "@@move|Move@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:529
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:531
 #, fuzzy
 msgid "@@undress|Undress@@"
 msgstr "@@unignore|Ne plus ignorer %s@@"
 
-#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:228
-#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:534
+#: src/gui/popupmenu.cpp:218 src/gui/popupmenu.cpp:229
+#: src/gui/popupmenu.cpp:350 src/gui/popupmenu.cpp:536
 msgid "@@buy|Buy@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:218 src/gui/popupmenu.cpp:229
-#: src/gui/popupmenu.cpp:350 src/gui/popupmenu.cpp:535
+#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:230
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:537
 #, fuzzy
 msgid "@@sell|Sell@@"
 msgstr "@@use|Utiliser@@"
 
-#: src/gui/popupmenu.cpp:226
+#: src/gui/popupmenu.cpp:227
 #, fuzzy
 msgid "@@talk|Talk@@"
 msgstr "@@attack|Attaquer %s@@"
 
-#: src/gui/popupmenu.cpp:240
+#: src/gui/popupmenu.cpp:241
 #, fuzzy
 msgid "@@admin-kick|Kick@@"
 msgstr "@@admin-kick|Kick player@@"
 
-#: src/gui/popupmenu.cpp:248 src/gui/popupmenu.cpp:353
+#: src/gui/popupmenu.cpp:249 src/gui/popupmenu.cpp:354
 #, fuzzy
 msgid "@@name|Add name to chat@@"
 msgstr "@@name|Ajouter le nom dans la conversation@@"
 
-#: src/gui/popupmenu.cpp:252 src/gui/popupmenu.cpp:272
-#: src/gui/popupmenu.cpp:357 src/gui/popupmenu.cpp:380
-#: src/gui/popupmenu.cpp:399 src/gui/popupmenu.cpp:412
-#: src/gui/popupmenu.cpp:430 src/gui/popupmenu.cpp:577
-#: src/gui/popupmenu.cpp:601
+#: src/gui/popupmenu.cpp:253 src/gui/popupmenu.cpp:273
+#: src/gui/popupmenu.cpp:358 src/gui/popupmenu.cpp:381
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:431 src/gui/popupmenu.cpp:579
+#: src/gui/popupmenu.cpp:603
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancel|Annuler@@"
 
-#: src/gui/popupmenu.cpp:267
+#: src/gui/popupmenu.cpp:268
 #, c-format
 msgid "@@player_%u|%s >@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:375
+#: src/gui/popupmenu.cpp:376
 #, fuzzy
 msgid "@@pickup|Pick up@@"
 msgstr "@@pickup|Ramasser %s@@"
 
-#: src/gui/popupmenu.cpp:376
+#: src/gui/popupmenu.cpp:377
 #, fuzzy
 msgid "@@chat|Add to chat@@"
 msgstr "@@chat|Ajouter à la conversation@@"
 
-#: src/gui/popupmenu.cpp:394
+#: src/gui/popupmenu.cpp:395
 msgid "Map Item"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:395
+#: src/gui/popupmenu.cpp:396
 msgid "@@rename map|Rename@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:396
+#: src/gui/popupmenu.cpp:397
 msgid "@@remove map|Remove@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:409
+#: src/gui/popupmenu.cpp:410
 msgid "@@load old outfits|Load old outfits@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:425 src/gui/windowmenu.cpp:90
+#: src/gui/popupmenu.cpp:426 src/gui/windowmenu.cpp:90
 msgid "Spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:426
+#: src/gui/popupmenu.cpp:427
 msgid "@@load old spells|Load old spells@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:427
+#: src/gui/popupmenu.cpp:428
 #, fuzzy
 msgid "@@edit spell|Edit spell@@"
 msgstr "@@use|Utiliser@@"
 
-#: src/gui/popupmenu.cpp:445
+#: src/gui/popupmenu.cpp:446
 msgid "@@chat close|Close@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:453
+#: src/gui/popupmenu.cpp:454
 #, fuzzy
 msgid "Disable highlight"
 msgstr "Onglet mis en surbrillance"
 
-#: src/gui/popupmenu.cpp:459
+#: src/gui/popupmenu.cpp:460
 #, fuzzy
 msgid "Enable highlight"
 msgstr "Onglet mis en surbrillance"
 
-#: src/gui/popupmenu.cpp:465
+#: src/gui/popupmenu.cpp:466
 msgid "@@leave party|Leave@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:585
+#: src/gui/popupmenu.cpp:587
 #, fuzzy
 msgid "Change guild position"
 msgstr "Changer"
 
-#: src/gui/popupmenu.cpp:598
+#: src/gui/popupmenu.cpp:600
 #, c-format
 msgid "@@guild-pos-%d|%s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:942
+#: src/gui/popupmenu.cpp:944
 msgid "Rename map sign          "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:943
+#: src/gui/popupmenu.cpp:945
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1091
+#: src/gui/popupmenu.cpp:1093
 #, fuzzy
 msgid "Store 10"
 msgstr "Entreposer"
 
-#: src/gui/popupmenu.cpp:1094
+#: src/gui/popupmenu.cpp:1096
 #, fuzzy
 msgid "Store half"
 msgstr "Entreposer"
 
-#: src/gui/popupmenu.cpp:1096
+#: src/gui/popupmenu.cpp:1098
 #, fuzzy
 msgid "Store all"
 msgstr "Entreposer"
 
-#: src/gui/popupmenu.cpp:1110
+#: src/gui/popupmenu.cpp:1112
 #, fuzzy
 msgid "Retrieve 10"
 msgstr "Récupérer"
 
-#: src/gui/popupmenu.cpp:1113
+#: src/gui/popupmenu.cpp:1115
 #, fuzzy
 msgid "Retrieve half"
 msgstr "Récupérer"
 
-#: src/gui/popupmenu.cpp:1115
+#: src/gui/popupmenu.cpp:1117
 #, fuzzy
 msgid "Retrieve all"
 msgstr "Récupérer"
 
-#: src/gui/popupmenu.cpp:1118 src/gui/popupmenu.cpp:1186
-#: src/gui/popupmenu.cpp:1224
+#: src/gui/popupmenu.cpp:1120 src/gui/popupmenu.cpp:1188
+#: src/gui/popupmenu.cpp:1226
 #, fuzzy
 msgid "Add to chat"
 msgstr "@@chat|Ajouter à la conversation@@"
 
-#: src/gui/popupmenu.cpp:1145 src/gui/popupmenu.cpp:1190
+#: src/gui/popupmenu.cpp:1147 src/gui/popupmenu.cpp:1192
 msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1228
+#: src/gui/popupmenu.cpp:1230
 msgid "Load old drop shortcuts"
 msgstr ""
 
@@ -3248,6 +3261,10 @@ msgstr ""
 msgid "Who Is Online - Update"
 msgstr ""
 
+#: src/gui/widgets/battletab.cpp:41
+msgid "Battle"
+msgstr ""
+
 #: src/gui/widgets/channeltab.cpp:49
 msgid "/users > Lists the users in the current channel"
 msgstr "/users > Affiche la liste des utilisateurs de ce salon"
@@ -3692,174 +3709,175 @@ msgstr "Onglet de la conversation suivante"
 #: src/keyboardconfig.cpp:233 src/keyboardconfig.cpp:236
 #: src/keyboardconfig.cpp:238 src/keyboardconfig.cpp:240
 #: src/keyboardconfig.cpp:242 src/keyboardconfig.cpp:244
+#: src/keyboardconfig.cpp:246 src/keyboardconfig.cpp:248
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "Raccourci d'emote %d"
 
-#: src/keyboardconfig.cpp:246
+#: src/keyboardconfig.cpp:250
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:248
+#: src/keyboardconfig.cpp:252
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:250
+#: src/keyboardconfig.cpp:254
 msgid "Copy Equiped to Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:252
+#: src/keyboardconfig.cpp:256
 msgid "Toggle Chat"
 msgstr "Activer / Désactiver la conversation"
 
-#: src/keyboardconfig.cpp:254
+#: src/keyboardconfig.cpp:258
 msgid "Scroll Chat Up"
 msgstr "Défiler la conversation (haut)"
 
-#: src/keyboardconfig.cpp:256
+#: src/keyboardconfig.cpp:260
 msgid "Scroll Chat Down"
 msgstr "Défiler la conversation (bas)"
 
-#: src/keyboardconfig.cpp:258
+#: src/keyboardconfig.cpp:262
 msgid "Previous Chat Tab"
 msgstr "Onglet de la conversation précédente"
 
-#: src/keyboardconfig.cpp:260
+#: src/keyboardconfig.cpp:264
 msgid "Next Chat Tab"
 msgstr "Onglet de la conversation suivante"
 
-#: src/keyboardconfig.cpp:262
+#: src/keyboardconfig.cpp:266
 #, fuzzy
 msgid "Previous chat tab line"
 msgstr "Onglet de la conversation précédente"
 
-#: src/keyboardconfig.cpp:264
+#: src/keyboardconfig.cpp:268
 #, fuzzy
 msgid "Next chat tab line"
 msgstr "Onglet de la conversation suivante"
 
-#: src/keyboardconfig.cpp:266
+#: src/keyboardconfig.cpp:270
 msgid "Chat Auto Complete"
 msgstr ""
 
-#: src/keyboardconfig.cpp:268
+#: src/keyboardconfig.cpp:272
 msgid "Deactivate Chat Input"
 msgstr ""
 
-#: src/keyboardconfig.cpp:270
+#: src/keyboardconfig.cpp:274
 msgid "Select OK"
 msgstr "Sélectionner OK"
 
-#: src/keyboardconfig.cpp:272
+#: src/keyboardconfig.cpp:276
 msgid "Ignore input 1"
 msgstr "Ignorer l'entrée 1"
 
-#: src/keyboardconfig.cpp:274
+#: src/keyboardconfig.cpp:278
 msgid "Ignore input 2"
 msgstr "Ignorer l'entrée 2"
 
-#: src/keyboardconfig.cpp:276
+#: src/keyboardconfig.cpp:280
 msgid "Direct Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:277
+#: src/keyboardconfig.cpp:281
 #, fuzzy
 msgid "Direct Down"
 msgstr "Descendre"
 
-#: src/keyboardconfig.cpp:279
+#: src/keyboardconfig.cpp:283
 #, fuzzy
 msgid "Direct Left"
 msgstr "Aller à gauche"
 
-#: src/keyboardconfig.cpp:280
+#: src/keyboardconfig.cpp:284
 #, fuzzy
 msgid "Direct Right"
 msgstr "Aller à droite"
 
-#: src/keyboardconfig.cpp:282
+#: src/keyboardconfig.cpp:286
 msgid "Crazy moves"
 msgstr ""
 
-#: src/keyboardconfig.cpp:284
+#: src/keyboardconfig.cpp:288
 msgid "Change Crazy Move mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:286
+#: src/keyboardconfig.cpp:290
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:288
+#: src/keyboardconfig.cpp:292
 msgid "Quick Drop N Items"
 msgstr ""
 
-#: src/keyboardconfig.cpp:290
+#: src/keyboardconfig.cpp:294
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/keyboardconfig.cpp:292
+#: src/keyboardconfig.cpp:296
 msgid "Quick heal target or self"
 msgstr ""
 
-#: src/keyboardconfig.cpp:294
+#: src/keyboardconfig.cpp:298
 msgid "Use #itenplz spell"
 msgstr ""
 
-#: src/keyboardconfig.cpp:296
+#: src/keyboardconfig.cpp:300
 msgid "Use magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboardconfig.cpp:302
 #, fuzzy
 msgid "Switch magic attack"
 msgstr "Changer de personnage"
 
-#: src/keyboardconfig.cpp:300
+#: src/keyboardconfig.cpp:304
 #, fuzzy
 msgid "Change move type"
 msgstr "Serveur"
 
-#: src/keyboardconfig.cpp:302
+#: src/keyboardconfig.cpp:306
 msgid "Change Attack Weapon Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:304
+#: src/keyboardconfig.cpp:308
 #, fuzzy
 msgid "Change Attack Type"
 msgstr "Cibler et Attaquer"
 
-#: src/keyboardconfig.cpp:306
+#: src/keyboardconfig.cpp:310
 #, fuzzy
 msgid "Change Follow mode"
 msgstr "Changer le mot de passe"
 
-#: src/keyboardconfig.cpp:308
+#: src/keyboardconfig.cpp:312
 #, fuzzy
 msgid "Change Imitation mode"
 msgstr "Modifier l'adresse mail"
 
-#: src/keyboardconfig.cpp:311
+#: src/keyboardconfig.cpp:315
 msgid "Disbale / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboardconfig.cpp:316
 msgid "On / Off audio"
 msgstr ""
 
-#: src/keyboardconfig.cpp:314
+#: src/keyboardconfig.cpp:318
 #, fuzzy
 msgid "Enable / Disable away mode"
 msgstr "Activer / Désactiver les échanges"
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboardconfig.cpp:320
 msgid "Emulate right click from keyboard"
 msgstr ""
 
-#: src/keyboardconfig.cpp:318
+#: src/keyboardconfig.cpp:322
 msgid "Toggle camera mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:380
+#: src/keyboardconfig.cpp:384
 #, fuzzy, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -4136,7 +4154,7 @@ msgstr " Cliquer sur OK pour ressuciter"
 msgid "You Died"
 msgstr "Vous êtes mort"
 
-#: src/net/manaserv/charhandler.cpp:144 src/net/manaserv/charhandler.cpp:215
+#: src/net/manaserv/charhandler.cpp:144 src/net/manaserv/charhandler.cpp:218
 #, fuzzy
 msgid "Not logged in."
 msgstr "Déjà connecté"
@@ -4181,7 +4199,11 @@ msgstr "Caractéristiques du personnage Ok"
 msgid "At least one statis out of the permitted range: (%u - %u)."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:177 src/net/manaserv/loginhandler.cpp:98
+#: src/net/manaserv/charhandler.cpp:177
+msgid "Invalid slot number."
+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
@@ -4189,26 +4211,26 @@ msgstr ""
 msgid "Unknown error."
 msgstr "Erreur inconnue"
 
-#: src/net/manaserv/charhandler.cpp:206 src/net/tmwa/charserverhandler.cpp:149
+#: src/net/manaserv/charhandler.cpp:209 src/net/tmwa/charserverhandler.cpp:149
 msgid "Info"
 msgstr "Informations"
 
-#: src/net/manaserv/charhandler.cpp:206
+#: src/net/manaserv/charhandler.cpp:209
 #, fuzzy
 msgid "Player deleted."
 msgstr "Personnage supprimé"
 
-#: src/net/manaserv/charhandler.cpp:218
+#: src/net/manaserv/charhandler.cpp:221
 #, fuzzy
 msgid "Selection out of range."
 msgstr "Choisissez le nombre d'objets à troquer."
 
-#: src/net/manaserv/charhandler.cpp:221
+#: src/net/manaserv/charhandler.cpp:224
 #, fuzzy, c-format
 msgid "Unknown error (%d)."
 msgstr "Erreur inconnue"
 
-#: src/net/manaserv/charhandler.cpp:257
+#: src/net/manaserv/charhandler.cpp:260
 msgid "No gameservers are available."
 msgstr "Pas de serveur de jeu disponible."
 
@@ -4401,11 +4423,11 @@ msgstr "%s souhaite réaliser un échange avec vous. Acceptez-vous ?"
 msgid "Trading with %s"
 msgstr "Echange avec %s"
 
-#: src/net/manaserv/tradehandler.cpp:159 src/net/tmwa/tradehandler.cpp:268
+#: src/net/manaserv/tradehandler.cpp:159 src/net/tmwa/tradehandler.cpp:273
 msgid "Trade canceled."
 msgstr "Echange annulé."
 
-#: src/net/manaserv/tradehandler.cpp:166 src/net/tmwa/tradehandler.cpp:278
+#: src/net/manaserv/tradehandler.cpp:166 src/net/tmwa/tradehandler.cpp:283
 msgid "Trade completed."
 msgstr "Echange finalisé."
 
@@ -4898,11 +4920,11 @@ msgstr "Partage d'expérience impossible."
 msgid "Experience sharing unknown."
 msgstr "Partage d'expérience authorisé."
 
-#: src/net/tmwa/inventoryhandler.cpp:329
+#: src/net/tmwa/inventoryhandler.cpp:334
 msgid "Failed to use item."
 msgstr "Impossible d'utiliser l'objet."
 
-#: src/net/tmwa/inventoryhandler.cpp:452
+#: src/net/tmwa/inventoryhandler.cpp:457
 msgid "Unable to equip."
 msgstr "Impossible d'équiper cet objet."
 
@@ -5241,7 +5263,14 @@ msgstr ""
 "Impossible de rajouter un objet. Votre partenaire pour cet échange n'a plus "
 "de place libre."
 
-#: src/net/tmwa/tradehandler.cpp:250
+#: src/net/tmwa/tradehandler.cpp:251
+#, fuzzy
+msgid "Failed adding item. You cant trade this item."
+msgstr ""
+"L'objet ne peux être ajouté. Vous ne pouvez ajouter deux fois le même objet "
+"dans cette fenêtre."
+
+#: src/net/tmwa/tradehandler.cpp:255
 msgid "Failed adding item for unknown reason."
 msgstr "Impossible de rajouter un objet pour une raison inconnue."
 
@@ -5266,6 +5295,11 @@ msgstr ""
 msgid "Floating bubble"
 msgstr ""
 
+#: src/resources/beinginfo.cpp:32 src/resources/itemdb.cpp:210
+#: src/resources/monsterdb.cpp:78
+msgid "unnamed"
+msgstr "anonyme"
+
 #: src/resources/itemdb.cpp:55
 #, c-format
 msgid "Attack %+d"
@@ -5290,10 +5324,6 @@ msgstr "PM %+d"
 msgid "Unknown item"
 msgstr "Objet inconnu"
 
-#: src/resources/itemdb.cpp:210 src/resources/monsterdb.cpp:78
-msgid "unnamed"
-msgstr "anonyme"
-
 #, fuzzy
 #~ msgid "Particle detail: %s"
 #~ msgstr "Détail des particules"
diff --git a/po/hr.po b/po/hr.po
index 9186f832d..51d9db24c 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: 2010-12-24 19:29+0200\n"
+"POT-Creation-Date: 2011-01-05 04:50+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"
@@ -20,6 +20,14 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
+#: src/being.cpp:480
+msgid "dodge"
+msgstr ""
+
+#: src/being.cpp:480
+msgid "miss"
+msgstr ""
+
 #: src/client.cpp:724 src/gui/setup.cpp:47 src/gui/windowmenu.cpp:92
 msgid "Setup"
 msgstr "Podešavanje"
@@ -55,9 +63,9 @@ 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:179 src/gui/register.cpp:225
+#: src/gui/charcreatedialog.cpp:185 src/gui/register.cpp:225
 #: src/gui/serverdialog.cpp:350 src/gui/unregisterdialog.cpp:134
-#: src/net/manaserv/charhandler.cpp:180 src/net/manaserv/charhandler.cpp:223
+#: src/net/manaserv/charhandler.cpp:183 src/net/manaserv/charhandler.cpp:226
 #: src/net/tmwa/charserverhandler.cpp:137
 #: src/net/tmwa/charserverhandler.cpp:154
 msgid "Error"
@@ -644,12 +652,12 @@ msgstr "Ignoriranje dolaznih zahtjeva za trgovanje"
 msgid "Accepting incoming trade requests"
 msgstr "Prihvaćanje dolaznih zahtjeva za trgovanje"
 
-#: src/game.cpp:1373
+#: src/game.cpp:1376
 #, fuzzy
 msgid "Could Not Load Map"
 msgstr "Ne mogu učitati karte"
 
-#: src/game.cpp:1374
+#: src/game.cpp:1377
 #, c-format
 msgid "Error while loading %s"
 msgstr "Greška prilikom učitavanja %s"
@@ -727,7 +735,7 @@ 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/keyboardconfig.cpp:271
+#: src/keyboardconfig.cpp:275
 msgid "Quit"
 msgstr "Izlaz"
 
@@ -749,9 +757,9 @@ msgstr "Prodaj"
 #: src/gui/buysell.cpp:62 src/gui/changeemaildialog.cpp:56
 #: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
 #: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:206
-#: src/gui/npcpostdialog.cpp:55 src/gui/popupmenu.cpp:1120
-#: src/gui/popupmenu.cpp:1147 src/gui/popupmenu.cpp:1192
-#: src/gui/popupmenu.cpp:1230 src/gui/quitdialog.cpp:54
+#: src/gui/npcpostdialog.cpp:55 src/gui/popupmenu.cpp:1122
+#: src/gui/popupmenu.cpp:1149 src/gui/popupmenu.cpp:1194
+#: src/gui/popupmenu.cpp:1232 src/gui/quitdialog.cpp:54
 #: src/gui/register.cpp:79 src/gui/setup.cpp:64 src/gui/socialwindow.cpp:786
 #: src/gui/textcommandeditor.cpp:231 src/gui/textdialog.cpp:44
 #: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:153
@@ -853,7 +861,7 @@ msgstr "Boja kose:"
 msgid "Hair style:"
 msgstr "Frizura:"
 
-#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:437
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:445
 #: src/gui/socialwindow.cpp:846
 msgid "Create"
 msgstr "Stvori"
@@ -866,20 +874,20 @@ msgstr "Muško"
 msgid "Female"
 msgstr "Žensko"
 
-#: src/gui/charcreatedialog.cpp:99 src/gui/charcreatedialog.cpp:251
+#: src/gui/charcreatedialog.cpp:99 src/gui/charcreatedialog.cpp:257
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Molimo, rasporedi %d bodova"
 
-#: src/gui/charcreatedialog.cpp:180
+#: src/gui/charcreatedialog.cpp:186
 msgid "Your name needs to be at least 4 characters."
 msgstr "Ime mora imati barem 4 znaka."
 
-#: src/gui/charcreatedialog.cpp:242
+#: src/gui/charcreatedialog.cpp:248
 msgid "Character stats OK"
 msgstr "Podaci lika su u redu"
 
-#: src/gui/charcreatedialog.cpp:256
+#: src/gui/charcreatedialog.cpp:262
 #, c-format
 msgid "Please remove %d points"
 msgstr "Molimo, oduzmi %d bodova"
@@ -910,18 +918,23 @@ msgstr "Odjavi"
 msgid "Change Email"
 msgstr "Promijeni Email Adresu"
 
-#: src/gui/charselectdialog.cpp:367 src/gui/serverdialog.cpp:248
+#: src/gui/charselectdialog.cpp:375 src/gui/serverdialog.cpp:248
 #: src/gui/setup_players.cpp:242 src/gui/shopwindow.cpp:117
 #: src/gui/shopwindow.cpp:120 src/gui/textcommandeditor.cpp:234
 msgid "Delete"
 msgstr "Obriši"
 
-#: src/gui/charselectdialog.cpp:425
+#: src/gui/charselectdialog.cpp:433
 #, fuzzy
 msgid "Choose"
 msgstr "Zatvori"
 
-#: src/gui/charselectdialog.cpp:439 src/gui/charselectdialog.cpp:440
+#: src/gui/charselectdialog.cpp:436
+#, fuzzy, c-format
+msgid "Level %d"
+msgstr "Nivo: %d"
+
+#: src/gui/charselectdialog.cpp:447 src/gui/charselectdialog.cpp:448
 msgid "(empty)"
 msgstr ""
 
@@ -1148,14 +1161,14 @@ msgstr ""
 msgid "OK"
 msgstr "U redu"
 
-#: src/gui/equipmentwindow.cpp:70 src/gui/windowmenu.cpp:70
+#: src/gui/equipmentwindow.cpp:72 src/gui/windowmenu.cpp:70
 msgid "Equipment"
 msgstr "Oprema"
 
-#: src/gui/equipmentwindow.cpp:89 src/gui/inventorywindow.cpp:96
+#: src/gui/equipmentwindow.cpp:91 src/gui/inventorywindow.cpp:96
 #: src/gui/inventorywindow.cpp:393 src/gui/inventorywindow.cpp:402
-#: src/gui/popupmenu.cpp:1068 src/gui/popupmenu.cpp:1167
-#: src/gui/popupmenu.cpp:1207
+#: src/gui/popupmenu.cpp:1070 src/gui/popupmenu.cpp:1169
+#: src/gui/popupmenu.cpp:1209
 msgid "Unequip"
 msgstr "Skini opremu"
 
@@ -1181,32 +1194,32 @@ msgid "Slots:"
 msgstr "Mjesta:"
 
 #: src/gui/inventorywindow.cpp:94 src/gui/inventorywindow.cpp:395
-#: src/gui/inventorywindow.cpp:404 src/gui/popupmenu.cpp:1070
-#: src/gui/popupmenu.cpp:1169 src/gui/popupmenu.cpp:1209
+#: src/gui/inventorywindow.cpp:404 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:1073
-#: src/gui/popupmenu.cpp:1142 src/gui/popupmenu.cpp:1173
-#: src/gui/popupmenu.cpp:1212
+#: src/gui/inventorywindow.cpp:400 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/popupmenu.cpp:1076 src/gui/popupmenu.cpp:1177
-#: src/gui/popupmenu.cpp:1215
+#: 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:1081
-#: src/gui/popupmenu.cpp:1182 src/gui/popupmenu.cpp:1220
+#: src/gui/inventorywindow.cpp:110 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/popupmenu.cpp:408
+#: src/gui/popupmenu.cpp:409
 msgid "Outfits"
 msgstr ""
 
@@ -1215,17 +1228,17 @@ msgid "Weight:"
 msgstr "Težina:"
 
 #: src/gui/inventorywindow.cpp:133 src/gui/inventorywindow.cpp:490
-#: src/gui/popupmenu.cpp:1085 src/gui/popupmenu.cpp:1185
-#: src/gui/popupmenu.cpp:1223 src/gui/setup.cpp:65
+#: 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:1104
+#: src/gui/inventorywindow.cpp:134 src/gui/popupmenu.cpp:1106
 msgid "Retrieve"
 msgstr "Preuzmi"
 
-#: src/gui/inventorywindow.cpp:501 src/gui/popupmenu.cpp:1078
-#: src/gui/popupmenu.cpp:1179 src/gui/popupmenu.cpp:1217
+#: src/gui/inventorywindow.cpp:501 src/gui/popupmenu.cpp:1080
+#: src/gui/popupmenu.cpp:1181 src/gui/popupmenu.cpp:1219
 #: src/gui/windowmenu.cpp:91
 msgid "Drop"
 msgstr "Ispusti"
@@ -1464,7 +1477,7 @@ msgstr "Dostavi"
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:447
+#: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:448
 #, fuzzy
 msgid "Clear"
 msgstr "Zatvori"
@@ -1508,287 +1521,287 @@ msgstr "Skini opremu"
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:116 src/gui/popupmenu.cpp:482
+#: src/gui/popupmenu.cpp:116 src/gui/popupmenu.cpp:483
 #, fuzzy
 msgid "@@trade|Trade@@"
 msgstr "@@trade|Razmijeni se s %s@@"
 
 #. TRANSLATORS: Attacking a player.
-#: src/gui/popupmenu.cpp:118 src/gui/popupmenu.cpp:237
-#: src/gui/popupmenu.cpp:483
+#: src/gui/popupmenu.cpp:118 src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:484
 #, fuzzy
 msgid "@@attack|Attack@@"
 msgstr "@@attack|Napadni %s@@"
 
 #. TRANSLATORS: Whispering a player.
-#: src/gui/popupmenu.cpp:120 src/gui/popupmenu.cpp:289
+#: src/gui/popupmenu.cpp:120 src/gui/popupmenu.cpp:290
 #, fuzzy
 msgid "@@whisper|Whisper@@"
 msgstr "@@use|Upotrijebi@@"
 
-#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:487
+#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:488
 #, fuzzy
 msgid "@@heal|Heal@@"
 msgstr "@@cancel|Otkaži@@"
 
-#: src/gui/popupmenu.cpp:130 src/gui/popupmenu.cpp:295
-#: src/gui/popupmenu.cpp:493
+#: src/gui/popupmenu.cpp:130 src/gui/popupmenu.cpp:296
+#: src/gui/popupmenu.cpp:494
 #, fuzzy
 msgid "@@friend|Befriend@@"
 msgstr "@@retrieve|Preuzmi@@"
 
-#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:136
-#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:296
-#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:320
-#: src/gui/popupmenu.cpp:494 src/gui/popupmenu.cpp:499
-#: src/gui/popupmenu.cpp:517
+#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:137
+#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:297
+#: src/gui/popupmenu.cpp:303 src/gui/popupmenu.cpp:321
+#: src/gui/popupmenu.cpp:495 src/gui/popupmenu.cpp:501
+#: src/gui/popupmenu.cpp:519
 #, fuzzy
 msgid "@@disregard|Disregard@@"
 msgstr "@@disregard|Zanemari %s@@"
 
-#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:137
-#: src/gui/popupmenu.cpp:297 src/gui/popupmenu.cpp:303
-#: src/gui/popupmenu.cpp:495 src/gui/popupmenu.cpp:500
+#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:138
+#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:304
+#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:502
 #, fuzzy
 msgid "@@ignore|Ignore@@"
 msgstr "@@ignore|Ignoriraj %s@@"
 
-#: src/gui/popupmenu.cpp:133 src/gui/popupmenu.cpp:138
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:149
-#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:304
-#: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:315
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:501
-#: src/gui/popupmenu.cpp:507 src/gui/popupmenu.cpp:512
+#: src/gui/popupmenu.cpp:133 src/gui/popupmenu.cpp:139
+#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:150
+#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:305
+#: src/gui/popupmenu.cpp:311 src/gui/popupmenu.cpp:316
+#: src/gui/popupmenu.cpp:497 src/gui/popupmenu.cpp:503
+#: src/gui/popupmenu.cpp:509 src/gui/popupmenu.cpp:514
 #, fuzzy
 msgid "@@erase|Erase@@"
 msgstr "@@use|Upotrijebi@@"
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:148
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:308
-#: src/gui/popupmenu.cpp:314 src/gui/popupmenu.cpp:319
-#: src/gui/popupmenu.cpp:505 src/gui/popupmenu.cpp:511
-#: src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:143 src/gui/popupmenu.cpp:149
+#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:315 src/gui/popupmenu.cpp:320
+#: src/gui/popupmenu.cpp:507 src/gui/popupmenu.cpp:513
+#: src/gui/popupmenu.cpp:518
 #, fuzzy
 msgid "@@unignore|Unignore@@"
 msgstr "@@unignore|Prestani Ignorirati %s@@"
 
-#: src/gui/popupmenu.cpp:143 src/gui/popupmenu.cpp:155
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:321
-#: src/gui/popupmenu.cpp:506 src/gui/popupmenu.cpp:518
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:156
+#: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:322
+#: src/gui/popupmenu.cpp:508 src/gui/popupmenu.cpp:520
 #, fuzzy
 msgid "@@ignore|Completely ignore@@"
 msgstr "@@ignore|Potpuno ignoriraj %s@@"
 
-#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:329
-#: src/gui/popupmenu.cpp:526
+#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:330
+#: src/gui/popupmenu.cpp:528
 msgid "@@follow|Follow@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:330
-#: src/gui/popupmenu.cpp:527
+#: src/gui/popupmenu.cpp:165 src/gui/popupmenu.cpp:331
+#: src/gui/popupmenu.cpp:529
 msgid "@@imitation|Imitation@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:174 src/gui/popupmenu.cpp:546
+#: src/gui/popupmenu.cpp:175 src/gui/popupmenu.cpp:548
 #, fuzzy
 msgid "@@party|Invite to party@@"
 msgstr "/party > Pozovite korisnike na partiju"
 
-#: src/gui/popupmenu.cpp:179 src/gui/popupmenu.cpp:551
+#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:553
 #, fuzzy
 msgid "@@kick party|Kick from party@@"
 msgstr "@@admin-kick|Šutni igrača@@"
 
-#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:337
-#: src/gui/popupmenu.cpp:565
+#: src/gui/popupmenu.cpp:195 src/gui/popupmenu.cpp:338
+#: src/gui/popupmenu.cpp:567
 #, fuzzy
 msgid "@@guild-kick|Kick from guild@@"
 msgstr "@@admin-kick|Šutni igrača@@"
 
-#: src/gui/popupmenu.cpp:196 src/gui/popupmenu.cpp:338
-#: src/gui/popupmenu.cpp:567
+#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:339
+#: src/gui/popupmenu.cpp:569
 msgid "@@guild-pos|Change pos in guild >@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:201 src/gui/popupmenu.cpp:342
-#: src/gui/popupmenu.cpp:572
+#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:343
+#: src/gui/popupmenu.cpp:574
 #, fuzzy
 msgid "@@guild|Invite to guild@@"
 msgstr "/party > Pozovite korisnike na partiju"
 
-#: src/gui/popupmenu.cpp:208
+#: src/gui/popupmenu.cpp:209
 msgid "@@admin-kick|Kick player@@"
 msgstr "@@admin-kick|Šutni igrača@@"
 
-#: src/gui/popupmenu.cpp:210
+#: src/gui/popupmenu.cpp:211
 msgid "@@nuke|Nuke@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:211 src/gui/popupmenu.cpp:231
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:232
+#: src/gui/popupmenu.cpp:530
 msgid "@@move|Move@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:529
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:531
 #, fuzzy
 msgid "@@undress|Undress@@"
 msgstr "@@unignore|Prestani Ignorirati %s@@"
 
-#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:228
-#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:534
+#: src/gui/popupmenu.cpp:218 src/gui/popupmenu.cpp:229
+#: src/gui/popupmenu.cpp:350 src/gui/popupmenu.cpp:536
 msgid "@@buy|Buy@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:218 src/gui/popupmenu.cpp:229
-#: src/gui/popupmenu.cpp:350 src/gui/popupmenu.cpp:535
+#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:230
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:537
 #, fuzzy
 msgid "@@sell|Sell@@"
 msgstr "@@use|Upotrijebi@@"
 
-#: src/gui/popupmenu.cpp:226
+#: src/gui/popupmenu.cpp:227
 #, fuzzy
 msgid "@@talk|Talk@@"
 msgstr "@@attack|Napadni %s@@"
 
-#: src/gui/popupmenu.cpp:240
+#: src/gui/popupmenu.cpp:241
 #, fuzzy
 msgid "@@admin-kick|Kick@@"
 msgstr "@@admin-kick|Šutni igrača@@"
 
-#: src/gui/popupmenu.cpp:248 src/gui/popupmenu.cpp:353
+#: src/gui/popupmenu.cpp:249 src/gui/popupmenu.cpp:354
 #, fuzzy
 msgid "@@name|Add name to chat@@"
 msgstr "@@name|Dodaj ime u chat@@"
 
-#: src/gui/popupmenu.cpp:252 src/gui/popupmenu.cpp:272
-#: src/gui/popupmenu.cpp:357 src/gui/popupmenu.cpp:380
-#: src/gui/popupmenu.cpp:399 src/gui/popupmenu.cpp:412
-#: src/gui/popupmenu.cpp:430 src/gui/popupmenu.cpp:577
-#: src/gui/popupmenu.cpp:601
+#: src/gui/popupmenu.cpp:253 src/gui/popupmenu.cpp:273
+#: src/gui/popupmenu.cpp:358 src/gui/popupmenu.cpp:381
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:431 src/gui/popupmenu.cpp:579
+#: src/gui/popupmenu.cpp:603
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancel|Otkaži@@"
 
-#: src/gui/popupmenu.cpp:267
+#: src/gui/popupmenu.cpp:268
 #, c-format
 msgid "@@player_%u|%s >@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:375
+#: src/gui/popupmenu.cpp:376
 #, fuzzy
 msgid "@@pickup|Pick up@@"
 msgstr "@@pickup|Pokupi %s@@"
 
-#: src/gui/popupmenu.cpp:376
+#: src/gui/popupmenu.cpp:377
 #, fuzzy
 msgid "@@chat|Add to chat@@"
 msgstr "@@chat|Dudaj u chat@@"
 
-#: src/gui/popupmenu.cpp:394
+#: src/gui/popupmenu.cpp:395
 msgid "Map Item"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:395
+#: src/gui/popupmenu.cpp:396
 msgid "@@rename map|Rename@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:396
+#: src/gui/popupmenu.cpp:397
 msgid "@@remove map|Remove@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:409
+#: src/gui/popupmenu.cpp:410
 msgid "@@load old outfits|Load old outfits@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:425 src/gui/windowmenu.cpp:90
+#: src/gui/popupmenu.cpp:426 src/gui/windowmenu.cpp:90
 msgid "Spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:426
+#: src/gui/popupmenu.cpp:427
 msgid "@@load old spells|Load old spells@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:427
+#: src/gui/popupmenu.cpp:428
 #, fuzzy
 msgid "@@edit spell|Edit spell@@"
 msgstr "@@use|Upotrijebi@@"
 
-#: src/gui/popupmenu.cpp:445
+#: src/gui/popupmenu.cpp:446
 msgid "@@chat close|Close@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:453
+#: src/gui/popupmenu.cpp:454
 #, fuzzy
 msgid "Disable highlight"
 msgstr "Istakni Karticu"
 
-#: src/gui/popupmenu.cpp:459
+#: src/gui/popupmenu.cpp:460
 #, fuzzy
 msgid "Enable highlight"
 msgstr "Istakni Karticu"
 
-#: src/gui/popupmenu.cpp:465
+#: src/gui/popupmenu.cpp:466
 msgid "@@leave party|Leave@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:585
+#: src/gui/popupmenu.cpp:587
 #, fuzzy
 msgid "Change guild position"
 msgstr "Izmijeni"
 
-#: src/gui/popupmenu.cpp:598
+#: src/gui/popupmenu.cpp:600
 #, c-format
 msgid "@@guild-pos-%d|%s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:942
+#: src/gui/popupmenu.cpp:944
 msgid "Rename map sign          "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:943
+#: src/gui/popupmenu.cpp:945
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1091
+#: src/gui/popupmenu.cpp:1093
 #, fuzzy
 msgid "Store 10"
 msgstr "Pohrani"
 
-#: src/gui/popupmenu.cpp:1094
+#: src/gui/popupmenu.cpp:1096
 #, fuzzy
 msgid "Store half"
 msgstr "Pohrani"
 
-#: src/gui/popupmenu.cpp:1096
+#: src/gui/popupmenu.cpp:1098
 #, fuzzy
 msgid "Store all"
 msgstr "Pohrani"
 
-#: src/gui/popupmenu.cpp:1110
+#: src/gui/popupmenu.cpp:1112
 #, fuzzy
 msgid "Retrieve 10"
 msgstr "Preuzmi"
 
-#: src/gui/popupmenu.cpp:1113
+#: src/gui/popupmenu.cpp:1115
 #, fuzzy
 msgid "Retrieve half"
 msgstr "Preuzmi"
 
-#: src/gui/popupmenu.cpp:1115
+#: src/gui/popupmenu.cpp:1117
 #, fuzzy
 msgid "Retrieve all"
 msgstr "Preuzmi"
 
-#: src/gui/popupmenu.cpp:1118 src/gui/popupmenu.cpp:1186
-#: src/gui/popupmenu.cpp:1224
+#: src/gui/popupmenu.cpp:1120 src/gui/popupmenu.cpp:1188
+#: src/gui/popupmenu.cpp:1226
 #, fuzzy
 msgid "Add to chat"
 msgstr "@@chat|Dudaj u chat@@"
 
-#: src/gui/popupmenu.cpp:1145 src/gui/popupmenu.cpp:1190
+#: src/gui/popupmenu.cpp:1147 src/gui/popupmenu.cpp:1192
 msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1228
+#: src/gui/popupmenu.cpp:1230
 msgid "Load old drop shortcuts"
 msgstr ""
 
@@ -3218,6 +3231,10 @@ msgstr ""
 msgid "Who Is Online - Update"
 msgstr ""
 
+#: src/gui/widgets/battletab.cpp:41
+msgid "Battle"
+msgstr ""
+
 #: src/gui/widgets/channeltab.cpp:49
 msgid "/users > Lists the users in the current channel"
 msgstr "/users > Lista korisnika u trenutnom kanalu"
@@ -3657,174 +3674,175 @@ msgstr "Sljedeća Chat Kartica"
 #: src/keyboardconfig.cpp:233 src/keyboardconfig.cpp:236
 #: src/keyboardconfig.cpp:238 src/keyboardconfig.cpp:240
 #: src/keyboardconfig.cpp:242 src/keyboardconfig.cpp:244
+#: src/keyboardconfig.cpp:246 src/keyboardconfig.cpp:248
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "Prečica za Ispoljavanje emocija %d"
 
-#: src/keyboardconfig.cpp:246
+#: src/keyboardconfig.cpp:250
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:248
+#: src/keyboardconfig.cpp:252
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:250
+#: src/keyboardconfig.cpp:254
 msgid "Copy Equiped to Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:252
+#: src/keyboardconfig.cpp:256
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:254
+#: src/keyboardconfig.cpp:258
 msgid "Scroll Chat Up"
 msgstr "Pomakni Chat Gore"
 
-#: src/keyboardconfig.cpp:256
+#: src/keyboardconfig.cpp:260
 msgid "Scroll Chat Down"
 msgstr "Pomakni Chat Dolje"
 
-#: src/keyboardconfig.cpp:258
+#: src/keyboardconfig.cpp:262
 msgid "Previous Chat Tab"
 msgstr "Prethodna Chat Kartica"
 
-#: src/keyboardconfig.cpp:260
+#: src/keyboardconfig.cpp:264
 msgid "Next Chat Tab"
 msgstr "Sljedeća Chat Kartica"
 
-#: src/keyboardconfig.cpp:262
+#: src/keyboardconfig.cpp:266
 #, fuzzy
 msgid "Previous chat tab line"
 msgstr "Prethodna Chat Kartica"
 
-#: src/keyboardconfig.cpp:264
+#: src/keyboardconfig.cpp:268
 #, fuzzy
 msgid "Next chat tab line"
 msgstr "Sljedeća Chat Kartica"
 
-#: src/keyboardconfig.cpp:266
+#: src/keyboardconfig.cpp:270
 msgid "Chat Auto Complete"
 msgstr ""
 
-#: src/keyboardconfig.cpp:268
+#: src/keyboardconfig.cpp:272
 msgid "Deactivate Chat Input"
 msgstr ""
 
-#: src/keyboardconfig.cpp:270
+#: src/keyboardconfig.cpp:274
 msgid "Select OK"
 msgstr "Odaberite OK"
 
-#: src/keyboardconfig.cpp:272
+#: src/keyboardconfig.cpp:276
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:274
+#: src/keyboardconfig.cpp:278
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:276
+#: src/keyboardconfig.cpp:280
 msgid "Direct Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:277
+#: src/keyboardconfig.cpp:281
 #, fuzzy
 msgid "Direct Down"
 msgstr "Pomakni Dolje"
 
-#: src/keyboardconfig.cpp:279
+#: src/keyboardconfig.cpp:283
 #, fuzzy
 msgid "Direct Left"
 msgstr "Pomakni Ulijevo"
 
-#: src/keyboardconfig.cpp:280
+#: src/keyboardconfig.cpp:284
 #, fuzzy
 msgid "Direct Right"
 msgstr "Pomakni Udesno"
 
-#: src/keyboardconfig.cpp:282
+#: src/keyboardconfig.cpp:286
 msgid "Crazy moves"
 msgstr ""
 
-#: src/keyboardconfig.cpp:284
+#: src/keyboardconfig.cpp:288
 msgid "Change Crazy Move mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:286
+#: src/keyboardconfig.cpp:290
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:288
+#: src/keyboardconfig.cpp:292
 msgid "Quick Drop N Items"
 msgstr ""
 
-#: src/keyboardconfig.cpp:290
+#: src/keyboardconfig.cpp:294
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/keyboardconfig.cpp:292
+#: src/keyboardconfig.cpp:296
 msgid "Quick heal target or self"
 msgstr ""
 
-#: src/keyboardconfig.cpp:294
+#: src/keyboardconfig.cpp:298
 msgid "Use #itenplz spell"
 msgstr ""
 
-#: src/keyboardconfig.cpp:296
+#: src/keyboardconfig.cpp:300
 msgid "Use magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboardconfig.cpp:302
 #, fuzzy
 msgid "Switch magic attack"
 msgstr "Promijeni lika"
 
-#: src/keyboardconfig.cpp:300
+#: src/keyboardconfig.cpp:304
 #, fuzzy
 msgid "Change move type"
 msgstr "Server"
 
-#: src/keyboardconfig.cpp:302
+#: src/keyboardconfig.cpp:306
 msgid "Change Attack Weapon Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:304
+#: src/keyboardconfig.cpp:308
 #, fuzzy
 msgid "Change Attack Type"
 msgstr "Meta i Napad"
 
-#: src/keyboardconfig.cpp:306
+#: src/keyboardconfig.cpp:310
 #, fuzzy
 msgid "Change Follow mode"
 msgstr "Promijeni Lozinku"
 
-#: src/keyboardconfig.cpp:308
+#: src/keyboardconfig.cpp:312
 #, fuzzy
 msgid "Change Imitation mode"
 msgstr "Promijeni Email Adresu"
 
-#: src/keyboardconfig.cpp:311
+#: src/keyboardconfig.cpp:315
 msgid "Disbale / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboardconfig.cpp:316
 msgid "On / Off audio"
 msgstr ""
 
-#: src/keyboardconfig.cpp:314
+#: src/keyboardconfig.cpp:318
 #, fuzzy
 msgid "Enable / Disable away mode"
 msgstr "Omogući/Onemogući Trgovanje"
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboardconfig.cpp:320
 msgid "Emulate right click from keyboard"
 msgstr ""
 
-#: src/keyboardconfig.cpp:318
+#: src/keyboardconfig.cpp:322
 msgid "Toggle camera mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:380
+#: src/keyboardconfig.cpp:384
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -4088,7 +4106,7 @@ msgstr ""
 msgid "You Died"
 msgstr "Umrli ste"
 
-#: src/net/manaserv/charhandler.cpp:144 src/net/manaserv/charhandler.cpp:215
+#: src/net/manaserv/charhandler.cpp:144 src/net/manaserv/charhandler.cpp:218
 #, fuzzy
 msgid "Not logged in."
 msgstr "Već prijavljeni"
@@ -4133,7 +4151,11 @@ msgstr "Podaci lika su u redu"
 msgid "At least one statis out of the permitted range: (%u - %u)."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:177 src/net/manaserv/loginhandler.cpp:98
+#: src/net/manaserv/charhandler.cpp:177
+msgid "Invalid slot number."
+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
@@ -4141,26 +4163,26 @@ msgstr ""
 msgid "Unknown error."
 msgstr "Nepoznata greška"
 
-#: src/net/manaserv/charhandler.cpp:206 src/net/tmwa/charserverhandler.cpp:149
+#: src/net/manaserv/charhandler.cpp:209 src/net/tmwa/charserverhandler.cpp:149
 msgid "Info"
 msgstr "Info"
 
-#: src/net/manaserv/charhandler.cpp:206
+#: src/net/manaserv/charhandler.cpp:209
 #, fuzzy
 msgid "Player deleted."
 msgstr "Lik izbrisan."
 
-#: src/net/manaserv/charhandler.cpp:218
+#: src/net/manaserv/charhandler.cpp:221
 #, fuzzy
 msgid "Selection out of range."
 msgstr "Odaberi količinu predmeta za razmjenu."
 
-#: src/net/manaserv/charhandler.cpp:221
+#: src/net/manaserv/charhandler.cpp:224
 #, fuzzy, c-format
 msgid "Unknown error (%d)."
 msgstr "Nepoznata greška"
 
-#: src/net/manaserv/charhandler.cpp:257
+#: src/net/manaserv/charhandler.cpp:260
 msgid "No gameservers are available."
 msgstr "Nijedan od servera igre nije dostupan."
 
@@ -4353,11 +4375,11 @@ msgstr "%s želi trgovati s vama, prihvaćate li?"
 msgid "Trading with %s"
 msgstr "Trgovanje s %s"
 
-#: src/net/manaserv/tradehandler.cpp:159 src/net/tmwa/tradehandler.cpp:268
+#: src/net/manaserv/tradehandler.cpp:159 src/net/tmwa/tradehandler.cpp:273
 msgid "Trade canceled."
 msgstr "Otkazano trgovanje."
 
-#: src/net/manaserv/tradehandler.cpp:166 src/net/tmwa/tradehandler.cpp:278
+#: src/net/manaserv/tradehandler.cpp:166 src/net/tmwa/tradehandler.cpp:283
 msgid "Trade completed."
 msgstr "Trgovanje je završeno."
 
@@ -4837,11 +4859,11 @@ msgstr ""
 msgid "Experience sharing unknown."
 msgstr ""
 
-#: src/net/tmwa/inventoryhandler.cpp:329
+#: src/net/tmwa/inventoryhandler.cpp:334
 msgid "Failed to use item."
 msgstr "Neuspješno korištenje predmeta."
 
-#: src/net/tmwa/inventoryhandler.cpp:452
+#: src/net/tmwa/inventoryhandler.cpp:457
 msgid "Unable to equip."
 msgstr "Nije moguće opremiti."
 
@@ -5167,7 +5189,12 @@ msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 "Neuspješno dodavanje predmeta. Trgovinski partner nema slobodnog prostora."
 
-#: src/net/tmwa/tradehandler.cpp:250
+#: src/net/tmwa/tradehandler.cpp:251
+#, fuzzy
+msgid "Failed adding item. You cant trade this item."
+msgstr "Neuspješno dodavanje predmeta. Trgovinski partner je preopterećen."
+
+#: src/net/tmwa/tradehandler.cpp:255
 msgid "Failed adding item for unknown reason."
 msgstr "Neuspješno dodavanje predmeta, iz nepoznatog razloga."
 
@@ -5192,6 +5219,11 @@ msgstr ""
 msgid "Floating bubble"
 msgstr ""
 
+#: src/resources/beinginfo.cpp:32 src/resources/itemdb.cpp:210
+#: src/resources/monsterdb.cpp:78
+msgid "unnamed"
+msgstr "neimenovano"
+
 #: src/resources/itemdb.cpp:55
 #, c-format
 msgid "Attack %+d"
@@ -5216,10 +5248,6 @@ msgstr "Mana %+d"
 msgid "Unknown item"
 msgstr "Nepoznati predmet"
 
-#: src/resources/itemdb.cpp:210 src/resources/monsterdb.cpp:78
-msgid "unnamed"
-msgstr "neimenovano"
-
 #, fuzzy
 #~ msgid "Particle detail: %s"
 #~ msgstr "Detalji Čestica"
diff --git a/po/hu.po b/po/hu.po
index 9b2f32728..e6084efde 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: 2010-12-24 19:29+0200\n"
+"POT-Creation-Date: 2011-01-05 04:50+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"
@@ -19,6 +19,14 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
+#: src/being.cpp:480
+msgid "dodge"
+msgstr ""
+
+#: src/being.cpp:480
+msgid "miss"
+msgstr ""
+
 #: src/client.cpp:724 src/gui/setup.cpp:47 src/gui/windowmenu.cpp:92
 msgid "Setup"
 msgstr "Beállítások"
@@ -54,9 +62,9 @@ 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:179 src/gui/register.cpp:225
+#: src/gui/charcreatedialog.cpp:185 src/gui/register.cpp:225
 #: src/gui/serverdialog.cpp:350 src/gui/unregisterdialog.cpp:134
-#: src/net/manaserv/charhandler.cpp:180 src/net/manaserv/charhandler.cpp:223
+#: src/net/manaserv/charhandler.cpp:183 src/net/manaserv/charhandler.cpp:226
 #: src/net/tmwa/charserverhandler.cpp:137
 #: src/net/tmwa/charserverhandler.cpp:154
 msgid "Error"
@@ -658,12 +666,12 @@ msgstr "Kereskedési kérelmek elutasítása"
 msgid "Accepting incoming trade requests"
 msgstr "Kereskedési kérelmek elfogadása"
 
-#: src/game.cpp:1373
+#: src/game.cpp:1376
 #, fuzzy
 msgid "Could Not Load Map"
 msgstr "Nem lehet betölteni a térképet"
 
-#: src/game.cpp:1374
+#: src/game.cpp:1377
 #, c-format
 msgid "Error while loading %s"
 msgstr "Hiba %s betöltése közben"
@@ -741,7 +749,7 @@ 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/keyboardconfig.cpp:271
+#: src/keyboardconfig.cpp:275
 msgid "Quit"
 msgstr "Kilépés"
 
@@ -763,9 +771,9 @@ msgstr "Eladás"
 #: src/gui/buysell.cpp:62 src/gui/changeemaildialog.cpp:56
 #: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
 #: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:206
-#: src/gui/npcpostdialog.cpp:55 src/gui/popupmenu.cpp:1120
-#: src/gui/popupmenu.cpp:1147 src/gui/popupmenu.cpp:1192
-#: src/gui/popupmenu.cpp:1230 src/gui/quitdialog.cpp:54
+#: src/gui/npcpostdialog.cpp:55 src/gui/popupmenu.cpp:1122
+#: src/gui/popupmenu.cpp:1149 src/gui/popupmenu.cpp:1194
+#: src/gui/popupmenu.cpp:1232 src/gui/quitdialog.cpp:54
 #: src/gui/register.cpp:79 src/gui/setup.cpp:64 src/gui/socialwindow.cpp:786
 #: src/gui/textcommandeditor.cpp:231 src/gui/textdialog.cpp:44
 #: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:153
@@ -867,7 +875,7 @@ msgstr "Haj szín:"
 msgid "Hair style:"
 msgstr "Haj stílus:"
 
-#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:437
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:445
 #: src/gui/socialwindow.cpp:846
 msgid "Create"
 msgstr "Létrehozás"
@@ -880,20 +888,20 @@ msgstr "Férfi"
 msgid "Female"
 msgstr "Nő"
 
-#: src/gui/charcreatedialog.cpp:99 src/gui/charcreatedialog.cpp:251
+#: src/gui/charcreatedialog.cpp:99 src/gui/charcreatedialog.cpp:257
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Kérlek oszd el a pontjaidat (%d van még)"
 
-#: src/gui/charcreatedialog.cpp:180
+#: src/gui/charcreatedialog.cpp:186
 msgid "Your name needs to be at least 4 characters."
 msgstr "A nevednek minimum 4 karakternek kell lennie."
 
-#: src/gui/charcreatedialog.cpp:242
+#: src/gui/charcreatedialog.cpp:248
 msgid "Character stats OK"
 msgstr "Karakter statok rendben"
 
-#: src/gui/charcreatedialog.cpp:256
+#: src/gui/charcreatedialog.cpp:262
 #, c-format
 msgid "Please remove %d points"
 msgstr "Kérlek távolíts el %d pontot"
@@ -924,18 +932,23 @@ msgstr "Regisztráció megszüntetése"
 msgid "Change Email"
 msgstr "Email cím módosírása"
 
-#: src/gui/charselectdialog.cpp:367 src/gui/serverdialog.cpp:248
+#: src/gui/charselectdialog.cpp:375 src/gui/serverdialog.cpp:248
 #: src/gui/setup_players.cpp:242 src/gui/shopwindow.cpp:117
 #: src/gui/shopwindow.cpp:120 src/gui/textcommandeditor.cpp:234
 msgid "Delete"
 msgstr "Törlés"
 
-#: src/gui/charselectdialog.cpp:425
+#: src/gui/charselectdialog.cpp:433
 #, fuzzy
 msgid "Choose"
 msgstr "Bezár"
 
-#: src/gui/charselectdialog.cpp:439 src/gui/charselectdialog.cpp:440
+#: src/gui/charselectdialog.cpp:436
+#, fuzzy, c-format
+msgid "Level %d"
+msgstr "Szint: %d"
+
+#: src/gui/charselectdialog.cpp:447 src/gui/charselectdialog.cpp:448
 msgid "(empty)"
 msgstr ""
 
@@ -1163,14 +1176,14 @@ msgstr ""
 msgid "OK"
 msgstr "Ok"
 
-#: src/gui/equipmentwindow.cpp:70 src/gui/windowmenu.cpp:70
+#: src/gui/equipmentwindow.cpp:72 src/gui/windowmenu.cpp:70
 msgid "Equipment"
 msgstr "Felszerelés"
 
-#: src/gui/equipmentwindow.cpp:89 src/gui/inventorywindow.cpp:96
+#: src/gui/equipmentwindow.cpp:91 src/gui/inventorywindow.cpp:96
 #: src/gui/inventorywindow.cpp:393 src/gui/inventorywindow.cpp:402
-#: src/gui/popupmenu.cpp:1068 src/gui/popupmenu.cpp:1167
-#: src/gui/popupmenu.cpp:1207
+#: src/gui/popupmenu.cpp:1070 src/gui/popupmenu.cpp:1169
+#: src/gui/popupmenu.cpp:1209
 msgid "Unequip"
 msgstr "Nem használ"
 
@@ -1196,32 +1209,32 @@ msgid "Slots:"
 msgstr "Hely:"
 
 #: src/gui/inventorywindow.cpp:94 src/gui/inventorywindow.cpp:395
-#: src/gui/inventorywindow.cpp:404 src/gui/popupmenu.cpp:1070
-#: src/gui/popupmenu.cpp:1169 src/gui/popupmenu.cpp:1209
+#: src/gui/inventorywindow.cpp:404 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:1073
-#: src/gui/popupmenu.cpp:1142 src/gui/popupmenu.cpp:1173
-#: src/gui/popupmenu.cpp:1212
+#: src/gui/inventorywindow.cpp:400 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/popupmenu.cpp:1076 src/gui/popupmenu.cpp:1177
-#: src/gui/popupmenu.cpp:1215
+#: 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:1081
-#: src/gui/popupmenu.cpp:1182 src/gui/popupmenu.cpp:1220
+#: src/gui/inventorywindow.cpp:110 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/popupmenu.cpp:408
+#: src/gui/popupmenu.cpp:409
 msgid "Outfits"
 msgstr ""
 
@@ -1230,17 +1243,17 @@ msgid "Weight:"
 msgstr "Súly:"
 
 #: src/gui/inventorywindow.cpp:133 src/gui/inventorywindow.cpp:490
-#: src/gui/popupmenu.cpp:1085 src/gui/popupmenu.cpp:1185
-#: src/gui/popupmenu.cpp:1223 src/gui/setup.cpp:65
+#: 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:1104
+#: src/gui/inventorywindow.cpp:134 src/gui/popupmenu.cpp:1106
 msgid "Retrieve"
 msgstr "Magához vesz"
 
-#: src/gui/inventorywindow.cpp:501 src/gui/popupmenu.cpp:1078
-#: src/gui/popupmenu.cpp:1179 src/gui/popupmenu.cpp:1217
+#: src/gui/inventorywindow.cpp:501 src/gui/popupmenu.cpp:1080
+#: src/gui/popupmenu.cpp:1181 src/gui/popupmenu.cpp:1219
 #: src/gui/windowmenu.cpp:91
 msgid "Drop"
 msgstr "Eldob"
@@ -1479,7 +1492,7 @@ msgstr "Küldés"
 msgid "NPC"
 msgstr "Gépjátékos"
 
-#: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:447
+#: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:448
 #, fuzzy
 msgid "Clear"
 msgstr "Szálfegyver"
@@ -1523,287 +1536,287 @@ msgstr "Nem használ"
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:116 src/gui/popupmenu.cpp:482
+#: src/gui/popupmenu.cpp:116 src/gui/popupmenu.cpp:483
 #, fuzzy
 msgid "@@trade|Trade@@"
 msgstr "@@trade|Üzlet Te és %s között@@"
 
 #. TRANSLATORS: Attacking a player.
-#: src/gui/popupmenu.cpp:118 src/gui/popupmenu.cpp:237
-#: src/gui/popupmenu.cpp:483
+#: src/gui/popupmenu.cpp:118 src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:484
 #, fuzzy
 msgid "@@attack|Attack@@"
 msgstr "@@attack|%s megtámadása@@"
 
 #. TRANSLATORS: Whispering a player.
-#: src/gui/popupmenu.cpp:120 src/gui/popupmenu.cpp:289
+#: src/gui/popupmenu.cpp:120 src/gui/popupmenu.cpp:290
 #, fuzzy
 msgid "@@whisper|Whisper@@"
 msgstr "@@use|Bevet@@"
 
-#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:487
+#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:488
 #, fuzzy
 msgid "@@heal|Heal@@"
 msgstr "@@cancel|mégse@@"
 
-#: src/gui/popupmenu.cpp:130 src/gui/popupmenu.cpp:295
-#: src/gui/popupmenu.cpp:493
+#: src/gui/popupmenu.cpp:130 src/gui/popupmenu.cpp:296
+#: src/gui/popupmenu.cpp:494
 #, fuzzy
 msgid "@@friend|Befriend@@"
 msgstr "@@retrieve|Visszavesz@@"
 
-#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:136
-#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:296
-#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:320
-#: src/gui/popupmenu.cpp:494 src/gui/popupmenu.cpp:499
-#: src/gui/popupmenu.cpp:517
+#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:137
+#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:297
+#: src/gui/popupmenu.cpp:303 src/gui/popupmenu.cpp:321
+#: src/gui/popupmenu.cpp:495 src/gui/popupmenu.cpp:501
+#: src/gui/popupmenu.cpp:519
 #, fuzzy
 msgid "@@disregard|Disregard@@"
 msgstr "@@disregard|Semmibe veszed %s-t@@"
 
-#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:137
-#: src/gui/popupmenu.cpp:297 src/gui/popupmenu.cpp:303
-#: src/gui/popupmenu.cpp:495 src/gui/popupmenu.cpp:500
+#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:138
+#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:304
+#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:502
 #, fuzzy
 msgid "@@ignore|Ignore@@"
 msgstr "@@ignore|%s tiltása@@"
 
-#: src/gui/popupmenu.cpp:133 src/gui/popupmenu.cpp:138
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:149
-#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:304
-#: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:315
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:501
-#: src/gui/popupmenu.cpp:507 src/gui/popupmenu.cpp:512
+#: src/gui/popupmenu.cpp:133 src/gui/popupmenu.cpp:139
+#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:150
+#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:305
+#: src/gui/popupmenu.cpp:311 src/gui/popupmenu.cpp:316
+#: src/gui/popupmenu.cpp:497 src/gui/popupmenu.cpp:503
+#: src/gui/popupmenu.cpp:509 src/gui/popupmenu.cpp:514
 #, fuzzy
 msgid "@@erase|Erase@@"
 msgstr "@@use|Bevet@@"
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:148
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:308
-#: src/gui/popupmenu.cpp:314 src/gui/popupmenu.cpp:319
-#: src/gui/popupmenu.cpp:505 src/gui/popupmenu.cpp:511
-#: src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:143 src/gui/popupmenu.cpp:149
+#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:315 src/gui/popupmenu.cpp:320
+#: src/gui/popupmenu.cpp:507 src/gui/popupmenu.cpp:513
+#: src/gui/popupmenu.cpp:518
 #, fuzzy
 msgid "@@unignore|Unignore@@"
 msgstr "@@unignore|%s tiltásának feloldása@@"
 
-#: src/gui/popupmenu.cpp:143 src/gui/popupmenu.cpp:155
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:321
-#: src/gui/popupmenu.cpp:506 src/gui/popupmenu.cpp:518
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:156
+#: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:322
+#: src/gui/popupmenu.cpp:508 src/gui/popupmenu.cpp:520
 #, fuzzy
 msgid "@@ignore|Completely ignore@@"
 msgstr "@@ignore|Teljesen letiltod %s-t@@"
 
-#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:329
-#: src/gui/popupmenu.cpp:526
+#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:330
+#: src/gui/popupmenu.cpp:528
 msgid "@@follow|Follow@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:330
-#: src/gui/popupmenu.cpp:527
+#: src/gui/popupmenu.cpp:165 src/gui/popupmenu.cpp:331
+#: src/gui/popupmenu.cpp:529
 msgid "@@imitation|Imitation@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:174 src/gui/popupmenu.cpp:546
+#: src/gui/popupmenu.cpp:175 src/gui/popupmenu.cpp:548
 #, fuzzy
 msgid "@@party|Invite to party@@"
 msgstr "/party > Felhasználó csapatba hívása"
 
-#: src/gui/popupmenu.cpp:179 src/gui/popupmenu.cpp:551
+#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:553
 #, fuzzy
 msgid "@@kick party|Kick from party@@"
 msgstr "@@admin-kick|Játékos kirúgása@@"
 
-#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:337
-#: src/gui/popupmenu.cpp:565
+#: src/gui/popupmenu.cpp:195 src/gui/popupmenu.cpp:338
+#: src/gui/popupmenu.cpp:567
 #, fuzzy
 msgid "@@guild-kick|Kick from guild@@"
 msgstr "@@admin-kick|Játékos kirúgása@@"
 
-#: src/gui/popupmenu.cpp:196 src/gui/popupmenu.cpp:338
-#: src/gui/popupmenu.cpp:567
+#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:339
+#: src/gui/popupmenu.cpp:569
 msgid "@@guild-pos|Change pos in guild >@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:201 src/gui/popupmenu.cpp:342
-#: src/gui/popupmenu.cpp:572
+#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:343
+#: src/gui/popupmenu.cpp:574
 #, fuzzy
 msgid "@@guild|Invite to guild@@"
 msgstr "/party > Felhasználó csapatba hívása"
 
-#: src/gui/popupmenu.cpp:208
+#: src/gui/popupmenu.cpp:209
 msgid "@@admin-kick|Kick player@@"
 msgstr "@@admin-kick|Játékos kirúgása@@"
 
-#: src/gui/popupmenu.cpp:210
+#: src/gui/popupmenu.cpp:211
 msgid "@@nuke|Nuke@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:211 src/gui/popupmenu.cpp:231
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:232
+#: src/gui/popupmenu.cpp:530
 msgid "@@move|Move@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:529
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:531
 #, fuzzy
 msgid "@@undress|Undress@@"
 msgstr "@@unignore|%s tiltásának feloldása@@"
 
-#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:228
-#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:534
+#: src/gui/popupmenu.cpp:218 src/gui/popupmenu.cpp:229
+#: src/gui/popupmenu.cpp:350 src/gui/popupmenu.cpp:536
 msgid "@@buy|Buy@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:218 src/gui/popupmenu.cpp:229
-#: src/gui/popupmenu.cpp:350 src/gui/popupmenu.cpp:535
+#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:230
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:537
 #, fuzzy
 msgid "@@sell|Sell@@"
 msgstr "@@use|Bevet@@"
 
-#: src/gui/popupmenu.cpp:226
+#: src/gui/popupmenu.cpp:227
 #, fuzzy
 msgid "@@talk|Talk@@"
 msgstr "@@attack|%s megtámadása@@"
 
-#: src/gui/popupmenu.cpp:240
+#: src/gui/popupmenu.cpp:241
 #, fuzzy
 msgid "@@admin-kick|Kick@@"
 msgstr "@@admin-kick|Játékos kirúgása@@"
 
-#: src/gui/popupmenu.cpp:248 src/gui/popupmenu.cpp:353
+#: src/gui/popupmenu.cpp:249 src/gui/popupmenu.cpp:354
 #, fuzzy
 msgid "@@name|Add name to chat@@"
 msgstr "@@name|Neve hozzáadása a csevegéshez@@"
 
-#: src/gui/popupmenu.cpp:252 src/gui/popupmenu.cpp:272
-#: src/gui/popupmenu.cpp:357 src/gui/popupmenu.cpp:380
-#: src/gui/popupmenu.cpp:399 src/gui/popupmenu.cpp:412
-#: src/gui/popupmenu.cpp:430 src/gui/popupmenu.cpp:577
-#: src/gui/popupmenu.cpp:601
+#: src/gui/popupmenu.cpp:253 src/gui/popupmenu.cpp:273
+#: src/gui/popupmenu.cpp:358 src/gui/popupmenu.cpp:381
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:431 src/gui/popupmenu.cpp:579
+#: src/gui/popupmenu.cpp:603
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancel|mégse@@"
 
-#: src/gui/popupmenu.cpp:267
+#: src/gui/popupmenu.cpp:268
 #, c-format
 msgid "@@player_%u|%s >@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:375
+#: src/gui/popupmenu.cpp:376
 #, fuzzy
 msgid "@@pickup|Pick up@@"
 msgstr "@@pickup|Vedd fel a(z) %s-t@@"
 
-#: src/gui/popupmenu.cpp:376
+#: src/gui/popupmenu.cpp:377
 #, fuzzy
 msgid "@@chat|Add to chat@@"
 msgstr "@@chat|Hozzáadás a chat-hez@@"
 
-#: src/gui/popupmenu.cpp:394
+#: src/gui/popupmenu.cpp:395
 msgid "Map Item"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:395
+#: src/gui/popupmenu.cpp:396
 msgid "@@rename map|Rename@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:396
+#: src/gui/popupmenu.cpp:397
 msgid "@@remove map|Remove@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:409
+#: src/gui/popupmenu.cpp:410
 msgid "@@load old outfits|Load old outfits@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:425 src/gui/windowmenu.cpp:90
+#: src/gui/popupmenu.cpp:426 src/gui/windowmenu.cpp:90
 msgid "Spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:426
+#: src/gui/popupmenu.cpp:427
 msgid "@@load old spells|Load old spells@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:427
+#: src/gui/popupmenu.cpp:428
 #, fuzzy
 msgid "@@edit spell|Edit spell@@"
 msgstr "@@use|Bevet@@"
 
-#: src/gui/popupmenu.cpp:445
+#: src/gui/popupmenu.cpp:446
 msgid "@@chat close|Close@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:453
+#: src/gui/popupmenu.cpp:454
 #, fuzzy
 msgid "Disable highlight"
 msgstr "Kijelölt fül"
 
-#: src/gui/popupmenu.cpp:459
+#: src/gui/popupmenu.cpp:460
 #, fuzzy
 msgid "Enable highlight"
 msgstr "Kijelölt fül"
 
-#: src/gui/popupmenu.cpp:465
+#: src/gui/popupmenu.cpp:466
 msgid "@@leave party|Leave@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:585
+#: src/gui/popupmenu.cpp:587
 #, fuzzy
 msgid "Change guild position"
 msgstr "Változtatás"
 
-#: src/gui/popupmenu.cpp:598
+#: src/gui/popupmenu.cpp:600
 #, c-format
 msgid "@@guild-pos-%d|%s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:942
+#: src/gui/popupmenu.cpp:944
 msgid "Rename map sign          "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:943
+#: src/gui/popupmenu.cpp:945
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1091
+#: src/gui/popupmenu.cpp:1093
 #, fuzzy
 msgid "Store 10"
 msgstr "Raktároz"
 
-#: src/gui/popupmenu.cpp:1094
+#: src/gui/popupmenu.cpp:1096
 #, fuzzy
 msgid "Store half"
 msgstr "Raktároz"
 
-#: src/gui/popupmenu.cpp:1096
+#: src/gui/popupmenu.cpp:1098
 #, fuzzy
 msgid "Store all"
 msgstr "Raktároz"
 
-#: src/gui/popupmenu.cpp:1110
+#: src/gui/popupmenu.cpp:1112
 #, fuzzy
 msgid "Retrieve 10"
 msgstr "Magához vesz"
 
-#: src/gui/popupmenu.cpp:1113
+#: src/gui/popupmenu.cpp:1115
 #, fuzzy
 msgid "Retrieve half"
 msgstr "Magához vesz"
 
-#: src/gui/popupmenu.cpp:1115
+#: src/gui/popupmenu.cpp:1117
 #, fuzzy
 msgid "Retrieve all"
 msgstr "Magához vesz"
 
-#: src/gui/popupmenu.cpp:1118 src/gui/popupmenu.cpp:1186
-#: src/gui/popupmenu.cpp:1224
+#: src/gui/popupmenu.cpp:1120 src/gui/popupmenu.cpp:1188
+#: src/gui/popupmenu.cpp:1226
 #, fuzzy
 msgid "Add to chat"
 msgstr "@@chat|Hozzáadás a chat-hez@@"
 
-#: src/gui/popupmenu.cpp:1145 src/gui/popupmenu.cpp:1190
+#: src/gui/popupmenu.cpp:1147 src/gui/popupmenu.cpp:1192
 msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1228
+#: src/gui/popupmenu.cpp:1230
 msgid "Load old drop shortcuts"
 msgstr ""
 
@@ -3236,6 +3249,10 @@ msgstr ""
 msgid "Who Is Online - Update"
 msgstr ""
 
+#: src/gui/widgets/battletab.cpp:41
+msgid "Battle"
+msgstr ""
+
 #: src/gui/widgets/channeltab.cpp:49
 msgid "/users > Lists the users in the current channel"
 msgstr "/users > Kilistázza az aktuális csatorna felhasználóit"
@@ -3678,174 +3695,175 @@ msgstr "Következő Chat Fül"
 #: src/keyboardconfig.cpp:233 src/keyboardconfig.cpp:236
 #: src/keyboardconfig.cpp:238 src/keyboardconfig.cpp:240
 #: src/keyboardconfig.cpp:242 src/keyboardconfig.cpp:244
+#: src/keyboardconfig.cpp:246 src/keyboardconfig.cpp:248
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "Hangulatjel Gyorsmenü %d"
 
-#: src/keyboardconfig.cpp:246
+#: src/keyboardconfig.cpp:250
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:248
+#: src/keyboardconfig.cpp:252
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:250
+#: src/keyboardconfig.cpp:254
 msgid "Copy Equiped to Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:252
+#: src/keyboardconfig.cpp:256
 msgid "Toggle Chat"
 msgstr "Chat Ki/Be Kapcsolása"
 
-#: src/keyboardconfig.cpp:254
+#: src/keyboardconfig.cpp:258
 msgid "Scroll Chat Up"
 msgstr "Csevej Felfele Görgetése"
 
-#: src/keyboardconfig.cpp:256
+#: src/keyboardconfig.cpp:260
 msgid "Scroll Chat Down"
 msgstr "Csevej Lefele Görgetése"
 
-#: src/keyboardconfig.cpp:258
+#: src/keyboardconfig.cpp:262
 msgid "Previous Chat Tab"
 msgstr "Előző Chat Fül"
 
-#: src/keyboardconfig.cpp:260
+#: src/keyboardconfig.cpp:264
 msgid "Next Chat Tab"
 msgstr "Következő Chat Fül"
 
-#: src/keyboardconfig.cpp:262
+#: src/keyboardconfig.cpp:266
 #, fuzzy
 msgid "Previous chat tab line"
 msgstr "Előző Chat Fül"
 
-#: src/keyboardconfig.cpp:264
+#: src/keyboardconfig.cpp:268
 #, fuzzy
 msgid "Next chat tab line"
 msgstr "Következő Chat Fül"
 
-#: src/keyboardconfig.cpp:266
+#: src/keyboardconfig.cpp:270
 msgid "Chat Auto Complete"
 msgstr ""
 
-#: src/keyboardconfig.cpp:268
+#: src/keyboardconfig.cpp:272
 msgid "Deactivate Chat Input"
 msgstr ""
 
-#: src/keyboardconfig.cpp:270
+#: src/keyboardconfig.cpp:274
 msgid "Select OK"
 msgstr "Ok Kiválasztása"
 
-#: src/keyboardconfig.cpp:272
+#: src/keyboardconfig.cpp:276
 msgid "Ignore input 1"
 msgstr "Ignore input 1"
 
-#: src/keyboardconfig.cpp:274
+#: src/keyboardconfig.cpp:278
 msgid "Ignore input 2"
 msgstr "Ignore input 2"
 
-#: src/keyboardconfig.cpp:276
+#: src/keyboardconfig.cpp:280
 msgid "Direct Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:277
+#: src/keyboardconfig.cpp:281
 #, fuzzy
 msgid "Direct Down"
 msgstr "Mozgás lefelé"
 
-#: src/keyboardconfig.cpp:279
+#: src/keyboardconfig.cpp:283
 #, fuzzy
 msgid "Direct Left"
 msgstr "Mozgás balra"
 
-#: src/keyboardconfig.cpp:280
+#: src/keyboardconfig.cpp:284
 #, fuzzy
 msgid "Direct Right"
 msgstr "Mozgás jobbra"
 
-#: src/keyboardconfig.cpp:282
+#: src/keyboardconfig.cpp:286
 msgid "Crazy moves"
 msgstr ""
 
-#: src/keyboardconfig.cpp:284
+#: src/keyboardconfig.cpp:288
 msgid "Change Crazy Move mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:286
+#: src/keyboardconfig.cpp:290
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:288
+#: src/keyboardconfig.cpp:292
 msgid "Quick Drop N Items"
 msgstr ""
 
-#: src/keyboardconfig.cpp:290
+#: src/keyboardconfig.cpp:294
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/keyboardconfig.cpp:292
+#: src/keyboardconfig.cpp:296
 msgid "Quick heal target or self"
 msgstr ""
 
-#: src/keyboardconfig.cpp:294
+#: src/keyboardconfig.cpp:298
 msgid "Use #itenplz spell"
 msgstr ""
 
-#: src/keyboardconfig.cpp:296
+#: src/keyboardconfig.cpp:300
 msgid "Use magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboardconfig.cpp:302
 #, fuzzy
 msgid "Switch magic attack"
 msgstr "Karakter változtatása"
 
-#: src/keyboardconfig.cpp:300
+#: src/keyboardconfig.cpp:304
 #, fuzzy
 msgid "Change move type"
 msgstr "Szerver"
 
-#: src/keyboardconfig.cpp:302
+#: src/keyboardconfig.cpp:306
 msgid "Change Attack Weapon Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:304
+#: src/keyboardconfig.cpp:308
 #, fuzzy
 msgid "Change Attack Type"
 msgstr "Kijelöl és Támad"
 
-#: src/keyboardconfig.cpp:306
+#: src/keyboardconfig.cpp:310
 #, fuzzy
 msgid "Change Follow mode"
 msgstr "Jelszó módosítása"
 
-#: src/keyboardconfig.cpp:308
+#: src/keyboardconfig.cpp:312
 #, fuzzy
 msgid "Change Imitation mode"
 msgstr "Email cím módosírása"
 
-#: src/keyboardconfig.cpp:311
+#: src/keyboardconfig.cpp:315
 msgid "Disbale / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboardconfig.cpp:316
 msgid "On / Off audio"
 msgstr ""
 
-#: src/keyboardconfig.cpp:314
+#: src/keyboardconfig.cpp:318
 #, fuzzy
 msgid "Enable / Disable away mode"
 msgstr "Üzletelés Engedélyezése/Tiltása"
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboardconfig.cpp:320
 msgid "Emulate right click from keyboard"
 msgstr ""
 
-#: src/keyboardconfig.cpp:318
+#: src/keyboardconfig.cpp:322
 msgid "Toggle camera mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:380
+#: src/keyboardconfig.cpp:384
 #, fuzzy, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -4113,7 +4131,7 @@ msgstr " Nyomj Ok-t a feléledéshez"
 msgid "You Died"
 msgstr "Meghaltál."
 
-#: src/net/manaserv/charhandler.cpp:144 src/net/manaserv/charhandler.cpp:215
+#: src/net/manaserv/charhandler.cpp:144 src/net/manaserv/charhandler.cpp:218
 #, fuzzy
 msgid "Not logged in."
 msgstr "Már be van jelentkezve"
@@ -4158,7 +4176,11 @@ msgstr "Karakter statok rendben"
 msgid "At least one statis out of the permitted range: (%u - %u)."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:177 src/net/manaserv/loginhandler.cpp:98
+#: src/net/manaserv/charhandler.cpp:177
+msgid "Invalid slot number."
+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
@@ -4166,26 +4188,26 @@ msgstr ""
 msgid "Unknown error."
 msgstr "Ismeretlen hiba"
 
-#: src/net/manaserv/charhandler.cpp:206 src/net/tmwa/charserverhandler.cpp:149
+#: src/net/manaserv/charhandler.cpp:209 src/net/tmwa/charserverhandler.cpp:149
 msgid "Info"
 msgstr "Infó"
 
-#: src/net/manaserv/charhandler.cpp:206
+#: src/net/manaserv/charhandler.cpp:209
 #, fuzzy
 msgid "Player deleted."
 msgstr "Karakter törölve."
 
-#: src/net/manaserv/charhandler.cpp:218
+#: src/net/manaserv/charhandler.cpp:221
 #, fuzzy
 msgid "Selection out of range."
 msgstr "Válaszd ki mennyi tárggyal akarsz üzletelni."
 
-#: src/net/manaserv/charhandler.cpp:221
+#: src/net/manaserv/charhandler.cpp:224
 #, fuzzy, c-format
 msgid "Unknown error (%d)."
 msgstr "Ismeretlen hiba"
 
-#: src/net/manaserv/charhandler.cpp:257
+#: src/net/manaserv/charhandler.cpp:260
 msgid "No gameservers are available."
 msgstr "Nincs elérhető játékszerver."
 
@@ -4378,11 +4400,11 @@ msgstr "%s üzletelni akar veled. Te akarsz vele?"
 msgid "Trading with %s"
 msgstr "Üzlet Te és %s között"
 
-#: src/net/manaserv/tradehandler.cpp:159 src/net/tmwa/tradehandler.cpp:268
+#: src/net/manaserv/tradehandler.cpp:159 src/net/tmwa/tradehandler.cpp:273
 msgid "Trade canceled."
 msgstr "Az üzlet megszakadt."
 
-#: src/net/manaserv/tradehandler.cpp:166 src/net/tmwa/tradehandler.cpp:278
+#: src/net/manaserv/tradehandler.cpp:166 src/net/tmwa/tradehandler.cpp:283
 msgid "Trade completed."
 msgstr "Sikeres üzlet."
 
@@ -4868,11 +4890,11 @@ msgstr "A tapasztalat megosztás nem lehetséges."
 msgid "Experience sharing unknown."
 msgstr "Tapasztalat megosztás engedélyezve."
 
-#: src/net/tmwa/inventoryhandler.cpp:329
+#: src/net/tmwa/inventoryhandler.cpp:334
 msgid "Failed to use item."
 msgstr "Nem tudod bevetni a tárgyat."
 
-#: src/net/tmwa/inventoryhandler.cpp:452
+#: src/net/tmwa/inventoryhandler.cpp:457
 msgid "Unable to equip."
 msgstr "Nem tudod használni."
 
@@ -5199,7 +5221,13 @@ msgstr "Tárgy hozzáadása sikertelen. Az üzleti partner túl van terhelve."
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr "Tárgy hozzáadása sikertelen. Az üzleti partnernek nincs elég helye."
 
-#: src/net/tmwa/tradehandler.cpp:250
+#: src/net/tmwa/tradehandler.cpp:251
+#, fuzzy
+msgid "Failed adding item. You cant trade this item."
+msgstr ""
+"Hiba a tárgy hozzáadásakor. Nem tudod rárakni az egyik tárgyat a másikra."
+
+#: src/net/tmwa/tradehandler.cpp:255
 msgid "Failed adding item for unknown reason."
 msgstr "Ismeretlen okból a tárgy hozzáadása sikertelen."
 
@@ -5224,6 +5252,11 @@ msgstr ""
 msgid "Floating bubble"
 msgstr ""
 
+#: src/resources/beinginfo.cpp:32 src/resources/itemdb.cpp:210
+#: src/resources/monsterdb.cpp:78
+msgid "unnamed"
+msgstr "Névtelen"
+
 #: src/resources/itemdb.cpp:55
 #, c-format
 msgid "Attack %+d"
@@ -5248,10 +5281,6 @@ msgstr "Varázserő %+d"
 msgid "Unknown item"
 msgstr "Ismeretlen tárgy"
 
-#: src/resources/itemdb.cpp:210 src/resources/monsterdb.cpp:78
-msgid "unnamed"
-msgstr "Névtelen"
-
 #, fuzzy
 #~ msgid "Particle detail: %s"
 #~ msgstr "Effektek részletessége"
diff --git a/po/it.po b/po/it.po
index 53d8fed94..77e7e6745 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: 2010-12-24 19:29+0200\n"
+"POT-Creation-Date: 2011-01-05 04:50+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"
@@ -21,6 +21,14 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
+#: src/being.cpp:480
+msgid "dodge"
+msgstr ""
+
+#: src/being.cpp:480
+msgid "miss"
+msgstr ""
+
 #: src/client.cpp:724 src/gui/setup.cpp:47 src/gui/windowmenu.cpp:92
 msgid "Setup"
 msgstr "Impostazioni"
@@ -56,9 +64,9 @@ 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:179 src/gui/register.cpp:225
+#: src/gui/charcreatedialog.cpp:185 src/gui/register.cpp:225
 #: src/gui/serverdialog.cpp:350 src/gui/unregisterdialog.cpp:134
-#: src/net/manaserv/charhandler.cpp:180 src/net/manaserv/charhandler.cpp:223
+#: src/net/manaserv/charhandler.cpp:183 src/net/manaserv/charhandler.cpp:226
 #: src/net/tmwa/charserverhandler.cpp:137
 #: src/net/tmwa/charserverhandler.cpp:154
 msgid "Error"
@@ -655,12 +663,12 @@ msgstr "Le richieste di scambio in arrivo saranno ignorate"
 msgid "Accepting incoming trade requests"
 msgstr "Le richieste di scambio in arrivo saranno accettate"
 
-#: src/game.cpp:1373
+#: src/game.cpp:1376
 #, fuzzy
 msgid "Could Not Load Map"
 msgstr "Impossibile caricare la mappa"
 
-#: src/game.cpp:1374
+#: src/game.cpp:1377
 #, c-format
 msgid "Error while loading %s"
 msgstr "Errore durante il caricamento di %s"
@@ -738,7 +746,7 @@ 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/keyboardconfig.cpp:271
+#: src/keyboardconfig.cpp:275
 msgid "Quit"
 msgstr "Esci"
 
@@ -760,9 +768,9 @@ msgstr "Vendi"
 #: src/gui/buysell.cpp:62 src/gui/changeemaildialog.cpp:56
 #: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
 #: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:206
-#: src/gui/npcpostdialog.cpp:55 src/gui/popupmenu.cpp:1120
-#: src/gui/popupmenu.cpp:1147 src/gui/popupmenu.cpp:1192
-#: src/gui/popupmenu.cpp:1230 src/gui/quitdialog.cpp:54
+#: src/gui/npcpostdialog.cpp:55 src/gui/popupmenu.cpp:1122
+#: src/gui/popupmenu.cpp:1149 src/gui/popupmenu.cpp:1194
+#: src/gui/popupmenu.cpp:1232 src/gui/quitdialog.cpp:54
 #: src/gui/register.cpp:79 src/gui/setup.cpp:64 src/gui/socialwindow.cpp:786
 #: src/gui/textcommandeditor.cpp:231 src/gui/textdialog.cpp:44
 #: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:153
@@ -864,7 +872,7 @@ msgstr "Colore Capelli:"
 msgid "Hair style:"
 msgstr "Stile Capelli:"
 
-#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:437
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:445
 #: src/gui/socialwindow.cpp:846
 msgid "Create"
 msgstr "Crea"
@@ -877,20 +885,20 @@ msgstr "Maschio"
 msgid "Female"
 msgstr "Femmina"
 
-#: src/gui/charcreatedialog.cpp:99 src/gui/charcreatedialog.cpp:251
+#: src/gui/charcreatedialog.cpp:99 src/gui/charcreatedialog.cpp:257
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Distribuire %d punti"
 
-#: src/gui/charcreatedialog.cpp:180
+#: src/gui/charcreatedialog.cpp:186
 msgid "Your name needs to be at least 4 characters."
 msgstr "Il tuo nome deve contenere almeno 4 caratteri."
 
-#: src/gui/charcreatedialog.cpp:242
+#: src/gui/charcreatedialog.cpp:248
 msgid "Character stats OK"
 msgstr "Statistiche personaggio OK"
 
-#: src/gui/charcreatedialog.cpp:256
+#: src/gui/charcreatedialog.cpp:262
 #, c-format
 msgid "Please remove %d points"
 msgstr "Rimuovere %d punti"
@@ -921,18 +929,23 @@ msgstr "Cancella registrazione"
 msgid "Change Email"
 msgstr "Cambia l'indirizzo Email"
 
-#: src/gui/charselectdialog.cpp:367 src/gui/serverdialog.cpp:248
+#: src/gui/charselectdialog.cpp:375 src/gui/serverdialog.cpp:248
 #: src/gui/setup_players.cpp:242 src/gui/shopwindow.cpp:117
 #: src/gui/shopwindow.cpp:120 src/gui/textcommandeditor.cpp:234
 msgid "Delete"
 msgstr "Elimina"
 
-#: src/gui/charselectdialog.cpp:425
+#: src/gui/charselectdialog.cpp:433
 #, fuzzy
 msgid "Choose"
 msgstr "Chiudi"
 
-#: src/gui/charselectdialog.cpp:439 src/gui/charselectdialog.cpp:440
+#: src/gui/charselectdialog.cpp:436
+#, fuzzy, c-format
+msgid "Level %d"
+msgstr "Livello: %d"
+
+#: src/gui/charselectdialog.cpp:447 src/gui/charselectdialog.cpp:448
 msgid "(empty)"
 msgstr ""
 
@@ -1160,14 +1173,14 @@ msgstr ""
 msgid "OK"
 msgstr "OK"
 
-#: src/gui/equipmentwindow.cpp:70 src/gui/windowmenu.cpp:70
+#: src/gui/equipmentwindow.cpp:72 src/gui/windowmenu.cpp:70
 msgid "Equipment"
 msgstr "Equipaggiamento"
 
-#: src/gui/equipmentwindow.cpp:89 src/gui/inventorywindow.cpp:96
+#: src/gui/equipmentwindow.cpp:91 src/gui/inventorywindow.cpp:96
 #: src/gui/inventorywindow.cpp:393 src/gui/inventorywindow.cpp:402
-#: src/gui/popupmenu.cpp:1068 src/gui/popupmenu.cpp:1167
-#: src/gui/popupmenu.cpp:1207
+#: src/gui/popupmenu.cpp:1070 src/gui/popupmenu.cpp:1169
+#: src/gui/popupmenu.cpp:1209
 msgid "Unequip"
 msgstr "Rimuovi"
 
@@ -1193,32 +1206,32 @@ msgid "Slots:"
 msgstr "Slot:"
 
 #: src/gui/inventorywindow.cpp:94 src/gui/inventorywindow.cpp:395
-#: src/gui/inventorywindow.cpp:404 src/gui/popupmenu.cpp:1070
-#: src/gui/popupmenu.cpp:1169 src/gui/popupmenu.cpp:1209
+#: src/gui/inventorywindow.cpp:404 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:1073
-#: src/gui/popupmenu.cpp:1142 src/gui/popupmenu.cpp:1173
-#: src/gui/popupmenu.cpp:1212
+#: src/gui/inventorywindow.cpp:400 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/popupmenu.cpp:1076 src/gui/popupmenu.cpp:1177
-#: src/gui/popupmenu.cpp:1215
+#: 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:1081
-#: src/gui/popupmenu.cpp:1182 src/gui/popupmenu.cpp:1220
+#: src/gui/inventorywindow.cpp:110 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/popupmenu.cpp:408
+#: src/gui/popupmenu.cpp:409
 msgid "Outfits"
 msgstr ""
 
@@ -1227,17 +1240,17 @@ msgid "Weight:"
 msgstr "Peso:"
 
 #: src/gui/inventorywindow.cpp:133 src/gui/inventorywindow.cpp:490
-#: src/gui/popupmenu.cpp:1085 src/gui/popupmenu.cpp:1185
-#: src/gui/popupmenu.cpp:1223 src/gui/setup.cpp:65
+#: 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:1104
+#: src/gui/inventorywindow.cpp:134 src/gui/popupmenu.cpp:1106
 msgid "Retrieve"
 msgstr "Recupera"
 
-#: src/gui/inventorywindow.cpp:501 src/gui/popupmenu.cpp:1078
-#: src/gui/popupmenu.cpp:1179 src/gui/popupmenu.cpp:1217
+#: src/gui/inventorywindow.cpp:501 src/gui/popupmenu.cpp:1080
+#: src/gui/popupmenu.cpp:1181 src/gui/popupmenu.cpp:1219
 #: src/gui/windowmenu.cpp:91
 msgid "Drop"
 msgstr "Lascia"
@@ -1476,7 +1489,7 @@ msgstr "Invia"
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:447
+#: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:448
 #, fuzzy
 msgid "Clear"
 msgstr "Asta"
@@ -1520,285 +1533,285 @@ msgstr "Rimuovi"
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:116 src/gui/popupmenu.cpp:482
+#: src/gui/popupmenu.cpp:116 src/gui/popupmenu.cpp:483
 #, fuzzy
 msgid "@@trade|Trade@@"
 msgstr "@@trade|Scambia Con %s@@"
 
 #. TRANSLATORS: Attacking a player.
-#: src/gui/popupmenu.cpp:118 src/gui/popupmenu.cpp:237
-#: src/gui/popupmenu.cpp:483
+#: src/gui/popupmenu.cpp:118 src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:484
 #, fuzzy
 msgid "@@attack|Attack@@"
 msgstr "@@attack|Attacca %s@@"
 
 #. TRANSLATORS: Whispering a player.
-#: src/gui/popupmenu.cpp:120 src/gui/popupmenu.cpp:289
+#: src/gui/popupmenu.cpp:120 src/gui/popupmenu.cpp:290
 #, fuzzy
 msgid "@@whisper|Whisper@@"
 msgstr "@@usa|Usa@@"
 
-#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:487
+#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:488
 #, fuzzy
 msgid "@@heal|Heal@@"
 msgstr "@@cancel|Cancella@@"
 
-#: src/gui/popupmenu.cpp:130 src/gui/popupmenu.cpp:295
-#: src/gui/popupmenu.cpp:493
+#: src/gui/popupmenu.cpp:130 src/gui/popupmenu.cpp:296
+#: src/gui/popupmenu.cpp:494
 msgid "@@friend|Befriend@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:136
-#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:296
-#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:320
-#: src/gui/popupmenu.cpp:494 src/gui/popupmenu.cpp:499
-#: src/gui/popupmenu.cpp:517
+#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:137
+#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:297
+#: src/gui/popupmenu.cpp:303 src/gui/popupmenu.cpp:321
+#: src/gui/popupmenu.cpp:495 src/gui/popupmenu.cpp:501
+#: src/gui/popupmenu.cpp:519
 #, fuzzy
 msgid "@@disregard|Disregard@@"
 msgstr "@@disregard|Disprezza %s@@"
 
-#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:137
-#: src/gui/popupmenu.cpp:297 src/gui/popupmenu.cpp:303
-#: src/gui/popupmenu.cpp:495 src/gui/popupmenu.cpp:500
+#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:138
+#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:304
+#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:502
 #, fuzzy
 msgid "@@ignore|Ignore@@"
 msgstr "@@ignore|Ignora %s@@"
 
-#: src/gui/popupmenu.cpp:133 src/gui/popupmenu.cpp:138
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:149
-#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:304
-#: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:315
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:501
-#: src/gui/popupmenu.cpp:507 src/gui/popupmenu.cpp:512
+#: src/gui/popupmenu.cpp:133 src/gui/popupmenu.cpp:139
+#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:150
+#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:305
+#: src/gui/popupmenu.cpp:311 src/gui/popupmenu.cpp:316
+#: src/gui/popupmenu.cpp:497 src/gui/popupmenu.cpp:503
+#: src/gui/popupmenu.cpp:509 src/gui/popupmenu.cpp:514
 #, fuzzy
 msgid "@@erase|Erase@@"
 msgstr "@@usa|Usa@@"
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:148
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:308
-#: src/gui/popupmenu.cpp:314 src/gui/popupmenu.cpp:319
-#: src/gui/popupmenu.cpp:505 src/gui/popupmenu.cpp:511
-#: src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:143 src/gui/popupmenu.cpp:149
+#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:315 src/gui/popupmenu.cpp:320
+#: src/gui/popupmenu.cpp:507 src/gui/popupmenu.cpp:513
+#: src/gui/popupmenu.cpp:518
 #, fuzzy
 msgid "@@unignore|Unignore@@"
 msgstr "@@unignore|Non ignorare %s@@"
 
-#: src/gui/popupmenu.cpp:143 src/gui/popupmenu.cpp:155
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:321
-#: src/gui/popupmenu.cpp:506 src/gui/popupmenu.cpp:518
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:156
+#: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:322
+#: src/gui/popupmenu.cpp:508 src/gui/popupmenu.cpp:520
 #, fuzzy
 msgid "@@ignore|Completely ignore@@"
 msgstr "@@ignore|Ignora completamente %s@@"
 
-#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:329
-#: src/gui/popupmenu.cpp:526
+#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:330
+#: src/gui/popupmenu.cpp:528
 msgid "@@follow|Follow@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:330
-#: src/gui/popupmenu.cpp:527
+#: src/gui/popupmenu.cpp:165 src/gui/popupmenu.cpp:331
+#: src/gui/popupmenu.cpp:529
 msgid "@@imitation|Imitation@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:174 src/gui/popupmenu.cpp:546
+#: src/gui/popupmenu.cpp:175 src/gui/popupmenu.cpp:548
 #, fuzzy
 msgid "@@party|Invite to party@@"
 msgstr "/party > Invita un utente nel party"
 
-#: src/gui/popupmenu.cpp:179 src/gui/popupmenu.cpp:551
+#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:553
 #, fuzzy
 msgid "@@kick party|Kick from party@@"
 msgstr "@@admin-kick|Espelli giocatore@@"
 
-#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:337
-#: src/gui/popupmenu.cpp:565
+#: src/gui/popupmenu.cpp:195 src/gui/popupmenu.cpp:338
+#: src/gui/popupmenu.cpp:567
 #, fuzzy
 msgid "@@guild-kick|Kick from guild@@"
 msgstr "@@admin-kick|Espelli giocatore@@"
 
-#: src/gui/popupmenu.cpp:196 src/gui/popupmenu.cpp:338
-#: src/gui/popupmenu.cpp:567
+#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:339
+#: src/gui/popupmenu.cpp:569
 msgid "@@guild-pos|Change pos in guild >@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:201 src/gui/popupmenu.cpp:342
-#: src/gui/popupmenu.cpp:572
+#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:343
+#: src/gui/popupmenu.cpp:574
 #, fuzzy
 msgid "@@guild|Invite to guild@@"
 msgstr "/party > Invita un utente nel party"
 
-#: src/gui/popupmenu.cpp:208
+#: src/gui/popupmenu.cpp:209
 msgid "@@admin-kick|Kick player@@"
 msgstr "@@admin-kick|Espelli giocatore@@"
 
-#: src/gui/popupmenu.cpp:210
+#: src/gui/popupmenu.cpp:211
 msgid "@@nuke|Nuke@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:211 src/gui/popupmenu.cpp:231
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:232
+#: src/gui/popupmenu.cpp:530
 msgid "@@move|Move@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:529
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:531
 #, fuzzy
 msgid "@@undress|Undress@@"
 msgstr "@@unignore|Non ignorare %s@@"
 
-#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:228
-#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:534
+#: src/gui/popupmenu.cpp:218 src/gui/popupmenu.cpp:229
+#: src/gui/popupmenu.cpp:350 src/gui/popupmenu.cpp:536
 msgid "@@buy|Buy@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:218 src/gui/popupmenu.cpp:229
-#: src/gui/popupmenu.cpp:350 src/gui/popupmenu.cpp:535
+#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:230
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:537
 #, fuzzy
 msgid "@@sell|Sell@@"
 msgstr "@@usa|Usa@@"
 
-#: src/gui/popupmenu.cpp:226
+#: src/gui/popupmenu.cpp:227
 #, fuzzy
 msgid "@@talk|Talk@@"
 msgstr "@@attack|Attacca %s@@"
 
-#: src/gui/popupmenu.cpp:240
+#: src/gui/popupmenu.cpp:241
 #, fuzzy
 msgid "@@admin-kick|Kick@@"
 msgstr "@@admin-kick|Espelli giocatore@@"
 
-#: src/gui/popupmenu.cpp:248 src/gui/popupmenu.cpp:353
+#: src/gui/popupmenu.cpp:249 src/gui/popupmenu.cpp:354
 #, fuzzy
 msgid "@@name|Add name to chat@@"
 msgstr "@@name|Aggiungi nome alla conversazione@@"
 
-#: src/gui/popupmenu.cpp:252 src/gui/popupmenu.cpp:272
-#: src/gui/popupmenu.cpp:357 src/gui/popupmenu.cpp:380
-#: src/gui/popupmenu.cpp:399 src/gui/popupmenu.cpp:412
-#: src/gui/popupmenu.cpp:430 src/gui/popupmenu.cpp:577
-#: src/gui/popupmenu.cpp:601
+#: src/gui/popupmenu.cpp:253 src/gui/popupmenu.cpp:273
+#: src/gui/popupmenu.cpp:358 src/gui/popupmenu.cpp:381
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:431 src/gui/popupmenu.cpp:579
+#: src/gui/popupmenu.cpp:603
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancel|Cancella@@"
 
-#: src/gui/popupmenu.cpp:267
+#: src/gui/popupmenu.cpp:268
 #, c-format
 msgid "@@player_%u|%s >@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:375
+#: src/gui/popupmenu.cpp:376
 #, fuzzy
 msgid "@@pickup|Pick up@@"
 msgstr "@@pickup|Raccogli %s@@"
 
-#: src/gui/popupmenu.cpp:376
+#: src/gui/popupmenu.cpp:377
 #, fuzzy
 msgid "@@chat|Add to chat@@"
 msgstr "@@chat|Aggiungi alla chat@@"
 
-#: src/gui/popupmenu.cpp:394
+#: src/gui/popupmenu.cpp:395
 msgid "Map Item"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:395
+#: src/gui/popupmenu.cpp:396
 msgid "@@rename map|Rename@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:396
+#: src/gui/popupmenu.cpp:397
 msgid "@@remove map|Remove@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:409
+#: src/gui/popupmenu.cpp:410
 msgid "@@load old outfits|Load old outfits@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:425 src/gui/windowmenu.cpp:90
+#: src/gui/popupmenu.cpp:426 src/gui/windowmenu.cpp:90
 msgid "Spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:426
+#: src/gui/popupmenu.cpp:427
 msgid "@@load old spells|Load old spells@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:427
+#: src/gui/popupmenu.cpp:428
 #, fuzzy
 msgid "@@edit spell|Edit spell@@"
 msgstr "@@usa|Usa@@"
 
-#: src/gui/popupmenu.cpp:445
+#: src/gui/popupmenu.cpp:446
 msgid "@@chat close|Close@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:453
+#: src/gui/popupmenu.cpp:454
 #, fuzzy
 msgid "Disable highlight"
 msgstr "Evidenziazione scheda"
 
-#: src/gui/popupmenu.cpp:459
+#: src/gui/popupmenu.cpp:460
 #, fuzzy
 msgid "Enable highlight"
 msgstr "Evidenziazione scheda"
 
-#: src/gui/popupmenu.cpp:465
+#: src/gui/popupmenu.cpp:466
 msgid "@@leave party|Leave@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:585
+#: src/gui/popupmenu.cpp:587
 #, fuzzy
 msgid "Change guild position"
 msgstr "Cambia"
 
-#: src/gui/popupmenu.cpp:598
+#: src/gui/popupmenu.cpp:600
 #, c-format
 msgid "@@guild-pos-%d|%s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:942
+#: src/gui/popupmenu.cpp:944
 msgid "Rename map sign          "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:943
+#: src/gui/popupmenu.cpp:945
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1091
+#: src/gui/popupmenu.cpp:1093
 #, fuzzy
 msgid "Store 10"
 msgstr "Storage"
 
-#: src/gui/popupmenu.cpp:1094
+#: src/gui/popupmenu.cpp:1096
 msgid "Store half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1096
+#: src/gui/popupmenu.cpp:1098
 #, fuzzy
 msgid "Store all"
 msgstr "Storage"
 
-#: src/gui/popupmenu.cpp:1110
+#: src/gui/popupmenu.cpp:1112
 #, fuzzy
 msgid "Retrieve 10"
 msgstr "Recupera"
 
-#: src/gui/popupmenu.cpp:1113
+#: src/gui/popupmenu.cpp:1115
 #, fuzzy
 msgid "Retrieve half"
 msgstr "Recupera"
 
-#: src/gui/popupmenu.cpp:1115
+#: src/gui/popupmenu.cpp:1117
 #, fuzzy
 msgid "Retrieve all"
 msgstr "Recupera"
 
-#: src/gui/popupmenu.cpp:1118 src/gui/popupmenu.cpp:1186
-#: src/gui/popupmenu.cpp:1224
+#: src/gui/popupmenu.cpp:1120 src/gui/popupmenu.cpp:1188
+#: src/gui/popupmenu.cpp:1226
 #, fuzzy
 msgid "Add to chat"
 msgstr "@@chat|Aggiungi alla chat@@"
 
-#: src/gui/popupmenu.cpp:1145 src/gui/popupmenu.cpp:1190
+#: src/gui/popupmenu.cpp:1147 src/gui/popupmenu.cpp:1192
 msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1228
+#: src/gui/popupmenu.cpp:1230
 msgid "Load old drop shortcuts"
 msgstr ""
 
@@ -3232,6 +3245,10 @@ msgstr ""
 msgid "Who Is Online - Update"
 msgstr ""
 
+#: src/gui/widgets/battletab.cpp:41
+msgid "Battle"
+msgstr ""
+
 #: src/gui/widgets/channeltab.cpp:49
 msgid "/users > Lists the users in the current channel"
 msgstr "/users > Lista gli utenti nel canale corrente"
@@ -3672,174 +3689,175 @@ msgstr "Scheda Chat Successiva"
 #: src/keyboardconfig.cpp:233 src/keyboardconfig.cpp:236
 #: src/keyboardconfig.cpp:238 src/keyboardconfig.cpp:240
 #: src/keyboardconfig.cpp:242 src/keyboardconfig.cpp:244
+#: src/keyboardconfig.cpp:246 src/keyboardconfig.cpp:248
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:246
+#: src/keyboardconfig.cpp:250
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:248
+#: src/keyboardconfig.cpp:252
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:250
+#: src/keyboardconfig.cpp:254
 msgid "Copy Equiped to Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:252
+#: src/keyboardconfig.cpp:256
 msgid "Toggle Chat"
 msgstr "Attiva Chat"
 
-#: src/keyboardconfig.cpp:254
+#: src/keyboardconfig.cpp:258
 msgid "Scroll Chat Up"
 msgstr "Scorre la chat in alto"
 
-#: src/keyboardconfig.cpp:256
+#: src/keyboardconfig.cpp:260
 msgid "Scroll Chat Down"
 msgstr "Scorre la chat in basso"
 
-#: src/keyboardconfig.cpp:258
+#: src/keyboardconfig.cpp:262
 msgid "Previous Chat Tab"
 msgstr "Scheda Chat Precedente"
 
-#: src/keyboardconfig.cpp:260
+#: src/keyboardconfig.cpp:264
 msgid "Next Chat Tab"
 msgstr "Scheda Chat Successiva"
 
-#: src/keyboardconfig.cpp:262
+#: src/keyboardconfig.cpp:266
 #, fuzzy
 msgid "Previous chat tab line"
 msgstr "Scheda Chat Precedente"
 
-#: src/keyboardconfig.cpp:264
+#: src/keyboardconfig.cpp:268
 #, fuzzy
 msgid "Next chat tab line"
 msgstr "Scheda Chat Successiva"
 
-#: src/keyboardconfig.cpp:266
+#: src/keyboardconfig.cpp:270
 msgid "Chat Auto Complete"
 msgstr ""
 
-#: src/keyboardconfig.cpp:268
+#: src/keyboardconfig.cpp:272
 msgid "Deactivate Chat Input"
 msgstr ""
 
-#: src/keyboardconfig.cpp:270
+#: src/keyboardconfig.cpp:274
 msgid "Select OK"
 msgstr "Seleziona OK"
 
-#: src/keyboardconfig.cpp:272
+#: src/keyboardconfig.cpp:276
 msgid "Ignore input 1"
 msgstr "Ignora input 1"
 
-#: src/keyboardconfig.cpp:274
+#: src/keyboardconfig.cpp:278
 msgid "Ignore input 2"
 msgstr "Ignora input 2"
 
-#: src/keyboardconfig.cpp:276
+#: src/keyboardconfig.cpp:280
 msgid "Direct Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:277
+#: src/keyboardconfig.cpp:281
 #, fuzzy
 msgid "Direct Down"
 msgstr "Muoviti verso il basso"
 
-#: src/keyboardconfig.cpp:279
+#: src/keyboardconfig.cpp:283
 #, fuzzy
 msgid "Direct Left"
 msgstr "Muoviti verso sinistra"
 
-#: src/keyboardconfig.cpp:280
+#: src/keyboardconfig.cpp:284
 #, fuzzy
 msgid "Direct Right"
 msgstr "Muoviti verso destra"
 
-#: src/keyboardconfig.cpp:282
+#: src/keyboardconfig.cpp:286
 msgid "Crazy moves"
 msgstr ""
 
-#: src/keyboardconfig.cpp:284
+#: src/keyboardconfig.cpp:288
 msgid "Change Crazy Move mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:286
+#: src/keyboardconfig.cpp:290
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:288
+#: src/keyboardconfig.cpp:292
 msgid "Quick Drop N Items"
 msgstr ""
 
-#: src/keyboardconfig.cpp:290
+#: src/keyboardconfig.cpp:294
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/keyboardconfig.cpp:292
+#: src/keyboardconfig.cpp:296
 msgid "Quick heal target or self"
 msgstr ""
 
-#: src/keyboardconfig.cpp:294
+#: src/keyboardconfig.cpp:298
 msgid "Use #itenplz spell"
 msgstr ""
 
-#: src/keyboardconfig.cpp:296
+#: src/keyboardconfig.cpp:300
 msgid "Use magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboardconfig.cpp:302
 #, fuzzy
 msgid "Switch magic attack"
 msgstr "Cambia personaggio"
 
-#: src/keyboardconfig.cpp:300
+#: src/keyboardconfig.cpp:304
 #, fuzzy
 msgid "Change move type"
 msgstr "Server"
 
-#: src/keyboardconfig.cpp:302
+#: src/keyboardconfig.cpp:306
 msgid "Change Attack Weapon Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:304
+#: src/keyboardconfig.cpp:308
 #, fuzzy
 msgid "Change Attack Type"
 msgstr "Mirino e attacco"
 
-#: src/keyboardconfig.cpp:306
+#: src/keyboardconfig.cpp:310
 #, fuzzy
 msgid "Change Follow mode"
 msgstr "Cambia la Password"
 
-#: src/keyboardconfig.cpp:308
+#: src/keyboardconfig.cpp:312
 #, fuzzy
 msgid "Change Imitation mode"
 msgstr "Cambia l'indirizzo Email"
 
-#: src/keyboardconfig.cpp:311
+#: src/keyboardconfig.cpp:315
 msgid "Disbale / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboardconfig.cpp:316
 msgid "On / Off audio"
 msgstr ""
 
-#: src/keyboardconfig.cpp:314
+#: src/keyboardconfig.cpp:318
 #, fuzzy
 msgid "Enable / Disable away mode"
 msgstr "Abilita/Disabilita Scambi"
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboardconfig.cpp:320
 msgid "Emulate right click from keyboard"
 msgstr ""
 
-#: src/keyboardconfig.cpp:318
+#: src/keyboardconfig.cpp:322
 msgid "Toggle camera mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:380
+#: src/keyboardconfig.cpp:384
 #, fuzzy, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -4107,7 +4125,7 @@ msgstr ""
 msgid "You Died"
 msgstr "Sei morto"
 
-#: src/net/manaserv/charhandler.cpp:144 src/net/manaserv/charhandler.cpp:215
+#: src/net/manaserv/charhandler.cpp:144 src/net/manaserv/charhandler.cpp:218
 msgid "Not logged in."
 msgstr ""
 
@@ -4151,7 +4169,11 @@ msgstr "Statistiche personaggio OK"
 msgid "At least one statis out of the permitted range: (%u - %u)."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:177 src/net/manaserv/loginhandler.cpp:98
+#: src/net/manaserv/charhandler.cpp:177
+msgid "Invalid slot number."
+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
@@ -4159,26 +4181,26 @@ msgstr ""
 msgid "Unknown error."
 msgstr "Errore sconosciuto"
 
-#: src/net/manaserv/charhandler.cpp:206 src/net/tmwa/charserverhandler.cpp:149
+#: src/net/manaserv/charhandler.cpp:209 src/net/tmwa/charserverhandler.cpp:149
 msgid "Info"
 msgstr "Informazioni"
 
-#: src/net/manaserv/charhandler.cpp:206
+#: src/net/manaserv/charhandler.cpp:209
 #, fuzzy
 msgid "Player deleted."
 msgstr "Personaggio cancellato."
 
-#: src/net/manaserv/charhandler.cpp:218
+#: src/net/manaserv/charhandler.cpp:221
 #, fuzzy
 msgid "Selection out of range."
 msgstr "Seleziona la quantità di oggetti da scambiare."
 
-#: src/net/manaserv/charhandler.cpp:221
+#: src/net/manaserv/charhandler.cpp:224
 #, fuzzy, c-format
 msgid "Unknown error (%d)."
 msgstr "Errore sconosciuto"
 
-#: src/net/manaserv/charhandler.cpp:257
+#: src/net/manaserv/charhandler.cpp:260
 msgid "No gameservers are available."
 msgstr "Nessun gameserver è disponibile."
 
@@ -4370,11 +4392,11 @@ msgstr "%s vuole commerciare con te, accetti?"
 msgid "Trading with %s"
 msgstr "Commerciando con %s"
 
-#: src/net/manaserv/tradehandler.cpp:159 src/net/tmwa/tradehandler.cpp:268
+#: src/net/manaserv/tradehandler.cpp:159 src/net/tmwa/tradehandler.cpp:273
 msgid "Trade canceled."
 msgstr "Scambio cancellato."
 
-#: src/net/manaserv/tradehandler.cpp:166 src/net/tmwa/tradehandler.cpp:278
+#: src/net/manaserv/tradehandler.cpp:166 src/net/tmwa/tradehandler.cpp:283
 msgid "Trade completed."
 msgstr "Scambio completato."
 
@@ -4861,11 +4883,11 @@ msgstr "Impossibile condividere l'esperienza."
 msgid "Experience sharing unknown."
 msgstr "Abilitata la condivisione dell'esperienza."
 
-#: src/net/tmwa/inventoryhandler.cpp:329
+#: src/net/tmwa/inventoryhandler.cpp:334
 msgid "Failed to use item."
 msgstr ""
 
-#: src/net/tmwa/inventoryhandler.cpp:452
+#: src/net/tmwa/inventoryhandler.cpp:457
 msgid "Unable to equip."
 msgstr "Impossibile equipaggiare."
 
@@ -5190,7 +5212,14 @@ msgstr ""
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:250
+#: src/net/tmwa/tradehandler.cpp:251
+#, fuzzy
+msgid "Failed adding item. You cant trade this item."
+msgstr ""
+"Aggiunta dell'oggetto fallita. Non puoi sovrapporre un tipo di oggetto sulla "
+"finestra."
+
+#: src/net/tmwa/tradehandler.cpp:255
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
@@ -5215,6 +5244,11 @@ msgstr ""
 msgid "Floating bubble"
 msgstr ""
 
+#: src/resources/beinginfo.cpp:32 src/resources/itemdb.cpp:210
+#: src/resources/monsterdb.cpp:78
+msgid "unnamed"
+msgstr ""
+
 #: src/resources/itemdb.cpp:55
 #, c-format
 msgid "Attack %+d"
@@ -5239,10 +5273,6 @@ msgstr "PM %+d"
 msgid "Unknown item"
 msgstr "Oggetto sconosciuto"
 
-#: src/resources/itemdb.cpp:210 src/resources/monsterdb.cpp:78
-msgid "unnamed"
-msgstr ""
-
 #, fuzzy
 #~ msgid "Particle detail: %s"
 #~ msgstr "Dettagli particelle"
diff --git a/po/manaplus.pot b/po/manaplus.pot
index 43307a34b..c2676d34d 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: 2010-12-24 19:29+0200\n"
+"POT-Creation-Date: 2011-01-05 04:50+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"
@@ -18,6 +18,14 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
+#: src/being.cpp:480
+msgid "dodge"
+msgstr ""
+
+#: src/being.cpp:480
+msgid "miss"
+msgstr ""
+
 #: src/client.cpp:724 src/gui/setup.cpp:47 src/gui/windowmenu.cpp:92
 msgid "Setup"
 msgstr ""
@@ -48,9 +56,9 @@ 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:179 src/gui/register.cpp:225
+#: src/gui/charcreatedialog.cpp:185 src/gui/register.cpp:225
 #: src/gui/serverdialog.cpp:350 src/gui/unregisterdialog.cpp:134
-#: src/net/manaserv/charhandler.cpp:180 src/net/manaserv/charhandler.cpp:223
+#: src/net/manaserv/charhandler.cpp:183 src/net/manaserv/charhandler.cpp:226
 #: src/net/tmwa/charserverhandler.cpp:137
 #: src/net/tmwa/charserverhandler.cpp:154
 msgid "Error"
@@ -603,11 +611,11 @@ msgstr ""
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:1373
+#: src/game.cpp:1376
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:1374
+#: src/game.cpp:1377
 #, c-format
 msgid "Error while loading %s"
 msgstr ""
@@ -683,7 +691,7 @@ 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/keyboardconfig.cpp:271
+#: src/keyboardconfig.cpp:275
 msgid "Quit"
 msgstr ""
 
@@ -705,9 +713,9 @@ msgstr ""
 #: src/gui/buysell.cpp:62 src/gui/changeemaildialog.cpp:56
 #: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
 #: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:206
-#: src/gui/npcpostdialog.cpp:55 src/gui/popupmenu.cpp:1120
-#: src/gui/popupmenu.cpp:1147 src/gui/popupmenu.cpp:1192
-#: src/gui/popupmenu.cpp:1230 src/gui/quitdialog.cpp:54
+#: src/gui/npcpostdialog.cpp:55 src/gui/popupmenu.cpp:1122
+#: src/gui/popupmenu.cpp:1149 src/gui/popupmenu.cpp:1194
+#: src/gui/popupmenu.cpp:1232 src/gui/quitdialog.cpp:54
 #: src/gui/register.cpp:79 src/gui/setup.cpp:64 src/gui/socialwindow.cpp:786
 #: src/gui/textcommandeditor.cpp:231 src/gui/textdialog.cpp:44
 #: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:153
@@ -804,7 +812,7 @@ msgstr ""
 msgid "Hair style:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:437
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:445
 #: src/gui/socialwindow.cpp:846
 msgid "Create"
 msgstr ""
@@ -817,20 +825,20 @@ msgstr ""
 msgid "Female"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:99 src/gui/charcreatedialog.cpp:251
+#: src/gui/charcreatedialog.cpp:99 src/gui/charcreatedialog.cpp:257
 #, c-format
 msgid "Please distribute %d points"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:180
+#: src/gui/charcreatedialog.cpp:186
 msgid "Your name needs to be at least 4 characters."
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:242
+#: src/gui/charcreatedialog.cpp:248
 msgid "Character stats OK"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:256
+#: src/gui/charcreatedialog.cpp:262
 #, c-format
 msgid "Please remove %d points"
 msgstr ""
@@ -860,17 +868,22 @@ msgstr ""
 msgid "Change Email"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:367 src/gui/serverdialog.cpp:248
+#: src/gui/charselectdialog.cpp:375 src/gui/serverdialog.cpp:248
 #: src/gui/setup_players.cpp:242 src/gui/shopwindow.cpp:117
 #: src/gui/shopwindow.cpp:120 src/gui/textcommandeditor.cpp:234
 msgid "Delete"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:425
+#: src/gui/charselectdialog.cpp:433
 msgid "Choose"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:439 src/gui/charselectdialog.cpp:440
+#: src/gui/charselectdialog.cpp:436
+#, c-format
+msgid "Level %d"
+msgstr ""
+
+#: src/gui/charselectdialog.cpp:447 src/gui/charselectdialog.cpp:448
 msgid "(empty)"
 msgstr ""
 
@@ -1077,14 +1090,14 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:70 src/gui/windowmenu.cpp:70
+#: src/gui/equipmentwindow.cpp:72 src/gui/windowmenu.cpp:70
 msgid "Equipment"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:89 src/gui/inventorywindow.cpp:96
+#: src/gui/equipmentwindow.cpp:91 src/gui/inventorywindow.cpp:96
 #: src/gui/inventorywindow.cpp:393 src/gui/inventorywindow.cpp:402
-#: src/gui/popupmenu.cpp:1068 src/gui/popupmenu.cpp:1167
-#: src/gui/popupmenu.cpp:1207
+#: src/gui/popupmenu.cpp:1070 src/gui/popupmenu.cpp:1169
+#: src/gui/popupmenu.cpp:1209
 msgid "Unequip"
 msgstr ""
 
@@ -1110,31 +1123,31 @@ msgid "Slots:"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:94 src/gui/inventorywindow.cpp:395
-#: src/gui/inventorywindow.cpp:404 src/gui/popupmenu.cpp:1070
-#: src/gui/popupmenu.cpp:1169 src/gui/popupmenu.cpp:1209
+#: src/gui/inventorywindow.cpp:404 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:1073
-#: src/gui/popupmenu.cpp:1142 src/gui/popupmenu.cpp:1173
-#: src/gui/popupmenu.cpp:1212
+#: src/gui/inventorywindow.cpp:400 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/popupmenu.cpp:1076 src/gui/popupmenu.cpp:1177
-#: src/gui/popupmenu.cpp:1215
+#: 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:1081
-#: src/gui/popupmenu.cpp:1182 src/gui/popupmenu.cpp:1220
+#: src/gui/inventorywindow.cpp:110 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/popupmenu.cpp:408
+#: src/gui/popupmenu.cpp:409
 msgid "Outfits"
 msgstr ""
 
@@ -1143,17 +1156,17 @@ msgid "Weight:"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:133 src/gui/inventorywindow.cpp:490
-#: src/gui/popupmenu.cpp:1085 src/gui/popupmenu.cpp:1185
-#: src/gui/popupmenu.cpp:1223 src/gui/setup.cpp:65
+#: 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:1104
+#: src/gui/inventorywindow.cpp:134 src/gui/popupmenu.cpp:1106
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:501 src/gui/popupmenu.cpp:1078
-#: src/gui/popupmenu.cpp:1179 src/gui/popupmenu.cpp:1217
+#: src/gui/inventorywindow.cpp:501 src/gui/popupmenu.cpp:1080
+#: src/gui/popupmenu.cpp:1181 src/gui/popupmenu.cpp:1219
 #: src/gui/windowmenu.cpp:91
 msgid "Drop"
 msgstr ""
@@ -1382,7 +1395,7 @@ msgstr ""
 msgid "NPC"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:447
+#: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:448
 msgid "Clear"
 msgstr ""
 
@@ -1423,255 +1436,255 @@ msgstr ""
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:116 src/gui/popupmenu.cpp:482
+#: src/gui/popupmenu.cpp:116 src/gui/popupmenu.cpp:483
 msgid "@@trade|Trade@@"
 msgstr ""
 
 #. TRANSLATORS: Attacking a player.
-#: src/gui/popupmenu.cpp:118 src/gui/popupmenu.cpp:237
-#: src/gui/popupmenu.cpp:483
+#: src/gui/popupmenu.cpp:118 src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:484
 msgid "@@attack|Attack@@"
 msgstr ""
 
 #. TRANSLATORS: Whispering a player.
-#: src/gui/popupmenu.cpp:120 src/gui/popupmenu.cpp:289
+#: src/gui/popupmenu.cpp:120 src/gui/popupmenu.cpp:290
 msgid "@@whisper|Whisper@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:487
+#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:488
 msgid "@@heal|Heal@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:130 src/gui/popupmenu.cpp:295
-#: src/gui/popupmenu.cpp:493
+#: src/gui/popupmenu.cpp:130 src/gui/popupmenu.cpp:296
+#: src/gui/popupmenu.cpp:494
 msgid "@@friend|Befriend@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:136
-#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:296
-#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:320
-#: src/gui/popupmenu.cpp:494 src/gui/popupmenu.cpp:499
-#: src/gui/popupmenu.cpp:517
+#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:137
+#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:297
+#: src/gui/popupmenu.cpp:303 src/gui/popupmenu.cpp:321
+#: src/gui/popupmenu.cpp:495 src/gui/popupmenu.cpp:501
+#: src/gui/popupmenu.cpp:519
 msgid "@@disregard|Disregard@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:137
-#: src/gui/popupmenu.cpp:297 src/gui/popupmenu.cpp:303
-#: src/gui/popupmenu.cpp:495 src/gui/popupmenu.cpp:500
+#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:138
+#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:304
+#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:502
 msgid "@@ignore|Ignore@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:133 src/gui/popupmenu.cpp:138
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:149
-#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:304
-#: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:315
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:501
-#: src/gui/popupmenu.cpp:507 src/gui/popupmenu.cpp:512
+#: src/gui/popupmenu.cpp:133 src/gui/popupmenu.cpp:139
+#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:150
+#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:305
+#: src/gui/popupmenu.cpp:311 src/gui/popupmenu.cpp:316
+#: src/gui/popupmenu.cpp:497 src/gui/popupmenu.cpp:503
+#: src/gui/popupmenu.cpp:509 src/gui/popupmenu.cpp:514
 msgid "@@erase|Erase@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:148
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:308
-#: src/gui/popupmenu.cpp:314 src/gui/popupmenu.cpp:319
-#: src/gui/popupmenu.cpp:505 src/gui/popupmenu.cpp:511
-#: src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:143 src/gui/popupmenu.cpp:149
+#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:315 src/gui/popupmenu.cpp:320
+#: src/gui/popupmenu.cpp:507 src/gui/popupmenu.cpp:513
+#: src/gui/popupmenu.cpp:518
 msgid "@@unignore|Unignore@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:143 src/gui/popupmenu.cpp:155
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:321
-#: src/gui/popupmenu.cpp:506 src/gui/popupmenu.cpp:518
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:156
+#: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:322
+#: src/gui/popupmenu.cpp:508 src/gui/popupmenu.cpp:520
 msgid "@@ignore|Completely ignore@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:329
-#: src/gui/popupmenu.cpp:526
+#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:330
+#: src/gui/popupmenu.cpp:528
 msgid "@@follow|Follow@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:330
-#: src/gui/popupmenu.cpp:527
+#: src/gui/popupmenu.cpp:165 src/gui/popupmenu.cpp:331
+#: src/gui/popupmenu.cpp:529
 msgid "@@imitation|Imitation@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:174 src/gui/popupmenu.cpp:546
+#: src/gui/popupmenu.cpp:175 src/gui/popupmenu.cpp:548
 msgid "@@party|Invite to party@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:179 src/gui/popupmenu.cpp:551
+#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:553
 msgid "@@kick party|Kick from party@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:337
-#: src/gui/popupmenu.cpp:565
+#: src/gui/popupmenu.cpp:195 src/gui/popupmenu.cpp:338
+#: src/gui/popupmenu.cpp:567
 msgid "@@guild-kick|Kick from guild@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:196 src/gui/popupmenu.cpp:338
-#: src/gui/popupmenu.cpp:567
+#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:339
+#: src/gui/popupmenu.cpp:569
 msgid "@@guild-pos|Change pos in guild >@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:201 src/gui/popupmenu.cpp:342
-#: src/gui/popupmenu.cpp:572
+#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:343
+#: src/gui/popupmenu.cpp:574
 msgid "@@guild|Invite to guild@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:208
+#: src/gui/popupmenu.cpp:209
 msgid "@@admin-kick|Kick player@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:210
+#: src/gui/popupmenu.cpp:211
 msgid "@@nuke|Nuke@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:211 src/gui/popupmenu.cpp:231
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:232
+#: src/gui/popupmenu.cpp:530
 msgid "@@move|Move@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:529
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:531
 msgid "@@undress|Undress@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:228
-#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:534
+#: src/gui/popupmenu.cpp:218 src/gui/popupmenu.cpp:229
+#: src/gui/popupmenu.cpp:350 src/gui/popupmenu.cpp:536
 msgid "@@buy|Buy@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:218 src/gui/popupmenu.cpp:229
-#: src/gui/popupmenu.cpp:350 src/gui/popupmenu.cpp:535
+#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:230
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:537
 msgid "@@sell|Sell@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:226
+#: src/gui/popupmenu.cpp:227
 msgid "@@talk|Talk@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:240
+#: src/gui/popupmenu.cpp:241
 msgid "@@admin-kick|Kick@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:248 src/gui/popupmenu.cpp:353
+#: src/gui/popupmenu.cpp:249 src/gui/popupmenu.cpp:354
 msgid "@@name|Add name to chat@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:252 src/gui/popupmenu.cpp:272
-#: src/gui/popupmenu.cpp:357 src/gui/popupmenu.cpp:380
-#: src/gui/popupmenu.cpp:399 src/gui/popupmenu.cpp:412
-#: src/gui/popupmenu.cpp:430 src/gui/popupmenu.cpp:577
-#: src/gui/popupmenu.cpp:601
+#: src/gui/popupmenu.cpp:253 src/gui/popupmenu.cpp:273
+#: src/gui/popupmenu.cpp:358 src/gui/popupmenu.cpp:381
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:431 src/gui/popupmenu.cpp:579
+#: src/gui/popupmenu.cpp:603
 msgid "@@cancel|Cancel@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:267
+#: src/gui/popupmenu.cpp:268
 #, c-format
 msgid "@@player_%u|%s >@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:375
+#: src/gui/popupmenu.cpp:376
 msgid "@@pickup|Pick up@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:376
+#: src/gui/popupmenu.cpp:377
 msgid "@@chat|Add to chat@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:394
+#: src/gui/popupmenu.cpp:395
 msgid "Map Item"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:395
+#: src/gui/popupmenu.cpp:396
 msgid "@@rename map|Rename@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:396
+#: src/gui/popupmenu.cpp:397
 msgid "@@remove map|Remove@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:409
+#: src/gui/popupmenu.cpp:410
 msgid "@@load old outfits|Load old outfits@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:425 src/gui/windowmenu.cpp:90
+#: src/gui/popupmenu.cpp:426 src/gui/windowmenu.cpp:90
 msgid "Spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:426
+#: src/gui/popupmenu.cpp:427
 msgid "@@load old spells|Load old spells@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:427
+#: src/gui/popupmenu.cpp:428
 msgid "@@edit spell|Edit spell@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:445
+#: src/gui/popupmenu.cpp:446
 msgid "@@chat close|Close@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:453
+#: src/gui/popupmenu.cpp:454
 msgid "Disable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:459
+#: src/gui/popupmenu.cpp:460
 msgid "Enable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:465
+#: src/gui/popupmenu.cpp:466
 msgid "@@leave party|Leave@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:585
+#: src/gui/popupmenu.cpp:587
 msgid "Change guild position"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:598
+#: src/gui/popupmenu.cpp:600
 #, c-format
 msgid "@@guild-pos-%d|%s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:942
+#: src/gui/popupmenu.cpp:944
 msgid "Rename map sign          "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:943
+#: src/gui/popupmenu.cpp:945
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1091
+#: src/gui/popupmenu.cpp:1093
 msgid "Store 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1094
+#: src/gui/popupmenu.cpp:1096
 msgid "Store half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1096
+#: src/gui/popupmenu.cpp:1098
 msgid "Store all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1110
+#: src/gui/popupmenu.cpp:1112
 msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1113
+#: src/gui/popupmenu.cpp:1115
 msgid "Retrieve half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1115
+#: src/gui/popupmenu.cpp:1117
 msgid "Retrieve all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1118 src/gui/popupmenu.cpp:1186
-#: src/gui/popupmenu.cpp:1224
+#: src/gui/popupmenu.cpp:1120 src/gui/popupmenu.cpp:1188
+#: src/gui/popupmenu.cpp:1226
 msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1145 src/gui/popupmenu.cpp:1190
+#: src/gui/popupmenu.cpp:1147 src/gui/popupmenu.cpp:1192
 msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1228
+#: src/gui/popupmenu.cpp:1230
 msgid "Load old drop shortcuts"
 msgstr ""
 
@@ -3010,6 +3023,10 @@ msgstr ""
 msgid "Who Is Online - Update"
 msgstr ""
 
+#: src/gui/widgets/battletab.cpp:41
+msgid "Battle"
+msgstr ""
+
 #: src/gui/widgets/channeltab.cpp:49
 msgid "/users > Lists the users in the current channel"
 msgstr ""
@@ -3427,163 +3444,164 @@ msgstr ""
 #: src/keyboardconfig.cpp:233 src/keyboardconfig.cpp:236
 #: src/keyboardconfig.cpp:238 src/keyboardconfig.cpp:240
 #: src/keyboardconfig.cpp:242 src/keyboardconfig.cpp:244
+#: src/keyboardconfig.cpp:246 src/keyboardconfig.cpp:248
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:246
+#: src/keyboardconfig.cpp:250
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:248
+#: src/keyboardconfig.cpp:252
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:250
+#: src/keyboardconfig.cpp:254
 msgid "Copy Equiped to Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:252
+#: src/keyboardconfig.cpp:256
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:254
+#: src/keyboardconfig.cpp:258
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:256
+#: src/keyboardconfig.cpp:260
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:258
+#: src/keyboardconfig.cpp:262
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:260
+#: src/keyboardconfig.cpp:264
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:262
+#: src/keyboardconfig.cpp:266
 msgid "Previous chat tab line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:264
+#: src/keyboardconfig.cpp:268
 msgid "Next chat tab line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:266
+#: src/keyboardconfig.cpp:270
 msgid "Chat Auto Complete"
 msgstr ""
 
-#: src/keyboardconfig.cpp:268
+#: src/keyboardconfig.cpp:272
 msgid "Deactivate Chat Input"
 msgstr ""
 
-#: src/keyboardconfig.cpp:270
+#: src/keyboardconfig.cpp:274
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:272
+#: src/keyboardconfig.cpp:276
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:274
+#: src/keyboardconfig.cpp:278
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:276
+#: src/keyboardconfig.cpp:280
 msgid "Direct Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:277
+#: src/keyboardconfig.cpp:281
 msgid "Direct Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:279
+#: src/keyboardconfig.cpp:283
 msgid "Direct Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:280
+#: src/keyboardconfig.cpp:284
 msgid "Direct Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:282
+#: src/keyboardconfig.cpp:286
 msgid "Crazy moves"
 msgstr ""
 
-#: src/keyboardconfig.cpp:284
+#: src/keyboardconfig.cpp:288
 msgid "Change Crazy Move mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:286
+#: src/keyboardconfig.cpp:290
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:288
+#: src/keyboardconfig.cpp:292
 msgid "Quick Drop N Items"
 msgstr ""
 
-#: src/keyboardconfig.cpp:290
+#: src/keyboardconfig.cpp:294
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/keyboardconfig.cpp:292
+#: src/keyboardconfig.cpp:296
 msgid "Quick heal target or self"
 msgstr ""
 
-#: src/keyboardconfig.cpp:294
+#: src/keyboardconfig.cpp:298
 msgid "Use #itenplz spell"
 msgstr ""
 
-#: src/keyboardconfig.cpp:296
+#: src/keyboardconfig.cpp:300
 msgid "Use magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboardconfig.cpp:302
 msgid "Switch magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:300
+#: src/keyboardconfig.cpp:304
 msgid "Change move type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:302
+#: src/keyboardconfig.cpp:306
 msgid "Change Attack Weapon Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:304
+#: src/keyboardconfig.cpp:308
 msgid "Change Attack Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:306
+#: src/keyboardconfig.cpp:310
 msgid "Change Follow mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:308
+#: src/keyboardconfig.cpp:312
 msgid "Change Imitation mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:311
+#: src/keyboardconfig.cpp:315
 msgid "Disbale / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboardconfig.cpp:316
 msgid "On / Off audio"
 msgstr ""
 
-#: src/keyboardconfig.cpp:314
+#: src/keyboardconfig.cpp:318
 msgid "Enable / Disable away mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboardconfig.cpp:320
 msgid "Emulate right click from keyboard"
 msgstr ""
 
-#: src/keyboardconfig.cpp:318
+#: src/keyboardconfig.cpp:322
 msgid "Toggle camera mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:380
+#: src/keyboardconfig.cpp:384
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -3826,7 +3844,7 @@ msgstr ""
 msgid "You Died"
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:144 src/net/manaserv/charhandler.cpp:215
+#: src/net/manaserv/charhandler.cpp:144 src/net/manaserv/charhandler.cpp:218
 msgid "Not logged in."
 msgstr ""
 
@@ -3867,31 +3885,35 @@ msgstr ""
 msgid "At least one statis out of the permitted range: (%u - %u)."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:177 src/net/manaserv/loginhandler.cpp:98
+#: src/net/manaserv/charhandler.cpp:177
+msgid "Invalid slot number."
+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
 msgid "Unknown error."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:206 src/net/tmwa/charserverhandler.cpp:149
+#: src/net/manaserv/charhandler.cpp:209 src/net/tmwa/charserverhandler.cpp:149
 msgid "Info"
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:206
+#: src/net/manaserv/charhandler.cpp:209
 msgid "Player deleted."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:218
+#: src/net/manaserv/charhandler.cpp:221
 msgid "Selection out of range."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:221
+#: src/net/manaserv/charhandler.cpp:224
 #, c-format
 msgid "Unknown error (%d)."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:257
+#: src/net/manaserv/charhandler.cpp:260
 msgid "No gameservers are available."
 msgstr ""
 
@@ -4066,11 +4088,11 @@ msgstr ""
 msgid "Trading with %s"
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:159 src/net/tmwa/tradehandler.cpp:268
+#: src/net/manaserv/tradehandler.cpp:159 src/net/tmwa/tradehandler.cpp:273
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:166 src/net/tmwa/tradehandler.cpp:278
+#: src/net/manaserv/tradehandler.cpp:166 src/net/tmwa/tradehandler.cpp:283
 msgid "Trade completed."
 msgstr ""
 
@@ -4520,11 +4542,11 @@ msgstr ""
 msgid "Experience sharing unknown."
 msgstr ""
 
-#: src/net/tmwa/inventoryhandler.cpp:329
+#: src/net/tmwa/inventoryhandler.cpp:334
 msgid "Failed to use item."
 msgstr ""
 
-#: src/net/tmwa/inventoryhandler.cpp:452
+#: src/net/tmwa/inventoryhandler.cpp:457
 msgid "Unable to equip."
 msgstr ""
 
@@ -4836,7 +4858,11 @@ msgstr ""
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:250
+#: src/net/tmwa/tradehandler.cpp:251
+msgid "Failed adding item. You cant trade this item."
+msgstr ""
+
+#: src/net/tmwa/tradehandler.cpp:255
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
@@ -4860,6 +4886,11 @@ msgstr ""
 msgid "Floating bubble"
 msgstr ""
 
+#: src/resources/beinginfo.cpp:32 src/resources/itemdb.cpp:210
+#: src/resources/monsterdb.cpp:78
+msgid "unnamed"
+msgstr ""
+
 #: src/resources/itemdb.cpp:55
 #, c-format
 msgid "Attack %+d"
@@ -4883,7 +4914,3 @@ msgstr ""
 #: src/resources/itemdb.cpp:155
 msgid "Unknown item"
 msgstr ""
-
-#: src/resources/itemdb.cpp:210 src/resources/monsterdb.cpp:78
-msgid "unnamed"
-msgstr ""
diff --git a/po/nl.po b/po/nl.po
index 335e0c991..8644f5e48 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: 2010-12-24 19:29+0200\n"
+"POT-Creation-Date: 2011-01-05 04:50+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"
@@ -19,6 +19,14 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
+#: src/being.cpp:480
+msgid "dodge"
+msgstr ""
+
+#: src/being.cpp:480
+msgid "miss"
+msgstr ""
+
 #: src/client.cpp:724 src/gui/setup.cpp:47 src/gui/windowmenu.cpp:92
 msgid "Setup"
 msgstr "Configureren"
@@ -54,9 +62,9 @@ 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:179 src/gui/register.cpp:225
+#: src/gui/charcreatedialog.cpp:185 src/gui/register.cpp:225
 #: src/gui/serverdialog.cpp:350 src/gui/unregisterdialog.cpp:134
-#: src/net/manaserv/charhandler.cpp:180 src/net/manaserv/charhandler.cpp:223
+#: src/net/manaserv/charhandler.cpp:183 src/net/manaserv/charhandler.cpp:226
 #: src/net/tmwa/charserverhandler.cpp:137
 #: src/net/tmwa/charserverhandler.cpp:154
 msgid "Error"
@@ -652,12 +660,12 @@ msgstr "Inkomende handelsaanvragen negeren"
 msgid "Accepting incoming trade requests"
 msgstr "Inkomende handelsaanvragen accepteren"
 
-#: src/game.cpp:1373
+#: src/game.cpp:1376
 #, fuzzy
 msgid "Could Not Load Map"
 msgstr "Kan de map niet laden"
 
-#: src/game.cpp:1374
+#: src/game.cpp:1377
 #, c-format
 msgid "Error while loading %s"
 msgstr "Fout bij het laden van %s"
@@ -735,7 +743,7 @@ 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/keyboardconfig.cpp:271
+#: src/keyboardconfig.cpp:275
 msgid "Quit"
 msgstr "Afsluiten"
 
@@ -757,9 +765,9 @@ msgstr "Verkopen"
 #: src/gui/buysell.cpp:62 src/gui/changeemaildialog.cpp:56
 #: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
 #: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:206
-#: src/gui/npcpostdialog.cpp:55 src/gui/popupmenu.cpp:1120
-#: src/gui/popupmenu.cpp:1147 src/gui/popupmenu.cpp:1192
-#: src/gui/popupmenu.cpp:1230 src/gui/quitdialog.cpp:54
+#: src/gui/npcpostdialog.cpp:55 src/gui/popupmenu.cpp:1122
+#: src/gui/popupmenu.cpp:1149 src/gui/popupmenu.cpp:1194
+#: src/gui/popupmenu.cpp:1232 src/gui/quitdialog.cpp:54
 #: src/gui/register.cpp:79 src/gui/setup.cpp:64 src/gui/socialwindow.cpp:786
 #: src/gui/textcommandeditor.cpp:231 src/gui/textdialog.cpp:44
 #: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:153
@@ -861,7 +869,7 @@ msgstr "Haarkleur:"
 msgid "Hair style:"
 msgstr "Haarstijl:"
 
-#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:437
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:445
 #: src/gui/socialwindow.cpp:846
 msgid "Create"
 msgstr "Aanmaken"
@@ -874,20 +882,20 @@ msgstr "Mannelijk"
 msgid "Female"
 msgstr "Vrouwelijk"
 
-#: src/gui/charcreatedialog.cpp:99 src/gui/charcreatedialog.cpp:251
+#: src/gui/charcreatedialog.cpp:99 src/gui/charcreatedialog.cpp:257
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Nog %d punten te verdelen"
 
-#: src/gui/charcreatedialog.cpp:180
+#: src/gui/charcreatedialog.cpp:186
 msgid "Your name needs to be at least 4 characters."
 msgstr "Je naam moet uit tenminste 4 tekens bestaan"
 
-#: src/gui/charcreatedialog.cpp:242
+#: src/gui/charcreatedialog.cpp:248
 msgid "Character stats OK"
 msgstr "Attributen van personage OK"
 
-#: src/gui/charcreatedialog.cpp:256
+#: src/gui/charcreatedialog.cpp:262
 #, c-format
 msgid "Please remove %d points"
 msgstr "Verwijder alstublieft %d punten"
@@ -918,18 +926,23 @@ msgstr "Registreren"
 msgid "Change Email"
 msgstr "Emailadres wijzigen"
 
-#: src/gui/charselectdialog.cpp:367 src/gui/serverdialog.cpp:248
+#: src/gui/charselectdialog.cpp:375 src/gui/serverdialog.cpp:248
 #: src/gui/setup_players.cpp:242 src/gui/shopwindow.cpp:117
 #: src/gui/shopwindow.cpp:120 src/gui/textcommandeditor.cpp:234
 msgid "Delete"
 msgstr "Verwijderen"
 
-#: src/gui/charselectdialog.cpp:425
+#: src/gui/charselectdialog.cpp:433
 #, fuzzy
 msgid "Choose"
 msgstr "Sluiten"
 
-#: src/gui/charselectdialog.cpp:439 src/gui/charselectdialog.cpp:440
+#: src/gui/charselectdialog.cpp:436
+#, fuzzy, c-format
+msgid "Level %d"
+msgstr "Level: %d"
+
+#: src/gui/charselectdialog.cpp:447 src/gui/charselectdialog.cpp:448
 msgid "(empty)"
 msgstr ""
 
@@ -1157,14 +1170,14 @@ msgstr ""
 msgid "OK"
 msgstr "OK"
 
-#: src/gui/equipmentwindow.cpp:70 src/gui/windowmenu.cpp:70
+#: src/gui/equipmentwindow.cpp:72 src/gui/windowmenu.cpp:70
 msgid "Equipment"
 msgstr "Uitrusting"
 
-#: src/gui/equipmentwindow.cpp:89 src/gui/inventorywindow.cpp:96
+#: src/gui/equipmentwindow.cpp:91 src/gui/inventorywindow.cpp:96
 #: src/gui/inventorywindow.cpp:393 src/gui/inventorywindow.cpp:402
-#: src/gui/popupmenu.cpp:1068 src/gui/popupmenu.cpp:1167
-#: src/gui/popupmenu.cpp:1207
+#: src/gui/popupmenu.cpp:1070 src/gui/popupmenu.cpp:1169
+#: src/gui/popupmenu.cpp:1209
 msgid "Unequip"
 msgstr "Afdoen"
 
@@ -1190,32 +1203,32 @@ msgid "Slots:"
 msgstr "Sloten:"
 
 #: src/gui/inventorywindow.cpp:94 src/gui/inventorywindow.cpp:395
-#: src/gui/inventorywindow.cpp:404 src/gui/popupmenu.cpp:1070
-#: src/gui/popupmenu.cpp:1169 src/gui/popupmenu.cpp:1209
+#: src/gui/inventorywindow.cpp:404 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:1073
-#: src/gui/popupmenu.cpp:1142 src/gui/popupmenu.cpp:1173
-#: src/gui/popupmenu.cpp:1212
+#: src/gui/inventorywindow.cpp:400 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/popupmenu.cpp:1076 src/gui/popupmenu.cpp:1177
-#: src/gui/popupmenu.cpp:1215
+#: 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:1081
-#: src/gui/popupmenu.cpp:1182 src/gui/popupmenu.cpp:1220
+#: src/gui/inventorywindow.cpp:110 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/popupmenu.cpp:408
+#: src/gui/popupmenu.cpp:409
 msgid "Outfits"
 msgstr ""
 
@@ -1224,17 +1237,17 @@ msgid "Weight:"
 msgstr "Gewicht:"
 
 #: src/gui/inventorywindow.cpp:133 src/gui/inventorywindow.cpp:490
-#: src/gui/popupmenu.cpp:1085 src/gui/popupmenu.cpp:1185
-#: src/gui/popupmenu.cpp:1223 src/gui/setup.cpp:65
+#: 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:1104
+#: src/gui/inventorywindow.cpp:134 src/gui/popupmenu.cpp:1106
 msgid "Retrieve"
 msgstr "Afhalen"
 
-#: src/gui/inventorywindow.cpp:501 src/gui/popupmenu.cpp:1078
-#: src/gui/popupmenu.cpp:1179 src/gui/popupmenu.cpp:1217
+#: src/gui/inventorywindow.cpp:501 src/gui/popupmenu.cpp:1080
+#: src/gui/popupmenu.cpp:1181 src/gui/popupmenu.cpp:1219
 #: src/gui/windowmenu.cpp:91
 msgid "Drop"
 msgstr "Neerleggen"
@@ -1473,7 +1486,7 @@ msgstr "Indienen"
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:447
+#: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:448
 #, fuzzy
 msgid "Clear"
 msgstr "Sluiten"
@@ -1517,276 +1530,276 @@ msgstr "Afdoen"
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:116 src/gui/popupmenu.cpp:482
+#: src/gui/popupmenu.cpp:116 src/gui/popupmenu.cpp:483
 #, fuzzy
 msgid "@@trade|Trade@@"
 msgstr "@@trade|Handelen met %s@@"
 
 #. TRANSLATORS: Attacking a player.
-#: src/gui/popupmenu.cpp:118 src/gui/popupmenu.cpp:237
-#: src/gui/popupmenu.cpp:483
+#: src/gui/popupmenu.cpp:118 src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:484
 #, fuzzy
 msgid "@@attack|Attack@@"
 msgstr "@@attack|%s aanvallen@@"
 
 #. TRANSLATORS: Whispering a player.
-#: src/gui/popupmenu.cpp:120 src/gui/popupmenu.cpp:289
+#: src/gui/popupmenu.cpp:120 src/gui/popupmenu.cpp:290
 #, fuzzy
 msgid "@@whisper|Whisper@@"
 msgstr "@@use|Gebruiken@@"
 
-#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:487
+#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:488
 #, fuzzy
 msgid "@@heal|Heal@@"
 msgstr "@@cancel|Annuleren@@"
 
-#: src/gui/popupmenu.cpp:130 src/gui/popupmenu.cpp:295
-#: src/gui/popupmenu.cpp:493
+#: src/gui/popupmenu.cpp:130 src/gui/popupmenu.cpp:296
+#: src/gui/popupmenu.cpp:494
 msgid "@@friend|Befriend@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:136
-#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:296
-#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:320
-#: src/gui/popupmenu.cpp:494 src/gui/popupmenu.cpp:499
-#: src/gui/popupmenu.cpp:517
+#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:137
+#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:297
+#: src/gui/popupmenu.cpp:303 src/gui/popupmenu.cpp:321
+#: src/gui/popupmenu.cpp:495 src/gui/popupmenu.cpp:501
+#: src/gui/popupmenu.cpp:519
 msgid "@@disregard|Disregard@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:137
-#: src/gui/popupmenu.cpp:297 src/gui/popupmenu.cpp:303
-#: src/gui/popupmenu.cpp:495 src/gui/popupmenu.cpp:500
+#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:138
+#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:304
+#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:502
 msgid "@@ignore|Ignore@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:133 src/gui/popupmenu.cpp:138
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:149
-#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:304
-#: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:315
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:501
-#: src/gui/popupmenu.cpp:507 src/gui/popupmenu.cpp:512
+#: src/gui/popupmenu.cpp:133 src/gui/popupmenu.cpp:139
+#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:150
+#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:305
+#: src/gui/popupmenu.cpp:311 src/gui/popupmenu.cpp:316
+#: src/gui/popupmenu.cpp:497 src/gui/popupmenu.cpp:503
+#: src/gui/popupmenu.cpp:509 src/gui/popupmenu.cpp:514
 #, fuzzy
 msgid "@@erase|Erase@@"
 msgstr "@@use|Gebruiken@@"
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:148
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:308
-#: src/gui/popupmenu.cpp:314 src/gui/popupmenu.cpp:319
-#: src/gui/popupmenu.cpp:505 src/gui/popupmenu.cpp:511
-#: src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:143 src/gui/popupmenu.cpp:149
+#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:315 src/gui/popupmenu.cpp:320
+#: src/gui/popupmenu.cpp:507 src/gui/popupmenu.cpp:513
+#: src/gui/popupmenu.cpp:518
 msgid "@@unignore|Unignore@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:143 src/gui/popupmenu.cpp:155
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:321
-#: src/gui/popupmenu.cpp:506 src/gui/popupmenu.cpp:518
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:156
+#: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:322
+#: src/gui/popupmenu.cpp:508 src/gui/popupmenu.cpp:520
 #, fuzzy
 msgid "@@ignore|Completely ignore@@"
 msgstr "Voltooid"
 
-#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:329
-#: src/gui/popupmenu.cpp:526
+#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:330
+#: src/gui/popupmenu.cpp:528
 msgid "@@follow|Follow@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:330
-#: src/gui/popupmenu.cpp:527
+#: src/gui/popupmenu.cpp:165 src/gui/popupmenu.cpp:331
+#: src/gui/popupmenu.cpp:529
 msgid "@@imitation|Imitation@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:174 src/gui/popupmenu.cpp:546
+#: src/gui/popupmenu.cpp:175 src/gui/popupmenu.cpp:548
 #, fuzzy
 msgid "@@party|Invite to party@@"
 msgstr "/party > Een gebruiker uitnodigen in de groep"
 
-#: src/gui/popupmenu.cpp:179 src/gui/popupmenu.cpp:551
+#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:553
 msgid "@@kick party|Kick from party@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:337
-#: src/gui/popupmenu.cpp:565
+#: src/gui/popupmenu.cpp:195 src/gui/popupmenu.cpp:338
+#: src/gui/popupmenu.cpp:567
 msgid "@@guild-kick|Kick from guild@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:196 src/gui/popupmenu.cpp:338
-#: src/gui/popupmenu.cpp:567
+#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:339
+#: src/gui/popupmenu.cpp:569
 msgid "@@guild-pos|Change pos in guild >@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:201 src/gui/popupmenu.cpp:342
-#: src/gui/popupmenu.cpp:572
+#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:343
+#: src/gui/popupmenu.cpp:574
 #, fuzzy
 msgid "@@guild|Invite to guild@@"
 msgstr "/party > Een gebruiker uitnodigen in de groep"
 
-#: src/gui/popupmenu.cpp:208
+#: src/gui/popupmenu.cpp:209
 msgid "@@admin-kick|Kick player@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:210
+#: src/gui/popupmenu.cpp:211
 msgid "@@nuke|Nuke@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:211 src/gui/popupmenu.cpp:231
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:232
+#: src/gui/popupmenu.cpp:530
 msgid "@@move|Move@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:529
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:531
 msgid "@@undress|Undress@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:228
-#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:534
+#: src/gui/popupmenu.cpp:218 src/gui/popupmenu.cpp:229
+#: src/gui/popupmenu.cpp:350 src/gui/popupmenu.cpp:536
 msgid "@@buy|Buy@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:218 src/gui/popupmenu.cpp:229
-#: src/gui/popupmenu.cpp:350 src/gui/popupmenu.cpp:535
+#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:230
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:537
 #, fuzzy
 msgid "@@sell|Sell@@"
 msgstr "@@use|Gebruiken@@"
 
-#: src/gui/popupmenu.cpp:226
+#: src/gui/popupmenu.cpp:227
 #, fuzzy
 msgid "@@talk|Talk@@"
 msgstr "@@attack|%s aanvallen@@"
 
-#: src/gui/popupmenu.cpp:240
+#: src/gui/popupmenu.cpp:241
 msgid "@@admin-kick|Kick@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:248 src/gui/popupmenu.cpp:353
+#: src/gui/popupmenu.cpp:249 src/gui/popupmenu.cpp:354
 msgid "@@name|Add name to chat@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:252 src/gui/popupmenu.cpp:272
-#: src/gui/popupmenu.cpp:357 src/gui/popupmenu.cpp:380
-#: src/gui/popupmenu.cpp:399 src/gui/popupmenu.cpp:412
-#: src/gui/popupmenu.cpp:430 src/gui/popupmenu.cpp:577
-#: src/gui/popupmenu.cpp:601
+#: src/gui/popupmenu.cpp:253 src/gui/popupmenu.cpp:273
+#: src/gui/popupmenu.cpp:358 src/gui/popupmenu.cpp:381
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:431 src/gui/popupmenu.cpp:579
+#: src/gui/popupmenu.cpp:603
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancel|Annuleren@@"
 
-#: src/gui/popupmenu.cpp:267
+#: src/gui/popupmenu.cpp:268
 #, c-format
 msgid "@@player_%u|%s >@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:375
+#: src/gui/popupmenu.cpp:376
 #, fuzzy
 msgid "@@pickup|Pick up@@"
 msgstr "@@pickup|%s oppakken@@"
 
-#: src/gui/popupmenu.cpp:376
+#: src/gui/popupmenu.cpp:377
 msgid "@@chat|Add to chat@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:394
+#: src/gui/popupmenu.cpp:395
 msgid "Map Item"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:395
+#: src/gui/popupmenu.cpp:396
 msgid "@@rename map|Rename@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:396
+#: src/gui/popupmenu.cpp:397
 msgid "@@remove map|Remove@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:409
+#: src/gui/popupmenu.cpp:410
 msgid "@@load old outfits|Load old outfits@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:425 src/gui/windowmenu.cpp:90
+#: src/gui/popupmenu.cpp:426 src/gui/windowmenu.cpp:90
 msgid "Spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:426
+#: src/gui/popupmenu.cpp:427
 msgid "@@load old spells|Load old spells@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:427
+#: src/gui/popupmenu.cpp:428
 #, fuzzy
 msgid "@@edit spell|Edit spell@@"
 msgstr "@@use|Gebruiken@@"
 
-#: src/gui/popupmenu.cpp:445
+#: src/gui/popupmenu.cpp:446
 msgid "@@chat close|Close@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:453
+#: src/gui/popupmenu.cpp:454
 #, fuzzy
 msgid "Disable highlight"
 msgstr "Tab Accentuering"
 
-#: src/gui/popupmenu.cpp:459
+#: src/gui/popupmenu.cpp:460
 #, fuzzy
 msgid "Enable highlight"
 msgstr "Tab Accentuering"
 
-#: src/gui/popupmenu.cpp:465
+#: src/gui/popupmenu.cpp:466
 msgid "@@leave party|Leave@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:585
+#: src/gui/popupmenu.cpp:587
 #, fuzzy
 msgid "Change guild position"
 msgstr "Veranderen"
 
-#: src/gui/popupmenu.cpp:598
+#: src/gui/popupmenu.cpp:600
 #, c-format
 msgid "@@guild-pos-%d|%s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:942
+#: src/gui/popupmenu.cpp:944
 msgid "Rename map sign          "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:943
+#: src/gui/popupmenu.cpp:945
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1091
+#: src/gui/popupmenu.cpp:1093
 #, fuzzy
 msgid "Store 10"
 msgstr "Opslaan"
 
-#: src/gui/popupmenu.cpp:1094
+#: src/gui/popupmenu.cpp:1096
 #, fuzzy
 msgid "Store half"
 msgstr "Opslaan"
 
-#: src/gui/popupmenu.cpp:1096
+#: src/gui/popupmenu.cpp:1098
 #, fuzzy
 msgid "Store all"
 msgstr "Opslaan"
 
-#: src/gui/popupmenu.cpp:1110
+#: src/gui/popupmenu.cpp:1112
 #, fuzzy
 msgid "Retrieve 10"
 msgstr "Afhalen"
 
-#: src/gui/popupmenu.cpp:1113
+#: src/gui/popupmenu.cpp:1115
 #, fuzzy
 msgid "Retrieve half"
 msgstr "Afhalen"
 
-#: src/gui/popupmenu.cpp:1115
+#: src/gui/popupmenu.cpp:1117
 #, fuzzy
 msgid "Retrieve all"
 msgstr "Afhalen"
 
-#: src/gui/popupmenu.cpp:1118 src/gui/popupmenu.cpp:1186
-#: src/gui/popupmenu.cpp:1224
+#: src/gui/popupmenu.cpp:1120 src/gui/popupmenu.cpp:1188
+#: src/gui/popupmenu.cpp:1226
 msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1145 src/gui/popupmenu.cpp:1190
+#: src/gui/popupmenu.cpp:1147 src/gui/popupmenu.cpp:1192
 msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1228
+#: src/gui/popupmenu.cpp:1230
 msgid "Load old drop shortcuts"
 msgstr ""
 
@@ -3219,6 +3232,10 @@ msgstr ""
 msgid "Who Is Online - Update"
 msgstr ""
 
+#: src/gui/widgets/battletab.cpp:41
+msgid "Battle"
+msgstr ""
+
 #: src/gui/widgets/channeltab.cpp:49
 msgid "/users > Lists the users in the current channel"
 msgstr "/users > Lijst van gebruikers in het huidig kanaal weergeven"
@@ -3663,174 +3680,175 @@ msgstr "Volgende chattab"
 #: src/keyboardconfig.cpp:233 src/keyboardconfig.cpp:236
 #: src/keyboardconfig.cpp:238 src/keyboardconfig.cpp:240
 #: src/keyboardconfig.cpp:242 src/keyboardconfig.cpp:244
+#: src/keyboardconfig.cpp:246 src/keyboardconfig.cpp:248
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "Emoticon snelkoppeling %d"
 
-#: src/keyboardconfig.cpp:246
+#: src/keyboardconfig.cpp:250
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:248
+#: src/keyboardconfig.cpp:252
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:250
+#: src/keyboardconfig.cpp:254
 msgid "Copy Equiped to Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:252
+#: src/keyboardconfig.cpp:256
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:254
+#: src/keyboardconfig.cpp:258
 msgid "Scroll Chat Up"
 msgstr "Chat omhoogscrollen"
 
-#: src/keyboardconfig.cpp:256
+#: src/keyboardconfig.cpp:260
 msgid "Scroll Chat Down"
 msgstr "Chat omlaagscrollen"
 
-#: src/keyboardconfig.cpp:258
+#: src/keyboardconfig.cpp:262
 msgid "Previous Chat Tab"
 msgstr "Vorige chattab"
 
-#: src/keyboardconfig.cpp:260
+#: src/keyboardconfig.cpp:264
 msgid "Next Chat Tab"
 msgstr "Volgende chattab"
 
-#: src/keyboardconfig.cpp:262
+#: src/keyboardconfig.cpp:266
 #, fuzzy
 msgid "Previous chat tab line"
 msgstr "Vorige chattab"
 
-#: src/keyboardconfig.cpp:264
+#: src/keyboardconfig.cpp:268
 #, fuzzy
 msgid "Next chat tab line"
 msgstr "Volgende chattab"
 
-#: src/keyboardconfig.cpp:266
+#: src/keyboardconfig.cpp:270
 msgid "Chat Auto Complete"
 msgstr ""
 
-#: src/keyboardconfig.cpp:268
+#: src/keyboardconfig.cpp:272
 msgid "Deactivate Chat Input"
 msgstr ""
 
-#: src/keyboardconfig.cpp:270
+#: src/keyboardconfig.cpp:274
 msgid "Select OK"
 msgstr "OK selecteren"
 
-#: src/keyboardconfig.cpp:272
+#: src/keyboardconfig.cpp:276
 msgid "Ignore input 1"
 msgstr "Ingave 1 negeren"
 
-#: src/keyboardconfig.cpp:274
+#: src/keyboardconfig.cpp:278
 msgid "Ignore input 2"
 msgstr "Ingave 2 negeren"
 
-#: src/keyboardconfig.cpp:276
+#: src/keyboardconfig.cpp:280
 msgid "Direct Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:277
+#: src/keyboardconfig.cpp:281
 #, fuzzy
 msgid "Direct Down"
 msgstr "Omlaag"
 
-#: src/keyboardconfig.cpp:279
+#: src/keyboardconfig.cpp:283
 #, fuzzy
 msgid "Direct Left"
 msgstr "Naar links"
 
-#: src/keyboardconfig.cpp:280
+#: src/keyboardconfig.cpp:284
 #, fuzzy
 msgid "Direct Right"
 msgstr "Naar rechts"
 
-#: src/keyboardconfig.cpp:282
+#: src/keyboardconfig.cpp:286
 msgid "Crazy moves"
 msgstr ""
 
-#: src/keyboardconfig.cpp:284
+#: src/keyboardconfig.cpp:288
 msgid "Change Crazy Move mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:286
+#: src/keyboardconfig.cpp:290
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:288
+#: src/keyboardconfig.cpp:292
 msgid "Quick Drop N Items"
 msgstr ""
 
-#: src/keyboardconfig.cpp:290
+#: src/keyboardconfig.cpp:294
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/keyboardconfig.cpp:292
+#: src/keyboardconfig.cpp:296
 msgid "Quick heal target or self"
 msgstr ""
 
-#: src/keyboardconfig.cpp:294
+#: src/keyboardconfig.cpp:298
 msgid "Use #itenplz spell"
 msgstr ""
 
-#: src/keyboardconfig.cpp:296
+#: src/keyboardconfig.cpp:300
 msgid "Use magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboardconfig.cpp:302
 #, fuzzy
 msgid "Switch magic attack"
 msgstr "Van personage wisselen"
 
-#: src/keyboardconfig.cpp:300
+#: src/keyboardconfig.cpp:304
 #, fuzzy
 msgid "Change move type"
 msgstr "Server"
 
-#: src/keyboardconfig.cpp:302
+#: src/keyboardconfig.cpp:306
 msgid "Change Attack Weapon Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:304
+#: src/keyboardconfig.cpp:308
 #, fuzzy
 msgid "Change Attack Type"
 msgstr "Viseren en Aanvallen"
 
-#: src/keyboardconfig.cpp:306
+#: src/keyboardconfig.cpp:310
 #, fuzzy
 msgid "Change Follow mode"
 msgstr "Wijzig wachtwoord"
 
-#: src/keyboardconfig.cpp:308
+#: src/keyboardconfig.cpp:312
 #, fuzzy
 msgid "Change Imitation mode"
 msgstr "Emailadres wijzigen"
 
-#: src/keyboardconfig.cpp:311
+#: src/keyboardconfig.cpp:315
 msgid "Disbale / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboardconfig.cpp:316
 msgid "On / Off audio"
 msgstr ""
 
-#: src/keyboardconfig.cpp:314
+#: src/keyboardconfig.cpp:318
 #, fuzzy
 msgid "Enable / Disable away mode"
 msgstr "Handelen inschakelen/uitschakelen"
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboardconfig.cpp:320
 msgid "Emulate right click from keyboard"
 msgstr ""
 
-#: src/keyboardconfig.cpp:318
+#: src/keyboardconfig.cpp:322
 msgid "Toggle camera mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:380
+#: src/keyboardconfig.cpp:384
 #, fuzzy, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -4101,7 +4119,7 @@ msgstr " Druk op OK om te respawnen"
 msgid "You Died"
 msgstr "Je stierf"
 
-#: src/net/manaserv/charhandler.cpp:144 src/net/manaserv/charhandler.cpp:215
+#: src/net/manaserv/charhandler.cpp:144 src/net/manaserv/charhandler.cpp:218
 #, fuzzy
 msgid "Not logged in."
 msgstr "Reeds aangemeld"
@@ -4146,7 +4164,11 @@ msgstr "Attributen van personage OK"
 msgid "At least one statis out of the permitted range: (%u - %u)."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:177 src/net/manaserv/loginhandler.cpp:98
+#: src/net/manaserv/charhandler.cpp:177
+msgid "Invalid slot number."
+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
@@ -4154,26 +4176,26 @@ msgstr ""
 msgid "Unknown error."
 msgstr "Onbekende foutmelding"
 
-#: src/net/manaserv/charhandler.cpp:206 src/net/tmwa/charserverhandler.cpp:149
+#: src/net/manaserv/charhandler.cpp:209 src/net/tmwa/charserverhandler.cpp:149
 msgid "Info"
 msgstr "Info"
 
-#: src/net/manaserv/charhandler.cpp:206
+#: src/net/manaserv/charhandler.cpp:209
 #, fuzzy
 msgid "Player deleted."
 msgstr "Personage verwijderd."
 
-#: src/net/manaserv/charhandler.cpp:218
+#: src/net/manaserv/charhandler.cpp:221
 #, fuzzy
 msgid "Selection out of range."
 msgstr "Selecteer het aantal exemplaren om te verhandelen"
 
-#: src/net/manaserv/charhandler.cpp:221
+#: src/net/manaserv/charhandler.cpp:224
 #, fuzzy, c-format
 msgid "Unknown error (%d)."
 msgstr "Onbekende foutmelding"
 
-#: src/net/manaserv/charhandler.cpp:257
+#: src/net/manaserv/charhandler.cpp:260
 msgid "No gameservers are available."
 msgstr "Geen gameservers beschikbaar."
 
@@ -4366,11 +4388,11 @@ msgstr "%s wil met jou handelen, aanvaard je dit?"
 msgid "Trading with %s"
 msgstr "Handelen met %s"
 
-#: src/net/manaserv/tradehandler.cpp:159 src/net/tmwa/tradehandler.cpp:268
+#: src/net/manaserv/tradehandler.cpp:159 src/net/tmwa/tradehandler.cpp:273
 msgid "Trade canceled."
 msgstr "Handel geannuleerd."
 
-#: src/net/manaserv/tradehandler.cpp:166 src/net/tmwa/tradehandler.cpp:278
+#: src/net/manaserv/tradehandler.cpp:166 src/net/tmwa/tradehandler.cpp:283
 msgid "Trade completed."
 msgstr "Handel voltooid."
 
@@ -4859,11 +4881,11 @@ msgstr "Ervaringsdeling is niet mogelijk."
 msgid "Experience sharing unknown."
 msgstr "Ervaringsdeling ingeschakeld."
 
-#: src/net/tmwa/inventoryhandler.cpp:329
+#: src/net/tmwa/inventoryhandler.cpp:334
 msgid "Failed to use item."
 msgstr "Kan voorwerp niet gebruiken."
 
-#: src/net/tmwa/inventoryhandler.cpp:452
+#: src/net/tmwa/inventoryhandler.cpp:457
 msgid "Unable to equip."
 msgstr "Kan dit niet uitrusten."
 
@@ -5193,7 +5215,14 @@ msgstr "Kan voorwerp niet toevoegen. Handelspartner is al te zwaar beladen."
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr "Kan voorwerp niet toevoegen. Handelspartner heeft geen vrij slot."
 
-#: src/net/tmwa/tradehandler.cpp:250
+#: src/net/tmwa/tradehandler.cpp:251
+#, fuzzy
+msgid "Failed adding item. You cant trade this item."
+msgstr ""
+"Kan dat voorwerp niet toevoegen. Je kan één type voorwerp niet overlappen in "
+"het venster."
+
+#: src/net/tmwa/tradehandler.cpp:255
 msgid "Failed adding item for unknown reason."
 msgstr "Kan voorwerp niet toevoegen voor een onbekende reden."
 
@@ -5218,6 +5247,11 @@ msgstr ""
 msgid "Floating bubble"
 msgstr ""
 
+#: src/resources/beinginfo.cpp:32 src/resources/itemdb.cpp:210
+#: src/resources/monsterdb.cpp:78
+msgid "unnamed"
+msgstr "naamloos"
+
 #: src/resources/itemdb.cpp:55
 #, c-format
 msgid "Attack %+d"
@@ -5242,10 +5276,6 @@ msgstr "Magie %+d"
 msgid "Unknown item"
 msgstr "Onbekend voorwerp"
 
-#: src/resources/itemdb.cpp:210 src/resources/monsterdb.cpp:78
-msgid "unnamed"
-msgstr "naamloos"
-
 #, fuzzy
 #~ msgid "Particle detail: %s"
 #~ msgstr "Deeltjes details"
diff --git a/po/pl.po b/po/pl.po
index 50203d8be..99d0d989b 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: 2010-12-24 19:29+0200\n"
+"POT-Creation-Date: 2011-01-05 04:50+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"
@@ -22,6 +22,14 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
+#: src/being.cpp:480
+msgid "dodge"
+msgstr ""
+
+#: src/being.cpp:480
+msgid "miss"
+msgstr ""
+
 #: src/client.cpp:724 src/gui/setup.cpp:47 src/gui/windowmenu.cpp:92
 msgid "Setup"
 msgstr "Konfiguracja"
@@ -57,9 +65,9 @@ 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:179 src/gui/register.cpp:225
+#: src/gui/charcreatedialog.cpp:185 src/gui/register.cpp:225
 #: src/gui/serverdialog.cpp:350 src/gui/unregisterdialog.cpp:134
-#: src/net/manaserv/charhandler.cpp:180 src/net/manaserv/charhandler.cpp:223
+#: src/net/manaserv/charhandler.cpp:183 src/net/manaserv/charhandler.cpp:226
 #: src/net/tmwa/charserverhandler.cpp:137
 #: src/net/tmwa/charserverhandler.cpp:154
 msgid "Error"
@@ -657,12 +665,12 @@ msgstr "Ignorowanie przychodzących próśb o handel"
 msgid "Accepting incoming trade requests"
 msgstr "Akceptowanie przychodzących próśb o handel"
 
-#: src/game.cpp:1373
+#: src/game.cpp:1376
 #, fuzzy
 msgid "Could Not Load Map"
 msgstr "Nie można załadować mapy"
 
-#: src/game.cpp:1374
+#: src/game.cpp:1377
 #, c-format
 msgid "Error while loading %s"
 msgstr "Błąd podczas łądowania %s"
@@ -740,7 +748,7 @@ 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/keyboardconfig.cpp:271
+#: src/keyboardconfig.cpp:275
 msgid "Quit"
 msgstr "Wyjdź"
 
@@ -762,9 +770,9 @@ msgstr "Sprzedaj"
 #: src/gui/buysell.cpp:62 src/gui/changeemaildialog.cpp:56
 #: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
 #: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:206
-#: src/gui/npcpostdialog.cpp:55 src/gui/popupmenu.cpp:1120
-#: src/gui/popupmenu.cpp:1147 src/gui/popupmenu.cpp:1192
-#: src/gui/popupmenu.cpp:1230 src/gui/quitdialog.cpp:54
+#: src/gui/npcpostdialog.cpp:55 src/gui/popupmenu.cpp:1122
+#: src/gui/popupmenu.cpp:1149 src/gui/popupmenu.cpp:1194
+#: src/gui/popupmenu.cpp:1232 src/gui/quitdialog.cpp:54
 #: src/gui/register.cpp:79 src/gui/setup.cpp:64 src/gui/socialwindow.cpp:786
 #: src/gui/textcommandeditor.cpp:231 src/gui/textdialog.cpp:44
 #: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:153
@@ -866,7 +874,7 @@ msgstr "Kolor włosów:"
 msgid "Hair style:"
 msgstr "Fryzura:"
 
-#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:437
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:445
 #: src/gui/socialwindow.cpp:846
 msgid "Create"
 msgstr "Utwórz"
@@ -879,20 +887,20 @@ msgstr "Mężczyzna"
 msgid "Female"
 msgstr "Kobieta"
 
-#: src/gui/charcreatedialog.cpp:99 src/gui/charcreatedialog.cpp:251
+#: src/gui/charcreatedialog.cpp:99 src/gui/charcreatedialog.cpp:257
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Proszę wykorzystać %d punktów"
 
-#: src/gui/charcreatedialog.cpp:180
+#: src/gui/charcreatedialog.cpp:186
 msgid "Your name needs to be at least 4 characters."
 msgstr "Twoje imię musi mieć conajmniej 4 znaki."
 
-#: src/gui/charcreatedialog.cpp:242
+#: src/gui/charcreatedialog.cpp:248
 msgid "Character stats OK"
 msgstr "Statystyki postaci w porządku."
 
-#: src/gui/charcreatedialog.cpp:256
+#: src/gui/charcreatedialog.cpp:262
 #, c-format
 msgid "Please remove %d points"
 msgstr "Proszę usunąć %d punktów"
@@ -923,18 +931,23 @@ msgstr "Wyrejestruj"
 msgid "Change Email"
 msgstr "Zmień adres Email"
 
-#: src/gui/charselectdialog.cpp:367 src/gui/serverdialog.cpp:248
+#: src/gui/charselectdialog.cpp:375 src/gui/serverdialog.cpp:248
 #: src/gui/setup_players.cpp:242 src/gui/shopwindow.cpp:117
 #: src/gui/shopwindow.cpp:120 src/gui/textcommandeditor.cpp:234
 msgid "Delete"
 msgstr "Usuń"
 
-#: src/gui/charselectdialog.cpp:425
+#: src/gui/charselectdialog.cpp:433
 #, fuzzy
 msgid "Choose"
 msgstr "Zamknij"
 
-#: src/gui/charselectdialog.cpp:439 src/gui/charselectdialog.cpp:440
+#: src/gui/charselectdialog.cpp:436
+#, fuzzy, c-format
+msgid "Level %d"
+msgstr "Poziom: %d"
+
+#: src/gui/charselectdialog.cpp:447 src/gui/charselectdialog.cpp:448
 msgid "(empty)"
 msgstr ""
 
@@ -1162,14 +1175,14 @@ msgstr ""
 msgid "OK"
 msgstr "Ok"
 
-#: src/gui/equipmentwindow.cpp:70 src/gui/windowmenu.cpp:70
+#: src/gui/equipmentwindow.cpp:72 src/gui/windowmenu.cpp:70
 msgid "Equipment"
 msgstr "Ekwipunek"
 
-#: src/gui/equipmentwindow.cpp:89 src/gui/inventorywindow.cpp:96
+#: src/gui/equipmentwindow.cpp:91 src/gui/inventorywindow.cpp:96
 #: src/gui/inventorywindow.cpp:393 src/gui/inventorywindow.cpp:402
-#: src/gui/popupmenu.cpp:1068 src/gui/popupmenu.cpp:1167
-#: src/gui/popupmenu.cpp:1207
+#: src/gui/popupmenu.cpp:1070 src/gui/popupmenu.cpp:1169
+#: src/gui/popupmenu.cpp:1209
 msgid "Unequip"
 msgstr "Zdejmij"
 
@@ -1195,32 +1208,32 @@ msgid "Slots:"
 msgstr "Miejsc:"
 
 #: src/gui/inventorywindow.cpp:94 src/gui/inventorywindow.cpp:395
-#: src/gui/inventorywindow.cpp:404 src/gui/popupmenu.cpp:1070
-#: src/gui/popupmenu.cpp:1169 src/gui/popupmenu.cpp:1209
+#: src/gui/inventorywindow.cpp:404 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:1073
-#: src/gui/popupmenu.cpp:1142 src/gui/popupmenu.cpp:1173
-#: src/gui/popupmenu.cpp:1212
+#: src/gui/inventorywindow.cpp:400 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/popupmenu.cpp:1076 src/gui/popupmenu.cpp:1177
-#: src/gui/popupmenu.cpp:1215
+#: 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:1081
-#: src/gui/popupmenu.cpp:1182 src/gui/popupmenu.cpp:1220
+#: src/gui/inventorywindow.cpp:110 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/popupmenu.cpp:408
+#: src/gui/popupmenu.cpp:409
 msgid "Outfits"
 msgstr ""
 
@@ -1229,17 +1242,17 @@ msgid "Weight:"
 msgstr "Waga:"
 
 #: src/gui/inventorywindow.cpp:133 src/gui/inventorywindow.cpp:490
-#: src/gui/popupmenu.cpp:1085 src/gui/popupmenu.cpp:1185
-#: src/gui/popupmenu.cpp:1223 src/gui/setup.cpp:65
+#: 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:1104
+#: src/gui/inventorywindow.cpp:134 src/gui/popupmenu.cpp:1106
 msgid "Retrieve"
 msgstr "Pobierz"
 
-#: src/gui/inventorywindow.cpp:501 src/gui/popupmenu.cpp:1078
-#: src/gui/popupmenu.cpp:1179 src/gui/popupmenu.cpp:1217
+#: src/gui/inventorywindow.cpp:501 src/gui/popupmenu.cpp:1080
+#: src/gui/popupmenu.cpp:1181 src/gui/popupmenu.cpp:1219
 #: src/gui/windowmenu.cpp:91
 msgid "Drop"
 msgstr "Upuść"
@@ -1478,7 +1491,7 @@ msgstr "Zatwierdź"
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:447
+#: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:448
 #, fuzzy
 msgid "Clear"
 msgstr "Kij"
@@ -1522,287 +1535,287 @@ msgstr "Zdejmij"
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:116 src/gui/popupmenu.cpp:482
+#: src/gui/popupmenu.cpp:116 src/gui/popupmenu.cpp:483
 #, fuzzy
 msgid "@@trade|Trade@@"
 msgstr "@@trade|Handel z %s@@"
 
 #. TRANSLATORS: Attacking a player.
-#: src/gui/popupmenu.cpp:118 src/gui/popupmenu.cpp:237
-#: src/gui/popupmenu.cpp:483
+#: src/gui/popupmenu.cpp:118 src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:484
 #, fuzzy
 msgid "@@attack|Attack@@"
 msgstr "@@attack|Atakuj %s@@"
 
 #. TRANSLATORS: Whispering a player.
-#: src/gui/popupmenu.cpp:120 src/gui/popupmenu.cpp:289
+#: src/gui/popupmenu.cpp:120 src/gui/popupmenu.cpp:290
 #, fuzzy
 msgid "@@whisper|Whisper@@"
 msgstr "@@use|Użyj@@"
 
-#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:487
+#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:488
 #, fuzzy
 msgid "@@heal|Heal@@"
 msgstr "@@cancel|Anuluj@@"
 
-#: src/gui/popupmenu.cpp:130 src/gui/popupmenu.cpp:295
-#: src/gui/popupmenu.cpp:493
+#: src/gui/popupmenu.cpp:130 src/gui/popupmenu.cpp:296
+#: src/gui/popupmenu.cpp:494
 #, fuzzy
 msgid "@@friend|Befriend@@"
 msgstr "@@retrieve|Pobierz@@"
 
-#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:136
-#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:296
-#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:320
-#: src/gui/popupmenu.cpp:494 src/gui/popupmenu.cpp:499
-#: src/gui/popupmenu.cpp:517
+#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:137
+#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:297
+#: src/gui/popupmenu.cpp:303 src/gui/popupmenu.cpp:321
+#: src/gui/popupmenu.cpp:495 src/gui/popupmenu.cpp:501
+#: src/gui/popupmenu.cpp:519
 #, fuzzy
 msgid "@@disregard|Disregard@@"
 msgstr "@@disregard|Lekceważ %s@@"
 
-#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:137
-#: src/gui/popupmenu.cpp:297 src/gui/popupmenu.cpp:303
-#: src/gui/popupmenu.cpp:495 src/gui/popupmenu.cpp:500
+#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:138
+#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:304
+#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:502
 #, fuzzy
 msgid "@@ignore|Ignore@@"
 msgstr "@@ignore|Ignoruj %s@@"
 
-#: src/gui/popupmenu.cpp:133 src/gui/popupmenu.cpp:138
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:149
-#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:304
-#: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:315
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:501
-#: src/gui/popupmenu.cpp:507 src/gui/popupmenu.cpp:512
+#: src/gui/popupmenu.cpp:133 src/gui/popupmenu.cpp:139
+#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:150
+#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:305
+#: src/gui/popupmenu.cpp:311 src/gui/popupmenu.cpp:316
+#: src/gui/popupmenu.cpp:497 src/gui/popupmenu.cpp:503
+#: src/gui/popupmenu.cpp:509 src/gui/popupmenu.cpp:514
 #, fuzzy
 msgid "@@erase|Erase@@"
 msgstr "@@use|Użyj@@"
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:148
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:308
-#: src/gui/popupmenu.cpp:314 src/gui/popupmenu.cpp:319
-#: src/gui/popupmenu.cpp:505 src/gui/popupmenu.cpp:511
-#: src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:143 src/gui/popupmenu.cpp:149
+#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:315 src/gui/popupmenu.cpp:320
+#: src/gui/popupmenu.cpp:507 src/gui/popupmenu.cpp:513
+#: src/gui/popupmenu.cpp:518
 #, fuzzy
 msgid "@@unignore|Unignore@@"
 msgstr "@@unignore|Przestań Ignorować %s@@"
 
-#: src/gui/popupmenu.cpp:143 src/gui/popupmenu.cpp:155
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:321
-#: src/gui/popupmenu.cpp:506 src/gui/popupmenu.cpp:518
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:156
+#: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:322
+#: src/gui/popupmenu.cpp:508 src/gui/popupmenu.cpp:520
 #, fuzzy
 msgid "@@ignore|Completely ignore@@"
 msgstr "@@ignore|Kompletnie ignoruj %s@@"
 
-#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:329
-#: src/gui/popupmenu.cpp:526
+#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:330
+#: src/gui/popupmenu.cpp:528
 msgid "@@follow|Follow@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:330
-#: src/gui/popupmenu.cpp:527
+#: src/gui/popupmenu.cpp:165 src/gui/popupmenu.cpp:331
+#: src/gui/popupmenu.cpp:529
 msgid "@@imitation|Imitation@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:174 src/gui/popupmenu.cpp:546
+#: src/gui/popupmenu.cpp:175 src/gui/popupmenu.cpp:548
 #, fuzzy
 msgid "@@party|Invite to party@@"
 msgstr "/party > Zaproś użytkownika do grupy"
 
-#: src/gui/popupmenu.cpp:179 src/gui/popupmenu.cpp:551
+#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:553
 #, fuzzy
 msgid "@@kick party|Kick from party@@"
 msgstr "@@admin-kick|Wykop gracza@@"
 
-#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:337
-#: src/gui/popupmenu.cpp:565
+#: src/gui/popupmenu.cpp:195 src/gui/popupmenu.cpp:338
+#: src/gui/popupmenu.cpp:567
 #, fuzzy
 msgid "@@guild-kick|Kick from guild@@"
 msgstr "@@admin-kick|Wykop gracza@@"
 
-#: src/gui/popupmenu.cpp:196 src/gui/popupmenu.cpp:338
-#: src/gui/popupmenu.cpp:567
+#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:339
+#: src/gui/popupmenu.cpp:569
 msgid "@@guild-pos|Change pos in guild >@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:201 src/gui/popupmenu.cpp:342
-#: src/gui/popupmenu.cpp:572
+#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:343
+#: src/gui/popupmenu.cpp:574
 #, fuzzy
 msgid "@@guild|Invite to guild@@"
 msgstr "/party > Zaproś użytkownika do grupy"
 
-#: src/gui/popupmenu.cpp:208
+#: src/gui/popupmenu.cpp:209
 msgid "@@admin-kick|Kick player@@"
 msgstr "@@admin-kick|Wykop gracza@@"
 
-#: src/gui/popupmenu.cpp:210
+#: src/gui/popupmenu.cpp:211
 msgid "@@nuke|Nuke@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:211 src/gui/popupmenu.cpp:231
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:232
+#: src/gui/popupmenu.cpp:530
 msgid "@@move|Move@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:529
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:531
 #, fuzzy
 msgid "@@undress|Undress@@"
 msgstr "@@unignore|Przestań Ignorować %s@@"
 
-#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:228
-#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:534
+#: src/gui/popupmenu.cpp:218 src/gui/popupmenu.cpp:229
+#: src/gui/popupmenu.cpp:350 src/gui/popupmenu.cpp:536
 msgid "@@buy|Buy@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:218 src/gui/popupmenu.cpp:229
-#: src/gui/popupmenu.cpp:350 src/gui/popupmenu.cpp:535
+#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:230
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:537
 #, fuzzy
 msgid "@@sell|Sell@@"
 msgstr "@@use|Użyj@@"
 
-#: src/gui/popupmenu.cpp:226
+#: src/gui/popupmenu.cpp:227
 #, fuzzy
 msgid "@@talk|Talk@@"
 msgstr "@@attack|Atakuj %s@@"
 
-#: src/gui/popupmenu.cpp:240
+#: src/gui/popupmenu.cpp:241
 #, fuzzy
 msgid "@@admin-kick|Kick@@"
 msgstr "@@admin-kick|Wykop gracza@@"
 
-#: src/gui/popupmenu.cpp:248 src/gui/popupmenu.cpp:353
+#: src/gui/popupmenu.cpp:249 src/gui/popupmenu.cpp:354
 #, fuzzy
 msgid "@@name|Add name to chat@@"
 msgstr "@@name|Dodaj imię do czatu@@"
 
-#: src/gui/popupmenu.cpp:252 src/gui/popupmenu.cpp:272
-#: src/gui/popupmenu.cpp:357 src/gui/popupmenu.cpp:380
-#: src/gui/popupmenu.cpp:399 src/gui/popupmenu.cpp:412
-#: src/gui/popupmenu.cpp:430 src/gui/popupmenu.cpp:577
-#: src/gui/popupmenu.cpp:601
+#: src/gui/popupmenu.cpp:253 src/gui/popupmenu.cpp:273
+#: src/gui/popupmenu.cpp:358 src/gui/popupmenu.cpp:381
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:431 src/gui/popupmenu.cpp:579
+#: src/gui/popupmenu.cpp:603
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancel|Anuluj@@"
 
-#: src/gui/popupmenu.cpp:267
+#: src/gui/popupmenu.cpp:268
 #, c-format
 msgid "@@player_%u|%s >@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:375
+#: src/gui/popupmenu.cpp:376
 #, fuzzy
 msgid "@@pickup|Pick up@@"
 msgstr "@@pickup|Podnieś %s@@"
 
-#: src/gui/popupmenu.cpp:376
+#: src/gui/popupmenu.cpp:377
 #, fuzzy
 msgid "@@chat|Add to chat@@"
 msgstr "@@chat|Dodaj do czatu@@"
 
-#: src/gui/popupmenu.cpp:394
+#: src/gui/popupmenu.cpp:395
 msgid "Map Item"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:395
+#: src/gui/popupmenu.cpp:396
 msgid "@@rename map|Rename@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:396
+#: src/gui/popupmenu.cpp:397
 msgid "@@remove map|Remove@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:409
+#: src/gui/popupmenu.cpp:410
 msgid "@@load old outfits|Load old outfits@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:425 src/gui/windowmenu.cpp:90
+#: src/gui/popupmenu.cpp:426 src/gui/windowmenu.cpp:90
 msgid "Spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:426
+#: src/gui/popupmenu.cpp:427
 msgid "@@load old spells|Load old spells@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:427
+#: src/gui/popupmenu.cpp:428
 #, fuzzy
 msgid "@@edit spell|Edit spell@@"
 msgstr "@@use|Użyj@@"
 
-#: src/gui/popupmenu.cpp:445
+#: src/gui/popupmenu.cpp:446
 msgid "@@chat close|Close@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:453
+#: src/gui/popupmenu.cpp:454
 #, fuzzy
 msgid "Disable highlight"
 msgstr "Podświetlenie zakładki"
 
-#: src/gui/popupmenu.cpp:459
+#: src/gui/popupmenu.cpp:460
 #, fuzzy
 msgid "Enable highlight"
 msgstr "Podświetlenie zakładki"
 
-#: src/gui/popupmenu.cpp:465
+#: src/gui/popupmenu.cpp:466
 msgid "@@leave party|Leave@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:585
+#: src/gui/popupmenu.cpp:587
 #, fuzzy
 msgid "Change guild position"
 msgstr "Zmień"
 
-#: src/gui/popupmenu.cpp:598
+#: src/gui/popupmenu.cpp:600
 #, c-format
 msgid "@@guild-pos-%d|%s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:942
+#: src/gui/popupmenu.cpp:944
 msgid "Rename map sign          "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:943
+#: src/gui/popupmenu.cpp:945
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1091
+#: src/gui/popupmenu.cpp:1093
 #, fuzzy
 msgid "Store 10"
 msgstr "Przechowaj"
 
-#: src/gui/popupmenu.cpp:1094
+#: src/gui/popupmenu.cpp:1096
 #, fuzzy
 msgid "Store half"
 msgstr "Przechowaj"
 
-#: src/gui/popupmenu.cpp:1096
+#: src/gui/popupmenu.cpp:1098
 #, fuzzy
 msgid "Store all"
 msgstr "Przechowaj"
 
-#: src/gui/popupmenu.cpp:1110
+#: src/gui/popupmenu.cpp:1112
 #, fuzzy
 msgid "Retrieve 10"
 msgstr "Pobierz"
 
-#: src/gui/popupmenu.cpp:1113
+#: src/gui/popupmenu.cpp:1115
 #, fuzzy
 msgid "Retrieve half"
 msgstr "Pobierz"
 
-#: src/gui/popupmenu.cpp:1115
+#: src/gui/popupmenu.cpp:1117
 #, fuzzy
 msgid "Retrieve all"
 msgstr "Pobierz"
 
-#: src/gui/popupmenu.cpp:1118 src/gui/popupmenu.cpp:1186
-#: src/gui/popupmenu.cpp:1224
+#: src/gui/popupmenu.cpp:1120 src/gui/popupmenu.cpp:1188
+#: src/gui/popupmenu.cpp:1226
 #, fuzzy
 msgid "Add to chat"
 msgstr "@@chat|Dodaj do czatu@@"
 
-#: src/gui/popupmenu.cpp:1145 src/gui/popupmenu.cpp:1190
+#: src/gui/popupmenu.cpp:1147 src/gui/popupmenu.cpp:1192
 msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1228
+#: src/gui/popupmenu.cpp:1230
 msgid "Load old drop shortcuts"
 msgstr ""
 
@@ -3237,6 +3250,10 @@ msgstr ""
 msgid "Who Is Online - Update"
 msgstr ""
 
+#: src/gui/widgets/battletab.cpp:41
+msgid "Battle"
+msgstr ""
+
 #: src/gui/widgets/channeltab.cpp:49
 msgid "/users > Lists the users in the current channel"
 msgstr "/users > Pokazuje listę użytkowników w obecnym kanale"
@@ -3677,174 +3694,175 @@ msgstr "Następna zakładka czatu"
 #: src/keyboardconfig.cpp:233 src/keyboardconfig.cpp:236
 #: src/keyboardconfig.cpp:238 src/keyboardconfig.cpp:240
 #: src/keyboardconfig.cpp:242 src/keyboardconfig.cpp:244
+#: src/keyboardconfig.cpp:246 src/keyboardconfig.cpp:248
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "Skrót Emotki %d"
 
-#: src/keyboardconfig.cpp:246
+#: src/keyboardconfig.cpp:250
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:248
+#: src/keyboardconfig.cpp:252
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:250
+#: src/keyboardconfig.cpp:254
 msgid "Copy Equiped to Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:252
+#: src/keyboardconfig.cpp:256
 msgid "Toggle Chat"
 msgstr "Przełącznik Czatu"
 
-#: src/keyboardconfig.cpp:254
+#: src/keyboardconfig.cpp:258
 msgid "Scroll Chat Up"
 msgstr "Przewiń czat do góry"
 
-#: src/keyboardconfig.cpp:256
+#: src/keyboardconfig.cpp:260
 msgid "Scroll Chat Down"
 msgstr "Przewiń czat w doł"
 
-#: src/keyboardconfig.cpp:258
+#: src/keyboardconfig.cpp:262
 msgid "Previous Chat Tab"
 msgstr "Poprzednia zakładka czatu"
 
-#: src/keyboardconfig.cpp:260
+#: src/keyboardconfig.cpp:264
 msgid "Next Chat Tab"
 msgstr "Następna zakładka czatu"
 
-#: src/keyboardconfig.cpp:262
+#: src/keyboardconfig.cpp:266
 #, fuzzy
 msgid "Previous chat tab line"
 msgstr "Poprzednia zakładka czatu"
 
-#: src/keyboardconfig.cpp:264
+#: src/keyboardconfig.cpp:268
 #, fuzzy
 msgid "Next chat tab line"
 msgstr "Następna zakładka czatu"
 
-#: src/keyboardconfig.cpp:266
+#: src/keyboardconfig.cpp:270
 msgid "Chat Auto Complete"
 msgstr ""
 
-#: src/keyboardconfig.cpp:268
+#: src/keyboardconfig.cpp:272
 msgid "Deactivate Chat Input"
 msgstr ""
 
-#: src/keyboardconfig.cpp:270
+#: src/keyboardconfig.cpp:274
 msgid "Select OK"
 msgstr "Wybrano OK"
 
-#: src/keyboardconfig.cpp:272
+#: src/keyboardconfig.cpp:276
 msgid "Ignore input 1"
 msgstr "Ignoruj wprowadzenie 1"
 
-#: src/keyboardconfig.cpp:274
+#: src/keyboardconfig.cpp:278
 msgid "Ignore input 2"
 msgstr "Ignoruj wprowadzenie 2"
 
-#: src/keyboardconfig.cpp:276
+#: src/keyboardconfig.cpp:280
 msgid "Direct Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:277
+#: src/keyboardconfig.cpp:281
 #, fuzzy
 msgid "Direct Down"
 msgstr "Przesuń w dół"
 
-#: src/keyboardconfig.cpp:279
+#: src/keyboardconfig.cpp:283
 #, fuzzy
 msgid "Direct Left"
 msgstr "Przesuń w lewo"
 
-#: src/keyboardconfig.cpp:280
+#: src/keyboardconfig.cpp:284
 #, fuzzy
 msgid "Direct Right"
 msgstr "Przesuń w prawo"
 
-#: src/keyboardconfig.cpp:282
+#: src/keyboardconfig.cpp:286
 msgid "Crazy moves"
 msgstr ""
 
-#: src/keyboardconfig.cpp:284
+#: src/keyboardconfig.cpp:288
 msgid "Change Crazy Move mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:286
+#: src/keyboardconfig.cpp:290
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:288
+#: src/keyboardconfig.cpp:292
 msgid "Quick Drop N Items"
 msgstr ""
 
-#: src/keyboardconfig.cpp:290
+#: src/keyboardconfig.cpp:294
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/keyboardconfig.cpp:292
+#: src/keyboardconfig.cpp:296
 msgid "Quick heal target or self"
 msgstr ""
 
-#: src/keyboardconfig.cpp:294
+#: src/keyboardconfig.cpp:298
 msgid "Use #itenplz spell"
 msgstr ""
 
-#: src/keyboardconfig.cpp:296
+#: src/keyboardconfig.cpp:300
 msgid "Use magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboardconfig.cpp:302
 #, fuzzy
 msgid "Switch magic attack"
 msgstr "Zmień postać"
 
-#: src/keyboardconfig.cpp:300
+#: src/keyboardconfig.cpp:304
 #, fuzzy
 msgid "Change move type"
 msgstr "Serwer"
 
-#: src/keyboardconfig.cpp:302
+#: src/keyboardconfig.cpp:306
 msgid "Change Attack Weapon Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:304
+#: src/keyboardconfig.cpp:308
 #, fuzzy
 msgid "Change Attack Type"
 msgstr "Namierz i Atakuj"
 
-#: src/keyboardconfig.cpp:306
+#: src/keyboardconfig.cpp:310
 #, fuzzy
 msgid "Change Follow mode"
 msgstr "Zmień hasło"
 
-#: src/keyboardconfig.cpp:308
+#: src/keyboardconfig.cpp:312
 #, fuzzy
 msgid "Change Imitation mode"
 msgstr "Zmień adres Email"
 
-#: src/keyboardconfig.cpp:311
+#: src/keyboardconfig.cpp:315
 msgid "Disbale / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboardconfig.cpp:316
 msgid "On / Off audio"
 msgstr ""
 
-#: src/keyboardconfig.cpp:314
+#: src/keyboardconfig.cpp:318
 #, fuzzy
 msgid "Enable / Disable away mode"
 msgstr "Włącz/Wysłącz Handlowanie"
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboardconfig.cpp:320
 msgid "Emulate right click from keyboard"
 msgstr ""
 
-#: src/keyboardconfig.cpp:318
+#: src/keyboardconfig.cpp:322
 msgid "Toggle camera mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:380
+#: src/keyboardconfig.cpp:384
 #, fuzzy, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -4112,7 +4130,7 @@ msgstr " Naciśnij OK, aby się odrodzić"
 msgid "You Died"
 msgstr "Umarłeś"
 
-#: src/net/manaserv/charhandler.cpp:144 src/net/manaserv/charhandler.cpp:215
+#: src/net/manaserv/charhandler.cpp:144 src/net/manaserv/charhandler.cpp:218
 #, fuzzy
 msgid "Not logged in."
 msgstr "Już zalogowany"
@@ -4157,7 +4175,11 @@ msgstr "Statystyki postaci w porządku."
 msgid "At least one statis out of the permitted range: (%u - %u)."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:177 src/net/manaserv/loginhandler.cpp:98
+#: src/net/manaserv/charhandler.cpp:177
+msgid "Invalid slot number."
+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
@@ -4165,26 +4187,26 @@ msgstr ""
 msgid "Unknown error."
 msgstr "Nieznany błąd"
 
-#: src/net/manaserv/charhandler.cpp:206 src/net/tmwa/charserverhandler.cpp:149
+#: src/net/manaserv/charhandler.cpp:209 src/net/tmwa/charserverhandler.cpp:149
 msgid "Info"
 msgstr "Info"
 
-#: src/net/manaserv/charhandler.cpp:206
+#: src/net/manaserv/charhandler.cpp:209
 #, fuzzy
 msgid "Player deleted."
 msgstr "Gracz usunięty"
 
-#: src/net/manaserv/charhandler.cpp:218
+#: src/net/manaserv/charhandler.cpp:221
 #, fuzzy
 msgid "Selection out of range."
 msgstr "Wybierz ilość przedmiotów do handlu."
 
-#: src/net/manaserv/charhandler.cpp:221
+#: src/net/manaserv/charhandler.cpp:224
 #, fuzzy, c-format
 msgid "Unknown error (%d)."
 msgstr "Nieznany błąd"
 
-#: src/net/manaserv/charhandler.cpp:257
+#: src/net/manaserv/charhandler.cpp:260
 msgid "No gameservers are available."
 msgstr "Brak dostępnych serwerów gier"
 
@@ -4377,11 +4399,11 @@ msgstr "%s chce handlować z tobą, zgadzasz się?"
 msgid "Trading with %s"
 msgstr "Handel z %s"
 
-#: src/net/manaserv/tradehandler.cpp:159 src/net/tmwa/tradehandler.cpp:268
+#: src/net/manaserv/tradehandler.cpp:159 src/net/tmwa/tradehandler.cpp:273
 msgid "Trade canceled."
 msgstr "Handel anulowany."
 
-#: src/net/manaserv/tradehandler.cpp:166 src/net/tmwa/tradehandler.cpp:278
+#: src/net/manaserv/tradehandler.cpp:166 src/net/tmwa/tradehandler.cpp:283
 msgid "Trade completed."
 msgstr "Handel zakończony."
 
@@ -4868,11 +4890,11 @@ msgstr "Podział doświadczenia nie jest możliwy."
 msgid "Experience sharing unknown."
 msgstr "Podział doświadczenia włączony."
 
-#: src/net/tmwa/inventoryhandler.cpp:329
+#: src/net/tmwa/inventoryhandler.cpp:334
 msgid "Failed to use item."
 msgstr "Użycie przedmiotu nie powiodło się."
 
-#: src/net/tmwa/inventoryhandler.cpp:452
+#: src/net/tmwa/inventoryhandler.cpp:457
 msgid "Unable to equip."
 msgstr "Nie można założyć."
 
@@ -5198,7 +5220,14 @@ msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 "Dodanie przedmiotu nie powiodło się. Kontrahent nie posiada wolnego miejsca."
 
-#: src/net/tmwa/tradehandler.cpp:250
+#: src/net/tmwa/tradehandler.cpp:251
+#, fuzzy
+msgid "Failed adding item. You cant trade this item."
+msgstr ""
+"Dodanie przedmiotu nie powiodło się. Nie może zachodzić na siebie ten sam "
+"rodzaj przedmiotu w okienku."
+
+#: src/net/tmwa/tradehandler.cpp:255
 msgid "Failed adding item for unknown reason."
 msgstr "Dodanie przedmiotu nie powiodło się z nieznanego powodu."
 
@@ -5223,6 +5252,11 @@ msgstr ""
 msgid "Floating bubble"
 msgstr ""
 
+#: src/resources/beinginfo.cpp:32 src/resources/itemdb.cpp:210
+#: src/resources/monsterdb.cpp:78
+msgid "unnamed"
+msgstr "nienazwany"
+
 #: src/resources/itemdb.cpp:55
 #, c-format
 msgid "Attack %+d"
@@ -5247,10 +5281,6 @@ msgstr "MP %+d"
 msgid "Unknown item"
 msgstr "Nieznany przedmiot"
 
-#: src/resources/itemdb.cpp:210 src/resources/monsterdb.cpp:78
-msgid "unnamed"
-msgstr "nienazwany"
-
 #, fuzzy
 #~ msgid "Particle detail: %s"
 #~ msgstr "Detale cząsteczek"
diff --git a/po/pt.po b/po/pt.po
index 77a9cccb6..6aecfb287 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: 2010-12-24 19:29+0200\n"
+"POT-Creation-Date: 2011-01-05 04:50+0200\n"
 "PO-Revision-Date: 2010-03-05 13:28+0000\n"
 "Last-Translator: Tustiman <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
@@ -19,6 +19,14 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
+#: src/being.cpp:480
+msgid "dodge"
+msgstr ""
+
+#: src/being.cpp:480
+msgid "miss"
+msgstr ""
+
 #: src/client.cpp:724 src/gui/setup.cpp:47 src/gui/windowmenu.cpp:92
 msgid "Setup"
 msgstr "Configuração"
@@ -54,9 +62,9 @@ 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:179 src/gui/register.cpp:225
+#: src/gui/charcreatedialog.cpp:185 src/gui/register.cpp:225
 #: src/gui/serverdialog.cpp:350 src/gui/unregisterdialog.cpp:134
-#: src/net/manaserv/charhandler.cpp:180 src/net/manaserv/charhandler.cpp:223
+#: src/net/manaserv/charhandler.cpp:183 src/net/manaserv/charhandler.cpp:226
 #: src/net/tmwa/charserverhandler.cpp:137
 #: src/net/tmwa/charserverhandler.cpp:154
 msgid "Error"
@@ -653,12 +661,12 @@ msgstr "Ignorando propostas de negócios"
 msgid "Accepting incoming trade requests"
 msgstr "Aceitando propostas de negócios"
 
-#: src/game.cpp:1373
+#: src/game.cpp:1376
 #, fuzzy
 msgid "Could Not Load Map"
 msgstr "Impossível carregar mapa"
 
-#: src/game.cpp:1374
+#: src/game.cpp:1377
 #, c-format
 msgid "Error while loading %s"
 msgstr "Erro ao carregar %s"
@@ -736,7 +744,7 @@ 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/keyboardconfig.cpp:271
+#: src/keyboardconfig.cpp:275
 msgid "Quit"
 msgstr "Sair"
 
@@ -758,9 +766,9 @@ msgstr "Vender"
 #: src/gui/buysell.cpp:62 src/gui/changeemaildialog.cpp:56
 #: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
 #: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:206
-#: src/gui/npcpostdialog.cpp:55 src/gui/popupmenu.cpp:1120
-#: src/gui/popupmenu.cpp:1147 src/gui/popupmenu.cpp:1192
-#: src/gui/popupmenu.cpp:1230 src/gui/quitdialog.cpp:54
+#: src/gui/npcpostdialog.cpp:55 src/gui/popupmenu.cpp:1122
+#: src/gui/popupmenu.cpp:1149 src/gui/popupmenu.cpp:1194
+#: src/gui/popupmenu.cpp:1232 src/gui/quitdialog.cpp:54
 #: src/gui/register.cpp:79 src/gui/setup.cpp:64 src/gui/socialwindow.cpp:786
 #: src/gui/textcommandeditor.cpp:231 src/gui/textdialog.cpp:44
 #: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:153
@@ -862,7 +870,7 @@ msgstr "Cor de Cabelo:"
 msgid "Hair style:"
 msgstr "Estilo do Cabelo:"
 
-#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:437
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:445
 #: src/gui/socialwindow.cpp:846
 msgid "Create"
 msgstr "Criar"
@@ -875,20 +883,20 @@ msgstr "Masculino"
 msgid "Female"
 msgstr "Feminino"
 
-#: src/gui/charcreatedialog.cpp:99 src/gui/charcreatedialog.cpp:251
+#: src/gui/charcreatedialog.cpp:99 src/gui/charcreatedialog.cpp:257
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Por favor distribua %d potos"
 
-#: src/gui/charcreatedialog.cpp:180
+#: src/gui/charcreatedialog.cpp:186
 msgid "Your name needs to be at least 4 characters."
 msgstr "O seu nome necessita de pelo menos 4 caracteres"
 
-#: src/gui/charcreatedialog.cpp:242
+#: src/gui/charcreatedialog.cpp:248
 msgid "Character stats OK"
 msgstr "Estatisticas da personagem OK"
 
-#: src/gui/charcreatedialog.cpp:256
+#: src/gui/charcreatedialog.cpp:262
 #, c-format
 msgid "Please remove %d points"
 msgstr "Por favor remova %d pontos"
@@ -919,18 +927,23 @@ msgstr "Remover o Registo"
 msgid "Change Email"
 msgstr "Alterar e-mail"
 
-#: src/gui/charselectdialog.cpp:367 src/gui/serverdialog.cpp:248
+#: src/gui/charselectdialog.cpp:375 src/gui/serverdialog.cpp:248
 #: src/gui/setup_players.cpp:242 src/gui/shopwindow.cpp:117
 #: src/gui/shopwindow.cpp:120 src/gui/textcommandeditor.cpp:234
 msgid "Delete"
 msgstr "Eliminar"
 
-#: src/gui/charselectdialog.cpp:425
+#: src/gui/charselectdialog.cpp:433
 #, fuzzy
 msgid "Choose"
 msgstr "Fechar"
 
-#: src/gui/charselectdialog.cpp:439 src/gui/charselectdialog.cpp:440
+#: src/gui/charselectdialog.cpp:436
+#, fuzzy, c-format
+msgid "Level %d"
+msgstr "Nível: %d"
+
+#: src/gui/charselectdialog.cpp:447 src/gui/charselectdialog.cpp:448
 msgid "(empty)"
 msgstr ""
 
@@ -1158,14 +1171,14 @@ msgstr ""
 msgid "OK"
 msgstr "OK"
 
-#: src/gui/equipmentwindow.cpp:70 src/gui/windowmenu.cpp:70
+#: src/gui/equipmentwindow.cpp:72 src/gui/windowmenu.cpp:70
 msgid "Equipment"
 msgstr "Equipamento"
 
-#: src/gui/equipmentwindow.cpp:89 src/gui/inventorywindow.cpp:96
+#: src/gui/equipmentwindow.cpp:91 src/gui/inventorywindow.cpp:96
 #: src/gui/inventorywindow.cpp:393 src/gui/inventorywindow.cpp:402
-#: src/gui/popupmenu.cpp:1068 src/gui/popupmenu.cpp:1167
-#: src/gui/popupmenu.cpp:1207
+#: src/gui/popupmenu.cpp:1070 src/gui/popupmenu.cpp:1169
+#: src/gui/popupmenu.cpp:1209
 msgid "Unequip"
 msgstr "Desequipar"
 
@@ -1191,32 +1204,32 @@ msgid "Slots:"
 msgstr "Entradas:"
 
 #: src/gui/inventorywindow.cpp:94 src/gui/inventorywindow.cpp:395
-#: src/gui/inventorywindow.cpp:404 src/gui/popupmenu.cpp:1070
-#: src/gui/popupmenu.cpp:1169 src/gui/popupmenu.cpp:1209
+#: src/gui/inventorywindow.cpp:404 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:1073
-#: src/gui/popupmenu.cpp:1142 src/gui/popupmenu.cpp:1173
-#: src/gui/popupmenu.cpp:1212
+#: src/gui/inventorywindow.cpp:400 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/popupmenu.cpp:1076 src/gui/popupmenu.cpp:1177
-#: src/gui/popupmenu.cpp:1215
+#: 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:1081
-#: src/gui/popupmenu.cpp:1182 src/gui/popupmenu.cpp:1220
+#: src/gui/inventorywindow.cpp:110 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/popupmenu.cpp:408
+#: src/gui/popupmenu.cpp:409
 msgid "Outfits"
 msgstr ""
 
@@ -1225,17 +1238,17 @@ msgid "Weight:"
 msgstr "Peso:"
 
 #: src/gui/inventorywindow.cpp:133 src/gui/inventorywindow.cpp:490
-#: src/gui/popupmenu.cpp:1085 src/gui/popupmenu.cpp:1185
-#: src/gui/popupmenu.cpp:1223 src/gui/setup.cpp:65
+#: 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:1104
+#: src/gui/inventorywindow.cpp:134 src/gui/popupmenu.cpp:1106
 msgid "Retrieve"
 msgstr "Recuperar"
 
-#: src/gui/inventorywindow.cpp:501 src/gui/popupmenu.cpp:1078
-#: src/gui/popupmenu.cpp:1179 src/gui/popupmenu.cpp:1217
+#: src/gui/inventorywindow.cpp:501 src/gui/popupmenu.cpp:1080
+#: src/gui/popupmenu.cpp:1181 src/gui/popupmenu.cpp:1219
 #: src/gui/windowmenu.cpp:91
 msgid "Drop"
 msgstr "Largar"
@@ -1474,7 +1487,7 @@ msgstr "Enviar"
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:447
+#: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:448
 #, fuzzy
 msgid "Clear"
 msgstr "Lança"
@@ -1518,287 +1531,287 @@ msgstr "Desequipar"
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:116 src/gui/popupmenu.cpp:482
+#: src/gui/popupmenu.cpp:116 src/gui/popupmenu.cpp:483
 #, fuzzy
 msgid "@@trade|Trade@@"
 msgstr "@@trade|Negociar com %s@@"
 
 #. TRANSLATORS: Attacking a player.
-#: src/gui/popupmenu.cpp:118 src/gui/popupmenu.cpp:237
-#: src/gui/popupmenu.cpp:483
+#: src/gui/popupmenu.cpp:118 src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:484
 #, fuzzy
 msgid "@@attack|Attack@@"
 msgstr "@@attack|Atacar %s@@"
 
 #. TRANSLATORS: Whispering a player.
-#: src/gui/popupmenu.cpp:120 src/gui/popupmenu.cpp:289
+#: src/gui/popupmenu.cpp:120 src/gui/popupmenu.cpp:290
 #, fuzzy
 msgid "@@whisper|Whisper@@"
 msgstr "@@use|Usar@@"
 
-#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:487
+#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:488
 #, fuzzy
 msgid "@@heal|Heal@@"
 msgstr "@@cancel|Cancelar@@"
 
-#: src/gui/popupmenu.cpp:130 src/gui/popupmenu.cpp:295
-#: src/gui/popupmenu.cpp:493
+#: src/gui/popupmenu.cpp:130 src/gui/popupmenu.cpp:296
+#: src/gui/popupmenu.cpp:494
 #, fuzzy
 msgid "@@friend|Befriend@@"
 msgstr "@@retrieve|Retirar@@"
 
-#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:136
-#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:296
-#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:320
-#: src/gui/popupmenu.cpp:494 src/gui/popupmenu.cpp:499
-#: src/gui/popupmenu.cpp:517
+#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:137
+#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:297
+#: src/gui/popupmenu.cpp:303 src/gui/popupmenu.cpp:321
+#: src/gui/popupmenu.cpp:495 src/gui/popupmenu.cpp:501
+#: src/gui/popupmenu.cpp:519
 #, fuzzy
 msgid "@@disregard|Disregard@@"
 msgstr "@@disregard|Desconsiderar %s@@"
 
-#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:137
-#: src/gui/popupmenu.cpp:297 src/gui/popupmenu.cpp:303
-#: src/gui/popupmenu.cpp:495 src/gui/popupmenu.cpp:500
+#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:138
+#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:304
+#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:502
 #, fuzzy
 msgid "@@ignore|Ignore@@"
 msgstr "@@ignore|Ignorar %s@@"
 
-#: src/gui/popupmenu.cpp:133 src/gui/popupmenu.cpp:138
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:149
-#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:304
-#: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:315
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:501
-#: src/gui/popupmenu.cpp:507 src/gui/popupmenu.cpp:512
+#: src/gui/popupmenu.cpp:133 src/gui/popupmenu.cpp:139
+#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:150
+#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:305
+#: src/gui/popupmenu.cpp:311 src/gui/popupmenu.cpp:316
+#: src/gui/popupmenu.cpp:497 src/gui/popupmenu.cpp:503
+#: src/gui/popupmenu.cpp:509 src/gui/popupmenu.cpp:514
 #, fuzzy
 msgid "@@erase|Erase@@"
 msgstr "@@use|Usar@@"
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:148
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:308
-#: src/gui/popupmenu.cpp:314 src/gui/popupmenu.cpp:319
-#: src/gui/popupmenu.cpp:505 src/gui/popupmenu.cpp:511
-#: src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:143 src/gui/popupmenu.cpp:149
+#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:315 src/gui/popupmenu.cpp:320
+#: src/gui/popupmenu.cpp:507 src/gui/popupmenu.cpp:513
+#: src/gui/popupmenu.cpp:518
 #, fuzzy
 msgid "@@unignore|Unignore@@"
 msgstr "@@unignore|Deixar de ignorar %s@@"
 
-#: src/gui/popupmenu.cpp:143 src/gui/popupmenu.cpp:155
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:321
-#: src/gui/popupmenu.cpp:506 src/gui/popupmenu.cpp:518
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:156
+#: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:322
+#: src/gui/popupmenu.cpp:508 src/gui/popupmenu.cpp:520
 #, fuzzy
 msgid "@@ignore|Completely ignore@@"
 msgstr "@@ignore|Ignorar completamente %s@@"
 
-#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:329
-#: src/gui/popupmenu.cpp:526
+#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:330
+#: src/gui/popupmenu.cpp:528
 msgid "@@follow|Follow@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:330
-#: src/gui/popupmenu.cpp:527
+#: src/gui/popupmenu.cpp:165 src/gui/popupmenu.cpp:331
+#: src/gui/popupmenu.cpp:529
 msgid "@@imitation|Imitation@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:174 src/gui/popupmenu.cpp:546
+#: src/gui/popupmenu.cpp:175 src/gui/popupmenu.cpp:548
 #, fuzzy
 msgid "@@party|Invite to party@@"
 msgstr "/party > convidar um jogadora para a equipa"
 
-#: src/gui/popupmenu.cpp:179 src/gui/popupmenu.cpp:551
+#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:553
 #, fuzzy
 msgid "@@kick party|Kick from party@@"
 msgstr "@@admin-kick|Expulsar jogador@@"
 
-#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:337
-#: src/gui/popupmenu.cpp:565
+#: src/gui/popupmenu.cpp:195 src/gui/popupmenu.cpp:338
+#: src/gui/popupmenu.cpp:567
 #, fuzzy
 msgid "@@guild-kick|Kick from guild@@"
 msgstr "@@admin-kick|Expulsar jogador@@"
 
-#: src/gui/popupmenu.cpp:196 src/gui/popupmenu.cpp:338
-#: src/gui/popupmenu.cpp:567
+#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:339
+#: src/gui/popupmenu.cpp:569
 msgid "@@guild-pos|Change pos in guild >@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:201 src/gui/popupmenu.cpp:342
-#: src/gui/popupmenu.cpp:572
+#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:343
+#: src/gui/popupmenu.cpp:574
 #, fuzzy
 msgid "@@guild|Invite to guild@@"
 msgstr "/party > convidar um jogadora para a equipa"
 
-#: src/gui/popupmenu.cpp:208
+#: src/gui/popupmenu.cpp:209
 msgid "@@admin-kick|Kick player@@"
 msgstr "@@admin-kick|Expulsar jogador@@"
 
-#: src/gui/popupmenu.cpp:210
+#: src/gui/popupmenu.cpp:211
 msgid "@@nuke|Nuke@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:211 src/gui/popupmenu.cpp:231
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:232
+#: src/gui/popupmenu.cpp:530
 msgid "@@move|Move@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:529
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:531
 #, fuzzy
 msgid "@@undress|Undress@@"
 msgstr "@@unignore|Deixar de ignorar %s@@"
 
-#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:228
-#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:534
+#: src/gui/popupmenu.cpp:218 src/gui/popupmenu.cpp:229
+#: src/gui/popupmenu.cpp:350 src/gui/popupmenu.cpp:536
 msgid "@@buy|Buy@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:218 src/gui/popupmenu.cpp:229
-#: src/gui/popupmenu.cpp:350 src/gui/popupmenu.cpp:535
+#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:230
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:537
 #, fuzzy
 msgid "@@sell|Sell@@"
 msgstr "@@use|Usar@@"
 
-#: src/gui/popupmenu.cpp:226
+#: src/gui/popupmenu.cpp:227
 #, fuzzy
 msgid "@@talk|Talk@@"
 msgstr "@@attack|Atacar %s@@"
 
-#: src/gui/popupmenu.cpp:240
+#: src/gui/popupmenu.cpp:241
 #, fuzzy
 msgid "@@admin-kick|Kick@@"
 msgstr "@@admin-kick|Expulsar jogador@@"
 
-#: src/gui/popupmenu.cpp:248 src/gui/popupmenu.cpp:353
+#: src/gui/popupmenu.cpp:249 src/gui/popupmenu.cpp:354
 #, fuzzy
 msgid "@@name|Add name to chat@@"
 msgstr "@@name|Adiciona nome ao chat@@"
 
-#: src/gui/popupmenu.cpp:252 src/gui/popupmenu.cpp:272
-#: src/gui/popupmenu.cpp:357 src/gui/popupmenu.cpp:380
-#: src/gui/popupmenu.cpp:399 src/gui/popupmenu.cpp:412
-#: src/gui/popupmenu.cpp:430 src/gui/popupmenu.cpp:577
-#: src/gui/popupmenu.cpp:601
+#: src/gui/popupmenu.cpp:253 src/gui/popupmenu.cpp:273
+#: src/gui/popupmenu.cpp:358 src/gui/popupmenu.cpp:381
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:431 src/gui/popupmenu.cpp:579
+#: src/gui/popupmenu.cpp:603
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancel|Cancelar@@"
 
-#: src/gui/popupmenu.cpp:267
+#: src/gui/popupmenu.cpp:268
 #, c-format
 msgid "@@player_%u|%s >@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:375
+#: src/gui/popupmenu.cpp:376
 #, fuzzy
 msgid "@@pickup|Pick up@@"
 msgstr "@@pickup|Pegar %s@@"
 
-#: src/gui/popupmenu.cpp:376
+#: src/gui/popupmenu.cpp:377
 #, fuzzy
 msgid "@@chat|Add to chat@@"
 msgstr "@@chat|Adicionar ao chat@@"
 
-#: src/gui/popupmenu.cpp:394
+#: src/gui/popupmenu.cpp:395
 msgid "Map Item"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:395
+#: src/gui/popupmenu.cpp:396
 msgid "@@rename map|Rename@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:396
+#: src/gui/popupmenu.cpp:397
 msgid "@@remove map|Remove@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:409
+#: src/gui/popupmenu.cpp:410
 msgid "@@load old outfits|Load old outfits@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:425 src/gui/windowmenu.cpp:90
+#: src/gui/popupmenu.cpp:426 src/gui/windowmenu.cpp:90
 msgid "Spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:426
+#: src/gui/popupmenu.cpp:427
 msgid "@@load old spells|Load old spells@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:427
+#: src/gui/popupmenu.cpp:428
 #, fuzzy
 msgid "@@edit spell|Edit spell@@"
 msgstr "@@use|Usar@@"
 
-#: src/gui/popupmenu.cpp:445
+#: src/gui/popupmenu.cpp:446
 msgid "@@chat close|Close@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:453
+#: src/gui/popupmenu.cpp:454
 #, fuzzy
 msgid "Disable highlight"
 msgstr "Realçar aba"
 
-#: src/gui/popupmenu.cpp:459
+#: src/gui/popupmenu.cpp:460
 #, fuzzy
 msgid "Enable highlight"
 msgstr "Realçar aba"
 
-#: src/gui/popupmenu.cpp:465
+#: src/gui/popupmenu.cpp:466
 msgid "@@leave party|Leave@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:585
+#: src/gui/popupmenu.cpp:587
 #, fuzzy
 msgid "Change guild position"
 msgstr "Modificar"
 
-#: src/gui/popupmenu.cpp:598
+#: src/gui/popupmenu.cpp:600
 #, c-format
 msgid "@@guild-pos-%d|%s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:942
+#: src/gui/popupmenu.cpp:944
 msgid "Rename map sign          "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:943
+#: src/gui/popupmenu.cpp:945
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1091
+#: src/gui/popupmenu.cpp:1093
 #, fuzzy
 msgid "Store 10"
 msgstr "Guardar"
 
-#: src/gui/popupmenu.cpp:1094
+#: src/gui/popupmenu.cpp:1096
 #, fuzzy
 msgid "Store half"
 msgstr "Guardar"
 
-#: src/gui/popupmenu.cpp:1096
+#: src/gui/popupmenu.cpp:1098
 #, fuzzy
 msgid "Store all"
 msgstr "Guardar"
 
-#: src/gui/popupmenu.cpp:1110
+#: src/gui/popupmenu.cpp:1112
 #, fuzzy
 msgid "Retrieve 10"
 msgstr "Recuperar"
 
-#: src/gui/popupmenu.cpp:1113
+#: src/gui/popupmenu.cpp:1115
 #, fuzzy
 msgid "Retrieve half"
 msgstr "Recuperar"
 
-#: src/gui/popupmenu.cpp:1115
+#: src/gui/popupmenu.cpp:1117
 #, fuzzy
 msgid "Retrieve all"
 msgstr "Recuperar"
 
-#: src/gui/popupmenu.cpp:1118 src/gui/popupmenu.cpp:1186
-#: src/gui/popupmenu.cpp:1224
+#: src/gui/popupmenu.cpp:1120 src/gui/popupmenu.cpp:1188
+#: src/gui/popupmenu.cpp:1226
 #, fuzzy
 msgid "Add to chat"
 msgstr "@@chat|Adicionar ao chat@@"
 
-#: src/gui/popupmenu.cpp:1145 src/gui/popupmenu.cpp:1190
+#: src/gui/popupmenu.cpp:1147 src/gui/popupmenu.cpp:1192
 msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1228
+#: src/gui/popupmenu.cpp:1230
 msgid "Load old drop shortcuts"
 msgstr ""
 
@@ -3231,6 +3244,10 @@ msgstr ""
 msgid "Who Is Online - Update"
 msgstr ""
 
+#: src/gui/widgets/battletab.cpp:41
+msgid "Battle"
+msgstr ""
+
 #: src/gui/widgets/channeltab.cpp:49
 msgid "/users > Lists the users in the current channel"
 msgstr "/users > Lista os utilizadores deste canal"
@@ -3673,174 +3690,175 @@ msgstr "Próxima aba de chat"
 #: src/keyboardconfig.cpp:233 src/keyboardconfig.cpp:236
 #: src/keyboardconfig.cpp:238 src/keyboardconfig.cpp:240
 #: src/keyboardconfig.cpp:242 src/keyboardconfig.cpp:244
+#: src/keyboardconfig.cpp:246 src/keyboardconfig.cpp:248
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "Atalho para Emoticon %d"
 
-#: src/keyboardconfig.cpp:246
+#: src/keyboardconfig.cpp:250
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:248
+#: src/keyboardconfig.cpp:252
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:250
+#: src/keyboardconfig.cpp:254
 msgid "Copy Equiped to Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:252
+#: src/keyboardconfig.cpp:256
 msgid "Toggle Chat"
 msgstr "Alternar para chat"
 
-#: src/keyboardconfig.cpp:254
+#: src/keyboardconfig.cpp:258
 msgid "Scroll Chat Up"
 msgstr "Rolar janela de chat para cima"
 
-#: src/keyboardconfig.cpp:256
+#: src/keyboardconfig.cpp:260
 msgid "Scroll Chat Down"
 msgstr "Rolar janela de chat para baixo"
 
-#: src/keyboardconfig.cpp:258
+#: src/keyboardconfig.cpp:262
 msgid "Previous Chat Tab"
 msgstr "Aba de chat anterior"
 
-#: src/keyboardconfig.cpp:260
+#: src/keyboardconfig.cpp:264
 msgid "Next Chat Tab"
 msgstr "Próxima aba de chat"
 
-#: src/keyboardconfig.cpp:262
+#: src/keyboardconfig.cpp:266
 #, fuzzy
 msgid "Previous chat tab line"
 msgstr "Aba de chat anterior"
 
-#: src/keyboardconfig.cpp:264
+#: src/keyboardconfig.cpp:268
 #, fuzzy
 msgid "Next chat tab line"
 msgstr "Próxima aba de chat"
 
-#: src/keyboardconfig.cpp:266
+#: src/keyboardconfig.cpp:270
 msgid "Chat Auto Complete"
 msgstr ""
 
-#: src/keyboardconfig.cpp:268
+#: src/keyboardconfig.cpp:272
 msgid "Deactivate Chat Input"
 msgstr ""
 
-#: src/keyboardconfig.cpp:270
+#: src/keyboardconfig.cpp:274
 msgid "Select OK"
 msgstr "Seleccionar OK"
 
-#: src/keyboardconfig.cpp:272
+#: src/keyboardconfig.cpp:276
 msgid "Ignore input 1"
 msgstr "Ignorar input 1"
 
-#: src/keyboardconfig.cpp:274
+#: src/keyboardconfig.cpp:278
 msgid "Ignore input 2"
 msgstr "Ignorar input 2"
 
-#: src/keyboardconfig.cpp:276
+#: src/keyboardconfig.cpp:280
 msgid "Direct Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:277
+#: src/keyboardconfig.cpp:281
 #, fuzzy
 msgid "Direct Down"
 msgstr "Mover para Baixo"
 
-#: src/keyboardconfig.cpp:279
+#: src/keyboardconfig.cpp:283
 #, fuzzy
 msgid "Direct Left"
 msgstr "Mover para Esquerda"
 
-#: src/keyboardconfig.cpp:280
+#: src/keyboardconfig.cpp:284
 #, fuzzy
 msgid "Direct Right"
 msgstr "Mover para Direita"
 
-#: src/keyboardconfig.cpp:282
+#: src/keyboardconfig.cpp:286
 msgid "Crazy moves"
 msgstr ""
 
-#: src/keyboardconfig.cpp:284
+#: src/keyboardconfig.cpp:288
 msgid "Change Crazy Move mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:286
+#: src/keyboardconfig.cpp:290
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:288
+#: src/keyboardconfig.cpp:292
 msgid "Quick Drop N Items"
 msgstr ""
 
-#: src/keyboardconfig.cpp:290
+#: src/keyboardconfig.cpp:294
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/keyboardconfig.cpp:292
+#: src/keyboardconfig.cpp:296
 msgid "Quick heal target or self"
 msgstr ""
 
-#: src/keyboardconfig.cpp:294
+#: src/keyboardconfig.cpp:298
 msgid "Use #itenplz spell"
 msgstr ""
 
-#: src/keyboardconfig.cpp:296
+#: src/keyboardconfig.cpp:300
 msgid "Use magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboardconfig.cpp:302
 #, fuzzy
 msgid "Switch magic attack"
 msgstr "Mudar de personagem"
 
-#: src/keyboardconfig.cpp:300
+#: src/keyboardconfig.cpp:304
 #, fuzzy
 msgid "Change move type"
 msgstr "Servidor"
 
-#: src/keyboardconfig.cpp:302
+#: src/keyboardconfig.cpp:306
 msgid "Change Attack Weapon Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:304
+#: src/keyboardconfig.cpp:308
 #, fuzzy
 msgid "Change Attack Type"
 msgstr "Selecionar & Atacar"
 
-#: src/keyboardconfig.cpp:306
+#: src/keyboardconfig.cpp:310
 #, fuzzy
 msgid "Change Follow mode"
 msgstr "Alterar Senha"
 
-#: src/keyboardconfig.cpp:308
+#: src/keyboardconfig.cpp:312
 #, fuzzy
 msgid "Change Imitation mode"
 msgstr "Alterar e-mail"
 
-#: src/keyboardconfig.cpp:311
+#: src/keyboardconfig.cpp:315
 msgid "Disbale / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboardconfig.cpp:316
 msgid "On / Off audio"
 msgstr ""
 
-#: src/keyboardconfig.cpp:314
+#: src/keyboardconfig.cpp:318
 #, fuzzy
 msgid "Enable / Disable away mode"
 msgstr "Habilitar/Desabilitar Negociações"
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboardconfig.cpp:320
 msgid "Emulate right click from keyboard"
 msgstr ""
 
-#: src/keyboardconfig.cpp:318
+#: src/keyboardconfig.cpp:322
 msgid "Toggle camera mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:380
+#: src/keyboardconfig.cpp:384
 #, fuzzy, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -4107,7 +4125,7 @@ msgstr " Clique em OK para re-popular."
 msgid "You Died"
 msgstr "Você morreu"
 
-#: src/net/manaserv/charhandler.cpp:144 src/net/manaserv/charhandler.cpp:215
+#: src/net/manaserv/charhandler.cpp:144 src/net/manaserv/charhandler.cpp:218
 #, fuzzy
 msgid "Not logged in."
 msgstr "Já está conectado"
@@ -4152,7 +4170,11 @@ msgstr "Estatisticas da personagem OK"
 msgid "At least one statis out of the permitted range: (%u - %u)."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:177 src/net/manaserv/loginhandler.cpp:98
+#: src/net/manaserv/charhandler.cpp:177
+msgid "Invalid slot number."
+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
@@ -4160,26 +4182,26 @@ msgstr ""
 msgid "Unknown error."
 msgstr "Erro desconhecido"
 
-#: src/net/manaserv/charhandler.cpp:206 src/net/tmwa/charserverhandler.cpp:149
+#: src/net/manaserv/charhandler.cpp:209 src/net/tmwa/charserverhandler.cpp:149
 msgid "Info"
 msgstr "Info"
 
-#: src/net/manaserv/charhandler.cpp:206
+#: src/net/manaserv/charhandler.cpp:209
 #, fuzzy
 msgid "Player deleted."
 msgstr "Personagem apagado."
 
-#: src/net/manaserv/charhandler.cpp:218
+#: src/net/manaserv/charhandler.cpp:221
 #, fuzzy
 msgid "Selection out of range."
 msgstr "Seleccionar a quantidade de itens a negociar."
 
-#: src/net/manaserv/charhandler.cpp:221
+#: src/net/manaserv/charhandler.cpp:224
 #, fuzzy, c-format
 msgid "Unknown error (%d)."
 msgstr "Erro desconhecido"
 
-#: src/net/manaserv/charhandler.cpp:257
+#: src/net/manaserv/charhandler.cpp:260
 msgid "No gameservers are available."
 msgstr "Não há gameservers disponíveis."
 
@@ -4372,11 +4394,11 @@ msgstr "%s quer negociar com você, você aceita?"
 msgid "Trading with %s"
 msgstr "Negociando com %s"
 
-#: src/net/manaserv/tradehandler.cpp:159 src/net/tmwa/tradehandler.cpp:268
+#: src/net/manaserv/tradehandler.cpp:159 src/net/tmwa/tradehandler.cpp:273
 msgid "Trade canceled."
 msgstr "Negociação cancelada."
 
-#: src/net/manaserv/tradehandler.cpp:166 src/net/tmwa/tradehandler.cpp:278
+#: src/net/manaserv/tradehandler.cpp:166 src/net/tmwa/tradehandler.cpp:283
 msgid "Trade completed."
 msgstr "Negociação realizada."
 
@@ -4861,11 +4883,11 @@ msgstr "Não é possível partilhar experiência."
 msgid "Experience sharing unknown."
 msgstr "Partilha de experiência habilitado."
 
-#: src/net/tmwa/inventoryhandler.cpp:329
+#: src/net/tmwa/inventoryhandler.cpp:334
 msgid "Failed to use item."
 msgstr "Problemas ao usar item."
 
-#: src/net/tmwa/inventoryhandler.cpp:452
+#: src/net/tmwa/inventoryhandler.cpp:457
 msgid "Unable to equip."
 msgstr "Impossível equipar."
 
@@ -5198,7 +5220,13 @@ msgstr "Erro ao adicionar item. Parceiro de negócios carregando muito peso."
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr "Erro ao adicionar item. Parceiro de negócios não tem slots livres."
 
-#: src/net/tmwa/tradehandler.cpp:250
+#: src/net/tmwa/tradehandler.cpp:251
+#, fuzzy
+msgid "Failed adding item. You cant trade this item."
+msgstr ""
+"Falha ao adicionar item. Você não pode duplicar um tipo de item na janela."
+
+#: src/net/tmwa/tradehandler.cpp:255
 msgid "Failed adding item for unknown reason."
 msgstr "Erro ao adicionar item devido a um motivo desconhecido."
 
@@ -5223,6 +5251,11 @@ msgstr ""
 msgid "Floating bubble"
 msgstr ""
 
+#: src/resources/beinginfo.cpp:32 src/resources/itemdb.cpp:210
+#: src/resources/monsterdb.cpp:78
+msgid "unnamed"
+msgstr "sem nome"
+
 #: src/resources/itemdb.cpp:55
 #, c-format
 msgid "Attack %+d"
@@ -5247,10 +5280,6 @@ msgstr "MP %+d"
 msgid "Unknown item"
 msgstr "Item desconhecido"
 
-#: src/resources/itemdb.cpp:210 src/resources/monsterdb.cpp:78
-msgid "unnamed"
-msgstr "sem nome"
-
 #, fuzzy
 #~ msgid "Particle detail: %s"
 #~ msgstr "Detalhe de partículas"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index e1f68a29a..02e5f95ed 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: 2010-12-24 19:29+0200\n"
+"POT-Creation-Date: 2011-01-05 04:50+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"
@@ -19,6 +19,14 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
+#: src/being.cpp:480
+msgid "dodge"
+msgstr ""
+
+#: src/being.cpp:480
+msgid "miss"
+msgstr ""
+
 #: src/client.cpp:724 src/gui/setup.cpp:47 src/gui/windowmenu.cpp:92
 msgid "Setup"
 msgstr "Configurar"
@@ -54,9 +62,9 @@ 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:179 src/gui/register.cpp:225
+#: src/gui/charcreatedialog.cpp:185 src/gui/register.cpp:225
 #: src/gui/serverdialog.cpp:350 src/gui/unregisterdialog.cpp:134
-#: src/net/manaserv/charhandler.cpp:180 src/net/manaserv/charhandler.cpp:223
+#: src/net/manaserv/charhandler.cpp:183 src/net/manaserv/charhandler.cpp:226
 #: src/net/tmwa/charserverhandler.cpp:137
 #: src/net/tmwa/charserverhandler.cpp:154
 msgid "Error"
@@ -653,12 +661,12 @@ msgstr "Ignorando propostas de negócios"
 msgid "Accepting incoming trade requests"
 msgstr "Aceitando propostas de negócios"
 
-#: src/game.cpp:1373
+#: src/game.cpp:1376
 #, fuzzy
 msgid "Could Not Load Map"
 msgstr "Impossível carregar mapa"
 
-#: src/game.cpp:1374
+#: src/game.cpp:1377
 #, c-format
 msgid "Error while loading %s"
 msgstr "Erro ao carregar %s"
@@ -736,7 +744,7 @@ 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/keyboardconfig.cpp:271
+#: src/keyboardconfig.cpp:275
 msgid "Quit"
 msgstr "Sair"
 
@@ -758,9 +766,9 @@ msgstr "Vender"
 #: src/gui/buysell.cpp:62 src/gui/changeemaildialog.cpp:56
 #: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
 #: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:206
-#: src/gui/npcpostdialog.cpp:55 src/gui/popupmenu.cpp:1120
-#: src/gui/popupmenu.cpp:1147 src/gui/popupmenu.cpp:1192
-#: src/gui/popupmenu.cpp:1230 src/gui/quitdialog.cpp:54
+#: src/gui/npcpostdialog.cpp:55 src/gui/popupmenu.cpp:1122
+#: src/gui/popupmenu.cpp:1149 src/gui/popupmenu.cpp:1194
+#: src/gui/popupmenu.cpp:1232 src/gui/quitdialog.cpp:54
 #: src/gui/register.cpp:79 src/gui/setup.cpp:64 src/gui/socialwindow.cpp:786
 #: src/gui/textcommandeditor.cpp:231 src/gui/textdialog.cpp:44
 #: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:153
@@ -862,7 +870,7 @@ msgstr "Cor do Cabelo:"
 msgid "Hair style:"
 msgstr "Estilo do Cabelo:"
 
-#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:437
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:445
 #: src/gui/socialwindow.cpp:846
 msgid "Create"
 msgstr "Criar"
@@ -875,20 +883,20 @@ msgstr "Homem"
 msgid "Female"
 msgstr "Mulher"
 
-#: src/gui/charcreatedialog.cpp:99 src/gui/charcreatedialog.cpp:251
+#: src/gui/charcreatedialog.cpp:99 src/gui/charcreatedialog.cpp:257
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Por favor distribua %d pontos"
 
-#: src/gui/charcreatedialog.cpp:180
+#: src/gui/charcreatedialog.cpp:186
 msgid "Your name needs to be at least 4 characters."
 msgstr "Seu nome precisa ter no mínimo 4 caracteres."
 
-#: src/gui/charcreatedialog.cpp:242
+#: src/gui/charcreatedialog.cpp:248
 msgid "Character stats OK"
 msgstr "Status do personagem OK"
 
-#: src/gui/charcreatedialog.cpp:256
+#: src/gui/charcreatedialog.cpp:262
 #, c-format
 msgid "Please remove %d points"
 msgstr "Por favor remova %d pontos"
@@ -919,18 +927,23 @@ msgstr "Cancelar Registro"
 msgid "Change Email"
 msgstr "Alterar e-mail"
 
-#: src/gui/charselectdialog.cpp:367 src/gui/serverdialog.cpp:248
+#: src/gui/charselectdialog.cpp:375 src/gui/serverdialog.cpp:248
 #: src/gui/setup_players.cpp:242 src/gui/shopwindow.cpp:117
 #: src/gui/shopwindow.cpp:120 src/gui/textcommandeditor.cpp:234
 msgid "Delete"
 msgstr "Excluir"
 
-#: src/gui/charselectdialog.cpp:425
+#: src/gui/charselectdialog.cpp:433
 #, fuzzy
 msgid "Choose"
 msgstr "Fechar"
 
-#: src/gui/charselectdialog.cpp:439 src/gui/charselectdialog.cpp:440
+#: src/gui/charselectdialog.cpp:436
+#, fuzzy, c-format
+msgid "Level %d"
+msgstr "Nível: %d"
+
+#: src/gui/charselectdialog.cpp:447 src/gui/charselectdialog.cpp:448
 msgid "(empty)"
 msgstr ""
 
@@ -1158,14 +1171,14 @@ msgstr ""
 msgid "OK"
 msgstr "OK"
 
-#: src/gui/equipmentwindow.cpp:70 src/gui/windowmenu.cpp:70
+#: src/gui/equipmentwindow.cpp:72 src/gui/windowmenu.cpp:70
 msgid "Equipment"
 msgstr "Equipamento"
 
-#: src/gui/equipmentwindow.cpp:89 src/gui/inventorywindow.cpp:96
+#: src/gui/equipmentwindow.cpp:91 src/gui/inventorywindow.cpp:96
 #: src/gui/inventorywindow.cpp:393 src/gui/inventorywindow.cpp:402
-#: src/gui/popupmenu.cpp:1068 src/gui/popupmenu.cpp:1167
-#: src/gui/popupmenu.cpp:1207
+#: src/gui/popupmenu.cpp:1070 src/gui/popupmenu.cpp:1169
+#: src/gui/popupmenu.cpp:1209
 msgid "Unequip"
 msgstr "Desequipar"
 
@@ -1191,32 +1204,32 @@ msgid "Slots:"
 msgstr "Entradas:"
 
 #: src/gui/inventorywindow.cpp:94 src/gui/inventorywindow.cpp:395
-#: src/gui/inventorywindow.cpp:404 src/gui/popupmenu.cpp:1070
-#: src/gui/popupmenu.cpp:1169 src/gui/popupmenu.cpp:1209
+#: src/gui/inventorywindow.cpp:404 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:1073
-#: src/gui/popupmenu.cpp:1142 src/gui/popupmenu.cpp:1173
-#: src/gui/popupmenu.cpp:1212
+#: src/gui/inventorywindow.cpp:400 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/popupmenu.cpp:1076 src/gui/popupmenu.cpp:1177
-#: src/gui/popupmenu.cpp:1215
+#: 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:1081
-#: src/gui/popupmenu.cpp:1182 src/gui/popupmenu.cpp:1220
+#: src/gui/inventorywindow.cpp:110 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/popupmenu.cpp:408
+#: src/gui/popupmenu.cpp:409
 msgid "Outfits"
 msgstr ""
 
@@ -1225,17 +1238,17 @@ msgid "Weight:"
 msgstr "Peso:"
 
 #: src/gui/inventorywindow.cpp:133 src/gui/inventorywindow.cpp:490
-#: src/gui/popupmenu.cpp:1085 src/gui/popupmenu.cpp:1185
-#: src/gui/popupmenu.cpp:1223 src/gui/setup.cpp:65
+#: 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:1104
+#: src/gui/inventorywindow.cpp:134 src/gui/popupmenu.cpp:1106
 msgid "Retrieve"
 msgstr "Retirar"
 
-#: src/gui/inventorywindow.cpp:501 src/gui/popupmenu.cpp:1078
-#: src/gui/popupmenu.cpp:1179 src/gui/popupmenu.cpp:1217
+#: src/gui/inventorywindow.cpp:501 src/gui/popupmenu.cpp:1080
+#: src/gui/popupmenu.cpp:1181 src/gui/popupmenu.cpp:1219
 #: src/gui/windowmenu.cpp:91
 msgid "Drop"
 msgstr "Descartar"
@@ -1474,7 +1487,7 @@ msgstr "Confirmar"
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:447
+#: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:448
 #, fuzzy
 msgid "Clear"
 msgstr "Lança"
@@ -1518,287 +1531,287 @@ msgstr "Desequipar"
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:116 src/gui/popupmenu.cpp:482
+#: src/gui/popupmenu.cpp:116 src/gui/popupmenu.cpp:483
 #, fuzzy
 msgid "@@trade|Trade@@"
 msgstr "@@trade|Negociar com %s@@"
 
 #. TRANSLATORS: Attacking a player.
-#: src/gui/popupmenu.cpp:118 src/gui/popupmenu.cpp:237
-#: src/gui/popupmenu.cpp:483
+#: src/gui/popupmenu.cpp:118 src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:484
 #, fuzzy
 msgid "@@attack|Attack@@"
 msgstr "@@attack|Atacar %s@@"
 
 #. TRANSLATORS: Whispering a player.
-#: src/gui/popupmenu.cpp:120 src/gui/popupmenu.cpp:289
+#: src/gui/popupmenu.cpp:120 src/gui/popupmenu.cpp:290
 #, fuzzy
 msgid "@@whisper|Whisper@@"
 msgstr "@@use|Usar@@"
 
-#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:487
+#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:488
 #, fuzzy
 msgid "@@heal|Heal@@"
 msgstr "@@cancel|Cancelar@@"
 
-#: src/gui/popupmenu.cpp:130 src/gui/popupmenu.cpp:295
-#: src/gui/popupmenu.cpp:493
+#: src/gui/popupmenu.cpp:130 src/gui/popupmenu.cpp:296
+#: src/gui/popupmenu.cpp:494
 #, fuzzy
 msgid "@@friend|Befriend@@"
 msgstr "@@retrieve|Retirar@@"
 
-#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:136
-#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:296
-#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:320
-#: src/gui/popupmenu.cpp:494 src/gui/popupmenu.cpp:499
-#: src/gui/popupmenu.cpp:517
+#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:137
+#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:297
+#: src/gui/popupmenu.cpp:303 src/gui/popupmenu.cpp:321
+#: src/gui/popupmenu.cpp:495 src/gui/popupmenu.cpp:501
+#: src/gui/popupmenu.cpp:519
 #, fuzzy
 msgid "@@disregard|Disregard@@"
 msgstr "@@disregard|Desconsiderar %s@@"
 
-#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:137
-#: src/gui/popupmenu.cpp:297 src/gui/popupmenu.cpp:303
-#: src/gui/popupmenu.cpp:495 src/gui/popupmenu.cpp:500
+#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:138
+#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:304
+#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:502
 #, fuzzy
 msgid "@@ignore|Ignore@@"
 msgstr "@@ignore|Ignorar %s@@"
 
-#: src/gui/popupmenu.cpp:133 src/gui/popupmenu.cpp:138
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:149
-#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:304
-#: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:315
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:501
-#: src/gui/popupmenu.cpp:507 src/gui/popupmenu.cpp:512
+#: src/gui/popupmenu.cpp:133 src/gui/popupmenu.cpp:139
+#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:150
+#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:305
+#: src/gui/popupmenu.cpp:311 src/gui/popupmenu.cpp:316
+#: src/gui/popupmenu.cpp:497 src/gui/popupmenu.cpp:503
+#: src/gui/popupmenu.cpp:509 src/gui/popupmenu.cpp:514
 #, fuzzy
 msgid "@@erase|Erase@@"
 msgstr "@@use|Usar@@"
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:148
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:308
-#: src/gui/popupmenu.cpp:314 src/gui/popupmenu.cpp:319
-#: src/gui/popupmenu.cpp:505 src/gui/popupmenu.cpp:511
-#: src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:143 src/gui/popupmenu.cpp:149
+#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:315 src/gui/popupmenu.cpp:320
+#: src/gui/popupmenu.cpp:507 src/gui/popupmenu.cpp:513
+#: src/gui/popupmenu.cpp:518
 #, fuzzy
 msgid "@@unignore|Unignore@@"
 msgstr "@@unignore|Deixar de ignorar %s@@"
 
-#: src/gui/popupmenu.cpp:143 src/gui/popupmenu.cpp:155
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:321
-#: src/gui/popupmenu.cpp:506 src/gui/popupmenu.cpp:518
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:156
+#: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:322
+#: src/gui/popupmenu.cpp:508 src/gui/popupmenu.cpp:520
 #, fuzzy
 msgid "@@ignore|Completely ignore@@"
 msgstr "@@ignore|Ignorar completamente %s@@"
 
-#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:329
-#: src/gui/popupmenu.cpp:526
+#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:330
+#: src/gui/popupmenu.cpp:528
 msgid "@@follow|Follow@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:330
-#: src/gui/popupmenu.cpp:527
+#: src/gui/popupmenu.cpp:165 src/gui/popupmenu.cpp:331
+#: src/gui/popupmenu.cpp:529
 msgid "@@imitation|Imitation@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:174 src/gui/popupmenu.cpp:546
+#: src/gui/popupmenu.cpp:175 src/gui/popupmenu.cpp:548
 #, fuzzy
 msgid "@@party|Invite to party@@"
 msgstr "/party > Convidar um usuário para o grupo"
 
-#: src/gui/popupmenu.cpp:179 src/gui/popupmenu.cpp:551
+#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:553
 #, fuzzy
 msgid "@@kick party|Kick from party@@"
 msgstr "@@admin-kick|Expulsar jogador@@"
 
-#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:337
-#: src/gui/popupmenu.cpp:565
+#: src/gui/popupmenu.cpp:195 src/gui/popupmenu.cpp:338
+#: src/gui/popupmenu.cpp:567
 #, fuzzy
 msgid "@@guild-kick|Kick from guild@@"
 msgstr "@@admin-kick|Expulsar jogador@@"
 
-#: src/gui/popupmenu.cpp:196 src/gui/popupmenu.cpp:338
-#: src/gui/popupmenu.cpp:567
+#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:339
+#: src/gui/popupmenu.cpp:569
 msgid "@@guild-pos|Change pos in guild >@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:201 src/gui/popupmenu.cpp:342
-#: src/gui/popupmenu.cpp:572
+#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:343
+#: src/gui/popupmenu.cpp:574
 #, fuzzy
 msgid "@@guild|Invite to guild@@"
 msgstr "/party > Convidar um usuário para o grupo"
 
-#: src/gui/popupmenu.cpp:208
+#: src/gui/popupmenu.cpp:209
 msgid "@@admin-kick|Kick player@@"
 msgstr "@@admin-kick|Expulsar jogador@@"
 
-#: src/gui/popupmenu.cpp:210
+#: src/gui/popupmenu.cpp:211
 msgid "@@nuke|Nuke@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:211 src/gui/popupmenu.cpp:231
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:232
+#: src/gui/popupmenu.cpp:530
 msgid "@@move|Move@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:529
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:531
 #, fuzzy
 msgid "@@undress|Undress@@"
 msgstr "@@unignore|Deixar de ignorar %s@@"
 
-#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:228
-#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:534
+#: src/gui/popupmenu.cpp:218 src/gui/popupmenu.cpp:229
+#: src/gui/popupmenu.cpp:350 src/gui/popupmenu.cpp:536
 msgid "@@buy|Buy@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:218 src/gui/popupmenu.cpp:229
-#: src/gui/popupmenu.cpp:350 src/gui/popupmenu.cpp:535
+#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:230
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:537
 #, fuzzy
 msgid "@@sell|Sell@@"
 msgstr "@@use|Usar@@"
 
-#: src/gui/popupmenu.cpp:226
+#: src/gui/popupmenu.cpp:227
 #, fuzzy
 msgid "@@talk|Talk@@"
 msgstr "@@attack|Atacar %s@@"
 
-#: src/gui/popupmenu.cpp:240
+#: src/gui/popupmenu.cpp:241
 #, fuzzy
 msgid "@@admin-kick|Kick@@"
 msgstr "@@admin-kick|Expulsar jogador@@"
 
-#: src/gui/popupmenu.cpp:248 src/gui/popupmenu.cpp:353
+#: src/gui/popupmenu.cpp:249 src/gui/popupmenu.cpp:354
 #, fuzzy
 msgid "@@name|Add name to chat@@"
 msgstr "@@name|Adiciona nome ao chat@@"
 
-#: src/gui/popupmenu.cpp:252 src/gui/popupmenu.cpp:272
-#: src/gui/popupmenu.cpp:357 src/gui/popupmenu.cpp:380
-#: src/gui/popupmenu.cpp:399 src/gui/popupmenu.cpp:412
-#: src/gui/popupmenu.cpp:430 src/gui/popupmenu.cpp:577
-#: src/gui/popupmenu.cpp:601
+#: src/gui/popupmenu.cpp:253 src/gui/popupmenu.cpp:273
+#: src/gui/popupmenu.cpp:358 src/gui/popupmenu.cpp:381
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:431 src/gui/popupmenu.cpp:579
+#: src/gui/popupmenu.cpp:603
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancel|Cancelar@@"
 
-#: src/gui/popupmenu.cpp:267
+#: src/gui/popupmenu.cpp:268
 #, c-format
 msgid "@@player_%u|%s >@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:375
+#: src/gui/popupmenu.cpp:376
 #, fuzzy
 msgid "@@pickup|Pick up@@"
 msgstr "@@pickup|Pegar %s@@"
 
-#: src/gui/popupmenu.cpp:376
+#: src/gui/popupmenu.cpp:377
 #, fuzzy
 msgid "@@chat|Add to chat@@"
 msgstr "@@chat|Adicionar ao chat@@"
 
-#: src/gui/popupmenu.cpp:394
+#: src/gui/popupmenu.cpp:395
 msgid "Map Item"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:395
+#: src/gui/popupmenu.cpp:396
 msgid "@@rename map|Rename@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:396
+#: src/gui/popupmenu.cpp:397
 msgid "@@remove map|Remove@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:409
+#: src/gui/popupmenu.cpp:410
 msgid "@@load old outfits|Load old outfits@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:425 src/gui/windowmenu.cpp:90
+#: src/gui/popupmenu.cpp:426 src/gui/windowmenu.cpp:90
 msgid "Spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:426
+#: src/gui/popupmenu.cpp:427
 msgid "@@load old spells|Load old spells@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:427
+#: src/gui/popupmenu.cpp:428
 #, fuzzy
 msgid "@@edit spell|Edit spell@@"
 msgstr "@@use|Usar@@"
 
-#: src/gui/popupmenu.cpp:445
+#: src/gui/popupmenu.cpp:446
 msgid "@@chat close|Close@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:453
+#: src/gui/popupmenu.cpp:454
 #, fuzzy
 msgid "Disable highlight"
 msgstr "Realçar aba"
 
-#: src/gui/popupmenu.cpp:459
+#: src/gui/popupmenu.cpp:460
 #, fuzzy
 msgid "Enable highlight"
 msgstr "Realçar aba"
 
-#: src/gui/popupmenu.cpp:465
+#: src/gui/popupmenu.cpp:466
 msgid "@@leave party|Leave@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:585
+#: src/gui/popupmenu.cpp:587
 #, fuzzy
 msgid "Change guild position"
 msgstr "Mudar"
 
-#: src/gui/popupmenu.cpp:598
+#: src/gui/popupmenu.cpp:600
 #, c-format
 msgid "@@guild-pos-%d|%s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:942
+#: src/gui/popupmenu.cpp:944
 msgid "Rename map sign          "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:943
+#: src/gui/popupmenu.cpp:945
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1091
+#: src/gui/popupmenu.cpp:1093
 #, fuzzy
 msgid "Store 10"
 msgstr "Guardar"
 
-#: src/gui/popupmenu.cpp:1094
+#: src/gui/popupmenu.cpp:1096
 #, fuzzy
 msgid "Store half"
 msgstr "Guardar"
 
-#: src/gui/popupmenu.cpp:1096
+#: src/gui/popupmenu.cpp:1098
 #, fuzzy
 msgid "Store all"
 msgstr "Guardar"
 
-#: src/gui/popupmenu.cpp:1110
+#: src/gui/popupmenu.cpp:1112
 #, fuzzy
 msgid "Retrieve 10"
 msgstr "Retirar"
 
-#: src/gui/popupmenu.cpp:1113
+#: src/gui/popupmenu.cpp:1115
 #, fuzzy
 msgid "Retrieve half"
 msgstr "Retirar"
 
-#: src/gui/popupmenu.cpp:1115
+#: src/gui/popupmenu.cpp:1117
 #, fuzzy
 msgid "Retrieve all"
 msgstr "Retirar"
 
-#: src/gui/popupmenu.cpp:1118 src/gui/popupmenu.cpp:1186
-#: src/gui/popupmenu.cpp:1224
+#: src/gui/popupmenu.cpp:1120 src/gui/popupmenu.cpp:1188
+#: src/gui/popupmenu.cpp:1226
 #, fuzzy
 msgid "Add to chat"
 msgstr "@@chat|Adicionar ao chat@@"
 
-#: src/gui/popupmenu.cpp:1145 src/gui/popupmenu.cpp:1190
+#: src/gui/popupmenu.cpp:1147 src/gui/popupmenu.cpp:1192
 msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1228
+#: src/gui/popupmenu.cpp:1230
 msgid "Load old drop shortcuts"
 msgstr ""
 
@@ -3232,6 +3245,10 @@ msgstr ""
 msgid "Who Is Online - Update"
 msgstr ""
 
+#: src/gui/widgets/battletab.cpp:41
+msgid "Battle"
+msgstr ""
+
 #: src/gui/widgets/channeltab.cpp:49
 msgid "/users > Lists the users in the current channel"
 msgstr "/users > Listar os usuários deste canal"
@@ -3674,174 +3691,175 @@ msgstr "Próxima aba de chat"
 #: src/keyboardconfig.cpp:233 src/keyboardconfig.cpp:236
 #: src/keyboardconfig.cpp:238 src/keyboardconfig.cpp:240
 #: src/keyboardconfig.cpp:242 src/keyboardconfig.cpp:244
+#: src/keyboardconfig.cpp:246 src/keyboardconfig.cpp:248
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "Atalho para Emoticon %d"
 
-#: src/keyboardconfig.cpp:246
+#: src/keyboardconfig.cpp:250
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:248
+#: src/keyboardconfig.cpp:252
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:250
+#: src/keyboardconfig.cpp:254
 msgid "Copy Equiped to Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:252
+#: src/keyboardconfig.cpp:256
 msgid "Toggle Chat"
 msgstr "Alternar para chat"
 
-#: src/keyboardconfig.cpp:254
+#: src/keyboardconfig.cpp:258
 msgid "Scroll Chat Up"
 msgstr "Rolar janela de chat para cima"
 
-#: src/keyboardconfig.cpp:256
+#: src/keyboardconfig.cpp:260
 msgid "Scroll Chat Down"
 msgstr "Rolar janela de chat para baixo"
 
-#: src/keyboardconfig.cpp:258
+#: src/keyboardconfig.cpp:262
 msgid "Previous Chat Tab"
 msgstr "Aba de chat anterior"
 
-#: src/keyboardconfig.cpp:260
+#: src/keyboardconfig.cpp:264
 msgid "Next Chat Tab"
 msgstr "Próxima aba de chat"
 
-#: src/keyboardconfig.cpp:262
+#: src/keyboardconfig.cpp:266
 #, fuzzy
 msgid "Previous chat tab line"
 msgstr "Aba de chat anterior"
 
-#: src/keyboardconfig.cpp:264
+#: src/keyboardconfig.cpp:268
 #, fuzzy
 msgid "Next chat tab line"
 msgstr "Próxima aba de chat"
 
-#: src/keyboardconfig.cpp:266
+#: src/keyboardconfig.cpp:270
 msgid "Chat Auto Complete"
 msgstr ""
 
-#: src/keyboardconfig.cpp:268
+#: src/keyboardconfig.cpp:272
 msgid "Deactivate Chat Input"
 msgstr ""
 
-#: src/keyboardconfig.cpp:270
+#: src/keyboardconfig.cpp:274
 msgid "Select OK"
 msgstr "Selecionar OK"
 
-#: src/keyboardconfig.cpp:272
+#: src/keyboardconfig.cpp:276
 msgid "Ignore input 1"
 msgstr "Ignorar input 1"
 
-#: src/keyboardconfig.cpp:274
+#: src/keyboardconfig.cpp:278
 msgid "Ignore input 2"
 msgstr "Ignorar input 2"
 
-#: src/keyboardconfig.cpp:276
+#: src/keyboardconfig.cpp:280
 msgid "Direct Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:277
+#: src/keyboardconfig.cpp:281
 #, fuzzy
 msgid "Direct Down"
 msgstr "Mover para Baixo"
 
-#: src/keyboardconfig.cpp:279
+#: src/keyboardconfig.cpp:283
 #, fuzzy
 msgid "Direct Left"
 msgstr "Esquerda"
 
-#: src/keyboardconfig.cpp:280
+#: src/keyboardconfig.cpp:284
 #, fuzzy
 msgid "Direct Right"
 msgstr "Direita"
 
-#: src/keyboardconfig.cpp:282
+#: src/keyboardconfig.cpp:286
 msgid "Crazy moves"
 msgstr ""
 
-#: src/keyboardconfig.cpp:284
+#: src/keyboardconfig.cpp:288
 msgid "Change Crazy Move mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:286
+#: src/keyboardconfig.cpp:290
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:288
+#: src/keyboardconfig.cpp:292
 msgid "Quick Drop N Items"
 msgstr ""
 
-#: src/keyboardconfig.cpp:290
+#: src/keyboardconfig.cpp:294
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/keyboardconfig.cpp:292
+#: src/keyboardconfig.cpp:296
 msgid "Quick heal target or self"
 msgstr ""
 
-#: src/keyboardconfig.cpp:294
+#: src/keyboardconfig.cpp:298
 msgid "Use #itenplz spell"
 msgstr ""
 
-#: src/keyboardconfig.cpp:296
+#: src/keyboardconfig.cpp:300
 msgid "Use magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboardconfig.cpp:302
 #, fuzzy
 msgid "Switch magic attack"
 msgstr "Trocar de Personagem"
 
-#: src/keyboardconfig.cpp:300
+#: src/keyboardconfig.cpp:304
 #, fuzzy
 msgid "Change move type"
 msgstr "Servidor"
 
-#: src/keyboardconfig.cpp:302
+#: src/keyboardconfig.cpp:306
 msgid "Change Attack Weapon Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:304
+#: src/keyboardconfig.cpp:308
 #, fuzzy
 msgid "Change Attack Type"
 msgstr "Selecionar & Atacar"
 
-#: src/keyboardconfig.cpp:306
+#: src/keyboardconfig.cpp:310
 #, fuzzy
 msgid "Change Follow mode"
 msgstr "Alterar senha"
 
-#: src/keyboardconfig.cpp:308
+#: src/keyboardconfig.cpp:312
 #, fuzzy
 msgid "Change Imitation mode"
 msgstr "Alterar e-mail"
 
-#: src/keyboardconfig.cpp:311
+#: src/keyboardconfig.cpp:315
 msgid "Disbale / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboardconfig.cpp:316
 msgid "On / Off audio"
 msgstr ""
 
-#: src/keyboardconfig.cpp:314
+#: src/keyboardconfig.cpp:318
 #, fuzzy
 msgid "Enable / Disable away mode"
 msgstr "Habilitar/Desabilitar Negociações"
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboardconfig.cpp:320
 msgid "Emulate right click from keyboard"
 msgstr ""
 
-#: src/keyboardconfig.cpp:318
+#: src/keyboardconfig.cpp:322
 msgid "Toggle camera mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:380
+#: src/keyboardconfig.cpp:384
 #, fuzzy, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -4110,7 +4128,7 @@ msgstr " Clique em OK para repopular."
 msgid "You Died"
 msgstr "Você morreu"
 
-#: src/net/manaserv/charhandler.cpp:144 src/net/manaserv/charhandler.cpp:215
+#: src/net/manaserv/charhandler.cpp:144 src/net/manaserv/charhandler.cpp:218
 #, fuzzy
 msgid "Not logged in."
 msgstr "Já está conectado"
@@ -4155,7 +4173,11 @@ msgstr "Status do personagem OK"
 msgid "At least one statis out of the permitted range: (%u - %u)."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:177 src/net/manaserv/loginhandler.cpp:98
+#: src/net/manaserv/charhandler.cpp:177
+msgid "Invalid slot number."
+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
@@ -4163,26 +4185,26 @@ msgstr ""
 msgid "Unknown error."
 msgstr "Erro desconhecido"
 
-#: src/net/manaserv/charhandler.cpp:206 src/net/tmwa/charserverhandler.cpp:149
+#: src/net/manaserv/charhandler.cpp:209 src/net/tmwa/charserverhandler.cpp:149
 msgid "Info"
 msgstr "Informações"
 
-#: src/net/manaserv/charhandler.cpp:206
+#: src/net/manaserv/charhandler.cpp:209
 #, fuzzy
 msgid "Player deleted."
 msgstr "Personagem deletado."
 
-#: src/net/manaserv/charhandler.cpp:218
+#: src/net/manaserv/charhandler.cpp:221
 #, fuzzy
 msgid "Selection out of range."
 msgstr "Selecionar quantidade de itens para negociar."
 
-#: src/net/manaserv/charhandler.cpp:221
+#: src/net/manaserv/charhandler.cpp:224
 #, fuzzy, c-format
 msgid "Unknown error (%d)."
 msgstr "Erro desconhecido"
 
-#: src/net/manaserv/charhandler.cpp:257
+#: src/net/manaserv/charhandler.cpp:260
 msgid "No gameservers are available."
 msgstr "Não há gameservers disponíveis."
 
@@ -4375,11 +4397,11 @@ msgstr "%s quer negociar com você, você aceita?"
 msgid "Trading with %s"
 msgstr "Negociando com %s"
 
-#: src/net/manaserv/tradehandler.cpp:159 src/net/tmwa/tradehandler.cpp:268
+#: src/net/manaserv/tradehandler.cpp:159 src/net/tmwa/tradehandler.cpp:273
 msgid "Trade canceled."
 msgstr "Negociação cancelada."
 
-#: src/net/manaserv/tradehandler.cpp:166 src/net/tmwa/tradehandler.cpp:278
+#: src/net/manaserv/tradehandler.cpp:166 src/net/tmwa/tradehandler.cpp:283
 msgid "Trade completed."
 msgstr "Negociação realizada."
 
@@ -4867,11 +4889,11 @@ msgstr "Não é possível compartilhar experiência."
 msgid "Experience sharing unknown."
 msgstr "Compartilhamento de experiência habilitado."
 
-#: src/net/tmwa/inventoryhandler.cpp:329
+#: src/net/tmwa/inventoryhandler.cpp:334
 msgid "Failed to use item."
 msgstr "Problemas ao usar ítem."
 
-#: src/net/tmwa/inventoryhandler.cpp:452
+#: src/net/tmwa/inventoryhandler.cpp:457
 msgid "Unable to equip."
 msgstr "Impossível equipar."
 
@@ -5204,7 +5226,13 @@ msgstr "Erro ao adicionar item. Parceiro de negócios carregando muito peso."
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr "Erro ao adicionar item. Parceiro de negócios não tem slots livres."
 
-#: src/net/tmwa/tradehandler.cpp:250
+#: src/net/tmwa/tradehandler.cpp:251
+#, fuzzy
+msgid "Failed adding item. You cant trade this item."
+msgstr ""
+"Falha ao adicionar item. Você não pode duplicar um tipo de item na janela."
+
+#: src/net/tmwa/tradehandler.cpp:255
 msgid "Failed adding item for unknown reason."
 msgstr "Erro ao adicionar item devido a um motivo desconhecido."
 
@@ -5229,6 +5257,11 @@ msgstr ""
 msgid "Floating bubble"
 msgstr ""
 
+#: src/resources/beinginfo.cpp:32 src/resources/itemdb.cpp:210
+#: src/resources/monsterdb.cpp:78
+msgid "unnamed"
+msgstr "sem nome"
+
 #: src/resources/itemdb.cpp:55
 #, c-format
 msgid "Attack %+d"
@@ -5253,10 +5286,6 @@ msgstr "MP %+d"
 msgid "Unknown item"
 msgstr "Item desconhecido"
 
-#: src/resources/itemdb.cpp:210 src/resources/monsterdb.cpp:78
-msgid "unnamed"
-msgstr "sem nome"
-
 #, fuzzy
 #~ msgid "Particle detail: %s"
 #~ msgstr "Detalhe de partículas"
diff --git a/po/ru.po b/po/ru.po
index e77024e8f..75fc4abc2 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: 2010-12-24 19:29+0200\n"
+"POT-Creation-Date: 2011-01-05 04:50+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"
@@ -22,6 +22,14 @@ msgstr ""
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Language: ru_RU\n"
 
+#: src/being.cpp:480
+msgid "dodge"
+msgstr "крит"
+
+#: src/being.cpp:480
+msgid "miss"
+msgstr "промах"
+
 #: src/client.cpp:724 src/gui/setup.cpp:47 src/gui/windowmenu.cpp:92
 msgid "Setup"
 msgstr "Настройка"
@@ -53,9 +61,9 @@ 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:179 src/gui/register.cpp:225
+#: src/gui/charcreatedialog.cpp:185 src/gui/register.cpp:225
 #: src/gui/serverdialog.cpp:350 src/gui/unregisterdialog.cpp:134
-#: src/net/manaserv/charhandler.cpp:180 src/net/manaserv/charhandler.cpp:223
+#: src/net/manaserv/charhandler.cpp:183 src/net/manaserv/charhandler.cpp:226
 #: src/net/tmwa/charserverhandler.cpp:137
 #: src/net/tmwa/charserverhandler.cpp:154
 msgid "Error"
@@ -625,11 +633,11 @@ msgstr "Игнорировать предложения о торговле"
 msgid "Accepting incoming trade requests"
 msgstr "Принимать предложения о торговле"
 
-#: src/game.cpp:1373
+#: src/game.cpp:1376
 msgid "Could Not Load Map"
 msgstr "Не удалось загрузить карту"
 
-#: src/game.cpp:1374
+#: src/game.cpp:1377
 #, c-format
 msgid "Error while loading %s"
 msgstr "Ошибка во время загрузки %s"
@@ -705,7 +713,7 @@ 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/keyboardconfig.cpp:271
+#: src/keyboardconfig.cpp:275
 msgid "Quit"
 msgstr "Выход"
 
@@ -727,9 +735,9 @@ msgstr "Продать"
 #: src/gui/buysell.cpp:62 src/gui/changeemaildialog.cpp:56
 #: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
 #: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:206
-#: src/gui/npcpostdialog.cpp:55 src/gui/popupmenu.cpp:1120
-#: src/gui/popupmenu.cpp:1147 src/gui/popupmenu.cpp:1192
-#: src/gui/popupmenu.cpp:1230 src/gui/quitdialog.cpp:54
+#: src/gui/npcpostdialog.cpp:55 src/gui/popupmenu.cpp:1122
+#: src/gui/popupmenu.cpp:1149 src/gui/popupmenu.cpp:1194
+#: src/gui/popupmenu.cpp:1232 src/gui/quitdialog.cpp:54
 #: src/gui/register.cpp:79 src/gui/setup.cpp:64 src/gui/socialwindow.cpp:786
 #: src/gui/textcommandeditor.cpp:231 src/gui/textdialog.cpp:44
 #: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:153
@@ -826,7 +834,7 @@ msgstr "Цвет волос:"
 msgid "Hair style:"
 msgstr "Стрижка:"
 
-#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:437
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:445
 #: src/gui/socialwindow.cpp:846
 msgid "Create"
 msgstr "Создать"
@@ -839,20 +847,20 @@ msgstr "Мужчина"
 msgid "Female"
 msgstr "Женщина"
 
-#: src/gui/charcreatedialog.cpp:99 src/gui/charcreatedialog.cpp:251
+#: src/gui/charcreatedialog.cpp:99 src/gui/charcreatedialog.cpp:257
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Распределите очки (%d)"
 
-#: src/gui/charcreatedialog.cpp:180
+#: src/gui/charcreatedialog.cpp:186
 msgid "Your name needs to be at least 4 characters."
 msgstr "Имя должно содержать не менее четырех символов."
 
-#: src/gui/charcreatedialog.cpp:242
+#: src/gui/charcreatedialog.cpp:248
 msgid "Character stats OK"
 msgstr "Данные персонажа в порядке"
 
-#: src/gui/charcreatedialog.cpp:256
+#: src/gui/charcreatedialog.cpp:262
 #, c-format
 msgid "Please remove %d points"
 msgstr "Снимите очки (%d)"
@@ -882,17 +890,22 @@ msgstr "Удалить регистрацию"
 msgid "Change Email"
 msgstr "Сменить адрес E-mail"
 
-#: src/gui/charselectdialog.cpp:367 src/gui/serverdialog.cpp:248
+#: src/gui/charselectdialog.cpp:375 src/gui/serverdialog.cpp:248
 #: src/gui/setup_players.cpp:242 src/gui/shopwindow.cpp:117
 #: src/gui/shopwindow.cpp:120 src/gui/textcommandeditor.cpp:234
 msgid "Delete"
 msgstr "Удалить"
 
-#: src/gui/charselectdialog.cpp:425
+#: src/gui/charselectdialog.cpp:433
 msgid "Choose"
 msgstr "Выбрать"
 
-#: src/gui/charselectdialog.cpp:439 src/gui/charselectdialog.cpp:440
+#: src/gui/charselectdialog.cpp:436
+#, c-format
+msgid "Level %d"
+msgstr "Уровень: %d"
+
+#: src/gui/charselectdialog.cpp:447 src/gui/charselectdialog.cpp:448
 msgid "(empty)"
 msgstr "(пусто)"
 
@@ -1099,14 +1112,14 @@ msgstr "Исх.: %d байт/сек."
 msgid "OK"
 msgstr "ОК"
 
-#: src/gui/equipmentwindow.cpp:70 src/gui/windowmenu.cpp:70
+#: src/gui/equipmentwindow.cpp:72 src/gui/windowmenu.cpp:70
 msgid "Equipment"
 msgstr "Снаряжение"
 
-#: src/gui/equipmentwindow.cpp:89 src/gui/inventorywindow.cpp:96
+#: src/gui/equipmentwindow.cpp:91 src/gui/inventorywindow.cpp:96
 #: src/gui/inventorywindow.cpp:393 src/gui/inventorywindow.cpp:402
-#: src/gui/popupmenu.cpp:1068 src/gui/popupmenu.cpp:1167
-#: src/gui/popupmenu.cpp:1207
+#: src/gui/popupmenu.cpp:1070 src/gui/popupmenu.cpp:1169
+#: src/gui/popupmenu.cpp:1209
 msgid "Unequip"
 msgstr "Снять"
 
@@ -1132,31 +1145,31 @@ msgid "Slots:"
 msgstr "Вместимость:"
 
 #: src/gui/inventorywindow.cpp:94 src/gui/inventorywindow.cpp:395
-#: src/gui/inventorywindow.cpp:404 src/gui/popupmenu.cpp:1070
-#: src/gui/popupmenu.cpp:1169 src/gui/popupmenu.cpp:1209
+#: src/gui/inventorywindow.cpp:404 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:1073
-#: src/gui/popupmenu.cpp:1142 src/gui/popupmenu.cpp:1173
-#: src/gui/popupmenu.cpp:1212
+#: src/gui/inventorywindow.cpp:400 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/popupmenu.cpp:1076 src/gui/popupmenu.cpp:1177
-#: src/gui/popupmenu.cpp:1215
+#: 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:1081
-#: src/gui/popupmenu.cpp:1182 src/gui/popupmenu.cpp:1220
+#: src/gui/inventorywindow.cpp:110 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/popupmenu.cpp:408
+#: src/gui/popupmenu.cpp:409
 msgid "Outfits"
 msgstr "Наряды"
 
@@ -1165,17 +1178,17 @@ msgid "Weight:"
 msgstr "Вес:"
 
 #: src/gui/inventorywindow.cpp:133 src/gui/inventorywindow.cpp:490
-#: src/gui/popupmenu.cpp:1085 src/gui/popupmenu.cpp:1185
-#: src/gui/popupmenu.cpp:1223 src/gui/setup.cpp:65
+#: 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:1104
+#: src/gui/inventorywindow.cpp:134 src/gui/popupmenu.cpp:1106
 msgid "Retrieve"
 msgstr "Получить"
 
-#: src/gui/inventorywindow.cpp:501 src/gui/popupmenu.cpp:1078
-#: src/gui/popupmenu.cpp:1179 src/gui/popupmenu.cpp:1217
+#: src/gui/inventorywindow.cpp:501 src/gui/popupmenu.cpp:1080
+#: src/gui/popupmenu.cpp:1181 src/gui/popupmenu.cpp:1219
 #: src/gui/windowmenu.cpp:91
 msgid "Drop"
 msgstr "Бросить"
@@ -1404,7 +1417,7 @@ msgstr "Применить"
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:447
+#: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:448
 msgid "Clear"
 msgstr "Очистить"
 
@@ -1447,255 +1460,255 @@ msgstr "Сначала снять"
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:116 src/gui/popupmenu.cpp:482
+#: src/gui/popupmenu.cpp:116 src/gui/popupmenu.cpp:483
 msgid "@@trade|Trade@@"
 msgstr "@@trade|Торговать@@"
 
 #. TRANSLATORS: Attacking a player.
-#: src/gui/popupmenu.cpp:118 src/gui/popupmenu.cpp:237
-#: src/gui/popupmenu.cpp:483
+#: src/gui/popupmenu.cpp:118 src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:484
 msgid "@@attack|Attack@@"
 msgstr "@@attack|Атаковать@@"
 
 #. TRANSLATORS: Whispering a player.
-#: src/gui/popupmenu.cpp:120 src/gui/popupmenu.cpp:289
+#: src/gui/popupmenu.cpp:120 src/gui/popupmenu.cpp:290
 msgid "@@whisper|Whisper@@"
 msgstr "@@whisper|Шептать@@"
 
-#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:487
+#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:488
 msgid "@@heal|Heal@@"
 msgstr "@@heal|Лечить@@"
 
-#: src/gui/popupmenu.cpp:130 src/gui/popupmenu.cpp:295
-#: src/gui/popupmenu.cpp:493
+#: src/gui/popupmenu.cpp:130 src/gui/popupmenu.cpp:296
+#: src/gui/popupmenu.cpp:494
 msgid "@@friend|Befriend@@"
 msgstr "@@friend|Подружиться@@"
 
-#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:136
-#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:296
-#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:320
-#: src/gui/popupmenu.cpp:494 src/gui/popupmenu.cpp:499
-#: src/gui/popupmenu.cpp:517
+#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:137
+#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:297
+#: src/gui/popupmenu.cpp:303 src/gui/popupmenu.cpp:321
+#: src/gui/popupmenu.cpp:495 src/gui/popupmenu.cpp:501
+#: src/gui/popupmenu.cpp:519
 msgid "@@disregard|Disregard@@"
 msgstr "@@disregard|Пренебреч@@"
 
-#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:137
-#: src/gui/popupmenu.cpp:297 src/gui/popupmenu.cpp:303
-#: src/gui/popupmenu.cpp:495 src/gui/popupmenu.cpp:500
+#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:138
+#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:304
+#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:502
 msgid "@@ignore|Ignore@@"
 msgstr "@@unignore|Игнорировать@@"
 
-#: src/gui/popupmenu.cpp:133 src/gui/popupmenu.cpp:138
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:149
-#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:304
-#: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:315
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:501
-#: src/gui/popupmenu.cpp:507 src/gui/popupmenu.cpp:512
+#: src/gui/popupmenu.cpp:133 src/gui/popupmenu.cpp:139
+#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:150
+#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:305
+#: src/gui/popupmenu.cpp:311 src/gui/popupmenu.cpp:316
+#: src/gui/popupmenu.cpp:497 src/gui/popupmenu.cpp:503
+#: src/gui/popupmenu.cpp:509 src/gui/popupmenu.cpp:514
 msgid "@@erase|Erase@@"
 msgstr "@@erase|Стереть@@"
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:148
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:308
-#: src/gui/popupmenu.cpp:314 src/gui/popupmenu.cpp:319
-#: src/gui/popupmenu.cpp:505 src/gui/popupmenu.cpp:511
-#: src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:143 src/gui/popupmenu.cpp:149
+#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:315 src/gui/popupmenu.cpp:320
+#: src/gui/popupmenu.cpp:507 src/gui/popupmenu.cpp:513
+#: src/gui/popupmenu.cpp:518
 msgid "@@unignore|Unignore@@"
 msgstr "@@unignore|Не игнорировать@@"
 
-#: src/gui/popupmenu.cpp:143 src/gui/popupmenu.cpp:155
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:321
-#: src/gui/popupmenu.cpp:506 src/gui/popupmenu.cpp:518
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:156
+#: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:322
+#: src/gui/popupmenu.cpp:508 src/gui/popupmenu.cpp:520
 msgid "@@ignore|Completely ignore@@"
 msgstr "@@ignore|Полностью игнорировать@@"
 
-#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:329
-#: src/gui/popupmenu.cpp:526
+#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:330
+#: src/gui/popupmenu.cpp:528
 msgid "@@follow|Follow@@"
 msgstr "@@follow|Следовать@@"
 
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:330
-#: src/gui/popupmenu.cpp:527
+#: src/gui/popupmenu.cpp:165 src/gui/popupmenu.cpp:331
+#: src/gui/popupmenu.cpp:529
 msgid "@@imitation|Imitation@@"
 msgstr "@@imitation|Имитация@@"
 
-#: src/gui/popupmenu.cpp:174 src/gui/popupmenu.cpp:546
+#: src/gui/popupmenu.cpp:175 src/gui/popupmenu.cpp:548
 msgid "@@party|Invite to party@@"
 msgstr "@@party|Пригласить в группу@@"
 
-#: src/gui/popupmenu.cpp:179 src/gui/popupmenu.cpp:551
+#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:553
 msgid "@@kick party|Kick from party@@"
 msgstr "@@kick party|Вышвырнуть из группы@@"
 
-#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:337
-#: src/gui/popupmenu.cpp:565
+#: src/gui/popupmenu.cpp:195 src/gui/popupmenu.cpp:338
+#: src/gui/popupmenu.cpp:567
 msgid "@@guild-kick|Kick from guild@@"
 msgstr "@@guild-kick|Выкинуть из гильдии@@"
 
-#: src/gui/popupmenu.cpp:196 src/gui/popupmenu.cpp:338
-#: src/gui/popupmenu.cpp:567
+#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:339
+#: src/gui/popupmenu.cpp:569
 msgid "@@guild-pos|Change pos in guild >@@"
 msgstr "@@guild-pos|Сменить статус в гильдии >@@"
 
-#: src/gui/popupmenu.cpp:201 src/gui/popupmenu.cpp:342
-#: src/gui/popupmenu.cpp:572
+#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:343
+#: src/gui/popupmenu.cpp:574
 msgid "@@guild|Invite to guild@@"
 msgstr "@@guild|Пригласить в гильдию@@"
 
-#: src/gui/popupmenu.cpp:208
+#: src/gui/popupmenu.cpp:209
 msgid "@@admin-kick|Kick player@@"
 msgstr "@@admin-kick|Вышвырнуть игрока@@"
 
-#: src/gui/popupmenu.cpp:210
+#: src/gui/popupmenu.cpp:211
 msgid "@@nuke|Nuke@@"
 msgstr "@@nuke|Уничтожить@@"
 
-#: src/gui/popupmenu.cpp:211 src/gui/popupmenu.cpp:231
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:232
+#: src/gui/popupmenu.cpp:530
 msgid "@@move|Move@@"
 msgstr "@@move|Двигаться@@"
 
-#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:529
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:531
 msgid "@@undress|Undress@@"
 msgstr "@@undress|Раздеть@@"
 
-#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:228
-#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:534
+#: src/gui/popupmenu.cpp:218 src/gui/popupmenu.cpp:229
+#: src/gui/popupmenu.cpp:350 src/gui/popupmenu.cpp:536
 msgid "@@buy|Buy@@"
 msgstr "@@buy|Купить@@"
 
-#: src/gui/popupmenu.cpp:218 src/gui/popupmenu.cpp:229
-#: src/gui/popupmenu.cpp:350 src/gui/popupmenu.cpp:535
+#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:230
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:537
 msgid "@@sell|Sell@@"
 msgstr "@@sell|Продать@@"
 
-#: src/gui/popupmenu.cpp:226
+#: src/gui/popupmenu.cpp:227
 msgid "@@talk|Talk@@"
 msgstr "@@talk|Говорить@@"
 
-#: src/gui/popupmenu.cpp:240
+#: src/gui/popupmenu.cpp:241
 msgid "@@admin-kick|Kick@@"
 msgstr "@@admin-kick|Вышвырнуть игрока@@"
 
-#: src/gui/popupmenu.cpp:248 src/gui/popupmenu.cpp:353
+#: src/gui/popupmenu.cpp:249 src/gui/popupmenu.cpp:354
 msgid "@@name|Add name to chat@@"
 msgstr "@@name|Добавить имя в чат@@"
 
-#: src/gui/popupmenu.cpp:252 src/gui/popupmenu.cpp:272
-#: src/gui/popupmenu.cpp:357 src/gui/popupmenu.cpp:380
-#: src/gui/popupmenu.cpp:399 src/gui/popupmenu.cpp:412
-#: src/gui/popupmenu.cpp:430 src/gui/popupmenu.cpp:577
-#: src/gui/popupmenu.cpp:601
+#: src/gui/popupmenu.cpp:253 src/gui/popupmenu.cpp:273
+#: src/gui/popupmenu.cpp:358 src/gui/popupmenu.cpp:381
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:431 src/gui/popupmenu.cpp:579
+#: src/gui/popupmenu.cpp:603
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancel|Отмена@@"
 
-#: src/gui/popupmenu.cpp:267
+#: src/gui/popupmenu.cpp:268
 #, c-format
 msgid "@@player_%u|%s >@@"
 msgstr "@@player_%u|%s >@@"
 
-#: src/gui/popupmenu.cpp:375
+#: src/gui/popupmenu.cpp:376
 msgid "@@pickup|Pick up@@"
 msgstr "@@pickup|Поднять@@"
 
-#: src/gui/popupmenu.cpp:376
+#: src/gui/popupmenu.cpp:377
 msgid "@@chat|Add to chat@@"
 msgstr "@@chat|Добавить в чат@@"
 
-#: src/gui/popupmenu.cpp:394
+#: src/gui/popupmenu.cpp:395
 msgid "Map Item"
 msgstr "Элмент карты"
 
-#: src/gui/popupmenu.cpp:395
+#: src/gui/popupmenu.cpp:396
 msgid "@@rename map|Rename@@"
 msgstr "@@rename map|Переименовать@@"
 
-#: src/gui/popupmenu.cpp:396
+#: src/gui/popupmenu.cpp:397
 msgid "@@remove map|Remove@@"
 msgstr "@@remove map|Удалить@@"
 
-#: src/gui/popupmenu.cpp:409
+#: src/gui/popupmenu.cpp:410
 msgid "@@load old outfits|Load old outfits@@"
 msgstr "@@load old outfits|Загрузить старые наряды@@"
 
-#: src/gui/popupmenu.cpp:425 src/gui/windowmenu.cpp:90
+#: src/gui/popupmenu.cpp:426 src/gui/windowmenu.cpp:90
 msgid "Spells"
 msgstr "Заклинания"
 
-#: src/gui/popupmenu.cpp:426
+#: src/gui/popupmenu.cpp:427
 msgid "@@load old spells|Load old spells@@"
 msgstr "@@load old spells|Загрузить старые заклинания@@"
 
-#: src/gui/popupmenu.cpp:427
+#: src/gui/popupmenu.cpp:428
 msgid "@@edit spell|Edit spell@@"
 msgstr "@@edit spell|Изменить заклинание@@"
 
-#: src/gui/popupmenu.cpp:445
+#: src/gui/popupmenu.cpp:446
 msgid "@@chat close|Close@@"
 msgstr "@@chat close|Закрыть@@"
 
-#: src/gui/popupmenu.cpp:453
+#: src/gui/popupmenu.cpp:454
 msgid "Disable highlight"
 msgstr "Отключить уведомление"
 
-#: src/gui/popupmenu.cpp:459
+#: src/gui/popupmenu.cpp:460
 msgid "Enable highlight"
 msgstr "Включить уведомление"
 
-#: src/gui/popupmenu.cpp:465
+#: src/gui/popupmenu.cpp:466
 msgid "@@leave party|Leave@@"
 msgstr "@@leave party|Покинуть@@"
 
-#: src/gui/popupmenu.cpp:585
+#: src/gui/popupmenu.cpp:587
 msgid "Change guild position"
 msgstr "Сменить позицию в гильдии"
 
-#: src/gui/popupmenu.cpp:598
+#: src/gui/popupmenu.cpp:600
 #, c-format
 msgid "@@guild-pos-%d|%s@@"
 msgstr "@@guild-pos-%d|%s@@"
 
-#: src/gui/popupmenu.cpp:942
+#: src/gui/popupmenu.cpp:944
 msgid "Rename map sign          "
 msgstr "Переименовать знак на карте"
 
-#: src/gui/popupmenu.cpp:943
+#: src/gui/popupmenu.cpp:945
 msgid "Name:                    "
 msgstr "Имя:                    "
 
-#: src/gui/popupmenu.cpp:1091
+#: src/gui/popupmenu.cpp:1093
 msgid "Store 10"
 msgstr "Сохранить 10"
 
-#: src/gui/popupmenu.cpp:1094
+#: src/gui/popupmenu.cpp:1096
 msgid "Store half"
 msgstr "Сохранить половину"
 
-#: src/gui/popupmenu.cpp:1096
+#: src/gui/popupmenu.cpp:1098
 msgid "Store all"
 msgstr "Сохранить все"
 
-#: src/gui/popupmenu.cpp:1110
+#: src/gui/popupmenu.cpp:1112
 msgid "Retrieve 10"
 msgstr "Получить 10"
 
-#: src/gui/popupmenu.cpp:1113
+#: src/gui/popupmenu.cpp:1115
 msgid "Retrieve half"
 msgstr "Получить половину"
 
-#: src/gui/popupmenu.cpp:1115
+#: src/gui/popupmenu.cpp:1117
 msgid "Retrieve all"
 msgstr "Получить все"
 
-#: src/gui/popupmenu.cpp:1118 src/gui/popupmenu.cpp:1186
-#: src/gui/popupmenu.cpp:1224
+#: src/gui/popupmenu.cpp:1120 src/gui/popupmenu.cpp:1188
+#: src/gui/popupmenu.cpp:1226
 msgid "Add to chat"
 msgstr "Добавить в чат"
 
-#: src/gui/popupmenu.cpp:1145 src/gui/popupmenu.cpp:1190
+#: src/gui/popupmenu.cpp:1147 src/gui/popupmenu.cpp:1192
 msgid "Load old item shortcuts"
 msgstr "Загрузить старые горячие клавиши предметов"
 
-#: src/gui/popupmenu.cpp:1228
+#: src/gui/popupmenu.cpp:1230
 msgid "Load old drop shortcuts"
 msgstr "Загрузить старые данные"
 
@@ -3041,6 +3054,10 @@ msgstr "Кто онлайн - ошибка"
 msgid "Who Is Online - Update"
 msgstr "Кто онлайн - обновление"
 
+#: src/gui/widgets/battletab.cpp:41
+msgid "Battle"
+msgstr ""
+
 #: src/gui/widgets/channeltab.cpp:49
 msgid "/users > Lists the users in the current channel"
 msgstr "/users > Список пользователей текущего канала"
@@ -3461,163 +3478,164 @@ msgstr "Следующая закладка общества"
 #: src/keyboardconfig.cpp:233 src/keyboardconfig.cpp:236
 #: src/keyboardconfig.cpp:238 src/keyboardconfig.cpp:240
 #: src/keyboardconfig.cpp:242 src/keyboardconfig.cpp:244
+#: src/keyboardconfig.cpp:246 src/keyboardconfig.cpp:248
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "Комбинация клавиш для емоции %d"
 
-#: src/keyboardconfig.cpp:246
+#: src/keyboardconfig.cpp:250
 msgid "Wear Outfit"
 msgstr "Одеть наряд"
 
-#: src/keyboardconfig.cpp:248
+#: src/keyboardconfig.cpp:252
 msgid "Copy Outfit"
 msgstr "Скопировать наряд"
 
-#: src/keyboardconfig.cpp:250
+#: src/keyboardconfig.cpp:254
 msgid "Copy Equiped to Outfit"
 msgstr "Копировать одетый наряд"
 
-#: src/keyboardconfig.cpp:252
+#: src/keyboardconfig.cpp:256
 msgid "Toggle Chat"
 msgstr "Переключится на чат"
 
-#: src/keyboardconfig.cpp:254
+#: src/keyboardconfig.cpp:258
 msgid "Scroll Chat Up"
 msgstr "Прокрутить чат вверх"
 
-#: src/keyboardconfig.cpp:256
+#: src/keyboardconfig.cpp:260
 msgid "Scroll Chat Down"
 msgstr "Прокрутить чат вниз"
 
-#: src/keyboardconfig.cpp:258
+#: src/keyboardconfig.cpp:262
 msgid "Previous Chat Tab"
 msgstr "Предыдущая закладка чата"
 
-#: src/keyboardconfig.cpp:260
+#: src/keyboardconfig.cpp:264
 msgid "Next Chat Tab"
 msgstr "Следующая закладка чата"
 
-#: src/keyboardconfig.cpp:262
+#: src/keyboardconfig.cpp:266
 msgid "Previous chat tab line"
 msgstr "Предыдущая строка вкладки"
 
-#: src/keyboardconfig.cpp:264
+#: src/keyboardconfig.cpp:268
 msgid "Next chat tab line"
 msgstr "Следующая строка вкладки"
 
-#: src/keyboardconfig.cpp:266
+#: src/keyboardconfig.cpp:270
 msgid "Chat Auto Complete"
 msgstr "Автозавершение в чате"
 
-#: src/keyboardconfig.cpp:268
+#: src/keyboardconfig.cpp:272
 msgid "Deactivate Chat Input"
 msgstr "Отключить фокус ввода"
 
-#: src/keyboardconfig.cpp:270
+#: src/keyboardconfig.cpp:274
 msgid "Select OK"
 msgstr "Выбрать Ok"
 
-#: src/keyboardconfig.cpp:272
+#: src/keyboardconfig.cpp:276
 msgid "Ignore input 1"
 msgstr "Игнорировать ввод 1"
 
-#: src/keyboardconfig.cpp:274
+#: src/keyboardconfig.cpp:278
 msgid "Ignore input 2"
 msgstr "Игнорировать ввод 2"
 
-#: src/keyboardconfig.cpp:276
+#: src/keyboardconfig.cpp:280
 msgid "Direct Up"
 msgstr "Вверх"
 
-#: src/keyboardconfig.cpp:277
+#: src/keyboardconfig.cpp:281
 msgid "Direct Down"
 msgstr "Вниз"
 
-#: src/keyboardconfig.cpp:279
+#: src/keyboardconfig.cpp:283
 msgid "Direct Left"
 msgstr "Влево"
 
-#: src/keyboardconfig.cpp:280
+#: src/keyboardconfig.cpp:284
 msgid "Direct Right"
 msgstr "Вправо"
 
-#: src/keyboardconfig.cpp:282
+#: src/keyboardconfig.cpp:286
 msgid "Crazy moves"
 msgstr ""
 
-#: src/keyboardconfig.cpp:284
+#: src/keyboardconfig.cpp:288
 msgid "Change Crazy Move mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:286
+#: src/keyboardconfig.cpp:290
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:288
+#: src/keyboardconfig.cpp:292
 msgid "Quick Drop N Items"
 msgstr ""
 
-#: src/keyboardconfig.cpp:290
+#: src/keyboardconfig.cpp:294
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/keyboardconfig.cpp:292
+#: src/keyboardconfig.cpp:296
 msgid "Quick heal target or self"
 msgstr "Быстрое лечения себя или цели"
 
-#: src/keyboardconfig.cpp:294
+#: src/keyboardconfig.cpp:298
 msgid "Use #itenplz spell"
 msgstr "Использовать заклинание #itenplz"
 
-#: src/keyboardconfig.cpp:296
+#: src/keyboardconfig.cpp:300
 msgid "Use magic attack"
 msgstr "Использовать магическую атаку"
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboardconfig.cpp:302
 msgid "Switch magic attack"
 msgstr "Переключить маг. атаку"
 
-#: src/keyboardconfig.cpp:300
+#: src/keyboardconfig.cpp:304
 msgid "Change move type"
 msgstr "Изменить тип движения"
 
-#: src/keyboardconfig.cpp:302
+#: src/keyboardconfig.cpp:306
 msgid "Change Attack Weapon Type"
 msgstr "Изменить тип атаки оружием"
 
-#: src/keyboardconfig.cpp:304
+#: src/keyboardconfig.cpp:308
 msgid "Change Attack Type"
 msgstr "Изменить тип атаки"
 
-#: src/keyboardconfig.cpp:306
+#: src/keyboardconfig.cpp:310
 msgid "Change Follow mode"
 msgstr "Изменить режим следования"
 
-#: src/keyboardconfig.cpp:308
+#: src/keyboardconfig.cpp:312
 msgid "Change Imitation mode"
 msgstr "Сменить режим имитации"
 
-#: src/keyboardconfig.cpp:311
+#: src/keyboardconfig.cpp:315
 msgid "Disbale / Enable Game modifier keys"
 msgstr "Запретить / Разрешить специальные модификаторы"
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboardconfig.cpp:316
 msgid "On / Off audio"
 msgstr "Вкл. / Выкл. звук"
 
-#: src/keyboardconfig.cpp:314
+#: src/keyboardconfig.cpp:318
 msgid "Enable / Disable away mode"
 msgstr "Включить / Выключить режим отошел"
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboardconfig.cpp:320
 msgid "Emulate right click from keyboard"
 msgstr "Эмуляция правого клика с клавиатуры"
 
-#: src/keyboardconfig.cpp:318
+#: src/keyboardconfig.cpp:322
 msgid "Toggle camera mode"
 msgstr "Изменить режим камеры"
 
-#: src/keyboardconfig.cpp:380
+#: src/keyboardconfig.cpp:384
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -3864,7 +3882,7 @@ msgstr "Нажмите ОК, чтобы возродиться."
 msgid "You Died"
 msgstr "Вы умерли"
 
-#: src/net/manaserv/charhandler.cpp:144 src/net/manaserv/charhandler.cpp:215
+#: src/net/manaserv/charhandler.cpp:144 src/net/manaserv/charhandler.cpp:218
 msgid "Not logged in."
 msgstr "Не авторизован."
 
@@ -3905,31 +3923,36 @@ msgstr "Характеристики персонажа слишком малы.
 msgid "At least one statis out of the permitted range: (%u - %u)."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:177 src/net/manaserv/loginhandler.cpp:98
+#: src/net/manaserv/charhandler.cpp:177
+#, fuzzy
+msgid "Invalid slot number."
+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
 msgid "Unknown error."
 msgstr "Неизвестная ошибка."
 
-#: src/net/manaserv/charhandler.cpp:206 src/net/tmwa/charserverhandler.cpp:149
+#: src/net/manaserv/charhandler.cpp:209 src/net/tmwa/charserverhandler.cpp:149
 msgid "Info"
 msgstr "Сведения"
 
-#: src/net/manaserv/charhandler.cpp:206
+#: src/net/manaserv/charhandler.cpp:209
 msgid "Player deleted."
 msgstr "Игрок удален."
 
-#: src/net/manaserv/charhandler.cpp:218
+#: src/net/manaserv/charhandler.cpp:221
 msgid "Selection out of range."
 msgstr "Выбор вне допустимого предела."
 
-#: src/net/manaserv/charhandler.cpp:221
+#: src/net/manaserv/charhandler.cpp:224
 #, c-format
 msgid "Unknown error (%d)."
 msgstr "Неизвестная ошибка (%d)."
 
-#: src/net/manaserv/charhandler.cpp:257
+#: src/net/manaserv/charhandler.cpp:260
 msgid "No gameservers are available."
 msgstr "Доступные игровые серверы не найдены"
 
@@ -4108,11 +4131,11 @@ msgstr "%s хочет торговать с вами, вы принимаете
 msgid "Trading with %s"
 msgstr "Торговля с %s"
 
-#: src/net/manaserv/tradehandler.cpp:159 src/net/tmwa/tradehandler.cpp:268
+#: src/net/manaserv/tradehandler.cpp:159 src/net/tmwa/tradehandler.cpp:273
 msgid "Trade canceled."
 msgstr "Торговля отменена."
 
-#: src/net/manaserv/tradehandler.cpp:166 src/net/tmwa/tradehandler.cpp:278
+#: src/net/manaserv/tradehandler.cpp:166 src/net/tmwa/tradehandler.cpp:283
 msgid "Trade completed."
 msgstr "Торговля завершена."
 
@@ -4312,17 +4335,17 @@ msgid "M.Defense"
 msgstr "Маг.Защита"
 
 #: src/net/tmwa/generalhandler.cpp:258
-#, fuzzy, c-format
+#, no-c-format
 msgid "% Accuracy"
 msgstr "% Точности"
 
 #: src/net/tmwa/generalhandler.cpp:259
-#, fuzzy, c-format
+#, no-c-format
 msgid "% Evade"
 msgstr "% Уклонения"
 
 #: src/net/tmwa/generalhandler.cpp:260
-#, fuzzy, c-format
+#, no-c-format
 msgid "% Critical"
 msgstr "% Критический удар"
 
@@ -4567,11 +4590,11 @@ msgstr "Обмен опытом невозможен."
 msgid "Experience sharing unknown."
 msgstr "Политика распределения опыта неизвестна."
 
-#: src/net/tmwa/inventoryhandler.cpp:329
+#: src/net/tmwa/inventoryhandler.cpp:334
 msgid "Failed to use item."
 msgstr "Не удалось использовать предмет."
 
-#: src/net/tmwa/inventoryhandler.cpp:452
+#: src/net/tmwa/inventoryhandler.cpp:457
 msgid "Unable to equip."
 msgstr "Нельза экипировать!"
 
@@ -4888,7 +4911,12 @@ msgstr "Не удалось добавить предмет. Партнер по
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr "Не удалось добавить предмет. У партнера по торговле кончилось место."
 
-#: src/net/tmwa/tradehandler.cpp:250
+#: src/net/tmwa/tradehandler.cpp:251
+#, fuzzy
+msgid "Failed adding item. You cant trade this item."
+msgstr "Не удалось добавить предмет. Партнер по торговле перегружен."
+
+#: src/net/tmwa/tradehandler.cpp:255
 msgid "Failed adding item for unknown reason."
 msgstr "Не удалось добавить предмет по неизвестной причине."
 
@@ -4912,6 +4940,11 @@ msgstr "Плавающий '...' пузырек"
 msgid "Floating bubble"
 msgstr "Плавающий пузырек"
 
+#: src/resources/beinginfo.cpp:32 src/resources/itemdb.cpp:210
+#: src/resources/monsterdb.cpp:78
+msgid "unnamed"
+msgstr "безымянный"
+
 #: src/resources/itemdb.cpp:55
 #, c-format
 msgid "Attack %+d"
@@ -4936,10 +4969,6 @@ msgstr "Мана %+d"
 msgid "Unknown item"
 msgstr "Неизвестный предмет"
 
-#: src/resources/itemdb.cpp:210 src/resources/monsterdb.cpp:78
-msgid "unnamed"
-msgstr "безымянный"
-
 #~ msgid "One stat is zero."
 #~ msgstr "Одна из характеристик равна нулю."
 
diff --git a/po/sv.po b/po/sv.po
index 6e9005101..1d895e49b 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: 2010-12-24 19:29+0200\n"
+"POT-Creation-Date: 2011-01-05 04:50+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"
@@ -19,6 +19,14 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
+#: src/being.cpp:480
+msgid "dodge"
+msgstr ""
+
+#: src/being.cpp:480
+msgid "miss"
+msgstr ""
+
 #: src/client.cpp:724 src/gui/setup.cpp:47 src/gui/windowmenu.cpp:92
 msgid "Setup"
 msgstr "Inställningar"
@@ -54,9 +62,9 @@ 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:179 src/gui/register.cpp:225
+#: src/gui/charcreatedialog.cpp:185 src/gui/register.cpp:225
 #: src/gui/serverdialog.cpp:350 src/gui/unregisterdialog.cpp:134
-#: src/net/manaserv/charhandler.cpp:180 src/net/manaserv/charhandler.cpp:223
+#: src/net/manaserv/charhandler.cpp:183 src/net/manaserv/charhandler.cpp:226
 #: src/net/tmwa/charserverhandler.cpp:137
 #: src/net/tmwa/charserverhandler.cpp:154
 msgid "Error"
@@ -655,12 +663,12 @@ msgstr "Ignorerar handelserbjudanden"
 msgid "Accepting incoming trade requests"
 msgstr "Accepterar handelserbjudanden"
 
-#: src/game.cpp:1373
+#: src/game.cpp:1376
 #, fuzzy
 msgid "Could Not Load Map"
 msgstr "Kunde inte ladda karta"
 
-#: src/game.cpp:1374
+#: src/game.cpp:1377
 #, c-format
 msgid "Error while loading %s"
 msgstr "Kunde inte ladda %s"
@@ -738,7 +746,7 @@ 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/keyboardconfig.cpp:271
+#: src/keyboardconfig.cpp:275
 msgid "Quit"
 msgstr "Avsluta"
 
@@ -760,9 +768,9 @@ msgstr "Sälj"
 #: src/gui/buysell.cpp:62 src/gui/changeemaildialog.cpp:56
 #: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
 #: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:206
-#: src/gui/npcpostdialog.cpp:55 src/gui/popupmenu.cpp:1120
-#: src/gui/popupmenu.cpp:1147 src/gui/popupmenu.cpp:1192
-#: src/gui/popupmenu.cpp:1230 src/gui/quitdialog.cpp:54
+#: src/gui/npcpostdialog.cpp:55 src/gui/popupmenu.cpp:1122
+#: src/gui/popupmenu.cpp:1149 src/gui/popupmenu.cpp:1194
+#: src/gui/popupmenu.cpp:1232 src/gui/quitdialog.cpp:54
 #: src/gui/register.cpp:79 src/gui/setup.cpp:64 src/gui/socialwindow.cpp:786
 #: src/gui/textcommandeditor.cpp:231 src/gui/textdialog.cpp:44
 #: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:153
@@ -864,7 +872,7 @@ msgstr "Hårfärg:"
 msgid "Hair style:"
 msgstr "Frisyr:"
 
-#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:437
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:445
 #: src/gui/socialwindow.cpp:846
 msgid "Create"
 msgstr "Skapa"
@@ -877,20 +885,20 @@ msgstr "Man"
 msgid "Female"
 msgstr "Kvinna"
 
-#: src/gui/charcreatedialog.cpp:99 src/gui/charcreatedialog.cpp:251
+#: src/gui/charcreatedialog.cpp:99 src/gui/charcreatedialog.cpp:257
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Var vänlig fördela %d poäng"
 
-#: src/gui/charcreatedialog.cpp:180
+#: src/gui/charcreatedialog.cpp:186
 msgid "Your name needs to be at least 4 characters."
 msgstr "Ditt namn måste vara minst 4 tecken långt."
 
-#: src/gui/charcreatedialog.cpp:242
+#: src/gui/charcreatedialog.cpp:248
 msgid "Character stats OK"
 msgstr "Karaktärens värden okej"
 
-#: src/gui/charcreatedialog.cpp:256
+#: src/gui/charcreatedialog.cpp:262
 #, c-format
 msgid "Please remove %d points"
 msgstr "Var vänlig ta bort %d poäng"
@@ -921,18 +929,23 @@ msgstr "Avregistrera"
 msgid "Change Email"
 msgstr "Ändra epostadress"
 
-#: src/gui/charselectdialog.cpp:367 src/gui/serverdialog.cpp:248
+#: src/gui/charselectdialog.cpp:375 src/gui/serverdialog.cpp:248
 #: src/gui/setup_players.cpp:242 src/gui/shopwindow.cpp:117
 #: src/gui/shopwindow.cpp:120 src/gui/textcommandeditor.cpp:234
 msgid "Delete"
 msgstr "Ta bort"
 
-#: src/gui/charselectdialog.cpp:425
+#: src/gui/charselectdialog.cpp:433
 #, fuzzy
 msgid "Choose"
 msgstr "Stäng"
 
-#: src/gui/charselectdialog.cpp:439 src/gui/charselectdialog.cpp:440
+#: src/gui/charselectdialog.cpp:436
+#, fuzzy, c-format
+msgid "Level %d"
+msgstr "Nivå: %d"
+
+#: src/gui/charselectdialog.cpp:447 src/gui/charselectdialog.cpp:448
 msgid "(empty)"
 msgstr ""
 
@@ -1160,14 +1173,14 @@ msgstr ""
 msgid "OK"
 msgstr "Okej"
 
-#: src/gui/equipmentwindow.cpp:70 src/gui/windowmenu.cpp:70
+#: src/gui/equipmentwindow.cpp:72 src/gui/windowmenu.cpp:70
 msgid "Equipment"
 msgstr "Utrustning"
 
-#: src/gui/equipmentwindow.cpp:89 src/gui/inventorywindow.cpp:96
+#: src/gui/equipmentwindow.cpp:91 src/gui/inventorywindow.cpp:96
 #: src/gui/inventorywindow.cpp:393 src/gui/inventorywindow.cpp:402
-#: src/gui/popupmenu.cpp:1068 src/gui/popupmenu.cpp:1167
-#: src/gui/popupmenu.cpp:1207
+#: src/gui/popupmenu.cpp:1070 src/gui/popupmenu.cpp:1169
+#: src/gui/popupmenu.cpp:1209
 msgid "Unequip"
 msgstr "Avrusta"
 
@@ -1193,32 +1206,32 @@ msgid "Slots:"
 msgstr "Utrymme:"
 
 #: src/gui/inventorywindow.cpp:94 src/gui/inventorywindow.cpp:395
-#: src/gui/inventorywindow.cpp:404 src/gui/popupmenu.cpp:1070
-#: src/gui/popupmenu.cpp:1169 src/gui/popupmenu.cpp:1209
+#: src/gui/inventorywindow.cpp:404 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:1073
-#: src/gui/popupmenu.cpp:1142 src/gui/popupmenu.cpp:1173
-#: src/gui/popupmenu.cpp:1212
+#: src/gui/inventorywindow.cpp:400 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/popupmenu.cpp:1076 src/gui/popupmenu.cpp:1177
-#: src/gui/popupmenu.cpp:1215
+#: 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:1081
-#: src/gui/popupmenu.cpp:1182 src/gui/popupmenu.cpp:1220
+#: src/gui/inventorywindow.cpp:110 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/popupmenu.cpp:408
+#: src/gui/popupmenu.cpp:409
 msgid "Outfits"
 msgstr ""
 
@@ -1227,17 +1240,17 @@ msgid "Weight:"
 msgstr "Vikt:"
 
 #: src/gui/inventorywindow.cpp:133 src/gui/inventorywindow.cpp:490
-#: src/gui/popupmenu.cpp:1085 src/gui/popupmenu.cpp:1185
-#: src/gui/popupmenu.cpp:1223 src/gui/setup.cpp:65
+#: 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:1104
+#: src/gui/inventorywindow.cpp:134 src/gui/popupmenu.cpp:1106
 msgid "Retrieve"
 msgstr "Hämta"
 
-#: src/gui/inventorywindow.cpp:501 src/gui/popupmenu.cpp:1078
-#: src/gui/popupmenu.cpp:1179 src/gui/popupmenu.cpp:1217
+#: src/gui/inventorywindow.cpp:501 src/gui/popupmenu.cpp:1080
+#: src/gui/popupmenu.cpp:1181 src/gui/popupmenu.cpp:1219
 #: src/gui/windowmenu.cpp:91
 msgid "Drop"
 msgstr "Släpp"
@@ -1476,7 +1489,7 @@ msgstr "Vidare"
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:447
+#: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:448
 #, fuzzy
 msgid "Clear"
 msgstr "Spjut"
@@ -1522,287 +1535,287 @@ msgstr "Avrusta"
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:116 src/gui/popupmenu.cpp:482
+#: src/gui/popupmenu.cpp:116 src/gui/popupmenu.cpp:483
 #, fuzzy
 msgid "@@trade|Trade@@"
 msgstr "@@trade|Handla med %s@@"
 
 #. TRANSLATORS: Attacking a player.
-#: src/gui/popupmenu.cpp:118 src/gui/popupmenu.cpp:237
-#: src/gui/popupmenu.cpp:483
+#: src/gui/popupmenu.cpp:118 src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:484
 #, fuzzy
 msgid "@@attack|Attack@@"
 msgstr "@@attack|Attackera %s@@"
 
 #. TRANSLATORS: Whispering a player.
-#: src/gui/popupmenu.cpp:120 src/gui/popupmenu.cpp:289
+#: src/gui/popupmenu.cpp:120 src/gui/popupmenu.cpp:290
 #, fuzzy
 msgid "@@whisper|Whisper@@"
 msgstr "@@use|Använd@@"
 
-#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:487
+#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:488
 #, fuzzy
 msgid "@@heal|Heal@@"
 msgstr "@@cancel|Avbryt@@"
 
-#: src/gui/popupmenu.cpp:130 src/gui/popupmenu.cpp:295
-#: src/gui/popupmenu.cpp:493
+#: src/gui/popupmenu.cpp:130 src/gui/popupmenu.cpp:296
+#: src/gui/popupmenu.cpp:494
 #, fuzzy
 msgid "@@friend|Befriend@@"
 msgstr "@@retrieve|Hämta@@"
 
-#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:136
-#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:296
-#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:320
-#: src/gui/popupmenu.cpp:494 src/gui/popupmenu.cpp:499
-#: src/gui/popupmenu.cpp:517
+#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:137
+#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:297
+#: src/gui/popupmenu.cpp:303 src/gui/popupmenu.cpp:321
+#: src/gui/popupmenu.cpp:495 src/gui/popupmenu.cpp:501
+#: src/gui/popupmenu.cpp:519
 #, fuzzy
 msgid "@@disregard|Disregard@@"
 msgstr "@@disregard|Strunta i %s@@"
 
-#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:137
-#: src/gui/popupmenu.cpp:297 src/gui/popupmenu.cpp:303
-#: src/gui/popupmenu.cpp:495 src/gui/popupmenu.cpp:500
+#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:138
+#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:304
+#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:502
 #, fuzzy
 msgid "@@ignore|Ignore@@"
 msgstr "@@ignore|Ignorera %s@@"
 
-#: src/gui/popupmenu.cpp:133 src/gui/popupmenu.cpp:138
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:149
-#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:304
-#: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:315
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:501
-#: src/gui/popupmenu.cpp:507 src/gui/popupmenu.cpp:512
+#: src/gui/popupmenu.cpp:133 src/gui/popupmenu.cpp:139
+#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:150
+#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:305
+#: src/gui/popupmenu.cpp:311 src/gui/popupmenu.cpp:316
+#: src/gui/popupmenu.cpp:497 src/gui/popupmenu.cpp:503
+#: src/gui/popupmenu.cpp:509 src/gui/popupmenu.cpp:514
 #, fuzzy
 msgid "@@erase|Erase@@"
 msgstr "@@use|Använd@@"
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:148
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:308
-#: src/gui/popupmenu.cpp:314 src/gui/popupmenu.cpp:319
-#: src/gui/popupmenu.cpp:505 src/gui/popupmenu.cpp:511
-#: src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:143 src/gui/popupmenu.cpp:149
+#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:315 src/gui/popupmenu.cpp:320
+#: src/gui/popupmenu.cpp:507 src/gui/popupmenu.cpp:513
+#: src/gui/popupmenu.cpp:518
 #, fuzzy
 msgid "@@unignore|Unignore@@"
 msgstr "@@unignore|Sluta ignorera %s@@"
 
-#: src/gui/popupmenu.cpp:143 src/gui/popupmenu.cpp:155
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:321
-#: src/gui/popupmenu.cpp:506 src/gui/popupmenu.cpp:518
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:156
+#: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:322
+#: src/gui/popupmenu.cpp:508 src/gui/popupmenu.cpp:520
 #, fuzzy
 msgid "@@ignore|Completely ignore@@"
 msgstr "@@ignore|Ignorera %s fullständigt@@"
 
-#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:329
-#: src/gui/popupmenu.cpp:526
+#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:330
+#: src/gui/popupmenu.cpp:528
 msgid "@@follow|Follow@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:330
-#: src/gui/popupmenu.cpp:527
+#: src/gui/popupmenu.cpp:165 src/gui/popupmenu.cpp:331
+#: src/gui/popupmenu.cpp:529
 msgid "@@imitation|Imitation@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:174 src/gui/popupmenu.cpp:546
+#: src/gui/popupmenu.cpp:175 src/gui/popupmenu.cpp:548
 #, fuzzy
 msgid "@@party|Invite to party@@"
 msgstr "/party > Bjud in en spelare till din grupp"
 
-#: src/gui/popupmenu.cpp:179 src/gui/popupmenu.cpp:551
+#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:553
 #, fuzzy
 msgid "@@kick party|Kick from party@@"
 msgstr "@@admin-kick|Sparka spelare@@"
 
-#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:337
-#: src/gui/popupmenu.cpp:565
+#: src/gui/popupmenu.cpp:195 src/gui/popupmenu.cpp:338
+#: src/gui/popupmenu.cpp:567
 #, fuzzy
 msgid "@@guild-kick|Kick from guild@@"
 msgstr "@@admin-kick|Sparka spelare@@"
 
-#: src/gui/popupmenu.cpp:196 src/gui/popupmenu.cpp:338
-#: src/gui/popupmenu.cpp:567
+#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:339
+#: src/gui/popupmenu.cpp:569
 msgid "@@guild-pos|Change pos in guild >@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:201 src/gui/popupmenu.cpp:342
-#: src/gui/popupmenu.cpp:572
+#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:343
+#: src/gui/popupmenu.cpp:574
 #, fuzzy
 msgid "@@guild|Invite to guild@@"
 msgstr "/party > Bjud in en spelare till din grupp"
 
-#: src/gui/popupmenu.cpp:208
+#: src/gui/popupmenu.cpp:209
 msgid "@@admin-kick|Kick player@@"
 msgstr "@@admin-kick|Sparka spelare@@"
 
-#: src/gui/popupmenu.cpp:210
+#: src/gui/popupmenu.cpp:211
 msgid "@@nuke|Nuke@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:211 src/gui/popupmenu.cpp:231
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:232
+#: src/gui/popupmenu.cpp:530
 msgid "@@move|Move@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:529
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:531
 #, fuzzy
 msgid "@@undress|Undress@@"
 msgstr "@@unignore|Sluta ignorera %s@@"
 
-#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:228
-#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:534
+#: src/gui/popupmenu.cpp:218 src/gui/popupmenu.cpp:229
+#: src/gui/popupmenu.cpp:350 src/gui/popupmenu.cpp:536
 msgid "@@buy|Buy@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:218 src/gui/popupmenu.cpp:229
-#: src/gui/popupmenu.cpp:350 src/gui/popupmenu.cpp:535
+#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:230
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:537
 #, fuzzy
 msgid "@@sell|Sell@@"
 msgstr "@@use|Använd@@"
 
-#: src/gui/popupmenu.cpp:226
+#: src/gui/popupmenu.cpp:227
 #, fuzzy
 msgid "@@talk|Talk@@"
 msgstr "@@attack|Attackera %s@@"
 
-#: src/gui/popupmenu.cpp:240
+#: src/gui/popupmenu.cpp:241
 #, fuzzy
 msgid "@@admin-kick|Kick@@"
 msgstr "@@admin-kick|Sparka spelare@@"
 
-#: src/gui/popupmenu.cpp:248 src/gui/popupmenu.cpp:353
+#: src/gui/popupmenu.cpp:249 src/gui/popupmenu.cpp:354
 #, fuzzy
 msgid "@@name|Add name to chat@@"
 msgstr "@@name|Använd namn i chatt@@"
 
-#: src/gui/popupmenu.cpp:252 src/gui/popupmenu.cpp:272
-#: src/gui/popupmenu.cpp:357 src/gui/popupmenu.cpp:380
-#: src/gui/popupmenu.cpp:399 src/gui/popupmenu.cpp:412
-#: src/gui/popupmenu.cpp:430 src/gui/popupmenu.cpp:577
-#: src/gui/popupmenu.cpp:601
+#: src/gui/popupmenu.cpp:253 src/gui/popupmenu.cpp:273
+#: src/gui/popupmenu.cpp:358 src/gui/popupmenu.cpp:381
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:431 src/gui/popupmenu.cpp:579
+#: src/gui/popupmenu.cpp:603
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancel|Avbryt@@"
 
-#: src/gui/popupmenu.cpp:267
+#: src/gui/popupmenu.cpp:268
 #, c-format
 msgid "@@player_%u|%s >@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:375
+#: src/gui/popupmenu.cpp:376
 #, fuzzy
 msgid "@@pickup|Pick up@@"
 msgstr "@@pickup|Plocka upp %s@@"
 
-#: src/gui/popupmenu.cpp:376
+#: src/gui/popupmenu.cpp:377
 #, fuzzy
 msgid "@@chat|Add to chat@@"
 msgstr "@@chat|Nämn i chattfönstret@@"
 
-#: src/gui/popupmenu.cpp:394
+#: src/gui/popupmenu.cpp:395
 msgid "Map Item"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:395
+#: src/gui/popupmenu.cpp:396
 msgid "@@rename map|Rename@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:396
+#: src/gui/popupmenu.cpp:397
 msgid "@@remove map|Remove@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:409
+#: src/gui/popupmenu.cpp:410
 msgid "@@load old outfits|Load old outfits@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:425 src/gui/windowmenu.cpp:90
+#: src/gui/popupmenu.cpp:426 src/gui/windowmenu.cpp:90
 msgid "Spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:426
+#: src/gui/popupmenu.cpp:427
 msgid "@@load old spells|Load old spells@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:427
+#: src/gui/popupmenu.cpp:428
 #, fuzzy
 msgid "@@edit spell|Edit spell@@"
 msgstr "@@use|Använd@@"
 
-#: src/gui/popupmenu.cpp:445
+#: src/gui/popupmenu.cpp:446
 msgid "@@chat close|Close@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:453
+#: src/gui/popupmenu.cpp:454
 #, fuzzy
 msgid "Disable highlight"
 msgstr "Flikmarkering"
 
-#: src/gui/popupmenu.cpp:459
+#: src/gui/popupmenu.cpp:460
 #, fuzzy
 msgid "Enable highlight"
 msgstr "Flikmarkering"
 
-#: src/gui/popupmenu.cpp:465
+#: src/gui/popupmenu.cpp:466
 msgid "@@leave party|Leave@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:585
+#: src/gui/popupmenu.cpp:587
 #, fuzzy
 msgid "Change guild position"
 msgstr "Ändra"
 
-#: src/gui/popupmenu.cpp:598
+#: src/gui/popupmenu.cpp:600
 #, c-format
 msgid "@@guild-pos-%d|%s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:942
+#: src/gui/popupmenu.cpp:944
 msgid "Rename map sign          "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:943
+#: src/gui/popupmenu.cpp:945
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1091
+#: src/gui/popupmenu.cpp:1093
 #, fuzzy
 msgid "Store 10"
 msgstr "Lagra"
 
-#: src/gui/popupmenu.cpp:1094
+#: src/gui/popupmenu.cpp:1096
 #, fuzzy
 msgid "Store half"
 msgstr "Lagra"
 
-#: src/gui/popupmenu.cpp:1096
+#: src/gui/popupmenu.cpp:1098
 #, fuzzy
 msgid "Store all"
 msgstr "Lagra"
 
-#: src/gui/popupmenu.cpp:1110
+#: src/gui/popupmenu.cpp:1112
 #, fuzzy
 msgid "Retrieve 10"
 msgstr "Hämta"
 
-#: src/gui/popupmenu.cpp:1113
+#: src/gui/popupmenu.cpp:1115
 #, fuzzy
 msgid "Retrieve half"
 msgstr "Hämta"
 
-#: src/gui/popupmenu.cpp:1115
+#: src/gui/popupmenu.cpp:1117
 #, fuzzy
 msgid "Retrieve all"
 msgstr "Hämta"
 
-#: src/gui/popupmenu.cpp:1118 src/gui/popupmenu.cpp:1186
-#: src/gui/popupmenu.cpp:1224
+#: src/gui/popupmenu.cpp:1120 src/gui/popupmenu.cpp:1188
+#: src/gui/popupmenu.cpp:1226
 #, fuzzy
 msgid "Add to chat"
 msgstr "@@chat|Nämn i chattfönstret@@"
 
-#: src/gui/popupmenu.cpp:1145 src/gui/popupmenu.cpp:1190
+#: src/gui/popupmenu.cpp:1147 src/gui/popupmenu.cpp:1192
 msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1228
+#: src/gui/popupmenu.cpp:1230
 msgid "Load old drop shortcuts"
 msgstr ""
 
@@ -3237,6 +3250,10 @@ msgstr ""
 msgid "Who Is Online - Update"
 msgstr ""
 
+#: src/gui/widgets/battletab.cpp:41
+msgid "Battle"
+msgstr ""
+
 #: src/gui/widgets/channeltab.cpp:49
 msgid "/users > Lists the users in the current channel"
 msgstr ""
@@ -3679,174 +3696,175 @@ msgstr "Nästa chattflik"
 #: src/keyboardconfig.cpp:233 src/keyboardconfig.cpp:236
 #: src/keyboardconfig.cpp:238 src/keyboardconfig.cpp:240
 #: src/keyboardconfig.cpp:242 src/keyboardconfig.cpp:244
+#: src/keyboardconfig.cpp:246 src/keyboardconfig.cpp:248
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "Tangent för smiley %d"
 
-#: src/keyboardconfig.cpp:246
+#: src/keyboardconfig.cpp:250
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:248
+#: src/keyboardconfig.cpp:252
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:250
+#: src/keyboardconfig.cpp:254
 msgid "Copy Equiped to Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:252
+#: src/keyboardconfig.cpp:256
 msgid "Toggle Chat"
 msgstr "Växla chattfönster"
 
-#: src/keyboardconfig.cpp:254
+#: src/keyboardconfig.cpp:258
 msgid "Scroll Chat Up"
 msgstr "Rulla upp chatt"
 
-#: src/keyboardconfig.cpp:256
+#: src/keyboardconfig.cpp:260
 msgid "Scroll Chat Down"
 msgstr "Rulla ned chatt"
 
-#: src/keyboardconfig.cpp:258
+#: src/keyboardconfig.cpp:262
 msgid "Previous Chat Tab"
 msgstr "Föregående chattflik"
 
-#: src/keyboardconfig.cpp:260
+#: src/keyboardconfig.cpp:264
 msgid "Next Chat Tab"
 msgstr "Nästa chattflik"
 
-#: src/keyboardconfig.cpp:262
+#: src/keyboardconfig.cpp:266
 #, fuzzy
 msgid "Previous chat tab line"
 msgstr "Föregående chattflik"
 
-#: src/keyboardconfig.cpp:264
+#: src/keyboardconfig.cpp:268
 #, fuzzy
 msgid "Next chat tab line"
 msgstr "Nästa chattflik"
 
-#: src/keyboardconfig.cpp:266
+#: src/keyboardconfig.cpp:270
 msgid "Chat Auto Complete"
 msgstr ""
 
-#: src/keyboardconfig.cpp:268
+#: src/keyboardconfig.cpp:272
 msgid "Deactivate Chat Input"
 msgstr ""
 
-#: src/keyboardconfig.cpp:270
+#: src/keyboardconfig.cpp:274
 msgid "Select OK"
 msgstr "Välj okej"
 
-#: src/keyboardconfig.cpp:272
+#: src/keyboardconfig.cpp:276
 msgid "Ignore input 1"
 msgstr "Ignorera inmatning 1"
 
-#: src/keyboardconfig.cpp:274
+#: src/keyboardconfig.cpp:278
 msgid "Ignore input 2"
 msgstr "Ignorera inmatning 2"
 
-#: src/keyboardconfig.cpp:276
+#: src/keyboardconfig.cpp:280
 msgid "Direct Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:277
+#: src/keyboardconfig.cpp:281
 #, fuzzy
 msgid "Direct Down"
 msgstr "Gå nedåt"
 
-#: src/keyboardconfig.cpp:279
+#: src/keyboardconfig.cpp:283
 #, fuzzy
 msgid "Direct Left"
 msgstr "Gå åt vänster"
 
-#: src/keyboardconfig.cpp:280
+#: src/keyboardconfig.cpp:284
 #, fuzzy
 msgid "Direct Right"
 msgstr "Gå åt höger"
 
-#: src/keyboardconfig.cpp:282
+#: src/keyboardconfig.cpp:286
 msgid "Crazy moves"
 msgstr ""
 
-#: src/keyboardconfig.cpp:284
+#: src/keyboardconfig.cpp:288
 msgid "Change Crazy Move mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:286
+#: src/keyboardconfig.cpp:290
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:288
+#: src/keyboardconfig.cpp:292
 msgid "Quick Drop N Items"
 msgstr ""
 
-#: src/keyboardconfig.cpp:290
+#: src/keyboardconfig.cpp:294
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/keyboardconfig.cpp:292
+#: src/keyboardconfig.cpp:296
 msgid "Quick heal target or self"
 msgstr ""
 
-#: src/keyboardconfig.cpp:294
+#: src/keyboardconfig.cpp:298
 msgid "Use #itenplz spell"
 msgstr ""
 
-#: src/keyboardconfig.cpp:296
+#: src/keyboardconfig.cpp:300
 msgid "Use magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboardconfig.cpp:302
 #, fuzzy
 msgid "Switch magic attack"
 msgstr "Byt karaktär"
 
-#: src/keyboardconfig.cpp:300
+#: src/keyboardconfig.cpp:304
 #, fuzzy
 msgid "Change move type"
 msgstr "Server"
 
-#: src/keyboardconfig.cpp:302
+#: src/keyboardconfig.cpp:306
 msgid "Change Attack Weapon Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:304
+#: src/keyboardconfig.cpp:308
 #, fuzzy
 msgid "Change Attack Type"
 msgstr "Välj & attackera"
 
-#: src/keyboardconfig.cpp:306
+#: src/keyboardconfig.cpp:310
 #, fuzzy
 msgid "Change Follow mode"
 msgstr "Ändra lösenord"
 
-#: src/keyboardconfig.cpp:308
+#: src/keyboardconfig.cpp:312
 #, fuzzy
 msgid "Change Imitation mode"
 msgstr "Ändra epostadress"
 
-#: src/keyboardconfig.cpp:311
+#: src/keyboardconfig.cpp:315
 msgid "Disbale / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboardconfig.cpp:316
 msgid "On / Off audio"
 msgstr ""
 
-#: src/keyboardconfig.cpp:314
+#: src/keyboardconfig.cpp:318
 #, fuzzy
 msgid "Enable / Disable away mode"
 msgstr "Tillåt/neka handel"
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboardconfig.cpp:320
 msgid "Emulate right click from keyboard"
 msgstr ""
 
-#: src/keyboardconfig.cpp:318
+#: src/keyboardconfig.cpp:322
 msgid "Toggle camera mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:380
+#: src/keyboardconfig.cpp:384
 #, fuzzy, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -4117,7 +4135,7 @@ msgstr " Klicka okej för att återuppstå"
 msgid "You Died"
 msgstr "Du dog"
 
-#: src/net/manaserv/charhandler.cpp:144 src/net/manaserv/charhandler.cpp:215
+#: src/net/manaserv/charhandler.cpp:144 src/net/manaserv/charhandler.cpp:218
 #, fuzzy
 msgid "Not logged in."
 msgstr "Redan inloggad"
@@ -4162,7 +4180,11 @@ msgstr "Karaktärens värden okej"
 msgid "At least one statis out of the permitted range: (%u - %u)."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:177 src/net/manaserv/loginhandler.cpp:98
+#: src/net/manaserv/charhandler.cpp:177
+msgid "Invalid slot number."
+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
@@ -4170,26 +4192,26 @@ msgstr ""
 msgid "Unknown error."
 msgstr "Okänt fel"
 
-#: src/net/manaserv/charhandler.cpp:206 src/net/tmwa/charserverhandler.cpp:149
+#: src/net/manaserv/charhandler.cpp:209 src/net/tmwa/charserverhandler.cpp:149
 msgid "Info"
 msgstr "Information"
 
-#: src/net/manaserv/charhandler.cpp:206
+#: src/net/manaserv/charhandler.cpp:209
 #, fuzzy
 msgid "Player deleted."
 msgstr "Karaktär borttagen."
 
-#: src/net/manaserv/charhandler.cpp:218
+#: src/net/manaserv/charhandler.cpp:221
 #, fuzzy
 msgid "Selection out of range."
 msgstr "Välj antal föremål att handla med."
 
-#: src/net/manaserv/charhandler.cpp:221
+#: src/net/manaserv/charhandler.cpp:224
 #, fuzzy, c-format
 msgid "Unknown error (%d)."
 msgstr "Okänt fel"
 
-#: src/net/manaserv/charhandler.cpp:257
+#: src/net/manaserv/charhandler.cpp:260
 msgid "No gameservers are available."
 msgstr "Ingen spelserver finns tillgänglig."
 
@@ -4382,11 +4404,11 @@ msgstr "%s vill byteshandla med dig, accepterar du?"
 msgid "Trading with %s"
 msgstr "Byteshandlar med %s"
 
-#: src/net/manaserv/tradehandler.cpp:159 src/net/tmwa/tradehandler.cpp:268
+#: src/net/manaserv/tradehandler.cpp:159 src/net/tmwa/tradehandler.cpp:273
 msgid "Trade canceled."
 msgstr "Byteshandel avbruten."
 
-#: src/net/manaserv/tradehandler.cpp:166 src/net/tmwa/tradehandler.cpp:278
+#: src/net/manaserv/tradehandler.cpp:166 src/net/tmwa/tradehandler.cpp:283
 msgid "Trade completed."
 msgstr "Byteshandel genomförd."
 
@@ -4875,11 +4897,11 @@ msgstr "Fördelning av erfarenhet ej möjlig."
 msgid "Experience sharing unknown."
 msgstr "Fördelning av erfarenhet aktiverad."
 
-#: src/net/tmwa/inventoryhandler.cpp:329
+#: src/net/tmwa/inventoryhandler.cpp:334
 msgid "Failed to use item."
 msgstr "Kunde inte använda föremål."
 
-#: src/net/tmwa/inventoryhandler.cpp:452
+#: src/net/tmwa/inventoryhandler.cpp:457
 msgid "Unable to equip."
 msgstr "Kan inte utrusta."
 
@@ -5205,7 +5227,14 @@ msgstr "Kunde inte lägga till föremål. Bytespartnern är överfull."
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr "Kunde inte lägga till föremål. Bytespartnern har inget ledigt utrymme."
 
-#: src/net/tmwa/tradehandler.cpp:250
+#: src/net/tmwa/tradehandler.cpp:251
+#, fuzzy
+msgid "Failed adding item. You cant trade this item."
+msgstr ""
+"Kan inte lägga till vald sak. Det går inte att byteshandla med samma slags "
+"sak flera gånger."
+
+#: src/net/tmwa/tradehandler.cpp:255
 msgid "Failed adding item for unknown reason."
 msgstr "Kunde inte lägga till föremål av okänd anledning."
 
@@ -5230,6 +5259,11 @@ msgstr ""
 msgid "Floating bubble"
 msgstr ""
 
+#: src/resources/beinginfo.cpp:32 src/resources/itemdb.cpp:210
+#: src/resources/monsterdb.cpp:78
+msgid "unnamed"
+msgstr "namnlös"
+
 #: src/resources/itemdb.cpp:55
 #, c-format
 msgid "Attack %+d"
@@ -5254,10 +5288,6 @@ msgstr "Mana %+d"
 msgid "Unknown item"
 msgstr "Okänt föremål"
 
-#: src/resources/itemdb.cpp:210 src/resources/monsterdb.cpp:78
-msgid "unnamed"
-msgstr "namnlös"
-
 #, fuzzy
 #~ msgid "Particle detail: %s"
 #~ msgstr "Partikeldetaljer"
author	Andrei Karas <akaras@inbox.ru>	2011-01-05 04:52:43 +0200
committer	Andrei Karas <akaras@inbox.ru>	2011-01-05 04:52:43 +0200
commit	827f91446c550fdf066cb9bec1d6b15ae8662b78 (patch)
tree	d75fcab56507f26891787f824cf443a248df6bf8 /po
parent	c595f66bc9031fd28e5146a7aaee686b4ecb9c67 (diff)
download	manaverse-827f91446c550fdf066cb9bec1d6b15ae8662b78.tar.gz manaverse-827f91446c550fdf066cb9bec1d6b15ae8662b78.tar.bz2 manaverse-827f91446c550fdf066cb9bec1d6b15ae8662b78.tar.xz manaverse-827f91446c550fdf066cb9bec1d6b15ae8662b78.zip