Merge branch 'master' into invfiler

author: Andrei Karas <akaras@inbox.ru> 2011-01-11 01:34:11 +0200
committer: Andrei Karas <akaras@inbox.ru> 2011-01-11 01:34:11 +0200
commit: fcced13d9972ac70f0f01f19583b7868e255b6a7 (patch)
tree: 9b01df102c5f9ba032ea0f9bc413dd707e99d88b
parent: 311783bebbe2bed366dca5097697ce34c690292d (diff)
parent: ef1b9856c86512fe73154c17da3ea98a7cd5f896 (diff)
download: ManaVerse-fcced13d9972ac70f0f01f19583b7868e255b6a7.tar.gz
ManaVerse-fcced13d9972ac70f0f01f19583b7868e255b6a7.tar.bz2
ManaVerse-fcced13d9972ac70f0f01f19583b7868e255b6a7.tar.xz
ManaVerse-fcced13d9972ac70f0f01f19583b7868e255b6a7.zip
44 files changed, 6074 insertions, 5594 deletions
diff --git a/ChangeLog b/ChangeLog
new file mode 100644
index 000000000..7ff8e227c
--- /dev/null
+++ b/ChangeLog
@@ -0,0 +1 @@
+=== ChangeLog discontinued ===
diff --git a/NEWS b/NEWS
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/NEWS
diff --git a/data/help/header.txt b/data/help/header.txt
index 3e60eebd4..1eec0df3c 100644
--- a/data/help/header.txt
+++ b/data/help/header.txt
@@ -2,7 +2,7 @@
 ##1               M   A   N   A      P   L   U   S
 ##1               ================================
  
-           ##2Version:##6 1.0.12.26        ##2Date:##3 26 December 2010
+           ##2Version:##6 1.1.1.9          ##2Date:##3 09 January 2011
  
 ##2                    Website: http://tmw.cetki.com/
 ##2                             http://mana.cetki.com/
diff --git a/packwin b/packwin
index a5e2307eb..4b3139242 100755
--- a/packwin
+++ b/packwin
@@ -5,7 +5,7 @@ dir=`pwd`
 cd packaging/windows
 ./make-translations.sh
 makensis -DDLLDIR=$dir/../mana_win/libs/dll/ \
-    -DPRODUCT_VERSION="4144-1.0.12.26" \
+    -DPRODUCT_VERSION="4144-1.1.1.9" \
     -DEXESUFFIX=/src \
     -DUPX=true \
     setup.nsi
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..67b255a5d 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-06 03:06+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:481
+msgid "dodge"
+msgstr ""
+
+#: src/being.cpp:481
+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 ""
 
@@ -2003,7 +2016,7 @@ msgid "Show chat colors list"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:111 src/gui/setup_chat.cpp:119
-#: src/gui/setup_other.cpp:135 src/gui/setup_other.cpp:139
+#: src/gui/setup_other.cpp:137 src/gui/setup_other.cpp:141
 msgid "Edit"
 msgstr ""
 
@@ -2028,26 +2041,26 @@ msgstr "Farver"
 msgid "Type:"
 msgstr "Type: "
 
-#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:398
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:400
 msgid "Static"
 msgstr "Fastlåst"
 
 #: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
-#: src/gui/setup_colors.cpp:399
+#: src/gui/setup_colors.cpp:401
 msgid "Pulse"
 msgstr "Pulserende"
 
 #: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:400
+#: src/gui/setup_colors.cpp:402
 msgid "Rainbow"
 msgstr "Regnbuefarvet"
 
 #: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:400
+#: src/gui/setup_colors.cpp:402
 msgid "Spectrum"
 msgstr "Spektrum"
 
-#: src/gui/setup_colors.cpp:94 src/gui/setup_colors.cpp:310
+#: src/gui/setup_colors.cpp:94 src/gui/setup_colors.cpp:312
 #, fuzzy
 msgid "Delay:"
 msgstr "Forsinkelse: "
@@ -2067,7 +2080,7 @@ msgstr "Grøn: "
 msgid "Blue:"
 msgstr "Blå: "
 
-#: src/gui/setup_colors.cpp:305
+#: src/gui/setup_colors.cpp:307
 msgid "Alpha:"
 msgstr ""
 
@@ -2124,99 +2137,104 @@ msgstr "Standard"
 msgid "Key Conflict(s) Detected."
 msgstr "Tast Konfikt(er) Opdaget."
 
-#: src/gui/setup_other.cpp:92
+#: src/gui/setup_other.cpp:94
 msgid "Misc"
 msgstr ""
 
-#: src/gui/setup_other.cpp:95
+#: src/gui/setup_other.cpp:97
 msgid "Show damage inflicted to monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:100
+#: src/gui/setup_other.cpp:102
 msgid "Auto target only reachable monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:104
+#: src/gui/setup_other.cpp:106
 #, fuzzy
 msgid "Highlight map portals"
 msgstr "Fremhæv"
 
-#: src/gui/setup_other.cpp:109
+#: src/gui/setup_other.cpp:111
 msgid "Highlight player attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:114
+#: src/gui/setup_other.cpp:116
 msgid "Highlight monster attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:118
+#: src/gui/setup_other.cpp:120
 msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:121
+#: src/gui/setup_other.cpp:123
 #, fuzzy
 msgid "Cycle monster targets"
 msgstr "Vis navn"
 
-#: src/gui/setup_other.cpp:124
+#: src/gui/setup_other.cpp:126
 #, fuzzy
 msgid "Enable bot checker"
 msgstr "Aktiver joystick"
 
-#: src/gui/setup_other.cpp:127
+#: src/gui/setup_other.cpp:129
 #, fuzzy
 msgid "Highlight floor items"
 msgstr "Fremhæv"
 
-#: src/gui/setup_other.cpp:130
+#: src/gui/setup_other.cpp:132
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:141
+#: src/gui/setup_other.cpp:143
 #, fuzzy
 msgid "Enable shop mode"
 msgstr "Slå handler fra/til"
 
-#: src/gui/setup_other.cpp:145
+#: src/gui/setup_other.cpp:147
 msgid "Enable buggy servers protection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:149
+#: src/gui/setup_other.cpp:151
 #, fuzzy
 msgid "Enable debug log"
 msgstr "Du kan ikke købe."
 
-#: src/gui/setup_other.cpp:153
+#: src/gui/setup_other.cpp:155
 #, fuzzy
 msgid "Enable server side attack"
 msgstr "Du kan ikke købe."
 
-#: src/gui/setup_other.cpp:157
+#: src/gui/setup_other.cpp:159
 msgid "Auto fix position"
 msgstr ""
 
-#: src/gui/setup_other.cpp:161
+#: src/gui/setup_other.cpp:163
 msgid "Attack while moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:165
+#: src/gui/setup_other.cpp:167
 #, fuzzy
 msgid "Enable quick stats"
 msgstr "Aktiver joystick"
 
-#: src/gui/setup_other.cpp:169
+#: src/gui/setup_other.cpp:171
 #, fuzzy
 msgid "Show warps particles"
 msgstr "som partikeleffekt"
 
-#: src/gui/setup_other.cpp:173
+#: src/gui/setup_other.cpp:175
 msgid "Accept sell/buy requests"
 msgstr ""
 
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:179
 msgid "Show monster hp bar"
 msgstr ""
 
+#: src/gui/setup_other.cpp:183
+#, fuzzy
+msgid "Show own hp bar"
+msgstr "Vis navn"
+
 #: src/gui/setup_players.cpp:60
 msgid "Relation"
 msgstr "Relation"
@@ -3060,156 +3078,165 @@ msgstr "##1  du prøver igen senere"
 msgid "Completed"
 msgstr "Udført"
 
-#: src/gui/userpalette.cpp:109
+#: src/gui/userpalette.cpp:111
 msgid "Being"
 msgstr "Skabning"
 
-#: src/gui/userpalette.cpp:110
+#: src/gui/userpalette.cpp:112
 #, fuzzy
 msgid "Friend Names"
 msgstr "Ven"
 
-#: src/gui/userpalette.cpp:111
+#: src/gui/userpalette.cpp:113
 #, fuzzy
 msgid "Disregarded Names"
 msgstr "Se bort fra"
 
-#: src/gui/userpalette.cpp:112
+#: src/gui/userpalette.cpp:114
 #, fuzzy
 msgid "Ignored Names"
 msgstr "Ignorer"
 
-#: src/gui/userpalette.cpp:113
+#: src/gui/userpalette.cpp:115
 #, fuzzy
 msgid "Erased Names"
 msgstr "GM-navne"
 
-#: src/gui/userpalette.cpp:114
+#: src/gui/userpalette.cpp:116
 msgid "Other Players' Names"
 msgstr "Andre spilleres navne"
 
-#: src/gui/userpalette.cpp:115
+#: src/gui/userpalette.cpp:117
 msgid "Own Name"
 msgstr "Eget navn"
 
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:118
 msgid "GM Names"
 msgstr "GM-navne"
 
-#: src/gui/userpalette.cpp:117
+#: src/gui/userpalette.cpp:119
 msgid "NPCs"
 msgstr "NPC'er"
 
-#: src/gui/userpalette.cpp:118
+#: src/gui/userpalette.cpp:120
 msgid "Monsters"
 msgstr "Monstre"
 
-#: src/gui/userpalette.cpp:119
+#: src/gui/userpalette.cpp:121
 #, fuzzy
 msgid "Monster HP bar"
 msgstr "Monster rammer spiller"
 
-#: src/gui/userpalette.cpp:121
+#: src/gui/userpalette.cpp:123
 msgid "Monster HP bar (second color)"
 msgstr ""
 
-#: src/gui/userpalette.cpp:122
+#: src/gui/userpalette.cpp:124
 #, fuzzy
 msgid "Party Members"
 msgstr "Gruppe"
 
-#: src/gui/userpalette.cpp:123
+#: src/gui/userpalette.cpp:125
 #, fuzzy
 msgid "Guild Members"
 msgstr "Opret en guild"
 
-#: src/gui/userpalette.cpp:124
+#: src/gui/userpalette.cpp:126
 msgid "Particle Effects"
 msgstr "Partikeleffekter"
 
-#: src/gui/userpalette.cpp:125
+#: src/gui/userpalette.cpp:127
 msgid "Pickup Notification"
 msgstr "Opsamlingsnotits"
 
-#: src/gui/userpalette.cpp:126
+#: src/gui/userpalette.cpp:128
 msgid "Exp Notification"
 msgstr "XP-notits"
 
-#: src/gui/userpalette.cpp:127
+#: src/gui/userpalette.cpp:129
+#, fuzzy
+msgid "Player HP bar"
+msgstr "Monster rammer spiller"
+
+#: src/gui/userpalette.cpp:131
+msgid "Player HP bar (second color)"
+msgstr ""
+
+#: src/gui/userpalette.cpp:132
 #, fuzzy
 msgid "Player Hits Monster"
 msgstr "Spiller rammer monster"
 
-#: src/gui/userpalette.cpp:128
+#: src/gui/userpalette.cpp:133
 #, fuzzy
 msgid "Monster Hits Player"
 msgstr "Monster rammer spiller"
 
-#: src/gui/userpalette.cpp:130
+#: src/gui/userpalette.cpp:135
 #, fuzzy
 msgid "Other Player Hits Local Player"
 msgstr "Andre spilleres navne"
 
-#: src/gui/userpalette.cpp:131
+#: src/gui/userpalette.cpp:136
 msgid "Critical Hit"
 msgstr "Kritisk sår"
 
-#: src/gui/userpalette.cpp:133
+#: src/gui/userpalette.cpp:138
 #, fuzzy
 msgid "Local Player Hits Monster"
 msgstr "Spiller rammer monster"
 
-#: src/gui/userpalette.cpp:135
+#: src/gui/userpalette.cpp:140
 #, fuzzy
 msgid "Local Player Critical Hit"
 msgstr "Spiller rammer monster"
 
-#: src/gui/userpalette.cpp:137
+#: src/gui/userpalette.cpp:142
 #, fuzzy
 msgid "Local Player Miss"
 msgstr "Gem bruger liste"
 
-#: src/gui/userpalette.cpp:138
+#: src/gui/userpalette.cpp:143
 msgid "Misses"
 msgstr "Rammer forbi"
 
-#: src/gui/userpalette.cpp:139
+#: src/gui/userpalette.cpp:144
 #, fuzzy
 msgid "Portal Highlight"
 msgstr "Fremhæv tab"
 
-#: src/gui/userpalette.cpp:141
+#: src/gui/userpalette.cpp:146
 #, fuzzy
 msgid "Collision Highlight"
 msgstr "Fremhæv"
 
-#: src/gui/userpalette.cpp:143
+#: src/gui/userpalette.cpp:148
 #, fuzzy
 msgid "Walkable Highlight"
 msgstr "Fremhæv tab"
 
-#: src/gui/userpalette.cpp:145
+#: src/gui/userpalette.cpp:150
 msgid "Local Player Attack Range"
 msgstr ""
 
-#: src/gui/userpalette.cpp:147
+#: src/gui/userpalette.cpp:152
 msgid "Local Player Attack Range Border"
 msgstr ""
 
-#: src/gui/userpalette.cpp:149
+#: src/gui/userpalette.cpp:154
 #, fuzzy
 msgid "Monster Attack Range"
 msgstr "Monster rammer spiller"
 
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:156
 msgid "Home Place"
 msgstr ""
 
-#: src/gui/userpalette.cpp:153
+#: src/gui/userpalette.cpp:158
 msgid "Home Place Border"
 msgstr ""
 
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:160
 msgid "Road Point"
 msgstr ""
 
@@ -3233,6 +3260,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 +3709,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 +4144,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 +4189,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 +4201,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 +4412,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 +4901,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 +5232,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 +5264,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 +5293,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..9a061834e 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-06 03:06+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:481
+msgid "dodge"
+msgstr ""
+
+#: src/being.cpp:481
+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 ""
 
@@ -1991,7 +2004,7 @@ msgid "Show chat colors list"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:111 src/gui/setup_chat.cpp:119
-#: src/gui/setup_other.cpp:135 src/gui/setup_other.cpp:139
+#: src/gui/setup_other.cpp:137 src/gui/setup_other.cpp:141
 msgid "Edit"
 msgstr ""
 
@@ -2015,26 +2028,26 @@ msgstr "Farben"
 msgid "Type:"
 msgstr "Typ: "
 
-#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:398
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:400
 msgid "Static"
 msgstr "Statisch"
 
 #: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
-#: src/gui/setup_colors.cpp:399
+#: src/gui/setup_colors.cpp:401
 msgid "Pulse"
 msgstr "Pulsierend"
 
 #: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:400
+#: src/gui/setup_colors.cpp:402
 msgid "Rainbow"
 msgstr "Regenbogen"
 
 #: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:400
+#: src/gui/setup_colors.cpp:402
 msgid "Spectrum"
 msgstr "Spektrum"
 
-#: src/gui/setup_colors.cpp:94 src/gui/setup_colors.cpp:310
+#: src/gui/setup_colors.cpp:94 src/gui/setup_colors.cpp:312
 msgid "Delay:"
 msgstr "Verzögerung: "
 
@@ -2050,7 +2063,7 @@ msgstr "Grün: "
 msgid "Blue:"
 msgstr "Blau: "
 
-#: src/gui/setup_colors.cpp:305
+#: src/gui/setup_colors.cpp:307
 msgid "Alpha:"
 msgstr ""
 
@@ -2108,99 +2121,104 @@ msgstr "Standard"
 msgid "Key Conflict(s) Detected."
 msgstr "Tastenkonflikte entdeckt."
 
-#: src/gui/setup_other.cpp:92
+#: src/gui/setup_other.cpp:94
 msgid "Misc"
 msgstr ""
 
-#: src/gui/setup_other.cpp:95
+#: src/gui/setup_other.cpp:97
 msgid "Show damage inflicted to monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:100
+#: src/gui/setup_other.cpp:102
 msgid "Auto target only reachable monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:104
+#: src/gui/setup_other.cpp:106
 #, fuzzy
 msgid "Highlight map portals"
 msgstr "Hervorgehoben"
 
-#: src/gui/setup_other.cpp:109
+#: src/gui/setup_other.cpp:111
 msgid "Highlight player attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:114
+#: src/gui/setup_other.cpp:116
 msgid "Highlight monster attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:118
+#: src/gui/setup_other.cpp:120
 msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:121
+#: src/gui/setup_other.cpp:123
 #, fuzzy
 msgid "Cycle monster targets"
 msgstr "Eigener Name"
 
-#: src/gui/setup_other.cpp:124
+#: src/gui/setup_other.cpp:126
 #, fuzzy
 msgid "Enable bot checker"
 msgstr "Joystick aktivieren"
 
-#: src/gui/setup_other.cpp:127
+#: src/gui/setup_other.cpp:129
 #, fuzzy
 msgid "Highlight floor items"
 msgstr "Hervorgehoben"
 
-#: src/gui/setup_other.cpp:130
+#: src/gui/setup_other.cpp:132
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:141
+#: src/gui/setup_other.cpp:143
 #, fuzzy
 msgid "Enable shop mode"
 msgstr "Handeln erlauben/verbieten"
 
-#: src/gui/setup_other.cpp:145
+#: src/gui/setup_other.cpp:147
 msgid "Enable buggy servers protection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:149
+#: src/gui/setup_other.cpp:151
 #, fuzzy
 msgid "Enable debug log"
 msgstr "Kauf fehlgeschlagen."
 
-#: src/gui/setup_other.cpp:153
+#: src/gui/setup_other.cpp:155
 #, fuzzy
 msgid "Enable server side attack"
 msgstr "Kauf fehlgeschlagen."
 
-#: src/gui/setup_other.cpp:157
+#: src/gui/setup_other.cpp:159
 msgid "Auto fix position"
 msgstr ""
 
-#: src/gui/setup_other.cpp:161
+#: src/gui/setup_other.cpp:163
 msgid "Attack while moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:165
+#: src/gui/setup_other.cpp:167
 #, fuzzy
 msgid "Enable quick stats"
 msgstr "Joystick aktivieren"
 
-#: src/gui/setup_other.cpp:169
+#: src/gui/setup_other.cpp:171
 #, fuzzy
 msgid "Show warps particles"
 msgstr "als Partikeleffekt"
 
-#: src/gui/setup_other.cpp:173
+#: src/gui/setup_other.cpp:175
 msgid "Accept sell/buy requests"
 msgstr ""
 
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:179
 msgid "Show monster hp bar"
 msgstr ""
 
+#: src/gui/setup_other.cpp:183
+#, fuzzy
+msgid "Show own hp bar"
+msgstr "Eigener Name"
+
 #: src/gui/setup_players.cpp:60
 msgid "Relation"
 msgstr "Beziehung"
@@ -3047,154 +3065,163 @@ msgstr "##1 es später erneut zu versuchen."
 msgid "Completed"
 msgstr "Fertig"
 
-#: src/gui/userpalette.cpp:109
+#: src/gui/userpalette.cpp:111
 msgid "Being"
 msgstr "Aktionen"
 
-#: src/gui/userpalette.cpp:110
+#: src/gui/userpalette.cpp:112
 #, fuzzy
 msgid "Friend Names"
 msgstr "Freund"
 
-#: src/gui/userpalette.cpp:111
+#: src/gui/userpalette.cpp:113
 #, fuzzy
 msgid "Disregarded Names"
 msgstr "Unbeachtet"
 
-#: src/gui/userpalette.cpp:112
+#: src/gui/userpalette.cpp:114
 #, fuzzy
 msgid "Ignored Names"
 msgstr "Ignoriere %s"
 
-#: src/gui/userpalette.cpp:113
+#: src/gui/userpalette.cpp:115
 #, fuzzy
 msgid "Erased Names"
 msgstr "Senden"
 
-#: src/gui/userpalette.cpp:114
+#: src/gui/userpalette.cpp:116
 msgid "Other Players' Names"
 msgstr "Namen anderer Spieler"
 
-#: src/gui/userpalette.cpp:115
+#: src/gui/userpalette.cpp:117
 msgid "Own Name"
 msgstr "Eigener Name"
 
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:118
 msgid "GM Names"
 msgstr "Namen von GM"
 
-#: src/gui/userpalette.cpp:117
+#: src/gui/userpalette.cpp:119
 msgid "NPCs"
 msgstr "NPCs"
 
-#: src/gui/userpalette.cpp:118
+#: src/gui/userpalette.cpp:120
 msgid "Monsters"
 msgstr "Monster"
 
-#: src/gui/userpalette.cpp:119
+#: src/gui/userpalette.cpp:121
 #, fuzzy
 msgid "Monster HP bar"
 msgstr "Monster trifft Spieler"
 
-#: src/gui/userpalette.cpp:121
+#: src/gui/userpalette.cpp:123
 msgid "Monster HP bar (second color)"
 msgstr ""
 
-#: src/gui/userpalette.cpp:122
+#: src/gui/userpalette.cpp:124
 #, fuzzy
 msgid "Party Members"
 msgstr "Party"
 
-#: src/gui/userpalette.cpp:123
+#: src/gui/userpalette.cpp:125
 #, fuzzy
 msgid "Guild Members"
 msgstr "Gildenname"
 
-#: src/gui/userpalette.cpp:124
+#: src/gui/userpalette.cpp:126
 msgid "Particle Effects"
 msgstr "Partikeleffekte"
 
-#: src/gui/userpalette.cpp:125
+#: src/gui/userpalette.cpp:127
 msgid "Pickup Notification"
 msgstr "aufgehobene Gegenstände"
 
-#: src/gui/userpalette.cpp:126
+#: src/gui/userpalette.cpp:128
 msgid "Exp Notification"
 msgstr "Anzeige der Erfahrungspunkte"
 
-#: src/gui/userpalette.cpp:127
+#: src/gui/userpalette.cpp:129
+#, fuzzy
+msgid "Player HP bar"
+msgstr "Monster trifft Spieler"
+
+#: src/gui/userpalette.cpp:131
+msgid "Player HP bar (second color)"
+msgstr ""
+
+#: src/gui/userpalette.cpp:132
 msgid "Player Hits Monster"
 msgstr "Spieler trifft Monster"
 
-#: src/gui/userpalette.cpp:128
+#: src/gui/userpalette.cpp:133
 msgid "Monster Hits Player"
 msgstr "Monster trifft Spieler"
 
-#: src/gui/userpalette.cpp:130
+#: src/gui/userpalette.cpp:135
 #, fuzzy
 msgid "Other Player Hits Local Player"
 msgstr "Namen anderer Spieler"
 
-#: src/gui/userpalette.cpp:131
+#: src/gui/userpalette.cpp:136
 msgid "Critical Hit"
 msgstr "Kritischer Treffer"
 
-#: src/gui/userpalette.cpp:133
+#: src/gui/userpalette.cpp:138
 #, fuzzy
 msgid "Local Player Hits Monster"
 msgstr "Spieler trifft Monster"
 
-#: src/gui/userpalette.cpp:135
+#: src/gui/userpalette.cpp:140
 #, fuzzy
 msgid "Local Player Critical Hit"
 msgstr "Spieler trifft Monster"
 
-#: src/gui/userpalette.cpp:137
+#: src/gui/userpalette.cpp:142
 #, fuzzy
 msgid "Local Player Miss"
 msgstr "Spielerliste sichern"
 
-#: src/gui/userpalette.cpp:138
+#: src/gui/userpalette.cpp:143
 msgid "Misses"
 msgstr "Verfehlt"
 
-#: src/gui/userpalette.cpp:139
+#: src/gui/userpalette.cpp:144
 #, fuzzy
 msgid "Portal Highlight"
 msgstr "Hervorgehobener Tab"
 
-#: src/gui/userpalette.cpp:141
+#: src/gui/userpalette.cpp:146
 #, fuzzy
 msgid "Collision Highlight"
 msgstr "Hervorgehoben"
 
-#: src/gui/userpalette.cpp:143
+#: src/gui/userpalette.cpp:148
 #, fuzzy
 msgid "Walkable Highlight"
 msgstr "Hervorgehobener Tab"
 
-#: src/gui/userpalette.cpp:145
+#: src/gui/userpalette.cpp:150
 msgid "Local Player Attack Range"
 msgstr ""
 
-#: src/gui/userpalette.cpp:147
+#: src/gui/userpalette.cpp:152
 msgid "Local Player Attack Range Border"
 msgstr ""
 
-#: src/gui/userpalette.cpp:149
+#: src/gui/userpalette.cpp:154
 #, fuzzy
 msgid "Monster Attack Range"
 msgstr "Monster trifft Spieler"
 
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:156
 msgid "Home Place"
 msgstr ""
 
-#: src/gui/userpalette.cpp:153
+#: src/gui/userpalette.cpp:158
 msgid "Home Place Border"
 msgstr ""
 
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:160
 msgid "Road Point"
 msgstr ""
 
@@ -3219,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 > Zeigt eine Liste der Spieler im aktuellen Kanal"
@@ -3662,174 +3693,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 +4123,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 +4164,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 +4372,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 +4862,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 +5195,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 +5226,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 +5255,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 +5649,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 +6477,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..09dbc7bb1 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-06 03:06+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:481
+msgid "dodge"
+msgstr ""
+
+#: src/being.cpp:481
+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 ""
 
@@ -1999,7 +2012,7 @@ msgid "Show chat colors list"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:111 src/gui/setup_chat.cpp:119
-#: src/gui/setup_other.cpp:135 src/gui/setup_other.cpp:139
+#: src/gui/setup_other.cpp:137 src/gui/setup_other.cpp:141
 msgid "Edit"
 msgstr ""
 
@@ -2024,26 +2037,26 @@ msgstr "Colours"
 msgid "Type:"
 msgstr "Type: "
 
-#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:398
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:400
 msgid "Static"
 msgstr "Static"
 
 #: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
-#: src/gui/setup_colors.cpp:399
+#: src/gui/setup_colors.cpp:401
 msgid "Pulse"
 msgstr "Pulse"
 
 #: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:400
+#: src/gui/setup_colors.cpp:402
 msgid "Rainbow"
 msgstr "Rainbow"
 
 #: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:400
+#: src/gui/setup_colors.cpp:402
 msgid "Spectrum"
 msgstr "Spectrum"
 
-#: src/gui/setup_colors.cpp:94 src/gui/setup_colors.cpp:310
+#: src/gui/setup_colors.cpp:94 src/gui/setup_colors.cpp:312
 #, fuzzy
 msgid "Delay:"
 msgstr "Delay: "
@@ -2063,7 +2076,7 @@ msgstr "Green: "
 msgid "Blue:"
 msgstr "Blue: "
 
-#: src/gui/setup_colors.cpp:305
+#: src/gui/setup_colors.cpp:307
 msgid "Alpha:"
 msgstr ""
 
@@ -2120,99 +2133,104 @@ msgstr "Default"
 msgid "Key Conflict(s) Detected."
 msgstr "Key Conflict(s) Detected."
 
-#: src/gui/setup_other.cpp:92
+#: src/gui/setup_other.cpp:94
 msgid "Misc"
 msgstr ""
 
-#: src/gui/setup_other.cpp:95
+#: src/gui/setup_other.cpp:97
 msgid "Show damage inflicted to monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:100
+#: src/gui/setup_other.cpp:102
 msgid "Auto target only reachable monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:104
+#: src/gui/setup_other.cpp:106
 #, fuzzy
 msgid "Highlight map portals"
 msgstr "Highlight"
 
-#: src/gui/setup_other.cpp:109
+#: src/gui/setup_other.cpp:111
 msgid "Highlight player attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:114
+#: src/gui/setup_other.cpp:116
 msgid "Highlight monster attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:118
+#: src/gui/setup_other.cpp:120
 msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:121
+#: src/gui/setup_other.cpp:123
 #, fuzzy
 msgid "Cycle monster targets"
 msgstr "Show name"
 
-#: src/gui/setup_other.cpp:124
+#: src/gui/setup_other.cpp:126
 #, fuzzy
 msgid "Enable bot checker"
 msgstr "Enable joystick"
 
-#: src/gui/setup_other.cpp:127
+#: src/gui/setup_other.cpp:129
 #, fuzzy
 msgid "Highlight floor items"
 msgstr "Highlight"
 
-#: src/gui/setup_other.cpp:130
+#: src/gui/setup_other.cpp:132
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:141
+#: src/gui/setup_other.cpp:143
 #, fuzzy
 msgid "Enable shop mode"
 msgstr "Allow/Disallow Trading"
 
-#: src/gui/setup_other.cpp:145
+#: src/gui/setup_other.cpp:147
 msgid "Enable buggy servers protection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:149
+#: src/gui/setup_other.cpp:151
 #, fuzzy
 msgid "Enable debug log"
 msgstr "Unable to buy."
 
-#: src/gui/setup_other.cpp:153
+#: src/gui/setup_other.cpp:155
 #, fuzzy
 msgid "Enable server side attack"
 msgstr "Unable to buy."
 
-#: src/gui/setup_other.cpp:157
+#: src/gui/setup_other.cpp:159
 msgid "Auto fix position"
 msgstr ""
 
-#: src/gui/setup_other.cpp:161
+#: src/gui/setup_other.cpp:163
 msgid "Attack while moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:165
+#: src/gui/setup_other.cpp:167
 #, fuzzy
 msgid "Enable quick stats"
 msgstr "Enable joystick"
 
-#: src/gui/setup_other.cpp:169
+#: src/gui/setup_other.cpp:171
 #, fuzzy
 msgid "Show warps particles"
 msgstr "as particle"
 
-#: src/gui/setup_other.cpp:173
+#: src/gui/setup_other.cpp:175
 msgid "Accept sell/buy requests"
 msgstr ""
 
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:179
 msgid "Show monster hp bar"
 msgstr ""
 
+#: src/gui/setup_other.cpp:183
+#, fuzzy
+msgid "Show own hp bar"
+msgstr "Show name"
+
 #: src/gui/setup_players.cpp:60
 msgid "Relation"
 msgstr "Relation"
@@ -3054,155 +3072,164 @@ msgstr "##1  you try again later"
 msgid "Completed"
 msgstr "Completed"
 
-#: src/gui/userpalette.cpp:109
+#: src/gui/userpalette.cpp:111
 msgid "Being"
 msgstr "Being"
 
-#: src/gui/userpalette.cpp:110
+#: src/gui/userpalette.cpp:112
 #, fuzzy
 msgid "Friend Names"
 msgstr "Friend"
 
-#: src/gui/userpalette.cpp:111
+#: src/gui/userpalette.cpp:113
 #, fuzzy
 msgid "Disregarded Names"
 msgstr "Disregarded"
 
-#: src/gui/userpalette.cpp:112
+#: src/gui/userpalette.cpp:114
 #, fuzzy
 msgid "Ignored Names"
 msgstr "Ignored"
 
-#: src/gui/userpalette.cpp:113
+#: src/gui/userpalette.cpp:115
 #, fuzzy
 msgid "Erased Names"
 msgstr "GM Names"
 
-#: src/gui/userpalette.cpp:114
+#: src/gui/userpalette.cpp:116
 msgid "Other Players' Names"
 msgstr "Other Players' Names"
 
-#: src/gui/userpalette.cpp:115
+#: src/gui/userpalette.cpp:117
 msgid "Own Name"
 msgstr "Own Name"
 
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:118
 msgid "GM Names"
 msgstr "GM Names"
 
-#: src/gui/userpalette.cpp:117
+#: src/gui/userpalette.cpp:119
 msgid "NPCs"
 msgstr "NPCs"
 
-#: src/gui/userpalette.cpp:118
+#: src/gui/userpalette.cpp:120
 msgid "Monsters"
 msgstr "Monsters"
 
-#: src/gui/userpalette.cpp:119
+#: src/gui/userpalette.cpp:121
 #, fuzzy
 msgid "Monster HP bar"
 msgstr "Monster hits Player"
 
-#: src/gui/userpalette.cpp:121
+#: src/gui/userpalette.cpp:123
 msgid "Monster HP bar (second color)"
 msgstr ""
 
-#: src/gui/userpalette.cpp:122
+#: src/gui/userpalette.cpp:124
 #, fuzzy
 msgid "Party Members"
 msgstr "Party"
 
-#: src/gui/userpalette.cpp:123
+#: src/gui/userpalette.cpp:125
 #, fuzzy
 msgid "Guild Members"
 msgstr "Guild"
 
-#: src/gui/userpalette.cpp:124
+#: src/gui/userpalette.cpp:126
 msgid "Particle Effects"
 msgstr "Particle Effects"
 
-#: src/gui/userpalette.cpp:125
+#: src/gui/userpalette.cpp:127
 msgid "Pickup Notification"
 msgstr "Pickup Notification"
 
-#: src/gui/userpalette.cpp:126
+#: src/gui/userpalette.cpp:128
 msgid "Exp Notification"
 msgstr "Exp Notification"
 
-#: src/gui/userpalette.cpp:127
+#: src/gui/userpalette.cpp:129
+#, fuzzy
+msgid "Player HP bar"
+msgstr "Monster hits Player"
+
+#: src/gui/userpalette.cpp:131
+msgid "Player HP bar (second color)"
+msgstr ""
+
+#: src/gui/userpalette.cpp:132
 #, fuzzy
 msgid "Player Hits Monster"
 msgstr "Player hits Monster"
 
-#: src/gui/userpalette.cpp:128
+#: src/gui/userpalette.cpp:133
 #, fuzzy
 msgid "Monster Hits Player"
 msgstr "Monster hits Player"
 
-#: src/gui/userpalette.cpp:130
+#: src/gui/userpalette.cpp:135
 #, fuzzy
 msgid "Other Player Hits Local Player"
 msgstr "Other Players' Names"
 
-#: src/gui/userpalette.cpp:131
+#: src/gui/userpalette.cpp:136
 msgid "Critical Hit"
 msgstr "Critical Hit"
 
-#: src/gui/userpalette.cpp:133
+#: src/gui/userpalette.cpp:138
 #, fuzzy
 msgid "Local Player Hits Monster"
 msgstr "Player hits Monster"
 
-#: src/gui/userpalette.cpp:135
+#: src/gui/userpalette.cpp:140
 #, fuzzy
 msgid "Local Player Critical Hit"
 msgstr "Player hits Monster"
 
-#: src/gui/userpalette.cpp:137
+#: src/gui/userpalette.cpp:142
 msgid "Local Player Miss"
 msgstr ""
 
-#: src/gui/userpalette.cpp:138
+#: src/gui/userpalette.cpp:143
 msgid "Misses"
 msgstr "Misses"
 
-#: src/gui/userpalette.cpp:139
+#: src/gui/userpalette.cpp:144
 #, fuzzy
 msgid "Portal Highlight"
 msgstr "Tab Highlight"
 
-#: src/gui/userpalette.cpp:141
+#: src/gui/userpalette.cpp:146
 #, fuzzy
 msgid "Collision Highlight"
 msgstr "Highlight"
 
-#: src/gui/userpalette.cpp:143
+#: src/gui/userpalette.cpp:148
 #, fuzzy
 msgid "Walkable Highlight"
 msgstr "Tab Highlight"
 
-#: src/gui/userpalette.cpp:145
+#: src/gui/userpalette.cpp:150
 msgid "Local Player Attack Range"
 msgstr ""
 
-#: src/gui/userpalette.cpp:147
+#: src/gui/userpalette.cpp:152
 msgid "Local Player Attack Range Border"
 msgstr ""
 
-#: src/gui/userpalette.cpp:149
+#: src/gui/userpalette.cpp:154
 #, fuzzy
 msgid "Monster Attack Range"
 msgstr "Monster hits Player"
 
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:156
 msgid "Home Place"
 msgstr ""
 
-#: src/gui/userpalette.cpp:153
+#: src/gui/userpalette.cpp:158
 msgid "Home Place Border"
 msgstr ""
 
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:160
 msgid "Road Point"
 msgstr ""
 
@@ -3226,6 +3253,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 +3696,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 +4134,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 +4179,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 +4191,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 +4403,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 +4892,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 +5228,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 +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 "unnamed"
+
 #: src/resources/itemdb.cpp:55
 #, c-format
 msgid "Attack %+d"
@@ -5241,10 +5288,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..3a743aa7f 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,62 +1,67 @@
 # Spanish translation for mana
-# Copyright (c) 2007 Rosetta Contributors and Canonical Ltd 2007
+# Copyright (c) 2008 Rosetta Contributors and Canonical Ltd 2008
 # This file is distributed under the same license as the mana package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2007.
+# Natsuki Sumon <natsuki.sumon@gmail.com>, 2010.
 #
 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"
-"PO-Revision-Date: 2010-02-24 20:55+0000\n"
-"Last-Translator: Miguel de Dios <tres.14159@gmail.com>\n"
-"Language-Team: Spanish <es@li.org>\n"
-"Language: es\n"
+"POT-Creation-Date: 2011-01-06 03:06+0200\n"
+"PO-Revision-Date: 2010-12-23 12:08+0100\n"
+"Last-Translator: Yohann Ferreira <yohann ferreira orange fr>\n"
+"Language-Team: Spanish Translator <natsuki.sumon@gmail.com>\n"
+"Language: es_ES\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
+"X-Poedit-Language: Spanish\n"
+"X-Poedit-Country: SPAIN\n"
+
+#: src/being.cpp:481
+msgid "dodge"
+msgstr ""
+
+#: src/being.cpp:481
+msgid "miss"
+msgstr ""
 
 #: src/client.cpp:724 src/gui/setup.cpp:47 src/gui/windowmenu.cpp:92
 msgid "Setup"
 msgstr "Configuración"
 
 #: src/client.cpp:798
-#, fuzzy
 msgid "Connecting to server"
-msgstr "conectando al servidor de mapas...."
+msgstr "Conectando al servidor"
 
 #: src/client.cpp:829
-#, fuzzy
 msgid "Logging in"
-msgstr "Iniciar sesión"
+msgstr "Acediendo a la cuenta"
 
 #: src/client.cpp:862
 msgid "Entering game world"
-msgstr ""
+msgstr "Entrando al juego"
 
 #: src/client.cpp:953
-#, fuzzy
 msgid "Requesting characters"
-msgstr "Seleccionar personaje"
+msgstr "Cargando jugadores"
 
 #: src/client.cpp:984
-#, fuzzy
 msgid "Connecting to the game server"
-msgstr "conectando al servidor de mapas...."
+msgstr "Conectando al servidor del juego"
 
 #: src/client.cpp:994
-#, fuzzy
 msgid "Changing game servers"
-msgstr "Servidor"
+msgstr "Cambiando el servidor del juego"
 
 #: src/client.cpp:1029 src/client.cpp:1036 src/client.cpp:1171
 #: src/gui/changeemaildialog.cpp:154 src/gui/changepassworddialog.cpp:144
-#: src/gui/charcreatedialog.cpp: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"
@@ -64,54 +69,50 @@ msgstr "Error"
 
 #: src/client.cpp:1045
 msgid "Requesting registration details"
-msgstr ""
+msgstr "Detalles de registración"
 
 #: src/client.cpp:1072
-#, fuzzy
 msgid "Password Change"
-msgstr "Contraseña:"
+msgstr "Cambiar contraseña"
 
 #: src/client.cpp:1073
 msgid "Password changed successfully!"
-msgstr ""
+msgstr "Le contraseña se cambió correctamente!"
 
 #: src/client.cpp:1092
-#, fuzzy
 msgid "Email Change"
-msgstr "Modificar"
+msgstr "Cambiar e-mail"
 
 #: src/client.cpp:1093
-#, fuzzy
 msgid "Email changed successfully!"
-msgstr "El miembro ha sido promovido con exito."
+msgstr "Email modificado correctamente!"
 
 #: src/client.cpp:1113
-#, fuzzy
 msgid "Unregister Successful"
-msgstr "Cancelar Cuenta"
+msgstr "Registro cancelado"
 
 #: src/client.cpp:1114
 msgid "Farewell, come back any time..."
-msgstr ""
+msgstr "Adiós, vuelve cuando quieras..."
 
 #: src/client.cpp:1297 src/client.cpp:1323 src/client.cpp:1367
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
-msgstr ""
+msgstr "%s no existe y no puede ser creado! Saliendo."
 
 #: src/client.cpp:1494
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid update host: %s"
-msgstr "servidor de actualizaciones invalido: "
+msgstr "Host de actualización inválido: %s"
 
 #: src/client.cpp:1528 src/client.cpp:1534
 msgid "Error creating updates directory!"
-msgstr "error al crear directorio de actualizaciones"
+msgstr "Error creando la carpeta de actualizaciones!"
 
 #: src/client.cpp:1555
-#, c-format
+#, fuzzy, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
-msgstr ""
+msgstr "%s no existe y no puede ser creado! Saliendo."
 
 #: src/commandhandler.cpp:264 src/commandhandler.cpp:477
 msgid "Unknown command."
@@ -127,114 +128,115 @@ msgstr "/help > Muestra esta ayuda"
 
 #: src/commandhandler.cpp:297
 msgid "/where > Display map name"
-msgstr "/where > Muestra el nombre del mapa actual"
+msgstr "/where > Muestra el nombre del mapa"
 
 #: src/commandhandler.cpp:298
 msgid "/who > Display number of online users"
-msgstr "/who > Mostrar el número de usuarios en linea"
+msgstr "/who > Muestra el número de jugadores on-line"
 
 #: src/commandhandler.cpp:299
 msgid "/me > Tell something about yourself"
-msgstr "/me > Diga algo de usted"
+msgstr "/me > Para decir algo sobre ti"
 
 #: src/commandhandler.cpp:301
 msgid "/clear > Clears this window"
-msgstr "/clear > Vacia la ventana"
+msgstr "/clear > Limpia esta ventana"
 
 #: src/commandhandler.cpp:303
 msgid "/msg > Send a private message to a user"
-msgstr "/msg > Enviar un mensaje privado a un usuario"
+msgstr "/msg > Envia un mensaje privado a este jugador"
 
 #: src/commandhandler.cpp:304
 msgid "/whisper > Alias of msg"
-msgstr "/whisper > Alias para un mensaje"
+msgstr "/whisper > Lo mismo que /msg"
 
 #: src/commandhandler.cpp:305
 msgid "/w > Alias of msg"
-msgstr "/w > Alias para un mensaje"
+msgstr "/w > Lo mismo que /msg"
 
 #: src/commandhandler.cpp:306
 msgid "/query > Makes a tab for private messages with another user"
-msgstr "/query > Crea una ventana para mensajes privados con otro jugador"
+msgstr "/query > Abre una pestaña de mensajes con otro jugador"
 
 #: src/commandhandler.cpp:308
 msgid "/q > Alias of query"
-msgstr "/q > Alias para una demanda"
+msgstr "/q > Lo mismo que /query"
 
 #: src/commandhandler.cpp:310
 msgid "/away > Tell the other whispering players you're away from keyboard."
-msgstr ""
+msgstr "/away > Les dice a los otros que estas fuera del PC mensaje privado ."
 
 #: src/commandhandler.cpp:313
 msgid "/ignore > ignore a player"
-msgstr ""
+msgstr "/ignore > Ignora un jugador (no se muestran susurros y/o mensajes)"
 
 #: src/commandhandler.cpp:314
 msgid "/unignore > stop ignoring a player"
-msgstr ""
+msgstr "/unignore > Deja de ignorar un jugador"
 
 #: src/commandhandler.cpp:315
 #, fuzzy
 msgid "/ignoreall > Ignore all opened whisper tabs"
-msgstr "/close > Cierra la pestaña de susurros"
+msgstr "/ignore > Ignora al jugador"
 
 #: src/commandhandler.cpp:316
+#, fuzzy
 msgid "/erase > Erase a player"
-msgstr ""
+msgstr "/ignore > Ignora un jugador (no se muestran susurros y/o mensajes)"
 
 #: src/commandhandler.cpp:317
+#, fuzzy
 msgid "/befriend > Be friend a player"
-msgstr ""
+msgstr "/ignore > Ignora un jugador (no se muestran susurros y/o mensajes)"
 
 #: src/commandhandler.cpp:318
 #, fuzzy
 msgid "/desregard > Disregard a player"
-msgstr "@@disregard|ignorar levemente a %s@@"
+msgstr "/ignore > Ignora un jugador (no se muestran susurros y/o mensajes)"
 
 #: src/commandhandler.cpp:319
+#, fuzzy
 msgid "/neutral > Neutral a player"
-msgstr ""
+msgstr "/ignore > Ignora un jugador (no se muestran susurros y/o mensajes)"
 
 #: src/commandhandler.cpp:321
 msgid "/list > Display all public channels"
-msgstr "/list > Muestra todos los canales Públicos"
+msgstr "/list > Muestra todos los canales públicos"
 
 #: src/commandhandler.cpp:322
 msgid "/join > Join or create a channel"
-msgstr "/join > Entrar o crear un canal"
+msgstr "/join > Unirse o crear un canal"
 
 #: src/commandhandler.cpp:324
-#, fuzzy
 msgid "/createparty > Create a new party"
-msgstr "/create > Crear un nuevo grupo"
+msgstr "/createparty > Crear un nuevo grupo"
 
 #: src/commandhandler.cpp:325
 #, fuzzy
 msgid "/createguild > Create a new guild"
-msgstr "/create > Crear un nuevo grupo"
+msgstr "/createparty > Crear un nuevo grupo"
 
 #: src/commandhandler.cpp:326
 msgid "/party > Invite a user to party"
-msgstr "/party > Invita a un jugador a entrar en tu grupo"
+msgstr "/party > Invitar un jugador al grupo"
 
 #: src/commandhandler.cpp:328
 msgid "/toggle > Determine whether <return> toggles the chat log"
-msgstr "/toggle > Determinar si <enter> cambia el registro de chat"
+msgstr "/toggle > Determina si <enter> muestra/esconde el chat"
 
 #: src/commandhandler.cpp:330
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
-"/present > Obtener lista de jugadores presentes (enviar a registro de chat, "
-"si se guarda registro)"
+"/present > Muestra la lista de jugadores presentes (enviar al log del chat)"
 
 #: src/commandhandler.cpp:333
 msgid "/announce > Global announcement (GM only)"
-msgstr "/announce > Anuncio global (Solo MJ's)"
+msgstr "/announce > Anuncio Global (Solo GMs)"
 
 #: src/commandhandler.cpp:335
 #, fuzzy
 msgid "/closeall > Close all opened whisper tabs"
-msgstr "/close > Cierra la pestaña de susurros"
+msgstr "/close > Cierra la pestaña de mensajes"
 
 #: src/commandhandler.cpp:337
 msgid "/all > Show all visible beings in debug tab"
@@ -269,17 +271,18 @@ msgid "/imitation > Imitate player"
 msgstr ""
 
 #: src/commandhandler.cpp:346
+#, fuzzy
 msgid "/heal > Heal player"
-msgstr ""
+msgstr "/ignore > Ignora un jugador (no se muestran susurros y/o mensajes)"
 
 #: src/commandhandler.cpp:347
 #, fuzzy
 msgid "/mail > Send offline message to player"
-msgstr "/msg > Enviar un mensaje privado a un usuario"
+msgstr "/msg > Envia un mensaje privado a este jugador"
 
 #: src/commandhandler.cpp:351
 msgid "For more information, type /help <command>."
-msgstr "Para más información, ingrese /help <comando>"
+msgstr "Para mas informacion,  pon /help <comando>."
 
 #: src/commandhandler.cpp:355
 msgid "Command: /help"
@@ -287,7 +290,7 @@ msgstr "Comando: /help"
 
 #: src/commandhandler.cpp:356
 msgid "This command displays a list of all commands available."
-msgstr "Este comando muestra todos los comandos disponibles."
+msgstr "Para ver la lista de comandos disponibles."
 
 #: src/commandhandler.cpp:358
 msgid "Command: /help <command>"
@@ -295,7 +298,7 @@ msgstr "Comando: /help <comando>"
 
 #: src/commandhandler.cpp:359
 msgid "This command displays help on <command>."
-msgstr "Este comando muestra ayuda sobre <otro comando>"
+msgstr "Para ver la ayuda en <comando>"
 
 #: src/commandhandler.cpp:367
 msgid "Command: /announce <msg>"
@@ -303,12 +306,12 @@ msgstr "Comando: /announce <mensaje>"
 
 #: src/commandhandler.cpp:368
 msgid "*** only available to a GM ***"
-msgstr "*** solo disponible a un GM ***"
+msgstr "*** Disponible solo para GMs ***"
 
 #: src/commandhandler.cpp:369
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
-"Este comando manda un mensaje a todos los jugadores que estén conectados."
+"Este comando envía un mensaje <mensaje> para todos los jugadores online."
 
 #: src/commandhandler.cpp:374
 msgid "Command: /clear"
@@ -316,18 +319,17 @@ msgstr "Comando: /clear"
 
 #: src/commandhandler.cpp:375
 msgid "This command clears the chat log of previous chat."
-msgstr "Este comando limpia el historial de chat de la conversación anterior."
+msgstr "Este comando limpia la pestaña actual del chat previo."
 
 #: src/commandhandler.cpp:379
-#, fuzzy
 msgid "Command: /ignore <player>"
-msgstr "Command: /item <policy>"
+msgstr "Comando: /ignore <jugador>"
 
 #: src/commandhandler.cpp:380
-#, fuzzy
 msgid "This command ignores the given player regardless of current relations."
 msgstr ""
-"Este comando muestra el número de jugadores que actualmente están conectados."
+"Este comando es para ignorar al jugador indicado, independientemente de la "
+"relación actual."
 
 #: src/commandhandler.cpp:385
 msgid "Command: /join <channel>"
@@ -335,11 +337,11 @@ msgstr "Comando: /join <canal>"
 
 #: src/commandhandler.cpp:386
 msgid "This command makes you enter <channel>."
-msgstr "Este comando sirve para ingresar a <canal>."
+msgstr "Este comando te hace entrar en <canal>."
 
 #: src/commandhandler.cpp:387
 msgid "If <channel> doesn't exist, it's created."
-msgstr "Si <Canal> no existe, lo crea."
+msgstr "Si el  <canal> no existe, sera creado."
 
 #: src/commandhandler.cpp:391
 msgid "Command: /list"
@@ -347,7 +349,7 @@ msgstr "Comando: /list"
 
 #: src/commandhandler.cpp:392
 msgid "This command shows a list of all channels."
-msgstr "Este comando muestra la lista de canales disponibles."
+msgstr "Este comando muestra una lista con todos los canales."
 
 #: src/commandhandler.cpp:396
 msgid "Command: /me <message>"
@@ -355,90 +357,84 @@ msgstr "Comando: /me <mensaje>"
 
 #: src/commandhandler.cpp:397
 msgid "This command tell others you are (doing) <msg>."
-msgstr "Este comando le dice a los demas que estas (haciendo) <mensaje>."
+msgstr "Este comando muestra a los otros lo que tú estas (haciendo) <mensaje>."
 
 #: src/commandhandler.cpp:401
 msgid "Command: /msg <nick> <message>"
-msgstr "Comando: /msg <apodo> <mensaje>"
+msgstr "Comando: /msg <nick> <mensaje>"
 
 #: src/commandhandler.cpp:402
 msgid "Command: /whisper <nick> <message>"
-msgstr "Comando: /whisper <apodo> <mensaje>"
+msgstr "Comando: /whisper <nick> <mensaje>"
 
 #: src/commandhandler.cpp:403
 msgid "Command: /w <nick> <message>"
-msgstr "Comando: /w <apodo> <mensaje>"
+msgstr "Comando: /w <nick> <mensaje>"
 
 #: src/commandhandler.cpp:404
 msgid "This command sends the text <message> to <nick>."
-msgstr "Este comando le envia un <mensaje> a <apodo>."
+msgstr "Este comando envía el texto <mensaje> para el jugador <nick>."
 
 #: src/commandhandler.cpp:405 src/commandhandler.cpp:437
 #: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
 #: src/net/tmwa/gui/guildtab.cpp:88 src/net/tmwa/gui/partytab.cpp:82
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
-msgstr "Si el <apodo> incluye espacios, encierralos entre comillas (\")."
+msgstr "Si <nick> posee espacios, colóquelo entre las comillas dobles (\")."
 
 #: src/commandhandler.cpp:410
 msgid "Command: /query <nick>"
-msgstr "Comando: /query <apodo>"
+msgstr "Comando: /query <nick>"
 
 #: src/commandhandler.cpp:411
 msgid "Command: /q <nick>"
-msgstr "Comando : /q <apodo>"
+msgstr "Comando: /q <nick>"
 
 #: src/commandhandler.cpp:412
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
-"Este comando intenta crear una pestaña en el chat de susurros (mensajes "
-"privados)  entre <apodo> y tú."
+"Este comando crea una pestaña para mensajes privados con el jugador <nick>."
 
 #: src/commandhandler.cpp:417
-#, fuzzy
 msgid "Command: /away <afk reason>"
-msgstr "Comando: /w <apodo> <mensaje>"
+msgstr "Comando: /away <motivo>"
 
 #: src/commandhandler.cpp:418
 msgid "This command tells you're away from keyboard with the given reason."
-msgstr ""
+msgstr "Este comando muestra que no estas en el PC por una razon dada."
 
 #: src/commandhandler.cpp:420
-#, fuzzy
 msgid "Command: /away"
-msgstr "Comando: /who"
+msgstr "Comando: /away"
 
 #: src/commandhandler.cpp:421
-#, fuzzy
 msgid "This command clears the away status and message."
-msgstr "hace que el tema sea <mensaje>"
+msgstr "Este comando limpia el status y los mensajes \"away\"."
 
 #: src/commandhandler.cpp:425
-#, fuzzy
 msgid "Command: /createparty <name>"
-msgstr "Comando: /create <nombre>"
+msgstr "Comando: /createparty <nombre>"
 
 #: src/commandhandler.cpp:426
-#, fuzzy
 msgid "This command creates a new party called <name>."
-msgstr "estos comandos crean un grupo <nombre>"
+msgstr "Este comando crea un nuevo grupo llamado <nombre>."
 
 #: src/commandhandler.cpp:430
 #, fuzzy
 msgid "Command: /createguild <name>"
-msgstr "Comando: /create <nombre>"
+msgstr "Comando: /createparty <nombre>"
 
 #: src/commandhandler.cpp:431
 #, fuzzy
 msgid "This command creates a new guild called <name>."
-msgstr "estos comandos crean un grupo <nombre>"
+msgstr "Este comando crea un nuevo grupo llamado <nombre>."
 
 #: src/commandhandler.cpp:435
 msgid "Command: /party <nick>"
-msgstr "Comando: /party <apodo>"
+msgstr "Comando: /party <nick>"
 
 #: src/commandhandler.cpp:436 src/net/tmwa/gui/partytab.cpp:81
 msgid "This command invites <nick> to party with you."
-msgstr "Este comando invita a <apodo> a un grupo contigo"
+msgstr "Este comando invita al jugador <nick> a formar parte de tu grupo."
 
 #: src/commandhandler.cpp:442
 msgid "Command: /present"
@@ -449,28 +445,29 @@ msgstr "Comando: /present"
 msgid ""
 "This command gets a list of players within hearing and sends it to chat log."
 msgstr ""
-"Este comando obtiene la lista de los jugadores a tu alcance y la envia al "
-"registro de grabaciones o bien al registro de chat."
+"Este comando recibe una lista de los jugadores dentro de la audición y la "
+"envía ya sea a la entrada de registro cuando el registro del chat está "
+"activado o el registro de conversaciones (pestaña de chat) de otro modo."
 
 #: src/commandhandler.cpp:448
 msgid "Command: /toggle <state>"
-msgstr "Comando: /toogle <estado>"
+msgstr "Comando: /toggle <estado>"
 
 #: src/commandhandler.cpp:449
 msgid ""
 "This command sets whether the return key should toggle the chat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
-"Este comando decide si la tecla de retorno debe alternar el registro de chat "
-"o bien si el registro de chat se oculta de forma automática."
+"Este comando determina si la tecla de retorno debe cambiar el registro de "
+"charla, o si el registro de charla se apaga automáticamente."
 
 #: src/commandhandler.cpp:452
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
 "\"0\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
-"<estado> puede ser \"1\" , \"yes\" o\" true\" para activarlo o bien \"0\" , "
-"\"no\" , \"false\" para desactivarlo"
+"<estado> puede ser \"1\", \"yes\" y \"true\" para activar o \"0\", \"no\" y "
+"\"false\" para desactivar."
 
 #: src/commandhandler.cpp:455
 msgid "Command: /toggle"
@@ -478,16 +475,15 @@ msgstr "Comando: /toggle"
 
 #: src/commandhandler.cpp:456
 msgid "This command displays the return toggle status."
-msgstr "Este comando muestra el estatus del botón alternar."
+msgstr "Este comando muestra el estado de alternar retorno."
 
 #: src/commandhandler.cpp:460 src/gui/widgets/whispertab.cpp:127
-#, fuzzy
 msgid "Command: /unignore <player>"
-msgstr "Command: /item <policy>"
+msgstr "Comando: /unignore <jugador>"
 
 #: src/commandhandler.cpp:461
 msgid "This command stops ignoring the given player if they are being ignored"
-msgstr ""
+msgstr "Este comando deja de ignorar a <jugador> si es ignorado"
 
 #: src/commandhandler.cpp:466
 msgid "Command: /where"
@@ -495,7 +491,7 @@ msgstr "Comando: /where"
 
 #: src/commandhandler.cpp:467
 msgid "This command displays the name of the current map."
-msgstr "Este comando muestra el nombre del mapa actual."
+msgstr "Muestra el nombre del mapa actual."
 
 #: src/commandhandler.cpp:471
 msgid "Command: /who"
@@ -503,16 +499,15 @@ msgstr "Comando: /who"
 
 #: src/commandhandler.cpp:472
 msgid "This command displays the number of players currently online."
-msgstr ""
-"Este comando muestra el número de jugadores que actualmente están conectados."
+msgstr "Este comando muestra el número de jugadores que están en línea."
 
 #: src/commandhandler.cpp:478
 msgid "Type /help for a list of commands."
-msgstr "Ingrese /help para una obtener la lista de comandos."
+msgstr "Escribe /help para una lista de comandos."
 
 #: src/commandhandler.cpp:546
 msgid "Cannot send empty whispers!"
-msgstr "No se pueden enviar susurros vacios."
+msgstr "No puedes enviar susurros vacíos!"
 
 #: src/commandhandler.cpp:554
 #, c-format
@@ -520,31 +515,30 @@ msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr ""
-"No se puede crear una ventana para el nick \"%s\"! Quizás ya existe o eres "
-"tú."
+"No se puede crear una pestaña de susurro para el nick \"%s\"! O bien ya "
+"existe, o eres tú."
 
 #: src/commandhandler.cpp:574
 #, c-format
 msgid "Requesting to join channel %s."
-msgstr "Se te pide reunirte en el channel %s."
+msgstr "Solicitando la entrada del canal %s."
 
 #: src/commandhandler.cpp:590 src/net/tmwa/gui/partytab.cpp:122
 msgid "Party name is missing."
 msgstr "Falta el nombre del grupo."
 
 #: src/commandhandler.cpp:601
-#, fuzzy
 msgid "Guild name is missing."
-msgstr "Falta el nombre del grupo."
+msgstr "Falta el nombre del clan."
 
 #: src/commandhandler.cpp:614 src/commandhandler.cpp:721
 #: src/commandhandler.cpp:762 src/commandhandler.cpp:792
 msgid "Please specify a name."
-msgstr ""
+msgstr "Por favor, especifique un nombre."
 
 #: src/commandhandler.cpp:655
 msgid "Return toggles chat."
-msgstr "la tecla de retorno alterna el chat"
+msgstr "Volver a alternar el chat."
 
 #: src/commandhandler.cpp:655
 msgid "Message closes chat."
@@ -552,11 +546,11 @@ msgstr "El mensaje cierra el chat."
 
 #: src/commandhandler.cpp:666
 msgid "Return now toggles chat."
-msgstr "Ahora la tecla de retorno alterna el chat."
+msgstr "Volver ahora a cambiar de chat."
 
 #: src/commandhandler.cpp:672
 msgid "Message now closes chat."
-msgstr "El mensaje ahora cierra el chat."
+msgstr "Mensaje ahora cierra el chat."
 
 #: src/commandhandler.cpp:700
 #, fuzzy
@@ -566,7 +560,7 @@ msgstr "Amigo"
 #: src/commandhandler.cpp:705
 #, fuzzy
 msgid "disregarded"
-msgstr "desestimado"
+msgstr "Desconocido"
 
 #: src/commandhandler.cpp:710
 #, fuzzy
@@ -576,51 +570,50 @@ msgstr "Neutral"
 #: src/commandhandler.cpp:729
 #, fuzzy, c-format
 msgid "Player already %s!"
-msgstr "El mensaje privado no se pudo enviar, la persona lo ha ignorado."
+msgstr "El jugador ya está ignorado!"
 
 #: src/commandhandler.cpp:743
 #, fuzzy, c-format
 msgid "Player successfully %s!"
-msgstr "El grupo se creo con éxito."
+msgstr "Jugador ignorado!"
 
 #: src/commandhandler.cpp:751
 #, fuzzy, c-format
 msgid "Player could not be %s!"
-msgstr "El mensaje privado no se pudo enviar, la persona lo ha ignorado."
+msgstr "El jugador no puede ser ignorado!"
 
 #: src/commandhandler.cpp:773
 msgid "Player wasn't ignored!"
-msgstr ""
+msgstr "El jugador no estaba ignorado!"
 
 #: src/commandhandler.cpp:780
 msgid "Player no longer ignored!"
-msgstr ""
+msgstr "El jugador ha sido devuelto al estado normal!"
 
 #: src/commandhandler.cpp:782
-#, fuzzy
 msgid "Player could not be unignored!"
-msgstr "El mensaje privado no se pudo enviar, la persona lo ha ignorado."
+msgstr "El jugador no puede ser devuelto al estado normal!"
 
 #: src/commandhandler.cpp:799
 #, fuzzy
 msgid "Player already erased!"
-msgstr "El mensaje privado no se pudo enviar, la persona lo ha ignorado."
+msgstr "El jugador ya está ignorado!"
 
 #: src/commandhandler.cpp:810
 #, fuzzy
 msgid "Player successfully erased!"
-msgstr "El grupo se creo con éxito."
+msgstr "Jugador ignorado!"
 
 #: src/commandhandler.cpp:812
 #, fuzzy
 msgid "Player could not be erased!"
-msgstr "El mensaje privado no se pudo enviar, la persona lo ha ignorado."
+msgstr "El jugador no puede ser ignorado!"
 
 #: src/commandhandler.h:39
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
-"Las opciones para /%s son \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+"Opciones para /%s son \"yes\" e \"no\", \"true\" e \"false\", \"1\" e \"0\"."
 
 #: src/game.cpp:219 src/gui/widgets/chattab.cpp:390
 msgid "General"
@@ -628,53 +621,50 @@ msgstr "General"
 
 #: src/game.cpp:223 src/gui/debugwindow.cpp:47 src/gui/widgets/chattab.cpp:392
 msgid "Debug"
-msgstr ""
+msgstr "Depurador"
 
 #: src/game.cpp:435
-#, fuzzy
 msgid "Screenshot saved as "
-msgstr "Captura de pantalla guardada en ~/"
+msgstr "Screenshot guardada como"
 
 #: src/game.cpp:443
 msgid "Saving screenshot failed!"
-msgstr "¡No se pudo crear captura de pantalla!"
+msgstr "Fallo al guardar screenshot!"
 
 #: src/game.cpp:482
-#, fuzzy
 msgid "The connection to the server was lost."
-msgstr "La conexión con el servidor se perdió, se cerrara el programa"
+msgstr "Se ha perdido la conexión del servidor."
 
 #: src/game.cpp:487
 msgid "Network Error"
-msgstr "Error de red"
+msgstr "Error de conexión"
 
 #: src/game.cpp:997
 msgid "Ignoring incoming trade requests"
-msgstr "Se están ignorando las peticiones de comercio recibidas"
+msgstr "Ignorando las propuestas de intercambio"
 
 #: src/game.cpp:1004
 msgid "Accepting incoming trade requests"
-msgstr "Se están aceptando las peticiones de comercio"
+msgstr "Aceptando las propuestas de intercambio"
 
-#: src/game.cpp:1373
-#, fuzzy
+#: src/game.cpp:1376
 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"
+msgstr "Error mientras cargaba %s"
 
 #: src/gui/beingpopup.cpp:89
-#, fuzzy, c-format
+#, c-format
 msgid "Party: %s"
-msgstr "Grupo (%s)"
+msgstr "Grupo: %s"
 
 #: src/gui/beingpopup.cpp:102
 #, fuzzy, c-format
 msgid "Guild: %s"
-msgstr "clanes"
+msgstr "Guilds"
 
 #: src/gui/beingpopup.cpp:114
 #, c-format
@@ -682,27 +672,26 @@ msgid "Pvp rank: %d"
 msgstr ""
 
 #: src/gui/botcheckerwindow.cpp:264
-#, fuzzy
 msgid "Bot Checker"
-msgstr "ventana del chat"
+msgstr ""
 
 #: src/gui/botcheckerwindow.cpp:294 src/gui/setup_players.cpp:59
 msgid "Name"
-msgstr "Nombre:"
+msgstr "Nombre"
 
 #: src/gui/botcheckerwindow.cpp:295 src/keyboardconfig.cpp:45
 #: src/net/tmwa/generalhandler.cpp:254
 msgid "Attack"
-msgstr "ataque"
+msgstr "Atacar"
 
 #: src/gui/botcheckerwindow.cpp:296 src/keyboardconfig.cpp:59
 msgid "Talk"
-msgstr "hablar"
+msgstr "Hablar"
 
 #: src/gui/botcheckerwindow.cpp:297
 #, fuzzy
 msgid "Move"
-msgstr "mover arriba"
+msgstr "Mover para arriba"
 
 #: src/gui/botcheckerwindow.cpp:298
 msgid "Result"
@@ -710,7 +699,7 @@ msgstr ""
 
 #: src/gui/botcheckerwindow.cpp:308 src/gui/npcdialog.cpp:116
 msgid "Reset"
-msgstr "Reiniciar"
+msgstr "Resetear"
 
 #: src/gui/buy.cpp:53 src/gui/buy.cpp:60 src/gui/buy.cpp:94
 #: src/gui/buysell.cpp:62
@@ -728,25 +717,25 @@ msgstr "Precio: %s / Total: %s"
 #: src/gui/buy.cpp:90 src/gui/itemamount.cpp:204 src/gui/itemamount.cpp:232
 #: src/gui/npcdialog.cpp:106 src/gui/sell.cpp:87 src/gui/statuswindow.cpp:793
 msgid "+"
-msgstr ""
+msgstr "+"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
 #: src/gui/buy.cpp:93 src/gui/itemamount.cpp:203 src/gui/itemamount.cpp:231
 #: src/gui/npcdialog.cpp:107 src/gui/sell.cpp:88 src/gui/statuswindow.cpp:805
 msgid "-"
-msgstr ""
+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"
 
 #: src/gui/buy.cpp:96 src/gui/sell.cpp:91 src/gui/statuswindow.cpp:446
 #: src/gui/statuswindow.cpp:792 src/gui/statuswindow.cpp:823
 msgid "Max"
-msgstr "Máx"
+msgstr "Máximo"
 
 #: src/gui/buysell.cpp:37 src/gui/buysell.cpp:46
 #: src/gui/inventorywindow.cpp:112
@@ -761,9 +750,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
@@ -772,7 +761,7 @@ msgstr "Cancelar"
 
 #: src/gui/changeemaildialog.cpp:45 src/gui/changeemaildialog.cpp:54
 msgid "Change Email Address"
-msgstr "Cambiar dirección de correo electrónico"
+msgstr "Cambiar e-mail"
 
 #: src/gui/changeemaildialog.cpp:49 src/gui/changepassworddialog.cpp:52
 #, c-format
@@ -780,29 +769,27 @@ msgid "Account: %s"
 msgstr "Cuenta: %s"
 
 #: src/gui/changeemaildialog.cpp:51
-#, fuzzy
 msgid "Type new email address twice:"
-msgstr "Ingrese la nueva dirección de correo electrónico dos veces:"
+msgstr "Escribe el nuevo email dos veces:"
 
 #: src/gui/changeemaildialog.cpp:129
-#, fuzzy, c-format
+#, c-format
 msgid "The new email address needs to be at least %d characters long."
-msgstr "El nombre de usuario debe tener al menos %d caracteres."
+msgstr "El nuevo email debe tener como mínimo %d caracteres."
 
 #: src/gui/changeemaildialog.cpp:136
-#, fuzzy, c-format
+#, c-format
 msgid "The new email address needs to be less than %d characters long."
-msgstr "El nombre de usuario puede tener como máximo %d caracteres."
+msgstr "El nuevo email debe tener como máximo %d caracteres."
 
 #: src/gui/changeemaildialog.cpp:143
-#, fuzzy
 msgid "The email address entries mismatch."
-msgstr "La nueva dirección de E-mail ya existe"
+msgstr "Los e-mail son distintos."
 
 #: src/gui/changepassworddialog.cpp:47 src/gui/changepassworddialog.cpp:56
 #: src/gui/charselectdialog.cpp:133
 msgid "Change Password"
-msgstr "Cambiar Contraseña"
+msgstr "Cambiar contraseña"
 
 #: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:91
 #: src/gui/register.cpp:73 src/gui/unregisterdialog.cpp:53
@@ -810,27 +797,26 @@ msgid "Password:"
 msgstr "Contraseña:"
 
 #: src/gui/changepassworddialog.cpp:63
-#, fuzzy
 msgid "Type new password twice:"
-msgstr "Ingresar la contraseña dos veces:"
+msgstr "Escribe la nueva contraseña 2 veces:"
 
 #: src/gui/changepassworddialog.cpp:111
 msgid "Enter the old password first."
-msgstr ""
+msgstr "Escribe la contraseña antigua."
 
 #: src/gui/changepassworddialog.cpp:117
-#, fuzzy, c-format
+#, c-format
 msgid "The new password needs to be at least %d characters long."
-msgstr "La contraseña debe tener al menos %d caracteres."
+msgstr "La nueva contraseña debe tener como mínimo %d caracteres."
 
 #: src/gui/changepassworddialog.cpp:124
-#, fuzzy, c-format
+#, c-format
 msgid "The new password needs to be less than %d characters long."
-msgstr "La contraseña puede tener como máximo %d caracteres."
+msgstr "La nueva contraseña debe tener como máximo %d caracteres."
 
 #: src/gui/changepassworddialog.cpp:131
 msgid "The new password entries mismatch."
-msgstr ""
+msgstr "Las nuevas contraseñas no concuerdan."
 
 #: src/gui/charcreatedialog.cpp:53
 msgid "Create Character"
@@ -846,26 +832,24 @@ msgstr "Nombre:"
 #: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
 #: src/gui/outfitwindow.cpp:77
 msgid ">"
-msgstr ""
+msgstr ">"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
 #: src/gui/outfitwindow.cpp:76
 msgid "<"
-msgstr ""
+msgstr "<"
 
 #: src/gui/charcreatedialog.cpp:74
-#, fuzzy
 msgid "Hair color:"
-msgstr "Color de pelo:"
+msgstr "Color del pelo:"
 
 #: src/gui/charcreatedialog.cpp:77
-#, fuzzy
 msgid "Hair style:"
-msgstr "Corte de pelo:"
+msgstr "Estilo 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,69 +862,72 @@ 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"
+msgstr "Por favor 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."
+msgstr "Su nombre debe de tener como mínimo 4 caracteres."
 
-#: src/gui/charcreatedialog.cpp:242
+#: src/gui/charcreatedialog.cpp:248
 msgid "Character stats OK"
-msgstr "Estadisticas del personaje OK"
+msgstr "Puntos de estado del jugador correctamente asignados"
 
-#: src/gui/charcreatedialog.cpp:256
+#: src/gui/charcreatedialog.cpp:262
 #, c-format
 msgid "Please remove %d points"
-msgstr "Quitar %d puntos"
+msgstr "Por favor extraiga %d puntos de estado"
 
 #: src/gui/charselectdialog.cpp:72
 msgid "Confirm Character Delete"
-msgstr "Confirmar borrado de personaje"
+msgstr "Confimar la supresión del personaje"
 
 #: src/gui/charselectdialog.cpp:73
 msgid "Are you sure you want to delete this character?"
-msgstr "¿Seguro que quieres eliminar este personaje?"
+msgstr "żEstás seguro de que deseas borrar este personaje?"
 
 #: src/gui/charselectdialog.cpp:121
 msgid "Account and Character Management"
-msgstr "Administración de cuenta y personajes"
+msgstr "Configuración de la cuenta y los personajes"
 
 #: src/gui/charselectdialog.cpp:132
 msgid "Switch Login"
-msgstr ""
+msgstr "Salir del Login"
 
 #: src/gui/charselectdialog.cpp:146 src/gui/unregisterdialog.cpp:47
 #: src/gui/unregisterdialog.cpp:55
 msgid "Unregister"
-msgstr "Cancelar Cuenta"
+msgstr "Cancelar Registro"
 
 #: src/gui/charselectdialog.cpp:155
-#, fuzzy
 msgid "Change Email"
-msgstr "Cambiar dirección de correo electrónico"
+msgstr "Cambiar 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"
+msgstr "Borrar"
 
-#: src/gui/charselectdialog.cpp:425
-#, fuzzy
+#: src/gui/charselectdialog.cpp:433
 msgid "Choose"
-msgstr "Cerrar"
+msgstr "Seleccionar"
+
+#: src/gui/charselectdialog.cpp:436
+#, fuzzy, c-format
+msgid "Level %d"
+msgstr "Nivel: %d"
 
-#: src/gui/charselectdialog.cpp:439 src/gui/charselectdialog.cpp:440
+#: src/gui/charselectdialog.cpp:447 src/gui/charselectdialog.cpp:448
 msgid "(empty)"
-msgstr ""
+msgstr "(vacío)"
 
 #: src/gui/chat.cpp:91
 #, fuzzy
 msgid "default"
-msgstr "Predeterminado"
+msgstr "Por defecto"
 
 #: src/gui/chat.cpp:92
 msgid "black"
@@ -954,26 +941,23 @@ msgstr "Amigo"
 #: src/gui/chat.cpp:94
 #, fuzzy
 msgid "green"
-msgstr "verde: "
+msgstr "Verde:"
 
 #: src/gui/chat.cpp:95
-#, fuzzy
 msgid "blue"
-msgstr "azul: "
+msgstr ""
 
 #: src/gui/chat.cpp:96
 msgid "gold"
 msgstr ""
 
 #: src/gui/chat.cpp:97
-#, fuzzy
 msgid "yellow"
-msgstr "bajo"
+msgstr ""
 
 #: src/gui/chat.cpp:98
-#, fuzzy
 msgid "pink"
-msgstr "Enlance"
+msgstr ""
 
 #: src/gui/chat.cpp:99
 msgid "purple"
@@ -986,22 +970,22 @@ msgstr ""
 #: src/gui/chat.cpp:101
 #, fuzzy
 msgid "brown"
-msgstr "arrojadizo"
+msgstr "Arrojado"
 
 #: src/gui/chat.cpp:102
 #, fuzzy
 msgid "rainbow 1"
-msgstr "arcoiris"
+msgstr "Arcoiris"
 
 #: src/gui/chat.cpp:103
 #, fuzzy
 msgid "rainbow 2"
-msgstr "arcoiris"
+msgstr "Arcoiris"
 
 #: src/gui/chat.cpp:104
 #, fuzzy
 msgid "rainbow 3"
-msgstr "arcoiris"
+msgstr "Arcoiris"
 
 #: src/gui/chat.cpp:121 src/gui/itemamount.cpp:90 src/gui/login.cpp:75
 #: src/gui/setup_players.cpp:215 src/gui/setup_theme.cpp:68
@@ -1016,14 +1000,14 @@ msgid "Chat"
 msgstr "Chat"
 
 #: src/gui/chat.cpp:554
-#, fuzzy, c-format
+#, c-format
 msgid "Present: %s; %d players are present."
-msgstr "%d jugadores estan conectados."
+msgstr "Presentes: %s; %d jugadores estan presentes."
 
 #: src/gui/chat.cpp:890
 #, c-format
 msgid "Whispering to %s: %s"
-msgstr "Susurrando a %s: %s"
+msgstr "Enviando mensaje privado para %s: %s"
 
 #: src/gui/confirmdialog.cpp:44
 msgid "Yes"
@@ -1036,101 +1020,101 @@ msgstr "No"
 #: src/gui/confirmdialog.cpp:49
 #, fuzzy
 msgid "Ignore"
-msgstr "Ingnorado"
+msgstr "Ignorado"
 
 #: src/gui/debugwindow.cpp:63 src/gui/debugwindow.cpp:74
-#, c-format
+#, fuzzy, c-format
 msgid "%d FPS (Software)"
-msgstr ""
+msgstr "%d FPS (OpenGL)"
 
 #: src/gui/debugwindow.cpp:67
-#, c-format
+#, fuzzy, c-format
 msgid "%d FPS (fast OpenGL)"
-msgstr ""
+msgstr "%d FPS (OpenGL)"
 
 #: src/gui/debugwindow.cpp:70
-#, c-format
+#, fuzzy, c-format
 msgid "%d FPS (old OpenGL)"
-msgstr ""
+msgstr "%d FPS (OpenGL)"
 
 #: src/gui/debugwindow.cpp:77
 #, c-format
 msgid "%d FPS"
-msgstr ""
+msgstr "%d FPS"
 
 #: src/gui/debugwindow.cpp:78 src/gui/debugwindow.cpp:181
 #: src/gui/debugwindow.cpp:204
 #, fuzzy
 msgid "Music:"
-msgstr "Tema: %s"
+msgstr "Música: %s"
 
 #: src/gui/debugwindow.cpp:79 src/gui/debugwindow.cpp:185
 #: src/gui/debugwindow.cpp:206
 #, fuzzy
 msgid "Map:"
-msgstr "Nombre: %s"
+msgstr "Mapa: %s"
 
 #: src/gui/debugwindow.cpp:80 src/gui/debugwindow.cpp:183
 #: src/gui/debugwindow.cpp:205
 #, fuzzy
 msgid "Minimap:"
-msgstr "Minimapa"
+msgstr "Minimapa: %s"
 
 #: src/gui/debugwindow.cpp:81
 #, c-format
 msgid "Cursor: (%d, %d)"
-msgstr ""
+msgstr "Cursor: (%d, %d)"
 
 #: src/gui/debugwindow.cpp:82 src/gui/debugwindow.cpp:192
-#, fuzzy, c-format
+#, c-format
 msgid "Particle count: %d"
-msgstr "Efectos de Partículas"
+msgstr "Recuento de partículas: %d"
 
 #: src/gui/debugwindow.cpp:84
 #, fuzzy, c-format
 msgid "Map actors count: %d"
-msgstr "Estadisticas del personaje OK"
+msgstr "Puntos del personaje: %d"
 
 #: src/gui/debugwindow.cpp:90 src/gui/debugwindow.cpp:126
 #: src/gui/debugwindow.cpp:131
 #, fuzzy
 msgid "Player Position:"
-msgstr "Jugador golpea al monstruo"
+msgstr "Jugadores"
 
 #: src/gui/debugwindow.cpp:91 src/gui/debugwindow.cpp:138
 #: src/gui/debugwindow.cpp:163
 #, fuzzy
 msgid "Target:"
-msgstr "mover a la izquierda"
+msgstr "Seleccionar NPC"
 
 #: src/gui/debugwindow.cpp:92 src/gui/debugwindow.cpp:143
 #: src/gui/debugwindow.cpp:164
 #, fuzzy
 msgid "Target Id:"
-msgstr "objetivo jugador"
+msgstr "Seleccionar NPC"
 
 #: src/gui/debugwindow.cpp:93 src/gui/debugwindow.cpp:147
 #: src/gui/debugwindow.cpp:152 src/gui/debugwindow.cpp:165
 #, fuzzy
 msgid "Target Level:"
-msgstr "objetivo jugador"
+msgstr "Seleccionar Jugador"
 
 #: src/gui/debugwindow.cpp:94 src/gui/debugwindow.cpp:155
 #: src/gui/debugwindow.cpp:166
 #, fuzzy
 msgid "Target Party:"
-msgstr "objetivo jugador"
+msgstr "Seleccionar Jugador"
 
 #: src/gui/debugwindow.cpp:95 src/gui/debugwindow.cpp:158
 #: src/gui/debugwindow.cpp:167
 #, fuzzy
 msgid "Target Guild:"
-msgstr "objetivo jugador"
+msgstr "Crear clan"
 
 #: src/gui/debugwindow.cpp:179 src/gui/debugwindow.cpp:202
 #, fuzzy
 msgid "Cursor:"
-msgstr "Cursor propio"
+msgstr "Cursor: (%d, %d)"
 
 #: src/gui/debugwindow.cpp:196 src/gui/debugwindow.cpp:209
 msgid "Map actors count:"
@@ -1159,18 +1143,18 @@ msgstr ""
 #: src/gui/okdialog.cpp:42 src/gui/quitdialog.cpp:53 src/gui/textdialog.cpp:43
 #: src/gui/trade.cpp:81 src/gui/trade.cpp:83
 msgid "OK"
-msgstr "Aceptar"
+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 "Equipo"
+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 "quitarselo"
+msgstr "Quitárselo"
 
 #: src/gui/help.cpp:38
 msgid "Help"
@@ -1187,58 +1171,57 @@ msgstr "Inventario"
 
 #: src/gui/inventorywindow.cpp:62
 msgid "Storage"
-msgstr "almacenamiento"
+msgstr "Almacén"
 
 #: src/gui/inventorywindow.cpp:89
 msgid "Slots:"
-msgstr "Ranuras:"
+msgstr "Espacios:"
 
 #: 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
-#, fuzzy
+#: src/gui/popupmenu.cpp:1078 src/gui/popupmenu.cpp:1179
+#: src/gui/popupmenu.cpp:1217
 msgid "Drop..."
-msgstr "Tirar"
+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 ""
+msgstr "Conjuntos"
 
 #: src/gui/inventorywindow.cpp:114
 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"
+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"
+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 "Tirar"
@@ -1249,23 +1232,23 @@ msgstr "Todo"
 
 #: src/gui/itemamount.cpp:258
 msgid "Select amount of items to trade."
-msgstr "Seleccione cantidad de objetos para comerciar."
+msgstr "Selecionar la cantidad de objetos a intercambiar."
 
 #: src/gui/itemamount.cpp:261
 msgid "Select amount of items to drop."
-msgstr "Seleccione la cantidad de objetos para tirar."
+msgstr "Selecionar cantidad de objetos a tirar."
 
 #: src/gui/itemamount.cpp:264
 msgid "Select amount of items to store."
-msgstr "Seleccionar la cantidad de objetos a guardar."
+msgstr "Seleccione la cantidad de objetos a almacenar."
 
 #: src/gui/itemamount.cpp:267
 msgid "Select amount of items to retrieve."
-msgstr "Seleccionar la cantidad de objetos a recuperar."
+msgstr "Selecciona la cantidad de objetos a retirar."
 
 #: src/gui/itemamount.cpp:270
 msgid "Select amount of items to split."
-msgstr "Seleccione objetos para dividir."
+msgstr "Selecionar la cantidad de objetos para dividir."
 
 #: src/gui/itemamount.cpp:273
 msgid "Add to buy shop."
@@ -1285,24 +1268,23 @@ msgid ", "
 msgstr ""
 
 #: src/gui/itempopup.cpp:152
-#, fuzzy, c-format
+#, c-format
 msgid "Weight: %s"
-msgstr "Peso: "
+msgstr "Peso: %s"
 
 #: src/gui/killstats.cpp:43 src/gui/windowmenu.cpp:65
-#, fuzzy
 msgid "Kill stats"
-msgstr "ventana de estado"
+msgstr ""
 
 #: src/gui/killstats.cpp:61
 #, fuzzy
 msgid "Reset stats"
-msgstr "Reiniciar"
+msgstr "Resetear"
 
 #: src/gui/killstats.cpp:62
 #, fuzzy
 msgid "Reset timer"
-msgstr "Reiniciar"
+msgstr "Resetear"
 
 #: src/gui/killstats.cpp:66
 #, fuzzy
@@ -1312,12 +1294,12 @@ msgstr "Nivel: %d"
 #: src/gui/killstats.cpp:70
 #, fuzzy
 msgid "Exp: "
-msgstr "EXP:"
+msgstr "Exp:"
 
 #: src/gui/killstats.cpp:71
 #, fuzzy
 msgid " Left: "
-msgstr "mover a la izquierda"
+msgstr "Izquierda"
 
 #: src/gui/killstats.cpp:74
 msgid " exp, Avg Mob for 1%: ?"
@@ -1424,7 +1406,7 @@ msgstr ""
 
 #: src/gui/login.cpp:83 src/gui/login.cpp:118
 msgid "Login"
-msgstr "Iniciar sesión"
+msgstr "Login"
 
 #: src/gui/login.cpp:87 src/gui/serverdialog.cpp:221
 #: src/gui/widgets/chattab.cpp:166
@@ -1436,7 +1418,6 @@ msgid "Custom update host"
 msgstr ""
 
 #: src/gui/login.cpp:106
-#, fuzzy
 msgid "Remember username"
 msgstr "Recordar nombre de usuario"
 
@@ -1449,9 +1430,8 @@ msgid "Register"
 msgstr "Registrar"
 
 #: src/gui/login.cpp:117
-#, fuzzy
 msgid "Change Server"
-msgstr "Servidor"
+msgstr "Cambiar de servidor"
 
 #: src/gui/minimap.cpp:46 src/gui/minimap.cpp:86
 msgid "Map"
@@ -1459,7 +1439,7 @@ msgstr "Mapa"
 
 #: src/gui/ministatus.cpp:196
 msgid "Need"
-msgstr ""
+msgstr "Necesitas"
 
 #: src/gui/npcdialog.cpp:46
 msgid "Waiting for server"
@@ -1477,18 +1457,19 @@ 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"
+msgstr "Limpiar log"
 
 #. TRANSLATORS: Please leave the \n sequences intact.
 #: src/gui/npcdialog.cpp:200
-#, fuzzy
 msgid ""
 "\n"
 "> Next\n"
-msgstr "Siguiente"
+msgstr ""
+"\n"
+"> Siguiente\n"
 
 #: src/gui/npcpostdialog.cpp:45
 msgid "To:"
@@ -1500,12 +1481,12 @@ msgstr "Enviar"
 
 #: src/gui/npcpostdialog.cpp:96
 msgid "Failed to send as sender or letter invalid."
-msgstr "No se pudo enviar puesto que el destino o la letra son invalidos."
+msgstr "Fallo al enviar o mensaje inválido."
 
 #: src/gui/outfitwindow.cpp:78 src/gui/outfitwindow.cpp:832
 #, c-format
 msgid "Outfit: %d"
-msgstr ""
+msgstr "Conjuntos: %d"
 
 #: src/gui/outfitwindow.cpp:80 src/gui/outfitwindow.cpp:834
 #, fuzzy, c-format
@@ -1513,295 +1494,288 @@ msgid "Key: %s"
 msgstr "Dinero: %s"
 
 #: src/gui/outfitwindow.cpp:83
-#, fuzzy
 msgid "Unequip first"
-msgstr "quitarselo"
+msgstr "Quitárselo antes"
 
 #: src/gui/outfitwindow.cpp:86
+#, fuzzy
 msgid "Away outfit"
-msgstr ""
+msgstr "Ponerse el conjunto"
 
-#: 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@@"
+msgstr "@@trade|Intercambiar 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@@"
+msgstr "@@attack|Atacar %s@@"
 
 #. TRANSLATORS: Whispering a player.
-#: src/gui/popupmenu.cpp:120 src/gui/popupmenu.cpp:289
-#, fuzzy
+#: src/gui/popupmenu.cpp:120 src/gui/popupmenu.cpp:290
 msgid "@@whisper|Whisper@@"
-msgstr "@@use|Usar@@"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:487
-#, fuzzy
+#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:488
 msgid "@@heal|Heal@@"
-msgstr "@@cancel|Cancelar@@"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:130 src/gui/popupmenu.cpp:295
-#: src/gui/popupmenu.cpp:493
-#, fuzzy
+#: src/gui/popupmenu.cpp:130 src/gui/popupmenu.cpp:296
+#: src/gui/popupmenu.cpp:494
 msgid "@@friend|Befriend@@"
-msgstr "@@retrieve|Recuperar@@"
+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|ignorar levemente a %s@@"
+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 del todo a %s@@"
+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|dejar de ignorar a  %s@@"
+msgstr "@@unignore|Dejar 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 al maximo %s@@"
+msgstr "Ignorar completamente"
 
-#: 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"
+msgstr "/party > Invitar un jugador al 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@@"
+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@@"
+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
-#, fuzzy
+#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:343
+#: src/gui/popupmenu.cpp:574
 msgid "@@guild|Invite to guild@@"
-msgstr "/party > Invita a un jugador a entrar en tu grupo"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:208
+#: src/gui/popupmenu.cpp:209
 msgid "@@admin-kick|Kick player@@"
-msgstr "@@admin-kick|expulsar jugador@@"
+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@@"
+msgstr "@@unignore|Dejar 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
-#, fuzzy
+#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:230
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:537
 msgid "@@sell|Sell@@"
-msgstr "@@use|Usar@@"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:226
-#, fuzzy
+#: src/gui/popupmenu.cpp:227
 msgid "@@talk|Talk@@"
-msgstr "@@attack|Atacar a %s@@"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:240
+#: src/gui/popupmenu.cpp:241
 #, fuzzy
 msgid "@@admin-kick|Kick@@"
-msgstr "@@admin-kick|expulsar jugador@@"
+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@@"
+msgstr "Anadir el nombre al 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|recoger %s@@"
+msgstr "@@pickup|Cojer %s@@"
 
-#: src/gui/popupmenu.cpp:376
+#: src/gui/popupmenu.cpp:377
 #, fuzzy
 msgid "@@chat|Add to chat@@"
-msgstr "@@chat|Añadir al chatt@@"
+msgstr "Añadir al 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
+#, fuzzy
 msgid "@@remove map|Remove@@"
-msgstr ""
+msgstr "@@retrieve|Retirar@@"
 
-#: 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
-#, fuzzy
+#: src/gui/popupmenu.cpp:428
 msgid "@@edit spell|Edit spell@@"
-msgstr "@@use|Usar@@"
+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 "Resaltar pestaña"
+msgstr "Opacidad de una tabla"
 
-#: src/gui/popupmenu.cpp:459
+#: src/gui/popupmenu.cpp:460
 #, fuzzy
 msgid "Enable highlight"
-msgstr "Resaltar pestaña"
+msgstr "Opacidad de una tabla"
 
-#: 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"
+msgstr "Cambiar de Login"
 
-#: 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"
+msgstr "Almacenar"
 
-#: src/gui/popupmenu.cpp:1094
+#: src/gui/popupmenu.cpp:1096
 #, fuzzy
 msgid "Store half"
-msgstr "almacenar"
+msgstr "Almacenar"
 
-#: src/gui/popupmenu.cpp:1096
+#: src/gui/popupmenu.cpp:1098
 #, fuzzy
 msgid "Store all"
-msgstr "almacenar"
+msgstr "Almacenar"
 
-#: src/gui/popupmenu.cpp:1110
+#: src/gui/popupmenu.cpp:1112
 #, fuzzy
 msgid "Retrieve 10"
-msgstr "recuperar"
+msgstr "Retirar"
 
-#: src/gui/popupmenu.cpp:1113
+#: src/gui/popupmenu.cpp:1115
 #, fuzzy
 msgid "Retrieve half"
-msgstr "recuperar"
+msgstr "Retirar"
 
-#: src/gui/popupmenu.cpp:1115
+#: src/gui/popupmenu.cpp:1117
 #, fuzzy
 msgid "Retrieve all"
-msgstr "recuperar"
+msgstr "Retirar"
 
-#: src/gui/popupmenu.cpp:1118 src/gui/popupmenu.cpp:1186
-#: src/gui/popupmenu.cpp:1224
-#, fuzzy
+#: src/gui/popupmenu.cpp:1120 src/gui/popupmenu.cpp:1188
+#: src/gui/popupmenu.cpp:1226
 msgid "Add to chat"
-msgstr "@@chat|Añadir al chatt@@"
+msgstr "Añadir al 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 ""
 
@@ -1811,11 +1785,11 @@ msgstr ""
 
 #: src/gui/quitdialog.cpp:51
 msgid "Switch server"
-msgstr "Cambiar servidor"
+msgstr "Cambiar de servidor"
 
 #: src/gui/quitdialog.cpp:52
 msgid "Switch character"
-msgstr "Cambiar personaje"
+msgstr "Cambiar de personaje"
 
 #: src/gui/register.cpp:74
 msgid "Confirm:"
@@ -1828,12 +1802,12 @@ msgstr "Email:"
 #: src/gui/register.cpp:173
 #, c-format
 msgid "The username needs to be at least %d characters long."
-msgstr "El nombre de usuario debe tener al menos %d caracteres."
+msgstr "El nombre debe tener como mínimo %d caracteres."
 
 #: src/gui/register.cpp:181
 #, c-format
 msgid "The username needs to be less than %d characters long."
-msgstr "El nombre de usuario puede tener como máximo %d caracteres."
+msgstr "El nombre debe tener menos de  %d caracteres."
 
 #: src/gui/register.cpp:189 src/gui/unregisterdialog.cpp:118
 #, c-format
@@ -1843,70 +1817,65 @@ msgstr "La contraseña debe tener al menos %d caracteres."
 #: src/gui/register.cpp:197 src/gui/unregisterdialog.cpp:125
 #, c-format
 msgid "The password needs to be less than %d characters long."
-msgstr "La contraseña puede tener como máximo %d caracteres."
+msgstr "La contraseña debe tener como mínimo %d caracteres."
 
 #: src/gui/register.cpp:204
 msgid "Passwords do not match."
 msgstr "Las contraseñas no coinciden."
 
 #: src/gui/serverdialog.cpp:207
-#, fuzzy
 msgid "Choose Your Server"
-msgstr "elige tu servidor"
+msgstr "Escoja tu servidor"
 
 #: src/gui/serverdialog.cpp:222
 msgid "Port:"
 msgstr "Puerto:"
 
 #: src/gui/serverdialog.cpp:223
-#, fuzzy
 msgid "Server type:"
-msgstr "Servidor:"
+msgstr "Tipo de servidor:"
 
 #: src/gui/serverdialog.cpp:245
 msgid "Load"
 msgstr ""
 
 #: src/gui/serverdialog.cpp:246
-#, fuzzy
 msgid "Connect"
-msgstr "Conectando…"
+msgstr "Conectar"
 
 #: src/gui/serverdialog.cpp:247
-#, fuzzy
 msgid "Custom Server"
-msgstr "Cursor propio"
+msgstr "Servidor propio"
 
 #: src/gui/serverdialog.cpp:351
 msgid "Please type both the address and the port of a server."
-msgstr "Escriba la dirección y el puerto de un servidor."
+msgstr "Por favor especifique el nombre y el puerto del servidor."
 
 #: src/gui/serverdialog.cpp:482
 #, c-format
 msgid "Downloading server list...%2.2f%%"
-msgstr ""
+msgstr "Bajando la lista de servidores...%2.2f%%"
 
 #: src/gui/serverdialog.cpp:488
-#, fuzzy
 msgid "Waiting for server..."
-msgstr "Esperando al servidor"
+msgstr "Esperando al servidor..."
 
 #: src/gui/serverdialog.cpp:492
 msgid "Preparing download"
-msgstr ""
+msgstr "Preparando la descarga"
 
 #: src/gui/serverdialog.cpp:496
 msgid "Error retreiving server list!"
-msgstr ""
+msgstr "Error al recuperar la lista de servers!"
 
 #: src/gui/serverdialog.cpp:593
 msgid "requires a newer version"
-msgstr ""
+msgstr "requiere una version mas nueva"
 
 #: src/gui/serverdialog.cpp:595
 #, c-format
 msgid "requires v%s"
-msgstr ""
+msgstr "requiere v%s"
 
 #: src/gui/setup_audio.cpp:46
 msgid "Enable Audio"
@@ -1923,16 +1892,15 @@ msgstr ""
 #: src/gui/setup_audio.cpp:49
 #, fuzzy
 msgid "Enable music"
-msgstr "Activar joystick"
+msgstr "Habilitar joystick"
 
 #: src/gui/setup_audio.cpp:50
-#, fuzzy
 msgid "Enable mumble voice chat"
-msgstr "Activar joystick"
+msgstr ""
 
 #: src/gui/setup_audio.cpp:52
 msgid "Download music"
-msgstr ""
+msgstr "Bajar Música"
 
 #: src/gui/setup_audio.cpp:57
 msgid "Audio"
@@ -1940,24 +1908,23 @@ msgstr "Audio"
 
 #: src/gui/setup_audio.cpp:60
 msgid "Sfx volume"
-msgstr "Volumen efectos"
+msgstr "Volumen Sfx"
 
 #: src/gui/setup_audio.cpp:61
 msgid "Music volume"
-msgstr "Volumen musica"
+msgstr "Volumen de Música"
 
 #: src/gui/setup_audio.cpp:117
-#, fuzzy
 msgid "Notice"
-msgstr "sin texto"
+msgstr "Anuncio"
 
 #: src/gui/setup_audio.cpp:117
 msgid "You may have to restart your client if you want to download new music"
-msgstr ""
+msgstr "Necesitas reiniciar el client si quieres descargar la musica"
 
 #: src/gui/setup_audio.cpp:130
 msgid "Sound Engine"
-msgstr ""
+msgstr "Mecanismo de Sonido"
 
 #: src/gui/setup_chat.cpp:64
 msgid "Remove colors from received chat messages"
@@ -1993,21 +1960,19 @@ msgid "Show chat history"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:100
-#, fuzzy
 msgid "Enable battle tab"
-msgstr "Imposible comprar."
+msgstr ""
 
 #: src/gui/setup_chat.cpp:104
-#, fuzzy
 msgid "Show battle events"
-msgstr "mostrar nombre"
+msgstr ""
 
 #: src/gui/setup_chat.cpp:108
 msgid "Show chat colors list"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:111 src/gui/setup_chat.cpp:119
-#: src/gui/setup_other.cpp:135 src/gui/setup_other.cpp:139
+#: src/gui/setup_other.cpp:137 src/gui/setup_other.cpp:141
 msgid "Edit"
 msgstr ""
 
@@ -2021,57 +1986,52 @@ msgstr ""
 
 #: src/gui/setup_colors.cpp:46
 msgid "This is what the color looks like"
-msgstr "asi es  como queda el color"
+msgstr "Así es como se verá el color"
 
 #: src/gui/setup_colors.cpp:51
 msgid "Colors"
-msgstr "colores"
+msgstr "Colores"
 
 #: src/gui/setup_colors.cpp:72
-#, fuzzy
 msgid "Type:"
-msgstr "tipo: "
+msgstr "Tipo:"
 
-#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:398
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:400
 msgid "Static"
-msgstr "estatica"
+msgstr "Estático"
 
 #: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
-#: src/gui/setup_colors.cpp:399
+#: src/gui/setup_colors.cpp:401
 msgid "Pulse"
-msgstr "pulso"
+msgstr "Pulso"
 
 #: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:400
+#: src/gui/setup_colors.cpp:402
 msgid "Rainbow"
-msgstr "arcoiris"
+msgstr "Arcoiris"
 
 #: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:400
+#: src/gui/setup_colors.cpp:402
 msgid "Spectrum"
-msgstr "espectro"
+msgstr "Espectro"
 
-#: src/gui/setup_colors.cpp:94 src/gui/setup_colors.cpp:310
-#, fuzzy
+#: src/gui/setup_colors.cpp:94 src/gui/setup_colors.cpp:312
 msgid "Delay:"
-msgstr "retraso: "
+msgstr "Atraso:"
 
 #: src/gui/setup_colors.cpp:109
-#, fuzzy
 msgid "Red:"
-msgstr "rojo: "
+msgstr "Rojo:"
 
 #: src/gui/setup_colors.cpp:124
-#, fuzzy
 msgid "Green:"
-msgstr "verde: "
+msgstr "Verde:"
 
 #: src/gui/setup_colors.cpp:139
-#, fuzzy
 msgid "Blue:"
-msgstr "azul: "
+msgstr "Azul:"
 
-#: src/gui/setup_colors.cpp:305
+#: src/gui/setup_colors.cpp:307
 msgid "Alpha:"
 msgstr ""
 
@@ -2081,11 +2041,11 @@ msgstr "Aplicar"
 
 #: src/gui/setup.cpp:66
 msgid "Reset Windows"
-msgstr "Reiniciar ventanas"
+msgstr "Restaurar Ventanas"
 
 #: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:76
 msgid "Press the button to start calibration"
-msgstr "Presione el botón para comenzar la calibración"
+msgstr "Aprieta el botón para empezar a calibrar"
 
 #: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:74
 msgid "Calibrate"
@@ -2093,7 +2053,7 @@ msgstr "Calibrar"
 
 #: src/gui/setup_joystick.cpp:39
 msgid "Enable joystick"
-msgstr "Activar joystick"
+msgstr "Habilitar joystick"
 
 #: src/gui/setup_joystick.cpp:41
 msgid "Joystick"
@@ -2101,11 +2061,11 @@ msgstr "Joystick"
 
 #: src/gui/setup_joystick.cpp:81
 msgid "Stop"
-msgstr "Detener"
+msgstr "Parar"
 
 #: src/gui/setup_joystick.cpp:82
 msgid "Rotate the stick"
-msgstr "Gire el stick"
+msgstr "Gira el stick"
 
 #: src/gui/setup_keyboard.cpp:77
 msgid "Keyboard"
@@ -2113,117 +2073,119 @@ msgstr "Teclado"
 
 #: src/gui/setup_keyboard.cpp:86
 msgid "Assign"
-msgstr "Asignar"
+msgstr "Atribuir"
 
 #: src/gui/setup_keyboard.cpp:90
-#, fuzzy
 msgid "Unassign"
-msgstr "Asignar"
+msgstr "Retirar"
 
 #: src/gui/setup_keyboard.cpp:94
 msgid "Default"
-msgstr "Predeterminado"
+msgstr "Por defecto"
 
 #: src/gui/setup_keyboard.cpp:130
 msgid "Key Conflict(s) Detected."
-msgstr "conflictos entre teclas detectados"
+msgstr "Conflicto de teclas detectado."
 
-#: src/gui/setup_other.cpp:92
+#: src/gui/setup_other.cpp:94
 msgid "Misc"
 msgstr ""
 
-#: src/gui/setup_other.cpp:95
+#: src/gui/setup_other.cpp:97
 msgid "Show damage inflicted to monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:100
+#: src/gui/setup_other.cpp:102
 msgid "Auto target only reachable monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:104
+#: src/gui/setup_other.cpp:106
 #, fuzzy
 msgid "Highlight map portals"
-msgstr "Resaltar"
+msgstr "Opacidad"
 
-#: src/gui/setup_other.cpp:109
+#: src/gui/setup_other.cpp:111
 msgid "Highlight player attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:114
+#: src/gui/setup_other.cpp:116
 msgid "Highlight monster attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:118
+#: src/gui/setup_other.cpp:120
 msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:121
+#: src/gui/setup_other.cpp:123
 #, fuzzy
 msgid "Cycle monster targets"
-msgstr "mostrar nombre"
+msgstr "Mostrar daño recibido"
 
-#: src/gui/setup_other.cpp:124
+#: src/gui/setup_other.cpp:126
 #, fuzzy
 msgid "Enable bot checker"
-msgstr "Activar joystick"
+msgstr "Habilitar joystick"
 
-#: src/gui/setup_other.cpp:127
+#: src/gui/setup_other.cpp:129
 #, fuzzy
 msgid "Highlight floor items"
-msgstr "Resaltar"
+msgstr "Opacidad"
 
-#: src/gui/setup_other.cpp:130
+#: src/gui/setup_other.cpp:132
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:141
-#, fuzzy
+#: src/gui/setup_other.cpp:143
 msgid "Enable shop mode"
-msgstr "admitir /bloquear intercambios"
+msgstr ""
 
-#: src/gui/setup_other.cpp:145
+#: src/gui/setup_other.cpp:147
 msgid "Enable buggy servers protection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:149
-#, fuzzy
+#: src/gui/setup_other.cpp:151
 msgid "Enable debug log"
-msgstr "Imposible comprar."
+msgstr ""
 
-#: src/gui/setup_other.cpp:153
-#, fuzzy
+#: src/gui/setup_other.cpp:155
 msgid "Enable server side attack"
-msgstr "Imposible comprar."
+msgstr ""
 
-#: src/gui/setup_other.cpp:157
+#: src/gui/setup_other.cpp:159
 msgid "Auto fix position"
 msgstr ""
 
-#: src/gui/setup_other.cpp:161
+#: src/gui/setup_other.cpp:163
 msgid "Attack while moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:165
+#: src/gui/setup_other.cpp:167
 #, fuzzy
 msgid "Enable quick stats"
-msgstr "Activar joystick"
+msgstr "Habilitar joystick"
 
-#: src/gui/setup_other.cpp:169
+#: src/gui/setup_other.cpp:171
 #, fuzzy
 msgid "Show warps particles"
-msgstr "como particula"
+msgstr "como partícula"
 
-#: src/gui/setup_other.cpp:173
+#: src/gui/setup_other.cpp:175
 msgid "Accept sell/buy requests"
 msgstr ""
 
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:179
+#, fuzzy
 msgid "Show monster hp bar"
-msgstr ""
+msgstr "Mostrar daño recibido"
+
+#: src/gui/setup_other.cpp:183
+#, fuzzy
+msgid "Show own hp bar"
+msgstr "Mostrar nombre propio"
 
 #: src/gui/setup_players.cpp:60
 msgid "Relation"
-msgstr "Relacion"
+msgstr "Relación"
 
 #: src/gui/setup_players.cpp:65
 msgid "Neutral"
@@ -2235,11 +2197,11 @@ msgstr "Amigo"
 
 #: src/gui/setup_players.cpp:67
 msgid "Disregarded"
-msgstr "desestimado"
+msgstr "Desconocido"
 
 #: src/gui/setup_players.cpp:68
 msgid "Ignored"
-msgstr "Ingnorado"
+msgstr "Ignorado"
 
 #: src/gui/setup_players.cpp:69
 msgid "Erased"
@@ -2247,11 +2209,11 @@ msgstr ""
 
 #: src/gui/setup_players.cpp:238
 msgid "Allow trading"
-msgstr "permitir comercio"
+msgstr "Permitir intercambios"
 
 #: src/gui/setup_players.cpp:240
 msgid "Allow whispers"
-msgstr "permitir susurros"
+msgstr "Permitir mensajes privados"
 
 #: src/gui/setup_players.cpp:243
 msgid "Old"
@@ -2259,12 +2221,11 @@ msgstr ""
 
 #: src/gui/setup_players.cpp:245
 msgid "Put all whispers in tabs"
-msgstr "poner susurros en pestañas"
+msgstr "Mostrar nuevos susurros en pestañas"
 
 #: src/gui/setup_players.cpp:248
-#, fuzzy
 msgid "Show gender"
-msgstr "mostrar nombre"
+msgstr "Mostrar género (del personaje)"
 
 #: src/gui/setup_players.cpp:253
 msgid "Players"
@@ -2272,22 +2233,21 @@ msgstr "Jugadores"
 
 #: src/gui/setup_players.cpp:278
 msgid "When ignoring:"
-msgstr "cuando ignorando"
+msgstr "Cuando se ignora a alguien:"
 
 #: src/gui/setup_players.cpp:301
 #, fuzzy
 msgid "Show level"
-msgstr "mostrar nombre"
+msgstr "Mostrar género (del personaje)"
 
 #: src/gui/setup_players.cpp:305
-#, fuzzy
 msgid "Show own name"
-msgstr "mostrar nombre"
+msgstr "Mostrar nombre propio"
 
 #: src/gui/setup_players.cpp:309
 #, fuzzy
 msgid "Target dead players"
-msgstr "objetivo jugador"
+msgstr "Seleccionar Jugador"
 
 #: src/gui/setup_theme.cpp:107
 msgid "Theme"
@@ -2308,7 +2268,7 @@ msgstr ""
 #: src/gui/setup_theme.cpp:112
 #, fuzzy
 msgid "Particle font"
-msgstr "Efectos de Partículas"
+msgstr "Recuento de partículas: %d"
 
 #: src/gui/setup_theme.cpp:113
 #, fuzzy
@@ -2318,32 +2278,32 @@ msgstr "Ayuda"
 #: src/gui/setup_theme.cpp:223
 #, fuzzy
 msgid "Theme Changed"
-msgstr "Modificar"
+msgstr "Cambiar e-mail"
 
 #: src/gui/setup_theme.cpp:224 src/gui/setup_video.cpp:714
 #: src/gui/setup_video.cpp:719
 msgid "Restart your client for the change to take effect."
-msgstr "para que el cambio tenga efecto reinicia el programa"
+msgstr "Reincie el juego para que los cambios tengan efecto."
 
 #: src/gui/setup_video.cpp:143
 #, fuzzy
 msgid "Tiny (10)"
-msgstr "muy pequeño"
+msgstr "Minúsculo"
 
 #: src/gui/setup_video.cpp:144
 #, fuzzy
 msgid "Small (11)"
-msgstr "pequeño"
+msgstr "Pequeño"
 
 #: src/gui/setup_video.cpp:145
 #, fuzzy
 msgid "Medium (12)"
-msgstr "mediano"
+msgstr "Media"
 
 #: src/gui/setup_video.cpp:146
 #, fuzzy
 msgid "Large (13)"
-msgstr "grande"
+msgstr "Grande"
 
 #: src/gui/setup_video.cpp:147
 msgid "Big (14)"
@@ -2369,7 +2329,7 @@ msgstr "OpenGL"
 
 #: src/gui/setup_video.cpp:200
 msgid "No text"
-msgstr "sin texto"
+msgstr "Sin texto"
 
 #: src/gui/setup_video.cpp:202
 msgid "Text"
@@ -2377,15 +2337,15 @@ msgstr "Texto"
 
 #: src/gui/setup_video.cpp:204
 msgid "Bubbles, no names"
-msgstr "burbujas sin nombres"
+msgstr "Burbujas sin nombres"
 
 #: src/gui/setup_video.cpp:206
 msgid "Bubbles with names"
-msgstr "burbujas con nombres"
+msgstr "Burbujas con nombres"
 
 #: src/gui/setup_video.cpp:219
 msgid "off"
-msgstr "desactivado"
+msgstr "apagado"
 
 #: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:238
 msgid "low"
@@ -2397,11 +2357,11 @@ msgstr "alto"
 
 #: src/gui/setup_video.cpp:240
 msgid "medium"
-msgstr "Medio"
+msgstr "medio"
 
 #: src/gui/setup_video.cpp:244
 msgid "max"
-msgstr "max"
+msgstr "máximo"
 
 #: src/gui/setup_video.cpp:276
 msgid "Full screen"
@@ -2410,7 +2370,7 @@ msgstr "Pantalla completa"
 #: src/gui/setup_video.cpp:277
 #, fuzzy
 msgid "Hw acceleration"
-msgstr "Relacion"
+msgstr "Relación"
 
 #: src/gui/setup_video.cpp:278
 msgid "Custom cursor"
@@ -2418,19 +2378,19 @@ msgstr "Cursor propio"
 
 #: src/gui/setup_video.cpp:280
 msgid "Visible names"
-msgstr "nombres visibles"
+msgstr "Nombres Visibles"
 
 #: src/gui/setup_video.cpp:282
 msgid "Particle effects"
-msgstr "efectos de particulas"
+msgstr "Efectos de partículas"
 
 #: src/gui/setup_video.cpp:284
 msgid "Log NPC dialogue"
-msgstr ""
+msgstr "Log dealogos con un NPC"
 
 #: src/gui/setup_video.cpp:285
 msgid "Show pickup notification"
-msgstr "mostrar aviso de recogida"
+msgstr "Mostrar aviso al coger algo"
 
 #. TRANSLATORS: Refers to "Show own name"
 #: src/gui/setup_video.cpp:287
@@ -2440,7 +2400,7 @@ msgstr "en chat"
 #. TRANSLATORS: Refers to "Show own name"
 #: src/gui/setup_video.cpp:289
 msgid "as particle"
-msgstr "como particula"
+msgstr "como partícula"
 
 #: src/gui/setup_video.cpp:291
 msgid "Hide shield sprite"
@@ -2467,9 +2427,8 @@ msgid "Show job"
 msgstr ""
 
 #: src/gui/setup_video.cpp:301
-#, fuzzy
 msgid "Enable opacity cache"
-msgstr "Activar joystick"
+msgstr ""
 
 #: src/gui/setup_video.cpp:302
 #, fuzzy
@@ -2477,15 +2436,14 @@ msgid "Show background"
 msgstr "Fondo"
 
 #: src/gui/setup_video.cpp:307
-#, fuzzy
 msgid "FPS limit:"
-msgstr "Límite de FPS:"
+msgstr "Limite FPS:"
 
 #: src/gui/setup_video.cpp:311 src/gui/setup_video.cpp:350
 #: src/gui/setup_video.cpp:646 src/gui/setup_video.cpp:809
 #, fuzzy
 msgid "Alt FPS limit: "
-msgstr "Límite de FPS:"
+msgstr "Limite FPS:"
 
 #: src/gui/setup_video.cpp:321
 msgid "Video"
@@ -2493,61 +2451,58 @@ msgstr "Vídeo"
 
 #: src/gui/setup_video.cpp:326
 msgid "Overhead text"
-msgstr "texto sobreoido"
+msgstr "Texto sobrescrito"
 
 #: src/gui/setup_video.cpp:327
 msgid "Gui opacity"
-msgstr "Transparencia menus"
+msgstr "Opacidad"
 
 #: src/gui/setup_video.cpp:328
 msgid "Ambient FX"
-msgstr "Efectos ambientales"
+msgstr "Ambiente FX"
 
 #: src/gui/setup_video.cpp:329
-#, fuzzy
 msgid "Particle detail"
-msgstr "detalle particulas"
+msgstr "Detalle de partículas"
 
 #: src/gui/setup_video.cpp:330
 msgid "Font size"
-msgstr "tamaño de letra"
+msgstr "Tamaño de fuente"
 
 #: src/gui/setup_video.cpp:348 src/gui/setup_video.cpp:351
 #: src/gui/setup_video.cpp:645 src/gui/setup_video.cpp:796
 #: src/gui/setup_video.cpp:807
-#, fuzzy
 msgid "None"
-msgstr "No"
+msgstr "Nada"
 
 #: src/gui/setup_video.cpp:528
-#, fuzzy
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
-msgstr "el modo y la restauracion del modo anterior fallaron"
+msgstr ""
+"Fallo al cambiar para el modo ventana y fallo al restaurar el modo anterior!"
 
 #: src/gui/setup_video.cpp:534
-#, fuzzy
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
-msgstr "el modo y la restauracion del modo anterior fallaron"
+msgstr ""
+"Fallo al cambiar para el modo ventana completa y fallo al restaurar el modo "
+"anterior!"
 
 #: src/gui/setup_video.cpp:545
-#, fuzzy
 msgid "Switching to Full Screen"
-msgstr "Cambiar a pantalla completa"
+msgstr "Cambiando a pantalla completa"
 
 #: src/gui/setup_video.cpp:546
 msgid "Restart needed for changes to take effect."
-msgstr "Se necesita reiniciar para aplicar los cambios."
+msgstr "Reinicio necesario para que los cambios tengan su efecto."
 
 #: src/gui/setup_video.cpp:558
-#, fuzzy
 msgid "Changing to OpenGL"
-msgstr "Cambiar a OpenGL"
+msgstr "Cambiando a OpenGL"
 
 #: src/gui/setup_video.cpp:559
 msgid "Applying change to OpenGL requires restart."
-msgstr "Se necesita reiniciar para aplicar los cambios hechos a OpenGL."
+msgstr "Aplicar el intercambio a OpenGL requiere reiniciar el juego."
 
 #: src/gui/setup_video.cpp:697
 msgid "Custom resolution (example: 1024x768)"
@@ -2558,22 +2513,20 @@ msgid "Enter new resolution:                "
 msgstr ""
 
 #: src/gui/setup_video.cpp:713 src/gui/setup_video.cpp:718
-#, fuzzy
 msgid "Screen Resolution Changed"
-msgstr "se cambio la resolucion de pantalla"
+msgstr "Resolución de pantalla cambiada"
 
 #: src/gui/setup_video.cpp:716
 msgid "Some windows may be moved to fit the lowered resolution."
-msgstr ""
+msgstr "Algunas ventanas deben ser movidas a una resolución más baja."
 
 #: src/gui/setup_video.cpp:750
-#, fuzzy
 msgid "Particle Effect Settings Changed."
-msgstr "efectos de particulas cambiados"
+msgstr "Configuración del efecto de las partículas cambiado."
 
 #: src/gui/setup_video.cpp:751
 msgid "Changes will take effect on map change."
-msgstr "los cambios tienen efecto en cuanto cambies de mapa"
+msgstr "Los cambios tendran efecto cuando se cambie de mapa."
 
 #: src/gui/shopwindow.cpp:71
 msgid "Personal Shop"
@@ -2589,7 +2542,7 @@ msgstr ""
 
 #: src/gui/shopwindow.cpp:116 src/gui/shopwindow.cpp:119 src/gui/trade.cpp:85
 msgid "Add"
-msgstr "Añadir"
+msgstr "Anadir"
 
 #: src/gui/shopwindow.cpp:118 src/gui/shopwindow.cpp:121
 msgid "Announce"
@@ -2602,12 +2555,12 @@ msgstr ""
 #: src/gui/shopwindow.cpp:706 src/net/manaserv/tradehandler.cpp:126
 #: src/net/tmwa/tradehandler.cpp:121
 msgid "Request for Trade"
-msgstr "Solicitud de intercambio"
+msgstr "Propuesta de intercambio"
 
 #: src/gui/shopwindow.cpp:707
 #, fuzzy, c-format
 msgid "%s wants to %s %s do you accept?"
-msgstr "%s desea realizar un intercambio con usted, acepta?"
+msgstr "%s quiere comerciar contigo, aceptas?"
 
 #: src/gui/skilldialog.cpp:227 src/gui/windowmenu.cpp:77
 msgid "Skills"
@@ -2615,30 +2568,30 @@ msgstr "Habilidades"
 
 #: src/gui/skilldialog.cpp:238
 msgid "Up"
-msgstr "Arriba"
+msgstr "Encima"
 
 #: src/gui/skilldialog.cpp:290
-#, fuzzy, c-format
+#, c-format
 msgid "Skill points available: %d"
-msgstr "puntos de habilidad: %d"
+msgstr "Puntos de habilidades: %d"
 
 #: src/gui/skilldialog.cpp:374
-#, fuzzy, c-format
+#, c-format
 msgid "Skill Set %d"
-msgstr "puntos de habilidad: %d"
+msgstr "Habilidades %d"
 
 #: src/gui/skilldialog.cpp:384
-#, fuzzy, c-format
+#, c-format
 msgid "Skill %d"
-msgstr "Habilidades"
+msgstr "Habilidad %d"
 
 #: src/gui/skilldialog.cpp:469
-#, fuzzy, c-format
+#, c-format
 msgid "Lvl: %d (%+d)"
-msgstr "Nivel: %d"
+msgstr "Nivel: %d (%+d)"
 
 #: src/gui/skilldialog.cpp:477
-#, fuzzy, c-format
+#, c-format
 msgid "Lvl: %d"
 msgstr "Nivel: %d"
 
@@ -2649,64 +2602,62 @@ msgstr "Clan"
 #: src/gui/socialwindow.cpp:143
 #, c-format
 msgid "Invited user %s to guild %s."
-msgstr ""
+msgstr "Invita al jugador %s para su clan %s."
 
 #: src/gui/socialwindow.cpp:157
-#, fuzzy, c-format
+#, c-format
 msgid "Guild %s quit requested."
-msgstr "Guild créada."
+msgstr "Clan %s pidiendo salir."
 
 #: src/gui/socialwindow.cpp:184
 msgid "Member Invite to Guild"
-msgstr ""
+msgstr "Miembro invitado al clan."
 
 #: src/gui/socialwindow.cpp:185
 #, c-format
 msgid "Who would you like to invite to guild %s?"
-msgstr ""
+msgstr "A quién te gustaría invitar al clan %s?"
 
 #: src/gui/socialwindow.cpp:194
-#, fuzzy
 msgid "Leave Guild?"
-msgstr "Crear clan"
+msgstr "Salir del clan?"
 
 #: src/gui/socialwindow.cpp:195
-#, fuzzy, c-format
+#, c-format
 msgid "Are you sure you want to leave guild %s?"
-msgstr "¿Está seguro que desea salir?"
+msgstr "Estás seguro de dejar el clan %s?"
 
 #: src/gui/socialwindow.cpp:212 src/net/tmwa/gui/partytab.cpp:47
 msgid "Party"
 msgstr "Grupo"
 
 #: src/gui/socialwindow.cpp:240
-#, fuzzy, c-format
+#, c-format
 msgid "Invited user %s to party."
-msgstr "/party > Invita a un jugador a entrar en tu grupo"
+msgstr "Jugador %s invitado al grupo."
 
 #: src/gui/socialwindow.cpp:254
 #, c-format
 msgid "Party %s quit requested."
-msgstr ""
+msgstr "Grupo %s requisitado."
 
 #: src/gui/socialwindow.cpp:281
-#, fuzzy
 msgid "Member Invite to Party"
-msgstr "/party > Invita a un jugador a entrar en tu grupo"
+msgstr "Invitación de un miembro al grupo"
 
 #: src/gui/socialwindow.cpp:282
 #, c-format
 msgid "Who would you like to invite to party %s?"
-msgstr ""
+msgstr "A quién te gustaría invitar al grupo %s?"
 
 #: src/gui/socialwindow.cpp:291
 msgid "Leave Party?"
-msgstr ""
+msgstr "Salir del grupo?"
 
 #: src/gui/socialwindow.cpp:292
-#, fuzzy, c-format
+#, c-format
 msgid "Are you sure you want to leave party %s?"
-msgstr "¿Está seguro que desea salir?"
+msgstr "Estás seguro de que quieres salir del grupo %s?"
 
 #: src/gui/socialwindow.cpp:514
 msgid "Nav"
@@ -2717,124 +2668,114 @@ msgid "Create Guild"
 msgstr "Crear clan"
 
 #: src/gui/socialwindow.cpp:784 src/gui/socialwindow.cpp:1186
-#, fuzzy
 msgid "Create Party"
-msgstr "Crear Personaje"
+msgstr "Crear grupo"
 
 #: src/gui/socialwindow.cpp:826 src/gui/windowmenu.cpp:87
 msgid "Social"
-msgstr ""
+msgstr "Social"
 
 #: src/gui/socialwindow.cpp:847
-#, fuzzy
 msgid "Invite"
-msgstr "Invitar a jugador"
+msgstr "Invitar"
 
 #: src/gui/socialwindow.cpp:848
-#, fuzzy
 msgid "Leave"
-msgstr "grande"
+msgstr "Dejar"
 
 #: src/gui/socialwindow.cpp:975
-#, fuzzy, c-format
+#, c-format
 msgid "Accepted party invite from %s."
-msgstr "Invitacion acceptada de %s."
+msgstr "Aceptada la invitación de   %s."
 
 #: src/gui/socialwindow.cpp:985
-#, fuzzy, c-format
+#, c-format
 msgid "Rejected party invite from %s."
-msgstr "Rechazada la invitacion de %s."
+msgstr "Cancelada la invitación de  %s."
 
 #: src/gui/socialwindow.cpp:1002
-#, fuzzy, c-format
+#, c-format
 msgid "Accepted guild invite from %s."
-msgstr "Invitacion acceptada de %s."
+msgstr "Aceptada la invitación a la guild de  %s."
 
 #: src/gui/socialwindow.cpp:1012
-#, fuzzy, c-format
+#, c-format
 msgid "Rejected guild invite from %s."
-msgstr "Rechazada la invitacion de %s."
+msgstr "Cancelada la invitación a la guild de %s."
 
 #: src/gui/socialwindow.cpp:1056
-#, fuzzy, c-format
+#, c-format
 msgid "Creating guild called %s."
-msgstr "Eror al crear la guild."
+msgstr "Creando clan llamado %s."
 
 #: src/gui/socialwindow.cpp:1079
 #, c-format
 msgid "Creating party called %s."
-msgstr ""
+msgstr "Creando grupo llamado %s."
 
 #: src/gui/socialwindow.cpp:1093
-#, fuzzy
 msgid "Guild Name"
-msgstr "Clan"
+msgstr "Nombre del clan"
 
 #: src/gui/socialwindow.cpp:1094
-#, fuzzy
 msgid "Choose your guild's name."
-msgstr "elige tu servidor"
+msgstr "Escoja el nombre de su clan."
 
 #: src/gui/socialwindow.cpp:1108
-#, fuzzy
 msgid "Received guild request, but one already exists."
-msgstr "Has recibido una invitation para un grupo, pero uno existe ya."
+msgstr "Recibida petición de creación del clan, pero ya existe."
 
 #: src/gui/socialwindow.cpp:1114
-#, fuzzy, c-format
+#, c-format
 msgid "%s has invited you to join the guild %s."
-msgstr "%s te invita a unirte al grupo %s."
+msgstr "%s te ha invitado al clan %s."
 
 #: src/gui/socialwindow.cpp:1120
-#, fuzzy
 msgid "Accept Guild Invite"
-msgstr "Aceptar invitaciones a grupos"
+msgstr "Aceptar invitación al clan"
 
 #: src/gui/socialwindow.cpp:1135
 msgid "Received party request, but one already exists."
-msgstr "Has recibido una invitation para un grupo, pero uno existe ya."
+msgstr "Recibida petición de creación del grupo, pero ya existe."
 
 #: src/gui/socialwindow.cpp:1146
-#, fuzzy
 msgid "You have been invited you to join a party."
-msgstr "%s te invita a unirte a su grupo."
+msgstr "Fuiste invitado a un grupo."
 
 #: src/gui/socialwindow.cpp:1150
-#, fuzzy, c-format
+#, c-format
 msgid "You have been invited to join the %s party."
-msgstr "%s te invita a unirte al grupo %s."
+msgstr "Has sido invitado para unirte al grupo %s."
 
 #: src/gui/socialwindow.cpp:1158
 #, c-format
 msgid "%s has invited you to join their party."
-msgstr "%s te invita a unirte a su grupo."
+msgstr "%s te ha invitado a unirte a su grupo."
 
 #: src/gui/socialwindow.cpp:1163
 #, c-format
 msgid "%s has invited you to join the %s party."
-msgstr "%s te invita a unirte al grupo %s."
+msgstr "%s te ha invitado para unirte al grupo %s."
 
 #: src/gui/socialwindow.cpp:1172
 msgid "Accept Party Invite"
-msgstr "Aceptar invitaciones a grupos"
+msgstr "Aceptar invitación al grupo"
 
 #: src/gui/socialwindow.cpp:1187
 msgid "Cannot create party. You are already in a party"
-msgstr ""
+msgstr "No se pudo crear un grupo. Ya estás en uno."
 
 #: src/gui/socialwindow.cpp:1192
-#, fuzzy
 msgid "Party Name"
-msgstr "Grupo"
+msgstr "Nombre del grupo"
 
 #: src/gui/socialwindow.cpp:1193
-#, fuzzy
 msgid "Choose your party's name."
-msgstr "elige tu servidor"
+msgstr "Escoja el nombre del grupo."
 
 #: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:83
 msgid "Specials"
-msgstr ""
+msgstr "Especiales"
 
 #: src/gui/statuswindow.cpp:126 src/gui/statuswindow.cpp:252
 #: src/gui/statuswindow.cpp:311
@@ -2854,7 +2795,7 @@ msgstr "PV:"
 
 #: src/gui/statuswindow.cpp:140
 msgid "Exp:"
-msgstr "EXP:"
+msgstr "Exp:"
 
 #: src/gui/statuswindow.cpp:154
 msgid "MP:"
@@ -2863,41 +2804,40 @@ msgstr "PM:"
 #: src/gui/statuswindow.cpp:186 src/gui/statuswindow.cpp:327
 #, c-format
 msgid "Job: %d"
-msgstr "trabajo : %d"
+msgstr "Trabajo: %d"
 
 #: src/gui/statuswindow.cpp:187
 msgid "Job:"
-msgstr "trabajo:"
+msgstr "Trabajo:"
 
 #: src/gui/statuswindow.cpp:241 src/gui/statuswindow.cpp:285
-#, fuzzy, c-format
+#, c-format
 msgid "Character points: %d"
-msgstr "Estadisticas del personaje OK"
+msgstr "Puntos del personaje: %d"
 
 #: src/gui/statuswindow.cpp:247
 #, fuzzy, c-format
 msgid "Level: %d (GM %d)"
-msgstr "Nivel: %d"
+msgstr "Nivel: %d (%+d)"
 
 #: src/gui/statuswindow.cpp:299
-#, fuzzy, c-format
+#, c-format
 msgid "Correction points: %d"
-msgstr "puntos de habilidad: %d"
+msgstr "Puntos de corrección: %d"
 
 #: src/gui/textcommandeditor.cpp:109
 #, fuzzy
 msgid "No Target"
-msgstr "mover a la izquierda"
+msgstr "Seleccionar NPC"
 
 #: src/gui/textcommandeditor.cpp:110
 #, fuzzy
 msgid "Allow Target"
-msgstr "permitir comercio"
+msgstr "Permitir intercambios"
 
 #: src/gui/textcommandeditor.cpp:111
-#, fuzzy
 msgid "Need Target"
-msgstr "mover a la izquierda"
+msgstr ""
 
 #: src/gui/textcommandeditor.cpp:116
 #, fuzzy
@@ -2907,12 +2847,12 @@ msgstr "General"
 #: src/gui/textcommandeditor.cpp:117
 #, fuzzy
 msgid "Life Magic"
-msgstr "Magia:"
+msgstr "Magia"
 
 #: src/gui/textcommandeditor.cpp:118
 #, fuzzy
 msgid "War Magic"
-msgstr "Magia:"
+msgstr "Magia"
 
 #: src/gui/textcommandeditor.cpp:119
 msgid "Transmute Magic"
@@ -2929,12 +2869,12 @@ msgstr ""
 #: src/gui/textcommandeditor.cpp:164
 #, fuzzy
 msgid "Command Editor"
-msgstr "Comando: /item"
+msgstr "Comando: /ignore"
 
 #: src/gui/textcommandeditor.cpp:181
 #, fuzzy
 msgid "magic"
-msgstr "Magia:"
+msgstr "Magia"
 
 #: src/gui/textcommandeditor.cpp:185
 msgid "other"
@@ -2956,7 +2896,7 @@ msgstr ""
 #: src/gui/textcommandeditor.cpp:201
 #, fuzzy
 msgid "Target Type:"
-msgstr "objetivo jugador"
+msgstr "Seleccionar Jugador"
 
 #: src/gui/textcommandeditor.cpp:206
 msgid "Icon:"
@@ -2965,16 +2905,15 @@ msgstr ""
 #: src/gui/textcommandeditor.cpp:212
 #, fuzzy
 msgid "Magic level:"
-msgstr "nivel maximo"
+msgstr "Nivel maximo"
 
 #: src/gui/textcommandeditor.cpp:217
 msgid "Magic School:"
 msgstr ""
 
 #: src/gui/textcommandeditor.cpp:223
-#, fuzzy
 msgid "School level:"
-msgstr "mostrar nombre"
+msgstr ""
 
 #: src/gui/textcommandeditor.cpp:228
 msgid "Save"
@@ -2982,50 +2921,50 @@ msgstr ""
 
 #: src/gui/trade.cpp:54
 msgid "Propose trade"
-msgstr "Proponer"
+msgstr "Proponer el intercambio"
 
 #: src/gui/trade.cpp:55
 msgid "Confirmed. Waiting..."
-msgstr "confirmado ... esperando"
+msgstr "Confirmado. Esperando..."
 
 #: src/gui/trade.cpp:56
 msgid "Agree trade"
-msgstr "aceptar trato"
+msgstr "Aceptar intercambio"
 
 #: src/gui/trade.cpp:57
 msgid "Agreed. Waiting..."
-msgstr "aceptado esperando..."
+msgstr "Aceptado. Esperando..."
 
 #: src/gui/trade.cpp:60
 msgid "Trade: You"
-msgstr "intercambiar: tu"
+msgstr "Intercambio: Tú"
 
 #: src/gui/trade.cpp:82 src/gui/trade.cpp:83 src/gui/widgets/tradetab.cpp:41
 msgid "Trade"
-msgstr "Comercio"
+msgstr "Intercambio"
 
 #: src/gui/trade.cpp:107 src/gui/trade.cpp:148
-#, fuzzy, c-format
+#, c-format
 msgid "You get %s"
-msgstr "tu recibes %s"
+msgstr "Tú recibes %s"
 
 #: src/gui/trade.cpp:108
 msgid "You give:"
-msgstr "Tu das:"
+msgstr "Tú das:"
 
 #: src/gui/trade.cpp:112
 msgid "Change"
-msgstr "Modificar"
+msgstr "Cambiar"
 
 #: src/gui/trade.cpp:312
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
-"no se pudo añadir objeto: No puedes sobreponer un tipo de objeto en la "
-"ventana"
+"Fallo al añadir objeto. No puedes añadir más de un mismo tipo de objeto en "
+"la ventana."
 
 #: src/gui/trade.cpp:357
 msgid "You don't have enough money."
-msgstr "No tienes suficiente dinero."
+msgstr "No tienes dinero suficiente."
 
 #: src/gui/unregisterdialog.cpp:51
 #, c-format
@@ -3034,11 +2973,11 @@ msgstr "Nombre: %s"
 
 #: src/gui/updatewindow.cpp:132
 msgid "Updating..."
-msgstr "Actualizando ..."
+msgstr "Actualizando..."
 
 #: src/gui/updatewindow.cpp:151
 msgid "Connecting..."
-msgstr "Conectando…"
+msgstr "Conectando..."
 
 #: src/gui/updatewindow.cpp:154
 msgid "Play"
@@ -3046,173 +2985,177 @@ msgstr "Jugar"
 
 #: src/gui/updatewindow.cpp:534
 msgid "##1  The update process is incomplete."
-msgstr "##1 el proceso de actualizacion esta incompleto"
+msgstr "##3  El proceso de actualización esta incompleto."
 
 #. TRANSLATORS: Continues "you try again later.".
 #: src/gui/updatewindow.cpp:536
 msgid "##1  It is strongly recommended that"
-msgstr "##1 se recomienda que"
+msgstr "##1 Es altamente recomendado que"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
 #: src/gui/updatewindow.cpp:538
-#, fuzzy
 msgid "##1  you try again later."
-msgstr "##1 lo intentes de nuevo mas tarde"
+msgstr "##1 lo intentes de nuevo más tarde."
 
 #: src/gui/updatewindow.cpp:663
 msgid "Completed"
-msgstr "Terminado"
+msgstr "Completado"
 
-#: src/gui/userpalette.cpp:109
+#: src/gui/userpalette.cpp:111
 msgid "Being"
-msgstr "Ser"
+msgstr "Personaje"
 
-#: src/gui/userpalette.cpp:110
+#: src/gui/userpalette.cpp:112
 #, fuzzy
 msgid "Friend Names"
 msgstr "Amigo"
 
-#: src/gui/userpalette.cpp:111
+#: src/gui/userpalette.cpp:113
 #, fuzzy
 msgid "Disregarded Names"
-msgstr "desestimado"
+msgstr "Desconocido"
 
-#: src/gui/userpalette.cpp:112
+#: src/gui/userpalette.cpp:114
 #, fuzzy
 msgid "Ignored Names"
-msgstr "Ingnorado"
+msgstr "Ignorar %s"
 
-#: src/gui/userpalette.cpp:113
+#: src/gui/userpalette.cpp:115
 #, fuzzy
 msgid "Erased Names"
-msgstr "Nombres de los MJs"
+msgstr "Nombres De Los GMs"
 
-#: src/gui/userpalette.cpp:114
+#: src/gui/userpalette.cpp:116
 msgid "Other Players' Names"
 msgstr "Nombres de otros jugadores"
 
-#: src/gui/userpalette.cpp:115
+#: src/gui/userpalette.cpp:117
 msgid "Own Name"
-msgstr "Nombre propio"
+msgstr "Propio Nombre"
 
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:118
 msgid "GM Names"
-msgstr "Nombres de los MJs"
+msgstr "Nombres De Los GMs"
 
-#: src/gui/userpalette.cpp:117
+#: src/gui/userpalette.cpp:119
 msgid "NPCs"
-msgstr "PNJs"
+msgstr "NPCs"
 
-#: src/gui/userpalette.cpp:118
+#: src/gui/userpalette.cpp:120
 msgid "Monsters"
 msgstr "Monstruos"
 
-#: src/gui/userpalette.cpp:119
+#: src/gui/userpalette.cpp:121
 #, fuzzy
 msgid "Monster HP bar"
-msgstr "Monstruo golpea a jugador"
+msgstr "Cuando un monstruo te ataca"
 
-#: src/gui/userpalette.cpp:121
+#: src/gui/userpalette.cpp:123
 msgid "Monster HP bar (second color)"
 msgstr ""
 
-#: src/gui/userpalette.cpp:122
-#, fuzzy
+#: src/gui/userpalette.cpp:124
 msgid "Party Members"
-msgstr "Grupo"
+msgstr "Miembros del grupo"
 
-#: src/gui/userpalette.cpp:123
-#, fuzzy
+#: src/gui/userpalette.cpp:125
 msgid "Guild Members"
-msgstr "Clan"
+msgstr "Miembros del guild"
 
-#: src/gui/userpalette.cpp:124
+#: src/gui/userpalette.cpp:126
 msgid "Particle Effects"
-msgstr "Efectos de Partículas"
+msgstr "Efectos Particulares"
 
-#: src/gui/userpalette.cpp:125
+#: src/gui/userpalette.cpp:127
 msgid "Pickup Notification"
-msgstr "Aviso de recogida"
+msgstr "Aviso al cojer un objeto"
 
-#: src/gui/userpalette.cpp:126
+#: src/gui/userpalette.cpp:128
 msgid "Exp Notification"
-msgstr "Aviso de Exp"
+msgstr "Aviso de experiencia"
 
-#: src/gui/userpalette.cpp:127
+#: src/gui/userpalette.cpp:129
 #, fuzzy
-msgid "Player Hits Monster"
-msgstr "Jugador golpea al monstruo"
+msgid "Player HP bar"
+msgstr "Jugador"
 
-#: src/gui/userpalette.cpp:128
+#: src/gui/userpalette.cpp:131
+msgid "Player HP bar (second color)"
+msgstr ""
+
+#: src/gui/userpalette.cpp:132
 #, fuzzy
+msgid "Player Hits Monster"
+msgstr "Cuando atacan a otros montruos"
+
+#: src/gui/userpalette.cpp:133
 msgid "Monster Hits Player"
-msgstr "Monstruo golpea a jugador"
+msgstr "Cuando un monstruo te ataca"
 
-#: src/gui/userpalette.cpp:130
+#: src/gui/userpalette.cpp:135
 #, fuzzy
 msgid "Other Player Hits Local Player"
-msgstr "Nombres de otros jugadores"
+msgstr "Cuando atacan a otros montruos"
 
-#: src/gui/userpalette.cpp:131
+#: src/gui/userpalette.cpp:136
 msgid "Critical Hit"
 msgstr "Golpe Critico"
 
-#: src/gui/userpalette.cpp:133
-#, fuzzy
+#: src/gui/userpalette.cpp:138
 msgid "Local Player Hits Monster"
-msgstr "Jugador golpea al monstruo"
+msgstr "Cuando le atacas al monstruo"
 
-#: src/gui/userpalette.cpp:135
-#, fuzzy
+#: src/gui/userpalette.cpp:140
 msgid "Local Player Critical Hit"
-msgstr "Jugador golpea al monstruo"
+msgstr "Golpe Critico del jugador"
 
-#: src/gui/userpalette.cpp:137
-#, fuzzy
+#: src/gui/userpalette.cpp:142
 msgid "Local Player Miss"
-msgstr "guardar lista de jugdores"
+msgstr "Cuando fallas un ataque"
 
-#: src/gui/userpalette.cpp:138
+#: src/gui/userpalette.cpp:143
 msgid "Misses"
-msgstr "Fallos"
+msgstr "Muchos fallos al atacar"
 
-#: src/gui/userpalette.cpp:139
+#: src/gui/userpalette.cpp:144
 #, fuzzy
 msgid "Portal Highlight"
-msgstr "Resaltar pestaña"
+msgstr "Opacidad de una tabla"
 
-#: src/gui/userpalette.cpp:141
+#: src/gui/userpalette.cpp:146
 #, fuzzy
 msgid "Collision Highlight"
-msgstr "Resaltar"
+msgstr "Opacidad"
 
-#: src/gui/userpalette.cpp:143
+#: src/gui/userpalette.cpp:148
 #, fuzzy
 msgid "Walkable Highlight"
-msgstr "Resaltar pestaña"
+msgstr "Opacidad de una tabla"
 
-#: src/gui/userpalette.cpp:145
+#: src/gui/userpalette.cpp:150
+#, fuzzy
 msgid "Local Player Attack Range"
-msgstr ""
+msgstr "Cuando le atacas al monstruo"
 
-#: src/gui/userpalette.cpp:147
+#: src/gui/userpalette.cpp:152
+#, fuzzy
 msgid "Local Player Attack Range Border"
-msgstr ""
+msgstr "Cuando le atacas al monstruo"
 
-#: src/gui/userpalette.cpp:149
+#: src/gui/userpalette.cpp:154
 #, fuzzy
 msgid "Monster Attack Range"
-msgstr "Monstruo golpea a jugador"
+msgstr "Cuando un monstruo te ataca"
 
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:156
 msgid "Home Place"
 msgstr ""
 
-#: src/gui/userpalette.cpp:153
+#: src/gui/userpalette.cpp:158
 msgid "Home Place Border"
 msgstr ""
 
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:160
 msgid "Road Point"
 msgstr ""
 
@@ -3236,109 +3179,113 @@ 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"
+msgstr "/users > Listas de usuarios en el canal"
 
 #: src/gui/widgets/channeltab.cpp:50
 msgid "/topic > Set the topic of the current channel"
-msgstr "/topic > elegir el tema deste canal"
+msgstr "/topic > Poner un tema en el canal"
 
 #: src/gui/widgets/channeltab.cpp:51
 msgid "/quit > Leave a channel"
-msgstr "/quit > abandonar el canal"
+msgstr "/quit > Salir del canal"
 
 #: src/gui/widgets/channeltab.cpp:52
 msgid "/op > Make a user a channel operator"
-msgstr "/op > convertir a un usuario en operador de canal"
+msgstr "/op > Hacer a un usuario operador del canal"
 
 #: src/gui/widgets/channeltab.cpp:53
 msgid "/kick > Kick a user from the channel"
-msgstr "/kick > expulsar usuario del canal"
+msgstr "/kick > Expulsar un usuario del canal"
 
 #: src/gui/widgets/channeltab.cpp:63
 msgid "Command: /users"
-msgstr "orden: /users"
+msgstr "Comando: /users"
 
 #: src/gui/widgets/channeltab.cpp:64
 msgid "This command shows the users in this channel."
-msgstr "muestra los usuarios en este canal"
+msgstr "Mostrar los usuarios en este canal."
 
 #: src/gui/widgets/channeltab.cpp:68
 msgid "Command: /topic <message>"
-msgstr "Command: /topic <mensaje>"
+msgstr "Comando: /topic <mensaje>"
 
 #: src/gui/widgets/channeltab.cpp:69
 msgid "This command sets the topic to <message>."
-msgstr "hace que el tema sea <mensaje>"
+msgstr "Este comando establece el tema a <mensaje> ."
 
 #: src/gui/widgets/channeltab.cpp:73
 msgid "Command: /quit"
-msgstr "orden: /quit"
+msgstr "Comando: /quit"
 
 #: src/gui/widgets/channeltab.cpp:74
 msgid "This command leaves the current channel."
-msgstr "te saca del canal actual"
+msgstr "Salir del canal."
 
 #: src/gui/widgets/channeltab.cpp:75
 msgid "If you're the last person in the channel, it will be deleted."
-msgstr "si eres la ultima persona de un canal sera eliminado"
+msgstr "Si eres la última persona de este canal , será eliminado."
 
 #: src/gui/widgets/channeltab.cpp:80
 msgid "Command: /op <nick>"
-msgstr "orden: /op <nick>"
+msgstr "Comando: /op <nick>"
 
 #: src/gui/widgets/channeltab.cpp:81
 msgid "This command makes <nick> a channel operator."
-msgstr "hace a <apodo> operador de canal"
+msgstr "Hacer al jugador <nick> operador del canal."
 
 #: src/gui/widgets/channeltab.cpp:84
 msgid "Channel operators can kick and op other users from the channel."
 msgstr ""
-"los operadores de canal pueden expulsar a otros usuarios y/o convertirlos en "
-"op. de canal"
+"Los operadores pueden expulsar y hace operadores a otros jugadores en el "
+"canal."
 
 #: src/gui/widgets/channeltab.cpp:89
 msgid "Command: /kick <nick>"
-msgstr "orden:/kick <apodo>"
+msgstr "Comando: /kick <nick>"
 
 #: src/gui/widgets/channeltab.cpp:90
 msgid "This command makes <nick> leave the channel."
-msgstr "esta orden expulsa a <apodo> del canal"
+msgstr "Expulsar <nick> del canal."
 
 #: src/gui/widgets/channeltab.cpp:119
 msgid "Need a user to op!"
-msgstr "necesitas a un usuario para op"
+msgstr "Se necesita un usuario para ser operador!"
 
 #: src/gui/widgets/channeltab.cpp:126
 msgid "Need a user to kick!"
-msgstr "hace falta un usuario para echarle"
+msgstr "Se necesita un usuario a expulsar!"
 
 #: src/gui/widgets/chattab.cpp:145
 msgid "Global announcement:"
-msgstr "Anuncio Global"
+msgstr "Anuncio global:"
 
 #: src/gui/widgets/chattab.cpp:151
 #, c-format
 msgid "Global announcement from %s:"
-msgstr "Anuncio global de %s"
+msgstr "Anuncio global de  %s:"
 
 #: src/gui/widgets/chattab.cpp:177
-#, fuzzy, c-format
+#, c-format
 msgid "%s whispers: %s"
-msgstr "%s susurra: "
+msgstr "%s envía mensaje privado: %s"
 
 #: src/gui/widgets/whispertab.cpp:104
 msgid "/ignore > Ignore the other player"
-msgstr ""
+msgstr "/ignore > Ignora al jugador"
 
 #: src/gui/widgets/whispertab.cpp:105
 msgid "/unignore > Stop ignoring the other player"
-msgstr ""
+msgstr "/unignore > Parar de ignorar al jugador"
 
 #: src/gui/widgets/whispertab.cpp:106
 msgid "/close > Close the whisper tab"
-msgstr "/close > Cierra la pestaña de susurros"
+msgstr "/close > Cierra la pestaña de mensajes"
 
 #: src/gui/widgets/whispertab.cpp:116
 msgid "Command: /close"
@@ -3346,33 +3293,29 @@ msgstr "Comando: /close"
 
 #: src/gui/widgets/whispertab.cpp:117
 msgid "This command closes the current whisper tab."
-msgstr "cierra la pestaña actual"
+msgstr "Este comando cierra la pestaña de mensajes actual"
 
 #: src/gui/widgets/whispertab.cpp:121
-#, fuzzy
 msgid "Command: /ignore"
-msgstr "Comando: /item"
+msgstr "Comando: /ignore"
 
 #: src/gui/widgets/whispertab.cpp:122
-#, fuzzy
 msgid "This command ignores the other player regardless of current relations."
 msgstr ""
-"Este comando muestra el número de jugadores que actualmente están conectados."
+"Este comando ignora a otro jugador independientemente de la relación actual "
+"con él."
 
 #: src/gui/widgets/whispertab.cpp:128
-#, fuzzy
 msgid "This command stops ignoring the other player if they are being ignored."
-msgstr ""
-"Este comando graba el registro del chat en el archivo <nombre de archivo>."
+msgstr "Este comando para de ignorar al jugador si había sido ignorado."
 
 #: src/gui/windowmenu.cpp:61
 msgid "BC"
 msgstr ""
 
 #: src/gui/windowmenu.cpp:61
-#, fuzzy
 msgid "Bot checker"
-msgstr "ventana del chat"
+msgstr ""
 
 #: src/gui/windowmenu.cpp:63
 msgid "ONL"
@@ -3389,7 +3332,7 @@ msgstr ""
 #: src/gui/windowmenu.cpp:67
 #, fuzzy
 msgid "Smiles"
-msgstr "emoticono"
+msgstr "Emoticono"
 
 #: src/gui/windowmenu.cpp:69
 msgid "STA"
@@ -3397,7 +3340,7 @@ msgstr ""
 
 #: src/gui/windowmenu.cpp:69
 msgid "Status"
-msgstr "Estado"
+msgstr "Status"
 
 #: src/gui/windowmenu.cpp:70
 msgid "EQU"
@@ -3426,7 +3369,7 @@ msgstr ""
 #: src/gui/windowmenu.cpp:88
 #, fuzzy
 msgid "Shortcuts"
-msgstr "Atajos"
+msgstr "Atajo"
 
 #: src/gui/windowmenu.cpp:90
 msgid "SP"
@@ -3441,44 +3384,41 @@ msgid "SET"
 msgstr ""
 
 #: src/gui/worldselectdialog.cpp:74
-#, fuzzy
 msgid "Select World"
-msgstr "seleccionar OK"
+msgstr "Seleccionar Mundo"
 
 #: src/gui/worldselectdialog.cpp:79
-#, fuzzy
 msgid "Change Login"
-msgstr "Modificar"
+msgstr "Cambiar de Login"
 
 #: src/gui/worldselectdialog.cpp:80
-#, fuzzy
 msgid "Choose World"
-msgstr "elige tu servidor"
+msgstr "Escojer Mundo"
 
 #: src/keyboardconfig.cpp:41
 msgid "Move Up"
-msgstr "mover arriba"
+msgstr "Mover para arriba"
 
 #: src/keyboardconfig.cpp:42
 msgid "Move Down"
-msgstr "mover abajo"
+msgstr "Mover para abajo"
 
 #: src/keyboardconfig.cpp:43
 msgid "Move Left"
-msgstr "mover a la izquierda"
+msgstr "Izquierda"
 
 #: src/keyboardconfig.cpp:44
 msgid "Move Right"
-msgstr "mover a la derecha"
+msgstr "Derecha"
 
 #: src/keyboardconfig.cpp:46
 msgid "Target & Attack"
-msgstr "objetivo y ataque"
+msgstr "Seleccionar & Atacar"
 
 #: src/keyboardconfig.cpp:48
 #, fuzzy
 msgid "Move to Target"
-msgstr "mover a la izquierda"
+msgstr "Izquierda"
 
 #: src/keyboardconfig.cpp:50
 msgid "Change Move to Target type"
@@ -3498,28 +3438,28 @@ msgstr ""
 
 #: src/keyboardconfig.cpp:58
 msgid "Smilie"
-msgstr "emoticono"
+msgstr "Emoticono"
 
 #: src/keyboardconfig.cpp:60
 msgid "Stop Attack"
-msgstr "dejar de atacar"
+msgstr "Parar el ataque"
 
 #: src/keyboardconfig.cpp:61
 #, fuzzy
 msgid "Target Closest"
-msgstr "objetivo cercano"
+msgstr "Seleccionar Monstruo"
 
 #: src/keyboardconfig.cpp:63
 msgid "Target NPC"
-msgstr "objetivo PNJ"
+msgstr "Seleccionar NPC"
 
 #: src/keyboardconfig.cpp:64
 msgid "Target Player"
-msgstr "objetivo jugador"
+msgstr "Seleccionar Jugador"
 
 #: src/keyboardconfig.cpp:66
 msgid "Pickup"
-msgstr "recoger"
+msgstr "Coger"
 
 #: src/keyboardconfig.cpp:67
 msgid "Change Pickup Type"
@@ -3527,29 +3467,29 @@ msgstr ""
 
 #: src/keyboardconfig.cpp:69
 msgid "Hide Windows"
-msgstr "ocultar ventanas"
+msgstr "Esconder ventanas"
 
 #: src/keyboardconfig.cpp:70
 msgid "Sit"
-msgstr "sentarse"
+msgstr "Sentarse"
 
 #: src/keyboardconfig.cpp:71
 msgid "Screenshot"
-msgstr "foto de pantalla"
+msgstr "Imprimir pantalla"
 
 #: src/keyboardconfig.cpp:72
 msgid "Enable/Disable Trading"
-msgstr "admitir /bloquear intercambios"
+msgstr "Habilitar/Desabilitar intercambios"
 
 #: src/keyboardconfig.cpp:74
 #, fuzzy
 msgid "Change Map View Mode"
-msgstr "Cambiar dirección de correo electrónico"
+msgstr "Cambiar contraseña"
 
 #: src/keyboardconfig.cpp:76
 #, fuzzy
 msgid "Item Shortcuts Key"
-msgstr "atajo al objeto %d"
+msgstr "Atajo para el objeto %d"
 
 #: src/keyboardconfig.cpp:78 src/keyboardconfig.cpp:80
 #: src/keyboardconfig.cpp:82 src/keyboardconfig.cpp:84
@@ -3563,86 +3503,84 @@ msgstr "atajo al objeto %d"
 #: src/keyboardconfig.cpp:115 src/keyboardconfig.cpp:117
 #, c-format
 msgid "Item Shortcut %d"
-msgstr "atajo al objeto %d"
+msgstr "Atajo para el objeto %d"
 
 #: src/keyboardconfig.cpp:118
 msgid "Help Window"
-msgstr "ventana de ayuda"
+msgstr "Ventana de ayuda"
 
 #: src/keyboardconfig.cpp:119
 msgid "Status Window"
-msgstr "ventana de estado"
+msgstr "Ventana de status"
 
 #: src/keyboardconfig.cpp:121
 msgid "Inventory Window"
-msgstr "ventana del inventorio"
+msgstr "Ventana de inventario"
 
 #: src/keyboardconfig.cpp:123
 msgid "Equipment Window"
-msgstr "Ventana de equipamiento"
+msgstr "Ventana de equipamento"
 
 #: src/keyboardconfig.cpp:125
 msgid "Skill Window"
-msgstr "ventana de habilidades"
+msgstr "Ventana de habilidades"
 
 #: src/keyboardconfig.cpp:127
 msgid "Minimap Window"
-msgstr "ventana del minimapa"
+msgstr "Ventana del minimapa"
 
 #: src/keyboardconfig.cpp:129
 msgid "Chat Window"
-msgstr "ventana del chat"
+msgstr "Ventana de Chat"
 
 #: src/keyboardconfig.cpp:130
 msgid "Item Shortcut Window"
-msgstr "ventana de atajos a objetos"
+msgstr "Ventana de atajos para objetos"
 
 #: src/keyboardconfig.cpp:132
 msgid "Setup Window"
-msgstr "ventana de configuracion"
+msgstr "Ventana de Configuración"
 
 #: src/keyboardconfig.cpp:134
 msgid "Debug Window"
-msgstr "ventana de depuracion"
+msgstr "Ventana de Problemas"
 
 #: src/keyboardconfig.cpp:136
-#, fuzzy
 msgid "Social Window"
-msgstr "ventana de habilidades"
+msgstr "Ventana Social"
 
 #: src/keyboardconfig.cpp:138
 msgid "Emote Shortcut Window"
-msgstr "ventana de atajos a emoticones"
+msgstr "Ventana de Emoticonos"
 
 #: src/keyboardconfig.cpp:140
-#, fuzzy
 msgid "Outfits Window"
-msgstr "ventana de estado"
+msgstr "Ventana de Conjuntos"
 
 #: src/keyboardconfig.cpp:142
 #, fuzzy
 msgid "Shop Window"
-msgstr "ventana de configuracion"
+msgstr "Ventana de Configuración"
 
 #: src/keyboardconfig.cpp:143
 #, fuzzy
 msgid "Quick drop Window"
-msgstr "ocultar ventanas"
+msgstr "Ventana de Configuración"
 
 #: src/keyboardconfig.cpp:145
 #, fuzzy
 msgid "Kills Stats Window"
-msgstr "ventana de estado"
+msgstr "Ventana de status"
 
 #: src/keyboardconfig.cpp:147
 #, fuzzy
 msgid "Commands Window"
-msgstr "Comando: /item"
+msgstr "Comando: /ignore"
 
 #: src/keyboardconfig.cpp:149
 #, fuzzy
 msgid "Bot Checker Window"
-msgstr "ventana del chat"
+msgstr "Ventana de Chat"
 
 #: src/keyboardconfig.cpp:152
 msgid "Who Is Online Window"
@@ -3651,12 +3589,12 @@ msgstr ""
 #: src/keyboardconfig.cpp:154
 #, fuzzy
 msgid "Previous Social Tab"
-msgstr "chat anterior"
+msgstr "Pestaña de Chat Anterior"
 
 #: src/keyboardconfig.cpp:155
 #, fuzzy
 msgid "Next Social Tab"
-msgstr "chat siguiente"
+msgstr "Siguiente Pestaña De Chat"
 
 #: src/keyboardconfig.cpp:157 src/keyboardconfig.cpp:159
 #: src/keyboardconfig.cpp:161 src/keyboardconfig.cpp:163
@@ -3679,179 +3617,183 @@ 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"
+msgstr "Atajo para Emoticono %d"
 
-#: src/keyboardconfig.cpp:246
+#: src/keyboardconfig.cpp:250
 msgid "Wear Outfit"
-msgstr ""
+msgstr "Ponerse el conjunto"
 
-#: src/keyboardconfig.cpp:248
+#: src/keyboardconfig.cpp:252
 msgid "Copy Outfit"
-msgstr ""
+msgstr "Copiar el conjunto"
 
-#: src/keyboardconfig.cpp:250
+#: src/keyboardconfig.cpp:254
+#, fuzzy
 msgid "Copy Equiped to Outfit"
-msgstr ""
+msgstr "Copiar el conjunto"
 
-#: src/keyboardconfig.cpp:252
+#: src/keyboardconfig.cpp:256
 msgid "Toggle Chat"
-msgstr "cambiar chat"
+msgstr "Cambiar de Chat"
 
-#: src/keyboardconfig.cpp:254
+#: src/keyboardconfig.cpp:258
 msgid "Scroll Chat Up"
-msgstr "chat arriba"
+msgstr "Tirar el chat para arriba"
 
-#: src/keyboardconfig.cpp:256
+#: src/keyboardconfig.cpp:260
 msgid "Scroll Chat Down"
-msgstr "chat abajo"
+msgstr "Tirar el chat para abajo"
 
-#: src/keyboardconfig.cpp:258
+#: src/keyboardconfig.cpp:262
 msgid "Previous Chat Tab"
-msgstr "chat anterior"
+msgstr "Pestaña de Chat Anterior"
 
-#: src/keyboardconfig.cpp:260
+#: src/keyboardconfig.cpp:264
 msgid "Next Chat Tab"
-msgstr "chat siguiente"
+msgstr "Siguiente Pestaña De Chat"
 
-#: src/keyboardconfig.cpp:262
+#: src/keyboardconfig.cpp:266
 #, fuzzy
 msgid "Previous chat tab line"
-msgstr "chat anterior"
+msgstr "Pestaña de Chat Anterior"
 
-#: src/keyboardconfig.cpp:264
+#: src/keyboardconfig.cpp:268
 #, fuzzy
 msgid "Next chat tab line"
-msgstr "chat siguiente"
+msgstr "Siguiente Pestaña 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"
+msgstr "Seleccionar OK"
 
-#: src/keyboardconfig.cpp:272
+#: src/keyboardconfig.cpp:276
 msgid "Ignore input 1"
-msgstr "ignorar entrada 1"
+msgstr "Ignorar input 1"
 
-#: src/keyboardconfig.cpp:274
+#: src/keyboardconfig.cpp:278
 msgid "Ignore input 2"
-msgstr "ignorar entrada 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 abajo"
+msgstr "Mover para abajo"
 
-#: src/keyboardconfig.cpp:279
+#: src/keyboardconfig.cpp:283
 #, fuzzy
 msgid "Direct Left"
-msgstr "mover a la izquierda"
+msgstr "Izquierda"
 
-#: src/keyboardconfig.cpp:280
+#: src/keyboardconfig.cpp:284
 #, fuzzy
 msgid "Direct Right"
-msgstr "mover a la derecha"
+msgstr "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"
+msgstr "Cambiar de personaje"
 
-#: src/keyboardconfig.cpp:300
+#: src/keyboardconfig.cpp:304
 #, fuzzy
 msgid "Change move type"
-msgstr "Servidor"
+msgstr "Cambiar de 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"
+msgstr "Seleccionar & Atacar"
 
-#: src/keyboardconfig.cpp:306
+#: src/keyboardconfig.cpp:310
 #, fuzzy
 msgid "Change Follow mode"
-msgstr "Cambiar Contraseña"
+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"
+msgstr "Cambiar 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 "admitir /bloquear intercambios"
+msgstr "Habilitar/Desabilitar 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
-#, fuzzy, c-format
+#: src/keyboardconfig.cpp:384
+#, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
-msgstr "resuelvelo , o el juego puede comportarse de manera extraña"
+msgstr ""
+"Conflito con las teclas \"%s\" e \"%s\" . Resuelva el conflicto, o el juego "
+"puede presentar un comportamiento raro."
 
 #: src/localplayer.cpp:325
 msgid "You were killed by "
@@ -3859,29 +3801,30 @@ msgstr ""
 
 #: src/localplayer.cpp:1305
 msgid "Unable to pick up item."
-msgstr "Imposible tomar objeto."
+msgstr "Imposible coger el objeto."
 
 #. TRANSLATORS: This sentence may be translated differently
 #. for different grammatical numbers (singular, plural, ...)
 #: src/localplayer.cpp:1315
-#, fuzzy, c-format
+#, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
-msgstr[0] "Ha recogido un(a) %s [@@%d|%s@@]."
-msgstr[1] "Ha recogido un(a) %s [@@%d|%s@@]."
+msgstr[0] "Usted cogió un/a %d [@@%d|%s@@]."
+msgstr[1] "Usted Cogió %d [@@%d|%s@@]."
 
 #: src/localplayer.cpp:2979
 msgid "Away"
-msgstr ""
+msgstr "Fuera del Teclado"
 
 #: src/localplayer.cpp:3617
 #, fuzzy
 msgid "You see "
-msgstr "tu recibes %s"
+msgstr "Tú recibes %s"
 
 #: src/main.cpp:44
+#, fuzzy
 msgid "manaplus [options] [mana-file]"
-msgstr ""
+msgstr "mana  [opciones] [archivo-mana]"
 
 #: src/main.cpp:45
 msgid "[mana-file] : The mana file is an XML file (.mana)"
@@ -3902,91 +3845,76 @@ msgstr "Opciones:"
 #: src/main.cpp:50
 #, fuzzy
 msgid "  -l --log-file       : Log file to use"
-msgstr "  -C --config-file : archivo de configuracion a usar"
+msgstr "  -C --config-dir     : Carpeta de Configuración a usar"
 
 #: src/main.cpp:51
 #, fuzzy
 msgid "  -L --chat-log-dir   : Chat log dir to use"
-msgstr "  -C --config-file : archivo de configuracion a usar"
+msgstr "  -C --config-dir     : Carpeta de Configuración a usar"
 
 #: src/main.cpp:52
-#, fuzzy
 msgid "  -v --version        : Display the version"
-msgstr "  -v --version : muestra la version"
+msgstr "  -v --version        :  Muestra la versión"
 
 #: src/main.cpp:53
-#, fuzzy
 msgid "  -h --help           : Display this help"
-msgstr "  -h --help : muestra esta ayuda"
+msgstr "  -h --help           : Muestra la ayuda"
 
 #: src/main.cpp:54
-#, fuzzy
 msgid "  -C --config-dir     : Configuration directory to use"
-msgstr "  -C --config-file : archivo de configuracion a usar"
+msgstr "  -C --config-dir     : Carpeta de Configuración a usar"
 
 #: src/main.cpp:55
-#, fuzzy
 msgid "  -U --username       : Login with this username"
-msgstr "  -U --username : conectarse con este nombre se usuario"
+msgstr "  -U --username       : Acceder con este nombre de usuario"
 
 #: src/main.cpp:56
-#, fuzzy
 msgid "  -P --password       : Login with this password"
-msgstr "  -P --password : entrar con esta contraseña"
+msgstr "  -P --password       : Acceder con la contraseña"
 
 #: src/main.cpp:57
-#, fuzzy
 msgid "  -c --character      : Login with this character"
-msgstr "  -c --character : conectarse con este personaje"
+msgstr "  -c --character      : Acceder con este jugador"
 
 #: src/main.cpp:58
-#, fuzzy
 msgid "  -s --server         : Login server name or IP"
-msgstr "  -s --server : nombre o IP del servidor de conexion"
+msgstr "  -s --server         :  Login server o IP"
 
 #: src/main.cpp:59
-#, fuzzy
 msgid "  -p --port           : Login server port"
-msgstr "  -p --port : Puerto del Servidor de conexion"
+msgstr "  -p --port           : Puerto del servidor"
 
 #: src/main.cpp:60
-#, fuzzy
 msgid "     --update-host    : Use this update host"
-msgstr "  -H --update-host : Usar este servidor de actualizaciones"
+msgstr "     --update-host    : Usar este host de actualización"
 
 #: src/main.cpp:61
-#, fuzzy
 msgid "  -D --default        : Choose default character server and character"
-msgstr "  -D --default : elige un servidor y personaje por defecto"
+msgstr "  -D --default        : Escoje el personaje por defecto y el servidor"
 
 #: src/main.cpp:63
-#, fuzzy
 msgid "  -u --skip-update    : Skip the update downloads"
-msgstr "  -u --skip-update : saltarse bajar las actualizaciones"
+msgstr "  -u --skip-update    : Saltarse las actualizaciones"
 
 #: src/main.cpp:64
-#, fuzzy
 msgid "  -d --data           : Directory to load game data from"
-msgstr "  -d --data : Directorio para cargar archivos del juego"
+msgstr "  -d --data           : Carpeta por donde cargar los datos del juego"
 
 #: src/main.cpp:66
-#, fuzzy
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
-msgstr "  -S --home-dir : Directorio a usar como directorio raiz"
+msgstr "  -L --localdata-dir  : Carpeta para usar los datos locales"
 
 #: src/main.cpp:68
-#, fuzzy
 msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr "  -S --home-dir : Directorio a usar como directorio raiz"
+msgstr "     --screenshot-dir : Carpeta donde guardar los screenshots"
 
 #: src/main.cpp:69
 msgid "     --safemode       : Start game in safe mode"
 msgstr ""
 
 #: src/main.cpp:71
-#, fuzzy
 msgid "     --no-opengl      : Disable OpenGL for this session"
-msgstr "  -O --no-opengl : des habilitar OpenGl para esta sesion"
+msgstr "     --no-opengl      :  Deshabilita OpenGL en esta sesion"
 
 #: src/net/manaserv/attributes.cpp:159 src/net/tmwa/generalhandler.cpp:247
 msgid "Strength"
@@ -3995,16 +3923,16 @@ msgstr "Fuerza"
 #: src/net/manaserv/attributes.cpp:166
 #, fuzzy, c-format
 msgid "Strength %+.1f"
-msgstr "fuerza %+d"
+msgstr "Fuerza %+d"
 
 #: src/net/manaserv/attributes.cpp:172 src/net/tmwa/generalhandler.cpp:248
 msgid "Agility"
-msgstr "agilidad2"
+msgstr "Agilidad"
 
 #: src/net/manaserv/attributes.cpp:179
 #, fuzzy, c-format
 msgid "Agility %+.1f"
-msgstr "agilidad %+d"
+msgstr "Agilidad %+d"
 
 #: src/net/manaserv/attributes.cpp:185 src/net/tmwa/generalhandler.cpp:251
 msgid "Dexterity"
@@ -4017,78 +3945,77 @@ msgstr "Destreza %+d"
 
 #: src/net/manaserv/attributes.cpp:198 src/net/tmwa/generalhandler.cpp:249
 msgid "Vitality"
-msgstr "vitalidad"
+msgstr "Vitalidad"
 
 #: src/net/manaserv/attributes.cpp:205
 #, fuzzy, c-format
 msgid "Vitality %+.1f"
-msgstr "vitalidad %+d"
+msgstr "Vitalidad %+d"
 
 #: src/net/manaserv/attributes.cpp:211 src/net/tmwa/generalhandler.cpp:250
 msgid "Intelligence"
-msgstr "inteligencia"
+msgstr "Inteligencia"
 
 #: src/net/manaserv/attributes.cpp:218
 #, fuzzy, c-format
 msgid "Intelligence %+.1f"
-msgstr "inteligencia %+d"
+msgstr "Inteligencia %+d"
 
 #: src/net/manaserv/attributes.cpp:224
-#, fuzzy
 msgid "Willpower"
-msgstr "Fuerza de voluntad:"
+msgstr "Fuerza de voluntad"
 
 #: src/net/manaserv/attributes.cpp:231
 #, fuzzy, c-format
 msgid "Willpower %+.1f"
-msgstr "Fuerza de voluntad: %+d"
+msgstr "Fuerza de voluntad %+d"
 
 #: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:104
 msgid "You are dead."
-msgstr "Estás muerto."
+msgstr "Estás muerto"
 
 #: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:105
 msgid "We regret to inform you that your character was killed in battle."
-msgstr "Sentimos informarte de que tu personaje ha muerto en batalla."
+msgstr "Lamentamos informarte de que tu personaje fue aniquilado en combate."
 
 #: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:107
 msgid "You are not that alive anymore."
-msgstr "Te quedaste sin vida."
+msgstr "Ya no estás tan vivo..."
 
 #: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:108
 msgid "The cold hands of the grim reaper are grabbing for your soul."
-msgstr "Las manos heladas de la muerte se llevaron tu alma."
+msgstr "Las frías manos de la muerte se llevaron tu alma su reino."
 
 #: src/net/manaserv/beinghandler.cpp:319 src/net/tmwa/playerhandler.cpp:109
 msgid "Game Over!"
-msgstr "¡Fin del juego!"
+msgstr "Fin Del Juego!"
 
 #: src/net/manaserv/beinghandler.cpp:320 src/net/tmwa/playerhandler.cpp:111
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr ""
-"No, niños. Tu personaje no murió realmente. Él... eeh... se marchó a un "
-"lugar mejor."
+"No, niños. Tu jugador no murió realmente. Solo... eeeh... fue a un lugar "
+"mejor ."
 
 #: src/net/manaserv/beinghandler.cpp:322 src/net/tmwa/playerhandler.cpp:113
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
-"Falló tu plan de romper el arma de tus enemigos golpeándola con tu garganta."
+"Parece que tu plan de romper las armas de tus enemigos con tu garganta falló!"
 
 #: src/net/manaserv/beinghandler.cpp:324 src/net/tmwa/playerhandler.cpp:115
 msgid "I guess this did not run too well."
-msgstr "Creo que esto no funcionó muy bien."
+msgstr "Creo que esto no fue muy bien."
 
 #: src/net/manaserv/beinghandler.cpp:325 src/net/tmwa/playerhandler.cpp:117
 msgid "Do you want your possessions identified?"
-msgstr "¿Quieres que tus posesiones sean identificadas?"
+msgstr "Deseas que tus posesiones sean identificadas?"
 
 #: src/net/manaserv/beinghandler.cpp:326 src/net/tmwa/playerhandler.cpp:119
 msgid "Sadly, no trace of you was ever found..."
-msgstr "Lamentablemente, ningún rastro tuyo fue encontrado nunca."
+msgstr "Desgraciadamente, nada de ti fue encontrado..."
 
 #: src/net/manaserv/beinghandler.cpp:328 src/net/tmwa/playerhandler.cpp:121
 msgid "Annihilated."
@@ -4096,309 +4023,287 @@ msgstr "Aniquilado."
 
 #: src/net/manaserv/beinghandler.cpp:329 src/net/tmwa/playerhandler.cpp:123
 msgid "Looks like you got your head handed to you."
-msgstr "Parce que te volaron la cabeza."
+msgstr "Parece que te tiraron tu cabeza a tus manos."
 
 #: src/net/manaserv/beinghandler.cpp:331 src/net/tmwa/playerhandler.cpp:125
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
-msgstr ""
-"Ya la has cagado otra vez, pon en tierra ese cuerpo por ahi en los tuneles y "
-"cogete otro."
+msgstr "Parece que te asustaste , revive en otro cuerpo y sigue tu aventura ."
 
 #: src/net/manaserv/beinghandler.cpp:336
-#, fuzzy
 msgid "Press OK to respawn."
-msgstr " Pulsa OK para volver a la vida"
+msgstr "Pulsa OK para reaparecer."
 
 #: src/net/manaserv/beinghandler.cpp:337
-#, fuzzy
 msgid "You Died"
 msgstr "Has muerto"
 
-#: src/net/manaserv/charhandler.cpp:144 src/net/manaserv/charhandler.cpp:215
-#, fuzzy
+#: src/net/manaserv/charhandler.cpp:144 src/net/manaserv/charhandler.cpp:218
 msgid "Not logged in."
-msgstr "Ya estas conectado"
+msgstr "No estás conectado."
 
 #: src/net/manaserv/charhandler.cpp:147
 msgid "No empty slot."
-msgstr ""
+msgstr "Sin espacios"
 
 #: src/net/manaserv/charhandler.cpp:150
 msgid "Invalid name."
-msgstr ""
+msgstr "Nombre no válido."
 
 #: src/net/manaserv/charhandler.cpp:153
-#, fuzzy
 msgid "Character's name already exists."
-msgstr "El nombre de usuario ya existe"
+msgstr "Nombre del jugador ya existe."
 
 #: src/net/manaserv/charhandler.cpp:156
 msgid "Invalid hairstyle."
-msgstr ""
+msgstr "Estilo de pelo no válido."
 
 #: src/net/manaserv/charhandler.cpp:159
 msgid "Invalid hair color."
-msgstr ""
+msgstr "Color del pelo no válido."
 
 #: src/net/manaserv/charhandler.cpp:162
 msgid "Invalid gender."
-msgstr ""
+msgstr "Género no válido."
 
 #: src/net/manaserv/charhandler.cpp:165
-#, fuzzy
 msgid "Character's stats are too high."
-msgstr "Estadisticas del personaje OK"
+msgstr "Atributos del personaje son muy altos."
 
 #: src/net/manaserv/charhandler.cpp:168
-#, fuzzy
 msgid "Character's stats are too low."
-msgstr "Estadisticas del personaje OK"
+msgstr "Atributos del personaje son muy bajos."
 
 #: src/net/manaserv/charhandler.cpp:171
 #, c-format
 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 "Nombre no válido."
+
+#: src/net/manaserv/charhandler.cpp:180 src/net/manaserv/loginhandler.cpp:98
 #: src/net/manaserv/loginhandler.cpp:130 src/net/manaserv/loginhandler.cpp:166
 #: src/net/manaserv/loginhandler.cpp:286 src/net/manaserv/loginhandler.cpp:323
 #: src/net/tmwa/loginhandler.cpp:99 src/net/tmwa/loginhandler.cpp:187
-#, fuzzy
 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"
+msgstr "Información"
 
-#: src/net/manaserv/charhandler.cpp:206
-#, fuzzy
+#: src/net/manaserv/charhandler.cpp:209
 msgid "Player deleted."
-msgstr "personaje borrado"
+msgstr "Personaje eliminado."
 
-#: src/net/manaserv/charhandler.cpp:218
-#, fuzzy
+#: src/net/manaserv/charhandler.cpp:221
 msgid "Selection out of range."
-msgstr "Seleccione cantidad de objetos para comerciar."
+msgstr "Seleccion fuera de rango."
 
-#: src/net/manaserv/charhandler.cpp:221
-#, fuzzy, c-format
+#: src/net/manaserv/charhandler.cpp:224
+#, c-format
 msgid "Unknown error (%d)."
-msgstr "Error desconocido."
+msgstr "Error desconocido (%d)."
 
-#: src/net/manaserv/charhandler.cpp:257
+#: src/net/manaserv/charhandler.cpp:260
 msgid "No gameservers are available."
-msgstr "No hay servidores de juego disponibles."
+msgstr "No hay servidores disponibles."
 
 #: src/net/manaserv/chathandler.cpp:185 src/net/manaserv/chathandler.cpp:308
 #: src/net/manaserv/guildhandler.cpp:264
 #, c-format
 msgid "Topic: %s"
-msgstr "Tema: %s"
+msgstr "Tópico: %s"
 
 #: src/net/manaserv/chathandler.cpp:190 src/net/manaserv/chathandler.cpp:268
-#, fuzzy
 msgid "Players in this channel:"
-msgstr "Jugador golpea al monstruo"
+msgstr "Jugadores en este canal:"
 
 #: src/net/manaserv/chathandler.cpp:207
-#, fuzzy
 msgid "Error joining channel."
-msgstr "Comando: /join <canal>"
+msgstr "Error al entrar al canal."
 
 #: src/net/manaserv/chathandler.cpp:213
-#, fuzzy
 msgid "Listing channels."
-msgstr "Se te pide reunirte en el channel %s."
+msgstr "Lista de canales."
 
 #: src/net/manaserv/chathandler.cpp:225
 msgid "End of channel list."
-msgstr ""
+msgstr "Fin de la lista de canales."
 
 #: src/net/manaserv/chathandler.cpp:298
-#, fuzzy, c-format
+#, c-format
 msgid "%s entered the channel."
-msgstr "%s se ha unido al grupo."
+msgstr "%s entró al canal."
 
 #: src/net/manaserv/chathandler.cpp:303
 #, c-format
 msgid "%s left the channel."
-msgstr ""
+msgstr "%s dejó el canal."
 
 #: src/net/manaserv/chathandler.cpp:319
 #, c-format
 msgid "%s has set mode %s on user %s."
-msgstr ""
+msgstr "%s colocó en el modo %s al usuario %s."
 
 #: src/net/manaserv/chathandler.cpp:330
 #, c-format
 msgid "%s has kicked %s."
-msgstr ""
+msgstr "%s expulsó a %s."
 
 #: src/net/manaserv/chathandler.cpp:336
-#, fuzzy
 msgid "Unknown channel event."
-msgstr "Comando desconocido."
+msgstr "Evento de canal desconocido."
 
 #: src/net/manaserv/guildhandler.cpp:84 src/net/tmwa/guildhandler.cpp:104
 msgid "Guild created."
-msgstr "Guild créada."
+msgstr "Clan creado."
 
 #: src/net/manaserv/guildhandler.cpp:89
 msgid "Error creating guild."
-msgstr "Eror al crear la guild."
+msgstr "Error al crear el clan."
 
 #: src/net/manaserv/guildhandler.cpp:99
 msgid "Invite sent."
-msgstr "Invitacion enviada."
+msgstr "Invitación enviada."
 
 #: src/net/manaserv/guildhandler.cpp:206
 msgid "Member was promoted successfully."
-msgstr "El miembro ha sido promovido con exito."
+msgstr "Estado del miembro fue cambiado satisfactoriamente."
 
 #: src/net/manaserv/guildhandler.cpp:211
 msgid "Failed to promote member."
-msgstr "Fallo al promover el miembro."
+msgstr "Error al cambiar estado del miembro."
 
 #: src/net/manaserv/loginhandler.cpp:89
-#, fuzzy
 msgid "Wrong magic_token."
-msgstr "Ficha de magia erronea"
+msgstr "Error de Token-mágico ."
 
 #: src/net/manaserv/loginhandler.cpp:92 src/net/manaserv/loginhandler.cpp:276
-#, fuzzy
 msgid "Already logged in."
-msgstr "Ya estas conectado"
+msgstr "El personaje ya está conectado."
 
 #: src/net/manaserv/loginhandler.cpp:95
-#, fuzzy
 msgid "Account banned."
-msgstr "Cuenta expirada."
+msgstr "Cuenta Baneada."
 
 #: src/net/manaserv/loginhandler.cpp:120
-#, fuzzy
 msgid "New password incorrect."
-msgstr "La nueva contraseña es incorrecta"
+msgstr "Nueva contraseña incorrecta."
 
 #: src/net/manaserv/loginhandler.cpp:123 src/net/tmwa/loginhandler.cpp:93
-#, fuzzy
 msgid "Old password incorrect."
-msgstr "La contraseña antigua es incorrecta"
+msgstr "Contrasena antigua incorrecta."
 
 #: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:159
 msgid "Account not connected. Please login first."
-msgstr "Cuenta no conectada. Conectate primero"
+msgstr "Cuenta no conectada. Por favor conéctate primero."
 
 #: src/net/manaserv/loginhandler.cpp:152
-#, fuzzy
 msgid "New email address incorrect."
-msgstr "La nueva dirección de E-mail es incorrecta"
+msgstr "Nuevo e-mail incorrecto."
 
 #: src/net/manaserv/loginhandler.cpp:155
-#, fuzzy
 msgid "Old email address incorrect."
-msgstr "La antigua dirección de E-mail es incorrecta"
+msgstr "E-mail antiguo incorrecto."
 
 #: src/net/manaserv/loginhandler.cpp:163
-#, fuzzy
 msgid "The new email address already exists."
-msgstr "La nueva dirección de E-mail ya existe"
+msgstr "El nuevo e-mail ya existe."
 
 #: src/net/manaserv/loginhandler.cpp:244
 msgid ""
 "Client registration is not allowed. Please contact server administration."
 msgstr ""
+"El registro no está soportado. Por favor contacta un administrador del "
+"server."
 
 #: src/net/manaserv/loginhandler.cpp:270 src/net/manaserv/loginhandler.cpp:307
-#, fuzzy
 msgid "Client version is too old."
-msgstr "La version de tu cliente es demasiado antigua"
+msgstr "La version del cliente es demasiado antigua."
 
 #: src/net/manaserv/loginhandler.cpp:273
-#, fuzzy
 msgid "Wrong username or password."
-msgstr "Nombre de usuario o contraseña incorrectos"
+msgstr "Nombre de usuario o contraseña incorrectos."
 
 #: src/net/manaserv/loginhandler.cpp:279
-#, fuzzy
 msgid "Account banned"
-msgstr "Cuenta expirada."
+msgstr "Cuenta Baneada"
 
 #: src/net/manaserv/loginhandler.cpp:282
 msgid "Login attempt too soon after previous attempt."
-msgstr ""
+msgstr "Intento de conexión muy pronto tras intento previo."
 
 #: src/net/manaserv/loginhandler.cpp:310
-#, fuzzy
 msgid "Wrong username, password or email address."
-msgstr "Nombre de usuario, contraseña o dirección de email incorrectos"
+msgstr "E-mail, nombre de usuario o contraseña incorrectos."
 
 #: src/net/manaserv/loginhandler.cpp:313
-#, fuzzy
 msgid "Username already exists."
-msgstr "El nombre de usuario ya existe"
+msgstr "Usuario ya existe."
 
 #: src/net/manaserv/loginhandler.cpp:316
-#, fuzzy
 msgid "Email address already exists."
-msgstr "La dirección de email ya existe"
+msgstr "El e-mail ya existe."
 
 #: src/net/manaserv/loginhandler.cpp:319
 msgid "You took too long with the captcha or your response was incorrect."
-msgstr ""
+msgstr "Tardaste mucho con el captcha o tu respuesta fue incorrecta."
 
 #: src/net/manaserv/partyhandler.cpp:89
 msgid "Joined party."
-msgstr "Unido al grupo."
+msgstr "Entraste al grupo."
 
 #: src/net/manaserv/partyhandler.cpp:107
 #, c-format
 msgid "%s joined the party."
-msgstr "%s se ha unido al grupo."
+msgstr "%s ha entrado a formar parte del grupo."
 
 #: src/net/manaserv/partyhandler.cpp:125
-#, fuzzy, c-format
+#, c-format
 msgid "%s rejected your invite."
-msgstr "%s rechazó tu invitación."
+msgstr "%s canceló tu invitación."
 
 #: src/net/manaserv/tradehandler.cpp:106
 msgid "Accepting incoming trade requests."
-msgstr "Se aceptan peticiones de intercambio."
+msgstr "Aceptar propuestas de intercambio entrantes."
 
 #: src/net/manaserv/tradehandler.cpp:108
 msgid "Ignoring incoming trade requests."
-msgstr "Se ignoran peticiones de intercambio."
+msgstr "Ignorar las propuestas de intercambio entrantes."
 
 #: src/net/manaserv/tradehandler.cpp:127 src/net/tmwa/tradehandler.cpp:122
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
-msgstr "%s desea realizar un intercambio con usted, acepta?"
+msgstr "%s quiere comerciar contigo, aceptas?"
 
 #: src/net/manaserv/tradehandler.cpp:145
 #, c-format
 msgid "Trading with %s"
-msgstr "Intercambiar con %s"
+msgstr "Intercambiando 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."
+msgstr "Intercambio 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."
+msgstr "Intercambio Realizado."
 
 #: src/net/tmwa/adminhandler.cpp:64
 msgid "Kick failed!"
-msgstr "no se le pudo expulsar"
+msgstr "Error al expulsar!"
 
 #: src/net/tmwa/adminhandler.cpp:66
 msgid "Kick succeeded!"
-msgstr "se le expulso"
+msgstr "Expulsado satisfactoriamente!"
 
 #: src/net/tmwa/buysellhandler.cpp:122
 msgid "Nothing to sell."
-msgstr "Nada para vender."
+msgstr "Nada que vender."
 
 #: src/net/tmwa/buysellhandler.cpp:129
 msgid "Thanks for buying."
@@ -4410,37 +4315,35 @@ msgstr "Imposible comprar."
 
 #: src/net/tmwa/buysellhandler.cpp:143
 msgid "Thanks for selling."
-msgstr "Gravias por vender."
+msgstr "Gracias por vender."
 
 #: src/net/tmwa/buysellhandler.cpp:145
 msgid "Unable to sell."
-msgstr "Impossibile vender."
+msgstr "Imposible vender."
 
 #: src/net/tmwa/charserverhandler.cpp:106
 msgid "Access denied. Most likely, there are too many players on this server."
-msgstr ""
+msgstr "Acesso denegado.Probablemente es que alla muchos jugadores."
 
 #: src/net/tmwa/charserverhandler.cpp:110
-#, fuzzy
 msgid "Cannot use this ID."
-msgstr "no se pude usar esta ID"
+msgstr "Imposible usar esta ID."
 
 #: src/net/tmwa/charserverhandler.cpp:113
-#, fuzzy
 msgid "Unknown char-server failure."
-msgstr "Error desconocido."
+msgstr "Error desconocido del char-server."
 
 #: src/net/tmwa/charserverhandler.cpp:137
 msgid "Failed to create character. Most likely the name is already taken."
-msgstr "no se pudo crear personaje. probablemente el nombre este cogido"
+msgstr "Error al crear personaje. Probablemente ya esté en uso."
 
 #: src/net/tmwa/charserverhandler.cpp:149
 msgid "Character deleted."
-msgstr "Personaje suprimido."
+msgstr "Personaje Borrado."
 
 #: src/net/tmwa/charserverhandler.cpp:154
 msgid "Failed to delete character."
-msgstr "no se pudo borrar personaje"
+msgstr "Fallo al borrar el personaje."
 
 #: src/net/tmwa/charserverhandler.cpp:286
 msgid "Strength:"
@@ -4464,69 +4367,66 @@ msgstr "Destreza:"
 
 #: src/net/tmwa/charserverhandler.cpp:291
 msgid "Luck:"
-msgstr "suerte:"
+msgstr "Suerte:"
 
 #: src/net/tmwa/chathandler.cpp:103
 #, fuzzy, c-format
 msgid "Whisper could not be sent, %s is offline."
-msgstr "El mensaje privado no se pudo enviar, la persona no esta conectada."
+msgstr "Imposible enviar mensaje, usuario desconectado."
 
 #: src/net/tmwa/chathandler.cpp:111
 #, fuzzy, c-format
 msgid "Whisper could not be sent, ignored by %s."
-msgstr "El mensaje privado no se pudo enviar, la persona lo ha ignorado."
+msgstr "Imposible enviar mensaje, estás ignorado por el otro jugador."
 
 #: src/net/tmwa/chathandler.cpp:333
-#, fuzzy
 msgid "MVP player."
-msgstr "Jugador"
+msgstr "Jugador VIP."
 
 #: src/net/tmwa/chathandler.cpp:337
 #, fuzzy
 msgid "MVP player: "
-msgstr "Jugador"
+msgstr "Jugador VIP."
 
 #: src/net/tmwa/chathandler.cpp:390 src/net/tmwa/chathandler.cpp:396
 #: src/net/tmwa/chathandler.cpp:401 src/net/tmwa/chathandler.cpp:407
 #: src/net/tmwa/chathandler.cpp:412 src/net/tmwa/chathandler.cpp:418
 #: src/net/tmwa/chathandler.cpp:425 src/net/tmwa/chathandler.cpp:431
 msgid "Channels are not supported!"
-msgstr "no se soportan canales!!"
+msgstr "Canales no son soportados!"
 
 #: src/net/tmwa/gamehandler.cpp:92
 #, c-format
 msgid "Online users: %d"
-msgstr ""
+msgstr "Jugadores online: %d"
 
 #: src/net/tmwa/gamehandler.cpp:102
-#, fuzzy
 msgid "Game"
-msgstr "Nombre:"
+msgstr "Juego"
 
 #: src/net/tmwa/gamehandler.cpp:102
-#, fuzzy
 msgid "Request to quit denied!"
-msgstr "Solicitud de intercambio"
+msgstr "Petición de salida denegada!"
 
 #: src/net/tmwa/generalhandler.cpp:104
 #, c-format
 msgid "Strength %+d"
-msgstr "fuerza %+d"
+msgstr "Fuerza %+d"
 
 #: src/net/tmwa/generalhandler.cpp:105
 #, c-format
 msgid "Agility %+d"
-msgstr "agilidad %+d"
+msgstr "Agilidad %+d"
 
 #: src/net/tmwa/generalhandler.cpp:106
 #, c-format
 msgid "Vitality %+d"
-msgstr "vitalidad %+d"
+msgstr "Vitalidad %+d"
 
 #: src/net/tmwa/generalhandler.cpp:107
 #, c-format
 msgid "Intelligence %+d"
-msgstr "inteligencia %+d"
+msgstr "Inteligencia %+d"
 
 #: src/net/tmwa/generalhandler.cpp:108
 #, c-format
@@ -4536,137 +4436,122 @@ msgstr "Destreza %+d"
 #: src/net/tmwa/generalhandler.cpp:109
 #, c-format
 msgid "Luck %+d"
-msgstr "suerte %+d"
+msgstr "Suerte %+d"
 
 #: src/net/tmwa/generalhandler.cpp:135
-#, fuzzy
 msgid "Authentication failed."
-msgstr "autenticacion fallida"
+msgstr "Fallo en la autentificación."
 
 #: src/net/tmwa/generalhandler.cpp:138
-#, fuzzy
 msgid "No servers available."
-msgstr "no hay servidores disponibles"
+msgstr "Servidores indiponibles."
 
 #: src/net/tmwa/generalhandler.cpp:142
-#, fuzzy
 msgid "Someone else is trying to use this account."
-msgstr "alguien mas esta tratando de usar esta cuenta"
+msgstr "Alguien está intentando usar tu cuenta."
 
 #: src/net/tmwa/generalhandler.cpp:145
-#, fuzzy
 msgid "This account is already logged in."
-msgstr "esta cuenta ya esta conectada"
+msgstr "Ya hay alguien conectado con esta cuenta."
 
 #: src/net/tmwa/generalhandler.cpp:148
-#, fuzzy
 msgid "Speed hack detected."
-msgstr "se detecto hack de velocidad"
+msgstr "Hack de velocidad detectado."
 
 #: src/net/tmwa/generalhandler.cpp:151
-#, fuzzy
 msgid "Duplicated login."
-msgstr "conexion duplicada"
+msgstr "Login duplicado."
 
 #: src/net/tmwa/generalhandler.cpp:154
-#, fuzzy
 msgid "Unknown connection error."
-msgstr "error de conexion desconocido"
+msgstr "Error de conexión desconocido."
 
 #: src/net/tmwa/generalhandler.cpp:220
 msgid "Got disconnected from server!"
-msgstr "fuiste desconectado del servidor!!"
+msgstr "Desconectado del servidor!"
 
 #: src/net/tmwa/generalhandler.cpp:252
 msgid "Luck"
 msgstr "Suerte"
 
 #: src/net/tmwa/generalhandler.cpp:255
-#, fuzzy
 msgid "Defense"
-msgstr "defensa"
+msgstr "Defensa"
 
 #: src/net/tmwa/generalhandler.cpp:256
-#, fuzzy
 msgid "M.Attack"
-msgstr "ataque magico"
+msgstr "Ataque M."
 
 #: src/net/tmwa/generalhandler.cpp:257
-#, fuzzy
 msgid "M.Defense"
-msgstr "defensa magica"
+msgstr "Defensa M."
 
 #: src/net/tmwa/generalhandler.cpp:258
 #, fuzzy, c-format
 msgid "% Accuracy"
-msgstr "% AcPunteria"
+msgstr "% Puntería"
 
 #: src/net/tmwa/generalhandler.cpp:259
-#, fuzzy, c-format
+#, c-format
 msgid "% Evade"
-msgstr "% agilidad"
+msgstr "% Evasión"
 
 #: src/net/tmwa/generalhandler.cpp:260
-#, fuzzy, c-format
+#, c-format
 msgid "% Critical"
-msgstr "Golpe Critico"
+msgstr "% Crítico"
 
 #: src/net/tmwa/generalhandler.cpp:261
 #, fuzzy
 msgid "Attack Delay"
-msgstr "Ataque %+d"
+msgstr "Atacar %s"
 
 #: src/net/tmwa/generalhandler.cpp:263
 #, fuzzy
 msgid "Walk Delay"
-msgstr "Ataque %+d"
+msgstr "Atraso:"
 
 #: src/net/tmwa/generalhandler.cpp:265
 #, fuzzy
 msgid "Attack Range"
-msgstr "Monstruo golpea a jugador"
+msgstr "Atacar %s"
 
 #: src/net/tmwa/gui/guildtab.cpp:74 src/net/tmwa/gui/partytab.cpp:66
 msgid "/help > Display this help."
-msgstr "/help > Mostrar la ayuda"
+msgstr "/help > Para la ayuda."
 
 #: src/net/tmwa/gui/guildtab.cpp:75
-#, fuzzy
 msgid "/invite > Invite a player to your guild"
-msgstr "/invite > Invitar a un jugador a tu grupo"
+msgstr "/invite > Invita un jugador a tu clan"
 
 #: src/net/tmwa/gui/guildtab.cpp:76
-#, fuzzy
 msgid "/leave > Leave the guild you are in"
-msgstr "/leave > abandonar tu grupo"
+msgstr "/leave > Deja el clan en la que estas"
 
 #: src/net/tmwa/gui/guildtab.cpp:77
-#, fuzzy
 msgid "/kick > Kick some one from the guild you are in"
-msgstr "/kick > expulsar a alguien de tu grupo"
+msgstr "/kick > Expulsa a alguien del clan en el que estás."
 
 #: src/net/tmwa/gui/guildtab.cpp:86 src/net/tmwa/gui/partytab.cpp:80
 msgid "Command: /invite <nick>"
-msgstr "Command: /invite <nick>"
+msgstr "Comando: /invite <nick>"
 
 #: src/net/tmwa/gui/guildtab.cpp:87
-#, fuzzy
 msgid "This command invites <nick> to the guild you're in."
-msgstr "Este comando invita a <apodo> a un grupo contigo"
+msgstr "Este comando invita a <nick> para el clan en el que estás ."
 
 #: src/net/tmwa/gui/guildtab.cpp:93 src/net/tmwa/gui/partytab.cpp:87
 msgid "Command: /leave"
-msgstr "Command: /leave"
+msgstr "Comando: /leave"
 
 #: src/net/tmwa/gui/guildtab.cpp:94
-#, fuzzy
 msgid "This command causes the player to leave the guild."
-msgstr "Este comando hace que el jugador deje el grupo."
+msgstr "Este comando hace que dejes el clan."
 
 #: src/net/tmwa/guildhandler.cpp:109 src/net/tmwa/guildhandler.cpp:114
 #, fuzzy
 msgid "You already in guild."
-msgstr "Eror al crear la guild."
+msgstr "Error al crear el clan."
 
 #: src/net/tmwa/guildhandler.cpp:119
 msgid "Emperium check failed."
@@ -4675,17 +4560,17 @@ msgstr ""
 #: src/net/tmwa/guildhandler.cpp:124
 #, fuzzy
 msgid "Unknown server response."
-msgstr "Respuesta a invitacion desconocida para %s."
+msgstr "Invitación desconocida a una guild."
 
 #: src/net/tmwa/guildhandler.cpp:202
 #, fuzzy, c-format
 msgid "Guild name: %s"
-msgstr "Clan"
+msgstr "Nombre del clan"
 
 #: src/net/tmwa/guildhandler.cpp:204
 #, fuzzy, c-format
 msgid "Guild master: %s"
-msgstr "Clan"
+msgstr "Miembros del guild"
 
 #: src/net/tmwa/guildhandler.cpp:206
 #, fuzzy, c-format
@@ -4693,9 +4578,9 @@ msgid "Guild level: %d"
 msgstr "Nivel: %d"
 
 #: src/net/tmwa/guildhandler.cpp:208
-#, c-format
+#, fuzzy, c-format
 msgid "Online members: %d"
-msgstr ""
+msgstr "Jugadores online: %d"
 
 #: src/net/tmwa/guildhandler.cpp:210
 #, c-format
@@ -4705,54 +4590,52 @@ msgstr ""
 #: src/net/tmwa/guildhandler.cpp:212
 #, fuzzy, c-format
 msgid "Average level: %d"
-msgstr "nivel maximo"
+msgstr "Nivel: %d"
 
 #: src/net/tmwa/guildhandler.cpp:214
 #, fuzzy, c-format
 msgid "Guild exp: %d"
-msgstr "Clan"
+msgstr "Nombre del clan"
 
 #: src/net/tmwa/guildhandler.cpp:216
 #, fuzzy, c-format
 msgid "Guild next exp: %d"
-msgstr "Guild créada."
+msgstr "Clan creado."
 
 #: src/net/tmwa/guildhandler.cpp:218
 #, fuzzy, c-format
 msgid "Guild castle: %s"
-msgstr "Guild créada."
+msgstr "Clan creado."
 
 #: src/net/tmwa/guildhandler.cpp:433
 msgid "Could not inivte user to guild."
-msgstr ""
+msgstr "No se puede invitar jugadores al clan."
 
 #: src/net/tmwa/guildhandler.cpp:438
 msgid "User rejected guild invite."
-msgstr ""
+msgstr "El jugador cancel la invitacion a tu guild."
 
 #: src/net/tmwa/guildhandler.cpp:443
-#, fuzzy
 msgid "User is now part of your guild."
-msgstr "%s es ahora miembro de tu grupo."
+msgstr "El usuario es ahora de tu clan."
 
 #: src/net/tmwa/guildhandler.cpp:448
 msgid "Your guild is full."
-msgstr ""
+msgstr "Tu clan está lleno."
 
 #: src/net/tmwa/guildhandler.cpp:453
-#, fuzzy
 msgid "Unknown guild invite response."
-msgstr "Respuesta a invitacion desconocida para %s."
+msgstr "Invitación desconocida a una guild."
 
 #: src/net/tmwa/guildhandler.cpp:475
 #, fuzzy
 msgid "You have left the guild."
-msgstr "Acaba de dejar al grupo."
+msgstr "Has dejado el grupo."
 
 #: src/net/tmwa/guildhandler.cpp:489
 #, fuzzy, c-format
 msgid "%s has left your guild."
-msgstr "%s ha dejado el grupo."
+msgstr "%s dejó tu grupo."
 
 #: src/net/tmwa/guildhandler.cpp:521
 msgid "You was kicked from guild."
@@ -4761,47 +4644,47 @@ msgstr ""
 #: src/net/tmwa/guildhandler.cpp:535
 #, fuzzy, c-format
 msgid "%s has kicked from your guild."
-msgstr "%s es ahora miembro de tu grupo."
+msgstr "%s expulsó a %s."
 
 #: src/net/tmwa/gui/partytab.cpp:67
 msgid "/invite > Invite a player to your party"
-msgstr "/invite > Invitar a un jugador a tu grupo"
+msgstr "/invite > Invita un jugador a tu grupo"
 
 #: src/net/tmwa/gui/partytab.cpp:68
 msgid "/leave > Leave the party you are in"
-msgstr "/leave > abandonar tu grupo"
+msgstr "/leave > Salir del grupo en el que estás"
 
 #: src/net/tmwa/gui/partytab.cpp:69
 msgid "/kick > Kick some one from the party you are in"
-msgstr "/kick > expulsar a alguien de tu grupo"
+msgstr "/kick > Expulsa a alguien del grupo en el que estás"
 
 #: src/net/tmwa/gui/partytab.cpp:70
 msgid "/item > Show/change party item sharing options"
-msgstr "/item > mostrar/cambiar opciones de compartir objetos del grupo"
+msgstr "/item > Mostrar/Cambiar el compartir objetos en el grupo"
 
 #: src/net/tmwa/gui/partytab.cpp:71
 msgid "/exp > Show/change party experience sharing options"
-msgstr "/exp > mostrar/cambiar opciones para compartir experiencia en el grupo"
+msgstr "/exp > Mostrar/Modificar el compartir experiencia en el grupo "
 
 #: src/net/tmwa/gui/partytab.cpp:88
 msgid "This command causes the player to leave the party."
-msgstr "Este comando hace que el jugador deje el grupo."
+msgstr "Este comando hace que dejes el grupo."
 
 #: src/net/tmwa/gui/partytab.cpp:92
 msgid "Command: /item <policy>"
-msgstr "Command: /item <policy>"
+msgstr "Comando> /item <policy>"
 
 #: src/net/tmwa/gui/partytab.cpp:94
 msgid "This command changes the party's item sharing policy."
-msgstr "cambia el compartir objetos dentro de un grupo"
+msgstr "Este comando cambia el compatir objetos en el grupo."
 
 #: src/net/tmwa/gui/partytab.cpp:95
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
 msgstr ""
-"<policy> puede ser  \"1\", \"yes\", \"true\" para compartir, o  \"0\", \"no"
-"\", \"false\" para no compartir"
+"<policy> puede ser \"1\", \"yes\" y \"true\" para habilitar el compartir "
+"objetos, o \"0\", \"no\" y \"false\" para deshabilitar."
 
 #: src/net/tmwa/gui/partytab.cpp:98
 msgid "Command: /item"
@@ -4809,8 +4692,7 @@ msgstr "Comando: /item"
 
 #: src/net/tmwa/gui/partytab.cpp:99
 msgid "This command displays the party's current item sharing policy."
-msgstr ""
-"Este mando permite enseñar la politica de intercambio de objetos en el grupo"
+msgstr "Este comando muestra el actual estado de compartir objetos en el grupo"
 
 #: src/net/tmwa/gui/partytab.cpp:104
 msgid "Command: /exp <policy>"
@@ -4818,15 +4700,15 @@ msgstr "Comando: /exp <policy>"
 
 #: src/net/tmwa/gui/partytab.cpp:105
 msgid "This command changes the party's experience sharing policy."
-msgstr "esta orden cambia si el grupo comparte o no la experiencia"
+msgstr "Este comando cambia la opción de compartir experiencia del grupo."
 
 #: src/net/tmwa/gui/partytab.cpp:107
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 msgstr ""
-"<policy> puede ser \"1\", \"yes\", \"true\" para activar el intercambio de "
-"experiencia o \"0\", \"no\", \"false\" para desactivarla."
+"<policy> puede ser \"1\", \"yes\" y \"true\" para habilitar compartir "
+"experiencia, o \"0\", \"no\" y \"false\" para deshabilitar."
 
 #: src/net/tmwa/gui/partytab.cpp:110
 msgid "Command: /exp"
@@ -4834,24 +4716,24 @@ msgstr "Comando: /exp"
 
 #: src/net/tmwa/gui/partytab.cpp:111
 msgid "This command displays the party's current experience sharing policy."
-msgstr "Esta orden muestra si el grupo deja compartir experiencia."
+msgstr ""
+"Este comando muestra el actual estado de compartir experiencia del grupo."
 
 #: src/net/tmwa/gui/partytab.cpp:145 src/net/tmwa/partyhandler.cpp:263
 msgid "Item sharing enabled."
-msgstr "Se permite compartir objetos"
+msgstr "Compartir objetos habilitado."
 
 #: src/net/tmwa/gui/partytab.cpp:148 src/net/tmwa/partyhandler.cpp:273
 msgid "Item sharing disabled."
-msgstr "No se permite compartir objetos"
+msgstr "Compartir objetos desabilitado."
 
 #: src/net/tmwa/gui/partytab.cpp:151 src/net/tmwa/partyhandler.cpp:283
 msgid "Item sharing not possible."
-msgstr "Imposible compartir ítem."
+msgstr "No es posible el compartir objetos."
 
 #: src/net/tmwa/gui/partytab.cpp:154
-#, fuzzy
 msgid "Item sharing unknown."
-msgstr "Se permite compartir objetos"
+msgstr "Compartir objetos desconocido."
 
 #: src/net/tmwa/gui/partytab.cpp:184 src/net/tmwa/partyhandler.cpp:225
 msgid "Experience sharing enabled."
@@ -4859,60 +4741,53 @@ msgstr "Compartir experiencia activado."
 
 #: src/net/tmwa/gui/partytab.cpp:187 src/net/tmwa/partyhandler.cpp:235
 msgid "Experience sharing disabled."
-msgstr "Compartir experiencia desactivado."
+msgstr "Compartir experiencia desactivado ."
 
 #: src/net/tmwa/gui/partytab.cpp:190 src/net/tmwa/partyhandler.cpp:245
 msgid "Experience sharing not possible."
 msgstr "Imposible compartir experiencia."
 
 #: src/net/tmwa/gui/partytab.cpp:193
-#, fuzzy
 msgid "Experience sharing unknown."
-msgstr "Compartir experiencia activado."
+msgstr "Compartir experiencia desconocido."
 
-#: src/net/tmwa/inventoryhandler.cpp:329
+#: src/net/tmwa/inventoryhandler.cpp:334
 msgid "Failed to use item."
-msgstr "No se pudo utilzar el objeto."
+msgstr "Fallo al usar el objeto."
 
-#: src/net/tmwa/inventoryhandler.cpp:452
+#: src/net/tmwa/inventoryhandler.cpp:457
 msgid "Unable to equip."
-msgstr "no se pudo equipar"
+msgstr "Imposible equipar."
 
 #: src/net/tmwa/loginhandler.cpp:90
 msgid "Account was not found. Please re-login."
-msgstr "La cuenta no se encontro. Por favor conectese de nuevo."
+msgstr "Cuenta no encontrada. Por favor conéctate de nuevo."
 
 #: src/net/tmwa/loginhandler.cpp:96
-#, fuzzy
 msgid "New password too short."
-msgstr "La nueva contraseña es demasiada corta"
+msgstr "Nueva contrasena es muy corta."
 
 #: src/net/tmwa/loginhandler.cpp:161
-#, fuzzy
 msgid "Unregistered ID."
-msgstr "ID sin registrar."
+msgstr "ID no registrada."
 
 #: src/net/tmwa/loginhandler.cpp:164
-#, fuzzy
 msgid "Wrong password."
-msgstr "Contraseña incorrecta."
+msgstr "Contrasena incorrecta."
 
 #: src/net/tmwa/loginhandler.cpp:167
-#, fuzzy
 msgid "Account expired."
-msgstr "Cuenta expirada."
+msgstr "La cuenta expiró."
 
 #: src/net/tmwa/loginhandler.cpp:170
-#, fuzzy
 msgid "Rejected from server."
-msgstr "Rechazado por el servidor."
+msgstr "Rechazado del servidor."
 
 #: src/net/tmwa/loginhandler.cpp:173
-#, fuzzy
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
-"Has sido bloqueado permanentemente del juego. Por favor, contacta al Equipo "
+"Has sido baneado permanentemente del juego. Por favor contacta con el equipo "
 "GM."
 
 #: src/net/tmwa/loginhandler.cpp:177
@@ -4921,50 +4796,47 @@ msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
 msgstr ""
-"Usted ha estado prohibido temporalmente el acceso al juego hasta %s.\n"
-"Por favor pongase en contacto con el equipo de GM a traves del forum.."
+"Has sido baneado temporalmente del juego %s.\n"
+"Por favor contacta un GM de nuestro equipo via el foro."
 
 #: src/net/tmwa/loginhandler.cpp:184
-#, fuzzy
 msgid "This user name is already taken."
-msgstr "Este nombre de usuario ya está tomado."
+msgstr "Este nombre de usuario ya está escogido."
 
 #: src/net/tmwa/network.cpp:147
 msgid "Empty address given to Network::connect()!"
-msgstr ""
+msgstr "Adress vacía enviada a Network::connect()!"
 
 #: src/net/tmwa/network.cpp:351
-#, fuzzy
 msgid "Unable to resolve host \""
-msgstr "Impossibile vender."
+msgstr "No es posible determinar el host \""
 
 #: src/net/tmwa/network.cpp:421
-#, fuzzy
 msgid "Connection to server terminated. "
-msgstr "conectando al servidor de mapas...."
+msgstr "Conexión al servidor terminada."
 
 #: src/net/tmwa/partyhandler.cpp:84
 msgid "Could not create party."
-msgstr "No se ha podido crear el grupo."
+msgstr "No es posible crear un grupo."
 
 #: src/net/tmwa/partyhandler.cpp:86
 msgid "Party successfully created."
-msgstr "El grupo se creo con éxito."
+msgstr "Grupo creado."
 
 #: src/net/tmwa/partyhandler.cpp:153
 #, c-format
 msgid "%s is already a member of a party."
-msgstr "%s ya forma parte del grupo."
+msgstr "%s ya es miembro de otro grupo."
 
 #: src/net/tmwa/partyhandler.cpp:158
 #, c-format
 msgid "%s refused your invitation."
-msgstr "%s rechazó tu invitación."
+msgstr "%s cancelo tu invitación."
 
 #: src/net/tmwa/partyhandler.cpp:163
 #, c-format
 msgid "%s is now a member of your party."
-msgstr "%s es ahora miembro de tu grupo."
+msgstr "%s ahora es un miembro de tu grupo."
 
 #: src/net/tmwa/partyhandler.cpp:168
 #, c-format
@@ -4974,16 +4846,16 @@ msgstr ""
 #: src/net/tmwa/partyhandler.cpp:173
 #, fuzzy, c-format
 msgid "QQQ Unknown invite response for %s."
-msgstr "Respuesta a invitacion desconocida para %s."
+msgstr "Invitacion desconocida para %s."
 
 #: src/net/tmwa/partyhandler.cpp:333
 msgid "You have left the party."
-msgstr "Acaba de dejar al grupo."
+msgstr "Has dejado el grupo."
 
 #: src/net/tmwa/partyhandler.cpp:345
 #, c-format
 msgid "%s has left your party."
-msgstr "%s ha dejado el grupo."
+msgstr "%s dejó tu grupo."
 
 #: src/net/tmwa/partyhandler.cpp:421
 #, c-format
@@ -4993,59 +4865,59 @@ msgstr "Un miembro desconocido intentó decir: %s"
 #: src/net/tmwa/partyhandler.cpp:503
 #, c-format
 msgid "%s is not in your party!"
-msgstr "%s no es de su grupo !"
+msgstr "%s no está en tu grupo!"
 
 #: src/net/tmwa/playerhandler.cpp:110
 msgid "Insert coin to continue."
-msgstr "Inserta una moneda para continuar."
+msgstr "Inserta moneda para continuar."
 
 #: src/net/tmwa/playerhandler.cpp:128
 msgid "You're not dead yet. You're just resting."
-msgstr "No estás muerto aún. Sólo estás descansando."
+msgstr "Tu no estás muerto. Sólo estás descansando."
 
 #: src/net/tmwa/playerhandler.cpp:129
 msgid "You are no more."
-msgstr "Tú ya no existes más."
+msgstr "Tu ya no existes más."
 
 #: src/net/tmwa/playerhandler.cpp:130
 msgid "You have ceased to be."
-msgstr "Has dejado de existir."
+msgstr "Parece que dejaste de existir."
 
 #: src/net/tmwa/playerhandler.cpp:131
 msgid "You've expired and gone to meet your maker."
-msgstr "Has expirado e ido a encontrarte con tu creador."
+msgstr "Has expirado e ido a ver al tu creador."
 
 #: src/net/tmwa/playerhandler.cpp:132
 msgid "You're a stiff."
-msgstr "Eres un tieso."
+msgstr "Eres un cadáver."
 
 #: src/net/tmwa/playerhandler.cpp:133
 msgid "Bereft of life, you rest in peace."
-msgstr "Sin vida, descanza en paz."
+msgstr "Sin vida, descansa en paz."
 
 #: src/net/tmwa/playerhandler.cpp:134
 msgid "If you weren't so animated, you'd be pushing up the daisies."
-msgstr "Si estuvieras con mas animo, no estarias comiendo las raices."
+msgstr "Si no estuvieras tan animado, diría que estás muerto."
 
 #: src/net/tmwa/playerhandler.cpp:135
 msgid "Your metabolic processes are now history."
-msgstr "Tus procesos metabólicos ya son historia."
+msgstr "Tus procesos metabólicos son ya historia."
 
 #: src/net/tmwa/playerhandler.cpp:136
 msgid "You're off the twig."
-msgstr "Estas al borde de la ramita."
+msgstr "Estás fuera de tus botas."
 
 #: src/net/tmwa/playerhandler.cpp:137
 msgid "You've kicked the bucket."
-msgstr "Has tocado el fondo."
+msgstr "Te han echado a patadas."
 
 #: src/net/tmwa/playerhandler.cpp:138
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
-"Has terminado de barajar tu vida, has corrido debajo de la cortina y te has "
-"unido al sangriento coro invisible."
+"Has dejado tu cuerpo mortal, bajado las cortinas y unido al sangriento coro "
+"de los invisibles."
 
 #: src/net/tmwa/playerhandler.cpp:140
 msgid "You are an ex-player."
@@ -5053,7 +4925,7 @@ msgstr "Eres un ex-jugador."
 
 #: src/net/tmwa/playerhandler.cpp:141
 msgid "You're pining for the fjords."
-msgstr "Estas ganando puntos para acabar en los fiordos."
+msgstr "Estas avanzando... hacia el barranco."
 
 #: src/net/tmwa/playerhandler.cpp:327 src/net/tmwa/playerhandler.cpp:336
 #: src/net/tmwa/playerhandler.cpp:415
@@ -5063,74 +4935,74 @@ msgstr "Mensaje"
 #: src/net/tmwa/playerhandler.cpp:328
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
-msgstr "Estás cargando más de la mitad de tu peso. No puedes recuperar salud."
+msgstr "Llevas más de la mitad del peso que puedes. No recuperarás PV o PM."
 
 #: src/net/tmwa/playerhandler.cpp:337
 #, fuzzy
 msgid "You are carrying less than half your weight. You are can regain health."
-msgstr "Estás cargando más de la mitad de tu peso. No puedes recuperar salud."
+msgstr "Llevas más de la mitad del peso que puedes. No recuperarás PV o PM."
 
 #: src/net/tmwa/playerhandler.cpp:442
-#, fuzzy, c-format
+#, c-format
 msgid "You picked up %s."
-msgstr "Has cogido "
+msgstr "Has cogido %s."
 
 #: src/net/tmwa/playerhandler.cpp:448
 #, fuzzy, c-format
 msgid "You spent %s."
-msgstr "tu recibes %s"
+msgstr "Tú recibes %s"
 
 #: src/net/tmwa/playerhandler.cpp:493
 msgid "Cannot raise skill!"
-msgstr ""
+msgstr "Imposible incrementar!"
 
 #: src/net/tmwa/playerhandler.cpp:613
 msgid "Equip arrows first."
-msgstr "Equipar primero las flechas."
+msgstr "Equipar las flechas primero."
 
 #: src/net/tmwa/specialhandler.cpp:149
 msgid "Trade failed!"
-msgstr "Ha fallado el comercio"
+msgstr "Fallo al intercambiar!"
 
 #: src/net/tmwa/specialhandler.cpp:152
 msgid "Emote failed!"
-msgstr "Emoticon fallido!"
+msgstr "Fallo al hacer un emoticono!"
 
 #: src/net/tmwa/specialhandler.cpp:155
 msgid "Sit failed!"
-msgstr "Sentarse fallido!"
+msgstr "Fallo al sentarse!"
 
 #: src/net/tmwa/specialhandler.cpp:158
 msgid "Chat creating failed!"
-msgstr "Creación de conversación fallida!"
+msgstr "Fallo al crear un chat!"
 
 #: src/net/tmwa/specialhandler.cpp:161
 msgid "Could not join party!"
-msgstr "No pusidiste unirte al grupo!"
+msgstr "Imposible entrar en un grupo!"
 
 #: src/net/tmwa/specialhandler.cpp:164
 msgid "Cannot shout!"
-msgstr "No puedes gritar!"
+msgstr "Imposible gritar!"
 
 #: src/net/tmwa/specialhandler.cpp:177
 msgid "You have not yet reached a high enough lvl!"
-msgstr "No has alcazado un nivel suficientemente alto!"
+msgstr "Usted no tiene suficiente nivel!"
 
 #: src/net/tmwa/specialhandler.cpp:181
 msgid "Insufficient HP!"
-msgstr "Puntos de vidas insuficientes!"
+msgstr "PV insuficiente!"
 
 #: src/net/tmwa/specialhandler.cpp:184
 msgid "Insufficient SP!"
-msgstr "insuficiente SP!"
+msgstr "SP insuficiente!"
 
 #: src/net/tmwa/specialhandler.cpp:187
 msgid "You have no memos!"
-msgstr "No tienes ningun memo!"
+msgstr "No tienes ninguna nota armenzada!"
 
 #: src/net/tmwa/specialhandler.cpp:190
 msgid "You cannot do that right now!"
-msgstr "No puedes hacer eso!"
+msgstr "No puedes hacer esto ahora mismo!"
 
 #: src/net/tmwa/specialhandler.cpp:193
 msgid "Seems you need more money... ;-)"
@@ -5138,41 +5010,39 @@ msgstr "Parece que necesitas más dinero... ;-)"
 
 #: src/net/tmwa/specialhandler.cpp:196
 msgid "You cannot use this skill with that kind of weapon!"
-msgstr "No puedes usar esa habilidad con ese tipo de arma!"
+msgstr "No puedes usar estas habilidades con estas armas!"
 
 #: src/net/tmwa/specialhandler.cpp:200
 msgid "You need another red gem!"
-msgstr "Necesitas otra gema roja!"
+msgstr "Necesitas otra Gema Roja!"
 
 #: src/net/tmwa/specialhandler.cpp:203
 msgid "You need another blue gem!"
-msgstr "Necesitas otra gema azul!"
+msgstr "Necesitas otra Gema Azul!"
 
 #: src/net/tmwa/specialhandler.cpp:206
 msgid "You're carrying to much to do this!"
-msgstr "Estas cargando demasiado para hacer esto!"
+msgstr "Llevas muchas cosas para hacer esto!"
 
 #: src/net/tmwa/specialhandler.cpp:209
 msgid "Huh? What's that?"
-msgstr "¿eh? que es eso?"
+msgstr "Huh? Qué es eso?"
 
 #: src/net/tmwa/specialhandler.cpp:220
 msgid "Warp failed..."
-msgstr "Teletransporte fallido..."
+msgstr "Fallo al teletransportar..."
 
 #: src/net/tmwa/specialhandler.cpp:223
 msgid "Could not steal anything..."
-msgstr "No pudiste robar nada..."
+msgstr "No puedes robar nada..."
 
 #: src/net/tmwa/specialhandler.cpp:226
 msgid "Poison had no effect..."
-msgstr "El veneno no tuvo efecto..."
+msgstr "Veneno no tuvo ningún efecto..."
 
 #: src/net/tmwa/tradehandler.cpp:145
 msgid "Trading isn't possible. Trade partner is too far away."
-msgstr ""
-"No se puede comerciar. La persona con quién se desea comerciar se encuentra "
-"demasiado lejos."
+msgstr "Intercambio es imposible. El otro personaje está muy alejado."
 
 #: src/net/tmwa/tradehandler.cpp:149
 msgid "Trading isn't possible. Character doesn't exist."
@@ -5180,55 +5050,65 @@ msgstr "Intercambio imposible. El personaje no existe."
 
 #: src/net/tmwa/tradehandler.cpp:153
 msgid "Trade cancelled due to an unknown reason."
-msgstr "Intercambio anulado por razones desconocidas."
+msgstr "Intercambio cancelado por una razón desconocida."
 
 #: src/net/tmwa/tradehandler.cpp:161
 #, c-format
 msgid "Trade: You and %s"
-msgstr "Intercambio: Usted y %s"
+msgstr "Intercambio: Tú y %s"
 
 #: src/net/tmwa/tradehandler.cpp:171
 #, c-format
 msgid "Trade with %s cancelled."
-msgstr "Intercambio con %s anulado."
+msgstr "Intercambio con %s cancelado."
 
 #: src/net/tmwa/tradehandler.cpp:184
-#, fuzzy
 msgid "Unhandled trade cancel packet."
-msgstr "Orden de cancelar intercambio descontrolado."
+msgstr "Intercambio no soportado."
 
 #: src/net/tmwa/tradehandler.cpp:241
 msgid "Failed adding item. Trade partner is over weighted."
-msgstr "No se pudo añadir el objeto. Tu compañero lleva demasiado peso encima."
+msgstr "Error al añadir objeto. El otro jugador lleva mucho peso."
 
 #: src/net/tmwa/tradehandler.cpp:246
 msgid "Failed adding item. Trade partner has no free slot."
-msgstr "No se pudo añadir el objeto. Tu compañero no tiene espacio."
+msgstr "Error al anadir objeto. El otro jugador no tiene más espacio."
 
-#: src/net/tmwa/tradehandler.cpp:250
+#: src/net/tmwa/tradehandler.cpp:251
+#, fuzzy
+msgid "Failed adding item. You cant trade this item."
+msgstr ""
+"Fallo al añadir objeto. No puedes añadir más de un mismo tipo de objeto en "
+"la ventana."
+
+#: src/net/tmwa/tradehandler.cpp:255
 msgid "Failed adding item for unknown reason."
-msgstr "No se pudo añadir el objeto, razon desconocida"
+msgstr "Fallo al anadir objeto por una razón desconocida."
 
 #: src/playerrelations.cpp:404
-#, fuzzy
 msgid "Completely ignore"
-msgstr "@@ignore|ignorar al maximo %s@@"
+msgstr "Ignorar completamente"
 
 #: src/playerrelations.cpp:418
 msgid "Print '...'"
-msgstr ""
+msgstr "Imprimir '...'"
 
 #: src/playerrelations.cpp:438
 msgid "Blink name"
-msgstr ""
+msgstr "Parpadear nombre"
 
 #: src/playerrelations.cpp:483
 msgid "Floating '...' bubble"
-msgstr ""
+msgstr "Burbuja '...' flotante"
 
 #: src/playerrelations.cpp:486
 msgid "Floating bubble"
-msgstr ""
+msgstr "Burbuja Flotante"
+
+#: 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
@@ -5243,232 +5123,234 @@ msgstr "Defensa %+d"
 #: src/resources/itemdb.cpp:57
 #, c-format
 msgid "HP %+d"
-msgstr "HP %+d"
+msgstr "PV %+d"
 
 #: src/resources/itemdb.cpp:58
 #, c-format
 msgid "MP %+d"
-msgstr "MP %+d"
+msgstr "PM %+d"
 
 #: src/resources/itemdb.cpp:155
 msgid "Unknown item"
 msgstr "Objeto desconocido"
 
-#: src/resources/itemdb.cpp:210 src/resources/monsterdb.cpp:78
-msgid "unnamed"
-msgstr "Sin nombre"
+#~ msgid "/record > Start recording the chat to an external file"
+#~ msgstr "/record > Comenzar a guardar el chat en un archivo externo"
+
+#~ msgid "Command: /record <filename>"
+#~ msgstr "Comando: /record <nombre_del_archivo>"
+
+#~ msgid "This command starts recording the chat log to the file <filename>."
+#~ msgstr ""
+#~ "Este comando inicia la grabación del chat en el archivo "
+#~ "<nombre_del_archivo>."
+
+#~ msgid "Command: /record"
+#~ msgstr "Comando: /record"
+
+#~ msgid "This command finishes a recording session."
+#~ msgstr "Este comando termina una sesión de grabación."
+
+#~ msgid "Attendance written to record log."
+#~ msgstr "Audición grabada en el registro del log."
 
-#, fuzzy
 #~ msgid "Particle detail: %s"
-#~ msgstr "detalle particulas"
+#~ msgstr "Detalle de partícula: %s"
 
-#, fuzzy
 #~ msgid "Ambient FX: %s"
-#~ msgstr "Efectos ambientales"
+#~ msgstr "Ambiente FX: %s"
 
-#, fuzzy
-#~ msgid "Emote Shortcut  %d"
-#~ msgstr "atajo a emoticon %d"
+#~ msgid "Trade with %s..."
+#~ msgstr "Negociar con %s..."
 
-#, fuzzy
-#~ msgid "Player position:"
-#~ msgstr "Jugador golpea al monstruo"
+#~ msgid "Whisper %s"
+#~ msgstr "Mensaje Privado %s"
 
-#, fuzzy
-#~ msgid "Music: %s"
-#~ msgstr "Tema: %s"
+#~ msgid "Befriend %s"
+#~ msgstr "Ser amigo %s"
 
-#, fuzzy
-#~ msgid "Map: %s"
-#~ msgstr "Nombre: %s"
+#~ msgid "Disregard %s"
+#~ msgstr "Desagregar %s"
 
-#, fuzzy
-#~ msgid "Minimap: %s"
-#~ msgstr "Minimapa"
+#~ msgid "Unignore %s"
+#~ msgstr "Dejar de Ignorar %s"
 
-#~ msgid "/record > Start recording the chat to an external file"
-#~ msgstr "/record > Empieza a registrar el chat en un archivo externo"
+#~ msgid "Completely ignore %s"
+#~ msgstr "Ignorar completamente %s"
 
-#~ msgid "Command: /record <filename>"
-#~ msgstr "Comando: /record <nombre de archivo>"
+#~ msgid "Follow %s"
+#~ msgstr "Seguir %s"
 
-#~ msgid "This command starts recording the chat log to the file <filename>."
-#~ msgstr ""
-#~ "Este comando graba el registro del chat en el archivo <nombre de archivo>."
+#~ msgid "Invite %s to join your guild"
+#~ msgstr "Invitar a %s para unirse a tu clan"
 
-#~ msgid "Command: /record"
-#~ msgstr "Comando: /record"
+#~ msgid "Invite %s to join your party"
+#~ msgstr "Invitar a %s para su grupo"
 
-#~ msgid "This command finishes a recording session."
-#~ msgstr "Este comando termina la sesion de grabación."
+#~ msgid "Kick player"
+#~ msgstr "Expulsar jugador"
 
-#~ msgid "Attendance written to record log."
-#~ msgstr "Asistencia grabada en el registro"
+#~ msgid "Talk to %s"
+#~ msgstr "Hablar con %s"
+
+#~ msgid "Kick monster"
+#~ msgstr "Expulsar monstruo"
+
+#~ msgid "Pick up %s"
+#~ msgstr "Coger %s"
 
 #~ msgid "Finishing recording."
-#~ msgstr "se termino de grabar"
+#~ msgstr "Finalizando grabación."
 
 #~ msgid "Not currently recording."
-#~ msgstr "no se esta grabando"
+#~ msgstr "No se está grabando en este momento."
 
 #~ msgid "Already recording."
-#~ msgstr "ya esta grabando!!"
+#~ msgstr "Ya se está llevando a cabo la grabación."
 
 #~ msgid "Starting to record..."
-#~ msgstr "empezando a grabar..."
+#~ msgstr "Iniciando la grabación..."
 
 #~ msgid "Failed to start recording."
-#~ msgstr "no se pudo empezar a grabar"
+#~ msgstr "Fallo al empezar la grabación."
 
 #~ msgid "Recording..."
-#~ msgstr "grabando..."
+#~ msgstr "Grabando..."
 
 #~ msgid "Stop recording"
-#~ msgstr "parar de grabar"
+#~ msgstr "Parar de grabar"
 
-#~ msgid "Find Path to Mouse"
-#~ msgstr "encontrar ruta del raton"
+#~ msgid "Sound"
+#~ msgstr "Sonido"
+
+#~ msgid "Specials Set %d"
+#~ msgstr "Especiales %d"
+
+#~ msgid "Special %d"
+#~ msgstr "Especial %d"
 
-#, fuzzy
 #~ msgid "HP"
-#~ msgstr "PV:"
+#~ msgstr "PV"
 
-#, fuzzy
 #~ msgid "MP"
-#~ msgstr "PM:"
+#~ msgstr "PM"
 
-#, fuzzy
 #~ msgid "Exp"
-#~ msgstr "EXP:"
+#~ msgstr "Exp"
 
-#, fuzzy
 #~ msgid "Money"
-#~ msgstr "Dinero: %d"
+#~ msgstr "Dinero"
 
-#, fuzzy
 #~ msgid "Job"
-#~ msgstr "trabajo:"
+#~ msgstr "Trabajo"
 
-#, fuzzy
 #~ msgid "Level"
-#~ msgstr "Nivel: %d"
-
-#, fuzzy
-#~ msgid "Player successfully ignored!"
-#~ msgstr "El grupo se creo con éxito."
-
-#, fuzzy
-#~ msgid "Player could not be ignored!"
-#~ msgstr "El mensaje privado no se pudo enviar, la persona lo ha ignorado."
+#~ msgstr "Nivel"
 
-#, fuzzy
-#~ msgid "  -C --config-file    : Configuration file to use"
-#~ msgstr "  -C --config-file : archivo de configuracion a usar"
-
-#, fuzzy
-#~ msgid "  -l --chat-log-dir   : Chat log dir to use"
-#~ msgstr "  -C --config-file : archivo de configuracion a usar"
+#~ msgid "Cannot send empty chat!"
+#~ msgstr "No puedes enviar un mensaje vacío!"
 
-#~ msgid "Sound"
-#~ msgstr "Sonido"
+#~ msgid "Find Path to Mouse"
+#~ msgstr "Encontrar Camino al Mouse"
 
-#, fuzzy
 #~ msgid "Access denied."
-#~ msgstr "acceso denegado"
+#~ msgstr "Acesso denegado."
 
-#, fuzzy
 #~ msgid "Unknown failure to select character."
-#~ msgstr "fallo desconocido al seleccionar personaje"
+#~ msgstr "Error desconocido al seleccionar este jugador."
+
+#~ msgid "Guild creation isn't supported yet."
+#~ msgstr "La creación de guilds no esta soportada."
+
+#~ msgid "Unable to unequip."
+#~ msgstr "Imposible quitárselo."
 
 #~ msgid "Inviting like this isn't supported at the moment."
-#~ msgstr "Por el momento no está soportado invitar de esta forma."
+#~ msgstr "Invitar así no esta soportado por el momento."
 
-#, fuzzy
-#~ msgid "You can only invite when you are in a party!"
-#~ msgstr "%s te invita a unirte a su grupo."
+#~ msgid "You can only inivte when you are in a party!"
+#~ msgstr "Sólo puedes invitar cuando estés en un grupo!"
+
+#~ msgid "One stat is zero."
+#~ msgstr "Un stat es 0."
 
 #~ msgid "Willpower:"
 #~ msgstr "Fuerza de voluntad:"
 
-#, fuzzy
 #~ msgid "Server is full."
-#~ msgstr "El servidor esta lleno"
+#~ msgstr "Servidor lleno."
 
 #, fuzzy
-#~ msgid "Trade with %s..."
-#~ msgstr "Intercambiar con %s"
+#~ msgid "Show damage"
+#~ msgstr "mostrar nombre"
 
-#, fuzzy
-#~ msgid "Whisper %s"
-#~ msgstr "Susurro"
+#~ msgid "Show IP: On"
+#~ msgstr "Mostrar IP: Activado"
 
-#, fuzzy
-#~ msgid "Befriend %s"
-#~ msgstr "@@friend|ser amigo de %s@@"
+#~ msgid "Show IP: Off"
+#~ msgstr "Mostrar IP: Cancelado"
 
-#, fuzzy
-#~ msgid "Disregard %s"
-#~ msgstr "desestimado"
+#~ msgid "Registration disabled"
+#~ msgstr "Registro desabilitado."
 
-#, fuzzy
-#~ msgid "Completely ignore %s"
-#~ msgstr "@@ignore|ignorar al maximo %s@@"
+#~ msgid "You need to use the website to register an account for this server."
+#~ msgstr "Necesitas registrarte desde la web para difrutar del juego."
 
-#, fuzzy
-#~ msgid "Invite %s to join your guild"
-#~ msgstr "@@guild|Invita a %s a unirse a tu clan@@"
+#~ msgid "Disable transparency (Low CPU mode)"
+#~ msgstr "Desabilitar transparencia (CPU Modo)"
 
-#, fuzzy
-#~ msgid "Invite %s to join your party"
-#~ msgstr "@@party|Invita a  %sa unirse a tu grupoy@@"
+#~ msgid ""
+#~ "Applying change to OpenGL requires restart. In case OpenGL messes up your "
+#~ "game graphics, restart the game with the command line option \"--no-opengl"
+#~ "\"."
+#~ msgstr ""
+#~ "Cambiar a OpenGL necesita reiniciar el cliente. En caso de OpenGL atrape "
+#~ "tus graficos, abra el juego atraves de linea de comando con la seguinte "
+#~ "opcion: \"--no-opengl\"."
 
-#, fuzzy
-#~ msgid "Kick player"
-#~ msgstr "no se le pudo expulsar"
+#~ msgid "Deactivating OpenGL"
+#~ msgstr "Desativando OpenGL"
 
-#, fuzzy
-#~ msgid "Talk to %s"
-#~ msgstr "@@talk|Hablar a %s@@"
+#~ msgid "Transparency disabled"
+#~ msgstr "Transparencia desabilitada"
 
-#, fuzzy
-#~ msgid "Kick monster"
-#~ msgstr "@@admin-kick|expulsar monstruor@@"
+#~ msgid "You must restart to apply changes."
+#~ msgstr "Debes reiniciar el cliente para aplicar los cambios."
 
-#, fuzzy
-#~ msgid "Pick up %s"
-#~ msgstr "recoger"
+#~ msgid "Transparency enabled"
+#~ msgstr "Transparencia habilitada."
 
-#~ msgid "Cannot send empty chat!"
-#~ msgstr "no se pude enviar un chat vacio!!"
+#~ msgid "Creating guild failed, please choose a shorter name."
+#~ msgstr "Fallo al crear Guild escoja un nombre mas corto."
 
-#~ msgid "Unable to unequip."
-#~ msgstr "no se pudo desequipar"
+#~ msgid "Creating party failed, please choose a shorter name."
+#~ msgstr "Fallo al crear un Grupo escoja un nombre mas corto."
+
+#~ msgid "Inviting failed, because you can't see a player called %s."
+#~ msgstr "Imposible invitar por que no puedes ver al jugador %s."
 
 #~ msgid "Text Shadow"
-#~ msgstr "Sombra del texto"
+#~ msgstr "Sombra de Texto"
 
 #~ msgid "Text Outline"
-#~ msgstr "Borde del texto"
+#~ msgstr "Lados del texto"
 
 #~ msgid "Progress Bar Labels"
-#~ msgstr "etiquetas de la barra de progreso"
+#~ msgstr "Barra de progreso"
 
 #, fuzzy
 #~ msgid "Item Too Expensive"
-#~ msgstr "Objeto demasiado caro"
+#~ msgstr "Objeto muy caro"
 
 #, fuzzy
 #~ msgid "Item Is Equipped"
-#~ msgstr "Objeto equipado"
+#~ msgstr "Objeto esta equipado"
 
 #~ msgid "GM"
-#~ msgstr "MJ"
-
-#~ msgid "Player"
-#~ msgstr "Jugador"
+#~ msgstr "GM"
 
 #~ msgid "Whisper"
-#~ msgstr "Susurro"
+#~ msgstr "Sussurrar"
 
 #~ msgid "Is"
 #~ msgstr "Es"
@@ -5477,26 +5359,29 @@ msgstr "Sin nombre"
 #~ msgstr "Servidor"
 
 #~ msgid "Logger"
-#~ msgstr "Registro"
+#~ msgstr "Historial"
+
+#~ msgid "Hyperlink"
+#~ msgstr "Link"
 
 #~ msgid "Unknown Item Type"
-#~ msgstr "Objeto desconocido"
+#~ msgstr "Tipo de objeto desconocido"
 
 #~ msgid "Generics"
 #~ msgstr "Genericos"
 
 #~ msgid "Hats"
-#~ msgstr "Sombreros"
+#~ msgstr "Gorros"
 
 #~ msgid "Usables"
-#~ msgstr "Consumibles"
+#~ msgstr "Usables"
 
 #~ msgid "Shirts"
-#~ msgstr "Faldas"
+#~ msgstr "Camisas"
 
 #, fuzzy
 #~ msgid "One Handed Weapons"
-#~ msgstr "Armas de una mano"
+#~ msgstr "Armas para 1 mano"
 
 #~ msgid "Pants"
 #~ msgstr "Pantalones"
@@ -5506,7 +5391,7 @@ msgstr "Sin nombre"
 
 #, fuzzy
 #~ msgid "Two Handed Weapons"
-#~ msgstr "Armas de una mano"
+#~ msgstr "Armas con las 2 manos"
 
 #~ msgid "Shields"
 #~ msgstr "Escudos"
@@ -5518,22 +5403,25 @@ msgstr "Sin nombre"
 #~ msgstr "Collares"
 
 #~ msgid "Arms"
-#~ msgstr "Brazos"
+#~ msgstr "Armas"
 
 #~ msgid "Ammo"
-#~ msgstr "Munición"
+#~ msgstr "Municion"
 
 #~ msgid "HP Bar"
-#~ msgstr "Barra de salud"
+#~ msgstr "Barra de HP"
 
 #~ msgid "3/4 HP Bar"
-#~ msgstr "Barra de salud a 3 cuartos"
+#~ msgstr "3/4 de barra de HP"
 
 #~ msgid "1/2 HP Bar"
-#~ msgstr "Barra de salud a la mitad"
+#~ msgstr "1/2 de barra de HP"
+
+#~ msgid "1/4 HP Bar"
+#~ msgstr "1/4 de barra de HP"
 
 #~ msgid "no"
-#~ msgstr "no"
+#~ msgstr "No"
 
 #~ msgid "Buddy"
 #~ msgstr "Amigo"
@@ -5542,7 +5430,7 @@ msgstr "Sin nombre"
 #~ msgstr "Lista de amigos"
 
 #~ msgid "Description: %s"
-#~ msgstr "Descripción: %s"
+#~ msgstr "Descripcion: %s"
 
 #~ msgid "Effect: %s"
 #~ msgstr "Efecto: %s"
@@ -5560,28 +5448,28 @@ msgstr "Sin nombre"
 #~ msgstr "Presente: "
 
 #~ msgid "Quit Guild"
-#~ msgstr "Dejar el clan"
+#~ msgstr "Salir del Guild"
 
 #~ msgid "Ok"
-#~ msgstr "Aceptar"
+#~ msgstr "Ok"
 
 #~ msgid "Recent:"
 #~ msgstr "Reciente:"
 
 #~ msgid "Cast Test Spell 1"
-#~ msgstr "Usar hechizo de prueba 1"
+#~ msgstr "Lanzar echizo de prueba   1"
 
 #~ msgid "Cast Test Spell 2"
-#~ msgstr "Usar hechizo de prueba 2"
+#~ msgstr "Lanzar echizo de prueba   2"
 
 #~ msgid "Cast Test Spell 3"
-#~ msgstr "Usar hechizo de prueba 3"
+#~ msgstr "Lanzar echizo de prueba   3"
 
 #~ msgid "2 Handed Weapons"
-#~ msgstr "Armas de segunda mano"
+#~ msgstr "Armas para 2 manos"
 
 #~ msgid "@@use|Unequip@@"
-#~ msgstr "@@usar|quitarselo@@"
+#~ msgstr "@@use|Desequipar@@"
 
 #~ msgid "@@use|Equip@@"
 #~ msgstr "@@use|Equipar@@"
@@ -5593,13 +5481,13 @@ msgstr "Sin nombre"
 #~ msgstr "@@split|Dividir@@"
 
 #~ msgid "@@store|Store@@"
-#~ msgstr "@@store|almacenar@@"
+#~ msgstr "@@store|Almacenar@@"
 
 #~ msgid "Select Server"
-#~ msgstr "Seleccionar servidor"
+#~ msgstr "Selecionar Servidor"
 
 #~ msgid "Failed to switch to "
-#~ msgstr "no se pudo cambiar a: "
+#~ msgstr "Fallo al cambiar a "
 
 #~ msgid "windowed"
 #~ msgstr "en ventana"
@@ -5608,115 +5496,118 @@ msgstr "Sin nombre"
 #~ msgstr "pantalla completa"
 
 #~ msgid "Mystery Skill"
-#~ msgstr "habilidad mis"
+#~ msgstr "Habilidade Misteriosa"
 
 #~ msgid "Weapons"
-#~ msgstr "armas"
+#~ msgstr "Armas"
 
 #~ msgid "Crafts"
-#~ msgstr "artesania"
+#~ msgstr "Artesanos"
 
 #~ msgid "Stats"
-#~ msgstr "Estadísticas"
+#~ msgstr "Status"
 
 #~ msgid "Total"
 #~ msgstr "Total"
 
 #~ msgid "Cost"
-#~ msgstr "Coste"
+#~ msgstr "Precio"
 
 #~ msgid "Attack:"
 #~ msgstr "Ataque:"
 
 #~ msgid "% Reflex:"
-#~ msgstr "% reflejos"
+#~ msgstr "% Reflexionar:"
 
 #~ msgid "Remaining Status Points: %d"
-#~ msgstr "puntos de estatus que te quedan: %d"
+#~ msgstr "Puntos de Status restantes: %d"
 
 #~ msgid "curl error "
-#~ msgstr "error: "
+#~ msgstr "Error de curl "
 
 #~ msgid " host: "
-#~ msgstr " anfitrion "
+#~ msgstr " host: "
 
 #~ msgid "Buddys"
-#~ msgstr "amigos"
+#~ msgstr "Amigos"
 
 #~ msgid "Party Window"
-#~ msgstr "ventana de grupo"
+#~ msgstr "Ventana de Grupo"
 
 #~ msgid "Unarmed"
-#~ msgstr "desarmado"
+#~ msgstr "Desarmado"
 
 #~ msgid "Knife"
-#~ msgstr "cuchillo"
+#~ msgstr "Navaja"
 
 #~ msgid "Sword"
-#~ msgstr "espada"
+#~ msgstr "Espada"
+
+#~ msgid "Polearm"
+#~ msgstr "Lanza"
 
 #~ msgid "Staff"
-#~ msgstr "arma de staff"
+#~ msgstr "Staff"
 
 #~ msgid "Whip"
-#~ msgstr "latigo"
+#~ msgstr "Whip"
 
 #~ msgid "Bow"
-#~ msgstr "arco"
+#~ msgstr "Arco"
 
 #~ msgid "Shooting"
-#~ msgstr "disparando"
+#~ msgstr "Tiro"
 
 #~ msgid "Mace"
-#~ msgstr "maza"
+#~ msgstr "Mazo"
 
 #~ msgid "Axe"
-#~ msgstr "hacha"
+#~ msgstr "Hacha"
 
 #~ msgid "Craft"
-#~ msgstr "artesanal"
+#~ msgstr "Embarcaciones"
 
 #~ msgid "Unknown Skill"
-#~ msgstr "habilidad desconocida"
+#~ msgstr "Habilidade desconocida"
 
 #~ msgid " can't be created, but it doesn't exist! Exiting."
-#~ msgstr " no se puede crear , pero no existe , saliendo..."
+#~ msgstr " No se puede crear, pero no existe! Saliendo."
 
 #~ msgid "Couldn't set "
-#~ msgstr "no se pudo configurar: "
+#~ msgstr "No se puede configurar "
 
 #~ msgid " video mode: "
-#~ msgstr " modo de video "
+#~ msgstr " modo de video: "
 
 #~ msgid "mana"
-#~ msgstr "TMW"
+#~ msgstr "Mana"
 
 #~ msgid "Connecting to character server..."
-#~ msgstr "conectando al servidor de personajes..."
+#~ msgstr "Conectando al servidor de personajes..."
 
 #~ msgid "Connecting to account server..."
-#~ msgstr "conectando al servidor de cuentas de usuario..."
+#~ msgstr "Conectando al servidor de cuentas..."
 
 #~ msgid "/new > Alias of create"
-#~ msgstr "new > lo mismo que create"
+#~ msgstr "/new > Alias de crear"
 
 #~ msgid "Command: /new <party-name>"
-#~ msgstr "Comando: /new <nombre del grupo>"
+#~ msgstr "Comando: /new <nombre-del-grupo>"
 
 #~ msgid "a"
-#~ msgstr "un(a)"
+#~ msgstr "una(o)"
 
 #~ msgid "Unnamed"
 #~ msgstr "Sin nombre"
 
 #~ msgid "@@pickup|Pick Up %s@@"
-#~ msgstr "@@pickup|Recoger %s@@"
+#~ msgstr "@@pegar|Coger %s@@"
 
 #~ msgid "Scroll radius"
-#~ msgstr "Ratio de scroll"
+#~ msgstr "Desplazar Radius"
 
 #~ msgid "Scroll laziness"
-#~ msgstr "Velocidad de scroll"
+#~ msgstr "Desplazar Laziness"
 
 #~ msgid "Unable to load selection.png"
 #~ msgstr "no se pudo cargar selection.png"
diff --git a/po/fr.po b/po/fr.po
index e67bf1537..15a107ddf 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,10 +8,10 @@ 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"
-"PO-Revision-Date: 2010-01-27 21:27+0000\n"
-"Last-Translator: JVC <Unknown>\n"
-"Language-Team: French\n"
+"POT-Creation-Date: 2011-01-06 03:06+0200\n"
+"PO-Revision-Date: 2010-12-29 00:51+0100\n"
+"Last-Translator: Yohann Ferreira <yohann ferreira orange fr>\n"
+"Language-Team: French <Yohann Ferreira <yohann ferreira orange efer>>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,45 +19,50 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
+"X-Poedit-Language: French\n"
+"X-Poedit-Country: FRANCE\n"
+
+#: src/being.cpp:481
+msgid "dodge"
+msgstr ""
+
+#: src/being.cpp:481
+msgid "miss"
+msgstr ""
 
 #: src/client.cpp:724 src/gui/setup.cpp:47 src/gui/windowmenu.cpp:92
 msgid "Setup"
 msgstr "Configuration"
 
 #: src/client.cpp:798
-#, fuzzy
 msgid "Connecting to server"
-msgstr "Connexion au serveur de cartes..."
+msgstr "Connexion au serveur"
 
 #: src/client.cpp:829
-#, fuzzy
 msgid "Logging in"
 msgstr "Connexion"
 
 #: src/client.cpp:862
 msgid "Entering game world"
-msgstr ""
+msgstr "Connexion au monde de jeu"
 
 #: src/client.cpp:953
-#, fuzzy
 msgid "Requesting characters"
-msgstr "Sélectionner votre personnnage"
+msgstr "Téléchargement des personnnages"
 
 #: src/client.cpp:984
-#, fuzzy
 msgid "Connecting to the game server"
-msgstr "Connexion au serveur de cartes..."
+msgstr "Connexion au serveur de jeu"
 
 #: src/client.cpp:994
-#, fuzzy
 msgid "Changing game servers"
-msgstr "Serveur"
+msgstr "Changement de serveur de jeu"
 
 #: src/client.cpp:1029 src/client.cpp:1036 src/client.cpp:1171
 #: src/gui/changeemaildialog.cpp:154 src/gui/changepassworddialog.cpp:144
-#: src/gui/charcreatedialog.cpp: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"
@@ -65,54 +70,50 @@ msgstr "Erreur"
 
 #: src/client.cpp:1045
 msgid "Requesting registration details"
-msgstr ""
+msgstr "Demande des paramètres d'enregistrement"
 
 #: src/client.cpp:1072
-#, fuzzy
 msgid "Password Change"
-msgstr "Mot de passe :"
+msgstr "Changement de mot de passe"
 
 #: src/client.cpp:1073
 msgid "Password changed successfully!"
-msgstr ""
+msgstr "Le mot de passe a été changé avec succès !"
 
 #: src/client.cpp:1092
-#, fuzzy
 msgid "Email Change"
-msgstr "Changer"
+msgstr "Changer d'email"
 
 #: src/client.cpp:1093
-#, fuzzy
 msgid "Email changed successfully!"
-msgstr "La promotion de ce membre a réussie."
+msgstr "L'adresse email a été changé avec succès !"
 
 #: src/client.cpp:1113
-#, fuzzy
 msgid "Unregister Successful"
-msgstr "Se désinscrire"
+msgstr "Désincription réussie"
 
 #: src/client.cpp:1114
 msgid "Farewell, come back any time..."
-msgstr ""
+msgstr "Adieu, revenez dès que vous le souhaitez..."
 
 #: src/client.cpp:1297 src/client.cpp:1323 src/client.cpp:1367
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
-msgstr ""
+msgstr "%s n'existe pas et ne peut pas être créé ! Fin du programme."
 
 #: src/client.cpp:1494
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid update host: %s"
-msgstr "Hôte de mise à jour incorrect : "
+msgstr "Hôte de mise à jour incorrect : %s"
 
 #: src/client.cpp:1528 src/client.cpp:1534
 msgid "Error creating updates directory!"
 msgstr "Impossible de créer le dossier de mise à jour !"
 
 #: src/client.cpp:1555
-#, c-format
+#, fuzzy, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
-msgstr ""
+msgstr "%s n'existe pas et ne peut pas être créé ! Fin du programme."
 
 #: src/commandhandler.cpp:264 src/commandhandler.cpp:477
 msgid "Unknown command."
@@ -167,36 +168,40 @@ msgstr "/q > Alias de query"
 #: src/commandhandler.cpp:310
 msgid "/away > Tell the other whispering players you're away from keyboard."
 msgstr ""
+"/away > Indique aux autres joueurs que vous n'êtes actuellement pas actif."
 
 #: src/commandhandler.cpp:313
 msgid "/ignore > ignore a player"
-msgstr ""
+msgstr "/ignore > Ignore un joueur"
 
 #: src/commandhandler.cpp:314
 msgid "/unignore > stop ignoring a player"
-msgstr ""
+msgstr "/unignore > Cesse d'ignorer un joueur"
 
 #: src/commandhandler.cpp:315
 #, fuzzy
 msgid "/ignoreall > Ignore all opened whisper tabs"
-msgstr "/close > Ferme l'onglet de conversation privée"
+msgstr "/ignore > Ignore l'autre joueur"
 
 #: src/commandhandler.cpp:316
+#, fuzzy
 msgid "/erase > Erase a player"
-msgstr ""
+msgstr "/ignore > Ignore un joueur"
 
 #: src/commandhandler.cpp:317
+#, fuzzy
 msgid "/befriend > Be friend a player"
-msgstr ""
+msgstr "/ignore > Ignore un joueur"
 
 #: src/commandhandler.cpp:318
 #, fuzzy
 msgid "/desregard > Disregard a player"
-msgstr "@@disregard|Négliger%s@@"
+msgstr "/ignore > Ignore un joueur"
 
 #: src/commandhandler.cpp:319
+#, fuzzy
 msgid "/neutral > Neutral a player"
-msgstr ""
+msgstr "/ignore > Ignore un joueur"
 
 #: src/commandhandler.cpp:321
 msgid "/list > Display all public channels"
@@ -207,14 +212,13 @@ msgid "/join > Join or create a channel"
 msgstr "/join > Rejoindre ou créer un salon."
 
 #: src/commandhandler.cpp:324
-#, fuzzy
 msgid "/createparty > Create a new party"
-msgstr "/create > Créer un nouveau groupe"
+msgstr "/createparty > Créer un nouveau groupe"
 
 #: src/commandhandler.cpp:325
 #, fuzzy
 msgid "/createguild > Create a new guild"
-msgstr "/create > Créer un nouveau groupe"
+msgstr "/createparty > Créer un nouveau groupe"
 
 #: src/commandhandler.cpp:326
 msgid "/party > Invite a user to party"
@@ -273,8 +277,9 @@ msgid "/imitation > Imitate player"
 msgstr ""
 
 #: src/commandhandler.cpp:346
+#, fuzzy
 msgid "/heal > Heal player"
-msgstr ""
+msgstr "/ignore > Ignore un joueur"
 
 #: src/commandhandler.cpp:347
 #, fuzzy
@@ -324,14 +329,12 @@ msgstr ""
 "précédente."
 
 #: src/commandhandler.cpp:379
-#, fuzzy
 msgid "Command: /ignore <player>"
-msgstr "Commande : /item <policy>"
+msgstr "Commande : /ignore <joueur>"
 
 #: src/commandhandler.cpp:380
-#, fuzzy
 msgid "This command ignores the given player regardless of current relations."
-msgstr "Cette commande affiche le nombre de joueurs actuellement connectés."
+msgstr "Cette commande ignore le joueur qu'il soit indiqué comme ami ou non."
 
 #: src/commandhandler.cpp:385
 msgid "Command: /join <channel>"
@@ -399,43 +402,39 @@ msgstr ""
 "Cette commande essaye de créer une fenêtre de dialogue entre vous et <nick>"
 
 #: src/commandhandler.cpp:417
-#, fuzzy
 msgid "Command: /away <afk reason>"
-msgstr "Commande : /w <nick> <message>"
+msgstr "Commande : /away <message d'absence>"
 
 #: src/commandhandler.cpp:418
 msgid "This command tells you're away from keyboard with the given reason."
 msgstr ""
+"Cette commande indique que vous n'êtes pas actif en indiquant la raison."
 
 #: src/commandhandler.cpp:420
-#, fuzzy
 msgid "Command: /away"
-msgstr "Commande : /who"
+msgstr "Commande : /away"
 
 #: src/commandhandler.cpp:421
-#, fuzzy
 msgid "This command clears the away status and message."
-msgstr "Cette commande change le sujet du salon en <message>"
+msgstr "Cette commande retire le statut absent."
 
 #: src/commandhandler.cpp:425
-#, fuzzy
 msgid "Command: /createparty <name>"
-msgstr "Commande : /create <party-name>"
+msgstr "Commande : /createparty <nom du groupe>"
 
 #: src/commandhandler.cpp:426
-#, fuzzy
 msgid "This command creates a new party called <name>."
-msgstr "Cette commande crée un nouveau groupe appelé <party-name>"
+msgstr "Cette commande crée un nouveau groupe appelé <name>"
 
 #: src/commandhandler.cpp:430
 #, fuzzy
 msgid "Command: /createguild <name>"
-msgstr "Commande : /create <party-name>"
+msgstr "Commande : /createparty <nom du groupe>"
 
 #: src/commandhandler.cpp:431
 #, fuzzy
 msgid "This command creates a new guild called <name>."
-msgstr "Cette commande crée un nouveau groupe appelé <party-name>"
+msgstr "Cette commande crée un nouveau groupe appelé <name>"
 
 #: src/commandhandler.cpp:435
 msgid "Command: /party <nick>"
@@ -488,13 +487,14 @@ msgid "This command displays the return toggle status."
 msgstr "Cette commande vous affiche le status du toggle courant."
 
 #: src/commandhandler.cpp:460 src/gui/widgets/whispertab.cpp:127
-#, fuzzy
 msgid "Command: /unignore <player>"
-msgstr "Commande : /item <policy>"
+msgstr "Commande : /unignore <joueur>"
 
 #: src/commandhandler.cpp:461
 msgid "This command stops ignoring the given player if they are being ignored"
 msgstr ""
+"Cette commande fait cesser d'ignorer le joueur donné s'il l'était "
+"précédemment."
 
 #: src/commandhandler.cpp:466
 msgid "Command: /where"
@@ -539,14 +539,13 @@ msgid "Party name is missing."
 msgstr "Indiquez un nom de groupe."
 
 #: src/commandhandler.cpp:601
-#, fuzzy
 msgid "Guild name is missing."
-msgstr "Indiquez un nom de groupe."
+msgstr "Le nom de la guilde est manquant."
 
 #: src/commandhandler.cpp:614 src/commandhandler.cpp:721
 #: src/commandhandler.cpp:762 src/commandhandler.cpp:792
 msgid "Please specify a name."
-msgstr ""
+msgstr "Veuillez indiquer un nom."
 
 #: src/commandhandler.cpp:655
 msgid "Return toggles chat."
@@ -582,45 +581,44 @@ msgstr "Neutre"
 #: src/commandhandler.cpp:729
 #, fuzzy, c-format
 msgid "Player already %s!"
-msgstr "Le message privé n'a pu être envoyé, le destinataire l'a ignoré."
+msgstr "Le joueur est déjà ignoré !"
 
 #: src/commandhandler.cpp:743
 #, fuzzy, c-format
 msgid "Player successfully %s!"
-msgstr "Création du groupe réussie."
+msgstr "Le joueur est désormais ignoré !"
 
 #: src/commandhandler.cpp:751
 #, fuzzy, c-format
 msgid "Player could not be %s!"
-msgstr "Le message privé n'a pu être envoyé, le destinataire l'a ignoré."
+msgstr "Le joueur n'a pas pu être ignoré !"
 
 #: src/commandhandler.cpp:773
 msgid "Player wasn't ignored!"
-msgstr ""
+msgstr "Le joueur n'était pas ignoré !"
 
 #: src/commandhandler.cpp:780
 msgid "Player no longer ignored!"
-msgstr ""
+msgstr "Le joueur n'est plus ignoré !"
 
 #: src/commandhandler.cpp:782
-#, fuzzy
 msgid "Player could not be unignored!"
-msgstr "Le message privé n'a pu être envoyé, le destinataire l'a ignoré."
+msgstr "Le joueur n'a pas pu être à nouveau écouté !"
 
 #: src/commandhandler.cpp:799
 #, fuzzy
 msgid "Player already erased!"
-msgstr "Le message privé n'a pu être envoyé, le destinataire l'a ignoré."
+msgstr "Le joueur est déjà ignoré !"
 
 #: src/commandhandler.cpp:810
 #, fuzzy
 msgid "Player successfully erased!"
-msgstr "Création du groupe réussie."
+msgstr "Le joueur est désormais ignoré !"
 
 #: src/commandhandler.cpp:812
 #, fuzzy
 msgid "Player could not be erased!"
-msgstr "Le message privé n'a pu être envoyé, le destinataire l'a ignoré."
+msgstr "Le joueur n'a pas pu être ignoré !"
 
 #: src/commandhandler.h:39
 #, c-format
@@ -635,19 +633,17 @@ msgstr "Général"
 
 #: src/game.cpp:223 src/gui/debugwindow.cpp:47 src/gui/widgets/chattab.cpp:392
 msgid "Debug"
-msgstr ""
+msgstr "Debug"
 
 #: src/game.cpp:435
-#, fuzzy
 msgid "Screenshot saved as "
-msgstr "Capture d'écran sauvegardée dans ~/"
+msgstr "Capture d'écran sauvegardée en tant que"
 
 #: src/game.cpp:443
 msgid "Saving screenshot failed!"
 msgstr "Impossible de sauvegarder la capture d'écran !"
 
 #: src/game.cpp:482
-#, fuzzy
 msgid "The connection to the server was lost."
 msgstr ""
 "La connexion au serveur a été coupée, le programme va maintenant se fermer."
@@ -664,20 +660,19 @@ 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
-#, fuzzy
+#: src/game.cpp:1376
 msgid "Could Not Load Map"
-msgstr "La localisation géographique n'a pu être chargé"
+msgstr "La carte 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"
 
 #: src/gui/beingpopup.cpp:89
-#, fuzzy, c-format
+#, c-format
 msgid "Party: %s"
-msgstr "Groupe (%s)"
+msgstr "Groupe : %s"
 
 #: src/gui/beingpopup.cpp:102
 #, fuzzy, c-format
@@ -690,9 +685,8 @@ msgid "Pvp rank: %d"
 msgstr ""
 
 #: src/gui/botcheckerwindow.cpp:264
-#, fuzzy
 msgid "Bot Checker"
-msgstr "Fenêtre d'emote"
+msgstr ""
 
 #: src/gui/botcheckerwindow.cpp:294 src/gui/setup_players.cpp:59
 msgid "Name"
@@ -747,7 +741,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 +763,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
@@ -788,24 +782,22 @@ msgid "Account: %s"
 msgstr "Compte : %s"
 
 #: src/gui/changeemaildialog.cpp:51
-#, fuzzy
 msgid "Type new email address twice:"
-msgstr "Entrer de nouveau la nouvelle adresse mail :"
+msgstr "Entrer l'adresse email deux fois :"
 
 #: src/gui/changeemaildialog.cpp:129
-#, fuzzy, c-format
+#, c-format
 msgid "The new email address needs to be at least %d characters long."
-msgstr "Le nom d'utilisateur doit faire au moins %d caractères."
+msgstr "L'adresse email doit être longue d'au moins %d caractères."
 
 #: src/gui/changeemaildialog.cpp:136
-#, fuzzy, c-format
+#, c-format
 msgid "The new email address needs to be less than %d characters long."
-msgstr "Le nom d'utilisateur doit faire moins de %d caractères."
+msgstr "L'adresse email ne doit pas être plus longue que %d caractères."
 
 #: src/gui/changeemaildialog.cpp:143
-#, fuzzy
 msgid "The email address entries mismatch."
-msgstr "Cette nouvelle adresse email existe déjà."
+msgstr "Les deux adresses email ne correspondent pas."
 
 #: src/gui/changepassworddialog.cpp:47 src/gui/changepassworddialog.cpp:56
 #: src/gui/charselectdialog.cpp:133
@@ -818,27 +810,26 @@ msgid "Password:"
 msgstr "Mot de passe :"
 
 #: src/gui/changepassworddialog.cpp:63
-#, fuzzy
 msgid "Type new password twice:"
-msgstr "Entrer une nouvelle fois le nouveau mot de passe :"
+msgstr "Entrer le mot de passe deux fois :"
 
 #: src/gui/changepassworddialog.cpp:111
 msgid "Enter the old password first."
-msgstr ""
+msgstr "Entrez d'abord l'ancien mot de passe."
 
 #: src/gui/changepassworddialog.cpp:117
-#, fuzzy, c-format
+#, c-format
 msgid "The new password needs to be at least %d characters long."
-msgstr "Le mot de passe doit faire au moins %d caractères."
+msgstr "Le mot de passe doit être long d'au moins %d caractères."
 
 #: src/gui/changepassworddialog.cpp:124
-#, fuzzy, c-format
+#, c-format
 msgid "The new password needs to be less than %d characters long."
-msgstr "Le mot de passe doit faire moins de %d caractères."
+msgstr "Le mot de passe ne doit pas être plus long que %d caractères."
 
 #: src/gui/changepassworddialog.cpp:131
 msgid "The new password entries mismatch."
-msgstr ""
+msgstr "Les anciens mots de passe ne correspondent pas."
 
 #: src/gui/charcreatedialog.cpp:53
 msgid "Create Character"
@@ -854,26 +845,24 @@ msgstr "Nom :"
 #: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
 #: src/gui/outfitwindow.cpp:77
 msgid ">"
-msgstr ""
+msgstr ">"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
 #: src/gui/outfitwindow.cpp:76
 msgid "<"
-msgstr ""
+msgstr "<"
 
 #: src/gui/charcreatedialog.cpp:74
-#, fuzzy
 msgid "Hair color:"
 msgstr "Couleur des cheveux :"
 
 #: src/gui/charcreatedialog.cpp:77
-#, fuzzy
 msgid "Hair style:"
-msgstr "Coupe :"
+msgstr "Coupe de cheveux :"
 
-#: 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 +875,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"
@@ -918,7 +907,7 @@ msgstr "Gestion du compte et du personnage"
 
 #: src/gui/charselectdialog.cpp:132
 msgid "Switch Login"
-msgstr ""
+msgstr "Changer de login"
 
 #: src/gui/charselectdialog.cpp:146 src/gui/unregisterdialog.cpp:47
 #: src/gui/unregisterdialog.cpp:55
@@ -926,24 +915,27 @@ msgid "Unregister"
 msgstr "Se désinscrire"
 
 #: src/gui/charselectdialog.cpp:155
-#, fuzzy
 msgid "Change Email"
-msgstr "Modifier l'adresse mail"
+msgstr "Modifier l'adresse 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 "Supprimer"
 
-#: src/gui/charselectdialog.cpp:425
-#, fuzzy
+#: src/gui/charselectdialog.cpp:433
 msgid "Choose"
-msgstr "Fermer"
+msgstr "Choisir"
+
+#: src/gui/charselectdialog.cpp:436
+#, fuzzy, c-format
+msgid "Level %d"
+msgstr "Niveau : %d"
 
-#: src/gui/charselectdialog.cpp:439 src/gui/charselectdialog.cpp:440
+#: src/gui/charselectdialog.cpp:447 src/gui/charselectdialog.cpp:448
 msgid "(empty)"
-msgstr ""
+msgstr "(vide)"
 
 #: src/gui/chat.cpp:91
 #, fuzzy
@@ -965,23 +957,20 @@ msgid "green"
 msgstr "Vert : "
 
 #: src/gui/chat.cpp:95
-#, fuzzy
 msgid "blue"
-msgstr "Bleu : "
+msgstr ""
 
 #: src/gui/chat.cpp:96
 msgid "gold"
 msgstr ""
 
 #: src/gui/chat.cpp:97
-#, fuzzy
 msgid "yellow"
-msgstr "léger"
+msgstr ""
 
 #: src/gui/chat.cpp:98
-#, fuzzy
 msgid "pink"
-msgstr "Lien"
+msgstr ""
 
 #: src/gui/chat.cpp:99
 msgid "purple"
@@ -1024,9 +1013,9 @@ msgid "Chat"
 msgstr "Conversation"
 
 #: src/gui/chat.cpp:554
-#, fuzzy, c-format
+#, c-format
 msgid "Present: %s; %d players are present."
-msgstr "%d joueurs sont présents."
+msgstr "Présents : %s ; %d joueurs sont présents."
 
 #: src/gui/chat.cpp:890
 #, c-format
@@ -1047,75 +1036,75 @@ msgid "Ignore"
 msgstr "Ignoré"
 
 #: src/gui/debugwindow.cpp:63 src/gui/debugwindow.cpp:74
-#, c-format
+#, fuzzy, c-format
 msgid "%d FPS (Software)"
-msgstr ""
+msgstr "%d FPS (OpenGL)"
 
 #: src/gui/debugwindow.cpp:67
-#, c-format
+#, fuzzy, c-format
 msgid "%d FPS (fast OpenGL)"
-msgstr ""
+msgstr "%d FPS (OpenGL)"
 
 #: src/gui/debugwindow.cpp:70
-#, c-format
+#, fuzzy, c-format
 msgid "%d FPS (old OpenGL)"
-msgstr ""
+msgstr "%d FPS (OpenGL)"
 
 #: src/gui/debugwindow.cpp:77
 #, c-format
 msgid "%d FPS"
-msgstr ""
+msgstr "%d FPS"
 
 #: src/gui/debugwindow.cpp:78 src/gui/debugwindow.cpp:181
 #: src/gui/debugwindow.cpp:204
 #, fuzzy
 msgid "Music:"
-msgstr "Sujet : %s"
+msgstr "Musique : %s"
 
 #: src/gui/debugwindow.cpp:79 src/gui/debugwindow.cpp:185
 #: src/gui/debugwindow.cpp:206
 #, fuzzy
 msgid "Map:"
-msgstr "Nom : %s"
+msgstr "Carte : %s"
 
 #: src/gui/debugwindow.cpp:80 src/gui/debugwindow.cpp:183
 #: src/gui/debugwindow.cpp:205
 #, fuzzy
 msgid "Minimap:"
-msgstr "Plan"
+msgstr "Plan : %s"
 
 #: src/gui/debugwindow.cpp:81
 #, c-format
 msgid "Cursor: (%d, %d)"
-msgstr ""
+msgstr "Curseur : (%d, %d)"
 
 #: src/gui/debugwindow.cpp:82 src/gui/debugwindow.cpp:192
-#, fuzzy, c-format
+#, c-format
 msgid "Particle count: %d"
-msgstr "Effets de particules"
+msgstr "Effets de particules : %d"
 
 #: src/gui/debugwindow.cpp:84
 #, fuzzy, c-format
 msgid "Map actors count: %d"
-msgstr "Caractéristiques du personnage Ok"
+msgstr "Points de personnage : %d"
 
 #: src/gui/debugwindow.cpp:90 src/gui/debugwindow.cpp:126
 #: src/gui/debugwindow.cpp:131
 #, fuzzy
 msgid "Player Position:"
-msgstr "Le joueur touche le monstre"
+msgstr "Joueurs"
 
 #: src/gui/debugwindow.cpp:91 src/gui/debugwindow.cpp:138
 #: src/gui/debugwindow.cpp:163
 #, fuzzy
 msgid "Target:"
-msgstr "Aller à gauche"
+msgstr "Cibler le PNJ"
 
 #: src/gui/debugwindow.cpp:92 src/gui/debugwindow.cpp:143
 #: src/gui/debugwindow.cpp:164
 #, fuzzy
 msgid "Target Id:"
-msgstr "Cibler le Joueur"
+msgstr "Cibler le PNJ"
 
 #: src/gui/debugwindow.cpp:93 src/gui/debugwindow.cpp:147
 #: src/gui/debugwindow.cpp:152 src/gui/debugwindow.cpp:165
@@ -1133,12 +1122,12 @@ msgstr "Cibler le Joueur"
 #: src/gui/debugwindow.cpp:167
 #, fuzzy
 msgid "Target Guild:"
-msgstr "Cibler le Joueur"
+msgstr "Créer une Guilde"
 
 #: src/gui/debugwindow.cpp:179 src/gui/debugwindow.cpp:202
 #, fuzzy
 msgid "Cursor:"
-msgstr "Curseur personnalisé"
+msgstr "Curseur : (%d, %d)"
 
 #: src/gui/debugwindow.cpp:196 src/gui/debugwindow.cpp:209
 msgid "Map actors count:"
@@ -1169,14 +1158,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,51 +1191,50 @@ 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
-#, fuzzy
+#: src/gui/popupmenu.cpp:1078 src/gui/popupmenu.cpp:1179
+#: src/gui/popupmenu.cpp:1217
 msgid "Drop..."
-msgstr "Jeter"
+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 ""
+msgstr "Tenues"
 
 #: src/gui/inventorywindow.cpp:114
 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"
@@ -1286,21 +1274,20 @@ msgstr ""
 #: src/gui/itemamount.cpp:279
 #, fuzzy
 msgid "Unknown."
-msgstr "Erreur inconnue"
+msgstr "Erreur inconnue."
 
 #: src/gui/itempopup.cpp:145
 msgid ", "
 msgstr ""
 
 #: src/gui/itempopup.cpp:152
-#, fuzzy, c-format
+#, c-format
 msgid "Weight: %s"
-msgstr "Poids : "
+msgstr "Poids : %s"
 
 #: src/gui/killstats.cpp:43 src/gui/windowmenu.cpp:65
-#, fuzzy
 msgid "Kill stats"
-msgstr "Fenêtre d'état"
+msgstr ""
 
 #: src/gui/killstats.cpp:61
 #, fuzzy
@@ -1444,7 +1431,6 @@ msgid "Custom update host"
 msgstr ""
 
 #: src/gui/login.cpp:106
-#, fuzzy
 msgid "Remember username"
 msgstr "Se souvenir du nom d'utilisateur"
 
@@ -1457,9 +1443,8 @@ msgid "Register"
 msgstr "S'inscrire"
 
 #: src/gui/login.cpp:117
-#, fuzzy
 msgid "Change Server"
-msgstr "Serveur"
+msgstr "Changer de Serveur"
 
 #: src/gui/minimap.cpp:46 src/gui/minimap.cpp:86
 msgid "Map"
@@ -1467,7 +1452,7 @@ msgstr "Plan"
 
 #: src/gui/ministatus.cpp:196
 msgid "Need"
-msgstr ""
+msgstr "Restant"
 
 #: src/gui/npcdialog.cpp:46
 msgid "Waiting for server"
@@ -1485,18 +1470,19 @@ 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"
+msgstr "Effacer le log"
 
 #. TRANSLATORS: Please leave the \n sequences intact.
 #: src/gui/npcdialog.cpp:200
-#, fuzzy
 msgid ""
 "\n"
 "> Next\n"
-msgstr "Suivant"
+msgstr ""
+"\n"
+"> Suivant\n"
 
 #: src/gui/npcpostdialog.cpp:45
 msgid "To:"
@@ -1513,7 +1499,7 @@ msgstr "Echec de l'envoi comme émetteur ou caractère invalide."
 #: src/gui/outfitwindow.cpp:78 src/gui/outfitwindow.cpp:832
 #, c-format
 msgid "Outfit: %d"
-msgstr ""
+msgstr "Tenue : %d"
 
 #: src/gui/outfitwindow.cpp:80 src/gui/outfitwindow.cpp:834
 #, fuzzy, c-format
@@ -1521,295 +1507,288 @@ msgid "Key: %s"
 msgstr "Argent : %s"
 
 #: src/gui/outfitwindow.cpp:83
-#, fuzzy
 msgid "Unequip first"
-msgstr "Retirer"
+msgstr "Retirer d'abord l'équipement"
 
 #: src/gui/outfitwindow.cpp:86
+#, fuzzy
 msgid "Away outfit"
-msgstr ""
+msgstr "Mettre la tenue"
 
-#: 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
-#, fuzzy
+#: src/gui/popupmenu.cpp:120 src/gui/popupmenu.cpp:290
 msgid "@@whisper|Whisper@@"
-msgstr "@@use|Utiliser@@"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:487
-#, fuzzy
+#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:488
 msgid "@@heal|Heal@@"
-msgstr "@@cancel|Annuler@@"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:130 src/gui/popupmenu.cpp:295
-#: src/gui/popupmenu.cpp:493
-#, fuzzy
+#: src/gui/popupmenu.cpp:130 src/gui/popupmenu.cpp:296
+#: src/gui/popupmenu.cpp:494
 msgid "@@friend|Befriend@@"
-msgstr "@@retrieve|Retirer@@"
+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|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@@"
+msgstr "Ignorer complètement"
 
-#: 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
-#, fuzzy
+#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:343
+#: src/gui/popupmenu.cpp:574
 msgid "@@guild|Invite to guild@@"
-msgstr "/party > Invite un utilisateur dans un groupe"
+msgstr ""
 
-#: 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
-#, fuzzy
+#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:230
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:537
 msgid "@@sell|Sell@@"
-msgstr "@@use|Utiliser@@"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:226
-#, fuzzy
+#: src/gui/popupmenu.cpp:227
 msgid "@@talk|Talk@@"
-msgstr "@@attack|Attaquer %s@@"
+msgstr ""
 
-#: 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@@"
+msgstr "Ajouter les noms dans le flux de 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@@"
+msgstr "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
+#, fuzzy
 msgid "@@remove map|Remove@@"
-msgstr ""
+msgstr "@@retrieve|Retirer@@"
 
-#: 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
-#, fuzzy
+#: src/gui/popupmenu.cpp:428
 msgid "@@edit spell|Edit spell@@"
-msgstr "@@use|Utiliser@@"
+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 "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"
+msgstr "Changer de Login"
 
-#: 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
-#, fuzzy
+#: src/gui/popupmenu.cpp:1120 src/gui/popupmenu.cpp:1188
+#: src/gui/popupmenu.cpp:1226
 msgid "Add to chat"
-msgstr "@@chat|Ajouter à la conversation@@"
+msgstr "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 ""
 
@@ -1858,7 +1837,6 @@ msgid "Passwords do not match."
 msgstr "Les deux mots de passe sont différents"
 
 #: src/gui/serverdialog.cpp:207
-#, fuzzy
 msgid "Choose Your Server"
 msgstr "Choisissez le serveur"
 
@@ -1867,23 +1845,20 @@ msgid "Port:"
 msgstr "Port :"
 
 #: src/gui/serverdialog.cpp:223
-#, fuzzy
 msgid "Server type:"
-msgstr "Serveur :"
+msgstr "Type de Serveur :"
 
 #: src/gui/serverdialog.cpp:245
 msgid "Load"
 msgstr ""
 
 #: src/gui/serverdialog.cpp:246
-#, fuzzy
 msgid "Connect"
 msgstr "Connexion..."
 
 #: src/gui/serverdialog.cpp:247
-#, fuzzy
 msgid "Custom Server"
-msgstr "Curseur personnalisé"
+msgstr "Serveur personnalisé"
 
 #: src/gui/serverdialog.cpp:351
 msgid "Please type both the address and the port of a server."
@@ -1892,29 +1867,28 @@ msgstr "Veuillez entrer l'adresse et le port du serveur."
 #: src/gui/serverdialog.cpp:482
 #, c-format
 msgid "Downloading server list...%2.2f%%"
-msgstr ""
+msgstr "Téléchargement de la liste des serveurs...%2.2f%%"
 
 #: src/gui/serverdialog.cpp:488
-#, fuzzy
 msgid "Waiting for server..."
-msgstr "Attente du serveur"
+msgstr "En attente du serveur..."
 
 #: src/gui/serverdialog.cpp:492
 msgid "Preparing download"
-msgstr ""
+msgstr "Préparation du téléchargement"
 
 #: src/gui/serverdialog.cpp:496
 msgid "Error retreiving server list!"
-msgstr ""
+msgstr "Erreur lors du téléchargement de la liste !"
 
 #: src/gui/serverdialog.cpp:593
 msgid "requires a newer version"
-msgstr ""
+msgstr "requiert une nouvelle version"
 
 #: src/gui/serverdialog.cpp:595
 #, c-format
 msgid "requires v%s"
-msgstr ""
+msgstr "requiert la v%s"
 
 #: src/gui/setup_audio.cpp:46
 msgid "Enable Audio"
@@ -1934,13 +1908,12 @@ msgid "Enable music"
 msgstr "Activer le joystick"
 
 #: src/gui/setup_audio.cpp:50
-#, fuzzy
 msgid "Enable mumble voice chat"
-msgstr "Activer le joystick"
+msgstr ""
 
 #: src/gui/setup_audio.cpp:52
 msgid "Download music"
-msgstr ""
+msgstr "Télécharger la musique"
 
 #: src/gui/setup_audio.cpp:57
 msgid "Audio"
@@ -1955,17 +1928,18 @@ msgid "Music volume"
 msgstr "Volume de la musique"
 
 #: src/gui/setup_audio.cpp:117
-#, fuzzy
 msgid "Notice"
-msgstr "Pas de texte"
+msgstr "Message"
 
 #: src/gui/setup_audio.cpp:117
 msgid "You may have to restart your client if you want to download new music"
 msgstr ""
+"Le client devra être redémarré afin de vous permettre de télécharger la "
+"musique."
 
 #: src/gui/setup_audio.cpp:130
 msgid "Sound Engine"
-msgstr ""
+msgstr "Moteur de son"
 
 #: src/gui/setup_chat.cpp:64
 msgid "Remove colors from received chat messages"
@@ -2001,21 +1975,19 @@ msgid "Show chat history"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:100
-#, fuzzy
 msgid "Enable battle tab"
-msgstr "Impossible d'acheter."
+msgstr ""
 
 #: src/gui/setup_chat.cpp:104
-#, fuzzy
 msgid "Show battle events"
-msgstr "Afficher le nom"
+msgstr ""
 
 #: src/gui/setup_chat.cpp:108
 msgid "Show chat colors list"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:111 src/gui/setup_chat.cpp:119
-#: src/gui/setup_other.cpp:135 src/gui/setup_other.cpp:139
+#: src/gui/setup_other.cpp:137 src/gui/setup_other.cpp:141
 msgid "Edit"
 msgstr ""
 
@@ -2036,50 +2008,45 @@ msgid "Colors"
 msgstr "Couleurs"
 
 #: src/gui/setup_colors.cpp:72
-#, fuzzy
 msgid "Type:"
 msgstr "Type : "
 
-#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:398
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:400
 msgid "Static"
 msgstr "Statique"
 
 #: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
-#: src/gui/setup_colors.cpp:399
+#: src/gui/setup_colors.cpp:401
 msgid "Pulse"
 msgstr "Impulsion"
 
 #: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:400
+#: src/gui/setup_colors.cpp:402
 msgid "Rainbow"
 msgstr "Arc-en-ciel"
 
 #: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:400
+#: src/gui/setup_colors.cpp:402
 msgid "Spectrum"
 msgstr "Spectre"
 
-#: src/gui/setup_colors.cpp:94 src/gui/setup_colors.cpp:310
-#, fuzzy
+#: src/gui/setup_colors.cpp:94 src/gui/setup_colors.cpp:312
 msgid "Delay:"
-msgstr "Retardé : "
+msgstr "Délai : "
 
 #: src/gui/setup_colors.cpp:109
-#, fuzzy
 msgid "Red:"
 msgstr "Rouge : "
 
 #: src/gui/setup_colors.cpp:124
-#, fuzzy
 msgid "Green:"
 msgstr "Vert : "
 
 #: src/gui/setup_colors.cpp:139
-#, fuzzy
 msgid "Blue:"
 msgstr "Bleu : "
 
-#: src/gui/setup_colors.cpp:305
+#: src/gui/setup_colors.cpp:307
 msgid "Alpha:"
 msgstr ""
 
@@ -2124,9 +2091,8 @@ msgid "Assign"
 msgstr "Assigner"
 
 #: src/gui/setup_keyboard.cpp:90
-#, fuzzy
 msgid "Unassign"
-msgstr "Assigner"
+msgstr "Désassigner"
 
 #: src/gui/setup_keyboard.cpp:94
 msgid "Default"
@@ -2136,99 +2102,100 @@ msgstr "Par défaut"
 msgid "Key Conflict(s) Detected."
 msgstr "Conflit(s) de touche détecté"
 
-#: src/gui/setup_other.cpp:92
+#: src/gui/setup_other.cpp:94
 msgid "Misc"
 msgstr ""
 
-#: src/gui/setup_other.cpp:95
+#: src/gui/setup_other.cpp:97
 msgid "Show damage inflicted to monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:100
+#: src/gui/setup_other.cpp:102
 msgid "Auto target only reachable monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:104
+#: src/gui/setup_other.cpp:106
 #, fuzzy
 msgid "Highlight map portals"
 msgstr "Surbrillance"
 
-#: src/gui/setup_other.cpp:109
+#: src/gui/setup_other.cpp:111
 msgid "Highlight player attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:114
+#: src/gui/setup_other.cpp:116
 msgid "Highlight monster attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:118
+#: src/gui/setup_other.cpp:120
 msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:121
-#, fuzzy
+#: src/gui/setup_other.cpp:123
 msgid "Cycle monster targets"
-msgstr "Afficher le nom"
+msgstr ""
 
-#: src/gui/setup_other.cpp:124
+#: src/gui/setup_other.cpp:126
 #, fuzzy
 msgid "Enable bot checker"
 msgstr "Activer le joystick"
 
-#: src/gui/setup_other.cpp:127
+#: src/gui/setup_other.cpp:129
 #, fuzzy
 msgid "Highlight floor items"
 msgstr "Surbrillance"
 
-#: src/gui/setup_other.cpp:130
+#: src/gui/setup_other.cpp:132
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:141
-#, fuzzy
+#: src/gui/setup_other.cpp:143
 msgid "Enable shop mode"
-msgstr "Activer / Désactiver les échanges"
+msgstr ""
 
-#: src/gui/setup_other.cpp:145
+#: src/gui/setup_other.cpp:147
 msgid "Enable buggy servers protection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:149
-#, fuzzy
+#: src/gui/setup_other.cpp:151
 msgid "Enable debug log"
-msgstr "Impossible d'acheter."
+msgstr ""
 
-#: src/gui/setup_other.cpp:153
-#, fuzzy
+#: src/gui/setup_other.cpp:155
 msgid "Enable server side attack"
-msgstr "Impossible d'acheter."
+msgstr ""
 
-#: src/gui/setup_other.cpp:157
+#: src/gui/setup_other.cpp:159
 msgid "Auto fix position"
 msgstr ""
 
-#: src/gui/setup_other.cpp:161
+#: src/gui/setup_other.cpp:163
 msgid "Attack while moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:165
+#: src/gui/setup_other.cpp:167
 #, fuzzy
 msgid "Enable quick stats"
 msgstr "Activer le joystick"
 
-#: src/gui/setup_other.cpp:169
+#: src/gui/setup_other.cpp:171
 #, fuzzy
 msgid "Show warps particles"
 msgstr "avec des particules"
 
-#: src/gui/setup_other.cpp:173
+#: src/gui/setup_other.cpp:175
 msgid "Accept sell/buy requests"
 msgstr ""
 
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:179
 msgid "Show monster hp bar"
 msgstr ""
 
+#: src/gui/setup_other.cpp:183
+#, fuzzy
+msgid "Show own hp bar"
+msgstr "Afficher son propre nom"
+
 #: src/gui/setup_players.cpp:60
 msgid "Relation"
 msgstr "Relation"
@@ -2270,9 +2237,8 @@ msgid "Put all whispers in tabs"
 msgstr "Placer tous les messages privés dans des onglets"
 
 #: src/gui/setup_players.cpp:248
-#, fuzzy
 msgid "Show gender"
-msgstr "Afficher le nom"
+msgstr "Afficher le genre"
 
 #: src/gui/setup_players.cpp:253
 msgid "Players"
@@ -2285,12 +2251,11 @@ msgstr "Quand ignoré :"
 #: src/gui/setup_players.cpp:301
 #, fuzzy
 msgid "Show level"
-msgstr "Afficher le nom"
+msgstr "Afficher le genre"
 
 #: src/gui/setup_players.cpp:305
-#, fuzzy
 msgid "Show own name"
-msgstr "Afficher le nom"
+msgstr "Afficher son propre nom"
 
 #: src/gui/setup_players.cpp:309
 #, fuzzy
@@ -2316,7 +2281,7 @@ msgstr ""
 #: src/gui/setup_theme.cpp:112
 #, fuzzy
 msgid "Particle font"
-msgstr "Effets de particules"
+msgstr "Effets de particules : %d"
 
 #: src/gui/setup_theme.cpp:113
 #, fuzzy
@@ -2326,7 +2291,7 @@ msgstr "Aide"
 #: src/gui/setup_theme.cpp:223
 #, fuzzy
 msgid "Theme Changed"
-msgstr "Changer"
+msgstr "Changer d'email"
 
 #: src/gui/setup_theme.cpp:224 src/gui/setup_video.cpp:714
 #: src/gui/setup_video.cpp:719
@@ -2434,7 +2399,7 @@ msgstr "Effets de particules"
 
 #: src/gui/setup_video.cpp:284
 msgid "Log NPC dialogue"
-msgstr ""
+msgstr "Loguer les conversations avec les PNJ"
 
 #: src/gui/setup_video.cpp:285
 msgid "Show pickup notification"
@@ -2475,9 +2440,8 @@ msgid "Show job"
 msgstr ""
 
 #: src/gui/setup_video.cpp:301
-#, fuzzy
 msgid "Enable opacity cache"
-msgstr "Activer le joystick"
+msgstr ""
 
 #: src/gui/setup_video.cpp:302
 #, fuzzy
@@ -2485,7 +2449,6 @@ msgid "Show background"
 msgstr "Arrière-plan"
 
 #: src/gui/setup_video.cpp:307
-#, fuzzy
 msgid "FPS limit:"
 msgstr "Limite FPS :"
 
@@ -2512,7 +2475,6 @@ msgid "Ambient FX"
 msgstr "Effets ambiants"
 
 #: src/gui/setup_video.cpp:329
-#, fuzzy
 msgid "Particle detail"
 msgstr "Détail des particules"
 
@@ -2523,24 +2485,24 @@ msgstr "Taille de police"
 #: src/gui/setup_video.cpp:348 src/gui/setup_video.cpp:351
 #: src/gui/setup_video.cpp:645 src/gui/setup_video.cpp:796
 #: src/gui/setup_video.cpp:807
-#, fuzzy
 msgid "None"
-msgstr "Non"
+msgstr "Rien"
 
 #: src/gui/setup_video.cpp:528
-#, fuzzy
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
-msgstr "le mode et la restauration du vieux mode ont également échoué !"
+msgstr ""
+"Impossible de passer en mode fenêtré, et l'ancienne résolution n'est "
+"également pas accessible !"
 
 #: src/gui/setup_video.cpp:534
-#, fuzzy
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
-msgstr "le mode et la restauration du vieux mode ont également échoué !"
+msgstr ""
+"Impossible de passer en mode plein-écran, et l'ancienne résolution n'est "
+"également pas accessible !"
 
 #: src/gui/setup_video.cpp:545
-#, fuzzy
 msgid "Switching to Full Screen"
 msgstr "Passage en plein écran"
 
@@ -2550,9 +2512,8 @@ msgstr ""
 "Les changements ne seront pris en compte qu'au prochain démarrage du jeu."
 
 #: src/gui/setup_video.cpp:558
-#, fuzzy
 msgid "Changing to OpenGL"
-msgstr "Changement OpenGL"
+msgstr "Activation d'OpenGL"
 
 #: src/gui/setup_video.cpp:559
 msgid "Applying change to OpenGL requires restart."
@@ -2568,18 +2529,18 @@ msgid "Enter new resolution:                "
 msgstr ""
 
 #: src/gui/setup_video.cpp:713 src/gui/setup_video.cpp:718
-#, fuzzy
 msgid "Screen Resolution Changed"
-msgstr "Résolution de l'écran changée"
+msgstr "Résolution de l'écran modifiée"
 
 #: src/gui/setup_video.cpp:716
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
+"Certaines fenêtre pourraient avoir été recentrée pour correspondre à la "
+"nouvelle résolution."
 
 #: src/gui/setup_video.cpp:750
-#, fuzzy
 msgid "Particle Effect Settings Changed."
-msgstr "Paramètres d'effet de particules changés."
+msgstr "Paramètres d'effet de particules modifiés."
 
 #: src/gui/setup_video.cpp:751
 msgid "Changes will take effect on map change."
@@ -2628,27 +2589,27 @@ msgid "Up"
 msgstr "Augmenter"
 
 #: src/gui/skilldialog.cpp:290
-#, fuzzy, c-format
+#, c-format
 msgid "Skill points available: %d"
 msgstr "Points de compétences : %d"
 
 #: src/gui/skilldialog.cpp:374
-#, fuzzy, c-format
+#, c-format
 msgid "Skill Set %d"
-msgstr "Points de compétences : %d"
+msgstr "Compétences : %d"
 
 #: src/gui/skilldialog.cpp:384
-#, fuzzy, c-format
+#, c-format
 msgid "Skill %d"
-msgstr "Compétences"
+msgstr "Compétence %d"
 
 #: src/gui/skilldialog.cpp:469
-#, fuzzy, c-format
+#, c-format
 msgid "Lvl: %d (%+d)"
-msgstr "Niveau : %d"
+msgstr "Niveau : %d (%+d)"
 
 #: src/gui/skilldialog.cpp:477
-#, fuzzy, c-format
+#, c-format
 msgid "Lvl: %d"
 msgstr "Niveau : %d"
 
@@ -2659,64 +2620,62 @@ msgstr "Guilde"
 #: src/gui/socialwindow.cpp:143
 #, c-format
 msgid "Invited user %s to guild %s."
-msgstr ""
+msgstr "Le joueur %s a été invité dans la guilde %s."
 
 #: src/gui/socialwindow.cpp:157
-#, fuzzy, c-format
+#, c-format
 msgid "Guild %s quit requested."
-msgstr "Guilde créée."
+msgstr "Demande pour quitter la guilde %s effectuée."
 
 #: src/gui/socialwindow.cpp:184
 msgid "Member Invite to Guild"
-msgstr ""
+msgstr "Inviter le membre de la guilde"
 
 #: src/gui/socialwindow.cpp:185
 #, c-format
 msgid "Who would you like to invite to guild %s?"
-msgstr ""
+msgstr "Qui voudriez-vous inviter dans la guilde %s ?"
 
 #: src/gui/socialwindow.cpp:194
-#, fuzzy
 msgid "Leave Guild?"
-msgstr "Créer une Guilde"
+msgstr "Quitter la guilde ?"
 
 #: src/gui/socialwindow.cpp:195
-#, fuzzy, c-format
+#, c-format
 msgid "Are you sure you want to leave guild %s?"
-msgstr "Êtes-vous sûr de vouloir sortir ?"
+msgstr "Êtes-vous sûr de vouloir quitter la guilde %s ?"
 
 #: src/gui/socialwindow.cpp:212 src/net/tmwa/gui/partytab.cpp:47
 msgid "Party"
 msgstr "Groupe"
 
 #: src/gui/socialwindow.cpp:240
-#, fuzzy, c-format
+#, c-format
 msgid "Invited user %s to party."
-msgstr "/party > Invite un utilisateur dans un groupe"
+msgstr "/party > Inviter l'utilisateur %s dans le groupe."
 
 #: src/gui/socialwindow.cpp:254
 #, c-format
 msgid "Party %s quit requested."
-msgstr ""
+msgstr "Vous avez demandé à quitter le groupe %s."
 
 #: src/gui/socialwindow.cpp:281
-#, fuzzy
 msgid "Member Invite to Party"
-msgstr "/party > Invite un utilisateur dans un groupe"
+msgstr "Inviter un joueur dans le groupe"
 
 #: src/gui/socialwindow.cpp:282
 #, c-format
 msgid "Who would you like to invite to party %s?"
-msgstr ""
+msgstr "Qui voudriez vous inviter dans le groupe %s ?"
 
 #: src/gui/socialwindow.cpp:291
 msgid "Leave Party?"
-msgstr ""
+msgstr "Quitter le groupe ?"
 
 #: src/gui/socialwindow.cpp:292
-#, fuzzy, c-format
+#, c-format
 msgid "Are you sure you want to leave party %s?"
-msgstr "Êtes-vous sûr de vouloir sortir ?"
+msgstr "Êtes-vous sûr de vouloir quitter le groupe %s ?"
 
 #: src/gui/socialwindow.cpp:514
 msgid "Nav"
@@ -2727,79 +2686,73 @@ msgid "Create Guild"
 msgstr "Créer une Guilde"
 
 #: src/gui/socialwindow.cpp:784 src/gui/socialwindow.cpp:1186
-#, fuzzy
 msgid "Create Party"
-msgstr "Création du personnage"
+msgstr "Créer un groupe"
 
 #: src/gui/socialwindow.cpp:826 src/gui/windowmenu.cpp:87
 msgid "Social"
-msgstr ""
+msgstr "Social"
 
 #: src/gui/socialwindow.cpp:847
-#, fuzzy
 msgid "Invite"
-msgstr "Inviter un utilisateur"
+msgstr "Inviter"
 
 #: src/gui/socialwindow.cpp:848
-#, fuzzy
 msgid "Leave"
-msgstr "Grand"
+msgstr "Quitter"
 
 #: src/gui/socialwindow.cpp:975
-#, fuzzy, c-format
+#, c-format
 msgid "Accepted party invite from %s."
-msgstr "Invitation acceptée de la part de %s."
+msgstr "Invitation dans le groupe acceptée de la part de %s."
 
 #: src/gui/socialwindow.cpp:985
-#, fuzzy, c-format
+#, c-format
 msgid "Rejected party invite from %s."
-msgstr "Invitation refusée de la part de %s."
+msgstr "Invitation dans le groupe de la part de %s refusée."
 
 #: src/gui/socialwindow.cpp:1002
-#, fuzzy, c-format
+#, c-format
 msgid "Accepted guild invite from %s."
-msgstr "Invitation acceptée de la part de %s."
+msgstr "Invitation dans la guilde acceptée de la part de %s."
 
 #: src/gui/socialwindow.cpp:1012
-#, fuzzy, c-format
+#, c-format
 msgid "Rejected guild invite from %s."
-msgstr "Invitation refusée de la part de %s."
+msgstr "Invitation dans la guilde de la part de %s refusée."
 
 #: src/gui/socialwindow.cpp:1056
-#, fuzzy, c-format
+#, c-format
 msgid "Creating guild called %s."
-msgstr "Erreur lors de la création de la guilde."
+msgstr "La guilde %s a été créée."
 
 #: src/gui/socialwindow.cpp:1079
 #, c-format
 msgid "Creating party called %s."
-msgstr ""
+msgstr "Le groupe %s a été créé."
 
 #: src/gui/socialwindow.cpp:1093
-#, fuzzy
 msgid "Guild Name"
-msgstr "Guilde"
+msgstr "Nom de la guilde"
 
 #: src/gui/socialwindow.cpp:1094
-#, fuzzy
 msgid "Choose your guild's name."
-msgstr "Choisissez le serveur"
+msgstr "Choisissez le nom de la guilde."
 
 #: src/gui/socialwindow.cpp:1108
-#, fuzzy
 msgid "Received guild request, but one already exists."
 msgstr ""
-"Vous avez reçu une demande de rejoindre un groupe, mais il en existe déjà un."
+"Vous avez reçu une demande pour rejoindre une guilde, mais il en existe déjà "
+"une autre."
 
 #: src/gui/socialwindow.cpp:1114
-#, fuzzy, c-format
+#, c-format
 msgid "%s has invited you to join the guild %s."
-msgstr "%s vous a invité à rejoindre le groupe %s."
+msgstr "%s vous a invité à rejoindre la guilde %s."
 
 #: src/gui/socialwindow.cpp:1120
-#, fuzzy
 msgid "Accept Guild Invite"
-msgstr "Accepter l'invitation pour ce groupe"
+msgstr "Accepter l'invitation dans cette guilde"
 
 #: src/gui/socialwindow.cpp:1135
 msgid "Received party request, but one already exists."
@@ -2807,14 +2760,13 @@ msgstr ""
 "Vous avez reçu une demande de rejoindre un groupe, mais il en existe déjà un."
 
 #: src/gui/socialwindow.cpp:1146
-#, fuzzy
 msgid "You have been invited you to join a party."
-msgstr "%s vous a invité à rejoindre son groupe."
+msgstr "Vous avez été invité à rejoindre un groupe."
 
 #: src/gui/socialwindow.cpp:1150
-#, fuzzy, c-format
+#, c-format
 msgid "You have been invited to join the %s party."
-msgstr "%s vous a invité à rejoindre le groupe %s."
+msgstr "Vous avez été invité à rejoindre le groupe %s."
 
 #: src/gui/socialwindow.cpp:1158
 #, c-format
@@ -2832,21 +2784,19 @@ msgstr "Accepter l'invitation pour ce groupe"
 
 #: src/gui/socialwindow.cpp:1187
 msgid "Cannot create party. You are already in a party"
-msgstr ""
+msgstr "Ne peut pas créer un groupe. Vous faites déjà partie d'un groupe."
 
 #: src/gui/socialwindow.cpp:1192
-#, fuzzy
 msgid "Party Name"
-msgstr "Groupe"
+msgstr "Nom du groupe"
 
 #: src/gui/socialwindow.cpp:1193
-#, fuzzy
 msgid "Choose your party's name."
-msgstr "Choisissez le serveur"
+msgstr "Choisissez le nom du groupe."
 
 #: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:83
 msgid "Specials"
-msgstr ""
+msgstr "Cpt. spéciales"
 
 #: src/gui/statuswindow.cpp:126 src/gui/statuswindow.cpp:252
 #: src/gui/statuswindow.cpp:311
@@ -2882,24 +2832,24 @@ msgid "Job:"
 msgstr "Habilité :"
 
 #: src/gui/statuswindow.cpp:241 src/gui/statuswindow.cpp:285
-#, fuzzy, c-format
+#, c-format
 msgid "Character points: %d"
-msgstr "Caractéristiques du personnage Ok"
+msgstr "Points de personnage : %d"
 
 #: src/gui/statuswindow.cpp:247
 #, fuzzy, c-format
 msgid "Level: %d (GM %d)"
-msgstr "Niveau : %d"
+msgstr "Niveau : %d (%+d)"
 
 #: src/gui/statuswindow.cpp:299
-#, fuzzy, c-format
+#, c-format
 msgid "Correction points: %d"
-msgstr "Points de compétences : %d"
+msgstr "Points de correction : %d"
 
 #: src/gui/textcommandeditor.cpp:109
 #, fuzzy
 msgid "No Target"
-msgstr "Aller à gauche"
+msgstr "Cibler le PNJ"
 
 #: src/gui/textcommandeditor.cpp:110
 #, fuzzy
@@ -2907,9 +2857,8 @@ msgid "Allow Target"
 msgstr "Autoriser les échanges"
 
 #: src/gui/textcommandeditor.cpp:111
-#, fuzzy
 msgid "Need Target"
-msgstr "Aller à gauche"
+msgstr ""
 
 #: src/gui/textcommandeditor.cpp:116
 #, fuzzy
@@ -2941,7 +2890,7 @@ msgstr ""
 #: src/gui/textcommandeditor.cpp:164
 #, fuzzy
 msgid "Command Editor"
-msgstr "Commande : /item"
+msgstr "Commande : /ignore"
 
 #: src/gui/textcommandeditor.cpp:181
 #, fuzzy
@@ -2984,9 +2933,8 @@ msgid "Magic School:"
 msgstr ""
 
 #: src/gui/textcommandeditor.cpp:223
-#, fuzzy
 msgid "School level:"
-msgstr "Afficher le nom"
+msgstr ""
 
 #: src/gui/textcommandeditor.cpp:228
 msgid "Save"
@@ -3017,9 +2965,9 @@ msgid "Trade"
 msgstr "Échange"
 
 #: src/gui/trade.cpp:107 src/gui/trade.cpp:148
-#, fuzzy, c-format
+#, c-format
 msgid "You get %s"
-msgstr "Vous recevez %s."
+msgstr "Vous recevez %s"
 
 #: src/gui/trade.cpp:108
 msgid "You give:"
@@ -3067,164 +3015,168 @@ msgstr "##1 Il est fortement recommandé que"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
 #: src/gui/updatewindow.cpp:538
-#, fuzzy
 msgid "##1  you try again later."
-msgstr "##1 vous réessayez plus tard"
+msgstr "##1 Essayez à nouveau plus tard"
 
 #: src/gui/updatewindow.cpp:663
 msgid "Completed"
 msgstr "Terminé"
 
-#: src/gui/userpalette.cpp:109
+#: src/gui/userpalette.cpp:111
 msgid "Being"
 msgstr "Forme de vie"
 
-#: src/gui/userpalette.cpp:110
+#: src/gui/userpalette.cpp:112
 #, fuzzy
 msgid "Friend Names"
 msgstr "Ami"
 
-#: src/gui/userpalette.cpp:111
+#: src/gui/userpalette.cpp:113
 #, fuzzy
 msgid "Disregarded Names"
 msgstr "Négligé"
 
-#: src/gui/userpalette.cpp:112
+#: src/gui/userpalette.cpp:114
 #, fuzzy
 msgid "Ignored Names"
-msgstr "Ignoré"
+msgstr "Ignorer %s"
 
-#: src/gui/userpalette.cpp:113
+#: src/gui/userpalette.cpp:115
 #, fuzzy
 msgid "Erased Names"
 msgstr "Nom des MJ"
 
-#: src/gui/userpalette.cpp:114
+#: src/gui/userpalette.cpp:116
 msgid "Other Players' Names"
 msgstr "Nom des autres joueurs"
 
-#: src/gui/userpalette.cpp:115
+#: src/gui/userpalette.cpp:117
 msgid "Own Name"
 msgstr "Mon nom"
 
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:118
 msgid "GM Names"
 msgstr "Nom des MJ"
 
-#: src/gui/userpalette.cpp:117
+#: src/gui/userpalette.cpp:119
 msgid "NPCs"
 msgstr "PNJs"
 
-#: src/gui/userpalette.cpp:118
+#: src/gui/userpalette.cpp:120
 msgid "Monsters"
 msgstr "Monstres"
 
-#: src/gui/userpalette.cpp:119
+#: src/gui/userpalette.cpp:121
 #, fuzzy
 msgid "Monster HP bar"
 msgstr "Le monstre touche le joueur"
 
-#: src/gui/userpalette.cpp:121
+#: src/gui/userpalette.cpp:123
 msgid "Monster HP bar (second color)"
 msgstr ""
 
-#: src/gui/userpalette.cpp:122
-#, fuzzy
+#: src/gui/userpalette.cpp:124
 msgid "Party Members"
-msgstr "Groupe"
+msgstr "Membres du groupe"
 
-#: src/gui/userpalette.cpp:123
-#, fuzzy
+#: src/gui/userpalette.cpp:125
 msgid "Guild Members"
-msgstr "Guilde"
+msgstr "Membres de la guilde"
 
-#: src/gui/userpalette.cpp:124
+#: src/gui/userpalette.cpp:126
 msgid "Particle Effects"
 msgstr "Effets de particules"
 
-#: src/gui/userpalette.cpp:125
+#: src/gui/userpalette.cpp:127
 msgid "Pickup Notification"
 msgstr "Information de récupération"
 
-#: src/gui/userpalette.cpp:126
+#: src/gui/userpalette.cpp:128
 msgid "Exp Notification"
 msgstr "Information d'expérience"
 
-#: src/gui/userpalette.cpp:127
+#: src/gui/userpalette.cpp:129
 #, fuzzy
-msgid "Player Hits Monster"
-msgstr "Le joueur touche le monstre"
+msgid "Player HP bar"
+msgstr "Joueur"
 
-#: src/gui/userpalette.cpp:128
+#: src/gui/userpalette.cpp:131
+msgid "Player HP bar (second color)"
+msgstr ""
+
+#: src/gui/userpalette.cpp:132
 #, fuzzy
+msgid "Player Hits Monster"
+msgstr "L'autre joueur touche le monstre"
+
+#: src/gui/userpalette.cpp:133
 msgid "Monster Hits Player"
 msgstr "Le monstre touche le joueur"
 
-#: src/gui/userpalette.cpp:130
+#: src/gui/userpalette.cpp:135
 #, fuzzy
 msgid "Other Player Hits Local Player"
-msgstr "Nom des autres joueurs"
+msgstr "L'autre joueur touche le monstre"
 
-#: src/gui/userpalette.cpp:131
+#: src/gui/userpalette.cpp:136
 msgid "Critical Hit"
 msgstr "Coup critique"
 
-#: src/gui/userpalette.cpp:133
-#, fuzzy
+#: src/gui/userpalette.cpp:138
 msgid "Local Player Hits Monster"
-msgstr "Le joueur touche le monstre"
+msgstr "Votre personnage touche le monstre"
 
-#: src/gui/userpalette.cpp:135
-#, fuzzy
+#: src/gui/userpalette.cpp:140
 msgid "Local Player Critical Hit"
-msgstr "Le joueur touche le monstre"
+msgstr "Coup critique"
 
-#: src/gui/userpalette.cpp:137
-#, fuzzy
+#: src/gui/userpalette.cpp:142
 msgid "Local Player Miss"
-msgstr "Sauvegarder la liste de joueurs"
+msgstr "Votre personnage manque son coup"
 
-#: src/gui/userpalette.cpp:138
+#: src/gui/userpalette.cpp:143
 msgid "Misses"
 msgstr "Coups manqués"
 
-#: src/gui/userpalette.cpp:139
+#: src/gui/userpalette.cpp:144
 #, fuzzy
 msgid "Portal Highlight"
 msgstr "Onglet mis en surbrillance"
 
-#: src/gui/userpalette.cpp:141
+#: src/gui/userpalette.cpp:146
 #, fuzzy
 msgid "Collision Highlight"
 msgstr "Surbrillance"
 
-#: src/gui/userpalette.cpp:143
+#: src/gui/userpalette.cpp:148
 #, fuzzy
 msgid "Walkable Highlight"
 msgstr "Onglet mis en surbrillance"
 
-#: src/gui/userpalette.cpp:145
+#: src/gui/userpalette.cpp:150
+#, fuzzy
 msgid "Local Player Attack Range"
-msgstr ""
+msgstr "Votre personnage touche le monstre"
 
-#: src/gui/userpalette.cpp:147
+#: src/gui/userpalette.cpp:152
+#, fuzzy
 msgid "Local Player Attack Range Border"
-msgstr ""
+msgstr "Votre personnage touche le monstre"
 
-#: src/gui/userpalette.cpp:149
+#: src/gui/userpalette.cpp:154
 #, fuzzy
 msgid "Monster Attack Range"
 msgstr "Le monstre touche le joueur"
 
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:156
 msgid "Home Place"
 msgstr ""
 
-#: src/gui/userpalette.cpp:153
+#: src/gui/userpalette.cpp:158
 msgid "Home Place Border"
 msgstr ""
 
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:160
 msgid "Road Point"
 msgstr ""
 
@@ -3248,6 +3200,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"
@@ -3337,17 +3293,17 @@ msgid "Global announcement from %s:"
 msgstr "Annonce globale de %s :"
 
 #: src/gui/widgets/chattab.cpp:177
-#, fuzzy, c-format
+#, c-format
 msgid "%s whispers: %s"
-msgstr "Message privé de %s : "
+msgstr "Message privé de %s : %s"
 
 #: src/gui/widgets/whispertab.cpp:104
 msgid "/ignore > Ignore the other player"
-msgstr ""
+msgstr "/ignore > Ignore l'autre joueur"
 
 #: src/gui/widgets/whispertab.cpp:105
 msgid "/unignore > Stop ignoring the other player"
-msgstr ""
+msgstr "/unignore > Cesse d'ignorer l'autre joueur"
 
 #: src/gui/widgets/whispertab.cpp:106
 msgid "/close > Close the whisper tab"
@@ -3362,30 +3318,26 @@ msgid "This command closes the current whisper tab."
 msgstr "Cette commande ferme l'onglet courant de conversation privée."
 
 #: src/gui/widgets/whispertab.cpp:121
-#, fuzzy
 msgid "Command: /ignore"
-msgstr "Commande : /item"
+msgstr "Commande : /ignore"
 
 #: src/gui/widgets/whispertab.cpp:122
-#, fuzzy
 msgid "This command ignores the other player regardless of current relations."
-msgstr "Cette commande affiche le nombre de joueurs actuellement connectés."
+msgstr ""
+"Cette commande permet d'ignorer un joueur qu'il soit indiqué comme ami ou "
+"non."
 
 #: src/gui/widgets/whispertab.cpp:128
-#, fuzzy
 msgid "This command stops ignoring the other player if they are being ignored."
-msgstr ""
-"Cette commande active l'enregistrement de la conversation dans le fichier "
-"<filename>."
+msgstr "Cette commande vous fait cesser d'ignorer un joueur si c'était le cas."
 
 #: src/gui/windowmenu.cpp:61
 msgid "BC"
 msgstr ""
 
 #: src/gui/windowmenu.cpp:61
-#, fuzzy
 msgid "Bot checker"
-msgstr "Fenêtre d'emote"
+msgstr ""
 
 #: src/gui/windowmenu.cpp:63
 msgid "ONL"
@@ -3454,19 +3406,16 @@ msgid "SET"
 msgstr ""
 
 #: src/gui/worldselectdialog.cpp:74
-#, fuzzy
 msgid "Select World"
-msgstr "Sélectionner OK"
+msgstr "Sélection du monde"
 
 #: src/gui/worldselectdialog.cpp:79
-#, fuzzy
 msgid "Change Login"
-msgstr "Changer"
+msgstr "Changer de Login"
 
 #: src/gui/worldselectdialog.cpp:80
-#, fuzzy
 msgid "Choose World"
-msgstr "Choisissez le serveur"
+msgstr "Choix du monde"
 
 #: src/keyboardconfig.cpp:41
 msgid "Move Up"
@@ -3520,7 +3469,7 @@ msgstr "Arrêter d'attaquer"
 #: src/keyboardconfig.cpp:61
 #, fuzzy
 msgid "Target Closest"
-msgstr "Cible la plus proche"
+msgstr "Cibler un monstre"
 
 #: src/keyboardconfig.cpp:63
 msgid "Target NPC"
@@ -3557,7 +3506,7 @@ msgstr "Activer / Désactiver les échanges"
 #: src/keyboardconfig.cpp:74
 #, fuzzy
 msgid "Change Map View Mode"
-msgstr "Modifier l'adresse mail"
+msgstr "Changer le mot de passe"
 
 #: src/keyboardconfig.cpp:76
 #, fuzzy
@@ -3619,18 +3568,16 @@ msgid "Debug Window"
 msgstr "Fenêtre de debug"
 
 #: src/keyboardconfig.cpp:136
-#, fuzzy
 msgid "Social Window"
-msgstr "Fenêtre de compétences"
+msgstr "Groupes et Guildes"
 
 #: src/keyboardconfig.cpp:138
 msgid "Emote Shortcut Window"
 msgstr "Fenêtre de raccourcis d'emote"
 
 #: src/keyboardconfig.cpp:140
-#, fuzzy
 msgid "Outfits Window"
-msgstr "Fenêtre d'état"
+msgstr "Fenêtre des tenues"
 
 #: src/keyboardconfig.cpp:142
 #, fuzzy
@@ -3640,7 +3587,7 @@ msgstr "Fenêtre de configuration"
 #: src/keyboardconfig.cpp:143
 #, fuzzy
 msgid "Quick drop Window"
-msgstr "Cacher les fenêtres"
+msgstr "Fenêtre de configuration"
 
 #: src/keyboardconfig.cpp:145
 #, fuzzy
@@ -3650,7 +3597,7 @@ msgstr "Fenêtre d'état"
 #: src/keyboardconfig.cpp:147
 #, fuzzy
 msgid "Commands Window"
-msgstr "Commande : /item"
+msgstr "Commande : /ignore"
 
 #: src/keyboardconfig.cpp:149
 #, fuzzy
@@ -3692,180 +3639,183 @@ 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 ""
+msgstr "Mettre la tenue"
 
-#: src/keyboardconfig.cpp:248
+#: src/keyboardconfig.cpp:252
 msgid "Copy Outfit"
-msgstr ""
+msgstr "Copier la tenue"
 
-#: src/keyboardconfig.cpp:250
+#: src/keyboardconfig.cpp:254
+#, fuzzy
 msgid "Copy Equiped to Outfit"
-msgstr ""
+msgstr "Copier la tenue"
 
-#: 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"
+msgstr "Changer de 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
-#, fuzzy, c-format
+#: src/keyboardconfig.cpp:384
+#, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
-"Trouver une solution ou des choses étranges se produiront pendant la partie."
+"Conflit entre les touches \"%s\" and \"%s\". Veuillez changer au moins l'une "
+"des touches ou attendez vous à un possible comportement étrange du jeu."
 
 #: src/localplayer.cpp:325
 msgid "You were killed by "
@@ -3878,24 +3828,25 @@ msgstr "Impossible de ramasser l'objet."
 #. TRANSLATORS: This sentence may be translated differently
 #. for different grammatical numbers (singular, plural, ...)
 #: src/localplayer.cpp:1315
-#, fuzzy, c-format
+#, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
-msgstr[0] "vous avez ramassé un(e) %s [@@%d|%s@@]."
-msgstr[1] "vous avez ramassé un(e) %s [@@%d|%s@@]."
+msgstr[0] "Vous avez ramassé %d [@@%d|%s@@]."
+msgstr[1] "Vous avez ramassé %d [@@%d|%s@@]."
 
 #: src/localplayer.cpp:2979
 msgid "Away"
-msgstr ""
+msgstr "Inactif"
 
 #: src/localplayer.cpp:3617
 #, fuzzy
 msgid "You see "
-msgstr "Vous recevez %s."
+msgstr "Vous recevez %s"
 
 #: src/main.cpp:44
+#, fuzzy
 msgid "manaplus [options] [mana-file]"
-msgstr ""
+msgstr "mana [options] [fichier-mana]"
 
 #: src/main.cpp:45
 msgid "[mana-file] : The mana file is an XML file (.mana)"
@@ -3916,95 +3867,81 @@ msgstr "Options :"
 #: src/main.cpp:50
 #, fuzzy
 msgid "  -l --log-file       : Log file to use"
-msgstr "  -C --config-file : Fichier de configuration à utiliser"
+msgstr "  -C --config-dir : Répertoire de configuration à utiliser"
 
 #: src/main.cpp:51
 #, fuzzy
 msgid "  -L --chat-log-dir   : Chat log dir to use"
-msgstr "  -C --config-file : Fichier de configuration à utiliser"
+msgstr "  -C --config-dir : Répertoire de configuration à utiliser"
 
 #: src/main.cpp:52
-#, fuzzy
 msgid "  -v --version        : Display the version"
 msgstr "  -v --version : Affiche la version"
 
 #: src/main.cpp:53
-#, fuzzy
 msgid "  -h --help           : Display this help"
-msgstr "  -h --help : Montre cette aide"
+msgstr "  -h --help : Montre cette rubrique d'aide"
 
 #: src/main.cpp:54
-#, fuzzy
 msgid "  -C --config-dir     : Configuration directory to use"
-msgstr "  -C --config-file : Fichier de configuration à utiliser"
+msgstr "  -C --config-dir : Répertoire de configuration à utiliser"
 
 #: src/main.cpp:55
-#, fuzzy
 msgid "  -U --username       : Login with this username"
 msgstr "  -U --username : Se connecter avec ce nom d'utilisateur"
 
 #: src/main.cpp:56
-#, fuzzy
 msgid "  -P --password       : Login with this password"
 msgstr "  -P --password : Se connecter avec ce mot de passe"
 
 #: src/main.cpp:57
-#, fuzzy
 msgid "  -c --character      : Login with this character"
 msgstr "  -c --character : Se connecter avec ce personnage"
 
 #: src/main.cpp:58
-#, fuzzy
 msgid "  -s --server         : Login server name or IP"
-msgstr "  -s --server : Nom du serveur pour la connexion ou IP"
+msgstr "  -s --server : Nom du serveur (ou IP) pour la connexion"
 
 #: src/main.cpp:59
-#, fuzzy
 msgid "  -p --port           : Login server port"
 msgstr "  -p --port : Port de connexion au serveur"
 
 #: src/main.cpp:60
-#, fuzzy
 msgid "     --update-host    : Use this update host"
-msgstr "  -H --update-host : Utilise cette mise à jour d'Hôte"
+msgstr ""
+"     --update-host : Utilise cette URL pour les fichiers de mises à jour"
 
 #: src/main.cpp:61
-#, fuzzy
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 "  -D --default : Choisir le serveur de personnages et le personnage par "
 "défaut"
 
 #: src/main.cpp:63
-#, fuzzy
 msgid "  -u --skip-update    : Skip the update downloads"
-msgstr "  -u --skip-update : Passer les téléchargements de mise à jour"
+msgstr ""
+"  -u --skip-update : Ne pas effectuer le téléchargement des mises à jour"
 
 #: src/main.cpp:64
-#, fuzzy
 msgid "  -d --data           : Directory to load game data from"
-msgstr ""
-"  -d --data : Répertoire dans lequel les données du jeu se trouvent et "
-"seront chargées"
+msgstr "  -d --data : Répertoire des données du jeu à charger"
 
 #: src/main.cpp:66
-#, fuzzy
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
-msgstr "  -S --home-dir : Répertoire à utiliser comme répertoire principal"
+msgstr ""
+"  -L --localdata-dir : Répertoire à utiliser comme répertoire principal"
 
 #: src/main.cpp:68
-#, fuzzy
 msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr "  -S --home-dir : Répertoire à utiliser comme répertoire principal"
+msgstr "      --screenshot-dir : Répertoire à utiliser pour les imprime-écrans"
 
 #: src/main.cpp:69
 msgid "     --safemode       : Start game in safe mode"
 msgstr ""
 
 #: src/main.cpp:71
-#, fuzzy
 msgid "     --no-opengl      : Disable OpenGL for this session"
-msgstr "  -O --no-opengl : Désactive OpenGL pour cette session"
+msgstr "     --no-opengl : Désactive l'OpenGL pour cette session"
 
 #: src/net/manaserv/attributes.cpp:159 src/net/tmwa/generalhandler.cpp:247
 msgid "Strength"
@@ -4052,9 +3989,8 @@ msgid "Intelligence %+.1f"
 msgstr "Intelligence %+d"
 
 #: src/net/manaserv/attributes.cpp:224
-#, fuzzy
 msgid "Willpower"
-msgstr "Volonté :"
+msgstr "Volonté"
 
 #: src/net/manaserv/attributes.cpp:231
 #, fuzzy, c-format
@@ -4127,88 +4063,84 @@ msgstr ""
 "autre."
 
 #: src/net/manaserv/beinghandler.cpp:336
-#, fuzzy
 msgid "Press OK to respawn."
-msgstr " Cliquer sur OK pour ressuciter"
+msgstr " Cliquer sur OK pour ressusciter"
 
 #: src/net/manaserv/beinghandler.cpp:337
-#, fuzzy
 msgid "You Died"
 msgstr "Vous êtes mort"
 
-#: src/net/manaserv/charhandler.cpp:144 src/net/manaserv/charhandler.cpp:215
-#, fuzzy
+#: src/net/manaserv/charhandler.cpp:144 src/net/manaserv/charhandler.cpp:218
 msgid "Not logged in."
-msgstr "Déjà connecté"
+msgstr "Non connecté."
 
 #: src/net/manaserv/charhandler.cpp:147
 msgid "No empty slot."
-msgstr ""
+msgstr "Pas d'emplacement vide."
 
 #: src/net/manaserv/charhandler.cpp:150
 msgid "Invalid name."
-msgstr ""
+msgstr "Nom invalide."
 
 #: src/net/manaserv/charhandler.cpp:153
-#, fuzzy
 msgid "Character's name already exists."
-msgstr "Ce nom d'utilisateur existe déjà"
+msgstr "Ce personnage existe déjà."
 
 #: src/net/manaserv/charhandler.cpp:156
 msgid "Invalid hairstyle."
-msgstr ""
+msgstr "Style de chevelure invalide."
 
 #: src/net/manaserv/charhandler.cpp:159
 msgid "Invalid hair color."
-msgstr ""
+msgstr "Couleur de cheveux invalide."
 
 #: src/net/manaserv/charhandler.cpp:162
 msgid "Invalid gender."
-msgstr ""
+msgstr "Genre invalide."
 
 #: src/net/manaserv/charhandler.cpp:165
-#, fuzzy
 msgid "Character's stats are too high."
-msgstr "Caractéristiques du personnage Ok"
+msgstr "Les caractéristiques du personnage sont trop hautes."
 
 #: src/net/manaserv/charhandler.cpp:168
-#, fuzzy
 msgid "Character's stats are too low."
-msgstr "Caractéristiques du personnage Ok"
+msgstr "Les caractéristiques du personnage sont trop basses."
 
 #: src/net/manaserv/charhandler.cpp:171
 #, c-format
 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 "Nom invalide."
+
+#: src/net/manaserv/charhandler.cpp:180 src/net/manaserv/loginhandler.cpp:98
 #: src/net/manaserv/loginhandler.cpp:130 src/net/manaserv/loginhandler.cpp:166
 #: src/net/manaserv/loginhandler.cpp:286 src/net/manaserv/loginhandler.cpp:323
 #: src/net/tmwa/loginhandler.cpp:99 src/net/tmwa/loginhandler.cpp:187
-#, fuzzy
 msgid "Unknown error."
-msgstr "Erreur inconnue"
+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
-#, fuzzy
+#: src/net/manaserv/charhandler.cpp:209
 msgid "Player deleted."
-msgstr "Personnage supprimé"
+msgstr "Personnage effacé."
 
-#: src/net/manaserv/charhandler.cpp:218
-#, fuzzy
+#: src/net/manaserv/charhandler.cpp:221
 msgid "Selection out of range."
-msgstr "Choisissez le nombre d'objets à troquer."
+msgstr "La sélection est invalide."
 
-#: src/net/manaserv/charhandler.cpp:221
-#, fuzzy, c-format
+#: src/net/manaserv/charhandler.cpp:224
+#, c-format
 msgid "Unknown error (%d)."
-msgstr "Erreur inconnue"
+msgstr "Erreur inconnue (%d)."
 
-#: src/net/manaserv/charhandler.cpp:257
+#: src/net/manaserv/charhandler.cpp:260
 msgid "No gameservers are available."
 msgstr "Pas de serveur de jeu disponible."
 
@@ -4219,48 +4151,44 @@ msgid "Topic: %s"
 msgstr "Sujet : %s"
 
 #: src/net/manaserv/chathandler.cpp:190 src/net/manaserv/chathandler.cpp:268
-#, fuzzy
 msgid "Players in this channel:"
-msgstr "Le joueur touche le monstre"
+msgstr "Joueurs dans ce canal :"
 
 #: src/net/manaserv/chathandler.cpp:207
-#, fuzzy
 msgid "Error joining channel."
-msgstr "Commande : /join <channel>"
+msgstr "Erreur lors de la tentative d'entrée dans le canal."
 
 #: src/net/manaserv/chathandler.cpp:213
-#, fuzzy
 msgid "Listing channels."
-msgstr "Il vous est demandé de rejoindre le chan %s."
+msgstr "Liste des canaux."
 
 #: src/net/manaserv/chathandler.cpp:225
 msgid "End of channel list."
-msgstr ""
+msgstr "Fin de la liste du canal."
 
 #: src/net/manaserv/chathandler.cpp:298
-#, fuzzy, c-format
+#, c-format
 msgid "%s entered the channel."
-msgstr "%s a rejoind le groupe."
+msgstr "%s a rejoint le canal."
 
 #: src/net/manaserv/chathandler.cpp:303
 #, c-format
 msgid "%s left the channel."
-msgstr ""
+msgstr "%s a quitté le canal"
 
 #: src/net/manaserv/chathandler.cpp:319
 #, c-format
 msgid "%s has set mode %s on user %s."
-msgstr ""
+msgstr "%s a activé le mode %s sur le joueur %s."
 
 #: src/net/manaserv/chathandler.cpp:330
 #, c-format
 msgid "%s has kicked %s."
-msgstr ""
+msgstr "%s a éjecté %s."
 
 #: src/net/manaserv/chathandler.cpp:336
-#, fuzzy
 msgid "Unknown channel event."
-msgstr "Commande inconnue."
+msgstr "Événement inconnu dans le canal."
 
 #: src/net/manaserv/guildhandler.cpp:84 src/net/tmwa/guildhandler.cpp:104
 msgid "Guild created."
@@ -4283,91 +4211,83 @@ msgid "Failed to promote member."
 msgstr "Echec lors de la promotion du membre"
 
 #: src/net/manaserv/loginhandler.cpp:89
-#, fuzzy
 msgid "Wrong magic_token."
-msgstr "Mauvaise empreinte magique"
+msgstr "Mauvais jeton de sécurité."
 
 #: src/net/manaserv/loginhandler.cpp:92 src/net/manaserv/loginhandler.cpp:276
-#, fuzzy
 msgid "Already logged in."
-msgstr "Déjà connecté"
+msgstr "Déjà connecté."
 
 #: src/net/manaserv/loginhandler.cpp:95
-#, fuzzy
 msgid "Account banned."
-msgstr "Compte expiré"
+msgstr "Compte banni."
 
 #: src/net/manaserv/loginhandler.cpp:120
-#, fuzzy
 msgid "New password incorrect."
-msgstr "Nouveau mot de passe incorrect"
+msgstr "Nouveau mot de passe incorrect."
 
 #: src/net/manaserv/loginhandler.cpp:123 src/net/tmwa/loginhandler.cpp:93
-#, fuzzy
 msgid "Old password incorrect."
-msgstr "Ancien mot de passe incorrect"
+msgstr "Ancien mot de passe incorrect."
 
 #: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:159
 msgid "Account not connected. Please login first."
 msgstr "Compte non connecté. Identifiez-vous tout d'abord."
 
 #: src/net/manaserv/loginhandler.cpp:152
-#, fuzzy
 msgid "New email address incorrect."
-msgstr "Nouvelle adresse email incorrecte"
+msgstr "Nouvelle adresse email incorrecte."
 
 #: src/net/manaserv/loginhandler.cpp:155
-#, fuzzy
 msgid "Old email address incorrect."
-msgstr "Ancienne adresse email incorrecte"
+msgstr "Ancienne adresse email incorrecte."
 
 #: src/net/manaserv/loginhandler.cpp:163
-#, fuzzy
 msgid "The new email address already exists."
-msgstr "Cette nouvelle adresse email existe déjà."
+msgstr "Cette adresse email existe déjà pour un autre compte."
 
 #: src/net/manaserv/loginhandler.cpp:244
 msgid ""
 "Client registration is not allowed. Please contact server administration."
 msgstr ""
+"L'enregistrement de comptes en utilisant le client n'est pas permis. "
+"Veuillez contacter l'administrateur du serveur."
 
 #: src/net/manaserv/loginhandler.cpp:270 src/net/manaserv/loginhandler.cpp:307
-#, fuzzy
 msgid "Client version is too old."
 msgstr "La version de votre client est trop ancienne."
 
 #: src/net/manaserv/loginhandler.cpp:273
-#, fuzzy
 msgid "Wrong username or password."
 msgstr "Mauvais nom d'utilisateur ou mot de passe."
 
 #: src/net/manaserv/loginhandler.cpp:279
-#, fuzzy
 msgid "Account banned"
-msgstr "Compte expiré"
+msgstr "Compte banni"
 
 #: src/net/manaserv/loginhandler.cpp:282
 msgid "Login attempt too soon after previous attempt."
 msgstr ""
+"La tentative de connexion a été faite trop rapidement depuis la dernière "
+"tentative."
 
 #: src/net/manaserv/loginhandler.cpp:310
-#, fuzzy
 msgid "Wrong username, password or email address."
-msgstr "Mauvais nom d'utilisateur, mot de passe ou adrese email."
+msgstr "Mauvais nom d'utilisateur, mot de passe ou adresse email."
 
 #: src/net/manaserv/loginhandler.cpp:313
-#, fuzzy
 msgid "Username already exists."
-msgstr "Ce nom d'utilisateur existe déjà"
+msgstr "Ce nom d'utilisateur existe déjà."
 
 #: src/net/manaserv/loginhandler.cpp:316
-#, fuzzy
 msgid "Email address already exists."
-msgstr "Cette adresse email existe déjà"
+msgstr "Cette adresse email existe déjà."
 
 #: src/net/manaserv/loginhandler.cpp:319
 msgid "You took too long with the captcha or your response was incorrect."
 msgstr ""
+"Vous avez mis trop de temps pour répondre au Captcha ou votre réponse est "
+"incorrecte."
 
 #: src/net/manaserv/partyhandler.cpp:89
 msgid "Joined party."
@@ -4379,7 +4299,7 @@ msgid "%s joined the party."
 msgstr "%s a rejoind le groupe."
 
 #: src/net/manaserv/partyhandler.cpp:125
-#, fuzzy, c-format
+#, c-format
 msgid "%s rejected your invite."
 msgstr "%s a refusé votre invitation."
 
@@ -4401,11 +4321,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é."
 
@@ -4439,17 +4359,15 @@ msgstr "Impossible de vendre."
 
 #: src/net/tmwa/charserverhandler.cpp:106
 msgid "Access denied. Most likely, there are too many players on this server."
-msgstr ""
+msgstr "Accès refusé. Il y a probablement trop de joueurs sur le serveur."
 
 #: src/net/tmwa/charserverhandler.cpp:110
-#, fuzzy
 msgid "Cannot use this ID."
-msgstr "Impossible d'utiliser cet ID"
+msgstr "Impossible d'utiliser cet Id."
 
 #: src/net/tmwa/charserverhandler.cpp:113
-#, fuzzy
 msgid "Unknown char-server failure."
-msgstr "Erreur inconnue"
+msgstr "Erreur inconnue provenant du serveur de personnages"
 
 #: src/net/tmwa/charserverhandler.cpp:137
 msgid "Failed to create character. Most likely the name is already taken."
@@ -4501,14 +4419,13 @@ msgid "Whisper could not be sent, ignored by %s."
 msgstr "Le message privé n'a pu être envoyé, le destinataire l'a ignoré."
 
 #: src/net/tmwa/chathandler.cpp:333
-#, fuzzy
 msgid "MVP player."
-msgstr "Joueur"
+msgstr "Joueur MVP"
 
 #: src/net/tmwa/chathandler.cpp:337
 #, fuzzy
 msgid "MVP player: "
-msgstr "Joueur"
+msgstr "Joueur MVP"
 
 #: src/net/tmwa/chathandler.cpp:390 src/net/tmwa/chathandler.cpp:396
 #: src/net/tmwa/chathandler.cpp:401 src/net/tmwa/chathandler.cpp:407
@@ -4520,17 +4437,15 @@ msgstr "Les salons ne sont pas gérés !"
 #: src/net/tmwa/gamehandler.cpp:92
 #, c-format
 msgid "Online users: %d"
-msgstr ""
+msgstr "Joueurs en ligne : %d"
 
 #: src/net/tmwa/gamehandler.cpp:102
-#, fuzzy
 msgid "Game"
-msgstr "Nom"
+msgstr "Jeu"
 
 #: src/net/tmwa/gamehandler.cpp:102
-#, fuzzy
 msgid "Request to quit denied!"
-msgstr "Demande d'échange"
+msgstr "Requête de départ refusée !"
 
 #: src/net/tmwa/generalhandler.cpp:104
 #, c-format
@@ -4563,39 +4478,32 @@ msgid "Luck %+d"
 msgstr "Chance %+d"
 
 #: src/net/tmwa/generalhandler.cpp:135
-#, fuzzy
 msgid "Authentication failed."
-msgstr "Échec de l'indentification"
+msgstr "Échec de l'authentification."
 
 #: src/net/tmwa/generalhandler.cpp:138
-#, fuzzy
 msgid "No servers available."
-msgstr "Aucun serveur n'est disponible"
+msgstr "Aucun serveur n'est disponible."
 
 #: src/net/tmwa/generalhandler.cpp:142
-#, fuzzy
 msgid "Someone else is trying to use this account."
-msgstr "Quelqu'un d'autre essaye d'utiliser ce compte"
+msgstr "Quelqu'un d'autre essaie d'utiliser ce compte."
 
 #: src/net/tmwa/generalhandler.cpp:145
-#, fuzzy
 msgid "This account is already logged in."
-msgstr "Ce compte est déjà connecté"
+msgstr "Ce compte est déjà connecté."
 
 #: src/net/tmwa/generalhandler.cpp:148
-#, fuzzy
 msgid "Speed hack detected."
-msgstr "Speed hack detecté"
+msgstr "Speed hack detecté."
 
 #: src/net/tmwa/generalhandler.cpp:151
-#, fuzzy
 msgid "Duplicated login."
-msgstr "Identification dupliquée"
+msgstr "Authentification déjà effectuée."
 
 #: src/net/tmwa/generalhandler.cpp:154
-#, fuzzy
 msgid "Unknown connection error."
-msgstr "Erreur de connexion inconnue"
+msgstr "Erreur de connexion inconnue."
 
 #: src/net/tmwa/generalhandler.cpp:220
 msgid "Got disconnected from server!"
@@ -4606,75 +4514,68 @@ msgid "Luck"
 msgstr "Chance"
 
 #: src/net/tmwa/generalhandler.cpp:255
-#, fuzzy
 msgid "Defense"
-msgstr "Défense :"
+msgstr "Défense"
 
 #: src/net/tmwa/generalhandler.cpp:256
-#, fuzzy
 msgid "M.Attack"
-msgstr "Attaque M. :"
+msgstr "Attaque M."
 
 #: src/net/tmwa/generalhandler.cpp:257
-#, fuzzy
 msgid "M.Defense"
-msgstr "Défense M. :"
+msgstr "Défense M."
 
 #: src/net/tmwa/generalhandler.cpp:258
 #, fuzzy, c-format
 msgid "% Accuracy"
-msgstr "% Précision :"
+msgstr "% Précision"
 
 #: src/net/tmwa/generalhandler.cpp:259
-#, fuzzy, c-format
+#, c-format
 msgid "% Evade"
-msgstr "% Esquive :"
+msgstr "% Esquive"
 
 #: src/net/tmwa/generalhandler.cpp:260
-#, fuzzy, c-format
+#, c-format
 msgid "% Critical"
-msgstr "Coup critique"
+msgstr "% Coup critique"
 
 #: src/net/tmwa/generalhandler.cpp:261
 #, fuzzy
 msgid "Attack Delay"
-msgstr "Attaque %+d"
+msgstr "Attaquer %s"
 
 #: src/net/tmwa/generalhandler.cpp:263
 #, fuzzy
 msgid "Walk Delay"
-msgstr "Attaque %+d"
+msgstr "Délai : "
 
 #: src/net/tmwa/generalhandler.cpp:265
 #, fuzzy
 msgid "Attack Range"
-msgstr "Le monstre touche le joueur"
+msgstr "Attaquer %s"
 
 #: src/net/tmwa/gui/guildtab.cpp:74 src/net/tmwa/gui/partytab.cpp:66
 msgid "/help > Display this help."
 msgstr "/help > Affiche cette aide."
 
 #: src/net/tmwa/gui/guildtab.cpp:75
-#, fuzzy
 msgid "/invite > Invite a player to your guild"
-msgstr "/invite > Invite un joueur à rejoindre votre groupe"
+msgstr "/invite > Invite un joueur à rejoindre votre guilde"
 
 #: src/net/tmwa/gui/guildtab.cpp:76
-#, fuzzy
 msgid "/leave > Leave the guild you are in"
-msgstr "/leave > Quitte le groupe dans lequel vous vous trouvez"
+msgstr "/leave > Quitter la guilde courante"
 
 #: src/net/tmwa/gui/guildtab.cpp:77
-#, fuzzy
 msgid "/kick > Kick some one from the guild you are in"
-msgstr "/kick > Sortir quelqu'un du groupe dont vous faites partie"
+msgstr "/kick > Ejecter quelqu'un du groupe dont vous faites partie"
 
 #: src/net/tmwa/gui/guildtab.cpp:86 src/net/tmwa/gui/partytab.cpp:80
 msgid "Command: /invite <nick>"
 msgstr "Commande : /invite <nick>"
 
 #: src/net/tmwa/gui/guildtab.cpp:87
-#, fuzzy
 msgid "This command invites <nick> to the guild you're in."
 msgstr "Cette commande invite <nick> à rejoindre votre groupe."
 
@@ -4683,9 +4584,8 @@ msgid "Command: /leave"
 msgstr "Commande : /leave"
 
 #: src/net/tmwa/gui/guildtab.cpp:94
-#, fuzzy
 msgid "This command causes the player to leave the guild."
-msgstr "Cette commande vous fait quitter votre groupe actuel."
+msgstr "Cette commande vous fait quitter la guilde actuelle."
 
 #: src/net/tmwa/guildhandler.cpp:109 src/net/tmwa/guildhandler.cpp:114
 #, fuzzy
@@ -4699,17 +4599,17 @@ msgstr ""
 #: src/net/tmwa/guildhandler.cpp:124
 #, fuzzy
 msgid "Unknown server response."
-msgstr "Réponse d'invitation de %s inconnue."
+msgstr "Réponse d'invitation à la guilde inconnue."
 
 #: src/net/tmwa/guildhandler.cpp:202
 #, fuzzy, c-format
 msgid "Guild name: %s"
-msgstr "Guilde"
+msgstr "Nom de la guilde"
 
 #: src/net/tmwa/guildhandler.cpp:204
 #, fuzzy, c-format
 msgid "Guild master: %s"
-msgstr "Guilde"
+msgstr "Membres de la guilde"
 
 #: src/net/tmwa/guildhandler.cpp:206
 #, fuzzy, c-format
@@ -4717,9 +4617,9 @@ msgid "Guild level: %d"
 msgstr "Niveau : %d"
 
 #: src/net/tmwa/guildhandler.cpp:208
-#, c-format
+#, fuzzy, c-format
 msgid "Online members: %d"
-msgstr ""
+msgstr "Joueurs en ligne : %d"
 
 #: src/net/tmwa/guildhandler.cpp:210
 #, c-format
@@ -4729,12 +4629,12 @@ msgstr ""
 #: src/net/tmwa/guildhandler.cpp:212
 #, fuzzy, c-format
 msgid "Average level: %d"
-msgstr "Niveau max."
+msgstr "Niveau : %d"
 
 #: src/net/tmwa/guildhandler.cpp:214
 #, fuzzy, c-format
 msgid "Guild exp: %d"
-msgstr "Guilde"
+msgstr "Nom de la guilde"
 
 #: src/net/tmwa/guildhandler.cpp:216
 #, fuzzy, c-format
@@ -4748,25 +4648,23 @@ msgstr "Guilde créée."
 
 #: src/net/tmwa/guildhandler.cpp:433
 msgid "Could not inivte user to guild."
-msgstr ""
+msgstr "N'a pas pu inviter le joueur dans la guilde. "
 
 #: src/net/tmwa/guildhandler.cpp:438
 msgid "User rejected guild invite."
-msgstr ""
+msgstr "Le joueur a refusé l'invitation dans la guilde."
 
 #: src/net/tmwa/guildhandler.cpp:443
-#, fuzzy
 msgid "User is now part of your guild."
-msgstr "%s est maintenant membre de votre groupe."
+msgstr "%s est maintenant membre de la guilde."
 
 #: src/net/tmwa/guildhandler.cpp:448
 msgid "Your guild is full."
-msgstr ""
+msgstr "Votre guilde est complète."
 
 #: src/net/tmwa/guildhandler.cpp:453
-#, fuzzy
 msgid "Unknown guild invite response."
-msgstr "Réponse d'invitation de %s inconnue."
+msgstr "Réponse d'invitation à la guilde inconnue."
 
 #: src/net/tmwa/guildhandler.cpp:475
 #, fuzzy
@@ -4785,7 +4683,7 @@ msgstr ""
 #: src/net/tmwa/guildhandler.cpp:535
 #, fuzzy, c-format
 msgid "%s has kicked from your guild."
-msgstr "%s est maintenant membre de votre groupe."
+msgstr "%s a éjecté %s."
 
 #: src/net/tmwa/gui/partytab.cpp:67
 msgid "/invite > Invite a player to your party"
@@ -4877,9 +4775,8 @@ msgid "Item sharing not possible."
 msgstr "Partage d'objet impossible."
 
 #: src/net/tmwa/gui/partytab.cpp:154
-#, fuzzy
 msgid "Item sharing unknown."
-msgstr "Partage d'objet activé."
+msgstr "Paramètre de partage d'objets inconnu."
 
 #: src/net/tmwa/gui/partytab.cpp:184 src/net/tmwa/partyhandler.cpp:225
 msgid "Experience sharing enabled."
@@ -4894,15 +4791,14 @@ msgid "Experience sharing not possible."
 msgstr "Partage d'expérience impossible."
 
 #: src/net/tmwa/gui/partytab.cpp:193
-#, fuzzy
 msgid "Experience sharing unknown."
-msgstr "Partage d'expérience authorisé."
+msgstr "Paramètre de partage d'expérience inconnu."
 
-#: 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."
 
@@ -4911,37 +4807,31 @@ msgid "Account was not found. Please re-login."
 msgstr "Le compte n'a pas été trouvé. Reconnectez vous svp."
 
 #: src/net/tmwa/loginhandler.cpp:96
-#, fuzzy
 msgid "New password too short."
-msgstr "Nouveau mot de passe trop court"
+msgstr "Le nouveau mot de passe est trop court."
 
 #: src/net/tmwa/loginhandler.cpp:161
-#, fuzzy
 msgid "Unregistered ID."
-msgstr "ID non enregistrée"
+msgstr "Id non enregistrée."
 
 #: src/net/tmwa/loginhandler.cpp:164
-#, fuzzy
 msgid "Wrong password."
-msgstr "Mauvais mot de passe"
+msgstr "Mauvais mot de passe."
 
 #: src/net/tmwa/loginhandler.cpp:167
-#, fuzzy
 msgid "Account expired."
-msgstr "Compte expiré"
+msgstr "Le compte a expiré."
 
 #: src/net/tmwa/loginhandler.cpp:170
-#, fuzzy
 msgid "Rejected from server."
-msgstr "Rejeté par le server"
+msgstr "Rejeté par le serveur."
 
 #: src/net/tmwa/loginhandler.cpp:173
-#, fuzzy
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 "Vous avez été banni de façon permanente du jeu. Merci de vous mettre en "
-"contact avec l'équipe des MJ."
+"contact avec l'équipe des GM."
 
 #: src/net/tmwa/loginhandler.cpp:177
 #, c-format
@@ -4953,23 +4843,20 @@ msgstr ""
 "Merci de contacter un MJ par le forum."
 
 #: src/net/tmwa/loginhandler.cpp:184
-#, fuzzy
 msgid "This user name is already taken."
-msgstr "Ce nom d'utilisateur est déjà utilisé"
+msgstr "Ce nom d'utilisateur est déjà utilisé."
 
 #: src/net/tmwa/network.cpp:147
 msgid "Empty address given to Network::connect()!"
-msgstr ""
+msgstr "Une adresse vide a été donnée à la commande Network::connect() !"
 
 #: src/net/tmwa/network.cpp:351
-#, fuzzy
 msgid "Unable to resolve host \""
-msgstr "Impossible de vendre."
+msgstr "Impossible de résoudre le nom \""
 
 #: src/net/tmwa/network.cpp:421
-#, fuzzy
 msgid "Connection to server terminated. "
-msgstr "Connexion au serveur de cartes..."
+msgstr "Connexion au serveur terminée."
 
 #: src/net/tmwa/partyhandler.cpp:84
 msgid "Could not create party."
@@ -5105,18 +4992,18 @@ msgstr ""
 "en mesure de regagner vos points de vie."
 
 #: src/net/tmwa/playerhandler.cpp:442
-#, fuzzy, c-format
+#, c-format
 msgid "You picked up %s."
-msgstr "Vous avez ramassé "
+msgstr "Vous avez ramassé  %s."
 
 #: src/net/tmwa/playerhandler.cpp:448
 #, fuzzy, c-format
 msgid "You spent %s."
-msgstr "Vous recevez %s."
+msgstr "Vous recevez %s"
 
 #: src/net/tmwa/playerhandler.cpp:493
 msgid "Cannot raise skill!"
-msgstr ""
+msgstr "Ne peut pas augmenter la capacité !"
 
 #: src/net/tmwa/playerhandler.cpp:613
 msgid "Equip arrows first."
@@ -5225,7 +5112,6 @@ msgid "Trade with %s cancelled."
 msgstr "Echange avec %s annulé."
 
 #: src/net/tmwa/tradehandler.cpp:184
-#, fuzzy
 msgid "Unhandled trade cancel packet."
 msgstr "Echange non pris en compte."
 
@@ -5241,30 +5127,41 @@ 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."
 
 #: src/playerrelations.cpp:404
-#, fuzzy
 msgid "Completely ignore"
-msgstr "@@ignore|Complètement ignorer %s@@"
+msgstr "Ignorer complètement"
 
 #: src/playerrelations.cpp:418
 msgid "Print '...'"
-msgstr ""
+msgstr "Affiche '...'"
 
 #: src/playerrelations.cpp:438
 msgid "Blink name"
-msgstr ""
+msgstr "Fais clignoter le nom"
 
 #: src/playerrelations.cpp:483
 msgid "Floating '...' bubble"
-msgstr ""
+msgstr "Bulle flottante '...'"
 
 #: src/playerrelations.cpp:486
 msgid "Floating bubble"
-msgstr ""
+msgstr "Bulle flottante"
+
+#: 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
@@ -5290,38 +5187,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"
-
-#, fuzzy
-#~ msgid "Ambient FX: %s"
-#~ msgstr "Effets ambiants"
-
-#, fuzzy
-#~ msgid "Emote Shortcut  %d"
-#~ msgstr "Raccourci d'emote %d"
-
-#, fuzzy
-#~ msgid "Player position:"
-#~ msgstr "Le joueur touche le monstre"
-
-#, fuzzy
-#~ msgid "Music: %s"
-#~ msgstr "Sujet : %s"
-
-#, fuzzy
-#~ msgid "Map: %s"
-#~ msgstr "Nom : %s"
-
-#, fuzzy
-#~ msgid "Minimap: %s"
-#~ msgstr "Plan"
-
 #~ msgid "/record > Start recording the chat to an external file"
 #~ msgstr ""
 #~ "/record > Commence à enregistrer la conversation dans un fichier externe"
@@ -5340,9 +5205,64 @@ msgstr "anonyme"
 #~ msgid "This command finishes a recording session."
 #~ msgstr "Cette commande termine une session d'enregistrement."
 
+#~ msgid "Show IP: On"
+#~ msgstr "Afficher l'IP : Activé"
+
+#~ msgid "Show IP: Off"
+#~ msgstr "Afficher l'IP : Désactivé"
+
 #~ msgid "Attendance written to record log."
 #~ msgstr "Présence inscrite dans le fichier d'enregistrement."
 
+#~ msgid "Particle detail: %s"
+#~ msgstr "Détail des particules : %s"
+
+#~ msgid "Ambient FX: %s"
+#~ msgstr "Effets ambiants : %s"
+
+#~ msgid "Registration disabled"
+#~ msgstr "Enregistrement désactivé"
+
+#~ msgid "You need to use the website to register an account for this server."
+#~ msgstr ""
+#~ "Veuillez enregistrer votre compte sur la page du site prévue à cet effet."
+
+#~ msgid "Trade with %s..."
+#~ msgstr "Troquer avec %s..."
+
+#~ msgid "Whisper %s"
+#~ msgstr "Chuchoter à %s"
+
+#~ msgid "Befriend %s"
+#~ msgstr "Être ami avec %s"
+
+#~ msgid "Disregard %s"
+#~ msgstr "Ignorer %s"
+
+#~ msgid "Unignore %s"
+#~ msgstr "Cesser d'ignorer %s"
+
+#~ msgid "Completely ignore %s"
+#~ msgstr "Ignorer complètement %s"
+
+#~ msgid "Invite %s to join your guild"
+#~ msgstr "Inviter %s à rejoindre votre guilde"
+
+#~ msgid "Invite %s to join your party"
+#~ msgstr "Inviter %s à se joindre votre groupe"
+
+#~ msgid "Kick player"
+#~ msgstr "Ejecter un joueur"
+
+#~ msgid "Talk to %s"
+#~ msgstr "Parler à %s"
+
+#~ msgid "Kick monster"
+#~ msgstr "Ejecter un monstre"
+
+#~ msgid "Pick up %s"
+#~ msgstr "Ramasser %s"
+
 #~ msgid "Finishing recording."
 #~ msgstr "Fin de l'engistrement."
 
@@ -5364,51 +5284,87 @@ msgstr "anonyme"
 #~ msgid "Stop recording"
 #~ msgstr "Arrêter l'enregistrement"
 
-#~ msgid "Find Path to Mouse"
-#~ msgstr "Trouver le chemin vers la souris"
+#~ msgid "Sound"
+#~ msgstr "Son"
+
+#~ msgid "Disable transparency (Low CPU mode)"
+#~ msgstr "Désactiver la transparence (Faibles CPUs)"
+
+#~ msgid "Show damage"
+#~ msgstr "Afficher les dégâts"
+
+#~ msgid ""
+#~ "Applying change to OpenGL requires restart. In case OpenGL messes up your "
+#~ "game graphics, restart the game with the command line option \"--no-opengl"
+#~ "\"."
+#~ msgstr ""
+#~ "Il est nécessaire de redémarrer le client pour appliquer les changements "
+#~ "liés à OpenGL. Si OpenGL empêche un affichage correct, redémarrez le jeu "
+#~ "avec l'option en ligne de commande : \"--no-opengl\"."
+
+#~ msgid "Deactivating OpenGL"
+#~ msgstr "Désactiver OpenGL"
+
+#~ msgid "Transparency disabled"
+#~ msgstr "Transparence désactivée"
+
+#~ msgid "You must restart to apply changes."
+#~ msgstr "Vous devez redémarrer pour appliquer les changements."
+
+#~ msgid "Transparency enabled"
+#~ msgstr "Transparence activée."
+
+#~ msgid "Creating guild failed, please choose a shorter name."
+#~ msgstr ""
+#~ "La création de la guilde à échoué, veuillez choisir un nom plus court."
+
+#~ msgid "Creating party failed, please choose a shorter name."
+#~ msgstr "La création du groupe à échoué, veuillez choisir un nom plus court."
+
+#~ msgid "Specials Set %d"
+#~ msgstr "Set de Cpt. spéciales %d"
+
+#~ msgid "Special %d"
+#~ msgstr "Cpt. spéciale %d"
 
-#, fuzzy
 #~ msgid "HP"
-#~ msgstr "Vie :"
+#~ msgstr "Vie"
 
-#, fuzzy
 #~ msgid "MP"
-#~ msgstr "PM :"
+#~ msgstr "PM"
 
-#, fuzzy
 #~ msgid "Exp"
-#~ msgstr "Exp :"
+#~ msgstr "Exp"
 
-#, fuzzy
 #~ msgid "Money"
-#~ msgstr "Argent : %d"
+#~ msgstr "Argent"
 
-#, fuzzy
 #~ msgid "Job"
-#~ msgstr "Habilité :"
+#~ msgstr "Habilité"
 
-#, fuzzy
 #~ msgid "Level"
-#~ msgstr "Niveau : %d"
+#~ msgstr "Niveau"
 
-#, fuzzy
-#~ msgid "Player successfully ignored!"
-#~ msgstr "Création du groupe réussie."
+#~ msgid "Cannot send empty chat!"
+#~ msgstr "Impossible d'envoyer une conversation vide !"
 
-#, fuzzy
-#~ msgid "Player could not be ignored!"
-#~ msgstr "Le message privé n'a pu être envoyé, le destinataire l'a ignoré."
+#~ msgid "Find Path to Mouse"
+#~ msgstr "Trouver le chemin vers la souris"
 
-#, fuzzy
-#~ msgid "  -C --config-file    : Configuration file to use"
-#~ msgstr "  -C --config-file : Fichier de configuration à utiliser"
+#~ msgid "One stat is zero."
+#~ msgstr "L'une des statistiques est à zéro."
 
-#, fuzzy
-#~ msgid "  -l --chat-log-dir   : Chat log dir to use"
-#~ msgstr "  -C --config-file : Fichier de configuration à utiliser"
+#~ msgid "Guild creation isn't supported yet."
+#~ msgstr "La création de guilde n'est pas encore supportée."
 
-#~ msgid "Sound"
-#~ msgstr "Son"
+#~ msgid "Unable to unequip."
+#~ msgstr "Impossible de deséquiper cet objet."
+
+#~ msgid "Inviting failed, because you can't see a player called %s."
+#~ msgstr "L'invitation à échouée, le joueur %s n'est pas à portée de vue."
+
+#~ msgid "You can only inivte when you are in a party!"
+#~ msgstr "Vous ne pouvez inviter que lorsque vous faites partie d'un groupe."
 
 #, fuzzy
 #~ msgid "Access denied."
@@ -5421,10 +5377,6 @@ msgstr "anonyme"
 #~ msgid "Inviting like this isn't supported at the moment."
 #~ msgstr "Cette manière d'inviter n'est pas en place actuellement."
 
-#, fuzzy
-#~ msgid "You can only invite when you are in a party!"
-#~ msgstr "%s vous a invité à rejoindre son groupe."
-
 #~ msgid "Willpower:"
 #~ msgstr "Volonté :"
 
@@ -5432,56 +5384,6 @@ msgstr "anonyme"
 #~ msgid "Server is full."
 #~ msgstr "Le serveur est plein"
 
-#, fuzzy
-#~ msgid "Trade with %s..."
-#~ msgstr "Echange avec %s"
-
-#, fuzzy
-#~ msgid "Whisper %s"
-#~ msgstr "Message privé"
-
-#, fuzzy
-#~ msgid "Befriend %s"
-#~ msgstr "@@friend|Être ami avec %s@@"
-
-#, fuzzy
-#~ msgid "Disregard %s"
-#~ msgstr "Négligé"
-
-#, fuzzy
-#~ msgid "Completely ignore %s"
-#~ msgstr "@@ignore|Complètement ignorer %s@@"
-
-#, fuzzy
-#~ msgid "Invite %s to join your guild"
-#~ msgstr "@@guild|Inviter %s à rejoindre votre guilde@@"
-
-#, fuzzy
-#~ msgid "Invite %s to join your party"
-#~ msgstr "@@party|Invitation de %s à joindre votre groupe@@"
-
-#, fuzzy
-#~ msgid "Kick player"
-#~ msgstr "Impossible de sortir la personne !"
-
-#, fuzzy
-#~ msgid "Talk to %s"
-#~ msgstr "@@talk|Parler à %s@@"
-
-#, fuzzy
-#~ msgid "Kick monster"
-#~ msgstr "@@admin-kick|Kick monster@@"
-
-#, fuzzy
-#~ msgid "Pick up %s"
-#~ msgstr "Ramasser"
-
-#~ msgid "Cannot send empty chat!"
-#~ msgstr "Impossible d'envoyer une conversation vide !"
-
-#~ msgid "Unable to unequip."
-#~ msgstr "Impossible de deséquiper cet objet."
-
 #~ msgid "Text Shadow"
 #~ msgstr "Ombre du texte"
 
@@ -5502,9 +5404,6 @@ msgstr "anonyme"
 #~ msgid "GM"
 #~ msgstr "MJ"
 
-#~ msgid "Player"
-#~ msgstr "Joueur"
-
 #~ msgid "Whisper"
 #~ msgstr "Message privé"
 
@@ -5517,6 +5416,9 @@ msgstr "anonyme"
 #~ msgid "Logger"
 #~ msgstr "Historique"
 
+#~ msgid "Hyperlink"
+#~ msgstr "Lien"
+
 #~ msgid "Unknown Item Type"
 #~ msgstr "Type inconnu d'objet"
 
@@ -5696,6 +5598,9 @@ msgstr "anonyme"
 #~ msgid "Sword"
 #~ msgstr "Épée"
 
+#~ msgid "Polearm"
+#~ msgstr "Pique"
+
 #~ msgid "Staff"
 #~ msgstr "Bâton"
 
diff --git a/po/hr.po b/po/hr.po
index 9186f832d..ca2bf085f 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-06 03:06+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:481
+msgid "dodge"
+msgstr ""
+
+#: src/being.cpp:481
+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 ""
 
@@ -1994,7 +2007,7 @@ msgid "Show chat colors list"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:111 src/gui/setup_chat.cpp:119
-#: src/gui/setup_other.cpp:135 src/gui/setup_other.cpp:139
+#: src/gui/setup_other.cpp:137 src/gui/setup_other.cpp:141
 msgid "Edit"
 msgstr ""
 
@@ -2019,26 +2032,26 @@ msgstr "Boje"
 msgid "Type:"
 msgstr "Tip: "
 
-#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:398
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:400
 msgid "Static"
 msgstr "Statično"
 
 #: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
-#: src/gui/setup_colors.cpp:399
+#: src/gui/setup_colors.cpp:401
 msgid "Pulse"
 msgstr "Pulsiranje"
 
 #: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:400
+#: src/gui/setup_colors.cpp:402
 msgid "Rainbow"
 msgstr "Duga"
 
 #: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:400
+#: src/gui/setup_colors.cpp:402
 msgid "Spectrum"
 msgstr "Spektar"
 
-#: src/gui/setup_colors.cpp:94 src/gui/setup_colors.cpp:310
+#: src/gui/setup_colors.cpp:94 src/gui/setup_colors.cpp:312
 #, fuzzy
 msgid "Delay:"
 msgstr "Odgoda: "
@@ -2058,7 +2071,7 @@ msgstr "Zelena: "
 msgid "Blue:"
 msgstr "Plava: "
 
-#: src/gui/setup_colors.cpp:305
+#: src/gui/setup_colors.cpp:307
 msgid "Alpha:"
 msgstr ""
 
@@ -2115,99 +2128,104 @@ msgstr "Zadano"
 msgid "Key Conflict(s) Detected."
 msgstr "Otkriven je Konflikt(i) Tipki."
 
-#: src/gui/setup_other.cpp:92
+#: src/gui/setup_other.cpp:94
 msgid "Misc"
 msgstr ""
 
-#: src/gui/setup_other.cpp:95
+#: src/gui/setup_other.cpp:97
 msgid "Show damage inflicted to monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:100
+#: src/gui/setup_other.cpp:102
 msgid "Auto target only reachable monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:104
+#: src/gui/setup_other.cpp:106
 #, fuzzy
 msgid "Highlight map portals"
 msgstr "Istakni"
 
-#: src/gui/setup_other.cpp:109
+#: src/gui/setup_other.cpp:111
 msgid "Highlight player attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:114
+#: src/gui/setup_other.cpp:116
 msgid "Highlight monster attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:118
+#: src/gui/setup_other.cpp:120
 msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:121
+#: src/gui/setup_other.cpp:123
 #, fuzzy
 msgid "Cycle monster targets"
 msgstr "Prikaži ime"
 
-#: src/gui/setup_other.cpp:124
+#: src/gui/setup_other.cpp:126
 #, fuzzy
 msgid "Enable bot checker"
 msgstr "Omogući igraću palicu"
 
-#: src/gui/setup_other.cpp:127
+#: src/gui/setup_other.cpp:129
 #, fuzzy
 msgid "Highlight floor items"
 msgstr "Istakni"
 
-#: src/gui/setup_other.cpp:130
+#: src/gui/setup_other.cpp:132
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:141
+#: src/gui/setup_other.cpp:143
 #, fuzzy
 msgid "Enable shop mode"
 msgstr "Omogući/Onemogući Trgovanje"
 
-#: src/gui/setup_other.cpp:145
+#: src/gui/setup_other.cpp:147
 msgid "Enable buggy servers protection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:149
+#: src/gui/setup_other.cpp:151
 #, fuzzy
 msgid "Enable debug log"
 msgstr "Ne može se kupiti"
 
-#: src/gui/setup_other.cpp:153
+#: src/gui/setup_other.cpp:155
 #, fuzzy
 msgid "Enable server side attack"
 msgstr "Ne može se kupiti"
 
-#: src/gui/setup_other.cpp:157
+#: src/gui/setup_other.cpp:159
 msgid "Auto fix position"
 msgstr ""
 
-#: src/gui/setup_other.cpp:161
+#: src/gui/setup_other.cpp:163
 msgid "Attack while moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:165
+#: src/gui/setup_other.cpp:167
 #, fuzzy
 msgid "Enable quick stats"
 msgstr "Omogući igraću palicu"
 
-#: src/gui/setup_other.cpp:169
+#: src/gui/setup_other.cpp:171
 #, fuzzy
 msgid "Show warps particles"
 msgstr "kao čestica"
 
-#: src/gui/setup_other.cpp:173
+#: src/gui/setup_other.cpp:175
 msgid "Accept sell/buy requests"
 msgstr ""
 
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:179
 msgid "Show monster hp bar"
 msgstr ""
 
+#: src/gui/setup_other.cpp:183
+#, fuzzy
+msgid "Show own hp bar"
+msgstr "Prikaži ime"
+
 #: src/gui/setup_players.cpp:60
 msgid "Relation"
 msgstr "Odnos"
@@ -3046,155 +3064,164 @@ msgstr "##1  pokušate ponovno kasnije"
 msgid "Completed"
 msgstr "Dovršeno"
 
-#: src/gui/userpalette.cpp:109
+#: src/gui/userpalette.cpp:111
 msgid "Being"
 msgstr "Biće"
 
-#: src/gui/userpalette.cpp:110
+#: src/gui/userpalette.cpp:112
 #, fuzzy
 msgid "Friend Names"
 msgstr "Prijatelj"
 
-#: src/gui/userpalette.cpp:111
+#: src/gui/userpalette.cpp:113
 #, fuzzy
 msgid "Disregarded Names"
 msgstr "Zanemareno"
 
-#: src/gui/userpalette.cpp:112
+#: src/gui/userpalette.cpp:114
 #, fuzzy
 msgid "Ignored Names"
 msgstr "Ignorirano"
 
-#: src/gui/userpalette.cpp:113
+#: src/gui/userpalette.cpp:115
 #, fuzzy
 msgid "Erased Names"
 msgstr "GM Imena"
 
-#: src/gui/userpalette.cpp:114
+#: src/gui/userpalette.cpp:116
 msgid "Other Players' Names"
 msgstr "Imena Drugih Igrača"
 
-#: src/gui/userpalette.cpp:115
+#: src/gui/userpalette.cpp:117
 msgid "Own Name"
 msgstr "Vlastito Ime"
 
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:118
 msgid "GM Names"
 msgstr "GM Imena"
 
-#: src/gui/userpalette.cpp:117
+#: src/gui/userpalette.cpp:119
 msgid "NPCs"
 msgstr "NPCs"
 
-#: src/gui/userpalette.cpp:118
+#: src/gui/userpalette.cpp:120
 msgid "Monsters"
 msgstr "Čudovišta"
 
-#: src/gui/userpalette.cpp:119
+#: src/gui/userpalette.cpp:121
 #, fuzzy
 msgid "Monster HP bar"
 msgstr "Čudovište pogađa Igrača"
 
-#: src/gui/userpalette.cpp:121
+#: src/gui/userpalette.cpp:123
 msgid "Monster HP bar (second color)"
 msgstr ""
 
-#: src/gui/userpalette.cpp:122
+#: src/gui/userpalette.cpp:124
 #, fuzzy
 msgid "Party Members"
 msgstr "Partija"
 
-#: src/gui/userpalette.cpp:123
+#: src/gui/userpalette.cpp:125
 #, fuzzy
 msgid "Guild Members"
 msgstr "Ceh"
 
-#: src/gui/userpalette.cpp:124
+#: src/gui/userpalette.cpp:126
 msgid "Particle Effects"
 msgstr "Efekti Čestica"
 
-#: src/gui/userpalette.cpp:125
+#: src/gui/userpalette.cpp:127
 msgid "Pickup Notification"
 msgstr "Obavijest Sakupljanja"
 
-#: src/gui/userpalette.cpp:126
+#: src/gui/userpalette.cpp:128
 msgid "Exp Notification"
 msgstr "Exp Obavijest"
 
-#: src/gui/userpalette.cpp:127
+#: src/gui/userpalette.cpp:129
+#, fuzzy
+msgid "Player HP bar"
+msgstr "Čudovište pogađa Igrača"
+
+#: src/gui/userpalette.cpp:131
+msgid "Player HP bar (second color)"
+msgstr ""
+
+#: src/gui/userpalette.cpp:132
 #, fuzzy
 msgid "Player Hits Monster"
 msgstr "Igrač pogađa Čudovište"
 
-#: src/gui/userpalette.cpp:128
+#: src/gui/userpalette.cpp:133
 #, fuzzy
 msgid "Monster Hits Player"
 msgstr "Čudovište pogađa Igrača"
 
-#: src/gui/userpalette.cpp:130
+#: src/gui/userpalette.cpp:135
 #, fuzzy
 msgid "Other Player Hits Local Player"
 msgstr "Imena Drugih Igrača"
 
-#: src/gui/userpalette.cpp:131
+#: src/gui/userpalette.cpp:136
 msgid "Critical Hit"
 msgstr "Kritični Udarac"
 
-#: src/gui/userpalette.cpp:133
+#: src/gui/userpalette.cpp:138
 #, fuzzy
 msgid "Local Player Hits Monster"
 msgstr "Igrač pogađa Čudovište"
 
-#: src/gui/userpalette.cpp:135
+#: src/gui/userpalette.cpp:140
 #, fuzzy
 msgid "Local Player Critical Hit"
 msgstr "Igrač pogađa Čudovište"
 
-#: src/gui/userpalette.cpp:137
+#: src/gui/userpalette.cpp:142
 msgid "Local Player Miss"
 msgstr ""
 
-#: src/gui/userpalette.cpp:138
+#: src/gui/userpalette.cpp:143
 msgid "Misses"
 msgstr "Promašaji"
 
-#: src/gui/userpalette.cpp:139
+#: src/gui/userpalette.cpp:144
 #, fuzzy
 msgid "Portal Highlight"
 msgstr "Istakni Karticu"
 
-#: src/gui/userpalette.cpp:141
+#: src/gui/userpalette.cpp:146
 #, fuzzy
 msgid "Collision Highlight"
 msgstr "Istakni"
 
-#: src/gui/userpalette.cpp:143
+#: src/gui/userpalette.cpp:148
 #, fuzzy
 msgid "Walkable Highlight"
 msgstr "Istakni Karticu"
 
-#: src/gui/userpalette.cpp:145
+#: src/gui/userpalette.cpp:150
 msgid "Local Player Attack Range"
 msgstr ""
 
-#: src/gui/userpalette.cpp:147
+#: src/gui/userpalette.cpp:152
 msgid "Local Player Attack Range Border"
 msgstr ""
 
-#: src/gui/userpalette.cpp:149
+#: src/gui/userpalette.cpp:154
 #, fuzzy
 msgid "Monster Attack Range"
 msgstr "Čudovište pogađa Igrača"
 
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:156
 msgid "Home Place"
 msgstr ""
 
-#: src/gui/userpalette.cpp:153
+#: src/gui/userpalette.cpp:158
 msgid "Home Place Border"
 msgstr ""
 
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:160
 msgid "Road Point"
 msgstr ""
 
@@ -3218,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 korisnika u trenutnom kanalu"
@@ -3657,174 +3688,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 +4120,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 +4165,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 +4177,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 +4389,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 +4873,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 +5203,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 +5233,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 +5262,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..117ff2fe7 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-06 03:06+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:481
+msgid "dodge"
+msgstr ""
+
+#: src/being.cpp:481
+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 ""
 
@@ -2009,7 +2022,7 @@ msgid "Show chat colors list"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:111 src/gui/setup_chat.cpp:119
-#: src/gui/setup_other.cpp:135 src/gui/setup_other.cpp:139
+#: src/gui/setup_other.cpp:137 src/gui/setup_other.cpp:141
 msgid "Edit"
 msgstr ""
 
@@ -2034,26 +2047,26 @@ msgstr "Színek"
 msgid "Type:"
 msgstr "Típus: "
 
-#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:398
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:400
 msgid "Static"
 msgstr "Statikus"
 
 #: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
-#: src/gui/setup_colors.cpp:399
+#: src/gui/setup_colors.cpp:401
 msgid "Pulse"
 msgstr "Pulzáló"
 
 #: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:400
+#: src/gui/setup_colors.cpp:402
 msgid "Rainbow"
 msgstr "Szivárvány"
 
 #: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:400
+#: src/gui/setup_colors.cpp:402
 msgid "Spectrum"
 msgstr "Színkép"
 
-#: src/gui/setup_colors.cpp:94 src/gui/setup_colors.cpp:310
+#: src/gui/setup_colors.cpp:94 src/gui/setup_colors.cpp:312
 #, fuzzy
 msgid "Delay:"
 msgstr "Várakozás "
@@ -2073,7 +2086,7 @@ msgstr "Zöld: "
 msgid "Blue:"
 msgstr "Kék: "
 
-#: src/gui/setup_colors.cpp:305
+#: src/gui/setup_colors.cpp:307
 msgid "Alpha:"
 msgstr ""
 
@@ -2130,99 +2143,104 @@ msgstr "Alapértelmezett"
 msgid "Key Conflict(s) Detected."
 msgstr "Billentyű ütközés van."
 
-#: src/gui/setup_other.cpp:92
+#: src/gui/setup_other.cpp:94
 msgid "Misc"
 msgstr ""
 
-#: src/gui/setup_other.cpp:95
+#: src/gui/setup_other.cpp:97
 msgid "Show damage inflicted to monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:100
+#: src/gui/setup_other.cpp:102
 msgid "Auto target only reachable monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:104
+#: src/gui/setup_other.cpp:106
 #, fuzzy
 msgid "Highlight map portals"
 msgstr "Kijelölt"
 
-#: src/gui/setup_other.cpp:109
+#: src/gui/setup_other.cpp:111
 msgid "Highlight player attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:114
+#: src/gui/setup_other.cpp:116
 msgid "Highlight monster attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:118
+#: src/gui/setup_other.cpp:120
 msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:121
+#: src/gui/setup_other.cpp:123
 #, fuzzy
 msgid "Cycle monster targets"
 msgstr "A név mutatása"
 
-#: src/gui/setup_other.cpp:124
+#: src/gui/setup_other.cpp:126
 #, fuzzy
 msgid "Enable bot checker"
 msgstr "Joystick engedélyezése"
 
-#: src/gui/setup_other.cpp:127
+#: src/gui/setup_other.cpp:129
 #, fuzzy
 msgid "Highlight floor items"
 msgstr "Kijelölt"
 
-#: src/gui/setup_other.cpp:130
+#: src/gui/setup_other.cpp:132
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:141
+#: src/gui/setup_other.cpp:143
 #, fuzzy
 msgid "Enable shop mode"
 msgstr "Üzletelés Engedélyezése/Tiltása"
 
-#: src/gui/setup_other.cpp:145
+#: src/gui/setup_other.cpp:147
 msgid "Enable buggy servers protection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:149
+#: src/gui/setup_other.cpp:151
 #, fuzzy
 msgid "Enable debug log"
 msgstr "Nem tudod megvenni."
 
-#: src/gui/setup_other.cpp:153
+#: src/gui/setup_other.cpp:155
 #, fuzzy
 msgid "Enable server side attack"
 msgstr "Nem tudod megvenni."
 
-#: src/gui/setup_other.cpp:157
+#: src/gui/setup_other.cpp:159
 msgid "Auto fix position"
 msgstr ""
 
-#: src/gui/setup_other.cpp:161
+#: src/gui/setup_other.cpp:163
 msgid "Attack while moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:165
+#: src/gui/setup_other.cpp:167
 #, fuzzy
 msgid "Enable quick stats"
 msgstr "Joystick engedélyezése"
 
-#: src/gui/setup_other.cpp:169
+#: src/gui/setup_other.cpp:171
 #, fuzzy
 msgid "Show warps particles"
 msgstr "Karakter felett"
 
-#: src/gui/setup_other.cpp:173
+#: src/gui/setup_other.cpp:175
 msgid "Accept sell/buy requests"
 msgstr ""
 
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:179
 msgid "Show monster hp bar"
 msgstr ""
 
+#: src/gui/setup_other.cpp:183
+#, fuzzy
+msgid "Show own hp bar"
+msgstr "A név mutatása"
+
 #: src/gui/setup_players.cpp:60
 msgid "Relation"
 msgstr "Kapcsolat"
@@ -3064,155 +3082,164 @@ msgstr "##1 próbáld meg később"
 msgid "Completed"
 msgstr "Kész"
 
-#: src/gui/userpalette.cpp:109
+#: src/gui/userpalette.cpp:111
 msgid "Being"
 msgstr "Nevek"
 
-#: src/gui/userpalette.cpp:110
+#: src/gui/userpalette.cpp:112
 #, fuzzy
 msgid "Friend Names"
 msgstr "Barát"
 
-#: src/gui/userpalette.cpp:111
+#: src/gui/userpalette.cpp:113
 #, fuzzy
 msgid "Disregarded Names"
 msgstr "Semmibevett"
 
-#: src/gui/userpalette.cpp:112
+#: src/gui/userpalette.cpp:114
 #, fuzzy
 msgid "Ignored Names"
 msgstr "Tiltott"
 
-#: src/gui/userpalette.cpp:113
+#: src/gui/userpalette.cpp:115
 #, fuzzy
 msgid "Erased Names"
 msgstr "GM név"
 
-#: src/gui/userpalette.cpp:114
+#: src/gui/userpalette.cpp:116
 msgid "Other Players' Names"
 msgstr "Ismeretlen játékos neve"
 
-#: src/gui/userpalette.cpp:115
+#: src/gui/userpalette.cpp:117
 msgid "Own Name"
 msgstr "Saját név"
 
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:118
 msgid "GM Names"
 msgstr "GM név"
 
-#: src/gui/userpalette.cpp:117
+#: src/gui/userpalette.cpp:119
 msgid "NPCs"
 msgstr "Gépjátékos neve"
 
-#: src/gui/userpalette.cpp:118
+#: src/gui/userpalette.cpp:120
 msgid "Monsters"
 msgstr "Szörny neve"
 
-#: src/gui/userpalette.cpp:119
+#: src/gui/userpalette.cpp:121
 #, fuzzy
 msgid "Monster HP bar"
 msgstr "Sérüléskor"
 
-#: src/gui/userpalette.cpp:121
+#: src/gui/userpalette.cpp:123
 msgid "Monster HP bar (second color)"
 msgstr ""
 
-#: src/gui/userpalette.cpp:122
+#: src/gui/userpalette.cpp:124
 #, fuzzy
 msgid "Party Members"
 msgstr "Csapat"
 
-#: src/gui/userpalette.cpp:123
+#: src/gui/userpalette.cpp:125
 #, fuzzy
 msgid "Guild Members"
 msgstr "Klán"
 
-#: src/gui/userpalette.cpp:124
+#: src/gui/userpalette.cpp:126
 msgid "Particle Effects"
 msgstr "Effektek"
 
-#: src/gui/userpalette.cpp:125
+#: src/gui/userpalette.cpp:127
 msgid "Pickup Notification"
 msgstr "Tárgy felvételekor"
 
-#: src/gui/userpalette.cpp:126
+#: src/gui/userpalette.cpp:128
 msgid "Exp Notification"
 msgstr "Tapasztalat szerzésekor"
 
-#: src/gui/userpalette.cpp:127
+#: src/gui/userpalette.cpp:129
+#, fuzzy
+msgid "Player HP bar"
+msgstr "Sérüléskor"
+
+#: src/gui/userpalette.cpp:131
+msgid "Player HP bar (second color)"
+msgstr ""
+
+#: src/gui/userpalette.cpp:132
 #, fuzzy
 msgid "Player Hits Monster"
 msgstr "Sebzéskor"
 
-#: src/gui/userpalette.cpp:128
+#: src/gui/userpalette.cpp:133
 #, fuzzy
 msgid "Monster Hits Player"
 msgstr "Sérüléskor"
 
-#: src/gui/userpalette.cpp:130
+#: src/gui/userpalette.cpp:135
 #, fuzzy
 msgid "Other Player Hits Local Player"
 msgstr "Ismeretlen játékos neve"
 
-#: src/gui/userpalette.cpp:131
+#: src/gui/userpalette.cpp:136
 msgid "Critical Hit"
 msgstr "Kritikális ütéskor"
 
-#: src/gui/userpalette.cpp:133
+#: src/gui/userpalette.cpp:138
 #, fuzzy
 msgid "Local Player Hits Monster"
 msgstr "Sebzéskor"
 
-#: src/gui/userpalette.cpp:135
+#: src/gui/userpalette.cpp:140
 #, fuzzy
 msgid "Local Player Critical Hit"
 msgstr "Sebzéskor"
 
-#: src/gui/userpalette.cpp:137
+#: src/gui/userpalette.cpp:142
 msgid "Local Player Miss"
 msgstr ""
 
-#: src/gui/userpalette.cpp:138
+#: src/gui/userpalette.cpp:143
 msgid "Misses"
 msgstr "Ha nincs találat."
 
-#: src/gui/userpalette.cpp:139
+#: src/gui/userpalette.cpp:144
 #, fuzzy
 msgid "Portal Highlight"
 msgstr "Kijelölt fül"
 
-#: src/gui/userpalette.cpp:141
+#: src/gui/userpalette.cpp:146
 #, fuzzy
 msgid "Collision Highlight"
 msgstr "Kijelölt"
 
-#: src/gui/userpalette.cpp:143
+#: src/gui/userpalette.cpp:148
 #, fuzzy
 msgid "Walkable Highlight"
 msgstr "Kijelölt fül"
 
-#: src/gui/userpalette.cpp:145
+#: src/gui/userpalette.cpp:150
 msgid "Local Player Attack Range"
 msgstr ""
 
-#: src/gui/userpalette.cpp:147
+#: src/gui/userpalette.cpp:152
 msgid "Local Player Attack Range Border"
 msgstr ""
 
-#: src/gui/userpalette.cpp:149
+#: src/gui/userpalette.cpp:154
 #, fuzzy
 msgid "Monster Attack Range"
 msgstr "Sérüléskor"
 
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:156
 msgid "Home Place"
 msgstr ""
 
-#: src/gui/userpalette.cpp:153
+#: src/gui/userpalette.cpp:158
 msgid "Home Place Border"
 msgstr ""
 
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:160
 msgid "Road Point"
 msgstr ""
 
@@ -3236,6 +3263,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 +3709,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 +4145,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 +4190,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 +4202,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 +4414,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 +4904,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 +5235,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 +5266,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 +5295,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..648d2d914 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-06 03:06+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:481
+msgid "dodge"
+msgstr ""
+
+#: src/being.cpp:481
+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 ""
 
@@ -2004,7 +2017,7 @@ msgid "Show chat colors list"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:111 src/gui/setup_chat.cpp:119
-#: src/gui/setup_other.cpp:135 src/gui/setup_other.cpp:139
+#: src/gui/setup_other.cpp:137 src/gui/setup_other.cpp:141
 msgid "Edit"
 msgstr ""
 
@@ -2029,26 +2042,26 @@ msgstr "Colori"
 msgid "Type:"
 msgstr "Tipo: "
 
-#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:398
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:400
 msgid "Static"
 msgstr "Statico"
 
 #: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
-#: src/gui/setup_colors.cpp:399
+#: src/gui/setup_colors.cpp:401
 msgid "Pulse"
 msgstr "Pulsazione"
 
 #: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:400
+#: src/gui/setup_colors.cpp:402
 msgid "Rainbow"
 msgstr "Arcobaleno"
 
 #: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:400
+#: src/gui/setup_colors.cpp:402
 msgid "Spectrum"
 msgstr "Gamma"
 
-#: src/gui/setup_colors.cpp:94 src/gui/setup_colors.cpp:310
+#: src/gui/setup_colors.cpp:94 src/gui/setup_colors.cpp:312
 #, fuzzy
 msgid "Delay:"
 msgstr "Ritardo: "
@@ -2068,7 +2081,7 @@ msgstr "Verde: "
 msgid "Blue:"
 msgstr "Blu: "
 
-#: src/gui/setup_colors.cpp:305
+#: src/gui/setup_colors.cpp:307
 msgid "Alpha:"
 msgstr ""
 
@@ -2125,98 +2138,103 @@ msgstr "Predefinito"
 msgid "Key Conflict(s) Detected."
 msgstr "Sono stati rilevati conflitti nei tasti."
 
-#: src/gui/setup_other.cpp:92
+#: src/gui/setup_other.cpp:94
 msgid "Misc"
 msgstr ""
 
-#: src/gui/setup_other.cpp:95
+#: src/gui/setup_other.cpp:97
 msgid "Show damage inflicted to monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:100
+#: src/gui/setup_other.cpp:102
 msgid "Auto target only reachable monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:104
+#: src/gui/setup_other.cpp:106
 #, fuzzy
 msgid "Highlight map portals"
 msgstr "Evidenziazione"
 
-#: src/gui/setup_other.cpp:109
+#: src/gui/setup_other.cpp:111
 msgid "Highlight player attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:114
+#: src/gui/setup_other.cpp:116
 msgid "Highlight monster attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:118
+#: src/gui/setup_other.cpp:120
 msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:121
+#: src/gui/setup_other.cpp:123
 #, fuzzy
 msgid "Cycle monster targets"
 msgstr "Mostra nomi"
 
-#: src/gui/setup_other.cpp:124
+#: src/gui/setup_other.cpp:126
 #, fuzzy
 msgid "Enable bot checker"
 msgstr "Abilita joystick"
 
-#: src/gui/setup_other.cpp:127
+#: src/gui/setup_other.cpp:129
 #, fuzzy
 msgid "Highlight floor items"
 msgstr "Evidenziazione"
 
-#: src/gui/setup_other.cpp:130
+#: src/gui/setup_other.cpp:132
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:141
+#: src/gui/setup_other.cpp:143
 #, fuzzy
 msgid "Enable shop mode"
 msgstr "Abilita/Disabilita Scambi"
 
-#: src/gui/setup_other.cpp:145
+#: src/gui/setup_other.cpp:147
 msgid "Enable buggy servers protection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:149
+#: src/gui/setup_other.cpp:151
 #, fuzzy
 msgid "Enable debug log"
 msgstr "Impossibile acquistare."
 
-#: src/gui/setup_other.cpp:153
+#: src/gui/setup_other.cpp:155
 #, fuzzy
 msgid "Enable server side attack"
 msgstr "Impossibile acquistare."
 
-#: src/gui/setup_other.cpp:157
+#: src/gui/setup_other.cpp:159
 msgid "Auto fix position"
 msgstr ""
 
-#: src/gui/setup_other.cpp:161
+#: src/gui/setup_other.cpp:163
 msgid "Attack while moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:165
+#: src/gui/setup_other.cpp:167
 #, fuzzy
 msgid "Enable quick stats"
 msgstr "Abilita joystick"
 
-#: src/gui/setup_other.cpp:169
+#: src/gui/setup_other.cpp:171
 msgid "Show warps particles"
 msgstr ""
 
-#: src/gui/setup_other.cpp:173
+#: src/gui/setup_other.cpp:175
 msgid "Accept sell/buy requests"
 msgstr ""
 
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:179
 msgid "Show monster hp bar"
 msgstr ""
 
+#: src/gui/setup_other.cpp:183
+#, fuzzy
+msgid "Show own hp bar"
+msgstr "Mostra nomi"
+
 #: src/gui/setup_players.cpp:60
 msgid "Relation"
 msgstr "Relazione"
@@ -3059,156 +3077,165 @@ msgstr "##1 prova più tardi"
 msgid "Completed"
 msgstr "Completato"
 
-#: src/gui/userpalette.cpp:109
+#: src/gui/userpalette.cpp:111
 msgid "Being"
 msgstr "Essere"
 
-#: src/gui/userpalette.cpp:110
+#: src/gui/userpalette.cpp:112
 #, fuzzy
 msgid "Friend Names"
 msgstr "Amico"
 
-#: src/gui/userpalette.cpp:111
+#: src/gui/userpalette.cpp:113
 #, fuzzy
 msgid "Disregarded Names"
 msgstr "Disprezzato"
 
-#: src/gui/userpalette.cpp:112
+#: src/gui/userpalette.cpp:114
 #, fuzzy
 msgid "Ignored Names"
 msgstr "Ignorato"
 
-#: src/gui/userpalette.cpp:113
+#: src/gui/userpalette.cpp:115
 #, fuzzy
 msgid "Erased Names"
 msgstr "Nomi dei GM"
 
-#: src/gui/userpalette.cpp:114
+#: src/gui/userpalette.cpp:116
 msgid "Other Players' Names"
 msgstr "Nomi degli altri giocatori"
 
-#: src/gui/userpalette.cpp:115
+#: src/gui/userpalette.cpp:117
 msgid "Own Name"
 msgstr "Proprio nome"
 
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:118
 msgid "GM Names"
 msgstr "Nomi dei GM"
 
-#: src/gui/userpalette.cpp:117
+#: src/gui/userpalette.cpp:119
 msgid "NPCs"
 msgstr "NPCs"
 
-#: src/gui/userpalette.cpp:118
+#: src/gui/userpalette.cpp:120
 msgid "Monsters"
 msgstr "Mostri"
 
-#: src/gui/userpalette.cpp:119
+#: src/gui/userpalette.cpp:121
 #, fuzzy
 msgid "Monster HP bar"
 msgstr "Il mostro colpisce il giocatore"
 
-#: src/gui/userpalette.cpp:121
+#: src/gui/userpalette.cpp:123
 msgid "Monster HP bar (second color)"
 msgstr ""
 
-#: src/gui/userpalette.cpp:122
+#: src/gui/userpalette.cpp:124
 #, fuzzy
 msgid "Party Members"
 msgstr "Party"
 
-#: src/gui/userpalette.cpp:123
+#: src/gui/userpalette.cpp:125
 #, fuzzy
 msgid "Guild Members"
 msgstr "Gilda"
 
-#: src/gui/userpalette.cpp:124
+#: src/gui/userpalette.cpp:126
 msgid "Particle Effects"
 msgstr "Effetti particelle"
 
-#: src/gui/userpalette.cpp:125
+#: src/gui/userpalette.cpp:127
 #, fuzzy
 msgid "Pickup Notification"
 msgstr "Notifica Esperienza"
 
-#: src/gui/userpalette.cpp:126
+#: src/gui/userpalette.cpp:128
 msgid "Exp Notification"
 msgstr "Notifica Esperienza"
 
-#: src/gui/userpalette.cpp:127
+#: src/gui/userpalette.cpp:129
+#, fuzzy
+msgid "Player HP bar"
+msgstr "Il mostro colpisce il giocatore"
+
+#: src/gui/userpalette.cpp:131
+msgid "Player HP bar (second color)"
+msgstr ""
+
+#: src/gui/userpalette.cpp:132
 #, fuzzy
 msgid "Player Hits Monster"
 msgstr "Il giocatore colpisce il mostro"
 
-#: src/gui/userpalette.cpp:128
+#: src/gui/userpalette.cpp:133
 #, fuzzy
 msgid "Monster Hits Player"
 msgstr "Il mostro colpisce il giocatore"
 
-#: src/gui/userpalette.cpp:130
+#: src/gui/userpalette.cpp:135
 #, fuzzy
 msgid "Other Player Hits Local Player"
 msgstr "Nomi degli altri giocatori"
 
-#: src/gui/userpalette.cpp:131
+#: src/gui/userpalette.cpp:136
 msgid "Critical Hit"
 msgstr "Colpo critico"
 
-#: src/gui/userpalette.cpp:133
+#: src/gui/userpalette.cpp:138
 #, fuzzy
 msgid "Local Player Hits Monster"
 msgstr "Il giocatore colpisce il mostro"
 
-#: src/gui/userpalette.cpp:135
+#: src/gui/userpalette.cpp:140
 #, fuzzy
 msgid "Local Player Critical Hit"
 msgstr "Il giocatore colpisce il mostro"
 
-#: src/gui/userpalette.cpp:137
+#: src/gui/userpalette.cpp:142
 msgid "Local Player Miss"
 msgstr ""
 
-#: src/gui/userpalette.cpp:138
+#: src/gui/userpalette.cpp:143
 msgid "Misses"
 msgstr "Perde"
 
-#: src/gui/userpalette.cpp:139
+#: src/gui/userpalette.cpp:144
 #, fuzzy
 msgid "Portal Highlight"
 msgstr "Evidenziazione scheda"
 
-#: src/gui/userpalette.cpp:141
+#: src/gui/userpalette.cpp:146
 #, fuzzy
 msgid "Collision Highlight"
 msgstr "Evidenziazione"
 
-#: src/gui/userpalette.cpp:143
+#: src/gui/userpalette.cpp:148
 #, fuzzy
 msgid "Walkable Highlight"
 msgstr "Evidenziazione scheda"
 
-#: src/gui/userpalette.cpp:145
+#: src/gui/userpalette.cpp:150
 msgid "Local Player Attack Range"
 msgstr ""
 
-#: src/gui/userpalette.cpp:147
+#: src/gui/userpalette.cpp:152
 msgid "Local Player Attack Range Border"
 msgstr ""
 
-#: src/gui/userpalette.cpp:149
+#: src/gui/userpalette.cpp:154
 #, fuzzy
 msgid "Monster Attack Range"
 msgstr "Il mostro colpisce il giocatore"
 
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:156
 msgid "Home Place"
 msgstr ""
 
-#: src/gui/userpalette.cpp:153
+#: src/gui/userpalette.cpp:158
 msgid "Home Place Border"
 msgstr ""
 
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:160
 msgid "Road Point"
 msgstr ""
 
@@ -3232,6 +3259,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 +3703,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 +4139,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 +4183,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 +4195,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 +4406,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 +4897,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 +5226,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 +5258,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 +5287,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..bfc33f73a 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-06 03:06+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:481
+msgid "dodge"
+msgstr ""
+
+#: src/being.cpp:481
+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 ""
 
@@ -1866,7 +1879,7 @@ msgid "Show chat colors list"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:111 src/gui/setup_chat.cpp:119
-#: src/gui/setup_other.cpp:135 src/gui/setup_other.cpp:139
+#: src/gui/setup_other.cpp:137 src/gui/setup_other.cpp:141
 msgid "Edit"
 msgstr ""
 
@@ -1890,26 +1903,26 @@ msgstr ""
 msgid "Type:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:398
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:400
 msgid "Static"
 msgstr ""
 
 #: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
-#: src/gui/setup_colors.cpp:399
+#: src/gui/setup_colors.cpp:401
 msgid "Pulse"
 msgstr ""
 
 #: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:400
+#: src/gui/setup_colors.cpp:402
 msgid "Rainbow"
 msgstr ""
 
 #: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:400
+#: src/gui/setup_colors.cpp:402
 msgid "Spectrum"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:94 src/gui/setup_colors.cpp:310
+#: src/gui/setup_colors.cpp:94 src/gui/setup_colors.cpp:312
 msgid "Delay:"
 msgstr ""
 
@@ -1925,7 +1938,7 @@ msgstr ""
 msgid "Blue:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:305
+#: src/gui/setup_colors.cpp:307
 msgid "Alpha:"
 msgstr ""
 
@@ -1981,90 +1994,94 @@ msgstr ""
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_other.cpp:92
+#: src/gui/setup_other.cpp:94
 msgid "Misc"
 msgstr ""
 
-#: src/gui/setup_other.cpp:95
+#: src/gui/setup_other.cpp:97
 msgid "Show damage inflicted to monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:100
+#: src/gui/setup_other.cpp:102
 msgid "Auto target only reachable monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:104
+#: src/gui/setup_other.cpp:106
 msgid "Highlight map portals"
 msgstr ""
 
-#: src/gui/setup_other.cpp:109
+#: src/gui/setup_other.cpp:111
 msgid "Highlight player attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:114
+#: src/gui/setup_other.cpp:116
 msgid "Highlight monster attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:118
+#: src/gui/setup_other.cpp:120
 msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:121
+#: src/gui/setup_other.cpp:123
 msgid "Cycle monster targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:124
+#: src/gui/setup_other.cpp:126
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:127
+#: src/gui/setup_other.cpp:129
 msgid "Highlight floor items"
 msgstr ""
 
-#: src/gui/setup_other.cpp:130
+#: src/gui/setup_other.cpp:132
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:141
+#: src/gui/setup_other.cpp:143
 msgid "Enable shop mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:145
+#: src/gui/setup_other.cpp:147
 msgid "Enable buggy servers protection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:149
+#: src/gui/setup_other.cpp:151
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:153
+#: src/gui/setup_other.cpp:155
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:157
+#: src/gui/setup_other.cpp:159
 msgid "Auto fix position"
 msgstr ""
 
-#: src/gui/setup_other.cpp:161
+#: src/gui/setup_other.cpp:163
 msgid "Attack while moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:165
+#: src/gui/setup_other.cpp:167
 msgid "Enable quick stats"
 msgstr ""
 
-#: src/gui/setup_other.cpp:169
+#: src/gui/setup_other.cpp:171
 msgid "Show warps particles"
 msgstr ""
 
-#: src/gui/setup_other.cpp:173
+#: src/gui/setup_other.cpp:175
 msgid "Accept sell/buy requests"
 msgstr ""
 
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:179
 msgid "Show monster hp bar"
 msgstr ""
 
+#: src/gui/setup_other.cpp:183
+msgid "Show own hp bar"
+msgstr ""
+
 #: src/gui/setup_players.cpp:60
 msgid "Relation"
 msgstr ""
@@ -2854,139 +2871,147 @@ msgstr ""
 msgid "Completed"
 msgstr ""
 
-#: src/gui/userpalette.cpp:109
+#: src/gui/userpalette.cpp:111
 msgid "Being"
 msgstr ""
 
-#: src/gui/userpalette.cpp:110
+#: src/gui/userpalette.cpp:112
 msgid "Friend Names"
 msgstr ""
 
-#: src/gui/userpalette.cpp:111
+#: src/gui/userpalette.cpp:113
 msgid "Disregarded Names"
 msgstr ""
 
-#: src/gui/userpalette.cpp:112
+#: src/gui/userpalette.cpp:114
 msgid "Ignored Names"
 msgstr ""
 
-#: src/gui/userpalette.cpp:113
+#: src/gui/userpalette.cpp:115
 msgid "Erased Names"
 msgstr ""
 
-#: src/gui/userpalette.cpp:114
+#: src/gui/userpalette.cpp:116
 msgid "Other Players' Names"
 msgstr ""
 
-#: src/gui/userpalette.cpp:115
+#: src/gui/userpalette.cpp:117
 msgid "Own Name"
 msgstr ""
 
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:118
 msgid "GM Names"
 msgstr ""
 
-#: src/gui/userpalette.cpp:117
+#: src/gui/userpalette.cpp:119
 msgid "NPCs"
 msgstr ""
 
-#: src/gui/userpalette.cpp:118
+#: src/gui/userpalette.cpp:120
 msgid "Monsters"
 msgstr ""
 
-#: src/gui/userpalette.cpp:119
+#: src/gui/userpalette.cpp:121
 msgid "Monster HP bar"
 msgstr ""
 
-#: src/gui/userpalette.cpp:121
+#: src/gui/userpalette.cpp:123
 msgid "Monster HP bar (second color)"
 msgstr ""
 
-#: src/gui/userpalette.cpp:122
+#: src/gui/userpalette.cpp:124
 msgid "Party Members"
 msgstr ""
 
-#: src/gui/userpalette.cpp:123
+#: src/gui/userpalette.cpp:125
 msgid "Guild Members"
 msgstr ""
 
-#: src/gui/userpalette.cpp:124
+#: src/gui/userpalette.cpp:126
 msgid "Particle Effects"
 msgstr ""
 
-#: src/gui/userpalette.cpp:125
+#: src/gui/userpalette.cpp:127
 msgid "Pickup Notification"
 msgstr ""
 
-#: src/gui/userpalette.cpp:126
+#: src/gui/userpalette.cpp:128
 msgid "Exp Notification"
 msgstr ""
 
-#: src/gui/userpalette.cpp:127
+#: src/gui/userpalette.cpp:129
+msgid "Player HP bar"
+msgstr ""
+
+#: src/gui/userpalette.cpp:131
+msgid "Player HP bar (second color)"
+msgstr ""
+
+#: src/gui/userpalette.cpp:132
 msgid "Player Hits Monster"
 msgstr ""
 
-#: src/gui/userpalette.cpp:128
+#: src/gui/userpalette.cpp:133
 msgid "Monster Hits Player"
 msgstr ""
 
-#: src/gui/userpalette.cpp:130
+#: src/gui/userpalette.cpp:135
 msgid "Other Player Hits Local Player"
 msgstr ""
 
-#: src/gui/userpalette.cpp:131
+#: src/gui/userpalette.cpp:136
 msgid "Critical Hit"
 msgstr ""
 
-#: src/gui/userpalette.cpp:133
+#: src/gui/userpalette.cpp:138
 msgid "Local Player Hits Monster"
 msgstr ""
 
-#: src/gui/userpalette.cpp:135
+#: src/gui/userpalette.cpp:140
 msgid "Local Player Critical Hit"
 msgstr ""
 
-#: src/gui/userpalette.cpp:137
+#: src/gui/userpalette.cpp:142
 msgid "Local Player Miss"
 msgstr ""
 
-#: src/gui/userpalette.cpp:138
+#: src/gui/userpalette.cpp:143
 msgid "Misses"
 msgstr ""
 
-#: src/gui/userpalette.cpp:139
+#: src/gui/userpalette.cpp:144
 msgid "Portal Highlight"
 msgstr ""
 
-#: src/gui/userpalette.cpp:141
+#: src/gui/userpalette.cpp:146
 msgid "Collision Highlight"
 msgstr ""
 
-#: src/gui/userpalette.cpp:143
+#: src/gui/userpalette.cpp:148
 msgid "Walkable Highlight"
 msgstr ""
 
-#: src/gui/userpalette.cpp:145
+#: src/gui/userpalette.cpp:150
 msgid "Local Player Attack Range"
 msgstr ""
 
-#: src/gui/userpalette.cpp:147
+#: src/gui/userpalette.cpp:152
 msgid "Local Player Attack Range Border"
 msgstr ""
 
-#: src/gui/userpalette.cpp:149
+#: src/gui/userpalette.cpp:154
 msgid "Monster Attack Range"
 msgstr ""
 
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:156
 msgid "Home Place"
 msgstr ""
 
-#: src/gui/userpalette.cpp:153
+#: src/gui/userpalette.cpp:158
 msgid "Home Place Border"
 msgstr ""
 
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:160
 msgid "Road Point"
 msgstr ""
 
@@ -3010,6 +3035,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 +3456,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 +3856,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 +3897,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 +4100,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 +4554,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 +4870,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 +4898,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 +4926,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..4d724e6ba 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-06 03:06+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:481
+msgid "dodge"
+msgstr ""
+
+#: src/being.cpp:481
+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 ""
 
@@ -1992,7 +2005,7 @@ msgid "Show chat colors list"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:111 src/gui/setup_chat.cpp:119
-#: src/gui/setup_other.cpp:135 src/gui/setup_other.cpp:139
+#: src/gui/setup_other.cpp:137 src/gui/setup_other.cpp:141
 msgid "Edit"
 msgstr ""
 
@@ -2017,26 +2030,26 @@ msgstr "Kleuren"
 msgid "Type:"
 msgstr "Type: "
 
-#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:398
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:400
 msgid "Static"
 msgstr "Statisch"
 
 #: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
-#: src/gui/setup_colors.cpp:399
+#: src/gui/setup_colors.cpp:401
 msgid "Pulse"
 msgstr "Puls"
 
 #: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:400
+#: src/gui/setup_colors.cpp:402
 msgid "Rainbow"
 msgstr "Regenboog"
 
 #: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:400
+#: src/gui/setup_colors.cpp:402
 msgid "Spectrum"
 msgstr "Spectrum"
 
-#: src/gui/setup_colors.cpp:94 src/gui/setup_colors.cpp:310
+#: src/gui/setup_colors.cpp:94 src/gui/setup_colors.cpp:312
 #, fuzzy
 msgid "Delay:"
 msgstr "Vertraging: "
@@ -2056,7 +2069,7 @@ msgstr "Groen: "
 msgid "Blue:"
 msgstr "Blauw: "
 
-#: src/gui/setup_colors.cpp:305
+#: src/gui/setup_colors.cpp:307
 msgid "Alpha:"
 msgstr ""
 
@@ -2113,99 +2126,104 @@ msgstr "Standaard"
 msgid "Key Conflict(s) Detected."
 msgstr "Conflict(en) tussen toetsen gevonden."
 
-#: src/gui/setup_other.cpp:92
+#: src/gui/setup_other.cpp:94
 msgid "Misc"
 msgstr ""
 
-#: src/gui/setup_other.cpp:95
+#: src/gui/setup_other.cpp:97
 msgid "Show damage inflicted to monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:100
+#: src/gui/setup_other.cpp:102
 msgid "Auto target only reachable monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:104
+#: src/gui/setup_other.cpp:106
 #, fuzzy
 msgid "Highlight map portals"
 msgstr "Accentueren"
 
-#: src/gui/setup_other.cpp:109
+#: src/gui/setup_other.cpp:111
 msgid "Highlight player attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:114
+#: src/gui/setup_other.cpp:116
 msgid "Highlight monster attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:118
+#: src/gui/setup_other.cpp:120
 msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:121
+#: src/gui/setup_other.cpp:123
 #, fuzzy
 msgid "Cycle monster targets"
 msgstr "Naam tonen"
 
-#: src/gui/setup_other.cpp:124
+#: src/gui/setup_other.cpp:126
 #, fuzzy
 msgid "Enable bot checker"
 msgstr "Joystick activeren"
 
-#: src/gui/setup_other.cpp:127
+#: src/gui/setup_other.cpp:129
 #, fuzzy
 msgid "Highlight floor items"
 msgstr "Accentueren"
 
-#: src/gui/setup_other.cpp:130
+#: src/gui/setup_other.cpp:132
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:141
+#: src/gui/setup_other.cpp:143
 #, fuzzy
 msgid "Enable shop mode"
 msgstr "Handelen inschakelen/uitschakelen"
 
-#: src/gui/setup_other.cpp:145
+#: src/gui/setup_other.cpp:147
 msgid "Enable buggy servers protection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:149
+#: src/gui/setup_other.cpp:151
 #, fuzzy
 msgid "Enable debug log"
 msgstr "Kan niets kopen."
 
-#: src/gui/setup_other.cpp:153
+#: src/gui/setup_other.cpp:155
 #, fuzzy
 msgid "Enable server side attack"
 msgstr "Kan niets kopen."
 
-#: src/gui/setup_other.cpp:157
+#: src/gui/setup_other.cpp:159
 msgid "Auto fix position"
 msgstr ""
 
-#: src/gui/setup_other.cpp:161
+#: src/gui/setup_other.cpp:163
 msgid "Attack while moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:165
+#: src/gui/setup_other.cpp:167
 #, fuzzy
 msgid "Enable quick stats"
 msgstr "Joystick activeren"
 
-#: src/gui/setup_other.cpp:169
+#: src/gui/setup_other.cpp:171
 #, fuzzy
 msgid "Show warps particles"
 msgstr "als deeltje"
 
-#: src/gui/setup_other.cpp:173
+#: src/gui/setup_other.cpp:175
 msgid "Accept sell/buy requests"
 msgstr ""
 
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:179
 msgid "Show monster hp bar"
 msgstr ""
 
+#: src/gui/setup_other.cpp:183
+#, fuzzy
+msgid "Show own hp bar"
+msgstr "Naam tonen"
+
 #: src/gui/setup_players.cpp:60
 msgid "Relation"
 msgstr "Relatie"
@@ -3048,154 +3066,163 @@ msgstr "##1 je later opnieuw probeert"
 msgid "Completed"
 msgstr "Voltooid"
 
-#: src/gui/userpalette.cpp:109
+#: src/gui/userpalette.cpp:111
 msgid "Being"
 msgstr "Wezen"
 
-#: src/gui/userpalette.cpp:110
+#: src/gui/userpalette.cpp:112
 #, fuzzy
 msgid "Friend Names"
 msgstr "Vriend"
 
-#: src/gui/userpalette.cpp:111
+#: src/gui/userpalette.cpp:113
 msgid "Disregarded Names"
 msgstr ""
 
-#: src/gui/userpalette.cpp:112
+#: src/gui/userpalette.cpp:114
 #, fuzzy
 msgid "Ignored Names"
 msgstr "Genegeerd"
 
-#: src/gui/userpalette.cpp:113
+#: src/gui/userpalette.cpp:115
 #, fuzzy
 msgid "Erased Names"
 msgstr "GM Namen"
 
-#: src/gui/userpalette.cpp:114
+#: src/gui/userpalette.cpp:116
 msgid "Other Players' Names"
 msgstr "Namen van andere Spelers"
 
-#: src/gui/userpalette.cpp:115
+#: src/gui/userpalette.cpp:117
 msgid "Own Name"
 msgstr "Eigen Naam"
 
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:118
 msgid "GM Names"
 msgstr "GM Namen"
 
-#: src/gui/userpalette.cpp:117
+#: src/gui/userpalette.cpp:119
 msgid "NPCs"
 msgstr "NPCs"
 
-#: src/gui/userpalette.cpp:118
+#: src/gui/userpalette.cpp:120
 msgid "Monsters"
 msgstr "Monsters"
 
-#: src/gui/userpalette.cpp:119
+#: src/gui/userpalette.cpp:121
 #, fuzzy
 msgid "Monster HP bar"
 msgstr "Monster raakt Speler"
 
-#: src/gui/userpalette.cpp:121
+#: src/gui/userpalette.cpp:123
 msgid "Monster HP bar (second color)"
 msgstr ""
 
-#: src/gui/userpalette.cpp:122
+#: src/gui/userpalette.cpp:124
 #, fuzzy
 msgid "Party Members"
 msgstr "Groep"
 
-#: src/gui/userpalette.cpp:123
+#: src/gui/userpalette.cpp:125
 #, fuzzy
 msgid "Guild Members"
 msgstr "Guild"
 
-#: src/gui/userpalette.cpp:124
+#: src/gui/userpalette.cpp:126
 msgid "Particle Effects"
 msgstr "Deeltjes effecten"
 
-#: src/gui/userpalette.cpp:125
+#: src/gui/userpalette.cpp:127
 msgid "Pickup Notification"
 msgstr "Notificatie bij opnemen"
 
-#: src/gui/userpalette.cpp:126
+#: src/gui/userpalette.cpp:128
 msgid "Exp Notification"
 msgstr "Ervaring Notificatie"
 
-#: src/gui/userpalette.cpp:127
+#: src/gui/userpalette.cpp:129
+#, fuzzy
+msgid "Player HP bar"
+msgstr "Monster raakt Speler"
+
+#: src/gui/userpalette.cpp:131
+msgid "Player HP bar (second color)"
+msgstr ""
+
+#: src/gui/userpalette.cpp:132
 #, fuzzy
 msgid "Player Hits Monster"
 msgstr "Speler raakt Monster"
 
-#: src/gui/userpalette.cpp:128
+#: src/gui/userpalette.cpp:133
 #, fuzzy
 msgid "Monster Hits Player"
 msgstr "Monster raakt Speler"
 
-#: src/gui/userpalette.cpp:130
+#: src/gui/userpalette.cpp:135
 #, fuzzy
 msgid "Other Player Hits Local Player"
 msgstr "Namen van andere Spelers"
 
-#: src/gui/userpalette.cpp:131
+#: src/gui/userpalette.cpp:136
 msgid "Critical Hit"
 msgstr "Kritieke aanval"
 
-#: src/gui/userpalette.cpp:133
+#: src/gui/userpalette.cpp:138
 #, fuzzy
 msgid "Local Player Hits Monster"
 msgstr "Speler raakt Monster"
 
-#: src/gui/userpalette.cpp:135
+#: src/gui/userpalette.cpp:140
 #, fuzzy
 msgid "Local Player Critical Hit"
 msgstr "Speler raakt Monster"
 
-#: src/gui/userpalette.cpp:137
+#: src/gui/userpalette.cpp:142
 msgid "Local Player Miss"
 msgstr ""
 
-#: src/gui/userpalette.cpp:138
+#: src/gui/userpalette.cpp:143
 msgid "Misses"
 msgstr "Missers"
 
-#: src/gui/userpalette.cpp:139
+#: src/gui/userpalette.cpp:144
 #, fuzzy
 msgid "Portal Highlight"
 msgstr "Tab Accentuering"
 
-#: src/gui/userpalette.cpp:141
+#: src/gui/userpalette.cpp:146
 #, fuzzy
 msgid "Collision Highlight"
 msgstr "Accentueren"
 
-#: src/gui/userpalette.cpp:143
+#: src/gui/userpalette.cpp:148
 #, fuzzy
 msgid "Walkable Highlight"
 msgstr "Tab Accentuering"
 
-#: src/gui/userpalette.cpp:145
+#: src/gui/userpalette.cpp:150
 msgid "Local Player Attack Range"
 msgstr ""
 
-#: src/gui/userpalette.cpp:147
+#: src/gui/userpalette.cpp:152
 msgid "Local Player Attack Range Border"
 msgstr ""
 
-#: src/gui/userpalette.cpp:149
+#: src/gui/userpalette.cpp:154
 #, fuzzy
 msgid "Monster Attack Range"
 msgstr "Monster raakt Speler"
 
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:156
 msgid "Home Place"
 msgstr ""
 
-#: src/gui/userpalette.cpp:153
+#: src/gui/userpalette.cpp:158
 msgid "Home Place Border"
 msgstr ""
 
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:160
 msgid "Road Point"
 msgstr ""
 
@@ -3219,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 > Lijst van gebruikers in het huidig kanaal weergeven"
@@ -3663,174 +3694,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 +4133,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 +4178,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 +4190,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 +4402,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 +4895,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 +5229,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 +5261,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 +5290,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..d8c63d973 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-06 03:06+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:481
+msgid "dodge"
+msgstr ""
+
+#: src/being.cpp:481
+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 ""
 
@@ -2008,7 +2021,7 @@ msgid "Show chat colors list"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:111 src/gui/setup_chat.cpp:119
-#: src/gui/setup_other.cpp:135 src/gui/setup_other.cpp:139
+#: src/gui/setup_other.cpp:137 src/gui/setup_other.cpp:141
 msgid "Edit"
 msgstr ""
 
@@ -2033,26 +2046,26 @@ msgstr "Kolory"
 msgid "Type:"
 msgstr "Typ: "
 
-#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:398
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:400
 msgid "Static"
 msgstr "Statyczny"
 
 #: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
-#: src/gui/setup_colors.cpp:399
+#: src/gui/setup_colors.cpp:401
 msgid "Pulse"
 msgstr "Puls"
 
 #: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:400
+#: src/gui/setup_colors.cpp:402
 msgid "Rainbow"
 msgstr "Tęcza"
 
 #: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:400
+#: src/gui/setup_colors.cpp:402
 msgid "Spectrum"
 msgstr "Widmo"
 
-#: src/gui/setup_colors.cpp:94 src/gui/setup_colors.cpp:310
+#: src/gui/setup_colors.cpp:94 src/gui/setup_colors.cpp:312
 #, fuzzy
 msgid "Delay:"
 msgstr "Opóźnienie: "
@@ -2072,7 +2085,7 @@ msgstr "Zielony: "
 msgid "Blue:"
 msgstr "Niebieski: "
 
-#: src/gui/setup_colors.cpp:305
+#: src/gui/setup_colors.cpp:307
 msgid "Alpha:"
 msgstr ""
 
@@ -2129,99 +2142,104 @@ msgstr "Domyślny"
 msgid "Key Conflict(s) Detected."
 msgstr "Wykryto konflikt klawiszy."
 
-#: src/gui/setup_other.cpp:92
+#: src/gui/setup_other.cpp:94
 msgid "Misc"
 msgstr ""
 
-#: src/gui/setup_other.cpp:95
+#: src/gui/setup_other.cpp:97
 msgid "Show damage inflicted to monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:100
+#: src/gui/setup_other.cpp:102
 msgid "Auto target only reachable monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:104
+#: src/gui/setup_other.cpp:106
 #, fuzzy
 msgid "Highlight map portals"
 msgstr "Podświetlenie"
 
-#: src/gui/setup_other.cpp:109
+#: src/gui/setup_other.cpp:111
 msgid "Highlight player attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:114
+#: src/gui/setup_other.cpp:116
 msgid "Highlight monster attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:118
+#: src/gui/setup_other.cpp:120
 msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:121
+#: src/gui/setup_other.cpp:123
 #, fuzzy
 msgid "Cycle monster targets"
 msgstr "Pokaż imię"
 
-#: src/gui/setup_other.cpp:124
+#: src/gui/setup_other.cpp:126
 #, fuzzy
 msgid "Enable bot checker"
 msgstr "Włącz joystick"
 
-#: src/gui/setup_other.cpp:127
+#: src/gui/setup_other.cpp:129
 #, fuzzy
 msgid "Highlight floor items"
 msgstr "Podświetlenie"
 
-#: src/gui/setup_other.cpp:130
+#: src/gui/setup_other.cpp:132
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:141
+#: src/gui/setup_other.cpp:143
 #, fuzzy
 msgid "Enable shop mode"
 msgstr "Włącz/Wysłącz Handlowanie"
 
-#: src/gui/setup_other.cpp:145
+#: src/gui/setup_other.cpp:147
 msgid "Enable buggy servers protection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:149
+#: src/gui/setup_other.cpp:151
 #, fuzzy
 msgid "Enable debug log"
 msgstr "Nie można kupić."
 
-#: src/gui/setup_other.cpp:153
+#: src/gui/setup_other.cpp:155
 #, fuzzy
 msgid "Enable server side attack"
 msgstr "Nie można kupić."
 
-#: src/gui/setup_other.cpp:157
+#: src/gui/setup_other.cpp:159
 msgid "Auto fix position"
 msgstr ""
 
-#: src/gui/setup_other.cpp:161
+#: src/gui/setup_other.cpp:163
 msgid "Attack while moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:165
+#: src/gui/setup_other.cpp:167
 #, fuzzy
 msgid "Enable quick stats"
 msgstr "Włącz joystick"
 
-#: src/gui/setup_other.cpp:169
+#: src/gui/setup_other.cpp:171
 #, fuzzy
 msgid "Show warps particles"
 msgstr "jako cząsteczkę"
 
-#: src/gui/setup_other.cpp:173
+#: src/gui/setup_other.cpp:175
 msgid "Accept sell/buy requests"
 msgstr ""
 
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:179
 msgid "Show monster hp bar"
 msgstr ""
 
+#: src/gui/setup_other.cpp:183
+#, fuzzy
+msgid "Show own hp bar"
+msgstr "Pokaż imię"
+
 #: src/gui/setup_players.cpp:60
 msgid "Relation"
 msgstr "Relacja"
@@ -3064,156 +3082,165 @@ msgstr "##1 spróbował później"
 msgid "Completed"
 msgstr "Zakończono"
 
-#: src/gui/userpalette.cpp:109
+#: src/gui/userpalette.cpp:111
 msgid "Being"
 msgstr "Byty"
 
-#: src/gui/userpalette.cpp:110
+#: src/gui/userpalette.cpp:112
 #, fuzzy
 msgid "Friend Names"
 msgstr "Przyjaciel"
 
-#: src/gui/userpalette.cpp:111
+#: src/gui/userpalette.cpp:113
 #, fuzzy
 msgid "Disregarded Names"
 msgstr "Nielubiany"
 
-#: src/gui/userpalette.cpp:112
+#: src/gui/userpalette.cpp:114
 #, fuzzy
 msgid "Ignored Names"
 msgstr "Ignorowany"
 
-#: src/gui/userpalette.cpp:113
+#: src/gui/userpalette.cpp:115
 #, fuzzy
 msgid "Erased Names"
 msgstr "Imiona GM"
 
-#: src/gui/userpalette.cpp:114
+#: src/gui/userpalette.cpp:116
 msgid "Other Players' Names"
 msgstr "Imiona Innych Graczy"
 
-#: src/gui/userpalette.cpp:115
+#: src/gui/userpalette.cpp:117
 msgid "Own Name"
 msgstr "Własne Imię"
 
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:118
 msgid "GM Names"
 msgstr "Imiona GM"
 
-#: src/gui/userpalette.cpp:117
+#: src/gui/userpalette.cpp:119
 msgid "NPCs"
 msgstr "NPC"
 
-#: src/gui/userpalette.cpp:118
+#: src/gui/userpalette.cpp:120
 msgid "Monsters"
 msgstr "Potwory"
 
-#: src/gui/userpalette.cpp:119
+#: src/gui/userpalette.cpp:121
 #, fuzzy
 msgid "Monster HP bar"
 msgstr "Potwór uderza Gracza"
 
-#: src/gui/userpalette.cpp:121
+#: src/gui/userpalette.cpp:123
 msgid "Monster HP bar (second color)"
 msgstr ""
 
-#: src/gui/userpalette.cpp:122
+#: src/gui/userpalette.cpp:124
 #, fuzzy
 msgid "Party Members"
 msgstr "Grupa"
 
-#: src/gui/userpalette.cpp:123
+#: src/gui/userpalette.cpp:125
 #, fuzzy
 msgid "Guild Members"
 msgstr "Gildia"
 
-#: src/gui/userpalette.cpp:124
+#: src/gui/userpalette.cpp:126
 msgid "Particle Effects"
 msgstr "Efekty Cząsteczkowe"
 
-#: src/gui/userpalette.cpp:125
+#: src/gui/userpalette.cpp:127
 msgid "Pickup Notification"
 msgstr "Powiadomienie o podniesieniu"
 
-#: src/gui/userpalette.cpp:126
+#: src/gui/userpalette.cpp:128
 msgid "Exp Notification"
 msgstr "Powiadomienie o Exp"
 
-#: src/gui/userpalette.cpp:127
+#: src/gui/userpalette.cpp:129
+#, fuzzy
+msgid "Player HP bar"
+msgstr "Potwór uderza Gracza"
+
+#: src/gui/userpalette.cpp:131
+msgid "Player HP bar (second color)"
+msgstr ""
+
+#: src/gui/userpalette.cpp:132
 #, fuzzy
 msgid "Player Hits Monster"
 msgstr "Gracz uderza Potwora"
 
-#: src/gui/userpalette.cpp:128
+#: src/gui/userpalette.cpp:133
 #, fuzzy
 msgid "Monster Hits Player"
 msgstr "Potwór uderza Gracza"
 
-#: src/gui/userpalette.cpp:130
+#: src/gui/userpalette.cpp:135
 #, fuzzy
 msgid "Other Player Hits Local Player"
 msgstr "Imiona Innych Graczy"
 
-#: src/gui/userpalette.cpp:131
+#: src/gui/userpalette.cpp:136
 msgid "Critical Hit"
 msgstr "Uderzenie Krytyczne"
 
-#: src/gui/userpalette.cpp:133
+#: src/gui/userpalette.cpp:138
 #, fuzzy
 msgid "Local Player Hits Monster"
 msgstr "Gracz uderza Potwora"
 
-#: src/gui/userpalette.cpp:135
+#: src/gui/userpalette.cpp:140
 #, fuzzy
 msgid "Local Player Critical Hit"
 msgstr "Gracz uderza Potwora"
 
-#: src/gui/userpalette.cpp:137
+#: src/gui/userpalette.cpp:142
 #, fuzzy
 msgid "Local Player Miss"
 msgstr "Zapisz listę graczy"
 
-#: src/gui/userpalette.cpp:138
+#: src/gui/userpalette.cpp:143
 msgid "Misses"
 msgstr "Pudła"
 
-#: src/gui/userpalette.cpp:139
+#: src/gui/userpalette.cpp:144
 #, fuzzy
 msgid "Portal Highlight"
 msgstr "Podświetlenie zakładki"
 
-#: src/gui/userpalette.cpp:141
+#: src/gui/userpalette.cpp:146
 #, fuzzy
 msgid "Collision Highlight"
 msgstr "Podświetlenie"
 
-#: src/gui/userpalette.cpp:143
+#: src/gui/userpalette.cpp:148
 #, fuzzy
 msgid "Walkable Highlight"
 msgstr "Podświetlenie zakładki"
 
-#: src/gui/userpalette.cpp:145
+#: src/gui/userpalette.cpp:150
 msgid "Local Player Attack Range"
 msgstr ""
 
-#: src/gui/userpalette.cpp:147
+#: src/gui/userpalette.cpp:152
 msgid "Local Player Attack Range Border"
 msgstr ""
 
-#: src/gui/userpalette.cpp:149
+#: src/gui/userpalette.cpp:154
 #, fuzzy
 msgid "Monster Attack Range"
 msgstr "Potwór uderza Gracza"
 
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:156
 msgid "Home Place"
 msgstr ""
 
-#: src/gui/userpalette.cpp:153
+#: src/gui/userpalette.cpp:158
 msgid "Home Place Border"
 msgstr ""
 
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:160
 msgid "Road Point"
 msgstr ""
 
@@ -3237,6 +3264,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 +3708,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 +4144,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 +4189,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 +4201,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 +4413,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 +4904,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 +5234,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 +5266,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 +5295,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..b216fcc80 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-06 03:06+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:481
+msgid "dodge"
+msgstr ""
+
+#: src/being.cpp:481
+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 ""
 
@@ -2004,7 +2017,7 @@ msgid "Show chat colors list"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:111 src/gui/setup_chat.cpp:119
-#: src/gui/setup_other.cpp:135 src/gui/setup_other.cpp:139
+#: src/gui/setup_other.cpp:137 src/gui/setup_other.cpp:141
 msgid "Edit"
 msgstr ""
 
@@ -2029,26 +2042,26 @@ msgstr "Cores"
 msgid "Type:"
 msgstr "Tipo: "
 
-#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:398
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:400
 msgid "Static"
 msgstr "Estática"
 
 #: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
-#: src/gui/setup_colors.cpp:399
+#: src/gui/setup_colors.cpp:401
 msgid "Pulse"
 msgstr "Pulsar"
 
 #: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:400
+#: src/gui/setup_colors.cpp:402
 msgid "Rainbow"
 msgstr "Arco-Íris"
 
 #: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:400
+#: src/gui/setup_colors.cpp:402
 msgid "Spectrum"
 msgstr "Espectro"
 
-#: src/gui/setup_colors.cpp:94 src/gui/setup_colors.cpp:310
+#: src/gui/setup_colors.cpp:94 src/gui/setup_colors.cpp:312
 #, fuzzy
 msgid "Delay:"
 msgstr "Atraso: "
@@ -2068,7 +2081,7 @@ msgstr "Verde: "
 msgid "Blue:"
 msgstr "Azul: "
 
-#: src/gui/setup_colors.cpp:305
+#: src/gui/setup_colors.cpp:307
 msgid "Alpha:"
 msgstr ""
 
@@ -2125,99 +2138,104 @@ msgstr "Padrão"
 msgid "Key Conflict(s) Detected."
 msgstr "Conflitos nas teclas detectado."
 
-#: src/gui/setup_other.cpp:92
+#: src/gui/setup_other.cpp:94
 msgid "Misc"
 msgstr ""
 
-#: src/gui/setup_other.cpp:95
+#: src/gui/setup_other.cpp:97
 msgid "Show damage inflicted to monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:100
+#: src/gui/setup_other.cpp:102
 msgid "Auto target only reachable monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:104
+#: src/gui/setup_other.cpp:106
 #, fuzzy
 msgid "Highlight map portals"
 msgstr "Realçar"
 
-#: src/gui/setup_other.cpp:109
+#: src/gui/setup_other.cpp:111
 msgid "Highlight player attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:114
+#: src/gui/setup_other.cpp:116
 msgid "Highlight monster attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:118
+#: src/gui/setup_other.cpp:120
 msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:121
+#: src/gui/setup_other.cpp:123
 #, fuzzy
 msgid "Cycle monster targets"
 msgstr "Mostrar nome"
 
-#: src/gui/setup_other.cpp:124
+#: src/gui/setup_other.cpp:126
 #, fuzzy
 msgid "Enable bot checker"
 msgstr "Habilitar Joystick"
 
-#: src/gui/setup_other.cpp:127
+#: src/gui/setup_other.cpp:129
 #, fuzzy
 msgid "Highlight floor items"
 msgstr "Realçar"
 
-#: src/gui/setup_other.cpp:130
+#: src/gui/setup_other.cpp:132
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:141
+#: src/gui/setup_other.cpp:143
 #, fuzzy
 msgid "Enable shop mode"
 msgstr "Habilitar/Desabilitar Negociações"
 
-#: src/gui/setup_other.cpp:145
+#: src/gui/setup_other.cpp:147
 msgid "Enable buggy servers protection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:149
+#: src/gui/setup_other.cpp:151
 #, fuzzy
 msgid "Enable debug log"
 msgstr "Impossível comprar."
 
-#: src/gui/setup_other.cpp:153
+#: src/gui/setup_other.cpp:155
 #, fuzzy
 msgid "Enable server side attack"
 msgstr "Impossível comprar."
 
-#: src/gui/setup_other.cpp:157
+#: src/gui/setup_other.cpp:159
 msgid "Auto fix position"
 msgstr ""
 
-#: src/gui/setup_other.cpp:161
+#: src/gui/setup_other.cpp:163
 msgid "Attack while moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:165
+#: src/gui/setup_other.cpp:167
 #, fuzzy
 msgid "Enable quick stats"
 msgstr "Habilitar Joystick"
 
-#: src/gui/setup_other.cpp:169
+#: src/gui/setup_other.cpp:171
 #, fuzzy
 msgid "Show warps particles"
 msgstr "como partícula"
 
-#: src/gui/setup_other.cpp:173
+#: src/gui/setup_other.cpp:175
 msgid "Accept sell/buy requests"
 msgstr ""
 
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:179
 msgid "Show monster hp bar"
 msgstr ""
 
+#: src/gui/setup_other.cpp:183
+#, fuzzy
+msgid "Show own hp bar"
+msgstr "Mostrar nome"
+
 #: src/gui/setup_players.cpp:60
 msgid "Relation"
 msgstr "Relação"
@@ -3059,155 +3077,164 @@ msgstr "##1  você tente novamente mais tarde"
 msgid "Completed"
 msgstr "Concluído"
 
-#: src/gui/userpalette.cpp:109
+#: src/gui/userpalette.cpp:111
 msgid "Being"
 msgstr "Ser"
 
-#: src/gui/userpalette.cpp:110
+#: src/gui/userpalette.cpp:112
 #, fuzzy
 msgid "Friend Names"
 msgstr "Amigo"
 
-#: src/gui/userpalette.cpp:111
+#: src/gui/userpalette.cpp:113
 #, fuzzy
 msgid "Disregarded Names"
 msgstr "Desconsiderado"
 
-#: src/gui/userpalette.cpp:112
+#: src/gui/userpalette.cpp:114
 #, fuzzy
 msgid "Ignored Names"
 msgstr "Ignorado"
 
-#: src/gui/userpalette.cpp:113
+#: src/gui/userpalette.cpp:115
 #, fuzzy
 msgid "Erased Names"
 msgstr "Nomes dos GMs"
 
-#: src/gui/userpalette.cpp:114
+#: src/gui/userpalette.cpp:116
 msgid "Other Players' Names"
 msgstr "Nomes de outros jogadores"
 
-#: src/gui/userpalette.cpp:115
+#: src/gui/userpalette.cpp:117
 msgid "Own Name"
 msgstr "Nome Próprio"
 
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:118
 msgid "GM Names"
 msgstr "Nomes dos GMs"
 
-#: src/gui/userpalette.cpp:117
+#: src/gui/userpalette.cpp:119
 msgid "NPCs"
 msgstr "NPCs"
 
-#: src/gui/userpalette.cpp:118
+#: src/gui/userpalette.cpp:120
 msgid "Monsters"
 msgstr "Monstros"
 
-#: src/gui/userpalette.cpp:119
+#: src/gui/userpalette.cpp:121
 #, fuzzy
 msgid "Monster HP bar"
 msgstr "Monstro acerta jogador"
 
-#: src/gui/userpalette.cpp:121
+#: src/gui/userpalette.cpp:123
 msgid "Monster HP bar (second color)"
 msgstr ""
 
-#: src/gui/userpalette.cpp:122
+#: src/gui/userpalette.cpp:124
 #, fuzzy
 msgid "Party Members"
 msgstr "Festa"
 
-#: src/gui/userpalette.cpp:123
+#: src/gui/userpalette.cpp:125
 #, fuzzy
 msgid "Guild Members"
 msgstr "Guilda"
 
-#: src/gui/userpalette.cpp:124
+#: src/gui/userpalette.cpp:126
 msgid "Particle Effects"
 msgstr "Efeitos de partícula"
 
-#: src/gui/userpalette.cpp:125
+#: src/gui/userpalette.cpp:127
 msgid "Pickup Notification"
 msgstr "Aviso de achado"
 
-#: src/gui/userpalette.cpp:126
+#: src/gui/userpalette.cpp:128
 msgid "Exp Notification"
 msgstr "Aviso de experiência"
 
-#: src/gui/userpalette.cpp:127
+#: src/gui/userpalette.cpp:129
+#, fuzzy
+msgid "Player HP bar"
+msgstr "Monstro acerta jogador"
+
+#: src/gui/userpalette.cpp:131
+msgid "Player HP bar (second color)"
+msgstr ""
+
+#: src/gui/userpalette.cpp:132
 #, fuzzy
 msgid "Player Hits Monster"
 msgstr "Jogador acerta monstro"
 
-#: src/gui/userpalette.cpp:128
+#: src/gui/userpalette.cpp:133
 #, fuzzy
 msgid "Monster Hits Player"
 msgstr "Monstro acerta jogador"
 
-#: src/gui/userpalette.cpp:130
+#: src/gui/userpalette.cpp:135
 #, fuzzy
 msgid "Other Player Hits Local Player"
 msgstr "Nomes de outros jogadores"
 
-#: src/gui/userpalette.cpp:131
+#: src/gui/userpalette.cpp:136
 msgid "Critical Hit"
 msgstr "Golpe crítico"
 
-#: src/gui/userpalette.cpp:133
+#: src/gui/userpalette.cpp:138
 #, fuzzy
 msgid "Local Player Hits Monster"
 msgstr "Jogador acerta monstro"
 
-#: src/gui/userpalette.cpp:135
+#: src/gui/userpalette.cpp:140
 #, fuzzy
 msgid "Local Player Critical Hit"
 msgstr "Jogador acerta monstro"
 
-#: src/gui/userpalette.cpp:137
+#: src/gui/userpalette.cpp:142
 msgid "Local Player Miss"
 msgstr ""
 
-#: src/gui/userpalette.cpp:138
+#: src/gui/userpalette.cpp:143
 msgid "Misses"
 msgstr "Falhas"
 
-#: src/gui/userpalette.cpp:139
+#: src/gui/userpalette.cpp:144
 #, fuzzy
 msgid "Portal Highlight"
 msgstr "Realçar aba"
 
-#: src/gui/userpalette.cpp:141
+#: src/gui/userpalette.cpp:146
 #, fuzzy
 msgid "Collision Highlight"
 msgstr "Realçar"
 
-#: src/gui/userpalette.cpp:143
+#: src/gui/userpalette.cpp:148
 #, fuzzy
 msgid "Walkable Highlight"
 msgstr "Realçar aba"
 
-#: src/gui/userpalette.cpp:145
+#: src/gui/userpalette.cpp:150
 msgid "Local Player Attack Range"
 msgstr ""
 
-#: src/gui/userpalette.cpp:147
+#: src/gui/userpalette.cpp:152
 msgid "Local Player Attack Range Border"
 msgstr ""
 
-#: src/gui/userpalette.cpp:149
+#: src/gui/userpalette.cpp:154
 #, fuzzy
 msgid "Monster Attack Range"
 msgstr "Monstro acerta jogador"
 
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:156
 msgid "Home Place"
 msgstr ""
 
-#: src/gui/userpalette.cpp:153
+#: src/gui/userpalette.cpp:158
 msgid "Home Place Border"
 msgstr ""
 
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:160
 msgid "Road Point"
 msgstr ""
 
@@ -3231,6 +3258,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 +3704,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 +4139,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 +4184,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 +4196,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 +4408,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 +4897,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 +5234,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 +5265,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 +5294,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..cd36c55e5 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-06 03:06+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:481
+msgid "dodge"
+msgstr ""
+
+#: src/being.cpp:481
+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 ""
 
@@ -2004,7 +2017,7 @@ msgid "Show chat colors list"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:111 src/gui/setup_chat.cpp:119
-#: src/gui/setup_other.cpp:135 src/gui/setup_other.cpp:139
+#: src/gui/setup_other.cpp:137 src/gui/setup_other.cpp:141
 msgid "Edit"
 msgstr ""
 
@@ -2029,26 +2042,26 @@ msgstr "Cores"
 msgid "Type:"
 msgstr "Tipo: "
 
-#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:398
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:400
 msgid "Static"
 msgstr "Estático"
 
 #: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
-#: src/gui/setup_colors.cpp:399
+#: src/gui/setup_colors.cpp:401
 msgid "Pulse"
 msgstr "Pulso"
 
 #: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:400
+#: src/gui/setup_colors.cpp:402
 msgid "Rainbow"
 msgstr "Arco-íris"
 
 #: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:400
+#: src/gui/setup_colors.cpp:402
 msgid "Spectrum"
 msgstr "Espectro"
 
-#: src/gui/setup_colors.cpp:94 src/gui/setup_colors.cpp:310
+#: src/gui/setup_colors.cpp:94 src/gui/setup_colors.cpp:312
 #, fuzzy
 msgid "Delay:"
 msgstr "Atraso: "
@@ -2068,7 +2081,7 @@ msgstr "Verde: "
 msgid "Blue:"
 msgstr "Azul: "
 
-#: src/gui/setup_colors.cpp:305
+#: src/gui/setup_colors.cpp:307
 msgid "Alpha:"
 msgstr ""
 
@@ -2125,99 +2138,104 @@ msgstr "Padrão"
 msgid "Key Conflict(s) Detected."
 msgstr "Conflitos nas teclas detectado."
 
-#: src/gui/setup_other.cpp:92
+#: src/gui/setup_other.cpp:94
 msgid "Misc"
 msgstr ""
 
-#: src/gui/setup_other.cpp:95
+#: src/gui/setup_other.cpp:97
 msgid "Show damage inflicted to monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:100
+#: src/gui/setup_other.cpp:102
 msgid "Auto target only reachable monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:104
+#: src/gui/setup_other.cpp:106
 #, fuzzy
 msgid "Highlight map portals"
 msgstr "Realçar"
 
-#: src/gui/setup_other.cpp:109
+#: src/gui/setup_other.cpp:111
 msgid "Highlight player attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:114
+#: src/gui/setup_other.cpp:116
 msgid "Highlight monster attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:118
+#: src/gui/setup_other.cpp:120
 msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:121
+#: src/gui/setup_other.cpp:123
 #, fuzzy
 msgid "Cycle monster targets"
 msgstr "Mostrar nome"
 
-#: src/gui/setup_other.cpp:124
+#: src/gui/setup_other.cpp:126
 #, fuzzy
 msgid "Enable bot checker"
 msgstr "Habilitar joystick"
 
-#: src/gui/setup_other.cpp:127
+#: src/gui/setup_other.cpp:129
 #, fuzzy
 msgid "Highlight floor items"
 msgstr "Realçar"
 
-#: src/gui/setup_other.cpp:130
+#: src/gui/setup_other.cpp:132
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:141
+#: src/gui/setup_other.cpp:143
 #, fuzzy
 msgid "Enable shop mode"
 msgstr "Habilitar/Desabilitar Negociações"
 
-#: src/gui/setup_other.cpp:145
+#: src/gui/setup_other.cpp:147
 msgid "Enable buggy servers protection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:149
+#: src/gui/setup_other.cpp:151
 #, fuzzy
 msgid "Enable debug log"
 msgstr "Impossível comprar."
 
-#: src/gui/setup_other.cpp:153
+#: src/gui/setup_other.cpp:155
 #, fuzzy
 msgid "Enable server side attack"
 msgstr "Impossível comprar."
 
-#: src/gui/setup_other.cpp:157
+#: src/gui/setup_other.cpp:159
 msgid "Auto fix position"
 msgstr ""
 
-#: src/gui/setup_other.cpp:161
+#: src/gui/setup_other.cpp:163
 msgid "Attack while moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:165
+#: src/gui/setup_other.cpp:167
 #, fuzzy
 msgid "Enable quick stats"
 msgstr "Habilitar joystick"
 
-#: src/gui/setup_other.cpp:169
+#: src/gui/setup_other.cpp:171
 #, fuzzy
 msgid "Show warps particles"
 msgstr "como partícula"
 
-#: src/gui/setup_other.cpp:173
+#: src/gui/setup_other.cpp:175
 msgid "Accept sell/buy requests"
 msgstr ""
 
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:179
 msgid "Show monster hp bar"
 msgstr ""
 
+#: src/gui/setup_other.cpp:183
+#, fuzzy
+msgid "Show own hp bar"
+msgstr "Mostrar nome"
+
 #: src/gui/setup_players.cpp:60
 msgid "Relation"
 msgstr "Relação"
@@ -3059,156 +3077,165 @@ msgstr "##1  você tente novamente mais tarde"
 msgid "Completed"
 msgstr "Concluído"
 
-#: src/gui/userpalette.cpp:109
+#: src/gui/userpalette.cpp:111
 msgid "Being"
 msgstr "Ser"
 
-#: src/gui/userpalette.cpp:110
+#: src/gui/userpalette.cpp:112
 #, fuzzy
 msgid "Friend Names"
 msgstr "Amigo"
 
-#: src/gui/userpalette.cpp:111
+#: src/gui/userpalette.cpp:113
 #, fuzzy
 msgid "Disregarded Names"
 msgstr "Desconsiderado"
 
-#: src/gui/userpalette.cpp:112
+#: src/gui/userpalette.cpp:114
 #, fuzzy
 msgid "Ignored Names"
 msgstr "Ignorado"
 
-#: src/gui/userpalette.cpp:113
+#: src/gui/userpalette.cpp:115
 #, fuzzy
 msgid "Erased Names"
 msgstr "Nomes dos GMs"
 
-#: src/gui/userpalette.cpp:114
+#: src/gui/userpalette.cpp:116
 msgid "Other Players' Names"
 msgstr "Nomes de outros jogadores"
 
-#: src/gui/userpalette.cpp:115
+#: src/gui/userpalette.cpp:117
 msgid "Own Name"
 msgstr "Próprio nome"
 
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:118
 msgid "GM Names"
 msgstr "Nomes dos GMs"
 
-#: src/gui/userpalette.cpp:117
+#: src/gui/userpalette.cpp:119
 msgid "NPCs"
 msgstr "NPCs"
 
-#: src/gui/userpalette.cpp:118
+#: src/gui/userpalette.cpp:120
 msgid "Monsters"
 msgstr "Monstros"
 
-#: src/gui/userpalette.cpp:119
+#: src/gui/userpalette.cpp:121
 #, fuzzy
 msgid "Monster HP bar"
 msgstr "Monstro acerta jogador"
 
-#: src/gui/userpalette.cpp:121
+#: src/gui/userpalette.cpp:123
 msgid "Monster HP bar (second color)"
 msgstr ""
 
-#: src/gui/userpalette.cpp:122
+#: src/gui/userpalette.cpp:124
 #, fuzzy
 msgid "Party Members"
 msgstr "Grupo"
 
-#: src/gui/userpalette.cpp:123
+#: src/gui/userpalette.cpp:125
 #, fuzzy
 msgid "Guild Members"
 msgstr "Corporação"
 
-#: src/gui/userpalette.cpp:124
+#: src/gui/userpalette.cpp:126
 msgid "Particle Effects"
 msgstr "Efeitos de partícula"
 
-#: src/gui/userpalette.cpp:125
+#: src/gui/userpalette.cpp:127
 msgid "Pickup Notification"
 msgstr "Aviso de achado"
 
-#: src/gui/userpalette.cpp:126
+#: src/gui/userpalette.cpp:128
 msgid "Exp Notification"
 msgstr "Aviso de experiência"
 
-#: src/gui/userpalette.cpp:127
+#: src/gui/userpalette.cpp:129
+#, fuzzy
+msgid "Player HP bar"
+msgstr "Monstro acerta jogador"
+
+#: src/gui/userpalette.cpp:131
+msgid "Player HP bar (second color)"
+msgstr ""
+
+#: src/gui/userpalette.cpp:132
 #, fuzzy
 msgid "Player Hits Monster"
 msgstr "Jogador acerta monstro"
 
-#: src/gui/userpalette.cpp:128
+#: src/gui/userpalette.cpp:133
 #, fuzzy
 msgid "Monster Hits Player"
 msgstr "Monstro acerta jogador"
 
-#: src/gui/userpalette.cpp:130
+#: src/gui/userpalette.cpp:135
 #, fuzzy
 msgid "Other Player Hits Local Player"
 msgstr "Nomes de outros jogadores"
 
-#: src/gui/userpalette.cpp:131
+#: src/gui/userpalette.cpp:136
 msgid "Critical Hit"
 msgstr "Golpe crítico"
 
-#: src/gui/userpalette.cpp:133
+#: src/gui/userpalette.cpp:138
 #, fuzzy
 msgid "Local Player Hits Monster"
 msgstr "Jogador acerta monstro"
 
-#: src/gui/userpalette.cpp:135
+#: src/gui/userpalette.cpp:140
 #, fuzzy
 msgid "Local Player Critical Hit"
 msgstr "Jogador acerta monstro"
 
-#: src/gui/userpalette.cpp:137
+#: src/gui/userpalette.cpp:142
 #, fuzzy
 msgid "Local Player Miss"
 msgstr "Salvar lista de jogadores"
 
-#: src/gui/userpalette.cpp:138
+#: src/gui/userpalette.cpp:143
 msgid "Misses"
 msgstr "Falhas"
 
-#: src/gui/userpalette.cpp:139
+#: src/gui/userpalette.cpp:144
 #, fuzzy
 msgid "Portal Highlight"
 msgstr "Realçar aba"
 
-#: src/gui/userpalette.cpp:141
+#: src/gui/userpalette.cpp:146
 #, fuzzy
 msgid "Collision Highlight"
 msgstr "Realçar"
 
-#: src/gui/userpalette.cpp:143
+#: src/gui/userpalette.cpp:148
 #, fuzzy
 msgid "Walkable Highlight"
 msgstr "Realçar aba"
 
-#: src/gui/userpalette.cpp:145
+#: src/gui/userpalette.cpp:150
 msgid "Local Player Attack Range"
 msgstr ""
 
-#: src/gui/userpalette.cpp:147
+#: src/gui/userpalette.cpp:152
 msgid "Local Player Attack Range Border"
 msgstr ""
 
-#: src/gui/userpalette.cpp:149
+#: src/gui/userpalette.cpp:154
 #, fuzzy
 msgid "Monster Attack Range"
 msgstr "Monstro acerta jogador"
 
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:156
 msgid "Home Place"
 msgstr ""
 
-#: src/gui/userpalette.cpp:153
+#: src/gui/userpalette.cpp:158
 msgid "Home Place Border"
 msgstr ""
 
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:160
 msgid "Road Point"
 msgstr ""
 
@@ -3232,6 +3259,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 +3705,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 +4142,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 +4187,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 +4199,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 +4411,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 +4903,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 +5240,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 +5271,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 +5300,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..ba13d6e51 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-06 03:06+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:481
+msgid "dodge"
+msgstr "крит"
+
+#: src/being.cpp:481
+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 "Загрузить старые данные"
 
@@ -1891,7 +1904,7 @@ msgid "Show chat colors list"
 msgstr "Показать список цветов чата"
 
 #: src/gui/setup_chat.cpp:111 src/gui/setup_chat.cpp:119
-#: src/gui/setup_other.cpp:135 src/gui/setup_other.cpp:139
+#: src/gui/setup_other.cpp:137 src/gui/setup_other.cpp:141
 msgid "Edit"
 msgstr "Изменить"
 
@@ -1915,26 +1928,26 @@ msgstr "Цвета"
 msgid "Type:"
 msgstr "Введите: "
 
-#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:398
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:400
 msgid "Static"
 msgstr "Статичный"
 
 #: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
-#: src/gui/setup_colors.cpp:399
+#: src/gui/setup_colors.cpp:401
 msgid "Pulse"
 msgstr "Пульсирующий"
 
 #: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:400
+#: src/gui/setup_colors.cpp:402
 msgid "Rainbow"
 msgstr "Радуга"
 
 #: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:400
+#: src/gui/setup_colors.cpp:402
 msgid "Spectrum"
 msgstr "Спектр"
 
-#: src/gui/setup_colors.cpp:94 src/gui/setup_colors.cpp:310
+#: src/gui/setup_colors.cpp:94 src/gui/setup_colors.cpp:312
 msgid "Delay:"
 msgstr "Задержка:"
 
@@ -1950,7 +1963,7 @@ msgstr "Зеленый:"
 msgid "Blue:"
 msgstr "Синий:"
 
-#: src/gui/setup_colors.cpp:305
+#: src/gui/setup_colors.cpp:307
 msgid "Alpha:"
 msgstr "Прозрачность:"
 
@@ -2006,90 +2019,94 @@ msgstr "По умолчанию"
 msgid "Key Conflict(s) Detected."
 msgstr "Обнаружен(ы) конфликт(ы) клавиш!"
 
-#: src/gui/setup_other.cpp:92
+#: src/gui/setup_other.cpp:94
 msgid "Misc"
 msgstr "Разное"
 
-#: src/gui/setup_other.cpp:95
+#: src/gui/setup_other.cpp:97
 msgid "Show damage inflicted to monsters"
 msgstr "Показ. повр. нанесенные монстрам"
 
-#: src/gui/setup_other.cpp:100
+#: src/gui/setup_other.cpp:102
 msgid "Auto target only reachable monsters"
 msgstr "Автоприцел по доступным монстрам"
 
-#: src/gui/setup_other.cpp:104
+#: src/gui/setup_other.cpp:106
 msgid "Highlight map portals"
 msgstr "Подсветка точек перехода на карте"
 
-#: src/gui/setup_other.cpp:109
+#: src/gui/setup_other.cpp:111
 msgid "Highlight player attack range"
 msgstr "Подсветка радиуса атаки игрока"
 
-#: src/gui/setup_other.cpp:114
+#: src/gui/setup_other.cpp:116
 msgid "Highlight monster attack range"
 msgstr "Подсветка радиуса атаки монстров"
 
-#: src/gui/setup_other.cpp:118
+#: src/gui/setup_other.cpp:120
 msgid "Cycle player targets"
 msgstr "Прокручивать прицел по игрокам"
 
-#: src/gui/setup_other.cpp:121
+#: src/gui/setup_other.cpp:123
 msgid "Cycle monster targets"
 msgstr "Прокручивать прицел по монстрам"
 
-#: src/gui/setup_other.cpp:124
+#: src/gui/setup_other.cpp:126
 msgid "Enable bot checker"
 msgstr "Включить детектор ботов"
 
-#: src/gui/setup_other.cpp:127
+#: src/gui/setup_other.cpp:129
 msgid "Highlight floor items"
 msgstr "Подсветка предметов на полу"
 
-#: src/gui/setup_other.cpp:130
+#: src/gui/setup_other.cpp:132
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:141
+#: src/gui/setup_other.cpp:143
 msgid "Enable shop mode"
 msgstr "Включить режим магазина"
 
-#: src/gui/setup_other.cpp:145
+#: src/gui/setup_other.cpp:147
 msgid "Enable buggy servers protection"
 msgstr "Включить защиту от сбойных серверов"
 
-#: src/gui/setup_other.cpp:149
+#: src/gui/setup_other.cpp:151
 msgid "Enable debug log"
 msgstr "Включить отлад. лог"
 
-#: src/gui/setup_other.cpp:153
+#: src/gui/setup_other.cpp:155
 msgid "Enable server side attack"
 msgstr "Включить серверную атаку"
 
-#: src/gui/setup_other.cpp:157
+#: src/gui/setup_other.cpp:159
 msgid "Auto fix position"
 msgstr "Авто. исправ. позиции"
 
-#: src/gui/setup_other.cpp:161
+#: src/gui/setup_other.cpp:163
 msgid "Attack while moving"
 msgstr "Атаковать в движении"
 
-#: src/gui/setup_other.cpp:165
+#: src/gui/setup_other.cpp:167
 msgid "Enable quick stats"
 msgstr "Включить быструю смену статов"
 
-#: src/gui/setup_other.cpp:169
+#: src/gui/setup_other.cpp:171
 msgid "Show warps particles"
 msgstr "Показывать анимацию порталов"
 
-#: src/gui/setup_other.cpp:173
+#: src/gui/setup_other.cpp:175
 msgid "Accept sell/buy requests"
 msgstr "Принимать запросы купить/продать"
 
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:179
 msgid "Show monster hp bar"
 msgstr "Показывать жизнь мобов"
 
+#: src/gui/setup_other.cpp:183
+msgid "Show own hp bar"
+msgstr "Показывать свою жизнь"
+
 #: src/gui/setup_players.cpp:60
 msgid "Relation"
 msgstr "Отношение"
@@ -2885,139 +2902,149 @@ msgstr "##1  попытаться еще раз немного погодя."
 msgid "Completed"
 msgstr "Завершено"
 
-#: src/gui/userpalette.cpp:109
+#: src/gui/userpalette.cpp:111
 msgid "Being"
 msgstr "Существо"
 
-#: src/gui/userpalette.cpp:110
+#: src/gui/userpalette.cpp:112
 msgid "Friend Names"
 msgstr "Имена Друзей"
 
-#: src/gui/userpalette.cpp:111
+#: src/gui/userpalette.cpp:113
 msgid "Disregarded Names"
 msgstr ""
 
-#: src/gui/userpalette.cpp:112
+#: src/gui/userpalette.cpp:114
 msgid "Ignored Names"
 msgstr "Игнорируемые имена"
 
-#: src/gui/userpalette.cpp:113
+#: src/gui/userpalette.cpp:115
 msgid "Erased Names"
 msgstr "Стертые имена"
 
-#: src/gui/userpalette.cpp:114
+#: src/gui/userpalette.cpp:116
 msgid "Other Players' Names"
 msgstr "Имена других игроков"
 
-#: src/gui/userpalette.cpp:115
+#: src/gui/userpalette.cpp:117
 msgid "Own Name"
 msgstr "Собственное имя"
 
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:118
 msgid "GM Names"
 msgstr "Имена ГМ"
 
-#: src/gui/userpalette.cpp:117
+#: src/gui/userpalette.cpp:119
 msgid "NPCs"
 msgstr "Боты"
 
-#: src/gui/userpalette.cpp:118
+#: src/gui/userpalette.cpp:120
 msgid "Monsters"
 msgstr "Монстры"
 
-#: src/gui/userpalette.cpp:119
+#: src/gui/userpalette.cpp:121
 msgid "Monster HP bar"
 msgstr "Полоса жизни монстров"
 
-#: src/gui/userpalette.cpp:121
+#: src/gui/userpalette.cpp:123
 msgid "Monster HP bar (second color)"
 msgstr "Полоса жизни монстров (второй цвет)"
 
-#: src/gui/userpalette.cpp:122
+#: src/gui/userpalette.cpp:124
 msgid "Party Members"
 msgstr "Члены группы"
 
-#: src/gui/userpalette.cpp:123
+#: src/gui/userpalette.cpp:125
 msgid "Guild Members"
 msgstr "Члены гильдии"
 
-#: src/gui/userpalette.cpp:124
+#: src/gui/userpalette.cpp:126
 msgid "Particle Effects"
 msgstr "Эффекты частиц"
 
-#: src/gui/userpalette.cpp:125
+#: src/gui/userpalette.cpp:127
 msgid "Pickup Notification"
 msgstr "Сообщение о подборе предмета"
 
-#: src/gui/userpalette.cpp:126
+#: src/gui/userpalette.cpp:128
 msgid "Exp Notification"
 msgstr "Сообщение об изменении опыта"
 
-#: src/gui/userpalette.cpp:127
+#: src/gui/userpalette.cpp:129
+#, fuzzy
+msgid "Player HP bar"
+msgstr "Полоса жизни монстров"
+
+#: src/gui/userpalette.cpp:131
+#, fuzzy
+msgid "Player HP bar (second color)"
+msgstr "Полоса жизни монстров (второй цвет)"
+
+#: src/gui/userpalette.cpp:132
 msgid "Player Hits Monster"
 msgstr "Удары игрока по монстру"
 
-#: src/gui/userpalette.cpp:128
+#: src/gui/userpalette.cpp:133
 msgid "Monster Hits Player"
 msgstr "Удары монстра по игроку"
 
-#: src/gui/userpalette.cpp:130
+#: src/gui/userpalette.cpp:135
 msgid "Other Player Hits Local Player"
 msgstr "Другой игрок бъет локального игрока"
 
-#: src/gui/userpalette.cpp:131
+#: src/gui/userpalette.cpp:136
 msgid "Critical Hit"
 msgstr "Критический удар"
 
-#: src/gui/userpalette.cpp:133
+#: src/gui/userpalette.cpp:138
 msgid "Local Player Hits Monster"
 msgstr "Удары игроков вокруг по монстру"
 
-#: src/gui/userpalette.cpp:135
+#: src/gui/userpalette.cpp:140
 msgid "Local Player Critical Hit"
 msgstr "Критический удар игрока"
 
-#: src/gui/userpalette.cpp:137
+#: src/gui/userpalette.cpp:142
 msgid "Local Player Miss"
 msgstr "Промах соседнего игрока"
 
-#: src/gui/userpalette.cpp:138
+#: src/gui/userpalette.cpp:143
 msgid "Misses"
 msgstr "Промахи"
 
-#: src/gui/userpalette.cpp:139
+#: src/gui/userpalette.cpp:144
 msgid "Portal Highlight"
 msgstr "Подсветка переходов"
 
-#: src/gui/userpalette.cpp:141
+#: src/gui/userpalette.cpp:146
 msgid "Collision Highlight"
 msgstr "Подсветка столкновений"
 
-#: src/gui/userpalette.cpp:143
+#: src/gui/userpalette.cpp:148
 msgid "Walkable Highlight"
 msgstr "Подсветка доступных участков карты"
 
-#: src/gui/userpalette.cpp:145
+#: src/gui/userpalette.cpp:150
 msgid "Local Player Attack Range"
 msgstr "Зона атаки соседнего игрока"
 
-#: src/gui/userpalette.cpp:147
+#: src/gui/userpalette.cpp:152
 msgid "Local Player Attack Range Border"
 msgstr "Граница зоны атаки соседнего игрока"
 
-#: src/gui/userpalette.cpp:149
+#: src/gui/userpalette.cpp:154
 msgid "Monster Attack Range"
 msgstr "Зона атаки монстра"
 
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:156
 msgid "Home Place"
 msgstr "Домашняя позиция"
 
-#: src/gui/userpalette.cpp:153
+#: src/gui/userpalette.cpp:158
 msgid "Home Place Border"
 msgstr "Бордюр домашней позиции"
 
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:160
 msgid "Road Point"
 msgstr "Точка дороги"
 
@@ -3041,6 +3068,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 +3492,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 +3896,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 +3937,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 +4145,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 +4349,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 +4604,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 +4925,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 +4954,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 +4983,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..306422464 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-06 03:06+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:481
+msgid "dodge"
+msgstr ""
+
+#: src/being.cpp:481
+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 ""
 
@@ -2008,7 +2021,7 @@ msgid "Show chat colors list"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:111 src/gui/setup_chat.cpp:119
-#: src/gui/setup_other.cpp:135 src/gui/setup_other.cpp:139
+#: src/gui/setup_other.cpp:137 src/gui/setup_other.cpp:141
 msgid "Edit"
 msgstr ""
 
@@ -2033,26 +2046,26 @@ msgstr "Färger"
 msgid "Type:"
 msgstr "Typ: "
 
-#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:398
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:400
 msgid "Static"
 msgstr "Statisk"
 
 #: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
-#: src/gui/setup_colors.cpp:399
+#: src/gui/setup_colors.cpp:401
 msgid "Pulse"
 msgstr "Pulserande"
 
 #: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:400
+#: src/gui/setup_colors.cpp:402
 msgid "Rainbow"
 msgstr "Regnbåge"
 
 #: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:400
+#: src/gui/setup_colors.cpp:402
 msgid "Spectrum"
 msgstr "Spektrum"
 
-#: src/gui/setup_colors.cpp:94 src/gui/setup_colors.cpp:310
+#: src/gui/setup_colors.cpp:94 src/gui/setup_colors.cpp:312
 #, fuzzy
 msgid "Delay:"
 msgstr "Fördröjning: "
@@ -2072,7 +2085,7 @@ msgstr "Grön: "
 msgid "Blue:"
 msgstr "Blå: "
 
-#: src/gui/setup_colors.cpp:305
+#: src/gui/setup_colors.cpp:307
 msgid "Alpha:"
 msgstr ""
 
@@ -2129,99 +2142,104 @@ msgstr "Förval"
 msgid "Key Conflict(s) Detected."
 msgstr "Samma tangent används på flera ställen."
 
-#: src/gui/setup_other.cpp:92
+#: src/gui/setup_other.cpp:94
 msgid "Misc"
 msgstr ""
 
-#: src/gui/setup_other.cpp:95
+#: src/gui/setup_other.cpp:97
 msgid "Show damage inflicted to monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:100
+#: src/gui/setup_other.cpp:102
 msgid "Auto target only reachable monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:104
+#: src/gui/setup_other.cpp:106
 #, fuzzy
 msgid "Highlight map portals"
 msgstr "Markering"
 
-#: src/gui/setup_other.cpp:109
+#: src/gui/setup_other.cpp:111
 msgid "Highlight player attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:114
+#: src/gui/setup_other.cpp:116
 msgid "Highlight monster attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:118
+#: src/gui/setup_other.cpp:120
 msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:121
+#: src/gui/setup_other.cpp:123
 #, fuzzy
 msgid "Cycle monster targets"
 msgstr "Visa namn"
 
-#: src/gui/setup_other.cpp:124
+#: src/gui/setup_other.cpp:126
 #, fuzzy
 msgid "Enable bot checker"
 msgstr "Aktivera joystick"
 
-#: src/gui/setup_other.cpp:127
+#: src/gui/setup_other.cpp:129
 #, fuzzy
 msgid "Highlight floor items"
 msgstr "Markering"
 
-#: src/gui/setup_other.cpp:130
+#: src/gui/setup_other.cpp:132
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:141
+#: src/gui/setup_other.cpp:143
 #, fuzzy
 msgid "Enable shop mode"
 msgstr "Tillåt/neka handel"
 
-#: src/gui/setup_other.cpp:145
+#: src/gui/setup_other.cpp:147
 msgid "Enable buggy servers protection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:149
+#: src/gui/setup_other.cpp:151
 #, fuzzy
 msgid "Enable debug log"
 msgstr "Kan inte köpa."
 
-#: src/gui/setup_other.cpp:153
+#: src/gui/setup_other.cpp:155
 #, fuzzy
 msgid "Enable server side attack"
 msgstr "Kan inte köpa."
 
-#: src/gui/setup_other.cpp:157
+#: src/gui/setup_other.cpp:159
 msgid "Auto fix position"
 msgstr ""
 
-#: src/gui/setup_other.cpp:161
+#: src/gui/setup_other.cpp:163
 msgid "Attack while moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:165
+#: src/gui/setup_other.cpp:167
 #, fuzzy
 msgid "Enable quick stats"
 msgstr "Aktivera joystick"
 
-#: src/gui/setup_other.cpp:169
+#: src/gui/setup_other.cpp:171
 #, fuzzy
 msgid "Show warps particles"
 msgstr "som partikel"
 
-#: src/gui/setup_other.cpp:173
+#: src/gui/setup_other.cpp:175
 msgid "Accept sell/buy requests"
 msgstr ""
 
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:179
 msgid "Show monster hp bar"
 msgstr ""
 
+#: src/gui/setup_other.cpp:183
+#, fuzzy
+msgid "Show own hp bar"
+msgstr "Visa namn"
+
 #: src/gui/setup_players.cpp:60
 msgid "Relation"
 msgstr "Relation"
@@ -3064,156 +3082,165 @@ msgstr "##1  du försöker igen senare"
 msgid "Completed"
 msgstr "Färdig"
 
-#: src/gui/userpalette.cpp:109
+#: src/gui/userpalette.cpp:111
 msgid "Being"
 msgstr "Varelse"
 
-#: src/gui/userpalette.cpp:110
+#: src/gui/userpalette.cpp:112
 #, fuzzy
 msgid "Friend Names"
 msgstr "Vän"
 
-#: src/gui/userpalette.cpp:111
+#: src/gui/userpalette.cpp:113
 #, fuzzy
 msgid "Disregarded Names"
 msgstr "Förbisedd"
 
-#: src/gui/userpalette.cpp:112
+#: src/gui/userpalette.cpp:114
 #, fuzzy
 msgid "Ignored Names"
 msgstr "Ignorerad"
 
-#: src/gui/userpalette.cpp:113
+#: src/gui/userpalette.cpp:115
 #, fuzzy
 msgid "Erased Names"
 msgstr "GM-namn"
 
-#: src/gui/userpalette.cpp:114
+#: src/gui/userpalette.cpp:116
 msgid "Other Players' Names"
 msgstr "Andra spelares namn"
 
-#: src/gui/userpalette.cpp:115
+#: src/gui/userpalette.cpp:117
 msgid "Own Name"
 msgstr "Eget namn"
 
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:118
 msgid "GM Names"
 msgstr "GM-namn"
 
-#: src/gui/userpalette.cpp:117
+#: src/gui/userpalette.cpp:119
 msgid "NPCs"
 msgstr "NPC:er"
 
-#: src/gui/userpalette.cpp:118
+#: src/gui/userpalette.cpp:120
 msgid "Monsters"
 msgstr "Monster"
 
-#: src/gui/userpalette.cpp:119
+#: src/gui/userpalette.cpp:121
 #, fuzzy
 msgid "Monster HP bar"
 msgstr "Monster slår spelare"
 
-#: src/gui/userpalette.cpp:121
+#: src/gui/userpalette.cpp:123
 msgid "Monster HP bar (second color)"
 msgstr ""
 
-#: src/gui/userpalette.cpp:122
+#: src/gui/userpalette.cpp:124
 #, fuzzy
 msgid "Party Members"
 msgstr "Grupp"
 
-#: src/gui/userpalette.cpp:123
+#: src/gui/userpalette.cpp:125
 #, fuzzy
 msgid "Guild Members"
 msgstr "Gille"
 
-#: src/gui/userpalette.cpp:124
+#: src/gui/userpalette.cpp:126
 msgid "Particle Effects"
 msgstr "Partikeleffekter"
 
-#: src/gui/userpalette.cpp:125
+#: src/gui/userpalette.cpp:127
 msgid "Pickup Notification"
 msgstr "Upplocksnotis"
 
-#: src/gui/userpalette.cpp:126
+#: src/gui/userpalette.cpp:128
 msgid "Exp Notification"
 msgstr "XP-notifiering"
 
-#: src/gui/userpalette.cpp:127
+#: src/gui/userpalette.cpp:129
+#, fuzzy
+msgid "Player HP bar"
+msgstr "Monster slår spelare"
+
+#: src/gui/userpalette.cpp:131
+msgid "Player HP bar (second color)"
+msgstr ""
+
+#: src/gui/userpalette.cpp:132
 #, fuzzy
 msgid "Player Hits Monster"
 msgstr "Spelare slår monster"
 
-#: src/gui/userpalette.cpp:128
+#: src/gui/userpalette.cpp:133
 #, fuzzy
 msgid "Monster Hits Player"
 msgstr "Monster slår spelare"
 
-#: src/gui/userpalette.cpp:130
+#: src/gui/userpalette.cpp:135
 #, fuzzy
 msgid "Other Player Hits Local Player"
 msgstr "Andra spelares namn"
 
-#: src/gui/userpalette.cpp:131
+#: src/gui/userpalette.cpp:136
 msgid "Critical Hit"
 msgstr "Kritisk träff"
 
-#: src/gui/userpalette.cpp:133
+#: src/gui/userpalette.cpp:138
 #, fuzzy
 msgid "Local Player Hits Monster"
 msgstr "Spelare slår monster"
 
-#: src/gui/userpalette.cpp:135
+#: src/gui/userpalette.cpp:140
 #, fuzzy
 msgid "Local Player Critical Hit"
 msgstr "Spelare slår monster"
 
-#: src/gui/userpalette.cpp:137
+#: src/gui/userpalette.cpp:142
 #, fuzzy
 msgid "Local Player Miss"
 msgstr "Kom ihåg spelarlista"
 
-#: src/gui/userpalette.cpp:138
+#: src/gui/userpalette.cpp:143
 msgid "Misses"
 msgstr "Missar"
 
-#: src/gui/userpalette.cpp:139
+#: src/gui/userpalette.cpp:144
 #, fuzzy
 msgid "Portal Highlight"
 msgstr "Flikmarkering"
 
-#: src/gui/userpalette.cpp:141
+#: src/gui/userpalette.cpp:146
 #, fuzzy
 msgid "Collision Highlight"
 msgstr "Markering"
 
-#: src/gui/userpalette.cpp:143
+#: src/gui/userpalette.cpp:148
 #, fuzzy
 msgid "Walkable Highlight"
 msgstr "Flikmarkering"
 
-#: src/gui/userpalette.cpp:145
+#: src/gui/userpalette.cpp:150
 msgid "Local Player Attack Range"
 msgstr ""
 
-#: src/gui/userpalette.cpp:147
+#: src/gui/userpalette.cpp:152
 msgid "Local Player Attack Range Border"
 msgstr ""
 
-#: src/gui/userpalette.cpp:149
+#: src/gui/userpalette.cpp:154
 #, fuzzy
 msgid "Monster Attack Range"
 msgstr "Monster slår spelare"
 
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:156
 msgid "Home Place"
 msgstr ""
 
-#: src/gui/userpalette.cpp:153
+#: src/gui/userpalette.cpp:158
 msgid "Home Place Border"
 msgstr ""
 
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:160
 msgid "Road Point"
 msgstr ""
 
@@ -3237,6 +3264,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 +3710,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 +4149,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 +4194,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 +4206,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 +4418,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 +4911,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 +5241,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 +5273,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 +5302,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"
diff --git a/src/being.cpp b/src/being.cpp
index 08893c2f4..4f31e402c 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -71,6 +71,7 @@
 #include "gui/widgets/chattab.h"
 
 #include "utils/dtor.h"
+#include "utils/gettext.h"
 #include "utils/stringutils.h"
 #include "utils/xml.h"
 
@@ -168,6 +169,7 @@ bool Being::mLowTraffic = true;
 bool Being::mDrawHotKeys = true;
 bool Being::mShowBattleEvents = false;
 bool Being::mShowMobHP = false;
+bool Being::mShowOwnHP = false;
 
 std::list<BeingCacheEntry*> beingInfoCache;
 
@@ -476,7 +478,7 @@ void Being::takeDamage(Being *attacker, int amount, AttackType type)
 
     gcn::Font *font = 0;
     std::string damage = amount ? toString(amount) : type == FLEE ?
-            "dodge" : "miss";
+            _("dodge") : _("miss");
     const gcn::Color *color;
 
     if (gui)
@@ -566,7 +568,15 @@ void Being::takeDamage(Being *attacker, int amount, AttackType type)
         mDamageTaken += amount;
         if (mInfo)
         {
-            sound.playSfx(mInfo->getSound(SOUND_EVENT_HURT));
+            if (attacker)
+            {
+                sound.playSfx(mInfo->getSound(SOUND_EVENT_HURT),
+                    attacker->getTileX(), attacker->getTileY());
+            }
+            else
+            {
+                sound.playSfx(mInfo->getSound(SOUND_EVENT_HURT));
+            }
             if (!mInfo->isStaticMaxHP())
             {
                 if (!mHP && mInfo->getMaxHP() < mDamageTaken)
@@ -616,7 +626,7 @@ void Being::handleAttack(Being *victim, int damage,
     }
 
     sound.playSfx(mInfo->getSound((damage > 0) ?
-                  SOUND_EVENT_HIT : SOUND_EVENT_MISS));
+                  SOUND_EVENT_HIT : SOUND_EVENT_MISS), mX, mY);
 }
 
 void Being::setName(const std::string &name)
@@ -902,7 +912,7 @@ void Being::setAction(Action action, int attackType _UNUSED_)
         case DEAD:
             currentAction = SpriteAction::DEAD;
             if (mInfo)
-                sound.playSfx(mInfo->getSound(SOUND_EVENT_DIE));
+                sound.playSfx(mInfo->getSound(SOUND_EVENT_DIE), mX, mY);
             break;
         case STAND:
             currentAction = SpriteAction::STAND;
@@ -1550,6 +1560,7 @@ void Being::reReadConfig()
         mDrawHotKeys = config.getBoolValue("drawHotKeys");
         mShowBattleEvents = config.getBoolValue("showBattleEvents");
         mShowMobHP = config.getBoolValue("showMobHP");
+        mShowOwnHP = config.getBoolValue("showOwnHP");
 
         mUpdateConfigTime = cur_time;
     }
@@ -1744,42 +1755,48 @@ bool Being::drawSpriteAt(Graphics *graphics, int x, int y) const
             2 * attackRange + 32, 2 * attackRange + 32));
     }
 
-    if (mShowMobHP && player_node && player_node->getTarget() == this
+    if (mShowMobHP && mInfo && player_node && player_node->getTarget() == this
         && getType() == MONSTER)
     {
         // show hp bar here
-        drawHpBar(graphics, x - 50 + 16, y + 32 - 6, 2 * 50, 4);
+        int maxHP = mMaxHP;
+        if (!maxHP)
+            maxHP = mInfo->getMaxHP();
+
+        drawHpBar(graphics, maxHP, mHP, mDamageTaken,
+                  UserPalette::MONSTER_HP, UserPalette::MONSTER_HP2,
+                  x - 50 + 16, y + 32 - 6, 2 * 50, 4);
+    }
+    if (mShowOwnHP && player_node == this && mAction != DEAD)
+    {
+        drawHpBar(graphics, PlayerInfo::getAttribute(MAX_HP),
+                  PlayerInfo::getAttribute(HP), 0,
+                  UserPalette::PLAYER_HP, UserPalette::PLAYER_HP2,
+                  x - 50 + 16, y + 32 - 6, 2 * 50, 4);
     }
     return res;
 }
 
-void Being::drawHpBar(Graphics *graphics, int x, int y,
+void Being::drawHpBar(Graphics *graphics, int maxHP, int hp, int damage,
+                      int color1, int color2, int x, int y,
                       int width, int height) const
 {
-    if (!mInfo)
-        return;
-
-    int maxHP = mMaxHP;
-
-    if (!maxHP)
-        maxHP = mInfo->getMaxHP();
-
     if (maxHP <= 0)
         return;
 
-    if (!mHP && maxHP < mHP)
+    if (!hp && maxHP < hp)
         return;
 
     float p;
 
-    if (mHP)
+    if (hp)
     {
-        p = static_cast<float>(maxHP) / static_cast<float>(mHP);
+        p = static_cast<float>(maxHP) / static_cast<float>(hp);
     }
-    else if (maxHP != mDamageTaken)
+    else if (maxHP != damage)
     {
         p = static_cast<float>(maxHP)
-            / static_cast<float>(maxHP - mDamageTaken);
+            / static_cast<float>(maxHP - damage);
     }
     else
     {
@@ -1791,8 +1808,7 @@ void Being::drawHpBar(Graphics *graphics, int x, int y,
 
     int dx = width / p;
 
-    graphics->setColor(userPalette->getColorWithAlpha(
-        UserPalette::MONSTER_HP));
+    graphics->setColor(userPalette->getColorWithAlpha(color1));
 
     graphics->fillRectangle(gcn::Rectangle(
         x, y, dx, height));
@@ -1800,8 +1816,7 @@ void Being::drawHpBar(Graphics *graphics, int x, int y,
     if (width - dx <= 0)
         return;
 
-    graphics->setColor(userPalette->getColorWithAlpha(
-        UserPalette::MONSTER_HP2));
+    graphics->setColor(userPalette->getColorWithAlpha(color2));
 
     graphics->fillRectangle(gcn::Rectangle(
         x + dx, y, width - dx, height));
diff --git a/src/being.h b/src/being.h
index 09466f5af..f9731366a 100644
--- a/src/being.h
+++ b/src/being.h
@@ -520,6 +520,7 @@ class Being : public ActorSprite, public ConfigListener
                                     int posX, int posY) const;
 
         void drawHpBar(Graphics *graphics, int x, int y,
+                       int maxHP, int hp, int damage, int color1, int color2,
                        int width, int height) const;
 
         static void load();
@@ -751,7 +752,7 @@ class Being : public ActorSprite, public ConfigListener
         static bool mDrawHotKeys;
         static bool mShowBattleEvents;
         static bool mShowMobHP;
-//        std::string mDisplayName;
+        static bool mShowOwnHP;
 
         unsigned int mMoveTime;
         unsigned int mAttackTime;
diff --git a/src/defaults.cpp b/src/defaults.cpp
index 0628aa72c..da5aa4e84 100644
--- a/src/defaults.cpp
+++ b/src/defaults.cpp
@@ -189,6 +189,8 @@ DefaultsData* getConfigDefaults()
     AddDEF(configData, "enableBattleTab", false);
     AddDEF(configData, "showBattleEvents", false);
     AddDEF(configData, "showMobHP", true);
+    AddDEF(configData, "showOwnHP", true);
+    AddDEF(configData, "usePersistentIP", false);
     return configData;
 }
 
@@ -219,6 +221,8 @@ DefaultsData* getBrandingDefaults()
     AddDEF(brandingData, "guiPath", "graphics/gui/");
     AddDEF(brandingData, "guiThemePath", "themes/");
     AddDEF(brandingData, "fontsPath", "fonts/");
+
+    AddDEF(brandingData, "wallpaperFile", "");
     return brandingData;
 }
 
diff --git a/src/gui/charselectdialog.cpp b/src/gui/charselectdialog.cpp
index d95930108..da1f59e46 100644
--- a/src/gui/charselectdialog.cpp
+++ b/src/gui/charselectdialog.cpp
@@ -433,7 +433,7 @@ void CharacterDisplay::update()
         mButton->setCaption(_("Choose"));
         mButton->setActionEventId("use");
         mName->setCaption(strprintf("%s", character->getName().c_str()));
-        mLevel->setCaption(strprintf("Level %d",
+        mLevel->setCaption(strprintf(_("Level %d"),
                            mCharacter->data.mAttributes[LEVEL]));
         mMoney->setCaption(Units::formatCurrency(
                            mCharacter->data.mAttributes[MONEY]));
diff --git a/src/gui/login.cpp b/src/gui/login.cpp
index 997895c95..b6139c6d0 100644
--- a/src/gui/login.cpp
+++ b/src/gui/login.cpp
@@ -53,9 +53,9 @@ std::string LoginDialog::savedPasswordKey = "";
 
 const char *UPDATE_TYPE_TEXT[3] =
 {
-    _("Normal"),
-    _("Auto Close"),
-    _("Skip"),
+    N_("Normal"),
+    N_("Auto Close"),
+    N_("Skip"),
 };
 
 class UpdateTypeModel : public gcn::ListModel
@@ -74,7 +74,7 @@ public:
         if (i >= getNumberOfElements() || i < 0)
             return _("???");
 
-        return UPDATE_TYPE_TEXT[i];
+        return gettext(UPDATE_TYPE_TEXT[i]);
     }
 };
 
diff --git a/src/gui/serverdialog.cpp b/src/gui/serverdialog.cpp
index c7e1d0f94..3556efc35 100644
--- a/src/gui/serverdialog.cpp
+++ b/src/gui/serverdialog.cpp
@@ -211,7 +211,8 @@ ServerDialog::ServerDialog(ServerInfo *serverInfo, const std::string &dir):
     mDownload(0),
     mDownloadProgress(-1.0f),
     mServers(ServerInfos()),
-    mServerInfo(serverInfo)
+    mServerInfo(serverInfo),
+    mPersistentIPCheckBox(false)
 {
     if (isSafeMode)
         setCaption("Choose Your Server  *** SAFE MODE ***");
@@ -223,6 +224,9 @@ ServerDialog::ServerDialog(ServerInfo *serverInfo, const std::string &dir):
     Label *typeLabel = new Label(_("Server type:"));
     mServerNameField = new TextField(mServerInfo->hostname);
     mPortField = new TextField(toString(mServerInfo->port));
+    mPersistentIPCheckBox = new CheckBox(_("Use same ip for game sub servers"),
+                                       config.getBoolValue("usePersistentIP"),
+                                       this, "persitent ip");
 
     loadCustomServers();
 
@@ -264,11 +268,12 @@ ServerDialog::ServerDialog(ServerInfo *serverInfo, const std::string &dir):
     place(1, 2, mTypeField, 5).setPadding(3);
     place(0, 3, usedScroll, 6, 5).setPadding(3);
     place(0, 8, mDescription, 6);
-    place(0, 9, mManualEntryButton);
-    place(1, 9, mDeleteButton);
-    place(2, 9, mLoadButton);
-    place(4, 9, mQuitButton);
-    place(5, 9, mConnectButton);
+    place(0, 9, mPersistentIPCheckBox, 6);
+    place(0, 10, mManualEntryButton);
+    place(1, 10, mDeleteButton);
+    place(2, 10, mLoadButton);
+    place(4, 10, mQuitButton);
+    place(5, 10, mConnectButton);
 
     // Make sure the list has enough height
     getLayout().setRowHeight(3, 80);
@@ -390,6 +395,7 @@ void ServerDialog::action(const gcn::ActionEvent &event)
                     LoginDialog::savedPassword = "";
             }
 
+            config.setValue("usePersistentIP", mPersistentIPCheckBox->isSelected());
             Client::setState(STATE_CONNECT_SERVER);
         }
     }
diff --git a/src/gui/serverdialog.h b/src/gui/serverdialog.h
index b9a67e246..e16dd09b5 100644
--- a/src/gui/serverdialog.h
+++ b/src/gui/serverdialog.h
@@ -23,6 +23,7 @@
 #define SERVERDIALOG_H
 
 #include "gui/widgets/window.h"
+#include "gui/widgets/checkbox.h"
 
 #include "net/download.h"
 #include "net/serverinfo.h"
@@ -199,6 +200,7 @@ class ServerDialog : public Window,
 
         ServerInfos mServers;
         ServerInfo *mServerInfo;
+        CheckBox *mPersistentIPCheckBox;
 };
 
 #endif
diff --git a/src/gui/setup_colors.cpp b/src/gui/setup_colors.cpp
index 76510a283..68d517cae 100644
--- a/src/gui/setup_colors.cpp
+++ b/src/gui/setup_colors.cpp
@@ -302,6 +302,8 @@ void Setup_Colors::valueChanged(const gcn::SelectionEvent &event _UNUSED_)
         case UserPalette::ROAD_POINT:
         case UserPalette::MONSTER_HP:
         case UserPalette::MONSTER_HP2:
+        case UserPalette::PLAYER_HP:
+        case UserPalette::PLAYER_HP2:
             mGradDelayLabel->setCaption(_("Alpha:"));
             mGradDelayText->setRange(0, 255);
             mGradDelaySlider->setScale(0, 255);
diff --git a/src/gui/setup_other.cpp b/src/gui/setup_other.cpp
index 54ec1c65d..5a2b77a81 100644
--- a/src/gui/setup_other.cpp
+++ b/src/gui/setup_other.cpp
@@ -63,6 +63,7 @@
 #define ACTION_WARP_PARTICLE "warp particle"
 #define ACTION_AUTO_SHOP "auto shop"
 #define ACTION_SHOW_MOB_HP "show mob hp"
+#define ACTION_SHOW_OWN_HP "show own hp"
 
 Setup_Other::Setup_Other():
     mShowMonstersTakedDamage(config.getBoolValue("showMonstersTakedDamage")),
@@ -87,7 +88,8 @@ Setup_Other::Setup_Other():
     mQuickStats(config.getBoolValue("quickStats")),
     mWarpParticle(config.getBoolValue("warpParticle")),
     mAutoShop(config.getBoolValue("autoShop")),
-    mShowMobHP(config.getBoolValue("showMobHP"))
+    mShowMobHP(config.getBoolValue("showMobHP")),
+    mShowOwnHP(config.getBoolValue("showOwnHP"))
 {
     setName(_("Misc"));
 
@@ -178,6 +180,10 @@ Setup_Other::Setup_Other():
                                        mShowMobHP,
                                        this, ACTION_SHOW_MOB_HP);
 
+    mShowOwnHPCheckBox = new CheckBox(_("Show own hp bar"),
+                                       mShowOwnHP,
+                                       this, ACTION_SHOW_OWN_HP);
+
     // Do the layout
     LayoutHelper h(this);
     ContainerPlacer place = h.getPlacer(0, 0);
@@ -192,6 +198,7 @@ Setup_Other::Setup_Other():
     place(12, 4, mWarpParticleCheckBox, 10);
     place(12, 5, mAutoShopCheckBox, 10);
     place(12, 6, mShowMobHPCheckBox, 10);
+    place(12, 7, mShowOwnHPCheckBox, 10);
     place(0, 3, mFloorItemsHighlightCheckBox, 12);
     place(0, 4, mHighlightAttackRangeCheckBox, 12);
     place(0, 5, mHighlightMonsterAttackRangeCheckBox, 12);
@@ -320,6 +327,10 @@ void Setup_Other::action(const gcn::ActionEvent &event)
     {
         mShowMobHP = mShowMobHPCheckBox->isSelected();
     }
+    else if (event.getId() == ACTION_SHOW_OWN_HP)
+    {
+        mShowOwnHP = mShowOwnHPCheckBox->isSelected();
+    }
 }
 
 void Setup_Other::cancel()
@@ -389,6 +400,9 @@ void Setup_Other::cancel()
 
     mShowMobHP = config.getBoolValue("showMobHP");
     mShowMobHPCheckBox->setSelected(mShowMobHP);
+
+    mShowOwnHP = config.getBoolValue("showOwnHP");
+    mShowOwnHPCheckBox->setSelected(mShowOwnHP);
 }
 
 void Setup_Other::apply()
@@ -416,6 +430,7 @@ void Setup_Other::apply()
     config.setValue("warpParticle", mWarpParticle);
     config.setValue("autoShop", mAutoShop);
     config.setValue("showMobHP", mShowMobHP);
+    config.setValue("showOwnHP", mShowOwnHP);
     logger->setDebugLog(mDebugLog);
 }
 
diff --git a/src/gui/setup_other.h b/src/gui/setup_other.h
index b20401be5..6a092e93f 100644
--- a/src/gui/setup_other.h
+++ b/src/gui/setup_other.h
@@ -119,6 +119,9 @@ class Setup_Other : public SetupTab, public gcn::ActionListener
         gcn::CheckBox *mShowMobHPCheckBox;
         bool mShowMobHP;
 
+        gcn::CheckBox *mShowOwnHPCheckBox;
+        bool mShowOwnHP;
+
         EditDialog *mEditDialog;
 };
 
diff --git a/src/gui/userpalette.cpp b/src/gui/userpalette.cpp
index 03e5c1eed..46f1b72b3 100644
--- a/src/gui/userpalette.cpp
+++ b/src/gui/userpalette.cpp
@@ -52,6 +52,8 @@ const std::string ColorTypeNames[] =
     "ColorParticle",
     "ColorPickupInfo",
     "ColorExpInfo",
+    "ColorPlayerHp",
+    "ColorPlayerHp2",
     "ColorHitPlayerMonster",
     "ColorHitMonsterPlayer",
     "ColorHitPlayerPlayer",
@@ -124,6 +126,9 @@ UserPalette::UserPalette():
     addColor(PARTICLE, 0xffffff, STATIC, _("Particle Effects"));
     addColor(PICKUP_INFO, 0x28dc28, STATIC, _("Pickup Notification"));
     addColor(EXP_INFO, 0xffff00, STATIC, _("Exp Notification"));
+    addColor(PLAYER_HP, 0x00ff00, STATIC, _("Player HP bar"), 50);
+    addColor(PLAYER_HP2, 0xff0000, STATIC,
+        _("Player HP bar (second color)"), 50);
     addColor(HIT_PLAYER_MONSTER, 0x0064ff, STATIC, _("Player Hits Monster"));
     addColor(HIT_MONSTER_PLAYER, 0xff3232, STATIC, _("Monster Hits Player"));
     addColor(HIT_PLAYER_PLAYER, 0xff5050, STATIC,
diff --git a/src/gui/userpalette.h b/src/gui/userpalette.h
index 057d47113..db2463e20 100644
--- a/src/gui/userpalette.h
+++ b/src/gui/userpalette.h
@@ -53,6 +53,8 @@ class UserPalette : public Palette, public gcn::ListModel
             PARTICLE,
             PICKUP_INFO,
             EXP_INFO,
+            PLAYER_HP,
+            PLAYER_HP2,
             HIT_PLAYER_MONSTER,
             HIT_MONSTER_PLAYER,
             HIT_PLAYER_PLAYER,
diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index edff2ce67..207e71bf5 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -3344,6 +3344,7 @@ void LocalPlayer::imitateOutfit(Being *player, int sprite)
     if (mImitationMode == 1 && !player_imitated.empty()
         && player->getName() == player_imitated)
     {
+//        logger->log("have equip %d", sprite);
 //        std::string filename = ItemDB::get(
 //                player->getId()).getSprite(mGender);
 //        logger->log("LocalPlayer::imitateOutfit sprite: " + toString(sprite));
@@ -3383,7 +3384,7 @@ void LocalPlayer::imitateOutfit(Being *player, int sprite)
         }
         else
         {
-//            logger->log("have unequip");
+//            logger->log("have unequip %d", sprite);
 
             int equipmentSlot = Net::getInventoryHandler()
                 ->convertFromServerSlot(sprite);
diff --git a/src/main.h b/src/main.h
index 480c9d374..e9dd8abb2 100644
--- a/src/main.h
+++ b/src/main.h
@@ -86,8 +86,8 @@
 //define DEBUG_FONT_COUNTERS 1
 //define DEBUG_ALPHA_CACHE 1
 
-#define SMALL_VERSION "1.0.12.26"
-#define CHECK_VERSION "01.00.12.26"
+#define SMALL_VERSION "1.1.1.9"
+#define CHECK_VERSION "01.01.01.09"
 
 
 #define PACKAGE_EXTENDED_VERSION "ManaPlus (" PACKAGE_OS \
diff --git a/src/net/tmwa/beinghandler.cpp b/src/net/tmwa/beinghandler.cpp
index ea4978a20..9c75689a4 100644
--- a/src/net/tmwa/beinghandler.cpp
+++ b/src/net/tmwa/beinghandler.cpp
@@ -674,6 +674,14 @@ void BeingHandler::handleMessage(Net::MessageIn &msg)
                     dstBeing->setSprite(SPRITE_MISC2, id);
                     player_node->imitateOutfit(dstBeing, SPRITE_MISC2);
                     break;
+                case 14:
+                    dstBeing->setSprite(SPRITE_EVOL1, id);
+                    player_node->imitateOutfit(dstBeing, SPRITE_EVOL1);
+                    break;
+                case 15:
+                    dstBeing->setSprite(SPRITE_EVOL2, id);
+                    player_node->imitateOutfit(dstBeing, SPRITE_EVOL2);
+                    break;
                 default:
                     logger->log("QQQ3 CHANGE_LOOKS: unsupported type: "
                             "%d, id: %d", type, id);
diff --git a/src/net/tmwa/buysellhandler.cpp b/src/net/tmwa/buysellhandler.cpp
index bdc372238..84a02e92a 100644
--- a/src/net/tmwa/buysellhandler.cpp
+++ b/src/net/tmwa/buysellhandler.cpp
@@ -139,12 +139,22 @@ void BuySellHandler::handleMessage(Net::MessageIn &msg)
             break;
 
         case SMSG_NPC_SELL_RESPONSE:
-            if (msg.readInt8() == 0)
-                SERVER_NOTICE(_("Thanks for selling."))
-            else
-                SERVER_NOTICE(_("Unable to sell."))
-
-            break;
+            switch (msg.readInt8())
+            {
+                case 0:
+                    SERVER_NOTICE(_("Thanks for selling."))
+                    break;
+                case 1:
+                default:
+                    SERVER_NOTICE(_("Unable to sell."))
+                    break;
+                case 2:
+                    SERVER_NOTICE(_("Unable to sell while trading."))
+                    break;
+                case 3:
+                    SERVER_NOTICE(_("Unable to sell unsellable item."))
+                    break;
+            }
         default:
             break;
     }
diff --git a/src/net/tmwa/charserverhandler.cpp b/src/net/tmwa/charserverhandler.cpp
index e500f667b..4bf9df8b3 100644
--- a/src/net/tmwa/charserverhandler.cpp
+++ b/src/net/tmwa/charserverhandler.cpp
@@ -160,7 +160,15 @@ void CharServerHandler::handleMessage(Net::MessageIn &msg)
             PlayerInfo::setCharId(msg.readInt32());
             GameHandler *gh = static_cast<GameHandler*>(Net::getGameHandler());
             gh->setMap(msg.readString(16));
-            mapServer.hostname = ipToString(msg.readInt32());
+            if (config.getBoolValue("usePersistentIP"))
+            {
+                msg.readInt32();
+                mapServer.hostname = Client::getServerName();
+            }
+            else
+            {
+                mapServer.hostname = ipToString(msg.readInt32());
+            }
             mapServer.port = msg.readInt16();
 
             // Prevent the selected local player from being deleted
diff --git a/src/net/tmwa/inventoryhandler.cpp b/src/net/tmwa/inventoryhandler.cpp
index b4b38e623..3cc0e9ce0 100644
--- a/src/net/tmwa/inventoryhandler.cpp
+++ b/src/net/tmwa/inventoryhandler.cpp
@@ -77,8 +77,8 @@ const Equipment::Slot EQUIP_CONVERT[] =
     Equipment::EQUIP_GLOVES_SLOT,   // SPRITE_GLOVES
     Equipment::EQUIP_FIGHT1_SLOT,   // SPRITE_WEAPON
     Equipment::EQUIP_FIGHT2_SLOT,   // SPRITE_SHIELD
-    Equipment::EQUIP_PROJECTILE_SLOT,    // 0
-    Equipment::EQUIP_PROJECTILE_SLOT,    // 0
+    Equipment::EQUIP_EVOL_RING1_SLOT,    // SPRITE_EVOL1
+    Equipment::EQUIP_EVOL_RING2_SLOT,    // SPRITE_EVOL2
     Equipment::EQUIP_PROJECTILE_SLOT,    // 0
 };
 
diff --git a/src/net/tmwa/loginhandler.cpp b/src/net/tmwa/loginhandler.cpp
index 73fec1322..05a28513c 100644
--- a/src/net/tmwa/loginhandler.cpp
+++ b/src/net/tmwa/loginhandler.cpp
@@ -288,7 +288,10 @@ void LoginHandler::chooseServer(unsigned int server)
         return;
 
     charServer.clear();
-    charServer.hostname = ipToString(mWorlds[server]->address);
+    if (config.getBoolValue("usePersistentIP"))
+        charServer.hostname = Client::getServerName();
+    else
+        charServer.hostname = ipToString(mWorlds[server]->address);
     charServer.port = mWorlds[server]->port;
 
     Client::setState(STATE_UPDATE);
diff --git a/src/net/tmwa/playerhandler.cpp b/src/net/tmwa/playerhandler.cpp
index 1d0d3e67d..8ef19c373 100644
--- a/src/net/tmwa/playerhandler.cpp
+++ b/src/net/tmwa/playerhandler.cpp
@@ -35,6 +35,7 @@
 #include "gui/npcdialog.h"
 #include "gui/okdialog.h"
 #include "gui/sell.h"
+#include "gui/skilldialog.h"
 #include "gui/statuswindow.h"
 #include "gui/viewport.h"
 
@@ -314,6 +315,8 @@ void PlayerHandler::handleMessage(Net::MessageIn &msg)
                         break;
                     case 0x000c:
                         PlayerInfo::setAttribute(SKILL_POINTS, value);
+                        if (skillDialog)
+                            skillDialog->update();
                         break;
                     case 0x0018:
                         if (!weightNotice)
diff --git a/src/net/tmwa/protocol.h b/src/net/tmwa/protocol.h
index 6001fae3b..83854c4c6 100644
--- a/src/net/tmwa/protocol.h
+++ b/src/net/tmwa/protocol.h
@@ -59,6 +59,8 @@ enum
     SPRITE_GLOVES,
     SPRITE_WEAPON,
     SPRITE_SHIELD,
+    SPRITE_EVOL1,
+    SPRITE_EVOL2,
     SPRITE_VECTOREND
 };
 
diff --git a/src/resources/itemdb.cpp b/src/resources/itemdb.cpp
index 71b88d192..a590dcac1 100644
--- a/src/resources/itemdb.cpp
+++ b/src/resources/itemdb.cpp
@@ -69,7 +69,7 @@ void ItemDB::setStatsList(const std::list<ItemDB::Stat> &stats)
 
 static ItemType itemTypeFromString(const std::string &name)
 {
-    if (name == "generic")
+    if (name == "generic" || name == "other")
     {
         return ITEM_UNUSABLE;
     }
@@ -326,7 +326,7 @@ void ItemDB::load()
             logger->log("ItemDB: Missing " #param " attribute for item %i!", \
                         id)
 
-        if (id >= 0)
+        if (id >= 0 && typeStr != "other")
         {
             CHECK_PARAM(name, "");
             CHECK_PARAM(description, "");
diff --git a/src/sound.cpp b/src/sound.cpp
index 8742ce361..080426a39 100644
--- a/src/sound.cpp
+++ b/src/sound.cpp
@@ -22,6 +22,7 @@
 #include <SDL.h>
 
 #include "configuration.h"
+#include "localplayer.h"
 #include "log.h"
 #include "sound.h"
 
@@ -280,6 +281,37 @@ void Sound::playSfx(const std::string &path)
     }
 }
 
+void Sound::playSfx(const std::string &path, int x, int y)
+{
+    if (!mInstalled || path.empty() || !mPlayBattle)
+        return;
+
+    std::string tmpPath;
+    if (!path.find("sfx/"))
+        tmpPath = path;
+    else
+        tmpPath = paths.getValue("sfx", "sfx/") + path;
+    ResourceManager *resman = ResourceManager::getInstance();
+    SoundEffect *sample = resman->getSoundEffect(tmpPath);
+    if (sample)
+    {
+        logger->log("Sound::playSfx() Playing: %s", path.c_str());
+        int vol = 120;
+        if (player_node)
+        {
+            int dx = player_node->getTileX() - x;
+            int dy = player_node->getTileY() - y;
+            if (dx < 0)
+                dx = -dx;
+            if (dy < 0)
+                dy = -dy;
+            int dist = dx > dy ? dx : dy;
+            vol -= dist * 8;
+        }
+        sample->play(0, vol);
+    }
+}
+
 void Sound::playGuiSfx(const std::string &path)
 {
     if (!mInstalled || path.empty() || !mPlayGui)
diff --git a/src/sound.h b/src/sound.h
index 100c228c1..92c0ab41a 100644
--- a/src/sound.h
+++ b/src/sound.h
@@ -93,6 +93,8 @@ class Sound : public ConfigListener
          */
         void playSfx(const std::string &path);
 
+        void playSfx(const std::string &path, int x, int y);
+
         /**
          * Plays an item for gui.
          *
author	Andrei Karas <akaras@inbox.ru>	2011-01-11 01:34:11 +0200
committer	Andrei Karas <akaras@inbox.ru>	2011-01-11 01:34:11 +0200
commit	fcced13d9972ac70f0f01f19583b7868e255b6a7 (patch)
tree	9b01df102c5f9ba032ea0f9bc413dd707e99d88b
parent	311783bebbe2bed366dca5097697ce34c690292d (diff)
parent	ef1b9856c86512fe73154c17da3ea98a7cd5f896 (diff)
download	ManaVerse-fcced13d9972ac70f0f01f19583b7868e255b6a7.tar.gz ManaVerse-fcced13d9972ac70f0f01f19583b7868e255b6a7.tar.bz2 ManaVerse-fcced13d9972ac70f0f01f19583b7868e255b6a7.tar.xz ManaVerse-fcced13d9972ac70f0f01f19583b7868e255b6a7.zip