Merge commit 'v1.1.11.27' into strippedstripped1.1.11.27

Conflicts: data/Makefile.am
author: Andrei Karas <akaras@inbox.ru> 2011-11-28 19:05:52 +0300
committer: Andrei Karas <akaras@inbox.ru> 2011-11-28 19:05:52 +0300
commit: b6eb53b9abdf48b88cb1978b9af97f2a879d2717 (patch)
tree: 5aad5623d352ec0b4aa245856958c61a384861c7
parent: 4d453108f45f9fb2ff4f5715cc1b3ddd63d36a80 (diff)
parent: 71fe51d38a406012e166589b7b720d83c1ab3ade (diff)
download: manaverse-b6eb53b9abdf48b88cb1978b9af97f2a879d2717.tar.gz
manaverse-b6eb53b9abdf48b88cb1978b9af97f2a879d2717.tar.bz2
manaverse-b6eb53b9abdf48b88cb1978b9af97f2a879d2717.tar.xz
manaverse-b6eb53b9abdf48b88cb1978b9af97f2a879d2717.zip
188 files changed, 7934 insertions, 9118 deletions
diff --git a/ChangeLog b/ChangeLog
index cbf0956f3..8e6665a82 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2011-11-27 New release 1.1.11.27
+ManaPlus:
+fix: show enemy relation in online list.
+fix: dead monsters and floor items poisition.
+fix: file name conflicts between skins and client data files.
+add: update ru and es translations.
+add: change chat log save path to yyyy-mm/dd/file.log.
+add: support for incomplete replace tag for items for compotability with future version of mana.
+add: background images for equipment window.
+add: whisper player name in autocomplete list.
+add: show yellow bar mode changes in debug chat tab.
+add: limits for hair color and style for char creation dialog.
+add: different animations depend on monster hp (only for evol).
+
 2011-11-12 New release 1.1.11.12
 ManaPlus:
 fix: hide death message on reconnect.
diff --git a/README b/README
index a2a2e70d8..57d6cf834 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 THE MANA PLUS CLIENT
 ===============
 
- Version: 1.1.11.12        Date: 2011-11-12
+ Version: 1.1.11.27        Date: 2011-11-27
 
  Development team:
   - See AUTHORS file for a list
diff --git a/README.txt b/README.txt
index 27db90d2c..2950b8e2a 100644
--- a/README.txt
+++ b/README.txt
@@ -1,7 +1,7 @@
 THE MANA PLUS CLIENT
 ===============
 
- Version: 1.1.11.12        Date: 2011-11-12
+ Version: 1.1.11.27        Date: 2011-11-27
 
  Development team:
   - See AUTHORS file for a list
diff --git a/build/packwin b/build/packwin
index 2d43c0b42..f81957f13 100755
--- a/build/packwin
+++ b/build/packwin
@@ -7,7 +7,7 @@ dir=`pwd`
 cd packaging/windows
 ./make-translations.sh
 makensis -DDLLDIR=$dir/../mana_win/libs/dll/ \
-    -DPRODUCT_VERSION="1.1.11.12" \
+    -DPRODUCT_VERSION="1.1.11.27" \
     -DEXESUFFIX=/src \
     -DUPX=true \
     setup.nsi
diff --git a/configure.ac b/configure.ac
index 8fbf51822..1cf9a1de3 100755
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.59)
-AC_INIT([ManaPlus], [1.1.11.12], [akaras@inbox.ru], [manaplus])
+AC_INIT([ManaPlus], [1.1.11.27], [akaras@inbox.ru], [manaplus])
 AM_INIT_AUTOMAKE([1.9])
 AC_CONFIG_HEADERS([config.h:config.h.in])
 AC_LANG_CPLUSPLUS
@@ -250,6 +250,8 @@ data/help/ru/Makefile
 data/help/ru/tips/Makefile
 data/help/tips/Makefile
 data/icons/Makefile
+data/perserver/Makefile
+data/perserver/default/Makefile
 docs/Makefile
 po/Makefile.in
 ])
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index 8641854f0..100e1229c 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -3,6 +3,7 @@ SET(DATA_DIR ${PKG_DATADIR}/data)
 ADD_SUBDIRECTORY(graphics)
 ADD_SUBDIRECTORY(help)
 ADD_SUBDIRECTORY(icons)
+ADD_SUBDIRECTORY(perserver)
 ADD_SUBDIRECTORY(sfx)
 ADD_SUBDIRECTORY(themes)
 
diff --git a/data/Makefile.am b/data/Makefile.am
index 7cebe7eb5..544e0c4aa 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,5 +1,5 @@
 
-SUBDIRS = graphics help icons sfx themes
+SUBDIRS = graphics help icons perserver sfx themes
 
 EXTRA_DIST = CMakeLists.txt items.xsd
 
diff --git a/data/graphics/gui/CMakeLists.txt b/data/graphics/gui/CMakeLists.txt
index a7c21e5ea..2c6e4b933 100644
--- a/data/graphics/gui/CMakeLists.txt
+++ b/data/graphics/gui/CMakeLists.txt
@@ -10,6 +10,7 @@ SET (FILES
     close_button.png
     colors.xml
     deepbox.png
+    equipmentbox.png
     hscroll_left_default.png
     hscroll_left_highlight.png
     hscroll_left_pressed.png
diff --git a/data/graphics/gui/Makefile.am b/data/graphics/gui/Makefile.am
index 6d04666a5..388d01663 100644
--- a/data/graphics/gui/Makefile.am
+++ b/data/graphics/gui/Makefile.am
@@ -13,6 +13,7 @@ gui_DATA =				\
 	close_button.png		\
 	colors.xml			\
 	deepbox.png			\
+	equipmentbox.png	\
 	hscroll_left_default.png	\
 	hscroll_left_highlight.png	\
 	hscroll_left_pressed.png	\
diff --git a/data/graphics/gui/equipmentbox.png b/data/graphics/gui/equipmentbox.png
new file mode 100644
index 000000000..a1a737a82
--- /dev/null
+++ b/data/graphics/gui/equipmentbox.png
diff --git a/data/perserver/CMakeLists.txt b/data/perserver/CMakeLists.txt
new file mode 100644
index 000000000..8b86a84b0
--- /dev/null
+++ b/data/perserver/CMakeLists.txt
@@ -0,0 +1 @@
+ADD_SUBDIRECTORY(default)
diff --git a/data/perserver/Makefile.am b/data/perserver/Makefile.am
new file mode 100644
index 000000000..b754c27f8
--- /dev/null
+++ b/data/perserver/Makefile.am
@@ -0,0 +1,3 @@
+SUBDIRS = default
+
+EXTRA_DIST = CMakeLists.txt
diff --git a/data/perserver/default/CMakeLists.txt b/data/perserver/default/CMakeLists.txt
new file mode 100644
index 000000000..61bd98df1
--- /dev/null
+++ b/data/perserver/default/CMakeLists.txt
@@ -0,0 +1,5 @@
+SET (FILES
+    charcreation.xml
+    )
+
+INSTALL(FILES ${FILES} DESTINATION ${DATA_DIR}/perserver/default)
diff --git a/data/perserver/default/Makefile.am b/data/perserver/default/Makefile.am
new file mode 100644
index 000000000..7ab87da67
--- /dev/null
+++ b/data/perserver/default/Makefile.am
@@ -0,0 +1,8 @@
+defaultdir = $(pkgdatadir)/data/perserver/default
+
+default_DATA =				\
+	charcreation.xml
+
+EXTRA_DIST =				\
+	$(default_DATA) \
+	CMakeLists.txt
diff --git a/data/perserver/default/charcreation.xml b/data/perserver/default/charcreation.xml
new file mode 100644
index 000000000..a7cb1a091
--- /dev/null
+++ b/data/perserver/default/charcreation.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Author : 4144
+(C) ManaPlus Developers 2011. -->
+
+<chars>
+    <haircolor min="0" max="11" />
+    <hairstyle min="0" max="19" />
+    <stat min="1" max="9" sum="30" />
+</chars>
diff --git a/manaplus.cbp b/manaplus.cbp
index 3c39ed68b..26f3b7c5e 100644
--- a/manaplus.cbp
+++ b/manaplus.cbp
@@ -589,6 +589,8 @@
 		<Unit filename="src\resources\animation.h" />
 		<Unit filename="src\resources\beinginfo.cpp" />
 		<Unit filename="src\resources\beinginfo.h" />
+		<Unit filename="src\resources\chardb.cpp" />
+		<Unit filename="src\resources\chardb.h" />
 		<Unit filename="src\resources\colordb.cpp" />
 		<Unit filename="src\resources\colordb.h" />
 		<Unit filename="src\resources\dye.cpp" />
diff --git a/packaging/windows/setup.nsi b/packaging/windows/setup.nsi
index baa7930a4..eb0e5ffe9 100644
--- a/packaging/windows/setup.nsi
+++ b/packaging/windows/setup.nsi
@@ -226,6 +226,8 @@ Section "Core files (required)" SecCore
   CreateDirectory "$INSTDIR\data\help\ru\tips"
   CreateDirectory "$INSTDIR\data\help\tips"
   CreateDirectory "$INSTDIR\data\icons"
+  CreateDirectory "$INSTDIR\data\perserver"
+  CreateDirectory "$INSTDIR\data\perserver\default"
   CreateDirectory "$INSTDIR\data\graphics\gui"
   CreateDirectory "$INSTDIR\data\graphics\images"
   CreateDirectory "$INSTDIR\data\graphics\sprites"
@@ -317,6 +319,8 @@ Section "Core files (required)" SecCore
   File "${SRCDIR}\data\help\tips\*.jpg"
   SetOutPath "$INSTDIR\data\icons\"
   File "${SRCDIR}\data\icons\manaplus.ico"
+  SetOutPath "$INSTDIR\data\perserver\default\"
+  File "${SRCDIR}\data\perserver\default\*.xml"
   SetOutPath "$INSTDIR\docs"
   File "${SRCDIR}\docs\FAQ.txt"
 SectionEnd
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 2ebb99798..8feef4b97 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -55,7 +55,6 @@ src/gui/shopwindow.cpp
 src/gui/skilldialog.cpp
 src/gui/socialwindow.cpp
 src/gui/specialswindow.cpp
-src/gui/statuspopup.cpp
 src/gui/statuswindow.cpp
 src/gui/textcommandeditor.cpp
 src/gui/textdialog.cpp
diff --git a/po/cs.po b/po/cs.po
index 1cbe2d6e0..84f1af652 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Andrei Karas <akaras@inbox.ru>, 2011.
 # Pitriss <chytrex@wjake.com>, 2011.
@@ -10,132 +10,133 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-11-12 00:23+0300\n"
+"POT-Creation-Date: 2011-11-26 02:20+0300\n"
 "PO-Revision-Date: 2011-11-11 21:38+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
-"Language-Team: Czech (http://www.transifex.net/projects/p/manaplus/team/cs/)\n"
+"Language-Team: Czech (http://www.transifex.net/projects/p/manaplus/team/"
+"cs/)\n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: cs\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
 
 #: src/actorspritemanager.cpp:1171
 msgid "Visible on map"
 msgstr "Viditelný na mapě"
 
-#: src/being.cpp:551
+#: src/being.cpp:553
 msgid "dodge"
 msgstr "úskočil"
 
-#: src/being.cpp:551
+#: src/being.cpp:553
 msgid "miss"
 msgstr "minul"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1530
+#: src/being.cpp:1534
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1535
+#: src/being.cpp:1539
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:869 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:878 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Nastavení"
 
-#: src/client.cpp:876 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:885 src/gui/setup_perfomance.cpp:48
 msgid "Perfomance"
 msgstr "Výkon"
 
-#: src/client.cpp:881 src/gui/setup_video.cpp:315
+#: src/client.cpp:890 src/gui/setup_video.cpp:315
 msgid "Video"
 msgstr "Video"
 
-#: src/client.cpp:886
+#: src/client.cpp:895
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:968
+#: src/client.cpp:977
 msgid "Connecting to server"
 msgstr "Připojuji se k serveru"
 
-#: src/client.cpp:999
+#: src/client.cpp:1008
 msgid "Logging in"
 msgstr "Přihlašuji se"
 
-#: src/client.cpp:1032
+#: src/client.cpp:1041
 msgid "Entering game world"
 msgstr "Vstupuji do herního světa"
 
-#: src/client.cpp:1132
+#: src/client.cpp:1142
 msgid "Requesting characters"
 msgstr "Požaduji postavy"
 
-#: src/client.cpp:1163
+#: src/client.cpp:1173
 msgid "Connecting to the game server"
 msgstr "Připojuji se k hernímu serveru"
 
-#: src/client.cpp:1173
+#: src/client.cpp:1183
 msgid "Changing game servers"
 msgstr "Zaměňuji herní servery"
 
-#: src/client.cpp:1216 src/client.cpp:1223 src/client.cpp:1357
+#: src/client.cpp:1226 src/client.cpp:1233 src/client.cpp:1367
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
-#: src/gui/charcreatedialog.cpp:221 src/gui/charselectdialog.cpp:253
+#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:254
 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
-#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
-#: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
+#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:167
+#: src/net/ea/charserverhandler.cpp:185 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "Chyba"
 
-#: src/client.cpp:1232
+#: src/client.cpp:1242
 msgid "Requesting registration details"
 msgstr "Požaduji registrační detaily"
 
-#: src/client.cpp:1258
+#: src/client.cpp:1268
 msgid "Password Change"
 msgstr "Změna hesla"
 
-#: src/client.cpp:1259
+#: src/client.cpp:1269
 msgid "Password changed successfully!"
 msgstr "Heslo úspěšně změněno!"
 
-#: src/client.cpp:1278
+#: src/client.cpp:1288
 msgid "Email Change"
 msgstr "Změna emailu"
 
-#: src/client.cpp:1279
+#: src/client.cpp:1289
 msgid "Email changed successfully!"
 msgstr "Email úspěšně změněn!"
 
-#: src/client.cpp:1299
+#: src/client.cpp:1309
 msgid "Unregister Successful"
 msgstr "Zrušení registrace úspěšné"
 
-#: src/client.cpp:1300
+#: src/client.cpp:1310
 msgid "Farewell, come back any time..."
 msgstr "Nashledanou, vraťte se kdykoli..."
 
-#: src/client.cpp:1499 src/client.cpp:1529 src/client.cpp:1544
-#: src/client.cpp:1969 src/client.cpp:1976
+#: src/client.cpp:1509 src/client.cpp:1539 src/client.cpp:1554
+#: src/client.cpp:1979 src/client.cpp:1986
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1675
+#: src/client.cpp:1685
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Neplatný host updatů: %s"
 
-#: src/client.cpp:1709 src/client.cpp:1715
+#: src/client.cpp:1719 src/client.cpp:1725
 msgid "Error creating updates directory!"
 msgstr "Chyba při vytváření adresáře s updaty!"
 
-#: src/client.cpp:1736
+#: src/client.cpp:1746
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Chyba: %s neexistuje a nelze ho vytvořit. Ukončuji."
@@ -151,8 +152,8 @@ msgstr "Nelze zaslat prázdné šeptání!"
 #: src/commandhandler.cpp:343
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
-" you."
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
+"you."
 msgstr ""
 "Nelze vytvořit záložku se šeptáním pro \"%s\"! Buďto záložka existuje nebo "
 "jsi to ty."
@@ -319,7 +320,7 @@ msgstr ""
 msgid "Resource orphaned images:"
 msgstr ""
 
-#: src/commandhandler.h:40
+#: src/commandhandler.h:34
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
@@ -348,19 +349,19 @@ msgstr "Spojení se serverem bylo ztraceno."
 msgid "Network Error"
 msgstr "Chyba sítě"
 
-#: src/game.cpp:1332
+#: src/game.cpp:1258
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorovat příchozí žádosti o obchodování"
 
-#: src/game.cpp:1342
+#: src/game.cpp:1268
 msgid "Accepting incoming trade requests"
 msgstr "Akceptovat příchozí žádosti o obchodování"
 
-#: src/game.cpp:1750
+#: src/game.cpp:1773
 msgid "Could Not Load Map"
 msgstr "Nelze načíst mapu"
 
-#: src/game.cpp:1751
+#: src/game.cpp:1774
 #, c-format
 msgid "Error while loading %s"
 msgstr "Chyba při načítání %s"
@@ -438,7 +439,7 @@ msgstr ""
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:207
 #: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:998
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:755
 msgid "+"
 msgstr ""
 
@@ -446,7 +447,7 @@ msgstr ""
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:206
 #: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:1010
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:767
 msgid "-"
 msgstr ""
 
@@ -459,7 +460,7 @@ msgstr "Ukončit"
 
 #: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
 #: src/gui/statuswindow.cpp:505 src/gui/statuswindow.cpp:555
-#: src/gui/statuswindow.cpp:997 src/gui/statuswindow.cpp:1028
+#: src/gui/statuswindow.cpp:754 src/gui/statuswindow.cpp:785
 msgid "Max"
 msgstr "Vše"
 
@@ -476,7 +477,7 @@ msgid "Sell"
 msgstr "Prodej"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
-#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:96
+#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:105
 #: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
 #: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:344
 #: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:500
@@ -553,68 +554,68 @@ msgstr "Nové heslo musí být méně než.%d znaků dlouhé."
 msgid "The new password entries mismatch."
 msgstr "Nová hesla nesouhlasí."
 
-#: src/gui/charcreatedialog.cpp:58
+#: src/gui/charcreatedialog.cpp:59
 msgid "Create Character"
 msgstr "Vytvořit postavu"
 
-#: src/gui/charcreatedialog.cpp:76 src/gui/logindialog.cpp:94
+#: src/gui/charcreatedialog.cpp:85 src/gui/logindialog.cpp:94
 #: src/gui/register.cpp:75
 msgid "Name:"
 msgstr "Jméno:"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:79 src/gui/charcreatedialog.cpp:84
-#: src/gui/charcreatedialog.cpp:90 src/gui/outfitwindow.cpp:85
+#: src/gui/charcreatedialog.cpp:88 src/gui/charcreatedialog.cpp:93
+#: src/gui/charcreatedialog.cpp:99 src/gui/outfitwindow.cpp:85
 msgid ">"
 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:82 src/gui/charcreatedialog.cpp:85
-#: src/gui/charcreatedialog.cpp:91 src/gui/outfitwindow.cpp:84
+#: src/gui/charcreatedialog.cpp:91 src/gui/charcreatedialog.cpp:94
+#: src/gui/charcreatedialog.cpp:100 src/gui/outfitwindow.cpp:84
 msgid "<"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:83
+#: src/gui/charcreatedialog.cpp:92
 msgid "Hair color:"
 msgstr "Barva vlasů:"
 
-#: src/gui/charcreatedialog.cpp:86
+#: src/gui/charcreatedialog.cpp:95
 msgid "Hair style:"
 msgstr "Účes:"
 
-#: src/gui/charcreatedialog.cpp:92
+#: src/gui/charcreatedialog.cpp:101
 msgid "Race:"
 msgstr "Rasa:"
 
-#: src/gui/charcreatedialog.cpp:95 src/gui/charselectdialog.cpp:480
+#: src/gui/charcreatedialog.cpp:104 src/gui/charselectdialog.cpp:481
 #: src/gui/socialwindow.cpp:1139
 msgid "Create"
 msgstr "Vytvořit"
 
-#: src/gui/charcreatedialog.cpp:97 src/gui/register.cpp:98
+#: src/gui/charcreatedialog.cpp:106 src/gui/register.cpp:98
 msgid "Male"
 msgstr "Muž"
 
-#: src/gui/charcreatedialog.cpp:98 src/gui/register.cpp:99
+#: src/gui/charcreatedialog.cpp:107 src/gui/register.cpp:99
 msgid "Female"
 msgstr "Žena"
 
-#: src/gui/charcreatedialog.cpp:116 src/gui/charcreatedialog.cpp:303
+#: src/gui/charcreatedialog.cpp:125 src/gui/charcreatedialog.cpp:312
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Rozdělte prosím %d bodů"
 
-#: src/gui/charcreatedialog.cpp:222
+#: src/gui/charcreatedialog.cpp:231
 msgid "Your name needs to be at least 4 characters."
 msgstr "Vaše jméno musí mít nejméně 4 znaky."
 
-#: src/gui/charcreatedialog.cpp:294
+#: src/gui/charcreatedialog.cpp:303
 msgid "Character stats OK"
 msgstr "Stav postavy je OK"
 
-#: src/gui/charcreatedialog.cpp:308
+#: src/gui/charcreatedialog.cpp:317
 #, c-format
 msgid "Please remove %d points"
 msgstr "Odstraňte prosím %d bodů"
@@ -644,34 +645,34 @@ msgstr "Zrušit registraci"
 msgid "Change Email"
 msgstr "Změnit email"
 
-#: src/gui/charselectdialog.cpp:253
+#: src/gui/charselectdialog.cpp:254
 msgid "Incorrect password"
 msgstr "Špatné heslo"
 
-#: src/gui/charselectdialog.cpp:286
+#: src/gui/charselectdialog.cpp:287
 msgid "Enter password for deleting character"
 msgstr "Zadej heslo pro smazání postavy"
 
-#: src/gui/charselectdialog.cpp:286
+#: src/gui/charselectdialog.cpp:287
 msgid "Enter password:"
 msgstr "Zadej heslo:"
 
-#: src/gui/charselectdialog.cpp:410 src/gui/serverdialog.cpp:298
+#: src/gui/charselectdialog.cpp:411 src/gui/serverdialog.cpp:298
 #: src/gui/setup_relations.cpp:244 src/gui/shopwindow.cpp:122
 #: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244
 msgid "Delete"
 msgstr "Smazat"
 
-#: src/gui/charselectdialog.cpp:468
+#: src/gui/charselectdialog.cpp:469
 msgid "Choose"
 msgstr "Vybrat"
 
-#: src/gui/charselectdialog.cpp:471
+#: src/gui/charselectdialog.cpp:472
 #, c-format
 msgid "Level %d"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:482 src/gui/charselectdialog.cpp:483
+#: src/gui/charselectdialog.cpp:483 src/gui/charselectdialog.cpp:484
 msgid "(empty)"
 msgstr ""
 
@@ -936,11 +937,11 @@ msgstr "Automaticky otevírat toto okno"
 msgid "OK"
 msgstr "OK"
 
-#: src/gui/equipmentwindow.cpp:61 src/gui/windowmenu.cpp:74
+#: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74
 msgid "Equipment"
 msgstr "Vybavení"
 
-#: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160
+#: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160
 #: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554
 #: src/gui/popupmenu.cpp:1737 src/gui/popupmenu.cpp:1829
 #: src/gui/popupmenu.cpp:1874
@@ -1379,7 +1380,7 @@ msgstr "Odignorovat"
 #: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:190
 #: src/gui/popupmenu.cpp:415 src/gui/popupmenu.cpp:435
 #: src/gui/popupmenu.cpp:672 src/gui/popupmenu.cpp:692
-#: src/playerrelations.cpp:446
+#: src/playerrelations.cpp:447
 msgid "Completely ignore"
 msgstr "Kompletně ignorovat"
 
@@ -2888,270 +2889,6 @@ msgstr "Zvolte jméno vaší party."
 msgid "Specials"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:204
-msgid "(D) default moves"
-msgstr "(D) výchozí pohyby"
-
-#: src/gui/statuspopup.cpp:209
-msgid "(I) invert moves"
-msgstr "(I) invertované pohyby"
-
-#: src/gui/statuspopup.cpp:214
-msgid "(c) moves with some crazy moves"
-msgstr "(c) pohyby s trochou šílených pohybů"
-
-#: src/gui/statuspopup.cpp:219
-msgid "(C) moves with crazy moves"
-msgstr "(C) pohyby s šílenými pohyby"
-
-#: src/gui/statuspopup.cpp:224
-msgid "(d) double normal + crazy"
-msgstr "(d) dvojité normální + šílené"
-
-#: src/gui/statuspopup.cpp:229
-msgid "(?) move"
-msgstr "(?) pohyb"
-
-#: src/gui/statuspopup.cpp:247
-msgid "(a) custom crazy move"
-msgstr "(a) vlastní šílené pohyby"
-
-#: src/gui/statuspopup.cpp:251
-msgid "(?) crazy move"
-msgstr "(?) šílené pohyby"
-
-#: src/gui/statuspopup.cpp:261
-msgid "(0) default moves to target"
-msgstr "(0) výchozí pohyb k cíli"
-
-#: src/gui/statuspopup.cpp:266
-msgid "(1) moves to target in distance 1"
-msgstr "(1) pohyb k cíli do vzdálenosti 1"
-
-#: src/gui/statuspopup.cpp:271
-msgid "(2) moves to target in distance 2"
-msgstr "(2) pohyb k cíli do vzdálenosti 2"
-
-#: src/gui/statuspopup.cpp:276
-msgid "(3) moves to target in distance 3"
-msgstr "(3) pohyb k cíli do vzdálenosti 3"
-
-#: src/gui/statuspopup.cpp:281
-msgid "(5) moves to target in distance 5"
-msgstr "(5) pohyb k cíli do vzdálenosti 5"
-
-#: src/gui/statuspopup.cpp:286
-msgid "(7) moves to target in distance 7"
-msgstr "(7) pohyb k cíli do vzdálenosti 7"
-
-#: src/gui/statuspopup.cpp:291
-msgid "(A) moves to target in attack range"
-msgstr "(A) pohyb k cíli na útočný dosah"
-
-#: src/gui/statuspopup.cpp:296
-msgid "(a) archer attack range"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:301
-msgid "(?) move to target"
-msgstr "(?) pohyb k cíli"
-
-#: src/gui/statuspopup.cpp:309
-msgid "(D) default follow"
-msgstr "(D) výchozí následování"
-
-#: src/gui/statuspopup.cpp:313
-msgid "(R) relative follow"
-msgstr "(R) relativní následování"
-
-#: src/gui/statuspopup.cpp:317
-msgid "(M) mirror follow"
-msgstr "(M) zrcadlené následování"
-
-#: src/gui/statuspopup.cpp:321
-msgid "(P) pet follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:325
-msgid "(?) unknown follow"
-msgstr "(?) neznámé následování"
-
-#: src/gui/statuspopup.cpp:334 src/gui/statuspopup.cpp:357
-msgid "(D) default attack"
-msgstr "(D) výchozí útok"
-
-#: src/gui/statuspopup.cpp:339
-msgid "(s) switch attack without shield"
-msgstr "(s) přepínat útok bez štítu"
-
-#: src/gui/statuspopup.cpp:344
-msgid "(S) switch attack with shield"
-msgstr "(S) přepínat útok se štítem"
-
-#: src/gui/statuspopup.cpp:348 src/gui/statuspopup.cpp:373
-msgid "(?) attack"
-msgstr "(?) útok"
-
-#: src/gui/statuspopup.cpp:361
-msgid "(G) go and attack"
-msgstr "(G) jdi a útoč"
-
-#: src/gui/statuspopup.cpp:365
-msgid "(A) go, attack, pickup"
-msgstr "(A) jdi, útoč, sbírej"
-
-#: src/gui/statuspopup.cpp:369
-msgid "(d) without auto attack"
-msgstr "(d) bez automatického útoku"
-
-#: src/gui/statuspopup.cpp:387
-msgid "(S) small pick up 1x1 cells"
-msgstr "(S) malý sběr 1x1 pole"
-
-#: src/gui/statuspopup.cpp:391
-msgid "(D) default pick up 2x1 cells"
-msgstr "(D) výchozí sběr 2x1 pole"
-
-#: src/gui/statuspopup.cpp:395
-msgid "(F) forward pick up 2x3 cells"
-msgstr "(F) sběr před 2x3 pole"
-
-#: src/gui/statuspopup.cpp:399
-msgid "(3) pick up 3x3 cells"
-msgstr "(3) sběr 3x3 pole"
-
-#: src/gui/statuspopup.cpp:403
-msgid "(g) go and pick up in distance 4"
-msgstr "(g) jdi a seber do vzdálenosti 4"
-
-#: src/gui/statuspopup.cpp:407
-msgid "(G) go and pick up in distance 8"
-msgstr "(G) jdi a seber do vzdálenosti 8"
-
-#: src/gui/statuspopup.cpp:411
-msgid "(A) go and pick up in max distance"
-msgstr "(A) jdi a seber do max. vzdálenosti"
-
-#: src/gui/statuspopup.cpp:415
-msgid "(?) pick up"
-msgstr "(?) sběr"
-
-#: src/gui/statuspopup.cpp:424
-msgid "(N) normal map view"
-msgstr "(N) Normální zobrazení mapy"
-
-#: src/gui/statuspopup.cpp:428
-msgid "(D) debug map view"
-msgstr "(D) debug zobrazení mapy"
-
-#: src/gui/statuspopup.cpp:432
-msgid "(u) ultra map view"
-msgstr "(u) ultra zobrazení mapy"
-
-#: src/gui/statuspopup.cpp:436
-msgid "(U) ultra map view 2"
-msgstr "(U) ultra zobrazení mapy 2"
-
-#: src/gui/statuspopup.cpp:440
-msgid "(e) empty map view"
-msgstr "(e) zobrazen prázdné mapy"
-
-#: src/gui/statuspopup.cpp:444
-msgid "(b) black & white map view"
-msgstr "(b) zobrazení černobílé mapy"
-
-#: src/gui/statuspopup.cpp:448
-msgid "(?) map view"
-msgstr "(?) zobrazení pamy"
-
-#: src/gui/statuspopup.cpp:456
-msgid "(f) use #flar for magic attack"
-msgstr "(f) použij #flar pro magický útok"
-
-#: src/gui/statuspopup.cpp:461
-msgid "(c) use #chiza for magic attack"
-msgstr "(c) použij #chiza pro magický útok"
-
-#: src/gui/statuspopup.cpp:466
-msgid "(I) use #ingrav for magic attack"
-msgstr "(I) použij #ingrav pro magický útok"
-
-#: src/gui/statuspopup.cpp:471
-msgid "(F) use #frillyar for magic attack"
-msgstr "(F) použij #frillyar pro magický útok"
-
-#: src/gui/statuspopup.cpp:476
-msgid "(U) use #upmarmu for magic attack"
-msgstr "(U) použij #upmarmu pro magický útok"
-
-#: src/gui/statuspopup.cpp:480
-msgid "(?) magic attack"
-msgstr "(?) magický útok attack"
-
-#: src/gui/statuspopup.cpp:489
-msgid "(a) attack all players"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:493
-msgid "(f) attack not friends"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:497
-msgid "(b) attack bad relations"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:501
-msgid "(d) dont attack players"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:505
-msgid "(?) pvp attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:514
-msgid "(D) default imitation"
-msgstr "(D) výchozí imitace"
-
-#: src/gui/statuspopup.cpp:518
-msgid "(O) outfits imitation"
-msgstr "(O) imitace výstroje"
-
-#: src/gui/statuspopup.cpp:522
-msgid "(?) imitation"
-msgstr "(?) imitace"
-
-#: src/gui/statuspopup.cpp:531
-msgid "(O) on keyboard"
-msgstr "(O) u počítače"
-
-#: src/gui/statuspopup.cpp:534
-msgid "(A) away"
-msgstr "(A) pryč (away)"
-
-#: src/gui/statuspopup.cpp:537 src/gui/statuspopup.cpp:557
-msgid "(?) away"
-msgstr "(?) away"
-
-#: src/gui/statuspopup.cpp:545
-msgid "(G) game camera mode"
-msgstr "(G) mód herní kamery"
-
-#: src/gui/statuspopup.cpp:549
-msgid "(F) free camera mode"
-msgstr "(F) mód volné kamery"
-
-#: src/gui/statuspopup.cpp:553
-msgid "(D) design camera mode"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:564
-msgid "Game modifiers are disabled"
-msgstr "Modifikátory hry jsou vypnuty"
-
-#: src/gui/statuspopup.cpp:569
-msgid "Game modifiers are enabled"
-msgstr "Modifikátory hry jsou zapnuty"
-
 #: src/gui/statuswindow.cpp:144 src/gui/statuswindow.cpp:274
 #: src/gui/statuswindow.cpp:337
 #, c-format
@@ -3200,136 +2937,6 @@ msgstr "Úroveň: %d (GM %d)"
 msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:649 src/gui/statuswindow.cpp:717
-#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:753
-#: src/gui/statuswindow.cpp:818 src/gui/statuswindow.cpp:847
-#: src/gui/statuswindow.cpp:870 src/gui/statuswindow.cpp:889
-msgid "(D)"
-msgstr "(D)"
-
-#: src/gui/statuswindow.cpp:652 src/gui/statuswindow.cpp:778
-msgid "(I)"
-msgstr "(I)"
-
-#: src/gui/statuswindow.cpp:655 src/gui/statuswindow.cpp:775
-msgid "(c)"
-msgstr "(c)"
-
-#: src/gui/statuswindow.cpp:658
-msgid "(C)"
-msgstr "(C)"
-
-#: src/gui/statuswindow.cpp:661 src/gui/statuswindow.cpp:762
-#: src/gui/statuswindow.cpp:803
-msgid "(d)"
-msgstr "(d)"
-
-#: src/gui/statuswindow.cpp:664 src/gui/statuswindow.cpp:678
-#: src/gui/statuswindow.cpp:710 src/gui/statuswindow.cpp:729
-#: src/gui/statuswindow.cpp:746 src/gui/statuswindow.cpp:765
-#: src/gui/statuswindow.cpp:787 src/gui/statuswindow.cpp:806
-#: src/gui/statuswindow.cpp:836 src/gui/statuswindow.cpp:862
-#: src/gui/statuswindow.cpp:876 src/gui/statuswindow.cpp:892
-#: src/gui/statuswindow.cpp:905
-msgid "(?)"
-msgstr "(?)"
-
-#: src/gui/statuswindow.cpp:675 src/gui/statuswindow.cpp:707
-#: src/gui/statuswindow.cpp:794
-msgid "(a)"
-msgstr "(a)"
-
-#: src/gui/statuswindow.cpp:686
-msgid "(0)"
-msgstr "(0)"
-
-#: src/gui/statuswindow.cpp:689
-msgid "(1)"
-msgstr "(1)"
-
-#: src/gui/statuswindow.cpp:692
-msgid "(2)"
-msgstr " (2)"
-
-#: src/gui/statuswindow.cpp:695 src/gui/statuswindow.cpp:824
-msgid "(3)"
-msgstr "(3)"
-
-#: src/gui/statuswindow.cpp:698
-msgid "(5)"
-msgstr "(5)"
-
-#: src/gui/statuswindow.cpp:701
-msgid "(7)"
-msgstr "(7)"
-
-#: src/gui/statuswindow.cpp:704 src/gui/statuswindow.cpp:759
-#: src/gui/statuswindow.cpp:833 src/gui/statuswindow.cpp:902
-msgid "(A)"
-msgstr "(A)"
-
-#: src/gui/statuswindow.cpp:720
-msgid "(R)"
-msgstr "(R)"
-
-#: src/gui/statuswindow.cpp:723
-msgid "(M)"
-msgstr "(M)"
-
-#: src/gui/statuswindow.cpp:726
-msgid "(P)"
-msgstr "(P)"
-
-#: src/gui/statuswindow.cpp:740
-msgid "(s)"
-msgstr "(s)"
-
-#: src/gui/statuswindow.cpp:743 src/gui/statuswindow.cpp:815
-msgid "(S)"
-msgstr "(S)"
-
-#: src/gui/statuswindow.cpp:756 src/gui/statuswindow.cpp:830
-#: src/gui/statuswindow.cpp:883
-msgid "(G)"
-msgstr "(G)"
-
-#: src/gui/statuswindow.cpp:772 src/gui/statuswindow.cpp:797
-msgid "(f)"
-msgstr "(f)"
-
-#: src/gui/statuswindow.cpp:781 src/gui/statuswindow.cpp:821
-#: src/gui/statuswindow.cpp:886
-msgid "(F)"
-msgstr "(F)"
-
-#: src/gui/statuswindow.cpp:784 src/gui/statuswindow.cpp:853
-msgid "(U)"
-msgstr "(U)"
-
-#: src/gui/statuswindow.cpp:800 src/gui/statuswindow.cpp:859
-msgid "(b)"
-msgstr "(b)"
-
-#: src/gui/statuswindow.cpp:827
-msgid "(g)"
-msgstr "(g)"
-
-#: src/gui/statuswindow.cpp:844
-msgid "(N)"
-msgstr "(N)"
-
-#: src/gui/statuswindow.cpp:850
-msgid "(u)"
-msgstr "(u)"
-
-#: src/gui/statuswindow.cpp:856
-msgid "(e)"
-msgstr "(e)"
-
-#: src/gui/statuswindow.cpp:873 src/gui/statuswindow.cpp:899
-msgid "(O)"
-msgstr "(O)"
-
 #: src/gui/textcommandeditor.cpp:113
 msgid "No Target"
 msgstr "Žádný cíl"
@@ -3456,8 +3063,7 @@ msgid "You don't have enough money."
 msgstr "Nemáte dost peněz."
 
 #: src/gui/tradewindow.cpp:454
-msgid ""
-"Failed adding item. You can not overlap one kind of item on the window."
+msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
 #: src/gui/unregisterdialog.cpp:54
@@ -3643,7 +3249,7 @@ msgstr "Hranice domácího místa"
 msgid "Road Point"
 msgstr "Bod cesty"
 
-#: src/gui/whoisonline.cpp:85 src/gui/whoisonline.cpp:479
+#: src/gui/whoisonline.cpp:85 src/gui/whoisonline.cpp:494
 msgid "Who Is Online - Updating"
 msgstr "Kdo je online - Obnovuji"
 
@@ -3651,15 +3257,15 @@ msgstr "Kdo je online - Obnovuji"
 msgid "Update"
 msgstr "Obnovit"
 
-#: src/gui/whoisonline.cpp:302
+#: src/gui/whoisonline.cpp:307
 msgid "Who Is Online - "
 msgstr "Kdo je online - "
 
-#: src/gui/whoisonline.cpp:493
+#: src/gui/whoisonline.cpp:508
 msgid "Who Is Online - error"
 msgstr "Kdo je online - chyba"
 
-#: src/gui/whoisonline.cpp:525
+#: src/gui/whoisonline.cpp:540
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -3835,8 +3441,7 @@ msgid "Command: /unignore <player>"
 msgstr ""
 
 #: src/gui/widgets/whispertab.cpp:131
-msgid ""
-"This command stops ignoring the other player if they are being ignored."
+msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
 #: src/gui/windowmenu.cpp:65
@@ -4366,41 +3971,41 @@ msgstr ""
 "Konflikt klávesy \"%s\" a klávesy \"%s\". Vyřešte jej, neboť se hra může "
 "chovat podivně."
 
-#: src/localplayer.cpp:389
+#: src/localplayer.cpp:384
 msgid "You were killed by "
 msgstr "Zabil vás "
 
-#: src/localplayer.cpp:1442
+#: src/localplayer.cpp:1434
 msgid "Tried to pick up nonexistent item."
 msgstr "Snažili jste se sebrat neexistující předmět."
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1436
 msgid "Item is too heavy."
 msgstr "Předmět je příliš těžký."
 
-#: src/localplayer.cpp:1446
+#: src/localplayer.cpp:1438
 msgid "Item is too far away."
 msgstr "Předmět je příliš daleko."
 
-#: src/localplayer.cpp:1448
+#: src/localplayer.cpp:1440
 msgid "Inventory is full."
 msgstr "Inventář je plný."
 
-#: src/localplayer.cpp:1450
+#: src/localplayer.cpp:1442
 msgid "Stack is too big."
 msgstr "Hromada je příliš velká."
 
-#: src/localplayer.cpp:1453
+#: src/localplayer.cpp:1445
 msgid "Item belongs to someone else."
 msgstr "Předmět patří někomu jinému."
 
-#: src/localplayer.cpp:1456
+#: src/localplayer.cpp:1448
 msgid "Unknown problem picking up item."
 msgstr "Neznámý problém při pokusu sebrat předmět."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1480
+#: src/localplayer.cpp:1472
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -4408,27 +4013,294 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/localplayer.cpp:3206
+#: src/localplayer.cpp:1887
+msgid "(D) default moves"
+msgstr "(D) výchozí pohyby"
+
+#: src/localplayer.cpp:1888
+msgid "(I) invert moves"
+msgstr "(I) invertované pohyby"
+
+#: src/localplayer.cpp:1889
+msgid "(c) moves with some crazy moves"
+msgstr "(c) pohyby s trochou šílených pohybů"
+
+#: src/localplayer.cpp:1890
+msgid "(C) moves with crazy moves"
+msgstr "(C) pohyby s šílenými pohyby"
+
+#: src/localplayer.cpp:1891
+msgid "(d) double normal + crazy"
+msgstr "(d) dvojité normální + šílené"
+
+#: src/localplayer.cpp:1892
+#, fuzzy
+msgid "(?) unknown move"
+msgstr "(?) neznámé následování"
+
+#: src/localplayer.cpp:1914
+#, fuzzy, c-format
+msgid "(%d) crazy move number %d"
+msgstr "(?) šílené pohyby"
+
+#: src/localplayer.cpp:1919
+msgid "(a) custom crazy move"
+msgstr "(a) vlastní šílené pohyby"
+
+#: src/localplayer.cpp:1923
+msgid "(?) crazy move"
+msgstr "(?) šílené pohyby"
+
+#: src/localplayer.cpp:1937
+msgid "(0) default moves to target"
+msgstr "(0) výchozí pohyb k cíli"
+
+#: src/localplayer.cpp:1938
+msgid "(1) moves to target in distance 1"
+msgstr "(1) pohyb k cíli do vzdálenosti 1"
+
+#: src/localplayer.cpp:1939
+msgid "(2) moves to target in distance 2"
+msgstr "(2) pohyb k cíli do vzdálenosti 2"
+
+#: src/localplayer.cpp:1940
+msgid "(3) moves to target in distance 3"
+msgstr "(3) pohyb k cíli do vzdálenosti 3"
+
+#: src/localplayer.cpp:1941
+msgid "(5) moves to target in distance 5"
+msgstr "(5) pohyb k cíli do vzdálenosti 5"
+
+#: src/localplayer.cpp:1942
+msgid "(7) moves to target in distance 7"
+msgstr "(7) pohyb k cíli do vzdálenosti 7"
+
+#: src/localplayer.cpp:1943
+msgid "(A) moves to target in attack range"
+msgstr "(A) pohyb k cíli na útočný dosah"
+
+#: src/localplayer.cpp:1944
+msgid "(a) archer attack range"
+msgstr ""
+
+#: src/localplayer.cpp:1945
+msgid "(?) move to target"
+msgstr "(?) pohyb k cíli"
+
+#: src/localplayer.cpp:1964
+msgid "(D) default follow"
+msgstr "(D) výchozí následování"
+
+#: src/localplayer.cpp:1965
+msgid "(R) relative follow"
+msgstr "(R) relativní následování"
+
+#: src/localplayer.cpp:1966
+msgid "(M) mirror follow"
+msgstr "(M) zrcadlené následování"
+
+#: src/localplayer.cpp:1967
+msgid "(P) pet follow"
+msgstr ""
+
+#: src/localplayer.cpp:1968
+msgid "(?) unknown follow"
+msgstr "(?) neznámé následování"
+
+#: src/localplayer.cpp:1987 src/localplayer.cpp:1991 src/localplayer.cpp:2014
+msgid "(?) attack"
+msgstr "(?) útok"
+
+#: src/localplayer.cpp:1988 src/localplayer.cpp:2010
+msgid "(D) default attack"
+msgstr "(D) výchozí útok"
+
+#: src/localplayer.cpp:1989
+msgid "(s) switch attack without shield"
+msgstr "(s) přepínat útok bez štítu"
+
+#: src/localplayer.cpp:1990
+msgid "(S) switch attack with shield"
+msgstr "(S) přepínat útok se štítem"
+
+#: src/localplayer.cpp:2011
+msgid "(G) go and attack"
+msgstr "(G) jdi a útoč"
+
+#: src/localplayer.cpp:2012
+msgid "(A) go, attack, pickup"
+msgstr "(A) jdi, útoč, sbírej"
+
+#: src/localplayer.cpp:2013
+msgid "(d) without auto attack"
+msgstr "(d) bez automatického útoku"
+
+#: src/localplayer.cpp:2047
+msgid "(S) small pick up 1x1 cells"
+msgstr "(S) malý sběr 1x1 pole"
+
+#: src/localplayer.cpp:2048
+msgid "(D) default pick up 2x1 cells"
+msgstr "(D) výchozí sběr 2x1 pole"
+
+#: src/localplayer.cpp:2049
+msgid "(F) forward pick up 2x3 cells"
+msgstr "(F) sběr před 2x3 pole"
+
+#: src/localplayer.cpp:2050
+msgid "(3) pick up 3x3 cells"
+msgstr "(3) sběr 3x3 pole"
+
+#: src/localplayer.cpp:2051
+msgid "(g) go and pick up in distance 4"
+msgstr "(g) jdi a seber do vzdálenosti 4"
+
+#: src/localplayer.cpp:2052
+msgid "(G) go and pick up in distance 8"
+msgstr "(G) jdi a seber do vzdálenosti 8"
+
+#: src/localplayer.cpp:2053
+msgid "(A) go and pick up in max distance"
+msgstr "(A) jdi a seber do max. vzdálenosti"
+
+#: src/localplayer.cpp:2054
+msgid "(?) pick up"
+msgstr "(?) sběr"
+
+#: src/localplayer.cpp:2067
+msgid "(N) normal map view"
+msgstr "(N) Normální zobrazení mapy"
+
+#: src/localplayer.cpp:2068
+msgid "(D) debug map view"
+msgstr "(D) debug zobrazení mapy"
+
+#: src/localplayer.cpp:2069
+msgid "(u) ultra map view"
+msgstr "(u) ultra zobrazení mapy"
+
+#: src/localplayer.cpp:2070
+msgid "(U) ultra map view 2"
+msgstr "(U) ultra zobrazení mapy 2"
+
+#: src/localplayer.cpp:2071
+msgid "(e) empty map view"
+msgstr "(e) zobrazen prázdné mapy"
+
+#: src/localplayer.cpp:2072
+msgid "(b) black & white map view"
+msgstr "(b) zobrazení černobílé mapy"
+
+#: src/localplayer.cpp:2091
+msgid "(f) use #flar for magic attack"
+msgstr "(f) použij #flar pro magický útok"
+
+#: src/localplayer.cpp:2092
+msgid "(c) use #chiza for magic attack"
+msgstr "(c) použij #chiza pro magický útok"
+
+#: src/localplayer.cpp:2093
+msgid "(I) use #ingrav for magic attack"
+msgstr "(I) použij #ingrav pro magický útok"
+
+#: src/localplayer.cpp:2094
+msgid "(F) use #frillyar for magic attack"
+msgstr "(F) použij #frillyar pro magický útok"
+
+#: src/localplayer.cpp:2095
+msgid "(U) use #upmarmu for magic attack"
+msgstr "(U) použij #upmarmu pro magický útok"
+
+#: src/localplayer.cpp:2096
+msgid "(?) magic attack"
+msgstr "(?) magický útok attack"
+
+#: src/localplayer.cpp:2115
+msgid "(a) attack all players"
+msgstr ""
+
+#: src/localplayer.cpp:2116
+msgid "(f) attack not friends"
+msgstr ""
+
+#: src/localplayer.cpp:2117
+msgid "(b) attack bad relations"
+msgstr ""
+
+#: src/localplayer.cpp:2118
+msgid "(d) dont attack players"
+msgstr ""
+
+#: src/localplayer.cpp:2119
+msgid "(?) pvp attack"
+msgstr ""
+
+#: src/localplayer.cpp:2138
+msgid "(D) default imitation"
+msgstr "(D) výchozí imitace"
+
+#: src/localplayer.cpp:2139
+msgid "(O) outfits imitation"
+msgstr "(O) imitace výstroje"
+
+#: src/localplayer.cpp:2140
+msgid "(?) imitation"
+msgstr "(?) imitace"
+
+#: src/localplayer.cpp:2168
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:3541
+#: src/localplayer.cpp:2187
+msgid "(O) on keyboard"
+msgstr "(O) u počítače"
+
+#: src/localplayer.cpp:2188
+msgid "(A) away"
+msgstr "(A) pryč (away)"
+
+#: src/localplayer.cpp:2189 src/localplayer.cpp:2204
+msgid "(?) away"
+msgstr "(?) away"
+
+#: src/localplayer.cpp:2202
+msgid "(G) game camera mode"
+msgstr "(G) mód herní kamery"
+
+#: src/localplayer.cpp:2203
+msgid "(F) free camera mode"
+msgstr "(F) mód volné kamery"
+
+#: src/localplayer.cpp:2228
+msgid "Game modifiers are enabled"
+msgstr "Modifikátory hry jsou zapnuty"
+
+#: src/localplayer.cpp:2229
+msgid "Game modifiers are disabled"
+msgstr "Modifikátory hry jsou vypnuty"
+
+#: src/localplayer.cpp:2230
+#, fuzzy
+msgid "Game modifiers are unknown"
+msgstr "Modifikátory hry jsou zapnuty"
+
+#: src/localplayer.cpp:3746
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3543 src/localplayer.cpp:3558
+#: src/localplayer.cpp:3748 src/localplayer.cpp:3763
 msgid "Follow canceled"
 msgstr "Následování zrušeno."
 
-#: src/localplayer.cpp:3550
+#: src/localplayer.cpp:3755
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3552 src/localplayer.cpp:3560
+#: src/localplayer.cpp:3757 src/localplayer.cpp:3765
 msgid "Imitation canceled"
 msgstr "Imitace zrušena."
 
-#: src/localplayer.cpp:3908
+#: src/localplayer.cpp:4113
 msgid "You see "
 msgstr "Vidíte "
 
@@ -4536,74 +4408,73 @@ msgstr "Děkuji za nákup."
 msgid "Unable to buy."
 msgstr "Nelze koupit."
 
-#: src/net/ea/charserverhandler.cpp:63
+#: src/net/ea/charserverhandler.cpp:66
 msgid "Strength:"
 msgstr "Síla:"
 
-#: src/net/ea/charserverhandler.cpp:64
+#: src/net/ea/charserverhandler.cpp:67
 msgid "Agility:"
 msgstr "Hbitost:"
 
-#: src/net/ea/charserverhandler.cpp:65
+#: src/net/ea/charserverhandler.cpp:68
 msgid "Vitality:"
 msgstr "Vitalita:"
 
-#: src/net/ea/charserverhandler.cpp:66
+#: src/net/ea/charserverhandler.cpp:69
 msgid "Intelligence:"
 msgstr "Inteligence:"
 
-#: src/net/ea/charserverhandler.cpp:67
+#: src/net/ea/charserverhandler.cpp:70
 msgid "Dexterity:"
 msgstr "Obratnost:"
 
-#: src/net/ea/charserverhandler.cpp:68
+#: src/net/ea/charserverhandler.cpp:71
 msgid "Luck:"
 msgstr "Štěstí:"
 
-#: src/net/ea/charserverhandler.cpp:102
+#: src/net/ea/charserverhandler.cpp:115
 msgid "Access denied. Most likely, there are too many players on this server."
-msgstr ""
-"Přístup zamítnut. Nejpravděpodobněji je na serveru příliš mnoho hráčů."
+msgstr "Přístup zamítnut. Nejpravděpodobněji je na serveru příliš mnoho hráčů."
 
-#: src/net/ea/charserverhandler.cpp:106
+#: src/net/ea/charserverhandler.cpp:119
 msgid "Cannot use this ID."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:109
+#: src/net/ea/charserverhandler.cpp:122
 msgid "Unknown char-server failure."
 msgstr "Neznámá chyba postavy na serveru."
 
-#: src/net/ea/charserverhandler.cpp:138
+#: src/net/ea/charserverhandler.cpp:151
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 "Nelze vytvořit postavu. Nejpravděpodobněji její jméno již na serveru "
 "existuje. "
 
-#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:235
+#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:235
 msgid "Wrong name."
 msgstr "Špatné jméno."
 
-#: src/net/ea/charserverhandler.cpp:145
+#: src/net/ea/charserverhandler.cpp:158
 msgid "Incorrect stats."
 msgstr "Nesprávné statistiky."
 
-#: src/net/ea/charserverhandler.cpp:148
+#: src/net/ea/charserverhandler.cpp:161
 msgid "Incorrect hair."
 msgstr "Nesprávný účes."
 
-#: src/net/ea/charserverhandler.cpp:151
+#: src/net/ea/charserverhandler.cpp:164
 msgid "Incorrect slot."
 msgstr "Nesprávný slot."
 
-#: src/net/ea/charserverhandler.cpp:166 src/net/manaserv/charhandler.cpp:210
+#: src/net/ea/charserverhandler.cpp:179 src/net/manaserv/charhandler.cpp:210
 msgid "Info"
 msgstr "informaceInfo"
 
-#: src/net/ea/charserverhandler.cpp:166
+#: src/net/ea/charserverhandler.cpp:179
 msgid "Character deleted."
 msgstr "Postava odstraněna."
 
-#: src/net/ea/charserverhandler.cpp:172
+#: src/net/ea/charserverhandler.cpp:185
 msgid "Failed to delete character."
 msgstr "Nepodařilo se odstranit postavu."
 
@@ -4828,15 +4699,15 @@ msgstr ""
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:284
+#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:285
 msgid "Item sharing enabled."
 msgstr "Sdílení předmětů povoleno."
 
-#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:294
+#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:295
 msgid "Item sharing disabled."
 msgstr "Sdílení předmětů zakázáno."
 
-#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:304
+#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:305
 msgid "Item sharing not possible."
 msgstr "Sdílení předmětů není možné."
 
@@ -4844,15 +4715,15 @@ msgstr "Sdílení předmětů není možné."
 msgid "Item sharing unknown."
 msgstr "Stav sdílení předmětů neznámý."
 
-#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:246
+#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:247
 msgid "Experience sharing enabled."
 msgstr "Sdílení zkušeností povoleno."
 
-#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:256
+#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:257
 msgid "Experience sharing disabled."
 msgstr "Sdílení zkušeností zakázáno."
 
-#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:266
+#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:267
 msgid "Experience sharing not possible."
 msgstr "Sdílení zkušeností není možné."
 
@@ -4969,16 +4840,16 @@ msgstr "%s nemůže být členem party, jelikož je parta plná."
 msgid "QQQ Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:357
+#: src/net/ea/partyhandler.cpp:358
 msgid "You have left the party."
 msgstr "Odešel jste z party."
 
-#: src/net/ea/partyhandler.cpp:370
+#: src/net/ea/partyhandler.cpp:371
 #, c-format
 msgid "%s has left your party."
 msgstr "%s opustil vaši partu."
 
-#: src/net/ea/partyhandler.cpp:447
+#: src/net/ea/partyhandler.cpp:448
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr "Neznámý člen se snažil říct: %s"
@@ -5012,8 +4883,8 @@ msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr ""
-"Ne, děti. Vaše postava ve skutečnosti neumřela. Ona.. errm.. odešla na lepší"
-" místo."
+"Ne, děti. Vaše postava ve skutečnosti neumřela. Ona.. errm.. odešla na lepší "
+"místo."
 
 #: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:323
 msgid ""
@@ -5111,10 +4982,8 @@ msgstr "Zpráva"
 
 #: src/net/ea/playerhandler.cpp:336
 msgid ""
-"You are carrying more than half your weight. You are unable to regain "
-"health."
-msgstr ""
-"Nesete více než polovinu vaší váhy. Obnovování života nyní není možné."
+"You are carrying more than half your weight. You are unable to regain health."
+msgstr "Nesete více než polovinu vaší váhy. Obnovování života nyní není možné."
 
 #: src/net/ea/playerhandler.cpp:346
 msgid "You are carrying less than half your weight. You can regain health."
@@ -5705,19 +5574,19 @@ msgstr ""
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/playerrelations.cpp:460
+#: src/playerrelations.cpp:461
 msgid "Print '...'"
 msgstr ""
 
-#: src/playerrelations.cpp:480
+#: src/playerrelations.cpp:481
 msgid "Blink name"
 msgstr ""
 
-#: src/playerrelations.cpp:524
+#: src/playerrelations.cpp:525
 msgid "Floating '...' bubble"
 msgstr ""
 
-#: src/playerrelations.cpp:527
+#: src/playerrelations.cpp:528
 msgid "Floating bubble"
 msgstr ""
 
@@ -5750,4 +5619,95 @@ msgstr ""
 msgid "Unknown item"
 msgstr "Neznámý předmět"
 
+#~ msgid "(?) move"
+#~ msgstr "(?) pohyb"
+
+#~ msgid "(?) map view"
+#~ msgstr "(?) zobrazení pamy"
+
+#~ msgid "(D)"
+#~ msgstr "(D)"
+
+#~ msgid "(I)"
+#~ msgstr "(I)"
+
+#~ msgid "(c)"
+#~ msgstr "(c)"
+
+#~ msgid "(C)"
+#~ msgstr "(C)"
+
+#~ msgid "(d)"
+#~ msgstr "(d)"
+
+#~ msgid "(?)"
+#~ msgstr "(?)"
+
+#~ msgid "(a)"
+#~ msgstr "(a)"
+
+#~ msgid "(0)"
+#~ msgstr "(0)"
+
+#~ msgid "(1)"
+#~ msgstr "(1)"
+
+#~ msgid "(2)"
+#~ msgstr " (2)"
+
+#~ msgid "(3)"
+#~ msgstr "(3)"
+
+#~ msgid "(5)"
+#~ msgstr "(5)"
+
+#~ msgid "(7)"
+#~ msgstr "(7)"
+
+#~ msgid "(A)"
+#~ msgstr "(A)"
+
+#~ msgid "(R)"
+#~ msgstr "(R)"
+
+#~ msgid "(M)"
+#~ msgstr "(M)"
+
+#~ msgid "(P)"
+#~ msgstr "(P)"
+
+#~ msgid "(s)"
+#~ msgstr "(s)"
+
+#~ msgid "(S)"
+#~ msgstr "(S)"
+
+#~ msgid "(G)"
+#~ msgstr "(G)"
+
+#~ msgid "(f)"
+#~ msgstr "(f)"
+
+#~ msgid "(F)"
+#~ msgstr "(F)"
+
+#~ msgid "(U)"
+#~ msgstr "(U)"
+
+#~ msgid "(b)"
+#~ msgstr "(b)"
+
+#~ msgid "(g)"
+#~ msgstr "(g)"
+
+#~ msgid "(N)"
+#~ msgstr "(N)"
+
+#~ msgid "(u)"
+#~ msgstr "(u)"
+
+#~ msgid "(e)"
+#~ msgstr "(e)"
 
+#~ msgid "(O)"
+#~ msgstr "(O)"
diff --git a/po/de.po b/po/de.po
index ae6f34c90..9e299cd03 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Andrei Karas <akaras@inbox.ru>, 2011.
 #   <clos3rlook@gmail.com>, 2011.
@@ -12,132 +12,133 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-11-12 00:23+0300\n"
+"POT-Creation-Date: 2011-11-26 02:20+0300\n"
 "PO-Revision-Date: 2011-11-11 21:38+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
-"Language-Team: German (http://www.transifex.net/projects/p/manaplus/team/de/)\n"
+"Language-Team: German (http://www.transifex.net/projects/p/manaplus/team/"
+"de/)\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: src/actorspritemanager.cpp:1171
 msgid "Visible on map"
 msgstr ""
 
-#: src/being.cpp:551
+#: src/being.cpp:553
 msgid "dodge"
 msgstr "ausweichen"
 
-#: src/being.cpp:551
+#: src/being.cpp:553
 msgid "miss"
 msgstr "verfehlt"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1530
+#: src/being.cpp:1534
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1535
+#: src/being.cpp:1539
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:869 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:878 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Einstellungen"
 
-#: src/client.cpp:876 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:885 src/gui/setup_perfomance.cpp:48
 msgid "Perfomance"
 msgstr ""
 
-#: src/client.cpp:881 src/gui/setup_video.cpp:315
+#: src/client.cpp:890 src/gui/setup_video.cpp:315
 msgid "Video"
 msgstr "Video"
 
-#: src/client.cpp:886
+#: src/client.cpp:895
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:968
+#: src/client.cpp:977
 msgid "Connecting to server"
 msgstr "Verbinde zum Server"
 
-#: src/client.cpp:999
+#: src/client.cpp:1008
 msgid "Logging in"
 msgstr "Anmelden"
 
-#: src/client.cpp:1032
+#: src/client.cpp:1041
 msgid "Entering game world"
 msgstr "Betrete die Spielwelt"
 
-#: src/client.cpp:1132
+#: src/client.cpp:1142
 msgid "Requesting characters"
 msgstr "Spielfiguren werden angefragt"
 
-#: src/client.cpp:1163
+#: src/client.cpp:1173
 msgid "Connecting to the game server"
 msgstr "Verbinde zum Charakterserver"
 
-#: src/client.cpp:1173
+#: src/client.cpp:1183
 msgid "Changing game servers"
 msgstr "Charakterserver wechseln"
 
-#: src/client.cpp:1216 src/client.cpp:1223 src/client.cpp:1357
+#: src/client.cpp:1226 src/client.cpp:1233 src/client.cpp:1367
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
-#: src/gui/charcreatedialog.cpp:221 src/gui/charselectdialog.cpp:253
+#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:254
 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
-#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
-#: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
+#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:167
+#: src/net/ea/charserverhandler.cpp:185 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "Fehler"
 
-#: src/client.cpp:1232
+#: src/client.cpp:1242
 msgid "Requesting registration details"
 msgstr "Anfrage der Registrierungsdetails"
 
-#: src/client.cpp:1258
+#: src/client.cpp:1268
 msgid "Password Change"
 msgstr "Passwort ändern"
 
-#: src/client.cpp:1259
+#: src/client.cpp:1269
 msgid "Password changed successfully!"
 msgstr "Passwort erfolgreich geändert!"
 
-#: src/client.cpp:1278
+#: src/client.cpp:1288
 msgid "Email Change"
 msgstr "E-Mail ändern"
 
-#: src/client.cpp:1279
+#: src/client.cpp:1289
 msgid "Email changed successfully!"
 msgstr "E-Mail erfolgreich geändert!"
 
-#: src/client.cpp:1299
+#: src/client.cpp:1309
 msgid "Unregister Successful"
 msgstr "erfolgreich abgemeldet."
 
-#: src/client.cpp:1300
+#: src/client.cpp:1310
 msgid "Farewell, come back any time..."
 msgstr "Leb wohl und komme jeder Zeit wieder..."
 
-#: src/client.cpp:1499 src/client.cpp:1529 src/client.cpp:1544
-#: src/client.cpp:1969 src/client.cpp:1976
+#: src/client.cpp:1509 src/client.cpp:1539 src/client.cpp:1554
+#: src/client.cpp:1979 src/client.cpp:1986
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s existiert nicht und kann nicht erstellt werden! Beende."
 
-#: src/client.cpp:1675
+#: src/client.cpp:1685
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Ungültiger Updateserver: %s"
 
-#: src/client.cpp:1709 src/client.cpp:1715
+#: src/client.cpp:1719 src/client.cpp:1725
 msgid "Error creating updates directory!"
 msgstr "Fehler beim Erstellen des Verzeichnisses für Updates!"
 
-#: src/client.cpp:1736
+#: src/client.cpp:1746
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -154,11 +155,11 @@ msgstr "Kann keine leeren Nachrichten versenden!"
 #: src/commandhandler.cpp:343
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
-" you."
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
+"you."
 msgstr ""
-"Kann keinen tab für Spieler \"%s\" erstellen! Entweder existiert er bereits,"
-" oder du bist es selbst."
+"Kann keinen tab für Spieler \"%s\" erstellen! Entweder existiert er bereits, "
+"oder du bist es selbst."
 
 #: src/commandhandler.cpp:363
 #, c-format
@@ -317,10 +318,11 @@ msgstr ""
 msgid "Resource orphaned images:"
 msgstr ""
 
-#: src/commandhandler.h:40
+#: src/commandhandler.h:34
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr "Gültige Optionen für /%s sind \"yes\",\"no\",\"true\",\"false\",\"1\",\"0\"."
+msgstr ""
+"Gültige Optionen für /%s sind \"yes\",\"no\",\"true\",\"false\",\"1\",\"0\"."
 
 #: src/game.cpp:252 src/gui/widgets/chattab.cpp:403
 msgid "General"
@@ -346,19 +348,19 @@ msgstr "Die Verbindung zum Server wurde getrennt."
 msgid "Network Error"
 msgstr "Netzwerkfehler"
 
-#: src/game.cpp:1332
+#: src/game.cpp:1258
 msgid "Ignoring incoming trade requests"
 msgstr "Ignoriere eingehende Handelsanfragen"
 
-#: src/game.cpp:1342
+#: src/game.cpp:1268
 msgid "Accepting incoming trade requests"
 msgstr "Akzeptiere eingehende Handelsanfragen"
 
-#: src/game.cpp:1750
+#: src/game.cpp:1773
 msgid "Could Not Load Map"
 msgstr "Karte konnte nicht geladen werden."
 
-#: src/game.cpp:1751
+#: src/game.cpp:1774
 #, c-format
 msgid "Error while loading %s"
 msgstr "Fehler beim Laden von %s"
@@ -436,7 +438,7 @@ msgstr ""
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:207
 #: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:998
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:755
 msgid "+"
 msgstr "+"
 
@@ -444,7 +446,7 @@ msgstr "+"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:206
 #: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:1010
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:767
 msgid "-"
 msgstr "-"
 
@@ -457,7 +459,7 @@ msgstr "Beenden"
 
 #: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
 #: src/gui/statuswindow.cpp:505 src/gui/statuswindow.cpp:555
-#: src/gui/statuswindow.cpp:997 src/gui/statuswindow.cpp:1028
+#: src/gui/statuswindow.cpp:754 src/gui/statuswindow.cpp:785
 msgid "Max"
 msgstr "Max"
 
@@ -474,7 +476,7 @@ msgid "Sell"
 msgstr "Verkaufen"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
-#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:96
+#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:105
 #: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
 #: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:344
 #: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:500
@@ -551,68 +553,68 @@ msgstr "Das neue Passwort muss kürzer als %d Zeichen sein."
 msgid "The new password entries mismatch."
 msgstr "Die Passwörter stimmen nicht überein."
 
-#: src/gui/charcreatedialog.cpp:58
+#: src/gui/charcreatedialog.cpp:59
 msgid "Create Character"
 msgstr "Charakter erstellen"
 
-#: src/gui/charcreatedialog.cpp:76 src/gui/logindialog.cpp:94
+#: src/gui/charcreatedialog.cpp:85 src/gui/logindialog.cpp:94
 #: src/gui/register.cpp:75
 msgid "Name:"
 msgstr "Name :"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:79 src/gui/charcreatedialog.cpp:84
-#: src/gui/charcreatedialog.cpp:90 src/gui/outfitwindow.cpp:85
+#: src/gui/charcreatedialog.cpp:88 src/gui/charcreatedialog.cpp:93
+#: src/gui/charcreatedialog.cpp:99 src/gui/outfitwindow.cpp:85
 msgid ">"
 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:82 src/gui/charcreatedialog.cpp:85
-#: src/gui/charcreatedialog.cpp:91 src/gui/outfitwindow.cpp:84
+#: src/gui/charcreatedialog.cpp:91 src/gui/charcreatedialog.cpp:94
+#: src/gui/charcreatedialog.cpp:100 src/gui/outfitwindow.cpp:84
 msgid "<"
 msgstr "<"
 
-#: src/gui/charcreatedialog.cpp:83
+#: src/gui/charcreatedialog.cpp:92
 msgid "Hair color:"
 msgstr "Haarfarbe:"
 
-#: src/gui/charcreatedialog.cpp:86
+#: src/gui/charcreatedialog.cpp:95
 msgid "Hair style:"
 msgstr "Frisur:"
 
-#: src/gui/charcreatedialog.cpp:92
+#: src/gui/charcreatedialog.cpp:101
 msgid "Race:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:95 src/gui/charselectdialog.cpp:480
+#: src/gui/charcreatedialog.cpp:104 src/gui/charselectdialog.cpp:481
 #: src/gui/socialwindow.cpp:1139
 msgid "Create"
 msgstr "Erstellen"
 
-#: src/gui/charcreatedialog.cpp:97 src/gui/register.cpp:98
+#: src/gui/charcreatedialog.cpp:106 src/gui/register.cpp:98
 msgid "Male"
 msgstr "Männlich"
 
-#: src/gui/charcreatedialog.cpp:98 src/gui/register.cpp:99
+#: src/gui/charcreatedialog.cpp:107 src/gui/register.cpp:99
 msgid "Female"
 msgstr "Weiblich"
 
-#: src/gui/charcreatedialog.cpp:116 src/gui/charcreatedialog.cpp:303
+#: src/gui/charcreatedialog.cpp:125 src/gui/charcreatedialog.cpp:312
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Bitte verteile %d Punkte"
 
-#: src/gui/charcreatedialog.cpp:222
+#: src/gui/charcreatedialog.cpp:231
 msgid "Your name needs to be at least 4 characters."
 msgstr "Dein Name muss aus mindestens 4 Zeichen bestehen."
 
-#: src/gui/charcreatedialog.cpp:294
+#: src/gui/charcreatedialog.cpp:303
 msgid "Character stats OK"
 msgstr "Spielfigurattribute OK"
 
-#: src/gui/charcreatedialog.cpp:308
+#: src/gui/charcreatedialog.cpp:317
 #, c-format
 msgid "Please remove %d points"
 msgstr "Bitte entferne %d Punkte"
@@ -642,34 +644,34 @@ msgstr "Abmelden"
 msgid "Change Email"
 msgstr "E-Mailadresse ändern"
 
-#: src/gui/charselectdialog.cpp:253
+#: src/gui/charselectdialog.cpp:254
 msgid "Incorrect password"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:286
+#: src/gui/charselectdialog.cpp:287
 msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:286
+#: src/gui/charselectdialog.cpp:287
 msgid "Enter password:"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:410 src/gui/serverdialog.cpp:298
+#: src/gui/charselectdialog.cpp:411 src/gui/serverdialog.cpp:298
 #: src/gui/setup_relations.cpp:244 src/gui/shopwindow.cpp:122
 #: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244
 msgid "Delete"
 msgstr "Löschen"
 
-#: src/gui/charselectdialog.cpp:468
+#: src/gui/charselectdialog.cpp:469
 msgid "Choose"
 msgstr "Wähle"
 
-#: src/gui/charselectdialog.cpp:471
+#: src/gui/charselectdialog.cpp:472
 #, c-format
 msgid "Level %d"
 msgstr "Level: %d"
 
-#: src/gui/charselectdialog.cpp:482 src/gui/charselectdialog.cpp:483
+#: src/gui/charselectdialog.cpp:483 src/gui/charselectdialog.cpp:484
 msgid "(empty)"
 msgstr "(leer)"
 
@@ -934,11 +936,11 @@ msgstr ""
 msgid "OK"
 msgstr "Ok"
 
-#: src/gui/equipmentwindow.cpp:61 src/gui/windowmenu.cpp:74
+#: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74
 msgid "Equipment"
 msgstr "Ausrüstung"
 
-#: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160
+#: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160
 #: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554
 #: src/gui/popupmenu.cpp:1737 src/gui/popupmenu.cpp:1829
 #: src/gui/popupmenu.cpp:1874
@@ -1375,7 +1377,7 @@ msgstr ""
 #: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:190
 #: src/gui/popupmenu.cpp:415 src/gui/popupmenu.cpp:435
 #: src/gui/popupmenu.cpp:672 src/gui/popupmenu.cpp:692
-#: src/playerrelations.cpp:446
+#: src/playerrelations.cpp:447
 msgid "Completely ignore"
 msgstr "@@ignore|Ignoriere %s komplett@@"
 
@@ -2890,270 +2892,6 @@ msgstr "Name deiner Party wählen."
 msgid "Specials"
 msgstr "Special"
 
-#: src/gui/statuspopup.cpp:204
-msgid "(D) default moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:209
-msgid "(I) invert moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:214
-msgid "(c) moves with some crazy moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:219
-msgid "(C) moves with crazy moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:224
-msgid "(d) double normal + crazy"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:229
-msgid "(?) move"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:247
-msgid "(a) custom crazy move"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:251
-msgid "(?) crazy move"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:261
-msgid "(0) default moves to target"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:266
-msgid "(1) moves to target in distance 1"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:271
-msgid "(2) moves to target in distance 2"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:276
-msgid "(3) moves to target in distance 3"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:281
-msgid "(5) moves to target in distance 5"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:286
-msgid "(7) moves to target in distance 7"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:291
-msgid "(A) moves to target in attack range"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:296
-msgid "(a) archer attack range"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:301
-msgid "(?) move to target"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:309
-msgid "(D) default follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:313
-msgid "(R) relative follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:317
-msgid "(M) mirror follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:321
-msgid "(P) pet follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:325
-msgid "(?) unknown follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:334 src/gui/statuspopup.cpp:357
-msgid "(D) default attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:339
-msgid "(s) switch attack without shield"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:344
-msgid "(S) switch attack with shield"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:348 src/gui/statuspopup.cpp:373
-msgid "(?) attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:361
-msgid "(G) go and attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:365
-msgid "(A) go, attack, pickup"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:369
-msgid "(d) without auto attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:387
-msgid "(S) small pick up 1x1 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:391
-msgid "(D) default pick up 2x1 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:395
-msgid "(F) forward pick up 2x3 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:399
-msgid "(3) pick up 3x3 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:403
-msgid "(g) go and pick up in distance 4"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:407
-msgid "(G) go and pick up in distance 8"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:411
-msgid "(A) go and pick up in max distance"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:415
-msgid "(?) pick up"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:424
-msgid "(N) normal map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:428
-msgid "(D) debug map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:432
-msgid "(u) ultra map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:436
-msgid "(U) ultra map view 2"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:440
-msgid "(e) empty map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:444
-msgid "(b) black & white map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:448
-msgid "(?) map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:456
-msgid "(f) use #flar for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:461
-msgid "(c) use #chiza for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:466
-msgid "(I) use #ingrav for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:471
-msgid "(F) use #frillyar for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:476
-msgid "(U) use #upmarmu for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:480
-msgid "(?) magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:489
-msgid "(a) attack all players"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:493
-msgid "(f) attack not friends"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:497
-msgid "(b) attack bad relations"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:501
-msgid "(d) dont attack players"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:505
-msgid "(?) pvp attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:514
-msgid "(D) default imitation"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:518
-msgid "(O) outfits imitation"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:522
-msgid "(?) imitation"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:531
-msgid "(O) on keyboard"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:534
-msgid "(A) away"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:537 src/gui/statuspopup.cpp:557
-msgid "(?) away"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:545
-msgid "(G) game camera mode"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:549
-msgid "(F) free camera mode"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:553
-msgid "(D) design camera mode"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:564
-msgid "Game modifiers are disabled"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:569
-msgid "Game modifiers are enabled"
-msgstr ""
-
 #: src/gui/statuswindow.cpp:144 src/gui/statuswindow.cpp:274
 #: src/gui/statuswindow.cpp:337
 #, c-format
@@ -3202,136 +2940,6 @@ msgstr "Level: %d (GM %d)"
 msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:649 src/gui/statuswindow.cpp:717
-#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:753
-#: src/gui/statuswindow.cpp:818 src/gui/statuswindow.cpp:847
-#: src/gui/statuswindow.cpp:870 src/gui/statuswindow.cpp:889
-msgid "(D)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:652 src/gui/statuswindow.cpp:778
-msgid "(I)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:655 src/gui/statuswindow.cpp:775
-msgid "(c)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:658
-msgid "(C)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:661 src/gui/statuswindow.cpp:762
-#: src/gui/statuswindow.cpp:803
-msgid "(d)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:664 src/gui/statuswindow.cpp:678
-#: src/gui/statuswindow.cpp:710 src/gui/statuswindow.cpp:729
-#: src/gui/statuswindow.cpp:746 src/gui/statuswindow.cpp:765
-#: src/gui/statuswindow.cpp:787 src/gui/statuswindow.cpp:806
-#: src/gui/statuswindow.cpp:836 src/gui/statuswindow.cpp:862
-#: src/gui/statuswindow.cpp:876 src/gui/statuswindow.cpp:892
-#: src/gui/statuswindow.cpp:905
-msgid "(?)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:675 src/gui/statuswindow.cpp:707
-#: src/gui/statuswindow.cpp:794
-msgid "(a)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:686
-msgid "(0)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:689
-msgid "(1)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:692
-msgid "(2)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:695 src/gui/statuswindow.cpp:824
-msgid "(3)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:698
-msgid "(5)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:701
-msgid "(7)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:704 src/gui/statuswindow.cpp:759
-#: src/gui/statuswindow.cpp:833 src/gui/statuswindow.cpp:902
-msgid "(A)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:720
-msgid "(R)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:723
-msgid "(M)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:726
-msgid "(P)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:740
-msgid "(s)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:743 src/gui/statuswindow.cpp:815
-msgid "(S)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:756 src/gui/statuswindow.cpp:830
-#: src/gui/statuswindow.cpp:883
-msgid "(G)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:772 src/gui/statuswindow.cpp:797
-msgid "(f)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:781 src/gui/statuswindow.cpp:821
-#: src/gui/statuswindow.cpp:886
-msgid "(F)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:784 src/gui/statuswindow.cpp:853
-msgid "(U)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:800 src/gui/statuswindow.cpp:859
-msgid "(b)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:827
-msgid "(g)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:844
-msgid "(N)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:850
-msgid "(u)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:856
-msgid "(e)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:873 src/gui/statuswindow.cpp:899
-msgid "(O)"
-msgstr ""
-
 #: src/gui/textcommandeditor.cpp:113
 msgid "No Target"
 msgstr "Kein Ziel"
@@ -3458,11 +3066,10 @@ msgid "You don't have enough money."
 msgstr "Du hast nicht genügend Geld."
 
 #: src/gui/tradewindow.cpp:454
-msgid ""
-"Failed adding item. You can not overlap one kind of item on the window."
+msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
-"Gegenstand konnte nicht hinzugefügt werden. Du kannst keinen weiteren dieser"
-" Gegenstände hinzufügen."
+"Gegenstand konnte nicht hinzugefügt werden. Du kannst keinen weiteren dieser "
+"Gegenstände hinzufügen."
 
 #: src/gui/unregisterdialog.cpp:54
 #, c-format
@@ -3647,7 +3254,7 @@ msgstr ""
 msgid "Road Point"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:85 src/gui/whoisonline.cpp:479
+#: src/gui/whoisonline.cpp:85 src/gui/whoisonline.cpp:494
 msgid "Who Is Online - Updating"
 msgstr ""
 
@@ -3655,15 +3262,15 @@ msgstr ""
 msgid "Update"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:302
+#: src/gui/whoisonline.cpp:307
 msgid "Who Is Online - "
 msgstr ""
 
-#: src/gui/whoisonline.cpp:493
+#: src/gui/whoisonline.cpp:508
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:525
+#: src/gui/whoisonline.cpp:540
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -3843,8 +3450,7 @@ msgid "Command: /unignore <player>"
 msgstr "Befehl: /unignore <Spieler>"
 
 #: src/gui/widgets/whispertab.cpp:131
-msgid ""
-"This command stops ignoring the other player if they are being ignored."
+msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
 #: src/gui/windowmenu.cpp:65
@@ -4372,68 +3978,333 @@ msgid ""
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:389
+#: src/localplayer.cpp:384
 msgid "You were killed by "
 msgstr ""
 
-#: src/localplayer.cpp:1442
+#: src/localplayer.cpp:1434
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1436
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1446
+#: src/localplayer.cpp:1438
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1448
+#: src/localplayer.cpp:1440
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1450
+#: src/localplayer.cpp:1442
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1453
+#: src/localplayer.cpp:1445
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1456
+#: src/localplayer.cpp:1448
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1480
+#: src/localplayer.cpp:1472
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/localplayer.cpp:3206
+#: src/localplayer.cpp:1887
+msgid "(D) default moves"
+msgstr ""
+
+#: src/localplayer.cpp:1888
+msgid "(I) invert moves"
+msgstr ""
+
+#: src/localplayer.cpp:1889
+msgid "(c) moves with some crazy moves"
+msgstr ""
+
+#: src/localplayer.cpp:1890
+msgid "(C) moves with crazy moves"
+msgstr ""
+
+#: src/localplayer.cpp:1891
+msgid "(d) double normal + crazy"
+msgstr ""
+
+#: src/localplayer.cpp:1892
+msgid "(?) unknown move"
+msgstr ""
+
+#: src/localplayer.cpp:1914
+#, c-format
+msgid "(%d) crazy move number %d"
+msgstr ""
+
+#: src/localplayer.cpp:1919
+msgid "(a) custom crazy move"
+msgstr ""
+
+#: src/localplayer.cpp:1923
+msgid "(?) crazy move"
+msgstr ""
+
+#: src/localplayer.cpp:1937
+msgid "(0) default moves to target"
+msgstr ""
+
+#: src/localplayer.cpp:1938
+msgid "(1) moves to target in distance 1"
+msgstr ""
+
+#: src/localplayer.cpp:1939
+msgid "(2) moves to target in distance 2"
+msgstr ""
+
+#: src/localplayer.cpp:1940
+msgid "(3) moves to target in distance 3"
+msgstr ""
+
+#: src/localplayer.cpp:1941
+msgid "(5) moves to target in distance 5"
+msgstr ""
+
+#: src/localplayer.cpp:1942
+msgid "(7) moves to target in distance 7"
+msgstr ""
+
+#: src/localplayer.cpp:1943
+msgid "(A) moves to target in attack range"
+msgstr ""
+
+#: src/localplayer.cpp:1944
+msgid "(a) archer attack range"
+msgstr ""
+
+#: src/localplayer.cpp:1945
+msgid "(?) move to target"
+msgstr ""
+
+#: src/localplayer.cpp:1964
+msgid "(D) default follow"
+msgstr ""
+
+#: src/localplayer.cpp:1965
+msgid "(R) relative follow"
+msgstr ""
+
+#: src/localplayer.cpp:1966
+msgid "(M) mirror follow"
+msgstr ""
+
+#: src/localplayer.cpp:1967
+msgid "(P) pet follow"
+msgstr ""
+
+#: src/localplayer.cpp:1968
+msgid "(?) unknown follow"
+msgstr ""
+
+#: src/localplayer.cpp:1987 src/localplayer.cpp:1991 src/localplayer.cpp:2014
+msgid "(?) attack"
+msgstr ""
+
+#: src/localplayer.cpp:1988 src/localplayer.cpp:2010
+msgid "(D) default attack"
+msgstr ""
+
+#: src/localplayer.cpp:1989
+msgid "(s) switch attack without shield"
+msgstr ""
+
+#: src/localplayer.cpp:1990
+msgid "(S) switch attack with shield"
+msgstr ""
+
+#: src/localplayer.cpp:2011
+msgid "(G) go and attack"
+msgstr ""
+
+#: src/localplayer.cpp:2012
+msgid "(A) go, attack, pickup"
+msgstr ""
+
+#: src/localplayer.cpp:2013
+msgid "(d) without auto attack"
+msgstr ""
+
+#: src/localplayer.cpp:2047
+msgid "(S) small pick up 1x1 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2048
+msgid "(D) default pick up 2x1 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2049
+msgid "(F) forward pick up 2x3 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2050
+msgid "(3) pick up 3x3 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2051
+msgid "(g) go and pick up in distance 4"
+msgstr ""
+
+#: src/localplayer.cpp:2052
+msgid "(G) go and pick up in distance 8"
+msgstr ""
+
+#: src/localplayer.cpp:2053
+msgid "(A) go and pick up in max distance"
+msgstr ""
+
+#: src/localplayer.cpp:2054
+msgid "(?) pick up"
+msgstr ""
+
+#: src/localplayer.cpp:2067
+msgid "(N) normal map view"
+msgstr ""
+
+#: src/localplayer.cpp:2068
+msgid "(D) debug map view"
+msgstr ""
+
+#: src/localplayer.cpp:2069
+msgid "(u) ultra map view"
+msgstr ""
+
+#: src/localplayer.cpp:2070
+msgid "(U) ultra map view 2"
+msgstr ""
+
+#: src/localplayer.cpp:2071
+msgid "(e) empty map view"
+msgstr ""
+
+#: src/localplayer.cpp:2072
+msgid "(b) black & white map view"
+msgstr ""
+
+#: src/localplayer.cpp:2091
+msgid "(f) use #flar for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2092
+msgid "(c) use #chiza for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2093
+msgid "(I) use #ingrav for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2094
+msgid "(F) use #frillyar for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2095
+msgid "(U) use #upmarmu for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2096
+msgid "(?) magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2115
+msgid "(a) attack all players"
+msgstr ""
+
+#: src/localplayer.cpp:2116
+msgid "(f) attack not friends"
+msgstr ""
+
+#: src/localplayer.cpp:2117
+msgid "(b) attack bad relations"
+msgstr ""
+
+#: src/localplayer.cpp:2118
+msgid "(d) dont attack players"
+msgstr ""
+
+#: src/localplayer.cpp:2119
+msgid "(?) pvp attack"
+msgstr ""
+
+#: src/localplayer.cpp:2138
+msgid "(D) default imitation"
+msgstr ""
+
+#: src/localplayer.cpp:2139
+msgid "(O) outfits imitation"
+msgstr ""
+
+#: src/localplayer.cpp:2140
+msgid "(?) imitation"
+msgstr ""
+
+#: src/localplayer.cpp:2168
 msgid "Away"
 msgstr "Abwesend"
 
-#: src/localplayer.cpp:3541
+#: src/localplayer.cpp:2187
+msgid "(O) on keyboard"
+msgstr ""
+
+#: src/localplayer.cpp:2188
+msgid "(A) away"
+msgstr ""
+
+#: src/localplayer.cpp:2189 src/localplayer.cpp:2204
+msgid "(?) away"
+msgstr ""
+
+#: src/localplayer.cpp:2202
+msgid "(G) game camera mode"
+msgstr ""
+
+#: src/localplayer.cpp:2203
+msgid "(F) free camera mode"
+msgstr ""
+
+#: src/localplayer.cpp:2228
+msgid "Game modifiers are enabled"
+msgstr ""
+
+#: src/localplayer.cpp:2229
+msgid "Game modifiers are disabled"
+msgstr ""
+
+#: src/localplayer.cpp:2230
+msgid "Game modifiers are unknown"
+msgstr ""
+
+#: src/localplayer.cpp:3746
 msgid "Follow: "
 msgstr "Folgen:"
 
-#: src/localplayer.cpp:3543 src/localplayer.cpp:3558
+#: src/localplayer.cpp:3748 src/localplayer.cpp:3763
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3550
+#: src/localplayer.cpp:3755
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3552 src/localplayer.cpp:3560
+#: src/localplayer.cpp:3757 src/localplayer.cpp:3765
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3908
+#: src/localplayer.cpp:4113
 msgid "You see "
 msgstr "Du siehst"
 
@@ -4541,71 +4412,71 @@ msgstr "Vielen Dank für den Einkauf."
 msgid "Unable to buy."
 msgstr "Kauf fehlgeschlagen."
 
-#: src/net/ea/charserverhandler.cpp:63
+#: src/net/ea/charserverhandler.cpp:66
 msgid "Strength:"
 msgstr "Stärke:"
 
-#: src/net/ea/charserverhandler.cpp:64
+#: src/net/ea/charserverhandler.cpp:67
 msgid "Agility:"
 msgstr "Beweglichkeit:"
 
-#: src/net/ea/charserverhandler.cpp:65
+#: src/net/ea/charserverhandler.cpp:68
 msgid "Vitality:"
 msgstr "Gesundheit:"
 
-#: src/net/ea/charserverhandler.cpp:66
+#: src/net/ea/charserverhandler.cpp:69
 msgid "Intelligence:"
 msgstr "Intelligenz:"
 
-#: src/net/ea/charserverhandler.cpp:67
+#: src/net/ea/charserverhandler.cpp:70
 msgid "Dexterity:"
 msgstr "Geschicklichkeit:"
 
-#: src/net/ea/charserverhandler.cpp:68
+#: src/net/ea/charserverhandler.cpp:71
 msgid "Luck:"
 msgstr "Glück:"
 
-#: src/net/ea/charserverhandler.cpp:102
+#: src/net/ea/charserverhandler.cpp:115
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:106
+#: src/net/ea/charserverhandler.cpp:119
 msgid "Cannot use this ID."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:109
+#: src/net/ea/charserverhandler.cpp:122
 msgid "Unknown char-server failure."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:138
+#: src/net/ea/charserverhandler.cpp:151
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:235
+#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:235
 msgid "Wrong name."
 msgstr "Falscher Name."
 
-#: src/net/ea/charserverhandler.cpp:145
+#: src/net/ea/charserverhandler.cpp:158
 msgid "Incorrect stats."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:148
+#: src/net/ea/charserverhandler.cpp:161
 msgid "Incorrect hair."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:151
+#: src/net/ea/charserverhandler.cpp:164
 msgid "Incorrect slot."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:166 src/net/manaserv/charhandler.cpp:210
+#: src/net/ea/charserverhandler.cpp:179 src/net/manaserv/charhandler.cpp:210
 msgid "Info"
 msgstr "Info"
 
-#: src/net/ea/charserverhandler.cpp:166
+#: src/net/ea/charserverhandler.cpp:179
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:172
+#: src/net/ea/charserverhandler.cpp:185
 msgid "Failed to delete character."
 msgstr ""
 
@@ -4830,15 +4701,15 @@ msgstr ""
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:284
+#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:285
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:294
+#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:295
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:304
+#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:305
 msgid "Item sharing not possible."
 msgstr ""
 
@@ -4846,15 +4717,15 @@ msgstr ""
 msgid "Item sharing unknown."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:246
+#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:247
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:256
+#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:257
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:266
+#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:267
 msgid "Experience sharing not possible."
 msgstr ""
 
@@ -4971,16 +4842,16 @@ msgstr ""
 msgid "QQQ Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:357
+#: src/net/ea/partyhandler.cpp:358
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:370
+#: src/net/ea/partyhandler.cpp:371
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:447
+#: src/net/ea/partyhandler.cpp:448
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
@@ -5023,8 +4894,8 @@ msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
-"Dein Plan, die Waffe deines Feindes mit Deinem Hals zu zerstören, war leider"
-" nicht ganz so genial, wie Du dachtest..."
+"Dein Plan, die Waffe deines Feindes mit Deinem Hals zu zerstören, war leider "
+"nicht ganz so genial, wie Du dachtest..."
 
 #: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:325
 msgid "I guess this did not run too well."
@@ -5114,8 +4985,7 @@ msgstr "Nachricht"
 
 #: src/net/ea/playerhandler.cpp:336
 msgid ""
-"You are carrying more than half your weight. You are unable to regain "
-"health."
+"You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 
 #: src/net/ea/playerhandler.cpp:346
@@ -5710,19 +5580,19 @@ msgstr "Verbindung mit Server abgebrochen. "
 msgid "%s is not in your party!"
 msgstr "%s ist nicht in Deiner Party!"
 
-#: src/playerrelations.cpp:460
+#: src/playerrelations.cpp:461
 msgid "Print '...'"
 msgstr "Drucke '..'"
 
-#: src/playerrelations.cpp:480
+#: src/playerrelations.cpp:481
 msgid "Blink name"
 msgstr "Blinkender Name"
 
-#: src/playerrelations.cpp:524
+#: src/playerrelations.cpp:525
 msgid "Floating '...' bubble"
 msgstr "Schwebende '...' Blase"
 
-#: src/playerrelations.cpp:527
+#: src/playerrelations.cpp:528
 msgid "Floating bubble"
 msgstr "Schwebende Blase"
 
@@ -5754,5 +5624,3 @@ msgstr "MP %+d"
 #: src/resources/itemdb.cpp:169
 msgid "Unknown item"
 msgstr "Unbekannter Gegenstand"
-
-
diff --git a/po/es.po b/po/es.po
index 528ba58fe..a29cd35e8 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Andrei Karas <akaras@inbox.ru>, 2011.
 # Jumpy <antoinebcn@hotmail.com>, 2011.
@@ -12,132 +12,133 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-11-12 00:23+0300\n"
-"PO-Revision-Date: 2011-11-11 21:38+0000\n"
-"Last-Translator: akaras <akaras@inbox.ru>\n"
-"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/manaplus/team/es/)\n"
+"POT-Creation-Date: 2011-11-26 02:20+0300\n"
+"PO-Revision-Date: 2011-11-20 19:51+0000\n"
+"Last-Translator: nelson6e65 <nelson6e65-manaplus@yahoo.es>\n"
+"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/"
+"manaplus/team/es/)\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: src/actorspritemanager.cpp:1171
 msgid "Visible on map"
 msgstr "Visible sobre el mapa"
 
-#: src/being.cpp:551
+#: src/being.cpp:553
 msgid "dodge"
 msgstr "evade"
 
-#: src/being.cpp:551
+#: src/being.cpp:553
 msgid "miss"
 msgstr "falla"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1530
+#: src/being.cpp:1534
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1535
+#: src/being.cpp:1539
 msgid "I"
 msgstr "I"
 
-#: src/client.cpp:869 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:878 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Configuración"
 
-#: src/client.cpp:876 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:885 src/gui/setup_perfomance.cpp:48
 msgid "Perfomance"
 msgstr "Rendimiento"
 
-#: src/client.cpp:881 src/gui/setup_video.cpp:315
+#: src/client.cpp:890 src/gui/setup_video.cpp:315
 msgid "Video"
 msgstr "Vídeo"
 
-#: src/client.cpp:886
+#: src/client.cpp:895
 msgid "Themes"
 msgstr "Temas"
 
-#: src/client.cpp:968
+#: src/client.cpp:977
 msgid "Connecting to server"
 msgstr "Conectando al servidor"
 
-#: src/client.cpp:999
+#: src/client.cpp:1008
 msgid "Logging in"
 msgstr "Accediendo a la cuenta"
 
-#: src/client.cpp:1032
+#: src/client.cpp:1041
 msgid "Entering game world"
 msgstr "Entrando al mundo del juego"
 
-#: src/client.cpp:1132
+#: src/client.cpp:1142
 msgid "Requesting characters"
 msgstr "Cargando personajes"
 
-#: src/client.cpp:1163
+#: src/client.cpp:1173
 msgid "Connecting to the game server"
 msgstr "Conectando al servidor del juego"
 
-#: src/client.cpp:1173
+#: src/client.cpp:1183
 msgid "Changing game servers"
 msgstr "Cambiando servidores del juego"
 
-#: src/client.cpp:1216 src/client.cpp:1223 src/client.cpp:1357
+#: src/client.cpp:1226 src/client.cpp:1233 src/client.cpp:1367
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
-#: src/gui/charcreatedialog.cpp:221 src/gui/charselectdialog.cpp:253
+#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:254
 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
-#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
-#: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
+#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:167
+#: src/net/ea/charserverhandler.cpp:185 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "Error"
 
-#: src/client.cpp:1232
+#: src/client.cpp:1242
 msgid "Requesting registration details"
 msgstr "Solicitando detalles de registro"
 
-#: src/client.cpp:1258
+#: src/client.cpp:1268
 msgid "Password Change"
 msgstr "Cambio de contraseña"
 
-#: src/client.cpp:1259
+#: src/client.cpp:1269
 msgid "Password changed successfully!"
 msgstr "¡Contraseña cambiada exitosamente!"
 
-#: src/client.cpp:1278
+#: src/client.cpp:1288
 msgid "Email Change"
 msgstr "Cambio de Email"
 
-#: src/client.cpp:1279
+#: src/client.cpp:1289
 msgid "Email changed successfully!"
 msgstr "¡Email modificado exitosamente!"
 
-#: src/client.cpp:1299
+#: src/client.cpp:1309
 msgid "Unregister Successful"
 msgstr "Registro cancelado"
 
-#: src/client.cpp:1300
+#: src/client.cpp:1310
 msgid "Farewell, come back any time..."
 msgstr "Adiós, vuelve cuando quieras..."
 
-#: src/client.cpp:1499 src/client.cpp:1529 src/client.cpp:1544
-#: src/client.cpp:1969 src/client.cpp:1976
+#: src/client.cpp:1509 src/client.cpp:1539 src/client.cpp:1554
+#: src/client.cpp:1979 src/client.cpp:1986
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "¡%s no existe y no puede ser creado! Saliendo."
 
-#: src/client.cpp:1675
+#: src/client.cpp:1685
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Servidor de actualización inválido: %s"
 
-#: src/client.cpp:1709 src/client.cpp:1715
+#: src/client.cpp:1719 src/client.cpp:1725
 msgid "Error creating updates directory!"
 msgstr "¡Error al crear la carpeta de actualizaciones!"
 
-#: src/client.cpp:1736
+#: src/client.cpp:1746
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Error: ¡%s no existe y no puede ser creado! Saliendo."
@@ -153,8 +154,8 @@ msgstr "¡No puedes enviar susurros vacíos!"
 #: src/commandhandler.cpp:343
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
-" you."
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
+"you."
 msgstr ""
 "¡No se puede crear una pestaña de susurro para el nick \"%s\"! O bien ya "
 "existe, o eres tú."
@@ -316,10 +317,11 @@ msgstr "Imágenes de recurso:"
 msgid "Resource orphaned images:"
 msgstr "Imágenes de recurso huérfano:"
 
-#: src/commandhandler.h:40
+#: src/commandhandler.h:34
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr "Opciones para /%s son \"yes\" | \"no\", \"true\" | \"false\", \"1\" | \"0\"."
+msgstr ""
+"Opciones para /%s son \"yes\" | \"no\", \"true\" | \"false\", \"1\" | \"0\"."
 
 #: src/game.cpp:252 src/gui/widgets/chattab.cpp:403
 msgid "General"
@@ -345,19 +347,19 @@ msgstr "Se ha perdido la conexión con el servidor."
 msgid "Network Error"
 msgstr "Error de Red"
 
-#: src/game.cpp:1332
+#: src/game.cpp:1258
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorando las peticiones de intercambio"
 
-#: src/game.cpp:1342
+#: src/game.cpp:1268
 msgid "Accepting incoming trade requests"
 msgstr "Aceptando las peticiones de intercambio"
 
-#: src/game.cpp:1750
+#: src/game.cpp:1773
 msgid "Could Not Load Map"
 msgstr "No se pudo cargar el mapa"
 
-#: src/game.cpp:1751
+#: src/game.cpp:1774
 #, c-format
 msgid "Error while loading %s"
 msgstr "Error mientras cargaba %s"
@@ -435,7 +437,7 @@ msgstr "Cantidad:"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:207
 #: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:998
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:755
 msgid "+"
 msgstr "+"
 
@@ -443,7 +445,7 @@ msgstr "+"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:206
 #: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:1010
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:767
 msgid "-"
 msgstr "-"
 
@@ -456,7 +458,7 @@ msgstr "Salir"
 
 #: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
 #: src/gui/statuswindow.cpp:505 src/gui/statuswindow.cpp:555
-#: src/gui/statuswindow.cpp:997 src/gui/statuswindow.cpp:1028
+#: src/gui/statuswindow.cpp:754 src/gui/statuswindow.cpp:785
 msgid "Max"
 msgstr "Máximo"
 
@@ -473,7 +475,7 @@ msgid "Sell"
 msgstr "Vender"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
-#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:96
+#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:105
 #: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
 #: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:344
 #: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:500
@@ -550,68 +552,68 @@ msgstr "La nueva contraseña debe tener como máximo %d caracteres."
 msgid "The new password entries mismatch."
 msgstr "Las nuevas contraseñas no concuerdan."
 
-#: src/gui/charcreatedialog.cpp:58
+#: src/gui/charcreatedialog.cpp:59
 msgid "Create Character"
 msgstr "Crear Personaje"
 
-#: src/gui/charcreatedialog.cpp:76 src/gui/logindialog.cpp:94
+#: src/gui/charcreatedialog.cpp:85 src/gui/logindialog.cpp:94
 #: src/gui/register.cpp:75
 msgid "Name:"
 msgstr "Nombre:"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:79 src/gui/charcreatedialog.cpp:84
-#: src/gui/charcreatedialog.cpp:90 src/gui/outfitwindow.cpp:85
+#: src/gui/charcreatedialog.cpp:88 src/gui/charcreatedialog.cpp:93
+#: src/gui/charcreatedialog.cpp:99 src/gui/outfitwindow.cpp:85
 msgid ">"
 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:82 src/gui/charcreatedialog.cpp:85
-#: src/gui/charcreatedialog.cpp:91 src/gui/outfitwindow.cpp:84
+#: src/gui/charcreatedialog.cpp:91 src/gui/charcreatedialog.cpp:94
+#: src/gui/charcreatedialog.cpp:100 src/gui/outfitwindow.cpp:84
 msgid "<"
 msgstr "<"
 
-#: src/gui/charcreatedialog.cpp:83
+#: src/gui/charcreatedialog.cpp:92
 msgid "Hair color:"
 msgstr "Color:"
 
-#: src/gui/charcreatedialog.cpp:86
+#: src/gui/charcreatedialog.cpp:95
 msgid "Hair style:"
 msgstr "Peinado:"
 
-#: src/gui/charcreatedialog.cpp:92
+#: src/gui/charcreatedialog.cpp:101
 msgid "Race:"
 msgstr "Race:"
 
-#: src/gui/charcreatedialog.cpp:95 src/gui/charselectdialog.cpp:480
+#: src/gui/charcreatedialog.cpp:104 src/gui/charselectdialog.cpp:481
 #: src/gui/socialwindow.cpp:1139
 msgid "Create"
 msgstr "Crear"
 
-#: src/gui/charcreatedialog.cpp:97 src/gui/register.cpp:98
+#: src/gui/charcreatedialog.cpp:106 src/gui/register.cpp:98
 msgid "Male"
 msgstr "Hombre"
 
-#: src/gui/charcreatedialog.cpp:98 src/gui/register.cpp:99
+#: src/gui/charcreatedialog.cpp:107 src/gui/register.cpp:99
 msgid "Female"
 msgstr "Mujer"
 
-#: src/gui/charcreatedialog.cpp:116 src/gui/charcreatedialog.cpp:303
+#: src/gui/charcreatedialog.cpp:125 src/gui/charcreatedialog.cpp:312
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Por favor distribuya %d puntos"
 
-#: src/gui/charcreatedialog.cpp:222
+#: src/gui/charcreatedialog.cpp:231
 msgid "Your name needs to be at least 4 characters."
 msgstr "Su nombre debe de tener como mínimo 4 caracteres."
 
-#: src/gui/charcreatedialog.cpp:294
+#: src/gui/charcreatedialog.cpp:303
 msgid "Character stats OK"
 msgstr "Atributos del personaje OK"
 
-#: src/gui/charcreatedialog.cpp:308
+#: src/gui/charcreatedialog.cpp:317
 #, c-format
 msgid "Please remove %d points"
 msgstr "Por favor borre %d puntos"
@@ -641,34 +643,34 @@ msgstr "Cancelar Registro"
 msgid "Change Email"
 msgstr "Cambiar e-mail"
 
-#: src/gui/charselectdialog.cpp:253
+#: src/gui/charselectdialog.cpp:254
 msgid "Incorrect password"
 msgstr "Contraseña incorrecta"
 
-#: src/gui/charselectdialog.cpp:286
+#: src/gui/charselectdialog.cpp:287
 msgid "Enter password for deleting character"
 msgstr "Ingrese la contraseña para borrar el personaje"
 
-#: src/gui/charselectdialog.cpp:286
+#: src/gui/charselectdialog.cpp:287
 msgid "Enter password:"
 msgstr "Ingrese contraseña:"
 
-#: src/gui/charselectdialog.cpp:410 src/gui/serverdialog.cpp:298
+#: src/gui/charselectdialog.cpp:411 src/gui/serverdialog.cpp:298
 #: src/gui/setup_relations.cpp:244 src/gui/shopwindow.cpp:122
 #: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244
 msgid "Delete"
 msgstr "Borrar"
 
-#: src/gui/charselectdialog.cpp:468
+#: src/gui/charselectdialog.cpp:469
 msgid "Choose"
 msgstr "Seleccionar"
 
-#: src/gui/charselectdialog.cpp:471
+#: src/gui/charselectdialog.cpp:472
 #, c-format
 msgid "Level %d"
 msgstr "Nivel: %d"
 
-#: src/gui/charselectdialog.cpp:482 src/gui/charselectdialog.cpp:483
+#: src/gui/charselectdialog.cpp:483 src/gui/charselectdialog.cpp:484
 msgid "(empty)"
 msgstr "(vacío)"
 
@@ -933,11 +935,11 @@ msgstr "Abrir automáticamente esta ventana"
 msgid "OK"
 msgstr "OK"
 
-#: src/gui/equipmentwindow.cpp:61 src/gui/windowmenu.cpp:74
+#: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74
 msgid "Equipment"
 msgstr "Equipamiento"
 
-#: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160
+#: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160
 #: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554
 #: src/gui/popupmenu.cpp:1737 src/gui/popupmenu.cpp:1829
 #: src/gui/popupmenu.cpp:1874
@@ -1374,7 +1376,7 @@ msgstr "Des-ignorar"
 #: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:190
 #: src/gui/popupmenu.cpp:415 src/gui/popupmenu.cpp:435
 #: src/gui/popupmenu.cpp:672 src/gui/popupmenu.cpp:692
-#: src/playerrelations.cpp:446
+#: src/playerrelations.cpp:447
 msgid "Completely ignore"
 msgstr "Ignorar completamente"
 
@@ -1968,15 +1970,15 @@ msgstr "Calibrar"
 
 #: src/gui/setup_joystick.cpp:72
 msgid "Enable joystick"
-msgstr "Habilitar joystick"
+msgstr "Habilitar la palanca de mando"
 
 #: src/gui/setup_joystick.cpp:75
 msgid "Use joystick if client window inactive"
-msgstr ""
+msgstr "Usar la palanca de mando si la ventana del cliente está inactiva"
 
 #: src/gui/setup_joystick.cpp:78
 msgid "Joystick"
-msgstr "Joystick"
+msgstr "Palanca de Mando"
 
 #: src/gui/setup_joystick.cpp:147
 msgid "Stop"
@@ -1984,7 +1986,7 @@ msgstr "Parar"
 
 #: src/gui/setup_joystick.cpp:149
 msgid "Rotate the stick and dont press buttons"
-msgstr ""
+msgstr "Girar la palanca y no presionar los botones"
 
 #: src/gui/setup_keyboard.cpp:80
 msgid "Keyboard"
@@ -2160,7 +2162,7 @@ msgstr "Habilitar soporte de bot clan y deshabilitar soporte de clan nativo"
 
 #: src/gui/setup_other.cpp:168
 msgid "Enable server side attack"
-msgstr "Habilitar los ataques colaterales de servidor"
+msgstr "Habilitar el ataque del lado del servidor"
 
 #: src/gui/setup_other.cpp:171
 msgid "Enable bot checker"
@@ -2884,270 +2886,6 @@ msgstr "Escoja el nombre del grupo."
 msgid "Specials"
 msgstr "Especiales"
 
-#: src/gui/statuspopup.cpp:204
-msgid "(D) default moves"
-msgstr "(D) moverse predeterminado"
-
-#: src/gui/statuspopup.cpp:209
-msgid "(I) invert moves"
-msgstr "(I) moverse invertido"
-
-#: src/gui/statuspopup.cpp:214
-msgid "(c) moves with some crazy moves"
-msgstr "(c) moverse con algunos movimientos locos"
-
-#: src/gui/statuspopup.cpp:219
-msgid "(C) moves with crazy moves"
-msgstr "(C) moverse con movimientos locos"
-
-#: src/gui/statuspopup.cpp:224
-msgid "(d) double normal + crazy"
-msgstr "(d) doble normal + loco"
-
-#: src/gui/statuspopup.cpp:229
-msgid "(?) move"
-msgstr "(?) maniobra"
-
-#: src/gui/statuspopup.cpp:247
-msgid "(a) custom crazy move"
-msgstr "(a) maniobra alocada personalizada"
-
-#: src/gui/statuspopup.cpp:251
-msgid "(?) crazy move"
-msgstr "(?) maniobra loca"
-
-#: src/gui/statuspopup.cpp:261
-msgid "(0) default moves to target"
-msgstr "(0) moverse por defecto hacia el objetivo"
-
-#: src/gui/statuspopup.cpp:266
-msgid "(1) moves to target in distance 1"
-msgstr "(1) moverse al objetivo en distancia 1"
-
-#: src/gui/statuspopup.cpp:271
-msgid "(2) moves to target in distance 2"
-msgstr "(2) moverse al objetivo en distancia 2"
-
-#: src/gui/statuspopup.cpp:276
-msgid "(3) moves to target in distance 3"
-msgstr "(3) moverse al objetivo en distancia 3"
-
-#: src/gui/statuspopup.cpp:281
-msgid "(5) moves to target in distance 5"
-msgstr "(5) moverse al objetivo en distancia 5"
-
-#: src/gui/statuspopup.cpp:286
-msgid "(7) moves to target in distance 7"
-msgstr "(7) moverse al objetivo en distancia 7"
-
-#: src/gui/statuspopup.cpp:291
-msgid "(A) moves to target in attack range"
-msgstr "(A) desplazarse al objetivo en el rango de ataque"
-
-#: src/gui/statuspopup.cpp:296
-msgid "(a) archer attack range"
-msgstr "(a) rango de ataque de arquero"
-
-#: src/gui/statuspopup.cpp:301
-msgid "(?) move to target"
-msgstr "(?) mover al objetivo"
-
-#: src/gui/statuspopup.cpp:309
-msgid "(D) default follow"
-msgstr "(D) seguimiento predeterminado"
-
-#: src/gui/statuspopup.cpp:313
-msgid "(R) relative follow"
-msgstr "(R) seguimiento relativo"
-
-#: src/gui/statuspopup.cpp:317
-msgid "(M) mirror follow"
-msgstr "(M) seguimiento tipo espejo"
-
-#: src/gui/statuspopup.cpp:321
-msgid "(P) pet follow"
-msgstr "(P) seguimiento como mascota"
-
-#: src/gui/statuspopup.cpp:325
-msgid "(?) unknown follow"
-msgstr "(?) seguimiento desconoicido"
-
-#: src/gui/statuspopup.cpp:334 src/gui/statuspopup.cpp:357
-msgid "(D) default attack"
-msgstr "(D) ataque predeterminado"
-
-#: src/gui/statuspopup.cpp:339
-msgid "(s) switch attack without shield"
-msgstr "(s) intercambiar ataque sin escudo"
-
-#: src/gui/statuspopup.cpp:344
-msgid "(S) switch attack with shield"
-msgstr "(S)  intercambiar ataque con escudo"
-
-#: src/gui/statuspopup.cpp:348 src/gui/statuspopup.cpp:373
-msgid "(?) attack"
-msgstr "(?) atacar"
-
-#: src/gui/statuspopup.cpp:361
-msgid "(G) go and attack"
-msgstr "(G) ir y atacar"
-
-#: src/gui/statuspopup.cpp:365
-msgid "(A) go, attack, pickup"
-msgstr "(A) ir, atacar, recoger"
-
-#: src/gui/statuspopup.cpp:369
-msgid "(d) without auto attack"
-msgstr "(d) sin atacar automáticamente"
-
-#: src/gui/statuspopup.cpp:387
-msgid "(S) small pick up 1x1 cells"
-msgstr "(S) recoger a 1x1 celdas (pequeño)"
-
-#: src/gui/statuspopup.cpp:391
-msgid "(D) default pick up 2x1 cells"
-msgstr "(D) recoger a 2x1 celdas (predeterminado)"
-
-#: src/gui/statuspopup.cpp:395
-msgid "(F) forward pick up 2x3 cells"
-msgstr "(F) recoger interesadamente a 2x3 celda"
-
-#: src/gui/statuspopup.cpp:399
-msgid "(3) pick up 3x3 cells"
-msgstr "(3) recoger a 3x3 celdas"
-
-#: src/gui/statuspopup.cpp:403
-msgid "(g) go and pick up in distance 4"
-msgstr "(g) ir y recoger en distancia 4"
-
-#: src/gui/statuspopup.cpp:407
-msgid "(G) go and pick up in distance 8"
-msgstr "(G) ir y recoger en distancia 8"
-
-#: src/gui/statuspopup.cpp:411
-msgid "(A) go and pick up in max distance"
-msgstr "(A) ir y recoger a máxima distancia"
-
-#: src/gui/statuspopup.cpp:415
-msgid "(?) pick up"
-msgstr "(?) recoger"
-
-#: src/gui/statuspopup.cpp:424
-msgid "(N) normal map view"
-msgstr "(N) vista normal del mapa"
-
-#: src/gui/statuspopup.cpp:428
-msgid "(D) debug map view"
-msgstr "(D) vista depurar del mapa"
-
-#: src/gui/statuspopup.cpp:432
-msgid "(u) ultra map view"
-msgstr "(u) ultra vista del mapa"
-
-#: src/gui/statuspopup.cpp:436
-msgid "(U) ultra map view 2"
-msgstr "(U) ultra vista del mapa 2"
-
-#: src/gui/statuspopup.cpp:440
-msgid "(e) empty map view"
-msgstr "(e) vista vacía del mapa"
-
-#: src/gui/statuspopup.cpp:444
-msgid "(b) black & white map view"
-msgstr "(b) vista del mapa en blanco y negro"
-
-#: src/gui/statuspopup.cpp:448
-msgid "(?) map view"
-msgstr "(?) vista del mapa"
-
-#: src/gui/statuspopup.cpp:456
-msgid "(f) use #flar for magic attack"
-msgstr "(f) usar #flar para ataque mágico"
-
-#: src/gui/statuspopup.cpp:461
-msgid "(c) use #chiza for magic attack"
-msgstr "(c) usar #chiza para ataque mágico"
-
-#: src/gui/statuspopup.cpp:466
-msgid "(I) use #ingrav for magic attack"
-msgstr "(I) usar #ingrav para ataque mágico"
-
-#: src/gui/statuspopup.cpp:471
-msgid "(F) use #frillyar for magic attack"
-msgstr "(F) usar #frillyar para ataque mágico"
-
-#: src/gui/statuspopup.cpp:476
-msgid "(U) use #upmarmu for magic attack"
-msgstr "(U) usar #upmarmu para ataque mágico"
-
-#: src/gui/statuspopup.cpp:480
-msgid "(?) magic attack"
-msgstr "(?) ataque mágico"
-
-#: src/gui/statuspopup.cpp:489
-msgid "(a) attack all players"
-msgstr "(a) atacar a todos los jugadores"
-
-#: src/gui/statuspopup.cpp:493
-msgid "(f) attack not friends"
-msgstr "(f) atacar a los que no son amigos"
-
-#: src/gui/statuspopup.cpp:497
-msgid "(b) attack bad relations"
-msgstr "(b) atacar a quienes están en malas relaciones"
-
-#: src/gui/statuspopup.cpp:501
-msgid "(d) dont attack players"
-msgstr "(d) no atacar a los jugadores"
-
-#: src/gui/statuspopup.cpp:505
-msgid "(?) pvp attack"
-msgstr "(?) ataque pvp"
-
-#: src/gui/statuspopup.cpp:514
-msgid "(D) default imitation"
-msgstr "(D) imitación predeterminada"
-
-#: src/gui/statuspopup.cpp:518
-msgid "(O) outfits imitation"
-msgstr "(O) imitación de conjuntos"
-
-#: src/gui/statuspopup.cpp:522
-msgid "(?) imitation"
-msgstr "(?) imitación"
-
-#: src/gui/statuspopup.cpp:531
-msgid "(O) on keyboard"
-msgstr "(O) en el teclado"
-
-#: src/gui/statuspopup.cpp:534
-msgid "(A) away"
-msgstr "(A) lejos del teclado"
-
-#: src/gui/statuspopup.cpp:537 src/gui/statuspopup.cpp:557
-msgid "(?) away"
-msgstr "(?) afuera"
-
-#: src/gui/statuspopup.cpp:545
-msgid "(G) game camera mode"
-msgstr "(G) modo de cámara de juego"
-
-#: src/gui/statuspopup.cpp:549
-msgid "(F) free camera mode"
-msgstr "(F) modo de cámara libre"
-
-#: src/gui/statuspopup.cpp:553
-msgid "(D) design camera mode"
-msgstr "(D) Definir el modo operativo de la cámara"
-
-#: src/gui/statuspopup.cpp:564
-msgid "Game modifiers are disabled"
-msgstr "Modificadores del juego están deshabilitados"
-
-#: src/gui/statuspopup.cpp:569
-msgid "Game modifiers are enabled"
-msgstr "Modificadores del juego están habilitados"
-
 #: src/gui/statuswindow.cpp:144 src/gui/statuswindow.cpp:274
 #: src/gui/statuswindow.cpp:337
 #, c-format
@@ -3196,136 +2934,6 @@ msgstr "Nivel: %d (GM %d)"
 msgid "Correction points: %d"
 msgstr "Puntos de corrección: %d"
 
-#: src/gui/statuswindow.cpp:649 src/gui/statuswindow.cpp:717
-#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:753
-#: src/gui/statuswindow.cpp:818 src/gui/statuswindow.cpp:847
-#: src/gui/statuswindow.cpp:870 src/gui/statuswindow.cpp:889
-msgid "(D)"
-msgstr "(D)"
-
-#: src/gui/statuswindow.cpp:652 src/gui/statuswindow.cpp:778
-msgid "(I)"
-msgstr "(I)"
-
-#: src/gui/statuswindow.cpp:655 src/gui/statuswindow.cpp:775
-msgid "(c)"
-msgstr "(c)"
-
-#: src/gui/statuswindow.cpp:658
-msgid "(C)"
-msgstr "(C)"
-
-#: src/gui/statuswindow.cpp:661 src/gui/statuswindow.cpp:762
-#: src/gui/statuswindow.cpp:803
-msgid "(d)"
-msgstr "(d)"
-
-#: src/gui/statuswindow.cpp:664 src/gui/statuswindow.cpp:678
-#: src/gui/statuswindow.cpp:710 src/gui/statuswindow.cpp:729
-#: src/gui/statuswindow.cpp:746 src/gui/statuswindow.cpp:765
-#: src/gui/statuswindow.cpp:787 src/gui/statuswindow.cpp:806
-#: src/gui/statuswindow.cpp:836 src/gui/statuswindow.cpp:862
-#: src/gui/statuswindow.cpp:876 src/gui/statuswindow.cpp:892
-#: src/gui/statuswindow.cpp:905
-msgid "(?)"
-msgstr "(?)"
-
-#: src/gui/statuswindow.cpp:675 src/gui/statuswindow.cpp:707
-#: src/gui/statuswindow.cpp:794
-msgid "(a)"
-msgstr "(a)"
-
-#: src/gui/statuswindow.cpp:686
-msgid "(0)"
-msgstr "(0)"
-
-#: src/gui/statuswindow.cpp:689
-msgid "(1)"
-msgstr "(1)"
-
-#: src/gui/statuswindow.cpp:692
-msgid "(2)"
-msgstr "(2)"
-
-#: src/gui/statuswindow.cpp:695 src/gui/statuswindow.cpp:824
-msgid "(3)"
-msgstr "(3)"
-
-#: src/gui/statuswindow.cpp:698
-msgid "(5)"
-msgstr "(5)"
-
-#: src/gui/statuswindow.cpp:701
-msgid "(7)"
-msgstr "(7)"
-
-#: src/gui/statuswindow.cpp:704 src/gui/statuswindow.cpp:759
-#: src/gui/statuswindow.cpp:833 src/gui/statuswindow.cpp:902
-msgid "(A)"
-msgstr "(A)"
-
-#: src/gui/statuswindow.cpp:720
-msgid "(R)"
-msgstr "(R)"
-
-#: src/gui/statuswindow.cpp:723
-msgid "(M)"
-msgstr "(M)"
-
-#: src/gui/statuswindow.cpp:726
-msgid "(P)"
-msgstr "(P)"
-
-#: src/gui/statuswindow.cpp:740
-msgid "(s)"
-msgstr "(s)"
-
-#: src/gui/statuswindow.cpp:743 src/gui/statuswindow.cpp:815
-msgid "(S)"
-msgstr "(S)"
-
-#: src/gui/statuswindow.cpp:756 src/gui/statuswindow.cpp:830
-#: src/gui/statuswindow.cpp:883
-msgid "(G)"
-msgstr "(G)"
-
-#: src/gui/statuswindow.cpp:772 src/gui/statuswindow.cpp:797
-msgid "(f)"
-msgstr "(f)"
-
-#: src/gui/statuswindow.cpp:781 src/gui/statuswindow.cpp:821
-#: src/gui/statuswindow.cpp:886
-msgid "(F)"
-msgstr "(F)"
-
-#: src/gui/statuswindow.cpp:784 src/gui/statuswindow.cpp:853
-msgid "(U)"
-msgstr "(U)"
-
-#: src/gui/statuswindow.cpp:800 src/gui/statuswindow.cpp:859
-msgid "(b)"
-msgstr "(b)"
-
-#: src/gui/statuswindow.cpp:827
-msgid "(g)"
-msgstr "(g)"
-
-#: src/gui/statuswindow.cpp:844
-msgid "(N)"
-msgstr "(N)"
-
-#: src/gui/statuswindow.cpp:850
-msgid "(u)"
-msgstr "(u)"
-
-#: src/gui/statuswindow.cpp:856
-msgid "(e)"
-msgstr "(e)"
-
-#: src/gui/statuswindow.cpp:873 src/gui/statuswindow.cpp:899
-msgid "(O)"
-msgstr "(O)"
-
 #: src/gui/textcommandeditor.cpp:113
 msgid "No Target"
 msgstr "Ningún objetivo"
@@ -3452,8 +3060,7 @@ msgid "You don't have enough money."
 msgstr "No tienes dinero suficiente."
 
 #: src/gui/tradewindow.cpp:454
-msgid ""
-"Failed adding item. You can not overlap one kind of item on the window."
+msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Fallo al añadir objeto. No puedes añadir más de un mismo tipo de objeto en "
 "la ventana."
@@ -3641,7 +3248,7 @@ msgstr "Limites de Lugar de Inicio"
 msgid "Road Point"
 msgstr "Mostrar camino"
 
-#: src/gui/whoisonline.cpp:85 src/gui/whoisonline.cpp:479
+#: src/gui/whoisonline.cpp:85 src/gui/whoisonline.cpp:494
 msgid "Who Is Online - Updating"
 msgstr "Quién está conectado - Actualizando"
 
@@ -3649,15 +3256,15 @@ msgstr "Quién está conectado - Actualizando"
 msgid "Update"
 msgstr "Actualizar"
 
-#: src/gui/whoisonline.cpp:302
+#: src/gui/whoisonline.cpp:307
 msgid "Who Is Online - "
 msgstr "Quienes están conectados - "
 
-#: src/gui/whoisonline.cpp:493
+#: src/gui/whoisonline.cpp:508
 msgid "Who Is Online - error"
 msgstr "Quienes están conectados - error"
 
-#: src/gui/whoisonline.cpp:525
+#: src/gui/whoisonline.cpp:540
 msgid "Who Is Online - Update"
 msgstr "Quienes están conectados - Actualizar"
 
@@ -3837,8 +3444,7 @@ msgid "Command: /unignore <player>"
 msgstr "Comando: /unignore <jugador>"
 
 #: src/gui/widgets/whispertab.cpp:131
-msgid ""
-"This command stops ignoring the other player if they are being ignored."
+msgid "This command stops ignoring the other player if they are being ignored."
 msgstr "Este comando para de ignorar al jugador si está siendo ignorado."
 
 #: src/gui/windowmenu.cpp:65
@@ -4368,68 +3974,333 @@ msgstr ""
 "Conflito con las teclas \"%s\" e \"%s\" . Resuelva el conflicto, o el juego "
 "puede presentar un comportamiento raro."
 
-#: src/localplayer.cpp:389
+#: src/localplayer.cpp:384
 msgid "You were killed by "
 msgstr "Fuiste eliminado por "
 
-#: src/localplayer.cpp:1442
+#: src/localplayer.cpp:1434
 msgid "Tried to pick up nonexistent item."
 msgstr "Intentaste recoger un objeto inexistante."
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1436
 msgid "Item is too heavy."
 msgstr "El artículo es muy pesado."
 
-#: src/localplayer.cpp:1446
+#: src/localplayer.cpp:1438
 msgid "Item is too far away."
 msgstr "El artículo está muy lejos."
 
-#: src/localplayer.cpp:1448
+#: src/localplayer.cpp:1440
 msgid "Inventory is full."
 msgstr "El inventario está lleno."
 
-#: src/localplayer.cpp:1450
+#: src/localplayer.cpp:1442
 msgid "Stack is too big."
 msgstr "El agrupamiento es demasiado grande."
 
-#: src/localplayer.cpp:1453
+#: src/localplayer.cpp:1445
 msgid "Item belongs to someone else."
 msgstr "El artículo pertenece a alguien más."
 
-#: src/localplayer.cpp:1456
+#: src/localplayer.cpp:1448
 msgid "Unknown problem picking up item."
 msgstr "Problema desconocido al intentar recoger el artículo."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1480
+#: src/localplayer.cpp:1472
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "Usted cogió un/a %d [@@%d|%s@@]."
 msgstr[1] "Usted Cogió %d [@@%d|%s@@]."
 
-#: src/localplayer.cpp:3206
+#: src/localplayer.cpp:1887
+msgid "(D) default moves"
+msgstr "(D) moverse predeterminado"
+
+#: src/localplayer.cpp:1888
+msgid "(I) invert moves"
+msgstr "(I) moverse invertido"
+
+#: src/localplayer.cpp:1889
+msgid "(c) moves with some crazy moves"
+msgstr "(c) moverse con algunos movimientos locos"
+
+#: src/localplayer.cpp:1890
+msgid "(C) moves with crazy moves"
+msgstr "(C) moverse con movimientos locos"
+
+#: src/localplayer.cpp:1891
+msgid "(d) double normal + crazy"
+msgstr "(d) doble normal + loco"
+
+#: src/localplayer.cpp:1892
+msgid "(?) unknown move"
+msgstr "(?) movimiento desconocido"
+
+#: src/localplayer.cpp:1914
+#, c-format
+msgid "(%d) crazy move number %d"
+msgstr "(%d) movimiento loco número %d"
+
+#: src/localplayer.cpp:1919
+msgid "(a) custom crazy move"
+msgstr "(a) maniobra alocada personalizada"
+
+#: src/localplayer.cpp:1923
+msgid "(?) crazy move"
+msgstr "(?) maniobra loca"
+
+#: src/localplayer.cpp:1937
+msgid "(0) default moves to target"
+msgstr "(0) moverse por defecto hacia el objetivo"
+
+#: src/localplayer.cpp:1938
+msgid "(1) moves to target in distance 1"
+msgstr "(1) moverse al objetivo en distancia 1"
+
+#: src/localplayer.cpp:1939
+msgid "(2) moves to target in distance 2"
+msgstr "(2) moverse al objetivo en distancia 2"
+
+#: src/localplayer.cpp:1940
+msgid "(3) moves to target in distance 3"
+msgstr "(3) moverse al objetivo en distancia 3"
+
+#: src/localplayer.cpp:1941
+msgid "(5) moves to target in distance 5"
+msgstr "(5) moverse al objetivo en distancia 5"
+
+#: src/localplayer.cpp:1942
+msgid "(7) moves to target in distance 7"
+msgstr "(7) moverse al objetivo en distancia 7"
+
+#: src/localplayer.cpp:1943
+msgid "(A) moves to target in attack range"
+msgstr "(A) desplazarse al objetivo en el rango de ataque"
+
+#: src/localplayer.cpp:1944
+msgid "(a) archer attack range"
+msgstr "(a) rango de ataque de arquero"
+
+#: src/localplayer.cpp:1945
+msgid "(?) move to target"
+msgstr "(?) mover al objetivo"
+
+#: src/localplayer.cpp:1964
+msgid "(D) default follow"
+msgstr "(D) seguimiento predeterminado"
+
+#: src/localplayer.cpp:1965
+msgid "(R) relative follow"
+msgstr "(R) seguimiento relativo"
+
+#: src/localplayer.cpp:1966
+msgid "(M) mirror follow"
+msgstr "(M) seguimiento tipo espejo"
+
+#: src/localplayer.cpp:1967
+msgid "(P) pet follow"
+msgstr "(P) seguimiento como mascota"
+
+#: src/localplayer.cpp:1968
+msgid "(?) unknown follow"
+msgstr "(?) seguimiento desconoicido"
+
+#: src/localplayer.cpp:1987 src/localplayer.cpp:1991 src/localplayer.cpp:2014
+msgid "(?) attack"
+msgstr "(?) atacar"
+
+#: src/localplayer.cpp:1988 src/localplayer.cpp:2010
+msgid "(D) default attack"
+msgstr "(D) ataque predeterminado"
+
+#: src/localplayer.cpp:1989
+msgid "(s) switch attack without shield"
+msgstr "(s) intercambiar ataque sin escudo"
+
+#: src/localplayer.cpp:1990
+msgid "(S) switch attack with shield"
+msgstr "(S)  intercambiar ataque con escudo"
+
+#: src/localplayer.cpp:2011
+msgid "(G) go and attack"
+msgstr "(G) ir y atacar"
+
+#: src/localplayer.cpp:2012
+msgid "(A) go, attack, pickup"
+msgstr "(A) ir, atacar, recoger"
+
+#: src/localplayer.cpp:2013
+msgid "(d) without auto attack"
+msgstr "(d) sin atacar automáticamente"
+
+#: src/localplayer.cpp:2047
+msgid "(S) small pick up 1x1 cells"
+msgstr "(S) recoger a 1x1 celdas (pequeño)"
+
+#: src/localplayer.cpp:2048
+msgid "(D) default pick up 2x1 cells"
+msgstr "(D) recoger a 2x1 celdas (predeterminado)"
+
+#: src/localplayer.cpp:2049
+msgid "(F) forward pick up 2x3 cells"
+msgstr "(F) recoger interesadamente a 2x3 celda"
+
+#: src/localplayer.cpp:2050
+msgid "(3) pick up 3x3 cells"
+msgstr "(3) recoger a 3x3 celdas"
+
+#: src/localplayer.cpp:2051
+msgid "(g) go and pick up in distance 4"
+msgstr "(g) ir y recoger en distancia 4"
+
+#: src/localplayer.cpp:2052
+msgid "(G) go and pick up in distance 8"
+msgstr "(G) ir y recoger en distancia 8"
+
+#: src/localplayer.cpp:2053
+msgid "(A) go and pick up in max distance"
+msgstr "(A) ir y recoger a máxima distancia"
+
+#: src/localplayer.cpp:2054
+msgid "(?) pick up"
+msgstr "(?) recoger"
+
+#: src/localplayer.cpp:2067
+msgid "(N) normal map view"
+msgstr "(N) vista normal del mapa"
+
+#: src/localplayer.cpp:2068
+msgid "(D) debug map view"
+msgstr "(D) vista depurar del mapa"
+
+#: src/localplayer.cpp:2069
+msgid "(u) ultra map view"
+msgstr "(u) ultra vista del mapa"
+
+#: src/localplayer.cpp:2070
+msgid "(U) ultra map view 2"
+msgstr "(U) ultra vista del mapa 2"
+
+#: src/localplayer.cpp:2071
+msgid "(e) empty map view"
+msgstr "(e) vista vacía del mapa"
+
+#: src/localplayer.cpp:2072
+msgid "(b) black & white map view"
+msgstr "(b) vista del mapa en blanco y negro"
+
+#: src/localplayer.cpp:2091
+msgid "(f) use #flar for magic attack"
+msgstr "(f) usar #flar para ataque mágico"
+
+#: src/localplayer.cpp:2092
+msgid "(c) use #chiza for magic attack"
+msgstr "(c) usar #chiza para ataque mágico"
+
+#: src/localplayer.cpp:2093
+msgid "(I) use #ingrav for magic attack"
+msgstr "(I) usar #ingrav para ataque mágico"
+
+#: src/localplayer.cpp:2094
+msgid "(F) use #frillyar for magic attack"
+msgstr "(F) usar #frillyar para ataque mágico"
+
+#: src/localplayer.cpp:2095
+msgid "(U) use #upmarmu for magic attack"
+msgstr "(U) usar #upmarmu para ataque mágico"
+
+#: src/localplayer.cpp:2096
+msgid "(?) magic attack"
+msgstr "(?) ataque mágico"
+
+#: src/localplayer.cpp:2115
+msgid "(a) attack all players"
+msgstr "(a) atacar a todos los jugadores"
+
+#: src/localplayer.cpp:2116
+msgid "(f) attack not friends"
+msgstr "(f) atacar a los que no son amigos"
+
+#: src/localplayer.cpp:2117
+msgid "(b) attack bad relations"
+msgstr "(b) atacar a quienes están en malas relaciones"
+
+#: src/localplayer.cpp:2118
+msgid "(d) dont attack players"
+msgstr "(d) no atacar a los jugadores"
+
+#: src/localplayer.cpp:2119
+msgid "(?) pvp attack"
+msgstr "(?) ataque pvp"
+
+#: src/localplayer.cpp:2138
+msgid "(D) default imitation"
+msgstr "(D) imitación predeterminada"
+
+#: src/localplayer.cpp:2139
+msgid "(O) outfits imitation"
+msgstr "(O) imitación de conjuntos"
+
+#: src/localplayer.cpp:2140
+msgid "(?) imitation"
+msgstr "(?) imitación"
+
+#: src/localplayer.cpp:2168
 msgid "Away"
 msgstr "Fuera del Teclado"
 
-#: src/localplayer.cpp:3541
+#: src/localplayer.cpp:2187
+msgid "(O) on keyboard"
+msgstr "(O) en el teclado"
+
+#: src/localplayer.cpp:2188
+msgid "(A) away"
+msgstr "(A) lejos del teclado"
+
+#: src/localplayer.cpp:2189 src/localplayer.cpp:2204
+msgid "(?) away"
+msgstr "(?) afuera"
+
+#: src/localplayer.cpp:2202
+msgid "(G) game camera mode"
+msgstr "(G) modo de cámara de juego"
+
+#: src/localplayer.cpp:2203
+msgid "(F) free camera mode"
+msgstr "(F) modo de cámara libre"
+
+#: src/localplayer.cpp:2228
+msgid "Game modifiers are enabled"
+msgstr "Modificadores del juego están habilitados"
+
+#: src/localplayer.cpp:2229
+msgid "Game modifiers are disabled"
+msgstr "Modificadores del juego están deshabilitados"
+
+#: src/localplayer.cpp:2230
+msgid "Game modifiers are unknown"
+msgstr "Los modificadores del juego son desconocidos"
+
+#: src/localplayer.cpp:3746
 msgid "Follow: "
 msgstr "Seguir: "
 
-#: src/localplayer.cpp:3543 src/localplayer.cpp:3558
+#: src/localplayer.cpp:3748 src/localplayer.cpp:3763
 msgid "Follow canceled"
 msgstr "Seguir cancelado"
 
-#: src/localplayer.cpp:3550
+#: src/localplayer.cpp:3755
 msgid "Imitation: "
 msgstr "Imitacion: "
 
-#: src/localplayer.cpp:3552 src/localplayer.cpp:3560
+#: src/localplayer.cpp:3757 src/localplayer.cpp:3765
 msgid "Imitation canceled"
 msgstr "Imitación cancelada"
 
-#: src/localplayer.cpp:3908
+#: src/localplayer.cpp:4113
 msgid "You see "
 msgstr "Ves "
 
@@ -4537,71 +4408,71 @@ msgstr "Gracias por comprar."
 msgid "Unable to buy."
 msgstr "Incapaz de comprar."
 
-#: src/net/ea/charserverhandler.cpp:63
+#: src/net/ea/charserverhandler.cpp:66
 msgid "Strength:"
 msgstr "Fuerza:"
 
-#: src/net/ea/charserverhandler.cpp:64
+#: src/net/ea/charserverhandler.cpp:67
 msgid "Agility:"
 msgstr "Agilidad:"
 
-#: src/net/ea/charserverhandler.cpp:65
+#: src/net/ea/charserverhandler.cpp:68
 msgid "Vitality:"
 msgstr "Vitalidad:"
 
-#: src/net/ea/charserverhandler.cpp:66
+#: src/net/ea/charserverhandler.cpp:69
 msgid "Intelligence:"
 msgstr "Inteligencia:"
 
-#: src/net/ea/charserverhandler.cpp:67
+#: src/net/ea/charserverhandler.cpp:70
 msgid "Dexterity:"
 msgstr "Destreza:"
 
-#: src/net/ea/charserverhandler.cpp:68
+#: src/net/ea/charserverhandler.cpp:71
 msgid "Luck:"
 msgstr "Suerte:"
 
-#: src/net/ea/charserverhandler.cpp:102
+#: src/net/ea/charserverhandler.cpp:115
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr "Acesso denegado.Probablemente es que alla muchos jugadores."
 
-#: src/net/ea/charserverhandler.cpp:106
+#: src/net/ea/charserverhandler.cpp:119
 msgid "Cannot use this ID."
 msgstr "Imposible usar esta ID."
 
-#: src/net/ea/charserverhandler.cpp:109
+#: src/net/ea/charserverhandler.cpp:122
 msgid "Unknown char-server failure."
 msgstr "Error desconocido del char-server."
 
-#: src/net/ea/charserverhandler.cpp:138
+#: src/net/ea/charserverhandler.cpp:151
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr "Error al crear personaje. Probablemente ya esté en uso."
 
-#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:235
+#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:235
 msgid "Wrong name."
 msgstr "Nombre equivocado."
 
-#: src/net/ea/charserverhandler.cpp:145
+#: src/net/ea/charserverhandler.cpp:158
 msgid "Incorrect stats."
 msgstr "Estadísticas incorrectas."
 
-#: src/net/ea/charserverhandler.cpp:148
+#: src/net/ea/charserverhandler.cpp:161
 msgid "Incorrect hair."
 msgstr "Cabello incorecto."
 
-#: src/net/ea/charserverhandler.cpp:151
+#: src/net/ea/charserverhandler.cpp:164
 msgid "Incorrect slot."
 msgstr "Ranura incorrecta."
 
-#: src/net/ea/charserverhandler.cpp:166 src/net/manaserv/charhandler.cpp:210
+#: src/net/ea/charserverhandler.cpp:179 src/net/manaserv/charhandler.cpp:210
 msgid "Info"
 msgstr "Información"
 
-#: src/net/ea/charserverhandler.cpp:166
+#: src/net/ea/charserverhandler.cpp:179
 msgid "Character deleted."
 msgstr "Personaje borrado."
 
-#: src/net/ea/charserverhandler.cpp:172
+#: src/net/ea/charserverhandler.cpp:185
 msgid "Failed to delete character."
 msgstr "Fallo al borrar el personaje."
 
@@ -4823,8 +4694,8 @@ msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 msgstr ""
-"<política> puede ser \"1\", \"yes\" y \"true\" para compartir experiencia, o"
-" \"0\", \"no\" y \"false\" para no compartir."
+"<política> puede ser \"1\", \"yes\" y \"true\" para compartir experiencia, o "
+"\"0\", \"no\" y \"false\" para no compartir."
 
 #: src/net/ea/gui/partytab.cpp:113
 msgid "Command: /exp"
@@ -4836,15 +4707,15 @@ msgstr ""
 "Este comando muestra la política actual de compartición experiencia del "
 "grupo."
 
-#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:284
+#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:285
 msgid "Item sharing enabled."
 msgstr "Compartir objetos habilitado."
 
-#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:294
+#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:295
 msgid "Item sharing disabled."
 msgstr "Compartir objetos desabilitado."
 
-#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:304
+#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:305
 msgid "Item sharing not possible."
 msgstr "No es posible el compartir objetos."
 
@@ -4852,15 +4723,15 @@ msgstr "No es posible el compartir objetos."
 msgid "Item sharing unknown."
 msgstr "Compartir objetos desconocido."
 
-#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:246
+#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:247
 msgid "Experience sharing enabled."
 msgstr "Compartir experiencia activado."
 
-#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:256
+#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:257
 msgid "Experience sharing disabled."
 msgstr "Compartir experiencia desactivado ."
 
-#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:266
+#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:267
 msgid "Experience sharing not possible."
 msgstr "Imposible compartir experiencia."
 
@@ -4915,8 +4786,8 @@ msgstr "Rechazado del servidor."
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
-"Has sido baneado permanentemente del juego. Por favor contacta con el equipo"
-" GM."
+"Has sido baneado permanentemente del juego. Por favor contacta con el equipo "
+"GM."
 
 #: src/net/ea/loginhandler.cpp:219
 msgid "Client too old."
@@ -4981,16 +4852,16 @@ msgstr "%s no puede unirse a tu grupo porque está completamente lleno."
 msgid "QQQ Unknown invite response for %s."
 msgstr "QQQ respuesta desconocida a la invitacion de %s."
 
-#: src/net/ea/partyhandler.cpp:357
+#: src/net/ea/partyhandler.cpp:358
 msgid "You have left the party."
 msgstr "Has dejado el grupo."
 
-#: src/net/ea/partyhandler.cpp:370
+#: src/net/ea/partyhandler.cpp:371
 #, c-format
 msgid "%s has left your party."
 msgstr "%s dejó tu grupo."
 
-#: src/net/ea/partyhandler.cpp:447
+#: src/net/ea/partyhandler.cpp:448
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr "Un miembro desconocido intentó decir: %s"
@@ -5123,8 +4994,7 @@ msgstr "Mensaje"
 
 #: src/net/ea/playerhandler.cpp:336
 msgid ""
-"You are carrying more than half your weight. You are unable to regain "
-"health."
+"You are carrying more than half your weight. You are unable to regain health."
 msgstr "Llevas más de la mitad del peso que puedes. No recuperarás PV o PM."
 
 #: src/net/ea/playerhandler.cpp:346
@@ -5722,19 +5592,19 @@ msgstr "Conexión al servidor terminada."
 msgid "%s is not in your party!"
 msgstr "%s no está en tu grupo!"
 
-#: src/playerrelations.cpp:460
+#: src/playerrelations.cpp:461
 msgid "Print '...'"
 msgstr "Imprimir '...'"
 
-#: src/playerrelations.cpp:480
+#: src/playerrelations.cpp:481
 msgid "Blink name"
 msgstr "Parpadear nombre"
 
-#: src/playerrelations.cpp:524
+#: src/playerrelations.cpp:525
 msgid "Floating '...' bubble"
 msgstr "Burbuja '...' flotante"
 
-#: src/playerrelations.cpp:527
+#: src/playerrelations.cpp:528
 msgid "Floating bubble"
 msgstr "Burbuja Flotante"
 
@@ -5766,5 +5636,3 @@ msgstr "PM %+d"
 #: src/resources/itemdb.cpp:169
 msgid "Unknown item"
 msgstr "Objeto desconocido"
-
-
diff --git a/po/fi.po b/po/fi.po
index 0b3eecbeb..d5c0b53c9 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Andrei Karas <akaras@inbox.ru>, 2011.
 # Sini Ruohomaa <sini.ruohomaa@iki.fi>, 2011.
@@ -9,132 +9,132 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-11-12 00:23+0300\n"
+"POT-Creation-Date: 2011-11-26 02:20+0300\n"
 "PO-Revision-Date: 2011-11-11 21:38+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: fi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: src/actorspritemanager.cpp:1171
 msgid "Visible on map"
 msgstr "Näkyvillä kartalla"
 
-#: src/being.cpp:551
+#: src/being.cpp:553
 msgid "dodge"
 msgstr "väistö"
 
-#: src/being.cpp:551
+#: src/being.cpp:553
 msgid "miss"
 msgstr "huti"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1530
+#: src/being.cpp:1534
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1535
+#: src/being.cpp:1539
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:869 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:878 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Asetukset"
 
-#: src/client.cpp:876 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:885 src/gui/setup_perfomance.cpp:48
 msgid "Perfomance"
 msgstr ""
 
-#: src/client.cpp:881 src/gui/setup_video.cpp:315
+#: src/client.cpp:890 src/gui/setup_video.cpp:315
 msgid "Video"
 msgstr "Kuva"
 
-#: src/client.cpp:886
+#: src/client.cpp:895
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:968
+#: src/client.cpp:977
 msgid "Connecting to server"
 msgstr "Yhdistän palvelimeen"
 
-#: src/client.cpp:999
+#: src/client.cpp:1008
 msgid "Logging in"
 msgstr "Kirjaudun sisään"
 
-#: src/client.cpp:1032
+#: src/client.cpp:1041
 msgid "Entering game world"
 msgstr "Siirryn pelimaailmaan"
 
-#: src/client.cpp:1132
+#: src/client.cpp:1142
 msgid "Requesting characters"
 msgstr "Pyydän hahmoja"
 
-#: src/client.cpp:1163
+#: src/client.cpp:1173
 msgid "Connecting to the game server"
 msgstr "Yhdistän pelipalvelimeen"
 
-#: src/client.cpp:1173
+#: src/client.cpp:1183
 msgid "Changing game servers"
 msgstr "Vaihdan pelipalvelinta"
 
-#: src/client.cpp:1216 src/client.cpp:1223 src/client.cpp:1357
+#: src/client.cpp:1226 src/client.cpp:1233 src/client.cpp:1367
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
-#: src/gui/charcreatedialog.cpp:221 src/gui/charselectdialog.cpp:253
+#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:254
 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
-#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
-#: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
+#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:167
+#: src/net/ea/charserverhandler.cpp:185 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "Virhe"
 
-#: src/client.cpp:1232
+#: src/client.cpp:1242
 msgid "Requesting registration details"
 msgstr "Pyydän rekisteröitymisen yksityiskohtia"
 
-#: src/client.cpp:1258
+#: src/client.cpp:1268
 msgid "Password Change"
 msgstr "Salasanan vaihto"
 
-#: src/client.cpp:1259
+#: src/client.cpp:1269
 msgid "Password changed successfully!"
 msgstr "Salasana vaihdettu onnistuneesti!"
 
-#: src/client.cpp:1278
+#: src/client.cpp:1288
 msgid "Email Change"
 msgstr "Sähköpostin vaihto"
 
-#: src/client.cpp:1279
+#: src/client.cpp:1289
 msgid "Email changed successfully!"
 msgstr "Sähköpostiosoite vaihdettu onnistuneesti!"
 
-#: src/client.cpp:1299
+#: src/client.cpp:1309
 msgid "Unregister Successful"
 msgstr "Tietojen poisto onnistui"
 
-#: src/client.cpp:1300
+#: src/client.cpp:1310
 msgid "Farewell, come back any time..."
 msgstr "Näkemisiin, tule pian takaisin..."
 
-#: src/client.cpp:1499 src/client.cpp:1529 src/client.cpp:1544
-#: src/client.cpp:1969 src/client.cpp:1976
+#: src/client.cpp:1509 src/client.cpp:1539 src/client.cpp:1554
+#: src/client.cpp:1979 src/client.cpp:1986
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s ei ole olemassa eikä sitä voi luoda! Poistun."
 
-#: src/client.cpp:1675
+#: src/client.cpp:1685
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Epäkelpo päivitysosoite: %s"
 
-#: src/client.cpp:1709 src/client.cpp:1715
+#: src/client.cpp:1719 src/client.cpp:1725
 msgid "Error creating updates directory!"
 msgstr "Päivityshakemistoa luodessa tapahtui virhe!"
 
-#: src/client.cpp:1736
+#: src/client.cpp:1746
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Virhe: %s ei ole olemassa eikä sitä voi luoda! Poistun."
@@ -150,11 +150,11 @@ msgstr "Et voi lähettää tyhjiä kuiskauksia!"
 #: src/commandhandler.cpp:343
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
-" you."
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
+"you."
 msgstr ""
-"Kuiskausvälilehden luonti nimelle \"%s\" epäonnistui! Se on joko jo auki tai"
-" käytit omaa nimeäsi."
+"Kuiskausvälilehden luonti nimelle \"%s\" epäonnistui! Se on joko jo auki tai "
+"käytit omaa nimeäsi."
 
 #: src/commandhandler.cpp:363
 #, c-format
@@ -313,12 +313,12 @@ msgstr "Resurssikuvat:"
 msgid "Resource orphaned images:"
 msgstr "Orvot resurssikuvat:"
 
-#: src/commandhandler.h:40
+#: src/commandhandler.h:34
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
-"Vaihtoehdot komennolle /%s ovat \"yes\" (kyllä), \"no\" (ei) tai vastaavasti"
-" \"true\", \"false\", \"1\" tai \"0\"."
+"Vaihtoehdot komennolle /%s ovat \"yes\" (kyllä), \"no\" (ei) tai vastaavasti "
+"\"true\", \"false\", \"1\" tai \"0\"."
 
 #: src/game.cpp:252 src/gui/widgets/chattab.cpp:403
 msgid "General"
@@ -344,19 +344,19 @@ msgstr "Yhteys palvelimeen katkesi."
 msgid "Network Error"
 msgstr "Verkkovirhe"
 
-#: src/game.cpp:1332
+#: src/game.cpp:1258
 msgid "Ignoring incoming trade requests"
 msgstr "Et huomioi kaupankäyntipyyntöjä"
 
-#: src/game.cpp:1342
+#: src/game.cpp:1268
 msgid "Accepting incoming trade requests"
 msgstr "Hyväksyt kaupankäyntipyynnöt"
 
-#: src/game.cpp:1750
+#: src/game.cpp:1773
 msgid "Could Not Load Map"
 msgstr "Kartan lataaminen epäonnistui"
 
-#: src/game.cpp:1751
+#: src/game.cpp:1774
 #, c-format
 msgid "Error while loading %s"
 msgstr "Kohdetta %s ladattaessa tapahtui virhe."
@@ -434,7 +434,7 @@ msgstr ""
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:207
 #: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:998
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:755
 msgid "+"
 msgstr "+"
 
@@ -442,7 +442,7 @@ msgstr "+"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:206
 #: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:1010
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:767
 msgid "-"
 msgstr "-"
 
@@ -455,7 +455,7 @@ msgstr "Sulje"
 
 #: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
 #: src/gui/statuswindow.cpp:505 src/gui/statuswindow.cpp:555
-#: src/gui/statuswindow.cpp:997 src/gui/statuswindow.cpp:1028
+#: src/gui/statuswindow.cpp:754 src/gui/statuswindow.cpp:785
 msgid "Max"
 msgstr "Max"
 
@@ -472,7 +472,7 @@ msgid "Sell"
 msgstr "Myy"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
-#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:96
+#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:105
 #: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
 #: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:344
 #: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:500
@@ -549,68 +549,68 @@ msgstr "Uuden salasanan enimmäispituus on %d merkkiä."
 msgid "The new password entries mismatch."
 msgstr "Uuden salasanan kopiot eivät täsmää."
 
-#: src/gui/charcreatedialog.cpp:58
+#: src/gui/charcreatedialog.cpp:59
 msgid "Create Character"
 msgstr "Luo hahmo"
 
-#: src/gui/charcreatedialog.cpp:76 src/gui/logindialog.cpp:94
+#: src/gui/charcreatedialog.cpp:85 src/gui/logindialog.cpp:94
 #: src/gui/register.cpp:75
 msgid "Name:"
 msgstr "Nimi:"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:79 src/gui/charcreatedialog.cpp:84
-#: src/gui/charcreatedialog.cpp:90 src/gui/outfitwindow.cpp:85
+#: src/gui/charcreatedialog.cpp:88 src/gui/charcreatedialog.cpp:93
+#: src/gui/charcreatedialog.cpp:99 src/gui/outfitwindow.cpp:85
 msgid ">"
 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:82 src/gui/charcreatedialog.cpp:85
-#: src/gui/charcreatedialog.cpp:91 src/gui/outfitwindow.cpp:84
+#: src/gui/charcreatedialog.cpp:91 src/gui/charcreatedialog.cpp:94
+#: src/gui/charcreatedialog.cpp:100 src/gui/outfitwindow.cpp:84
 msgid "<"
 msgstr "<"
 
-#: src/gui/charcreatedialog.cpp:83
+#: src/gui/charcreatedialog.cpp:92
 msgid "Hair color:"
 msgstr "Hiusten väri:"
 
-#: src/gui/charcreatedialog.cpp:86
+#: src/gui/charcreatedialog.cpp:95
 msgid "Hair style:"
 msgstr "Hiustyyli:"
 
-#: src/gui/charcreatedialog.cpp:92
+#: src/gui/charcreatedialog.cpp:101
 msgid "Race:"
 msgstr "Rotu: "
 
-#: src/gui/charcreatedialog.cpp:95 src/gui/charselectdialog.cpp:480
+#: src/gui/charcreatedialog.cpp:104 src/gui/charselectdialog.cpp:481
 #: src/gui/socialwindow.cpp:1139
 msgid "Create"
 msgstr "Luo"
 
-#: src/gui/charcreatedialog.cpp:97 src/gui/register.cpp:98
+#: src/gui/charcreatedialog.cpp:106 src/gui/register.cpp:98
 msgid "Male"
 msgstr "Miespuolinen"
 
-#: src/gui/charcreatedialog.cpp:98 src/gui/register.cpp:99
+#: src/gui/charcreatedialog.cpp:107 src/gui/register.cpp:99
 msgid "Female"
 msgstr "Naispuolinen"
 
-#: src/gui/charcreatedialog.cpp:116 src/gui/charcreatedialog.cpp:303
+#: src/gui/charcreatedialog.cpp:125 src/gui/charcreatedialog.cpp:312
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Jaa %d pistettä"
 
-#: src/gui/charcreatedialog.cpp:222
+#: src/gui/charcreatedialog.cpp:231
 msgid "Your name needs to be at least 4 characters."
 msgstr "Nimessäsi täytyy olla ainakin 4 merkkiä."
 
-#: src/gui/charcreatedialog.cpp:294
+#: src/gui/charcreatedialog.cpp:303
 msgid "Character stats OK"
 msgstr "Hahmon pistejako OK"
 
-#: src/gui/charcreatedialog.cpp:308
+#: src/gui/charcreatedialog.cpp:317
 #, c-format
 msgid "Please remove %d points"
 msgstr "%d pistettä liikaa, ole hyvä ja poista ylimäärä"
@@ -640,34 +640,34 @@ msgstr "Poista palvelimelta"
 msgid "Change Email"
 msgstr "Vaihda sähköpostiosoite"
 
-#: src/gui/charselectdialog.cpp:253
+#: src/gui/charselectdialog.cpp:254
 msgid "Incorrect password"
 msgstr "Väärä salasana"
 
-#: src/gui/charselectdialog.cpp:286
+#: src/gui/charselectdialog.cpp:287
 msgid "Enter password for deleting character"
 msgstr "Anna salasana hahmon poistamiseksi"
 
-#: src/gui/charselectdialog.cpp:286
+#: src/gui/charselectdialog.cpp:287
 msgid "Enter password:"
 msgstr "Salasana:"
 
-#: src/gui/charselectdialog.cpp:410 src/gui/serverdialog.cpp:298
+#: src/gui/charselectdialog.cpp:411 src/gui/serverdialog.cpp:298
 #: src/gui/setup_relations.cpp:244 src/gui/shopwindow.cpp:122
 #: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244
 msgid "Delete"
 msgstr "Poista"
 
-#: src/gui/charselectdialog.cpp:468
+#: src/gui/charselectdialog.cpp:469
 msgid "Choose"
 msgstr "Valitse"
 
-#: src/gui/charselectdialog.cpp:471
+#: src/gui/charselectdialog.cpp:472
 #, c-format
 msgid "Level %d"
 msgstr "Taso %d"
 
-#: src/gui/charselectdialog.cpp:482 src/gui/charselectdialog.cpp:483
+#: src/gui/charselectdialog.cpp:483 src/gui/charselectdialog.cpp:484
 msgid "(empty)"
 msgstr "(tyhjä)"
 
@@ -932,11 +932,11 @@ msgstr ""
 msgid "OK"
 msgstr "Ok"
 
-#: src/gui/equipmentwindow.cpp:61 src/gui/windowmenu.cpp:74
+#: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74
 msgid "Equipment"
 msgstr "Varusteet"
 
-#: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160
+#: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160
 #: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554
 #: src/gui/popupmenu.cpp:1737 src/gui/popupmenu.cpp:1829
 #: src/gui/popupmenu.cpp:1874
@@ -1373,7 +1373,7 @@ msgstr "Huomioi jälleen"
 #: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:190
 #: src/gui/popupmenu.cpp:415 src/gui/popupmenu.cpp:435
 #: src/gui/popupmenu.cpp:672 src/gui/popupmenu.cpp:692
-#: src/playerrelations.cpp:446
+#: src/playerrelations.cpp:447
 msgid "Completely ignore"
 msgstr "Jätä täysin huomiotta"
 
@@ -1791,8 +1791,8 @@ msgstr "Huomaa"
 #: src/gui/setup_audio.cpp:120
 msgid "You may have to restart your client if you want to download new music"
 msgstr ""
-"Voit joutua uudelleenkäynnistämään asiakasohjelmasi, jos haluat ladata uudet"
-" musiikit"
+"Voit joutua uudelleenkäynnistämään asiakasohjelmasi, jos haluat ladata uudet "
+"musiikit"
 
 #: src/gui/setup_audio.cpp:133
 msgid "Sound Engine"
@@ -2566,8 +2566,7 @@ msgstr "-"
 #: src/gui/setup_video.cpp:484
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
-msgstr ""
-"Ikkunoituun tilaan vaihto epäonnistui, samoin paluu edelliseen tilaan!"
+msgstr "Ikkunoituun tilaan vaihto epäonnistui, samoin paluu edelliseen tilaan!"
 
 #: src/gui/setup_video.cpp:490
 msgid ""
@@ -2882,270 +2881,6 @@ msgstr "Anna ryhmällesi nimi."
 msgid "Specials"
 msgstr "Erikoisuudet"
 
-#: src/gui/statuspopup.cpp:204
-msgid "(D) default moves"
-msgstr "(D) oletusliikkeet"
-
-#: src/gui/statuspopup.cpp:209
-msgid "(I) invert moves"
-msgstr "(I) käännetyt liikkeet"
-
-#: src/gui/statuspopup.cpp:214
-msgid "(c) moves with some crazy moves"
-msgstr "(c) liikkuu osin villiliikkein"
-
-#: src/gui/statuspopup.cpp:219
-msgid "(C) moves with crazy moves"
-msgstr "(C) liikkuu villiliikkein"
-
-#: src/gui/statuspopup.cpp:224
-msgid "(d) double normal + crazy"
-msgstr "(d) tuplaa tavallinen + villi"
-
-#: src/gui/statuspopup.cpp:229
-msgid "(?) move"
-msgstr "(?) liiku"
-
-#: src/gui/statuspopup.cpp:247
-msgid "(a) custom crazy move"
-msgstr "(a) oma villiliike"
-
-#: src/gui/statuspopup.cpp:251
-msgid "(?) crazy move"
-msgstr "(?) villiliike"
-
-#: src/gui/statuspopup.cpp:261
-msgid "(0) default moves to target"
-msgstr "(0) oletussiirtymä kohteen luo"
-
-#: src/gui/statuspopup.cpp:266
-msgid "(1) moves to target in distance 1"
-msgstr "(1) siirry kohteen luo etäisyydellä 1"
-
-#: src/gui/statuspopup.cpp:271
-msgid "(2) moves to target in distance 2"
-msgstr "(2) siirry kohteen luo etäisyydellä 2"
-
-#: src/gui/statuspopup.cpp:276
-msgid "(3) moves to target in distance 3"
-msgstr "(3) siirry kohteen luo etäisyydellä 3"
-
-#: src/gui/statuspopup.cpp:281
-msgid "(5) moves to target in distance 5"
-msgstr "(5) siirry kohteen luo etäisyydellä 5"
-
-#: src/gui/statuspopup.cpp:286
-msgid "(7) moves to target in distance 7"
-msgstr "(7) siirry kohteen luo etäisyydellä 7"
-
-#: src/gui/statuspopup.cpp:291
-msgid "(A) moves to target in attack range"
-msgstr "(A) siirry kohteen luo hyökkäyskantamalla"
-
-#: src/gui/statuspopup.cpp:296
-msgid "(a) archer attack range"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:301
-msgid "(?) move to target"
-msgstr "(?) siirry kohteen luo"
-
-#: src/gui/statuspopup.cpp:309
-msgid "(D) default follow"
-msgstr "(D) oletusseuraaminen"
-
-#: src/gui/statuspopup.cpp:313
-msgid "(R) relative follow"
-msgstr "(R) suhteellinen seuraaminen"
-
-#: src/gui/statuspopup.cpp:317
-msgid "(M) mirror follow"
-msgstr "(M) peilikuvaseuraaminen"
-
-#: src/gui/statuspopup.cpp:321
-msgid "(P) pet follow"
-msgstr "(P) lemmikkiseuraaminen"
-
-#: src/gui/statuspopup.cpp:325
-msgid "(?) unknown follow"
-msgstr "(?) tuntematon seuraaminen"
-
-#: src/gui/statuspopup.cpp:334 src/gui/statuspopup.cpp:357
-msgid "(D) default attack"
-msgstr "(D) oletushyökkäys"
-
-#: src/gui/statuspopup.cpp:339
-msgid "(s) switch attack without shield"
-msgstr "(s) vaihda hyökkäystä, ei kilpeä"
-
-#: src/gui/statuspopup.cpp:344
-msgid "(S) switch attack with shield"
-msgstr "(S) vaihda hyökkäystä, kilpi mukana"
-
-#: src/gui/statuspopup.cpp:348 src/gui/statuspopup.cpp:373
-msgid "(?) attack"
-msgstr "(?) hyökkäys"
-
-#: src/gui/statuspopup.cpp:361
-msgid "(G) go and attack"
-msgstr "(G) mene ja hyökkää"
-
-#: src/gui/statuspopup.cpp:365
-msgid "(A) go, attack, pickup"
-msgstr "(A) mene, hyökkää, nosta"
-
-#: src/gui/statuspopup.cpp:369
-msgid "(d) without auto attack"
-msgstr "(d) ei automaattista hyökkäystä"
-
-#: src/gui/statuspopup.cpp:387
-msgid "(S) small pick up 1x1 cells"
-msgstr "(S) pieni nosto 1x1 ruutua"
-
-#: src/gui/statuspopup.cpp:391
-msgid "(D) default pick up 2x1 cells"
-msgstr "(D) oletusnosto 2x1 ruutua"
-
-#: src/gui/statuspopup.cpp:395
-msgid "(F) forward pick up 2x3 cells"
-msgstr "(F) nosto edestä 2x3 ruutua"
-
-#: src/gui/statuspopup.cpp:399
-msgid "(3) pick up 3x3 cells"
-msgstr "(3) nosto 3x3 ruutua"
-
-#: src/gui/statuspopup.cpp:403
-msgid "(g) go and pick up in distance 4"
-msgstr "(g) mene ja nosta etäisyydellä 4"
-
-#: src/gui/statuspopup.cpp:407
-msgid "(G) go and pick up in distance 8"
-msgstr "(G) mene ja nosta etäisyydellä 8"
-
-#: src/gui/statuspopup.cpp:411
-msgid "(A) go and pick up in max distance"
-msgstr "(A) mene ja nosta maksimietäisyydellä"
-
-#: src/gui/statuspopup.cpp:415
-msgid "(?) pick up"
-msgstr "(?) nosta"
-
-#: src/gui/statuspopup.cpp:424
-msgid "(N) normal map view"
-msgstr "(N) normaali karttanäkymä"
-
-#: src/gui/statuspopup.cpp:428
-msgid "(D) debug map view"
-msgstr "(D) debug-karttanäkymä"
-
-#: src/gui/statuspopup.cpp:432
-msgid "(u) ultra map view"
-msgstr "(u) ultra-karttanäkymä"
-
-#: src/gui/statuspopup.cpp:436
-msgid "(U) ultra map view 2"
-msgstr "(U) ultra-karttanäkymä 2"
-
-#: src/gui/statuspopup.cpp:440
-msgid "(e) empty map view"
-msgstr "(e) tyhjä karttanäkymä"
-
-#: src/gui/statuspopup.cpp:444
-msgid "(b) black & white map view"
-msgstr "(b) mustavalkoinen karttanäkymä"
-
-#: src/gui/statuspopup.cpp:448
-msgid "(?) map view"
-msgstr "(?) karttanäkymä"
-
-#: src/gui/statuspopup.cpp:456
-msgid "(f) use #flar for magic attack"
-msgstr "(f) #flar taikahyökkäyksenä"
-
-#: src/gui/statuspopup.cpp:461
-msgid "(c) use #chiza for magic attack"
-msgstr "(c) #chiza taikahyökkäyksenä"
-
-#: src/gui/statuspopup.cpp:466
-msgid "(I) use #ingrav for magic attack"
-msgstr "(I) #ingrav taikahyökkäyksenä"
-
-#: src/gui/statuspopup.cpp:471
-msgid "(F) use #frillyar for magic attack"
-msgstr "(F) #frillyar taikahyökkäyksenä"
-
-#: src/gui/statuspopup.cpp:476
-msgid "(U) use #upmarmu for magic attack"
-msgstr "(U) #upmarmu taikahyökkäyksenä"
-
-#: src/gui/statuspopup.cpp:480
-msgid "(?) magic attack"
-msgstr "(?) taikahyökkäys"
-
-#: src/gui/statuspopup.cpp:489
-msgid "(a) attack all players"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:493
-msgid "(f) attack not friends"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:497
-msgid "(b) attack bad relations"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:501
-msgid "(d) dont attack players"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:505
-msgid "(?) pvp attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:514
-msgid "(D) default imitation"
-msgstr "(D) oletusmatkinta"
-
-#: src/gui/statuspopup.cpp:518
-msgid "(O) outfits imitation"
-msgstr "(O) asun matkinta"
-
-#: src/gui/statuspopup.cpp:522
-msgid "(?) imitation"
-msgstr "(?) matkinta"
-
-#: src/gui/statuspopup.cpp:531
-msgid "(O) on keyboard"
-msgstr "(O) paikalla"
-
-#: src/gui/statuspopup.cpp:534
-msgid "(A) away"
-msgstr "(A) poissa"
-
-#: src/gui/statuspopup.cpp:537 src/gui/statuspopup.cpp:557
-msgid "(?) away"
-msgstr "(?) poissaolo"
-
-#: src/gui/statuspopup.cpp:545
-msgid "(G) game camera mode"
-msgstr "(G) pelin kameratila"
-
-#: src/gui/statuspopup.cpp:549
-msgid "(F) free camera mode"
-msgstr "(F) vapaa kamera"
-
-#: src/gui/statuspopup.cpp:553
-msgid "(D) design camera mode"
-msgstr "(D) suunnittelukamera"
-
-#: src/gui/statuspopup.cpp:564
-msgid "Game modifiers are disabled"
-msgstr "Pelimuokkaimet poissa käytöstä"
-
-#: src/gui/statuspopup.cpp:569
-msgid "Game modifiers are enabled"
-msgstr "Pelimuokkaimet käytössä"
-
 #: src/gui/statuswindow.cpp:144 src/gui/statuswindow.cpp:274
 #: src/gui/statuswindow.cpp:337
 #, c-format
@@ -3194,136 +2929,6 @@ msgstr "Taso: %d (GM %d)"
 msgid "Correction points: %d"
 msgstr "Korjauspisteitä: %d"
 
-#: src/gui/statuswindow.cpp:649 src/gui/statuswindow.cpp:717
-#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:753
-#: src/gui/statuswindow.cpp:818 src/gui/statuswindow.cpp:847
-#: src/gui/statuswindow.cpp:870 src/gui/statuswindow.cpp:889
-msgid "(D)"
-msgstr "(D)"
-
-#: src/gui/statuswindow.cpp:652 src/gui/statuswindow.cpp:778
-msgid "(I)"
-msgstr "(I)"
-
-#: src/gui/statuswindow.cpp:655 src/gui/statuswindow.cpp:775
-msgid "(c)"
-msgstr "(c)"
-
-#: src/gui/statuswindow.cpp:658
-msgid "(C)"
-msgstr "(C)"
-
-#: src/gui/statuswindow.cpp:661 src/gui/statuswindow.cpp:762
-#: src/gui/statuswindow.cpp:803
-msgid "(d)"
-msgstr "(d)"
-
-#: src/gui/statuswindow.cpp:664 src/gui/statuswindow.cpp:678
-#: src/gui/statuswindow.cpp:710 src/gui/statuswindow.cpp:729
-#: src/gui/statuswindow.cpp:746 src/gui/statuswindow.cpp:765
-#: src/gui/statuswindow.cpp:787 src/gui/statuswindow.cpp:806
-#: src/gui/statuswindow.cpp:836 src/gui/statuswindow.cpp:862
-#: src/gui/statuswindow.cpp:876 src/gui/statuswindow.cpp:892
-#: src/gui/statuswindow.cpp:905
-msgid "(?)"
-msgstr "(?)"
-
-#: src/gui/statuswindow.cpp:675 src/gui/statuswindow.cpp:707
-#: src/gui/statuswindow.cpp:794
-msgid "(a)"
-msgstr "(a)"
-
-#: src/gui/statuswindow.cpp:686
-msgid "(0)"
-msgstr "(0)"
-
-#: src/gui/statuswindow.cpp:689
-msgid "(1)"
-msgstr "(1)"
-
-#: src/gui/statuswindow.cpp:692
-msgid "(2)"
-msgstr "(2)"
-
-#: src/gui/statuswindow.cpp:695 src/gui/statuswindow.cpp:824
-msgid "(3)"
-msgstr "(3)"
-
-#: src/gui/statuswindow.cpp:698
-msgid "(5)"
-msgstr "(5)"
-
-#: src/gui/statuswindow.cpp:701
-msgid "(7)"
-msgstr "(7)"
-
-#: src/gui/statuswindow.cpp:704 src/gui/statuswindow.cpp:759
-#: src/gui/statuswindow.cpp:833 src/gui/statuswindow.cpp:902
-msgid "(A)"
-msgstr "(A)"
-
-#: src/gui/statuswindow.cpp:720
-msgid "(R)"
-msgstr "(R)"
-
-#: src/gui/statuswindow.cpp:723
-msgid "(M)"
-msgstr "(M)"
-
-#: src/gui/statuswindow.cpp:726
-msgid "(P)"
-msgstr "(P)"
-
-#: src/gui/statuswindow.cpp:740
-msgid "(s)"
-msgstr "(s)"
-
-#: src/gui/statuswindow.cpp:743 src/gui/statuswindow.cpp:815
-msgid "(S)"
-msgstr "(S)"
-
-#: src/gui/statuswindow.cpp:756 src/gui/statuswindow.cpp:830
-#: src/gui/statuswindow.cpp:883
-msgid "(G)"
-msgstr "(G)"
-
-#: src/gui/statuswindow.cpp:772 src/gui/statuswindow.cpp:797
-msgid "(f)"
-msgstr "(f)"
-
-#: src/gui/statuswindow.cpp:781 src/gui/statuswindow.cpp:821
-#: src/gui/statuswindow.cpp:886
-msgid "(F)"
-msgstr "(F)"
-
-#: src/gui/statuswindow.cpp:784 src/gui/statuswindow.cpp:853
-msgid "(U)"
-msgstr "(U)"
-
-#: src/gui/statuswindow.cpp:800 src/gui/statuswindow.cpp:859
-msgid "(b)"
-msgstr "(b)"
-
-#: src/gui/statuswindow.cpp:827
-msgid "(g)"
-msgstr "(g)"
-
-#: src/gui/statuswindow.cpp:844
-msgid "(N)"
-msgstr "(N)"
-
-#: src/gui/statuswindow.cpp:850
-msgid "(u)"
-msgstr "(u)"
-
-#: src/gui/statuswindow.cpp:856
-msgid "(e)"
-msgstr "(e)"
-
-#: src/gui/statuswindow.cpp:873 src/gui/statuswindow.cpp:899
-msgid "(O)"
-msgstr "(O)"
-
 #: src/gui/textcommandeditor.cpp:113
 msgid "No Target"
 msgstr "Ei kohdetta"
@@ -3450,8 +3055,7 @@ msgid "You don't have enough money."
 msgstr "Sinulla ei ole tarpeeksi rahaa."
 
 #: src/gui/tradewindow.cpp:454
-msgid ""
-"Failed adding item. You can not overlap one kind of item on the window."
+msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr "Tavaran lisääminen epäonnistui, limittämisongelma."
 
 #: src/gui/unregisterdialog.cpp:54
@@ -3637,7 +3241,7 @@ msgstr "Kotipaikan raja"
 msgid "Road Point"
 msgstr "Väyläpiste"
 
-#: src/gui/whoisonline.cpp:85 src/gui/whoisonline.cpp:479
+#: src/gui/whoisonline.cpp:85 src/gui/whoisonline.cpp:494
 msgid "Who Is Online - Updating"
 msgstr "Kuka on linjoila - päivitän"
 
@@ -3645,15 +3249,15 @@ msgstr "Kuka on linjoila - päivitän"
 msgid "Update"
 msgstr "Päivitä"
 
-#: src/gui/whoisonline.cpp:302
+#: src/gui/whoisonline.cpp:307
 msgid "Who Is Online - "
 msgstr "Kuka on linjoilla - "
 
-#: src/gui/whoisonline.cpp:493
+#: src/gui/whoisonline.cpp:508
 msgid "Who Is Online - error"
 msgstr "Kuka on linjoilla - virhe"
 
-#: src/gui/whoisonline.cpp:525
+#: src/gui/whoisonline.cpp:540
 msgid "Who Is Online - Update"
 msgstr "Kuka on linjoilla - päivitä"
 
@@ -3833,8 +3437,7 @@ msgid "Command: /unignore <player>"
 msgstr "Komento: /unignore <pelaajan nimi>"
 
 #: src/gui/widgets/whispertab.cpp:131
-msgid ""
-"This command stops ignoring the other player if they are being ignored."
+msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 "Tämä komento huomioi pelaajan taas, jos tämä on ensin jätetty huomiotta."
 
@@ -4365,68 +3968,335 @@ msgstr ""
 "Päällekkäiset näppäinoikotiet \"%s\" ja \"%s\" voivat aiheuttaa outouksia; "
 "ole hyvä ja poista päällekkäisyydet. "
 
-#: src/localplayer.cpp:389
+#: src/localplayer.cpp:384
 msgid "You were killed by "
 msgstr "Sinut otti hengiltä "
 
-#: src/localplayer.cpp:1442
+#: src/localplayer.cpp:1434
 msgid "Tried to pick up nonexistent item."
 msgstr "Yritit nostaa olemattoman tavaran."
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1436
 msgid "Item is too heavy."
 msgstr "Tavara on liian painava."
 
-#: src/localplayer.cpp:1446
+#: src/localplayer.cpp:1438
 msgid "Item is too far away."
 msgstr "Tavara on liian kaukana."
 
-#: src/localplayer.cpp:1448
+#: src/localplayer.cpp:1440
 msgid "Inventory is full."
 msgstr "Sinulla on liikaa tavaraa ennestään."
 
-#: src/localplayer.cpp:1450
+#: src/localplayer.cpp:1442
 msgid "Stack is too big."
 msgstr "Kasa on liian suuri."
 
-#: src/localplayer.cpp:1453
+#: src/localplayer.cpp:1445
 msgid "Item belongs to someone else."
 msgstr "Tavara kuuluu jollekulle muulle."
 
-#: src/localplayer.cpp:1456
+#: src/localplayer.cpp:1448
 msgid "Unknown problem picking up item."
 msgstr "Tuntematon ongelma esti tavaran nostamisen."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1480
+#: src/localplayer.cpp:1472
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "[@@%2$d|%3$s@@] (%1$d kpl) otettu."
 msgstr[1] "[@@%2$d|%3$s@@] (%1$d kpl) otettu."
 
-#: src/localplayer.cpp:3206
+#: src/localplayer.cpp:1887
+msgid "(D) default moves"
+msgstr "(D) oletusliikkeet"
+
+#: src/localplayer.cpp:1888
+msgid "(I) invert moves"
+msgstr "(I) käännetyt liikkeet"
+
+#: src/localplayer.cpp:1889
+msgid "(c) moves with some crazy moves"
+msgstr "(c) liikkuu osin villiliikkein"
+
+#: src/localplayer.cpp:1890
+msgid "(C) moves with crazy moves"
+msgstr "(C) liikkuu villiliikkein"
+
+#: src/localplayer.cpp:1891
+msgid "(d) double normal + crazy"
+msgstr "(d) tuplaa tavallinen + villi"
+
+#: src/localplayer.cpp:1892
+#, fuzzy
+msgid "(?) unknown move"
+msgstr "(?) tuntematon seuraaminen"
+
+#: src/localplayer.cpp:1914
+#, fuzzy, c-format
+msgid "(%d) crazy move number %d"
+msgstr "(?) villiliike"
+
+#: src/localplayer.cpp:1919
+msgid "(a) custom crazy move"
+msgstr "(a) oma villiliike"
+
+#: src/localplayer.cpp:1923
+msgid "(?) crazy move"
+msgstr "(?) villiliike"
+
+#: src/localplayer.cpp:1937
+msgid "(0) default moves to target"
+msgstr "(0) oletussiirtymä kohteen luo"
+
+#: src/localplayer.cpp:1938
+msgid "(1) moves to target in distance 1"
+msgstr "(1) siirry kohteen luo etäisyydellä 1"
+
+#: src/localplayer.cpp:1939
+msgid "(2) moves to target in distance 2"
+msgstr "(2) siirry kohteen luo etäisyydellä 2"
+
+#: src/localplayer.cpp:1940
+msgid "(3) moves to target in distance 3"
+msgstr "(3) siirry kohteen luo etäisyydellä 3"
+
+#: src/localplayer.cpp:1941
+msgid "(5) moves to target in distance 5"
+msgstr "(5) siirry kohteen luo etäisyydellä 5"
+
+#: src/localplayer.cpp:1942
+msgid "(7) moves to target in distance 7"
+msgstr "(7) siirry kohteen luo etäisyydellä 7"
+
+#: src/localplayer.cpp:1943
+msgid "(A) moves to target in attack range"
+msgstr "(A) siirry kohteen luo hyökkäyskantamalla"
+
+#: src/localplayer.cpp:1944
+msgid "(a) archer attack range"
+msgstr ""
+
+#: src/localplayer.cpp:1945
+msgid "(?) move to target"
+msgstr "(?) siirry kohteen luo"
+
+#: src/localplayer.cpp:1964
+msgid "(D) default follow"
+msgstr "(D) oletusseuraaminen"
+
+#: src/localplayer.cpp:1965
+msgid "(R) relative follow"
+msgstr "(R) suhteellinen seuraaminen"
+
+#: src/localplayer.cpp:1966
+msgid "(M) mirror follow"
+msgstr "(M) peilikuvaseuraaminen"
+
+#: src/localplayer.cpp:1967
+msgid "(P) pet follow"
+msgstr "(P) lemmikkiseuraaminen"
+
+#: src/localplayer.cpp:1968
+msgid "(?) unknown follow"
+msgstr "(?) tuntematon seuraaminen"
+
+#: src/localplayer.cpp:1987 src/localplayer.cpp:1991 src/localplayer.cpp:2014
+msgid "(?) attack"
+msgstr "(?) hyökkäys"
+
+#: src/localplayer.cpp:1988 src/localplayer.cpp:2010
+msgid "(D) default attack"
+msgstr "(D) oletushyökkäys"
+
+#: src/localplayer.cpp:1989
+msgid "(s) switch attack without shield"
+msgstr "(s) vaihda hyökkäystä, ei kilpeä"
+
+#: src/localplayer.cpp:1990
+msgid "(S) switch attack with shield"
+msgstr "(S) vaihda hyökkäystä, kilpi mukana"
+
+#: src/localplayer.cpp:2011
+msgid "(G) go and attack"
+msgstr "(G) mene ja hyökkää"
+
+#: src/localplayer.cpp:2012
+msgid "(A) go, attack, pickup"
+msgstr "(A) mene, hyökkää, nosta"
+
+#: src/localplayer.cpp:2013
+msgid "(d) without auto attack"
+msgstr "(d) ei automaattista hyökkäystä"
+
+#: src/localplayer.cpp:2047
+msgid "(S) small pick up 1x1 cells"
+msgstr "(S) pieni nosto 1x1 ruutua"
+
+#: src/localplayer.cpp:2048
+msgid "(D) default pick up 2x1 cells"
+msgstr "(D) oletusnosto 2x1 ruutua"
+
+#: src/localplayer.cpp:2049
+msgid "(F) forward pick up 2x3 cells"
+msgstr "(F) nosto edestä 2x3 ruutua"
+
+#: src/localplayer.cpp:2050
+msgid "(3) pick up 3x3 cells"
+msgstr "(3) nosto 3x3 ruutua"
+
+#: src/localplayer.cpp:2051
+msgid "(g) go and pick up in distance 4"
+msgstr "(g) mene ja nosta etäisyydellä 4"
+
+#: src/localplayer.cpp:2052
+msgid "(G) go and pick up in distance 8"
+msgstr "(G) mene ja nosta etäisyydellä 8"
+
+#: src/localplayer.cpp:2053
+msgid "(A) go and pick up in max distance"
+msgstr "(A) mene ja nosta maksimietäisyydellä"
+
+#: src/localplayer.cpp:2054
+msgid "(?) pick up"
+msgstr "(?) nosta"
+
+#: src/localplayer.cpp:2067
+msgid "(N) normal map view"
+msgstr "(N) normaali karttanäkymä"
+
+#: src/localplayer.cpp:2068
+msgid "(D) debug map view"
+msgstr "(D) debug-karttanäkymä"
+
+#: src/localplayer.cpp:2069
+msgid "(u) ultra map view"
+msgstr "(u) ultra-karttanäkymä"
+
+#: src/localplayer.cpp:2070
+msgid "(U) ultra map view 2"
+msgstr "(U) ultra-karttanäkymä 2"
+
+#: src/localplayer.cpp:2071
+msgid "(e) empty map view"
+msgstr "(e) tyhjä karttanäkymä"
+
+#: src/localplayer.cpp:2072
+msgid "(b) black & white map view"
+msgstr "(b) mustavalkoinen karttanäkymä"
+
+#: src/localplayer.cpp:2091
+msgid "(f) use #flar for magic attack"
+msgstr "(f) #flar taikahyökkäyksenä"
+
+#: src/localplayer.cpp:2092
+msgid "(c) use #chiza for magic attack"
+msgstr "(c) #chiza taikahyökkäyksenä"
+
+#: src/localplayer.cpp:2093
+msgid "(I) use #ingrav for magic attack"
+msgstr "(I) #ingrav taikahyökkäyksenä"
+
+#: src/localplayer.cpp:2094
+msgid "(F) use #frillyar for magic attack"
+msgstr "(F) #frillyar taikahyökkäyksenä"
+
+#: src/localplayer.cpp:2095
+msgid "(U) use #upmarmu for magic attack"
+msgstr "(U) #upmarmu taikahyökkäyksenä"
+
+#: src/localplayer.cpp:2096
+msgid "(?) magic attack"
+msgstr "(?) taikahyökkäys"
+
+#: src/localplayer.cpp:2115
+msgid "(a) attack all players"
+msgstr ""
+
+#: src/localplayer.cpp:2116
+msgid "(f) attack not friends"
+msgstr ""
+
+#: src/localplayer.cpp:2117
+msgid "(b) attack bad relations"
+msgstr ""
+
+#: src/localplayer.cpp:2118
+msgid "(d) dont attack players"
+msgstr ""
+
+#: src/localplayer.cpp:2119
+msgid "(?) pvp attack"
+msgstr ""
+
+#: src/localplayer.cpp:2138
+msgid "(D) default imitation"
+msgstr "(D) oletusmatkinta"
+
+#: src/localplayer.cpp:2139
+msgid "(O) outfits imitation"
+msgstr "(O) asun matkinta"
+
+#: src/localplayer.cpp:2140
+msgid "(?) imitation"
+msgstr "(?) matkinta"
+
+#: src/localplayer.cpp:2168
 msgid "Away"
 msgstr "Poissa"
 
-#: src/localplayer.cpp:3541
+#: src/localplayer.cpp:2187
+msgid "(O) on keyboard"
+msgstr "(O) paikalla"
+
+#: src/localplayer.cpp:2188
+msgid "(A) away"
+msgstr "(A) poissa"
+
+#: src/localplayer.cpp:2189 src/localplayer.cpp:2204
+msgid "(?) away"
+msgstr "(?) poissaolo"
+
+#: src/localplayer.cpp:2202
+msgid "(G) game camera mode"
+msgstr "(G) pelin kameratila"
+
+#: src/localplayer.cpp:2203
+msgid "(F) free camera mode"
+msgstr "(F) vapaa kamera"
+
+#: src/localplayer.cpp:2228
+msgid "Game modifiers are enabled"
+msgstr "Pelimuokkaimet käytössä"
+
+#: src/localplayer.cpp:2229
+msgid "Game modifiers are disabled"
+msgstr "Pelimuokkaimet poissa käytöstä"
+
+#: src/localplayer.cpp:2230
+#, fuzzy
+msgid "Game modifiers are unknown"
+msgstr "Pelimuokkaimet käytössä"
+
+#: src/localplayer.cpp:3746
 msgid "Follow: "
 msgstr "Seuraa: "
 
-#: src/localplayer.cpp:3543 src/localplayer.cpp:3558
+#: src/localplayer.cpp:3748 src/localplayer.cpp:3763
 msgid "Follow canceled"
 msgstr "Seuraaminen keskeytetty"
 
-#: src/localplayer.cpp:3550
+#: src/localplayer.cpp:3755
 msgid "Imitation: "
 msgstr "Matki: "
 
-#: src/localplayer.cpp:3552 src/localplayer.cpp:3560
+#: src/localplayer.cpp:3757 src/localplayer.cpp:3765
 msgid "Imitation canceled"
 msgstr "Matkiminen keskeytetty"
 
-#: src/localplayer.cpp:3908
+#: src/localplayer.cpp:4113
 msgid "You see "
 msgstr "Näet "
 
@@ -4535,72 +4405,71 @@ msgstr "Kiitos kaupoista."
 msgid "Unable to buy."
 msgstr "Ostaminen epäonnistui."
 
-#: src/net/ea/charserverhandler.cpp:63
+#: src/net/ea/charserverhandler.cpp:66
 msgid "Strength:"
 msgstr "Voima:"
 
-#: src/net/ea/charserverhandler.cpp:64
+#: src/net/ea/charserverhandler.cpp:67
 msgid "Agility:"
 msgstr "Ketteryys:"
 
-#: src/net/ea/charserverhandler.cpp:65
+#: src/net/ea/charserverhandler.cpp:68
 msgid "Vitality:"
 msgstr "Elinvoima:"
 
-#: src/net/ea/charserverhandler.cpp:66
+#: src/net/ea/charserverhandler.cpp:69
 msgid "Intelligence:"
 msgstr "Älykkyys:"
 
-#: src/net/ea/charserverhandler.cpp:67
+#: src/net/ea/charserverhandler.cpp:70
 msgid "Dexterity:"
 msgstr "Näppäryys:"
 
-#: src/net/ea/charserverhandler.cpp:68
+#: src/net/ea/charserverhandler.cpp:71
 msgid "Luck:"
 msgstr "Tuuri:"
 
-#: src/net/ea/charserverhandler.cpp:102
+#: src/net/ea/charserverhandler.cpp:115
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr "Pääsy evätty. Todennäköisesti palvelimella on liian paljon pelaajia."
 
-#: src/net/ea/charserverhandler.cpp:106
+#: src/net/ea/charserverhandler.cpp:119
 msgid "Cannot use this ID."
 msgstr "Tätä tunnistetta ei voi käyttää."
 
-#: src/net/ea/charserverhandler.cpp:109
+#: src/net/ea/charserverhandler.cpp:122
 msgid "Unknown char-server failure."
 msgstr "Tuntematon hahmopalvelinvirhe."
 
-#: src/net/ea/charserverhandler.cpp:138
+#: src/net/ea/charserverhandler.cpp:151
 msgid "Failed to create character. Most likely the name is already taken."
-msgstr ""
-"Hahmon luonti epäonnistui. Todennäköisesti hahmon nimi on jo käytössä."
+msgstr "Hahmon luonti epäonnistui. Todennäköisesti hahmon nimi on jo käytössä."
 
-#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:235
+#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:235
 msgid "Wrong name."
 msgstr "Väärä nimi."
 
-#: src/net/ea/charserverhandler.cpp:145
+#: src/net/ea/charserverhandler.cpp:158
 msgid "Incorrect stats."
 msgstr "Väärät arvot."
 
-#: src/net/ea/charserverhandler.cpp:148
+#: src/net/ea/charserverhandler.cpp:161
 msgid "Incorrect hair."
 msgstr "Väärä hiustyyli."
 
-#: src/net/ea/charserverhandler.cpp:151
+#: src/net/ea/charserverhandler.cpp:164
 msgid "Incorrect slot."
 msgstr "Väärä paikka."
 
-#: src/net/ea/charserverhandler.cpp:166 src/net/manaserv/charhandler.cpp:210
+#: src/net/ea/charserverhandler.cpp:179 src/net/manaserv/charhandler.cpp:210
 msgid "Info"
 msgstr "Tietoja"
 
-#: src/net/ea/charserverhandler.cpp:166
+#: src/net/ea/charserverhandler.cpp:179
 msgid "Character deleted."
 msgstr "Hahmo poistettu."
 
-#: src/net/ea/charserverhandler.cpp:172
+#: src/net/ea/charserverhandler.cpp:185
 msgid "Failed to delete character."
 msgstr "Hahmon poisto epäonnistui."
 
@@ -4830,15 +4699,15 @@ msgstr "Komento: /exp"
 msgid "This command displays the party's current experience sharing policy."
 msgstr "Tämä komento näyttää ryhmän nykyisen kokemuksenjaon politiikan."
 
-#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:284
+#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:285
 msgid "Item sharing enabled."
 msgstr "Saaliinjako käytössä."
 
-#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:294
+#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:295
 msgid "Item sharing disabled."
 msgstr "Saaliinjako poistettu käytöstä."
 
-#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:304
+#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:305
 msgid "Item sharing not possible."
 msgstr "Saaliinjako ei ole mahdollista."
 
@@ -4846,15 +4715,15 @@ msgstr "Saaliinjako ei ole mahdollista."
 msgid "Item sharing unknown."
 msgstr "Saaliinjaon tila on tuntematon."
 
-#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:246
+#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:247
 msgid "Experience sharing enabled."
 msgstr "Kokemuksen jako käytössä."
 
-#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:256
+#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:257
 msgid "Experience sharing disabled."
 msgstr "Kokemuksen jako pois käytöstä."
 
-#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:266
+#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:267
 msgid "Experience sharing not possible."
 msgstr "Kokemuksen jako ei ole mahdollista."
 
@@ -4974,16 +4843,16 @@ msgstr "%s ei voi liittyä ryhmääsi, koska se on täynnä."
 msgid "QQQ Unknown invite response for %s."
 msgstr "QQQ Tuntematon kutsuvastaus kohteella %s."
 
-#: src/net/ea/partyhandler.cpp:357
+#: src/net/ea/partyhandler.cpp:358
 msgid "You have left the party."
 msgstr "Erosit ryhmästä."
 
-#: src/net/ea/partyhandler.cpp:370
+#: src/net/ea/partyhandler.cpp:371
 #, c-format
 msgid "%s has left your party."
 msgstr "%s on eronnut ryhmästä."
 
-#: src/net/ea/partyhandler.cpp:447
+#: src/net/ea/partyhandler.cpp:448
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr "Tuntematon jäsen yritti sanoa: %s"
@@ -5116,10 +4985,8 @@ msgstr "Viesti"
 
 #: src/net/ea/playerhandler.cpp:336
 msgid ""
-"You are carrying more than half your weight. You are unable to regain "
-"health."
-msgstr ""
-"Kannat roinaa yli puolen elopainoasi. Rasitus estää sinua paranemasta."
+"You are carrying more than half your weight. You are unable to regain health."
+msgstr "Kannat roinaa yli puolen elopainoasi. Rasitus estää sinua paranemasta."
 
 #: src/net/ea/playerhandler.cpp:346
 msgid "You are carrying less than half your weight. You can regain health."
@@ -5715,19 +5582,19 @@ msgstr "Yhteys palvelimeen katkaistu. "
 msgid "%s is not in your party!"
 msgstr "%s ei ole ryhmässäsi!"
 
-#: src/playerrelations.cpp:460
+#: src/playerrelations.cpp:461
 msgid "Print '...'"
 msgstr "Tulosta '...'"
 
-#: src/playerrelations.cpp:480
+#: src/playerrelations.cpp:481
 msgid "Blink name"
 msgstr "Vilkuta nimeä"
 
-#: src/playerrelations.cpp:524
+#: src/playerrelations.cpp:525
 msgid "Floating '...' bubble"
 msgstr "Leijuva '...' -puhekupla"
 
-#: src/playerrelations.cpp:527
+#: src/playerrelations.cpp:528
 msgid "Floating bubble"
 msgstr "Leijuva puhekupla"
 
@@ -5760,4 +5627,98 @@ msgstr "MP %+d"
 msgid "Unknown item"
 msgstr "Tuntematon tavara"
 
+#~ msgid "(?) move"
+#~ msgstr "(?) liiku"
+
+#~ msgid "(?) map view"
+#~ msgstr "(?) karttanäkymä"
+
+#~ msgid "(D) design camera mode"
+#~ msgstr "(D) suunnittelukamera"
+
+#~ msgid "(D)"
+#~ msgstr "(D)"
+
+#~ msgid "(I)"
+#~ msgstr "(I)"
+
+#~ msgid "(c)"
+#~ msgstr "(c)"
+
+#~ msgid "(C)"
+#~ msgstr "(C)"
+
+#~ msgid "(d)"
+#~ msgstr "(d)"
+
+#~ msgid "(?)"
+#~ msgstr "(?)"
+
+#~ msgid "(a)"
+#~ msgstr "(a)"
+
+#~ msgid "(0)"
+#~ msgstr "(0)"
+
+#~ msgid "(1)"
+#~ msgstr "(1)"
+
+#~ msgid "(2)"
+#~ msgstr "(2)"
+
+#~ msgid "(3)"
+#~ msgstr "(3)"
+
+#~ msgid "(5)"
+#~ msgstr "(5)"
+
+#~ msgid "(7)"
+#~ msgstr "(7)"
+
+#~ msgid "(A)"
+#~ msgstr "(A)"
+
+#~ msgid "(R)"
+#~ msgstr "(R)"
+
+#~ msgid "(M)"
+#~ msgstr "(M)"
+
+#~ msgid "(P)"
+#~ msgstr "(P)"
+
+#~ msgid "(s)"
+#~ msgstr "(s)"
+
+#~ msgid "(S)"
+#~ msgstr "(S)"
+
+#~ msgid "(G)"
+#~ msgstr "(G)"
+
+#~ msgid "(f)"
+#~ msgstr "(f)"
+
+#~ msgid "(F)"
+#~ msgstr "(F)"
+
+#~ msgid "(U)"
+#~ msgstr "(U)"
+
+#~ msgid "(b)"
+#~ msgstr "(b)"
+
+#~ msgid "(g)"
+#~ msgstr "(g)"
+
+#~ msgid "(N)"
+#~ msgstr "(N)"
+
+#~ msgid "(u)"
+#~ msgstr "(u)"
+
+#~ msgid "(e)"
+#~ msgstr "(e)"
 
+#~ msgid "(O)"
+#~ msgstr "(O)"
diff --git a/po/fr.po b/po/fr.po
index 177f9dcaf..8aab19ce2 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Andrei Karas <akaras@inbox.ru>, 2011.
 #   <antoinebcn@hotmail.com>, 2011.
@@ -12,132 +12,133 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-11-12 00:23+0300\n"
+"POT-Creation-Date: 2011-11-26 02:20+0300\n"
 "PO-Revision-Date: 2011-11-11 21:38+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
-"Language-Team: French (http://www.transifex.net/projects/p/manaplus/team/fr/)\n"
+"Language-Team: French (http://www.transifex.net/projects/p/manaplus/team/"
+"fr/)\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
 #: src/actorspritemanager.cpp:1171
 msgid "Visible on map"
 msgstr "Visible sur la carte"
 
-#: src/being.cpp:551
+#: src/being.cpp:553
 msgid "dodge"
 msgstr "esquivé"
 
-#: src/being.cpp:551
+#: src/being.cpp:553
 msgid "miss"
 msgstr "raté"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1530
+#: src/being.cpp:1534
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1535
+#: src/being.cpp:1539
 msgid "I"
 msgstr "I"
 
-#: src/client.cpp:869 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:878 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Configuration"
 
-#: src/client.cpp:876 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:885 src/gui/setup_perfomance.cpp:48
 msgid "Perfomance"
 msgstr "Performance"
 
-#: src/client.cpp:881 src/gui/setup_video.cpp:315
+#: src/client.cpp:890 src/gui/setup_video.cpp:315
 msgid "Video"
 msgstr "Vidéo"
 
-#: src/client.cpp:886
+#: src/client.cpp:895
 msgid "Themes"
 msgstr "Thèmes"
 
-#: src/client.cpp:968
+#: src/client.cpp:977
 msgid "Connecting to server"
 msgstr "Connexion au serveur"
 
-#: src/client.cpp:999
+#: src/client.cpp:1008
 msgid "Logging in"
 msgstr "Connexion"
 
-#: src/client.cpp:1032
+#: src/client.cpp:1041
 msgid "Entering game world"
 msgstr "Vous entrez dans un nouveau monde"
 
-#: src/client.cpp:1132
+#: src/client.cpp:1142
 msgid "Requesting characters"
 msgstr "Téléchargement des personnages"
 
-#: src/client.cpp:1163
+#: src/client.cpp:1173
 msgid "Connecting to the game server"
 msgstr "Connexion au serveur de jeu"
 
-#: src/client.cpp:1173
+#: src/client.cpp:1183
 msgid "Changing game servers"
 msgstr "Changement de serveur de jeu"
 
-#: src/client.cpp:1216 src/client.cpp:1223 src/client.cpp:1357
+#: src/client.cpp:1226 src/client.cpp:1233 src/client.cpp:1367
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
-#: src/gui/charcreatedialog.cpp:221 src/gui/charselectdialog.cpp:253
+#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:254
 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
-#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
-#: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
+#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:167
+#: src/net/ea/charserverhandler.cpp:185 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "Erreur"
 
-#: src/client.cpp:1232
+#: src/client.cpp:1242
 msgid "Requesting registration details"
 msgstr "Demande des paramètres d'inscription"
 
-#: src/client.cpp:1258
+#: src/client.cpp:1268
 msgid "Password Change"
 msgstr "Changement de mot de passe"
 
-#: src/client.cpp:1259
+#: src/client.cpp:1269
 msgid "Password changed successfully!"
 msgstr "Le mot de passe a été changé avec succès !"
 
-#: src/client.cpp:1278
+#: src/client.cpp:1288
 msgid "Email Change"
 msgstr "Changer d'e-mail"
 
-#: src/client.cpp:1279
+#: src/client.cpp:1289
 msgid "Email changed successfully!"
 msgstr "L'adresse e-mail a été changée avec succès !"
 
-#: src/client.cpp:1299
+#: src/client.cpp:1309
 msgid "Unregister Successful"
 msgstr "Désinscription réussie"
 
-#: src/client.cpp:1300
+#: src/client.cpp:1310
 msgid "Farewell, come back any time..."
 msgstr "A bientôt, revenez quand vous voudrez..."
 
-#: src/client.cpp:1499 src/client.cpp:1529 src/client.cpp:1544
-#: src/client.cpp:1969 src/client.cpp:1976
+#: src/client.cpp:1509 src/client.cpp:1539 src/client.cpp:1554
+#: src/client.cpp:1979 src/client.cpp:1986
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s n'existe pas et ne peut pas être créé ! Fermeture du programme."
 
-#: src/client.cpp:1675
+#: src/client.cpp:1685
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Site de mise à jour invalide : %s"
 
-#: src/client.cpp:1709 src/client.cpp:1715
+#: src/client.cpp:1719 src/client.cpp:1725
 msgid "Error creating updates directory!"
 msgstr "Impossible de créer le dossier de mise à jour !"
 
-#: src/client.cpp:1736
+#: src/client.cpp:1746
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -154,11 +155,11 @@ msgstr "Vous ne pouvez pas envoyer de messages vides."
 #: src/commandhandler.cpp:343
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
-" you."
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
+"you."
 msgstr ""
-"Vous ne pouvez créer une nouvelle fenêtre de message privé avec le nom "
-"\"%s\". Soit elle existe déjà, soit il s'agit de vous même."
+"Vous ne pouvez créer une nouvelle fenêtre de message privé avec le nom \"%s"
+"\". Soit elle existe déjà, soit il s'agit de vous même."
 
 #: src/commandhandler.cpp:363
 #, c-format
@@ -318,10 +319,11 @@ msgstr "Images des ressources :"
 msgid "Resource orphaned images:"
 msgstr "Images des ressources non affectées :"
 
-#: src/commandhandler.h:40
+#: src/commandhandler.h:34
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr "Les options de /%s sont \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgstr ""
+"Les options de /%s sont \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 
 #: src/game.cpp:252 src/gui/widgets/chattab.cpp:403
 msgid "General"
@@ -348,19 +350,19 @@ msgstr ""
 msgid "Network Error"
 msgstr "Erreur Réseau"
 
-#: src/game.cpp:1332
+#: src/game.cpp:1258
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorer les requêtes d'échanges entrantes"
 
-#: src/game.cpp:1342
+#: src/game.cpp:1268
 msgid "Accepting incoming trade requests"
 msgstr "Accepter les requêtes d'échanges entrantes"
 
-#: src/game.cpp:1750
+#: src/game.cpp:1773
 msgid "Could Not Load Map"
 msgstr "La carte n'a pu être chargée"
 
-#: src/game.cpp:1751
+#: src/game.cpp:1774
 #, c-format
 msgid "Error while loading %s"
 msgstr "Erreur durant le chargement %s"
@@ -438,7 +440,7 @@ msgstr "Montant"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:207
 #: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:998
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:755
 msgid "+"
 msgstr "+"
 
@@ -446,7 +448,7 @@ msgstr "+"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:206
 #: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:1010
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:767
 msgid "-"
 msgstr "-"
 
@@ -459,7 +461,7 @@ msgstr "Quitter"
 
 #: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
 #: src/gui/statuswindow.cpp:505 src/gui/statuswindow.cpp:555
-#: src/gui/statuswindow.cpp:997 src/gui/statuswindow.cpp:1028
+#: src/gui/statuswindow.cpp:754 src/gui/statuswindow.cpp:785
 msgid "Max"
 msgstr "Max."
 
@@ -476,7 +478,7 @@ msgid "Sell"
 msgstr "Vendre"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
-#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:96
+#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:105
 #: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
 #: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:344
 #: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:500
@@ -553,68 +555,68 @@ msgstr "Le mot de passe ne doit pas être plus long que %d caractères."
 msgid "The new password entries mismatch."
 msgstr "Les nouveaux mots de passe ne correspondent pas."
 
-#: src/gui/charcreatedialog.cpp:58
+#: src/gui/charcreatedialog.cpp:59
 msgid "Create Character"
 msgstr "Créer le personnage"
 
-#: src/gui/charcreatedialog.cpp:76 src/gui/logindialog.cpp:94
+#: src/gui/charcreatedialog.cpp:85 src/gui/logindialog.cpp:94
 #: src/gui/register.cpp:75
 msgid "Name:"
 msgstr "Nom :"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:79 src/gui/charcreatedialog.cpp:84
-#: src/gui/charcreatedialog.cpp:90 src/gui/outfitwindow.cpp:85
+#: src/gui/charcreatedialog.cpp:88 src/gui/charcreatedialog.cpp:93
+#: src/gui/charcreatedialog.cpp:99 src/gui/outfitwindow.cpp:85
 msgid ">"
 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:82 src/gui/charcreatedialog.cpp:85
-#: src/gui/charcreatedialog.cpp:91 src/gui/outfitwindow.cpp:84
+#: src/gui/charcreatedialog.cpp:91 src/gui/charcreatedialog.cpp:94
+#: src/gui/charcreatedialog.cpp:100 src/gui/outfitwindow.cpp:84
 msgid "<"
 msgstr "<"
 
-#: src/gui/charcreatedialog.cpp:83
+#: src/gui/charcreatedialog.cpp:92
 msgid "Hair color:"
 msgstr "Couleur :"
 
-#: src/gui/charcreatedialog.cpp:86
+#: src/gui/charcreatedialog.cpp:95
 msgid "Hair style:"
 msgstr "Coupe :"
 
-#: src/gui/charcreatedialog.cpp:92
+#: src/gui/charcreatedialog.cpp:101
 msgid "Race:"
 msgstr "Race:"
 
-#: src/gui/charcreatedialog.cpp:95 src/gui/charselectdialog.cpp:480
+#: src/gui/charcreatedialog.cpp:104 src/gui/charselectdialog.cpp:481
 #: src/gui/socialwindow.cpp:1139
 msgid "Create"
 msgstr "Créer"
 
-#: src/gui/charcreatedialog.cpp:97 src/gui/register.cpp:98
+#: src/gui/charcreatedialog.cpp:106 src/gui/register.cpp:98
 msgid "Male"
 msgstr "Masculin"
 
-#: src/gui/charcreatedialog.cpp:98 src/gui/register.cpp:99
+#: src/gui/charcreatedialog.cpp:107 src/gui/register.cpp:99
 msgid "Female"
 msgstr "Féminin"
 
-#: src/gui/charcreatedialog.cpp:116 src/gui/charcreatedialog.cpp:303
+#: src/gui/charcreatedialog.cpp:125 src/gui/charcreatedialog.cpp:312
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Veuillez distribuer %d points"
 
-#: src/gui/charcreatedialog.cpp:222
+#: src/gui/charcreatedialog.cpp:231
 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:294
+#: src/gui/charcreatedialog.cpp:303
 msgid "Character stats OK"
 msgstr "Caractéristiques du personnage Ok"
 
-#: src/gui/charcreatedialog.cpp:308
+#: src/gui/charcreatedialog.cpp:317
 #, c-format
 msgid "Please remove %d points"
 msgstr "Veuillez retirer %d points"
@@ -644,34 +646,34 @@ msgstr "Se désinscrire"
 msgid "Change Email"
 msgstr "Modifier l'adresse e-mail"
 
-#: src/gui/charselectdialog.cpp:253
+#: src/gui/charselectdialog.cpp:254
 msgid "Incorrect password"
 msgstr "Mot de passe incorrect"
 
-#: src/gui/charselectdialog.cpp:286
+#: src/gui/charselectdialog.cpp:287
 msgid "Enter password for deleting character"
 msgstr "Entrer le mot de passe pour effacer le personnage"
 
-#: src/gui/charselectdialog.cpp:286
+#: src/gui/charselectdialog.cpp:287
 msgid "Enter password:"
 msgstr "Entrer le mot de passe :"
 
-#: src/gui/charselectdialog.cpp:410 src/gui/serverdialog.cpp:298
+#: src/gui/charselectdialog.cpp:411 src/gui/serverdialog.cpp:298
 #: src/gui/setup_relations.cpp:244 src/gui/shopwindow.cpp:122
 #: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244
 msgid "Delete"
 msgstr "Supprimer"
 
-#: src/gui/charselectdialog.cpp:468
+#: src/gui/charselectdialog.cpp:469
 msgid "Choose"
 msgstr "Choisir"
 
-#: src/gui/charselectdialog.cpp:471
+#: src/gui/charselectdialog.cpp:472
 #, c-format
 msgid "Level %d"
 msgstr "Niveau %d"
 
-#: src/gui/charselectdialog.cpp:482 src/gui/charselectdialog.cpp:483
+#: src/gui/charselectdialog.cpp:483 src/gui/charselectdialog.cpp:484
 msgid "(empty)"
 msgstr "(vide)"
 
@@ -936,11 +938,11 @@ msgstr "Ouverture automatique de cette fenêtre"
 msgid "OK"
 msgstr "Ok"
 
-#: src/gui/equipmentwindow.cpp:61 src/gui/windowmenu.cpp:74
+#: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74
 msgid "Equipment"
 msgstr "Équipement"
 
-#: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160
+#: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160
 #: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554
 #: src/gui/popupmenu.cpp:1737 src/gui/popupmenu.cpp:1829
 #: src/gui/popupmenu.cpp:1874
@@ -1377,7 +1379,7 @@ msgstr "Ne plus ignorer"
 #: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:190
 #: src/gui/popupmenu.cpp:415 src/gui/popupmenu.cpp:435
 #: src/gui/popupmenu.cpp:672 src/gui/popupmenu.cpp:692
-#: src/playerrelations.cpp:446
+#: src/playerrelations.cpp:447
 msgid "Completely ignore"
 msgstr "Ignorer complètement"
 
@@ -2158,8 +2160,7 @@ msgstr "Activer le support pour auction bot"
 
 #: src/gui/setup_other.cpp:162
 msgid "Enable guild bot support and disable native guild support"
-msgstr ""
-"Activer le support pour guild bot et désactiver le support par défault"
+msgstr "Activer le support pour guild bot et désactiver le support par défault"
 
 #: src/gui/setup_other.cpp:168
 msgid "Enable server side attack"
@@ -2204,8 +2205,7 @@ msgstr "Accélération matériel"
 #: src/gui/setup_perfomance.cpp:64
 msgid "Enable opacity cache (Software, can use many memory)"
 msgstr ""
-"Autoriser l'opacité du cache (Le programme peut utiliser beaucoup de "
-"mémoire)"
+"Autoriser l'opacité du cache (Le programme peut utiliser beaucoup de mémoire)"
 
 #: src/gui/setup_perfomance.cpp:67
 msgid "Enable map reduce (Software)"
@@ -2842,8 +2842,8 @@ msgstr "Choisissez le nom de la guilde."
 #: src/gui/socialwindow.cpp:1425
 msgid "Received guild request, but one already exists."
 msgstr ""
-"Vous avez reçu une invitation pour rejoindre une guilde, mais vous êtes déjà"
-" dans une."
+"Vous avez reçu une invitation pour rejoindre une guilde, mais vous êtes déjà "
+"dans une."
 
 #: src/gui/socialwindow.cpp:1431
 #, c-format
@@ -2899,270 +2899,6 @@ msgstr "Choisissez le nom du groupe."
 msgid "Specials"
 msgstr "Cpt. spéciales"
 
-#: src/gui/statuspopup.cpp:204
-msgid "(D) default moves"
-msgstr "(D) Mouvements par défaut"
-
-#: src/gui/statuspopup.cpp:209
-msgid "(I) invert moves"
-msgstr "(I) Mouvements inversés"
-
-#: src/gui/statuspopup.cpp:214
-msgid "(c) moves with some crazy moves"
-msgstr "(c) Mouvements un peu fous"
-
-#: src/gui/statuspopup.cpp:219
-msgid "(C) moves with crazy moves"
-msgstr "(C) Mouvement complètement fous"
-
-#: src/gui/statuspopup.cpp:224
-msgid "(d) double normal + crazy"
-msgstr "(d) double normal et fou"
-
-#: src/gui/statuspopup.cpp:229
-msgid "(?) move"
-msgstr "(?) Mouvements"
-
-#: src/gui/statuspopup.cpp:247
-msgid "(a) custom crazy move"
-msgstr "(a) Mouvements fous personnalisés"
-
-#: src/gui/statuspopup.cpp:251
-msgid "(?) crazy move"
-msgstr "(?) Mouvements fous"
-
-#: src/gui/statuspopup.cpp:261
-msgid "(0) default moves to target"
-msgstr "(0) Aller à la cible distante par défaut"
-
-#: src/gui/statuspopup.cpp:266
-msgid "(1) moves to target in distance 1"
-msgstr "(1) Aller à la cible en distante de 1"
-
-#: src/gui/statuspopup.cpp:271
-msgid "(2) moves to target in distance 2"
-msgstr "(2) Aller vers la cible jusqu'à 2 de distance"
-
-#: src/gui/statuspopup.cpp:276
-msgid "(3) moves to target in distance 3"
-msgstr "(3)  Aller à la cible en distante de 3"
-
-#: src/gui/statuspopup.cpp:281
-msgid "(5) moves to target in distance 5"
-msgstr "(5)  Aller à la cible en distante de 5"
-
-#: src/gui/statuspopup.cpp:286
-msgid "(7) moves to target in distance 7"
-msgstr "(7) Aller à la cible en distante de 7"
-
-#: src/gui/statuspopup.cpp:291
-msgid "(A) moves to target in attack range"
-msgstr "(A) Aller à la cible dans le champ d'attaque"
-
-#: src/gui/statuspopup.cpp:296
-msgid "(a) archer attack range"
-msgstr "(a) Portée des attaques des Archéens"
-
-#: src/gui/statuspopup.cpp:301
-msgid "(?) move to target"
-msgstr "(?) Aller à la cible"
-
-#: src/gui/statuspopup.cpp:309
-msgid "(D) default follow"
-msgstr "(D) Suivre : défaut"
-
-#: src/gui/statuspopup.cpp:313
-msgid "(R) relative follow"
-msgstr "(R) Suivre: mouvement relatif"
-
-#: src/gui/statuspopup.cpp:317
-msgid "(M) mirror follow"
-msgstr "(M) Suivre effet miroir"
-
-#: src/gui/statuspopup.cpp:321
-msgid "(P) pet follow"
-msgstr "(P) Suivre comme un toutou"
-
-#: src/gui/statuspopup.cpp:325
-msgid "(?) unknown follow"
-msgstr "(?) Suivre : mode inconnu"
-
-#: src/gui/statuspopup.cpp:334 src/gui/statuspopup.cpp:357
-msgid "(D) default attack"
-msgstr "(D) Attaque : défaut"
-
-#: src/gui/statuspopup.cpp:339
-msgid "(s) switch attack without shield"
-msgstr "(s) Attaquer sans protection"
-
-#: src/gui/statuspopup.cpp:344
-msgid "(S) switch attack with shield"
-msgstr "(S) Attaquer avec protection"
-
-#: src/gui/statuspopup.cpp:348 src/gui/statuspopup.cpp:373
-msgid "(?) attack"
-msgstr "(?) Attaque"
-
-#: src/gui/statuspopup.cpp:361
-msgid "(G) go and attack"
-msgstr "(G) Se déplacer et attaquer"
-
-#: src/gui/statuspopup.cpp:365
-msgid "(A) go, attack, pickup"
-msgstr "(A) Se déplacer, attaquer et ramasser"
-
-#: src/gui/statuspopup.cpp:369
-msgid "(d) without auto attack"
-msgstr "(d) Sans attaque automatique"
-
-#: src/gui/statuspopup.cpp:387
-msgid "(S) small pick up 1x1 cells"
-msgstr "(S) Ramassage sur 1x1 case"
-
-#: src/gui/statuspopup.cpp:391
-msgid "(D) default pick up 2x1 cells"
-msgstr "(D) Ramassage par défaut sur 2x1 cases"
-
-#: src/gui/statuspopup.cpp:395
-msgid "(F) forward pick up 2x3 cells"
-msgstr "(F) Ramassage avant sur  2x3 cases"
-
-#: src/gui/statuspopup.cpp:399
-msgid "(3) pick up 3x3 cells"
-msgstr "(3) Ramassage sur 3x3 cases"
-
-#: src/gui/statuspopup.cpp:403
-msgid "(g) go and pick up in distance 4"
-msgstr "(g) Aller et ramasser jusqu'à 4 de distance"
-
-#: src/gui/statuspopup.cpp:407
-msgid "(G) go and pick up in distance 8"
-msgstr "(G) Aller et ramasser jusqu'à 8 de distance"
-
-#: src/gui/statuspopup.cpp:411
-msgid "(A) go and pick up in max distance"
-msgstr "(A) Aller et ramasser jusqu'à la distance max"
-
-#: src/gui/statuspopup.cpp:415
-msgid "(?) pick up"
-msgstr "(?) Ramassage"
-
-#: src/gui/statuspopup.cpp:424
-msgid "(N) normal map view"
-msgstr "(N) Vue normale du jeu"
-
-#: src/gui/statuspopup.cpp:428
-msgid "(D) debug map view"
-msgstr "(D) Vue du jeu mode déverminage"
-
-#: src/gui/statuspopup.cpp:432
-msgid "(u) ultra map view"
-msgstr "(u) Vue du jeu mode Ultra 1"
-
-#: src/gui/statuspopup.cpp:436
-msgid "(U) ultra map view 2"
-msgstr "(u) Vue du jeu mode Ultra 2"
-
-#: src/gui/statuspopup.cpp:440
-msgid "(e) empty map view"
-msgstr "(e) Vue de la carte vide"
-
-#: src/gui/statuspopup.cpp:444
-msgid "(b) black & white map view"
-msgstr "(b) Vue de la carte en N&B"
-
-#: src/gui/statuspopup.cpp:448
-msgid "(?) map view"
-msgstr "(?) Carte"
-
-#: src/gui/statuspopup.cpp:456
-msgid "(f) use #flar for magic attack"
-msgstr "(f) Utiliser #flar comme sort d'attaque"
-
-#: src/gui/statuspopup.cpp:461
-msgid "(c) use #chiza for magic attack"
-msgstr "(c) Utiliser #chiza comme sort d'attaque"
-
-#: src/gui/statuspopup.cpp:466
-msgid "(I) use #ingrav for magic attack"
-msgstr "(I) Utiliser #ingrav comme sort d'attaque"
-
-#: src/gui/statuspopup.cpp:471
-msgid "(F) use #frillyar for magic attack"
-msgstr "(F) Utiliser #frillyar comme sort d'attaque"
-
-#: src/gui/statuspopup.cpp:476
-msgid "(U) use #upmarmu for magic attack"
-msgstr "(U) Utiliser #upmarmu comme sort d'attaque"
-
-#: src/gui/statuspopup.cpp:480
-msgid "(?) magic attack"
-msgstr "(?) Sorts d'attaque"
-
-#: src/gui/statuspopup.cpp:489
-msgid "(a) attack all players"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:493
-msgid "(f) attack not friends"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:497
-msgid "(b) attack bad relations"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:501
-msgid "(d) dont attack players"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:505
-msgid "(?) pvp attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:514
-msgid "(D) default imitation"
-msgstr "(D) Imitation par défaut"
-
-#: src/gui/statuspopup.cpp:518
-msgid "(O) outfits imitation"
-msgstr "(O) Imiter les équipements"
-
-#: src/gui/statuspopup.cpp:522
-msgid "(?) imitation"
-msgstr "(?) Imitation"
-
-#: src/gui/statuspopup.cpp:531
-msgid "(O) on keyboard"
-msgstr "(O) Présent sur le jeu"
-
-#: src/gui/statuspopup.cpp:534
-msgid "(A) away"
-msgstr "(A) Absent"
-
-#: src/gui/statuspopup.cpp:537 src/gui/statuspopup.cpp:557
-msgid "(?) away"
-msgstr "(?) Absent"
-
-#: src/gui/statuspopup.cpp:545
-msgid "(G) game camera mode"
-msgstr "(G) Mode camera du jeu"
-
-#: src/gui/statuspopup.cpp:549
-msgid "(F) free camera mode"
-msgstr "(F) Mode camera libre"
-
-#: src/gui/statuspopup.cpp:553
-msgid "(D) design camera mode"
-msgstr "(D) Définir le mode camera"
-
-#: src/gui/statuspopup.cpp:564
-msgid "Game modifiers are disabled"
-msgstr "Modificateurs de mode de jeu désactivés"
-
-#: src/gui/statuspopup.cpp:569
-msgid "Game modifiers are enabled"
-msgstr "Modificateurs de mode de jeu activés"
-
 #: src/gui/statuswindow.cpp:144 src/gui/statuswindow.cpp:274
 #: src/gui/statuswindow.cpp:337
 #, c-format
@@ -3211,136 +2947,6 @@ msgstr "Niveau : %d (GM %d)"
 msgid "Correction points: %d"
 msgstr "Points de correction : %d"
 
-#: src/gui/statuswindow.cpp:649 src/gui/statuswindow.cpp:717
-#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:753
-#: src/gui/statuswindow.cpp:818 src/gui/statuswindow.cpp:847
-#: src/gui/statuswindow.cpp:870 src/gui/statuswindow.cpp:889
-msgid "(D)"
-msgstr "(D)"
-
-#: src/gui/statuswindow.cpp:652 src/gui/statuswindow.cpp:778
-msgid "(I)"
-msgstr "(I)"
-
-#: src/gui/statuswindow.cpp:655 src/gui/statuswindow.cpp:775
-msgid "(c)"
-msgstr "(c)"
-
-#: src/gui/statuswindow.cpp:658
-msgid "(C)"
-msgstr "(C)"
-
-#: src/gui/statuswindow.cpp:661 src/gui/statuswindow.cpp:762
-#: src/gui/statuswindow.cpp:803
-msgid "(d)"
-msgstr "(d)"
-
-#: src/gui/statuswindow.cpp:664 src/gui/statuswindow.cpp:678
-#: src/gui/statuswindow.cpp:710 src/gui/statuswindow.cpp:729
-#: src/gui/statuswindow.cpp:746 src/gui/statuswindow.cpp:765
-#: src/gui/statuswindow.cpp:787 src/gui/statuswindow.cpp:806
-#: src/gui/statuswindow.cpp:836 src/gui/statuswindow.cpp:862
-#: src/gui/statuswindow.cpp:876 src/gui/statuswindow.cpp:892
-#: src/gui/statuswindow.cpp:905
-msgid "(?)"
-msgstr "(?)"
-
-#: src/gui/statuswindow.cpp:675 src/gui/statuswindow.cpp:707
-#: src/gui/statuswindow.cpp:794
-msgid "(a)"
-msgstr "(a)"
-
-#: src/gui/statuswindow.cpp:686
-msgid "(0)"
-msgstr "(0)"
-
-#: src/gui/statuswindow.cpp:689
-msgid "(1)"
-msgstr "(1)"
-
-#: src/gui/statuswindow.cpp:692
-msgid "(2)"
-msgstr "(2)"
-
-#: src/gui/statuswindow.cpp:695 src/gui/statuswindow.cpp:824
-msgid "(3)"
-msgstr "(3)"
-
-#: src/gui/statuswindow.cpp:698
-msgid "(5)"
-msgstr "(5)"
-
-#: src/gui/statuswindow.cpp:701
-msgid "(7)"
-msgstr "(7)"
-
-#: src/gui/statuswindow.cpp:704 src/gui/statuswindow.cpp:759
-#: src/gui/statuswindow.cpp:833 src/gui/statuswindow.cpp:902
-msgid "(A)"
-msgstr "(A)"
-
-#: src/gui/statuswindow.cpp:720
-msgid "(R)"
-msgstr "(R)"
-
-#: src/gui/statuswindow.cpp:723
-msgid "(M)"
-msgstr "(M)"
-
-#: src/gui/statuswindow.cpp:726
-msgid "(P)"
-msgstr "(P)"
-
-#: src/gui/statuswindow.cpp:740
-msgid "(s)"
-msgstr "(s)"
-
-#: src/gui/statuswindow.cpp:743 src/gui/statuswindow.cpp:815
-msgid "(S)"
-msgstr "(S)"
-
-#: src/gui/statuswindow.cpp:756 src/gui/statuswindow.cpp:830
-#: src/gui/statuswindow.cpp:883
-msgid "(G)"
-msgstr "(G)"
-
-#: src/gui/statuswindow.cpp:772 src/gui/statuswindow.cpp:797
-msgid "(f)"
-msgstr "(f)"
-
-#: src/gui/statuswindow.cpp:781 src/gui/statuswindow.cpp:821
-#: src/gui/statuswindow.cpp:886
-msgid "(F)"
-msgstr "(F)"
-
-#: src/gui/statuswindow.cpp:784 src/gui/statuswindow.cpp:853
-msgid "(U)"
-msgstr "(U)"
-
-#: src/gui/statuswindow.cpp:800 src/gui/statuswindow.cpp:859
-msgid "(b)"
-msgstr "(b)"
-
-#: src/gui/statuswindow.cpp:827
-msgid "(g)"
-msgstr "(g)"
-
-#: src/gui/statuswindow.cpp:844
-msgid "(N)"
-msgstr "(N)"
-
-#: src/gui/statuswindow.cpp:850
-msgid "(u)"
-msgstr "(u)"
-
-#: src/gui/statuswindow.cpp:856
-msgid "(e)"
-msgstr "(e)"
-
-#: src/gui/statuswindow.cpp:873 src/gui/statuswindow.cpp:899
-msgid "(O)"
-msgstr "(O)"
-
 #: src/gui/textcommandeditor.cpp:113
 msgid "No Target"
 msgstr "Pas de cible"
@@ -3467,8 +3073,7 @@ msgid "You don't have enough money."
 msgstr "Vous n'avez pas assez d'argent."
 
 #: src/gui/tradewindow.cpp:454
-msgid ""
-"Failed adding item. You can not overlap one kind of item on the window."
+msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "L'objet ne peux être ajouté. Vous ne pouvez ajouter deux fois le même objet "
 "dans cette fenêtre."
@@ -3656,7 +3261,7 @@ msgstr "Limites de votre position"
 msgid "Road Point"
 msgstr "Étape"
 
-#: src/gui/whoisonline.cpp:85 src/gui/whoisonline.cpp:479
+#: src/gui/whoisonline.cpp:85 src/gui/whoisonline.cpp:494
 msgid "Who Is Online - Updating"
 msgstr "Qui est en ligne - Mise à jour"
 
@@ -3664,15 +3269,15 @@ msgstr "Qui est en ligne - Mise à jour"
 msgid "Update"
 msgstr "Mise à jour"
 
-#: src/gui/whoisonline.cpp:302
+#: src/gui/whoisonline.cpp:307
 msgid "Who Is Online - "
 msgstr "Qui est en ligne - "
 
-#: src/gui/whoisonline.cpp:493
+#: src/gui/whoisonline.cpp:508
 msgid "Who Is Online - error"
 msgstr "Qui est en ligne - Erreur"
 
-#: src/gui/whoisonline.cpp:525
+#: src/gui/whoisonline.cpp:540
 msgid "Who Is Online - Update"
 msgstr "Qui est en ligne - Mise à jour"
 
@@ -3706,8 +3311,7 @@ msgstr "Commande : /users"
 
 #: src/gui/widgets/channeltab.cpp:67
 msgid "This command shows the users in this channel."
-msgstr ""
-"Cette commande affiche la liste d'utilisateurs présents dans ce salon."
+msgstr "Cette commande affiche la liste d'utilisateurs présents dans ce salon."
 
 #: src/gui/widgets/channeltab.cpp:71
 msgid "Command: /topic <message>"
@@ -3857,10 +3461,8 @@ msgid "Command: /unignore <player>"
 msgstr "Commande : /unignore <joueur>"
 
 #: src/gui/widgets/whispertab.cpp:131
-msgid ""
-"This command stops ignoring the other player if they are being ignored."
-msgstr ""
-"Cette commande vous fait cesser d'ignorer un joueur si c'était le cas."
+msgid "This command stops ignoring the other player if they are being ignored."
+msgstr "Cette commande vous fait cesser d'ignorer un joueur si c'était le cas."
 
 #: src/gui/windowmenu.cpp:65
 msgid "BC"
@@ -4389,68 +3991,335 @@ msgstr ""
 "Conflit entre les touches \"%s\" and \"%s\". Changez au moins l'une des "
 "touches ou attendez vous à un possible comportement étrange du jeu."
 
-#: src/localplayer.cpp:389
+#: src/localplayer.cpp:384
 msgid "You were killed by "
 msgstr "Vous avez été tué par "
 
-#: src/localplayer.cpp:1442
+#: src/localplayer.cpp:1434
 msgid "Tried to pick up nonexistent item."
 msgstr "Vous avez essayé de prendre un item qui n'existe pas."
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1436
 msgid "Item is too heavy."
 msgstr "L'objet est trop lourd."
 
-#: src/localplayer.cpp:1446
+#: src/localplayer.cpp:1438
 msgid "Item is too far away."
 msgstr "L'objet est trop éloigné"
 
-#: src/localplayer.cpp:1448
+#: src/localplayer.cpp:1440
 msgid "Inventory is full."
 msgstr "L'inventaire est plein"
 
-#: src/localplayer.cpp:1450
+#: src/localplayer.cpp:1442
 msgid "Stack is too big."
 msgstr "La pile est trop grande"
 
-#: src/localplayer.cpp:1453
+#: src/localplayer.cpp:1445
 msgid "Item belongs to someone else."
 msgstr "L'objet appartient a quelqu'un d'autre"
 
-#: src/localplayer.cpp:1456
+#: src/localplayer.cpp:1448
 msgid "Unknown problem picking up item."
 msgstr "Problème inconnu pour ramasser l'objet."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1480
+#: src/localplayer.cpp:1472
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "Vous avez ramassé %d [@@%d|%s@@]."
 msgstr[1] "Vous avez ramassé %d [@@%d|%s@@]."
 
-#: src/localplayer.cpp:3206
+#: src/localplayer.cpp:1887
+msgid "(D) default moves"
+msgstr "(D) Mouvements par défaut"
+
+#: src/localplayer.cpp:1888
+msgid "(I) invert moves"
+msgstr "(I) Mouvements inversés"
+
+#: src/localplayer.cpp:1889
+msgid "(c) moves with some crazy moves"
+msgstr "(c) Mouvements un peu fous"
+
+#: src/localplayer.cpp:1890
+msgid "(C) moves with crazy moves"
+msgstr "(C) Mouvement complètement fous"
+
+#: src/localplayer.cpp:1891
+msgid "(d) double normal + crazy"
+msgstr "(d) double normal et fou"
+
+#: src/localplayer.cpp:1892
+#, fuzzy
+msgid "(?) unknown move"
+msgstr "(?) Suivre : mode inconnu"
+
+#: src/localplayer.cpp:1914
+#, fuzzy, c-format
+msgid "(%d) crazy move number %d"
+msgstr "(?) Mouvements fous"
+
+#: src/localplayer.cpp:1919
+msgid "(a) custom crazy move"
+msgstr "(a) Mouvements fous personnalisés"
+
+#: src/localplayer.cpp:1923
+msgid "(?) crazy move"
+msgstr "(?) Mouvements fous"
+
+#: src/localplayer.cpp:1937
+msgid "(0) default moves to target"
+msgstr "(0) Aller à la cible distante par défaut"
+
+#: src/localplayer.cpp:1938
+msgid "(1) moves to target in distance 1"
+msgstr "(1) Aller à la cible en distante de 1"
+
+#: src/localplayer.cpp:1939
+msgid "(2) moves to target in distance 2"
+msgstr "(2) Aller vers la cible jusqu'à 2 de distance"
+
+#: src/localplayer.cpp:1940
+msgid "(3) moves to target in distance 3"
+msgstr "(3)  Aller à la cible en distante de 3"
+
+#: src/localplayer.cpp:1941
+msgid "(5) moves to target in distance 5"
+msgstr "(5)  Aller à la cible en distante de 5"
+
+#: src/localplayer.cpp:1942
+msgid "(7) moves to target in distance 7"
+msgstr "(7) Aller à la cible en distante de 7"
+
+#: src/localplayer.cpp:1943
+msgid "(A) moves to target in attack range"
+msgstr "(A) Aller à la cible dans le champ d'attaque"
+
+#: src/localplayer.cpp:1944
+msgid "(a) archer attack range"
+msgstr "(a) Portée des attaques des Archéens"
+
+#: src/localplayer.cpp:1945
+msgid "(?) move to target"
+msgstr "(?) Aller à la cible"
+
+#: src/localplayer.cpp:1964
+msgid "(D) default follow"
+msgstr "(D) Suivre : défaut"
+
+#: src/localplayer.cpp:1965
+msgid "(R) relative follow"
+msgstr "(R) Suivre: mouvement relatif"
+
+#: src/localplayer.cpp:1966
+msgid "(M) mirror follow"
+msgstr "(M) Suivre effet miroir"
+
+#: src/localplayer.cpp:1967
+msgid "(P) pet follow"
+msgstr "(P) Suivre comme un toutou"
+
+#: src/localplayer.cpp:1968
+msgid "(?) unknown follow"
+msgstr "(?) Suivre : mode inconnu"
+
+#: src/localplayer.cpp:1987 src/localplayer.cpp:1991 src/localplayer.cpp:2014
+msgid "(?) attack"
+msgstr "(?) Attaque"
+
+#: src/localplayer.cpp:1988 src/localplayer.cpp:2010
+msgid "(D) default attack"
+msgstr "(D) Attaque : défaut"
+
+#: src/localplayer.cpp:1989
+msgid "(s) switch attack without shield"
+msgstr "(s) Attaquer sans protection"
+
+#: src/localplayer.cpp:1990
+msgid "(S) switch attack with shield"
+msgstr "(S) Attaquer avec protection"
+
+#: src/localplayer.cpp:2011
+msgid "(G) go and attack"
+msgstr "(G) Se déplacer et attaquer"
+
+#: src/localplayer.cpp:2012
+msgid "(A) go, attack, pickup"
+msgstr "(A) Se déplacer, attaquer et ramasser"
+
+#: src/localplayer.cpp:2013
+msgid "(d) without auto attack"
+msgstr "(d) Sans attaque automatique"
+
+#: src/localplayer.cpp:2047
+msgid "(S) small pick up 1x1 cells"
+msgstr "(S) Ramassage sur 1x1 case"
+
+#: src/localplayer.cpp:2048
+msgid "(D) default pick up 2x1 cells"
+msgstr "(D) Ramassage par défaut sur 2x1 cases"
+
+#: src/localplayer.cpp:2049
+msgid "(F) forward pick up 2x3 cells"
+msgstr "(F) Ramassage avant sur  2x3 cases"
+
+#: src/localplayer.cpp:2050
+msgid "(3) pick up 3x3 cells"
+msgstr "(3) Ramassage sur 3x3 cases"
+
+#: src/localplayer.cpp:2051
+msgid "(g) go and pick up in distance 4"
+msgstr "(g) Aller et ramasser jusqu'à 4 de distance"
+
+#: src/localplayer.cpp:2052
+msgid "(G) go and pick up in distance 8"
+msgstr "(G) Aller et ramasser jusqu'à 8 de distance"
+
+#: src/localplayer.cpp:2053
+msgid "(A) go and pick up in max distance"
+msgstr "(A) Aller et ramasser jusqu'à la distance max"
+
+#: src/localplayer.cpp:2054
+msgid "(?) pick up"
+msgstr "(?) Ramassage"
+
+#: src/localplayer.cpp:2067
+msgid "(N) normal map view"
+msgstr "(N) Vue normale du jeu"
+
+#: src/localplayer.cpp:2068
+msgid "(D) debug map view"
+msgstr "(D) Vue du jeu mode déverminage"
+
+#: src/localplayer.cpp:2069
+msgid "(u) ultra map view"
+msgstr "(u) Vue du jeu mode Ultra 1"
+
+#: src/localplayer.cpp:2070
+msgid "(U) ultra map view 2"
+msgstr "(u) Vue du jeu mode Ultra 2"
+
+#: src/localplayer.cpp:2071
+msgid "(e) empty map view"
+msgstr "(e) Vue de la carte vide"
+
+#: src/localplayer.cpp:2072
+msgid "(b) black & white map view"
+msgstr "(b) Vue de la carte en N&B"
+
+#: src/localplayer.cpp:2091
+msgid "(f) use #flar for magic attack"
+msgstr "(f) Utiliser #flar comme sort d'attaque"
+
+#: src/localplayer.cpp:2092
+msgid "(c) use #chiza for magic attack"
+msgstr "(c) Utiliser #chiza comme sort d'attaque"
+
+#: src/localplayer.cpp:2093
+msgid "(I) use #ingrav for magic attack"
+msgstr "(I) Utiliser #ingrav comme sort d'attaque"
+
+#: src/localplayer.cpp:2094
+msgid "(F) use #frillyar for magic attack"
+msgstr "(F) Utiliser #frillyar comme sort d'attaque"
+
+#: src/localplayer.cpp:2095
+msgid "(U) use #upmarmu for magic attack"
+msgstr "(U) Utiliser #upmarmu comme sort d'attaque"
+
+#: src/localplayer.cpp:2096
+msgid "(?) magic attack"
+msgstr "(?) Sorts d'attaque"
+
+#: src/localplayer.cpp:2115
+msgid "(a) attack all players"
+msgstr ""
+
+#: src/localplayer.cpp:2116
+msgid "(f) attack not friends"
+msgstr ""
+
+#: src/localplayer.cpp:2117
+msgid "(b) attack bad relations"
+msgstr ""
+
+#: src/localplayer.cpp:2118
+msgid "(d) dont attack players"
+msgstr ""
+
+#: src/localplayer.cpp:2119
+msgid "(?) pvp attack"
+msgstr ""
+
+#: src/localplayer.cpp:2138
+msgid "(D) default imitation"
+msgstr "(D) Imitation par défaut"
+
+#: src/localplayer.cpp:2139
+msgid "(O) outfits imitation"
+msgstr "(O) Imiter les équipements"
+
+#: src/localplayer.cpp:2140
+msgid "(?) imitation"
+msgstr "(?) Imitation"
+
+#: src/localplayer.cpp:2168
 msgid "Away"
 msgstr "Inactif"
 
-#: src/localplayer.cpp:3541
+#: src/localplayer.cpp:2187
+msgid "(O) on keyboard"
+msgstr "(O) Présent sur le jeu"
+
+#: src/localplayer.cpp:2188
+msgid "(A) away"
+msgstr "(A) Absent"
+
+#: src/localplayer.cpp:2189 src/localplayer.cpp:2204
+msgid "(?) away"
+msgstr "(?) Absent"
+
+#: src/localplayer.cpp:2202
+msgid "(G) game camera mode"
+msgstr "(G) Mode camera du jeu"
+
+#: src/localplayer.cpp:2203
+msgid "(F) free camera mode"
+msgstr "(F) Mode camera libre"
+
+#: src/localplayer.cpp:2228
+msgid "Game modifiers are enabled"
+msgstr "Modificateurs de mode de jeu activés"
+
+#: src/localplayer.cpp:2229
+msgid "Game modifiers are disabled"
+msgstr "Modificateurs de mode de jeu désactivés"
+
+#: src/localplayer.cpp:2230
+#, fuzzy
+msgid "Game modifiers are unknown"
+msgstr "Modificateurs de mode de jeu activés"
+
+#: src/localplayer.cpp:3746
 msgid "Follow: "
 msgstr "Suivre : "
 
-#: src/localplayer.cpp:3543 src/localplayer.cpp:3558
+#: src/localplayer.cpp:3748 src/localplayer.cpp:3763
 msgid "Follow canceled"
 msgstr "Suivi annulé"
 
-#: src/localplayer.cpp:3550
+#: src/localplayer.cpp:3755
 msgid "Imitation: "
 msgstr "Imitation: "
 
-#: src/localplayer.cpp:3552 src/localplayer.cpp:3560
+#: src/localplayer.cpp:3757 src/localplayer.cpp:3765
 msgid "Imitation canceled"
 msgstr "Imitation annulée"
 
-#: src/localplayer.cpp:3908
+#: src/localplayer.cpp:4113
 msgid "You see "
 msgstr "Vous voyez  "
 
@@ -4543,8 +4412,7 @@ msgstr ""
 
 #: src/main.cpp:72
 msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr ""
-"      --screenshot-dir : Répertoire à utiliser pour les imprime-écrans"
+msgstr "      --screenshot-dir : Répertoire à utiliser pour les imprime-écrans"
 
 #: src/main.cpp:73
 msgid "     --safemode       : Start game in safe mode"
@@ -4566,73 +4434,73 @@ msgstr "Merci de votre achat."
 msgid "Unable to buy."
 msgstr "Incapable d'acheter."
 
-#: src/net/ea/charserverhandler.cpp:63
+#: src/net/ea/charserverhandler.cpp:66
 msgid "Strength:"
 msgstr "Force :"
 
-#: src/net/ea/charserverhandler.cpp:64
+#: src/net/ea/charserverhandler.cpp:67
 msgid "Agility:"
 msgstr "Agilité :"
 
-#: src/net/ea/charserverhandler.cpp:65
+#: src/net/ea/charserverhandler.cpp:68
 msgid "Vitality:"
 msgstr "Vitalité :"
 
-#: src/net/ea/charserverhandler.cpp:66
+#: src/net/ea/charserverhandler.cpp:69
 msgid "Intelligence:"
 msgstr "Intelligence :"
 
-#: src/net/ea/charserverhandler.cpp:67
+#: src/net/ea/charserverhandler.cpp:70
 msgid "Dexterity:"
 msgstr "Dextérité :"
 
-#: src/net/ea/charserverhandler.cpp:68
+#: src/net/ea/charserverhandler.cpp:71
 msgid "Luck:"
 msgstr "Volonté :"
 
-#: src/net/ea/charserverhandler.cpp:102
+#: src/net/ea/charserverhandler.cpp:115
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr "Accès refusé. Il y a probablement trop de joueurs sur le serveur."
 
-#: src/net/ea/charserverhandler.cpp:106
+#: src/net/ea/charserverhandler.cpp:119
 msgid "Cannot use this ID."
 msgstr "Vous ne pouvez utiliser cette identification."
 
-#: src/net/ea/charserverhandler.cpp:109
+#: src/net/ea/charserverhandler.cpp:122
 msgid "Unknown char-server failure."
 msgstr "Erreur inconnue du serveur de personnage."
 
-#: src/net/ea/charserverhandler.cpp:138
+#: src/net/ea/charserverhandler.cpp:151
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 "Impossible de créer ce personnage. Il est probable que ce nom soit déjà "
 "utilisé."
 
-#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:235
+#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:235
 msgid "Wrong name."
 msgstr "Mauvais nom."
 
-#: src/net/ea/charserverhandler.cpp:145
+#: src/net/ea/charserverhandler.cpp:158
 msgid "Incorrect stats."
 msgstr "Stats incorrectes."
 
-#: src/net/ea/charserverhandler.cpp:148
+#: src/net/ea/charserverhandler.cpp:161
 msgid "Incorrect hair."
 msgstr "Cheveux incorrects."
 
-#: src/net/ea/charserverhandler.cpp:151
+#: src/net/ea/charserverhandler.cpp:164
 msgid "Incorrect slot."
 msgstr "Case incorrecte."
 
-#: src/net/ea/charserverhandler.cpp:166 src/net/manaserv/charhandler.cpp:210
+#: src/net/ea/charserverhandler.cpp:179 src/net/manaserv/charhandler.cpp:210
 msgid "Info"
 msgstr "Informations"
 
-#: src/net/ea/charserverhandler.cpp:166
+#: src/net/ea/charserverhandler.cpp:179
 msgid "Character deleted."
 msgstr "Personnage supprimé."
 
-#: src/net/ea/charserverhandler.cpp:172
+#: src/net/ea/charserverhandler.cpp:185
 msgid "Failed to delete character."
 msgstr "La suppression du personnage n'a pu s'effectuer."
 
@@ -4866,15 +4734,15 @@ msgstr ""
 "Cette commande affiche les préférences actuelles du groupe sur le partage "
 "d'expérience."
 
-#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:284
+#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:285
 msgid "Item sharing enabled."
 msgstr "Partage d'objet activé."
 
-#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:294
+#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:295
 msgid "Item sharing disabled."
 msgstr "Partage d'objet désactivé."
 
-#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:304
+#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:305
 msgid "Item sharing not possible."
 msgstr "Partage d'objet impossible."
 
@@ -4882,15 +4750,15 @@ msgstr "Partage d'objet impossible."
 msgid "Item sharing unknown."
 msgstr "Paramètre de partage d'objets inconnu."
 
-#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:246
+#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:247
 msgid "Experience sharing enabled."
 msgstr "Partage d'expérience autorisé."
 
-#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:256
+#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:257
 msgid "Experience sharing disabled."
 msgstr "Partage d'expérience non autorisé."
 
-#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:266
+#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:267
 msgid "Experience sharing not possible."
 msgstr "Partage d'expérience impossible."
 
@@ -5011,16 +4879,16 @@ msgstr "%s ne peut rejoindre votre groupe. Celui-ci est complet."
 msgid "QQQ Unknown invite response for %s."
 msgstr "QQQ Erreur inconnue sur l'invitation de %s."
 
-#: src/net/ea/partyhandler.cpp:357
+#: src/net/ea/partyhandler.cpp:358
 msgid "You have left the party."
 msgstr "Vous avez quitté le groupe."
 
-#: src/net/ea/partyhandler.cpp:370
+#: src/net/ea/partyhandler.cpp:371
 #, c-format
 msgid "%s has left your party."
 msgstr "%s a quitté le groupe."
 
-#: src/net/ea/partyhandler.cpp:447
+#: src/net/ea/partyhandler.cpp:448
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr "Un membre inconnu a essayé de dire : %s"
@@ -5159,11 +5027,10 @@ msgstr "Message"
 
 #: src/net/ea/playerhandler.cpp:336
 msgid ""
-"You are carrying more than half your weight. You are unable to regain "
-"health."
+"You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
-"Vous portez plus de la moitié du poids de votre inventaire. Vous n'êtes plus"
-" en mesure de regagner vos points de vie."
+"Vous portez plus de la moitié du poids de votre inventaire. Vous n'êtes plus "
+"en mesure de regagner vos points de vie."
 
 #: src/net/ea/playerhandler.cpp:346
 msgid "You are carrying less than half your weight. You can regain health."
@@ -5768,19 +5635,19 @@ msgstr "Connexion au serveur terminée."
 msgid "%s is not in your party!"
 msgstr "%s n'est pas membre de votre groupe !"
 
-#: src/playerrelations.cpp:460
+#: src/playerrelations.cpp:461
 msgid "Print '...'"
 msgstr "Affiche '...'"
 
-#: src/playerrelations.cpp:480
+#: src/playerrelations.cpp:481
 msgid "Blink name"
 msgstr "Fais clignoter le nom"
 
-#: src/playerrelations.cpp:524
+#: src/playerrelations.cpp:525
 msgid "Floating '...' bubble"
 msgstr "Bulle flottante '...'"
 
-#: src/playerrelations.cpp:527
+#: src/playerrelations.cpp:528
 msgid "Floating bubble"
 msgstr "Bulle flottante"
 
@@ -5813,4 +5680,98 @@ msgstr "PM %+d"
 msgid "Unknown item"
 msgstr "Objet inconnu"
 
+#~ msgid "(?) move"
+#~ msgstr "(?) Mouvements"
+
+#~ msgid "(?) map view"
+#~ msgstr "(?) Carte"
+
+#~ msgid "(D) design camera mode"
+#~ msgstr "(D) Définir le mode camera"
+
+#~ msgid "(D)"
+#~ msgstr "(D)"
+
+#~ msgid "(I)"
+#~ msgstr "(I)"
+
+#~ msgid "(c)"
+#~ msgstr "(c)"
+
+#~ msgid "(C)"
+#~ msgstr "(C)"
+
+#~ msgid "(d)"
+#~ msgstr "(d)"
+
+#~ msgid "(?)"
+#~ msgstr "(?)"
+
+#~ msgid "(a)"
+#~ msgstr "(a)"
+
+#~ msgid "(0)"
+#~ msgstr "(0)"
+
+#~ msgid "(1)"
+#~ msgstr "(1)"
+
+#~ msgid "(2)"
+#~ msgstr "(2)"
+
+#~ msgid "(3)"
+#~ msgstr "(3)"
+
+#~ msgid "(5)"
+#~ msgstr "(5)"
+
+#~ msgid "(7)"
+#~ msgstr "(7)"
+
+#~ msgid "(A)"
+#~ msgstr "(A)"
+
+#~ msgid "(R)"
+#~ msgstr "(R)"
+
+#~ msgid "(M)"
+#~ msgstr "(M)"
+
+#~ msgid "(P)"
+#~ msgstr "(P)"
+
+#~ msgid "(s)"
+#~ msgstr "(s)"
+
+#~ msgid "(S)"
+#~ msgstr "(S)"
+
+#~ msgid "(G)"
+#~ msgstr "(G)"
+
+#~ msgid "(f)"
+#~ msgstr "(f)"
+
+#~ msgid "(F)"
+#~ msgstr "(F)"
+
+#~ msgid "(U)"
+#~ msgstr "(U)"
+
+#~ msgid "(b)"
+#~ msgstr "(b)"
+
+#~ msgid "(g)"
+#~ msgstr "(g)"
+
+#~ msgid "(N)"
+#~ msgstr "(N)"
+
+#~ msgid "(u)"
+#~ msgstr "(u)"
+
+#~ msgid "(e)"
+#~ msgstr "(e)"
 
+#~ msgid "(O)"
+#~ msgstr "(O)"
diff --git a/po/id.po b/po/id.po
index b617f51cf..f24788aaa 100644
--- a/po/id.po
+++ b/po/id.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 #   <adjieps@yahoo.com>, 2011.
 # Andrei Karas <akaras@inbox.ru>, 2011.
@@ -10,132 +10,133 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-11-12 00:23+0300\n"
+"POT-Creation-Date: 2011-11-26 02:20+0300\n"
 "PO-Revision-Date: 2011-11-11 21:38+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
-"Language-Team: Indonesian (http://www.transifex.net/projects/p/manaplus/team/id/)\n"
+"Language-Team: Indonesian (http://www.transifex.net/projects/p/manaplus/team/"
+"id/)\n"
+"Language: id\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: id\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
 #: src/actorspritemanager.cpp:1171
 msgid "Visible on map"
 msgstr "Terlihat di peta"
 
-#: src/being.cpp:551
+#: src/being.cpp:553
 msgid "dodge"
 msgstr "Menghindar"
 
-#: src/being.cpp:551
+#: src/being.cpp:553
 msgid "miss"
 msgstr "Luput"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1530
+#: src/being.cpp:1534
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1535
+#: src/being.cpp:1539
 msgid "I"
 msgstr "l"
 
-#: src/client.cpp:869 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:878 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Pengaturan"
 
-#: src/client.cpp:876 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:885 src/gui/setup_perfomance.cpp:48
 msgid "Perfomance"
 msgstr ""
 
-#: src/client.cpp:881 src/gui/setup_video.cpp:315
+#: src/client.cpp:890 src/gui/setup_video.cpp:315
 msgid "Video"
 msgstr "Video"
 
-#: src/client.cpp:886
+#: src/client.cpp:895
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:968
+#: src/client.cpp:977
 msgid "Connecting to server"
 msgstr "Terhubung dengan server"
 
-#: src/client.cpp:999
+#: src/client.cpp:1008
 msgid "Logging in"
 msgstr "Masuk"
 
-#: src/client.cpp:1032
+#: src/client.cpp:1041
 msgid "Entering game world"
 msgstr "Memasuki arena permainan"
 
-#: src/client.cpp:1132
+#: src/client.cpp:1142
 msgid "Requesting characters"
 msgstr "Pemilihan karakter"
 
-#: src/client.cpp:1163
+#: src/client.cpp:1173
 msgid "Connecting to the game server"
 msgstr "terhubung dengan server"
 
-#: src/client.cpp:1173
+#: src/client.cpp:1183
 msgid "Changing game servers"
 msgstr "Pergantian server"
 
-#: src/client.cpp:1216 src/client.cpp:1223 src/client.cpp:1357
+#: src/client.cpp:1226 src/client.cpp:1233 src/client.cpp:1367
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
-#: src/gui/charcreatedialog.cpp:221 src/gui/charselectdialog.cpp:253
+#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:254
 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
-#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
-#: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
+#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:167
+#: src/net/ea/charserverhandler.cpp:185 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "Kesalahan"
 
-#: src/client.cpp:1232
+#: src/client.cpp:1242
 msgid "Requesting registration details"
 msgstr "Meminta detail registrasi"
 
-#: src/client.cpp:1258
+#: src/client.cpp:1268
 msgid "Password Change"
 msgstr "Ubah sandi"
 
-#: src/client.cpp:1259
+#: src/client.cpp:1269
 msgid "Password changed successfully!"
 msgstr "Perubahan sandi berhasil"
 
-#: src/client.cpp:1278
+#: src/client.cpp:1288
 msgid "Email Change"
 msgstr "Perubahan email"
 
-#: src/client.cpp:1279
+#: src/client.cpp:1289
 msgid "Email changed successfully!"
 msgstr "Perubahan email berhasil"
 
-#: src/client.cpp:1299
+#: src/client.cpp:1309
 msgid "Unregister Successful"
 msgstr "Telah tidak terdaftar"
 
-#: src/client.cpp:1300
+#: src/client.cpp:1310
 msgid "Farewell, come back any time..."
 msgstr "Selamat tinggal, datang kembali setiap saat"
 
-#: src/client.cpp:1499 src/client.cpp:1529 src/client.cpp:1544
-#: src/client.cpp:1969 src/client.cpp:1976
+#: src/client.cpp:1509 src/client.cpp:1539 src/client.cpp:1554
+#: src/client.cpp:1979 src/client.cpp:1986
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s tidak ada dan tidak dapat dibuat!keluar."
 
-#: src/client.cpp:1675
+#: src/client.cpp:1685
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Gagal mengupdate host: %s"
 
-#: src/client.cpp:1709 src/client.cpp:1715
+#: src/client.cpp:1719 src/client.cpp:1725
 msgid "Error creating updates directory!"
 msgstr "Gagal membuat direktori update!"
 
-#: src/client.cpp:1736
+#: src/client.cpp:1746
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "kesalahan %s tidak ada dan tidak dapat dibuat!keluar."
@@ -151,8 +152,8 @@ msgstr "Tidak dapat mengirimkan pesan tanpa nama"
 #: src/commandhandler.cpp:343
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
-" you."
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
+"you."
 msgstr ""
 "Tidak dapat membuat kolom whisper baru untuk nama \"%s\"! nama telah ada, "
 "atau nama anda sendiri"
@@ -309,10 +310,11 @@ msgstr "Sumber gambar"
 msgid "Resource orphaned images:"
 msgstr ""
 
-#: src/commandhandler.h:40
+#: src/commandhandler.h:34
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr "Pilihan untuk /%s adalah \"ya\", \"tidak\", \"benar\",\"salah\", \"1\",\"0\"."
+msgstr ""
+"Pilihan untuk /%s adalah \"ya\", \"tidak\", \"benar\",\"salah\", \"1\",\"0\"."
 
 #: src/game.cpp:252 src/gui/widgets/chattab.cpp:403
 msgid "General"
@@ -338,19 +340,19 @@ msgstr "Koneksi ke server terputus"
 msgid "Network Error"
 msgstr "Kesalahan jaringan"
 
-#: src/game.cpp:1332
+#: src/game.cpp:1258
 msgid "Ignoring incoming trade requests"
 msgstr "Abaikan permohonan transaksi"
 
-#: src/game.cpp:1342
+#: src/game.cpp:1268
 msgid "Accepting incoming trade requests"
 msgstr "Terima permohonan transaksi"
 
-#: src/game.cpp:1750
+#: src/game.cpp:1773
 msgid "Could Not Load Map"
 msgstr "Tidak dapat menampilkan peta"
 
-#: src/game.cpp:1751
+#: src/game.cpp:1774
 #, c-format
 msgid "Error while loading %s"
 msgstr "Error ketika menunggu %s"
@@ -428,7 +430,7 @@ msgstr ""
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:207
 #: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:998
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:755
 msgid "+"
 msgstr "+"
 
@@ -436,7 +438,7 @@ msgstr "+"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:206
 #: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:1010
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:767
 msgid "-"
 msgstr "-"
 
@@ -449,7 +451,7 @@ msgstr "Keluar"
 
 #: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
 #: src/gui/statuswindow.cpp:505 src/gui/statuswindow.cpp:555
-#: src/gui/statuswindow.cpp:997 src/gui/statuswindow.cpp:1028
+#: src/gui/statuswindow.cpp:754 src/gui/statuswindow.cpp:785
 msgid "Max"
 msgstr "Max"
 
@@ -466,7 +468,7 @@ msgid "Sell"
 msgstr "Jual"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
-#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:96
+#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:105
 #: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
 #: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:344
 #: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:500
@@ -543,68 +545,68 @@ msgstr "Password baru harus kurang dari %d karakter."
 msgid "The new password entries mismatch."
 msgstr "Password baru yang dimasukkan tidak cocok."
 
-#: src/gui/charcreatedialog.cpp:58
+#: src/gui/charcreatedialog.cpp:59
 msgid "Create Character"
 msgstr "Buat Karakter"
 
-#: src/gui/charcreatedialog.cpp:76 src/gui/logindialog.cpp:94
+#: src/gui/charcreatedialog.cpp:85 src/gui/logindialog.cpp:94
 #: src/gui/register.cpp:75
 msgid "Name:"
 msgstr "Nama:"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:79 src/gui/charcreatedialog.cpp:84
-#: src/gui/charcreatedialog.cpp:90 src/gui/outfitwindow.cpp:85
+#: src/gui/charcreatedialog.cpp:88 src/gui/charcreatedialog.cpp:93
+#: src/gui/charcreatedialog.cpp:99 src/gui/outfitwindow.cpp:85
 msgid ">"
 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:82 src/gui/charcreatedialog.cpp:85
-#: src/gui/charcreatedialog.cpp:91 src/gui/outfitwindow.cpp:84
+#: src/gui/charcreatedialog.cpp:91 src/gui/charcreatedialog.cpp:94
+#: src/gui/charcreatedialog.cpp:100 src/gui/outfitwindow.cpp:84
 msgid "<"
 msgstr "<"
 
-#: src/gui/charcreatedialog.cpp:83
+#: src/gui/charcreatedialog.cpp:92
 msgid "Hair color:"
 msgstr "Warna rambut"
 
-#: src/gui/charcreatedialog.cpp:86
+#: src/gui/charcreatedialog.cpp:95
 msgid "Hair style:"
 msgstr "Gaya rambut"
 
-#: src/gui/charcreatedialog.cpp:92
+#: src/gui/charcreatedialog.cpp:101
 msgid "Race:"
 msgstr "Ras:"
 
-#: src/gui/charcreatedialog.cpp:95 src/gui/charselectdialog.cpp:480
+#: src/gui/charcreatedialog.cpp:104 src/gui/charselectdialog.cpp:481
 #: src/gui/socialwindow.cpp:1139
 msgid "Create"
 msgstr "Buat"
 
-#: src/gui/charcreatedialog.cpp:97 src/gui/register.cpp:98
+#: src/gui/charcreatedialog.cpp:106 src/gui/register.cpp:98
 msgid "Male"
 msgstr "Laki-laki"
 
-#: src/gui/charcreatedialog.cpp:98 src/gui/register.cpp:99
+#: src/gui/charcreatedialog.cpp:107 src/gui/register.cpp:99
 msgid "Female"
 msgstr "Perempuan"
 
-#: src/gui/charcreatedialog.cpp:116 src/gui/charcreatedialog.cpp:303
+#: src/gui/charcreatedialog.cpp:125 src/gui/charcreatedialog.cpp:312
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Tolong distribusikan %d point"
 
-#: src/gui/charcreatedialog.cpp:222
+#: src/gui/charcreatedialog.cpp:231
 msgid "Your name needs to be at least 4 characters."
 msgstr "Nama anda paling sedikit harus mengandung 4 karakter"
 
-#: src/gui/charcreatedialog.cpp:294
+#: src/gui/charcreatedialog.cpp:303
 msgid "Character stats OK"
 msgstr "Stats Karakter OK"
 
-#: src/gui/charcreatedialog.cpp:308
+#: src/gui/charcreatedialog.cpp:317
 #, c-format
 msgid "Please remove %d points"
 msgstr "Tolong hilangkan %d poin"
@@ -634,34 +636,34 @@ msgstr "Tidak jadi mendaftar"
 msgid "Change Email"
 msgstr "Ganti email"
 
-#: src/gui/charselectdialog.cpp:253
+#: src/gui/charselectdialog.cpp:254
 msgid "Incorrect password"
 msgstr "Sandi tidak benar"
 
-#: src/gui/charselectdialog.cpp:286
+#: src/gui/charselectdialog.cpp:287
 msgid "Enter password for deleting character"
 msgstr "Masukan Sandi untuk menghapus karakter"
 
-#: src/gui/charselectdialog.cpp:286
+#: src/gui/charselectdialog.cpp:287
 msgid "Enter password:"
 msgstr "Masukkan sandi"
 
-#: src/gui/charselectdialog.cpp:410 src/gui/serverdialog.cpp:298
+#: src/gui/charselectdialog.cpp:411 src/gui/serverdialog.cpp:298
 #: src/gui/setup_relations.cpp:244 src/gui/shopwindow.cpp:122
 #: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244
 msgid "Delete"
 msgstr "Hapus"
 
-#: src/gui/charselectdialog.cpp:468
+#: src/gui/charselectdialog.cpp:469
 msgid "Choose"
 msgstr "Pilih"
 
-#: src/gui/charselectdialog.cpp:471
+#: src/gui/charselectdialog.cpp:472
 #, c-format
 msgid "Level %d"
 msgstr "Level %d"
 
-#: src/gui/charselectdialog.cpp:482 src/gui/charselectdialog.cpp:483
+#: src/gui/charselectdialog.cpp:483 src/gui/charselectdialog.cpp:484
 msgid "(empty)"
 msgstr "(kosong)"
 
@@ -926,11 +928,11 @@ msgstr "Buka jendela otomatis"
 msgid "OK"
 msgstr "OK"
 
-#: src/gui/equipmentwindow.cpp:61 src/gui/windowmenu.cpp:74
+#: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74
 msgid "Equipment"
 msgstr "Perlengkapan"
 
-#: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160
+#: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160
 #: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554
 #: src/gui/popupmenu.cpp:1737 src/gui/popupmenu.cpp:1829
 #: src/gui/popupmenu.cpp:1874
@@ -1365,7 +1367,7 @@ msgstr "Batalkan pengabaian"
 #: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:190
 #: src/gui/popupmenu.cpp:415 src/gui/popupmenu.cpp:435
 #: src/gui/popupmenu.cpp:672 src/gui/popupmenu.cpp:692
-#: src/playerrelations.cpp:446
+#: src/playerrelations.cpp:447
 msgid "Completely ignore"
 msgstr ""
 
@@ -2870,270 +2872,6 @@ msgstr ""
 msgid "Specials"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:204
-msgid "(D) default moves"
-msgstr "(D) jalan normal"
-
-#: src/gui/statuspopup.cpp:209
-msgid "(I) invert moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:214
-msgid "(c) moves with some crazy moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:219
-msgid "(C) moves with crazy moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:224
-msgid "(d) double normal + crazy"
-msgstr "(d) normal ganda + mode gila"
-
-#: src/gui/statuspopup.cpp:229
-msgid "(?) move"
-msgstr "(?) jalan"
-
-#: src/gui/statuspopup.cpp:247
-msgid "(a) custom crazy move"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:251
-msgid "(?) crazy move"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:261
-msgid "(0) default moves to target"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:266
-msgid "(1) moves to target in distance 1"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:271
-msgid "(2) moves to target in distance 2"
-msgstr "(2) jalan ke target di jarak 2"
-
-#: src/gui/statuspopup.cpp:276
-msgid "(3) moves to target in distance 3"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:281
-msgid "(5) moves to target in distance 5"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:286
-msgid "(7) moves to target in distance 7"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:291
-msgid "(A) moves to target in attack range"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:296
-msgid "(a) archer attack range"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:301
-msgid "(?) move to target"
-msgstr "(?)bergerak ke target"
-
-#: src/gui/statuspopup.cpp:309
-msgid "(D) default follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:313
-msgid "(R) relative follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:317
-msgid "(M) mirror follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:321
-msgid "(P) pet follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:325
-msgid "(?) unknown follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:334 src/gui/statuspopup.cpp:357
-msgid "(D) default attack"
-msgstr "(D) pukulan normal"
-
-#: src/gui/statuspopup.cpp:339
-msgid "(s) switch attack without shield"
-msgstr "(s) ganti pukulan tanpa pelindung"
-
-#: src/gui/statuspopup.cpp:344
-msgid "(S) switch attack with shield"
-msgstr "(S) pukulan dengan pelindung"
-
-#: src/gui/statuspopup.cpp:348 src/gui/statuspopup.cpp:373
-msgid "(?) attack"
-msgstr "(?)serangan"
-
-#: src/gui/statuspopup.cpp:361
-msgid "(G) go and attack"
-msgstr "(G) jalan dan serang"
-
-#: src/gui/statuspopup.cpp:365
-msgid "(A) go, attack, pickup"
-msgstr "(A) jalan, serang, ambil"
-
-#: src/gui/statuspopup.cpp:369
-msgid "(d) without auto attack"
-msgstr "(d) tanpa penyerangan otomatis"
-
-#: src/gui/statuspopup.cpp:387
-msgid "(S) small pick up 1x1 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:391
-msgid "(D) default pick up 2x1 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:395
-msgid "(F) forward pick up 2x3 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:399
-msgid "(3) pick up 3x3 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:403
-msgid "(g) go and pick up in distance 4"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:407
-msgid "(G) go and pick up in distance 8"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:411
-msgid "(A) go and pick up in max distance"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:415
-msgid "(?) pick up"
-msgstr "(?)mengambil"
-
-#: src/gui/statuspopup.cpp:424
-msgid "(N) normal map view"
-msgstr "(N) penampilan peta normal"
-
-#: src/gui/statuspopup.cpp:428
-msgid "(D) debug map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:432
-msgid "(u) ultra map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:436
-msgid "(U) ultra map view 2"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:440
-msgid "(e) empty map view"
-msgstr "(e) penampilan peta kosong"
-
-#: src/gui/statuspopup.cpp:444
-msgid "(b) black & white map view"
-msgstr "(b)penampilan peta hitam & putih"
-
-#: src/gui/statuspopup.cpp:448
-msgid "(?) map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:456
-msgid "(f) use #flar for magic attack"
-msgstr "(f) gunakan #flar untuk serangan magic"
-
-#: src/gui/statuspopup.cpp:461
-msgid "(c) use #chiza for magic attack"
-msgstr "(c) gunakan #chiza untuk serangan magic"
-
-#: src/gui/statuspopup.cpp:466
-msgid "(I) use #ingrav for magic attack"
-msgstr "(l) gunakan #ingrav untuk serangan magic"
-
-#: src/gui/statuspopup.cpp:471
-msgid "(F) use #frillyar for magic attack"
-msgstr "(F) gunakan #frillyar untuk serangan magic"
-
-#: src/gui/statuspopup.cpp:476
-msgid "(U) use #upmarmu for magic attack"
-msgstr "(U) gunakan #upmarmu untuk serangan magic"
-
-#: src/gui/statuspopup.cpp:480
-msgid "(?) magic attack"
-msgstr "(?) serangan magic"
-
-#: src/gui/statuspopup.cpp:489
-msgid "(a) attack all players"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:493
-msgid "(f) attack not friends"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:497
-msgid "(b) attack bad relations"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:501
-msgid "(d) dont attack players"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:505
-msgid "(?) pvp attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:514
-msgid "(D) default imitation"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:518
-msgid "(O) outfits imitation"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:522
-msgid "(?) imitation"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:531
-msgid "(O) on keyboard"
-msgstr "(O) pada keyboard"
-
-#: src/gui/statuspopup.cpp:534
-msgid "(A) away"
-msgstr "(A) pergi"
-
-#: src/gui/statuspopup.cpp:537 src/gui/statuspopup.cpp:557
-msgid "(?) away"
-msgstr "(?) pergi"
-
-#: src/gui/statuspopup.cpp:545
-msgid "(G) game camera mode"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:549
-msgid "(F) free camera mode"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:553
-msgid "(D) design camera mode"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:564
-msgid "Game modifiers are disabled"
-msgstr "Perombakan game tidak diperbolehkan"
-
-#: src/gui/statuspopup.cpp:569
-msgid "Game modifiers are enabled"
-msgstr "Perombakan game diperbolehkan"
-
 #: src/gui/statuswindow.cpp:144 src/gui/statuswindow.cpp:274
 #: src/gui/statuswindow.cpp:337
 #, c-format
@@ -3182,136 +2920,6 @@ msgstr ""
 msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:649 src/gui/statuswindow.cpp:717
-#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:753
-#: src/gui/statuswindow.cpp:818 src/gui/statuswindow.cpp:847
-#: src/gui/statuswindow.cpp:870 src/gui/statuswindow.cpp:889
-msgid "(D)"
-msgstr "(D)"
-
-#: src/gui/statuswindow.cpp:652 src/gui/statuswindow.cpp:778
-msgid "(I)"
-msgstr "(l)"
-
-#: src/gui/statuswindow.cpp:655 src/gui/statuswindow.cpp:775
-msgid "(c)"
-msgstr "(c)"
-
-#: src/gui/statuswindow.cpp:658
-msgid "(C)"
-msgstr "(C)"
-
-#: src/gui/statuswindow.cpp:661 src/gui/statuswindow.cpp:762
-#: src/gui/statuswindow.cpp:803
-msgid "(d)"
-msgstr "(d)"
-
-#: src/gui/statuswindow.cpp:664 src/gui/statuswindow.cpp:678
-#: src/gui/statuswindow.cpp:710 src/gui/statuswindow.cpp:729
-#: src/gui/statuswindow.cpp:746 src/gui/statuswindow.cpp:765
-#: src/gui/statuswindow.cpp:787 src/gui/statuswindow.cpp:806
-#: src/gui/statuswindow.cpp:836 src/gui/statuswindow.cpp:862
-#: src/gui/statuswindow.cpp:876 src/gui/statuswindow.cpp:892
-#: src/gui/statuswindow.cpp:905
-msgid "(?)"
-msgstr "(?)"
-
-#: src/gui/statuswindow.cpp:675 src/gui/statuswindow.cpp:707
-#: src/gui/statuswindow.cpp:794
-msgid "(a)"
-msgstr "(a)"
-
-#: src/gui/statuswindow.cpp:686
-msgid "(0)"
-msgstr "(0)"
-
-#: src/gui/statuswindow.cpp:689
-msgid "(1)"
-msgstr "(1)"
-
-#: src/gui/statuswindow.cpp:692
-msgid "(2)"
-msgstr "(2)"
-
-#: src/gui/statuswindow.cpp:695 src/gui/statuswindow.cpp:824
-msgid "(3)"
-msgstr "(3)"
-
-#: src/gui/statuswindow.cpp:698
-msgid "(5)"
-msgstr "(5)"
-
-#: src/gui/statuswindow.cpp:701
-msgid "(7)"
-msgstr "(7)"
-
-#: src/gui/statuswindow.cpp:704 src/gui/statuswindow.cpp:759
-#: src/gui/statuswindow.cpp:833 src/gui/statuswindow.cpp:902
-msgid "(A)"
-msgstr "(A)"
-
-#: src/gui/statuswindow.cpp:720
-msgid "(R)"
-msgstr "(R)"
-
-#: src/gui/statuswindow.cpp:723
-msgid "(M)"
-msgstr "(M)"
-
-#: src/gui/statuswindow.cpp:726
-msgid "(P)"
-msgstr "(P)"
-
-#: src/gui/statuswindow.cpp:740
-msgid "(s)"
-msgstr "(s)"
-
-#: src/gui/statuswindow.cpp:743 src/gui/statuswindow.cpp:815
-msgid "(S)"
-msgstr "(S)"
-
-#: src/gui/statuswindow.cpp:756 src/gui/statuswindow.cpp:830
-#: src/gui/statuswindow.cpp:883
-msgid "(G)"
-msgstr "(G)"
-
-#: src/gui/statuswindow.cpp:772 src/gui/statuswindow.cpp:797
-msgid "(f)"
-msgstr "(f)"
-
-#: src/gui/statuswindow.cpp:781 src/gui/statuswindow.cpp:821
-#: src/gui/statuswindow.cpp:886
-msgid "(F)"
-msgstr "(F)"
-
-#: src/gui/statuswindow.cpp:784 src/gui/statuswindow.cpp:853
-msgid "(U)"
-msgstr "(U)"
-
-#: src/gui/statuswindow.cpp:800 src/gui/statuswindow.cpp:859
-msgid "(b)"
-msgstr "(b)"
-
-#: src/gui/statuswindow.cpp:827
-msgid "(g)"
-msgstr "(g)"
-
-#: src/gui/statuswindow.cpp:844
-msgid "(N)"
-msgstr "(N)"
-
-#: src/gui/statuswindow.cpp:850
-msgid "(u)"
-msgstr "(u)"
-
-#: src/gui/statuswindow.cpp:856
-msgid "(e)"
-msgstr "(e)"
-
-#: src/gui/statuswindow.cpp:873 src/gui/statuswindow.cpp:899
-msgid "(O)"
-msgstr "(O)"
-
 #: src/gui/textcommandeditor.cpp:113
 msgid "No Target"
 msgstr "Tidak ada target"
@@ -3438,8 +3046,7 @@ msgid "You don't have enough money."
 msgstr "Anda tidak memiliki cukup uang."
 
 #: src/gui/tradewindow.cpp:454
-msgid ""
-"Failed adding item. You can not overlap one kind of item on the window."
+msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
 #: src/gui/unregisterdialog.cpp:54
@@ -3625,7 +3232,7 @@ msgstr ""
 msgid "Road Point"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:85 src/gui/whoisonline.cpp:479
+#: src/gui/whoisonline.cpp:85 src/gui/whoisonline.cpp:494
 msgid "Who Is Online - Updating"
 msgstr ""
 
@@ -3633,15 +3240,15 @@ msgstr ""
 msgid "Update"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:302
+#: src/gui/whoisonline.cpp:307
 msgid "Who Is Online - "
 msgstr ""
 
-#: src/gui/whoisonline.cpp:493
+#: src/gui/whoisonline.cpp:508
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:525
+#: src/gui/whoisonline.cpp:540
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -3817,8 +3424,7 @@ msgid "Command: /unignore <player>"
 msgstr "perintah: /unignore <nama pemain>"
 
 #: src/gui/widgets/whispertab.cpp:131
-msgid ""
-"This command stops ignoring the other player if they are being ignored."
+msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
 #: src/gui/windowmenu.cpp:65
@@ -4346,67 +3952,334 @@ msgid ""
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:389
+#: src/localplayer.cpp:384
 msgid "You were killed by "
 msgstr ""
 
-#: src/localplayer.cpp:1442
+#: src/localplayer.cpp:1434
 msgid "Tried to pick up nonexistent item."
 msgstr "Mencoba mengambil item yang tidak lagi ada"
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1436
 msgid "Item is too heavy."
 msgstr "item terlalu berat"
 
-#: src/localplayer.cpp:1446
+#: src/localplayer.cpp:1438
 msgid "Item is too far away."
 msgstr "barang terlalu jauh"
 
-#: src/localplayer.cpp:1448
+#: src/localplayer.cpp:1440
 msgid "Inventory is full."
 msgstr "Perbekalan sudah penuh"
 
-#: src/localplayer.cpp:1450
+#: src/localplayer.cpp:1442
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1453
+#: src/localplayer.cpp:1445
 msgid "Item belongs to someone else."
 msgstr "Barang milik orang lain."
 
-#: src/localplayer.cpp:1456
+#: src/localplayer.cpp:1448
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1480
+#: src/localplayer.cpp:1472
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 
-#: src/localplayer.cpp:3206
+#: src/localplayer.cpp:1887
+msgid "(D) default moves"
+msgstr "(D) jalan normal"
+
+#: src/localplayer.cpp:1888
+msgid "(I) invert moves"
+msgstr ""
+
+#: src/localplayer.cpp:1889
+msgid "(c) moves with some crazy moves"
+msgstr ""
+
+#: src/localplayer.cpp:1890
+msgid "(C) moves with crazy moves"
+msgstr ""
+
+#: src/localplayer.cpp:1891
+msgid "(d) double normal + crazy"
+msgstr "(d) normal ganda + mode gila"
+
+#: src/localplayer.cpp:1892
+#, fuzzy
+msgid "(?) unknown move"
+msgstr "(?) jalan"
+
+#: src/localplayer.cpp:1914
+#, c-format
+msgid "(%d) crazy move number %d"
+msgstr ""
+
+#: src/localplayer.cpp:1919
+msgid "(a) custom crazy move"
+msgstr ""
+
+#: src/localplayer.cpp:1923
+msgid "(?) crazy move"
+msgstr ""
+
+#: src/localplayer.cpp:1937
+msgid "(0) default moves to target"
+msgstr ""
+
+#: src/localplayer.cpp:1938
+msgid "(1) moves to target in distance 1"
+msgstr ""
+
+#: src/localplayer.cpp:1939
+msgid "(2) moves to target in distance 2"
+msgstr "(2) jalan ke target di jarak 2"
+
+#: src/localplayer.cpp:1940
+msgid "(3) moves to target in distance 3"
+msgstr ""
+
+#: src/localplayer.cpp:1941
+msgid "(5) moves to target in distance 5"
+msgstr ""
+
+#: src/localplayer.cpp:1942
+msgid "(7) moves to target in distance 7"
+msgstr ""
+
+#: src/localplayer.cpp:1943
+msgid "(A) moves to target in attack range"
+msgstr ""
+
+#: src/localplayer.cpp:1944
+msgid "(a) archer attack range"
+msgstr ""
+
+#: src/localplayer.cpp:1945
+msgid "(?) move to target"
+msgstr "(?)bergerak ke target"
+
+#: src/localplayer.cpp:1964
+msgid "(D) default follow"
+msgstr ""
+
+#: src/localplayer.cpp:1965
+msgid "(R) relative follow"
+msgstr ""
+
+#: src/localplayer.cpp:1966
+msgid "(M) mirror follow"
+msgstr ""
+
+#: src/localplayer.cpp:1967
+msgid "(P) pet follow"
+msgstr ""
+
+#: src/localplayer.cpp:1968
+msgid "(?) unknown follow"
+msgstr ""
+
+#: src/localplayer.cpp:1987 src/localplayer.cpp:1991 src/localplayer.cpp:2014
+msgid "(?) attack"
+msgstr "(?)serangan"
+
+#: src/localplayer.cpp:1988 src/localplayer.cpp:2010
+msgid "(D) default attack"
+msgstr "(D) pukulan normal"
+
+#: src/localplayer.cpp:1989
+msgid "(s) switch attack without shield"
+msgstr "(s) ganti pukulan tanpa pelindung"
+
+#: src/localplayer.cpp:1990
+msgid "(S) switch attack with shield"
+msgstr "(S) pukulan dengan pelindung"
+
+#: src/localplayer.cpp:2011
+msgid "(G) go and attack"
+msgstr "(G) jalan dan serang"
+
+#: src/localplayer.cpp:2012
+msgid "(A) go, attack, pickup"
+msgstr "(A) jalan, serang, ambil"
+
+#: src/localplayer.cpp:2013
+msgid "(d) without auto attack"
+msgstr "(d) tanpa penyerangan otomatis"
+
+#: src/localplayer.cpp:2047
+msgid "(S) small pick up 1x1 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2048
+msgid "(D) default pick up 2x1 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2049
+msgid "(F) forward pick up 2x3 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2050
+msgid "(3) pick up 3x3 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2051
+msgid "(g) go and pick up in distance 4"
+msgstr ""
+
+#: src/localplayer.cpp:2052
+msgid "(G) go and pick up in distance 8"
+msgstr ""
+
+#: src/localplayer.cpp:2053
+msgid "(A) go and pick up in max distance"
+msgstr ""
+
+#: src/localplayer.cpp:2054
+msgid "(?) pick up"
+msgstr "(?)mengambil"
+
+#: src/localplayer.cpp:2067
+msgid "(N) normal map view"
+msgstr "(N) penampilan peta normal"
+
+#: src/localplayer.cpp:2068
+msgid "(D) debug map view"
+msgstr ""
+
+#: src/localplayer.cpp:2069
+msgid "(u) ultra map view"
+msgstr ""
+
+#: src/localplayer.cpp:2070
+msgid "(U) ultra map view 2"
+msgstr ""
+
+#: src/localplayer.cpp:2071
+msgid "(e) empty map view"
+msgstr "(e) penampilan peta kosong"
+
+#: src/localplayer.cpp:2072
+msgid "(b) black & white map view"
+msgstr "(b)penampilan peta hitam & putih"
+
+#: src/localplayer.cpp:2091
+msgid "(f) use #flar for magic attack"
+msgstr "(f) gunakan #flar untuk serangan magic"
+
+#: src/localplayer.cpp:2092
+msgid "(c) use #chiza for magic attack"
+msgstr "(c) gunakan #chiza untuk serangan magic"
+
+#: src/localplayer.cpp:2093
+msgid "(I) use #ingrav for magic attack"
+msgstr "(l) gunakan #ingrav untuk serangan magic"
+
+#: src/localplayer.cpp:2094
+msgid "(F) use #frillyar for magic attack"
+msgstr "(F) gunakan #frillyar untuk serangan magic"
+
+#: src/localplayer.cpp:2095
+msgid "(U) use #upmarmu for magic attack"
+msgstr "(U) gunakan #upmarmu untuk serangan magic"
+
+#: src/localplayer.cpp:2096
+msgid "(?) magic attack"
+msgstr "(?) serangan magic"
+
+#: src/localplayer.cpp:2115
+msgid "(a) attack all players"
+msgstr ""
+
+#: src/localplayer.cpp:2116
+msgid "(f) attack not friends"
+msgstr ""
+
+#: src/localplayer.cpp:2117
+msgid "(b) attack bad relations"
+msgstr ""
+
+#: src/localplayer.cpp:2118
+msgid "(d) dont attack players"
+msgstr ""
+
+#: src/localplayer.cpp:2119
+msgid "(?) pvp attack"
+msgstr ""
+
+#: src/localplayer.cpp:2138
+msgid "(D) default imitation"
+msgstr ""
+
+#: src/localplayer.cpp:2139
+msgid "(O) outfits imitation"
+msgstr ""
+
+#: src/localplayer.cpp:2140
+msgid "(?) imitation"
+msgstr ""
+
+#: src/localplayer.cpp:2168
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:3541
+#: src/localplayer.cpp:2187
+msgid "(O) on keyboard"
+msgstr "(O) pada keyboard"
+
+#: src/localplayer.cpp:2188
+msgid "(A) away"
+msgstr "(A) pergi"
+
+#: src/localplayer.cpp:2189 src/localplayer.cpp:2204
+msgid "(?) away"
+msgstr "(?) pergi"
+
+#: src/localplayer.cpp:2202
+msgid "(G) game camera mode"
+msgstr ""
+
+#: src/localplayer.cpp:2203
+msgid "(F) free camera mode"
+msgstr ""
+
+#: src/localplayer.cpp:2228
+msgid "Game modifiers are enabled"
+msgstr "Perombakan game diperbolehkan"
+
+#: src/localplayer.cpp:2229
+msgid "Game modifiers are disabled"
+msgstr "Perombakan game tidak diperbolehkan"
+
+#: src/localplayer.cpp:2230
+#, fuzzy
+msgid "Game modifiers are unknown"
+msgstr "Perombakan game diperbolehkan"
+
+#: src/localplayer.cpp:3746
 msgid "Follow: "
 msgstr "Ikuti:"
 
-#: src/localplayer.cpp:3543 src/localplayer.cpp:3558
+#: src/localplayer.cpp:3748 src/localplayer.cpp:3763
 msgid "Follow canceled"
 msgstr "Batal mengikuti"
 
-#: src/localplayer.cpp:3550
+#: src/localplayer.cpp:3755
 msgid "Imitation: "
 msgstr "Tirukan:"
 
-#: src/localplayer.cpp:3552 src/localplayer.cpp:3560
+#: src/localplayer.cpp:3757 src/localplayer.cpp:3765
 msgid "Imitation canceled"
 msgstr "Batal menirukan"
 
-#: src/localplayer.cpp:3908
+#: src/localplayer.cpp:4113
 msgid "You see "
 msgstr ""
 
@@ -4514,71 +4387,71 @@ msgstr ""
 msgid "Unable to buy."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:63
+#: src/net/ea/charserverhandler.cpp:66
 msgid "Strength:"
 msgstr "Kekuatan"
 
-#: src/net/ea/charserverhandler.cpp:64
+#: src/net/ea/charserverhandler.cpp:67
 msgid "Agility:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:65
+#: src/net/ea/charserverhandler.cpp:68
 msgid "Vitality:"
 msgstr "Daya/Tenaga Hidup"
 
-#: src/net/ea/charserverhandler.cpp:66
+#: src/net/ea/charserverhandler.cpp:69
 msgid "Intelligence:"
 msgstr "Kecerdasan"
 
-#: src/net/ea/charserverhandler.cpp:67
+#: src/net/ea/charserverhandler.cpp:70
 msgid "Dexterity:"
 msgstr "Ketangkasan"
 
-#: src/net/ea/charserverhandler.cpp:68
+#: src/net/ea/charserverhandler.cpp:71
 msgid "Luck:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:102
+#: src/net/ea/charserverhandler.cpp:115
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:106
+#: src/net/ea/charserverhandler.cpp:119
 msgid "Cannot use this ID."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:109
+#: src/net/ea/charserverhandler.cpp:122
 msgid "Unknown char-server failure."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:138
+#: src/net/ea/charserverhandler.cpp:151
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:235
+#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:235
 msgid "Wrong name."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:145
+#: src/net/ea/charserverhandler.cpp:158
 msgid "Incorrect stats."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:148
+#: src/net/ea/charserverhandler.cpp:161
 msgid "Incorrect hair."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:151
+#: src/net/ea/charserverhandler.cpp:164
 msgid "Incorrect slot."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:166 src/net/manaserv/charhandler.cpp:210
+#: src/net/ea/charserverhandler.cpp:179 src/net/manaserv/charhandler.cpp:210
 msgid "Info"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:166
+#: src/net/ea/charserverhandler.cpp:179
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:172
+#: src/net/ea/charserverhandler.cpp:185
 msgid "Failed to delete character."
 msgstr ""
 
@@ -4803,15 +4676,15 @@ msgstr ""
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:284
+#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:285
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:294
+#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:295
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:304
+#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:305
 msgid "Item sharing not possible."
 msgstr ""
 
@@ -4819,15 +4692,15 @@ msgstr ""
 msgid "Item sharing unknown."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:246
+#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:247
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:256
+#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:257
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:266
+#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:267
 msgid "Experience sharing not possible."
 msgstr ""
 
@@ -4944,16 +4817,16 @@ msgstr "%s tidak dapat bergabung dengan kelompok karena kelompok sudah penuh."
 msgid "QQQ Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:357
+#: src/net/ea/partyhandler.cpp:358
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:370
+#: src/net/ea/partyhandler.cpp:371
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:447
+#: src/net/ea/partyhandler.cpp:448
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
@@ -5080,8 +4953,7 @@ msgstr ""
 
 #: src/net/ea/playerhandler.cpp:336
 msgid ""
-"You are carrying more than half your weight. You are unable to regain "
-"health."
+"You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 
 #: src/net/ea/playerhandler.cpp:346
@@ -5675,19 +5547,19 @@ msgstr ""
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/playerrelations.cpp:460
+#: src/playerrelations.cpp:461
 msgid "Print '...'"
 msgstr ""
 
-#: src/playerrelations.cpp:480
+#: src/playerrelations.cpp:481
 msgid "Blink name"
 msgstr ""
 
-#: src/playerrelations.cpp:524
+#: src/playerrelations.cpp:525
 msgid "Floating '...' bubble"
 msgstr ""
 
-#: src/playerrelations.cpp:527
+#: src/playerrelations.cpp:528
 msgid "Floating bubble"
 msgstr ""
 
@@ -5720,4 +5592,89 @@ msgstr "MP %+d"
 msgid "Unknown item"
 msgstr ""
 
+#~ msgid "(D)"
+#~ msgstr "(D)"
+
+#~ msgid "(I)"
+#~ msgstr "(l)"
+
+#~ msgid "(c)"
+#~ msgstr "(c)"
+
+#~ msgid "(C)"
+#~ msgstr "(C)"
+
+#~ msgid "(d)"
+#~ msgstr "(d)"
+
+#~ msgid "(?)"
+#~ msgstr "(?)"
+
+#~ msgid "(a)"
+#~ msgstr "(a)"
+
+#~ msgid "(0)"
+#~ msgstr "(0)"
+
+#~ msgid "(1)"
+#~ msgstr "(1)"
+
+#~ msgid "(2)"
+#~ msgstr "(2)"
+
+#~ msgid "(3)"
+#~ msgstr "(3)"
+
+#~ msgid "(5)"
+#~ msgstr "(5)"
+
+#~ msgid "(7)"
+#~ msgstr "(7)"
+
+#~ msgid "(A)"
+#~ msgstr "(A)"
+
+#~ msgid "(R)"
+#~ msgstr "(R)"
+
+#~ msgid "(M)"
+#~ msgstr "(M)"
+
+#~ msgid "(P)"
+#~ msgstr "(P)"
+
+#~ msgid "(s)"
+#~ msgstr "(s)"
+
+#~ msgid "(S)"
+#~ msgstr "(S)"
+
+#~ msgid "(G)"
+#~ msgstr "(G)"
+
+#~ msgid "(f)"
+#~ msgstr "(f)"
+
+#~ msgid "(F)"
+#~ msgstr "(F)"
+
+#~ msgid "(U)"
+#~ msgstr "(U)"
+
+#~ msgid "(b)"
+#~ msgstr "(b)"
+
+#~ msgid "(g)"
+#~ msgstr "(g)"
+
+#~ msgid "(N)"
+#~ msgstr "(N)"
+
+#~ msgid "(u)"
+#~ msgstr "(u)"
+
+#~ msgid "(e)"
+#~ msgstr "(e)"
 
+#~ msgid "(O)"
+#~ msgstr "(O)"
diff --git a/po/ja.po b/po/ja.po
index fbe04c585..d417f15f5 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Andrei Karas <akaras@inbox.ru>, 2011.
 # Necromonger <Necromong@inbox.ru>, 2011.
@@ -11,132 +11,133 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-11-12 00:23+0300\n"
+"POT-Creation-Date: 2011-11-26 02:20+0300\n"
 "PO-Revision-Date: 2011-11-11 21:38+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
-"Language-Team: Japanese (http://www.transifex.net/projects/p/manaplus/team/ja/)\n"
+"Language-Team: Japanese (http://www.transifex.net/projects/p/manaplus/team/"
+"ja/)\n"
+"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ja\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
 #: src/actorspritemanager.cpp:1171
 msgid "Visible on map"
 msgstr ""
 
-#: src/being.cpp:551
+#: src/being.cpp:553
 msgid "dodge"
 msgstr "ドッジ"
 
-#: src/being.cpp:551
+#: src/being.cpp:553
 msgid "miss"
 msgstr "ミス"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1530
+#: src/being.cpp:1534
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1535
+#: src/being.cpp:1539
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:869 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:878 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "設定"
 
-#: src/client.cpp:876 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:885 src/gui/setup_perfomance.cpp:48
 msgid "Perfomance"
 msgstr ""
 
-#: src/client.cpp:881 src/gui/setup_video.cpp:315
+#: src/client.cpp:890 src/gui/setup_video.cpp:315
 msgid "Video"
 msgstr "ビデオ"
 
-#: src/client.cpp:886
+#: src/client.cpp:895
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:968
+#: src/client.cpp:977
 msgid "Connecting to server"
 msgstr "サーバー通信中…"
 
-#: src/client.cpp:999
+#: src/client.cpp:1008
 msgid "Logging in"
 msgstr "ログイン中…"
 
-#: src/client.cpp:1032
+#: src/client.cpp:1041
 msgid "Entering game world"
 msgstr "ゲームの世界に入る中"
 
-#: src/client.cpp:1132
+#: src/client.cpp:1142
 msgid "Requesting characters"
 msgstr "服：％d"
 
-#: src/client.cpp:1163
+#: src/client.cpp:1173
 msgid "Connecting to the game server"
 msgstr "ゲームサーバー通信中…"
 
-#: src/client.cpp:1173
+#: src/client.cpp:1183
 msgid "Changing game servers"
 msgstr "サーバーを入り替え中…"
 
-#: src/client.cpp:1216 src/client.cpp:1223 src/client.cpp:1357
+#: src/client.cpp:1226 src/client.cpp:1233 src/client.cpp:1367
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
-#: src/gui/charcreatedialog.cpp:221 src/gui/charselectdialog.cpp:253
+#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:254
 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
-#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
-#: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
+#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:167
+#: src/net/ea/charserverhandler.cpp:185 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "エラー"
 
-#: src/client.cpp:1232
+#: src/client.cpp:1242
 msgid "Requesting registration details"
 msgstr "登録細目を要請中"
 
-#: src/client.cpp:1258
+#: src/client.cpp:1268
 msgid "Password Change"
 msgstr "パスワード変更"
 
-#: src/client.cpp:1259
+#: src/client.cpp:1269
 msgid "Password changed successfully!"
 msgstr "パスワード変更成功！"
 
-#: src/client.cpp:1278
+#: src/client.cpp:1288
 msgid "Email Change"
 msgstr "メール変更"
 
-#: src/client.cpp:1279
+#: src/client.cpp:1289
 msgid "Email changed successfully!"
 msgstr "メール変更成功！"
 
-#: src/client.cpp:1299
+#: src/client.cpp:1309
 msgid "Unregister Successful"
 msgstr "登録解除成功"
 
-#: src/client.cpp:1300
+#: src/client.cpp:1310
 msgid "Farewell, come back any time..."
 msgstr "さよなら、いつでも戻ってね..."
 
-#: src/client.cpp:1499 src/client.cpp:1529 src/client.cpp:1544
-#: src/client.cpp:1969 src/client.cpp:1976
+#: src/client.cpp:1509 src/client.cpp:1539 src/client.cpp:1554
+#: src/client.cpp:1979 src/client.cpp:1986
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s は存在しないので作成することが不可能！終了中…"
 
-#: src/client.cpp:1675
+#: src/client.cpp:1685
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "無効なアップデートホスト:  %s"
 
-#: src/client.cpp:1709 src/client.cpp:1715
+#: src/client.cpp:1719 src/client.cpp:1725
 msgid "Error creating updates directory!"
 msgstr "更新フォルダの作成エラー"
 
-#: src/client.cpp:1736
+#: src/client.cpp:1746
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "エラー： %s は存在しないので作成することが不可能！終了中…"
@@ -152,9 +153,11 @@ msgstr "空のメッセージを送信することはできません！"
 #: src/commandhandler.cpp:343
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
-" you."
-msgstr "%sと言うメッセージタブの作成ができません！それはもう既に存在しているか、自分です。"
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
+"you."
+msgstr ""
+"%sと言うメッセージタブの作成ができません！それはもう既に存在しているか、自分"
+"です。"
 
 #: src/commandhandler.cpp:363
 #, c-format
@@ -308,10 +311,12 @@ msgstr ""
 msgid "Resource orphaned images:"
 msgstr ""
 
-#: src/commandhandler.h:40
+#: src/commandhandler.h:34
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr "/%sへの可能なオプションは：\"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"。"
+msgstr ""
+"/%sへの可能なオプションは：\"yes\", \"no\", \"true\", \"false\", \"1\", "
+"\"0\"。"
 
 #: src/game.cpp:252 src/gui/widgets/chattab.cpp:403
 msgid "General"
@@ -337,19 +342,19 @@ msgstr ""
 msgid "Network Error"
 msgstr "ネットワークエラー"
 
-#: src/game.cpp:1332
+#: src/game.cpp:1258
 msgid "Ignoring incoming trade requests"
 msgstr "他人からのトレードリクエストを無視します。"
 
-#: src/game.cpp:1342
+#: src/game.cpp:1268
 msgid "Accepting incoming trade requests"
 msgstr "他人からのトレードリクエストを受け入れます。"
 
-#: src/game.cpp:1750
+#: src/game.cpp:1773
 msgid "Could Not Load Map"
 msgstr "マップをロードできませんでした"
 
-#: src/game.cpp:1751
+#: src/game.cpp:1774
 #, c-format
 msgid "Error while loading %s"
 msgstr "%sをロードしている間にエラーが起きました。"
@@ -427,7 +432,7 @@ msgstr ""
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:207
 #: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:998
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:755
 msgid "+"
 msgstr "+"
 
@@ -435,7 +440,7 @@ msgstr "+"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:206
 #: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:1010
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:767
 msgid "-"
 msgstr "-"
 
@@ -448,7 +453,7 @@ msgstr "終了"
 
 #: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
 #: src/gui/statuswindow.cpp:505 src/gui/statuswindow.cpp:555
-#: src/gui/statuswindow.cpp:997 src/gui/statuswindow.cpp:1028
+#: src/gui/statuswindow.cpp:754 src/gui/statuswindow.cpp:785
 msgid "Max"
 msgstr "最大"
 
@@ -465,7 +470,7 @@ msgid "Sell"
 msgstr "売る"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
-#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:96
+#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:105
 #: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
 #: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:344
 #: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:500
@@ -542,68 +547,68 @@ msgstr "パスワードは%d文字より短くなくてはいけません。"
 msgid "The new password entries mismatch."
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:58
+#: src/gui/charcreatedialog.cpp:59
 msgid "Create Character"
 msgstr "キャラクターを作成"
 
-#: src/gui/charcreatedialog.cpp:76 src/gui/logindialog.cpp:94
+#: src/gui/charcreatedialog.cpp:85 src/gui/logindialog.cpp:94
 #: src/gui/register.cpp:75
 msgid "Name:"
 msgstr "名前:"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:79 src/gui/charcreatedialog.cpp:84
-#: src/gui/charcreatedialog.cpp:90 src/gui/outfitwindow.cpp:85
+#: src/gui/charcreatedialog.cpp:88 src/gui/charcreatedialog.cpp:93
+#: src/gui/charcreatedialog.cpp:99 src/gui/outfitwindow.cpp:85
 msgid ">"
 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:82 src/gui/charcreatedialog.cpp:85
-#: src/gui/charcreatedialog.cpp:91 src/gui/outfitwindow.cpp:84
+#: src/gui/charcreatedialog.cpp:91 src/gui/charcreatedialog.cpp:94
+#: src/gui/charcreatedialog.cpp:100 src/gui/outfitwindow.cpp:84
 msgid "<"
 msgstr "<"
 
-#: src/gui/charcreatedialog.cpp:83
+#: src/gui/charcreatedialog.cpp:92
 msgid "Hair color:"
 msgstr "髪色："
 
-#: src/gui/charcreatedialog.cpp:86
+#: src/gui/charcreatedialog.cpp:95
 msgid "Hair style:"
 msgstr "髪スタイル"
 
-#: src/gui/charcreatedialog.cpp:92
+#: src/gui/charcreatedialog.cpp:101
 msgid "Race:"
 msgstr "人種:"
 
-#: src/gui/charcreatedialog.cpp:95 src/gui/charselectdialog.cpp:480
+#: src/gui/charcreatedialog.cpp:104 src/gui/charselectdialog.cpp:481
 #: src/gui/socialwindow.cpp:1139
 msgid "Create"
 msgstr "作成"
 
-#: src/gui/charcreatedialog.cpp:97 src/gui/register.cpp:98
+#: src/gui/charcreatedialog.cpp:106 src/gui/register.cpp:98
 msgid "Male"
 msgstr "男性"
 
-#: src/gui/charcreatedialog.cpp:98 src/gui/register.cpp:99
+#: src/gui/charcreatedialog.cpp:107 src/gui/register.cpp:99
 msgid "Female"
 msgstr "女性"
 
-#: src/gui/charcreatedialog.cpp:116 src/gui/charcreatedialog.cpp:303
+#: src/gui/charcreatedialog.cpp:125 src/gui/charcreatedialog.cpp:312
 #, c-format
 msgid "Please distribute %d points"
 msgstr "%d ポイントを振り分けてください"
 
-#: src/gui/charcreatedialog.cpp:222
+#: src/gui/charcreatedialog.cpp:231
 msgid "Your name needs to be at least 4 characters."
 msgstr "名前には４文字以上必要です。"
 
-#: src/gui/charcreatedialog.cpp:294
+#: src/gui/charcreatedialog.cpp:303
 msgid "Character stats OK"
 msgstr "キャラクターの能力ポイント配分量は問題ありません。"
 
-#: src/gui/charcreatedialog.cpp:308
+#: src/gui/charcreatedialog.cpp:317
 #, c-format
 msgid "Please remove %d points"
 msgstr "%dポイントを取り除いてください。"
@@ -633,34 +638,34 @@ msgstr "登録解除"
 msgid "Change Email"
 msgstr "メールアドレスを変える"
 
-#: src/gui/charselectdialog.cpp:253
+#: src/gui/charselectdialog.cpp:254
 msgid "Incorrect password"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:286
+#: src/gui/charselectdialog.cpp:287
 msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:286
+#: src/gui/charselectdialog.cpp:287
 msgid "Enter password:"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:410 src/gui/serverdialog.cpp:298
+#: src/gui/charselectdialog.cpp:411 src/gui/serverdialog.cpp:298
 #: src/gui/setup_relations.cpp:244 src/gui/shopwindow.cpp:122
 #: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244
 msgid "Delete"
 msgstr "削除"
 
-#: src/gui/charselectdialog.cpp:468
+#: src/gui/charselectdialog.cpp:469
 msgid "Choose"
 msgstr "選ぶ"
 
-#: src/gui/charselectdialog.cpp:471
+#: src/gui/charselectdialog.cpp:472
 #, c-format
 msgid "Level %d"
 msgstr "レベル%d"
 
-#: src/gui/charselectdialog.cpp:482 src/gui/charselectdialog.cpp:483
+#: src/gui/charselectdialog.cpp:483 src/gui/charselectdialog.cpp:484
 msgid "(empty)"
 msgstr "(空っぽ)"
 
@@ -925,11 +930,11 @@ msgstr ""
 msgid "OK"
 msgstr "OK"
 
-#: src/gui/equipmentwindow.cpp:61 src/gui/windowmenu.cpp:74
+#: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74
 msgid "Equipment"
 msgstr "装備"
 
-#: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160
+#: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160
 #: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554
 #: src/gui/popupmenu.cpp:1737 src/gui/popupmenu.cpp:1829
 #: src/gui/popupmenu.cpp:1874
@@ -1364,7 +1369,7 @@ msgstr ""
 #: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:190
 #: src/gui/popupmenu.cpp:415 src/gui/popupmenu.cpp:435
 #: src/gui/popupmenu.cpp:672 src/gui/popupmenu.cpp:692
-#: src/playerrelations.cpp:446
+#: src/playerrelations.cpp:447
 msgid "Completely ignore"
 msgstr "完全無視"
 
@@ -1781,7 +1786,9 @@ msgstr "お知らせ"
 
 #: src/gui/setup_audio.cpp:120
 msgid "You may have to restart your client if you want to download new music"
-msgstr "新しい音楽をダウンロードする場合は、クライアントを再起動する必要がある可能性がある"
+msgstr ""
+"新しい音楽をダウンロードする場合は、クライアントを再起動する必要がある可能性"
+"がある"
 
 #: src/gui/setup_audio.cpp:133
 msgid "Sound Engine"
@@ -2869,270 +2876,6 @@ msgstr "パーティ名を選んでください"
 msgid "Specials"
 msgstr "スペシアール"
 
-#: src/gui/statuspopup.cpp:204
-msgid "(D) default moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:209
-msgid "(I) invert moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:214
-msgid "(c) moves with some crazy moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:219
-msgid "(C) moves with crazy moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:224
-msgid "(d) double normal + crazy"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:229
-msgid "(?) move"
-msgstr "(?) 動く"
-
-#: src/gui/statuspopup.cpp:247
-msgid "(a) custom crazy move"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:251
-msgid "(?) crazy move"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:261
-msgid "(0) default moves to target"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:266
-msgid "(1) moves to target in distance 1"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:271
-msgid "(2) moves to target in distance 2"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:276
-msgid "(3) moves to target in distance 3"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:281
-msgid "(5) moves to target in distance 5"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:286
-msgid "(7) moves to target in distance 7"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:291
-msgid "(A) moves to target in attack range"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:296
-msgid "(a) archer attack range"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:301
-msgid "(?) move to target"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:309
-msgid "(D) default follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:313
-msgid "(R) relative follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:317
-msgid "(M) mirror follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:321
-msgid "(P) pet follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:325
-msgid "(?) unknown follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:334 src/gui/statuspopup.cpp:357
-msgid "(D) default attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:339
-msgid "(s) switch attack without shield"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:344
-msgid "(S) switch attack with shield"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:348 src/gui/statuspopup.cpp:373
-msgid "(?) attack"
-msgstr "(?) 襲う"
-
-#: src/gui/statuspopup.cpp:361
-msgid "(G) go and attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:365
-msgid "(A) go, attack, pickup"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:369
-msgid "(d) without auto attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:387
-msgid "(S) small pick up 1x1 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:391
-msgid "(D) default pick up 2x1 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:395
-msgid "(F) forward pick up 2x3 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:399
-msgid "(3) pick up 3x3 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:403
-msgid "(g) go and pick up in distance 4"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:407
-msgid "(G) go and pick up in distance 8"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:411
-msgid "(A) go and pick up in max distance"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:415
-msgid "(?) pick up"
-msgstr "(?) 拾い上げる"
-
-#: src/gui/statuspopup.cpp:424
-msgid "(N) normal map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:428
-msgid "(D) debug map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:432
-msgid "(u) ultra map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:436
-msgid "(U) ultra map view 2"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:440
-msgid "(e) empty map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:444
-msgid "(b) black & white map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:448
-msgid "(?) map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:456
-msgid "(f) use #flar for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:461
-msgid "(c) use #chiza for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:466
-msgid "(I) use #ingrav for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:471
-msgid "(F) use #frillyar for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:476
-msgid "(U) use #upmarmu for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:480
-msgid "(?) magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:489
-msgid "(a) attack all players"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:493
-msgid "(f) attack not friends"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:497
-msgid "(b) attack bad relations"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:501
-msgid "(d) dont attack players"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:505
-msgid "(?) pvp attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:514
-msgid "(D) default imitation"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:518
-msgid "(O) outfits imitation"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:522
-msgid "(?) imitation"
-msgstr "(?) "
-
-#: src/gui/statuspopup.cpp:531
-msgid "(O) on keyboard"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:534
-msgid "(A) away"
-msgstr "(A) "
-
-#: src/gui/statuspopup.cpp:537 src/gui/statuspopup.cpp:557
-msgid "(?) away"
-msgstr "(?) 不在で"
-
-#: src/gui/statuspopup.cpp:545
-msgid "(G) game camera mode"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:549
-msgid "(F) free camera mode"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:553
-msgid "(D) design camera mode"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:564
-msgid "Game modifiers are disabled"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:569
-msgid "Game modifiers are enabled"
-msgstr ""
-
 #: src/gui/statuswindow.cpp:144 src/gui/statuswindow.cpp:274
 #: src/gui/statuswindow.cpp:337
 #, c-format
@@ -3181,136 +2924,6 @@ msgstr "レベル： %d (GM %d)"
 msgid "Correction points: %d"
 msgstr "修正点： %d"
 
-#: src/gui/statuswindow.cpp:649 src/gui/statuswindow.cpp:717
-#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:753
-#: src/gui/statuswindow.cpp:818 src/gui/statuswindow.cpp:847
-#: src/gui/statuswindow.cpp:870 src/gui/statuswindow.cpp:889
-msgid "(D)"
-msgstr "(D)"
-
-#: src/gui/statuswindow.cpp:652 src/gui/statuswindow.cpp:778
-msgid "(I)"
-msgstr "(I)"
-
-#: src/gui/statuswindow.cpp:655 src/gui/statuswindow.cpp:775
-msgid "(c)"
-msgstr "(c)"
-
-#: src/gui/statuswindow.cpp:658
-msgid "(C)"
-msgstr "(C)"
-
-#: src/gui/statuswindow.cpp:661 src/gui/statuswindow.cpp:762
-#: src/gui/statuswindow.cpp:803
-msgid "(d)"
-msgstr "(d)"
-
-#: src/gui/statuswindow.cpp:664 src/gui/statuswindow.cpp:678
-#: src/gui/statuswindow.cpp:710 src/gui/statuswindow.cpp:729
-#: src/gui/statuswindow.cpp:746 src/gui/statuswindow.cpp:765
-#: src/gui/statuswindow.cpp:787 src/gui/statuswindow.cpp:806
-#: src/gui/statuswindow.cpp:836 src/gui/statuswindow.cpp:862
-#: src/gui/statuswindow.cpp:876 src/gui/statuswindow.cpp:892
-#: src/gui/statuswindow.cpp:905
-msgid "(?)"
-msgstr "(?)"
-
-#: src/gui/statuswindow.cpp:675 src/gui/statuswindow.cpp:707
-#: src/gui/statuswindow.cpp:794
-msgid "(a)"
-msgstr "(a)"
-
-#: src/gui/statuswindow.cpp:686
-msgid "(0)"
-msgstr "(0)"
-
-#: src/gui/statuswindow.cpp:689
-msgid "(1)"
-msgstr "(1)"
-
-#: src/gui/statuswindow.cpp:692
-msgid "(2)"
-msgstr "(2)"
-
-#: src/gui/statuswindow.cpp:695 src/gui/statuswindow.cpp:824
-msgid "(3)"
-msgstr "(3)"
-
-#: src/gui/statuswindow.cpp:698
-msgid "(5)"
-msgstr "(5)"
-
-#: src/gui/statuswindow.cpp:701
-msgid "(7)"
-msgstr "(7)"
-
-#: src/gui/statuswindow.cpp:704 src/gui/statuswindow.cpp:759
-#: src/gui/statuswindow.cpp:833 src/gui/statuswindow.cpp:902
-msgid "(A)"
-msgstr "(A)"
-
-#: src/gui/statuswindow.cpp:720
-msgid "(R)"
-msgstr "(R)"
-
-#: src/gui/statuswindow.cpp:723
-msgid "(M)"
-msgstr "(M)"
-
-#: src/gui/statuswindow.cpp:726
-msgid "(P)"
-msgstr "(P)"
-
-#: src/gui/statuswindow.cpp:740
-msgid "(s)"
-msgstr "(s)"
-
-#: src/gui/statuswindow.cpp:743 src/gui/statuswindow.cpp:815
-msgid "(S)"
-msgstr "(S)"
-
-#: src/gui/statuswindow.cpp:756 src/gui/statuswindow.cpp:830
-#: src/gui/statuswindow.cpp:883
-msgid "(G)"
-msgstr "(G)"
-
-#: src/gui/statuswindow.cpp:772 src/gui/statuswindow.cpp:797
-msgid "(f)"
-msgstr "(f)"
-
-#: src/gui/statuswindow.cpp:781 src/gui/statuswindow.cpp:821
-#: src/gui/statuswindow.cpp:886
-msgid "(F)"
-msgstr "(F)"
-
-#: src/gui/statuswindow.cpp:784 src/gui/statuswindow.cpp:853
-msgid "(U)"
-msgstr "(U)"
-
-#: src/gui/statuswindow.cpp:800 src/gui/statuswindow.cpp:859
-msgid "(b)"
-msgstr "(b)"
-
-#: src/gui/statuswindow.cpp:827
-msgid "(g)"
-msgstr "(g)"
-
-#: src/gui/statuswindow.cpp:844
-msgid "(N)"
-msgstr "(N)"
-
-#: src/gui/statuswindow.cpp:850
-msgid "(u)"
-msgstr "(u)"
-
-#: src/gui/statuswindow.cpp:856
-msgid "(e)"
-msgstr "(e)"
-
-#: src/gui/statuswindow.cpp:873 src/gui/statuswindow.cpp:899
-msgid "(O)"
-msgstr "(O)"
-
 #: src/gui/textcommandeditor.cpp:113
 msgid "No Target"
 msgstr "ターゲットなし"
@@ -3437,9 +3050,10 @@ msgid "You don't have enough money."
 msgstr "現金不足です。"
 
 #: src/gui/tradewindow.cpp:454
-msgid ""
-"Failed adding item. You can not overlap one kind of item on the window."
-msgstr "アイテムを追加することに失敗しました。アイテム一種類を一つのウインドウ上で重複して追加することは出来ません！"
+msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgstr ""
+"アイテムを追加することに失敗しました。アイテム一種類を一つのウインドウ上で重"
+"複して追加することは出来ません！"
 
 #: src/gui/unregisterdialog.cpp:54
 #, c-format
@@ -3624,7 +3238,7 @@ msgstr ""
 msgid "Road Point"
 msgstr "ロードのポイント"
 
-#: src/gui/whoisonline.cpp:85 src/gui/whoisonline.cpp:479
+#: src/gui/whoisonline.cpp:85 src/gui/whoisonline.cpp:494
 msgid "Who Is Online - Updating"
 msgstr ""
 
@@ -3632,15 +3246,15 @@ msgstr ""
 msgid "Update"
 msgstr "アップデート"
 
-#: src/gui/whoisonline.cpp:302
+#: src/gui/whoisonline.cpp:307
 msgid "Who Is Online - "
 msgstr ""
 
-#: src/gui/whoisonline.cpp:493
+#: src/gui/whoisonline.cpp:508
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:525
+#: src/gui/whoisonline.cpp:540
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -3708,11 +3322,15 @@ msgstr "このコマンドでは、入力したユーザーをチャンネルの
 #: src/gui/widgets/guildchattab.cpp:61 src/net/ea/gui/guildtab.cpp:69
 #: src/net/ea/gui/partytab.cpp:85
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
-msgstr "入力するニックネームにスペースが入っている場合、ダブルコーテーション(\"\")で囲んでください。"
+msgstr ""
+"入力するニックネームにスペースが入っている場合、ダブルコーテーション(\"\")で"
+"囲んでください。"
 
 #: src/gui/widgets/channeltab.cpp:87
 msgid "Channel operators can kick and op other users from the channel."
-msgstr "チャンネルのオペレーターはチャンネルからオペレーター以外のユーザーを追い出すことができます。"
+msgstr ""
+"チャンネルのオペレーターはチャンネルからオペレーター以外のユーザーを追い出す"
+"ことができます。"
 
 #: src/gui/widgets/channeltab.cpp:92
 msgid "Command: /kick <nick>"
@@ -3801,7 +3419,8 @@ msgstr "コマンド: /close"
 
 #: src/gui/widgets/whispertab.cpp:120
 msgid "This command closes the current whisper tab."
-msgstr "このコマンドでは、現在開いているプライベートメッセージのタブを閉じます。"
+msgstr ""
+"このコマンドでは、現在開いているプライベートメッセージのタブを閉じます。"
 
 #: src/gui/widgets/whispertab.cpp:124
 msgid "Command: /ignore"
@@ -3816,8 +3435,7 @@ msgid "Command: /unignore <player>"
 msgstr "コマンド：　/unignore <プレイヤー>"
 
 #: src/gui/widgets/whispertab.cpp:131
-msgid ""
-"This command stops ignoring the other player if they are being ignored."
+msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
 #: src/gui/windowmenu.cpp:65
@@ -4345,67 +3963,333 @@ msgid ""
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:389
+#: src/localplayer.cpp:384
 msgid "You were killed by "
 msgstr ""
 
-#: src/localplayer.cpp:1442
+#: src/localplayer.cpp:1434
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1436
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1446
+#: src/localplayer.cpp:1438
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1448
+#: src/localplayer.cpp:1440
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1450
+#: src/localplayer.cpp:1442
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1453
+#: src/localplayer.cpp:1445
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1456
+#: src/localplayer.cpp:1448
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1480
+#: src/localplayer.cpp:1472
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 
-#: src/localplayer.cpp:3206
+#: src/localplayer.cpp:1887
+msgid "(D) default moves"
+msgstr ""
+
+#: src/localplayer.cpp:1888
+msgid "(I) invert moves"
+msgstr ""
+
+#: src/localplayer.cpp:1889
+msgid "(c) moves with some crazy moves"
+msgstr ""
+
+#: src/localplayer.cpp:1890
+msgid "(C) moves with crazy moves"
+msgstr ""
+
+#: src/localplayer.cpp:1891
+msgid "(d) double normal + crazy"
+msgstr ""
+
+#: src/localplayer.cpp:1892
+#, fuzzy
+msgid "(?) unknown move"
+msgstr "(?) 動く"
+
+#: src/localplayer.cpp:1914
+#, c-format
+msgid "(%d) crazy move number %d"
+msgstr ""
+
+#: src/localplayer.cpp:1919
+msgid "(a) custom crazy move"
+msgstr ""
+
+#: src/localplayer.cpp:1923
+msgid "(?) crazy move"
+msgstr ""
+
+#: src/localplayer.cpp:1937
+msgid "(0) default moves to target"
+msgstr ""
+
+#: src/localplayer.cpp:1938
+msgid "(1) moves to target in distance 1"
+msgstr ""
+
+#: src/localplayer.cpp:1939
+msgid "(2) moves to target in distance 2"
+msgstr ""
+
+#: src/localplayer.cpp:1940
+msgid "(3) moves to target in distance 3"
+msgstr ""
+
+#: src/localplayer.cpp:1941
+msgid "(5) moves to target in distance 5"
+msgstr ""
+
+#: src/localplayer.cpp:1942
+msgid "(7) moves to target in distance 7"
+msgstr ""
+
+#: src/localplayer.cpp:1943
+msgid "(A) moves to target in attack range"
+msgstr ""
+
+#: src/localplayer.cpp:1944
+msgid "(a) archer attack range"
+msgstr ""
+
+#: src/localplayer.cpp:1945
+msgid "(?) move to target"
+msgstr ""
+
+#: src/localplayer.cpp:1964
+msgid "(D) default follow"
+msgstr ""
+
+#: src/localplayer.cpp:1965
+msgid "(R) relative follow"
+msgstr ""
+
+#: src/localplayer.cpp:1966
+msgid "(M) mirror follow"
+msgstr ""
+
+#: src/localplayer.cpp:1967
+msgid "(P) pet follow"
+msgstr ""
+
+#: src/localplayer.cpp:1968
+msgid "(?) unknown follow"
+msgstr ""
+
+#: src/localplayer.cpp:1987 src/localplayer.cpp:1991 src/localplayer.cpp:2014
+msgid "(?) attack"
+msgstr "(?) 襲う"
+
+#: src/localplayer.cpp:1988 src/localplayer.cpp:2010
+msgid "(D) default attack"
+msgstr ""
+
+#: src/localplayer.cpp:1989
+msgid "(s) switch attack without shield"
+msgstr ""
+
+#: src/localplayer.cpp:1990
+msgid "(S) switch attack with shield"
+msgstr ""
+
+#: src/localplayer.cpp:2011
+msgid "(G) go and attack"
+msgstr ""
+
+#: src/localplayer.cpp:2012
+msgid "(A) go, attack, pickup"
+msgstr ""
+
+#: src/localplayer.cpp:2013
+msgid "(d) without auto attack"
+msgstr ""
+
+#: src/localplayer.cpp:2047
+msgid "(S) small pick up 1x1 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2048
+msgid "(D) default pick up 2x1 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2049
+msgid "(F) forward pick up 2x3 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2050
+msgid "(3) pick up 3x3 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2051
+msgid "(g) go and pick up in distance 4"
+msgstr ""
+
+#: src/localplayer.cpp:2052
+msgid "(G) go and pick up in distance 8"
+msgstr ""
+
+#: src/localplayer.cpp:2053
+msgid "(A) go and pick up in max distance"
+msgstr ""
+
+#: src/localplayer.cpp:2054
+msgid "(?) pick up"
+msgstr "(?) 拾い上げる"
+
+#: src/localplayer.cpp:2067
+msgid "(N) normal map view"
+msgstr ""
+
+#: src/localplayer.cpp:2068
+msgid "(D) debug map view"
+msgstr ""
+
+#: src/localplayer.cpp:2069
+msgid "(u) ultra map view"
+msgstr ""
+
+#: src/localplayer.cpp:2070
+msgid "(U) ultra map view 2"
+msgstr ""
+
+#: src/localplayer.cpp:2071
+msgid "(e) empty map view"
+msgstr ""
+
+#: src/localplayer.cpp:2072
+msgid "(b) black & white map view"
+msgstr ""
+
+#: src/localplayer.cpp:2091
+msgid "(f) use #flar for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2092
+msgid "(c) use #chiza for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2093
+msgid "(I) use #ingrav for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2094
+msgid "(F) use #frillyar for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2095
+msgid "(U) use #upmarmu for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2096
+msgid "(?) magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2115
+msgid "(a) attack all players"
+msgstr ""
+
+#: src/localplayer.cpp:2116
+msgid "(f) attack not friends"
+msgstr ""
+
+#: src/localplayer.cpp:2117
+msgid "(b) attack bad relations"
+msgstr ""
+
+#: src/localplayer.cpp:2118
+msgid "(d) dont attack players"
+msgstr ""
+
+#: src/localplayer.cpp:2119
+msgid "(?) pvp attack"
+msgstr ""
+
+#: src/localplayer.cpp:2138
+msgid "(D) default imitation"
+msgstr ""
+
+#: src/localplayer.cpp:2139
+msgid "(O) outfits imitation"
+msgstr ""
+
+#: src/localplayer.cpp:2140
+msgid "(?) imitation"
+msgstr "(?) "
+
+#: src/localplayer.cpp:2168
 msgid "Away"
 msgstr "去って"
 
-#: src/localplayer.cpp:3541
+#: src/localplayer.cpp:2187
+msgid "(O) on keyboard"
+msgstr ""
+
+#: src/localplayer.cpp:2188
+msgid "(A) away"
+msgstr "(A) "
+
+#: src/localplayer.cpp:2189 src/localplayer.cpp:2204
+msgid "(?) away"
+msgstr "(?) 不在で"
+
+#: src/localplayer.cpp:2202
+msgid "(G) game camera mode"
+msgstr ""
+
+#: src/localplayer.cpp:2203
+msgid "(F) free camera mode"
+msgstr ""
+
+#: src/localplayer.cpp:2228
+msgid "Game modifiers are enabled"
+msgstr ""
+
+#: src/localplayer.cpp:2229
+msgid "Game modifiers are disabled"
+msgstr ""
+
+#: src/localplayer.cpp:2230
+msgid "Game modifiers are unknown"
+msgstr ""
+
+#: src/localplayer.cpp:3746
 msgid "Follow: "
 msgstr "従う: "
 
-#: src/localplayer.cpp:3543 src/localplayer.cpp:3558
+#: src/localplayer.cpp:3748 src/localplayer.cpp:3763
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3550
+#: src/localplayer.cpp:3755
 msgid "Imitation: "
 msgstr "擬い: "
 
-#: src/localplayer.cpp:3552 src/localplayer.cpp:3560
+#: src/localplayer.cpp:3757 src/localplayer.cpp:3765
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3908
+#: src/localplayer.cpp:4113
 msgid "You see "
 msgstr "あなた"
 
@@ -4513,71 +4397,71 @@ msgstr "買ってくださり、ありがとうございました。"
 msgid "Unable to buy."
 msgstr "購買不可能"
 
-#: src/net/ea/charserverhandler.cpp:63
+#: src/net/ea/charserverhandler.cpp:66
 msgid "Strength:"
 msgstr "筋力:"
 
-#: src/net/ea/charserverhandler.cpp:64
+#: src/net/ea/charserverhandler.cpp:67
 msgid "Agility:"
 msgstr "素早さ:"
 
-#: src/net/ea/charserverhandler.cpp:65
+#: src/net/ea/charserverhandler.cpp:68
 msgid "Vitality:"
 msgstr "体力:"
 
-#: src/net/ea/charserverhandler.cpp:66
+#: src/net/ea/charserverhandler.cpp:69
 msgid "Intelligence:"
 msgstr "知性:"
 
-#: src/net/ea/charserverhandler.cpp:67
+#: src/net/ea/charserverhandler.cpp:70
 msgid "Dexterity:"
 msgstr "敏捷:"
 
-#: src/net/ea/charserverhandler.cpp:68
+#: src/net/ea/charserverhandler.cpp:71
 msgid "Luck:"
 msgstr "運:"
 
-#: src/net/ea/charserverhandler.cpp:102
+#: src/net/ea/charserverhandler.cpp:115
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:106
+#: src/net/ea/charserverhandler.cpp:119
 msgid "Cannot use this ID."
 msgstr "ID使用不可能。"
 
-#: src/net/ea/charserverhandler.cpp:109
+#: src/net/ea/charserverhandler.cpp:122
 msgid "Unknown char-server failure."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:138
+#: src/net/ea/charserverhandler.cpp:151
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr "キャラクター作成失敗。本名はのう使われている。"
 
-#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:235
+#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:235
 msgid "Wrong name."
 msgstr "名前間違い"
 
-#: src/net/ea/charserverhandler.cpp:145
+#: src/net/ea/charserverhandler.cpp:158
 msgid "Incorrect stats."
 msgstr "不適切な統計。"
 
-#: src/net/ea/charserverhandler.cpp:148
+#: src/net/ea/charserverhandler.cpp:161
 msgid "Incorrect hair."
 msgstr "不適切な髪。"
 
-#: src/net/ea/charserverhandler.cpp:151
+#: src/net/ea/charserverhandler.cpp:164
 msgid "Incorrect slot."
 msgstr "不適切なスロット。"
 
-#: src/net/ea/charserverhandler.cpp:166 src/net/manaserv/charhandler.cpp:210
+#: src/net/ea/charserverhandler.cpp:179 src/net/manaserv/charhandler.cpp:210
 msgid "Info"
 msgstr "情報"
 
-#: src/net/ea/charserverhandler.cpp:166
+#: src/net/ea/charserverhandler.cpp:179
 msgid "Character deleted."
 msgstr "キャラクターを削除した。"
 
-#: src/net/ea/charserverhandler.cpp:172
+#: src/net/ea/charserverhandler.cpp:185
 msgid "Failed to delete character."
 msgstr "キャラ削除失敗"
 
@@ -4771,7 +4655,8 @@ msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
 msgstr ""
-"＜ポリシ＞を有効するためには「１」、「yes」か「true」を設定ください。無効にするために、「0」、「no」か「false」を設定ください。"
+"＜ポリシ＞を有効するためには「１」、「yes」か「true」を設定ください。無効にす"
+"るために、「0」、「no」か「false」を設定ください。"
 
 #: src/net/ea/gui/partytab.cpp:101
 msgid "Command: /item"
@@ -4794,7 +4679,8 @@ msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 msgstr ""
-"<ポリシ>を有効するためには、「1」、「yes」か「true」を設定ください。無効にする場合、「0」、「no」か「false」を設定ください。"
+"<ポリシ>を有効するためには、「1」、「yes」か「true」を設定ください。無効にす"
+"る場合、「0」、「no」か「false」を設定ください。"
 
 #: src/net/ea/gui/partytab.cpp:113
 msgid "Command: /exp"
@@ -4804,15 +4690,15 @@ msgstr "コマンド: /exp"
 msgid "This command displays the party's current experience sharing policy."
 msgstr "本コマンドでは、パーティメンバー以内の経験分割方針を表示する。"
 
-#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:284
+#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:285
 msgid "Item sharing enabled."
 msgstr "アイテムシェア有効"
 
-#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:294
+#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:295
 msgid "Item sharing disabled."
 msgstr "アイテムシェア無効"
 
-#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:304
+#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:305
 msgid "Item sharing not possible."
 msgstr "アイテムシェア不可能"
 
@@ -4820,15 +4706,15 @@ msgstr "アイテムシェア不可能"
 msgid "Item sharing unknown."
 msgstr "アイテムシェア不明"
 
-#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:246
+#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:247
 msgid "Experience sharing enabled."
 msgstr "経験シェア有効"
 
-#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:256
+#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:257
 msgid "Experience sharing disabled."
 msgstr "経験シェア無効"
 
-#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:266
+#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:267
 msgid "Experience sharing not possible."
 msgstr "経験シェア不可能"
 
@@ -4947,16 +4833,16 @@ msgstr ""
 msgid "QQQ Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:357
+#: src/net/ea/partyhandler.cpp:358
 msgid "You have left the party."
 msgstr "パーティから離れた。"
 
-#: src/net/ea/partyhandler.cpp:370
+#: src/net/ea/partyhandler.cpp:371
 #, c-format
 msgid "%s has left your party."
 msgstr "%sがパーティから離れた。"
 
-#: src/net/ea/partyhandler.cpp:447
+#: src/net/ea/partyhandler.cpp:448
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr "不明なメンバーが言おうとした事: %s"
@@ -4989,7 +4875,9 @@ msgstr "ゲームを続けるためにはコインを入れてください。"
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
-msgstr "ううん、棒ややち。あなたのキャラは本当にしんでなかった。もっと綺麗なところに向かっただけ。"
+msgstr ""
+"ううん、棒ややち。あなたのキャラは本当にしんでなかった。もっと綺麗なところに"
+"向かっただけ。"
 
 #: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:323
 msgid ""
@@ -5048,7 +4936,9 @@ msgstr "命を失い、天国に向かった。"
 
 #: src/net/ea/playerhandler.cpp:126
 msgid "If you weren't so animated, you'd be pushing up the daisies."
-msgstr "もしあなたがそんなにも生気に満ちていなかったならば、死んで葬られていたんじゃないか？"
+msgstr ""
+"もしあなたがそんなにも生気に満ちていなかったならば、死んで葬られていたんじゃ"
+"ないか？"
 
 #: src/net/ea/playerhandler.cpp:127
 msgid "Your metabolic processes are now history."
@@ -5083,8 +4973,7 @@ msgstr "メッセージ"
 
 #: src/net/ea/playerhandler.cpp:336
 msgid ""
-"You are carrying more than half your weight. You are unable to regain "
-"health."
+"You are carrying more than half your weight. You are unable to regain health."
 msgstr "持っているアイテムは体重より半分以上なので、体力が回復できない。"
 
 #: src/net/ea/playerhandler.cpp:346
@@ -5676,19 +5565,19 @@ msgstr ""
 msgid "%s is not in your party!"
 msgstr "%sはパーティにはいない！"
 
-#: src/playerrelations.cpp:460
+#: src/playerrelations.cpp:461
 msgid "Print '...'"
 msgstr "'...'を表示する"
 
-#: src/playerrelations.cpp:480
+#: src/playerrelations.cpp:481
 msgid "Blink name"
 msgstr "名前を瞬き"
 
-#: src/playerrelations.cpp:524
+#: src/playerrelations.cpp:525
 msgid "Floating '...' bubble"
 msgstr "フローティング'...'バブル"
 
-#: src/playerrelations.cpp:527
+#: src/playerrelations.cpp:528
 msgid "Floating bubble"
 msgstr "フローティングバブル"
 
@@ -5721,4 +5610,89 @@ msgstr "MP %+d"
 msgid "Unknown item"
 msgstr "不明なアイテム"
 
+#~ msgid "(D)"
+#~ msgstr "(D)"
+
+#~ msgid "(I)"
+#~ msgstr "(I)"
+
+#~ msgid "(c)"
+#~ msgstr "(c)"
+
+#~ msgid "(C)"
+#~ msgstr "(C)"
+
+#~ msgid "(d)"
+#~ msgstr "(d)"
+
+#~ msgid "(?)"
+#~ msgstr "(?)"
+
+#~ msgid "(a)"
+#~ msgstr "(a)"
+
+#~ msgid "(0)"
+#~ msgstr "(0)"
+
+#~ msgid "(1)"
+#~ msgstr "(1)"
+
+#~ msgid "(2)"
+#~ msgstr "(2)"
+
+#~ msgid "(3)"
+#~ msgstr "(3)"
+
+#~ msgid "(5)"
+#~ msgstr "(5)"
+
+#~ msgid "(7)"
+#~ msgstr "(7)"
+
+#~ msgid "(A)"
+#~ msgstr "(A)"
+
+#~ msgid "(R)"
+#~ msgstr "(R)"
+
+#~ msgid "(M)"
+#~ msgstr "(M)"
+
+#~ msgid "(P)"
+#~ msgstr "(P)"
+
+#~ msgid "(s)"
+#~ msgstr "(s)"
+
+#~ msgid "(S)"
+#~ msgstr "(S)"
+
+#~ msgid "(G)"
+#~ msgstr "(G)"
+
+#~ msgid "(f)"
+#~ msgstr "(f)"
+
+#~ msgid "(F)"
+#~ msgstr "(F)"
+
+#~ msgid "(U)"
+#~ msgstr "(U)"
+
+#~ msgid "(b)"
+#~ msgstr "(b)"
+
+#~ msgid "(g)"
+#~ msgstr "(g)"
+
+#~ msgid "(N)"
+#~ msgstr "(N)"
+
+#~ msgid "(u)"
+#~ msgstr "(u)"
+
+#~ msgid "(e)"
+#~ msgstr "(e)"
 
+#~ msgid "(O)"
+#~ msgstr "(O)"
diff --git a/po/manaplus.pot b/po/manaplus.pot
index ec8d2f6b2..ade60fbc7 100644
--- a/po/manaplus.pot
+++ b/po/manaplus.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-11-12 00:23+0300\n"
+"POT-Creation-Date: 2011-11-26 02:20+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -22,118 +22,118 @@ msgstr ""
 msgid "Visible on map"
 msgstr ""
 
-#: src/being.cpp:551
+#: src/being.cpp:553
 msgid "dodge"
 msgstr ""
 
-#: src/being.cpp:551
+#: src/being.cpp:553
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1530
+#: src/being.cpp:1534
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1535
+#: src/being.cpp:1539
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:869 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:878 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr ""
 
-#: src/client.cpp:876 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:885 src/gui/setup_perfomance.cpp:48
 msgid "Perfomance"
 msgstr ""
 
-#: src/client.cpp:881 src/gui/setup_video.cpp:315
+#: src/client.cpp:890 src/gui/setup_video.cpp:315
 msgid "Video"
 msgstr ""
 
-#: src/client.cpp:886
+#: src/client.cpp:895
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:968
+#: src/client.cpp:977
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:999
+#: src/client.cpp:1008
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:1032
+#: src/client.cpp:1041
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1132
+#: src/client.cpp:1142
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:1163
+#: src/client.cpp:1173
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:1173
+#: src/client.cpp:1183
 msgid "Changing game servers"
 msgstr ""
 
-#: src/client.cpp:1216 src/client.cpp:1223 src/client.cpp:1357
+#: src/client.cpp:1226 src/client.cpp:1233 src/client.cpp:1367
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
-#: src/gui/charcreatedialog.cpp:221 src/gui/charselectdialog.cpp:253
+#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:254
 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
-#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
-#: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
+#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:167
+#: src/net/ea/charserverhandler.cpp:185 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr ""
 
-#: src/client.cpp:1232
+#: src/client.cpp:1242
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1258
+#: src/client.cpp:1268
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:1259
+#: src/client.cpp:1269
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1278
+#: src/client.cpp:1288
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:1279
+#: src/client.cpp:1289
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1299
+#: src/client.cpp:1309
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:1300
+#: src/client.cpp:1310
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1499 src/client.cpp:1529 src/client.cpp:1544
-#: src/client.cpp:1969 src/client.cpp:1976
+#: src/client.cpp:1509 src/client.cpp:1539 src/client.cpp:1554
+#: src/client.cpp:1979 src/client.cpp:1986
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1675
+#: src/client.cpp:1685
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1709 src/client.cpp:1715
+#: src/client.cpp:1719 src/client.cpp:1725
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:1736
+#: src/client.cpp:1746
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -310,7 +310,7 @@ msgstr ""
 msgid "Resource orphaned images:"
 msgstr ""
 
-#: src/commandhandler.h:40
+#: src/commandhandler.h:34
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
@@ -339,19 +339,19 @@ msgstr ""
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:1332
+#: src/game.cpp:1258
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:1342
+#: src/game.cpp:1268
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:1750
+#: src/game.cpp:1773
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:1751
+#: src/game.cpp:1774
 #, c-format
 msgid "Error while loading %s"
 msgstr ""
@@ -429,7 +429,7 @@ msgstr ""
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:207
 #: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:998
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:755
 msgid "+"
 msgstr ""
 
@@ -437,7 +437,7 @@ msgstr ""
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:206
 #: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:1010
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:767
 msgid "-"
 msgstr ""
 
@@ -450,7 +450,7 @@ msgstr ""
 
 #: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
 #: src/gui/statuswindow.cpp:505 src/gui/statuswindow.cpp:555
-#: src/gui/statuswindow.cpp:997 src/gui/statuswindow.cpp:1028
+#: src/gui/statuswindow.cpp:754 src/gui/statuswindow.cpp:785
 msgid "Max"
 msgstr ""
 
@@ -467,7 +467,7 @@ msgid "Sell"
 msgstr ""
 
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
-#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:96
+#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:105
 #: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
 #: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:344
 #: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:500
@@ -544,68 +544,68 @@ msgstr ""
 msgid "The new password entries mismatch."
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:58
+#: src/gui/charcreatedialog.cpp:59
 msgid "Create Character"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:76 src/gui/logindialog.cpp:94
+#: src/gui/charcreatedialog.cpp:85 src/gui/logindialog.cpp:94
 #: src/gui/register.cpp:75
 msgid "Name:"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:79 src/gui/charcreatedialog.cpp:84
-#: src/gui/charcreatedialog.cpp:90 src/gui/outfitwindow.cpp:85
+#: src/gui/charcreatedialog.cpp:88 src/gui/charcreatedialog.cpp:93
+#: src/gui/charcreatedialog.cpp:99 src/gui/outfitwindow.cpp:85
 msgid ">"
 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:82 src/gui/charcreatedialog.cpp:85
-#: src/gui/charcreatedialog.cpp:91 src/gui/outfitwindow.cpp:84
+#: src/gui/charcreatedialog.cpp:91 src/gui/charcreatedialog.cpp:94
+#: src/gui/charcreatedialog.cpp:100 src/gui/outfitwindow.cpp:84
 msgid "<"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:83
+#: src/gui/charcreatedialog.cpp:92
 msgid "Hair color:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:86
+#: src/gui/charcreatedialog.cpp:95
 msgid "Hair style:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:92
+#: src/gui/charcreatedialog.cpp:101
 msgid "Race:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:95 src/gui/charselectdialog.cpp:480
+#: src/gui/charcreatedialog.cpp:104 src/gui/charselectdialog.cpp:481
 #: src/gui/socialwindow.cpp:1139
 msgid "Create"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:97 src/gui/register.cpp:98
+#: src/gui/charcreatedialog.cpp:106 src/gui/register.cpp:98
 msgid "Male"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:98 src/gui/register.cpp:99
+#: src/gui/charcreatedialog.cpp:107 src/gui/register.cpp:99
 msgid "Female"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:116 src/gui/charcreatedialog.cpp:303
+#: src/gui/charcreatedialog.cpp:125 src/gui/charcreatedialog.cpp:312
 #, c-format
 msgid "Please distribute %d points"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:222
+#: src/gui/charcreatedialog.cpp:231
 msgid "Your name needs to be at least 4 characters."
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:294
+#: src/gui/charcreatedialog.cpp:303
 msgid "Character stats OK"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:308
+#: src/gui/charcreatedialog.cpp:317
 #, c-format
 msgid "Please remove %d points"
 msgstr ""
@@ -635,34 +635,34 @@ msgstr ""
 msgid "Change Email"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:253
+#: src/gui/charselectdialog.cpp:254
 msgid "Incorrect password"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:286
+#: src/gui/charselectdialog.cpp:287
 msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:286
+#: src/gui/charselectdialog.cpp:287
 msgid "Enter password:"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:410 src/gui/serverdialog.cpp:298
+#: src/gui/charselectdialog.cpp:411 src/gui/serverdialog.cpp:298
 #: src/gui/setup_relations.cpp:244 src/gui/shopwindow.cpp:122
 #: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244
 msgid "Delete"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:468
+#: src/gui/charselectdialog.cpp:469
 msgid "Choose"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:471
+#: src/gui/charselectdialog.cpp:472
 #, c-format
 msgid "Level %d"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:482 src/gui/charselectdialog.cpp:483
+#: src/gui/charselectdialog.cpp:483 src/gui/charselectdialog.cpp:484
 msgid "(empty)"
 msgstr ""
 
@@ -927,11 +927,11 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:61 src/gui/windowmenu.cpp:74
+#: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74
 msgid "Equipment"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160
+#: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160
 #: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554
 #: src/gui/popupmenu.cpp:1737 src/gui/popupmenu.cpp:1829
 #: src/gui/popupmenu.cpp:1874
@@ -1368,7 +1368,7 @@ msgstr ""
 #: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:190
 #: src/gui/popupmenu.cpp:415 src/gui/popupmenu.cpp:435
 #: src/gui/popupmenu.cpp:672 src/gui/popupmenu.cpp:692
-#: src/playerrelations.cpp:446
+#: src/playerrelations.cpp:447
 msgid "Completely ignore"
 msgstr ""
 
@@ -2873,270 +2873,6 @@ msgstr ""
 msgid "Specials"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:204
-msgid "(D) default moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:209
-msgid "(I) invert moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:214
-msgid "(c) moves with some crazy moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:219
-msgid "(C) moves with crazy moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:224
-msgid "(d) double normal + crazy"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:229
-msgid "(?) move"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:247
-msgid "(a) custom crazy move"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:251
-msgid "(?) crazy move"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:261
-msgid "(0) default moves to target"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:266
-msgid "(1) moves to target in distance 1"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:271
-msgid "(2) moves to target in distance 2"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:276
-msgid "(3) moves to target in distance 3"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:281
-msgid "(5) moves to target in distance 5"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:286
-msgid "(7) moves to target in distance 7"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:291
-msgid "(A) moves to target in attack range"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:296
-msgid "(a) archer attack range"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:301
-msgid "(?) move to target"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:309
-msgid "(D) default follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:313
-msgid "(R) relative follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:317
-msgid "(M) mirror follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:321
-msgid "(P) pet follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:325
-msgid "(?) unknown follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:334 src/gui/statuspopup.cpp:357
-msgid "(D) default attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:339
-msgid "(s) switch attack without shield"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:344
-msgid "(S) switch attack with shield"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:348 src/gui/statuspopup.cpp:373
-msgid "(?) attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:361
-msgid "(G) go and attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:365
-msgid "(A) go, attack, pickup"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:369
-msgid "(d) without auto attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:387
-msgid "(S) small pick up 1x1 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:391
-msgid "(D) default pick up 2x1 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:395
-msgid "(F) forward pick up 2x3 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:399
-msgid "(3) pick up 3x3 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:403
-msgid "(g) go and pick up in distance 4"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:407
-msgid "(G) go and pick up in distance 8"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:411
-msgid "(A) go and pick up in max distance"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:415
-msgid "(?) pick up"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:424
-msgid "(N) normal map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:428
-msgid "(D) debug map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:432
-msgid "(u) ultra map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:436
-msgid "(U) ultra map view 2"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:440
-msgid "(e) empty map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:444
-msgid "(b) black & white map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:448
-msgid "(?) map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:456
-msgid "(f) use #flar for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:461
-msgid "(c) use #chiza for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:466
-msgid "(I) use #ingrav for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:471
-msgid "(F) use #frillyar for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:476
-msgid "(U) use #upmarmu for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:480
-msgid "(?) magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:489
-msgid "(a) attack all players"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:493
-msgid "(f) attack not friends"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:497
-msgid "(b) attack bad relations"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:501
-msgid "(d) dont attack players"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:505
-msgid "(?) pvp attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:514
-msgid "(D) default imitation"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:518
-msgid "(O) outfits imitation"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:522
-msgid "(?) imitation"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:531
-msgid "(O) on keyboard"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:534
-msgid "(A) away"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:537 src/gui/statuspopup.cpp:557
-msgid "(?) away"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:545
-msgid "(G) game camera mode"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:549
-msgid "(F) free camera mode"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:553
-msgid "(D) design camera mode"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:564
-msgid "Game modifiers are disabled"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:569
-msgid "Game modifiers are enabled"
-msgstr ""
-
 #: src/gui/statuswindow.cpp:144 src/gui/statuswindow.cpp:274
 #: src/gui/statuswindow.cpp:337
 #, c-format
@@ -3185,136 +2921,6 @@ msgstr ""
 msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:649 src/gui/statuswindow.cpp:717
-#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:753
-#: src/gui/statuswindow.cpp:818 src/gui/statuswindow.cpp:847
-#: src/gui/statuswindow.cpp:870 src/gui/statuswindow.cpp:889
-msgid "(D)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:652 src/gui/statuswindow.cpp:778
-msgid "(I)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:655 src/gui/statuswindow.cpp:775
-msgid "(c)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:658
-msgid "(C)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:661 src/gui/statuswindow.cpp:762
-#: src/gui/statuswindow.cpp:803
-msgid "(d)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:664 src/gui/statuswindow.cpp:678
-#: src/gui/statuswindow.cpp:710 src/gui/statuswindow.cpp:729
-#: src/gui/statuswindow.cpp:746 src/gui/statuswindow.cpp:765
-#: src/gui/statuswindow.cpp:787 src/gui/statuswindow.cpp:806
-#: src/gui/statuswindow.cpp:836 src/gui/statuswindow.cpp:862
-#: src/gui/statuswindow.cpp:876 src/gui/statuswindow.cpp:892
-#: src/gui/statuswindow.cpp:905
-msgid "(?)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:675 src/gui/statuswindow.cpp:707
-#: src/gui/statuswindow.cpp:794
-msgid "(a)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:686
-msgid "(0)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:689
-msgid "(1)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:692
-msgid "(2)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:695 src/gui/statuswindow.cpp:824
-msgid "(3)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:698
-msgid "(5)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:701
-msgid "(7)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:704 src/gui/statuswindow.cpp:759
-#: src/gui/statuswindow.cpp:833 src/gui/statuswindow.cpp:902
-msgid "(A)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:720
-msgid "(R)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:723
-msgid "(M)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:726
-msgid "(P)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:740
-msgid "(s)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:743 src/gui/statuswindow.cpp:815
-msgid "(S)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:756 src/gui/statuswindow.cpp:830
-#: src/gui/statuswindow.cpp:883
-msgid "(G)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:772 src/gui/statuswindow.cpp:797
-msgid "(f)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:781 src/gui/statuswindow.cpp:821
-#: src/gui/statuswindow.cpp:886
-msgid "(F)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:784 src/gui/statuswindow.cpp:853
-msgid "(U)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:800 src/gui/statuswindow.cpp:859
-msgid "(b)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:827
-msgid "(g)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:844
-msgid "(N)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:850
-msgid "(u)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:856
-msgid "(e)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:873 src/gui/statuswindow.cpp:899
-msgid "(O)"
-msgstr ""
-
 #: src/gui/textcommandeditor.cpp:113
 msgid "No Target"
 msgstr ""
@@ -3627,7 +3233,7 @@ msgstr ""
 msgid "Road Point"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:85 src/gui/whoisonline.cpp:479
+#: src/gui/whoisonline.cpp:85 src/gui/whoisonline.cpp:494
 msgid "Who Is Online - Updating"
 msgstr ""
 
@@ -3635,15 +3241,15 @@ msgstr ""
 msgid "Update"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:302
+#: src/gui/whoisonline.cpp:307
 msgid "Who Is Online - "
 msgstr ""
 
-#: src/gui/whoisonline.cpp:493
+#: src/gui/whoisonline.cpp:508
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:525
+#: src/gui/whoisonline.cpp:540
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -4347,68 +3953,333 @@ msgid ""
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:389
+#: src/localplayer.cpp:384
 msgid "You were killed by "
 msgstr ""
 
-#: src/localplayer.cpp:1442
+#: src/localplayer.cpp:1434
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1436
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1446
+#: src/localplayer.cpp:1438
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1448
+#: src/localplayer.cpp:1440
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1450
+#: src/localplayer.cpp:1442
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1453
+#: src/localplayer.cpp:1445
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1456
+#: src/localplayer.cpp:1448
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1480
+#: src/localplayer.cpp:1472
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/localplayer.cpp:3206
+#: src/localplayer.cpp:1887
+msgid "(D) default moves"
+msgstr ""
+
+#: src/localplayer.cpp:1888
+msgid "(I) invert moves"
+msgstr ""
+
+#: src/localplayer.cpp:1889
+msgid "(c) moves with some crazy moves"
+msgstr ""
+
+#: src/localplayer.cpp:1890
+msgid "(C) moves with crazy moves"
+msgstr ""
+
+#: src/localplayer.cpp:1891
+msgid "(d) double normal + crazy"
+msgstr ""
+
+#: src/localplayer.cpp:1892
+msgid "(?) unknown move"
+msgstr ""
+
+#: src/localplayer.cpp:1914
+#, c-format
+msgid "(%d) crazy move number %d"
+msgstr ""
+
+#: src/localplayer.cpp:1919
+msgid "(a) custom crazy move"
+msgstr ""
+
+#: src/localplayer.cpp:1923
+msgid "(?) crazy move"
+msgstr ""
+
+#: src/localplayer.cpp:1937
+msgid "(0) default moves to target"
+msgstr ""
+
+#: src/localplayer.cpp:1938
+msgid "(1) moves to target in distance 1"
+msgstr ""
+
+#: src/localplayer.cpp:1939
+msgid "(2) moves to target in distance 2"
+msgstr ""
+
+#: src/localplayer.cpp:1940
+msgid "(3) moves to target in distance 3"
+msgstr ""
+
+#: src/localplayer.cpp:1941
+msgid "(5) moves to target in distance 5"
+msgstr ""
+
+#: src/localplayer.cpp:1942
+msgid "(7) moves to target in distance 7"
+msgstr ""
+
+#: src/localplayer.cpp:1943
+msgid "(A) moves to target in attack range"
+msgstr ""
+
+#: src/localplayer.cpp:1944
+msgid "(a) archer attack range"
+msgstr ""
+
+#: src/localplayer.cpp:1945
+msgid "(?) move to target"
+msgstr ""
+
+#: src/localplayer.cpp:1964
+msgid "(D) default follow"
+msgstr ""
+
+#: src/localplayer.cpp:1965
+msgid "(R) relative follow"
+msgstr ""
+
+#: src/localplayer.cpp:1966
+msgid "(M) mirror follow"
+msgstr ""
+
+#: src/localplayer.cpp:1967
+msgid "(P) pet follow"
+msgstr ""
+
+#: src/localplayer.cpp:1968
+msgid "(?) unknown follow"
+msgstr ""
+
+#: src/localplayer.cpp:1987 src/localplayer.cpp:1991 src/localplayer.cpp:2014
+msgid "(?) attack"
+msgstr ""
+
+#: src/localplayer.cpp:1988 src/localplayer.cpp:2010
+msgid "(D) default attack"
+msgstr ""
+
+#: src/localplayer.cpp:1989
+msgid "(s) switch attack without shield"
+msgstr ""
+
+#: src/localplayer.cpp:1990
+msgid "(S) switch attack with shield"
+msgstr ""
+
+#: src/localplayer.cpp:2011
+msgid "(G) go and attack"
+msgstr ""
+
+#: src/localplayer.cpp:2012
+msgid "(A) go, attack, pickup"
+msgstr ""
+
+#: src/localplayer.cpp:2013
+msgid "(d) without auto attack"
+msgstr ""
+
+#: src/localplayer.cpp:2047
+msgid "(S) small pick up 1x1 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2048
+msgid "(D) default pick up 2x1 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2049
+msgid "(F) forward pick up 2x3 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2050
+msgid "(3) pick up 3x3 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2051
+msgid "(g) go and pick up in distance 4"
+msgstr ""
+
+#: src/localplayer.cpp:2052
+msgid "(G) go and pick up in distance 8"
+msgstr ""
+
+#: src/localplayer.cpp:2053
+msgid "(A) go and pick up in max distance"
+msgstr ""
+
+#: src/localplayer.cpp:2054
+msgid "(?) pick up"
+msgstr ""
+
+#: src/localplayer.cpp:2067
+msgid "(N) normal map view"
+msgstr ""
+
+#: src/localplayer.cpp:2068
+msgid "(D) debug map view"
+msgstr ""
+
+#: src/localplayer.cpp:2069
+msgid "(u) ultra map view"
+msgstr ""
+
+#: src/localplayer.cpp:2070
+msgid "(U) ultra map view 2"
+msgstr ""
+
+#: src/localplayer.cpp:2071
+msgid "(e) empty map view"
+msgstr ""
+
+#: src/localplayer.cpp:2072
+msgid "(b) black & white map view"
+msgstr ""
+
+#: src/localplayer.cpp:2091
+msgid "(f) use #flar for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2092
+msgid "(c) use #chiza for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2093
+msgid "(I) use #ingrav for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2094
+msgid "(F) use #frillyar for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2095
+msgid "(U) use #upmarmu for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2096
+msgid "(?) magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2115
+msgid "(a) attack all players"
+msgstr ""
+
+#: src/localplayer.cpp:2116
+msgid "(f) attack not friends"
+msgstr ""
+
+#: src/localplayer.cpp:2117
+msgid "(b) attack bad relations"
+msgstr ""
+
+#: src/localplayer.cpp:2118
+msgid "(d) dont attack players"
+msgstr ""
+
+#: src/localplayer.cpp:2119
+msgid "(?) pvp attack"
+msgstr ""
+
+#: src/localplayer.cpp:2138
+msgid "(D) default imitation"
+msgstr ""
+
+#: src/localplayer.cpp:2139
+msgid "(O) outfits imitation"
+msgstr ""
+
+#: src/localplayer.cpp:2140
+msgid "(?) imitation"
+msgstr ""
+
+#: src/localplayer.cpp:2168
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:3541
+#: src/localplayer.cpp:2187
+msgid "(O) on keyboard"
+msgstr ""
+
+#: src/localplayer.cpp:2188
+msgid "(A) away"
+msgstr ""
+
+#: src/localplayer.cpp:2189 src/localplayer.cpp:2204
+msgid "(?) away"
+msgstr ""
+
+#: src/localplayer.cpp:2202
+msgid "(G) game camera mode"
+msgstr ""
+
+#: src/localplayer.cpp:2203
+msgid "(F) free camera mode"
+msgstr ""
+
+#: src/localplayer.cpp:2228
+msgid "Game modifiers are enabled"
+msgstr ""
+
+#: src/localplayer.cpp:2229
+msgid "Game modifiers are disabled"
+msgstr ""
+
+#: src/localplayer.cpp:2230
+msgid "Game modifiers are unknown"
+msgstr ""
+
+#: src/localplayer.cpp:3746
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3543 src/localplayer.cpp:3558
+#: src/localplayer.cpp:3748 src/localplayer.cpp:3763
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3550
+#: src/localplayer.cpp:3755
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3552 src/localplayer.cpp:3560
+#: src/localplayer.cpp:3757 src/localplayer.cpp:3765
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3908
+#: src/localplayer.cpp:4113
 msgid "You see "
 msgstr ""
 
@@ -4516,71 +4387,71 @@ msgstr ""
 msgid "Unable to buy."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:63
+#: src/net/ea/charserverhandler.cpp:66
 msgid "Strength:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:64
+#: src/net/ea/charserverhandler.cpp:67
 msgid "Agility:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:65
+#: src/net/ea/charserverhandler.cpp:68
 msgid "Vitality:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:66
+#: src/net/ea/charserverhandler.cpp:69
 msgid "Intelligence:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:67
+#: src/net/ea/charserverhandler.cpp:70
 msgid "Dexterity:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:68
+#: src/net/ea/charserverhandler.cpp:71
 msgid "Luck:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:102
+#: src/net/ea/charserverhandler.cpp:115
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:106
+#: src/net/ea/charserverhandler.cpp:119
 msgid "Cannot use this ID."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:109
+#: src/net/ea/charserverhandler.cpp:122
 msgid "Unknown char-server failure."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:138
+#: src/net/ea/charserverhandler.cpp:151
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:235
+#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:235
 msgid "Wrong name."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:145
+#: src/net/ea/charserverhandler.cpp:158
 msgid "Incorrect stats."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:148
+#: src/net/ea/charserverhandler.cpp:161
 msgid "Incorrect hair."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:151
+#: src/net/ea/charserverhandler.cpp:164
 msgid "Incorrect slot."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:166 src/net/manaserv/charhandler.cpp:210
+#: src/net/ea/charserverhandler.cpp:179 src/net/manaserv/charhandler.cpp:210
 msgid "Info"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:166
+#: src/net/ea/charserverhandler.cpp:179
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:172
+#: src/net/ea/charserverhandler.cpp:185
 msgid "Failed to delete character."
 msgstr ""
 
@@ -4805,15 +4676,15 @@ msgstr ""
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:284
+#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:285
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:294
+#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:295
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:304
+#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:305
 msgid "Item sharing not possible."
 msgstr ""
 
@@ -4821,15 +4692,15 @@ msgstr ""
 msgid "Item sharing unknown."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:246
+#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:247
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:256
+#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:257
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:266
+#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:267
 msgid "Experience sharing not possible."
 msgstr ""
 
@@ -4946,16 +4817,16 @@ msgstr ""
 msgid "QQQ Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:357
+#: src/net/ea/partyhandler.cpp:358
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:370
+#: src/net/ea/partyhandler.cpp:371
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:447
+#: src/net/ea/partyhandler.cpp:448
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
@@ -5674,19 +5545,19 @@ msgstr ""
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/playerrelations.cpp:460
+#: src/playerrelations.cpp:461
 msgid "Print '...'"
 msgstr ""
 
-#: src/playerrelations.cpp:480
+#: src/playerrelations.cpp:481
 msgid "Blink name"
 msgstr ""
 
-#: src/playerrelations.cpp:524
+#: src/playerrelations.cpp:525
 msgid "Floating '...' bubble"
 msgstr ""
 
-#: src/playerrelations.cpp:527
+#: src/playerrelations.cpp:528
 msgid "Floating bubble"
 msgstr ""
 
diff --git a/po/nl_BE.po b/po/nl_BE.po
index 7dabe9900..e33843673 100644
--- a/po/nl_BE.po
+++ b/po/nl_BE.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Jeroen De Meerleer <jeroen.de.meerleer@telenet.be>, 2011.
 # Maarten Vanraes <maarten.vanraes@gmail.com>, 2011.
@@ -9,132 +9,133 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-11-12 00:23+0300\n"
+"POT-Creation-Date: 2011-11-26 02:20+0300\n"
 "PO-Revision-Date: 2011-11-11 21:38+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
-"Language-Team: Dutch (Belgium/Flemish) (http://www.transifex.net/projects/p/manaplus/team/nl_BE/)\n"
+"Language-Team: Dutch (Belgium/Flemish) (http://www.transifex.net/projects/p/"
+"manaplus/team/nl_BE/)\n"
+"Language: nl_BE\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: nl_BE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: src/actorspritemanager.cpp:1171
 msgid "Visible on map"
 msgstr "Zichtbaar op de map"
 
-#: src/being.cpp:551
+#: src/being.cpp:553
 msgid "dodge"
 msgstr "ontwijkt"
 
-#: src/being.cpp:551
+#: src/being.cpp:553
 msgid "miss"
 msgstr "mist"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1530
+#: src/being.cpp:1534
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1535
+#: src/being.cpp:1539
 msgid "I"
 msgstr "I"
 
-#: src/client.cpp:869 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:878 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Configureren"
 
-#: src/client.cpp:876 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:885 src/gui/setup_perfomance.cpp:48
 msgid "Perfomance"
 msgstr ""
 
-#: src/client.cpp:881 src/gui/setup_video.cpp:315
+#: src/client.cpp:890 src/gui/setup_video.cpp:315
 msgid "Video"
 msgstr "Video"
 
-#: src/client.cpp:886
+#: src/client.cpp:895
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:968
+#: src/client.cpp:977
 msgid "Connecting to server"
 msgstr "Verbinden met server"
 
-#: src/client.cpp:999
+#: src/client.cpp:1008
 msgid "Logging in"
 msgstr "Inloggen"
 
-#: src/client.cpp:1032
+#: src/client.cpp:1041
 msgid "Entering game world"
 msgstr "Spelwereld binnenkomen"
 
-#: src/client.cpp:1132
+#: src/client.cpp:1142
 msgid "Requesting characters"
 msgstr "Aanvragen personage"
 
-#: src/client.cpp:1163
+#: src/client.cpp:1173
 msgid "Connecting to the game server"
 msgstr "Verbinden met de spelserver"
 
-#: src/client.cpp:1173
+#: src/client.cpp:1183
 msgid "Changing game servers"
 msgstr "Wijzigen spelservers"
 
-#: src/client.cpp:1216 src/client.cpp:1223 src/client.cpp:1357
+#: src/client.cpp:1226 src/client.cpp:1233 src/client.cpp:1367
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
-#: src/gui/charcreatedialog.cpp:221 src/gui/charselectdialog.cpp:253
+#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:254
 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
-#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
-#: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
+#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:167
+#: src/net/ea/charserverhandler.cpp:185 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "Fout"
 
-#: src/client.cpp:1232
+#: src/client.cpp:1242
 msgid "Requesting registration details"
 msgstr "Aanvragen registratie details"
 
-#: src/client.cpp:1258
+#: src/client.cpp:1268
 msgid "Password Change"
 msgstr "Paswoord Wijziging"
 
-#: src/client.cpp:1259
+#: src/client.cpp:1269
 msgid "Password changed successfully!"
 msgstr "Paswoord is gewijzigd!"
 
-#: src/client.cpp:1278
+#: src/client.cpp:1288
 msgid "Email Change"
 msgstr "Email Wijziging"
 
-#: src/client.cpp:1279
+#: src/client.cpp:1289
 msgid "Email changed successfully!"
 msgstr "Email is gewijzigd!"
 
-#: src/client.cpp:1299
+#: src/client.cpp:1309
 msgid "Unregister Successful"
 msgstr "Registratie ongedaan gemaakt!"
 
-#: src/client.cpp:1300
+#: src/client.cpp:1310
 msgid "Farewell, come back any time..."
 msgstr "Tot ziens..."
 
-#: src/client.cpp:1499 src/client.cpp:1529 src/client.cpp:1544
-#: src/client.cpp:1969 src/client.cpp:1976
+#: src/client.cpp:1509 src/client.cpp:1539 src/client.cpp:1554
+#: src/client.cpp:1979 src/client.cpp:1986
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s bestaat niet en kan niet gecreëerd worden! Stoppen."
 
-#: src/client.cpp:1675
+#: src/client.cpp:1685
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Ongeldige update host %s"
 
-#: src/client.cpp:1709 src/client.cpp:1715
+#: src/client.cpp:1719 src/client.cpp:1725
 msgid "Error creating updates directory!"
 msgstr "Fout bij het creëren van de update map!"
 
-#: src/client.cpp:1736
+#: src/client.cpp:1746
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Fout: %s bestaat niet en kan niet gecreëerd worden! Stoppen."
@@ -150,8 +151,8 @@ msgstr "Kan geen lege berichten sturen!"
 #: src/commandhandler.cpp:343
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
-" you."
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
+"you."
 msgstr ""
 "Je kan geen fluister-tab aanmaken voor \"%s\"! Het kan zijn dat hij reeds "
 "bestaat, of het is jezelf."
@@ -313,10 +314,11 @@ msgstr ""
 msgid "Resource orphaned images:"
 msgstr ""
 
-#: src/commandhandler.h:40
+#: src/commandhandler.h:34
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr "Opties voor /%s zijn \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgstr ""
+"Opties voor /%s zijn \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 
 #: src/game.cpp:252 src/gui/widgets/chattab.cpp:403
 msgid "General"
@@ -342,19 +344,19 @@ msgstr "De verbinding met de server is verbroken."
 msgid "Network Error"
 msgstr "Netwerkfout"
 
-#: src/game.cpp:1332
+#: src/game.cpp:1258
 msgid "Ignoring incoming trade requests"
 msgstr "Inkomende handelsaanvragen negeren"
 
-#: src/game.cpp:1342
+#: src/game.cpp:1268
 msgid "Accepting incoming trade requests"
 msgstr "Inkomende handelsaanvragen accepteren"
 
-#: src/game.cpp:1750
+#: src/game.cpp:1773
 msgid "Could Not Load Map"
 msgstr "Kon Map Niet Laden"
 
-#: src/game.cpp:1751
+#: src/game.cpp:1774
 #, c-format
 msgid "Error while loading %s"
 msgstr "Fout bij het laden van %s"
@@ -432,7 +434,7 @@ msgstr ""
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:207
 #: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:998
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:755
 msgid "+"
 msgstr "+"
 
@@ -440,7 +442,7 @@ msgstr "+"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:206
 #: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:1010
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:767
 msgid "-"
 msgstr "-"
 
@@ -453,7 +455,7 @@ msgstr "Afsluiten"
 
 #: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
 #: src/gui/statuswindow.cpp:505 src/gui/statuswindow.cpp:555
-#: src/gui/statuswindow.cpp:997 src/gui/statuswindow.cpp:1028
+#: src/gui/statuswindow.cpp:754 src/gui/statuswindow.cpp:785
 msgid "Max"
 msgstr "Maximum"
 
@@ -470,7 +472,7 @@ msgid "Sell"
 msgstr "Verkopen"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
-#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:96
+#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:105
 #: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
 #: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:344
 #: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:500
@@ -547,68 +549,68 @@ msgstr "Het nieuw paswoord mag niet meer dan %d karakters bevatten."
 msgid "The new password entries mismatch."
 msgstr "De nieuwe paswoord ingaven zijn niet gelijk."
 
-#: src/gui/charcreatedialog.cpp:58
+#: src/gui/charcreatedialog.cpp:59
 msgid "Create Character"
 msgstr "Personage Aanmaken"
 
-#: src/gui/charcreatedialog.cpp:76 src/gui/logindialog.cpp:94
+#: src/gui/charcreatedialog.cpp:85 src/gui/logindialog.cpp:94
 #: src/gui/register.cpp:75
 msgid "Name:"
 msgstr "Naam:"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:79 src/gui/charcreatedialog.cpp:84
-#: src/gui/charcreatedialog.cpp:90 src/gui/outfitwindow.cpp:85
+#: src/gui/charcreatedialog.cpp:88 src/gui/charcreatedialog.cpp:93
+#: src/gui/charcreatedialog.cpp:99 src/gui/outfitwindow.cpp:85
 msgid ">"
 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:82 src/gui/charcreatedialog.cpp:85
-#: src/gui/charcreatedialog.cpp:91 src/gui/outfitwindow.cpp:84
+#: src/gui/charcreatedialog.cpp:91 src/gui/charcreatedialog.cpp:94
+#: src/gui/charcreatedialog.cpp:100 src/gui/outfitwindow.cpp:84
 msgid "<"
 msgstr "<"
 
-#: src/gui/charcreatedialog.cpp:83
+#: src/gui/charcreatedialog.cpp:92
 msgid "Hair color:"
 msgstr "Haarkleur:"
 
-#: src/gui/charcreatedialog.cpp:86
+#: src/gui/charcreatedialog.cpp:95
 msgid "Hair style:"
 msgstr "Haarstijl:"
 
-#: src/gui/charcreatedialog.cpp:92
+#: src/gui/charcreatedialog.cpp:101
 msgid "Race:"
 msgstr "Ras:"
 
-#: src/gui/charcreatedialog.cpp:95 src/gui/charselectdialog.cpp:480
+#: src/gui/charcreatedialog.cpp:104 src/gui/charselectdialog.cpp:481
 #: src/gui/socialwindow.cpp:1139
 msgid "Create"
 msgstr "Aanmaken"
 
-#: src/gui/charcreatedialog.cpp:97 src/gui/register.cpp:98
+#: src/gui/charcreatedialog.cpp:106 src/gui/register.cpp:98
 msgid "Male"
 msgstr "Mannelijk"
 
-#: src/gui/charcreatedialog.cpp:98 src/gui/register.cpp:99
+#: src/gui/charcreatedialog.cpp:107 src/gui/register.cpp:99
 msgid "Female"
 msgstr "Vrouwelijk"
 
-#: src/gui/charcreatedialog.cpp:116 src/gui/charcreatedialog.cpp:303
+#: src/gui/charcreatedialog.cpp:125 src/gui/charcreatedialog.cpp:312
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Nog %d punten te verdelen"
 
-#: src/gui/charcreatedialog.cpp:222
+#: src/gui/charcreatedialog.cpp:231
 msgid "Your name needs to be at least 4 characters."
 msgstr "Je naam moet uit tenminste 4 tekens bestaan"
 
-#: src/gui/charcreatedialog.cpp:294
+#: src/gui/charcreatedialog.cpp:303
 msgid "Character stats OK"
 msgstr "Attributen van personage OK"
 
-#: src/gui/charcreatedialog.cpp:308
+#: src/gui/charcreatedialog.cpp:317
 #, c-format
 msgid "Please remove %d points"
 msgstr "Verwijder alstublieft %d punten"
@@ -638,34 +640,34 @@ msgstr "Registreren"
 msgid "Change Email"
 msgstr "Wijzig Email"
 
-#: src/gui/charselectdialog.cpp:253
+#: src/gui/charselectdialog.cpp:254
 msgid "Incorrect password"
 msgstr "Ongeldig paswoord"
 
-#: src/gui/charselectdialog.cpp:286
+#: src/gui/charselectdialog.cpp:287
 msgid "Enter password for deleting character"
 msgstr "Geef uw wachtwoord om uw personage te verwijderen"
 
-#: src/gui/charselectdialog.cpp:286
+#: src/gui/charselectdialog.cpp:287
 msgid "Enter password:"
 msgstr "Geef wachtwoord:"
 
-#: src/gui/charselectdialog.cpp:410 src/gui/serverdialog.cpp:298
+#: src/gui/charselectdialog.cpp:411 src/gui/serverdialog.cpp:298
 #: src/gui/setup_relations.cpp:244 src/gui/shopwindow.cpp:122
 #: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244
 msgid "Delete"
 msgstr "Verwijderen"
 
-#: src/gui/charselectdialog.cpp:468
+#: src/gui/charselectdialog.cpp:469
 msgid "Choose"
 msgstr "Kies"
 
-#: src/gui/charselectdialog.cpp:471
+#: src/gui/charselectdialog.cpp:472
 #, c-format
 msgid "Level %d"
 msgstr "Niveau %d"
 
-#: src/gui/charselectdialog.cpp:482 src/gui/charselectdialog.cpp:483
+#: src/gui/charselectdialog.cpp:483 src/gui/charselectdialog.cpp:484
 msgid "(empty)"
 msgstr "(leeg)"
 
@@ -930,11 +932,11 @@ msgstr ""
 msgid "OK"
 msgstr "OK"
 
-#: src/gui/equipmentwindow.cpp:61 src/gui/windowmenu.cpp:74
+#: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74
 msgid "Equipment"
 msgstr "Uitrusting"
 
-#: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160
+#: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160
 #: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554
 #: src/gui/popupmenu.cpp:1737 src/gui/popupmenu.cpp:1829
 #: src/gui/popupmenu.cpp:1874
@@ -1371,7 +1373,7 @@ msgstr ""
 #: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:190
 #: src/gui/popupmenu.cpp:415 src/gui/popupmenu.cpp:435
 #: src/gui/popupmenu.cpp:672 src/gui/popupmenu.cpp:692
-#: src/playerrelations.cpp:446
+#: src/playerrelations.cpp:447
 msgid "Completely ignore"
 msgstr "Volledig genegeerd"
 
@@ -2606,8 +2608,8 @@ msgstr "Scherm Resolutie is gewijzigd"
 #: src/gui/setup_video.cpp:621
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
-"Enkele vensters kunnen verplaatst worden om te passen in de omlaag gebrachte"
-" resolutie"
+"Enkele vensters kunnen verplaatst worden om te passen in de omlaag gebrachte "
+"resolutie"
 
 #: src/gui/setup_video.cpp:654
 msgid "Particle Effect Settings Changed."
@@ -2884,270 +2886,6 @@ msgstr "Kies uw groepsnaam."
 msgid "Specials"
 msgstr "Specialen"
 
-#: src/gui/statuspopup.cpp:204
-msgid "(D) default moves"
-msgstr "(D) standaard bewegingen"
-
-#: src/gui/statuspopup.cpp:209
-msgid "(I) invert moves"
-msgstr "(I) geïnverteerde bewegingen"
-
-#: src/gui/statuspopup.cpp:214
-msgid "(c) moves with some crazy moves"
-msgstr "(c) bewegingen met enkele vreemde bewegingen"
-
-#: src/gui/statuspopup.cpp:219
-msgid "(C) moves with crazy moves"
-msgstr "(C) bewegingen met vreemde bewegingen"
-
-#: src/gui/statuspopup.cpp:224
-msgid "(d) double normal + crazy"
-msgstr "(d) dubbel normaal + raar"
-
-#: src/gui/statuspopup.cpp:229
-msgid "(?) move"
-msgstr "(?) beweeg"
-
-#: src/gui/statuspopup.cpp:247
-msgid "(a) custom crazy move"
-msgstr "(a) manuele vreemde beweging"
-
-#: src/gui/statuspopup.cpp:251
-msgid "(?) crazy move"
-msgstr "(?) vreemde beweging"
-
-#: src/gui/statuspopup.cpp:261
-msgid "(0) default moves to target"
-msgstr "(0) standaard bewegingen tot aan doel"
-
-#: src/gui/statuspopup.cpp:266
-msgid "(1) moves to target in distance 1"
-msgstr "(1) bewegen tot aan doel in bereik 1"
-
-#: src/gui/statuspopup.cpp:271
-msgid "(2) moves to target in distance 2"
-msgstr "(2) bewegen tot aan doel in bereik 2"
-
-#: src/gui/statuspopup.cpp:276
-msgid "(3) moves to target in distance 3"
-msgstr "(3) bewegen tot aan doel in bereik 3"
-
-#: src/gui/statuspopup.cpp:281
-msgid "(5) moves to target in distance 5"
-msgstr "(5) bewegen tot aan doel in bereik 5"
-
-#: src/gui/statuspopup.cpp:286
-msgid "(7) moves to target in distance 7"
-msgstr "(7) bewegen tot aan doel in bereik 7"
-
-#: src/gui/statuspopup.cpp:291
-msgid "(A) moves to target in attack range"
-msgstr "(A) beweeg tot aan doel in aanvalsbereik"
-
-#: src/gui/statuspopup.cpp:296
-msgid "(a) archer attack range"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:301
-msgid "(?) move to target"
-msgstr "(?) beweeg tot aan doel"
-
-#: src/gui/statuspopup.cpp:309
-msgid "(D) default follow"
-msgstr "(D) standaard volgen"
-
-#: src/gui/statuspopup.cpp:313
-msgid "(R) relative follow"
-msgstr "(R) relatief volgen"
-
-#: src/gui/statuspopup.cpp:317
-msgid "(M) mirror follow"
-msgstr "(M) gespiegeld volgen"
-
-#: src/gui/statuspopup.cpp:321
-msgid "(P) pet follow"
-msgstr "(P) huisdier volgen"
-
-#: src/gui/statuspopup.cpp:325
-msgid "(?) unknown follow"
-msgstr "(?) onbekend volgen"
-
-#: src/gui/statuspopup.cpp:334 src/gui/statuspopup.cpp:357
-msgid "(D) default attack"
-msgstr "(D) standaard aanval"
-
-#: src/gui/statuspopup.cpp:339
-msgid "(s) switch attack without shield"
-msgstr "(s) wissel aanval zonder schild"
-
-#: src/gui/statuspopup.cpp:344
-msgid "(S) switch attack with shield"
-msgstr "(S) wissel aanval met schild"
-
-#: src/gui/statuspopup.cpp:348 src/gui/statuspopup.cpp:373
-msgid "(?) attack"
-msgstr "(?) aanval"
-
-#: src/gui/statuspopup.cpp:361
-msgid "(G) go and attack"
-msgstr "(G) ga en val aan"
-
-#: src/gui/statuspopup.cpp:365
-msgid "(A) go, attack, pickup"
-msgstr "(A) ga, val aan, raap op"
-
-#: src/gui/statuspopup.cpp:369
-msgid "(d) without auto attack"
-msgstr "(d) zonder auto aanval"
-
-#: src/gui/statuspopup.cpp:387
-msgid "(S) small pick up 1x1 cells"
-msgstr "(S) klein raap op 1x1 velden"
-
-#: src/gui/statuspopup.cpp:391
-msgid "(D) default pick up 2x1 cells"
-msgstr "(D) standaard raap op 2x1 velden"
-
-#: src/gui/statuspopup.cpp:395
-msgid "(F) forward pick up 2x3 cells"
-msgstr "(F) vooruit raap op 2x3 velden"
-
-#: src/gui/statuspopup.cpp:399
-msgid "(3) pick up 3x3 cells"
-msgstr "(3) raap op 3x3 velden"
-
-#: src/gui/statuspopup.cpp:403
-msgid "(g) go and pick up in distance 4"
-msgstr "(g) go en raap op met bereik 4"
-
-#: src/gui/statuspopup.cpp:407
-msgid "(G) go and pick up in distance 8"
-msgstr "(G) ga en raap op met bereik 8"
-
-#: src/gui/statuspopup.cpp:411
-msgid "(A) go and pick up in max distance"
-msgstr "(A) ga en raap op zonder bereiklimiet"
-
-#: src/gui/statuspopup.cpp:415
-msgid "(?) pick up"
-msgstr "(?) raap op"
-
-#: src/gui/statuspopup.cpp:424
-msgid "(N) normal map view"
-msgstr "(N) normale map tonen"
-
-#: src/gui/statuspopup.cpp:428
-msgid "(D) debug map view"
-msgstr "(D) debug map tonen"
-
-#: src/gui/statuspopup.cpp:432
-msgid "(u) ultra map view"
-msgstr "(u) ultra map tonen"
-
-#: src/gui/statuspopup.cpp:436
-msgid "(U) ultra map view 2"
-msgstr "(U) ultra map tonen 2"
-
-#: src/gui/statuspopup.cpp:440
-msgid "(e) empty map view"
-msgstr "(e) lege map tonen"
-
-#: src/gui/statuspopup.cpp:444
-msgid "(b) black & white map view"
-msgstr "(b) zwart & witte map tonen"
-
-#: src/gui/statuspopup.cpp:448
-msgid "(?) map view"
-msgstr "(?) map tonen"
-
-#: src/gui/statuspopup.cpp:456
-msgid "(f) use #flar for magic attack"
-msgstr "(f) gebruik #flar voor magie aanval"
-
-#: src/gui/statuspopup.cpp:461
-msgid "(c) use #chiza for magic attack"
-msgstr "(c) gebruik #chiza voor magie aanval"
-
-#: src/gui/statuspopup.cpp:466
-msgid "(I) use #ingrav for magic attack"
-msgstr "(I) gebruik #ingrav voor magie aanval"
-
-#: src/gui/statuspopup.cpp:471
-msgid "(F) use #frillyar for magic attack"
-msgstr "(F) gebruik #frillyar voor magie aanval"
-
-#: src/gui/statuspopup.cpp:476
-msgid "(U) use #upmarmu for magic attack"
-msgstr "(U) gebruik #upmarmu voor magie aanval"
-
-#: src/gui/statuspopup.cpp:480
-msgid "(?) magic attack"
-msgstr "(?) magie aanval"
-
-#: src/gui/statuspopup.cpp:489
-msgid "(a) attack all players"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:493
-msgid "(f) attack not friends"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:497
-msgid "(b) attack bad relations"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:501
-msgid "(d) dont attack players"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:505
-msgid "(?) pvp attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:514
-msgid "(D) default imitation"
-msgstr "(D) standaard imitatie"
-
-#: src/gui/statuspopup.cpp:518
-msgid "(O) outfits imitation"
-msgstr "(O) kleren imitatie"
-
-#: src/gui/statuspopup.cpp:522
-msgid "(?) imitation"
-msgstr "(?) imitatie"
-
-#: src/gui/statuspopup.cpp:531
-msgid "(O) on keyboard"
-msgstr "(O) op toetsenbord"
-
-#: src/gui/statuspopup.cpp:534
-msgid "(A) away"
-msgstr "(A) weg"
-
-#: src/gui/statuspopup.cpp:537 src/gui/statuspopup.cpp:557
-msgid "(?) away"
-msgstr "(?) weg"
-
-#: src/gui/statuspopup.cpp:545
-msgid "(G) game camera mode"
-msgstr "(G) spel camera modus"
-
-#: src/gui/statuspopup.cpp:549
-msgid "(F) free camera mode"
-msgstr "(F) vrije camera modus"
-
-#: src/gui/statuspopup.cpp:553
-msgid "(D) design camera mode"
-msgstr "(D) design camera modus"
-
-#: src/gui/statuspopup.cpp:564
-msgid "Game modifiers are disabled"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:569
-msgid "Game modifiers are enabled"
-msgstr ""
-
 #: src/gui/statuswindow.cpp:144 src/gui/statuswindow.cpp:274
 #: src/gui/statuswindow.cpp:337
 #, c-format
@@ -3196,136 +2934,6 @@ msgstr "Niveau: %d (GM %d)"
 msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:649 src/gui/statuswindow.cpp:717
-#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:753
-#: src/gui/statuswindow.cpp:818 src/gui/statuswindow.cpp:847
-#: src/gui/statuswindow.cpp:870 src/gui/statuswindow.cpp:889
-msgid "(D)"
-msgstr "(D)"
-
-#: src/gui/statuswindow.cpp:652 src/gui/statuswindow.cpp:778
-msgid "(I)"
-msgstr "(I)"
-
-#: src/gui/statuswindow.cpp:655 src/gui/statuswindow.cpp:775
-msgid "(c)"
-msgstr "(c)"
-
-#: src/gui/statuswindow.cpp:658
-msgid "(C)"
-msgstr "(C)"
-
-#: src/gui/statuswindow.cpp:661 src/gui/statuswindow.cpp:762
-#: src/gui/statuswindow.cpp:803
-msgid "(d)"
-msgstr "(d)"
-
-#: src/gui/statuswindow.cpp:664 src/gui/statuswindow.cpp:678
-#: src/gui/statuswindow.cpp:710 src/gui/statuswindow.cpp:729
-#: src/gui/statuswindow.cpp:746 src/gui/statuswindow.cpp:765
-#: src/gui/statuswindow.cpp:787 src/gui/statuswindow.cpp:806
-#: src/gui/statuswindow.cpp:836 src/gui/statuswindow.cpp:862
-#: src/gui/statuswindow.cpp:876 src/gui/statuswindow.cpp:892
-#: src/gui/statuswindow.cpp:905
-msgid "(?)"
-msgstr "(?)"
-
-#: src/gui/statuswindow.cpp:675 src/gui/statuswindow.cpp:707
-#: src/gui/statuswindow.cpp:794
-msgid "(a)"
-msgstr "(a)"
-
-#: src/gui/statuswindow.cpp:686
-msgid "(0)"
-msgstr "(0)"
-
-#: src/gui/statuswindow.cpp:689
-msgid "(1)"
-msgstr "(1)"
-
-#: src/gui/statuswindow.cpp:692
-msgid "(2)"
-msgstr "(2)"
-
-#: src/gui/statuswindow.cpp:695 src/gui/statuswindow.cpp:824
-msgid "(3)"
-msgstr "(3)"
-
-#: src/gui/statuswindow.cpp:698
-msgid "(5)"
-msgstr "(5)"
-
-#: src/gui/statuswindow.cpp:701
-msgid "(7)"
-msgstr "(7)"
-
-#: src/gui/statuswindow.cpp:704 src/gui/statuswindow.cpp:759
-#: src/gui/statuswindow.cpp:833 src/gui/statuswindow.cpp:902
-msgid "(A)"
-msgstr "(A)"
-
-#: src/gui/statuswindow.cpp:720
-msgid "(R)"
-msgstr "(R)"
-
-#: src/gui/statuswindow.cpp:723
-msgid "(M)"
-msgstr "(M)"
-
-#: src/gui/statuswindow.cpp:726
-msgid "(P)"
-msgstr "(P)"
-
-#: src/gui/statuswindow.cpp:740
-msgid "(s)"
-msgstr "(s)"
-
-#: src/gui/statuswindow.cpp:743 src/gui/statuswindow.cpp:815
-msgid "(S)"
-msgstr "(S)"
-
-#: src/gui/statuswindow.cpp:756 src/gui/statuswindow.cpp:830
-#: src/gui/statuswindow.cpp:883
-msgid "(G)"
-msgstr "(G)"
-
-#: src/gui/statuswindow.cpp:772 src/gui/statuswindow.cpp:797
-msgid "(f)"
-msgstr "(f)"
-
-#: src/gui/statuswindow.cpp:781 src/gui/statuswindow.cpp:821
-#: src/gui/statuswindow.cpp:886
-msgid "(F)"
-msgstr "(F)"
-
-#: src/gui/statuswindow.cpp:784 src/gui/statuswindow.cpp:853
-msgid "(U)"
-msgstr "(U)"
-
-#: src/gui/statuswindow.cpp:800 src/gui/statuswindow.cpp:859
-msgid "(b)"
-msgstr "(b)"
-
-#: src/gui/statuswindow.cpp:827
-msgid "(g)"
-msgstr "(g)"
-
-#: src/gui/statuswindow.cpp:844
-msgid "(N)"
-msgstr "(N)"
-
-#: src/gui/statuswindow.cpp:850
-msgid "(u)"
-msgstr "(u)"
-
-#: src/gui/statuswindow.cpp:856
-msgid "(e)"
-msgstr "(e)"
-
-#: src/gui/statuswindow.cpp:873 src/gui/statuswindow.cpp:899
-msgid "(O)"
-msgstr "(O)"
-
 #: src/gui/textcommandeditor.cpp:113
 msgid "No Target"
 msgstr "Geen Doel"
@@ -3452,11 +3060,10 @@ msgid "You don't have enough money."
 msgstr "Je hebt niet genoeg geld."
 
 #: src/gui/tradewindow.cpp:454
-msgid ""
-"Failed adding item. You can not overlap one kind of item on the window."
+msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
-"Kan dat voorwerp niet toevoegen. Je kan één type voorwerp niet overlappen in"
-" het venster."
+"Kan dat voorwerp niet toevoegen. Je kan één type voorwerp niet overlappen in "
+"het venster."
 
 #: src/gui/unregisterdialog.cpp:54
 #, c-format
@@ -3641,7 +3248,7 @@ msgstr ""
 msgid "Road Point"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:85 src/gui/whoisonline.cpp:479
+#: src/gui/whoisonline.cpp:85 src/gui/whoisonline.cpp:494
 msgid "Who Is Online - Updating"
 msgstr "Wie Is Online - Bijwerken"
 
@@ -3649,15 +3256,15 @@ msgstr "Wie Is Online - Bijwerken"
 msgid "Update"
 msgstr "Bijwerken"
 
-#: src/gui/whoisonline.cpp:302
+#: src/gui/whoisonline.cpp:307
 msgid "Who Is Online - "
 msgstr "Wie Is Online - "
 
-#: src/gui/whoisonline.cpp:493
+#: src/gui/whoisonline.cpp:508
 msgid "Who Is Online - error"
 msgstr "Wie Is Online - fout"
 
-#: src/gui/whoisonline.cpp:525
+#: src/gui/whoisonline.cpp:540
 msgid "Who Is Online - Update"
 msgstr "Wie Is Online - Bijgewerkt"
 
@@ -3841,8 +3448,7 @@ msgid "Command: /unignore <player>"
 msgstr "Commando: /unignore <speler>"
 
 #: src/gui/widgets/whispertab.cpp:131
-msgid ""
-"This command stops ignoring the other player if they are being ignored."
+msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 "Dit commando stop met de andere speler te negeren als deze genegeerd werd."
 
@@ -4371,68 +3977,334 @@ msgid ""
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:389
+#: src/localplayer.cpp:384
 msgid "You were killed by "
 msgstr "U bent gedoodt door "
 
-#: src/localplayer.cpp:1442
+#: src/localplayer.cpp:1434
 msgid "Tried to pick up nonexistent item."
 msgstr "Geprobeerd een nietbestaand voorwerp op te rapen."
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1436
 msgid "Item is too heavy."
 msgstr "Voorwerp is te zwaar."
 
-#: src/localplayer.cpp:1446
+#: src/localplayer.cpp:1438
 msgid "Item is too far away."
 msgstr "Voorwerp is te ver weg."
 
-#: src/localplayer.cpp:1448
+#: src/localplayer.cpp:1440
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1450
+#: src/localplayer.cpp:1442
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1453
+#: src/localplayer.cpp:1445
 msgid "Item belongs to someone else."
 msgstr "Voorwerp behoort bij iemand anders."
 
-#: src/localplayer.cpp:1456
+#: src/localplayer.cpp:1448
 msgid "Unknown problem picking up item."
 msgstr "Onbekend probleem bij het oprapen van voorwerp."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1480
+#: src/localplayer.cpp:1472
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "U raapte op %d [@@%d|%s@@]."
 msgstr[1] "U raapte op %d [@@%d|%s@@]."
 
-#: src/localplayer.cpp:3206
+#: src/localplayer.cpp:1887
+msgid "(D) default moves"
+msgstr "(D) standaard bewegingen"
+
+#: src/localplayer.cpp:1888
+msgid "(I) invert moves"
+msgstr "(I) geïnverteerde bewegingen"
+
+#: src/localplayer.cpp:1889
+msgid "(c) moves with some crazy moves"
+msgstr "(c) bewegingen met enkele vreemde bewegingen"
+
+#: src/localplayer.cpp:1890
+msgid "(C) moves with crazy moves"
+msgstr "(C) bewegingen met vreemde bewegingen"
+
+#: src/localplayer.cpp:1891
+msgid "(d) double normal + crazy"
+msgstr "(d) dubbel normaal + raar"
+
+#: src/localplayer.cpp:1892
+#, fuzzy
+msgid "(?) unknown move"
+msgstr "(?) onbekend volgen"
+
+#: src/localplayer.cpp:1914
+#, fuzzy, c-format
+msgid "(%d) crazy move number %d"
+msgstr "(?) vreemde beweging"
+
+#: src/localplayer.cpp:1919
+msgid "(a) custom crazy move"
+msgstr "(a) manuele vreemde beweging"
+
+#: src/localplayer.cpp:1923
+msgid "(?) crazy move"
+msgstr "(?) vreemde beweging"
+
+#: src/localplayer.cpp:1937
+msgid "(0) default moves to target"
+msgstr "(0) standaard bewegingen tot aan doel"
+
+#: src/localplayer.cpp:1938
+msgid "(1) moves to target in distance 1"
+msgstr "(1) bewegen tot aan doel in bereik 1"
+
+#: src/localplayer.cpp:1939
+msgid "(2) moves to target in distance 2"
+msgstr "(2) bewegen tot aan doel in bereik 2"
+
+#: src/localplayer.cpp:1940
+msgid "(3) moves to target in distance 3"
+msgstr "(3) bewegen tot aan doel in bereik 3"
+
+#: src/localplayer.cpp:1941
+msgid "(5) moves to target in distance 5"
+msgstr "(5) bewegen tot aan doel in bereik 5"
+
+#: src/localplayer.cpp:1942
+msgid "(7) moves to target in distance 7"
+msgstr "(7) bewegen tot aan doel in bereik 7"
+
+#: src/localplayer.cpp:1943
+msgid "(A) moves to target in attack range"
+msgstr "(A) beweeg tot aan doel in aanvalsbereik"
+
+#: src/localplayer.cpp:1944
+msgid "(a) archer attack range"
+msgstr ""
+
+#: src/localplayer.cpp:1945
+msgid "(?) move to target"
+msgstr "(?) beweeg tot aan doel"
+
+#: src/localplayer.cpp:1964
+msgid "(D) default follow"
+msgstr "(D) standaard volgen"
+
+#: src/localplayer.cpp:1965
+msgid "(R) relative follow"
+msgstr "(R) relatief volgen"
+
+#: src/localplayer.cpp:1966
+msgid "(M) mirror follow"
+msgstr "(M) gespiegeld volgen"
+
+#: src/localplayer.cpp:1967
+msgid "(P) pet follow"
+msgstr "(P) huisdier volgen"
+
+#: src/localplayer.cpp:1968
+msgid "(?) unknown follow"
+msgstr "(?) onbekend volgen"
+
+#: src/localplayer.cpp:1987 src/localplayer.cpp:1991 src/localplayer.cpp:2014
+msgid "(?) attack"
+msgstr "(?) aanval"
+
+#: src/localplayer.cpp:1988 src/localplayer.cpp:2010
+msgid "(D) default attack"
+msgstr "(D) standaard aanval"
+
+#: src/localplayer.cpp:1989
+msgid "(s) switch attack without shield"
+msgstr "(s) wissel aanval zonder schild"
+
+#: src/localplayer.cpp:1990
+msgid "(S) switch attack with shield"
+msgstr "(S) wissel aanval met schild"
+
+#: src/localplayer.cpp:2011
+msgid "(G) go and attack"
+msgstr "(G) ga en val aan"
+
+#: src/localplayer.cpp:2012
+msgid "(A) go, attack, pickup"
+msgstr "(A) ga, val aan, raap op"
+
+#: src/localplayer.cpp:2013
+msgid "(d) without auto attack"
+msgstr "(d) zonder auto aanval"
+
+#: src/localplayer.cpp:2047
+msgid "(S) small pick up 1x1 cells"
+msgstr "(S) klein raap op 1x1 velden"
+
+#: src/localplayer.cpp:2048
+msgid "(D) default pick up 2x1 cells"
+msgstr "(D) standaard raap op 2x1 velden"
+
+#: src/localplayer.cpp:2049
+msgid "(F) forward pick up 2x3 cells"
+msgstr "(F) vooruit raap op 2x3 velden"
+
+#: src/localplayer.cpp:2050
+msgid "(3) pick up 3x3 cells"
+msgstr "(3) raap op 3x3 velden"
+
+#: src/localplayer.cpp:2051
+msgid "(g) go and pick up in distance 4"
+msgstr "(g) go en raap op met bereik 4"
+
+#: src/localplayer.cpp:2052
+msgid "(G) go and pick up in distance 8"
+msgstr "(G) ga en raap op met bereik 8"
+
+#: src/localplayer.cpp:2053
+msgid "(A) go and pick up in max distance"
+msgstr "(A) ga en raap op zonder bereiklimiet"
+
+#: src/localplayer.cpp:2054
+msgid "(?) pick up"
+msgstr "(?) raap op"
+
+#: src/localplayer.cpp:2067
+msgid "(N) normal map view"
+msgstr "(N) normale map tonen"
+
+#: src/localplayer.cpp:2068
+msgid "(D) debug map view"
+msgstr "(D) debug map tonen"
+
+#: src/localplayer.cpp:2069
+msgid "(u) ultra map view"
+msgstr "(u) ultra map tonen"
+
+#: src/localplayer.cpp:2070
+msgid "(U) ultra map view 2"
+msgstr "(U) ultra map tonen 2"
+
+#: src/localplayer.cpp:2071
+msgid "(e) empty map view"
+msgstr "(e) lege map tonen"
+
+#: src/localplayer.cpp:2072
+msgid "(b) black & white map view"
+msgstr "(b) zwart & witte map tonen"
+
+#: src/localplayer.cpp:2091
+msgid "(f) use #flar for magic attack"
+msgstr "(f) gebruik #flar voor magie aanval"
+
+#: src/localplayer.cpp:2092
+msgid "(c) use #chiza for magic attack"
+msgstr "(c) gebruik #chiza voor magie aanval"
+
+#: src/localplayer.cpp:2093
+msgid "(I) use #ingrav for magic attack"
+msgstr "(I) gebruik #ingrav voor magie aanval"
+
+#: src/localplayer.cpp:2094
+msgid "(F) use #frillyar for magic attack"
+msgstr "(F) gebruik #frillyar voor magie aanval"
+
+#: src/localplayer.cpp:2095
+msgid "(U) use #upmarmu for magic attack"
+msgstr "(U) gebruik #upmarmu voor magie aanval"
+
+#: src/localplayer.cpp:2096
+msgid "(?) magic attack"
+msgstr "(?) magie aanval"
+
+#: src/localplayer.cpp:2115
+msgid "(a) attack all players"
+msgstr ""
+
+#: src/localplayer.cpp:2116
+msgid "(f) attack not friends"
+msgstr ""
+
+#: src/localplayer.cpp:2117
+msgid "(b) attack bad relations"
+msgstr ""
+
+#: src/localplayer.cpp:2118
+msgid "(d) dont attack players"
+msgstr ""
+
+#: src/localplayer.cpp:2119
+msgid "(?) pvp attack"
+msgstr ""
+
+#: src/localplayer.cpp:2138
+msgid "(D) default imitation"
+msgstr "(D) standaard imitatie"
+
+#: src/localplayer.cpp:2139
+msgid "(O) outfits imitation"
+msgstr "(O) kleren imitatie"
+
+#: src/localplayer.cpp:2140
+msgid "(?) imitation"
+msgstr "(?) imitatie"
+
+#: src/localplayer.cpp:2168
 msgid "Away"
 msgstr "Weg"
 
-#: src/localplayer.cpp:3541
+#: src/localplayer.cpp:2187
+msgid "(O) on keyboard"
+msgstr "(O) op toetsenbord"
+
+#: src/localplayer.cpp:2188
+msgid "(A) away"
+msgstr "(A) weg"
+
+#: src/localplayer.cpp:2189 src/localplayer.cpp:2204
+msgid "(?) away"
+msgstr "(?) weg"
+
+#: src/localplayer.cpp:2202
+msgid "(G) game camera mode"
+msgstr "(G) spel camera modus"
+
+#: src/localplayer.cpp:2203
+msgid "(F) free camera mode"
+msgstr "(F) vrije camera modus"
+
+#: src/localplayer.cpp:2228
+msgid "Game modifiers are enabled"
+msgstr ""
+
+#: src/localplayer.cpp:2229
+msgid "Game modifiers are disabled"
+msgstr ""
+
+#: src/localplayer.cpp:2230
+msgid "Game modifiers are unknown"
+msgstr ""
+
+#: src/localplayer.cpp:3746
 msgid "Follow: "
 msgstr "Volg: "
 
-#: src/localplayer.cpp:3543 src/localplayer.cpp:3558
+#: src/localplayer.cpp:3748 src/localplayer.cpp:3763
 msgid "Follow canceled"
 msgstr "Volgen onderbroken"
 
-#: src/localplayer.cpp:3550
+#: src/localplayer.cpp:3755
 msgid "Imitation: "
 msgstr "Imitatie: "
 
-#: src/localplayer.cpp:3552 src/localplayer.cpp:3560
+#: src/localplayer.cpp:3757 src/localplayer.cpp:3765
 msgid "Imitation canceled"
 msgstr "Imitatie onderbroken"
 
-#: src/localplayer.cpp:3908
+#: src/localplayer.cpp:4113
 msgid "You see "
 msgstr ""
 
@@ -4540,73 +4412,73 @@ msgstr "Bedankt voor de aankopen."
 msgid "Unable to buy."
 msgstr "Kan niets kopen."
 
-#: src/net/ea/charserverhandler.cpp:63
+#: src/net/ea/charserverhandler.cpp:66
 msgid "Strength:"
 msgstr "Sterkte:"
 
-#: src/net/ea/charserverhandler.cpp:64
+#: src/net/ea/charserverhandler.cpp:67
 msgid "Agility:"
 msgstr "Agiliteit:"
 
-#: src/net/ea/charserverhandler.cpp:65
+#: src/net/ea/charserverhandler.cpp:68
 msgid "Vitality:"
 msgstr "Vitaliteit:"
 
-#: src/net/ea/charserverhandler.cpp:66
+#: src/net/ea/charserverhandler.cpp:69
 msgid "Intelligence:"
 msgstr "Intelligentie:"
 
-#: src/net/ea/charserverhandler.cpp:67
+#: src/net/ea/charserverhandler.cpp:70
 msgid "Dexterity:"
 msgstr "Dexteriteit:"
 
-#: src/net/ea/charserverhandler.cpp:68
+#: src/net/ea/charserverhandler.cpp:71
 msgid "Luck:"
 msgstr "Geluk:"
 
-#: src/net/ea/charserverhandler.cpp:102
+#: src/net/ea/charserverhandler.cpp:115
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 "Toegang geweigerd. Hoogstwaarschijnlijk zijn er teveel spelers op deze "
 "server."
 
-#: src/net/ea/charserverhandler.cpp:106
+#: src/net/ea/charserverhandler.cpp:119
 msgid "Cannot use this ID."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:109
+#: src/net/ea/charserverhandler.cpp:122
 msgid "Unknown char-server failure."
 msgstr "Onbekende char-server fout."
 
-#: src/net/ea/charserverhandler.cpp:138
+#: src/net/ea/charserverhandler.cpp:151
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr "Kan personage niet aanmaken. Waarschijnlijk bestaat de naam al."
 
-#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:235
+#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:235
 msgid "Wrong name."
 msgstr "Verkeerde naam."
 
-#: src/net/ea/charserverhandler.cpp:145
+#: src/net/ea/charserverhandler.cpp:158
 msgid "Incorrect stats."
 msgstr "Ongeldige statistieken."
 
-#: src/net/ea/charserverhandler.cpp:148
+#: src/net/ea/charserverhandler.cpp:161
 msgid "Incorrect hair."
 msgstr "Ongeldig haar."
 
-#: src/net/ea/charserverhandler.cpp:151
+#: src/net/ea/charserverhandler.cpp:164
 msgid "Incorrect slot."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:166 src/net/manaserv/charhandler.cpp:210
+#: src/net/ea/charserverhandler.cpp:179 src/net/manaserv/charhandler.cpp:210
 msgid "Info"
 msgstr "Info"
 
-#: src/net/ea/charserverhandler.cpp:166
+#: src/net/ea/charserverhandler.cpp:179
 msgid "Character deleted."
 msgstr "Personage verwijderd."
 
-#: src/net/ea/charserverhandler.cpp:172
+#: src/net/ea/charserverhandler.cpp:185
 msgid "Failed to delete character."
 msgstr "Kon personage niet verwijderen."
 
@@ -4801,8 +4673,8 @@ msgid ""
 "\"0\", \"no\", \"false\" to disable item sharing."
 msgstr ""
 "<beleid> kan een van de volgende zijn om voorwerpdeling in te schakelen: "
-"\"1\", \"yes\", \"true\". Of om voorwerpdeling uit te schakelen: \"0\", "
-"\"no\", \"false\"."
+"\"1\", \"yes\", \"true\". Of om voorwerpdeling uit te schakelen: \"0\", \"no"
+"\", \"false\"."
 
 #: src/net/ea/gui/partytab.cpp:101
 msgid "Command: /item"
@@ -4839,15 +4711,15 @@ msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 "Dit commando geeft het huidige ervaringsdelingbeleid van de groep weer."
 
-#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:284
+#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:285
 msgid "Item sharing enabled."
 msgstr "Voorwerpdeling ingeschakeld."
 
-#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:294
+#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:295
 msgid "Item sharing disabled."
 msgstr "Voorwerpdeling uitgeschakeld."
 
-#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:304
+#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:305
 msgid "Item sharing not possible."
 msgstr "Voorwerpdeling is niet mogelijk."
 
@@ -4855,15 +4727,15 @@ msgstr "Voorwerpdeling is niet mogelijk."
 msgid "Item sharing unknown."
 msgstr "Voorwerpdeling onbekend."
 
-#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:246
+#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:247
 msgid "Experience sharing enabled."
 msgstr "Ervaringsdeling ingeschakeld."
 
-#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:256
+#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:257
 msgid "Experience sharing disabled."
 msgstr "Ervaringsdeling uitgeschakeld."
 
-#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:266
+#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:267
 msgid "Experience sharing not possible."
 msgstr "Ervaringsdeling is niet mogelijk."
 
@@ -4982,16 +4854,16 @@ msgstr ""
 msgid "QQQ Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:357
+#: src/net/ea/partyhandler.cpp:358
 msgid "You have left the party."
 msgstr "Je hebt de groep verlaten."
 
-#: src/net/ea/partyhandler.cpp:370
+#: src/net/ea/partyhandler.cpp:371
 #, c-format
 msgid "%s has left your party."
 msgstr "%s heeft jouw groep verlaten."
 
-#: src/net/ea/partyhandler.cpp:447
+#: src/net/ea/partyhandler.cpp:448
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr "Een onbekend lid probeerde te zeggen: %s"
@@ -5125,8 +4997,7 @@ msgstr "Bericht"
 
 #: src/net/ea/playerhandler.cpp:336
 msgid ""
-"You are carrying more than half your weight. You are unable to regain "
-"health."
+"You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 "Je draagt meer dan de helft van jouw eigen gewicht. Je kan geen leven "
 "herstellen."
@@ -5511,8 +5382,7 @@ msgstr "Het nieuwe email adres bestaat reeds."
 msgid ""
 "Client registration is not allowed. Please contact server administration."
 msgstr ""
-"Client registratie is niet toegestaan. Contacteer aub de server "
-"adminstratie."
+"Client registratie is niet toegestaan. Contacteer aub de server adminstratie."
 
 #: src/net/manaserv/loginhandler.cpp:275 src/net/manaserv/loginhandler.cpp:312
 msgid "Client version is too old."
@@ -5723,19 +5593,19 @@ msgstr "Verbinding met server beëindigd. "
 msgid "%s is not in your party!"
 msgstr "%s is niet in jouw groep!"
 
-#: src/playerrelations.cpp:460
+#: src/playerrelations.cpp:461
 msgid "Print '...'"
 msgstr "Say '...'"
 
-#: src/playerrelations.cpp:480
+#: src/playerrelations.cpp:481
 msgid "Blink name"
 msgstr "Blink naam"
 
-#: src/playerrelations.cpp:524
+#: src/playerrelations.cpp:525
 msgid "Floating '...' bubble"
 msgstr "Zwevende '...' bel"
 
-#: src/playerrelations.cpp:527
+#: src/playerrelations.cpp:528
 msgid "Floating bubble"
 msgstr "Zwevende bel"
 
@@ -5768,4 +5638,98 @@ msgstr "Magie %+d"
 msgid "Unknown item"
 msgstr "Onbekend voorwerp"
 
+#~ msgid "(?) move"
+#~ msgstr "(?) beweeg"
+
+#~ msgid "(?) map view"
+#~ msgstr "(?) map tonen"
+
+#~ msgid "(D) design camera mode"
+#~ msgstr "(D) design camera modus"
+
+#~ msgid "(D)"
+#~ msgstr "(D)"
+
+#~ msgid "(I)"
+#~ msgstr "(I)"
+
+#~ msgid "(c)"
+#~ msgstr "(c)"
+
+#~ msgid "(C)"
+#~ msgstr "(C)"
+
+#~ msgid "(d)"
+#~ msgstr "(d)"
+
+#~ msgid "(?)"
+#~ msgstr "(?)"
+
+#~ msgid "(a)"
+#~ msgstr "(a)"
+
+#~ msgid "(0)"
+#~ msgstr "(0)"
+
+#~ msgid "(1)"
+#~ msgstr "(1)"
+
+#~ msgid "(2)"
+#~ msgstr "(2)"
+
+#~ msgid "(3)"
+#~ msgstr "(3)"
+
+#~ msgid "(5)"
+#~ msgstr "(5)"
+
+#~ msgid "(7)"
+#~ msgstr "(7)"
+
+#~ msgid "(A)"
+#~ msgstr "(A)"
+
+#~ msgid "(R)"
+#~ msgstr "(R)"
+
+#~ msgid "(M)"
+#~ msgstr "(M)"
+
+#~ msgid "(P)"
+#~ msgstr "(P)"
+
+#~ msgid "(s)"
+#~ msgstr "(s)"
+
+#~ msgid "(S)"
+#~ msgstr "(S)"
+
+#~ msgid "(G)"
+#~ msgstr "(G)"
+
+#~ msgid "(f)"
+#~ msgstr "(f)"
+
+#~ msgid "(F)"
+#~ msgstr "(F)"
+
+#~ msgid "(U)"
+#~ msgstr "(U)"
+
+#~ msgid "(b)"
+#~ msgstr "(b)"
+
+#~ msgid "(g)"
+#~ msgstr "(g)"
+
+#~ msgid "(N)"
+#~ msgstr "(N)"
+
+#~ msgid "(u)"
+#~ msgstr "(u)"
+
+#~ msgid "(e)"
+#~ msgstr "(e)"
 
+#~ msgid "(O)"
+#~ msgstr "(O)"
diff --git a/po/pt.po b/po/pt.po
index 2f877ee1a..91a041ad2 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Andrei Karas <akaras@inbox.ru>, 2011.
 #   <freya.df@gmail.com>, 2011.
@@ -10,132 +10,133 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-11-12 00:23+0300\n"
+"POT-Creation-Date: 2011-11-26 02:20+0300\n"
 "PO-Revision-Date: 2011-11-11 21:38+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
-"Language-Team: Portuguese (http://www.transifex.net/projects/p/manaplus/team/pt/)\n"
+"Language-Team: Portuguese (http://www.transifex.net/projects/p/manaplus/team/"
+"pt/)\n"
+"Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: pt\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: src/actorspritemanager.cpp:1171
 msgid "Visible on map"
 msgstr "Visivel no mapa"
 
-#: src/being.cpp:551
+#: src/being.cpp:553
 msgid "dodge"
 msgstr "desviou"
 
-#: src/being.cpp:551
+#: src/being.cpp:553
 msgid "miss"
 msgstr "errou"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1530
+#: src/being.cpp:1534
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1535
+#: src/being.cpp:1539
 msgid "I"
 msgstr "l"
 
-#: src/client.cpp:869 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:878 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Configurar"
 
-#: src/client.cpp:876 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:885 src/gui/setup_perfomance.cpp:48
 msgid "Perfomance"
 msgstr "Performance"
 
-#: src/client.cpp:881 src/gui/setup_video.cpp:315
+#: src/client.cpp:890 src/gui/setup_video.cpp:315
 msgid "Video"
 msgstr "Vídeo"
 
-#: src/client.cpp:886
+#: src/client.cpp:895
 msgid "Themes"
 msgstr "Temas"
 
-#: src/client.cpp:968
+#: src/client.cpp:977
 msgid "Connecting to server"
 msgstr "Conectando ao servidor"
 
-#: src/client.cpp:999
+#: src/client.cpp:1008
 msgid "Logging in"
 msgstr "Efetuando login"
 
-#: src/client.cpp:1032
+#: src/client.cpp:1041
 msgid "Entering game world"
 msgstr "Entrando no domínio do jogo"
 
-#: src/client.cpp:1132
+#: src/client.cpp:1142
 msgid "Requesting characters"
 msgstr "Requisitando personagens"
 
-#: src/client.cpp:1163
+#: src/client.cpp:1173
 msgid "Connecting to the game server"
 msgstr "Conectando ao servidor do jogo"
 
-#: src/client.cpp:1173
+#: src/client.cpp:1183
 msgid "Changing game servers"
 msgstr "Mudando servidores do jogo"
 
-#: src/client.cpp:1216 src/client.cpp:1223 src/client.cpp:1357
+#: src/client.cpp:1226 src/client.cpp:1233 src/client.cpp:1367
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
-#: src/gui/charcreatedialog.cpp:221 src/gui/charselectdialog.cpp:253
+#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:254
 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
-#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
-#: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
+#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:167
+#: src/net/ea/charserverhandler.cpp:185 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "Erro"
 
-#: src/client.cpp:1232
+#: src/client.cpp:1242
 msgid "Requesting registration details"
 msgstr "Requisitando detalhes do registro"
 
-#: src/client.cpp:1258
+#: src/client.cpp:1268
 msgid "Password Change"
 msgstr "Mudar senha"
 
-#: src/client.cpp:1259
+#: src/client.cpp:1269
 msgid "Password changed successfully!"
 msgstr "Senha modificada com sucesso!"
 
-#: src/client.cpp:1278
+#: src/client.cpp:1288
 msgid "Email Change"
 msgstr "Mudar email"
 
-#: src/client.cpp:1279
+#: src/client.cpp:1289
 msgid "Email changed successfully!"
 msgstr "Email modificado com sucesso!"
 
-#: src/client.cpp:1299
+#: src/client.cpp:1309
 msgid "Unregister Successful"
 msgstr "Registro cancelado com sucesso"
 
-#: src/client.cpp:1300
+#: src/client.cpp:1310
 msgid "Farewell, come back any time..."
 msgstr "Tchau, volte sempre..."
 
-#: src/client.cpp:1499 src/client.cpp:1529 src/client.cpp:1544
-#: src/client.cpp:1969 src/client.cpp:1976
+#: src/client.cpp:1509 src/client.cpp:1539 src/client.cpp:1554
+#: src/client.cpp:1979 src/client.cpp:1986
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s não existe e não pode ser criado! Saindo."
 
-#: src/client.cpp:1675
+#: src/client.cpp:1685
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Host de atualização inválido: %s"
 
-#: src/client.cpp:1709 src/client.cpp:1715
+#: src/client.cpp:1719 src/client.cpp:1725
 msgid "Error creating updates directory!"
 msgstr "Erro ao criar pasta de atualizações!"
 
-#: src/client.cpp:1736
+#: src/client.cpp:1746
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Erro: %s não existe e não pode se criado! Saindo."
@@ -151,11 +152,11 @@ msgstr "Não é possível enviar mensagens privadas vazias!"
 #: src/commandhandler.cpp:343
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
-" you."
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
+"you."
 msgstr ""
-"Não é possível  criar uma aba de mensagem privada para o nick \"%s\"! Ou ela"
-" já existe ou é você mesmo."
+"Não é possível  criar uma aba de mensagem privada para o nick \"%s\"! Ou ela "
+"já existe ou é você mesmo."
 
 #: src/commandhandler.cpp:363
 #, c-format
@@ -314,10 +315,11 @@ msgstr "Recursos de imagens:"
 msgid "Resource orphaned images:"
 msgstr "Recursos de imagens orfãos:"
 
-#: src/commandhandler.h:40
+#: src/commandhandler.h:34
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr "Opções para /%s são \"yes\" e \"no\", \"true\" e \"false\", \"1\" e \"0\"."
+msgstr ""
+"Opções para /%s são \"yes\" e \"no\", \"true\" e \"false\", \"1\" e \"0\"."
 
 #: src/game.cpp:252 src/gui/widgets/chattab.cpp:403
 msgid "General"
@@ -343,19 +345,19 @@ msgstr "A conexão com o servidor caiu."
 msgid "Network Error"
 msgstr "Erro de conexão"
 
-#: src/game.cpp:1332
+#: src/game.cpp:1258
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorando propostas de negócios"
 
-#: src/game.cpp:1342
+#: src/game.cpp:1268
 msgid "Accepting incoming trade requests"
 msgstr "Aceitando propostas de negócios"
 
-#: src/game.cpp:1750
+#: src/game.cpp:1773
 msgid "Could Not Load Map"
 msgstr "Não foi possível carregar o mapa"
 
-#: src/game.cpp:1751
+#: src/game.cpp:1774
 #, c-format
 msgid "Error while loading %s"
 msgstr "Erro ao carregar %s"
@@ -433,7 +435,7 @@ msgstr "Quantidade:"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:207
 #: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:998
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:755
 msgid "+"
 msgstr "+"
 
@@ -441,7 +443,7 @@ msgstr "+"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:206
 #: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:1010
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:767
 msgid "-"
 msgstr "-"
 
@@ -454,7 +456,7 @@ msgstr "Sair"
 
 #: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
 #: src/gui/statuswindow.cpp:505 src/gui/statuswindow.cpp:555
-#: src/gui/statuswindow.cpp:997 src/gui/statuswindow.cpp:1028
+#: src/gui/statuswindow.cpp:754 src/gui/statuswindow.cpp:785
 msgid "Max"
 msgstr "Máximo"
 
@@ -471,7 +473,7 @@ msgid "Sell"
 msgstr "Vender"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
-#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:96
+#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:105
 #: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
 #: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:344
 #: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:500
@@ -548,68 +550,68 @@ msgstr "A nova senha deve ter menos que %d caracteres."
 msgid "The new password entries mismatch."
 msgstr "As novas senhas não são iguais."
 
-#: src/gui/charcreatedialog.cpp:58
+#: src/gui/charcreatedialog.cpp:59
 msgid "Create Character"
 msgstr "Criar Personagem"
 
-#: src/gui/charcreatedialog.cpp:76 src/gui/logindialog.cpp:94
+#: src/gui/charcreatedialog.cpp:85 src/gui/logindialog.cpp:94
 #: src/gui/register.cpp:75
 msgid "Name:"
 msgstr "Nome:"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:79 src/gui/charcreatedialog.cpp:84
-#: src/gui/charcreatedialog.cpp:90 src/gui/outfitwindow.cpp:85
+#: src/gui/charcreatedialog.cpp:88 src/gui/charcreatedialog.cpp:93
+#: src/gui/charcreatedialog.cpp:99 src/gui/outfitwindow.cpp:85
 msgid ">"
 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:82 src/gui/charcreatedialog.cpp:85
-#: src/gui/charcreatedialog.cpp:91 src/gui/outfitwindow.cpp:84
+#: src/gui/charcreatedialog.cpp:91 src/gui/charcreatedialog.cpp:94
+#: src/gui/charcreatedialog.cpp:100 src/gui/outfitwindow.cpp:84
 msgid "<"
 msgstr "<"
 
-#: src/gui/charcreatedialog.cpp:83
+#: src/gui/charcreatedialog.cpp:92
 msgid "Hair color:"
 msgstr "Cor do Cabelo:"
 
-#: src/gui/charcreatedialog.cpp:86
+#: src/gui/charcreatedialog.cpp:95
 msgid "Hair style:"
 msgstr "Estilo do Cabelo:"
 
-#: src/gui/charcreatedialog.cpp:92
+#: src/gui/charcreatedialog.cpp:101
 msgid "Race:"
 msgstr "Corrida:"
 
-#: src/gui/charcreatedialog.cpp:95 src/gui/charselectdialog.cpp:480
+#: src/gui/charcreatedialog.cpp:104 src/gui/charselectdialog.cpp:481
 #: src/gui/socialwindow.cpp:1139
 msgid "Create"
 msgstr "Criar"
 
-#: src/gui/charcreatedialog.cpp:97 src/gui/register.cpp:98
+#: src/gui/charcreatedialog.cpp:106 src/gui/register.cpp:98
 msgid "Male"
 msgstr "Homem"
 
-#: src/gui/charcreatedialog.cpp:98 src/gui/register.cpp:99
+#: src/gui/charcreatedialog.cpp:107 src/gui/register.cpp:99
 msgid "Female"
 msgstr "Mulher"
 
-#: src/gui/charcreatedialog.cpp:116 src/gui/charcreatedialog.cpp:303
+#: src/gui/charcreatedialog.cpp:125 src/gui/charcreatedialog.cpp:312
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Por favor distribua %d pontos"
 
-#: src/gui/charcreatedialog.cpp:222
+#: src/gui/charcreatedialog.cpp:231
 msgid "Your name needs to be at least 4 characters."
 msgstr "Seu nome deve ter pelo menos 4 caracteres."
 
-#: src/gui/charcreatedialog.cpp:294
+#: src/gui/charcreatedialog.cpp:303
 msgid "Character stats OK"
 msgstr "Atributos do personagem OK"
 
-#: src/gui/charcreatedialog.cpp:308
+#: src/gui/charcreatedialog.cpp:317
 #, c-format
 msgid "Please remove %d points"
 msgstr "Por favor remova %d pontos"
@@ -639,34 +641,34 @@ msgstr "Cancelar Registro"
 msgid "Change Email"
 msgstr "Alterar email"
 
-#: src/gui/charselectdialog.cpp:253
+#: src/gui/charselectdialog.cpp:254
 msgid "Incorrect password"
 msgstr "Senha Incorreta"
 
-#: src/gui/charselectdialog.cpp:286
+#: src/gui/charselectdialog.cpp:287
 msgid "Enter password for deleting character"
 msgstr "Entre com a Senha para Deletar o usuario"
 
-#: src/gui/charselectdialog.cpp:286
+#: src/gui/charselectdialog.cpp:287
 msgid "Enter password:"
 msgstr "Entre com a senha"
 
-#: src/gui/charselectdialog.cpp:410 src/gui/serverdialog.cpp:298
+#: src/gui/charselectdialog.cpp:411 src/gui/serverdialog.cpp:298
 #: src/gui/setup_relations.cpp:244 src/gui/shopwindow.cpp:122
 #: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244
 msgid "Delete"
 msgstr "Excluir"
 
-#: src/gui/charselectdialog.cpp:468
+#: src/gui/charselectdialog.cpp:469
 msgid "Choose"
 msgstr "Escolher"
 
-#: src/gui/charselectdialog.cpp:471
+#: src/gui/charselectdialog.cpp:472
 #, c-format
 msgid "Level %d"
 msgstr "Nível %d"
 
-#: src/gui/charselectdialog.cpp:482 src/gui/charselectdialog.cpp:483
+#: src/gui/charselectdialog.cpp:483 src/gui/charselectdialog.cpp:484
 msgid "(empty)"
 msgstr "(vazio)"
 
@@ -931,11 +933,11 @@ msgstr "Abrir automaticamente esta janela"
 msgid "OK"
 msgstr "OK"
 
-#: src/gui/equipmentwindow.cpp:61 src/gui/windowmenu.cpp:74
+#: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74
 msgid "Equipment"
 msgstr "Equipamento"
 
-#: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160
+#: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160
 #: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554
 #: src/gui/popupmenu.cpp:1737 src/gui/popupmenu.cpp:1829
 #: src/gui/popupmenu.cpp:1874
@@ -1372,7 +1374,7 @@ msgstr "Não ignorar"
 #: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:190
 #: src/gui/popupmenu.cpp:415 src/gui/popupmenu.cpp:435
 #: src/gui/popupmenu.cpp:672 src/gui/popupmenu.cpp:692
-#: src/playerrelations.cpp:446
+#: src/playerrelations.cpp:447
 msgid "Completely ignore"
 msgstr "Ignorar completamente"
 
@@ -2882,270 +2884,6 @@ msgstr "Escolha o nome do seu grupo."
 msgid "Specials"
 msgstr "Especiais"
 
-#: src/gui/statuspopup.cpp:204
-msgid "(D) default moves"
-msgstr "(D) movimentos padrão"
-
-#: src/gui/statuspopup.cpp:209
-msgid "(I) invert moves"
-msgstr "(l) inserir movimentos"
-
-#: src/gui/statuspopup.cpp:214
-msgid "(c) moves with some crazy moves"
-msgstr "(c) Alguns movimentos loucos"
-
-#: src/gui/statuspopup.cpp:219
-msgid "(C) moves with crazy moves"
-msgstr "(C) Movimentos loucos"
-
-#: src/gui/statuspopup.cpp:224
-msgid "(d) double normal + crazy"
-msgstr "(d) dobro normal + louco"
-
-#: src/gui/statuspopup.cpp:229
-msgid "(?) move"
-msgstr "(?) mover"
-
-#: src/gui/statuspopup.cpp:247
-msgid "(a) custom crazy move"
-msgstr "(a) movimentos loucos customizados"
-
-#: src/gui/statuspopup.cpp:251
-msgid "(?) crazy move"
-msgstr "(?) movimentos loucos"
-
-#: src/gui/statuspopup.cpp:261
-msgid "(0) default moves to target"
-msgstr "(0) Mover ao alvo padrão"
-
-#: src/gui/statuspopup.cpp:266
-msgid "(1) moves to target in distance 1"
-msgstr "(1) Mover ao alvo com distância 1"
-
-#: src/gui/statuspopup.cpp:271
-msgid "(2) moves to target in distance 2"
-msgstr "(2) mover ao alvo em distância 2"
-
-#: src/gui/statuspopup.cpp:276
-msgid "(3) moves to target in distance 3"
-msgstr "(3) Mover ao alvo com distância 3"
-
-#: src/gui/statuspopup.cpp:281
-msgid "(5) moves to target in distance 5"
-msgstr "(5) Mover ao alvo com distância 5"
-
-#: src/gui/statuspopup.cpp:286
-msgid "(7) moves to target in distance 7"
-msgstr "(7) Mover ao alvo com distância 7"
-
-#: src/gui/statuspopup.cpp:291
-msgid "(A) moves to target in attack range"
-msgstr "(A)  Mover ao alvo com a distância de ataque"
-
-#: src/gui/statuspopup.cpp:296
-msgid "(a) archer attack range"
-msgstr "(a) Alcance de arqueiros"
-
-#: src/gui/statuspopup.cpp:301
-msgid "(?) move to target"
-msgstr "(?)  Mover ao alvo"
-
-#: src/gui/statuspopup.cpp:309
-msgid "(D) default follow"
-msgstr "(D) Seguir em modo padrão"
-
-#: src/gui/statuspopup.cpp:313
-msgid "(R) relative follow"
-msgstr "(R) Seguir em modo relativo"
-
-#: src/gui/statuspopup.cpp:317
-msgid "(M) mirror follow"
-msgstr "(M) Seguir em modo espelhado"
-
-#: src/gui/statuspopup.cpp:321
-msgid "(P) pet follow"
-msgstr "(P) Seguir em modo animal de extimação"
-
-#: src/gui/statuspopup.cpp:325
-msgid "(?) unknown follow"
-msgstr "(?) Seguir em modo desconhecido"
-
-#: src/gui/statuspopup.cpp:334 src/gui/statuspopup.cpp:357
-msgid "(D) default attack"
-msgstr "(D) Ataque padrão"
-
-#: src/gui/statuspopup.cpp:339
-msgid "(s) switch attack without shield"
-msgstr "(s) Trocar ataque sem escudo"
-
-#: src/gui/statuspopup.cpp:344
-msgid "(S) switch attack with shield"
-msgstr "(S) Trocar ataque com escudo"
-
-#: src/gui/statuspopup.cpp:348 src/gui/statuspopup.cpp:373
-msgid "(?) attack"
-msgstr "(?) Ataque"
-
-#: src/gui/statuspopup.cpp:361
-msgid "(G) go and attack"
-msgstr "(G) Ir e atacar"
-
-#: src/gui/statuspopup.cpp:365
-msgid "(A) go, attack, pickup"
-msgstr "(A) Ir, atacar, pegar"
-
-#: src/gui/statuspopup.cpp:369
-msgid "(d) without auto attack"
-msgstr "(d) sem auto ataque"
-
-#: src/gui/statuspopup.cpp:387
-msgid "(S) small pick up 1x1 cells"
-msgstr "(S) Pequeno pegar 1x1 celulas"
-
-#: src/gui/statuspopup.cpp:391
-msgid "(D) default pick up 2x1 cells"
-msgstr "(D) Pegar padrão 2x1 células"
-
-#: src/gui/statuspopup.cpp:395
-msgid "(F) forward pick up 2x3 cells"
-msgstr "(F) Pegar em frente 2x3 células"
-
-#: src/gui/statuspopup.cpp:399
-msgid "(3) pick up 3x3 cells"
-msgstr "(3) Pegar 3x3 células"
-
-#: src/gui/statuspopup.cpp:403
-msgid "(g) go and pick up in distance 4"
-msgstr "(g) Ir e pegar em distância 4"
-
-#: src/gui/statuspopup.cpp:407
-msgid "(G) go and pick up in distance 8"
-msgstr "(G) Ir e pegar em distância 8"
-
-#: src/gui/statuspopup.cpp:411
-msgid "(A) go and pick up in max distance"
-msgstr "(A) Ir e pegar em distância mâxima"
-
-#: src/gui/statuspopup.cpp:415
-msgid "(?) pick up"
-msgstr "(?) Pegar item"
-
-#: src/gui/statuspopup.cpp:424
-msgid "(N) normal map view"
-msgstr "(N) Visualizardor de mapa normal"
-
-#: src/gui/statuspopup.cpp:428
-msgid "(D) debug map view"
-msgstr "(D) Visualizador de mapa depurador"
-
-#: src/gui/statuspopup.cpp:432
-msgid "(u) ultra map view"
-msgstr "(u) Visualizador de mapa ultra"
-
-#: src/gui/statuspopup.cpp:436
-msgid "(U) ultra map view 2"
-msgstr "(U) Visualizador de mapa ultra 2"
-
-#: src/gui/statuspopup.cpp:440
-msgid "(e) empty map view"
-msgstr "(e) Visualizador de mapa vazio"
-
-#: src/gui/statuspopup.cpp:444
-msgid "(b) black & white map view"
-msgstr "(b) Visualizador de mapa preto e branco"
-
-#: src/gui/statuspopup.cpp:448
-msgid "(?) map view"
-msgstr "(?) Visualizador de mapa"
-
-#: src/gui/statuspopup.cpp:456
-msgid "(f) use #flar for magic attack"
-msgstr "(f) Usar #flar para feitiço de ataque"
-
-#: src/gui/statuspopup.cpp:461
-msgid "(c) use #chiza for magic attack"
-msgstr "(c) Usar #chiza para feitiço de ataque"
-
-#: src/gui/statuspopup.cpp:466
-msgid "(I) use #ingrav for magic attack"
-msgstr "(I) Usar #ingrav para feitiço de ataque"
-
-#: src/gui/statuspopup.cpp:471
-msgid "(F) use #frillyar for magic attack"
-msgstr "(F) Usar #frillyar para feitiço de ataque"
-
-#: src/gui/statuspopup.cpp:476
-msgid "(U) use #upmarmu for magic attack"
-msgstr "(U) Usar #upmarmu para feitiço de ataque"
-
-#: src/gui/statuspopup.cpp:480
-msgid "(?) magic attack"
-msgstr "(?) Feitiço de ataque"
-
-#: src/gui/statuspopup.cpp:489
-msgid "(a) attack all players"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:493
-msgid "(f) attack not friends"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:497
-msgid "(b) attack bad relations"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:501
-msgid "(d) dont attack players"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:505
-msgid "(?) pvp attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:514
-msgid "(D) default imitation"
-msgstr "(D) Mímica padrão"
-
-#: src/gui/statuspopup.cpp:518
-msgid "(O) outfits imitation"
-msgstr "(O) Mímica de roupas"
-
-#: src/gui/statuspopup.cpp:522
-msgid "(?) imitation"
-msgstr "(?) Mímica"
-
-#: src/gui/statuspopup.cpp:531
-msgid "(O) on keyboard"
-msgstr "(O) No teclado"
-
-#: src/gui/statuspopup.cpp:534
-msgid "(A) away"
-msgstr "(A) Ausente"
-
-#: src/gui/statuspopup.cpp:537 src/gui/statuspopup.cpp:557
-msgid "(?) away"
-msgstr "(?) Ausente"
-
-#: src/gui/statuspopup.cpp:545
-msgid "(G) game camera mode"
-msgstr "(G) Modo de jogo câmera"
-
-#: src/gui/statuspopup.cpp:549
-msgid "(F) free camera mode"
-msgstr "(F) Modo de jogo câmera livre"
-
-#: src/gui/statuspopup.cpp:553
-msgid "(D) design camera mode"
-msgstr "(D)  Modo de jogo câmera design"
-
-#: src/gui/statuspopup.cpp:564
-msgid "Game modifiers are disabled"
-msgstr "Modificadores de jogo desativados"
-
-#: src/gui/statuspopup.cpp:569
-msgid "Game modifiers are enabled"
-msgstr "Modificadores de jogo ativados"
-
 #: src/gui/statuswindow.cpp:144 src/gui/statuswindow.cpp:274
 #: src/gui/statuswindow.cpp:337
 #, c-format
@@ -3194,136 +2932,6 @@ msgstr "Nível: %d (GM %d)"
 msgid "Correction points: %d"
 msgstr "Pontos de correção: %d"
 
-#: src/gui/statuswindow.cpp:649 src/gui/statuswindow.cpp:717
-#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:753
-#: src/gui/statuswindow.cpp:818 src/gui/statuswindow.cpp:847
-#: src/gui/statuswindow.cpp:870 src/gui/statuswindow.cpp:889
-msgid "(D)"
-msgstr "(D)"
-
-#: src/gui/statuswindow.cpp:652 src/gui/statuswindow.cpp:778
-msgid "(I)"
-msgstr "(I)"
-
-#: src/gui/statuswindow.cpp:655 src/gui/statuswindow.cpp:775
-msgid "(c)"
-msgstr "(c)"
-
-#: src/gui/statuswindow.cpp:658
-msgid "(C)"
-msgstr "(C)"
-
-#: src/gui/statuswindow.cpp:661 src/gui/statuswindow.cpp:762
-#: src/gui/statuswindow.cpp:803
-msgid "(d)"
-msgstr "(d)"
-
-#: src/gui/statuswindow.cpp:664 src/gui/statuswindow.cpp:678
-#: src/gui/statuswindow.cpp:710 src/gui/statuswindow.cpp:729
-#: src/gui/statuswindow.cpp:746 src/gui/statuswindow.cpp:765
-#: src/gui/statuswindow.cpp:787 src/gui/statuswindow.cpp:806
-#: src/gui/statuswindow.cpp:836 src/gui/statuswindow.cpp:862
-#: src/gui/statuswindow.cpp:876 src/gui/statuswindow.cpp:892
-#: src/gui/statuswindow.cpp:905
-msgid "(?)"
-msgstr "(?)"
-
-#: src/gui/statuswindow.cpp:675 src/gui/statuswindow.cpp:707
-#: src/gui/statuswindow.cpp:794
-msgid "(a)"
-msgstr "(a)"
-
-#: src/gui/statuswindow.cpp:686
-msgid "(0)"
-msgstr "(0)"
-
-#: src/gui/statuswindow.cpp:689
-msgid "(1)"
-msgstr "(1)"
-
-#: src/gui/statuswindow.cpp:692
-msgid "(2)"
-msgstr "(2)"
-
-#: src/gui/statuswindow.cpp:695 src/gui/statuswindow.cpp:824
-msgid "(3)"
-msgstr "(3)"
-
-#: src/gui/statuswindow.cpp:698
-msgid "(5)"
-msgstr "(4)"
-
-#: src/gui/statuswindow.cpp:701
-msgid "(7)"
-msgstr "(7)"
-
-#: src/gui/statuswindow.cpp:704 src/gui/statuswindow.cpp:759
-#: src/gui/statuswindow.cpp:833 src/gui/statuswindow.cpp:902
-msgid "(A)"
-msgstr "(A)"
-
-#: src/gui/statuswindow.cpp:720
-msgid "(R)"
-msgstr "(R)"
-
-#: src/gui/statuswindow.cpp:723
-msgid "(M)"
-msgstr "(M)"
-
-#: src/gui/statuswindow.cpp:726
-msgid "(P)"
-msgstr "(P)"
-
-#: src/gui/statuswindow.cpp:740
-msgid "(s)"
-msgstr "(s)"
-
-#: src/gui/statuswindow.cpp:743 src/gui/statuswindow.cpp:815
-msgid "(S)"
-msgstr "(S)"
-
-#: src/gui/statuswindow.cpp:756 src/gui/statuswindow.cpp:830
-#: src/gui/statuswindow.cpp:883
-msgid "(G)"
-msgstr "(G)"
-
-#: src/gui/statuswindow.cpp:772 src/gui/statuswindow.cpp:797
-msgid "(f)"
-msgstr "(f)"
-
-#: src/gui/statuswindow.cpp:781 src/gui/statuswindow.cpp:821
-#: src/gui/statuswindow.cpp:886
-msgid "(F)"
-msgstr "(F)"
-
-#: src/gui/statuswindow.cpp:784 src/gui/statuswindow.cpp:853
-msgid "(U)"
-msgstr "(U)"
-
-#: src/gui/statuswindow.cpp:800 src/gui/statuswindow.cpp:859
-msgid "(b)"
-msgstr "(b)"
-
-#: src/gui/statuswindow.cpp:827
-msgid "(g)"
-msgstr "(g)"
-
-#: src/gui/statuswindow.cpp:844
-msgid "(N)"
-msgstr "(N)"
-
-#: src/gui/statuswindow.cpp:850
-msgid "(u)"
-msgstr "(u)"
-
-#: src/gui/statuswindow.cpp:856
-msgid "(e)"
-msgstr "(e)"
-
-#: src/gui/statuswindow.cpp:873 src/gui/statuswindow.cpp:899
-msgid "(O)"
-msgstr "(O)"
-
 #: src/gui/textcommandeditor.cpp:113
 msgid "No Target"
 msgstr "Sem alvo"
@@ -3450,8 +3058,7 @@ msgid "You don't have enough money."
 msgstr "Você não tem dinheiro suficiente."
 
 #: src/gui/tradewindow.cpp:454
-msgid ""
-"Failed adding item. You can not overlap one kind of item on the window."
+msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Falha ao adicionar item. Você não pode duplicar este tipo de item na janela."
 
@@ -3638,7 +3245,7 @@ msgstr "Borda do Lugar Inicial"
 msgid "Road Point"
 msgstr "Ponto de estrada"
 
-#: src/gui/whoisonline.cpp:85 src/gui/whoisonline.cpp:479
+#: src/gui/whoisonline.cpp:85 src/gui/whoisonline.cpp:494
 msgid "Who Is Online - Updating"
 msgstr "Quem está online - Atualizando"
 
@@ -3646,15 +3253,15 @@ msgstr "Quem está online - Atualizando"
 msgid "Update"
 msgstr "Atualizar"
 
-#: src/gui/whoisonline.cpp:302
+#: src/gui/whoisonline.cpp:307
 msgid "Who Is Online - "
 msgstr "Quem está online - "
 
-#: src/gui/whoisonline.cpp:493
+#: src/gui/whoisonline.cpp:508
 msgid "Who Is Online - error"
 msgstr "Quem está online - Erro"
 
-#: src/gui/whoisonline.cpp:525
+#: src/gui/whoisonline.cpp:540
 msgid "Who Is Online - Update"
 msgstr "Quem está online - Atualizado"
 
@@ -3831,8 +3438,7 @@ msgid "Command: /unignore <player>"
 msgstr "Comando: /unignore <jogador>"
 
 #: src/gui/widgets/whispertab.cpp:131
-msgid ""
-"This command stops ignoring the other player if they are being ignored."
+msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 "Este comando para de ignorar o outro jogador se ele estiver sendo ignorado."
 
@@ -4363,68 +3969,335 @@ msgstr ""
 "Conflito com as teclas \"%s\" e \"%s\" . Resolva o conflito para não "
 "comprometer a jogabilidade."
 
-#: src/localplayer.cpp:389
+#: src/localplayer.cpp:384
 msgid "You were killed by "
 msgstr "Você foi morto por "
 
-#: src/localplayer.cpp:1442
+#: src/localplayer.cpp:1434
 msgid "Tried to pick up nonexistent item."
 msgstr "Você tentou pegar um item não existente."
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1436
 msgid "Item is too heavy."
 msgstr "Este item é muito pesado."
 
-#: src/localplayer.cpp:1446
+#: src/localplayer.cpp:1438
 msgid "Item is too far away."
 msgstr "Item está muito longe"
 
-#: src/localplayer.cpp:1448
+#: src/localplayer.cpp:1440
 msgid "Inventory is full."
 msgstr "O inventário está cheio."
 
-#: src/localplayer.cpp:1450
+#: src/localplayer.cpp:1442
 msgid "Stack is too big."
 msgstr "Esta pilha é muito grande."
 
-#: src/localplayer.cpp:1453
+#: src/localplayer.cpp:1445
 msgid "Item belongs to someone else."
 msgstr "Este item pertence a outra pessoa."
 
-#: src/localplayer.cpp:1456
+#: src/localplayer.cpp:1448
 msgid "Unknown problem picking up item."
 msgstr "Problema desconhecido ao tentar pegar item."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1480
+#: src/localplayer.cpp:1472
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "Você pegou %d [@@%d|%s@@]."
 msgstr[1] "Você pegou %d [@@%d|%s@@]."
 
-#: src/localplayer.cpp:3206
+#: src/localplayer.cpp:1887
+msgid "(D) default moves"
+msgstr "(D) movimentos padrão"
+
+#: src/localplayer.cpp:1888
+msgid "(I) invert moves"
+msgstr "(l) inserir movimentos"
+
+#: src/localplayer.cpp:1889
+msgid "(c) moves with some crazy moves"
+msgstr "(c) Alguns movimentos loucos"
+
+#: src/localplayer.cpp:1890
+msgid "(C) moves with crazy moves"
+msgstr "(C) Movimentos loucos"
+
+#: src/localplayer.cpp:1891
+msgid "(d) double normal + crazy"
+msgstr "(d) dobro normal + louco"
+
+#: src/localplayer.cpp:1892
+#, fuzzy
+msgid "(?) unknown move"
+msgstr "(?) Seguir em modo desconhecido"
+
+#: src/localplayer.cpp:1914
+#, fuzzy, c-format
+msgid "(%d) crazy move number %d"
+msgstr "(?) movimentos loucos"
+
+#: src/localplayer.cpp:1919
+msgid "(a) custom crazy move"
+msgstr "(a) movimentos loucos customizados"
+
+#: src/localplayer.cpp:1923
+msgid "(?) crazy move"
+msgstr "(?) movimentos loucos"
+
+#: src/localplayer.cpp:1937
+msgid "(0) default moves to target"
+msgstr "(0) Mover ao alvo padrão"
+
+#: src/localplayer.cpp:1938
+msgid "(1) moves to target in distance 1"
+msgstr "(1) Mover ao alvo com distância 1"
+
+#: src/localplayer.cpp:1939
+msgid "(2) moves to target in distance 2"
+msgstr "(2) mover ao alvo em distância 2"
+
+#: src/localplayer.cpp:1940
+msgid "(3) moves to target in distance 3"
+msgstr "(3) Mover ao alvo com distância 3"
+
+#: src/localplayer.cpp:1941
+msgid "(5) moves to target in distance 5"
+msgstr "(5) Mover ao alvo com distância 5"
+
+#: src/localplayer.cpp:1942
+msgid "(7) moves to target in distance 7"
+msgstr "(7) Mover ao alvo com distância 7"
+
+#: src/localplayer.cpp:1943
+msgid "(A) moves to target in attack range"
+msgstr "(A)  Mover ao alvo com a distância de ataque"
+
+#: src/localplayer.cpp:1944
+msgid "(a) archer attack range"
+msgstr "(a) Alcance de arqueiros"
+
+#: src/localplayer.cpp:1945
+msgid "(?) move to target"
+msgstr "(?)  Mover ao alvo"
+
+#: src/localplayer.cpp:1964
+msgid "(D) default follow"
+msgstr "(D) Seguir em modo padrão"
+
+#: src/localplayer.cpp:1965
+msgid "(R) relative follow"
+msgstr "(R) Seguir em modo relativo"
+
+#: src/localplayer.cpp:1966
+msgid "(M) mirror follow"
+msgstr "(M) Seguir em modo espelhado"
+
+#: src/localplayer.cpp:1967
+msgid "(P) pet follow"
+msgstr "(P) Seguir em modo animal de extimação"
+
+#: src/localplayer.cpp:1968
+msgid "(?) unknown follow"
+msgstr "(?) Seguir em modo desconhecido"
+
+#: src/localplayer.cpp:1987 src/localplayer.cpp:1991 src/localplayer.cpp:2014
+msgid "(?) attack"
+msgstr "(?) Ataque"
+
+#: src/localplayer.cpp:1988 src/localplayer.cpp:2010
+msgid "(D) default attack"
+msgstr "(D) Ataque padrão"
+
+#: src/localplayer.cpp:1989
+msgid "(s) switch attack without shield"
+msgstr "(s) Trocar ataque sem escudo"
+
+#: src/localplayer.cpp:1990
+msgid "(S) switch attack with shield"
+msgstr "(S) Trocar ataque com escudo"
+
+#: src/localplayer.cpp:2011
+msgid "(G) go and attack"
+msgstr "(G) Ir e atacar"
+
+#: src/localplayer.cpp:2012
+msgid "(A) go, attack, pickup"
+msgstr "(A) Ir, atacar, pegar"
+
+#: src/localplayer.cpp:2013
+msgid "(d) without auto attack"
+msgstr "(d) sem auto ataque"
+
+#: src/localplayer.cpp:2047
+msgid "(S) small pick up 1x1 cells"
+msgstr "(S) Pequeno pegar 1x1 celulas"
+
+#: src/localplayer.cpp:2048
+msgid "(D) default pick up 2x1 cells"
+msgstr "(D) Pegar padrão 2x1 células"
+
+#: src/localplayer.cpp:2049
+msgid "(F) forward pick up 2x3 cells"
+msgstr "(F) Pegar em frente 2x3 células"
+
+#: src/localplayer.cpp:2050
+msgid "(3) pick up 3x3 cells"
+msgstr "(3) Pegar 3x3 células"
+
+#: src/localplayer.cpp:2051
+msgid "(g) go and pick up in distance 4"
+msgstr "(g) Ir e pegar em distância 4"
+
+#: src/localplayer.cpp:2052
+msgid "(G) go and pick up in distance 8"
+msgstr "(G) Ir e pegar em distância 8"
+
+#: src/localplayer.cpp:2053
+msgid "(A) go and pick up in max distance"
+msgstr "(A) Ir e pegar em distância mâxima"
+
+#: src/localplayer.cpp:2054
+msgid "(?) pick up"
+msgstr "(?) Pegar item"
+
+#: src/localplayer.cpp:2067
+msgid "(N) normal map view"
+msgstr "(N) Visualizardor de mapa normal"
+
+#: src/localplayer.cpp:2068
+msgid "(D) debug map view"
+msgstr "(D) Visualizador de mapa depurador"
+
+#: src/localplayer.cpp:2069
+msgid "(u) ultra map view"
+msgstr "(u) Visualizador de mapa ultra"
+
+#: src/localplayer.cpp:2070
+msgid "(U) ultra map view 2"
+msgstr "(U) Visualizador de mapa ultra 2"
+
+#: src/localplayer.cpp:2071
+msgid "(e) empty map view"
+msgstr "(e) Visualizador de mapa vazio"
+
+#: src/localplayer.cpp:2072
+msgid "(b) black & white map view"
+msgstr "(b) Visualizador de mapa preto e branco"
+
+#: src/localplayer.cpp:2091
+msgid "(f) use #flar for magic attack"
+msgstr "(f) Usar #flar para feitiço de ataque"
+
+#: src/localplayer.cpp:2092
+msgid "(c) use #chiza for magic attack"
+msgstr "(c) Usar #chiza para feitiço de ataque"
+
+#: src/localplayer.cpp:2093
+msgid "(I) use #ingrav for magic attack"
+msgstr "(I) Usar #ingrav para feitiço de ataque"
+
+#: src/localplayer.cpp:2094
+msgid "(F) use #frillyar for magic attack"
+msgstr "(F) Usar #frillyar para feitiço de ataque"
+
+#: src/localplayer.cpp:2095
+msgid "(U) use #upmarmu for magic attack"
+msgstr "(U) Usar #upmarmu para feitiço de ataque"
+
+#: src/localplayer.cpp:2096
+msgid "(?) magic attack"
+msgstr "(?) Feitiço de ataque"
+
+#: src/localplayer.cpp:2115
+msgid "(a) attack all players"
+msgstr ""
+
+#: src/localplayer.cpp:2116
+msgid "(f) attack not friends"
+msgstr ""
+
+#: src/localplayer.cpp:2117
+msgid "(b) attack bad relations"
+msgstr ""
+
+#: src/localplayer.cpp:2118
+msgid "(d) dont attack players"
+msgstr ""
+
+#: src/localplayer.cpp:2119
+msgid "(?) pvp attack"
+msgstr ""
+
+#: src/localplayer.cpp:2138
+msgid "(D) default imitation"
+msgstr "(D) Mímica padrão"
+
+#: src/localplayer.cpp:2139
+msgid "(O) outfits imitation"
+msgstr "(O) Mímica de roupas"
+
+#: src/localplayer.cpp:2140
+msgid "(?) imitation"
+msgstr "(?) Mímica"
+
+#: src/localplayer.cpp:2168
 msgid "Away"
 msgstr "Indisponivel "
 
-#: src/localplayer.cpp:3541
+#: src/localplayer.cpp:2187
+msgid "(O) on keyboard"
+msgstr "(O) No teclado"
+
+#: src/localplayer.cpp:2188
+msgid "(A) away"
+msgstr "(A) Ausente"
+
+#: src/localplayer.cpp:2189 src/localplayer.cpp:2204
+msgid "(?) away"
+msgstr "(?) Ausente"
+
+#: src/localplayer.cpp:2202
+msgid "(G) game camera mode"
+msgstr "(G) Modo de jogo câmera"
+
+#: src/localplayer.cpp:2203
+msgid "(F) free camera mode"
+msgstr "(F) Modo de jogo câmera livre"
+
+#: src/localplayer.cpp:2228
+msgid "Game modifiers are enabled"
+msgstr "Modificadores de jogo ativados"
+
+#: src/localplayer.cpp:2229
+msgid "Game modifiers are disabled"
+msgstr "Modificadores de jogo desativados"
+
+#: src/localplayer.cpp:2230
+#, fuzzy
+msgid "Game modifiers are unknown"
+msgstr "Modificadores de jogo ativados"
+
+#: src/localplayer.cpp:3746
 msgid "Follow: "
 msgstr "Seguindo:"
 
-#: src/localplayer.cpp:3543 src/localplayer.cpp:3558
+#: src/localplayer.cpp:3748 src/localplayer.cpp:3763
 msgid "Follow canceled"
 msgstr "Seguir cancelado"
 
-#: src/localplayer.cpp:3550
+#: src/localplayer.cpp:3755
 msgid "Imitation: "
 msgstr "Imitando:"
 
-#: src/localplayer.cpp:3552 src/localplayer.cpp:3560
+#: src/localplayer.cpp:3757 src/localplayer.cpp:3765
 msgid "Imitation canceled"
 msgstr "Imitação cancelada"
 
-#: src/localplayer.cpp:3908
+#: src/localplayer.cpp:4113
 msgid "You see "
 msgstr "Você vê "
 
@@ -4536,71 +4409,71 @@ msgstr "Obrigado pela compra."
 msgid "Unable to buy."
 msgstr "Impossível comprar."
 
-#: src/net/ea/charserverhandler.cpp:63
+#: src/net/ea/charserverhandler.cpp:66
 msgid "Strength:"
 msgstr "Força:"
 
-#: src/net/ea/charserverhandler.cpp:64
+#: src/net/ea/charserverhandler.cpp:67
 msgid "Agility:"
 msgstr "Agilidade:"
 
-#: src/net/ea/charserverhandler.cpp:65
+#: src/net/ea/charserverhandler.cpp:68
 msgid "Vitality:"
 msgstr "Vitalidade:"
 
-#: src/net/ea/charserverhandler.cpp:66
+#: src/net/ea/charserverhandler.cpp:69
 msgid "Intelligence:"
 msgstr "Inteligência:"
 
-#: src/net/ea/charserverhandler.cpp:67
+#: src/net/ea/charserverhandler.cpp:70
 msgid "Dexterity:"
 msgstr "Destreza:"
 
-#: src/net/ea/charserverhandler.cpp:68
+#: src/net/ea/charserverhandler.cpp:71
 msgid "Luck:"
 msgstr "Sorte:"
 
-#: src/net/ea/charserverhandler.cpp:102
+#: src/net/ea/charserverhandler.cpp:115
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr "Acesso negado. Provavelmente há jogadores demais neste servidor."
 
-#: src/net/ea/charserverhandler.cpp:106
+#: src/net/ea/charserverhandler.cpp:119
 msgid "Cannot use this ID."
 msgstr "Não é possível usar este ID."
 
-#: src/net/ea/charserverhandler.cpp:109
+#: src/net/ea/charserverhandler.cpp:122
 msgid "Unknown char-server failure."
 msgstr "Erro desconhecido do char-server."
 
-#: src/net/ea/charserverhandler.cpp:138
+#: src/net/ea/charserverhandler.cpp:151
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr "Erro ao criar personagem. Provavelmente o nome já está sendo usado."
 
-#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:235
+#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:235
 msgid "Wrong name."
 msgstr "Nome errado."
 
-#: src/net/ea/charserverhandler.cpp:145
+#: src/net/ea/charserverhandler.cpp:158
 msgid "Incorrect stats."
 msgstr "Stats incorretos."
 
-#: src/net/ea/charserverhandler.cpp:148
+#: src/net/ea/charserverhandler.cpp:161
 msgid "Incorrect hair."
 msgstr "Cabelo incorreto."
 
-#: src/net/ea/charserverhandler.cpp:151
+#: src/net/ea/charserverhandler.cpp:164
 msgid "Incorrect slot."
 msgstr "Slot incorreto."
 
-#: src/net/ea/charserverhandler.cpp:166 src/net/manaserv/charhandler.cpp:210
+#: src/net/ea/charserverhandler.cpp:179 src/net/manaserv/charhandler.cpp:210
 msgid "Info"
 msgstr "Informações"
 
-#: src/net/ea/charserverhandler.cpp:166
+#: src/net/ea/charserverhandler.cpp:179
 msgid "Character deleted."
 msgstr "Personagem deletado."
 
-#: src/net/ea/charserverhandler.cpp:172
+#: src/net/ea/charserverhandler.cpp:185
 msgid "Failed to delete character."
 msgstr "Falha ao deletar personagem."
 
@@ -4813,8 +4686,7 @@ msgstr "Comando: /exp <policy>"
 
 #: src/net/ea/gui/partytab.cpp:108
 msgid "This command changes the party's experience sharing policy."
-msgstr ""
-"Este comando muda a opção de compartilhamento de experiência do grupo."
+msgstr "Este comando muda a opção de compartilhamento de experiência do grupo."
 
 #: src/net/ea/gui/partytab.cpp:110
 msgid ""
@@ -4831,18 +4703,17 @@ msgstr "Comando: /exp"
 #: src/net/ea/gui/partytab.cpp:114
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
-"Este comando exibe a atual opção de compartilhamento de experiência do "
-"grupo."
+"Este comando exibe a atual opção de compartilhamento de experiência do grupo."
 
-#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:284
+#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:285
 msgid "Item sharing enabled."
 msgstr "Compartilhamento de itens habilitado."
 
-#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:294
+#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:295
 msgid "Item sharing disabled."
 msgstr "Compartilhamento de itens desabilitado."
 
-#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:304
+#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:305
 msgid "Item sharing not possible."
 msgstr "Não é possível compartilhar itens."
 
@@ -4850,15 +4721,15 @@ msgstr "Não é possível compartilhar itens."
 msgid "Item sharing unknown."
 msgstr "Compartilhamento de itens desconhecido."
 
-#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:246
+#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:247
 msgid "Experience sharing enabled."
 msgstr "Compartilhamento de experiência habilitado."
 
-#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:256
+#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:257
 msgid "Experience sharing disabled."
 msgstr "Compartilhamento de experiência desabilitado."
 
-#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:266
+#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:267
 msgid "Experience sharing not possible."
 msgstr "Não é possível compartilhar experiência."
 
@@ -4979,16 +4850,16 @@ msgstr "%s não pode se juntar ao gupo cheio."
 msgid "QQQ Unknown invite response for %s."
 msgstr "QQQ resposta de convite desconhecida por %s."
 
-#: src/net/ea/partyhandler.cpp:357
+#: src/net/ea/partyhandler.cpp:358
 msgid "You have left the party."
 msgstr "Você saiu do grupo."
 
-#: src/net/ea/partyhandler.cpp:370
+#: src/net/ea/partyhandler.cpp:371
 #, c-format
 msgid "%s has left your party."
 msgstr "%s saiu do seu grupo."
 
-#: src/net/ea/partyhandler.cpp:447
+#: src/net/ea/partyhandler.cpp:448
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr "Um membro desconhecido tentou dizer: %s"
@@ -5120,8 +4991,7 @@ msgstr "Mensagem"
 
 #: src/net/ea/playerhandler.cpp:336
 msgid ""
-"You are carrying more than half your weight. You are unable to regain "
-"health."
+"You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 "Você está carregando mais que a metade de seu peso. Você não poderá mais "
 "recuperar HP."
@@ -5719,19 +5589,19 @@ msgstr "Conexão com o servidor interrompida. "
 msgid "%s is not in your party!"
 msgstr "%s não está em seu grupo!"
 
-#: src/playerrelations.cpp:460
+#: src/playerrelations.cpp:461
 msgid "Print '...'"
 msgstr "Imprimir '...'"
 
-#: src/playerrelations.cpp:480
+#: src/playerrelations.cpp:481
 msgid "Blink name"
 msgstr "Piscar nome"
 
-#: src/playerrelations.cpp:524
+#: src/playerrelations.cpp:525
 msgid "Floating '...' bubble"
 msgstr "Bolha '...' flutuante"
 
-#: src/playerrelations.cpp:527
+#: src/playerrelations.cpp:528
 msgid "Floating bubble"
 msgstr "Bolha Flutuante"
 
@@ -5764,4 +5634,98 @@ msgstr "MP %+d"
 msgid "Unknown item"
 msgstr "Item desconhecido"
 
+#~ msgid "(?) move"
+#~ msgstr "(?) mover"
+
+#~ msgid "(?) map view"
+#~ msgstr "(?) Visualizador de mapa"
+
+#~ msgid "(D) design camera mode"
+#~ msgstr "(D)  Modo de jogo câmera design"
+
+#~ msgid "(D)"
+#~ msgstr "(D)"
+
+#~ msgid "(I)"
+#~ msgstr "(I)"
+
+#~ msgid "(c)"
+#~ msgstr "(c)"
+
+#~ msgid "(C)"
+#~ msgstr "(C)"
+
+#~ msgid "(d)"
+#~ msgstr "(d)"
+
+#~ msgid "(?)"
+#~ msgstr "(?)"
+
+#~ msgid "(a)"
+#~ msgstr "(a)"
+
+#~ msgid "(0)"
+#~ msgstr "(0)"
+
+#~ msgid "(1)"
+#~ msgstr "(1)"
+
+#~ msgid "(2)"
+#~ msgstr "(2)"
+
+#~ msgid "(3)"
+#~ msgstr "(3)"
+
+#~ msgid "(5)"
+#~ msgstr "(4)"
+
+#~ msgid "(7)"
+#~ msgstr "(7)"
+
+#~ msgid "(A)"
+#~ msgstr "(A)"
+
+#~ msgid "(R)"
+#~ msgstr "(R)"
+
+#~ msgid "(M)"
+#~ msgstr "(M)"
+
+#~ msgid "(P)"
+#~ msgstr "(P)"
+
+#~ msgid "(s)"
+#~ msgstr "(s)"
+
+#~ msgid "(S)"
+#~ msgstr "(S)"
+
+#~ msgid "(G)"
+#~ msgstr "(G)"
+
+#~ msgid "(f)"
+#~ msgstr "(f)"
+
+#~ msgid "(F)"
+#~ msgstr "(F)"
+
+#~ msgid "(U)"
+#~ msgstr "(U)"
+
+#~ msgid "(b)"
+#~ msgstr "(b)"
+
+#~ msgid "(g)"
+#~ msgstr "(g)"
+
+#~ msgid "(N)"
+#~ msgstr "(N)"
+
+#~ msgid "(u)"
+#~ msgstr "(u)"
+
+#~ msgid "(e)"
+#~ msgstr "(e)"
 
+#~ msgid "(O)"
+#~ msgstr "(O)"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 532d19385..4c7d2cbd6 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 #   <alasmirt@gmail.com>, 2011.
 # alastrim <alasmirt@gmail.com>, 2011.
@@ -12,132 +12,133 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-11-12 00:23+0300\n"
+"POT-Creation-Date: 2011-11-26 02:20+0300\n"
 "PO-Revision-Date: 2011-11-11 21:38+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
-"Language-Team: Portuguese (Brazilian) (http://www.transifex.net/projects/p/manaplus/team/pt_BR/)\n"
+"Language-Team: Portuguese (Brazilian) (http://www.transifex.net/projects/p/"
+"manaplus/team/pt_BR/)\n"
+"Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
 #: src/actorspritemanager.cpp:1171
 msgid "Visible on map"
 msgstr "Mapa visivel "
 
-#: src/being.cpp:551
+#: src/being.cpp:553
 msgid "dodge"
 msgstr "por nome"
 
-#: src/being.cpp:551
+#: src/being.cpp:553
 msgid "miss"
 msgstr "por id"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1530
+#: src/being.cpp:1534
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1535
+#: src/being.cpp:1539
 msgid "I"
 msgstr "I"
 
-#: src/client.cpp:869 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:878 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "por peso"
 
-#: src/client.cpp:876 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:885 src/gui/setup_perfomance.cpp:48
 msgid "Perfomance"
 msgstr "Performance"
 
-#: src/client.cpp:881 src/gui/setup_video.cpp:315
+#: src/client.cpp:890 src/gui/setup_video.cpp:315
 msgid "Video"
 msgstr "Vídeo"
 
-#: src/client.cpp:886
+#: src/client.cpp:895
 msgid "Themes"
 msgstr "Temas"
 
-#: src/client.cpp:968
+#: src/client.cpp:977
 msgid "Connecting to server"
 msgstr "por quantidade"
 
-#: src/client.cpp:999
+#: src/client.cpp:1008
 msgid "Logging in"
 msgstr "por tipo"
 
-#: src/client.cpp:1032
+#: src/client.cpp:1041
 msgid "Entering game world"
 msgstr "Habilitar rolagem preguisoça "
 
-#: src/client.cpp:1132
+#: src/client.cpp:1142
 msgid "Requesting characters"
 msgstr "Rolagem preguiçosa"
 
-#: src/client.cpp:1163
+#: src/client.cpp:1173
 msgid "Connecting to the game server"
 msgstr "Conectando ao servidor do jogo"
 
-#: src/client.cpp:1173
+#: src/client.cpp:1183
 msgid "Changing game servers"
 msgstr "Mudando servidores do jogo"
 
-#: src/client.cpp:1216 src/client.cpp:1223 src/client.cpp:1357
+#: src/client.cpp:1226 src/client.cpp:1233 src/client.cpp:1367
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
-#: src/gui/charcreatedialog.cpp:221 src/gui/charselectdialog.cpp:253
+#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:254
 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
-#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
-#: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
+#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:167
+#: src/net/ea/charserverhandler.cpp:185 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "Erro"
 
-#: src/client.cpp:1232
+#: src/client.cpp:1242
 msgid "Requesting registration details"
 msgstr "Requisitando detalhes do registro"
 
-#: src/client.cpp:1258
+#: src/client.cpp:1268
 msgid "Password Change"
 msgstr "Mudar senha"
 
-#: src/client.cpp:1259
+#: src/client.cpp:1269
 msgid "Password changed successfully!"
 msgstr "Senha modificada com sucesso!"
 
-#: src/client.cpp:1278
+#: src/client.cpp:1288
 msgid "Email Change"
 msgstr "Mudar email"
 
-#: src/client.cpp:1279
+#: src/client.cpp:1289
 msgid "Email changed successfully!"
 msgstr "Email modificado com sucesso!"
 
-#: src/client.cpp:1299
+#: src/client.cpp:1309
 msgid "Unregister Successful"
 msgstr "Registro cancelado com sucesso"
 
-#: src/client.cpp:1300
+#: src/client.cpp:1310
 msgid "Farewell, come back any time..."
 msgstr "Tchau, volte sempre..."
 
-#: src/client.cpp:1499 src/client.cpp:1529 src/client.cpp:1544
-#: src/client.cpp:1969 src/client.cpp:1976
+#: src/client.cpp:1509 src/client.cpp:1539 src/client.cpp:1554
+#: src/client.cpp:1979 src/client.cpp:1986
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s não existe e não pode ser criado! Saindo."
 
-#: src/client.cpp:1675
+#: src/client.cpp:1685
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Host de atualização inválido: %s"
 
-#: src/client.cpp:1709 src/client.cpp:1715
+#: src/client.cpp:1719 src/client.cpp:1725
 msgid "Error creating updates directory!"
 msgstr "Erro ao criar pasta de atualizações!"
 
-#: src/client.cpp:1736
+#: src/client.cpp:1746
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Erro: %s não existe e não pode se criado! Saindo."
@@ -153,11 +154,11 @@ msgstr "Não é possível enviar mensagens privadas vazias!"
 #: src/commandhandler.cpp:343
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
-" you."
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
+"you."
 msgstr ""
-"Não é possível  criar uma aba de mensagem privada para o nick \"%s\"! Ou ela"
-" já existe ou é você mesmo."
+"Não é possível  criar uma aba de mensagem privada para o nick \"%s\"! Ou ela "
+"já existe ou é você mesmo."
 
 #: src/commandhandler.cpp:363
 #, c-format
@@ -316,10 +317,11 @@ msgstr "Recursos de imagem:"
 msgid "Resource orphaned images:"
 msgstr "Recurso de imagem orfão:"
 
-#: src/commandhandler.h:40
+#: src/commandhandler.h:34
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr "Opções para /%s são \"yes\" e \"no\", \"true\" e \"false\", \"1\" e \"0\"."
+msgstr ""
+"Opções para /%s são \"yes\" e \"no\", \"true\" e \"false\", \"1\" e \"0\"."
 
 #: src/game.cpp:252 src/gui/widgets/chattab.cpp:403
 msgid "General"
@@ -345,19 +347,19 @@ msgstr "A conexão com o servidor caiu."
 msgid "Network Error"
 msgstr "Erro de conexão"
 
-#: src/game.cpp:1332
+#: src/game.cpp:1258
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorando propostas de negócios"
 
-#: src/game.cpp:1342
+#: src/game.cpp:1268
 msgid "Accepting incoming trade requests"
 msgstr "Aceitando propostas de negócios"
 
-#: src/game.cpp:1750
+#: src/game.cpp:1773
 msgid "Could Not Load Map"
 msgstr "Não foi possível carregar o mapa"
 
-#: src/game.cpp:1751
+#: src/game.cpp:1774
 #, c-format
 msgid "Error while loading %s"
 msgstr "Erro ao carregar %s"
@@ -435,7 +437,7 @@ msgstr "Quantidade:"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:207
 #: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:998
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:755
 msgid "+"
 msgstr "+"
 
@@ -443,7 +445,7 @@ msgstr "+"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:206
 #: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:1010
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:767
 msgid "-"
 msgstr "-"
 
@@ -456,7 +458,7 @@ msgstr "Sair"
 
 #: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
 #: src/gui/statuswindow.cpp:505 src/gui/statuswindow.cpp:555
-#: src/gui/statuswindow.cpp:997 src/gui/statuswindow.cpp:1028
+#: src/gui/statuswindow.cpp:754 src/gui/statuswindow.cpp:785
 msgid "Max"
 msgstr "Máximo"
 
@@ -473,7 +475,7 @@ msgid "Sell"
 msgstr "Vender"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
-#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:96
+#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:105
 #: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
 #: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:344
 #: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:500
@@ -550,68 +552,68 @@ msgstr "A nova senha deve ter menos que %d caracteres."
 msgid "The new password entries mismatch."
 msgstr "As novas senhas não são iguais."
 
-#: src/gui/charcreatedialog.cpp:58
+#: src/gui/charcreatedialog.cpp:59
 msgid "Create Character"
 msgstr "Criar Personagem"
 
-#: src/gui/charcreatedialog.cpp:76 src/gui/logindialog.cpp:94
+#: src/gui/charcreatedialog.cpp:85 src/gui/logindialog.cpp:94
 #: src/gui/register.cpp:75
 msgid "Name:"
 msgstr "Nome:"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:79 src/gui/charcreatedialog.cpp:84
-#: src/gui/charcreatedialog.cpp:90 src/gui/outfitwindow.cpp:85
+#: src/gui/charcreatedialog.cpp:88 src/gui/charcreatedialog.cpp:93
+#: src/gui/charcreatedialog.cpp:99 src/gui/outfitwindow.cpp:85
 msgid ">"
 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:82 src/gui/charcreatedialog.cpp:85
-#: src/gui/charcreatedialog.cpp:91 src/gui/outfitwindow.cpp:84
+#: src/gui/charcreatedialog.cpp:91 src/gui/charcreatedialog.cpp:94
+#: src/gui/charcreatedialog.cpp:100 src/gui/outfitwindow.cpp:84
 msgid "<"
 msgstr "<"
 
-#: src/gui/charcreatedialog.cpp:83
+#: src/gui/charcreatedialog.cpp:92
 msgid "Hair color:"
 msgstr "Cor do Cabelo:"
 
-#: src/gui/charcreatedialog.cpp:86
+#: src/gui/charcreatedialog.cpp:95
 msgid "Hair style:"
 msgstr "Estilo do Cabelo:"
 
-#: src/gui/charcreatedialog.cpp:92
+#: src/gui/charcreatedialog.cpp:101
 msgid "Race:"
 msgstr "Corrida:"
 
-#: src/gui/charcreatedialog.cpp:95 src/gui/charselectdialog.cpp:480
+#: src/gui/charcreatedialog.cpp:104 src/gui/charselectdialog.cpp:481
 #: src/gui/socialwindow.cpp:1139
 msgid "Create"
 msgstr "Criar"
 
-#: src/gui/charcreatedialog.cpp:97 src/gui/register.cpp:98
+#: src/gui/charcreatedialog.cpp:106 src/gui/register.cpp:98
 msgid "Male"
 msgstr "Homem"
 
-#: src/gui/charcreatedialog.cpp:98 src/gui/register.cpp:99
+#: src/gui/charcreatedialog.cpp:107 src/gui/register.cpp:99
 msgid "Female"
 msgstr "Mulher"
 
-#: src/gui/charcreatedialog.cpp:116 src/gui/charcreatedialog.cpp:303
+#: src/gui/charcreatedialog.cpp:125 src/gui/charcreatedialog.cpp:312
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Por favor distribua %d pontos"
 
-#: src/gui/charcreatedialog.cpp:222
+#: src/gui/charcreatedialog.cpp:231
 msgid "Your name needs to be at least 4 characters."
 msgstr "Seu nome deve ter pelo menos 4 caracteres."
 
-#: src/gui/charcreatedialog.cpp:294
+#: src/gui/charcreatedialog.cpp:303
 msgid "Character stats OK"
 msgstr "Atributos do personagem OK"
 
-#: src/gui/charcreatedialog.cpp:308
+#: src/gui/charcreatedialog.cpp:317
 #, c-format
 msgid "Please remove %d points"
 msgstr "Por favor remova %d pontos"
@@ -641,34 +643,34 @@ msgstr "Cancelar Registro"
 msgid "Change Email"
 msgstr "Alterar email"
 
-#: src/gui/charselectdialog.cpp:253
+#: src/gui/charselectdialog.cpp:254
 msgid "Incorrect password"
 msgstr "Senha incorreta"
 
-#: src/gui/charselectdialog.cpp:286
+#: src/gui/charselectdialog.cpp:287
 msgid "Enter password for deleting character"
 msgstr "Entre com a senha para apagar o personagem"
 
-#: src/gui/charselectdialog.cpp:286
+#: src/gui/charselectdialog.cpp:287
 msgid "Enter password:"
 msgstr "Entre com a senha:"
 
-#: src/gui/charselectdialog.cpp:410 src/gui/serverdialog.cpp:298
+#: src/gui/charselectdialog.cpp:411 src/gui/serverdialog.cpp:298
 #: src/gui/setup_relations.cpp:244 src/gui/shopwindow.cpp:122
 #: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244
 msgid "Delete"
 msgstr "Excluir"
 
-#: src/gui/charselectdialog.cpp:468
+#: src/gui/charselectdialog.cpp:469
 msgid "Choose"
 msgstr "Escolher"
 
-#: src/gui/charselectdialog.cpp:471
+#: src/gui/charselectdialog.cpp:472
 #, c-format
 msgid "Level %d"
 msgstr "Nível %d"
 
-#: src/gui/charselectdialog.cpp:482 src/gui/charselectdialog.cpp:483
+#: src/gui/charselectdialog.cpp:483 src/gui/charselectdialog.cpp:484
 msgid "(empty)"
 msgstr "(vazio)"
 
@@ -933,11 +935,11 @@ msgstr "Auto abrir esta janela"
 msgid "OK"
 msgstr "OK"
 
-#: src/gui/equipmentwindow.cpp:61 src/gui/windowmenu.cpp:74
+#: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74
 msgid "Equipment"
 msgstr "Equipamento"
 
-#: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160
+#: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160
 #: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554
 #: src/gui/popupmenu.cpp:1737 src/gui/popupmenu.cpp:1829
 #: src/gui/popupmenu.cpp:1874
@@ -1374,7 +1376,7 @@ msgstr "Não ignorar"
 #: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:190
 #: src/gui/popupmenu.cpp:415 src/gui/popupmenu.cpp:435
 #: src/gui/popupmenu.cpp:672 src/gui/popupmenu.cpp:692
-#: src/playerrelations.cpp:446
+#: src/playerrelations.cpp:447
 msgid "Completely ignore"
 msgstr "Ignorar completamente"
 
@@ -2884,270 +2886,6 @@ msgstr "Escolha o nome do seu grupo."
 msgid "Specials"
 msgstr "Especiais"
 
-#: src/gui/statuspopup.cpp:204
-msgid "(D) default moves"
-msgstr "(D) movimentos padrão"
-
-#: src/gui/statuspopup.cpp:209
-msgid "(I) invert moves"
-msgstr "(l) inserir movimentos"
-
-#: src/gui/statuspopup.cpp:214
-msgid "(c) moves with some crazy moves"
-msgstr "(c) Alguns movimentos loucos"
-
-#: src/gui/statuspopup.cpp:219
-msgid "(C) moves with crazy moves"
-msgstr "(C) Movimentos loucos"
-
-#: src/gui/statuspopup.cpp:224
-msgid "(d) double normal + crazy"
-msgstr "(d) dobro normal + louco"
-
-#: src/gui/statuspopup.cpp:229
-msgid "(?) move"
-msgstr "(?) mover"
-
-#: src/gui/statuspopup.cpp:247
-msgid "(a) custom crazy move"
-msgstr "(a) movimentos loucos customizados"
-
-#: src/gui/statuspopup.cpp:251
-msgid "(?) crazy move"
-msgstr "(?) Movimentos loucos"
-
-#: src/gui/statuspopup.cpp:261
-msgid "(0) default moves to target"
-msgstr "(0) Mover ao alvo padrão"
-
-#: src/gui/statuspopup.cpp:266
-msgid "(1) moves to target in distance 1"
-msgstr "(1) Mover ao alvo com distância 1"
-
-#: src/gui/statuspopup.cpp:271
-msgid "(2) moves to target in distance 2"
-msgstr "(2) mover ao alvo em distância 2"
-
-#: src/gui/statuspopup.cpp:276
-msgid "(3) moves to target in distance 3"
-msgstr "(3) Mover ao alvo com distância 3"
-
-#: src/gui/statuspopup.cpp:281
-msgid "(5) moves to target in distance 5"
-msgstr "(5) Mover ao alvo com distância 5"
-
-#: src/gui/statuspopup.cpp:286
-msgid "(7) moves to target in distance 7"
-msgstr "(7) Mover ao alvo com distância 7"
-
-#: src/gui/statuspopup.cpp:291
-msgid "(A) moves to target in attack range"
-msgstr "(A)  Mover ao alvo com a distância de ataque"
-
-#: src/gui/statuspopup.cpp:296
-msgid "(a) archer attack range"
-msgstr "(a) Alcance ataque de arqueiro"
-
-#: src/gui/statuspopup.cpp:301
-msgid "(?) move to target"
-msgstr "(?) Mover ao alvo"
-
-#: src/gui/statuspopup.cpp:309
-msgid "(D) default follow"
-msgstr "(D) Seguir em modo padrão"
-
-#: src/gui/statuspopup.cpp:313
-msgid "(R) relative follow"
-msgstr "(R) Seguir em modo relativo"
-
-#: src/gui/statuspopup.cpp:317
-msgid "(M) mirror follow"
-msgstr "(M) Seguir em modo espelhado"
-
-#: src/gui/statuspopup.cpp:321
-msgid "(P) pet follow"
-msgstr "(P) Seguir em modo animal de extimação"
-
-#: src/gui/statuspopup.cpp:325
-msgid "(?) unknown follow"
-msgstr "(?) Seguir em modo desconhecido"
-
-#: src/gui/statuspopup.cpp:334 src/gui/statuspopup.cpp:357
-msgid "(D) default attack"
-msgstr "(D) Ataque padrão"
-
-#: src/gui/statuspopup.cpp:339
-msgid "(s) switch attack without shield"
-msgstr "(s) Trocar ataque sem escudo"
-
-#: src/gui/statuspopup.cpp:344
-msgid "(S) switch attack with shield"
-msgstr "(S) Trocar ataque com escudo"
-
-#: src/gui/statuspopup.cpp:348 src/gui/statuspopup.cpp:373
-msgid "(?) attack"
-msgstr "(?) Ataque"
-
-#: src/gui/statuspopup.cpp:361
-msgid "(G) go and attack"
-msgstr "(G) Ir e atacar"
-
-#: src/gui/statuspopup.cpp:365
-msgid "(A) go, attack, pickup"
-msgstr "(A) Ir, atacar, pegar"
-
-#: src/gui/statuspopup.cpp:369
-msgid "(d) without auto attack"
-msgstr "(d) sem auto ataque"
-
-#: src/gui/statuspopup.cpp:387
-msgid "(S) small pick up 1x1 cells"
-msgstr "(S) Pequeno pegar 1x1 celulas"
-
-#: src/gui/statuspopup.cpp:391
-msgid "(D) default pick up 2x1 cells"
-msgstr "(D) Pegar padrão 2x1 células"
-
-#: src/gui/statuspopup.cpp:395
-msgid "(F) forward pick up 2x3 cells"
-msgstr "(F) Pegar em frente 2x3 células"
-
-#: src/gui/statuspopup.cpp:399
-msgid "(3) pick up 3x3 cells"
-msgstr "(3) Pegar 3x3 células"
-
-#: src/gui/statuspopup.cpp:403
-msgid "(g) go and pick up in distance 4"
-msgstr "(g) Ir e pegar em distância 4"
-
-#: src/gui/statuspopup.cpp:407
-msgid "(G) go and pick up in distance 8"
-msgstr "(G) Ir e pegar em distância 8"
-
-#: src/gui/statuspopup.cpp:411
-msgid "(A) go and pick up in max distance"
-msgstr "(A) Ir e pegar em distância mâxima"
-
-#: src/gui/statuspopup.cpp:415
-msgid "(?) pick up"
-msgstr "(?) Pegar item"
-
-#: src/gui/statuspopup.cpp:424
-msgid "(N) normal map view"
-msgstr "(N) Visualizardor de mapa normal"
-
-#: src/gui/statuspopup.cpp:428
-msgid "(D) debug map view"
-msgstr "(D) Visualizador de mapa depurador"
-
-#: src/gui/statuspopup.cpp:432
-msgid "(u) ultra map view"
-msgstr "(u) Visualizador de mapa ultra"
-
-#: src/gui/statuspopup.cpp:436
-msgid "(U) ultra map view 2"
-msgstr "(U) Visualizador de mapa ultra 2"
-
-#: src/gui/statuspopup.cpp:440
-msgid "(e) empty map view"
-msgstr "(e) Visualizador de mapa vazio"
-
-#: src/gui/statuspopup.cpp:444
-msgid "(b) black & white map view"
-msgstr "(b) Visualizador de mapa preto e branco"
-
-#: src/gui/statuspopup.cpp:448
-msgid "(?) map view"
-msgstr "(?) Visualizador de mapa"
-
-#: src/gui/statuspopup.cpp:456
-msgid "(f) use #flar for magic attack"
-msgstr "(f) Usar #flar para feitiço de ataque"
-
-#: src/gui/statuspopup.cpp:461
-msgid "(c) use #chiza for magic attack"
-msgstr "(c) Usar #chiza para feitiço de ataque"
-
-#: src/gui/statuspopup.cpp:466
-msgid "(I) use #ingrav for magic attack"
-msgstr "(I) Usar #ingrav para feitiço de ataque"
-
-#: src/gui/statuspopup.cpp:471
-msgid "(F) use #frillyar for magic attack"
-msgstr "(F) Usar #frillyar para feitiço de ataque"
-
-#: src/gui/statuspopup.cpp:476
-msgid "(U) use #upmarmu for magic attack"
-msgstr "(U) Usar #upmarmu para feitiço de ataque"
-
-#: src/gui/statuspopup.cpp:480
-msgid "(?) magic attack"
-msgstr "(?) Feitiço de ataque"
-
-#: src/gui/statuspopup.cpp:489
-msgid "(a) attack all players"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:493
-msgid "(f) attack not friends"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:497
-msgid "(b) attack bad relations"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:501
-msgid "(d) dont attack players"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:505
-msgid "(?) pvp attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:514
-msgid "(D) default imitation"
-msgstr "(D) Mímica padrão"
-
-#: src/gui/statuspopup.cpp:518
-msgid "(O) outfits imitation"
-msgstr "(O) Mímica de roupas"
-
-#: src/gui/statuspopup.cpp:522
-msgid "(?) imitation"
-msgstr "(?) Mímica"
-
-#: src/gui/statuspopup.cpp:531
-msgid "(O) on keyboard"
-msgstr "(O) No teclado"
-
-#: src/gui/statuspopup.cpp:534
-msgid "(A) away"
-msgstr "(A) Ausente"
-
-#: src/gui/statuspopup.cpp:537 src/gui/statuspopup.cpp:557
-msgid "(?) away"
-msgstr "(?) Ausente"
-
-#: src/gui/statuspopup.cpp:545
-msgid "(G) game camera mode"
-msgstr "(G) Modo de jogo câmera"
-
-#: src/gui/statuspopup.cpp:549
-msgid "(F) free camera mode"
-msgstr "(F) Modo de jogo câmera livre"
-
-#: src/gui/statuspopup.cpp:553
-msgid "(D) design camera mode"
-msgstr "(D)  Modo de jogo câmera design"
-
-#: src/gui/statuspopup.cpp:564
-msgid "Game modifiers are disabled"
-msgstr "Modificadores de jogo desativados"
-
-#: src/gui/statuspopup.cpp:569
-msgid "Game modifiers are enabled"
-msgstr "Modificadores de jogo desativados"
-
 #: src/gui/statuswindow.cpp:144 src/gui/statuswindow.cpp:274
 #: src/gui/statuswindow.cpp:337
 #, c-format
@@ -3196,136 +2934,6 @@ msgstr "Nível: %d (GM %d)"
 msgid "Correction points: %d"
 msgstr "Pontos de correção: %d"
 
-#: src/gui/statuswindow.cpp:649 src/gui/statuswindow.cpp:717
-#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:753
-#: src/gui/statuswindow.cpp:818 src/gui/statuswindow.cpp:847
-#: src/gui/statuswindow.cpp:870 src/gui/statuswindow.cpp:889
-msgid "(D)"
-msgstr "(D)"
-
-#: src/gui/statuswindow.cpp:652 src/gui/statuswindow.cpp:778
-msgid "(I)"
-msgstr "(l)"
-
-#: src/gui/statuswindow.cpp:655 src/gui/statuswindow.cpp:775
-msgid "(c)"
-msgstr "(c)"
-
-#: src/gui/statuswindow.cpp:658
-msgid "(C)"
-msgstr "(C)"
-
-#: src/gui/statuswindow.cpp:661 src/gui/statuswindow.cpp:762
-#: src/gui/statuswindow.cpp:803
-msgid "(d)"
-msgstr "(d)"
-
-#: src/gui/statuswindow.cpp:664 src/gui/statuswindow.cpp:678
-#: src/gui/statuswindow.cpp:710 src/gui/statuswindow.cpp:729
-#: src/gui/statuswindow.cpp:746 src/gui/statuswindow.cpp:765
-#: src/gui/statuswindow.cpp:787 src/gui/statuswindow.cpp:806
-#: src/gui/statuswindow.cpp:836 src/gui/statuswindow.cpp:862
-#: src/gui/statuswindow.cpp:876 src/gui/statuswindow.cpp:892
-#: src/gui/statuswindow.cpp:905
-msgid "(?)"
-msgstr "(?)"
-
-#: src/gui/statuswindow.cpp:675 src/gui/statuswindow.cpp:707
-#: src/gui/statuswindow.cpp:794
-msgid "(a)"
-msgstr "(a)"
-
-#: src/gui/statuswindow.cpp:686
-msgid "(0)"
-msgstr "(0)"
-
-#: src/gui/statuswindow.cpp:689
-msgid "(1)"
-msgstr "(1)"
-
-#: src/gui/statuswindow.cpp:692
-msgid "(2)"
-msgstr "(2)"
-
-#: src/gui/statuswindow.cpp:695 src/gui/statuswindow.cpp:824
-msgid "(3)"
-msgstr "(3)"
-
-#: src/gui/statuswindow.cpp:698
-msgid "(5)"
-msgstr "(5)"
-
-#: src/gui/statuswindow.cpp:701
-msgid "(7)"
-msgstr "(7)"
-
-#: src/gui/statuswindow.cpp:704 src/gui/statuswindow.cpp:759
-#: src/gui/statuswindow.cpp:833 src/gui/statuswindow.cpp:902
-msgid "(A)"
-msgstr "(A)"
-
-#: src/gui/statuswindow.cpp:720
-msgid "(R)"
-msgstr "(R)"
-
-#: src/gui/statuswindow.cpp:723
-msgid "(M)"
-msgstr "(M)"
-
-#: src/gui/statuswindow.cpp:726
-msgid "(P)"
-msgstr "(P)"
-
-#: src/gui/statuswindow.cpp:740
-msgid "(s)"
-msgstr "(s)"
-
-#: src/gui/statuswindow.cpp:743 src/gui/statuswindow.cpp:815
-msgid "(S)"
-msgstr "(S)"
-
-#: src/gui/statuswindow.cpp:756 src/gui/statuswindow.cpp:830
-#: src/gui/statuswindow.cpp:883
-msgid "(G)"
-msgstr "(G)"
-
-#: src/gui/statuswindow.cpp:772 src/gui/statuswindow.cpp:797
-msgid "(f)"
-msgstr "(f)"
-
-#: src/gui/statuswindow.cpp:781 src/gui/statuswindow.cpp:821
-#: src/gui/statuswindow.cpp:886
-msgid "(F)"
-msgstr "(F)"
-
-#: src/gui/statuswindow.cpp:784 src/gui/statuswindow.cpp:853
-msgid "(U)"
-msgstr "(U)"
-
-#: src/gui/statuswindow.cpp:800 src/gui/statuswindow.cpp:859
-msgid "(b)"
-msgstr "(b)"
-
-#: src/gui/statuswindow.cpp:827
-msgid "(g)"
-msgstr "(g)"
-
-#: src/gui/statuswindow.cpp:844
-msgid "(N)"
-msgstr "(N)"
-
-#: src/gui/statuswindow.cpp:850
-msgid "(u)"
-msgstr "(u)"
-
-#: src/gui/statuswindow.cpp:856
-msgid "(e)"
-msgstr "(e)"
-
-#: src/gui/statuswindow.cpp:873 src/gui/statuswindow.cpp:899
-msgid "(O)"
-msgstr "(O)"
-
 #: src/gui/textcommandeditor.cpp:113
 msgid "No Target"
 msgstr "Sem alvo"
@@ -3452,8 +3060,7 @@ msgid "You don't have enough money."
 msgstr "Você não tem dinheiro suficiente."
 
 #: src/gui/tradewindow.cpp:454
-msgid ""
-"Failed adding item. You can not overlap one kind of item on the window."
+msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Falha ao adicionar item. Você não pode duplicar este tipo de item na janela."
 
@@ -3640,7 +3247,7 @@ msgstr "Borda do Lugar Inicial"
 msgid "Road Point"
 msgstr "Ponto de estrada"
 
-#: src/gui/whoisonline.cpp:85 src/gui/whoisonline.cpp:479
+#: src/gui/whoisonline.cpp:85 src/gui/whoisonline.cpp:494
 msgid "Who Is Online - Updating"
 msgstr "Quem está online - Atualizando"
 
@@ -3648,15 +3255,15 @@ msgstr "Quem está online - Atualizando"
 msgid "Update"
 msgstr "Atualizar"
 
-#: src/gui/whoisonline.cpp:302
+#: src/gui/whoisonline.cpp:307
 msgid "Who Is Online - "
 msgstr "Quem está online - "
 
-#: src/gui/whoisonline.cpp:493
+#: src/gui/whoisonline.cpp:508
 msgid "Who Is Online - error"
 msgstr "Quem está online - Erro"
 
-#: src/gui/whoisonline.cpp:525
+#: src/gui/whoisonline.cpp:540
 msgid "Who Is Online - Update"
 msgstr "Quem está online - Atualizado"
 
@@ -3833,8 +3440,7 @@ msgid "Command: /unignore <player>"
 msgstr "Comando: /unignore <jogador>"
 
 #: src/gui/widgets/whispertab.cpp:131
-msgid ""
-"This command stops ignoring the other player if they are being ignored."
+msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 "Este comando para de ignorar o outro jogador se ele estiver sendo ignorado."
 
@@ -4365,68 +3971,335 @@ msgstr ""
 "Conflito com as teclas \"%s\" e \"%s\" . Resolva o conflito para não "
 "comprometer a jogabilidade."
 
-#: src/localplayer.cpp:389
+#: src/localplayer.cpp:384
 msgid "You were killed by "
 msgstr "Você foi morto por "
 
-#: src/localplayer.cpp:1442
+#: src/localplayer.cpp:1434
 msgid "Tried to pick up nonexistent item."
 msgstr "Você tentou pegar um item não existente."
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1436
 msgid "Item is too heavy."
 msgstr "Este item é muito pesado."
 
-#: src/localplayer.cpp:1446
+#: src/localplayer.cpp:1438
 msgid "Item is too far away."
 msgstr "Item está muito longe"
 
-#: src/localplayer.cpp:1448
+#: src/localplayer.cpp:1440
 msgid "Inventory is full."
 msgstr "O inventário está cheio."
 
-#: src/localplayer.cpp:1450
+#: src/localplayer.cpp:1442
 msgid "Stack is too big."
 msgstr "Esta pilha é muito grande."
 
-#: src/localplayer.cpp:1453
+#: src/localplayer.cpp:1445
 msgid "Item belongs to someone else."
 msgstr "Este item pertence a outra pessoa."
 
-#: src/localplayer.cpp:1456
+#: src/localplayer.cpp:1448
 msgid "Unknown problem picking up item."
 msgstr "Problema desconhecido ao tentar pegar item."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1480
+#: src/localplayer.cpp:1472
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "Você pegou %d [@@%d|%s@@]."
 msgstr[1] "Você pegou %d [@@%d|%s@@]."
 
-#: src/localplayer.cpp:3206
+#: src/localplayer.cpp:1887
+msgid "(D) default moves"
+msgstr "(D) movimentos padrão"
+
+#: src/localplayer.cpp:1888
+msgid "(I) invert moves"
+msgstr "(l) inserir movimentos"
+
+#: src/localplayer.cpp:1889
+msgid "(c) moves with some crazy moves"
+msgstr "(c) Alguns movimentos loucos"
+
+#: src/localplayer.cpp:1890
+msgid "(C) moves with crazy moves"
+msgstr "(C) Movimentos loucos"
+
+#: src/localplayer.cpp:1891
+msgid "(d) double normal + crazy"
+msgstr "(d) dobro normal + louco"
+
+#: src/localplayer.cpp:1892
+#, fuzzy
+msgid "(?) unknown move"
+msgstr "(?) Seguir em modo desconhecido"
+
+#: src/localplayer.cpp:1914
+#, fuzzy, c-format
+msgid "(%d) crazy move number %d"
+msgstr "(?) Movimentos loucos"
+
+#: src/localplayer.cpp:1919
+msgid "(a) custom crazy move"
+msgstr "(a) movimentos loucos customizados"
+
+#: src/localplayer.cpp:1923
+msgid "(?) crazy move"
+msgstr "(?) Movimentos loucos"
+
+#: src/localplayer.cpp:1937
+msgid "(0) default moves to target"
+msgstr "(0) Mover ao alvo padrão"
+
+#: src/localplayer.cpp:1938
+msgid "(1) moves to target in distance 1"
+msgstr "(1) Mover ao alvo com distância 1"
+
+#: src/localplayer.cpp:1939
+msgid "(2) moves to target in distance 2"
+msgstr "(2) mover ao alvo em distância 2"
+
+#: src/localplayer.cpp:1940
+msgid "(3) moves to target in distance 3"
+msgstr "(3) Mover ao alvo com distância 3"
+
+#: src/localplayer.cpp:1941
+msgid "(5) moves to target in distance 5"
+msgstr "(5) Mover ao alvo com distância 5"
+
+#: src/localplayer.cpp:1942
+msgid "(7) moves to target in distance 7"
+msgstr "(7) Mover ao alvo com distância 7"
+
+#: src/localplayer.cpp:1943
+msgid "(A) moves to target in attack range"
+msgstr "(A)  Mover ao alvo com a distância de ataque"
+
+#: src/localplayer.cpp:1944
+msgid "(a) archer attack range"
+msgstr "(a) Alcance ataque de arqueiro"
+
+#: src/localplayer.cpp:1945
+msgid "(?) move to target"
+msgstr "(?) Mover ao alvo"
+
+#: src/localplayer.cpp:1964
+msgid "(D) default follow"
+msgstr "(D) Seguir em modo padrão"
+
+#: src/localplayer.cpp:1965
+msgid "(R) relative follow"
+msgstr "(R) Seguir em modo relativo"
+
+#: src/localplayer.cpp:1966
+msgid "(M) mirror follow"
+msgstr "(M) Seguir em modo espelhado"
+
+#: src/localplayer.cpp:1967
+msgid "(P) pet follow"
+msgstr "(P) Seguir em modo animal de extimação"
+
+#: src/localplayer.cpp:1968
+msgid "(?) unknown follow"
+msgstr "(?) Seguir em modo desconhecido"
+
+#: src/localplayer.cpp:1987 src/localplayer.cpp:1991 src/localplayer.cpp:2014
+msgid "(?) attack"
+msgstr "(?) Ataque"
+
+#: src/localplayer.cpp:1988 src/localplayer.cpp:2010
+msgid "(D) default attack"
+msgstr "(D) Ataque padrão"
+
+#: src/localplayer.cpp:1989
+msgid "(s) switch attack without shield"
+msgstr "(s) Trocar ataque sem escudo"
+
+#: src/localplayer.cpp:1990
+msgid "(S) switch attack with shield"
+msgstr "(S) Trocar ataque com escudo"
+
+#: src/localplayer.cpp:2011
+msgid "(G) go and attack"
+msgstr "(G) Ir e atacar"
+
+#: src/localplayer.cpp:2012
+msgid "(A) go, attack, pickup"
+msgstr "(A) Ir, atacar, pegar"
+
+#: src/localplayer.cpp:2013
+msgid "(d) without auto attack"
+msgstr "(d) sem auto ataque"
+
+#: src/localplayer.cpp:2047
+msgid "(S) small pick up 1x1 cells"
+msgstr "(S) Pequeno pegar 1x1 celulas"
+
+#: src/localplayer.cpp:2048
+msgid "(D) default pick up 2x1 cells"
+msgstr "(D) Pegar padrão 2x1 células"
+
+#: src/localplayer.cpp:2049
+msgid "(F) forward pick up 2x3 cells"
+msgstr "(F) Pegar em frente 2x3 células"
+
+#: src/localplayer.cpp:2050
+msgid "(3) pick up 3x3 cells"
+msgstr "(3) Pegar 3x3 células"
+
+#: src/localplayer.cpp:2051
+msgid "(g) go and pick up in distance 4"
+msgstr "(g) Ir e pegar em distância 4"
+
+#: src/localplayer.cpp:2052
+msgid "(G) go and pick up in distance 8"
+msgstr "(G) Ir e pegar em distância 8"
+
+#: src/localplayer.cpp:2053
+msgid "(A) go and pick up in max distance"
+msgstr "(A) Ir e pegar em distância mâxima"
+
+#: src/localplayer.cpp:2054
+msgid "(?) pick up"
+msgstr "(?) Pegar item"
+
+#: src/localplayer.cpp:2067
+msgid "(N) normal map view"
+msgstr "(N) Visualizardor de mapa normal"
+
+#: src/localplayer.cpp:2068
+msgid "(D) debug map view"
+msgstr "(D) Visualizador de mapa depurador"
+
+#: src/localplayer.cpp:2069
+msgid "(u) ultra map view"
+msgstr "(u) Visualizador de mapa ultra"
+
+#: src/localplayer.cpp:2070
+msgid "(U) ultra map view 2"
+msgstr "(U) Visualizador de mapa ultra 2"
+
+#: src/localplayer.cpp:2071
+msgid "(e) empty map view"
+msgstr "(e) Visualizador de mapa vazio"
+
+#: src/localplayer.cpp:2072
+msgid "(b) black & white map view"
+msgstr "(b) Visualizador de mapa preto e branco"
+
+#: src/localplayer.cpp:2091
+msgid "(f) use #flar for magic attack"
+msgstr "(f) Usar #flar para feitiço de ataque"
+
+#: src/localplayer.cpp:2092
+msgid "(c) use #chiza for magic attack"
+msgstr "(c) Usar #chiza para feitiço de ataque"
+
+#: src/localplayer.cpp:2093
+msgid "(I) use #ingrav for magic attack"
+msgstr "(I) Usar #ingrav para feitiço de ataque"
+
+#: src/localplayer.cpp:2094
+msgid "(F) use #frillyar for magic attack"
+msgstr "(F) Usar #frillyar para feitiço de ataque"
+
+#: src/localplayer.cpp:2095
+msgid "(U) use #upmarmu for magic attack"
+msgstr "(U) Usar #upmarmu para feitiço de ataque"
+
+#: src/localplayer.cpp:2096
+msgid "(?) magic attack"
+msgstr "(?) Feitiço de ataque"
+
+#: src/localplayer.cpp:2115
+msgid "(a) attack all players"
+msgstr ""
+
+#: src/localplayer.cpp:2116
+msgid "(f) attack not friends"
+msgstr ""
+
+#: src/localplayer.cpp:2117
+msgid "(b) attack bad relations"
+msgstr ""
+
+#: src/localplayer.cpp:2118
+msgid "(d) dont attack players"
+msgstr ""
+
+#: src/localplayer.cpp:2119
+msgid "(?) pvp attack"
+msgstr ""
+
+#: src/localplayer.cpp:2138
+msgid "(D) default imitation"
+msgstr "(D) Mímica padrão"
+
+#: src/localplayer.cpp:2139
+msgid "(O) outfits imitation"
+msgstr "(O) Mímica de roupas"
+
+#: src/localplayer.cpp:2140
+msgid "(?) imitation"
+msgstr "(?) Mímica"
+
+#: src/localplayer.cpp:2168
 msgid "Away"
 msgstr "Indisponivel "
 
-#: src/localplayer.cpp:3541
+#: src/localplayer.cpp:2187
+msgid "(O) on keyboard"
+msgstr "(O) No teclado"
+
+#: src/localplayer.cpp:2188
+msgid "(A) away"
+msgstr "(A) Ausente"
+
+#: src/localplayer.cpp:2189 src/localplayer.cpp:2204
+msgid "(?) away"
+msgstr "(?) Ausente"
+
+#: src/localplayer.cpp:2202
+msgid "(G) game camera mode"
+msgstr "(G) Modo de jogo câmera"
+
+#: src/localplayer.cpp:2203
+msgid "(F) free camera mode"
+msgstr "(F) Modo de jogo câmera livre"
+
+#: src/localplayer.cpp:2228
+msgid "Game modifiers are enabled"
+msgstr "Modificadores de jogo desativados"
+
+#: src/localplayer.cpp:2229
+msgid "Game modifiers are disabled"
+msgstr "Modificadores de jogo desativados"
+
+#: src/localplayer.cpp:2230
+#, fuzzy
+msgid "Game modifiers are unknown"
+msgstr "Modificadores de jogo desativados"
+
+#: src/localplayer.cpp:3746
 msgid "Follow: "
 msgstr "Seguindo:"
 
-#: src/localplayer.cpp:3543 src/localplayer.cpp:3558
+#: src/localplayer.cpp:3748 src/localplayer.cpp:3763
 msgid "Follow canceled"
 msgstr "Seguindo cancelado"
 
-#: src/localplayer.cpp:3550
+#: src/localplayer.cpp:3755
 msgid "Imitation: "
 msgstr "Imitando:"
 
-#: src/localplayer.cpp:3552 src/localplayer.cpp:3560
+#: src/localplayer.cpp:3757 src/localplayer.cpp:3765
 msgid "Imitation canceled"
 msgstr "Imitação cancelada"
 
-#: src/localplayer.cpp:3908
+#: src/localplayer.cpp:4113
 msgid "You see "
 msgstr "Você vê "
 
@@ -4538,71 +4411,71 @@ msgstr "Obrigado pela compra."
 msgid "Unable to buy."
 msgstr "Impossível comprar."
 
-#: src/net/ea/charserverhandler.cpp:63
+#: src/net/ea/charserverhandler.cpp:66
 msgid "Strength:"
 msgstr "Força:"
 
-#: src/net/ea/charserverhandler.cpp:64
+#: src/net/ea/charserverhandler.cpp:67
 msgid "Agility:"
 msgstr "Agilidade:"
 
-#: src/net/ea/charserverhandler.cpp:65
+#: src/net/ea/charserverhandler.cpp:68
 msgid "Vitality:"
 msgstr "Vitalidade:"
 
-#: src/net/ea/charserverhandler.cpp:66
+#: src/net/ea/charserverhandler.cpp:69
 msgid "Intelligence:"
 msgstr "Inteligência:"
 
-#: src/net/ea/charserverhandler.cpp:67
+#: src/net/ea/charserverhandler.cpp:70
 msgid "Dexterity:"
 msgstr "Destreza:"
 
-#: src/net/ea/charserverhandler.cpp:68
+#: src/net/ea/charserverhandler.cpp:71
 msgid "Luck:"
 msgstr "Sorte:"
 
-#: src/net/ea/charserverhandler.cpp:102
+#: src/net/ea/charserverhandler.cpp:115
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr "Acesso negado. Provavelmente há jogadores demais neste servidor."
 
-#: src/net/ea/charserverhandler.cpp:106
+#: src/net/ea/charserverhandler.cpp:119
 msgid "Cannot use this ID."
 msgstr "Não é possível usar este ID."
 
-#: src/net/ea/charserverhandler.cpp:109
+#: src/net/ea/charserverhandler.cpp:122
 msgid "Unknown char-server failure."
 msgstr "Erro desconhecido do char-server."
 
-#: src/net/ea/charserverhandler.cpp:138
+#: src/net/ea/charserverhandler.cpp:151
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr "Erro ao criar personagem. Provavelmente o nome já está sendo usado."
 
-#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:235
+#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:235
 msgid "Wrong name."
 msgstr "Nome errado."
 
-#: src/net/ea/charserverhandler.cpp:145
+#: src/net/ea/charserverhandler.cpp:158
 msgid "Incorrect stats."
 msgstr "Stats incorretos."
 
-#: src/net/ea/charserverhandler.cpp:148
+#: src/net/ea/charserverhandler.cpp:161
 msgid "Incorrect hair."
 msgstr "Cabelo incorreto."
 
-#: src/net/ea/charserverhandler.cpp:151
+#: src/net/ea/charserverhandler.cpp:164
 msgid "Incorrect slot."
 msgstr "Slot incorreto."
 
-#: src/net/ea/charserverhandler.cpp:166 src/net/manaserv/charhandler.cpp:210
+#: src/net/ea/charserverhandler.cpp:179 src/net/manaserv/charhandler.cpp:210
 msgid "Info"
 msgstr "Informações"
 
-#: src/net/ea/charserverhandler.cpp:166
+#: src/net/ea/charserverhandler.cpp:179
 msgid "Character deleted."
 msgstr "Personagem deletado."
 
-#: src/net/ea/charserverhandler.cpp:172
+#: src/net/ea/charserverhandler.cpp:185
 msgid "Failed to delete character."
 msgstr "Falha ao deletar personagem."
 
@@ -4815,8 +4688,7 @@ msgstr "Comando: /exp <policy>"
 
 #: src/net/ea/gui/partytab.cpp:108
 msgid "This command changes the party's experience sharing policy."
-msgstr ""
-"Este comando muda a opção de compartilhamento de experiência do grupo."
+msgstr "Este comando muda a opção de compartilhamento de experiência do grupo."
 
 #: src/net/ea/gui/partytab.cpp:110
 msgid ""
@@ -4833,18 +4705,17 @@ msgstr "Comando: /exp"
 #: src/net/ea/gui/partytab.cpp:114
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
-"Este comando exibe a atual opção de compartilhamento de experiência do "
-"grupo."
+"Este comando exibe a atual opção de compartilhamento de experiência do grupo."
 
-#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:284
+#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:285
 msgid "Item sharing enabled."
 msgstr "Compartilhamento de itens habilitado."
 
-#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:294
+#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:295
 msgid "Item sharing disabled."
 msgstr "Compartilhamento de itens desabilitado."
 
-#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:304
+#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:305
 msgid "Item sharing not possible."
 msgstr "Não é possível compartilhar itens."
 
@@ -4852,15 +4723,15 @@ msgstr "Não é possível compartilhar itens."
 msgid "Item sharing unknown."
 msgstr "Compartilhamento de itens desconhecido."
 
-#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:246
+#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:247
 msgid "Experience sharing enabled."
 msgstr "Compartilhamento de experiência habilitado."
 
-#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:256
+#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:257
 msgid "Experience sharing disabled."
 msgstr "Compartilhamento de experiência desabilitado."
 
-#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:266
+#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:267
 msgid "Experience sharing not possible."
 msgstr "Não é possível compartilhar experiência."
 
@@ -4981,16 +4852,16 @@ msgstr "%s não pode se juntar ao grupo cheio."
 msgid "QQQ Unknown invite response for %s."
 msgstr "QQQ resposta de convite desconhecida por %s."
 
-#: src/net/ea/partyhandler.cpp:357
+#: src/net/ea/partyhandler.cpp:358
 msgid "You have left the party."
 msgstr "Você saiu do grupo."
 
-#: src/net/ea/partyhandler.cpp:370
+#: src/net/ea/partyhandler.cpp:371
 #, c-format
 msgid "%s has left your party."
 msgstr "%s saiu do seu grupo."
 
-#: src/net/ea/partyhandler.cpp:447
+#: src/net/ea/partyhandler.cpp:448
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr "Um membro desconhecido tentou dizer: %s"
@@ -5122,8 +4993,7 @@ msgstr "Mensagem"
 
 #: src/net/ea/playerhandler.cpp:336
 msgid ""
-"You are carrying more than half your weight. You are unable to regain "
-"health."
+"You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 "Você está carregando mais que a metade de seu peso. Você não poderá mais "
 "recuperar HP."
@@ -5721,19 +5591,19 @@ msgstr "Conexão com o servidor interrompida. "
 msgid "%s is not in your party!"
 msgstr "%s não está em seu grupo!"
 
-#: src/playerrelations.cpp:460
+#: src/playerrelations.cpp:461
 msgid "Print '...'"
 msgstr "Imprimir '...'"
 
-#: src/playerrelations.cpp:480
+#: src/playerrelations.cpp:481
 msgid "Blink name"
 msgstr "Piscar nome"
 
-#: src/playerrelations.cpp:524
+#: src/playerrelations.cpp:525
 msgid "Floating '...' bubble"
 msgstr "Bolha '...' flutuante"
 
-#: src/playerrelations.cpp:527
+#: src/playerrelations.cpp:528
 msgid "Floating bubble"
 msgstr "Bolha Flutuante"
 
@@ -5766,4 +5636,98 @@ msgstr "MP %+d"
 msgid "Unknown item"
 msgstr "Item desconhecido"
 
+#~ msgid "(?) move"
+#~ msgstr "(?) mover"
+
+#~ msgid "(?) map view"
+#~ msgstr "(?) Visualizador de mapa"
+
+#~ msgid "(D) design camera mode"
+#~ msgstr "(D)  Modo de jogo câmera design"
+
+#~ msgid "(D)"
+#~ msgstr "(D)"
+
+#~ msgid "(I)"
+#~ msgstr "(l)"
+
+#~ msgid "(c)"
+#~ msgstr "(c)"
+
+#~ msgid "(C)"
+#~ msgstr "(C)"
+
+#~ msgid "(d)"
+#~ msgstr "(d)"
+
+#~ msgid "(?)"
+#~ msgstr "(?)"
+
+#~ msgid "(a)"
+#~ msgstr "(a)"
+
+#~ msgid "(0)"
+#~ msgstr "(0)"
+
+#~ msgid "(1)"
+#~ msgstr "(1)"
+
+#~ msgid "(2)"
+#~ msgstr "(2)"
+
+#~ msgid "(3)"
+#~ msgstr "(3)"
+
+#~ msgid "(5)"
+#~ msgstr "(5)"
+
+#~ msgid "(7)"
+#~ msgstr "(7)"
+
+#~ msgid "(A)"
+#~ msgstr "(A)"
+
+#~ msgid "(R)"
+#~ msgstr "(R)"
+
+#~ msgid "(M)"
+#~ msgstr "(M)"
+
+#~ msgid "(P)"
+#~ msgstr "(P)"
+
+#~ msgid "(s)"
+#~ msgstr "(s)"
+
+#~ msgid "(S)"
+#~ msgstr "(S)"
+
+#~ msgid "(G)"
+#~ msgstr "(G)"
+
+#~ msgid "(f)"
+#~ msgstr "(f)"
+
+#~ msgid "(F)"
+#~ msgstr "(F)"
+
+#~ msgid "(U)"
+#~ msgstr "(U)"
+
+#~ msgid "(b)"
+#~ msgstr "(b)"
+
+#~ msgid "(g)"
+#~ msgstr "(g)"
+
+#~ msgid "(N)"
+#~ msgstr "(N)"
+
+#~ msgid "(u)"
+#~ msgstr "(u)"
+
+#~ msgid "(e)"
+#~ msgstr "(e)"
 
+#~ msgid "(O)"
+#~ msgstr "(O)"
diff --git a/po/ru.po b/po/ru.po
index cef414ee7..b2c77759f 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Andrei Karas <akaras@inbox.ru>, 2011.
 # Necromonger <Necromong@inbox.ru>, 2011.
@@ -11,132 +11,134 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-11-12 00:23+0300\n"
-"PO-Revision-Date: 2011-11-11 21:42+0000\n"
+"POT-Creation-Date: 2011-11-26 02:20+0300\n"
+"PO-Revision-Date: 2011-11-20 17:44+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
-"Language-Team: Russian (http://www.transifex.net/projects/p/manaplus/team/ru/)\n"
+"Language-Team: Russian (http://www.transifex.net/projects/p/manaplus/team/"
+"ru/)\n"
+"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ru\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
 #: src/actorspritemanager.cpp:1171
 msgid "Visible on map"
 msgstr "Видимые на карте"
 
-#: src/being.cpp:551
+#: src/being.cpp:553
 msgid "dodge"
 msgstr "уворот"
 
-#: src/being.cpp:551
+#: src/being.cpp:553
 msgid "miss"
 msgstr "промах"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1530
+#: src/being.cpp:1534
 msgid "A"
 msgstr "О"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1535
+#: src/being.cpp:1539
 msgid "I"
 msgstr "Б"
 
-#: src/client.cpp:869 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:878 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Настройка"
 
-#: src/client.cpp:876 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:885 src/gui/setup_perfomance.cpp:48
 msgid "Perfomance"
 msgstr "Производительность"
 
-#: src/client.cpp:881 src/gui/setup_video.cpp:315
+#: src/client.cpp:890 src/gui/setup_video.cpp:315
 msgid "Video"
 msgstr "Видео"
 
-#: src/client.cpp:886
+#: src/client.cpp:895
 msgid "Themes"
 msgstr "Темы"
 
-#: src/client.cpp:968
+#: src/client.cpp:977
 msgid "Connecting to server"
 msgstr "Идет подключение к серверу..."
 
-#: src/client.cpp:999
+#: src/client.cpp:1008
 msgid "Logging in"
 msgstr "Авторизация"
 
-#: src/client.cpp:1032
+#: src/client.cpp:1041
 msgid "Entering game world"
 msgstr "Входим в игровой мир"
 
-#: src/client.cpp:1132
+#: src/client.cpp:1142
 msgid "Requesting characters"
 msgstr "Получение списка персонажей"
 
-#: src/client.cpp:1163
+#: src/client.cpp:1173
 msgid "Connecting to the game server"
 msgstr "Подключение к игровому серверу"
 
-#: src/client.cpp:1173
+#: src/client.cpp:1183
 msgid "Changing game servers"
 msgstr "Смена игрового сервера"
 
-#: src/client.cpp:1216 src/client.cpp:1223 src/client.cpp:1357
+#: src/client.cpp:1226 src/client.cpp:1233 src/client.cpp:1367
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
-#: src/gui/charcreatedialog.cpp:221 src/gui/charselectdialog.cpp:253
+#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:254
 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
-#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
-#: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
+#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:167
+#: src/net/ea/charserverhandler.cpp:185 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "Ошибка"
 
-#: src/client.cpp:1232
+#: src/client.cpp:1242
 msgid "Requesting registration details"
 msgstr "Запрос регистрационных данных"
 
-#: src/client.cpp:1258
+#: src/client.cpp:1268
 msgid "Password Change"
 msgstr "Изменить Пароль"
 
-#: src/client.cpp:1259
+#: src/client.cpp:1269
 msgid "Password changed successfully!"
 msgstr "Пароль изменен!"
 
-#: src/client.cpp:1278
+#: src/client.cpp:1288
 msgid "Email Change"
 msgstr "Сменить Email"
 
-#: src/client.cpp:1279
+#: src/client.cpp:1289
 msgid "Email changed successfully!"
 msgstr "Email изменен!"
 
-#: src/client.cpp:1299
+#: src/client.cpp:1309
 msgid "Unregister Successful"
 msgstr "Регистрация удалена"
 
-#: src/client.cpp:1300
+#: src/client.cpp:1310
 msgid "Farewell, come back any time..."
 msgstr "Хорошо, возвращайтесь в любое время..."
 
-#: src/client.cpp:1499 src/client.cpp:1529 src/client.cpp:1544
-#: src/client.cpp:1969 src/client.cpp:1976
+#: src/client.cpp:1509 src/client.cpp:1539 src/client.cpp:1554
+#: src/client.cpp:1979 src/client.cpp:1986
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s не существует, и не может быть создано! Выход."
 
-#: src/client.cpp:1675
+#: src/client.cpp:1685
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Некорректный сервер обновлений: %s"
 
-#: src/client.cpp:1709 src/client.cpp:1715
+#: src/client.cpp:1719 src/client.cpp:1725
 msgid "Error creating updates directory!"
 msgstr "Ошибка создания директории для обновлений!"
 
-#: src/client.cpp:1736
+#: src/client.cpp:1746
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Ошибка: %s не существует, и не может быть создан! Выход."
@@ -152,11 +154,11 @@ msgstr "Нельзя отправлять пустые сообщения!"
 #: src/commandhandler.cpp:343
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
-" you."
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
+"you."
 msgstr ""
-"Невозможно создать вкладку для личного общения с игроком \"%s\"! Или вкладка"
-" уже создана, или этот игрок Вы сами."
+"Невозможно создать вкладку для личного общения с игроком \"%s\"! Или вкладка "
+"уже создана, или этот игрок Вы сами."
 
 #: src/commandhandler.cpp:363
 #, c-format
@@ -320,10 +322,12 @@ msgstr "Изображений:"
 msgid "Resource orphaned images:"
 msgstr "Удаленных изображений:"
 
-#: src/commandhandler.h:40
+#: src/commandhandler.h:34
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr "/%s может принимать значение \"yes\", \"no\", \"true\", \"false\", \"1\" или \"0\"."
+msgstr ""
+"/%s может принимать значение \"yes\", \"no\", \"true\", \"false\", \"1\" или "
+"\"0\"."
 
 #: src/game.cpp:252 src/gui/widgets/chattab.cpp:403
 msgid "General"
@@ -349,19 +353,19 @@ msgstr "Соединение с сервером потеряно."
 msgid "Network Error"
 msgstr "Ошибка сети"
 
-#: src/game.cpp:1332
+#: src/game.cpp:1258
 msgid "Ignoring incoming trade requests"
 msgstr "Игнорировать предложения о торговле"
 
-#: src/game.cpp:1342
+#: src/game.cpp:1268
 msgid "Accepting incoming trade requests"
 msgstr "Принимать предложения о торговле"
 
-#: src/game.cpp:1750
+#: src/game.cpp:1773
 msgid "Could Not Load Map"
 msgstr "Не удалось загрузить карту"
 
-#: src/game.cpp:1751
+#: src/game.cpp:1774
 #, c-format
 msgid "Error while loading %s"
 msgstr "Ошибка во время загрузки %s"
@@ -439,7 +443,7 @@ msgstr "Количество:"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:207
 #: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:998
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:755
 msgid "+"
 msgstr "+"
 
@@ -447,7 +451,7 @@ msgstr "+"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:206
 #: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:1010
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:767
 msgid "-"
 msgstr "-"
 
@@ -460,7 +464,7 @@ msgstr "Выход"
 
 #: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
 #: src/gui/statuswindow.cpp:505 src/gui/statuswindow.cpp:555
-#: src/gui/statuswindow.cpp:997 src/gui/statuswindow.cpp:1028
+#: src/gui/statuswindow.cpp:754 src/gui/statuswindow.cpp:785
 msgid "Max"
 msgstr "Макс"
 
@@ -477,7 +481,7 @@ msgid "Sell"
 msgstr "Продать"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
-#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:96
+#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:105
 #: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
 #: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:344
 #: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:500
@@ -554,68 +558,68 @@ msgstr "Пароль должен содержать менее %d символ�
 msgid "The new password entries mismatch."
 msgstr "Новый пароль не совпадает."
 
-#: src/gui/charcreatedialog.cpp:58
+#: src/gui/charcreatedialog.cpp:59
 msgid "Create Character"
 msgstr "Создать персонажа"
 
-#: src/gui/charcreatedialog.cpp:76 src/gui/logindialog.cpp:94
+#: src/gui/charcreatedialog.cpp:85 src/gui/logindialog.cpp:94
 #: src/gui/register.cpp:75
 msgid "Name:"
 msgstr "Имя:"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:79 src/gui/charcreatedialog.cpp:84
-#: src/gui/charcreatedialog.cpp:90 src/gui/outfitwindow.cpp:85
+#: src/gui/charcreatedialog.cpp:88 src/gui/charcreatedialog.cpp:93
+#: src/gui/charcreatedialog.cpp:99 src/gui/outfitwindow.cpp:85
 msgid ">"
 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:82 src/gui/charcreatedialog.cpp:85
-#: src/gui/charcreatedialog.cpp:91 src/gui/outfitwindow.cpp:84
+#: src/gui/charcreatedialog.cpp:91 src/gui/charcreatedialog.cpp:94
+#: src/gui/charcreatedialog.cpp:100 src/gui/outfitwindow.cpp:84
 msgid "<"
 msgstr "<"
 
-#: src/gui/charcreatedialog.cpp:83
+#: src/gui/charcreatedialog.cpp:92
 msgid "Hair color:"
 msgstr "Цвет волос:"
 
-#: src/gui/charcreatedialog.cpp:86
+#: src/gui/charcreatedialog.cpp:95
 msgid "Hair style:"
 msgstr "Стрижка:"
 
-#: src/gui/charcreatedialog.cpp:92
+#: src/gui/charcreatedialog.cpp:101
 msgid "Race:"
 msgstr "Раса:"
 
-#: src/gui/charcreatedialog.cpp:95 src/gui/charselectdialog.cpp:480
+#: src/gui/charcreatedialog.cpp:104 src/gui/charselectdialog.cpp:481
 #: src/gui/socialwindow.cpp:1139
 msgid "Create"
 msgstr "Создать"
 
-#: src/gui/charcreatedialog.cpp:97 src/gui/register.cpp:98
+#: src/gui/charcreatedialog.cpp:106 src/gui/register.cpp:98
 msgid "Male"
 msgstr "Мужчина"
 
-#: src/gui/charcreatedialog.cpp:98 src/gui/register.cpp:99
+#: src/gui/charcreatedialog.cpp:107 src/gui/register.cpp:99
 msgid "Female"
 msgstr "Женщина"
 
-#: src/gui/charcreatedialog.cpp:116 src/gui/charcreatedialog.cpp:303
+#: src/gui/charcreatedialog.cpp:125 src/gui/charcreatedialog.cpp:312
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Распределите очки (%d)"
 
-#: src/gui/charcreatedialog.cpp:222
+#: src/gui/charcreatedialog.cpp:231
 msgid "Your name needs to be at least 4 characters."
 msgstr "Имя должно содержать не менее четырех символов."
 
-#: src/gui/charcreatedialog.cpp:294
+#: src/gui/charcreatedialog.cpp:303
 msgid "Character stats OK"
 msgstr "Данные персонажа в порядке"
 
-#: src/gui/charcreatedialog.cpp:308
+#: src/gui/charcreatedialog.cpp:317
 #, c-format
 msgid "Please remove %d points"
 msgstr "Снимите очки (%d)"
@@ -645,34 +649,34 @@ msgstr "Удалить регистрацию"
 msgid "Change Email"
 msgstr "Сменить адрес E-mail"
 
-#: src/gui/charselectdialog.cpp:253
+#: src/gui/charselectdialog.cpp:254
 msgid "Incorrect password"
 msgstr "Нправильный пароль"
 
-#: src/gui/charselectdialog.cpp:286
+#: src/gui/charselectdialog.cpp:287
 msgid "Enter password for deleting character"
 msgstr "Введите пароль для удаления персонажа"
 
-#: src/gui/charselectdialog.cpp:286
+#: src/gui/charselectdialog.cpp:287
 msgid "Enter password:"
 msgstr "Введите пароль:"
 
-#: src/gui/charselectdialog.cpp:410 src/gui/serverdialog.cpp:298
+#: src/gui/charselectdialog.cpp:411 src/gui/serverdialog.cpp:298
 #: src/gui/setup_relations.cpp:244 src/gui/shopwindow.cpp:122
 #: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244
 msgid "Delete"
 msgstr "Удалить"
 
-#: src/gui/charselectdialog.cpp:468
+#: src/gui/charselectdialog.cpp:469
 msgid "Choose"
 msgstr "Выбрать"
 
-#: src/gui/charselectdialog.cpp:471
+#: src/gui/charselectdialog.cpp:472
 #, c-format
 msgid "Level %d"
 msgstr "Уровень: %d"
 
-#: src/gui/charselectdialog.cpp:482 src/gui/charselectdialog.cpp:483
+#: src/gui/charselectdialog.cpp:483 src/gui/charselectdialog.cpp:484
 msgid "(empty)"
 msgstr "(пусто)"
 
@@ -937,11 +941,11 @@ msgstr "Автоматически открывать это окно"
 msgid "OK"
 msgstr "ОК"
 
-#: src/gui/equipmentwindow.cpp:61 src/gui/windowmenu.cpp:74
+#: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74
 msgid "Equipment"
 msgstr "Снаряжение"
 
-#: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160
+#: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160
 #: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554
 #: src/gui/popupmenu.cpp:1737 src/gui/popupmenu.cpp:1829
 #: src/gui/popupmenu.cpp:1874
@@ -1380,7 +1384,7 @@ msgstr "Не игнорировать"
 #: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:190
 #: src/gui/popupmenu.cpp:415 src/gui/popupmenu.cpp:435
 #: src/gui/popupmenu.cpp:672 src/gui/popupmenu.cpp:692
-#: src/playerrelations.cpp:446
+#: src/playerrelations.cpp:447
 msgid "Completely ignore"
 msgstr "@@ignore|Полностью игнорировать@@"
 
@@ -2193,8 +2197,7 @@ msgstr "Показать фон"
 
 #: src/gui/setup_perfomance.cpp:55
 msgid "Better perfomance (enable for better perfomance)"
-msgstr ""
-"Улучшение производительности (включите для большей производительности)"
+msgstr "Улучшение производительности (включите для большей производительности)"
 
 #: src/gui/setup_perfomance.cpp:58
 msgid "Auto adjust perfomance"
@@ -2579,8 +2582,8 @@ msgstr "Нет"
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
-"Не удалось переключиться в оконный режим. Восстановить старый режим также не"
-" удалось!"
+"Не удалось переключиться в оконный режим. Восстановить старый режим также не "
+"удалось!"
 
 #: src/gui/setup_video.cpp:490
 msgid ""
@@ -2898,270 +2901,6 @@ msgstr "Выберите имя будущей группы."
 msgid "Specials"
 msgstr "Особые"
 
-#: src/gui/statuspopup.cpp:204
-msgid "(D) default moves"
-msgstr "(D) движения по умолчанию"
-
-#: src/gui/statuspopup.cpp:209
-msgid "(I) invert moves"
-msgstr "(I) обратное движение"
-
-#: src/gui/statuspopup.cpp:214
-msgid "(c) moves with some crazy moves"
-msgstr "(c) обычное движение иногда с сумашедшими движениями"
-
-#: src/gui/statuspopup.cpp:219
-msgid "(C) moves with crazy moves"
-msgstr "(C) движение с сумашедшими движениями"
-
-#: src/gui/statuspopup.cpp:224
-msgid "(d) double normal + crazy"
-msgstr "(d) нормальные и сумашедшие движения"
-
-#: src/gui/statuspopup.cpp:229
-msgid "(?) move"
-msgstr "(?) неизвестное движение"
-
-#: src/gui/statuspopup.cpp:247
-msgid "(a) custom crazy move"
-msgstr "(a) пользовательские сумашедшие движения"
-
-#: src/gui/statuspopup.cpp:251
-msgid "(?) crazy move"
-msgstr "(?) неизвестные сумасшедшие движения"
-
-#: src/gui/statuspopup.cpp:261
-msgid "(0) default moves to target"
-msgstr "(0) обычное движение к цели"
-
-#: src/gui/statuspopup.cpp:266
-msgid "(1) moves to target in distance 1"
-msgstr "(1) движение к цели на расстояние 1"
-
-#: src/gui/statuspopup.cpp:271
-msgid "(2) moves to target in distance 2"
-msgstr "(2) движение к цели на расстояние 2"
-
-#: src/gui/statuspopup.cpp:276
-msgid "(3) moves to target in distance 3"
-msgstr "(3) движение к цели на расстояние 3"
-
-#: src/gui/statuspopup.cpp:281
-msgid "(5) moves to target in distance 5"
-msgstr "(5) движение к цели на расстояние 5"
-
-#: src/gui/statuspopup.cpp:286
-msgid "(7) moves to target in distance 7"
-msgstr "(7) движение к цели на расстояние 7"
-
-#: src/gui/statuspopup.cpp:291
-msgid "(A) moves to target in attack range"
-msgstr "(A) движение к цели на расстояние атаки"
-
-#: src/gui/statuspopup.cpp:296
-msgid "(a) archer attack range"
-msgstr "(a) атака лучника"
-
-#: src/gui/statuspopup.cpp:301
-msgid "(?) move to target"
-msgstr "(?) неизвестное движение к цели"
-
-#: src/gui/statuspopup.cpp:309
-msgid "(D) default follow"
-msgstr "(D) следование по умолчанию"
-
-#: src/gui/statuspopup.cpp:313
-msgid "(R) relative follow"
-msgstr "(R) относительное следование"
-
-#: src/gui/statuspopup.cpp:317
-msgid "(M) mirror follow"
-msgstr "(M) зеркальное следование"
-
-#: src/gui/statuspopup.cpp:321
-msgid "(P) pet follow"
-msgstr "(P) следование как животное"
-
-#: src/gui/statuspopup.cpp:325
-msgid "(?) unknown follow"
-msgstr "(?) неизвестное следование"
-
-#: src/gui/statuspopup.cpp:334 src/gui/statuspopup.cpp:357
-msgid "(D) default attack"
-msgstr "(D) обычная атака"
-
-#: src/gui/statuspopup.cpp:339
-msgid "(s) switch attack without shield"
-msgstr "(s) переключение атаки без щита"
-
-#: src/gui/statuspopup.cpp:344
-msgid "(S) switch attack with shield"
-msgstr "(S) переключение атаки со щитом"
-
-#: src/gui/statuspopup.cpp:348 src/gui/statuspopup.cpp:373
-msgid "(?) attack"
-msgstr "(?) неизвестная атака"
-
-#: src/gui/statuspopup.cpp:361
-msgid "(G) go and attack"
-msgstr "(G) идти и атаковать"
-
-#: src/gui/statuspopup.cpp:365
-msgid "(A) go, attack, pickup"
-msgstr "(A) идти, атаковать, собирать"
-
-#: src/gui/statuspopup.cpp:369
-msgid "(d) without auto attack"
-msgstr "(d) без автоатаки"
-
-#: src/gui/statuspopup.cpp:387
-msgid "(S) small pick up 1x1 cells"
-msgstr "(S) поднятие в области 1x1"
-
-#: src/gui/statuspopup.cpp:391
-msgid "(D) default pick up 2x1 cells"
-msgstr "(D) поднятие из области 2x1"
-
-#: src/gui/statuspopup.cpp:395
-msgid "(F) forward pick up 2x3 cells"
-msgstr "(F) поднятие из области спереди 2x3"
-
-#: src/gui/statuspopup.cpp:399
-msgid "(3) pick up 3x3 cells"
-msgstr "(3) поднятие из области 3x3"
-
-#: src/gui/statuspopup.cpp:403
-msgid "(g) go and pick up in distance 4"
-msgstr "(g) движение и поднятие на расстоянии 4"
-
-#: src/gui/statuspopup.cpp:407
-msgid "(G) go and pick up in distance 8"
-msgstr "(g) движение и поднятие на расстоянии 8"
-
-#: src/gui/statuspopup.cpp:411
-msgid "(A) go and pick up in max distance"
-msgstr "(A) движение и поднятие на максимальном расстоянии"
-
-#: src/gui/statuspopup.cpp:415
-msgid "(?) pick up"
-msgstr "(?) неизвестный режим поднятия"
-
-#: src/gui/statuspopup.cpp:424
-msgid "(N) normal map view"
-msgstr "(N) обычный режим карты"
-
-#: src/gui/statuspopup.cpp:428
-msgid "(D) debug map view"
-msgstr "(D) отладочный режим карты"
-
-#: src/gui/statuspopup.cpp:432
-msgid "(u) ultra map view"
-msgstr "(u) специальный режим карты"
-
-#: src/gui/statuspopup.cpp:436
-msgid "(U) ultra map view 2"
-msgstr "(U) специальный режим карты 2"
-
-#: src/gui/statuspopup.cpp:440
-msgid "(e) empty map view"
-msgstr "(e) режим пустой карты"
-
-#: src/gui/statuspopup.cpp:444
-msgid "(b) black & white map view"
-msgstr "(b) черно-белый режим карты"
-
-#: src/gui/statuspopup.cpp:448
-msgid "(?) map view"
-msgstr "(?) неизвестный режим карты"
-
-#: src/gui/statuspopup.cpp:456
-msgid "(f) use #flar for magic attack"
-msgstr "(f) использовать #flar для атаки"
-
-#: src/gui/statuspopup.cpp:461
-msgid "(c) use #chiza for magic attack"
-msgstr "(c) использовать #chiza для атаки"
-
-#: src/gui/statuspopup.cpp:466
-msgid "(I) use #ingrav for magic attack"
-msgstr "(I) использовать #ingrav для атаки"
-
-#: src/gui/statuspopup.cpp:471
-msgid "(F) use #frillyar for magic attack"
-msgstr "(F) использовать #frillyar для атаки"
-
-#: src/gui/statuspopup.cpp:476
-msgid "(U) use #upmarmu for magic attack"
-msgstr "(U) использовать #upmarmu для атаки"
-
-#: src/gui/statuspopup.cpp:480
-msgid "(?) magic attack"
-msgstr "(?) неизвестная магическая атака"
-
-#: src/gui/statuspopup.cpp:489
-msgid "(a) attack all players"
-msgstr "(a) атаковать всех игроков"
-
-#: src/gui/statuspopup.cpp:493
-msgid "(f) attack not friends"
-msgstr "(f) атаковать всех кроме друзей"
-
-#: src/gui/statuspopup.cpp:497
-msgid "(b) attack bad relations"
-msgstr "(b) атаковать врагов"
-
-#: src/gui/statuspopup.cpp:501
-msgid "(d) dont attack players"
-msgstr "(d) не атаковать игроков"
-
-#: src/gui/statuspopup.cpp:505
-msgid "(?) pvp attack"
-msgstr "(?) pvp атака"
-
-#: src/gui/statuspopup.cpp:514
-msgid "(D) default imitation"
-msgstr "(D) имитация по умолчанию"
-
-#: src/gui/statuspopup.cpp:518
-msgid "(O) outfits imitation"
-msgstr "(O) имитация нарядов"
-
-#: src/gui/statuspopup.cpp:522
-msgid "(?) imitation"
-msgstr "(?) неизвестная имитация"
-
-#: src/gui/statuspopup.cpp:531
-msgid "(O) on keyboard"
-msgstr "(O) возле компьютера"
-
-#: src/gui/statuspopup.cpp:534
-msgid "(A) away"
-msgstr "(A) отошел"
-
-#: src/gui/statuspopup.cpp:537 src/gui/statuspopup.cpp:557
-msgid "(?) away"
-msgstr "(?) неизвестный режим отошел"
-
-#: src/gui/statuspopup.cpp:545
-msgid "(G) game camera mode"
-msgstr "(G) игровая камера"
-
-#: src/gui/statuspopup.cpp:549
-msgid "(F) free camera mode"
-msgstr "(F) свободная камера"
-
-#: src/gui/statuspopup.cpp:553
-msgid "(D) design camera mode"
-msgstr "(D) камера в режиме разработки"
-
-#: src/gui/statuspopup.cpp:564
-msgid "Game modifiers are disabled"
-msgstr "Игровые модификаторы выключены"
-
-#: src/gui/statuspopup.cpp:569
-msgid "Game modifiers are enabled"
-msgstr "Игровые модификаторы включены"
-
 #: src/gui/statuswindow.cpp:144 src/gui/statuswindow.cpp:274
 #: src/gui/statuswindow.cpp:337
 #, c-format
@@ -3210,136 +2949,6 @@ msgstr "Уровень: %d (GM %d)"
 msgid "Correction points: %d"
 msgstr "Очков навыков: %d"
 
-#: src/gui/statuswindow.cpp:649 src/gui/statuswindow.cpp:717
-#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:753
-#: src/gui/statuswindow.cpp:818 src/gui/statuswindow.cpp:847
-#: src/gui/statuswindow.cpp:870 src/gui/statuswindow.cpp:889
-msgid "(D)"
-msgstr "(D)"
-
-#: src/gui/statuswindow.cpp:652 src/gui/statuswindow.cpp:778
-msgid "(I)"
-msgstr "(I)"
-
-#: src/gui/statuswindow.cpp:655 src/gui/statuswindow.cpp:775
-msgid "(c)"
-msgstr "(c)"
-
-#: src/gui/statuswindow.cpp:658
-msgid "(C)"
-msgstr "(C)"
-
-#: src/gui/statuswindow.cpp:661 src/gui/statuswindow.cpp:762
-#: src/gui/statuswindow.cpp:803
-msgid "(d)"
-msgstr "(d)"
-
-#: src/gui/statuswindow.cpp:664 src/gui/statuswindow.cpp:678
-#: src/gui/statuswindow.cpp:710 src/gui/statuswindow.cpp:729
-#: src/gui/statuswindow.cpp:746 src/gui/statuswindow.cpp:765
-#: src/gui/statuswindow.cpp:787 src/gui/statuswindow.cpp:806
-#: src/gui/statuswindow.cpp:836 src/gui/statuswindow.cpp:862
-#: src/gui/statuswindow.cpp:876 src/gui/statuswindow.cpp:892
-#: src/gui/statuswindow.cpp:905
-msgid "(?)"
-msgstr "(?)"
-
-#: src/gui/statuswindow.cpp:675 src/gui/statuswindow.cpp:707
-#: src/gui/statuswindow.cpp:794
-msgid "(a)"
-msgstr "(a)"
-
-#: src/gui/statuswindow.cpp:686
-msgid "(0)"
-msgstr "(0)"
-
-#: src/gui/statuswindow.cpp:689
-msgid "(1)"
-msgstr "(1)"
-
-#: src/gui/statuswindow.cpp:692
-msgid "(2)"
-msgstr "(2)"
-
-#: src/gui/statuswindow.cpp:695 src/gui/statuswindow.cpp:824
-msgid "(3)"
-msgstr "(3)"
-
-#: src/gui/statuswindow.cpp:698
-msgid "(5)"
-msgstr "(5)"
-
-#: src/gui/statuswindow.cpp:701
-msgid "(7)"
-msgstr "(7)"
-
-#: src/gui/statuswindow.cpp:704 src/gui/statuswindow.cpp:759
-#: src/gui/statuswindow.cpp:833 src/gui/statuswindow.cpp:902
-msgid "(A)"
-msgstr "(A)"
-
-#: src/gui/statuswindow.cpp:720
-msgid "(R)"
-msgstr "(R)"
-
-#: src/gui/statuswindow.cpp:723
-msgid "(M)"
-msgstr "(M)"
-
-#: src/gui/statuswindow.cpp:726
-msgid "(P)"
-msgstr "(P)"
-
-#: src/gui/statuswindow.cpp:740
-msgid "(s)"
-msgstr "(s)"
-
-#: src/gui/statuswindow.cpp:743 src/gui/statuswindow.cpp:815
-msgid "(S)"
-msgstr "(S)"
-
-#: src/gui/statuswindow.cpp:756 src/gui/statuswindow.cpp:830
-#: src/gui/statuswindow.cpp:883
-msgid "(G)"
-msgstr "(G)"
-
-#: src/gui/statuswindow.cpp:772 src/gui/statuswindow.cpp:797
-msgid "(f)"
-msgstr "(f)"
-
-#: src/gui/statuswindow.cpp:781 src/gui/statuswindow.cpp:821
-#: src/gui/statuswindow.cpp:886
-msgid "(F)"
-msgstr "(F)"
-
-#: src/gui/statuswindow.cpp:784 src/gui/statuswindow.cpp:853
-msgid "(U)"
-msgstr "(U)"
-
-#: src/gui/statuswindow.cpp:800 src/gui/statuswindow.cpp:859
-msgid "(b)"
-msgstr "(b)"
-
-#: src/gui/statuswindow.cpp:827
-msgid "(g)"
-msgstr "(g)"
-
-#: src/gui/statuswindow.cpp:844
-msgid "(N)"
-msgstr "(N)"
-
-#: src/gui/statuswindow.cpp:850
-msgid "(u)"
-msgstr "(u)"
-
-#: src/gui/statuswindow.cpp:856
-msgid "(e)"
-msgstr "(e)"
-
-#: src/gui/statuswindow.cpp:873 src/gui/statuswindow.cpp:899
-msgid "(O)"
-msgstr "(O)"
-
 #: src/gui/textcommandeditor.cpp:113
 msgid "No Target"
 msgstr "Без цели"
@@ -3466,8 +3075,7 @@ msgid "You don't have enough money."
 msgstr "У вас недостаточно денег"
 
 #: src/gui/tradewindow.cpp:454
-msgid ""
-"Failed adding item. You can not overlap one kind of item on the window."
+msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Отказано в добавлении предмета. Вы не можете добавить какой-либо вид "
 "объектов более одного раза."
@@ -3655,7 +3263,7 @@ msgstr "Бордюр домашней позиции"
 msgid "Road Point"
 msgstr "Точка дороги"
 
-#: src/gui/whoisonline.cpp:85 src/gui/whoisonline.cpp:479
+#: src/gui/whoisonline.cpp:85 src/gui/whoisonline.cpp:494
 msgid "Who Is Online - Updating"
 msgstr "Кто онлайн - обновление"
 
@@ -3663,15 +3271,15 @@ msgstr "Кто онлайн - обновление"
 msgid "Update"
 msgstr "Обновить"
 
-#: src/gui/whoisonline.cpp:302
+#: src/gui/whoisonline.cpp:307
 msgid "Who Is Online - "
 msgstr "Кто онлайн - "
 
-#: src/gui/whoisonline.cpp:493
+#: src/gui/whoisonline.cpp:508
 msgid "Who Is Online - error"
 msgstr "Кто онлайн - ошибка"
 
-#: src/gui/whoisonline.cpp:525
+#: src/gui/whoisonline.cpp:540
 msgid "Who Is Online - Update"
 msgstr "Кто онлайн - обновление"
 
@@ -3842,16 +3450,15 @@ msgstr "Команда: /ignore"
 #: src/gui/widgets/whispertab.cpp:125
 msgid "This command ignores the other player regardless of current relations."
 msgstr ""
-"Эта команда позволяет игнорировать другого игрока вне зависимости от текущих"
-" отношений с ним."
+"Эта команда позволяет игнорировать другого игрока вне зависимости от текущих "
+"отношений с ним."
 
 #: src/gui/widgets/whispertab.cpp:130
 msgid "Command: /unignore <player>"
 msgstr "Команда: /unignore <игрок>"
 
 #: src/gui/widgets/whispertab.cpp:131
-msgid ""
-"This command stops ignoring the other player if they are being ignored."
+msgid "This command stops ignoring the other player if they are being ignored."
 msgstr "Эта команда прекращает игнорирование другого игрока."
 
 #: src/gui/windowmenu.cpp:65
@@ -4381,41 +3988,41 @@ msgstr ""
 "Конфликт клавиш \"%s\" и \"%s\".Исправьте их, или игра может себя странно "
 "вести."
 
-#: src/localplayer.cpp:389
+#: src/localplayer.cpp:384
 msgid "You were killed by "
 msgstr "Вы были убиты "
 
-#: src/localplayer.cpp:1442
+#: src/localplayer.cpp:1434
 msgid "Tried to pick up nonexistent item."
 msgstr "Попытка поднять несуществующий предмет."
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1436
 msgid "Item is too heavy."
 msgstr "Предмет слишком тяжелый."
 
-#: src/localplayer.cpp:1446
+#: src/localplayer.cpp:1438
 msgid "Item is too far away."
 msgstr "Предмет слишком далеко"
 
-#: src/localplayer.cpp:1448
+#: src/localplayer.cpp:1440
 msgid "Inventory is full."
 msgstr "Инвентарь переполнен."
 
-#: src/localplayer.cpp:1450
+#: src/localplayer.cpp:1442
 msgid "Stack is too big."
 msgstr "Слишком много предметов."
 
-#: src/localplayer.cpp:1453
+#: src/localplayer.cpp:1445
 msgid "Item belongs to someone else."
 msgstr "Предмет принадлежит кому-то еще."
 
-#: src/localplayer.cpp:1456
+#: src/localplayer.cpp:1448
 msgid "Unknown problem picking up item."
 msgstr "Неизвестная проблема при поднятии предмета."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1480
+#: src/localplayer.cpp:1472
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -4423,27 +4030,292 @@ msgstr[0] "Вы подняли %d [@@%d|%s@@]."
 msgstr[1] "Вы подняли %d [@@%d|%s@@]."
 msgstr[2] "Вы подняли %d [@@%d|%s@@]."
 
-#: src/localplayer.cpp:3206
+#: src/localplayer.cpp:1887
+msgid "(D) default moves"
+msgstr "(D) движения по умолчанию"
+
+#: src/localplayer.cpp:1888
+msgid "(I) invert moves"
+msgstr "(I) обратное движение"
+
+#: src/localplayer.cpp:1889
+msgid "(c) moves with some crazy moves"
+msgstr "(c) обычное движение иногда с сумашедшими движениями"
+
+#: src/localplayer.cpp:1890
+msgid "(C) moves with crazy moves"
+msgstr "(C) движение с сумашедшими движениями"
+
+#: src/localplayer.cpp:1891
+msgid "(d) double normal + crazy"
+msgstr "(d) нормальные и сумашедшие движения"
+
+#: src/localplayer.cpp:1892
+msgid "(?) unknown move"
+msgstr "(?) неизвестное движение"
+
+#: src/localplayer.cpp:1914
+#, c-format
+msgid "(%d) crazy move number %d"
+msgstr "(%d) сумасшедшее движение %d"
+
+#: src/localplayer.cpp:1919
+msgid "(a) custom crazy move"
+msgstr "(a) пользовательские сумашедшие движения"
+
+#: src/localplayer.cpp:1923
+msgid "(?) crazy move"
+msgstr "(?) неизвестные сумасшедшие движения"
+
+#: src/localplayer.cpp:1937
+msgid "(0) default moves to target"
+msgstr "(0) обычное движение к цели"
+
+#: src/localplayer.cpp:1938
+msgid "(1) moves to target in distance 1"
+msgstr "(1) движение к цели на расстояние 1"
+
+#: src/localplayer.cpp:1939
+msgid "(2) moves to target in distance 2"
+msgstr "(2) движение к цели на расстояние 2"
+
+#: src/localplayer.cpp:1940
+msgid "(3) moves to target in distance 3"
+msgstr "(3) движение к цели на расстояние 3"
+
+#: src/localplayer.cpp:1941
+msgid "(5) moves to target in distance 5"
+msgstr "(5) движение к цели на расстояние 5"
+
+#: src/localplayer.cpp:1942
+msgid "(7) moves to target in distance 7"
+msgstr "(7) движение к цели на расстояние 7"
+
+#: src/localplayer.cpp:1943
+msgid "(A) moves to target in attack range"
+msgstr "(A) движение к цели на расстояние атаки"
+
+#: src/localplayer.cpp:1944
+msgid "(a) archer attack range"
+msgstr "(a) атака лучника"
+
+#: src/localplayer.cpp:1945
+msgid "(?) move to target"
+msgstr "(?) неизвестное движение к цели"
+
+#: src/localplayer.cpp:1964
+msgid "(D) default follow"
+msgstr "(D) следование по умолчанию"
+
+#: src/localplayer.cpp:1965
+msgid "(R) relative follow"
+msgstr "(R) относительное следование"
+
+#: src/localplayer.cpp:1966
+msgid "(M) mirror follow"
+msgstr "(M) зеркальное следование"
+
+#: src/localplayer.cpp:1967
+msgid "(P) pet follow"
+msgstr "(P) следование как животное"
+
+#: src/localplayer.cpp:1968
+msgid "(?) unknown follow"
+msgstr "(?) неизвестное следование"
+
+#: src/localplayer.cpp:1987 src/localplayer.cpp:1991 src/localplayer.cpp:2014
+msgid "(?) attack"
+msgstr "(?) неизвестная атака"
+
+#: src/localplayer.cpp:1988 src/localplayer.cpp:2010
+msgid "(D) default attack"
+msgstr "(D) обычная атака"
+
+#: src/localplayer.cpp:1989
+msgid "(s) switch attack without shield"
+msgstr "(s) переключение атаки без щита"
+
+#: src/localplayer.cpp:1990
+msgid "(S) switch attack with shield"
+msgstr "(S) переключение атаки со щитом"
+
+#: src/localplayer.cpp:2011
+msgid "(G) go and attack"
+msgstr "(G) идти и атаковать"
+
+#: src/localplayer.cpp:2012
+msgid "(A) go, attack, pickup"
+msgstr "(A) идти, атаковать, собирать"
+
+#: src/localplayer.cpp:2013
+msgid "(d) without auto attack"
+msgstr "(d) без автоатаки"
+
+#: src/localplayer.cpp:2047
+msgid "(S) small pick up 1x1 cells"
+msgstr "(S) поднятие в области 1x1"
+
+#: src/localplayer.cpp:2048
+msgid "(D) default pick up 2x1 cells"
+msgstr "(D) поднятие из области 2x1"
+
+#: src/localplayer.cpp:2049
+msgid "(F) forward pick up 2x3 cells"
+msgstr "(F) поднятие из области спереди 2x3"
+
+#: src/localplayer.cpp:2050
+msgid "(3) pick up 3x3 cells"
+msgstr "(3) поднятие из области 3x3"
+
+#: src/localplayer.cpp:2051
+msgid "(g) go and pick up in distance 4"
+msgstr "(g) движение и поднятие на расстоянии 4"
+
+#: src/localplayer.cpp:2052
+msgid "(G) go and pick up in distance 8"
+msgstr "(g) движение и поднятие на расстоянии 8"
+
+#: src/localplayer.cpp:2053
+msgid "(A) go and pick up in max distance"
+msgstr "(A) движение и поднятие на максимальном расстоянии"
+
+#: src/localplayer.cpp:2054
+msgid "(?) pick up"
+msgstr "(?) неизвестный режим поднятия"
+
+#: src/localplayer.cpp:2067
+msgid "(N) normal map view"
+msgstr "(N) обычный режим карты"
+
+#: src/localplayer.cpp:2068
+msgid "(D) debug map view"
+msgstr "(D) отладочный режим карты"
+
+#: src/localplayer.cpp:2069
+msgid "(u) ultra map view"
+msgstr "(u) специальный режим карты"
+
+#: src/localplayer.cpp:2070
+msgid "(U) ultra map view 2"
+msgstr "(U) специальный режим карты 2"
+
+#: src/localplayer.cpp:2071
+msgid "(e) empty map view"
+msgstr "(e) режим пустой карты"
+
+#: src/localplayer.cpp:2072
+msgid "(b) black & white map view"
+msgstr "(b) черно-белый режим карты"
+
+#: src/localplayer.cpp:2091
+msgid "(f) use #flar for magic attack"
+msgstr "(f) использовать #flar для атаки"
+
+#: src/localplayer.cpp:2092
+msgid "(c) use #chiza for magic attack"
+msgstr "(c) использовать #chiza для атаки"
+
+#: src/localplayer.cpp:2093
+msgid "(I) use #ingrav for magic attack"
+msgstr "(I) использовать #ingrav для атаки"
+
+#: src/localplayer.cpp:2094
+msgid "(F) use #frillyar for magic attack"
+msgstr "(F) использовать #frillyar для атаки"
+
+#: src/localplayer.cpp:2095
+msgid "(U) use #upmarmu for magic attack"
+msgstr "(U) использовать #upmarmu для атаки"
+
+#: src/localplayer.cpp:2096
+msgid "(?) magic attack"
+msgstr "(?) неизвестная магическая атака"
+
+#: src/localplayer.cpp:2115
+msgid "(a) attack all players"
+msgstr "(a) атаковать всех игроков"
+
+#: src/localplayer.cpp:2116
+msgid "(f) attack not friends"
+msgstr "(f) атаковать всех кроме друзей"
+
+#: src/localplayer.cpp:2117
+msgid "(b) attack bad relations"
+msgstr "(b) атаковать врагов"
+
+#: src/localplayer.cpp:2118
+msgid "(d) dont attack players"
+msgstr "(d) не атаковать игроков"
+
+#: src/localplayer.cpp:2119
+msgid "(?) pvp attack"
+msgstr "(?) pvp атака"
+
+#: src/localplayer.cpp:2138
+msgid "(D) default imitation"
+msgstr "(D) имитация по умолчанию"
+
+#: src/localplayer.cpp:2139
+msgid "(O) outfits imitation"
+msgstr "(O) имитация нарядов"
+
+#: src/localplayer.cpp:2140
+msgid "(?) imitation"
+msgstr "(?) неизвестная имитация"
+
+#: src/localplayer.cpp:2168
 msgid "Away"
 msgstr "Отошел"
 
-#: src/localplayer.cpp:3541
+#: src/localplayer.cpp:2187
+msgid "(O) on keyboard"
+msgstr "(O) возле компьютера"
+
+#: src/localplayer.cpp:2188
+msgid "(A) away"
+msgstr "(A) отошел"
+
+#: src/localplayer.cpp:2189 src/localplayer.cpp:2204
+msgid "(?) away"
+msgstr "(?) неизвестный режим отошел"
+
+#: src/localplayer.cpp:2202
+msgid "(G) game camera mode"
+msgstr "(G) игровая камера"
+
+#: src/localplayer.cpp:2203
+msgid "(F) free camera mode"
+msgstr "(F) свободная камера"
+
+#: src/localplayer.cpp:2228
+msgid "Game modifiers are enabled"
+msgstr "Игровые модификаторы включены"
+
+#: src/localplayer.cpp:2229
+msgid "Game modifiers are disabled"
+msgstr "Игровые модификаторы выключены"
+
+#: src/localplayer.cpp:2230
+msgid "Game modifiers are unknown"
+msgstr "Игровые модификаторы в неизвестном положении"
+
+#: src/localplayer.cpp:3746
 msgid "Follow: "
 msgstr "Следование: "
 
-#: src/localplayer.cpp:3543 src/localplayer.cpp:3558
+#: src/localplayer.cpp:3748 src/localplayer.cpp:3763
 msgid "Follow canceled"
 msgstr "Следование отменено"
 
-#: src/localplayer.cpp:3550
+#: src/localplayer.cpp:3755
 msgid "Imitation: "
 msgstr "Имитация: "
 
-#: src/localplayer.cpp:3552 src/localplayer.cpp:3560
+#: src/localplayer.cpp:3757 src/localplayer.cpp:3765
 msgid "Imitation canceled"
 msgstr "Имитация отменена"
 
-#: src/localplayer.cpp:3908
+#: src/localplayer.cpp:4113
 msgid "You see "
 msgstr "Вы видите "
 
@@ -4552,73 +4424,72 @@ msgstr "Спасибо за покупку!"
 msgid "Unable to buy."
 msgstr "Низзя купить!"
 
-#: src/net/ea/charserverhandler.cpp:63
+#: src/net/ea/charserverhandler.cpp:66
 msgid "Strength:"
 msgstr "Сила (str):"
 
-#: src/net/ea/charserverhandler.cpp:64
+#: src/net/ea/charserverhandler.cpp:67
 msgid "Agility:"
 msgstr "Выносливость (agi):"
 
-#: src/net/ea/charserverhandler.cpp:65
+#: src/net/ea/charserverhandler.cpp:68
 msgid "Vitality:"
 msgstr "Живучесть (vit):"
 
-#: src/net/ea/charserverhandler.cpp:66
+#: src/net/ea/charserverhandler.cpp:69
 msgid "Intelligence:"
 msgstr "Интеллект (int):"
 
-#: src/net/ea/charserverhandler.cpp:67
+#: src/net/ea/charserverhandler.cpp:70
 msgid "Dexterity:"
 msgstr "Ловкость (dex):"
 
-#: src/net/ea/charserverhandler.cpp:68
+#: src/net/ea/charserverhandler.cpp:71
 msgid "Luck:"
 msgstr "Удача (luk):"
 
-#: src/net/ea/charserverhandler.cpp:102
+#: src/net/ea/charserverhandler.cpp:115
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 "В доступе отказано. Скорее всего, на этом сервере слишком много игроков."
 
-#: src/net/ea/charserverhandler.cpp:106
+#: src/net/ea/charserverhandler.cpp:119
 msgid "Cannot use this ID."
 msgstr "Нельзя использовать данный ID."
 
-#: src/net/ea/charserverhandler.cpp:109
+#: src/net/ea/charserverhandler.cpp:122
 msgid "Unknown char-server failure."
 msgstr "Неизвестная ошибка сервера персонажей."
 
-#: src/net/ea/charserverhandler.cpp:138
+#: src/net/ea/charserverhandler.cpp:151
 msgid "Failed to create character. Most likely the name is already taken."
-msgstr ""
-"Невозможно создать персонажа. Скорее всего, таке имя уже используется."
+msgstr "Невозможно создать персонажа. Скорее всего, таке имя уже используется."
 
-#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:235
+#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:235
 msgid "Wrong name."
 msgstr "Некорректное имя."
 
-#: src/net/ea/charserverhandler.cpp:145
+#: src/net/ea/charserverhandler.cpp:158
 msgid "Incorrect stats."
 msgstr "Некорректные статы."
 
-#: src/net/ea/charserverhandler.cpp:148
+#: src/net/ea/charserverhandler.cpp:161
 msgid "Incorrect hair."
 msgstr "Некорректный тип волос."
 
-#: src/net/ea/charserverhandler.cpp:151
+#: src/net/ea/charserverhandler.cpp:164
 msgid "Incorrect slot."
 msgstr "Некорректный слот."
 
-#: src/net/ea/charserverhandler.cpp:166 src/net/manaserv/charhandler.cpp:210
+#: src/net/ea/charserverhandler.cpp:179 src/net/manaserv/charhandler.cpp:210
 msgid "Info"
 msgstr "Сведения"
 
-#: src/net/ea/charserverhandler.cpp:166
+#: src/net/ea/charserverhandler.cpp:179
 msgid "Character deleted."
 msgstr "Персонаж удален"
 
-#: src/net/ea/charserverhandler.cpp:172
+#: src/net/ea/charserverhandler.cpp:185
 msgid "Failed to delete character."
 msgstr "Невозможно удалить персонажа."
 
@@ -4813,8 +4684,8 @@ msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
 msgstr ""
-"<политикой> может быть \"1\", \"yes\", \"true\" для включения разделения или"
-" \"0\", \"no\", \"false\" -- для выключения."
+"<политикой> может быть \"1\", \"yes\", \"true\" для включения разделения или "
+"\"0\", \"no\", \"false\" -- для выключения."
 
 #: src/net/ea/gui/partytab.cpp:101
 msgid "Command: /item"
@@ -4822,8 +4693,7 @@ msgstr "Команда: /item"
 
 #: src/net/ea/gui/partytab.cpp:102
 msgid "This command displays the party's current item sharing policy."
-msgstr ""
-"Отображает текущую политику разделения предметов между членами группы."
+msgstr "Отображает текущую политику разделения предметов между членами группы."
 
 #: src/net/ea/gui/partytab.cpp:107
 msgid "Command: /exp <policy>"
@@ -4849,15 +4719,15 @@ msgstr "Команда: /exp"
 msgid "This command displays the party's current experience sharing policy."
 msgstr "Эта команда отображает текущую политику обмена опытом."
 
-#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:284
+#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:285
 msgid "Item sharing enabled."
 msgstr "Обмен предметами включен"
 
-#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:294
+#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:295
 msgid "Item sharing disabled."
 msgstr "Обмен предметами выключен"
 
-#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:304
+#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:305
 msgid "Item sharing not possible."
 msgstr "Обмен предметами невозможен."
 
@@ -4865,15 +4735,15 @@ msgstr "Обмен предметами невозможен."
 msgid "Item sharing unknown."
 msgstr "Статус обмена предметами неизвестен."
 
-#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:246
+#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:247
 msgid "Experience sharing enabled."
 msgstr "Обмен опытом вклыючен."
 
-#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:256
+#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:257
 msgid "Experience sharing disabled."
 msgstr "Обмен опытом выкючен."
 
-#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:266
+#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:267
 msgid "Experience sharing not possible."
 msgstr "Обмен опытом невозможен."
 
@@ -4991,16 +4861,16 @@ msgstr "%s не может присоединиться к Вашей групп
 msgid "QQQ Unknown invite response for %s."
 msgstr "QQQ Неизвестный ответ на приглашение для %s"
 
-#: src/net/ea/partyhandler.cpp:357
+#: src/net/ea/partyhandler.cpp:358
 msgid "You have left the party."
 msgstr "Вы покинули группу."
 
-#: src/net/ea/partyhandler.cpp:370
+#: src/net/ea/partyhandler.cpp:371
 #, c-format
 msgid "%s has left your party."
 msgstr "%s покинул Вашу группу."
 
-#: src/net/ea/partyhandler.cpp:447
+#: src/net/ea/partyhandler.cpp:448
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr "Неизвестный участник попытался сказать: %s"
@@ -5131,8 +5001,7 @@ msgstr "Сообщение"
 
 #: src/net/ea/playerhandler.cpp:336
 msgid ""
-"You are carrying more than half your weight. You are unable to regain "
-"health."
+"You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 "Вы несете груз больший, чем половина вашей грузоподъемности. Здоровье "
 "восстанавливаться не будет."
@@ -5734,19 +5603,19 @@ msgstr "Подключение к серверу прервано."
 msgid "%s is not in your party!"
 msgstr "%s не в группе!"
 
-#: src/playerrelations.cpp:460
+#: src/playerrelations.cpp:461
 msgid "Print '...'"
 msgstr "Печатать '...'"
 
-#: src/playerrelations.cpp:480
+#: src/playerrelations.cpp:481
 msgid "Blink name"
 msgstr "Мигать именем"
 
-#: src/playerrelations.cpp:524
+#: src/playerrelations.cpp:525
 msgid "Floating '...' bubble"
 msgstr "Плавающий '...' пузырек"
 
-#: src/playerrelations.cpp:527
+#: src/playerrelations.cpp:528
 msgid "Floating bubble"
 msgstr "Плавающий пузырек"
 
@@ -5778,5 +5647,3 @@ msgstr "Мана %+d"
 #: src/resources/itemdb.cpp:169
 msgid "Unknown item"
 msgstr "Неизвестный предмет"
-
-
diff --git a/po/zh_CN.po b/po/zh_CN.po
index f80a91390..519462407 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Andrei Karas <akaras@inbox.ru>, 2011.
 #   <colorfullife81@gmail.com>, 2011.
@@ -10,132 +10,133 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-11-12 00:23+0300\n"
+"POT-Creation-Date: 2011-11-26 02:20+0300\n"
 "PO-Revision-Date: 2011-11-11 21:38+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
-"Language-Team: Chinese (China) (http://www.transifex.net/projects/p/manaplus/team/zh_CN/)\n"
+"Language-Team: Chinese (China) (http://www.transifex.net/projects/p/manaplus/"
+"team/zh_CN/)\n"
+"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
 #: src/actorspritemanager.cpp:1171
 msgid "Visible on map"
 msgstr "在地图上可见"
 
-#: src/being.cpp:551
+#: src/being.cpp:553
 msgid "dodge"
 msgstr "躲闪"
 
-#: src/being.cpp:551
+#: src/being.cpp:553
 msgid "miss"
 msgstr "无法出售无法出售的物品。"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1530
+#: src/being.cpp:1534
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1535
+#: src/being.cpp:1539
 msgid "I"
 msgstr "I"
 
-#: src/client.cpp:869 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:878 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "魔法攻击"
 
-#: src/client.cpp:876 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:885 src/gui/setup_perfomance.cpp:48
 msgid "Perfomance"
 msgstr "性能"
 
-#: src/client.cpp:881 src/gui/setup_video.cpp:315
+#: src/client.cpp:890 src/gui/setup_video.cpp:315
 msgid "Video"
 msgstr "视频"
 
-#: src/client.cpp:886
+#: src/client.cpp:895
 msgid "Themes"
 msgstr "主题"
 
-#: src/client.cpp:968
+#: src/client.cpp:977
 msgid "Connecting to server"
 msgstr "魔法防御"
 
-#: src/client.cpp:999
+#: src/client.cpp:1008
 msgid "Logging in"
 msgstr "尝试捡起不存在的物品。"
 
-#: src/client.cpp:1032
+#: src/client.cpp:1041
 msgid "Entering game world"
 msgstr "捡起物品发生不存在的物品。"
 
-#: src/client.cpp:1132
+#: src/client.cpp:1142
 msgid "Requesting characters"
 msgstr "请求角色"
 
-#: src/client.cpp:1163
+#: src/client.cpp:1173
 msgid "Connecting to the game server"
 msgstr "连接到游戏服务器"
 
-#: src/client.cpp:1173
+#: src/client.cpp:1183
 msgid "Changing game servers"
 msgstr "更改游戏服务器"
 
-#: src/client.cpp:1216 src/client.cpp:1223 src/client.cpp:1357
+#: src/client.cpp:1226 src/client.cpp:1233 src/client.cpp:1367
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
-#: src/gui/charcreatedialog.cpp:221 src/gui/charselectdialog.cpp:253
+#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:254
 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
-#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
-#: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
+#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:167
+#: src/net/ea/charserverhandler.cpp:185 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "错误"
 
-#: src/client.cpp:1232
+#: src/client.cpp:1242
 msgid "Requesting registration details"
 msgstr "请求注册的详细信息"
 
-#: src/client.cpp:1258
+#: src/client.cpp:1268
 msgid "Password Change"
 msgstr "密码更改"
 
-#: src/client.cpp:1259
+#: src/client.cpp:1269
 msgid "Password changed successfully!"
 msgstr "更改密码成功！"
 
-#: src/client.cpp:1278
+#: src/client.cpp:1288
 msgid "Email Change"
 msgstr "更改电子邮件"
 
-#: src/client.cpp:1279
+#: src/client.cpp:1289
 msgid "Email changed successfully!"
 msgstr "更改电子邮件成功！"
 
-#: src/client.cpp:1299
+#: src/client.cpp:1309
 msgid "Unregister Successful"
 msgstr "注销成功"
 
-#: src/client.cpp:1300
+#: src/client.cpp:1310
 msgid "Farewell, come back any time..."
 msgstr "再见，随时欢迎回来... ..."
 
-#: src/client.cpp:1499 src/client.cpp:1529 src/client.cpp:1544
-#: src/client.cpp:1969 src/client.cpp:1976
+#: src/client.cpp:1509 src/client.cpp:1539 src/client.cpp:1554
+#: src/client.cpp:1979 src/client.cpp:1986
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s 不存在，并且无法创建！退出。"
 
-#: src/client.cpp:1675
+#: src/client.cpp:1685
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "无效的更新主机: %s"
 
-#: src/client.cpp:1709 src/client.cpp:1715
+#: src/client.cpp:1719 src/client.cpp:1725
 msgid "Error creating updates directory!"
 msgstr "创建更新目录错误！"
 
-#: src/client.cpp:1736
+#: src/client.cpp:1746
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "错误：%s 不存在并且无法创建！退出。"
@@ -151,8 +152,8 @@ msgstr "无法发送空白密语！"
 #: src/commandhandler.cpp:343
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
-" you."
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
+"you."
 msgstr "无法同 \"%s\" 建立一个私人谈话标签页！或者已经存在，或者那就是自己。"
 
 #: src/commandhandler.cpp:363
@@ -307,7 +308,7 @@ msgstr ""
 msgid "Resource orphaned images:"
 msgstr ""
 
-#: src/commandhandler.h:40
+#: src/commandhandler.h:34
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr "/%s的选项是\"yes\"，\"no\"，\"true\"，\"false\"，\"1\"，\"0\"。"
@@ -336,19 +337,19 @@ msgstr "服务器的连接丢失。"
 msgid "Network Error"
 msgstr "网络错误"
 
-#: src/game.cpp:1332
+#: src/game.cpp:1258
 msgid "Ignoring incoming trade requests"
 msgstr "忽略新进的交易请求"
 
-#: src/game.cpp:1342
+#: src/game.cpp:1268
 msgid "Accepting incoming trade requests"
 msgstr "接受传入的交易请求"
 
-#: src/game.cpp:1750
+#: src/game.cpp:1773
 msgid "Could Not Load Map"
 msgstr "不能加载地图"
 
-#: src/game.cpp:1751
+#: src/game.cpp:1774
 #, c-format
 msgid "Error while loading %s"
 msgstr "加载%s时出现错误"
@@ -426,7 +427,7 @@ msgstr ""
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:207
 #: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:998
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:755
 msgid "+"
 msgstr "+"
 
@@ -434,7 +435,7 @@ msgstr "+"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:206
 #: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:1010
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:767
 msgid "-"
 msgstr "-"
 
@@ -447,7 +448,7 @@ msgstr "退出"
 
 #: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
 #: src/gui/statuswindow.cpp:505 src/gui/statuswindow.cpp:555
-#: src/gui/statuswindow.cpp:997 src/gui/statuswindow.cpp:1028
+#: src/gui/statuswindow.cpp:754 src/gui/statuswindow.cpp:785
 msgid "Max"
 msgstr "最大"
 
@@ -464,7 +465,7 @@ msgid "Sell"
 msgstr "出售"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
-#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:96
+#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:105
 #: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
 #: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:344
 #: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:500
@@ -541,68 +542,68 @@ msgstr "新密码必须小于%d个字符长。"
 msgid "The new password entries mismatch."
 msgstr "新的密码输入不匹配。"
 
-#: src/gui/charcreatedialog.cpp:58
+#: src/gui/charcreatedialog.cpp:59
 msgid "Create Character"
 msgstr "创建角色"
 
-#: src/gui/charcreatedialog.cpp:76 src/gui/logindialog.cpp:94
+#: src/gui/charcreatedialog.cpp:85 src/gui/logindialog.cpp:94
 #: src/gui/register.cpp:75
 msgid "Name:"
 msgstr "姓名"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:79 src/gui/charcreatedialog.cpp:84
-#: src/gui/charcreatedialog.cpp:90 src/gui/outfitwindow.cpp:85
+#: src/gui/charcreatedialog.cpp:88 src/gui/charcreatedialog.cpp:93
+#: src/gui/charcreatedialog.cpp:99 src/gui/outfitwindow.cpp:85
 msgid ">"
 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:82 src/gui/charcreatedialog.cpp:85
-#: src/gui/charcreatedialog.cpp:91 src/gui/outfitwindow.cpp:84
+#: src/gui/charcreatedialog.cpp:91 src/gui/charcreatedialog.cpp:94
+#: src/gui/charcreatedialog.cpp:100 src/gui/outfitwindow.cpp:84
 msgid "<"
 msgstr "<"
 
-#: src/gui/charcreatedialog.cpp:83
+#: src/gui/charcreatedialog.cpp:92
 msgid "Hair color:"
 msgstr "头发颜色："
 
-#: src/gui/charcreatedialog.cpp:86
+#: src/gui/charcreatedialog.cpp:95
 msgid "Hair style:"
 msgstr "发型："
 
-#: src/gui/charcreatedialog.cpp:92
+#: src/gui/charcreatedialog.cpp:101
 msgid "Race:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:95 src/gui/charselectdialog.cpp:480
+#: src/gui/charcreatedialog.cpp:104 src/gui/charselectdialog.cpp:481
 #: src/gui/socialwindow.cpp:1139
 msgid "Create"
 msgstr "建立"
 
-#: src/gui/charcreatedialog.cpp:97 src/gui/register.cpp:98
+#: src/gui/charcreatedialog.cpp:106 src/gui/register.cpp:98
 msgid "Male"
 msgstr "帅哥"
 
-#: src/gui/charcreatedialog.cpp:98 src/gui/register.cpp:99
+#: src/gui/charcreatedialog.cpp:107 src/gui/register.cpp:99
 msgid "Female"
 msgstr "美女"
 
-#: src/gui/charcreatedialog.cpp:116 src/gui/charcreatedialog.cpp:303
+#: src/gui/charcreatedialog.cpp:125 src/gui/charcreatedialog.cpp:312
 #, c-format
 msgid "Please distribute %d points"
 msgstr "请分发%d点数"
 
-#: src/gui/charcreatedialog.cpp:222
+#: src/gui/charcreatedialog.cpp:231
 msgid "Your name needs to be at least 4 characters."
 msgstr "你的名字需要至少4个字符"
 
-#: src/gui/charcreatedialog.cpp:294
+#: src/gui/charcreatedialog.cpp:303
 msgid "Character stats OK"
 msgstr "角色状态可以"
 
-#: src/gui/charcreatedialog.cpp:308
+#: src/gui/charcreatedialog.cpp:317
 #, c-format
 msgid "Please remove %d points"
 msgstr "请删除%d点数"
@@ -632,34 +633,34 @@ msgstr "注销"
 msgid "Change Email"
 msgstr "变更电子邮件"
 
-#: src/gui/charselectdialog.cpp:253
+#: src/gui/charselectdialog.cpp:254
 msgid "Incorrect password"
 msgstr "不正确的密码"
 
-#: src/gui/charselectdialog.cpp:286
+#: src/gui/charselectdialog.cpp:287
 msgid "Enter password for deleting character"
 msgstr "删除字符输入的密码"
 
-#: src/gui/charselectdialog.cpp:286
+#: src/gui/charselectdialog.cpp:287
 msgid "Enter password:"
 msgstr "输入密码："
 
-#: src/gui/charselectdialog.cpp:410 src/gui/serverdialog.cpp:298
+#: src/gui/charselectdialog.cpp:411 src/gui/serverdialog.cpp:298
 #: src/gui/setup_relations.cpp:244 src/gui/shopwindow.cpp:122
 #: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244
 msgid "Delete"
 msgstr "删除"
 
-#: src/gui/charselectdialog.cpp:468
+#: src/gui/charselectdialog.cpp:469
 msgid "Choose"
 msgstr "选择"
 
-#: src/gui/charselectdialog.cpp:471
+#: src/gui/charselectdialog.cpp:472
 #, c-format
 msgid "Level %d"
 msgstr "等级 %d"
 
-#: src/gui/charselectdialog.cpp:482 src/gui/charselectdialog.cpp:483
+#: src/gui/charselectdialog.cpp:483 src/gui/charselectdialog.cpp:484
 msgid "(empty)"
 msgstr "()"
 
@@ -924,11 +925,11 @@ msgstr "自动打开这个窗口"
 msgid "OK"
 msgstr "确定"
 
-#: src/gui/equipmentwindow.cpp:61 src/gui/windowmenu.cpp:74
+#: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74
 msgid "Equipment"
 msgstr "装备"
 
-#: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160
+#: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160
 #: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554
 #: src/gui/popupmenu.cpp:1737 src/gui/popupmenu.cpp:1829
 #: src/gui/popupmenu.cpp:1874
@@ -1363,7 +1364,7 @@ msgstr ""
 #: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:190
 #: src/gui/popupmenu.cpp:415 src/gui/popupmenu.cpp:435
 #: src/gui/popupmenu.cpp:672 src/gui/popupmenu.cpp:692
-#: src/playerrelations.cpp:446
+#: src/playerrelations.cpp:447
 msgid "Completely ignore"
 msgstr "完全忽略"
 
@@ -2868,270 +2869,6 @@ msgstr "选择n的名称。"
 msgid "Specials"
 msgstr "特价商品"
 
-#: src/gui/statuspopup.cpp:204
-msgid "(D) default moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:209
-msgid "(I) invert moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:214
-msgid "(c) moves with some crazy moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:219
-msgid "(C) moves with crazy moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:224
-msgid "(d) double normal + crazy"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:229
-msgid "(?) move"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:247
-msgid "(a) custom crazy move"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:251
-msgid "(?) crazy move"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:261
-msgid "(0) default moves to target"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:266
-msgid "(1) moves to target in distance 1"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:271
-msgid "(2) moves to target in distance 2"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:276
-msgid "(3) moves to target in distance 3"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:281
-msgid "(5) moves to target in distance 5"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:286
-msgid "(7) moves to target in distance 7"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:291
-msgid "(A) moves to target in attack range"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:296
-msgid "(a) archer attack range"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:301
-msgid "(?) move to target"
-msgstr "(?)移动到目标"
-
-#: src/gui/statuspopup.cpp:309
-msgid "(D) default follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:313
-msgid "(R) relative follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:317
-msgid "(M) mirror follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:321
-msgid "(P) pet follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:325
-msgid "(?) unknown follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:334 src/gui/statuspopup.cpp:357
-msgid "(D) default attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:339
-msgid "(s) switch attack without shield"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:344
-msgid "(S) switch attack with shield"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:348 src/gui/statuspopup.cpp:373
-msgid "(?) attack"
-msgstr "(?) 攻击"
-
-#: src/gui/statuspopup.cpp:361
-msgid "(G) go and attack"
-msgstr "(G) 去攻击"
-
-#: src/gui/statuspopup.cpp:365
-msgid "(A) go, attack, pickup"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:369
-msgid "(d) without auto attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:387
-msgid "(S) small pick up 1x1 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:391
-msgid "(D) default pick up 2x1 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:395
-msgid "(F) forward pick up 2x3 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:399
-msgid "(3) pick up 3x3 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:403
-msgid "(g) go and pick up in distance 4"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:407
-msgid "(G) go and pick up in distance 8"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:411
-msgid "(A) go and pick up in max distance"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:415
-msgid "(?) pick up"
-msgstr "(?)拿起"
-
-#: src/gui/statuspopup.cpp:424
-msgid "(N) normal map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:428
-msgid "(D) debug map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:432
-msgid "(u) ultra map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:436
-msgid "(U) ultra map view 2"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:440
-msgid "(e) empty map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:444
-msgid "(b) black & white map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:448
-msgid "(?) map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:456
-msgid "(f) use #flar for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:461
-msgid "(c) use #chiza for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:466
-msgid "(I) use #ingrav for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:471
-msgid "(F) use #frillyar for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:476
-msgid "(U) use #upmarmu for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:480
-msgid "(?) magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:489
-msgid "(a) attack all players"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:493
-msgid "(f) attack not friends"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:497
-msgid "(b) attack bad relations"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:501
-msgid "(d) dont attack players"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:505
-msgid "(?) pvp attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:514
-msgid "(D) default imitation"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:518
-msgid "(O) outfits imitation"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:522
-msgid "(?) imitation"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:531
-msgid "(O) on keyboard"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:534
-msgid "(A) away"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:537 src/gui/statuspopup.cpp:557
-msgid "(?) away"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:545
-msgid "(G) game camera mode"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:549
-msgid "(F) free camera mode"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:553
-msgid "(D) design camera mode"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:564
-msgid "Game modifiers are disabled"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:569
-msgid "Game modifiers are enabled"
-msgstr ""
-
 #: src/gui/statuswindow.cpp:144 src/gui/statuswindow.cpp:274
 #: src/gui/statuswindow.cpp:337
 #, c-format
@@ -3180,136 +2917,6 @@ msgstr "级别:%d (GM %d)"
 msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:649 src/gui/statuswindow.cpp:717
-#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:753
-#: src/gui/statuswindow.cpp:818 src/gui/statuswindow.cpp:847
-#: src/gui/statuswindow.cpp:870 src/gui/statuswindow.cpp:889
-msgid "(D)"
-msgstr "(D)"
-
-#: src/gui/statuswindow.cpp:652 src/gui/statuswindow.cpp:778
-msgid "(I)"
-msgstr "(I)"
-
-#: src/gui/statuswindow.cpp:655 src/gui/statuswindow.cpp:775
-msgid "(c)"
-msgstr "(c)"
-
-#: src/gui/statuswindow.cpp:658
-msgid "(C)"
-msgstr "(C)"
-
-#: src/gui/statuswindow.cpp:661 src/gui/statuswindow.cpp:762
-#: src/gui/statuswindow.cpp:803
-msgid "(d)"
-msgstr "(d)"
-
-#: src/gui/statuswindow.cpp:664 src/gui/statuswindow.cpp:678
-#: src/gui/statuswindow.cpp:710 src/gui/statuswindow.cpp:729
-#: src/gui/statuswindow.cpp:746 src/gui/statuswindow.cpp:765
-#: src/gui/statuswindow.cpp:787 src/gui/statuswindow.cpp:806
-#: src/gui/statuswindow.cpp:836 src/gui/statuswindow.cpp:862
-#: src/gui/statuswindow.cpp:876 src/gui/statuswindow.cpp:892
-#: src/gui/statuswindow.cpp:905
-msgid "(?)"
-msgstr "(?)"
-
-#: src/gui/statuswindow.cpp:675 src/gui/statuswindow.cpp:707
-#: src/gui/statuswindow.cpp:794
-msgid "(a)"
-msgstr "(a)"
-
-#: src/gui/statuswindow.cpp:686
-msgid "(0)"
-msgstr "(0)"
-
-#: src/gui/statuswindow.cpp:689
-msgid "(1)"
-msgstr "(1)"
-
-#: src/gui/statuswindow.cpp:692
-msgid "(2)"
-msgstr "(2)"
-
-#: src/gui/statuswindow.cpp:695 src/gui/statuswindow.cpp:824
-msgid "(3)"
-msgstr "(3)"
-
-#: src/gui/statuswindow.cpp:698
-msgid "(5)"
-msgstr "(5)"
-
-#: src/gui/statuswindow.cpp:701
-msgid "(7)"
-msgstr "(7)"
-
-#: src/gui/statuswindow.cpp:704 src/gui/statuswindow.cpp:759
-#: src/gui/statuswindow.cpp:833 src/gui/statuswindow.cpp:902
-msgid "(A)"
-msgstr "(A)"
-
-#: src/gui/statuswindow.cpp:720
-msgid "(R)"
-msgstr "(R)"
-
-#: src/gui/statuswindow.cpp:723
-msgid "(M)"
-msgstr "(M)"
-
-#: src/gui/statuswindow.cpp:726
-msgid "(P)"
-msgstr "(P)"
-
-#: src/gui/statuswindow.cpp:740
-msgid "(s)"
-msgstr "(s)"
-
-#: src/gui/statuswindow.cpp:743 src/gui/statuswindow.cpp:815
-msgid "(S)"
-msgstr "(S)"
-
-#: src/gui/statuswindow.cpp:756 src/gui/statuswindow.cpp:830
-#: src/gui/statuswindow.cpp:883
-msgid "(G)"
-msgstr "(G)"
-
-#: src/gui/statuswindow.cpp:772 src/gui/statuswindow.cpp:797
-msgid "(f)"
-msgstr "(f)"
-
-#: src/gui/statuswindow.cpp:781 src/gui/statuswindow.cpp:821
-#: src/gui/statuswindow.cpp:886
-msgid "(F)"
-msgstr "(F)"
-
-#: src/gui/statuswindow.cpp:784 src/gui/statuswindow.cpp:853
-msgid "(U)"
-msgstr "(U)"
-
-#: src/gui/statuswindow.cpp:800 src/gui/statuswindow.cpp:859
-msgid "(b)"
-msgstr "(b)"
-
-#: src/gui/statuswindow.cpp:827
-msgid "(g)"
-msgstr "(g)"
-
-#: src/gui/statuswindow.cpp:844
-msgid "(N)"
-msgstr "(N)"
-
-#: src/gui/statuswindow.cpp:850
-msgid "(u)"
-msgstr "(u)"
-
-#: src/gui/statuswindow.cpp:856
-msgid "(e)"
-msgstr "(e)"
-
-#: src/gui/statuswindow.cpp:873 src/gui/statuswindow.cpp:899
-msgid "(O)"
-msgstr "(O)"
-
 #: src/gui/textcommandeditor.cpp:113
 msgid "No Target"
 msgstr "没有目标"
@@ -3436,8 +3043,7 @@ msgid "You don't have enough money."
 msgstr "你没有足够的钱币."
 
 #: src/gui/tradewindow.cpp:454
-msgid ""
-"Failed adding item. You can not overlap one kind of item on the window."
+msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr "添加物品失败。你不能覆盖窗口中的该类物品。"
 
 #: src/gui/unregisterdialog.cpp:54
@@ -3623,7 +3229,7 @@ msgstr "家居广场边界"
 msgid "Road Point"
 msgstr "路点"
 
-#: src/gui/whoisonline.cpp:85 src/gui/whoisonline.cpp:479
+#: src/gui/whoisonline.cpp:85 src/gui/whoisonline.cpp:494
 msgid "Who Is Online - Updating"
 msgstr "谁在线 - 更新"
 
@@ -3631,15 +3237,15 @@ msgstr "谁在线 - 更新"
 msgid "Update"
 msgstr "更新"
 
-#: src/gui/whoisonline.cpp:302
+#: src/gui/whoisonline.cpp:307
 msgid "Who Is Online - "
 msgstr "谁在线 -"
 
-#: src/gui/whoisonline.cpp:493
+#: src/gui/whoisonline.cpp:508
 msgid "Who Is Online - error"
 msgstr "谁在线 - 错误"
 
-#: src/gui/whoisonline.cpp:525
+#: src/gui/whoisonline.cpp:540
 msgid "Who Is Online - Update"
 msgstr "谁在线 - 更新"
 
@@ -3815,8 +3421,7 @@ msgid "Command: /unignore <player>"
 msgstr "命令: /unignore <玩家>"
 
 #: src/gui/widgets/whispertab.cpp:131
-msgid ""
-"This command stops ignoring the other player if they are being ignored."
+msgid "This command stops ignoring the other player if they are being ignored."
 msgstr "此命令将停止忽视了其他的球员，如果他们被忽略了。"
 
 #: src/gui/windowmenu.cpp:65
@@ -4344,67 +3949,332 @@ msgid ""
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:389
+#: src/localplayer.cpp:384
 msgid "You were killed by "
 msgstr "你被打死"
 
-#: src/localplayer.cpp:1442
+#: src/localplayer.cpp:1434
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1436
 msgid "Item is too heavy."
 msgstr "项目是太重了。"
 
-#: src/localplayer.cpp:1446
+#: src/localplayer.cpp:1438
 msgid "Item is too far away."
 msgstr "物品太远了。"
 
-#: src/localplayer.cpp:1448
+#: src/localplayer.cpp:1440
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1450
+#: src/localplayer.cpp:1442
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1453
+#: src/localplayer.cpp:1445
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1456
+#: src/localplayer.cpp:1448
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1480
+#: src/localplayer.cpp:1472
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "你拾起%d[@@%d|%s @@]。"
 
-#: src/localplayer.cpp:3206
+#: src/localplayer.cpp:1887
+msgid "(D) default moves"
+msgstr ""
+
+#: src/localplayer.cpp:1888
+msgid "(I) invert moves"
+msgstr ""
+
+#: src/localplayer.cpp:1889
+msgid "(c) moves with some crazy moves"
+msgstr ""
+
+#: src/localplayer.cpp:1890
+msgid "(C) moves with crazy moves"
+msgstr ""
+
+#: src/localplayer.cpp:1891
+msgid "(d) double normal + crazy"
+msgstr ""
+
+#: src/localplayer.cpp:1892
+msgid "(?) unknown move"
+msgstr ""
+
+#: src/localplayer.cpp:1914
+#, c-format
+msgid "(%d) crazy move number %d"
+msgstr ""
+
+#: src/localplayer.cpp:1919
+msgid "(a) custom crazy move"
+msgstr ""
+
+#: src/localplayer.cpp:1923
+msgid "(?) crazy move"
+msgstr ""
+
+#: src/localplayer.cpp:1937
+msgid "(0) default moves to target"
+msgstr ""
+
+#: src/localplayer.cpp:1938
+msgid "(1) moves to target in distance 1"
+msgstr ""
+
+#: src/localplayer.cpp:1939
+msgid "(2) moves to target in distance 2"
+msgstr ""
+
+#: src/localplayer.cpp:1940
+msgid "(3) moves to target in distance 3"
+msgstr ""
+
+#: src/localplayer.cpp:1941
+msgid "(5) moves to target in distance 5"
+msgstr ""
+
+#: src/localplayer.cpp:1942
+msgid "(7) moves to target in distance 7"
+msgstr ""
+
+#: src/localplayer.cpp:1943
+msgid "(A) moves to target in attack range"
+msgstr ""
+
+#: src/localplayer.cpp:1944
+msgid "(a) archer attack range"
+msgstr ""
+
+#: src/localplayer.cpp:1945
+msgid "(?) move to target"
+msgstr "(?)移动到目标"
+
+#: src/localplayer.cpp:1964
+msgid "(D) default follow"
+msgstr ""
+
+#: src/localplayer.cpp:1965
+msgid "(R) relative follow"
+msgstr ""
+
+#: src/localplayer.cpp:1966
+msgid "(M) mirror follow"
+msgstr ""
+
+#: src/localplayer.cpp:1967
+msgid "(P) pet follow"
+msgstr ""
+
+#: src/localplayer.cpp:1968
+msgid "(?) unknown follow"
+msgstr ""
+
+#: src/localplayer.cpp:1987 src/localplayer.cpp:1991 src/localplayer.cpp:2014
+msgid "(?) attack"
+msgstr "(?) 攻击"
+
+#: src/localplayer.cpp:1988 src/localplayer.cpp:2010
+msgid "(D) default attack"
+msgstr ""
+
+#: src/localplayer.cpp:1989
+msgid "(s) switch attack without shield"
+msgstr ""
+
+#: src/localplayer.cpp:1990
+msgid "(S) switch attack with shield"
+msgstr ""
+
+#: src/localplayer.cpp:2011
+msgid "(G) go and attack"
+msgstr "(G) 去攻击"
+
+#: src/localplayer.cpp:2012
+msgid "(A) go, attack, pickup"
+msgstr ""
+
+#: src/localplayer.cpp:2013
+msgid "(d) without auto attack"
+msgstr ""
+
+#: src/localplayer.cpp:2047
+msgid "(S) small pick up 1x1 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2048
+msgid "(D) default pick up 2x1 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2049
+msgid "(F) forward pick up 2x3 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2050
+msgid "(3) pick up 3x3 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2051
+msgid "(g) go and pick up in distance 4"
+msgstr ""
+
+#: src/localplayer.cpp:2052
+msgid "(G) go and pick up in distance 8"
+msgstr ""
+
+#: src/localplayer.cpp:2053
+msgid "(A) go and pick up in max distance"
+msgstr ""
+
+#: src/localplayer.cpp:2054
+msgid "(?) pick up"
+msgstr "(?)拿起"
+
+#: src/localplayer.cpp:2067
+msgid "(N) normal map view"
+msgstr ""
+
+#: src/localplayer.cpp:2068
+msgid "(D) debug map view"
+msgstr ""
+
+#: src/localplayer.cpp:2069
+msgid "(u) ultra map view"
+msgstr ""
+
+#: src/localplayer.cpp:2070
+msgid "(U) ultra map view 2"
+msgstr ""
+
+#: src/localplayer.cpp:2071
+msgid "(e) empty map view"
+msgstr ""
+
+#: src/localplayer.cpp:2072
+msgid "(b) black & white map view"
+msgstr ""
+
+#: src/localplayer.cpp:2091
+msgid "(f) use #flar for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2092
+msgid "(c) use #chiza for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2093
+msgid "(I) use #ingrav for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2094
+msgid "(F) use #frillyar for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2095
+msgid "(U) use #upmarmu for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2096
+msgid "(?) magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2115
+msgid "(a) attack all players"
+msgstr ""
+
+#: src/localplayer.cpp:2116
+msgid "(f) attack not friends"
+msgstr ""
+
+#: src/localplayer.cpp:2117
+msgid "(b) attack bad relations"
+msgstr ""
+
+#: src/localplayer.cpp:2118
+msgid "(d) dont attack players"
+msgstr ""
+
+#: src/localplayer.cpp:2119
+msgid "(?) pvp attack"
+msgstr ""
+
+#: src/localplayer.cpp:2138
+msgid "(D) default imitation"
+msgstr ""
+
+#: src/localplayer.cpp:2139
+msgid "(O) outfits imitation"
+msgstr ""
+
+#: src/localplayer.cpp:2140
+msgid "(?) imitation"
+msgstr ""
+
+#: src/localplayer.cpp:2168
 msgid "Away"
 msgstr "距离"
 
-#: src/localplayer.cpp:3541
+#: src/localplayer.cpp:2187
+msgid "(O) on keyboard"
+msgstr ""
+
+#: src/localplayer.cpp:2188
+msgid "(A) away"
+msgstr ""
+
+#: src/localplayer.cpp:2189 src/localplayer.cpp:2204
+msgid "(?) away"
+msgstr ""
+
+#: src/localplayer.cpp:2202
+msgid "(G) game camera mode"
+msgstr ""
+
+#: src/localplayer.cpp:2203
+msgid "(F) free camera mode"
+msgstr ""
+
+#: src/localplayer.cpp:2228
+msgid "Game modifiers are enabled"
+msgstr ""
+
+#: src/localplayer.cpp:2229
+msgid "Game modifiers are disabled"
+msgstr ""
+
+#: src/localplayer.cpp:2230
+msgid "Game modifiers are unknown"
+msgstr ""
+
+#: src/localplayer.cpp:3746
 msgid "Follow: "
 msgstr "跟随:"
 
-#: src/localplayer.cpp:3543 src/localplayer.cpp:3558
+#: src/localplayer.cpp:3748 src/localplayer.cpp:3763
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3550
+#: src/localplayer.cpp:3755
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3552 src/localplayer.cpp:3560
+#: src/localplayer.cpp:3757 src/localplayer.cpp:3765
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3908
+#: src/localplayer.cpp:4113
 msgid "You see "
 msgstr "你看"
 
@@ -4512,71 +4382,71 @@ msgstr "谢谢你的购买。"
 msgid "Unable to buy."
 msgstr "无法购买。"
 
-#: src/net/ea/charserverhandler.cpp:63
+#: src/net/ea/charserverhandler.cpp:66
 msgid "Strength:"
 msgstr "力量："
 
-#: src/net/ea/charserverhandler.cpp:64
+#: src/net/ea/charserverhandler.cpp:67
 msgid "Agility:"
 msgstr "敏捷："
 
-#: src/net/ea/charserverhandler.cpp:65
+#: src/net/ea/charserverhandler.cpp:68
 msgid "Vitality:"
 msgstr "生命："
 
-#: src/net/ea/charserverhandler.cpp:66
+#: src/net/ea/charserverhandler.cpp:69
 msgid "Intelligence:"
 msgstr "智力："
 
-#: src/net/ea/charserverhandler.cpp:67
+#: src/net/ea/charserverhandler.cpp:70
 msgid "Dexterity:"
 msgstr "灵巧："
 
-#: src/net/ea/charserverhandler.cpp:68
+#: src/net/ea/charserverhandler.cpp:71
 msgid "Luck:"
 msgstr "幸运："
 
-#: src/net/ea/charserverhandler.cpp:102
+#: src/net/ea/charserverhandler.cpp:115
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr "访问被拒绝。最有可能的，也有太多的球员，在此服务器上。"
 
-#: src/net/ea/charserverhandler.cpp:106
+#: src/net/ea/charserverhandler.cpp:119
 msgid "Cannot use this ID."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:109
+#: src/net/ea/charserverhandler.cpp:122
 msgid "Unknown char-server failure."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:138
+#: src/net/ea/charserverhandler.cpp:151
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr "创建角色失败。很可能名称已被占用。"
 
-#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:235
+#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:235
 msgid "Wrong name."
 msgstr "错误的名称。"
 
-#: src/net/ea/charserverhandler.cpp:145
+#: src/net/ea/charserverhandler.cpp:158
 msgid "Incorrect stats."
 msgstr "不正确的统计。"
 
-#: src/net/ea/charserverhandler.cpp:148
+#: src/net/ea/charserverhandler.cpp:161
 msgid "Incorrect hair."
 msgstr "不正确的头发。"
 
-#: src/net/ea/charserverhandler.cpp:151
+#: src/net/ea/charserverhandler.cpp:164
 msgid "Incorrect slot."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:166 src/net/manaserv/charhandler.cpp:210
+#: src/net/ea/charserverhandler.cpp:179 src/net/manaserv/charhandler.cpp:210
 msgid "Info"
 msgstr "信息"
 
-#: src/net/ea/charserverhandler.cpp:166
+#: src/net/ea/charserverhandler.cpp:179
 msgid "Character deleted."
 msgstr "角色已删除。"
 
-#: src/net/ea/charserverhandler.cpp:172
+#: src/net/ea/charserverhandler.cpp:185
 msgid "Failed to delete character."
 msgstr "删除角色失败。"
 
@@ -4769,7 +4639,9 @@ msgstr "改命令改变帮会的物品共享策略。"
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
-msgstr "<策略>可以为“1”，“yes”，“true”其中一以开启物品共享，或者 是\"0\",\"no\",\"false\"用来禁止物品共享。"
+msgstr ""
+"<策略>可以为“1”，“yes”，“true”其中一以开启物品共享，或者 是\"0\",\"no\","
+"\"false\"用来禁止物品共享。"
 
 #: src/net/ea/gui/partytab.cpp:101
 msgid "Command: /item"
@@ -4791,7 +4663,9 @@ msgstr "该命令改变帮会的经验共享策略。"
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
-msgstr "<策略>可以为“1”，“yes”，“true”其中之一以开启经验共享，或者 是\"0\",\"no\",\"false\"用来关闭经验共享。"
+msgstr ""
+"<策略>可以为“1”，“yes”，“true”其中之一以开启经验共享，或者 是\"0\",\"no\","
+"\"false\"用来关闭经验共享。"
 
 #: src/net/ea/gui/partytab.cpp:113
 msgid "Command: /exp"
@@ -4801,15 +4675,15 @@ msgstr "命令：/exp"
 msgid "This command displays the party's current experience sharing policy."
 msgstr "该命令显示帮会现有的经验共享策略。"
 
-#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:284
+#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:285
 msgid "Item sharing enabled."
 msgstr "物品共享开启。"
 
-#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:294
+#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:295
 msgid "Item sharing disabled."
 msgstr "物品共享关闭。"
 
-#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:304
+#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:305
 msgid "Item sharing not possible."
 msgstr "物品共享不可能。"
 
@@ -4817,15 +4691,15 @@ msgstr "物品共享不可能。"
 msgid "Item sharing unknown."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:246
+#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:247
 msgid "Experience sharing enabled."
 msgstr "经验共享开启。"
 
-#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:256
+#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:257
 msgid "Experience sharing disabled."
 msgstr "经验共享关闭。"
 
-#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:266
+#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:267
 msgid "Experience sharing not possible."
 msgstr "经验共享不可能。"
 
@@ -4944,16 +4818,16 @@ msgstr "%s不能加入团队，因为团队成员已满。"
 msgid "QQQ Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:357
+#: src/net/ea/partyhandler.cpp:358
 msgid "You have left the party."
 msgstr "你以退出帮会"
 
-#: src/net/ea/partyhandler.cpp:370
+#: src/net/ea/partyhandler.cpp:371
 #, c-format
 msgid "%s has left your party."
 msgstr "%s已经离开你的帮会。"
 
-#: src/net/ea/partyhandler.cpp:447
+#: src/net/ea/partyhandler.cpp:448
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr "一未知成员尝试说：%s"
@@ -5071,7 +4945,9 @@ msgstr ""
 
 #: src/net/ea/playerhandler.cpp:133
 msgid "You're pining for the fjords."
-msgstr "<策略>可以为“1”，“yes”，“true”其中之一以开启物品共享，或者 是\"0\",\"no\",\"false\"用来禁止物品共享。"
+msgstr ""
+"<策略>可以为“1”，“yes”，“true”其中之一以开启物品共享，或者 是\"0\",\"no\","
+"\"false\"用来禁止物品共享。"
 
 #: src/net/ea/playerhandler.cpp:335 src/net/ea/playerhandler.cpp:345
 #: src/net/ea/playerhandler.cpp:427
@@ -5080,8 +4956,7 @@ msgstr "讯息"
 
 #: src/net/ea/playerhandler.cpp:336
 msgid ""
-"You are carrying more than half your weight. You are unable to regain "
-"health."
+"You are carrying more than half your weight. You are unable to regain health."
 msgstr "你已携带超过半数负重。无法回复健康（体力）"
 
 #: src/net/ea/playerhandler.cpp:346
@@ -5673,19 +5548,19 @@ msgstr "连接到服务器终止。"
 msgid "%s is not in your party!"
 msgstr "%s不在你的帮会中！"
 
-#: src/playerrelations.cpp:460
+#: src/playerrelations.cpp:461
 msgid "Print '...'"
 msgstr ""
 
-#: src/playerrelations.cpp:480
+#: src/playerrelations.cpp:481
 msgid "Blink name"
 msgstr ""
 
-#: src/playerrelations.cpp:524
+#: src/playerrelations.cpp:525
 msgid "Floating '...' bubble"
 msgstr ""
 
-#: src/playerrelations.cpp:527
+#: src/playerrelations.cpp:528
 msgid "Floating bubble"
 msgstr "流动的泡沫"
 
@@ -5718,4 +5593,89 @@ msgstr "MP %+d"
 msgid "Unknown item"
 msgstr "未知物品"
 
+#~ msgid "(D)"
+#~ msgstr "(D)"
+
+#~ msgid "(I)"
+#~ msgstr "(I)"
+
+#~ msgid "(c)"
+#~ msgstr "(c)"
+
+#~ msgid "(C)"
+#~ msgstr "(C)"
+
+#~ msgid "(d)"
+#~ msgstr "(d)"
+
+#~ msgid "(?)"
+#~ msgstr "(?)"
+
+#~ msgid "(a)"
+#~ msgstr "(a)"
+
+#~ msgid "(0)"
+#~ msgstr "(0)"
+
+#~ msgid "(1)"
+#~ msgstr "(1)"
+
+#~ msgid "(2)"
+#~ msgstr "(2)"
+
+#~ msgid "(3)"
+#~ msgstr "(3)"
+
+#~ msgid "(5)"
+#~ msgstr "(5)"
+
+#~ msgid "(7)"
+#~ msgstr "(7)"
+
+#~ msgid "(A)"
+#~ msgstr "(A)"
+
+#~ msgid "(R)"
+#~ msgstr "(R)"
+
+#~ msgid "(M)"
+#~ msgstr "(M)"
+
+#~ msgid "(P)"
+#~ msgstr "(P)"
+
+#~ msgid "(s)"
+#~ msgstr "(s)"
+
+#~ msgid "(S)"
+#~ msgstr "(S)"
+
+#~ msgid "(G)"
+#~ msgstr "(G)"
+
+#~ msgid "(f)"
+#~ msgstr "(f)"
+
+#~ msgid "(F)"
+#~ msgstr "(F)"
+
+#~ msgid "(U)"
+#~ msgstr "(U)"
+
+#~ msgid "(b)"
+#~ msgstr "(b)"
+
+#~ msgid "(g)"
+#~ msgstr "(g)"
+
+#~ msgid "(N)"
+#~ msgstr "(N)"
+
+#~ msgid "(u)"
+#~ msgstr "(u)"
+
+#~ msgid "(e)"
+#~ msgstr "(e)"
 
+#~ msgid "(O)"
+#~ msgstr "(O)"
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 66ec51a6c..d4ae8079b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -401,6 +401,8 @@ SET(SRCS
     resources/animation.h
     resources/beinginfo.cpp
     resources/beinginfo.h
+    resources/chardb.cpp
+    resources/chardb.h
     resources/colordb.cpp
     resources/colordb.h
     resources/dye.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 4b1d224bc..6ab63bc70 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -309,6 +309,8 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
 	      resources/animation.h \
 	      resources/beinginfo.cpp \
 	      resources/beinginfo.h \
+	      resources/chardb.cpp \
+	      resources/chardb.h \
 	      resources/colordb.cpp \
 	      resources/colordb.h \
 	      resources/dye.cpp \
diff --git a/src/actor.cpp b/src/actor.cpp
index 095f3d959..150f6042b 100644
--- a/src/actor.cpp
+++ b/src/actor.cpp
@@ -29,7 +29,8 @@
 #include "debug.h"
 
 Actor::Actor():
-    mMap(nullptr)
+    mMap(nullptr),
+    mYDiff(0)
 {}
 
 Actor::~Actor()
diff --git a/src/actor.h b/src/actor.h
index 654141221..9afaff93d 100644
--- a/src/actor.h
+++ b/src/actor.h
@@ -88,6 +88,12 @@ public:
     { return static_cast<int>(mPos.y); }
 
     /**
+     * Returns the pixel Y coordinate of the actor for sorting only.
+     */
+    virtual int getSortPixelY() const
+    { return static_cast<int>(mPos.y) - mYDiff; }
+
+    /**
      * Returns the x coordinate in tiles of the actor.
      */
     virtual int getTileX() const;
@@ -121,6 +127,7 @@ public:
 protected:
     Map *mMap;
     Vector mPos;                /**< Position in pixels relative to map. */
+    int mYDiff;
 
 private:
     Actors::iterator mMapActor;
diff --git a/src/actorspritemanager.h b/src/actorspritemanager.h
index d2d9af108..f1f83634d 100644
--- a/src/actorspritemanager.h
+++ b/src/actorspritemanager.h
@@ -30,12 +30,6 @@
 
 #include <vector>
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 class LocalPlayer;
 class Map;
 
diff --git a/src/animatedsprite.cpp b/src/animatedsprite.cpp
index c1f1cac85..5277ddf33 100644
--- a/src/animatedsprite.cpp
+++ b/src/animatedsprite.cpp
@@ -42,7 +42,9 @@ AnimatedSprite::AnimatedSprite(SpriteDef *sprite):
     mSprite(sprite),
     mAction(nullptr),
     mAnimation(nullptr),
-    mFrame(nullptr)
+    mFrame(nullptr),
+    mNumber(100),
+    mNumber1(100)
 {
     mAlpha = 1.0f;
 
@@ -90,7 +92,7 @@ bool AnimatedSprite::play(std::string spriteAction)
     if (!mSprite)
         return false;
 
-    Action *action = mSprite->getAction(spriteAction);
+    Action *action = mSprite->getAction(spriteAction, mNumber);
     if (!action)
         return false;
 
@@ -313,3 +315,19 @@ void *AnimatedSprite::getHash()
 //        return mAnimation;
     return this;
 }
+
+bool AnimatedSprite::updateNumber(unsigned num)
+{
+    if (mNumber1 != num)
+    {
+        mNumber1 = num;
+        mNumber = mSprite->findNumber(num);
+        if (!mNumber)
+        {
+            mNumber = 100;
+            return false;
+        }
+        return true;
+    }
+    return false;
+}
diff --git a/src/animatedsprite.h b/src/animatedsprite.h
index 2a2cfb8d8..16bcdf2da 100644
--- a/src/animatedsprite.h
+++ b/src/animatedsprite.h
@@ -84,6 +84,8 @@ class AnimatedSprite : public Sprite
 
         virtual void *getHash();
 
+        bool updateNumber(unsigned num);
+
     private:
         bool updateCurrentAnimation(unsigned int dt);
 
@@ -97,6 +99,8 @@ class AnimatedSprite : public Sprite
         Action *mAction;               /**< The currently active action. */
         Animation *mAnimation;         /**< The currently active animation. */
         Frame *mFrame;                 /**< The currently active frame. */
+        unsigned mNumber;
+        unsigned mNumber1;
 };
 
 #endif
diff --git a/src/being.cpp b/src/being.cpp
index b344e9709..736d64f1a 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -253,7 +253,8 @@ Being::Being(int id, Type type, Uint16 subtype, Map *map):
     mAdvanced(false),
     mShop(false),
     mAway(false),
-    mInactive(false)
+    mInactive(false),
+    mNumber(100)
 {
     mSpriteRemap = new int[20];
     mSpriteHide = new int[20];
@@ -287,6 +288,7 @@ Being::Being(int id, Type type, Uint16 subtype, Map *map):
 
     updateColors();
     resetCounters();
+    updatePercentHP();
 }
 
 Being::~Being()
@@ -660,7 +662,10 @@ void Being::takeDamage(Being *attacker, int amount, AttackType type)
         }
 
         if (mType == MONSTER)
+        {
+            updatePercentHP();
             updateName();
+        }
         else if (mType == PLAYER && socialWindow && getName() != "")
             socialWindow->updateAvatar(getName());
 
@@ -899,9 +904,6 @@ void Being::setGuild(Guild *guild)
     if (old)
         old->removeMember(mName);
 
-//    if (guild)
-//        guild->addMember(mId, mName);
-
     updateColors();
 
     if (this == player_node && socialWindow)
@@ -1017,6 +1019,8 @@ void Being::setAction(Action action, int attackType A_UNUSED)
             currentAction = SpriteAction::DEAD;
             if (mInfo)
                 sound.playSfx(mInfo->getSound(SOUND_EVENT_DIE), mX, mY);
+            if (mType == MONSTER)
+                mYDiff = 31;
             break;
         case STAND:
             currentAction = SpriteAction::STAND;
@@ -2100,6 +2104,8 @@ void Being::setHP(int hp)
     mHP = hp;
     if (mMaxHP < mHP)
         mMaxHP = mHP;
+    if (mType == MONSTER)
+        updatePercentHP();
 }
 
 void Being::setMaxHP(int hp)
@@ -2131,7 +2137,6 @@ void Being::recalcSpritesOrder()
     std::vector<int> slotRemap;
     std::map<int, int> itemSlotRemap;
 
-//    logger->log("preparation start");
     std::vector<int>::iterator it;
     int oldHide[20];
     int dir = mSpriteDirection;
@@ -2171,22 +2176,48 @@ void Being::recalcSpritesOrder()
                 {
                     int remSprite = itr->first;
                     const std::map<int, int> &itemReplacer = itr->second;
-                    if (itemReplacer.empty())
-                    {
-                        mSpriteHide[remSprite] = 1;
+                    if (remSprite >= 0)
+                    {   // slot known
+                        if (itemReplacer.empty())
+                        {
+                            mSpriteHide[remSprite] = 1;
+                        }
+                        else
+                        {
+                            std::map<int, int>::const_iterator repIt
+                                = itemReplacer.find(mSpriteIDs[remSprite]);
+                            if (repIt != itemReplacer.end())
+                            {
+                                mSpriteHide[remSprite] = repIt->second;
+                                if (repIt->second != 1)
+                                {
+                                    setSprite(remSprite, repIt->second,
+                                        mSpriteColors[remSprite],
+                                        1, false, true);
+                                }
+                            }
+                        }
                     }
                     else
-                    {
+                    {   // slot unknown. Search for real slot, this can be slow
                         std::map<int, int>::const_iterator repIt
-                            = itemReplacer.find(mSpriteIDs[remSprite]);
-                        if (repIt != itemReplacer.end())
+                            = itemReplacer.begin();
+                        std::map<int, int>::const_iterator repIt_end
+                            = itemReplacer.end();
+                        for (; repIt != repIt_end; ++ repIt)
                         {
-                            mSpriteHide[remSprite] = repIt->second;
-                            if (repIt->second != 1)
+                            for (unsigned slot2 = 0; slot2 < sz; slot2 ++)
                             {
-                                setSprite(remSprite, repIt->second,
-                                    mSpriteColors[remSprite],
-                                    1, false, true);
+                                if (mSpriteIDs[slot2] == repIt->first)
+                                {
+                                    mSpriteHide[slot2] = repIt->second;
+                                    if (repIt->second != 1)
+                                    {
+                                        setSprite(slot2, repIt->second,
+                                            mSpriteColors[slot2],
+                                            1, false, true);
+                                    }
+                                }
                             }
                         }
                     }
@@ -2459,7 +2490,6 @@ void Being::saveComment(const std::string &name,
             return;
     }
     dir += stringToHexPath(name);
-//    logger->log("save to: %s", dir.c_str());
     ResourceManager *resman = ResourceManager::getInstance();
     resman->saveTextFile(dir, "comment.txt", name + "\n" + comment);
 }
@@ -2484,7 +2514,6 @@ void Being::setEmote(Uint8 emotion, int emote_time)
             updateName();
             addToCache();
         }
-//        logger->log("flags: %d", emotion - FLAG_SPECIAL);
     }
     else
     {
@@ -2493,6 +2522,23 @@ void Being::setEmote(Uint8 emotion, int emote_time)
     }
 }
 
+void Being::updatePercentHP()
+{
+    if (!mMaxHP || !serverVersion)
+        return;
+    unsigned num = 0;
+    if (mHP)
+    {
+        num = mHP * 100 / mMaxHP;
+        if (num != mNumber)
+        {
+            mNumber = num;
+            if (updateNumber(mNumber))
+                setAction(mAction);
+        }
+    }
+}
+
 BeingEquipBackend::BeingEquipBackend(Being *being):
     mBeing(being)
 {
diff --git a/src/being.h b/src/being.h
index 9ee60fcdf..f1cae8df7 100644
--- a/src/being.h
+++ b/src/being.h
@@ -23,12 +23,6 @@
 #ifndef BEING_H
 #define BEING_H
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 #include "actorsprite.h"
 #include "configlistener.h"
 #include "equipment.h"
@@ -767,6 +761,8 @@ class Being : public ActorSprite, public ConfigListener
         void attack2(Being *target = nullptr, bool keep = false,
                      bool dontChangeEquipment = false);
 
+        void updatePercentHP();
+
     protected:
         /**
          * Sets the new path for this being.
@@ -909,6 +905,7 @@ class Being : public ActorSprite, public ConfigListener
         bool mShop;
         bool mAway;
         bool mInactive;
+        unsigned mNumber;
 };
 
 extern std::list<BeingCacheEntry*> beingInfoCache;
diff --git a/src/chatlogger.cpp b/src/chatlogger.cpp
index 067265138..0299a6fe3 100644
--- a/src/chatlogger.cpp
+++ b/src/chatlogger.cpp
@@ -40,11 +40,16 @@
 #include "logger.h"
 #include "configuration.h"
 
+#include "utils/mkdir.h"
 #include "utils/stringutils.h"
 
 #include "debug.h"
 
-ChatLogger::ChatLogger()
+ChatLogger::ChatLogger() :
+    mLogDir(""),
+    mBaseLogDir(""),
+    mServerName(""),
+    mLogFileName("")
 {
 }
 
@@ -60,6 +65,7 @@ void ChatLogger::setLogFile(const std::string &logFilename)
         mLogFile.close();
 
     mLogFile.open(logFilename.c_str(), std::ios_base::app);
+    mLogFileName = logFilename;
 
     if (!mLogFile.is_open())
     {
@@ -77,19 +83,19 @@ void ChatLogger::setLogDir(const std::string &logDir)
 
     DIR *dir = opendir(mLogDir.c_str());
     if (!dir)
-        makeDir(mLogDir);
+        mkdir_r(mLogDir.c_str());
     else
         closedir(dir);
 }
 
 void ChatLogger::log(std::string str)
 {
-    std::string dateStr = getDateString();
-    if (!mLogFile.is_open() || dateStr != mLogDate)
+    std::string dateStr = getDir();
+    std::string logFileName = strprintf("%s/#General.log", dateStr.c_str());
+    if (!mLogFile.is_open() || logFileName != mLogFileName)
     {
-        mLogDate = dateStr;
-        setLogFile(strprintf("%s/%s/#General_%s.log", mLogDir.c_str(),
-                             mServerName.c_str(), dateStr.c_str()));
+        setLogDir(dateStr);
+        setLogFile(logFileName);
     }
 
     str = removeColors(str);
@@ -99,21 +105,21 @@ void ChatLogger::log(std::string str)
 void ChatLogger::log(std::string name, std::string str)
 {
     std::ofstream logFile;
-    logFile.open(strprintf("%s/%s/%s_%s.log", mLogDir.c_str(),
-        mServerName.c_str(), secureName(name).c_str(),
-        getDateString().c_str()).c_str(), std::ios_base::app);
+    std::string dateStr = getDir();
+    std::string logFileName = strprintf("%s/%s.log",
+        dateStr.c_str(), secureName(name).c_str());
 
-    if (!logFile.is_open())
-        return;
+    if (!mLogFile.is_open() || logFileName != mLogFileName)
+    {
+        setLogDir(dateStr);
+        setLogFile(logFileName);
+    }
 
     str = removeColors(str);
-    writeTo(logFile, str);
-
-    if (logFile.is_open())
-        logFile.close();
+    writeTo(mLogFile, str);
 }
 
-std::string ChatLogger::getDateString() const
+std::string ChatLogger::getDir() const
 {
     std::string date;
 
@@ -124,8 +130,11 @@ std::string ChatLogger::getDateString() const
     time (&rawtime);
     timeinfo = localtime(&rawtime);
 
-    strftime(buffer, 79, "%y-%m-%d", timeinfo);
-    date = buffer;
+    strftime(buffer, 79, "%Y-%m/%d", timeinfo);
+
+    date = strprintf("%s/%s/%s", mBaseLogDir.c_str(),
+        mServerName.c_str(), buffer);
+
     return date;
 }
 
@@ -164,29 +173,20 @@ void ChatLogger::setServerName(const std::string &serverName)
     {
         DIR *dir = opendir((mLogDir + "/" + mServerName).c_str());
         if (!dir)
-            makeDir(mLogDir + "/" + mServerName);
+            mkdir_r((mLogDir + "/" + mServerName).c_str());
         else
             closedir(dir);
     }
 }
 
-void ChatLogger::makeDir(const std::string &dir)
-{
-#ifdef WIN32
-    mkdir(dir.c_str());
-#else
-    mkdir(dir.c_str(), 0750);
-#endif
-}
-
 void ChatLogger::loadLast(std::string name, std::list<std::string> &list,
                           unsigned n)
 {
     std::ifstream logFile;
+    std::string fileName = strprintf("%s/%s.log", getDir().c_str(),
+        secureName(name).c_str());
 
-    logFile.open(strprintf("%s/%s/%s_%s.log", mLogDir.c_str(),
-        mServerName.c_str(), secureName(name).c_str(),
-        getDateString().c_str()).c_str(), std::ios::in);
+    logFile.open(fileName.c_str(), std::ios::in);
 
     if (!logFile.is_open())
         return;
diff --git a/src/chatlogger.h b/src/chatlogger.h
index 6e096ac89..23d5d4a86 100644
--- a/src/chatlogger.h
+++ b/src/chatlogger.h
@@ -40,8 +40,6 @@ class ChatLogger
          */
         ~ChatLogger();
 
-        void setLogDir(const std::string &logDir);
-
         /**
          * Enters a message in the log. The message will be timestamped.
          */
@@ -52,26 +50,30 @@ class ChatLogger
         void loadLast(std::string name, std::list<std::string> &list,
                       unsigned n);
 
-        std::string getDateString() const;
+        std::string getDir() const;
 
         std::string secureName(std::string &str) const;
 
         void setServerName(const std::string &serverName);
 
+        void setBaseLogDir(const std::string &logDir)
+        { mBaseLogDir = logDir; }
+
     private:
         /**
          * Sets the file to log to and opens it
          */
         void setLogFile(const std::string &logFilename);
 
-        void writeTo(std::ofstream &file, const std::string &str) const;
+        void setLogDir(const std::string &logDir);
 
-        void makeDir(const std::string &dir);
+        void writeTo(std::ofstream &file, const std::string &str) const;
 
         std::ofstream mLogFile;
         std::string mLogDir;
+        std::string mBaseLogDir;
         std::string mServerName;
-        std::string mLogDate;
+        std::string mLogFileName;
 };
 
 extern ChatLogger *chatLogger;
diff --git a/src/client.cpp b/src/client.cpp
index 8a6ec2116..d8bb747fb 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -85,6 +85,7 @@
 #include "net/worldinfo.h"
 
 #include "resources/beinginfo.h"
+#include "resources/chardb.h"
 #include "resources/colordb.h"
 #include "resources/emotedb.h"
 #include "resources/image.h"
@@ -322,9 +323,9 @@ Client::Client(const Options &options):
 
     chatLogger = new ChatLogger;
     if (mOptions.chatLogDir == "")
-        chatLogger->setLogDir(mLocalDataDir + std::string("/logs/"));
+        chatLogger->setBaseLogDir(mLocalDataDir + std::string("/logs/"));
     else
-        chatLogger->setLogDir(mOptions.chatLogDir);
+        chatLogger->setBaseLogDir(mOptions.chatLogDir);
 
     logger->setLogToStandardOut(config.getBoolValue("logToStandardOut"));
 
@@ -368,6 +369,8 @@ Client::Client(const Options &options):
     Image::setEnableAlpha(config.getFloatValue("guialpha") != 1.0f);
 #endif
 
+    resman->addToSearchPath(PKG_DATADIR "data/perserver/default", false);
+
 #if defined __APPLE__
     CFBundleRef mainBundle = CFBundleGetMainBundle();
     CFURLRef resourcesURL = CFBundleCopyResourcesDirectoryURL(mainBundle);
@@ -649,6 +652,7 @@ Client::~Client()
     SDL_RemoveTimer(mSecondsCounterId);
 
     // Unload XML databases
+    CharDB::unload();
     ColorDB::unload();
     EmoteDB::unload();
     ItemDB::unload();
@@ -1111,6 +1115,7 @@ int Client::exec()
                     Mana::Event::trigger(CHANNEL_CLIENT, evt2);
 
                     // Load XML databases
+                    CharDB::load();
                     ColorDB::load();
                     MapDB::load();
                     ItemDB::load();
diff --git a/src/client.h b/src/client.h
index 776e9aa3d..b3fc0d676 100644
--- a/src/client.h
+++ b/src/client.h
@@ -36,12 +36,6 @@
 
 #include <sys/time.h>
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 class Button;
 class Desktop;
 class LoginData;
diff --git a/src/commandhandler.h b/src/commandhandler.h
index 809e9e517..f8b44e04f 100644
--- a/src/commandhandler.h
+++ b/src/commandhandler.h
@@ -31,12 +31,6 @@ class ChatTab;
 
 extern ChatTab *localChatTab;
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 #define BOOLEAN_OPTIONS _("Options to /%s are \"yes\", \"no\", \"true\", "\
 "\"false\", \"1\", \"0\".")
 
@@ -263,23 +257,21 @@ class CommandHandler
          */
         void handleNavigate(const std::string &args, ChatTab *tab);
 
-        void handleMail(const std::string &args, ChatTab *tab A_UNUSED);
+        void handleMail(const std::string &args, ChatTab *tab);
 
         void handleHack(const std::string &args, ChatTab *tab);
 
-        void handlePriceLoad(const std::string &args A_UNUSED,
-                             ChatTab *tab A_UNUSED);
+        void handlePriceLoad(const std::string &args, ChatTab *tab);
 
-        void handlePriceSave(const std::string &args A_UNUSED,
-                             ChatTab *tab A_UNUSED);
+        void handlePriceSave(const std::string &args, ChatTab *tab);
 
-        void handleTrade(const std::string &args, ChatTab *tab A_UNUSED);
+        void handleTrade(const std::string &args, ChatTab *tab);
 
-        void handleDisconnect(const std::string &args, ChatTab *tab A_UNUSED);
+        void handleDisconnect(const std::string &args, ChatTab *tab);
 
-        void handleUndress(const std::string &args, ChatTab *tab A_UNUSED);
+        void handleUndress(const std::string &args, ChatTab *tab);
 
-        void handleAttack(const std::string &args, ChatTab *tab A_UNUSED);
+        void handleAttack(const std::string &args, ChatTab *tab);
 
         void handleDirs(const std::string &args, ChatTab *tab);
 
@@ -289,22 +281,17 @@ class CommandHandler
 
         void handleUptime(const std::string &args, ChatTab *tab);
 
-        void handleAddAttack(const std::string &args, ChatTab *tab A_UNUSED);
+        void handleAddAttack(const std::string &args, ChatTab *tab);
 
-        void handleAddPriorityAttack(const std::string &args,
-                                     ChatTab *tab A_UNUSED);
+        void handleAddPriorityAttack(const std::string &args, ChatTab *tab);
 
-        void handleRemoveAttack(const std::string &args,
-                                ChatTab *tab A_UNUSED);
+        void handleRemoveAttack(const std::string &args, ChatTab *tab);
 
-        void handleAddIgnoreAttack(const std::string &args,
-                                   ChatTab *tab A_UNUSED);
+        void handleAddIgnoreAttack(const std::string &args, ChatTab *tab);
 
-        void handleServerIgnoreAll(const std::string &args,
-                                   ChatTab *tab A_UNUSED);
+        void handleServerIgnoreAll(const std::string &args, ChatTab *tab);
 
-        void handleServerUnIgnoreAll(const std::string &args,
-                                     ChatTab *tab A_UNUSED);
+        void handleServerUnIgnoreAll(const std::string &args, ChatTab *tab);
 
         void handleDump(const std::string &args, ChatTab *tab);
 
@@ -313,7 +300,7 @@ class CommandHandler
         void outString(ChatTab *tab, const std::string &str,
                        const std::string &def);
 
-        void handleCacheInfo(const std::string &args, ChatTab *tab A_UNUSED);
+        void handleCacheInfo(const std::string &args, ChatTab *tab);
 
         bool parse2Int(const std::string &args, int *x, int *y);
 };
diff --git a/src/compoundsprite.cpp b/src/compoundsprite.cpp
index 3ee988cec..912c51404 100644
--- a/src/compoundsprite.cpp
+++ b/src/compoundsprite.cpp
@@ -544,6 +544,21 @@ void CompoundSprite::initCurrentCacheItem() const
     }
 }
 
+bool CompoundSprite::updateNumber(unsigned num)
+{
+    SpriteConstIterator it, it_end;
+    bool res(false);
+    for (it = begin(), it_end = end(); it != it_end; ++ it)
+    {
+        if (*it)
+        {
+            if ((*it)->updateNumber(num))
+                res = true;
+        }
+    }
+    return res;
+}
+
 CompoundItem::CompoundItem() :
 //    alpha(1.0f),
     image(nullptr),
diff --git a/src/compoundsprite.h b/src/compoundsprite.h
index d1b019057..f29bece7f 100644
--- a/src/compoundsprite.h
+++ b/src/compoundsprite.h
@@ -119,6 +119,8 @@ public:
 
     virtual void setAlpha(float alpha);
 
+    bool updateNumber(unsigned num);
+
 private:
     void redraw() const;
 
diff --git a/src/flooritem.cpp b/src/flooritem.cpp
index fa6cbf618..cf1ee16dc 100644
--- a/src/flooritem.cpp
+++ b/src/flooritem.cpp
@@ -80,6 +80,7 @@ FloorItem::FloorItem(int id,
     const ItemInfo &info = ItemDB::get(itemId);
     setupSpriteDisplay(info.getDisplay(), true, 1,
         info.getDyeColorsString(mColor));
+    mYDiff = 31;
 }
 
 const ItemInfo &FloorItem::getInfo() const
diff --git a/src/game.cpp b/src/game.cpp
index 042bd2423..683ba418b 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -702,753 +702,599 @@ void Game::resetAdjustLevel()
     mAdjustLevel = 0;
 }
 
-/**
- * The huge input handling method.
- */
-void Game::handleInput()
+bool Game::handleOutfitsKeys(SDL_Event &event, bool &used)
 {
-    if (joystick)
-        joystick->update();
-
-    bool wasDown(false);
-    // Events
-    SDL_Event event;
-    while (SDL_PollEvent(&event))
+    if (keyboard.isEnabled()
+        && !chatWindow->isInputFocused()
+        && !setupWindow->isVisible()
+        && !player_node->getAway()
+        && !NpcDialog::isAnyInputFocused()
+        && !InventoryWindow::isAnyInputFocused())
     {
-        bool used = false;
+        bool wearOutfit = false;
+        bool copyOutfit = false;
+        if (keyboard.isKeyActive(keyboard.KEY_WEAR_OUTFIT))
+            wearOutfit = true;
 
-        updateHistory(event);
-        checkKeys();
+        if (keyboard.isKeyActive(keyboard.KEY_COPY_OUTFIT))
+            copyOutfit = true;
 
-        // Keyboard events (for discontinuous keys)
-        if (event.type == SDL_KEYDOWN)
+        if (wearOutfit || copyOutfit)
         {
-            wasDown = true;
-            gcn::Window *requestedWindow = nullptr;
+            int outfitNum = outfitWindow->keyToNumber(
+                event.key.keysym.sym);
+            if (outfitNum >= 0)
+            {
+                used = true;
+                if (wearOutfit)
+                    outfitWindow->wearOutfit(outfitNum);
+                else if (copyOutfit)
+                    outfitWindow->copyOutfit(outfitNum);
+            }
+            else
+            {
+                if (keyboard.isKeyActive(keyboard.KEY_MOVE_RIGHT))
+                    outfitWindow->wearNextOutfit();
+                else if (keyboard.isKeyActive(keyboard.KEY_MOVE_LEFT))
+                    outfitWindow->wearPreviousOutfit();
+            }
+            setValidSpeed();
+            return true;
+        }
+        else if (keyboard.isKeyActive(keyboard.KEY_MOVE_TO_POINT))
+        {
+            int num = outfitWindow->keyToNumber(
+                event.key.keysym.sym);
+            if (socialWindow && num >= 0)
+            {
+                socialWindow->selectPortal(num);
+                return true;
+            }
+        }
+    }
+    return false;
+}
 
-            if (setupWindow && setupWindow->isVisible() &&
-                keyboard.getNewKeyIndex() > keyboard.KEY_NO_VALUE)
+bool Game::handleSwitchKeys(SDL_Event &event, bool &used)
+{
+    if ((!chatWindow || !chatWindow->isInputFocused())
+        && !gui->getFocusHandler()->getModalFocused()
+        && !player_node->getAway())
+    {
+        NpcDialog *dialog = NpcDialog::getActive();
+        if (keyboard.isKeyActive(keyboard.KEY_OK)
+            && (!dialog || !dialog->isTextInputFocused()))
+        {
+            // Close the Browser if opened
+            if (helpWindow->isVisible())
+                helpWindow->setVisible(false);
+            // Close the config window, cancelling changes if opened
+            else if (setupWindow->isVisible())
             {
-                keyboard.setNewKey(static_cast<int>(event.key.keysym.sym));
-                keyboard.callbackNewKey();
-                keyboard.setNewKeyIndex(keyboard.KEY_NO_VALUE);
-                return;
+                setupWindow->action(gcn::ActionEvent(
+                    nullptr, "cancel"));
+            }
+            else if (dialog)
+            {
+                dialog->action(gcn::ActionEvent(nullptr, "ok"));
+            }
+        }
+        if (chatWindow && keyboard.isKeyActive(
+            keyboard.KEY_TOGGLE_CHAT))
+        {
+            if (!InventoryWindow::isAnyInputFocused())
+            {
+                if (chatWindow->requestChatFocus())
+                    used = true;
             }
+        }
+        if (dialog)
+        {
+            if (keyboard.isKeyActive(keyboard.KEY_MOVE_UP))
+                dialog->move(1);
+            else if (keyboard.isKeyActive(keyboard.KEY_MOVE_DOWN))
+                dialog->move(-1);
+        }
+    }
 
-            // send straight to gui for certain windows
-            if (quitDialog || TextDialog::isActive() ||
-                NpcPostDialog::isActive())
+    if (chatWindow && ((!chatWindow->isInputFocused() &&
+        !NpcDialog::isAnyInputFocused() &&
+        !InventoryWindow::isAnyInputFocused())
+        || (event.key.keysym.mod & KMOD_ALT)))
+    {
+        if (keyboard.isKeyActive(keyboard.KEY_PREV_CHAT_TAB))
+        {
+            chatWindow->prevTab();
+            return true;
+        }
+        else if (keyboard.isKeyActive(keyboard.KEY_NEXT_CHAT_TAB))
+        {
+            chatWindow->nextTab();
+            return true;
+        }
+        else if (keyboard.isKeyActive(keyboard.KEY_PREV_SOCIAL_TAB))
+        {
+            socialWindow->prevTab();
+            return true;
+        }
+        else if (keyboard.isKeyActive(keyboard.KEY_NEXT_SOCIAL_TAB))
+        {
+            socialWindow->nextTab();
+            return true;
+        }
+        else if (keyboard.isKeyActive(keyboard.KEY_CLOSE_CHAT_TAB))
+        {
+            chatWindow->closeTab();
+            return true;
+        }
+    }
+
+    const int tKey = keyboard.getKeyIndex(event.key.keysym.sym);
+    switch (tKey)
+    {
+        case KeyboardConfig::KEY_SCROLL_CHAT_UP:
+            if (chatWindow && chatWindow->isVisible())
             {
-                try
+                chatWindow->scroll(-DEFAULT_CHAT_WINDOW_SCROLL);
+                used = true;
+            }
+            break;
+        case KeyboardConfig::KEY_SCROLL_CHAT_DOWN:
+            if (chatWindow && chatWindow->isVisible())
+            {
+                chatWindow->scroll(DEFAULT_CHAT_WINDOW_SCROLL);
+                used = true;
+                return true;
+            }
+            break;
+        case KeyboardConfig::KEY_WINDOW_HELP:
+            // In-game Help
+            if (helpWindow)
+            {
+                if (helpWindow->isVisible())
                 {
-                    guiInput->pushInput(event);
+                    helpWindow->setVisible(false);
                 }
-                catch (const gcn::Exception &e)
+                else
                 {
-                    const char* err = e.getMessage().c_str();
-                    logger->log("Warning: guichan input exception: %s", err);
+                    helpWindow->loadHelp("index");
+                    helpWindow->requestMoveToTop();
                 }
-                return;
-            }
-
-            if (chatWindow && !chatWindow->isInputFocused()
-                && keyboard.isKeyActive(keyboard.KEY_RIGHT_CLICK))
-            {
-                int mouseX, mouseY;
-                SDL_GetMouseState(&mouseX, &mouseY);
-
-                gcn::MouseEvent event2(viewport, false, false, false, false,
-                        0, gcn::MouseEvent::RIGHT, mouseX, mouseY, 1);
-                if (viewport)
-                    viewport->mousePressed(event2);
-                continue;
             }
-
-            // Mode switch to emotes
-            if (keyboard.isKeyActive(keyboard.KEY_EMOTE))
+            used = true;
+            break;
+        // Quitting confirmation dialog
+        case KeyboardConfig::KEY_QUIT:
+            if (!chatWindow || !chatWindow->isInputFocused())
             {
-                // Emotions
-                int emotion = keyboard.getKeyEmoteOffset(event.key.keysym.sym);
-                if (emotion)
+                if (viewport && viewport->isPopupMenuVisible())
                 {
-                    if (emoteShortcut)
-                        emoteShortcut->useEmote(emotion);
-                    used = true;
-                    setValidSpeed();
-                    return;
+                    viewport->closePopupMenu();
+                }
+                else
+                {
+                    quitDialog = new QuitDialog(&quitDialog);
+                    quitDialog->requestMoveToTop();
                 }
+                return true;
             }
+            break;
+        default:
+            break;
+    }
 
-            if (keyboard.isEnabled()
-                && !chatWindow->isInputFocused()
-                && !setupWindow->isVisible()
-                && !player_node->getAway()
-                && !NpcDialog::isAnyInputFocused()
-                && !InventoryWindow::isAnyInputFocused())
+    if (keyboard.isEnabled()
+        && (!chatWindow || !chatWindow->isInputFocused())
+        && !NpcDialog::isAnyInputFocused()
+        && (!player_node || !player_node->getAway()))
+    {
+        if (!gui->getFocusHandler()->getModalFocused()
+            && mValidSpeed
+            && (!setupWindow || !setupWindow->isVisible())
+            && !InventoryWindow::isAnyInputFocused())
+        {
+            switch (tKey)
             {
-                bool wearOutfit = false;
-                bool copyOutfit = false;
-                if (keyboard.isKeyActive(keyboard.KEY_WEAR_OUTFIT))
-                    wearOutfit = true;
+                case KeyboardConfig::KEY_QUICK_DROP:
+                    if (dropShortcut)
+                        dropShortcut->dropFirst();
+                    break;
 
-                if (keyboard.isKeyActive(keyboard.KEY_COPY_OUTFIT))
-                    copyOutfit = true;
+                case KeyboardConfig::KEY_QUICK_DROPN:
+                    if (dropShortcut)
+                        dropShortcut->dropItems();
+                    break;
 
-                if (wearOutfit || copyOutfit)
-                {
-                    int outfitNum = outfitWindow->keyToNumber(
-                        event.key.keysym.sym);
-                    if (outfitNum >= 0)
+                case KeyboardConfig::KEY_SWITCH_QUICK_DROP:
+                    if (player_node)
                     {
-                        used = true;
-                        if (wearOutfit)
-                            outfitWindow->wearOutfit(outfitNum);
-                        else if (copyOutfit)
-                            outfitWindow->copyOutfit(outfitNum);
+                        if (!player_node->getDisableGameModifiers())
+                            player_node->changeQuickDropCounter();
                     }
-                    else
+                    break;
+
+                case KeyboardConfig::KEY_MAGIC_INMA1:
+                    if (actorSpriteManager)
+                        actorSpriteManager->healTarget();
+                    setValidSpeed();
+                    break;
+
+                case KeyboardConfig::KEY_MAGIC_ITENPLZ:
+                    if (Net::getPlayerHandler()->canUseMagic()
+                        && PlayerInfo::getAttribute(MP) >= 3)
                     {
-                        if (keyboard.isKeyActive(keyboard.KEY_MOVE_RIGHT))
-                            outfitWindow->wearNextOutfit();
-                        else if (keyboard.isKeyActive(keyboard.KEY_MOVE_LEFT))
-                            outfitWindow->wearPreviousOutfit();
+                        actorSpriteManager->itenplz();
                     }
                     setValidSpeed();
-                    continue;
-                }
-                else if (keyboard.isKeyActive(keyboard.KEY_MOVE_TO_POINT))
-                {
-                    int num = outfitWindow->keyToNumber(
-                        event.key.keysym.sym);
-                    if (socialWindow && num >= 0)
+                    break;
+
+                case KeyboardConfig::KEY_CRAZY_MOVES:
+                    if (player_node)
+                        player_node->crazyMove();
+                    break;
+
+                case KeyboardConfig::KEY_CHANGE_CRAZY_MOVES_TYPE:
+                    if (player_node)
                     {
-                        socialWindow->selectPortal(num);
-                        continue;
+                        if (!player_node->getDisableGameModifiers())
+                            player_node->changeCrazyMoveType();
                     }
-                }
-            }
+                    break;
 
-            if ((!chatWindow || !chatWindow->isInputFocused())
-                && !gui->getFocusHandler()->getModalFocused()
-                && !player_node->getAway())
-            {
-                NpcDialog *dialog = NpcDialog::getActive();
-                if (keyboard.isKeyActive(keyboard.KEY_OK)
-                    && (!dialog || !dialog->isTextInputFocused()))
-                {
-                    // Close the Browser if opened
-                    if (helpWindow->isVisible())
-                        helpWindow->setVisible(false);
-                    // Close the config window, cancelling changes if opened
-                    else if (setupWindow->isVisible())
+                case KeyboardConfig::KEY_CHANGE_PICKUP_TYPE:
+                    if (player_node)
                     {
-                        setupWindow->action(gcn::ActionEvent(
-                            nullptr, "cancel"));
+                        if (!player_node->getDisableGameModifiers())
+                            player_node->changePickUpType();
                     }
-                    else if (dialog)
+                    break;
+
+                case KeyboardConfig::KEY_MOVE_TO_TARGET:
+                    if (player_node)
                     {
-                        dialog->action(gcn::ActionEvent(nullptr, "ok"));
+                        if (!keyboard.isKeyActive(
+                            keyboard.KEY_TARGET_ATTACK)
+                            && !keyboard.isKeyActive(keyboard.KEY_ATTACK))
+                        {
+                            player_node->moveToTarget();
+                        }
                     }
-                }
-                if (chatWindow && keyboard.isKeyActive(
-                    keyboard.KEY_TOGGLE_CHAT))
-                {
-                    if (!InventoryWindow::isAnyInputFocused())
+                    break;
+
+                case KeyboardConfig::KEY_MOVE_TO_HOME:
+                    if (player_node)
                     {
-                        if (chatWindow->requestChatFocus())
-                            used = true;
+                        if (!keyboard.isKeyActive(
+                            keyboard.KEY_TARGET_ATTACK)
+                            && !keyboard.isKeyActive(keyboard.KEY_ATTACK))
+                        {
+                            player_node->moveToHome();
+                        }
+                        setValidSpeed();
                     }
-                }
-                if (dialog)
-                {
-                    if (keyboard.isKeyActive(keyboard.KEY_MOVE_UP))
-                        dialog->move(1);
-                    else if (keyboard.isKeyActive(keyboard.KEY_MOVE_DOWN))
-                        dialog->move(-1);
-                }
-            }
+                    break;
 
-            if (chatWindow && ((!chatWindow->isInputFocused() &&
-                !NpcDialog::isAnyInputFocused() &&
-                !InventoryWindow::isAnyInputFocused())
-                || (event.key.keysym.mod & KMOD_ALT)))
-            {
-                if (keyboard.isKeyActive(keyboard.KEY_PREV_CHAT_TAB))
-                {
-                    chatWindow->prevTab();
-                    return;
-                }
-                else if (keyboard.isKeyActive(keyboard.KEY_NEXT_CHAT_TAB))
-                {
-                    chatWindow->nextTab();
-                    return;
-                }
-                else if (keyboard.isKeyActive(keyboard.KEY_PREV_SOCIAL_TAB))
-                {
-                    socialWindow->prevTab();
-                    return;
-                }
-                else if (keyboard.isKeyActive(keyboard.KEY_NEXT_SOCIAL_TAB))
-                {
-                    socialWindow->nextTab();
-                    return;
-                }
-                else if (keyboard.isKeyActive(keyboard.KEY_CLOSE_CHAT_TAB))
-                {
-                    chatWindow->closeTab();
-                    return;
-                }
-            }
+                case KeyboardConfig::KEY_SET_HOME:
+                    if (player_node)
+                        player_node->setHome();
+                    break;
 
-            const int tKey = keyboard.getKeyIndex(event.key.keysym.sym);
-            switch (tKey)
-            {
-                case KeyboardConfig::KEY_SCROLL_CHAT_UP:
-                    if (chatWindow && chatWindow->isVisible())
+                case KeyboardConfig::KEY_INVERT_DIRECTION:
+                    if (player_node)
                     {
-                        chatWindow->scroll(-DEFAULT_CHAT_WINDOW_SCROLL);
-                        used = true;
+                        if (!player_node->getDisableGameModifiers())
+                            player_node->invertDirection();
                     }
                     break;
-                case KeyboardConfig::KEY_SCROLL_CHAT_DOWN:
-                    if (chatWindow && chatWindow->isVisible())
+
+                case KeyboardConfig::KEY_CHANGE_ATTACK_WEAPON_TYPE:
+                    if (player_node)
                     {
-                        chatWindow->scroll(DEFAULT_CHAT_WINDOW_SCROLL);
-                        used = true;
-                        return;
+                        if (!player_node->getDisableGameModifiers())
+                            player_node->changeAttackWeaponType();
                     }
                     break;
-                case KeyboardConfig::KEY_WINDOW_HELP:
-                    // In-game Help
-                    if (helpWindow)
+
+                case KeyboardConfig::KEY_CHANGE_ATTACK_TYPE:
+                    if (player_node)
                     {
-                        if (helpWindow->isVisible())
-                        {
-                            helpWindow->setVisible(false);
-                        }
-                        else
-                        {
-                            helpWindow->loadHelp("index");
-                            helpWindow->requestMoveToTop();
-                        }
+                        if (!player_node->getDisableGameModifiers())
+                            player_node->changeAttackType();
                     }
-                    used = true;
                     break;
-               // Quitting confirmation dialog
-               case KeyboardConfig::KEY_QUIT:
-                    if (!chatWindow || !chatWindow->isInputFocused())
+
+                case KeyboardConfig::KEY_CHANGE_FOLLOW_MODE:
+                    if (player_node)
                     {
-                        if (viewport && viewport->isPopupMenuVisible())
-                        {
-                            viewport->closePopupMenu();
-                        }
-                        else
-                        {
-                            quitDialog = new QuitDialog(&quitDialog);
-                            quitDialog->requestMoveToTop();
-                        }
-                        return;
+                        if (!player_node->getDisableGameModifiers())
+                            player_node->changeFollowMode();
                     }
                     break;
-                default:
+
+                case KeyboardConfig::KEY_CHANGE_IMITATION_MODE:
+                    if (player_node)
+                    {
+                        if (!player_node->getDisableGameModifiers())
+                            player_node->changeImitationMode();
+                    }
                     break;
-            }
 
-            if (keyboard.isEnabled() && (!chatWindow
-                || !chatWindow->isInputFocused())
-                && !gui->getFocusHandler()->getModalFocused()
-                && mValidSpeed
-                && (!setupWindow || !setupWindow->isVisible())
-                && (!player_node || !player_node->getAway())
-                && !NpcDialog::isAnyInputFocused()
-                && !InventoryWindow::isAnyInputFocused())
-            {
-                switch (tKey)
-                {
-                    case KeyboardConfig::KEY_QUICK_DROP:
-                        if (dropShortcut)
-                            dropShortcut->dropFirst();
-                        break;
+                case KeyboardConfig::KEY_MAGIC_ATTACK:
+                    if (player_node)
+                        player_node->magicAttack();
+                    break;
 
-                    case KeyboardConfig::KEY_QUICK_DROPN:
-                        if (dropShortcut)
-                            dropShortcut->dropItems();
-                        break;
+                case KeyboardConfig::KEY_SWITCH_MAGIC_ATTACK:
+                    if (player_node)
+                    {
+                        if (!player_node->getDisableGameModifiers())
+                            player_node->switchMagicAttack();
+                    }
+                    break;
 
-                    case KeyboardConfig::KEY_SWITCH_QUICK_DROP:
-                        if (player_node)
-                        {
-                            if (!player_node->getDisableGameModifiers())
-                                player_node->changeQuickDropCounter();
-                        }
-                        break;
+                case KeyboardConfig::KEY_SWITCH_PVP_ATTACK:
+                    if (player_node)
+                    {
+                        if (!player_node->getDisableGameModifiers())
+                            player_node->switchPvpAttack();
+                    }
+                    break;
 
-                    case KeyboardConfig::KEY_MAGIC_INMA1:
-                        if (actorSpriteManager)
-                            actorSpriteManager->healTarget();
-                        setValidSpeed();
-                        break;
+                case KeyboardConfig::KEY_CHANGE_MOVE_TO_TARGET:
+                    if (player_node)
+                    {
+                        if (!player_node->getDisableGameModifiers())
+                            player_node->changeMoveToTargetType();
+                    }
+                    break;
 
-                    case KeyboardConfig::KEY_MAGIC_ITENPLZ:
-                        if (Net::getPlayerHandler()->canUseMagic()
-                            && PlayerInfo::getAttribute(MP) >= 3)
-                        {
-                            actorSpriteManager->itenplz();
-                        }
-                        setValidSpeed();
-                        break;
+                case KeyboardConfig::KEY_COPY_EQUIPED_OUTFIT:
+                    if (outfitWindow)
+                        outfitWindow->copyFromEquiped();
+                    break;
 
-                    case KeyboardConfig::KEY_CRAZY_MOVES:
-                        if (player_node)
-                            player_node->crazyMove();
-                        break;
+                case KeyboardConfig::KEY_DISABLE_GAME_MODIFIERS:
+                    if (player_node)
+                        player_node->switchGameModifiers();
+                    break;
 
-                    case KeyboardConfig::KEY_CHANGE_CRAZY_MOVES_TYPE:
-                        if (player_node)
-                        {
-                            if (!player_node->getDisableGameModifiers())
-                                player_node->changeCrazyMoveType();
-                        }
-                        break;
+                case KeyboardConfig::KEY_CHANGE_AUDIO:
+                    sound.changeAudio();
+                    break;
 
-                    case KeyboardConfig::KEY_CHANGE_PICKUP_TYPE:
-                        if (player_node)
-                        {
-                            if (!player_node->getDisableGameModifiers())
-                                player_node->changePickUpType();
-                        }
-                        break;
+                case KeyboardConfig::KEY_AWAY:
+                    if (player_node)
+                    {
+                        player_node->changeAwayMode();
+                        setValidSpeed();
+                    }
+                    break;
 
-                    case KeyboardConfig::KEY_MOVE_TO_TARGET:
-                        if (player_node)
-                        {
-                            if (!keyboard.isKeyActive(
-                                keyboard.KEY_TARGET_ATTACK)
-                                && !keyboard.isKeyActive(keyboard.KEY_ATTACK))
-                            {
-                                player_node->moveToTarget();
-                            }
-                        }
-                        break;
+                case KeyboardConfig::KEY_CAMERA:
+                    if (player_node && viewport)
+                    {
+                        if (!player_node->getDisableGameModifiers())
+                            viewport->toggleCameraMode();
+                        setValidSpeed();
+                    }
+                    break;
 
-                    case KeyboardConfig::KEY_MOVE_TO_HOME:
-                        if (player_node)
+                default:
+                    break;
+            }
+        }
+
+        gcn::Window *requestedWindow = nullptr;
+
+        if (!NpcDialog::isAnyInputFocused()
+            && !keyboard.isKeyActive(keyboard.KEY_TARGET)
+            && !keyboard.isKeyActive(keyboard.KEY_UNTARGET))
+        {
+            if (setupWindow && setupWindow->isVisible())
+            {
+                if (tKey == KeyboardConfig::KEY_WINDOW_SETUP)
+                {
+                    setupWindow->doCancel();
+                    used = true;
+                }
+            }
+            else
+            {
+                // Do not activate shortcuts if tradewindow is visible
+                if (itemShortcutWindow && tradeWindow
+                    && !tradeWindow->isVisible()
+                    && !setupWindow->isVisible())
+                {
+                    int num = itemShortcutWindow->getTabIndex();
+                    if (num >= 0 && num < SHORTCUT_TABS)
+                    {
+                        // Checks if any item shortcut is pressed.
+                        for (int i = KeyboardConfig::KEY_SHORTCUT_1;
+                              i <= KeyboardConfig::KEY_SHORTCUT_20;
+                              i ++)
                         {
-                            if (!keyboard.isKeyActive(
-                                keyboard.KEY_TARGET_ATTACK)
-                                && !keyboard.isKeyActive(keyboard.KEY_ATTACK))
+                            if (tKey == i && !used)
                             {
-                                player_node->moveToHome();
+                                itemShortcut[num]->useItem(
+                                    i - KeyboardConfig::KEY_SHORTCUT_1);
+                                break;
                             }
-                            setValidSpeed();
                         }
-                        break;
+                    }
+                }
 
-                    case KeyboardConfig::KEY_SET_HOME:
+                switch (tKey)
+                {
+                    case KeyboardConfig::KEY_PICKUP:
                         if (player_node)
-                            player_node->setHome();
+                            player_node->pickUpItems();
+                        used = true;
                         break;
-
-                    case KeyboardConfig::KEY_INVERT_DIRECTION:
+                    case KeyboardConfig::KEY_SIT:
+                        // Player sit action
                         if (player_node)
                         {
-                            if (!player_node->getDisableGameModifiers())
-                                player_node->invertDirection();
+                            if (keyboard.isKeyActive(keyboard.KEY_EMOTE))
+                                player_node->updateSit();
+                            else
+                                player_node->toggleSit();
                         }
+                        used = true;
                         break;
-
-                    case KeyboardConfig::KEY_CHANGE_ATTACK_WEAPON_TYPE:
-                        if (player_node)
+                    case KeyboardConfig::KEY_HIDE_WINDOWS:
+                        // Hide certain windows
+                        if (!chatWindow || !chatWindow->isInputFocused())
                         {
-                            if (!player_node->getDisableGameModifiers())
-                                player_node->changeAttackWeaponType();
+                            if (statusWindow)
+                                statusWindow->setVisible(false);
+                            if (inventoryWindow)
+                                inventoryWindow->setVisible(false);
+                            if (shopWindow)
+                                shopWindow->setVisible(false);
+                            if (skillDialog)
+                                skillDialog->setVisible(false);
+                            if (setupWindow)
+                                setupWindow->setVisible(false);
+                            if (equipmentWindow)
+                                equipmentWindow->setVisible(false);
+                            if (helpWindow)
+                                helpWindow->setVisible(false);
+                            if (debugWindow)
+                                debugWindow->setVisible(false);
+                            if (outfitWindow)
+                                outfitWindow->setVisible(false);
+                            if (dropShortcutWindow)
+                                dropShortcutWindow->setVisible(false);
+                            if (spellShortcutWindow)
+                                spellShortcutWindow->setVisible(false);
+                            if (botCheckerWindow)
+                                botCheckerWindow->setVisible(false);
+                            if (socialWindow)
+                                socialWindow->setVisible(false);
                         }
                         break;
-
-                    case KeyboardConfig::KEY_CHANGE_ATTACK_TYPE:
-                        if (player_node)
-                        {
-                            if (!player_node->getDisableGameModifiers())
-                                player_node->changeAttackType();
-                        }
+                    case KeyboardConfig::KEY_WINDOW_STATUS:
+                        requestedWindow = statusWindow;
                         break;
-
-                    case KeyboardConfig::KEY_CHANGE_FOLLOW_MODE:
-                        if (player_node)
-                        {
-                            if (!player_node->getDisableGameModifiers())
-                                player_node->changeFollowMode();
-                        }
+                    case KeyboardConfig::KEY_WINDOW_INVENTORY:
+                        requestedWindow = inventoryWindow;
                         break;
-
-                    case KeyboardConfig::KEY_CHANGE_IMITATION_MODE:
-                        if (player_node)
-                        {
-                            if (!player_node->getDisableGameModifiers())
-                                player_node->changeImitationMode();
-                        }
+                    case KeyboardConfig::KEY_WINDOW_SHOP:
+                        requestedWindow = shopWindow;
                         break;
-
-                    case KeyboardConfig::KEY_MAGIC_ATTACK:
-                        if (player_node)
-                            player_node->magicAttack();
+                    case KeyboardConfig::KEY_WINDOW_EQUIPMENT:
+                        requestedWindow = equipmentWindow;
                         break;
-
-                    case KeyboardConfig::KEY_SWITCH_MAGIC_ATTACK:
-                        if (player_node)
-                        {
-                            if (!player_node->getDisableGameModifiers())
-                                player_node->switchMagicAttack();
-                        }
+                    case KeyboardConfig::KEY_WINDOW_SKILL:
+                        requestedWindow = skillDialog;
                         break;
-
-                    case KeyboardConfig::KEY_SWITCH_PVP_ATTACK:
-                        if (player_node)
-                        {
-                            if (!player_node->getDisableGameModifiers())
-                                player_node->switchPvpAttack();
-                        }
+                    case KeyboardConfig::KEY_WINDOW_KILLS:
+                        requestedWindow = killStats;
                         break;
-
-                    case KeyboardConfig::KEY_CHANGE_MOVE_TO_TARGET:
-                        if (player_node)
-                        {
-                            if (!player_node->getDisableGameModifiers())
-                                player_node->changeMoveToTargetType();
-                        }
+                    case KeyboardConfig::KEY_WINDOW_MINIMAP:
+                        minimap->toggle();
                         break;
-
-                    case KeyboardConfig::KEY_COPY_EQUIPED_OUTFIT:
-                        if (outfitWindow)
-                            outfitWindow->copyFromEquiped();
+                    case KeyboardConfig::KEY_WINDOW_CHAT:
+                        requestedWindow = chatWindow;
                         break;
-
-                    case KeyboardConfig::KEY_DISABLE_GAME_MODIFIERS:
-                        if (player_node)
-                            player_node->switchGameModifiers();
+                    case KeyboardConfig::KEY_WINDOW_SHORTCUT:
+                        requestedWindow = itemShortcutWindow;
                         break;
-
-                    case KeyboardConfig::KEY_CHANGE_AUDIO:
-                        sound.changeAudio();
+                    case KeyboardConfig::KEY_WINDOW_SETUP:
+                        requestedWindow = setupWindow;
                         break;
-
-                    case KeyboardConfig::KEY_AWAY:
-                        if (player_node)
-                        {
-                            player_node->changeAwayMode();
-                            setValidSpeed();
-                        }
+                    case KeyboardConfig::KEY_WINDOW_DEBUG:
+                        requestedWindow = debugWindow;
                         break;
-
-                    case KeyboardConfig::KEY_CAMERA:
-                        if (player_node && viewport)
-                        {
-                            if (!player_node->getDisableGameModifiers())
-                                viewport->toggleCameraMode();
-                            setValidSpeed();
-                        }
+                    case KeyboardConfig::KEY_WINDOW_SOCIAL:
+                        requestedWindow = socialWindow;
                         break;
-
-                    default:
+                    case KeyboardConfig::KEY_WINDOW_EMOTE_SHORTCUT:
+                        requestedWindow = emoteShortcutWindow;
                         break;
-                }
-            }
-
-            if (keyboard.isEnabled()
-                && (!chatWindow || !chatWindow->isInputFocused())
-                && !NpcDialog::isAnyInputFocused()
-                && (!player_node || !player_node->getAway())
-                && !keyboard.isKeyActive(keyboard.KEY_TARGET)
-                && !keyboard.isKeyActive(keyboard.KEY_UNTARGET)
-                && !InventoryWindow::isAnyInputFocused())
-            {
-//                const int tKey = keyboard.getKeyIndex(event.key.keysym.sym);
-
-                if (setupWindow && setupWindow->isVisible())
-                {
-                    if (tKey == KeyboardConfig::KEY_WINDOW_SETUP)
-                    {
-                        setupWindow->doCancel();
+                    case KeyboardConfig::KEY_WINDOW_OUTFIT:
+                        requestedWindow = outfitWindow;
+                        break;
+                    case KeyboardConfig::KEY_WINDOW_DROP:
+                        requestedWindow = dropShortcutWindow;
+                        break;
+                    case KeyboardConfig::KEY_WINDOW_SPELLS:
+                        requestedWindow = spellShortcutWindow;
+                        break;
+                    case KeyboardConfig::KEY_WINDOW_BOT_CHECKER:
+                        requestedWindow = botCheckerWindow;
+                        break;
+                    case KeyboardConfig::KEY_WINDOW_ONLINE:
+                        requestedWindow = whoIsOnline;
+                        break;
+                    case KeyboardConfig::KEY_SCREENSHOT:
+                        // Screenshot (picture, hence the p)
+                        saveScreenshot();
                         used = true;
-                    }
-                }
-                else
-                {
-                    // Do not activate shortcuts if tradewindow is visible
-                    if (itemShortcutWindow && tradeWindow
-                        && !tradeWindow->isVisible()
-                        && !setupWindow->isVisible())
-                    {
-                        int num = itemShortcutWindow->getTabIndex();
-                        if (num >= 0 && num < SHORTCUT_TABS)
+                        break;
+                    case KeyboardConfig::KEY_PATHFIND:
+                        // Find path to mouse (debug purpose)
+                        if (!player_node || !player_node->
+                            getDisableGameModifiers())
                         {
-                            // Checks if any item shortcut is pressed.
-                            for (int i = KeyboardConfig::KEY_SHORTCUT_1;
-                                 i <= KeyboardConfig::KEY_SHORTCUT_20;
-                                 i ++)
-                            {
-                                if (tKey == i && !used)
-                                {
-                                    itemShortcut[num]->useItem(
-                                        i - KeyboardConfig::KEY_SHORTCUT_1);
-                                    break;
-                                }
-                            }
+                            if (viewport)
+                                viewport->toggleDebugPath();
+                            if (miniStatusWindow)
+                                miniStatusWindow->updateStatus();
+                            if (mCurrentMap)
+                                mCurrentMap->redrawMap();
+                            used = true;
                         }
-                    }
-
-                    switch (tKey)
+                        break;
+                    case KeyboardConfig::KEY_TRADE:
                     {
-                        case KeyboardConfig::KEY_PICKUP:
-                            if (player_node)
-                                player_node->pickUpItems();
-                            used = true;
-                            break;
-                        case KeyboardConfig::KEY_SIT:
-                            // Player sit action
-                            if (player_node)
-                            {
-                                if (keyboard.isKeyActive(keyboard.KEY_EMOTE))
-                                    player_node->updateSit();
-                                else
-                                    player_node->toggleSit();
-                            }
-                            used = true;
-                            break;
-                        case KeyboardConfig::KEY_HIDE_WINDOWS:
-                            // Hide certain windows
-                            if (!chatWindow || !chatWindow->isInputFocused())
-                            {
-                                if (statusWindow)
-                                    statusWindow->setVisible(false);
-                                if (inventoryWindow)
-                                    inventoryWindow->setVisible(false);
-                                if (shopWindow)
-                                    shopWindow->setVisible(false);
-                                if (skillDialog)
-                                    skillDialog->setVisible(false);
-                                if (setupWindow)
-                                    setupWindow->setVisible(false);
-                                if (equipmentWindow)
-                                    equipmentWindow->setVisible(false);
-                                if (helpWindow)
-                                    helpWindow->setVisible(false);
-                                if (debugWindow)
-                                    debugWindow->setVisible(false);
-                                if (outfitWindow)
-                                    outfitWindow->setVisible(false);
-                                if (dropShortcutWindow)
-                                    dropShortcutWindow->setVisible(false);
-                                if (spellShortcutWindow)
-                                    spellShortcutWindow->setVisible(false);
-                                if (botCheckerWindow)
-                                    botCheckerWindow->setVisible(false);
-                                if (socialWindow)
-                                    socialWindow->setVisible(false);
-                            }
-                            break;
-                        case KeyboardConfig::KEY_WINDOW_STATUS:
-                            requestedWindow = statusWindow;
-                            break;
-                        case KeyboardConfig::KEY_WINDOW_INVENTORY:
-                            requestedWindow = inventoryWindow;
-                            break;
-                        case KeyboardConfig::KEY_WINDOW_SHOP:
-                            requestedWindow = shopWindow;
-                            break;
-                        case KeyboardConfig::KEY_WINDOW_EQUIPMENT:
-                            requestedWindow = equipmentWindow;
-                            break;
-                        case KeyboardConfig::KEY_WINDOW_SKILL:
-                            requestedWindow = skillDialog;
-                            break;
-                        case KeyboardConfig::KEY_WINDOW_KILLS:
-                            requestedWindow = killStats;
-                            break;
-                        case KeyboardConfig::KEY_WINDOW_MINIMAP:
-                            minimap->toggle();
-                            break;
-                        case KeyboardConfig::KEY_WINDOW_CHAT:
-                            requestedWindow = chatWindow;
-                            break;
-                        case KeyboardConfig::KEY_WINDOW_SHORTCUT:
-                            requestedWindow = itemShortcutWindow;
-                            break;
-                        case KeyboardConfig::KEY_WINDOW_SETUP:
-                            requestedWindow = setupWindow;
-                            break;
-                        case KeyboardConfig::KEY_WINDOW_DEBUG:
-                            requestedWindow = debugWindow;
-                            break;
-                        case KeyboardConfig::KEY_WINDOW_SOCIAL:
-                            requestedWindow = socialWindow;
-                            break;
-                        case KeyboardConfig::KEY_WINDOW_EMOTE_SHORTCUT:
-                            requestedWindow = emoteShortcutWindow;
-                            break;
-                        case KeyboardConfig::KEY_WINDOW_OUTFIT:
-                            requestedWindow = outfitWindow;
-                            break;
-                        case KeyboardConfig::KEY_WINDOW_DROP:
-                            requestedWindow = dropShortcutWindow;
-                            break;
-                        case KeyboardConfig::KEY_WINDOW_SPELLS:
-                            requestedWindow = spellShortcutWindow;
-                            break;
-                        case KeyboardConfig::KEY_WINDOW_BOT_CHECKER:
-                            requestedWindow = botCheckerWindow;
-                            break;
-                        case KeyboardConfig::KEY_WINDOW_ONLINE:
-                            requestedWindow = whoIsOnline;
-                            break;
-                        case KeyboardConfig::KEY_SCREENSHOT:
-                            // Screenshot (picture, hence the p)
-                            saveScreenshot();
-                            used = true;
-                            break;
-                        case KeyboardConfig::KEY_PATHFIND:
-                            // Find path to mouse (debug purpose)
-                            if (!player_node || !player_node->
-                                getDisableGameModifiers())
-                            {
-                                if (viewport)
-                                    viewport->toggleDebugPath();
-                                if (miniStatusWindow)
-                                    miniStatusWindow->updateStatus();
-                                if (mCurrentMap)
-                                    mCurrentMap->redrawMap();
-                                used = true;
-                            }
-                            break;
-                        case KeyboardConfig::KEY_TRADE:
+                        // Toggle accepting of incoming trade requests
+                        unsigned int deflt = player_relations.getDefault();
+                        if (deflt & PlayerRelation::TRADE)
                         {
-                            // Toggle accepting of incoming trade requests
-                            unsigned int deflt = player_relations.getDefault();
-                            if (deflt & PlayerRelation::TRADE)
+                            if (localChatTab)
                             {
-                                if (localChatTab)
-                                {
-                                    localChatTab->chatLog(
-                                        _("Ignoring incoming trade requests"),
-                                        BY_SERVER);
-                                }
-                                deflt &= ~PlayerRelation::TRADE;
+                                localChatTab->chatLog(
+                                    _("Ignoring incoming trade requests"),
+                                    BY_SERVER);
                             }
-                            else
+                            deflt &= ~PlayerRelation::TRADE;
+                        }
+                        else
+                        {
+                            if (localChatTab)
                             {
-                                if (localChatTab)
-                                {
-                                    localChatTab->chatLog(
-                                        _("Accepting incoming trade requests"),
-                                        BY_SERVER);
-                                }
-                                deflt |= PlayerRelation::TRADE;
+                                localChatTab->chatLog(
+                                    _("Accepting incoming trade requests"),
+                                    BY_SERVER);
                             }
-
-                            player_relations.setDefault(deflt);
-
-                            used = true;
+                            deflt |= PlayerRelation::TRADE;
                         }
-                            break;
-                        default:
-                            break;
-                    }
-                }
 
-                if (requestedWindow)
-                {
-                    requestedWindow->setVisible(!requestedWindow->isVisible());
-                    if (requestedWindow->isVisible())
-                        requestedWindow->requestMoveToTop();
-                    used = true;
-                }
-            }
-        }
-        // Active event
-        else if (event.type == SDL_ACTIVEEVENT)
-        {
-//            logger->log("SDL_ACTIVEEVENT");
-//            logger->log("state: %d", (int)event.active.state);
-//            logger->log("gain: %d", (int)event.active.gain);
+                        player_relations.setDefault(deflt);
 
-            int fpsLimit = 0;
-            if (event.active.state & SDL_APPACTIVE)
-            {
-                if (event.active.gain)
-                {   // window restore
-                    Client::setIsMinimized(false);
-                    if (!player_node && !player_node->getAway())
-                        fpsLimit = config.getIntValue("fpslimit");
-                    if (player_node)
-                        player_node->setHalfAway(false);
-                }
-                else
-                {   // window minimisation
-                    Client::setIsMinimized(true);
-                    if (player_node && !player_node->getAway())
-                    {
-                        fpsLimit = config.getIntValue("altfpslimit");
-                        player_node->setHalfAway(true);
+                        used = true;
                     }
+                        break;
+                    default:
+                        break;
                 }
-                Client::setFramerate(fpsLimit);
-            }
-            if (player_node)
-                player_node->updateName();
-
-            if (event.active.state & SDL_APPINPUTFOCUS)
-                Client::setInputFocused(event.active.gain);
-            if (event.active.state & SDL_APPMOUSEFOCUS)
-                Client::setMouseFocused(event.active.gain);
-
-            if (player_node && player_node->getAway())
-            {
-                if (Client::getInputFocused() || Client::getMouseFocused())
-                    fpsLimit = config.getIntValue("fpslimit");
-                else
-                    fpsLimit = config.getIntValue("altfpslimit");
-                Client::setFramerate(fpsLimit);
-            }
-            else
-            {
-                fpsLimit = config.getIntValue("fpslimit");
-                Client::setFramerate(fpsLimit);
             }
-        }
-        // Quit event
-        else if (event.type == SDL_QUIT)
-        {
-            Client::setState(STATE_EXIT);
-        }
 
-        // Push input to GUI when not used
-        if (!used)
-        {
-            try
-            {
-                if (guiInput)
-                    guiInput->pushInput(event);
-            }
-            catch (const gcn::Exception &e)
+            if (requestedWindow)
             {
-                const char *err = e.getMessage().c_str();
-                logger->log("Warning: guichan input exception: %s", err);
+                requestedWindow->setVisible(!requestedWindow->isVisible());
+                if (requestedWindow->isVisible())
+                    requestedWindow->requestMoveToTop();
+                used = true;
             }
         }
-
-    } // End while
-
-    // If the user is configuring the keys then don't respond.
-    if (!player_node || !keyboard.isEnabled() || player_node->getAway())
-        return;
-
-    if (keyboard.isKeyActive(keyboard.KEY_WEAR_OUTFIT)
-        || keyboard.isKeyActive(keyboard.KEY_COPY_OUTFIT)
-        || (setupWindow && setupWindow->isVisible()))
-    {
-        return;
     }
+    return false;
+}
 
+void Game::handleMoveAndAttack(SDL_Event &event, bool wasDown)
+{
     // Moving player around
     if (player_node->isAlive() && (!Being::isTalking()
         || keyboard.getKeyIndex(event.key.keysym.sym)
@@ -1702,6 +1548,183 @@ void Game::handleInput()
     }
 }
 
+void Game::handleActive(SDL_Event &event)
+{
+//    logger->log("SDL_ACTIVEEVENT");
+//    logger->log("state: %d", (int)event.active.state);
+//    logger->log("gain: %d", (int)event.active.gain);
+
+    int fpsLimit = 0;
+    if (event.active.state & SDL_APPACTIVE)
+    {
+        if (event.active.gain)
+        {   // window restore
+            Client::setIsMinimized(false);
+            if (!player_node && !player_node->getAway())
+                fpsLimit = config.getIntValue("fpslimit");
+            if (player_node)
+                player_node->setHalfAway(false);
+        }
+        else
+        {   // window minimisation
+            Client::setIsMinimized(true);
+            if (player_node && !player_node->getAway())
+            {
+                fpsLimit = config.getIntValue("altfpslimit");
+                player_node->setHalfAway(true);
+            }
+        }
+        Client::setFramerate(fpsLimit);
+    }
+    if (player_node)
+        player_node->updateName();
+
+    if (event.active.state & SDL_APPINPUTFOCUS)
+        Client::setInputFocused(event.active.gain);
+    if (event.active.state & SDL_APPMOUSEFOCUS)
+        Client::setMouseFocused(event.active.gain);
+
+    if (player_node && player_node->getAway())
+    {
+        if (Client::getInputFocused() || Client::getMouseFocused())
+            fpsLimit = config.getIntValue("fpslimit");
+        else
+            fpsLimit = config.getIntValue("altfpslimit");
+        Client::setFramerate(fpsLimit);
+    }
+    else
+    {
+        fpsLimit = config.getIntValue("fpslimit");
+        Client::setFramerate(fpsLimit);
+    }
+}
+
+/**
+ * The huge input handling method.
+ */
+void Game::handleInput()
+{
+    if (joystick)
+        joystick->update();
+
+    bool wasDown(false);
+    // Events
+    SDL_Event event;
+    while (SDL_PollEvent(&event))
+    {
+        bool used = false;
+
+        updateHistory(event);
+        checkKeys();
+
+        // Keyboard events (for discontinuous keys)
+        if (event.type == SDL_KEYDOWN)
+        {
+            wasDown = true;
+
+            if (setupWindow && setupWindow->isVisible() &&
+                keyboard.getNewKeyIndex() > keyboard.KEY_NO_VALUE)
+            {
+                keyboard.setNewKey(static_cast<int>(event.key.keysym.sym));
+                keyboard.callbackNewKey();
+                keyboard.setNewKeyIndex(keyboard.KEY_NO_VALUE);
+                return;
+            }
+
+            // send straight to gui for certain windows
+            if (quitDialog || TextDialog::isActive() ||
+                NpcPostDialog::isActive())
+            {
+                try
+                {
+                    guiInput->pushInput(event);
+                }
+                catch (const gcn::Exception &e)
+                {
+                    const char* err = e.getMessage().c_str();
+                    logger->log("Warning: guichan input exception: %s", err);
+                }
+                return;
+            }
+
+            if (chatWindow && !chatWindow->isInputFocused()
+                && keyboard.isKeyActive(keyboard.KEY_RIGHT_CLICK))
+            {
+                int mouseX, mouseY;
+                SDL_GetMouseState(&mouseX, &mouseY);
+
+                gcn::MouseEvent event2(viewport, false, false, false, false,
+                        0, gcn::MouseEvent::RIGHT, mouseX, mouseY, 1);
+                if (viewport)
+                    viewport->mousePressed(event2);
+                continue;
+            }
+
+            // Mode switch to emotes
+            if (keyboard.isKeyActive(keyboard.KEY_EMOTE))
+            {
+                // Emotions
+                int emotion = keyboard.getKeyEmoteOffset(event.key.keysym.sym);
+                if (emotion)
+                {
+                    if (emoteShortcut)
+                        emoteShortcut->useEmote(emotion);
+                    used = true;
+                    setValidSpeed();
+                    return;
+                }
+            }
+
+            if (handleOutfitsKeys(event, used))
+                continue;
+
+            if (handleSwitchKeys(event, used))
+                return;
+
+        }
+        // Active event
+        else if (event.type == SDL_ACTIVEEVENT)
+        {
+            handleActive(event);
+        }
+        // Quit event
+        else if (event.type == SDL_QUIT)
+        {
+            Client::setState(STATE_EXIT);
+        }
+
+        // Push input to GUI when not used
+        if (!used)
+        {
+            try
+            {
+                if (guiInput)
+                    guiInput->pushInput(event);
+            }
+            catch (const gcn::Exception &e)
+            {
+                const char *err = e.getMessage().c_str();
+                logger->log("Warning: guichan input exception: %s", err);
+            }
+        }
+
+    } // End while
+
+    // If the user is configuring the keys then don't respond.
+    if (!player_node || !keyboard.isEnabled() || player_node->getAway())
+        return;
+
+    // If pressed outfits keys, stop processing keys.
+    if (keyboard.isKeyActive(keyboard.KEY_WEAR_OUTFIT)
+        || keyboard.isKeyActive(keyboard.KEY_COPY_OUTFIT)
+        || (setupWindow && setupWindow->isVisible()))
+    {
+        return;
+    }
+
+    handleMoveAndAttack(event, wasDown);
+}
+
 /**
  * Changes the currently active map. Should only be called while the game is
  * running.
diff --git a/src/game.h b/src/game.h
index 2205e30de..4e5337d29 100644
--- a/src/game.h
+++ b/src/game.h
@@ -78,6 +78,14 @@ class Game
 
         void handleInput();
 
+        bool handleOutfitsKeys(SDL_Event &event, bool &used);
+
+        bool handleSwitchKeys(SDL_Event &event, bool &used);
+
+        void handleMoveAndAttack(SDL_Event &event, bool wasDown);
+
+        void handleActive(SDL_Event &event);
+
         void changeMap(const std::string &mapName);
 
         /**
diff --git a/src/graphics.h b/src/graphics.h
index 4a4676b26..2502c0418 100644
--- a/src/graphics.h
+++ b/src/graphics.h
@@ -25,14 +25,6 @@
 
 #include <guichan/sdl/sdlgraphics.hpp>
 
-//include "graphicsvertexes.h"
-
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 class GraphicsVertexes;
 class Image;
 class ImageVertexes;
diff --git a/src/gui/botcheckerwindow.h b/src/gui/botcheckerwindow.h
index 6af9c91d6..86d5ef290 100644
--- a/src/gui/botcheckerwindow.h
+++ b/src/gui/botcheckerwindow.h
@@ -32,12 +32,6 @@
 
 #include <vector>
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 struct BOTCHK
 {
     short id;      /**< Index into "botchecker_db" array */
diff --git a/src/gui/buydialog.h b/src/gui/buydialog.h
index 53d20e1e5..6bc10a103 100644
--- a/src/gui/buydialog.h
+++ b/src/gui/buydialog.h
@@ -30,12 +30,6 @@
 #include <guichan/actionlistener.hpp>
 #include <guichan/selectionlistener.hpp>
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 class ShopItems;
 class ShopListBox;
 class IntTextField;
diff --git a/src/gui/charcreatedialog.cpp b/src/gui/charcreatedialog.cpp
index 42435f036..d621caa96 100644
--- a/src/gui/charcreatedialog.cpp
+++ b/src/gui/charcreatedialog.cpp
@@ -44,6 +44,7 @@
 #include "net/messageout.h"
 #include "net/net.h"
 
+#include "resources/chardb.h"
 #include "resources/colordb.h"
 #include "resources/itemdb.h"
 
@@ -66,10 +67,18 @@ CharCreateDialog::CharCreateDialog(CharSelectDialog *parent, int slot):
     mPlayer = new Being(0, ActorSprite::PLAYER, mRace, nullptr);
     mPlayer->setGender(GENDER_MALE);
 
-    int numberOfHairColors = ColorDB::getHairSize();
+    maxHairColor = CharDB::getMaxHairColor();
+    minHairColor = CharDB::getMinHairColor();
+    if (!maxHairColor)
+        maxHairColor = ColorDB::getHairSize();
 
-    mHairStyle = rand() % mPlayer->getNumOfHairstyles();
-    mHairColor = rand() % numberOfHairColors;
+    maxHairStyle = CharDB::getMaxHairStyle();
+    minHairStyle = CharDB::getMinHairStyle();
+    if (!maxHairStyle)
+        maxHairStyle = mPlayer->getNumOfHairstyles();
+
+    mHairStyle = (rand() % maxHairStyle) + minHairStyle;
+    mHairColor = (rand() % maxHairColor) + minHairColor;
     updateHair();
 
     mNameField = new TextField("");
@@ -408,10 +417,14 @@ void CharCreateDialog::updateHair()
     mHairStyle %= Being::getNumOfHairstyles();
     if (mHairStyle < 0)
         mHairStyle += Being::getNumOfHairstyles();
+    if (mHairStyle < (signed)minHairStyle || mHairStyle > (signed)maxHairStyle)
+        mHairStyle = minHairStyle;
 
     mHairColor %= ColorDB::getHairSize();
     if (mHairColor < 0)
         mHairColor += ColorDB::getHairSize();
+    if (mHairColor < (signed)minHairColor || mHairColor > (signed)maxHairColor)
+        mHairColor = minHairColor;
 
     mPlayer->setSprite(Net::getCharHandler()->hairSprite(),
                        mHairStyle * -1, ColorDB::getHairColor(mHairColor));
diff --git a/src/gui/charcreatedialog.h b/src/gui/charcreatedialog.h
index 2f0f83513..c7010d6b1 100644
--- a/src/gui/charcreatedialog.h
+++ b/src/gui/charcreatedialog.h
@@ -124,6 +124,11 @@ class CharCreateDialog : public Window, public gcn::ActionListener
         int mRace;
 
         int mSlot;
+
+        unsigned maxHairColor;
+        unsigned minHairColor;
+        unsigned maxHairStyle;
+        unsigned minHairStyle;
 };
 
 #endif // CHAR_CREATE_DIALOG_H
diff --git a/src/gui/charselectdialog.cpp b/src/gui/charselectdialog.cpp
index 93302e0ff..15d1e6e0e 100644
--- a/src/gui/charselectdialog.cpp
+++ b/src/gui/charselectdialog.cpp
@@ -186,6 +186,7 @@ CharSelectDialog::CharSelectDialog(LoginData *data):
 
 CharSelectDialog::~CharSelectDialog()
 {
+    Net::getCharHandler()->clear();
 }
 
 void CharSelectDialog::action(const gcn::ActionEvent &event)
diff --git a/src/gui/chatwindow.h b/src/gui/chatwindow.h
index 1ad468a3b..ad5229ffe 100644
--- a/src/gui/chatwindow.h
+++ b/src/gui/chatwindow.h
@@ -38,12 +38,6 @@
 #include <vector>
 #include <set>
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 class BrowserBox;
 class ChatTab;
 class Channel;
diff --git a/src/gui/didyouknowwindow.h b/src/gui/didyouknowwindow.h
index b135103e8..d9734e8fe 100644
--- a/src/gui/didyouknowwindow.h
+++ b/src/gui/didyouknowwindow.h
@@ -28,12 +28,6 @@
 
 #include <guichan/actionlistener.hpp>
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 class Button;
 class BrowserBox;
 class CheckBox;
@@ -59,8 +53,7 @@ class DidYouKnowWindow : public Window, public LinkHandler,
         /**
          * Handles link action.
          */
-        void handleLink(const std::string &link,
-                        gcn::MouseEvent *event A_UNUSED);
+        void handleLink(const std::string &link, gcn::MouseEvent *event);
 
         void loadData(int num = 0);
 
diff --git a/src/gui/equipmentwindow.cpp b/src/gui/equipmentwindow.cpp
index d3d230922..cb3ace0c7 100644
--- a/src/gui/equipmentwindow.cpp
+++ b/src/gui/equipmentwindow.cpp
@@ -42,6 +42,7 @@
 #include "net/net.h"
 
 #include "resources/image.h"
+#include "resources/imageset.h"
 #include "resources/iteminfo.h"
 #include "resources/resourcemanager.h"
 
@@ -55,13 +56,16 @@
 
 static const int BOX_WIDTH = 36;
 static const int BOX_HEIGHT = 36;
+static const int BOX_X_PAD = (BOX_WIDTH - 32) / 2;
+static const int BOX_Y_PAD = (BOX_HEIGHT - 32) / 2;
 
 EquipmentWindow::EquipmentWindow(Equipment *equipment, Being *being,
                                  bool foring):
     Window(_("Equipment"), false, nullptr, "equipment.xml"),
     mEquipment(equipment),
     mSelected(-1),
-    mForing(foring)
+    mForing(foring),
+    mImageSet(0)
 {
     mBeing = being;
     mItemPopup = new ItemPopup;
@@ -119,6 +123,11 @@ EquipmentWindow::~EquipmentWindow()
     }
     delete_all(mBoxes);
     mBoxes.clear();
+    if (mImageSet)
+    {
+        mImageSet->decRef();
+        mImageSet = nullptr;
+    }
 }
 
 void EquipmentWindow::draw(gcn::Graphics *graphics)
@@ -133,12 +142,12 @@ void EquipmentWindow::draw(gcn::Graphics *graphics)
     int i = 0;
     const int fontHeight = getFont()->getHeight();
 
-    std::vector<std::pair<int, int>*>::const_iterator it;
-    std::vector<std::pair<int, int>*>::const_iterator it_end = mBoxes.end();
+    std::vector<EquipmentBox*>::const_iterator it;
+    std::vector<EquipmentBox*>::const_iterator it_end = mBoxes.end();
 
     for (it = mBoxes.begin(); it != it_end; ++ it, ++ i)
     {
-        std::pair<int, int> *box = *it;
+        EquipmentBox *box = *it;
         if (!box)
             continue;
         if (i == mSelected)
@@ -146,14 +155,14 @@ void EquipmentWindow::draw(gcn::Graphics *graphics)
             mHighlightColor.a = getGuiAlpha();
             // Set color to the highlight color
             g->setColor(mHighlightColor);
-            g->fillRectangle(gcn::Rectangle(box->first,
-                box->second, BOX_WIDTH, BOX_HEIGHT));
+            g->fillRectangle(gcn::Rectangle(box->x, box->y,
+                BOX_WIDTH, BOX_HEIGHT));
         }
 
         // Set color black
         g->setColor(mBorderColor);
         // Draw box border
-        g->drawRectangle(gcn::Rectangle(box->first, box->second,
+        g->drawRectangle(gcn::Rectangle(box->x, box->y,
             BOX_WIDTH, BOX_HEIGHT));
 
         if (!mEquipment)
@@ -168,17 +177,21 @@ void EquipmentWindow::draw(gcn::Graphics *graphics)
             {
                 image->setAlpha(1.0f); // Ensure the image is drawn
                                        // with maximum opacity
-                g->drawImage(image, box->first + 2, box->second + 2);
+                g->drawImage(image, box->x + 2, box->y + 2);
                 if (i == EQUIP_PROJECTILE_SLOT)
                 {
                     g->setColor(getForegroundColor());
                     graphics->drawText(toString(item->getQuantity()),
-                        box->first + (BOX_WIDTH / 2),
-                        box->second - fontHeight,
+                        box->x + (BOX_WIDTH / 2), box->y - fontHeight,
                         gcn::Graphics::CENTER);
                 }
             }
         }
+        else if (box->image)
+        {
+            g->drawImage(box->image, box->x + BOX_X_PAD,
+                box->y + BOX_Y_PAD);
+        }
     }
 }
 
@@ -200,16 +213,16 @@ Item *EquipmentWindow::getItem(int x, int y) const
     if (!mEquipment)
         return nullptr;
 
-    std::vector<std::pair<int, int>*>::const_iterator it;
-    std::vector<std::pair<int, int>*>::const_iterator it_end = mBoxes.end();
+    std::vector<EquipmentBox*>::const_iterator it;
+    std::vector<EquipmentBox*>::const_iterator it_end = mBoxes.end();
     int i = 0;
 
     for (it = mBoxes.begin(); it != it_end; ++ it, ++ i)
     {
-        std::pair<int, int> *box = *it;
+        EquipmentBox *box = *it;
         if (!box)
             continue;
-        const gcn::Rectangle tRect(box->first, box->second,
+        const gcn::Rectangle tRect(box->x, box->y,
             BOX_WIDTH, BOX_HEIGHT);
 
         if (tRect.isPointInRect(x, y))
@@ -233,18 +246,17 @@ void EquipmentWindow::mousePressed(gcn::MouseEvent& mouseEvent)
         if (mForing)
             return;
         // Checks if any of the presses were in the equip boxes.
-        std::vector<std::pair<int, int>*>::const_iterator it;
-        std::vector<std::pair<int, int>*>::const_iterator
-            it_end = mBoxes.end();
+        std::vector<EquipmentBox*>::const_iterator it;
+        std::vector<EquipmentBox*>::const_iterator it_end = mBoxes.end();
         int i = 0;
 
         for (it = mBoxes.begin(); it != it_end; ++ it, ++ i)
         {
-            std::pair<int, int> *box = *it;
+            EquipmentBox *box = *it;
             if (!box)
                 continue;
             Item *item = mEquipment->getEquipment(i);
-            const gcn::Rectangle tRect(box->first, box->second,
+            const gcn::Rectangle tRect(box->x, box->y,
                 BOX_WIDTH, BOX_HEIGHT);
 
             if (tRect.isPointInRect(x, y) && item)
@@ -351,6 +363,12 @@ void EquipmentWindow::fillBoxes()
         return;
     }
 
+    if (mImageSet)
+        mImageSet->decRef();
+
+    mImageSet = Theme::getImageSetFromTheme(XML::getProperty(
+        root, "image", "equipmentbox.png"), 32, 32);
+
     for_each_xml_child_node(node, root)
     {
         if (xmlStrEqual(node->name, BAD_CAST "window"))
@@ -358,7 +376,7 @@ void EquipmentWindow::fillBoxes()
         else if (xmlStrEqual(node->name, BAD_CAST "playerbox"))
             loadPlayerBox(node);
         else if (xmlStrEqual(node->name, BAD_CAST "slot"))
-            loadSlot(node);
+            loadSlot(node, mImageSet);
     }
     delete doc;
 }
@@ -378,7 +396,7 @@ void EquipmentWindow::loadPlayerBox(xmlNodePtr playerBoxNode)
         XML::getProperty(playerBoxNode, "height", 168)));
 }
 
-void EquipmentWindow::loadSlot(xmlNodePtr slotNode)
+void EquipmentWindow::loadSlot(xmlNodePtr slotNode, ImageSet *imageset)
 {
     int slot = parseSlotName(XML::getProperty(slotNode, "name", ""));
     if (slot < 0)
@@ -386,16 +404,22 @@ void EquipmentWindow::loadSlot(xmlNodePtr slotNode)
 
     const int x = XML::getProperty(slotNode, "x", 0) + getPadding();
     const int y = XML::getProperty(slotNode, "y", 0) + getTitleBarHeight();
+    const int imageIndex = XML::getProperty(slotNode, "image", -1);
+    Image *image = nullptr;
+
+    if (imageset && imageIndex >= 0 && imageIndex < (signed)imageset->size())
+        image = imageset->get(imageIndex);
 
     if (mBoxes[slot])
     {
-        std::pair<int, int> *pair = mBoxes[slot];
-        pair->first = x;
-        pair->second = y;
+        EquipmentBox *box = mBoxes[slot];
+        box->x = x;
+        box->y = y;
+        box->image = image;
     }
     else
     {
-         mBoxes[slot] = new std::pair<int, int>(x, y);
+        mBoxes[slot] = new EquipmentBox(x, y, image);
     }
 }
 
@@ -461,23 +485,34 @@ int EquipmentWindow::parseSlotName(std::string name)
 
 void EquipmentWindow::fillDefault()
 {
-    addBox(0, 90, 40);     // torso
-    addBox(1, 8, 78);      // gloves
-    addBox(2, 70, 0);      // hat
-    addBox(3, 50, 253);    // pants
-    addBox(4, 90, 253);    // boots
-    addBox(5, 8, 213);     // FREE
-    addBox(6, 129, 213);   // wings
-    addBox(7, 50, 40);     // scarf
-    addBox(8, 8, 168);     // weapon
-    addBox(9, 129, 168);   // shield
-    addBox(10, 129, 78);   // ammo
-    addBox(11, 8, 123);    // amulet
-    addBox(12, 129, 123);  // ring
+    if (mImageSet)
+        mImageSet->decRef();
+
+    mImageSet = Theme::getImageSetFromTheme(
+        "equipmentbox.png", 32, 32);
+
+    addBox(0, 90, 40, 0);    // torso
+    addBox(1, 8, 78, 1);     // gloves
+    addBox(2, 70, 0, 2);     // hat
+    addBox(3, 50, 253, 3);   // pants
+    addBox(4, 90, 253, 4);   // boots
+    addBox(5, 8, 213, 5);    // FREE
+    addBox(6, 129, 213, 6);  // wings
+    addBox(7, 50, 40, 5);    // scarf
+    addBox(8, 8, 168, 7);    // weapon
+    addBox(9, 129, 168, 8);  // shield
+    addBox(10, 129, 78, 9);  // ammo
+    addBox(11, 8, 123, 5);   // amulet
+    addBox(12, 129, 123, 5); // ring
 }
 
-void EquipmentWindow::addBox(int idx, int x, int y)
+void EquipmentWindow::addBox(int idx, int x, int y, int imageIndex)
 {
-    mBoxes[idx] = new std::pair<int, int>(
-        x + getPadding(), y + getTitleBarHeight());
+    Image *image = nullptr;
+
+    if (mImageSet && imageIndex >= 0 && imageIndex < (signed)mImageSet->size())
+        image = mImageSet->get(imageIndex);
+
+    mBoxes[idx] = new EquipmentBox(x + getPadding(), y + getTitleBarHeight(),
+        image);
 }
diff --git a/src/gui/equipmentwindow.h b/src/gui/equipmentwindow.h
index cadf27620..0a3c2da20 100644
--- a/src/gui/equipmentwindow.h
+++ b/src/gui/equipmentwindow.h
@@ -25,27 +25,37 @@
 
 #include "equipment.h"
 #include "guichanfwd.h"
+#include "localconsts.h"
 
 #include "gui/widgets/window.h"
 
 #include "utils/xml.h"
 
+#include "resources/image.h"
+
 #include <guichan/actionlistener.hpp>
 
 #include <vector>
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 class Being;
 class Inventory;
+class Image;
+class ImageSet;
 class Item;
 class ItemPopup;
 class PlayerBox;
 
+struct EquipmentBox
+{
+    EquipmentBox(int x0, int y0, Image *img) :
+        x(x0), y(y0), image(img)
+    { }
+
+    int x;
+    int y;
+    Image *image;
+};
+
 /**
  * Equipment dialog.
  *
@@ -96,13 +106,13 @@ class EquipmentWindow : public Window, public gcn::ActionListener
 
         void fillDefault();
 
-        void addBox(int idx, int x, int y);
+        void addBox(int idx, int x, int y, int imageIndex);
 
         void loadWindow(xmlNodePtr windowNode);
 
         void loadPlayerBox(xmlNodePtr playerBoxNode);
 
-        void loadSlot(xmlNodePtr slotNode);
+        void loadSlot(xmlNodePtr slotNode, ImageSet *imageset);
 
         int parseSlotName(std::string name);
 
@@ -114,8 +124,9 @@ class EquipmentWindow : public Window, public gcn::ActionListener
 
         int mSelected; /**< Index of selected item. */
         bool mForing;
+        ImageSet *mImageSet;
         Being *mBeing;
-        std::vector<std::pair<int, int>*> mBoxes;
+        std::vector<EquipmentBox*> mBoxes;
         gcn::Color mHighlightColor;
         gcn::Color mBorderColor;
 };
diff --git a/src/gui/helpwindow.h b/src/gui/helpwindow.h
index d59289db0..178ae1e16 100644
--- a/src/gui/helpwindow.h
+++ b/src/gui/helpwindow.h
@@ -28,11 +28,7 @@
 
 #include <guichan/actionlistener.hpp>
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
+#include "localconsts.h"
 
 class BrowserBox;
 class LinkHandler;
diff --git a/src/gui/inventorywindow.h b/src/gui/inventorywindow.h
index 9dadeb5a8..aa78705b8 100644
--- a/src/gui/inventorywindow.h
+++ b/src/gui/inventorywindow.h
@@ -35,12 +35,6 @@
 #include <guichan/keylistener.hpp>
 #include <guichan/selectionlistener.hpp>
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 class DropDown;
 class Item;
 class ItemContainer;
@@ -48,7 +42,6 @@ class InventoryFilter;
 class LayoutCell;
 class ProgressBar;
 class SortListModel;
-//class TextBox;
 class TextField;
 
 /**
diff --git a/src/gui/itemamountwindow.h b/src/gui/itemamountwindow.h
index 2dffdc286..bacd4cfd0 100644
--- a/src/gui/itemamountwindow.h
+++ b/src/gui/itemamountwindow.h
@@ -28,12 +28,6 @@
 #include <guichan/keylistener.hpp>
 #include <guichan/actionlistener.hpp>
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 class Icon;
 class IntTextField;
 class Item;
diff --git a/src/gui/ministatuswindow.h b/src/gui/ministatuswindow.h
index 5e1b442dc..6fb8f7652 100644
--- a/src/gui/ministatuswindow.h
+++ b/src/gui/ministatuswindow.h
@@ -31,12 +31,6 @@
 
 #include <vector>
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 class AnimatedSprite;
 class Graphics;
 class ProgressBar;
diff --git a/src/gui/popupmenu.h b/src/gui/popupmenu.h
index 3a7f27d4b..4bbe2c46c 100644
--- a/src/gui/popupmenu.h
+++ b/src/gui/popupmenu.h
@@ -28,11 +28,7 @@
 
 #include <guichan/actionlistener.hpp>
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
+#include "localconsts.h"
 
 class Being;
 class BrowserBox;
diff --git a/src/gui/register.h b/src/gui/register.h
index 34bcadd6d..b0137f141 100644
--- a/src/gui/register.h
+++ b/src/gui/register.h
@@ -30,12 +30,6 @@
 
 #include <string>
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 class LoginData;
 class OkDialog;
 
diff --git a/src/gui/selldialog.h b/src/gui/selldialog.h
index 46cb077e1..a775cf0e0 100644
--- a/src/gui/selldialog.h
+++ b/src/gui/selldialog.h
@@ -30,12 +30,6 @@
 
 #include <SDL_types.h>
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 class Item;
 class ShopItems;
 class ShopListBox;
diff --git a/src/gui/setup_colors.h b/src/gui/setup_colors.h
index 850f23897..b6d5209e2 100644
--- a/src/gui/setup_colors.h
+++ b/src/gui/setup_colors.h
@@ -31,12 +31,6 @@
 
 #include <string>
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 class BrowserBox;
 class TextField;
 class TextPreview;
diff --git a/src/gui/setup_relations.h b/src/gui/setup_relations.h
index a6627a06d..2c23d4dba 100644
--- a/src/gui/setup_relations.h
+++ b/src/gui/setup_relations.h
@@ -30,12 +30,6 @@
 
 #include <guichan/actionlistener.hpp>
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 class EditDialog;
 class GuiTable;
 class PlayerTableModel;
diff --git a/src/gui/shopwindow.h b/src/gui/shopwindow.h
index 8b170f31e..e1fd8a2a0 100644
--- a/src/gui/shopwindow.h
+++ b/src/gui/shopwindow.h
@@ -30,12 +30,6 @@
 #include <guichan/actionlistener.hpp>
 #include <guichan/selectionlistener.hpp>
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 class CheckBox;
 class Item;
 class ListBox;
diff --git a/src/gui/skilldialog.h b/src/gui/skilldialog.h
index 21ee56f5e..63f7d1790 100644
--- a/src/gui/skilldialog.h
+++ b/src/gui/skilldialog.h
@@ -42,12 +42,6 @@ class TabbedArea;
 
 struct SkillInfo;
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 /**
  * The skill dialog.
  *
diff --git a/src/gui/socialwindow.h b/src/gui/socialwindow.h
index 7dc962316..dec8a6c26 100644
--- a/src/gui/socialwindow.h
+++ b/src/gui/socialwindow.h
@@ -30,12 +30,6 @@
 #include <string>
 #include <map>
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 class AttackTab;
 class Button;
 class ConfirmDialog;
diff --git a/src/gui/specialswindow.h b/src/gui/specialswindow.h
index 030c1343b..4350a656b 100644
--- a/src/gui/specialswindow.h
+++ b/src/gui/specialswindow.h
@@ -34,12 +34,6 @@
 
 #include <map>
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 class Label;
 class ScrollArea;
 class Tab;
diff --git a/src/gui/statuspopup.cpp b/src/gui/statuspopup.cpp
index 5f2ec71e3..3e1f68d09 100644
--- a/src/gui/statuspopup.cpp
+++ b/src/gui/statuspopup.cpp
@@ -37,7 +37,6 @@
 #include "units.h"
 #include "keyboardconfig.h"
 
-#include "utils/gettext.h"
 #include "utils/stringutils.h"
 
 #include <guichan/font.hpp>
@@ -187,387 +186,52 @@ void StatusPopup::view(int x, int y)
     requestMoveToTop();
 }
 
-void StatusPopup::setLabelText(gcn::Label *label, char *text, int key)
+void StatusPopup::setLabelText(gcn::Label *label, const char *text, int key)
 {
     label->setCaption(strprintf("%s  %s", text,
         keyboard.getKeyValueString(key).c_str()));
 }
 
+void StatusPopup::setLabelText2(gcn::Label *label, std::string text, int key)
+{
+    label->setCaption(strprintf("%s  %s", text.c_str(),
+        keyboard.getKeyValueString(key).c_str()));
+    label->adjustSize();
+}
+
 void StatusPopup::updateLabels()
 {
     if (!player_node || !viewport)
         return;
 
-    switch (player_node->getInvertDirection())
-    {
-        case 0:
-            setLabelText(mMoveType, _("(D) default moves"),
-                keyboard.KEY_INVERT_DIRECTION);
-            break;
-
-        case 1:
-            setLabelText(mMoveType, _("(I) invert moves"),
-                keyboard.KEY_INVERT_DIRECTION);
-            break;
-
-        case 2:
-            setLabelText(mMoveType, _("(c) moves with some crazy moves"),
-                keyboard.KEY_INVERT_DIRECTION);
-            break;
-
-        case 3:
-            setLabelText(mMoveType, _("(C) moves with crazy moves"),
-                keyboard.KEY_INVERT_DIRECTION);
-            break;
-
-        case 4:
-            setLabelText(mMoveType, _("(d) double normal + crazy"),
-                keyboard.KEY_INVERT_DIRECTION);
-            break;
-
-        default:
-            setLabelText(mMoveType, _("(?) move"),
-                keyboard.KEY_INVERT_DIRECTION);
-            break;
-    }
-    mMoveType->adjustSize();
-
-    if (player_node->getCrazyMoveType() < 10)
-    {
-        mCrazyMoveType->setCaption(strprintf("(%d) crazy move number %d  %s",
-            player_node->getCrazyMoveType(), player_node->getCrazyMoveType(),
-            keyboard.getKeyValueString(
-            keyboard.KEY_CHANGE_CRAZY_MOVES_TYPE).c_str()));
-    }
-    else
-    {
-        switch (player_node->getCrazyMoveType())
-        {
-            case 10:
-                setLabelText(mCrazyMoveType, _("(a) custom crazy move"),
-                    keyboard.KEY_CHANGE_CRAZY_MOVES_TYPE);
-                break;
-            default:
-                setLabelText(mCrazyMoveType, _("(?) crazy move"),
-                    keyboard.KEY_CHANGE_CRAZY_MOVES_TYPE);
-                break;
-        }
-    }
-    mCrazyMoveType->adjustSize();
-
-    switch (player_node->getMoveToTargetType())
-    {
-        case 0:
-            setLabelText(mMoveToTargetType, _("(0) default moves to target"),
-                keyboard.KEY_CHANGE_MOVE_TO_TARGET);
-            break;
-        case 1:
-            setLabelText(mMoveToTargetType,
-                _("(1) moves to target in distance 1"),
-                keyboard.KEY_CHANGE_MOVE_TO_TARGET);
-            break;
-        case 2:
-            setLabelText(mMoveToTargetType,
-                _("(2) moves to target in distance 2"),
-                keyboard.KEY_CHANGE_MOVE_TO_TARGET);
-            break;
-        case 3:
-            setLabelText(mMoveToTargetType,
-                _("(3) moves to target in distance 3"),
-                keyboard.KEY_CHANGE_MOVE_TO_TARGET);
-            break;
-        case 4:
-            setLabelText(mMoveToTargetType,
-                _("(5) moves to target in distance 5"),
-                keyboard.KEY_CHANGE_MOVE_TO_TARGET);
-            break;
-        case 5:
-            setLabelText(mMoveToTargetType,
-                _("(7) moves to target in distance 7"),
-                keyboard.KEY_CHANGE_MOVE_TO_TARGET);
-            break;
-        case 6:
-            setLabelText(mMoveToTargetType,
-                _("(A) moves to target in attack range"),
-                keyboard.KEY_CHANGE_MOVE_TO_TARGET);
-            break;
-        case 7:
-            setLabelText(mMoveToTargetType,
-                _("(a) archer attack range"),
-                keyboard.KEY_CHANGE_MOVE_TO_TARGET);
-            break;
-        default:
-            setLabelText(mMoveToTargetType,
-                _("(?) move to target"), keyboard.KEY_CHANGE_MOVE_TO_TARGET);
-            break;
-    }
-    mMoveToTargetType->adjustSize();
-
-    switch (player_node->getFollowMode())
-    {
-        case 0:
-            setLabelText(mFollowMode, _("(D) default follow"),
-                keyboard.KEY_CHANGE_FOLLOW_MODE);
-            break;
-        case 1:
-            setLabelText(mFollowMode, _("(R) relative follow"),
-                keyboard.KEY_CHANGE_FOLLOW_MODE);
-            break;
-        case 2:
-            setLabelText(mFollowMode, _("(M) mirror follow"),
-                keyboard.KEY_CHANGE_FOLLOW_MODE);
-            break;
-        case 3:
-            setLabelText(mFollowMode, _("(P) pet follow"),
-                keyboard.KEY_CHANGE_FOLLOW_MODE);
-            break;
-        default:
-            setLabelText(mFollowMode, _("(?) unknown follow"),
-                keyboard.KEY_CHANGE_FOLLOW_MODE);
-            break;
-    }
-    mFollowMode->adjustSize();
-
-    switch (player_node->getAttackWeaponType())
-    {
-        case 1:
-            setLabelText(mAttackWeaponType, _("(D) default attack"),
-                keyboard.KEY_CHANGE_ATTACK_WEAPON_TYPE);
-            break;
-        case 2:
-            setLabelText(mAttackWeaponType,
-                _("(s) switch attack without shield"),
-                keyboard.KEY_CHANGE_ATTACK_WEAPON_TYPE);
-            break;
-        case 3:
-            setLabelText(mAttackWeaponType,
-                _("(S) switch attack with shield"),
-                keyboard.KEY_CHANGE_ATTACK_WEAPON_TYPE);
-            break;
-        default:
-            setLabelText(mAttackWeaponType, _("(?) attack"),
-                keyboard.KEY_CHANGE_ATTACK_WEAPON_TYPE);
-            break;
-    }
-    mAttackWeaponType->adjustSize();
-
-    switch (player_node->getAttackType())
-    {
-        case 0:
-            setLabelText(mAttackType, _("(D) default attack"),
-                keyboard.KEY_CHANGE_ATTACK_TYPE);
-            break;
-        case 1:
-            setLabelText(mAttackType, _("(G) go and attack"),
-                keyboard.KEY_CHANGE_ATTACK_TYPE);
-            break;
-        case 2:
-            setLabelText(mAttackType, _("(A) go, attack, pickup"),
-                keyboard.KEY_CHANGE_ATTACK_TYPE);
-            break;
-        case 3:
-            setLabelText(mAttackType, _("(d) without auto attack"),
-                keyboard.KEY_CHANGE_ATTACK_TYPE);
-            break;
-        default:
-            setLabelText(mAttackType, _("(?) attack"),
-                keyboard.KEY_CHANGE_ATTACK_TYPE);
-            break;
-    }
-    mAttackType->adjustSize();
-
-    mDropCounter->setCaption(strprintf("(%d) drop counter %d  %s",
-        player_node->getQuickDropCounter(), player_node->getQuickDropCounter(),
-        keyboard.getKeyValueString(keyboard.KEY_SWITCH_QUICK_DROP).c_str()));
-    mDropCounter->adjustSize();
-
-    switch (player_node->getPickUpType())
-    {
-        case 0:
-            setLabelText(mPickUpType, _("(S) small pick up 1x1 cells"),
-                keyboard.KEY_CHANGE_PICKUP_TYPE);
-            break;
-        case 1:
-            setLabelText(mPickUpType, _("(D) default pick up 2x1 cells"),
-                keyboard.KEY_CHANGE_PICKUP_TYPE);
-            break;
-        case 2:
-            setLabelText(mPickUpType, _("(F) forward pick up 2x3 cells"),
-                keyboard.KEY_CHANGE_PICKUP_TYPE);
-            break;
-        case 3:
-            setLabelText(mPickUpType, _("(3) pick up 3x3 cells"),
-                keyboard.KEY_CHANGE_PICKUP_TYPE);
-            break;
-        case 4:
-            setLabelText(mPickUpType, _("(g) go and pick up in distance 4"),
-                keyboard.KEY_CHANGE_PICKUP_TYPE);
-            break;
-        case 5:
-            setLabelText(mPickUpType, _("(G) go and pick up in distance 8"),
-                keyboard.KEY_CHANGE_PICKUP_TYPE);
-            break;
-        case 6:
-            setLabelText(mPickUpType, _("(A) go and pick up in max distance"),
-                keyboard.KEY_CHANGE_PICKUP_TYPE);
-            break;
-        default:
-            setLabelText(mPickUpType, _("(?) pick up"),
-                keyboard.KEY_CHANGE_PICKUP_TYPE);
-            break;
-    }
-    mPickUpType->adjustSize();
-
-    switch (viewport->getDebugPath())
-    {
-        case 0:
-            setLabelText(mMapType, _("(N) normal map view"),
-                keyboard.KEY_PATHFIND);
-            break;
-        case 1:
-            setLabelText(mMapType, _("(D) debug map view"),
-                keyboard.KEY_PATHFIND);
-            break;
-        case 2:
-            setLabelText(mMapType, _("(u) ultra map view"),
-                keyboard.KEY_PATHFIND);
-            break;
-        case 3:
-            setLabelText(mMapType, _("(U) ultra map view 2"),
-                keyboard.KEY_PATHFIND);
-            break;
-        case 4:
-            setLabelText(mMapType, _("(e) empty map view"),
-                keyboard.KEY_PATHFIND);
-            break;
-        case 5:
-            setLabelText(mMapType, _("(b) black & white map view"),
-                keyboard.KEY_PATHFIND);
-            break;
-        default:
-            setLabelText(mMapType, _("(?) map view"), keyboard.KEY_PATHFIND);
-            break;
-    }
-    mMapType->adjustSize();
-
-    switch (player_node->getMagicAttackType())
-    {
-        case 0:
-            setLabelText(mMagicAttackType, _("(f) use #flar for magic attack"),
-                keyboard.KEY_SWITCH_MAGIC_ATTACK);
-            break;
-        case 1:
-            setLabelText(mMagicAttackType,
-                 _("(c) use #chiza for magic attack"),
-                keyboard.KEY_SWITCH_MAGIC_ATTACK);
-            break;
-        case 2:
-            setLabelText(mMagicAttackType,
-                _("(I) use #ingrav for magic attack"),
-                keyboard.KEY_SWITCH_MAGIC_ATTACK);
-            break;
-        case 3:
-            setLabelText(mMagicAttackType,
-                _("(F) use #frillyar for magic attack"),
-                keyboard.KEY_SWITCH_MAGIC_ATTACK);
-            break;
-        case 4:
-            setLabelText(mMagicAttackType,
-                _("(U) use #upmarmu for magic attack"),
-                keyboard.KEY_SWITCH_MAGIC_ATTACK);
-            break;
-        default:
-            setLabelText(mMagicAttackType, _("(?) magic attack"),
-                keyboard.KEY_SWITCH_MAGIC_ATTACK);
-            break;
-    }
-    mMagicAttackType->adjustSize();
-
-    switch (player_node->getPvpAttackType())
-    {
-        case 0:
-            setLabelText(mPvpAttackType, _("(a) attack all players"),
-                keyboard.KEY_SWITCH_PVP_ATTACK);
-            break;
-        case 1:
-            setLabelText(mPvpAttackType, _("(f) attack not friends"),
-                keyboard.KEY_SWITCH_PVP_ATTACK);
-            break;
-        case 2:
-            setLabelText(mPvpAttackType, _("(b) attack bad relations"),
-                keyboard.KEY_SWITCH_PVP_ATTACK);
-            break;
-        case 3:
-            setLabelText(mPvpAttackType, _("(d) dont attack players"),
-                keyboard.KEY_SWITCH_PVP_ATTACK);
-            break;
-        default:
-            setLabelText(mMagicAttackType, _("(?) pvp attack"),
-                keyboard.KEY_SWITCH_MAGIC_ATTACK);
-            break;
-    }
-    mPvpAttackType->adjustSize();
-
-    switch (player_node->getImitationMode())
-    {
-        case 0:
-            setLabelText(mImitationMode, _("(D) default imitation"),
-                keyboard.KEY_CHANGE_IMITATION_MODE);
-            break;
-        case 1:
-            setLabelText(mImitationMode, _("(O) outfits imitation"),
-                keyboard.KEY_CHANGE_IMITATION_MODE);
-            break;
-        default:
-            setLabelText(mImitationMode, _("(?) imitation"),
-                keyboard.KEY_CHANGE_IMITATION_MODE);
-            break;
-    }
-    mImitationMode->adjustSize();
-
-    switch ((int)player_node->getAway())
-    {
-        case 0:
-            setLabelText(mAwayMode, _("(O) on keyboard"), keyboard.KEY_AWAY);
-            break;
-        case 1:
-            setLabelText(mAwayMode, _("(A) away"), keyboard.KEY_AWAY);
-            break;
-        default:
-            setLabelText(mAwayMode, _("(?) away"), keyboard.KEY_AWAY);
-            break;
-    }
-    mAwayMode->adjustSize();
-
-    switch (viewport->getCameraMode())
-    {
-        case 0:
-            setLabelText(mCameraMode, _("(G) game camera mode"),
-                keyboard.KEY_CAMERA);
-            break;
-        case 1:
-            setLabelText(mCameraMode, _("(F) free camera mode"),
-                keyboard.KEY_CAMERA);
-            break;
-        case 2:
-            setLabelText(mCameraMode, _("(D) design camera mode"),
-                keyboard.KEY_CAMERA);
-            break;
-        default:
-            setLabelText(mCameraMode, _("(?) away"), keyboard.KEY_CAMERA);
-            break;
-    }
-    mCameraMode->adjustSize();
-
-    if (player_node->getDisableGameModifiers())
-    {
-        setLabelText(mDisableGameModifiers, _("Game modifiers are disabled"),
-            keyboard.KEY_DISABLE_GAME_MODIFIERS);
-    }
-    else
-    {
-        setLabelText(mDisableGameModifiers, _("Game modifiers are enabled"),
-            keyboard.KEY_DISABLE_GAME_MODIFIERS);
-    }
-    mDisableGameModifiers->adjustSize();
+    setLabelText2(mMoveType, player_node->getInvertDirectionString(),
+        keyboard.KEY_INVERT_DIRECTION);
+    setLabelText2(mCrazyMoveType, player_node->getCrazyMoveTypeString(),
+        keyboard.KEY_CHANGE_CRAZY_MOVES_TYPE);
+    setLabelText2(mMoveToTargetType, player_node->getMoveToTargetTypeString(),
+        keyboard.KEY_CHANGE_MOVE_TO_TARGET);
+    setLabelText2(mFollowMode, player_node->getFollowModeString(),
+        keyboard.KEY_CHANGE_FOLLOW_MODE);
+    setLabelText2(mAttackWeaponType, player_node->getAttackWeaponTypeString(),
+        keyboard.KEY_CHANGE_ATTACK_WEAPON_TYPE);
+    setLabelText2(mAttackType, player_node->getAttackTypeString(),
+        keyboard.KEY_CHANGE_ATTACK_TYPE);
+    setLabelText2(mDropCounter, player_node->getQuickDropCounterString(),
+        keyboard.KEY_SWITCH_QUICK_DROP);
+    setLabelText2(mPickUpType, player_node->getPickUpTypeString(),
+        keyboard.KEY_CHANGE_PICKUP_TYPE);
+    setLabelText2(mMapType, player_node->getDebugPathString(),
+        keyboard.KEY_PATHFIND);
+    setLabelText2(mMagicAttackType, player_node->getMagicAttackString(),
+        keyboard.KEY_SWITCH_MAGIC_ATTACK);
+    setLabelText2(mPvpAttackType, player_node->getPvpAttackString(),
+        keyboard.KEY_SWITCH_PVP_ATTACK);
+    setLabelText2(mImitationMode, player_node->getImitationModeString(),
+        keyboard.KEY_CHANGE_IMITATION_MODE);
+    setLabelText2(mAwayMode, player_node->getAwayModeString(),
+        keyboard.KEY_AWAY);
+    setLabelText2(mCameraMode, player_node->getCameraModeString(),
+        keyboard.KEY_CAMERA);
+    setLabelText2(mDisableGameModifiers, player_node->getGameModifiersString(),
+        keyboard.KEY_DISABLE_GAME_MODIFIERS);
 }
diff --git a/src/gui/statuspopup.h b/src/gui/statuspopup.h
index 2af8064c5..976b5e57b 100644
--- a/src/gui/statuspopup.h
+++ b/src/gui/statuspopup.h
@@ -60,7 +60,10 @@ class StatusPopup : public Popup
 
     private:
         void updateLabels();
-        void setLabelText(gcn::Label *label, char *text, int key);
+
+        void setLabelText(gcn::Label *label, const char *text, int key);
+
+        void setLabelText2(gcn::Label *label, std::string text, int key);
 
         gcn::Label *mMoveType;
         gcn::Label *mCrazyMoveType;
diff --git a/src/gui/statuswindow.cpp b/src/gui/statuswindow.cpp
index 37a706baf..5ac14d132 100644
--- a/src/gui/statuswindow.cpp
+++ b/src/gui/statuswindow.cpp
@@ -624,7 +624,7 @@ void StatusWindow::updateInvSlotsBar(ProgressBar *bar)
     bar->setText(strprintf("%d", usedSlots));
 }
 
-std::string StatusWindow::translateLetter(char* letters)
+std::string StatusWindow::translateLetter(const char* letters)
 {
     char buf[2];
     char *str = gettext(letters);
@@ -636,277 +636,34 @@ std::string StatusWindow::translateLetter(char* letters)
     return std::string(buf);
 }
 
+std::string StatusWindow::translateLetter2(std::string letters)
+{
+    if (letters.size() < 5)
+        return "";
+
+    return std::string(gettext(letters.substr(1, 1).c_str()));
+}
+
 void StatusWindow::updateStatusBar(ProgressBar *bar, bool percent A_UNUSED)
 {
     if (!player_node || !viewport)
         return;
 
-    std::string str;
-
-    switch (player_node->getInvertDirection())
-    {
-        case 0:
-            str = translateLetter(N_("(D)"));
-            break;
-        case 1:
-            str = translateLetter(N_("(I)"));
-            break;
-        case 2:
-            str = translateLetter(N_("(c)"));
-            break;
-        case 3:
-            str = translateLetter(N_("(C)"));
-            break;
-        case 4:
-            str = translateLetter(N_("(d)"));
-            break;
-        default:
-            str = translateLetter(N_("(?)"));
-            break;
-    }
-
-    if (player_node->getCrazyMoveType() < 10)
-        str += toString(player_node->getCrazyMoveType());
-    else
-    {
-        switch (player_node->getCrazyMoveType())
-        {
-            case 10:
-                str += translateLetter(N_("(a)"));
-                break;
-            default:
-                str += translateLetter(N_("(?)"));
-                break;
-        }
-    }
-
-    switch (player_node->getMoveToTargetType())
-    {
-        case 0:
-            str += translateLetter(N_("(0)"));
-            break;
-        case 1:
-            str += translateLetter(N_("(1)"));
-            break;
-        case 2:
-            str += translateLetter(N_("(2)"));
-            break;
-        case 3:
-            str += translateLetter(N_("(3)"));
-            break;
-        case 4:
-            str += translateLetter(N_("(5)"));
-            break;
-        case 5:
-            str += translateLetter(N_("(7)"));
-            break;
-        case 6:
-            str += translateLetter(N_("(A)"));
-            break;
-        case 7:
-            str += translateLetter(N_("(a)"));
-            break;
-        default:
-            str += translateLetter(N_("(?)"));
-            break;
-    }
-
-    switch (player_node->getFollowMode())
-    {
-        case 0:
-            str += translateLetter(N_("(D)"));
-            break;
-        case 1:
-            str += translateLetter(N_("(R)"));
-            break;
-        case 2:
-            str += translateLetter(N_("(M)"));
-            break;
-        case 3:
-            str += translateLetter(N_("(P)"));
-            break;
-        default:
-            str += translateLetter(N_("(?)"));
-            break;
-    }
-
-    str += " ";
-    switch (player_node->getAttackWeaponType())
-    {
-        case 1:
-            str += translateLetter(N_("(D)"));
-            break;
-        case 2:
-            str += translateLetter(N_("(s)"));
-            break;
-        case 3:
-            str += translateLetter(N_("(S)"));
-            break;
-        default:
-            str += translateLetter(N_("(?)"));
-            break;
-    }
-
-    switch (player_node->getAttackType())
-    {
-        case 0:
-            str += translateLetter(N_("(D)"));
-            break;
-        case 1:
-            str += translateLetter(N_("(G)"));
-            break;
-        case 2:
-            str += translateLetter(N_("(A)"));
-            break;
-        case 3:
-            str += translateLetter(N_("(d)"));
-            break;
-        default:
-            str += translateLetter(N_("(?)"));
-            break;
-    }
-
-    switch (player_node->getMagicAttackType())
-    {
-        case 0:
-            str += translateLetter(N_("(f)"));
-            break;
-        case 1:
-            str += translateLetter(N_("(c)"));
-            break;
-        case 2:
-            str += translateLetter(N_("(I)"));
-            break;
-        case 3:
-            str += translateLetter(N_("(F)"));
-            break;
-        case 4:
-            str += translateLetter(N_("(U)"));
-            break;
-        default:
-            str += translateLetter(N_("(?)"));
-            break;
-    }
-
-    switch (player_node->getPvpAttackType())
-    {
-        case 0:
-            str += translateLetter(N_("(a)"));
-            break;
-        case 1:
-            str += translateLetter(N_("(f)"));
-            break;
-        case 2:
-            str += translateLetter(N_("(b)"));
-            break;
-        case 3:
-            str += translateLetter(N_("(d)"));
-            break;
-        default:
-            str += translateLetter(N_("(?)"));
-            break;
-    }
-
-    str += " " + toString(player_node->getQuickDropCounter());
-
-    switch (player_node->getPickUpType())
-    {
-        case 0:
-            str += translateLetter(N_("(S)"));
-            break;
-        case 1:
-            str += translateLetter(N_("(D)"));
-            break;
-        case 2:
-            str += translateLetter(N_("(F)"));
-            break;
-        case 3:
-            str += translateLetter(N_("(3)"));
-            break;
-        case 4:
-            str += translateLetter(N_("(g)"));
-            break;
-        case 5:
-            str += translateLetter(N_("(G)"));
-            break;
-        case 6:
-            str += translateLetter(N_("(A)"));
-            break;
-        default:
-            str += translateLetter(N_("(?)"));
-            break;
-    }
-
-    str += " ";
-    switch (viewport->getDebugPath())
-    {
-        case 0:
-            str += translateLetter(N_("(N)"));
-            break;
-        case 1:
-            str += translateLetter(N_("(D)"));
-            break;
-        case 2:
-            str += translateLetter(N_("(u)"));
-            break;
-        case 3:
-            str += translateLetter(N_("(U)"));
-            break;
-        case 4:
-            str += translateLetter(N_("(e)"));
-            break;
-        case 5:
-            str += translateLetter(N_("(b)"));
-            break;
-        default:
-            str += translateLetter(N_("(?)"));
-            break;
-    }
-
-    str += " ";
-    switch (player_node->getImitationMode())
-    {
-        case 0:
-            str += translateLetter(N_("(D)"));
-            break;
-        case 1:
-            str += translateLetter(N_("(O)"));
-            break;
-        default:
-            str += translateLetter(N_("(?)"));
-            break;
-    }
-
-    switch (viewport->getCameraMode())
-    {
-        case 0:
-            str += translateLetter(N_("(G)"));
-            break;
-        case 1:
-            str += translateLetter(N_("(F)"));
-            break;
-        case 2:
-            str += translateLetter(N_("(D)"));
-            break;
-        default:
-            str += translateLetter(N_("(?)"));
-            break;
-    }
-
-    switch ((int)player_node->getAway())
-    {
-        case 0:
-            str += translateLetter(N_("(O)"));
-            break;
-        case 1:
-            str += translateLetter(N_("(A)"));
-            break;
-        default:
-            str += translateLetter(N_("(?)"));
-            break;
-    }
+    bar->setText(translateLetter2(player_node->getInvertDirectionString())
+        += translateLetter2(player_node->getCrazyMoveTypeString())
+        += translateLetter2(player_node->getMoveToTargetTypeString())
+        += translateLetter2(player_node->getFollowModeString())
+        += " " + translateLetter2(player_node->getAttackWeaponTypeString())
+        += translateLetter2(player_node->getAttackTypeString())
+        += translateLetter2(player_node->getMagicAttackString())
+        += translateLetter2(player_node->getPvpAttackString())
+        += " " + translateLetter2(player_node->getQuickDropCounterString())
+        += translateLetter2(player_node->getPickUpTypeString())
+        += " " + translateLetter2(player_node->getDebugPathString())
+        += " " + translateLetter2(player_node->getImitationModeString())
+        += translateLetter2(player_node->getCameraModeString())
+        += translateLetter2(player_node->getAwayModeString()));
 
-    bar->setText(str);
     bar->setProgress(50);
     if (player_node->getDisableGameModifiers())
     {
diff --git a/src/gui/statuswindow.h b/src/gui/statuswindow.h
index fa957d059..d3a619bcb 100644
--- a/src/gui/statuswindow.h
+++ b/src/gui/statuswindow.h
@@ -37,12 +37,6 @@ class ProgressBar;
 class ScrollArea;
 class VertContainer;
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 /**
  * The player status dialog.
  *
@@ -82,7 +76,9 @@ class StatusWindow : public Window,
         void action(const gcn::ActionEvent &event);
 
     private:
-        static std::string translateLetter(char* letters);
+        static std::string translateLetter(const char* letters);
+
+        static std::string translateLetter2(std::string letters);
 
         /**
          * Status Part
diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp
index 0246a5b62..9aa6bb956 100644
--- a/src/gui/theme.cpp
+++ b/src/gui/theme.cpp
@@ -599,12 +599,17 @@ std::string Theme::resolveThemePath(const std::string &path)
     else
         file = path;
 
-    // Might be a valid path already
-    if (PHYSFS_exists(file.c_str()))
-        return path;
+    // File with path
+    if (file.find('/') != std::string::npos)
+    {
+        // Might be a valid path already
+        if (PHYSFS_exists(file.c_str()))
+            return path;
+    }
 
     // Try the theme
     file = getThemePath() + "/" + file;
+
     if (PHYSFS_exists(file.c_str()))
         return getThemePath() + "/" + path;
 
diff --git a/src/gui/viewport.h b/src/gui/viewport.h
index 8823928a3..938988198 100644
--- a/src/gui/viewport.h
+++ b/src/gui/viewport.h
@@ -31,12 +31,6 @@
 
 #include <guichan/mouselistener.hpp>
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 class ActorSprite;
 class Button;
 class Being;
diff --git a/src/gui/whoisonline.cpp b/src/gui/whoisonline.cpp
index ead38f42b..e0fa4ebcf 100644
--- a/src/gui/whoisonline.cpp
+++ b/src/gui/whoisonline.cpp
@@ -198,6 +198,7 @@ void WhoIsOnline::loadList()
     std::vector<std::string> friends;
     std::vector<std::string> neutral;
     std::vector<std::string> disregard;
+    std::vector<std::string> enemy;
 
     // Tokenize and add each line separately
     char *line = strtok(mMemoryBuffer, "\n");
@@ -270,6 +271,7 @@ void WhoIsOnline::loadList()
                 switch (player_relations.getRelation(nick))
                 {
                     case PlayerRelation::NEUTRAL:
+                    default:
                         neutral.push_back(prepareNick(nick, level, "0"));
                         break;
 
@@ -282,9 +284,12 @@ void WhoIsOnline::loadList()
                         disregard.push_back(prepareNick(nick, level, "8"));
                         break;
 
+                    case PlayerRelation::ENEMY2:
+                        enemy.push_back(prepareNick(nick, level, "1"));
+                        break;
+
                     case PlayerRelation::IGNORED:
                     case PlayerRelation::ERASED:
-                    default:
                         //Ignore the ignored.
                         break;
                 }
@@ -316,6 +321,16 @@ void WhoIsOnline::loadList()
         mBrowserBox->addRow("---");
         addedFromSection = false;
     }
+    for (int i = 0; i < static_cast<int>(enemy.size()); i++)
+    {
+        mBrowserBox->addRow(enemy.at(i));
+        addedFromSection = true;
+    }
+    if (addedFromSection == true)
+    {
+        mBrowserBox->addRow("---");
+        addedFromSection = false;
+    }
     for (int i = 0; i < static_cast<int>(neutral.size()); i++)
     {
         mBrowserBox->addRow(neutral.at(i));
diff --git a/src/gui/widgets/chattab.h b/src/gui/widgets/chattab.h
index 4e077fafb..962c0b363 100644
--- a/src/gui/widgets/chattab.h
+++ b/src/gui/widgets/chattab.h
@@ -28,11 +28,7 @@
 #include "gui/widgets/browserbox.h"
 #include "gui/widgets/tab.h"
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
+#include "localconsts.h"
 
 class ScrollArea;
 
@@ -58,6 +54,7 @@ class ChatTab : public Tab
          * Constructor.
          */
         ChatTab(const std::string &name);
+
         ~ChatTab();
 
         /**
@@ -106,7 +103,8 @@ class ChatTab : public Tab
          * Add any extra help text to the output. Allows tabs to define help
          * for commands defined by the tab itself.
          */
-        virtual void showHelp() {}
+        virtual void showHelp()
+        { }
 
         /**
          * Handle special commands. Allows a tab to handle commands it
diff --git a/src/gui/widgets/checkbox.h b/src/gui/widgets/checkbox.h
index 4e293aad6..af38065f5 100644
--- a/src/gui/widgets/checkbox.h
+++ b/src/gui/widgets/checkbox.h
@@ -27,12 +27,6 @@
 
 #include "localconsts.h"
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 class Image;
 
 /**
diff --git a/src/gui/widgets/desktop.h b/src/gui/widgets/desktop.h
index 6364ecfe9..b1f059ffe 100644
--- a/src/gui/widgets/desktop.h
+++ b/src/gui/widgets/desktop.h
@@ -27,12 +27,6 @@
 
 #include <guichan/widgetlistener.hpp>
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 class Image;
 
 /**
diff --git a/src/gui/widgets/dropshortcutcontainer.h b/src/gui/widgets/dropshortcutcontainer.h
index 348f48567..1f03fd53b 100644
--- a/src/gui/widgets/dropshortcutcontainer.h
+++ b/src/gui/widgets/dropshortcutcontainer.h
@@ -28,12 +28,6 @@
 
 #include "gui/widgets/shortcutcontainer.h"
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 class Image;
 class Item;
 class ItemPopup;
diff --git a/src/gui/widgets/emoteshortcutcontainer.h b/src/gui/widgets/emoteshortcutcontainer.h
index 06c009f0b..743ca4e87 100644
--- a/src/gui/widgets/emoteshortcutcontainer.h
+++ b/src/gui/widgets/emoteshortcutcontainer.h
@@ -27,12 +27,6 @@
 
 #include <vector>
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 class AnimatedSprite;
 class Image;
 class TextPopup;
diff --git a/src/gui/widgets/flowcontainer.h b/src/gui/widgets/flowcontainer.h
index 2ef6035f0..d1f276b3c 100644
--- a/src/gui/widgets/flowcontainer.h
+++ b/src/gui/widgets/flowcontainer.h
@@ -26,12 +26,6 @@
 
 #include <guichan/widgetlistener.hpp>
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 /**
  * A container that arranges its contents like words on a page.
  *
diff --git a/src/gui/widgets/guitable.h b/src/gui/widgets/guitable.h
index cf3cb8ad8..17f517644 100644
--- a/src/gui/widgets/guitable.h
+++ b/src/gui/widgets/guitable.h
@@ -33,12 +33,6 @@
 
 #include <vector>
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 class GuiTableActionListener;
 
 /**
diff --git a/src/gui/widgets/horizontcontainer.h b/src/gui/widgets/horizontcontainer.h
index 80014c171..2a3f77d2b 100644
--- a/src/gui/widgets/horizontcontainer.h
+++ b/src/gui/widgets/horizontcontainer.h
@@ -26,12 +26,6 @@
 
 #include <guichan/widgetlistener.hpp>
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 /**
  * A widget container.
  *
diff --git a/src/gui/widgets/inventoryfilter.h b/src/gui/widgets/inventoryfilter.h
index be69489a8..c3762189e 100644
--- a/src/gui/widgets/inventoryfilter.h
+++ b/src/gui/widgets/inventoryfilter.h
@@ -27,12 +27,6 @@
 
 #include "gui/widgets/horizontcontainer.h"
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 class InventoryFilter : public HorizontContainer, public gcn::ActionListener
 {
     public:
diff --git a/src/gui/widgets/itemcontainer.h b/src/gui/widgets/itemcontainer.h
index e4188f54b..2c465fdee 100644
--- a/src/gui/widgets/itemcontainer.h
+++ b/src/gui/widgets/itemcontainer.h
@@ -31,12 +31,6 @@
 #include <list>
 #include <algorithm>
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 class Image;
 class Inventory;
 class Item;
diff --git a/src/gui/widgets/itemlinkhandler.h b/src/gui/widgets/itemlinkhandler.h
index 8dd2f62f5..bc3bdc51c 100644
--- a/src/gui/widgets/itemlinkhandler.h
+++ b/src/gui/widgets/itemlinkhandler.h
@@ -25,21 +25,16 @@
 
 #include "gui/widgets/linkhandler.h"
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 class ItemPopup;
 
 class ItemLinkHandler : public LinkHandler
 {
     public:
         ItemLinkHandler();
+
         ~ItemLinkHandler();
-        void handleLink(const std::string &link,
-                        gcn::MouseEvent *event A_UNUSED);
+
+        void handleLink(const std::string &link, gcn::MouseEvent *event);
 
     private:
         ItemPopup *mItemPopup;
diff --git a/src/gui/widgets/itemshortcutcontainer.h b/src/gui/widgets/itemshortcutcontainer.h
index 473cef350..587723279 100644
--- a/src/gui/widgets/itemshortcutcontainer.h
+++ b/src/gui/widgets/itemshortcutcontainer.h
@@ -29,12 +29,6 @@
 
 #include <guichan/mouselistener.hpp>
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 class Image;
 class Item;
 class ItemPopup;
diff --git a/src/gui/widgets/layout.cpp b/src/gui/widgets/layout.cpp
index 7f2f1f621..f0359062e 100644
--- a/src/gui/widgets/layout.cpp
+++ b/src/gui/widgets/layout.cpp
@@ -222,11 +222,15 @@ LayoutCell &LayoutArray::place(gcn::Widget *widget, int x, int y, int w, int h)
     return cell;
 }
 
-void LayoutArray::align(int &pos, int &size, int dim,
-                        LayoutCell const &cell, int *sizes) const
+void LayoutArray::align(int &pos, int &size, int dim, LayoutCell const &cell,
+                        int *sizes, int sizeCount) const
 {
     int size_max = sizes[0];
-    for (int i = 1; i < cell.mExtent[dim]; ++i)
+    int cnt = cell.mExtent[dim];
+    if (sizeCount && cell.mExtent[dim] > sizeCount)
+        cnt = sizeCount;
+
+    for (int i = 1; i < cnt; ++i)
         size_max += sizes[i] + mSpacing;
     size = std::min<int>(cell.mSize[dim], size_max);
 
@@ -274,7 +278,8 @@ std::vector<int> LayoutArray::getSizes(int dim, int upp) const
         }
     }
 
-    if (upp == Layout::AUTO_DEF) return sizes;
+    if (upp == Layout::AUTO_DEF)
+        return sizes;
 
     // Compute the FILL sizes.
     int nb = static_cast<int>(sizes.size());
@@ -343,8 +348,10 @@ void LayoutArray::reflow(int nx, int ny, int nw, int nh)
             if (cell && cell->mType != LayoutCell::NONE)
             {
                 int dx = x, dy = y, dw = 0, dh = 0;
-                align(dx, dw, 0, *cell, &widths[gridX]);
-                align(dy, dh, 1, *cell, &heights[gridY]);
+                align(dx, dw, 0, *cell, &widths[gridX],
+                    widths.size() - gridX);
+                align(dy, dh, 1, *cell, &heights[gridY],
+                    heights.size() - gridY);
                 cell->reflow(dx, dy, dw, dh);
             }
             x += widths[gridX] + mSpacing;
diff --git a/src/gui/widgets/layout.h b/src/gui/widgets/layout.h
index c4c703644..754d13a0b 100644
--- a/src/gui/widgets/layout.h
+++ b/src/gui/widgets/layout.h
@@ -127,8 +127,8 @@ class LayoutArray
         /**
          * Gets the position and size of a widget along a given axis
          */
-        void align(int &pos, int &size, int dim,
-                   LayoutCell const &cell, int *sizes) const;
+        void align(int &pos, int &size, int dim, LayoutCell const &cell,
+                   int *sizes, int sizeCount) const;
 
         /**
          * Ensures the private vectors are large enough.
diff --git a/src/gui/widgets/layouthelper.h b/src/gui/widgets/layouthelper.h
index c38356c07..a01051595 100644
--- a/src/gui/widgets/layouthelper.h
+++ b/src/gui/widgets/layouthelper.h
@@ -27,12 +27,6 @@
 
 #include <guichan/widgetlistener.hpp>
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 /**
  * A helper class for adding a layout to a Guichan container widget. The layout
  * will register itself as a widget listener and relayout the widgets in the
diff --git a/src/gui/widgets/listbox.h b/src/gui/widgets/listbox.h
index 418b83f58..8ac0bbc3b 100644
--- a/src/gui/widgets/listbox.h
+++ b/src/gui/widgets/listbox.h
@@ -25,12 +25,6 @@
 
 #include <guichan/widgets/listbox.hpp>
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 class SelectionListener;
 
 /**
diff --git a/src/gui/widgets/popup.h b/src/gui/widgets/popup.h
index 9d4343ba3..64e4b52ac 100644
--- a/src/gui/widgets/popup.h
+++ b/src/gui/widgets/popup.h
@@ -32,12 +32,6 @@
 #include <guichan/mouselistener.hpp>
 #include <guichan/widgetlistener.hpp>
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 class GraphicsVertexes;
 class Skin;
 class WindowContainer;
diff --git a/src/gui/widgets/radiobutton.h b/src/gui/widgets/radiobutton.h
index 677195bd6..d1c347acb 100644
--- a/src/gui/widgets/radiobutton.h
+++ b/src/gui/widgets/radiobutton.h
@@ -25,12 +25,6 @@
 
 #include <guichan/widgets/radiobutton.hpp>
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 class Image;
 
 /**
diff --git a/src/gui/widgets/scrollarea.h b/src/gui/widgets/scrollarea.h
index 56e21c58c..105791080 100644
--- a/src/gui/widgets/scrollarea.h
+++ b/src/gui/widgets/scrollarea.h
@@ -26,12 +26,6 @@
 #include <guichan/widgets/scrollarea.hpp>
 #include <guichan/widgetlistener.hpp>
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 class GraphicsVertexes;
 class Image;
 class ImageRect;
diff --git a/src/gui/widgets/setupitem.h b/src/gui/widgets/setupitem.h
index 15d2d41ea..5b8a9df87 100644
--- a/src/gui/widgets/setupitem.h
+++ b/src/gui/widgets/setupitem.h
@@ -33,12 +33,6 @@
 
 #include <list>
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 class CheckBox;
 class Configuration;
 class ContainerPlacer;
diff --git a/src/gui/widgets/setuptabscroll.h b/src/gui/widgets/setuptabscroll.h
index d2aa7002f..2b0c6f65e 100644
--- a/src/gui/widgets/setuptabscroll.h
+++ b/src/gui/widgets/setuptabscroll.h
@@ -26,11 +26,7 @@
 #include <map>
 #include <set>
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
+#include "localconsts.h"
 
 class SetupItem;
 class ScrollArea;
diff --git a/src/gui/widgets/shoplistbox.h b/src/gui/widgets/shoplistbox.h
index 38e238f20..c5acbbefc 100644
--- a/src/gui/widgets/shoplistbox.h
+++ b/src/gui/widgets/shoplistbox.h
@@ -25,12 +25,6 @@
 
 #include "gui/widgets/listbox.h"
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 class ShopItems;
 class ItemPopup;
 
@@ -82,7 +76,7 @@ class ShopListBox : public ListBox
 
         void mouseMoved(gcn::MouseEvent &event);
 
-        void mouseExited(gcn::MouseEvent& mouseEvent A_UNUSED);
+        void mouseExited(gcn::MouseEvent& mouseEvent);
 
     private:
         void init();
diff --git a/src/gui/widgets/shortcutcontainer.h b/src/gui/widgets/shortcutcontainer.h
index df8529bd5..8587950c6 100644
--- a/src/gui/widgets/shortcutcontainer.h
+++ b/src/gui/widgets/shortcutcontainer.h
@@ -29,12 +29,6 @@
 
 #include "gui/widgets/tab.h"
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 class Image;
 
 /**
@@ -55,7 +49,8 @@ class ShortcutContainer : public gcn::Widget,
         /**
          * Destructor.
          */
-        ~ShortcutContainer() {}
+        ~ShortcutContainer()
+        { }
 
         /**
          * Draws the shortcuts
diff --git a/src/gui/widgets/slider.h b/src/gui/widgets/slider.h
index 619c0c795..9ac45d0a0 100644
--- a/src/gui/widgets/slider.h
+++ b/src/gui/widgets/slider.h
@@ -25,12 +25,6 @@
 
 #include <guichan/widgets/slider.hpp>
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 class Image;
 
 /**
diff --git a/src/gui/widgets/spellshortcutcontainer.h b/src/gui/widgets/spellshortcutcontainer.h
index 88b00338a..4191f9921 100644
--- a/src/gui/widgets/spellshortcutcontainer.h
+++ b/src/gui/widgets/spellshortcutcontainer.h
@@ -27,13 +27,6 @@
 #include <guichan/mouselistener.hpp>
 
 #include "gui/widgets/shortcutcontainer.h"
-//#include "textcommand.h"
-
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
 
 class Image;
 class SpellPopup;
diff --git a/src/gui/widgets/tabbedarea.h b/src/gui/widgets/tabbedarea.h
index af241d7c5..d71109dd3 100644
--- a/src/gui/widgets/tabbedarea.h
+++ b/src/gui/widgets/tabbedarea.h
@@ -32,12 +32,6 @@
 
 #include <string>
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 class Tab;
 
 /**
diff --git a/src/gui/widgets/vertcontainer.h b/src/gui/widgets/vertcontainer.h
index 3b0ceeca7..08546aa47 100644
--- a/src/gui/widgets/vertcontainer.h
+++ b/src/gui/widgets/vertcontainer.h
@@ -28,12 +28,6 @@
 
 #include <vector>
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 /**
  * A widget container.
  *
diff --git a/src/gui/widgets/whispertab.cpp b/src/gui/widgets/whispertab.cpp
index c99c4e0c5..33859d8be 100644
--- a/src/gui/widgets/whispertab.cpp
+++ b/src/gui/widgets/whispertab.cpp
@@ -165,3 +165,8 @@ void WhisperTab::saveToLogFile(std::string &msg)
     if (chatLogger)
         chatLogger->log(getNick(), msg);
 }
+
+void WhisperTab::getAutoCompleteList(std::vector<std::string> &names) const
+{
+    names.push_back(mNick);
+}
diff --git a/src/gui/widgets/whispertab.h b/src/gui/widgets/whispertab.h
index 5bca422a6..8678c932c 100644
--- a/src/gui/widgets/whispertab.h
+++ b/src/gui/widgets/whispertab.h
@@ -33,7 +33,8 @@ class Channel;
 class WhisperTab : public ChatTab
 {
     public:
-        const std::string &getNick() const { return mNick; }
+        const std::string &getNick() const
+        { return mNick; }
 
         void showHelp();
 
@@ -45,6 +46,8 @@ class WhisperTab : public ChatTab
 
         void saveToLogFile(std::string &msg);
 
+        void getAutoCompleteList(std::vector<std::string> &names) const;
+
     protected:
         friend class ChatWindow;
 
diff --git a/src/gui/widgets/window.h b/src/gui/widgets/window.h
index 5ace2328e..6249626d3 100644
--- a/src/gui/widgets/window.h
+++ b/src/gui/widgets/window.h
@@ -31,12 +31,6 @@
 
 #include <guichan/widgets/window.hpp>
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 class ContainerPlacer;
 class GraphicsVertexes;
 class Layout;
diff --git a/src/gui/windowmenu.h b/src/gui/windowmenu.h
index 739a302ba..3f02ea851 100644
--- a/src/gui/windowmenu.h
+++ b/src/gui/windowmenu.h
@@ -29,15 +29,11 @@
 #include <guichan/actionlistener.hpp>
 #include <guichan/selectionlistener.hpp>
 
+#include "localconsts.h"
+
 #include <map>
 #include <vector>
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 class EmotePopup;
 class TextPopup;
 
diff --git a/src/imagesprite.h b/src/imagesprite.h
index 21705c812..9dad0f743 100644
--- a/src/imagesprite.h
+++ b/src/imagesprite.h
@@ -22,12 +22,6 @@
 #ifndef IMAGESPRITE_H
 #define IMAGESPRITE_H
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 #include "sprite.h"
 
 #include "resources/image.h"
@@ -73,6 +67,9 @@ public:
     unsigned int getFrameCount() const
     { return 1; }
 
+    bool updateNumber(unsigned num A_UNUSED)
+    { return false; }
+
 private:
     Image *mImage;
 };
diff --git a/src/localconsts.h b/src/localconsts.h
index cd7fcd955..e135a4108 100644
--- a/src/localconsts.h
+++ b/src/localconsts.h
@@ -22,3 +22,9 @@
 #undef nullptr
 #define nullptr 0
 #endif
+
+#ifdef __GNUC__
+#define A_UNUSED  __attribute__ ((unused))
+#else
+#define A_UNUSED
+#endif
+\ No newline at end of file
diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index 0739ab538..cbf75a5f9 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -190,7 +190,6 @@ LocalPlayer::LocalPlayer(int id, int subtype):
     PlayerInfo::setStatMod(WALK_SPEED, 0);
 
     loadHomes();
-//    initTargetCursor();
 
     config.addListener("showownname", this);
     config.addListener("targetDeadPlayers", this);
@@ -278,16 +277,12 @@ void LocalPlayer::logic()
     {
         if (mMessageTime == 0)
         {
-            //const Vector &pos = getPosition();
-
             MessagePair info = mMessages.front();
 
             if (particleEngine)
             {
                 particleEngine->addTextRiseFadeOutEffect(
                     info.first,
-                    /*(int) pos.x,
-                    (int) pos.y - 48,*/
                     getPixelX(),
                     getPixelY() - 48,
                     &userPalette->getColor(info.second),
@@ -818,8 +813,6 @@ void LocalPlayer::nextTile(unsigned char dir A_UNUSED = 0)
     if (Net::getNetworkType() != ServerInfo::MANASERV)
 #endif
     {
-//        updatePos();
-
         if (Party::getParty(1))
         {
             PartyMember *pm = Party::getParty(1)->getMember(getName());
@@ -973,7 +966,6 @@ bool LocalPlayer::pickUp(FloorItem *item)
 
             mPickUpTarget = item;
             mPickUpTarget->addActorSpriteListener(this);
-//            stopAttack();
         }
     }
     return true;
@@ -1867,84 +1859,384 @@ void LocalPlayer::moveToHome()
     }
 }
 
-void LocalPlayer::changeAttackWeaponType()
-{
-    mAttackWeaponType++;
-    if (mAttackWeaponType > 3)
-        mAttackWeaponType = 1;
-
-    config.setValue("attackWeaponType", mAttackWeaponType);
-    if (miniStatusWindow)
-        miniStatusWindow->updateStatus();
-}
+static const unsigned invertDirectionSize = 5;
 
-void LocalPlayer::changeAttackType()
+void LocalPlayer::changeMode(unsigned *var, unsigned limit, const char *conf,
+                             std::string (LocalPlayer::*func)(), unsigned def)
 {
-    mAttackType++;
-    if (mAttackType > 3)
-        mAttackType = 0;
-
-    config.setValue("attackType", mAttackType);
+    (*var) ++;
+    if (*var >= limit)
+        *var = def;
+    config.setValue(conf, *var);
     if (miniStatusWindow)
         miniStatusWindow->updateStatus();
+    const std::string str = (this->*func)();
+    if (str.size() > 4)
+        debugMsg(str.substr(4));
 }
 
 void LocalPlayer::invertDirection()
 {
     mMoveState = 0;
-    mInvertDirection ++;
-    if (mInvertDirection > 4)
-        mInvertDirection = 0;
-    config.setValue("invertMoveDirection", mInvertDirection);
-    if (miniStatusWindow)
-        miniStatusWindow->updateStatus();
+    changeMode(&mInvertDirection, invertDirectionSize, "invertMoveDirection",
+        &LocalPlayer::getInvertDirectionString);
+}
+
+static const char *invertDirectionStrings[] =
+{
+    N_("(D) default moves"),
+    N_("(I) invert moves"),
+    N_("(c) moves with some crazy moves"),
+    N_("(C) moves with crazy moves"),
+    N_("(d) double normal + crazy"),
+    N_("(?) unknown move")
+};
+
+std::string LocalPlayer::getInvertDirectionString()
+{
+    return gettext(getVarItem(&invertDirectionStrings[0],
+        mInvertDirection, invertDirectionSize));
 }
 
+static const unsigned crazyMoveTypeSize = 11;
+
 void LocalPlayer::changeCrazyMoveType()
 {
     mCrazyMoveState = 0;
-    mCrazyMoveType++;
-    if (mCrazyMoveType > 10)
-        mCrazyMoveType = 1;
+    changeMode(&mCrazyMoveType, crazyMoveTypeSize, "crazyMoveType",
+        &LocalPlayer::getCrazyMoveTypeString, 1);
+}
 
-    config.setValue("crazyMoveType", mCrazyMoveType);
-    if (miniStatusWindow)
-        miniStatusWindow->updateStatus();
+std::string LocalPlayer::getCrazyMoveTypeString()
+{
+    if (mCrazyMoveType < crazyMoveTypeSize - 1)
+    {
+        return strprintf(_("(%d) crazy move number %d"),
+            mCrazyMoveType, mCrazyMoveType);
+    }
+    else if (mCrazyMoveType == crazyMoveTypeSize - 1)
+    {
+        return _("(a) custom crazy move");
+    }
+    else
+    {
+        return _("(?) crazy move");
+    }
 }
 
-void LocalPlayer::changePickUpType()
+static const unsigned moveToTargetTypeSize = 8;
+
+void LocalPlayer::changeMoveToTargetType()
 {
-    mPickUpType++;
-    if (mPickUpType > 6)
-        mPickUpType = 0;
+    changeMode(&mMoveToTargetType, moveToTargetTypeSize, "moveToTargetType",
+        &LocalPlayer::getMoveToTargetTypeString);
+}
 
-    config.setValue("pickUpType", mPickUpType);
-    if (miniStatusWindow)
-        miniStatusWindow->updateStatus();
+static const char *moveToTargetTypeStrings[] =
+{
+    N_("(0) default moves to target"),
+    N_("(1) moves to target in distance 1"),
+    N_("(2) moves to target in distance 2"),
+    N_("(3) moves to target in distance 3"),
+    N_("(5) moves to target in distance 5"),
+    N_("(7) moves to target in distance 7"),
+    N_("(A) moves to target in attack range"),
+    N_("(a) archer attack range"),
+    N_("(?) move to target")
+};
+
+std::string LocalPlayer::getMoveToTargetTypeString()
+{
+    return gettext(getVarItem(&moveToTargetTypeStrings[0],
+        mMoveToTargetType, moveToTargetTypeSize));
 }
 
+static const unsigned followModeSize = 4;
+
 void LocalPlayer::changeFollowMode()
 {
-    mFollowMode++;
-    if (mFollowMode > 3)
-        mFollowMode = 0;
+    changeMode(&mFollowMode, followModeSize, "followMode",
+        &LocalPlayer::getFollowModeString);
+}
 
-    config.setValue("followMode", mFollowMode);
-    if (miniStatusWindow)
-        miniStatusWindow->updateStatus();
+static const char *followModeStrings[] =
+{
+    N_("(D) default follow"),
+    N_("(R) relative follow"),
+    N_("(M) mirror follow"),
+    N_("(P) pet follow"),
+    N_("(?) unknown follow")
+};
+
+std::string LocalPlayer::getFollowModeString()
+{
+    return gettext(getVarItem(&followModeStrings[0],
+        mFollowMode, followModeSize));
+}
+
+const unsigned attackWeaponTypeSize = 4;
+
+void LocalPlayer::changeAttackWeaponType()
+{
+    changeMode(&mAttackWeaponType, attackWeaponTypeSize, "attackWeaponType",
+        &LocalPlayer::getAttackWeaponTypeString, 1);
+}
+
+static const char *attackWeaponTypeStrings[] =
+{
+    N_("(?) attack"),
+    N_("(D) default attack"),
+    N_("(s) switch attack without shield"),
+    N_("(S) switch attack with shield"),
+    N_("(?) attack")
+};
+
+std::string LocalPlayer::getAttackWeaponTypeString()
+{
+    return gettext(getVarItem(&attackWeaponTypeStrings[0],
+        mAttackWeaponType, attackWeaponTypeSize));
+}
+
+const unsigned attackTypeSize = 4;
+
+void LocalPlayer::changeAttackType()
+{
+    changeMode(&mAttackType, attackTypeSize, "attackType",
+        &LocalPlayer::getAttackTypeString);
+}
+
+static const char *attackTypeStrings[] =
+{
+    N_("(D) default attack"),
+    N_("(G) go and attack"),
+    N_("(A) go, attack, pickup"),
+    N_("(d) without auto attack"),
+    N_("(?) attack")
+};
+
+std::string LocalPlayer::getAttackTypeString()
+{
+    return gettext(getVarItem(&attackTypeStrings[0],
+        mAttackType, attackTypeSize));
 }
 
+const unsigned quickDropCounterSize = 10;
+
+void LocalPlayer::changeQuickDropCounter()
+{
+    changeMode(&mQuickDropCounter, quickDropCounterSize, "quickDropCounter",
+        &LocalPlayer::getQuickDropCounterString, 1);
+}
+
+std::string LocalPlayer::getQuickDropCounterString()
+{
+    return strprintf("(%d) drop counter %d",
+        mQuickDropCounter, mQuickDropCounter);
+}
+
+const unsigned pickUpTypeSize = 7;
+
+void LocalPlayer::changePickUpType()
+{
+    changeMode(&mPickUpType, pickUpTypeSize, "pickUpType",
+        &LocalPlayer::getPickUpTypeString);
+}
+
+static const char *pickUpTypeStrings[] =
+{
+    N_("(S) small pick up 1x1 cells"),
+    N_("(D) default pick up 2x1 cells"),
+    N_("(F) forward pick up 2x3 cells"),
+    N_("(3) pick up 3x3 cells"),
+    N_("(g) go and pick up in distance 4"),
+    N_("(G) go and pick up in distance 8"),
+    N_("(A) go and pick up in max distance"),
+    N_("(?) pick up")
+};
+
+std::string LocalPlayer::getPickUpTypeString()
+{
+    return gettext(getVarItem(&pickUpTypeStrings[0],
+        mPickUpType, pickUpTypeSize));
+}
+
+const unsigned debugPathSize = 5;
+
+static const char *debugPathStrings[] =
+{
+    N_("(N) normal map view"),
+    N_("(D) debug map view"),
+    N_("(u) ultra map view"),
+    N_("(U) ultra map view 2"),
+    N_("(e) empty map view"),
+    N_("(b) black & white map view")
+};
+
+std::string LocalPlayer::getDebugPathString()
+{
+    return gettext(getVarItem(&debugPathStrings[0],
+        viewport->getDebugPath(), debugPathSize));
+}
+
+const unsigned magicAttackSize = 5;
+
+void LocalPlayer::switchMagicAttack()
+{
+    changeMode(&mMagicAttackType, magicAttackSize, "magicAttackType",
+        &LocalPlayer::getMagicAttackString);
+}
+
+static const char *magicAttackStrings[] =
+{
+    N_("(f) use #flar for magic attack"),
+    N_("(c) use #chiza for magic attack"),
+    N_("(I) use #ingrav for magic attack"),
+    N_("(F) use #frillyar for magic attack"),
+    N_("(U) use #upmarmu for magic attack"),
+    N_("(?) magic attack")
+};
+
+std::string LocalPlayer::getMagicAttackString()
+{
+    return gettext(getVarItem(&magicAttackStrings[0],
+        mMagicAttackType, magicAttackSize));
+}
+
+const unsigned pvpAttackSize = 4;
+
+void LocalPlayer::switchPvpAttack()
+{
+    changeMode(&mPvpAttackType, pvpAttackSize, "pvpAttackType",
+        &LocalPlayer::getPvpAttackString);
+}
+
+static const char *pvpAttackStrings[] =
+{
+    N_("(a) attack all players"),
+    N_("(f) attack not friends"),
+    N_("(b) attack bad relations"),
+    N_("(d) dont attack players"),
+    N_("(?) pvp attack")
+};
+
+std::string LocalPlayer::getPvpAttackString()
+{
+    return gettext(getVarItem(&pvpAttackStrings[0],
+        mPvpAttackType, pvpAttackSize));
+}
+
+const unsigned imitationModeSize = 2;
+
 void LocalPlayer::changeImitationMode()
 {
-    mImitationMode++;
-    if (mImitationMode > 1)
-        mImitationMode = 0;
+    changeMode(&mImitationMode, imitationModeSize, "imitationMode",
+        &LocalPlayer::getImitationModeString);
+}
 
-    config.setValue("imitationMode", mImitationMode);
+static const char *imitationModeStrings[] =
+{
+    N_("(D) default imitation"),
+    N_("(O) outfits imitation"),
+    N_("(?) imitation")
+};
+
+std::string LocalPlayer::getImitationModeString()
+{
+    return gettext(getVarItem(&imitationModeStrings[0],
+        mImitationMode, imitationModeSize));
+}
+
+const unsigned awayModeSize = 2;
+
+void LocalPlayer::changeAwayMode()
+{
+    mAwayMode = !mAwayMode;
+    mAfkTime = 0;
+    mInactive = false;
+    updateName();
     if (miniStatusWindow)
         miniStatusWindow->updateStatus();
+    if (mAwayMode)
+    {
+        if (chatWindow)
+            chatWindow->clearAwayLog();
+
+        cancelFollow();
+        navigateClean();
+        if (outfitWindow)
+            outfitWindow->wearAwayOutfit();
+        mAwayDialog = new OkDialog(_("Away"),
+            config.getStringValue("afkMessage"), true, false);
+        mAwayDialog->addActionListener(mAwayListener);
+        sound.volumeOff();
+    }
+    else
+    {
+        mAwayDialog = nullptr;
+        sound.volumeRestore();
+        if (chatWindow)
+        {
+            chatWindow->displayAwayLog();
+            chatWindow->clearAwayLog();
+        }
+    }
+}
+
+static const char *awayModeStrings[] =
+{
+    N_("(O) on keyboard"),
+    N_("(A) away"),
+    N_("(?) away")
+};
+
+std::string LocalPlayer::getAwayModeString()
+{
+    return gettext(getVarItem(&awayModeStrings[0],
+        mAwayMode, awayModeSize));
+}
+
+const unsigned cameraModeSize = 2;
+
+static const char *cameraModeStrings[] =
+{
+    N_("(G) game camera mode"),
+    N_("(F) free camera mode"),
+    N_("(?) away")
+};
+
+std::string LocalPlayer::getCameraModeString()
+{
+    return gettext(getVarItem(&cameraModeStrings[0],
+        viewport->getCameraMode(), cameraModeSize));
 }
 
+const unsigned gameModifiersSize = 2;
+
+void LocalPlayer::switchGameModifiers()
+{
+    mDisableGameModifiers = !mDisableGameModifiers;
+    config.setValue("disableGameModifiers", mDisableGameModifiers);
+    miniStatusWindow->updateStatus();
+
+    const std::string str = getGameModifiersString();
+    if (str.size() > 4)
+        debugMsg(str.substr(4));
+}
+
+static const char *gameModifiersStrings[] =
+{
+    _("Game modifiers are enabled"),
+    _("Game modifiers are disabled"),
+    _("Game modifiers are unknown")
+};
+
+std::string LocalPlayer::getGameModifiersString()
+{
+    return gettext(getVarItem(&gameModifiersStrings[0],
+        mDisableGameModifiers, gameModifiersSize));
+}
+
+
 void LocalPlayer::changeEquipmentBeforeAttack(Being* target)
 {
     if (mAttackWeaponType == 1 || !target || !PlayerInfo::getInventory())
@@ -2742,10 +3034,7 @@ bool LocalPlayer::pickUpItems(int pickUpType)
             }
             item = actorSpriteManager->findItem(x, y);
             if (item)
-            {
                 status = pickUp(item);
-//                status = true;
-            }
             break;
         case 2:
             switch (mDirection)
@@ -2806,15 +3095,6 @@ bool LocalPlayer::pickUpItems(int pickUpType)
     return status;
 }
 
-void LocalPlayer::changeQuickDropCounter()
-{
-    mQuickDropCounter++;
-    if (mQuickDropCounter > 9)
-        mQuickDropCounter = 1;
-
-    config.setValue("quickDropCounter", mQuickDropCounter);
-    miniStatusWindow->updateStatus();
-}
 
 void LocalPlayer::moveByDirection(unsigned char dir)
 {
@@ -2891,28 +3171,6 @@ void LocalPlayer::debugMsg(std::string str)
         debugChatTab->chatLog(str);
 }
 
-void LocalPlayer::switchMagicAttack()
-{
-    mMagicAttackType++;
-    if (mMagicAttackType > 4)
-        mMagicAttackType = 0;
-
-    config.setValue("magicAttackType", mMagicAttackType);
-    if (miniStatusWindow)
-        miniStatusWindow->updateStatus();
-}
-
-void LocalPlayer::switchPvpAttack()
-{
-    mPvpAttackType++;
-    if (mPvpAttackType > 3)
-        mPvpAttackType = 0;
-
-    config.setValue("pvpAttackType", mPvpAttackType);
-    if (miniStatusWindow)
-        miniStatusWindow->updateStatus();
-}
-
 void LocalPlayer::magicAttack()
 {
     if (!chatWindow || !isAlive()
@@ -2970,17 +3228,6 @@ void LocalPlayer::tryMagic(std::string spell, int baseMagic,
     }
 }
 
-void LocalPlayer::changeMoveToTargetType()
-{
-    mMoveToTargetType++;
-    if (mMoveToTargetType > 7)
-        mMoveToTargetType = 0;
-
-    config.setValue("moveToTargetType", mMoveToTargetType);
-    if (miniStatusWindow)
-        miniStatusWindow->updateStatus();
-}
-
 void LocalPlayer::loadHomes()
 {
     std::string homeStr = serverConfig.getValue("playerHomes",
@@ -3136,14 +3383,6 @@ void LocalPlayer::saveHomes()
     serverConfig.setValue("playerHomes", ss.str());
 }
 
-
-void LocalPlayer::switchGameModifiers()
-{
-    mDisableGameModifiers = !mDisableGameModifiers;
-    config.setValue("disableGameModifiers", mDisableGameModifiers);
-    miniStatusWindow->updateStatus();
-}
-
 void LocalPlayer::pingRequest()
 {
     if (mWaitPing == true && mPingSendTick != 0)
@@ -3186,39 +3425,6 @@ void LocalPlayer::tryPingRequest()
     }
 }
 
-void LocalPlayer::changeAwayMode()
-{
-    mAwayMode = !mAwayMode;
-    mAfkTime = 0;
-    mInactive = false;
-    updateName();
-    if (miniStatusWindow)
-        miniStatusWindow->updateStatus();
-    if (mAwayMode)
-    {
-        if (chatWindow)
-            chatWindow->clearAwayLog();
-
-        cancelFollow();
-        navigateClean();
-        if (outfitWindow)
-            outfitWindow->wearAwayOutfit();
-        mAwayDialog = new OkDialog(_("Away"),
-            config.getStringValue("afkMessage"), true, false);
-        mAwayDialog->addActionListener(mAwayListener);
-        sound.volumeOff();
-    }
-    else
-    {
-        mAwayDialog = nullptr;
-        sound.volumeRestore();
-        if (chatWindow)
-        {
-            chatWindow->displayAwayLog();
-            chatWindow->clearAwayLog();
-        }
-    }
-}
 
 void LocalPlayer::setAway(const std::string &message)
 {
@@ -3424,7 +3630,6 @@ void LocalPlayer::updateCoords()
                     tmpLayer->clean();
                     tmpLayer->addRoad(mNavigatePath);
                 }
-//                navigateTo(mNavigateX, mNavigateY);
             }
         }
     }
@@ -3981,6 +4186,15 @@ bool LocalPlayer::checAttackPermissions(Being *target)
     }
 }
 
+
+const char *LocalPlayer::getVarItem(const char **arr, unsigned index,
+                                    unsigned sz)
+{
+    if (index < sz)
+        return arr[index];
+    return arr[sz];
+}
+
 void AwayListener::action(const gcn::ActionEvent &event)
 {
     if (event.getId() == "ok" && player_node && player_node->getAway())
diff --git a/src/localplayer.h b/src/localplayer.h
index 08ebbe841..5b755e4f6 100644
--- a/src/localplayer.h
+++ b/src/localplayer.h
@@ -37,12 +37,6 @@
 #include <memory>
 #include <vector>
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 class ChatTab;
 class FloorItem;
 class ImageSet;
@@ -483,6 +477,36 @@ class LocalPlayer : public Being, public ActorSpriteListener,
 
         bool checAttackPermissions(Being *target);
 
+        std::string getInvertDirectionString();
+
+        std::string getCrazyMoveTypeString();
+
+        std::string getMoveToTargetTypeString();
+
+        std::string getFollowModeString();
+
+        std::string getAttackWeaponTypeString();
+
+        std::string getAttackTypeString();
+
+        std::string getQuickDropCounterString();
+
+        std::string getPickUpTypeString();
+
+        std::string getDebugPathString();
+
+        std::string getMagicAttackString();
+
+        std::string getPvpAttackString();
+
+        std::string getImitationModeString();
+
+        std::string getAwayModeString();
+
+        std::string getCameraModeString();
+
+        std::string getGameModifiersString();
+
     protected:
         /** Whether or not the name settings have changed */
         bool mUpdateName;
@@ -496,6 +520,11 @@ class LocalPlayer : public Being, public ActorSpriteListener,
         void tryMagic(std::string spell, int baseMagic,
                       int schoolMagic, int mana);
 
+        const char *getVarItem(const char **arr, unsigned index, unsigned sz);
+
+        void changeMode(unsigned *var, unsigned limit, const char *conf,
+                        std::string (LocalPlayer::*func)(), unsigned def = 0);
+
         void crazyMove1();
         void crazyMove2();
         void crazyMove3();
diff --git a/src/main.h b/src/main.h
index f0f3b8c2c..6f7c0980a 100644
--- a/src/main.h
+++ b/src/main.h
@@ -45,8 +45,8 @@
  * different interfaces, which have different implementations for each server.
  */
 
-#define SMALL_VERSION "1.1.11.12"
-#define CHECK_VERSION "01.01.11.12"
+#define SMALL_VERSION "1.1.11.27"
+#define CHECK_VERSION "01.01.11.27"
 
 #ifdef HAVE_CONFIG_H
 #include "../config.h"
@@ -98,10 +98,4 @@
 #define PKG_DATADIR ""
 #endif
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 #endif
diff --git a/src/map.cpp b/src/map.cpp
index bcf2b22fe..e706f120b 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -85,7 +85,7 @@ class ActorFunctuator
         {
             if (!a || !b)
                 return false;
-            return a->getPixelY() < b->getPixelY();
+            return a->getSortPixelY() < b->getSortPixelY();
         }
 } actorCompare;
 
diff --git a/src/map.h b/src/map.h
index 3fa607116..79dd01c41 100644
--- a/src/map.h
+++ b/src/map.h
@@ -32,12 +32,6 @@
 #include <string>
 #include <vector>
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 class Animation;
 class AmbientLayer;
 class Graphics;
diff --git a/src/net/charhandler.h b/src/net/charhandler.h
index 72a81684c..848354e96 100644
--- a/src/net/charhandler.h
+++ b/src/net/charhandler.h
@@ -90,6 +90,8 @@ class CharHandler
 
         virtual unsigned int maxSprite() const = 0;
 
+        virtual void clear() = 0;
+
     protected:
         CharHandler() :
             mSelectedCharacter(0),
diff --git a/src/net/download.h b/src/net/download.h
index 12c0c07d7..8339dee30 100644
--- a/src/net/download.h
+++ b/src/net/download.h
@@ -28,12 +28,6 @@
 #include <stdio.h>
 #include <string>
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 enum DownloadStatus
 {
     DOWNLOAD_STATUS_CANCELLED = -3,
diff --git a/src/net/ea/adminhandler.h b/src/net/ea/adminhandler.h
index 2e311881f..5d1b7aa14 100644
--- a/src/net/ea/adminhandler.h
+++ b/src/net/ea/adminhandler.h
@@ -26,12 +26,6 @@
 #include "net/adminhandler.h"
 #include "net/net.h"
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 namespace Ea
 {
 
diff --git a/src/net/ea/beinghandler.cpp b/src/net/ea/beinghandler.cpp
index 5c3c694b3..1c2983137 100644
--- a/src/net/ea/beinghandler.cpp
+++ b/src/net/ea/beinghandler.cpp
@@ -215,10 +215,10 @@ void BeingHandler::processBeingVisibleOrMove(Net::MessageIn &msg, bool visible)
             int maxHP = msg.readInt32();
             if (hp && maxHP)
             {
+                dstBeing->setMaxHP(maxHP);
                 int oldHP = dstBeing->getHP();
                 if (!oldHP || oldHP > hp)
                     dstBeing->setHP(hp);
-                dstBeing->setMaxHP(maxHP);
             }
         }
         else
diff --git a/src/net/ea/beinghandler.h b/src/net/ea/beinghandler.h
index f3769943d..f47385a61 100644
--- a/src/net/ea/beinghandler.h
+++ b/src/net/ea/beinghandler.h
@@ -26,12 +26,6 @@
 #include "net/beinghandler.h"
 #include "net/net.h"
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 namespace Ea
 {
 
diff --git a/src/net/ea/charserverhandler.cpp b/src/net/ea/charserverhandler.cpp
index 0c01959f2..63e267584 100644
--- a/src/net/ea/charserverhandler.cpp
+++ b/src/net/ea/charserverhandler.cpp
@@ -33,8 +33,11 @@
 #include "net/ea/loginhandler.h"
 #include "net/ea/eaprotocol.h"
 
+#include "utils/dtor.h"
 #include "utils/gettext.h"
 
+#include "resources/chardb.h"
+
 #include "debug.h"
 
 extern Net::CharHandler *charHandler;
@@ -70,7 +73,17 @@ void CharServerHandler::setCharCreateDialog(CharCreateDialog *window)
     const Token &token =
         static_cast<LoginHandler*>(Net::getLoginHandler())->getToken();
 
-    mCharCreateDialog->setAttributes(attributes, 30, 1, 9);
+    int minStat = CharDB::getMinStat();
+    if (!minStat)
+        minStat = 1;
+    int maxStat = CharDB::getMaxStat();
+    if (!maxStat)
+        maxStat = 9;
+    int sumStat = CharDB::getSumStat();
+    if (!sumStat)
+        sumStat = 30;
+
+    mCharCreateDialog->setAttributes(attributes, sumStat, minStat, maxStat);
     mCharCreateDialog->setFixedGender(true, token.sex);
 }
 
@@ -172,4 +185,10 @@ void CharServerHandler::processCharDeleteFailed(Net::MessageIn &msg A_UNUSED)
     new OkDialog(_("Error"), _("Failed to delete character."));
 }
 
+void CharServerHandler::clear()
+{
+    delete_all(mCharacters);
+    mCharacters.clear();
+}
+
 } // namespace Ea
diff --git a/src/net/ea/charserverhandler.h b/src/net/ea/charserverhandler.h
index bd39781cd..bacde67b6 100644
--- a/src/net/ea/charserverhandler.h
+++ b/src/net/ea/charserverhandler.h
@@ -28,12 +28,6 @@
 #include "net/net.h"
 #include "net/serverinfo.h"
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 class LoginData;
 
 namespace Ea
@@ -78,6 +72,8 @@ class CharServerHandler : public Net::CharHandler
 
         virtual void processCharDeleteFailed(Net::MessageIn &msg);
 
+        virtual void clear();
+
     protected:
         virtual void readPlayerData(Net::MessageIn &msg,
                                     Net::Character *character,
diff --git a/src/net/ea/chathandler.h b/src/net/ea/chathandler.h
index cff9bf589..d39e6788a 100644
--- a/src/net/ea/chathandler.h
+++ b/src/net/ea/chathandler.h
@@ -30,12 +30,6 @@
 
 #include <queue>
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 namespace Ea
 {
 
diff --git a/src/net/ea/gamehandler.h b/src/net/ea/gamehandler.h
index 6d8b88bd4..511efe357 100644
--- a/src/net/ea/gamehandler.h
+++ b/src/net/ea/gamehandler.h
@@ -29,12 +29,6 @@
 #include "net/messagein.h"
 #include "net/net.h"
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 namespace Ea
 {
 
diff --git a/src/net/ea/guildhandler.h b/src/net/ea/guildhandler.h
index 06edb2e89..5b090ec41 100644
--- a/src/net/ea/guildhandler.h
+++ b/src/net/ea/guildhandler.h
@@ -27,12 +27,6 @@
 
 #include "net/ea/gui/guildtab.h"
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 namespace Ea
 {
 
diff --git a/src/net/ea/inventoryhandler.h b/src/net/ea/inventoryhandler.h
index d99e34fc6..6db6b18ed 100644
--- a/src/net/ea/inventoryhandler.h
+++ b/src/net/ea/inventoryhandler.h
@@ -38,12 +38,6 @@
 #include <vector>
 #include <queue>
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 namespace Ea
 {
 
diff --git a/src/net/ea/loginhandler.h b/src/net/ea/loginhandler.h
index 06c47ad5d..62ace31c8 100644
--- a/src/net/ea/loginhandler.h
+++ b/src/net/ea/loginhandler.h
@@ -31,12 +31,6 @@
 
 #include <string>
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 class LoginData;
 
 namespace Ea
diff --git a/src/net/ea/npchandler.h b/src/net/ea/npchandler.h
index 44c1c5fb3..3e68c2321 100644
--- a/src/net/ea/npchandler.h
+++ b/src/net/ea/npchandler.h
@@ -29,12 +29,6 @@
 
 #include <map>
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 class NpcDialog;
 
 namespace Ea
diff --git a/src/net/ea/partyhandler.cpp b/src/net/ea/partyhandler.cpp
index 5fa0df29b..8373cb1c4 100644
--- a/src/net/ea/partyhandler.cpp
+++ b/src/net/ea/partyhandler.cpp
@@ -225,6 +225,7 @@ void PartyHandler::processPartySettings(Net::MessageIn &msg)
             return;
 
         Ea::partyTab = new PartyTab();
+        Ea::partyTab->loadFromLogFile("#Party");
     }
 
     // These seem to indicate the sharing mode for exp and items
diff --git a/src/net/ea/partyhandler.h b/src/net/ea/partyhandler.h
index 6ba0d0b82..596fda4f7 100644
--- a/src/net/ea/partyhandler.h
+++ b/src/net/ea/partyhandler.h
@@ -29,12 +29,6 @@
 
 #include "party.h"
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 namespace Ea
 {
 
diff --git a/src/net/ea/playerhandler.h b/src/net/ea/playerhandler.h
index 57bcbdcd5..ceb4aba0b 100644
--- a/src/net/ea/playerhandler.h
+++ b/src/net/ea/playerhandler.h
@@ -27,12 +27,6 @@
 #include "net/net.h"
 #include "net/playerhandler.h"
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 namespace Ea
 {
 
diff --git a/src/net/ea/specialhandler.h b/src/net/ea/specialhandler.h
index 06e8f8893..47b412f3e 100644
--- a/src/net/ea/specialhandler.h
+++ b/src/net/ea/specialhandler.h
@@ -27,12 +27,6 @@
 #include "net/net.h"
 #include "net/specialhandler.h"
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 namespace Ea
 {
 
diff --git a/src/net/ea/tradehandler.h b/src/net/ea/tradehandler.h
index 2a27f8c31..6d623f60d 100644
--- a/src/net/ea/tradehandler.h
+++ b/src/net/ea/tradehandler.h
@@ -27,12 +27,6 @@
 #include "net/net.h"
 #include "net/tradehandler.h"
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 namespace Ea
 {
 
diff --git a/src/net/manaserv/adminhandler.cpp b/src/net/manaserv/adminhandler.cpp
index a8860d73b..a7bcf6355 100644
--- a/src/net/manaserv/adminhandler.cpp
+++ b/src/net/manaserv/adminhandler.cpp
@@ -26,6 +26,8 @@
 #include "net/manaserv/messageout.h"
 #include "net/manaserv/protocol.h"
 
+#include "debug.h"
+
 extern Net::AdminHandler *adminHandler;
 
 namespace ManaServ
diff --git a/src/net/manaserv/adminhandler.h b/src/net/manaserv/adminhandler.h
index 17d296bd6..5a71db35e 100644
--- a/src/net/manaserv/adminhandler.h
+++ b/src/net/manaserv/adminhandler.h
@@ -26,12 +26,6 @@
 #include "net/adminhandler.h"
 #include "string"
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 namespace ManaServ
 {
 
diff --git a/src/net/manaserv/beinghandler.h b/src/net/manaserv/beinghandler.h
index 512d3e58f..59797f8f5 100644
--- a/src/net/manaserv/beinghandler.h
+++ b/src/net/manaserv/beinghandler.h
@@ -30,12 +30,6 @@
 #include "vector.h"
 #include "map.h"
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 namespace ManaServ
 {
 
diff --git a/src/net/manaserv/buysellhandler.h b/src/net/manaserv/buysellhandler.h
index b38fdd9e7..e1a9c91e5 100644
--- a/src/net/manaserv/buysellhandler.h
+++ b/src/net/manaserv/buysellhandler.h
@@ -27,12 +27,6 @@
 
 #include "net/buysellhandler.h"
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 namespace ManaServ
 {
 
diff --git a/src/net/manaserv/chathandler.h b/src/net/manaserv/chathandler.h
index 3ed7717ad..e93c2dd87 100644
--- a/src/net/manaserv/chathandler.h
+++ b/src/net/manaserv/chathandler.h
@@ -28,12 +28,6 @@
 
 #include "net/manaserv/messagehandler.h"
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 namespace ManaServ
 {
 
diff --git a/src/net/manaserv/gamehandler.h b/src/net/manaserv/gamehandler.h
index a38052205..323b2566a 100644
--- a/src/net/manaserv/gamehandler.h
+++ b/src/net/manaserv/gamehandler.h
@@ -28,12 +28,6 @@
 
 #include "net/manaserv/messagehandler.h"
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 namespace ManaServ
 {
 
diff --git a/src/net/manaserv/generalhandler.h b/src/net/manaserv/generalhandler.h
index ccdddbbe6..c6614707f 100644
--- a/src/net/manaserv/generalhandler.h
+++ b/src/net/manaserv/generalhandler.h
@@ -30,12 +30,6 @@
 
 #include "net/manaserv/messagehandler.h"
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 namespace ManaServ
 {
 
diff --git a/src/net/manaserv/guildhandler.h b/src/net/manaserv/guildhandler.h
index 023e60b08..6a8db27c8 100644
--- a/src/net/manaserv/guildhandler.h
+++ b/src/net/manaserv/guildhandler.h
@@ -27,12 +27,6 @@
 
 #include "net/manaserv/messagehandler.h"
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 namespace ManaServ
 {
 
@@ -62,7 +56,7 @@ public:
 
     void memberList(int guildId);
 
-    void info(int guildId A_UNUSED);
+    void info(int guildId);
 
     void changeMemberPostion(GuildMember *member, int level);
 
diff --git a/src/net/manaserv/inventoryhandler.h b/src/net/manaserv/inventoryhandler.h
index fbe53d735..ba4535d79 100644
--- a/src/net/manaserv/inventoryhandler.h
+++ b/src/net/manaserv/inventoryhandler.h
@@ -29,12 +29,6 @@
 
 #include "net/manaserv/messagehandler.h"
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 namespace ManaServ
 {
 
diff --git a/src/net/manaserv/loginhandler.h b/src/net/manaserv/loginhandler.h
index e60f00d92..0e8f2a4e6 100644
--- a/src/net/manaserv/loginhandler.h
+++ b/src/net/manaserv/loginhandler.h
@@ -28,12 +28,6 @@
 
 #include "net/manaserv/messagehandler.h"
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 class LoginData;
 
 namespace ManaServ
diff --git a/src/net/manaserv/npchandler.h b/src/net/manaserv/npchandler.h
index f48e92ecb..f91858614 100644
--- a/src/net/manaserv/npchandler.h
+++ b/src/net/manaserv/npchandler.h
@@ -29,12 +29,6 @@
 
 #include <map>
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 class NpcDialog;
 
 namespace ManaServ
diff --git a/src/net/manaserv/partyhandler.h b/src/net/manaserv/partyhandler.h
index 89924c962..087936d72 100644
--- a/src/net/manaserv/partyhandler.h
+++ b/src/net/manaserv/partyhandler.h
@@ -27,16 +27,11 @@
 
 #include "net/manaserv/messagehandler.h"
 
+#include "localconsts.h"
 #include "party.h"
 
 #include <string>
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 namespace ManaServ
 {
 
diff --git a/src/net/manaserv/playerhandler.h b/src/net/manaserv/playerhandler.h
index f00fea42a..21bbac516 100644
--- a/src/net/manaserv/playerhandler.h
+++ b/src/net/manaserv/playerhandler.h
@@ -29,12 +29,6 @@
 
 #include <guichan/actionlistener.hpp>
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 namespace ManaServ
 {
 
diff --git a/src/net/manaserv/specialhandler.cpp b/src/net/manaserv/specialhandler.cpp
index de45c2144..85fe7271f 100644
--- a/src/net/manaserv/specialhandler.cpp
+++ b/src/net/manaserv/specialhandler.cpp
@@ -27,6 +27,8 @@
 #include "net/manaserv/messageout.h"
 #include "net/manaserv/protocol.h"
 
+#include "debug.h"
+
 extern Net::SpecialHandler *specialHandler;
 
 namespace ManaServ
diff --git a/src/net/manaserv/specialhandler.h b/src/net/manaserv/specialhandler.h
index e7931f8ea..ccbe59fd9 100644
--- a/src/net/manaserv/specialhandler.h
+++ b/src/net/manaserv/specialhandler.h
@@ -27,12 +27,6 @@
 
 #include "net/manaserv/messagehandler.h"
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 namespace ManaServ
 {
 
diff --git a/src/net/manaserv/tradehandler.cpp b/src/net/manaserv/tradehandler.cpp
index be38e4019..383da9fe6 100644
--- a/src/net/manaserv/tradehandler.cpp
+++ b/src/net/manaserv/tradehandler.cpp
@@ -100,9 +100,9 @@ TradeHandler::TradeHandler():
     tradeHandler = this;
 }
 
-void TradeHandler::setAcceptTradeRequests(bool acceptTradeRequests)
+void TradeHandler::setAcceptTradeRequests(bool acceptRequests)
 {
-    mAcceptTradeRequests = acceptTradeRequests;
+    mAcceptTradeRequests = acceptRequests;
     if (mAcceptTradeRequests)
         SERVER_NOTICE(_("Accepting incoming trade requests."))
     else
diff --git a/src/net/manaserv/tradehandler.h b/src/net/manaserv/tradehandler.h
index 35c260a8e..2ca542f78 100644
--- a/src/net/manaserv/tradehandler.h
+++ b/src/net/manaserv/tradehandler.h
@@ -27,12 +27,6 @@
 
 #include "net/manaserv/messagehandler.h"
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 namespace ManaServ
 {
 
@@ -56,7 +50,7 @@ class TradeHandler : public MessageHandler, public Net::TradeHandler
          * requests are automatically denied. When true, a popup will ask the
          * player whether he wants to trade.
          */
-        void setAcceptTradeRequests(bool acceptTradeRequests);
+        void setAcceptTradeRequests(bool acceptRequests);
 
         void request(Being *being);
 
diff --git a/src/net/messageout.h b/src/net/messageout.h
index 4445bbbe8..a169bfe2d 100644
--- a/src/net/messageout.h
+++ b/src/net/messageout.h
@@ -27,12 +27,6 @@
 
 #include <iosfwd>
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 namespace Net
 {
 
diff --git a/src/net/tmwa/adminhandler.h b/src/net/tmwa/adminhandler.h
index 53fd4831f..d81e2421a 100644
--- a/src/net/tmwa/adminhandler.h
+++ b/src/net/tmwa/adminhandler.h
@@ -30,12 +30,6 @@
 
 #include "net/tmwa/messagehandler.h"
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 namespace TmwAthena
 {
 
diff --git a/src/net/tmwa/charserverhandler.h b/src/net/tmwa/charserverhandler.h
index 4bd3153e8..f1256e409 100644
--- a/src/net/tmwa/charserverhandler.h
+++ b/src/net/tmwa/charserverhandler.h
@@ -33,12 +33,6 @@
 
 #include "net/ea/token.h"
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 class LoginData;
 
 namespace TmwAthena
diff --git a/src/net/tmwa/chathandler.h b/src/net/tmwa/chathandler.h
index 197ba12b3..9a88b7478 100644
--- a/src/net/tmwa/chathandler.h
+++ b/src/net/tmwa/chathandler.h
@@ -30,12 +30,6 @@
 
 #include "net/tmwa/messagehandler.h"
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 namespace TmwAthena
 {
 
diff --git a/src/net/tmwa/gamehandler.h b/src/net/tmwa/gamehandler.h
index 6824ee672..ddb381058 100644
--- a/src/net/tmwa/gamehandler.h
+++ b/src/net/tmwa/gamehandler.h
@@ -31,12 +31,6 @@
 
 #include "net/ea/gamehandler.h"
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 namespace TmwAthena
 {
 
diff --git a/src/net/tmwa/generalhandler.h b/src/net/tmwa/generalhandler.h
index 9ab8d64b4..e0f29fd1d 100644
--- a/src/net/tmwa/generalhandler.h
+++ b/src/net/tmwa/generalhandler.h
@@ -30,12 +30,6 @@
 
 #include "net/tmwa/messagehandler.h"
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 namespace TmwAthena
 {
 
diff --git a/src/net/tmwa/guildhandler.h b/src/net/tmwa/guildhandler.h
index d8a1cc9e7..d8d291bdd 100644
--- a/src/net/tmwa/guildhandler.h
+++ b/src/net/tmwa/guildhandler.h
@@ -30,12 +30,6 @@
 
 #include "net/tmwa/messagehandler.h"
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 namespace TmwAthena
 {
 
@@ -64,7 +58,7 @@ class GuildHandler : public Ea::GuildHandler, public MessageHandler
 
         void memberList(int guildId);
 
-        void info(int guildId A_UNUSED);
+        void info(int guildId);
 
         void changeMemberPostion(GuildMember *member, int level);
 
diff --git a/src/net/tmwa/inventoryhandler.h b/src/net/tmwa/inventoryhandler.h
index 989ced27a..d924e8713 100644
--- a/src/net/tmwa/inventoryhandler.h
+++ b/src/net/tmwa/inventoryhandler.h
@@ -31,12 +31,6 @@
 
 #include "net/tmwa/messagehandler.h"
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 namespace TmwAthena
 {
 
diff --git a/src/net/tmwa/loginhandler.h b/src/net/tmwa/loginhandler.h
index 1e73d3c99..c13c882a7 100644
--- a/src/net/tmwa/loginhandler.h
+++ b/src/net/tmwa/loginhandler.h
@@ -33,12 +33,6 @@
 
 #include <string>
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 class LoginData;
 
 namespace TmwAthena
diff --git a/src/net/tmwa/npchandler.h b/src/net/tmwa/npchandler.h
index 624f64cbc..548346205 100644
--- a/src/net/tmwa/npchandler.h
+++ b/src/net/tmwa/npchandler.h
@@ -32,12 +32,6 @@
 
 #include <map>
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 class NpcDialog;
 
 namespace TmwAthena
diff --git a/src/net/tmwa/partyhandler.h b/src/net/tmwa/partyhandler.h
index 209ea5047..4d727a986 100644
--- a/src/net/tmwa/partyhandler.h
+++ b/src/net/tmwa/partyhandler.h
@@ -30,12 +30,6 @@
 
 #include "party.h"
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 namespace TmwAthena
 {
 
diff --git a/src/net/tmwa/playerhandler.h b/src/net/tmwa/playerhandler.h
index 4fd108e94..bf8e861ff 100644
--- a/src/net/tmwa/playerhandler.h
+++ b/src/net/tmwa/playerhandler.h
@@ -30,12 +30,6 @@
 
 #include "net/tmwa/messagehandler.h"
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 namespace TmwAthena
 {
 
diff --git a/src/net/tmwa/specialhandler.h b/src/net/tmwa/specialhandler.h
index 21c1b9026..50bf31c0b 100644
--- a/src/net/tmwa/specialhandler.h
+++ b/src/net/tmwa/specialhandler.h
@@ -30,12 +30,6 @@
 
 #include "net/tmwa/messagehandler.h"
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 namespace TmwAthena
 {
 
diff --git a/src/net/tmwa/tradehandler.h b/src/net/tmwa/tradehandler.h
index 85c153743..3a4c8c1fc 100644
--- a/src/net/tmwa/tradehandler.h
+++ b/src/net/tmwa/tradehandler.h
@@ -30,12 +30,6 @@
 
 #include "net/tmwa/messagehandler.h"
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 namespace TmwAthena
 {
 
diff --git a/src/net/tradehandler.h b/src/net/tradehandler.h
index f099efe53..57219e675 100644
--- a/src/net/tradehandler.h
+++ b/src/net/tradehandler.h
@@ -27,11 +27,7 @@
 
 #include <iosfwd>
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
+#include "localconsts.h"
 
 namespace Net
 {
@@ -43,7 +39,6 @@ class TradeHandler
 
         virtual void request(Being *being A_UNUSED)
         { }
-//        virtual ~TradeHandler() {}
 
         virtual void respond(bool accept A_UNUSED)
         { }
diff --git a/src/opengl1graphics.h b/src/opengl1graphics.h
index 3943a82fb..11df607f8 100644
--- a/src/opengl1graphics.h
+++ b/src/opengl1graphics.h
@@ -33,12 +33,6 @@
 #include <SDL_opengl.h>
 #endif
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 class OpenGL1Graphics : public Graphics
 {
     public:
diff --git a/src/openglgraphics.h b/src/openglgraphics.h
index 12eb2d9f8..d12810203 100644
--- a/src/openglgraphics.h
+++ b/src/openglgraphics.h
@@ -33,12 +33,6 @@
 #include <SDL_opengl.h>
 #endif
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 class OpenGLGraphics : public Graphics
 {
     public:
diff --git a/src/particle.h b/src/particle.h
index 0a4a2253d..ad448a054 100644
--- a/src/particle.h
+++ b/src/particle.h
@@ -25,17 +25,12 @@
 
 #include "actor.h"
 #include "guichanfwd.h"
+#include "localconsts.h"
 #include "vector.h"
 
 #include <list>
 #include <string>
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 class Map;
 class Particle;
 class ParticleEmitter;
@@ -114,6 +109,12 @@ class Particle : public Actor
         { return static_cast<int>(mPos.y) - 16; }
 
         /**
+         * Necessary for sorting with the other sprites for sorting only.
+         */
+        virtual int getSortPixelY() const
+        { return static_cast<int>(mPos.y) - 16; }
+
+        /**
          * Creates a blank particle as a child of the current particle
          * Useful for creating target particles
          */
@@ -274,7 +275,8 @@ class Particle : public Actor
         virtual float getAlpha() const
         { return 1.0f; }
 
-        virtual void setAlpha(float alpha A_UNUSED) {}
+        virtual void setAlpha(float alpha A_UNUSED)
+        { }
 
         virtual void setDeathEffect(const std::string &effectFile,
                                     char conditions)
diff --git a/src/particlecontainer.h b/src/particlecontainer.h
index 937c4dd63..2219bd67c 100644
--- a/src/particlecontainer.h
+++ b/src/particlecontainer.h
@@ -45,7 +45,7 @@ public:
      * delParent means that the destructor should also free the parent.
      */
     ParticleContainer(ParticleContainer *parent = nullptr,
-        bool delParent = true);
+                      bool delParent = true);
 
     virtual ~ParticleContainer();
 
diff --git a/src/playerrelations.cpp b/src/playerrelations.cpp
index 324dac065..1bf63aa81 100644
--- a/src/playerrelations.cpp
+++ b/src/playerrelations.cpp
@@ -282,6 +282,7 @@ unsigned int PlayerRelationsManager::checkPermissionSilently(
             case PlayerRelation::IGNORED:
             case PlayerRelation::ERASED:
             case PlayerRelation::BLACKLISTED:
+            case PlayerRelation::ENEMY2:
             default:
                 permissions &= mDefaultPermissions; // narrow
         }
diff --git a/src/playerrelations.h b/src/playerrelations.h
index 5fabb3d0e..5eb1b3c64 100644
--- a/src/playerrelations.h
+++ b/src/playerrelations.h
@@ -28,12 +28,6 @@
 #include <string>
 #include <vector>
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 class Being;
 
 struct PlayerRelation
diff --git a/src/resources/action.cpp b/src/resources/action.cpp
index c2af3ff9b..f940bffcb 100644
--- a/src/resources/action.cpp
+++ b/src/resources/action.cpp
@@ -29,7 +29,8 @@
 
 #include "debug.h"
 
-Action::Action()
+Action::Action() :
+    mNumber(100)
 {
 }
 
diff --git a/src/resources/action.h b/src/resources/action.h
index 05b326d8f..9ab6f98d5 100644
--- a/src/resources/action.h
+++ b/src/resources/action.h
@@ -43,10 +43,17 @@ class Action
 
         Animation *getAnimation(int direction) const;
 
+        unsigned getNumber()
+        { return mNumber; }
+
+        void setNumber(unsigned n)
+        { mNumber = n; }
+
     protected:
         typedef std::map<int, Animation*> Animations;
         typedef Animations::iterator AnimationIterator;
         Animations mAnimations;
+        unsigned mNumber;
 };
 
 #endif
diff --git a/src/resources/chardb.cpp b/src/resources/chardb.cpp
new file mode 100644
index 000000000..d944f280e
--- /dev/null
+++ b/src/resources/chardb.cpp
@@ -0,0 +1,129 @@
+/*
+ *  Color database
+ *  Copyright (C) 2008  Aethyra Development Team
+ *  Copyright (C) 2011  The ManaPlus Developers
+ *
+ *  This file is part of The ManaPlus Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "resources/chardb.h"
+
+#include "client.h"
+#include "logger.h"
+
+#include "utils/xml.h"
+
+#include <libxml/tree.h>
+
+#include "debug.h"
+
+namespace
+{
+    bool mLoaded = false;
+    unsigned mMinHairColor = 0;
+    unsigned mMaxHairColor = 0;
+    unsigned mMinHairStyle = 0;
+    unsigned mMaxHairStyle = 0;
+    unsigned mMinStat = 0;
+    unsigned mMaxStat = 0;
+    unsigned mSumStat = 0;
+}
+
+void CharDB::load()
+{
+    if (mLoaded)
+        unload();
+
+    XML::Document *doc = new XML::Document("charcreation.xml");
+    xmlNodePtr root = doc->rootNode();
+
+    if (!root || !xmlStrEqual(root->name, BAD_CAST "chars"))
+    {
+        logger->log1("CharDB: Failed to parse charcreation.xml.");
+
+        delete doc;
+        return;
+    }
+
+    for_each_xml_child_node(node, root)
+    {
+        if (xmlStrEqual(node->name, BAD_CAST "haircolor"))
+        {
+            loadMinMax(node, &mMinHairColor, &mMaxHairColor);
+        }
+        else if (xmlStrEqual(node->name, BAD_CAST "hairstyle"))
+        {
+            loadMinMax(node, &mMinHairStyle, &mMaxHairStyle);
+        }
+        else if (xmlStrEqual(node->name, BAD_CAST "stat"))
+        {
+            loadMinMax(node, &mMinStat, &mMaxStat);
+            mSumStat = XML::getProperty(node, "sum", 0);
+        }
+    }
+
+    delete doc;
+
+    mLoaded = true;
+}
+
+void CharDB::loadMinMax(xmlNodePtr node, unsigned *min, unsigned *max)
+{
+    *min = XML::getProperty(node, "min", 1);
+    *max = XML::getProperty(node, "max", 10);
+}
+
+void CharDB::unload()
+{
+    logger->log1("Unloading chars database...");
+
+    mLoaded = false;
+}
+
+unsigned CharDB::getMinHairColor()
+{
+    return mMinHairColor;
+}
+
+unsigned CharDB::getMaxHairColor()
+{
+    return mMaxHairColor;
+}
+
+unsigned CharDB::getMinHairStyle()
+{
+    return mMinHairStyle;
+}
+
+unsigned CharDB::getMaxHairStyle()
+{
+    return mMaxHairStyle;
+}
+
+unsigned CharDB::getMinStat()
+{
+    return mMinStat;
+}
+
+unsigned CharDB::getMaxStat()
+{
+    return mMaxStat;
+}
+
+unsigned CharDB::getSumStat()
+{
+    return mSumStat;
+}
diff --git a/src/resources/chardb.h b/src/resources/chardb.h
new file mode 100644
index 000000000..769dedb56
--- /dev/null
+++ b/src/resources/chardb.h
@@ -0,0 +1,62 @@
+/*
+ *  Color database
+ *  Copyright (C) 2008  Aethyra Development Team
+ *  Copyright (C) 2011  The ManaPlus Developers
+ *
+ *  This file is part of The ManaPlus Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef CHARDB_MANAGER_H
+#define CHARDB_MANAGER_H
+
+#include <map>
+#include <string>
+
+#include <libxml/tree.h>
+
+/**
+ * Char information database.
+ */
+namespace CharDB
+{
+    /**
+     * Loads the chars data.
+     */
+    void load();
+
+    /**
+     * Clear the chars data
+     */
+    void unload();
+
+    void loadMinMax(xmlNodePtr node, unsigned *min, unsigned *max);
+
+    unsigned getMinHairColor();
+
+    unsigned getMaxHairColor();
+
+    unsigned getMinHairStyle();
+
+    unsigned getMaxHairStyle();
+
+    unsigned getMinStat();
+
+    unsigned getMaxStat();
+
+    unsigned getSumStat();
+}
+
+#endif
diff --git a/src/resources/colordb.cpp b/src/resources/colordb.cpp
index 225abef91..3b8c9d573 100644
--- a/src/resources/colordb.cpp
+++ b/src/resources/colordb.cpp
@@ -1,6 +1,7 @@
 /*
  *  Color database
  *  Copyright (C) 2008  Aethyra Development Team
+ *  Copyright (C) 2011  The ManaPlus Developers
  *
  *  This file is part of The ManaPlus Client.
  *
diff --git a/src/resources/colordb.h b/src/resources/colordb.h
index 83bff57da..f4cc88a59 100644
--- a/src/resources/colordb.h
+++ b/src/resources/colordb.h
@@ -1,6 +1,7 @@
 /*
  *  Color database
  *  Copyright (C) 2008  Aethyra Development Team
+ *  Copyright (C) 2011  The ManaPlus Developers
  *
  *  This file is part of The ManaPlus Client.
  *
diff --git a/src/resources/itemdb.cpp b/src/resources/itemdb.cpp
index 3e53dd6e7..2911fa06f 100644
--- a/src/resources/itemdb.cpp
+++ b/src/resources/itemdb.cpp
@@ -546,25 +546,51 @@ int parseDirectionName(std::string name)
 {
     int id = -1;
     if (name == "down")
-        id = DIRECTION_DOWN;
+    {
+        if (serverVersion > 0)
+            id = DIRECTION_DOWN;
+        else
+            id = -2;
+    }
     else if (name == "downleft" || name == "leftdown")
+    {
         id = DIRECTION_DOWNLEFT;
+    }
     else if (name == "left")
+    {
         id = DIRECTION_LEFT;
+    }
     else if (name == "upleft" || name == "leftup")
+    {
         id = DIRECTION_UPLEFT;
+    }
     else if (name == "up")
-        id = DIRECTION_UP;
+    {
+        if (serverVersion > 0)
+            id = DIRECTION_UP;
+        else
+            id = -3;
+    }
     else if (name == "upright" || name == "rightup")
+    {
         id = DIRECTION_UPRIGHT;
+    }
     else if (name == "right")
+    {
         id = DIRECTION_RIGHT;
+    }
     else if (name == "downright" || name == "rightdown")
+    {
         id = DIRECTION_DOWNRIGHT;
+    }
     else if (name == "downall")
+    {
         id = -2;
+    }
     else if (name == "upall")
+    {
         id = -3;
+    }
 
     return id;
 }
diff --git a/src/resources/itemdb.h b/src/resources/itemdb.h
index c20961eff..71f0a490e 100644
--- a/src/resources/itemdb.h
+++ b/src/resources/itemdb.h
@@ -28,12 +28,6 @@
 #include <map>
 #include <string>
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 class ItemInfo;
 
 /**
diff --git a/src/resources/mapreader.h b/src/resources/mapreader.h
index b10f35d89..c15a83b6f 100644
--- a/src/resources/mapreader.h
+++ b/src/resources/mapreader.h
@@ -27,12 +27,6 @@
 
 #include <string>
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 class Map;
 class Properties;
 class Tileset;
diff --git a/src/resources/spritedef.cpp b/src/resources/spritedef.cpp
index 3e2aac785..32d18b6b8 100644
--- a/src/resources/spritedef.cpp
+++ b/src/resources/spritedef.cpp
@@ -35,23 +35,44 @@
 
 #include "utils/xml.h"
 
-#include <set>
-
 #include "debug.h"
 
 SpriteReference *SpriteReference::Empty = nullptr;
 
-Action *SpriteDef::getAction(std::string action) const
+Action *SpriteDef::getAction(std::string action, unsigned num) const
 {
-    Actions::const_iterator i = mActions.find(action);
+    Actions::const_iterator i = mActions.find(num);
+    if (i == mActions.end() && num != 100)
+        i = mActions.find(100);
 
-    if (i == mActions.end())
+    if (i == mActions.end() || !(*i).second)
+        return nullptr;
+
+    ActionMap::const_iterator it = ((*i).second)->find(action);
+
+    if (it == ((*i).second)->end())
     {
         logger->log("Warning: no action \"%s\" defined!", action.c_str());
         return nullptr;
     }
 
-    return i->second;
+    return (*it).second;
+}
+
+unsigned SpriteDef::findNumber(unsigned num) const
+{
+    unsigned min = 101;
+    Actions::const_iterator it = mActions.begin();
+    Actions::const_iterator it_end = mActions.end();
+    for (; it != it_end; ++ it)
+    {
+        unsigned n = (*it).first;
+        if (n >= num && n < min)
+            min = n;
+    }
+    if (min == 101)
+        return 0;
+    return min;
 }
 
 SpriteDef *SpriteDef::load(const std::string &animationFile, int variant)
@@ -77,6 +98,7 @@ SpriteDef *SpriteDef::load(const std::string &animationFile, int variant)
     }
 
     SpriteDef *def = new SpriteDef;
+    def->mProcessedFiles.insert(animationFile);
     def->loadSprite(rootNode, variant, palettes);
     def->substituteActions();
     return def;
@@ -84,11 +106,19 @@ SpriteDef *SpriteDef::load(const std::string &animationFile, int variant)
 
 void SpriteDef::substituteAction(std::string complete, std::string with)
 {
-    if (mActions.find(complete) == mActions.end())
+    Actions::const_iterator it = mActions.begin();
+    Actions::const_iterator it_end = mActions.end();
+    for (; it != it_end; ++ it)
     {
-        Actions::const_iterator i = mActions.find(with);
-        if (i != mActions.end())
-            mActions[complete] = i->second;
+        ActionMap *d = (*it).second;
+        if (!d)
+            continue;
+        if (d->find(complete) == d->end())
+        {
+            ActionMap::iterator i = d->find(with);
+            if (i != d->end())
+                (*d)[complete] = i->second;
+        }
     }
 }
 
@@ -162,12 +192,13 @@ void SpriteDef::loadAction(xmlNodePtr node, int variant_offset)
 {
     const std::string actionName = XML::getProperty(node, "name", "");
     const std::string imageSetName = XML::getProperty(node, "imageset", "");
+    const unsigned hp = XML::getProperty(node, "hp", 100);
 
     ImageSetIterator si = mImageSets.find(imageSetName);
     if (si == mImageSets.end())
     {
         logger->log("Warning: imageset \"%s\" not defined in %s",
-                imageSetName.c_str(), getIdPath().c_str());
+            imageSetName.c_str(), getIdPath().c_str());
         return;
     }
     ImageSet *imageSet = si->second;
@@ -175,19 +206,21 @@ void SpriteDef::loadAction(xmlNodePtr node, int variant_offset)
     if (actionName == SpriteAction::INVALID)
     {
         logger->log("Warning: Unknown action \"%s\" defined in %s",
-                actionName.c_str(), getIdPath().c_str());
+            actionName.c_str(), getIdPath().c_str());
         return;
     }
     Action *action = new Action;
-    mActions[actionName] = action;
+    action->setNumber(hp);
+    addAction(hp, actionName, action);
 
     // dirty hack to fix bad resources in tmw server
     if (actionName == "attack_stab")
-        mActions["attack"] = action;
+        addAction(hp, "attack", action);
 
     // When first action set it as default direction
-    if (mActions.size() == 1)
-        mActions[SpriteAction::DEFAULT] = action;
+    Actions::const_iterator i = mActions.find(hp);
+    if ((*i).second->size() == 1)
+        addAction(hp, SpriteAction::DEFAULT, action);
 
     // Load animations
     for_each_xml_child_node(animationNode, node)
@@ -280,7 +313,7 @@ void SpriteDef::loadAnimation(xmlNodePtr animationNode,
                     if (!img)
                     {
                         logger->log("No image at index %d",
-                                    pos + variant_offset);
+                            pos + variant_offset);
                         pos ++;
                         continue;
                     }
@@ -317,14 +350,21 @@ void SpriteDef::loadAnimation(xmlNodePtr animationNode,
 
 void SpriteDef::includeSprite(xmlNodePtr includeNode)
 {
-    // TODO: Perform circular dependency check, since it's easy to crash the
-    // client this way.
-    const std::string filename = XML::getProperty(includeNode, "file", "");
+    std::string filename = XML::getProperty(includeNode, "file", "");
 
     if (filename.empty())
         return;
+    filename = paths.getStringValue("sprites") + filename;
+
+    if (mProcessedFiles.find(filename) != mProcessedFiles.end())
+    {
+        logger->log("Error, Tried to include %s which already is included.",
+            filename.c_str());
+        return;
+    }
+    mProcessedFiles.insert(filename);
 
-    XML::Document doc(paths.getStringValue("sprites") + filename);
+    XML::Document doc(filename);
     xmlNodePtr rootNode = doc.rootNode();
 
     if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "sprite"))
@@ -339,14 +379,18 @@ void SpriteDef::includeSprite(xmlNodePtr includeNode)
 SpriteDef::~SpriteDef()
 {
     // Actions are shared, so ensure they are deleted only once.
-    std::set< Action * > actions;
-    for (Actions::const_iterator i = mActions.begin(),
+    std::set<Action*> actions;
+    for (Actions::iterator i = mActions.begin(),
          i_end = mActions.end(); i != i_end; ++i)
     {
-        actions.insert(i->second);
+        ActionMap::iterator it = (*i).second->begin();
+        ActionMap::iterator it_end = (*i).second->end();
+        for (; it != it_end; ++ it)
+            actions.insert(it->second);
+        delete (*i).second;
     }
 
-    for (std::set< Action * >::const_iterator i = actions.begin(),
+    for (std::set<Action*>::const_iterator i = actions.begin(),
          i_end = actions.end(); i != i_end; ++i)
     {
         delete *i;
@@ -355,7 +399,7 @@ SpriteDef::~SpriteDef()
     mActions.clear();
 
     for (ImageSetIterator i = mImageSets.begin();
-            i != mImageSets.end(); ++i)
+         i != mImageSets.end(); ++i)
     {
         if (i->second)
         {
@@ -388,3 +432,12 @@ SpriteDirection SpriteDef::makeSpriteDirection(const std::string &direction)
     else
         return DIRECTION_INVALID;
 }
+
+void SpriteDef::addAction(unsigned hp, std::string name, Action *action)
+{
+    Actions::const_iterator i = mActions.find(hp);
+    if (i == mActions.end())
+        mActions[hp] = new ActionMap();
+
+    (*mActions[hp])[name] = action;
+}
diff --git a/src/resources/spritedef.h b/src/resources/spritedef.h
index b2939fca1..3aa6369dd 100644
--- a/src/resources/spritedef.h
+++ b/src/resources/spritedef.h
@@ -29,6 +29,7 @@
 
 #include <list>
 #include <map>
+#include <set>
 #include <string>
 #include <vector>
 
@@ -117,7 +118,9 @@ class SpriteDef : public Resource
         /**
          * Returns the specified action.
          */
-        Action *getAction(std::string action) const;
+        Action *getAction(std::string action, unsigned num) const;
+
+        unsigned findNumber(unsigned num) const;
 
         /**
          * Converts a string into a SpriteDirection enum.
@@ -125,11 +128,14 @@ class SpriteDef : public Resource
         static SpriteDirection
         makeSpriteDirection(const std::string &direction);
 
+        void addAction(unsigned hp, std::string name, Action *action);
+
     private:
         /**
          * Constructor.
          */
-        SpriteDef() {}
+        SpriteDef()
+        { }
 
         /**
          * Destructor.
@@ -177,11 +183,12 @@ class SpriteDef : public Resource
 
         typedef std::map<std::string, ImageSet*> ImageSets;
         typedef ImageSets::iterator ImageSetIterator;
-
-        typedef std::map<std::string, Action*> Actions;
+        typedef std::map<std::string, Action*> ActionMap;
+        typedef std::map<unsigned, ActionMap*> Actions;
 
         ImageSets mImageSets;
         Actions mActions;
+        std::set<std::string> mProcessedFiles;
 };
 
 #endif // SPRITEDEF_H
diff --git a/src/sprite.h b/src/sprite.h
index 52752619b..64721b740 100644
--- a/src/sprite.h
+++ b/src/sprite.h
@@ -112,6 +112,8 @@ class Sprite
         virtual void *getHash2()
         { return this; }
 
+        virtual bool updateNumber(unsigned num) = 0;
+
     protected:
         float mAlpha;                  /**< The alpha opacity used to draw */
 };
diff --git a/src/textmanager.h b/src/textmanager.h
index 019214bb6..1ed88883a 100644
--- a/src/textmanager.h
+++ b/src/textmanager.h
@@ -25,12 +25,6 @@
 
 #include "guichanfwd.h"
 
-#ifdef __GNUC__
-#define A_UNUSED  __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
 class Text;
 
 class TextManager
diff --git a/src/textparticle.h b/src/textparticle.h
index db9dc1766..b37f25732 100644
--- a/src/textparticle.h
+++ b/src/textparticle.h
@@ -45,6 +45,10 @@ class TextParticle : public Particle
         virtual int getPixelY() const
         { return static_cast<int>(mPos.y + mPos.z); }
 
+        // hack to improve text visibility (for sorting only)
+        virtual int getSortPixelY() const
+        { return static_cast<int>(mPos.y + mPos.z); }
+
     private:
         std::string mText;             /**< Text of the particle. */
         gcn::Font *mTextFont;          /**< Font used for drawing the text. */
author	Andrei Karas <akaras@inbox.ru>	2011-11-28 19:05:52 +0300
committer	Andrei Karas <akaras@inbox.ru>	2011-11-28 19:05:52 +0300
commit	b6eb53b9abdf48b88cb1978b9af97f2a879d2717 (patch)
tree	5aad5623d352ec0b4aa245856958c61a384861c7
parent	4d453108f45f9fb2ff4f5715cc1b3ddd63d36a80 (diff)
parent	71fe51d38a406012e166589b7b720d83c1ab3ade (diff)
download	manaverse-b6eb53b9abdf48b88cb1978b9af97f2a879d2717.tar.gz manaverse-b6eb53b9abdf48b88cb1978b9af97f2a879d2717.tar.bz2 manaverse-b6eb53b9abdf48b88cb1978b9af97f2a879d2717.tar.xz manaverse-b6eb53b9abdf48b88cb1978b9af97f2a879d2717.zip