From 01b26b05ec787cb8cbfce27474362f5c29650f60 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sun, 18 Sep 2011 19:41:29 +0300
Subject: Fix compilation warnings.

---
 src/avatar.h                      | 3 +++
 src/being.cpp                     | 1 -
 src/gui/setup_relations.cpp       | 1 -
 src/guild.h                       | 2 +-
 src/listener.h                    | 2 +-
 src/net/beinghandler.h            | 3 +++
 src/net/buysellhandler.h          | 3 +++
 src/net/ea/partyhandler.cpp       | 2 --
 src/net/ea/specialhandler.cpp     | 3 ---
 src/net/tmwa/messagein.cpp        | 4 ----
 src/net/tradehandler.h            | 3 +++
 src/party.h                       | 2 +-
 src/resources/resourcemanager.cpp | 2 --
 src/utils/sha256.cpp              | 2 +-
 14 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/src/avatar.h b/src/avatar.h
index 83f4a586a..6c79dd96a 100644
--- a/src/avatar.h
+++ b/src/avatar.h
@@ -35,6 +35,9 @@ class Avatar
 public:
     Avatar(const std::string &name = "");
 
+    virtual ~Avatar()
+    { }
+
     /**
      * Returns the avatar's name.
      */
diff --git a/src/being.cpp b/src/being.cpp
index 532e6e2cf..2ed05449a 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -84,7 +84,6 @@
 #include "debug.h"
 
 #define CACHE_SIZE 50
-#define HAIR_FILE "hair.xml"
 
 static const int DEFAULT_BEING_WIDTH = 32;
 static const int DEFAULT_BEING_HEIGHT = 32;
diff --git a/src/gui/setup_relations.cpp b/src/gui/setup_relations.cpp
index 489d5a818..57a51e435 100644
--- a/src/gui/setup_relations.cpp
+++ b/src/gui/setup_relations.cpp
@@ -228,7 +228,6 @@ public:
 #define ACTION_OLD "old"
 #define ACTION_TABLE "table"
 #define ACTION_STRATEGY "strategy"
-#define ACTION_WHISPER_TAB "whisper tab"
 
 Setup_Relations::Setup_Relations():
     mPlayerTableTitleModel(new StaticTableModel(1, COLUMNS_NR)),
diff --git a/src/guild.h b/src/guild.h
index 62135e9ad..915dda5e7 100644
--- a/src/guild.h
+++ b/src/guild.h
@@ -65,7 +65,7 @@ protected:
 class Guild : public AvatarListModel
 {
 public:
-    ~Guild();
+    virtual ~Guild();
 
     /**
      * Set the guild's name.
diff --git a/src/listener.h b/src/listener.h
index 8993c31af..cccc026c6 100644
--- a/src/listener.h
+++ b/src/listener.h
@@ -32,7 +32,7 @@ namespace Mana
 class Listener
 {
     public:
-        ~Listener();
+        virtual ~Listener();
 
         void listen(Channels channel);
 
diff --git a/src/net/beinghandler.h b/src/net/beinghandler.h
index 07279b148..bc1491ada 100644
--- a/src/net/beinghandler.h
+++ b/src/net/beinghandler.h
@@ -32,6 +32,9 @@ namespace Net
 class BeingHandler
 {
     public:
+        virtual ~BeingHandler()
+        { }
+
         virtual void handleMessage(Net::MessageIn &msg) = 0;
 
         virtual void requestNameById(int id) = 0;
diff --git a/src/net/buysellhandler.h b/src/net/buysellhandler.h
index 213da227d..ad70c2884 100644
--- a/src/net/buysellhandler.h
+++ b/src/net/buysellhandler.h
@@ -34,6 +34,9 @@ namespace Net
 class BuySellHandler
 {
     public:
+        virtual ~BuySellHandler()
+        { }
+
         virtual void handleMessage(Net::MessageIn &msg) = 0;
         virtual void requestSellList(std::string nick) = 0;
         virtual void requestBuyList(std::string nick) = 0;
diff --git a/src/net/ea/partyhandler.cpp b/src/net/ea/partyhandler.cpp
index e006b9c71..36e192ce8 100644
--- a/src/net/ea/partyhandler.cpp
+++ b/src/net/ea/partyhandler.cpp
@@ -34,8 +34,6 @@
 
 #include "debug.h"
 
-#define PARTY_ID 1
-
 namespace Ea
 {
 
diff --git a/src/net/ea/specialhandler.cpp b/src/net/ea/specialhandler.cpp
index 4f0f22aed..b78531434 100644
--- a/src/net/ea/specialhandler.cpp
+++ b/src/net/ea/specialhandler.cpp
@@ -50,8 +50,6 @@
 #define BSKILL_CREATECHAT 0x0003
 #define BSKILL_JOINPARTY  0x0004
 #define BSKILL_SHOUT      0x0005
-#define BSKILL_PK         0x0006 // ??
-#define BSKILL_SETALLIGN  0x0007 // ??
 
 /** reasons why action failed      */
 #define RFAIL_SKILLDEP    0x00
@@ -64,7 +62,6 @@
 #define RFAIL_REDGEM      0x07
 #define RFAIL_BLUEGEM     0x08
 #define RFAIL_OVERWEIGHT  0x09
-#define RFAIL_GENERIC     0x0a
 
 /** should always be zero if failed */
 #define SKILL_FAILED      0x00
diff --git a/src/net/tmwa/messagein.cpp b/src/net/tmwa/messagein.cpp
index fb1986597..5a9d39211 100644
--- a/src/net/tmwa/messagein.cpp
+++ b/src/net/tmwa/messagein.cpp
@@ -33,10 +33,6 @@
 
 #include "debug.h"
 
-#define MAKEWORD(low, high) \
-    ((unsigned short)(((unsigned char)(low)) | \
-    ((unsigned short)((unsigned char)(high))) << 8))
-
 namespace TmwAthena 
 {
 
diff --git a/src/net/tradehandler.h b/src/net/tradehandler.h
index 837c53eeb..f099efe53 100644
--- a/src/net/tradehandler.h
+++ b/src/net/tradehandler.h
@@ -38,6 +38,9 @@ namespace Net
 class TradeHandler
 {
     public:
+        virtual ~TradeHandler()
+        { }
+
         virtual void request(Being *being A_UNUSED)
         { }
 //        virtual ~TradeHandler() {}
diff --git a/src/party.h b/src/party.h
index e286a794a..73c45214a 100644
--- a/src/party.h
+++ b/src/party.h
@@ -167,7 +167,7 @@ private:
      */
     Party(short id);
 
-    ~Party();
+    virtual ~Party();
 
     MemberList mMembers;
     std::string mName;
diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp
index ee325e253..fcba17812 100644
--- a/src/resources/resourcemanager.cpp
+++ b/src/resources/resourcemanager.cpp
@@ -48,8 +48,6 @@
 
 #include "debug.h"
 
-#define THEMES_FOLDER "themes"
-
 ResourceManager *ResourceManager::instance = NULL;
 
 ResourceManager::ResourceManager() :
diff --git a/src/utils/sha256.cpp b/src/utils/sha256.cpp
index 1e7143300..523c021a4 100644
--- a/src/utils/sha256.cpp
+++ b/src/utils/sha256.cpp
@@ -101,7 +101,7 @@ class SHA256Context
 
 #define SHFR(x, n)    (x >> n)
 #define ROTR(x, n)   ((x >> n) | (x << ((sizeof(x) << 3) - n)))
-#define ROTL(x, n)   ((x << n) | (x >> ((sizeof(x) << 3) - n)))
+//#define ROTL(x, n)   ((x << n) | (x >> ((sizeof(x) << 3) - n)))
 #define CH(x, y, z)  ((x & y) ^ (~x & z))
 #define MAJ(x, y, z) ((x & y) ^ (x & z) ^ (y & z))
 
-- 
cgit v1.2.3-60-g2f50


From c0bced1e7d5984d162a53455d474bb16154ed386 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sun, 18 Sep 2011 20:03:19 +0300
Subject: Add new options to build scripts.

---
 bmake   | 5 ++++-
 bmake46 | 7 +++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/bmake b/bmake
index fa5462407..0dea9d942 100755
--- a/bmake
+++ b/bmake
@@ -33,7 +33,10 @@ export CXXFLAGS="-Wunreachable-code -Wmissing-field-initializers \
 -Wempty-body -Wsign-compare -Wclobbered -Wcast-align -Wcast-qual \
 -Wtype-limits -Wpointer-arith -Wundef -Wmissing-include-dirs \
 -Wignored-qualifiers -Winit-self -pedantic -Wall -ggdb3 -O2 -pipe \
--Wpacked -Wshadow -D_FORTIFY_SOURCE=2"
+-Wpacked -Wshadow -Wunused -Wsynth \
+-Wbuiltin-macro-redefined -Wctor-dtor-privacy -Wdeprecated -Wextra \
+-Wendif-labels -Wformat=1 -Wimport -Wnon-virtual-dtor -Wpsabi \
+-Wsign-promo -Wwrite-strings -D_FORTIFY_SOURCE=2"
 
 autoreconf -i
 ./configure --prefix=$dir/run \
diff --git a/bmake46 b/bmake46
index 14e3f6246..8874f802b 100755
--- a/bmake46
+++ b/bmake46
@@ -16,7 +16,7 @@
 # -Weffc++
 
 #from time to time fix: -Wold-style-cast -Wconversion -Wswitch-enum -Waggregate-return
-#from time to time fix: -Winline
+#from time to time fix: -Winline -Woverloaded-virtual
 #need fix: -Wsuggest-attribute=pure -Wsuggest-attribute=const
 #need fix: -Wstrict-overflow=5 -fstrict-overflow
 #need fix: -Wstrict-aliasing=3
@@ -44,7 +44,10 @@ export CXXFLAGS="-Wvariadic-macros -Wvla -Wredundant-decls \
 -Wcast-align -Wcast-qual -Wpointer-arith -Wundef \
 -Wmissing-include-dirs -Winit-self -pedantic -Wall -ggdb3 -O2 -pipe \
 -Wpacked -Wextra -Wstrict-overflow=1 -Wunknown-pragmas -Wwrite-strings \
--Wstack-protector -Wshadow -D_FORTIFY_SOURCE=2"
+-Wstack-protector -Wshadow -Wunused -Wunused-macros -Wsynth \
+-Wbuiltin-macro-redefined -Wctor-dtor-privacy -Wdeprecated -Wextra \
+-Wendif-labels -Wformat=1 -Wimport -Wnon-virtual-dtor -Wpsabi \
+-Wsign-promo -Wwrite-strings -D_FORTIFY_SOURCE=2"
 
 autoreconf -i
 ./configure --prefix=$dir/run \
-- 
cgit v1.2.3-60-g2f50


From 5583ed6cb475a3fbc717f717971f0887ecc0226a Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sun, 18 Sep 2011 21:48:33 +0300
Subject: Fix half away state.

---
 src/game.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/game.cpp b/src/game.cpp
index d82f13913..81f987376 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -1366,11 +1366,9 @@ void Game::handleInput()
                 {   // window restore
                     Client::setIsMinimized(false);
                     if (!player_node && !player_node->getAwayMode())
-                    {
                         fpsLimit = config.getIntValue("fpslimit");
-                        if (player_node)
-                            player_node->setHalfAway(false);
-                    }
+                    if (player_node)
+                        player_node->setHalfAway(false);
                 }
                 else
                 {   // window minimisation
-- 
cgit v1.2.3-60-g2f50


From 479e8a53ec90c19890dfb4b3746c4453769d806a Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Mon, 19 Sep 2011 19:33:14 +0300
Subject: Add comment field to spells/commands.

---
 src/gui/spellpopup.cpp        | 35 +++++++++++++++++++++++++++++------
 src/gui/spellpopup.h          |  2 ++
 src/gui/textcommandeditor.cpp | 42 ++++++++++++++++++++++++++----------------
 src/gui/textcommandeditor.h   |  4 ++++
 src/spellmanager.cpp          | 43 +++++++++++++++++++++++++++----------------
 src/textcommand.cpp           | 15 +++++++++------
 src/textcommand.h             | 19 ++++++++++++-------
 7 files changed, 109 insertions(+), 51 deletions(-)

diff --git a/src/gui/spellpopup.cpp b/src/gui/spellpopup.cpp
index c7d25e257..66d69b197 100644
--- a/src/gui/spellpopup.cpp
+++ b/src/gui/spellpopup.cpp
@@ -42,14 +42,15 @@
 #include "debug.h"
 
 SpellPopup::SpellPopup():
-    Popup("SpellPopup", "spellpopup.xml")
+    Popup("SpellPopup", "spellpopup.xml"),
+    mItemName(new Label),
+    mItemComment(new Label)
 {
-    // Item Name
-    mItemName = new Label;
     mItemName->setFont(boldFont);
-    mItemName->setPosition(getPadding(), getPadding());
 
     add(mItemName);
+    add(mItemComment);
+
     addMouseListener(this);
 }
 
@@ -60,17 +61,39 @@ SpellPopup::~SpellPopup()
 void SpellPopup::setItem(TextCommand *spell)
 {
     if (spell)
+    {
         mItemName->setCaption(spell->getName());
+        mItemComment->setCaption(spell->getComment());
+    }
     else
+    {
         mItemName->setCaption("?");
+        mItemComment->setCaption("");
+    }
 
     mItemName->adjustSize();
+    mItemComment->adjustSize();
     int minWidth = mItemName->getWidth();
+    if (mItemComment->getWidth() > minWidth)
+        minWidth = mItemComment->getWidth();
 
     minWidth += 8;
-    setWidth(minWidth);
+    setWidth(minWidth + 2 * getPadding());
 
-    setContentSize(minWidth, getPadding() + getFont()->getHeight());
+    mItemName->setPosition(getPadding(), getPadding());
+    mItemComment->setPosition(getPadding(),
+        getPadding() + mItemName->getHeight());
+
+    if (mItemComment->getCaption() != "")
+    {
+        setContentSize(minWidth, getPadding()
+            + 2 * getFont()->getHeight());
+    }
+    else
+    {
+        setContentSize(minWidth, getPadding()
+            + getFont()->getHeight());
+    }
 }
 
 void SpellPopup::view(int x, int y)
diff --git a/src/gui/spellpopup.h b/src/gui/spellpopup.h
index 69c47bf45..883b2bfe0 100644
--- a/src/gui/spellpopup.h
+++ b/src/gui/spellpopup.h
@@ -63,6 +63,8 @@ class SpellPopup : public Popup
 
     private:
         gcn::Label *mItemName;
+
+        gcn::Label *mItemComment;
 };
 
 #endif // SPELLPOPUP_H
diff --git a/src/gui/textcommandeditor.cpp b/src/gui/textcommandeditor.cpp
index 282f23ee1..0bd25fcb5 100644
--- a/src/gui/textcommandeditor.cpp
+++ b/src/gui/textcommandeditor.cpp
@@ -168,7 +168,7 @@ TextCommandEditor::TextCommandEditor(TextCommand *command):
     Window(_("Command Editor"), false, 0, "commandeditor.xml")
 {
     int w = 350;
-    int h = 350;
+    int h = 370;
 
     mEnabledKeyboard = keyboard.isEnabled();
     keyboard.setEnabled(false);
@@ -197,6 +197,9 @@ TextCommandEditor::TextCommandEditor(TextCommand *command):
     mCommandLabel = new Label(_("Command:"));
     mCommandTextField = new TextField();
 
+    mCommentLabel = new Label(_("Comment:"));
+    mCommentTextField = new TextField();
+
     mManaLabel = new Label(_("Mana:"));
     mManaField = new IntTextField(0);
     mManaField->setRange(0, 500);
@@ -248,6 +251,7 @@ TextCommandEditor::TextCommandEditor(TextCommand *command):
 
     mSymbolTextField->setText(command->getSymbol());
     mCommandTextField->setText(command->getCommand());
+    mCommentTextField->setText(command->getComment());
     mManaField->setValue(command->getMana());
     mTypeDropDown->setSelected(command->getTargetType());
     mMagicLvlField->setValue(command->getBaseLvl());
@@ -263,25 +267,29 @@ TextCommandEditor::TextCommandEditor(TextCommand *command):
     placer(2, 1, mSymbolTextField, 3).setPadding(3);
     placer(0, 2, mCommandLabel, 2).setPadding(3);
     placer(2, 2, mCommandTextField, 4).setPadding(3);
-    placer(0, 3, mTypeLabel, 2).setPadding(3);
-    placer(2, 3, mTypeDropDown, 3).setPadding(3);
 
-    placer(0, 4, mIconLabel, 2).setPadding(3);
-    placer(2, 4, mIconDropDown, 3).setPadding(3);
+    placer(0, 3, mCommentLabel, 2).setPadding(3);
+    placer(2, 3, mCommentTextField, 4).setPadding(3);
+
+    placer(0, 4, mTypeLabel, 2).setPadding(3);
+    placer(2, 4, mTypeDropDown, 3).setPadding(3);
+
+    placer(0, 5, mIconLabel, 2).setPadding(3);
+    placer(2, 5, mIconDropDown, 3).setPadding(3);
 
-    placer(0, 5, mManaLabel, 2).setPadding(3);
-    placer(2, 5, mManaField, 3).setPadding(3);
-    placer(0, 6, mMagicLvlLabel, 2).setPadding(3);
-    placer(2, 6, mMagicLvlField, 3).setPadding(3);
+    placer(0, 6, mManaLabel, 2).setPadding(3);
+    placer(2, 6, mManaField, 3).setPadding(3);
+    placer(0, 7, mMagicLvlLabel, 2).setPadding(3);
+    placer(2, 7, mMagicLvlField, 3).setPadding(3);
 
-    placer(0, 7, mSchoolLabel, 2).setPadding(3);
-    placer(2, 7, mSchoolDropDown, 3).setPadding(3);
-    placer(0, 8, mSchoolLvlLabel, 2).setPadding(3);
-    placer(2, 8, mSchoolLvlField, 3).setPadding(3);
+    placer(0, 8, mSchoolLabel, 2).setPadding(3);
+    placer(2, 8, mSchoolDropDown, 3).setPadding(3);
+    placer(0, 9, mSchoolLvlLabel, 2).setPadding(3);
+    placer(2, 9, mSchoolLvlField, 3).setPadding(3);
 
-    placer(0, 9, mSaveButton, 2).setPadding(3);
-    placer(2, 9, mCancelButton, 2).setPadding(3);
-    placer(4, 9, mDeleteButton, 2).setPadding(3);
+    placer(0, 10, mSaveButton, 2).setPadding(3);
+    placer(2, 10, mCancelButton, 2).setPadding(3);
+    placer(4, 10, mDeleteButton, 2).setPadding(3);
 
     setWidth(w);
     setHeight(h);
@@ -375,6 +383,7 @@ void TextCommandEditor::save()
 
     mCommand->setSymbol(mSymbolTextField->getText());
     mCommand->setCommand(mCommandTextField->getText());
+    mCommand->setComment(mCommentTextField->getText());
     mCommand->setMana(mManaField->getValue());
     mCommand->setTargetType(
             static_cast<SpellTarget>(mTypeDropDown->getSelected()));
@@ -392,6 +401,7 @@ void TextCommandEditor::deleteCommand()
     mCommand->setCommandType(TEXT_COMMAND_TEXT);
     mCommand->setSymbol("");
     mCommand->setCommand("");
+    mCommand->setComment("");
     mCommand->setMana(0);
     mCommand->setTargetType(NOTARGET);
     mCommand->setIcon("");
diff --git a/src/gui/textcommandeditor.h b/src/gui/textcommandeditor.h
index 236c42320..9239481b7 100644
--- a/src/gui/textcommandeditor.h
+++ b/src/gui/textcommandeditor.h
@@ -84,6 +84,10 @@ class TextCommandEditor : public Window, public gcn::ActionListener
         TextField *mSymbolTextField;
         Label *mCommandLabel;
         TextField *mCommandTextField;
+
+        Label *mCommentLabel;
+        TextField *mCommentTextField;
+
         Label *mTypeLabel;
         DropDown *mTypeDropDown;
         Label *mIconLabel;
diff --git a/src/spellmanager.cpp b/src/spellmanager.cpp
index 895ac94f2..4f7d038f2 100644
--- a/src/spellmanager.cpp
+++ b/src/spellmanager.cpp
@@ -68,31 +68,31 @@ void SpellManager::fillSpells()
 {
 //id, std::string name, std::string symbol, ST type, int basicLvl, MagicSchool school, int schoolLvl, int mana)
 
-    addSpell(new TextCommand(0, "lum", "#lum", ALLOWTARGET,
+    addSpell(new TextCommand(0, "lum", "#lum", "heal with lifestones", ALLOWTARGET,
              "", 1, SKILL_MAGIC_LIFE, 0, 6));
-    addSpell(new TextCommand(1, "inm", "#inma", NEEDTARGET,
+    addSpell(new TextCommand(1, "inm", "#inma", "heal", NEEDTARGET,
              "", 2, SKILL_MAGIC_LIFE, 2, 10));
-    addSpell(new TextCommand(2, "fla", "#flar", NOTARGET,
+    addSpell(new TextCommand(2, "fla", "#flar", "", NOTARGET,
              "", 1, SKILL_MAGIC_WAR, 0, 10));
-    addSpell(new TextCommand(3, "chi", "#chiza", NOTARGET,
+    addSpell(new TextCommand(3, "chi", "#chiza", "", NOTARGET,
              "", 1, SKILL_MAGIC_WAR, 0, 9));
-    addSpell(new TextCommand(4, "ing", "#ingrav", NOTARGET,
+    addSpell(new TextCommand(4, "ing", "#ingrav", "", NOTARGET,
              "", 2, SKILL_MAGIC_WAR, 2, 20));
-    addSpell(new TextCommand(5, "fri", "#frillyar", NOTARGET,
+    addSpell(new TextCommand(5, "fri", "#frillyar", "", NOTARGET,
              "", 2, SKILL_MAGIC_WAR, 2, 25));
-    addSpell(new TextCommand(6, "upm", "#upmarmu", NOTARGET,
+    addSpell(new TextCommand(6, "upm", "#upmarmu", "", NOTARGET,
              "", 2, SKILL_MAGIC_WAR, 2, 20));
-    addSpell(new TextCommand(7, "ite", "#itenplz", NOTARGET,
+    addSpell(new TextCommand(7, "ite", "#itenplz", "", NOTARGET,
              "", 1, SKILL_MAGIC_NATURE, 0, 3));
-    addSpell(new TextCommand(8, "bet", "#betsanc", ALLOWTARGET,
+    addSpell(new TextCommand(8, "bet", "#betsanc", "", ALLOWTARGET,
              "", 2, SKILL_MAGIC_NATURE, 2, 14));
-    addSpell(new TextCommand(9, "abi", "#abizit", NOTARGET,
+    addSpell(new TextCommand(9, "abi", "#abizit", "", NOTARGET,
              "", 1, SKILL_MAGIC, 0, 1));
-    addSpell(new TextCommand(10, "inw", "#inwilt", NOTARGET,
+    addSpell(new TextCommand(10, "inw", "#inwilt", "", NOTARGET,
              "", 2, SKILL_MAGIC, 2, 7));
-    addSpell(new TextCommand(11, "hi", "hi", NOTARGET, ""));
-    addSpell(new TextCommand(12, "hea", "heal", NOTARGET, ""));
-    addSpell(new TextCommand(13, "@sp", "@spawn maggot 10", NOTARGET, ""));
+    addSpell(new TextCommand(11, "hi", "hi", "", NOTARGET, ""));
+    addSpell(new TextCommand(12, "hea", "heal", "", NOTARGET, ""));
+    addSpell(new TextCommand(13, "@sp", "@spawn maggot 10", "", NOTARGET, ""));
     for (int f = 12; f < SPELL_SHORTCUT_ITEMS * SPELL_SHORTCUT_TABS; f++)
         addSpell(new TextCommand(f));
 }
@@ -269,6 +269,8 @@ void SpellManager::load(bool oldConfig)
 
         std::string cmd = cfg->getValue("commandShortcutCmd"
                                         + toString(i), "");
+        std::string comment = cfg->getValue("commandShortcutComment"
+                                        + toString(i), "");
         std::string symbol = cfg->getValue("commandShortcutSymbol"
                                            + toString(i), "");
         std::string icon = cfg->getValue("commandShortcutIcon"
@@ -276,13 +278,13 @@ void SpellManager::load(bool oldConfig)
 
         if (static_cast<TextCommandType>(commandType) == TEXT_COMMAND_MAGIC)
         {
-            addSpell(new TextCommand(i, symbol, cmd,
+            addSpell(new TextCommand(i, symbol, cmd, comment,
                 static_cast<SpellTarget>(targetType), icon, basicLvl,
                 static_cast<MagicSchool>(school), schoolLvl, mana));
         }
         else
         {
-            addSpell(new TextCommand(i, symbol, cmd,
+            addSpell(new TextCommand(i, symbol, cmd, comment,
                 static_cast<SpellTarget>(targetType), icon));
         }
     }
@@ -304,6 +306,15 @@ void SpellManager::save()
             {
                 serverConfig.deleteKey("commandShortcutCmd" + toString(i));
             }
+            if (spell->getComment() != "")
+            {
+                serverConfig.setValue("commandShortcutComment" + toString(i),
+                                      spell->getComment());
+            }
+            else
+            {
+                serverConfig.deleteKey("commandShortcutComment" + toString(i));
+            }
             if (spell->getSymbol() != "")
             {
                 serverConfig.setValue("commandShortcutSymbol" + toString(i),
diff --git a/src/textcommand.cpp b/src/textcommand.cpp
index 1402576d1..30d8c2a4c 100644
--- a/src/textcommand.cpp
+++ b/src/textcommand.cpp
@@ -31,11 +31,12 @@
 #include "debug.h"
 
 TextCommand::TextCommand(unsigned int id, std::string symbol,
-                         std::string command, SpellTarget type,
-                         std::string icon, unsigned int basicLvl,
-                         MagicSchool school, unsigned int schoolLvl,
-                         int mana) :
+                         std::string command,  std::string comment,
+                         SpellTarget type, std::string icon,
+                         unsigned int basicLvl, MagicSchool school,
+                         unsigned int schoolLvl, int mana) :
     mCommand(command),
+    mComment(comment),
     mSymbol(symbol),
     mTargetType(type),
     mIcon(icon),
@@ -52,9 +53,10 @@ TextCommand::TextCommand(unsigned int id, std::string symbol,
 
 
 TextCommand::TextCommand(unsigned int id, std::string symbol,
-                         std::string command, SpellTarget type,
-                         std::string icon) :
+                         std::string command, std::string comment,
+                         SpellTarget type, std::string icon) :
     mCommand(command),
+    mComment(comment),
     mSymbol(symbol),
     mTargetType(type),
     mIcon(icon),
@@ -71,6 +73,7 @@ TextCommand::TextCommand(unsigned int id, std::string symbol,
 
 TextCommand::TextCommand(unsigned int id) :
     mCommand(""),
+    mComment(""),
     mSymbol(""),
     mTargetType(NOTARGET),
     mIcon(""),
diff --git a/src/textcommand.h b/src/textcommand.h
index 5ddbe824d..b1af7667d 100644
--- a/src/textcommand.h
+++ b/src/textcommand.h
@@ -62,18 +62,16 @@ class TextCommand
         /**
          * Constructor.
          */
-        TextCommand(unsigned int id, std::string symbol,
-                    std::string command, SpellTarget type,
-                    std::string icon, unsigned int basicLvl,
-                    MagicSchool school = SKILL_MAGIC,
+        TextCommand(unsigned int id, std::string symbol, std::string command,
+                    std::string comment, SpellTarget type, std::string icon,
+                    unsigned int basicLvl, MagicSchool school = SKILL_MAGIC,
                     unsigned int schoolLvl = 0, int mana = 0);
 
         /**
          * Constructor.
          */
-        TextCommand(unsigned int id, std::string symbol,
-                    std::string command, SpellTarget type,
-                    std::string icon);
+        TextCommand(unsigned int id, std::string symbol, std::string command,
+                    std::string comment, SpellTarget type, std::string icon);
 
         /**
          * Constructor.
@@ -91,6 +89,9 @@ class TextCommand
         std::string getCommand() const
         { return mCommand; }
 
+        std::string getComment() const
+        { return mComment; }
+
         std::string getSymbol() const
         { return mSymbol; }
 
@@ -121,6 +122,9 @@ class TextCommand
         void setCommand(std::string command)
         { mCommand = command; }
 
+        void setComment(std::string comment)
+        { mComment = comment; }
+
         void setSymbol(std::string symbol)
         { mSymbol = symbol; }
 
@@ -159,6 +163,7 @@ class TextCommand
 
     protected:
         std::string mCommand;
+        std::string mComment;
         std::string mSymbol;
         SpellTarget mTargetType;
         std::string mIcon;
-- 
cgit v1.2.3-60-g2f50


From 5f2ee9e2f8c8d313de85df08abdc2a7f7396995f Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Mon, 19 Sep 2011 20:35:08 +0300
Subject: Unhide method widgetResized. Removed empty widgetResized from some
 classes.

---
 src/gui/botcheckerwindow.cpp  | 5 -----
 src/gui/botcheckerwindow.h    | 2 --
 src/gui/npcdialog.cpp         | 7 -------
 src/gui/npcdialog.h           | 7 -------
 src/gui/textcommandeditor.cpp | 5 -----
 src/gui/textcommandeditor.h   | 2 --
 src/gui/widgets/window.h      | 2 +-
 7 files changed, 1 insertion(+), 29 deletions(-)

diff --git a/src/gui/botcheckerwindow.cpp b/src/gui/botcheckerwindow.cpp
index 34293e59d..88bc65a78 100644
--- a/src/gui/botcheckerwindow.cpp
+++ b/src/gui/botcheckerwindow.cpp
@@ -378,11 +378,6 @@ void BotCheckerWindow::update()
 {
 }
 
-void BotCheckerWindow::widgetResized(const gcn::Event &event)
-{
-    Window::widgetResized(event);
-}
-
 void BotCheckerWindow::updateList()
 {
     if (mTableModel)
diff --git a/src/gui/botcheckerwindow.h b/src/gui/botcheckerwindow.h
index a69781865..6af9c91d6 100644
--- a/src/gui/botcheckerwindow.h
+++ b/src/gui/botcheckerwindow.h
@@ -71,8 +71,6 @@ class BotCheckerWindow : public Window, public gcn::ActionListener,
 
         void logic();
 
-        void widgetResized(const gcn::Event &event);
-
         void updateList();
 
         void reset();
diff --git a/src/gui/npcdialog.cpp b/src/gui/npcdialog.cpp
index 3e1ee46d8..b926d260e 100644
--- a/src/gui/npcdialog.cpp
+++ b/src/gui/npcdialog.cpp
@@ -404,13 +404,6 @@ void NpcDialog::move(int amount)
     }
 }
 
-void NpcDialog::widgetResized(const gcn::Event &event)
-{
-    Window::widgetResized(event);
-
-//    setText(mText);
-}
-
 void NpcDialog::setVisible(bool visible)
 {
     Window::setVisible(visible);
diff --git a/src/gui/npcdialog.h b/src/gui/npcdialog.h
index 2f5a90b5f..7e9ea7e10 100644
--- a/src/gui/npcdialog.h
+++ b/src/gui/npcdialog.h
@@ -147,13 +147,6 @@ class NpcDialog : public Window, public gcn::ActionListener,
 
         void move(int amount);
 
-        /**
-         * Called when resizing the window.
-         *
-         * @param event The calling event
-         */
-        void widgetResized(const gcn::Event &event);
-
         void setVisible(bool visible);
 
         void optionChanged(const std::string &name);
diff --git a/src/gui/textcommandeditor.cpp b/src/gui/textcommandeditor.cpp
index 0bd25fcb5..6512f8465 100644
--- a/src/gui/textcommandeditor.cpp
+++ b/src/gui/textcommandeditor.cpp
@@ -343,11 +343,6 @@ void TextCommandEditor::update()
 {
 }
 
-void TextCommandEditor::widgetResized(const gcn::Event &event)
-{
-    Window::widgetResized(event);
-}
-
 void TextCommandEditor::updateList()
 {
 }
diff --git a/src/gui/textcommandeditor.h b/src/gui/textcommandeditor.h
index 9239481b7..d0b2f0a54 100644
--- a/src/gui/textcommandeditor.h
+++ b/src/gui/textcommandeditor.h
@@ -60,8 +60,6 @@ class TextCommandEditor : public Window, public gcn::ActionListener
 
         void update();
 
-        void widgetResized(const gcn::Event &event);
-
         void updateList();
 
         void reset();
diff --git a/src/gui/widgets/window.h b/src/gui/widgets/window.h
index 510a68323..cc7c6e6a1 100644
--- a/src/gui/widgets/window.h
+++ b/src/gui/widgets/window.h
@@ -113,7 +113,7 @@ class Window : public gcn::Window, gcn::WidgetListener
         /**
          * Called whenever the widget changes size.
          */
-        void widgetResized(const gcn::Event &event);
+        virtual void widgetResized(const gcn::Event &event);
 
         virtual void widgetMoved(const gcn::Event& event);
 
-- 
cgit v1.2.3-60-g2f50


From 8138d0e61f633546263df94473e91d500ada9c0e Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Tue, 20 Sep 2011 22:19:45 +0300
Subject: Auto hide filter in invetory if window size too small.

---
 src/gui/inventorywindow.cpp | 55 +++++++++++++++++++++++++++++++++++----------
 src/gui/inventorywindow.h   | 10 ++++++++-
 src/gui/widgets/layout.h    | 29 ++++++++++++++++++------
 3 files changed, 74 insertions(+), 20 deletions(-)

diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index cd02a6732..35165a16a 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -99,7 +99,8 @@ InventoryWindow::InventoryWindow(Inventory *inventory):
     Window("Inventory", false, 0, "inventory.xml"),
     mInventory(inventory),
     mDropButton(0),
-    mSplit(false)
+    mSplit(false),
+    mCompactMode(false)
 {
     if (inventory)
     {
@@ -146,7 +147,6 @@ InventoryWindow::InventoryWindow(Inventory *inventory):
     mSortDropDown->setSelected(0);
 
     mFilterLabel = new Label(_("Filter:"));
-    mSorterLabel = new Label(_("Sort:"));
     mNameFilter = new TextField("", true, this, "namefilter", true);
 
     std::vector<std::string> tags = ItemDB::getTags();
@@ -181,13 +181,12 @@ InventoryWindow::InventoryWindow(Inventory *inventory):
         place(0, 0, mWeightLabel, 1).setPadding(3);
         place(1, 0, mWeightBar, 3);
         place(4, 0, mSlotsLabel, 1).setPadding(3);
-        place(5, 0, mSlotsBar, 2);
-        place(7, 0, mSorterLabel, 1);
-        place(8, 0, mSortDropDown, 3);
+        mSlotsBarCell = &place(5, 0, mSlotsBar, 3);
+        mSortDropDownCell = &place(8, 0, mSortDropDown, 3);
 
         place(0, 1, mFilterLabel, 1).setPadding(3);
-        place(1, 1, mFilter, 7).setPadding(3);
-        place(8, 1, mNameFilter, 3);
+        mFilterCell = &place(1, 1, mFilter, 8).setPadding(3);
+        mNameFilterCell = &place(8, 1, mNameFilter, 3);
 
         place(0, 2, invenScroll, 11).setPadding(3);
         place(0, 3, mUseButton);
@@ -206,13 +205,12 @@ InventoryWindow::InventoryWindow(Inventory *inventory):
         mCloseButton = new Button(_("Close"), "close", this);
 
         place(0, 0, mSlotsLabel).setPadding(3);
-        place(1, 0, mSlotsBar, 4);
-        place(5, 0, mSorterLabel, 1);
-        place(6, 0, mSortDropDown, 1);
+        mSlotsBarCell = &place(1, 0, mSlotsBar, 5);
+        mSortDropDownCell = &place(6, 0, mSortDropDown, 1);
 
         place(0, 1, mFilterLabel, 1).setPadding(3);
-        place(1, 1, mFilter, 5).setPadding(3);
-        place(6, 1, mNameFilter, 1);
+        mFilterCell = &place(1, 1, mFilter, 6).setPadding(3);
+        mNameFilterCell = &place(6, 1, mNameFilter, 1);
 
         place(0, 2, invenScroll, 7, 4);
         place(0, 6, mStoreButton);
@@ -240,6 +238,7 @@ InventoryWindow::InventoryWindow(Inventory *inventory):
     loadWindowState();
     slotsChanged(mInventory);
 
+    widgetResized(0);
     if (!isMainInventory())
         setVisible(true);
 }
@@ -666,3 +665,35 @@ bool InventoryWindow::isAnyInputFocused()
     }
     return false;
 }
+
+void InventoryWindow::widgetResized(const gcn::Event &event)
+{
+    Window::widgetResized(event);
+
+    if (!isMainInventory())
+        return;
+
+    if (getWidth() < 600)
+    {
+        if (!mCompactMode)
+        {
+            mSortDropDown->setVisible(false);
+            mNameFilter->setVisible(false);
+            mSortDropDownCell->setType(LayoutCell::NONE);
+            mNameFilterCell->setType(LayoutCell::NONE);
+            mFilterCell->setWidth(mFilterCell->getWidth() + 3);
+            mSlotsBarCell->setWidth(mSlotsBarCell->getWidth() + 3);
+            mCompactMode = true;
+        }
+    }
+    else if (mCompactMode)
+    {
+        mSortDropDown->setVisible(true);
+        mNameFilter->setVisible(true);
+        mSortDropDownCell->setType(LayoutCell::WIDGET);
+        mNameFilterCell->setType(LayoutCell::WIDGET);
+        mFilterCell->setWidth(mFilterCell->getWidth() - 3);
+        mSlotsBarCell->setWidth(mSlotsBarCell->getWidth() - 3);
+        mCompactMode = false;
+    }
+}
diff --git a/src/gui/inventorywindow.h b/src/gui/inventorywindow.h
index c32fd8905..5592b9449 100644
--- a/src/gui/inventorywindow.h
+++ b/src/gui/inventorywindow.h
@@ -45,6 +45,7 @@ class DropDown;
 class Item;
 class ItemContainer;
 class InventoryFilter;
+class LayoutCell;
 class ProgressBar;
 class SortListModel;
 //class TextBox;
@@ -133,6 +134,8 @@ class InventoryWindow : public Window,
 
         bool isInputFocused() const;
 
+        void widgetResized(const gcn::Event &event);
+
         static bool isAnyInputFocused();
 
     private:
@@ -154,15 +157,20 @@ class InventoryWindow : public Window,
                     *mSplitButton, *mOutfitButton, *mShopButton,
                     *mStoreButton, *mRetrieveButton, *mCloseButton;
 
-        gcn::Label *mWeightLabel, *mSlotsLabel, *mFilterLabel, *mSorterLabel;
+        gcn::Label *mWeightLabel, *mSlotsLabel, *mFilterLabel;
 
         ProgressBar *mWeightBar, *mSlotsBar;
         InventoryFilter *mFilter;
         DropDown *mSortDropDown;
         SortListModel *mSortModel;
         TextField *mNameFilter;
+        LayoutCell *mSortDropDownCell;
+        LayoutCell *mNameFilterCell;
+        LayoutCell *mFilterCell;
+        LayoutCell *mSlotsBarCell;
 
         bool mSplit;
+        bool mCompactMode;
 };
 
 extern InventoryWindow *inventoryWindow;
diff --git a/src/gui/widgets/layout.h b/src/gui/widgets/layout.h
index f5e1f1749..5e3ac4532 100644
--- a/src/gui/widgets/layout.h
+++ b/src/gui/widgets/layout.h
@@ -261,6 +261,28 @@ class LayoutCell
          */
         void computeSizes();
 
+        void setType(int t)
+        { mType = t; }
+
+        int getWidth()
+        { return mExtent[0]; }
+
+        int getHeight()
+        { return mExtent[1]; }
+
+        void setWidth(int w)
+        { mExtent[0] = w; }
+
+        void setHeight(int h)
+        { mExtent[1] = h; }
+
+        enum
+        {
+            NONE = 0,
+            WIDGET,
+            ARRAY
+        };
+
     private:
         // Copy not allowed, as the cell may own an array.
         LayoutCell(LayoutCell const &);
@@ -272,13 +294,6 @@ class LayoutCell
             LayoutArray *mArray;
         };
 
-        enum
-        {
-            NONE = 0,
-            WIDGET,
-            ARRAY
-        };
-
         /**
          * Returns the embedded array. Creates it if the cell does not contain
          * anything yet. Aborts if it contains a widget.
-- 
cgit v1.2.3-60-g2f50


From 1f846d2863d36543c854fe630519a4d1fd01f802 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Wed, 21 Sep 2011 01:41:13 +0300
Subject: Improve mouse object selection if near mixed floor items and
 monsters.

---
 src/actorspritemanager.cpp | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/actorspritemanager.cpp b/src/actorspritemanager.cpp
index 03418a857..52d807f64 100644
--- a/src/actorspritemanager.cpp
+++ b/src/actorspritemanager.cpp
@@ -308,9 +308,22 @@ Being *ActorSpriteManager::findBeingByPixel(int x, int y,
         if (!*it)
             continue;
 
-        if ((*it)->getType() == ActorSprite::FLOOR_ITEM
-            || (*it)->getType() == ActorSprite::PORTAL)
+        if ((*it)->getType() == ActorSprite::PORTAL)
+            continue;
+
+        if ((*it)->getType() == ActorSprite::FLOOR_ITEM)
         {
+            if (!noBeing)
+            {
+                FloorItem *floor = static_cast<FloorItem*>(*it);
+                if (!noBeing && (floor->getPixelX() - 32 <= x) &&
+                    (floor->getPixelX() + 32 > x) &&
+                    (floor->getPixelY() - 64 <= y) &&
+                    (floor->getPixelY() + 16 > y))
+                {
+                    noBeing = true;
+                }
+            }
             continue;
         }
 
-- 
cgit v1.2.3-60-g2f50


From 4bb1025466856bdab15f95806cb8d521552f3759 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Wed, 21 Sep 2011 04:03:12 +0300
Subject: Add option to disable advanced mouse targeting.

---
 src/actorspritemanager.cpp | 106 ++++++++++++++++++++++++++++++---------------
 src/actorspritemanager.h   |   1 +
 src/defaults.cpp           |   1 +
 src/gui/setup_players.cpp  |   3 ++
 4 files changed, 75 insertions(+), 36 deletions(-)

diff --git a/src/actorspritemanager.cpp b/src/actorspritemanager.cpp
index 52d807f64..18ef869c1 100644
--- a/src/actorspritemanager.cpp
+++ b/src/actorspritemanager.cpp
@@ -177,11 +177,13 @@ ActorSpriteManager::ActorSpriteManager() :
     mTargetOnlyReachable = config.getBoolValue("targetOnlyReachable");
     mCyclePlayers = config.getBoolValue("cyclePlayers");
     mCycleMonsters = config.getBoolValue("cycleMonsters");
+    mExtMouseTargeting = config.getBoolValue("extMouseTargeting");
 
     config.addListener("targetDeadPlayers", this);
     config.addListener("targetOnlyReachable", this);
     config.addListener("cyclePlayers", this);
     config.addListener("cycleMonsters", this);
+    config.addListener("extMouseTargeting", this);
 
     loadAttackList();
 }
@@ -192,6 +194,7 @@ ActorSpriteManager::~ActorSpriteManager()
     config.removeListener("targetOnlyReachable", this);
     config.removeListener("cyclePlayers", this);
     config.removeListener("cycleMonsters", this);
+    config.removeListener("extMouseTargeting", this);
     storeAttackList();
     clear();
 }
@@ -300,39 +303,81 @@ Being *ActorSpriteManager::findBeingByPixel(int x, int y,
         return NULL;
 
     bool targetDead = mTargetDeadPlayers;
-    Being *tempBeing = 0;
-    bool noBeing(false);
 
-    for_actors
+    if (mExtMouseTargeting)
     {
-        if (!*it)
-            continue;
+        Being *tempBeing = 0;
+        bool noBeing(false);
 
-        if ((*it)->getType() == ActorSprite::PORTAL)
-            continue;
-
-        if ((*it)->getType() == ActorSprite::FLOOR_ITEM)
+        for_actors
         {
-            if (!noBeing)
+            if (!*it)
+                continue;
+
+            if ((*it)->getType() == ActorSprite::PORTAL)
+                continue;
+
+            if ((*it)->getType() == ActorSprite::FLOOR_ITEM)
             {
-                FloorItem *floor = static_cast<FloorItem*>(*it);
-                if (!noBeing && (floor->getPixelX() - 32 <= x) &&
-                    (floor->getPixelX() + 32 > x) &&
-                    (floor->getPixelY() - 64 <= y) &&
-                    (floor->getPixelY() + 16 > y))
+                if (!noBeing)
                 {
-                    noBeing = true;
+                    FloorItem *floor = static_cast<FloorItem*>(*it);
+                    if (!noBeing && (floor->getPixelX() - 32 <= x) &&
+                        (floor->getPixelX() + 32 > x) &&
+                        (floor->getPixelY() - 64 <= y) &&
+                        (floor->getPixelY() + 16 > y))
+                    {
+                        noBeing = true;
+                    }
                 }
+                continue;
             }
-            continue;
-        }
 
-        Being *being = static_cast<Being*>(*it);
+            Being *being = static_cast<Being*>(*it);
 
-        if ((being->isAlive()
-            || (targetDead && being->getType() == Being::PLAYER))
-            && (allPlayers ||  being != player_node))
+            if ((being->isAlive()
+                || (targetDead && being->getType() == Being::PLAYER))
+                && (allPlayers ||  being != player_node))
+            {
+
+                if ((being->getPixelX() - 16 <= x) &&
+                    (being->getPixelX() + 16 > x) &&
+                    (being->getPixelY() - 32 <= y) &&
+                    (being->getPixelY() > y))
+                {
+                    return being;
+                }
+                else if (!noBeing && (being->getPixelX() - 32 <= x) &&
+                          (being->getPixelX() + 32 > x) &&
+                          (being->getPixelY() - 64 <= y) &&
+                          (being->getPixelY() + 16 > y))
+                {
+                    if (tempBeing)
+                        noBeing = true;
+                    else
+                        tempBeing = being;
+                }
+            }
+        }
+
+        if (noBeing)
+            return 0;
+        return tempBeing;
+    }
+    else
+    {
+        for_actors
         {
+            if (!*it)
+                continue;
+
+            if ((*it)->getType() == ActorSprite::PORTAL ||
+                (*it)->getType() == ActorSprite::FLOOR_ITEM)
+            {
+                continue;
+            }
+
+            Being *being = static_cast<Being*>(*it);
 
             if ((being->getPixelX() - 16 <= x) &&
                 (being->getPixelX() + 16 > x) &&
@@ -341,22 +386,9 @@ Being *ActorSpriteManager::findBeingByPixel(int x, int y,
             {
                 return being;
             }
-            else if (!noBeing && (being->getPixelX() - 32 <= x) &&
-                     (being->getPixelX() + 32 > x) &&
-                     (being->getPixelY() - 64 <= y) &&
-                     (being->getPixelY() + 16 > y))
-            {
-                if (tempBeing)
-                    noBeing = true;
-                else
-                    tempBeing = being;
-            }
         }
-    }
-
-    if (noBeing)
         return 0;
-    return tempBeing;
+    }
 }
 
 void ActorSpriteManager::findBeingsByPixel(std::vector<Being*> &beings,
@@ -1298,6 +1330,8 @@ void ActorSpriteManager::optionChanged(const std::string &name)
         mCyclePlayers = config.getBoolValue("cyclePlayers");
     else if (name == "cycleMonsters")
         mCycleMonsters = config.getBoolValue("cycleMonsters");
+    else if (name == "extMouseTargeting")
+        mExtMouseTargeting = config.getBoolValue("extMouseTargeting");
 }
 
 void ActorSpriteManager::removeAttackMob(const std::string &name)
diff --git a/src/actorspritemanager.h b/src/actorspritemanager.h
index bd2ae79fb..d2d9af108 100644
--- a/src/actorspritemanager.h
+++ b/src/actorspritemanager.h
@@ -318,6 +318,7 @@ class ActorSpriteManager: public ConfigListener
         bool mTargetOnlyReachable;
         bool mCyclePlayers;
         bool mCycleMonsters;
+        bool mExtMouseTargeting;
 
         std::list<std::string> mPriorityAttackMobs;
         std::list<std::string> mAttackMobs;
diff --git a/src/defaults.cpp b/src/defaults.cpp
index 4a82a83a9..d7fa07a07 100644
--- a/src/defaults.cpp
+++ b/src/defaults.cpp
@@ -218,6 +218,7 @@ DefaultsData* getConfigDefaults()
     AddDEF(configData, "showip", false);
     AddDEF(configData, "seflMouseHeal", true);
     AddDEF(configData, "enableLazyScrolling", true);
+    AddDEF(configData, "extMouseTargeting", true);
     return configData;
 }
 
diff --git a/src/gui/setup_players.cpp b/src/gui/setup_players.cpp
index 670fc3635..a6bf5b81c 100644
--- a/src/gui/setup_players.cpp
+++ b/src/gui/setup_players.cpp
@@ -60,6 +60,9 @@ Setup_Players::Setup_Players()
     new SetupItemCheckBox(_("Show own name"), "",
         "showownname", this, "showownnameEvent");
 
+    new SetupItemCheckBox(_("Enable extended mouse targeting"), "",
+        "extMouseTargeting", this, "extMouseTargetingEvent");
+
     new SetupItemCheckBox(_("Target dead players"), "",
         "targetDeadPlayers", this, "targetDeadPlayersEvent");
 
-- 
cgit v1.2.3-60-g2f50


From b51739591b7573d0b97a13a7d22708461eea70e2 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Thu, 22 Sep 2011 01:14:24 +0300
Subject: Update watch link debian packaging example.

---
 packaging/debian/watch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packaging/debian/watch b/packaging/debian/watch
index adce948c2..d5d7432e9 100644
--- a/packaging/debian/watch
+++ b/packaging/debian/watch
@@ -1,2 +1,2 @@
 version=3
-http://sf.net/themanaworld/mana-(.*)\.tar\.gz
+http://download.evolonline.org/manaplus/download/([\d\.]+)/manaplus-([\d\.]+)\.tar\.bz2
-- 
cgit v1.2.3-60-g2f50


From a3e0ab99334d7c2d33a0bf206b711eff420a86c4 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Thu, 22 Sep 2011 20:11:30 +0300
Subject: Improve speed on targeting monsters placed on same tile with player.

---
 src/localplayer.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index e17cf09c4..5aea98fbb 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -3413,6 +3413,9 @@ int LocalPlayer::getPathLength(Being* being)
 
     const Vector &playerPos = getPosition();
 
+    if (being->mX == mX && being->mY == mY)
+        return 0;
+
     Path debugPath = mMap->findPath(
         static_cast<int>(playerPos.x - 16) / 32,
         static_cast<int>(playerPos.y - 32) / 32,
-- 
cgit v1.2.3-60-g2f50


From b4e651126059375044bd9ff45a1bbb225a1cfe44 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Thu, 22 Sep 2011 20:48:08 +0300
Subject: Remove getters for x,y player position in local player class.

---
 src/localplayer.cpp | 170 +++++++++++++++++++++++++++-------------------------
 1 file changed, 87 insertions(+), 83 deletions(-)

diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index 5aea98fbb..20d4094d6 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -219,7 +219,7 @@ LocalPlayer::~LocalPlayer()
 void LocalPlayer::logic()
 {
     if (mumbleManager)
-        mumbleManager->setPos(getTileX(), getTileY(), getDirection());
+        mumbleManager->setPos(mX, mY, mDirection);
 
     // Actions are allowed once per second
     if (get_elapsed_time(mLastAction) >= 1000)
@@ -236,14 +236,14 @@ void LocalPlayer::logic()
             dist = 20;
 
         if ((mNavigateX || mNavigateY) &&
-            ((mCrossX + dist >= getTileX() && mCrossX <= getTileX() + dist
-            && mCrossY + dist >= getTileY() && mCrossY <= getTileY() + dist)
+            ((mCrossX + dist >= mX && mCrossX <= mX + dist
+            && mCrossY + dist >= mY && mCrossY <= mY + dist)
             || (!mCrossX && !mCrossY)))
         {
             for (Path::const_iterator i = mNavigatePath.begin(),
                  i_end = mNavigatePath.end(); i != i_end; ++i)
             {
-                if ((*i).x == getTileX() && (*i).y == getTileY())
+                if ((*i).x == mX && (*i).y == mY)
                 {
                     mNavigatePath.pop_front();
                     break;
@@ -813,8 +813,8 @@ void LocalPlayer::nextTile(unsigned char dir A_UNUSED = 0)
             PartyMember *pm = Party::getParty(1)->getMember(getName());
             if (pm)
             {
-                pm->setX(getTileX());
-                pm->setY(getTileY());
+                pm->setX(mX);
+                pm->setY(mY);
             }
         }
 
@@ -925,8 +925,8 @@ bool LocalPlayer::pickUp(FloorItem *item)
     if (!Client::limitPackets(PACKET_PICKUP))
         return false;
 
-    int dx = item->getTileX() - getTileX();
-    int dy = item->getTileY() - getTileY();
+    int dx = item->getTileX() - mX;
+    int dy = item->getTileY() - mY;
     int dist = 6;
 
     if (mPickUpType >= 4 && mPickUpType <= 6)
@@ -1148,7 +1148,7 @@ void LocalPlayer::startWalking(unsigned char dir)
         else
 #endif
         {
-            Being::setDestination(getTileX(), getTileY());
+            Being::setDestination(mX, mY);
         }
         return;
     }
@@ -1324,8 +1324,8 @@ void LocalPlayer::attack(Being *target, bool keep, bool dontChangeEquipment)
     else
 #endif
     {
-        int dist_x = target->getTileX() - getTileX();
-        int dist_y = target->getTileY() - getTileY();
+        int dist_x = target->getTileX() - mX;
+        int dist_y = target->getTileY() - mY;
 
         // Must be standing or sitting to attack
         if (mAction != STAND && mAction != SIT)
@@ -1516,8 +1516,8 @@ bool LocalPlayer::withinAttackRange(Being *target, bool fixDistance,
     else
 #endif
     {
-        dx = static_cast<int>(abs(target->getTileX() - getTileX()));
-        dy = static_cast<int>(abs(target->getTileY() - getTileY()));
+        dx = static_cast<int>(abs(target->getTileX() - mX));
+        dy = static_cast<int>(abs(target->getTileY() - mY));
     }
     return !(dx > range || dy > range);
 }
@@ -1712,7 +1712,7 @@ void LocalPlayer::moveTo(int x, int y)
 void LocalPlayer::move(int dX, int dY)
 {
     mPickUpTarget = 0;
-    moveTo(getTileX() + dX, getTileY() + dY);
+    moveTo(mX + dX, mY + dY);
 }
 
 void LocalPlayer::moveToTarget(unsigned int dist)
@@ -1811,7 +1811,7 @@ void LocalPlayer::moveToTarget(unsigned int dist)
 void LocalPlayer::moveToHome()
 {
     mPickUpTarget = 0;
-    if ((getTileX() != mCrossX || getTileY() != mCrossY) && mCrossX && mCrossY)
+    if ((mX != mCrossX || mY != mCrossY) && mCrossX && mCrossY)
     {
         moveTo(mCrossX, mCrossY);
     }
@@ -1823,7 +1823,7 @@ void LocalPlayer::moveToHome()
         if (iter != mHomes.end())
         {
             Vector pos = mHomes[(*iter).first];
-            if (getTileX() == pos.x && getTileY() == pos.y)
+            if (mX == pos.x && mY == pos.y)
             {
                 Net::getPlayerHandler()->setDestination(
                         static_cast<int>(pos.x),
@@ -1922,8 +1922,8 @@ void LocalPlayer::changeEquipmentBeforeAttack(Being* target)
         return;
 
     bool allowSword = false;
-    int dx = target->getTileX() - getTileX();
-    int dy = target->getTileY() - getTileY();
+    int dx = target->getTileX() - mX;
+    int dy = target->getTileY() - mY;
     Item *item = NULL;
 
     if (dx * dx + dy * dy > 80)
@@ -2039,25 +2039,25 @@ void LocalPlayer::crazyMove1()
     if (!Client::limitPackets(PACKET_DIRECTION))
         return;
 
-    if (getDirection() == Being::UP)
+    if (mDirection == Being::UP)
     {
         setWalkingDir(Being::UP);
         setDirection(Being::LEFT);
         Net::getPlayerHandler()->setDirection(Being::LEFT);
     }
-    else if (getDirection() == Being::LEFT)
+    else if (mDirection == Being::LEFT)
     {
         setWalkingDir(Being::LEFT);
         setDirection(Being::DOWN);
         Net::getPlayerHandler()->setDirection(Being::DOWN);
     }
-    else if (getDirection() == Being::DOWN)
+    else if (mDirection == Being::DOWN)
     {
         setWalkingDir(Being::DOWN);
         setDirection(Being::RIGHT);
         Net::getPlayerHandler()->setDirection(Being::RIGHT);
     }
-    else if (getDirection() == Being::RIGHT)
+    else if (mDirection == Being::RIGHT)
     {
         setWalkingDir(Being::RIGHT);
         setDirection(Being::UP);
@@ -2073,25 +2073,25 @@ void LocalPlayer::crazyMove2()
     if (!Client::limitPackets(PACKET_DIRECTION))
         return;
 
-    if (getDirection() == Being::UP)
+    if (mDirection == Being::UP)
     {
         setWalkingDir(Being::UP | Being::LEFT);
         setDirection(Being::RIGHT);
         Net::getPlayerHandler()->setDirection(Being::DOWN | Being::RIGHT);
     }
-    else if (getDirection() == Being::RIGHT)
+    else if (mDirection == Being::RIGHT)
     {
         setWalkingDir(Being::UP | Being::RIGHT);
         setDirection(Being::DOWN);
         Net::getPlayerHandler()->setDirection(Being::DOWN | Being::LEFT);
     }
-    else if (getDirection() == Being::DOWN)
+    else if (mDirection == Being::DOWN)
     {
         setWalkingDir(Being::DOWN | Being::RIGHT);
         setDirection(Being::LEFT);
         Net::getPlayerHandler()->setDirection(Being::UP | Being::LEFT);
     }
-    else if (getDirection() == Being::LEFT)
+    else if (mDirection == Being::LEFT)
     {
         setWalkingDir(Being::DOWN | Being::LEFT);
         setDirection(Being::UP);
@@ -2272,19 +2272,19 @@ void LocalPlayer::crazyMove8()
         { 1,  0, -1,  0}    //move down
     };
 
-    if (getDirection() == Being::UP)
+    if (mDirection == Being::UP)
         idx = 0;
-    else if (getDirection() == Being::RIGHT)
+    else if (mDirection == Being::RIGHT)
         idx = 1;
-    else if (getDirection() == Being::DOWN)
+    else if (mDirection == Being::DOWN)
         idx = 2;
-    else if (getDirection() == Being::LEFT)
+    else if (mDirection == Being::LEFT)
         idx = 3;
 
 
     int mult = 1;
     if (mMap->getWalk(mX + movesX[idx][0],
-        getTileY() + movesY[idx][0], getWalkMask()))
+        mY + movesY[idx][0], getWalkMask()))
     {
         while (mMap->getWalk(mX + movesX[idx][0] * mult,
                mY + movesY[idx][0] * mult,
@@ -2340,7 +2340,7 @@ void LocalPlayer::crazyMove9()
     switch (mCrazyMoveState)
     {
         case 0:
-            switch (getDirection())
+            switch (mDirection)
             {
                 case UP   : dy = -1; break;
                 case DOWN : dy = 1; break;
@@ -2412,7 +2412,7 @@ void LocalPlayer::crazyMoveA()
                     move(1, 0);
                     break;
                 case 'f':
-                    switch (getDirection())
+                    switch (mDirection)
                     {
                         case UP   : dy = -1; break;
                         case DOWN : dy = 1; break;
@@ -2423,7 +2423,7 @@ void LocalPlayer::crazyMoveA()
                     move(dx, dy);
                     break;
                 case 'b':
-                    switch (getDirection())
+                    switch (mDirection)
                     {
                         case UP   : dy = 1; break;
                         case DOWN : dy = -1; break;
@@ -2487,7 +2487,7 @@ void LocalPlayer::crazyMoveA()
                     if (Client::limitPackets(PACKET_DIRECTION))
                     {
                         Uint8 dir = 0;
-                        switch (getDirection())
+                        switch (mDirection)
                         {
                             case UP    : dir = Being::LEFT; break;
                             case DOWN  : dir = Being::RIGHT; break;
@@ -2503,7 +2503,7 @@ void LocalPlayer::crazyMoveA()
                     if (Client::limitPackets(PACKET_DIRECTION))
                     {
                         Uint8 dir = 0;
-                        switch (getDirection())
+                        switch (mDirection)
                         {
                             case UP    : dir = Being::RIGHT; break;
                             case DOWN  : dir = Being::LEFT; break;
@@ -2519,7 +2519,7 @@ void LocalPlayer::crazyMoveA()
                     if (Client::limitPackets(PACKET_DIRECTION))
                     {
                         Uint8 dir = 0;
-                        switch (getDirection())
+                        switch (mDirection)
                         {
                             case UP    : dir = Being::DOWN; break;
                             case DOWN  : dir = Being::UP; break;
@@ -2614,8 +2614,8 @@ bool LocalPlayer::isReachable(int x, int y, int maxCost)
     if (!mMap)
         return false;
 
-    if (x - 1 <= getTileX() && x + 1 >= getTileX()
-        && y - 1 <= getTileY() && y + 1 >= getTileY() )
+    if (x - 1 <= mX && x + 1 >= mX
+        && y - 1 <= mY && y + 1 >= mY )
     {
         return true;
     }
@@ -2638,17 +2638,17 @@ bool LocalPlayer::isReachable(Being *being, int maxCost)
     if (being->isReachable() == Being::REACH_NO)
         return false;
 
-    if (being->getTileX() == getTileX()
-        && being->getTileY() == getTileY())
+    if (being->getTileX() == mX
+        && being->getTileY() == mY)
     {
         being->setDistance(0);
         being->setIsReachable(Being::REACH_YES);
         return true;
     }
-    else if (being->getTileX() - 1 <= getTileX()
-             && being->getTileX() + 1 >= getTileX()
-             && being->getTileY() - 1 <= getTileY()
-             && being->getTileY() + 1 >= getTileY())
+    else if (being->getTileX() - 1 <= mX
+             && being->getTileX() + 1 >= mX
+             && being->getTileY() - 1 <= mY
+             && being->getTileY() + 1 >= mY)
     {
         being->setDistance(1);
         being->setIsReachable(Being::REACH_YES);
@@ -2681,8 +2681,8 @@ bool LocalPlayer::pickUpItems(int pickUpType)
         return false;
 
     bool status = false;
-    int x = getTileX();
-    int y = getTileY();
+    int x = mX;
+    int y = mY;
 
     // first pick up item on player position
     FloorItem *item =
@@ -2703,7 +2703,7 @@ bool LocalPlayer::pickUpItems(int pickUpType)
     switch(pickUpType)
     {
         case 1:
-            switch (getDirection())
+            switch (mDirection)
             {
                 case UP   : --y; break;
                 case DOWN : ++y; break;
@@ -2719,7 +2719,7 @@ bool LocalPlayer::pickUpItems(int pickUpType)
             }
             break;
         case 2:
-            switch (getDirection())
+            switch (mDirection)
             {
                 case UP   : x1 = x - 1; y1 = y - 1; x2 = x + 1; y2 = y; break;
                 case DOWN : x1 = x - 1; y1 = y; x2 = x + 1; y2 = y + 1; break;
@@ -2996,8 +2996,8 @@ void LocalPlayer::setHome()
                 static_cast<int>(pos.y));
         }
 
-        if (iter != mHomes.end() && getTileX() == static_cast<int>(pos.x)
-            && getTileY() == static_cast<int>(pos.y))
+        if (iter != mHomes.end() && mX == static_cast<int>(pos.x)
+            && mY == static_cast<int>(pos.y))
         {
             mMap->updatePortalTile("", MapItem::EMPTY,
                 static_cast<int>(pos.x), static_cast<int>(pos.y));
@@ -3014,17 +3014,17 @@ void LocalPlayer::setHome()
                     static_cast<int>(pos.y), MapItem::EMPTY);
             }
 
-            pos.x = static_cast<float>(getTileX());
-            pos.y = static_cast<float>(getTileY());
+            pos.x = static_cast<float>(mX);
+            pos.y = static_cast<float>(mY);
             mHomes[key] = pos;
             mMap->updatePortalTile("home", MapItem::HOME,
-                                   getTileX(), getTileY());
-            socialWindow->addPortal(getTileX(), getTileY());
+                                   mX, mY);
+            socialWindow->addPortal(mX, mY);
         }
-        MapItem *mapItem = specialLayer->getTile(getTileX(), getTileY());
+        MapItem *mapItem = specialLayer->getTile(mX, mY);
         if (mapItem)
         {
-            int idx = socialWindow->getPortalIndex(getTileX(), getTileY());
+            int idx = socialWindow->getPortalIndex(mX, mY);
             mapItem->setName(keyboard.getKeyShortString(
                 outfitWindow->keyName(idx)));
         }
@@ -3032,11 +3032,11 @@ void LocalPlayer::setHome()
     }
     else
     {
-        MapItem *mapItem = specialLayer->getTile(getTileX(), getTileY());
+        MapItem *mapItem = specialLayer->getTile(mX, mY);
         int type = 0;
 
         std::map<std::string, Vector>::iterator iter = mHomes.find(key);
-        if (iter != mHomes.end() && getTileX() == pos.x && getTileY() == pos.y)
+        if (iter != mHomes.end() && mX == pos.x && mY == pos.y)
         {
             mHomes.erase(key);
             saveHomes();
@@ -3057,26 +3057,24 @@ void LocalPlayer::setHome()
         {
             type = MapItem::EMPTY;
         }
-        mMap->updatePortalTile("", type, getTileX(), getTileY());
+        mMap->updatePortalTile("", type, mX, mY);
 
         if (type != MapItem::EMPTY)
         {
-            socialWindow->addPortal(getTileX(), getTileY());
-            mapItem = specialLayer->getTile(getTileX(), getTileY());
+            socialWindow->addPortal(mX, mY);
+            mapItem = specialLayer->getTile(mX, mY);
             if (mapItem)
             {
-                int idx = socialWindow->getPortalIndex(getTileX(), getTileY());
+                int idx = socialWindow->getPortalIndex(mX, mY);
                 mapItem->setName(keyboard.getKeyShortString(
                     outfitWindow->keyName(idx)));
             }
         }
         else
         {
-            specialLayer->setTile(getTileX(), getTileY(), MapItem::EMPTY);
-            socialWindow->removePortal(getTileX(), getTileY());
+            specialLayer->setTile(mX, mY, MapItem::EMPTY);
+            socialWindow->removePortal(mX, mY);
         }
-
-//        specialLayer->setTile(getTileX(), getTileY(), type);
     }
 }
 
@@ -3234,8 +3232,8 @@ bool LocalPlayer::navigateTo(int x, int y)
     mShowNavigePath = true;
     mOldX = static_cast<int>(playerPos.x);
     mOldY = static_cast<int>(playerPos.y);
-    mOldTileX = getTileX();
-    mOldTileY = getTileY();
+    mOldTileX = mX;
+    mOldTileY = mY;
     mNavigateX = x;
     mNavigateY = y;
     mNavigateId = 0;
@@ -3263,8 +3261,8 @@ void LocalPlayer::navigateTo(Being *being)
     mShowNavigePath = true;
     mOldX = static_cast<int>(playerPos.x);
     mOldY = static_cast<int>(playerPos.y);
-    mOldTileX = getTileX();
-    mOldTileY = getTileY();
+    mOldTileX = mX;
+    mOldTileY = mY;
     mNavigateX = being->getTileX();
     mNavigateY = being->getTileY();
 
@@ -3307,7 +3305,7 @@ void LocalPlayer::updateCoords()
 
     const Vector &playerPos = getPosition();
 
-    if (getTileX() != mOldTileX || getTileY() != mOldTileY)
+    if (mX != mOldTileX || mY != mOldTileY)
     {
         if (socialWindow)
             socialWindow->updatePortals();
@@ -3315,7 +3313,7 @@ void LocalPlayer::updateCoords()
             viewport->hideBeingPopup();
         if (mMap)
         {
-            std::string str = mMap->getObjectData(getTileX(), getTileY(),
+            std::string str = mMap->getObjectData(mX, mY,
                 MapItem::MUSIC);
             if (str.empty())
                 str = mMap->getMusicFile();
@@ -3331,7 +3329,7 @@ void LocalPlayer::updateCoords()
 
     if (mShowNavigePath)
     {
-        if (mMap && (getTileX() != mOldTileX || getTileY() != mOldTileY))
+        if (mMap && (mX != mOldTileX || mY != mOldTileY))
         {
             SpecialLayer *tmpLayer = mMap->getTempLayer();
             if (!tmpLayer)
@@ -3367,7 +3365,7 @@ void LocalPlayer::updateCoords()
                 for (Path::const_iterator i = mNavigatePath.begin(),
                      i_end = mNavigatePath.end(); i != i_end; ++i)
                 {
-                    if ((*i).x == getTileX() && (*i).y == getTileY())
+                    if ((*i).x == mX && (*i).y == mY)
                     {
                         mNavigatePath.pop_front();
                         break;
@@ -3385,8 +3383,8 @@ void LocalPlayer::updateCoords()
     }
     mOldX = static_cast<int>(playerPos.x);
     mOldY = static_cast<int>(playerPos.y);
-    mOldTileX = getTileX();
-    mOldTileY = getTileY();
+    mOldTileX = mX;
+    mOldTileY = mY;
 }
 
 void LocalPlayer::targetMoved()
@@ -3416,6 +3414,12 @@ int LocalPlayer::getPathLength(Being* being)
     if (being->mX == mX && being->mY == mY)
         return 0;
 
+    if (being->mX - 1 <= mX && being->mX + 1 >= mX
+        && being->mY - 1 <= mY && being->mY + 1 >= mY)
+    {
+        return 1;
+    }
+
     Path debugPath = mMap->findPath(
         static_cast<int>(playerPos.x - 16) / 32,
         static_cast<int>(playerPos.y - 32) / 32,
@@ -3635,15 +3639,15 @@ void LocalPlayer::followMoveTo(Being *being, int x1, int y1, int x2, int y2)
             case 1:
                 if (x1 != x2 || y1 != y2)
                 {
-                    setDestination(getTileX() + x2 - x1, getTileY() + y2 - y1);
-                    setNextDest(getTileX() + x2 - x1, getTileY() + y2 - y1);
+                    setDestination(mX + x2 - x1, mY + y2 - y1);
+                    setNextDest(mX + x2 - x1, mY + y2 - y1);
                 }
                 break;
             case 2:
                 if (x1 != x2 || y1 != y2)
                 {
-                    setDestination(getTileX() + x1 - x2, getTileY() + y1 - y2);
-                    setNextDest(getTileX() + x1 - x2, getTileY() + y1 - y2);
+                    setDestination(mX + x1 - x2, mY + y1 - y2);
+                    setNextDest(mX + x1 - x2, mY + y1 - y2);
                 }
                 break;
             case 3:
@@ -3697,8 +3701,8 @@ void LocalPlayer::fixPos(int maxDist)
     if (!mCrossX && !mCrossY)
         return;
 
-    int dx = abs(getTileX() - mCrossX);
-    int dy = abs(getTileY() - mCrossY);
+    int dx = abs(mX - mCrossX);
+    int dy = abs(mY - mCrossY);
     int dest = (dx * dx) + (dy * dy);
 
     if (dest > maxDist && mActivityTime
-- 
cgit v1.2.3-60-g2f50


From 9fe83ca23b72a2f13024b0839656d5b00b28b419 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Fri, 23 Sep 2011 01:56:52 +0300
Subject: Improve target monster selection if option "target only reachanble"
 disabled.

---
 src/localplayer.cpp | 28 ++++++++++++++++++++++------
 src/localplayer.h   |  1 +
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index 20d4094d6..11333af42 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -171,6 +171,7 @@ LocalPlayer::LocalPlayer(int id, int subtype):
     mShowJobExp = config.getBoolValue("showJobExp");
     mEnableAdvert = config.getBoolValue("enableAdvert");
     mTradebot = config.getBoolValue("tradebot");
+    mTargetOnlyReachable = config.getBoolValue("targetOnlyReachable");
 
     mPingSendTick = 0;
     mWaitPing = false;
@@ -192,6 +193,7 @@ LocalPlayer::LocalPlayer(int id, int subtype):
     config.addListener("showJobExp", this);
     config.addListener("enableAdvert", this);
     config.addListener("tradebot", this);
+    config.addListener("targetOnlyReachable", this);
     setShowName(config.getBoolValue("showownname"));
 }
 
@@ -209,6 +211,7 @@ LocalPlayer::~LocalPlayer()
     config.removeListener("showJobExp", this);
     config.removeListener("enableAdvert", this);
     config.removeListener("tradebot", this);
+    config.removeListener("targetOnlyReachable", this);
 
     delete mAwayDialog;
     mAwayDialog = 0;
@@ -1631,6 +1634,8 @@ void LocalPlayer::optionChanged(const std::string &value)
         mEnableAdvert = config.getBoolValue("enableAdvert");
     else if (value == "tradebot")
         mTradebot = config.getBoolValue("tradebot");
+    else if (value == "targetOnlyReachable")
+        mTargetOnlyReachable = config.getBoolValue("targetOnlyReachable");
 }
 
 void LocalPlayer::processEvent(Mana::Channels channel,
@@ -3420,12 +3425,23 @@ int LocalPlayer::getPathLength(Being* being)
         return 1;
     }
 
-    Path debugPath = mMap->findPath(
-        static_cast<int>(playerPos.x - 16) / 32,
-        static_cast<int>(playerPos.y - 32) / 32,
-        being->getTileX(), being->getTileY(),
-        getWalkMask(), 0);
-    return static_cast<int>(debugPath.size());
+    if (mTargetOnlyReachable)
+    {
+        Path debugPath = mMap->findPath(
+            static_cast<int>(playerPos.x - 16) / 32,
+            static_cast<int>(playerPos.y - 32) / 32,
+            being->getTileX(), being->getTileY(),
+            getWalkMask(), 0);
+        return static_cast<int>(debugPath.size());
+    }
+    else
+    {
+        const int dx = static_cast<int>(abs(being->mX - mX));
+        const int dy = static_cast<int>(abs(being->mY - mY));
+        if (dx > dy)
+            return dx;
+        return dy;
+    }
 }
 
 void LocalPlayer::attack2(Being *target, bool keep, bool dontChangeEquipment)
diff --git a/src/localplayer.h b/src/localplayer.h
index cb23d855e..278598d58 100644
--- a/src/localplayer.h
+++ b/src/localplayer.h
@@ -601,6 +601,7 @@ class LocalPlayer : public Being, public ActorSpriteListener,
         bool mBlockAdvert;
         bool mEnableAdvert;
         bool mTradebot;
+        bool mTargetOnlyReachable;
         bool mNextStep;
 };
 
-- 
cgit v1.2.3-60-g2f50


From dcc723947399caae79a181d4b2cd430fc6dde585 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Fri, 23 Sep 2011 17:41:51 +0300
Subject: Fix default size for social and status windows.

---
 src/gui/socialwindow.cpp | 2 +-
 src/gui/statuswindow.cpp | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/gui/socialwindow.cpp b/src/gui/socialwindow.cpp
index a8d15f36c..ab19e501b 100644
--- a/src/gui/socialwindow.cpp
+++ b/src/gui/socialwindow.cpp
@@ -1133,7 +1133,7 @@ SocialWindow::SocialWindow() :
 
     setMinWidth(120);
     setMinHeight(55);
-    setDefaultSize(590, 200, 150, 120);
+    setDefaultSize(590, 200, 180, 300);
     setupWindow->registerWindowForReset(this);
 
     mCreateButton = new Button(_("Create"), "create", this);
diff --git a/src/gui/statuswindow.cpp b/src/gui/statuswindow.cpp
index 0cad8732a..203338708 100644
--- a/src/gui/statuswindow.cpp
+++ b/src/gui/statuswindow.cpp
@@ -133,8 +133,8 @@ StatusWindow::StatusWindow():
     setCloseButton(true);
     setSaveVisible(true);
     setStickyButtonLock(true);
-    setDefaultSize((windowContainer->getWidth() - 365) / 2,
-                   (windowContainer->getHeight() - 255) / 2, 365, 275);
+    setDefaultSize((windowContainer->getWidth() - 480) / 2,
+                   (windowContainer->getHeight() - 500) / 2, 480, 500);
 
     // ----------------------
     // Status Part
-- 
cgit v1.2.3-60-g2f50


From e1e205aaaeb21eb98481c58be70aa6cb9d3b5302 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sat, 24 Sep 2011 02:02:30 +0300
Subject: Fix number of servers type with enabled manaserv.

---
 src/gui/serverdialog.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/gui/serverdialog.h b/src/gui/serverdialog.h
index a5f5f3ee0..39c6f94f7 100644
--- a/src/gui/serverdialog.h
+++ b/src/gui/serverdialog.h
@@ -95,7 +95,11 @@ class TypeListModel : public gcn::ListModel
          * Used to get number of line in the list
          */
         int getNumberOfElements()
+#ifdef MANASERV_SUPPORT
+        { return 3; }
+#else
         { return 2; }
+#endif
 
         /**
          * Used to get an element from the list
-- 
cgit v1.2.3-60-g2f50


From 4208c8cd889112aa1adffaa2b6492f61734d1105 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sat, 24 Sep 2011 17:13:07 +0300
Subject: Replace compare function in who is online to functuator.

---
 src/gui/whoisonline.cpp | 38 +++++++++++++++++++++-----------------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/src/gui/whoisonline.cpp b/src/gui/whoisonline.cpp
index e1f69c2d7..a14e99afc 100644
--- a/src/gui/whoisonline.cpp
+++ b/src/gui/whoisonline.cpp
@@ -59,23 +59,27 @@
 #undef malloc
 #endif
 
-bool stringCompare(const std::string &left, const std::string &right);
 
-bool stringCompare(const std::string &left, const std::string &right )
+class NameFunctuator
 {
-    for (std::string::const_iterator lit = left.begin(),
-         rit = right.begin();
-         lit != left.end() && rit != right.end(); ++lit, ++rit)
-    {
-        if (tolower(*lit) < tolower(*rit))
-            return true;
-        else if (tolower(*lit) > tolower(*rit))
+    public:
+        bool operator()(const std::string &left,
+                        const std::string &right) const
+        {
+            for (std::string::const_iterator lit = left.begin(),
+                 rit = right.begin();
+                 lit != left.end() && rit != right.end(); ++lit, ++rit)
+            {
+                if (tolower(*lit) < tolower(*rit))
+                    return true;
+                else if (tolower(*lit) > tolower(*rit))
+                    return false;
+            }
+            if (left.size() < right.size())
+                return true;
             return false;
-    }
-    if (left.size() < right.size())
-        return true;
-    return false;
-}
+        }
+} nameCompare;
 
 WhoIsOnline::WhoIsOnline():
     Window(_("Who Is Online - Updating"), false, 0, "whoisonline.xml"),
@@ -297,9 +301,9 @@ void WhoIsOnline::loadList()
     setCaption(_("Who Is Online - ") + toString(numOnline));
 
     //List the online people
-    sort(friends.begin(), friends.end(), stringCompare);
-    sort(neutral.begin(), neutral.end(), stringCompare);
-    sort(disregard.begin(), disregard.end(), stringCompare);
+    sort(friends.begin(), friends.end(), nameCompare);
+    sort(neutral.begin(), neutral.end(), nameCompare);
+    sort(disregard.begin(), disregard.end(), nameCompare);
     bool addedFromSection(false);
     for (int i = 0; i < static_cast<int>(friends.size()); i++)
     {
-- 
cgit v1.2.3-60-g2f50


From a1cd5307497bfc754f157a3e22bfa98fc126137a Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Mon, 26 Sep 2011 17:46:50 +0300
Subject: Split keyboard keys to groups.

---
 src/gui/setup_keyboard.cpp | 33 ++++++++++++++++++++++++++-------
 src/keyboardconfig.cpp     | 32 +++++++++++++++++++++++---------
 src/keyboardconfig.h       | 16 +++++++++++++---
 3 files changed, 62 insertions(+), 19 deletions(-)

diff --git a/src/gui/setup_keyboard.cpp b/src/gui/setup_keyboard.cpp
index 5125541cf..922d9797b 100644
--- a/src/gui/setup_keyboard.cpp
+++ b/src/gui/setup_keyboard.cpp
@@ -153,8 +153,17 @@ void Setup_Keyboard::action(const gcn::ActionEvent &event)
     {
         if (!mKeySetting)
         {
-            mAssignKeyButton->setEnabled(true);
-            mUnassignKeyButton->setEnabled(true);
+            int i(mKeyList->getSelected());
+            if (keyboard.isSeparator(i))
+            {
+                mAssignKeyButton->setEnabled(false);
+                mUnassignKeyButton->setEnabled(false);
+            }
+            else
+            {
+                mAssignKeyButton->setEnabled(true);
+                mUnassignKeyButton->setEnabled(true);
+            }
         }
     }
     else if (event.getId() == "assign")
@@ -183,11 +192,21 @@ void Setup_Keyboard::action(const gcn::ActionEvent &event)
 
 void Setup_Keyboard::refreshAssignedKey(int index)
 {
-    std::string caption;
-    char *temp = SDL_GetKeyName(
-        static_cast<SDLKey>(keyboard.getKeyValue(index)));
-    caption = keyboard.getKeyCaption(index) + ": " + toString(temp);
-    mKeyListModel->setElementAt(index, caption);
+    if (keyboard.isSeparator(index))
+    {
+        const std::string str = " \342\200\225\342\200\225\342\200\225"
+            "\342\200\225\342\200\225 ";
+        mKeyListModel->setElementAt(index, str
+            + keyboard.getKeyCaption(index) + str);
+    }
+    else
+    {
+        std::string caption;
+        char *temp = SDL_GetKeyName(
+            static_cast<SDLKey>(keyboard.getKeyValue(index)));
+        caption = keyboard.getKeyCaption(index) + ": " + toString(temp);
+        mKeyListModel->setElementAt(index, caption);
+    }
 }
 
 void Setup_Keyboard::newKeyCallback(int index)
diff --git a/src/keyboardconfig.cpp b/src/keyboardconfig.cpp
index ea9f9b90b..f9831c18f 100644
--- a/src/keyboardconfig.cpp
+++ b/src/keyboardconfig.cpp
@@ -40,6 +40,7 @@ struct KeyData
 
 // keyData must be in same order as enum keyAction.
 static KeyData const keyData[KeyboardConfig::KEY_TOTAL] = {
+    {"", 0, N_("Basic Keys"), 0},
     {"keyMoveUp", SDLK_UP, N_("Move Up"), KeyboardConfig::GRP_DEFAULT},
     {"keyMoveDown", SDLK_DOWN, N_("Move Down"), KeyboardConfig::GRP_DEFAULT},
     {"keyMoveLeft", SDLK_LEFT, N_("Move Left"), KeyboardConfig::GRP_DEFAULT},
@@ -58,7 +59,6 @@ static KeyData const keyData[KeyboardConfig::KEY_TOTAL] = {
         KeyboardConfig::GRP_DEFAULT},
     {"keyMoveToPoint", SDLK_RSHIFT, N_("Move to navigation point"),
         KeyboardConfig::GRP_DEFAULT},
-    {"keySmilie", SDLK_LALT, N_("Smilie"), KeyboardConfig::GRP_DEFAULT},
     {"keyTalk", SDLK_t, N_("Talk"), KeyboardConfig::GRP_DEFAULT},
     {"keyTarget", SDLK_LSHIFT, N_("Stop Attack"), KeyboardConfig::GRP_DEFAULT},
     {"keyTargetClosest", SDLK_a, N_("Target Closest"),
@@ -77,6 +77,10 @@ static KeyData const keyData[KeyboardConfig::KEY_TOTAL] = {
         KeyboardConfig::GRP_DEFAULT},
     {"keyPathfind", SDLK_f, N_("Change Map View Mode"),
         KeyboardConfig::GRP_DEFAULT},
+    {"keyOK", SDLK_SPACE, N_("Select OK"),
+        KeyboardConfig::GRP_DEFAULT | KeyboardConfig::GRP_GUI},
+    {"keyQuit", SDLK_ESCAPE, N_("Quit"), KeyboardConfig::GRP_DEFAULT},
+    {"", 0, N_("Shortcuts Keys"), 0},
     {"keyShortcutsKey", SDLK_MENU, N_("Item Shortcuts Key"),
         KeyboardConfig::GRP_DEFAULT},
     {"keyShortcut1", SDLK_1, strprintf(N_("Item Shortcut %d"), 1),
@@ -119,6 +123,7 @@ static KeyData const keyData[KeyboardConfig::KEY_TOTAL] = {
         strprintf(N_("Item Shortcut %d"), 19), KeyboardConfig::GRP_DEFAULT},
     {"keyShortcut20", KeyboardConfig::KEY_NO_VALUE,
         strprintf(N_("Item Shortcut %d"), 20), KeyboardConfig::GRP_DEFAULT},
+    {"", 0, N_("Windows Keys"), 0},
     {"keyWindowHelp", SDLK_F1, N_("Help Window"), KeyboardConfig::GRP_DEFAULT
         | KeyboardConfig::GRP_GUI},
     {"keyWindowStatus", SDLK_F2, N_("Status Window"),
@@ -165,6 +170,8 @@ static KeyData const keyData[KeyboardConfig::KEY_TOTAL] = {
         | KeyboardConfig::GRP_GUI},
     {"keySocialNextTab", KeyboardConfig::KEY_NO_VALUE, N_("Next Social Tab"),
         KeyboardConfig::GRP_DEFAULT | KeyboardConfig::GRP_GUI},
+    {"", 0, N_("Emotes Keys"), 0},
+    {"keySmilie", SDLK_LALT, N_("Smilie"), KeyboardConfig::GRP_DEFAULT},
     {"keyEmoteShortcut1", SDLK_1, strprintf(N_("Emote Shortcut %d"), 1),
         KeyboardConfig::GRP_EMOTION},
     {"keyEmoteShortcut2", SDLK_2, strprintf(N_("Emote Shortcut %d"), 2),
@@ -258,12 +265,14 @@ static KeyData const keyData[KeyboardConfig::KEY_TOTAL] = {
         KeyboardConfig::GRP_EMOTION},
     {"keyEmoteShortcut44", SDLK_b, strprintf(N_("Emote Shortcut %d"), 44),
         KeyboardConfig::GRP_EMOTION},
+    {"", 0, N_("Outfits Keys"), 0},
     {"keyWearOutfit", SDLK_RCTRL, N_("Wear Outfit"),
         KeyboardConfig::GRP_DEFAULT},
     {"keyCopyOutfit", SDLK_RALT, N_("Copy Outfit"),
         KeyboardConfig::GRP_DEFAULT},
     {"keyCopyEquipedOutfit", SDLK_RIGHTBRACKET, N_("Copy equipped to Outfit"),
         KeyboardConfig::GRP_DEFAULT},
+    {"", 0, N_("Chat Keys"), 0},
     {"keyChat", SDLK_RETURN, N_("Toggle Chat"), KeyboardConfig::GRP_DEFAULT
         | KeyboardConfig::GRP_CHAT},
     {"keyChatScrollUp", SDLK_PAGEUP, N_("Scroll Chat Up"),
@@ -285,9 +294,7 @@ static KeyData const keyData[KeyboardConfig::KEY_TOTAL] = {
         KeyboardConfig::GRP_CHAT},
     {"keyDeActivateChat", SDLK_ESCAPE, N_("Deactivate Chat Input"),
         KeyboardConfig::GRP_CHAT},
-    {"keyOK", SDLK_SPACE, N_("Select OK"),
-        KeyboardConfig::GRP_DEFAULT | KeyboardConfig::GRP_GUI},
-    {"keyQuit", SDLK_ESCAPE, N_("Quit"), KeyboardConfig::GRP_DEFAULT},
+    {"", 0, N_("Other Keys"), 0},
     {"keyIgnoreInput1", SDLK_LSUPER, N_("Ignore input 1"),
         KeyboardConfig::GRP_DEFAULT},
     {"keyIgnoreInput2", SDLK_RSUPER, N_("Ignore input 2"),
@@ -370,15 +377,21 @@ void KeyboardConfig::retrieve()
 {
     for (int i = 0; i < KEY_TOTAL; i++)
     {
-        mKey[i].value = static_cast<int>(config.getValue(
-            mKey[i].configField, mKey[i].defaultValue));
+        if (*mKey[i].configField)
+        {
+            mKey[i].value = static_cast<int>(config.getValue(
+                mKey[i].configField, mKey[i].defaultValue));
+        }
     }
 }
 
 void KeyboardConfig::store()
 {
     for (int i = 0; i < KEY_TOTAL; i++)
-        config.setValue(mKey[i].configField, mKey[i].value);
+    {
+        if (*mKey[i].configField)
+            config.setValue(mKey[i].configField, mKey[i].value);
+    }
 }
 
 void KeyboardConfig::makeDefault()
@@ -396,7 +409,7 @@ bool KeyboardConfig::hasConflicts()
      */
     for (i = 0; i < KEY_TOTAL; i++)
     {
-        if (mKey[i].value == KEY_NO_VALUE)
+        if (mKey[i].value == KEY_NO_VALUE || !*mKey[i].configField)
             continue;
 
         for (j = i, j++; j < KEY_TOTAL; j++)
@@ -405,7 +418,8 @@ bool KeyboardConfig::hasConflicts()
             // as well as emote and ignore keys, but no other keys
             if (mKey[j].value != KEY_NO_VALUE &&
                 mKey[i].value == mKey[j].value &&
-                ((mKey[i].grp & mKey[j].grp) != 0)
+                ((mKey[i].grp & mKey[j].grp) != 0 &&
+                *mKey[i].configField)
                )
             {
                 mBindError = strprintf(_("Conflict \"%s\" and \"%s\" keys. "
diff --git a/src/keyboardconfig.h b/src/keyboardconfig.h
index 43bb1c17f..bfec0fc87 100644
--- a/src/keyboardconfig.h
+++ b/src/keyboardconfig.h
@@ -78,6 +78,9 @@ class KeyboardConfig
         int getKeyValue(int index) const
         { return mKey[index].value; }
 
+        bool isSeparator(int index) const
+        { return !*mKey[index].configField; }
+
         /**
          * Get the index of the new key to be assigned.
          */
@@ -157,6 +160,7 @@ class KeyboardConfig
         enum KeyAction
         {
             KEY_NO_VALUE = -1,
+            KEY_SEPARATOR1,
             KEY_MOVE_UP,
             KEY_MOVE_DOWN,
             KEY_MOVE_LEFT,
@@ -168,7 +172,6 @@ class KeyboardConfig
             KEY_MOVE_TO_HOME,
             KEY_SET_HOME,
             KEY_MOVE_TO_POINT,
-            KEY_EMOTE,
             KEY_TALK,
             KEY_TARGET,
             KEY_TARGET_CLOSEST,
@@ -181,6 +184,9 @@ class KeyboardConfig
             KEY_SCREENSHOT,
             KEY_TRADE,
             KEY_PATHFIND,
+            KEY_OK,
+            KEY_QUIT,
+            KEY_SEPARATOR2,
             KEY_SHORTCUTS_KEY,
             KEY_SHORTCUT_1,
             KEY_SHORTCUT_2,
@@ -202,6 +208,7 @@ class KeyboardConfig
             KEY_SHORTCUT_18,
             KEY_SHORTCUT_19,
             KEY_SHORTCUT_20,
+            KEY_SEPARATOR3,
             KEY_WINDOW_HELP,
             KEY_WINDOW_STATUS,
             KEY_WINDOW_INVENTORY,
@@ -224,6 +231,8 @@ class KeyboardConfig
             KEY_WINDOW_DIDYOUKNOW,
             KEY_PREV_SOCIAL_TAB,
             KEY_NEXT_SOCIAL_TAB,
+            KEY_SEPARATOR4,
+            KEY_EMOTE,
             KEY_EMOTE_1,
             KEY_EMOTE_2,
             KEY_EMOTE_3,
@@ -268,9 +277,11 @@ class KeyboardConfig
             KEY_EMOTE_42,
             KEY_EMOTE_43,
             KEY_EMOTE_44,
+            KEY_SEPARATOR5,
             KEY_WEAR_OUTFIT,
             KEY_COPY_OUTFIT,
             KEY_COPY_EQUIPED_OUTFIT,
+            KEY_SEPARATOR6,
             KEY_TOGGLE_CHAT,
             KEY_SCROLL_CHAT_UP,
             KEY_SCROLL_CHAT_DOWN,
@@ -281,8 +292,7 @@ class KeyboardConfig
             KEY_CHAT_NEXT_HISTORY,
             KEY_AUTOCOMPLETE_CHAT,
             KEY_DEACTIVATE_CHAT,
-            KEY_OK,
-            KEY_QUIT,
+            KEY_SEPARATOR7,
             KEY_IGNORE_INPUT_1,
             KEY_IGNORE_INPUT_2,
             KEY_DIRECT_UP,
-- 
cgit v1.2.3-60-g2f50


From 2ca54be098398e50bb9aa482f78d1f302e372fd5 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Mon, 26 Sep 2011 20:17:08 +0300
Subject: Add ability to scrolling in scrollareas like chat by mouse draging.

---
 src/gui/widgets/scrollarea.cpp | 57 ++++++++++++++++++++++++++++++++++++++++++
 src/gui/widgets/scrollarea.h   |  5 ++++
 2 files changed, 62 insertions(+)

diff --git a/src/gui/widgets/scrollarea.cpp b/src/gui/widgets/scrollarea.cpp
index 2796d3ab2..3204028dc 100644
--- a/src/gui/widgets/scrollarea.cpp
+++ b/src/gui/widgets/scrollarea.cpp
@@ -47,6 +47,8 @@ ScrollArea::ScrollArea():
     gcn::ScrollArea(),
     mX(0),
     mY(0),
+    mClickX(0),
+    mClickY(0),
     mHasMouse(false),
     mOpaque(true),
     mVertexes(new GraphicsVertexes()),
@@ -64,6 +66,8 @@ ScrollArea::ScrollArea(gcn::Widget *widget):
     gcn::ScrollArea(widget),
     mX(0),
     mY(0),
+    mClickX(0),
+    mClickY(0),
     mHasMouse(false),
     mOpaque(true),
     mVertexes(new GraphicsVertexes()),
@@ -513,3 +517,56 @@ void ScrollArea::widgetMoved(const gcn::Event& event A_UNUSED)
 {
     mRedraw = true;
 }
+
+void ScrollArea::mousePressed(gcn::MouseEvent& event)
+{
+    gcn::ScrollArea::mousePressed(event);
+    if (event.getButton() == gcn::MouseEvent::LEFT)
+    {
+        mClickX = event.getX();
+        mClickY = event.getY();
+    }
+}
+
+void ScrollArea::mouseReleased(gcn::MouseEvent& event)
+{
+    if (event.getButton() == gcn::MouseEvent::LEFT && mClickX && mClickY)
+    {
+        if (!event.isConsumed())
+        {
+            int dx = event.getX() - mClickX;
+            int dy = event.getY() - mClickY;
+
+            if ((dx < 10 && dx > 0) || (dx > -10 && dx < 0))
+                dx = 0;
+
+            if ((dy < 10 && dy > 0) || (dy > -10 && dy < 0))
+                dy = 0;
+
+            if (dx)
+            {
+                int s = getHorizontalScrollAmount() + dx;
+                if (s < 0)
+                    s = 0;
+                else if (s > getHorizontalMaxScroll())
+                    s = getHorizontalMaxScroll();
+
+                setHorizontalScrollAmount(s);
+            }
+            if (dy)
+            {
+                int s = getVerticalScrollAmount() + dy;
+                if (s < 0)
+                    s = 0;
+                else if (s > getVerticalMaxScroll())
+                    s = getVerticalMaxScroll();
+
+                setVerticalScrollAmount(s);
+            }
+            mClickX = 0;
+            mClickY = 0;
+            event.consume();
+        }
+    }
+    gcn::ScrollArea::mouseReleased(event);
+}
diff --git a/src/gui/widgets/scrollarea.h b/src/gui/widgets/scrollarea.h
index 095010f3c..56e21c58c 100644
--- a/src/gui/widgets/scrollarea.h
+++ b/src/gui/widgets/scrollarea.h
@@ -112,6 +112,10 @@ class ScrollArea : public gcn::ScrollArea, public gcn::WidgetListener
          */
         void mouseExited(gcn::MouseEvent& event);
 
+        void mousePressed(gcn::MouseEvent& event);
+
+        void mouseReleased(gcn::MouseEvent& event);
+
         void widgetResized(const gcn::Event &event);
 
         void widgetMoved(const gcn::Event &event);
@@ -148,6 +152,7 @@ class ScrollArea : public gcn::ScrollArea, public gcn::WidgetListener
         static Image *buttons[4][2];
 
         int mX, mY;
+        int mClickX, mClickY;
         bool mHasMouse;
         bool mOpaque;
         GraphicsVertexes *mVertexes;
-- 
cgit v1.2.3-60-g2f50


From b782c12e55c65b6ca9b7384d63fb833a4c53c0bf Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Mon, 26 Sep 2011 20:20:01 +0300
Subject: Fix code style.

---
 src/actorspritemanager.cpp | 6 +++---
 src/spellmanager.cpp       | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/actorspritemanager.cpp b/src/actorspritemanager.cpp
index 18ef869c1..827d46f29 100644
--- a/src/actorspritemanager.cpp
+++ b/src/actorspritemanager.cpp
@@ -348,9 +348,9 @@ Being *ActorSpriteManager::findBeingByPixel(int x, int y,
                     return being;
                 }
                 else if (!noBeing && (being->getPixelX() - 32 <= x) &&
-                          (being->getPixelX() + 32 > x) &&
-                          (being->getPixelY() - 64 <= y) &&
-                          (being->getPixelY() + 16 > y))
+                         (being->getPixelX() + 32 > x) &&
+                         (being->getPixelY() - 64 <= y) &&
+                         (being->getPixelY() + 16 > y))
                 {
                     if (tempBeing)
                         noBeing = true;
diff --git a/src/spellmanager.cpp b/src/spellmanager.cpp
index 4f7d038f2..9f7aaaa8b 100644
--- a/src/spellmanager.cpp
+++ b/src/spellmanager.cpp
@@ -68,8 +68,8 @@ void SpellManager::fillSpells()
 {
 //id, std::string name, std::string symbol, ST type, int basicLvl, MagicSchool school, int schoolLvl, int mana)
 
-    addSpell(new TextCommand(0, "lum", "#lum", "heal with lifestones", ALLOWTARGET,
-             "", 1, SKILL_MAGIC_LIFE, 0, 6));
+    addSpell(new TextCommand(0, "lum", "#lum", "heal with lifestones",
+             ALLOWTARGET, "", 1, SKILL_MAGIC_LIFE, 0, 6));
     addSpell(new TextCommand(1, "inm", "#inma", "heal", NEEDTARGET,
              "", 2, SKILL_MAGIC_LIFE, 2, 10));
     addSpell(new TextCommand(2, "fla", "#flar", "", NOTARGET,
-- 
cgit v1.2.3-60-g2f50


From 8b4027516585888ad7e807b73a2f683e5a2ee0f8 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Tue, 27 Sep 2011 01:11:39 +0300
Subject: Add limit for stop attack packet.

---
 src/client.cpp      | 8 ++++++--
 src/client.h        | 1 +
 src/localplayer.cpp | 3 +++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/client.cpp b/src/client.cpp
index d0348dec5..8497d337b 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -2006,6 +2006,10 @@ void Client::initPacketLimiter()
     mPacketLimits[PACKET_ATTACK].cntLimit = 1;
     mPacketLimits[PACKET_ATTACK].cnt = 0;
 
+    mPacketLimits[PACKET_STOPATTACK].timeLimit = 2 + 10;
+    mPacketLimits[PACKET_STOPATTACK].lastTime = 0;
+    mPacketLimits[PACKET_STOPATTACK].cntLimit = 1;
+    mPacketLimits[PACKET_STOPATTACK].cnt = 0;
 
     if (!mServerConfigDir.empty())
     {
@@ -2043,7 +2047,7 @@ void Client::initPacketLimiter()
                     mPacketLimits[f].timeLimit = atoi(line);
             }
             inPacketFile.close();
-            if (ver == 1)
+            if (ver < 3)
                 writePacketLimits(packetLimitsName);
         }
     }
@@ -2058,7 +2062,7 @@ void Client::writePacketLimits(std::string packetLimitsName)
         outPacketFile.close();
         return;
     }
-    outPacketFile << "2" << std::endl;
+    outPacketFile << "3" << std::endl;
     for (int f = 0; f < PACKET_SIZE; f ++)
     {
         outPacketFile << toString(mPacketLimits[f].timeLimit)
diff --git a/src/client.h b/src/client.h
index 08bc1ecbf..776e9aa3d 100644
--- a/src/client.h
+++ b/src/client.h
@@ -136,6 +136,7 @@ enum PacketTypes
     PACKET_SIT = 7,
     PACKET_DIRECTION = 8,
     PACKET_ATTACK = 9,
+    PACKET_STOPATTACK = 10,
     PACKET_SIZE
 };
 
diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index 11333af42..324f3af54 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -1383,6 +1383,9 @@ void LocalPlayer::attack(Being *target, bool keep, bool dontChangeEquipment)
 
 void LocalPlayer::stopAttack()
 {
+    if (!Client::limitPackets(PACKET_STOPATTACK))
+        return;
+
     if (mServerAttack && mAction == ATTACK)
         Net::getPlayerHandler()->stopAttack();
 
-- 
cgit v1.2.3-60-g2f50


From 44e9d7fdf4be882cde47b98808a79b2f41ad8e60 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Tue, 27 Sep 2011 22:59:25 +0300
Subject: Update and rebuild translations.

---
 po/cs.po        | 496 +++++++++++++++++++++++++++------------------------
 po/de.po        | 496 +++++++++++++++++++++++++++------------------------
 po/es.po        | 496 +++++++++++++++++++++++++++------------------------
 po/fi.po        | 496 +++++++++++++++++++++++++++------------------------
 po/fr.po        | 540 ++++++++++++++++++++++++++++++--------------------------
 po/hr.po        | 496 +++++++++++++++++++++++++++------------------------
 po/hu.po        | 496 +++++++++++++++++++++++++++------------------------
 po/id.po        | 494 +++++++++++++++++++++++++++------------------------
 po/ja.po        | 496 +++++++++++++++++++++++++++------------------------
 po/manaplus.pot | 492 +++++++++++++++++++++++++++------------------------
 po/nl_BE.po     | 496 +++++++++++++++++++++++++++------------------------
 po/pt.po        | 498 +++++++++++++++++++++++++++------------------------
 po/pt_BR.po     | 498 +++++++++++++++++++++++++++------------------------
 po/ru.po        | 496 +++++++++++++++++++++++++++------------------------
 po/zh_CN.po     | 496 +++++++++++++++++++++++++++------------------------
 15 files changed, 3984 insertions(+), 3498 deletions(-)

diff --git a/po/cs.po b/po/cs.po
index f0ac1b589..40b1ff5ee 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-09-17 16:12+0300\n"
-"PO-Revision-Date: 2011-09-17 13:43+0000\n"
+"POT-Creation-Date: 2011-09-27 22:18+0300\n"
+"PO-Revision-Date: 2011-09-27 19:20+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: Czech (http://www.transifex.net/projects/p/manaplus/team/"
 "cs/)\n"
@@ -21,25 +21,25 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
 
-#: src/actorspritemanager.cpp:1088
+#: src/actorspritemanager.cpp:1133
 msgid "Visible on map"
 msgstr "Viditelný na mapě"
 
-#: src/being.cpp:548
+#: src/being.cpp:547
 msgid "dodge"
 msgstr "úskočil"
 
-#: src/being.cpp:548
+#: src/being.cpp:547
 msgid "miss"
 msgstr "minul"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1527
+#: src/being.cpp:1526
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1532
+#: src/being.cpp:1531
 msgid "I"
 msgstr ""
 
@@ -47,43 +47,43 @@ msgstr ""
 msgid "Setup"
 msgstr "Nastavení"
 
-#: src/client.cpp:841 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:842 src/gui/setup_perfomance.cpp:48
 msgid "Perfomance"
 msgstr "Výkon"
 
-#: src/client.cpp:846 src/gui/setup_video.cpp:315
+#: src/client.cpp:847 src/gui/setup_video.cpp:315
 msgid "Video"
 msgstr "Video"
 
-#: src/client.cpp:851
+#: src/client.cpp:852
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:932
+#: src/client.cpp:934
 msgid "Connecting to server"
 msgstr "Připojuji se k serveru"
 
-#: src/client.cpp:963
+#: src/client.cpp:965
 msgid "Logging in"
 msgstr "Přihlašuji se"
 
-#: src/client.cpp:996
+#: src/client.cpp:998
 msgid "Entering game world"
 msgstr "Vstupuji do herního světa"
 
-#: src/client.cpp:1096
+#: src/client.cpp:1098
 msgid "Requesting characters"
 msgstr "Požaduji postavy"
 
-#: src/client.cpp:1127
+#: src/client.cpp:1129
 msgid "Connecting to the game server"
 msgstr "Připojuji se k hernímu serveru"
 
-#: src/client.cpp:1137
+#: src/client.cpp:1139
 msgid "Changing game servers"
 msgstr "Zaměňuji herní servery"
 
-#: src/client.cpp:1180 src/client.cpp:1187 src/client.cpp:1321
+#: src/client.cpp:1182 src/client.cpp:1189 src/client.cpp:1323
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:221 src/gui/charselectdialog.cpp:253
 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
@@ -93,50 +93,50 @@ msgstr "Zaměňuji herní servery"
 msgid "Error"
 msgstr "Chyba"
 
-#: src/client.cpp:1196
+#: src/client.cpp:1198
 msgid "Requesting registration details"
 msgstr "Požaduji registrační detaily"
 
-#: src/client.cpp:1222
+#: src/client.cpp:1224
 msgid "Password Change"
 msgstr "Změna hesla"
 
-#: src/client.cpp:1223
+#: src/client.cpp:1225
 msgid "Password changed successfully!"
 msgstr "Heslo úspěšně změněno!"
 
-#: src/client.cpp:1242
+#: src/client.cpp:1244
 msgid "Email Change"
 msgstr "Změna emailu"
 
-#: src/client.cpp:1243
+#: src/client.cpp:1245
 msgid "Email changed successfully!"
 msgstr "Email úspěšně změněn!"
 
-#: src/client.cpp:1263
+#: src/client.cpp:1265
 msgid "Unregister Successful"
 msgstr "Zrušení registrace úspěšné"
 
-#: src/client.cpp:1264
+#: src/client.cpp:1266
 msgid "Farewell, come back any time..."
 msgstr "Nashledanou, vraťte se kdykoli..."
 
-#: src/client.cpp:1463 src/client.cpp:1493 src/client.cpp:1508
-#: src/client.cpp:1933 src/client.cpp:1940
+#: src/client.cpp:1465 src/client.cpp:1495 src/client.cpp:1510
+#: src/client.cpp:1935 src/client.cpp:1942
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1639
+#: src/client.cpp:1641
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Neplatný host updatů: %s"
 
-#: src/client.cpp:1673 src/client.cpp:1679
+#: src/client.cpp:1675 src/client.cpp:1681
 msgid "Error creating updates directory!"
 msgstr "Chyba při vytváření adresáře s updaty!"
 
-#: src/client.cpp:1700
+#: src/client.cpp:1702
 #, 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."
@@ -349,11 +349,11 @@ msgstr "Ignorovat příchozí žádosti o obchodování"
 msgid "Accepting incoming trade requests"
 msgstr "Akceptovat příchozí žádosti o obchodování"
 
-#: src/game.cpp:1729
+#: src/game.cpp:1727
 msgid "Could Not Load Map"
 msgstr "Nelze načíst mapu"
 
-#: src/game.cpp:1730
+#: src/game.cpp:1728
 #, c-format
 msgid "Error while loading %s"
 msgstr "Chyba při načítání %s"
@@ -388,7 +388,7 @@ msgstr "Jméno"
 
 #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:133
 #: src/gui/popupmenu.cpp:283 src/gui/popupmenu.cpp:596
-#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:265
+#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:265
 msgid "Attack"
 msgstr "Útok"
 
@@ -442,7 +442,7 @@ msgstr ""
 #: src/gui/buydialog.cpp:99 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:294
-#: src/keyboardconfig.cpp:290
+#: src/keyboardconfig.cpp:82
 msgid "Quit"
 msgstr "Ukončit"
 
@@ -477,7 +477,7 @@ msgstr "Prodej"
 #: src/gui/popupmenu.cpp:1858 src/gui/popupmenu.cpp:1897
 #: src/gui/popupmenu.cpp:1949 src/gui/popupmenu.cpp:1969
 #: src/gui/quitdialog.cpp:55 src/gui/register.cpp:82 src/gui/setup.cpp:72
-#: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:238
+#: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:241
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
 #: src/gui/updaterwindow.cpp:161
 msgid "Cancel"
@@ -646,8 +646,8 @@ msgid "Enter password:"
 msgstr "Zadej heslo:"
 
 #: src/gui/charselectdialog.cpp:410 src/gui/serverdialog.cpp:298
-#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:122
-#: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:241
+#: src/gui/setup_relations.cpp:242 src/gui/shopwindow.cpp:122
+#: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244
 msgid "Delete"
 msgstr "Smazat"
 
@@ -899,7 +899,7 @@ msgid "Did You Know?"
 msgstr "Víte že ... ?"
 
 #: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
-#: src/gui/inventorywindow.cpp:206 src/gui/npcdialog.cpp:53
+#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:53
 #: src/gui/popupmenu.cpp:556 src/gui/shopwindow.cpp:113
 msgid "Close"
 msgstr "Zavřít"
@@ -926,7 +926,7 @@ msgid "Equipment"
 msgstr "Vybavení"
 
 #: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160
-#: src/gui/inventorywindow.cpp:539 src/gui/inventorywindow.cpp:548
+#: src/gui/inventorywindow.cpp:538 src/gui/inventorywindow.cpp:547
 #: src/gui/popupmenu.cpp:1656 src/gui/popupmenu.cpp:1748
 #: src/gui/popupmenu.cpp:1793
 msgid "Unequip"
@@ -956,37 +956,33 @@ msgstr "dle množství"
 msgid "by type"
 msgstr "dle typu"
 
-#: src/gui/inventorywindow.cpp:111 src/gui/windowmenu.cpp:76
+#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:76
 #: src/inventory.cpp:249
 msgid "Inventory"
 msgstr "Inventář"
 
-#: src/gui/inventorywindow.cpp:136
+#: src/gui/inventorywindow.cpp:137
 msgid "Slots:"
 msgstr "Sloty:"
 
-#: src/gui/inventorywindow.cpp:148
+#: src/gui/inventorywindow.cpp:149
 msgid "Filter:"
 msgstr "Filtr:"
 
-#: src/gui/inventorywindow.cpp:149
-msgid "Sort:"
-msgstr "Třídit:"
-
-#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:541
-#: src/gui/inventorywindow.cpp:550 src/gui/popupmenu.cpp:1658
+#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:540
+#: src/gui/inventorywindow.cpp:549 src/gui/popupmenu.cpp:1658
 #: src/gui/popupmenu.cpp:1750 src/gui/popupmenu.cpp:1795
 msgid "Equip"
 msgstr "Vybavit"
 
-#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:542
-#: src/gui/inventorywindow.cpp:546 src/gui/popupmenu.cpp:1662
+#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:541
+#: src/gui/inventorywindow.cpp:545 src/gui/popupmenu.cpp:1662
 #: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1754
 #: src/gui/popupmenu.cpp:1799
 msgid "Use"
 msgstr "Použít"
 
-#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:646
+#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:645
 #: src/gui/popupmenu.cpp:1667 src/gui/popupmenu.cpp:1759
 #: src/gui/popupmenu.cpp:1804
 msgid "Drop..."
@@ -1006,17 +1002,17 @@ msgstr "Výstroje"
 msgid "Weight:"
 msgstr "Hmotnost:"
 
-#: src/gui/inventorywindow.cpp:204 src/gui/inventorywindow.cpp:637
+#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:636
 #: src/gui/popupmenu.cpp:1642 src/gui/popupmenu.cpp:1771
 #: src/gui/popupmenu.cpp:1816 src/gui/setup.cpp:73
 msgid "Store"
 msgstr "Uložit"
 
-#: src/gui/inventorywindow.cpp:205 src/gui/popupmenu.cpp:1683
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1683
 msgid "Retrieve"
 msgstr "Vzít"
 
-#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1672
+#: src/gui/inventorywindow.cpp:647 src/gui/popupmenu.cpp:1672
 #: src/gui/popupmenu.cpp:1764 src/gui/popupmenu.cpp:1809
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
@@ -2210,30 +2206,34 @@ msgid "Show own name"
 msgstr "Zobrazit vlastní jméno"
 
 #: src/gui/setup_players.cpp:63
+msgid "Enable extended mouse targeting"
+msgstr ""
+
+#: src/gui/setup_players.cpp:66
 msgid "Target dead players"
 msgstr "Zaměřovat mrtvé hráče"
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_players.cpp:69
 msgid "Visible names"
 msgstr "Viditelná jména"
 
-#: src/gui/setup_players.cpp:69
+#: src/gui/setup_players.cpp:72
 msgid "Secure trades"
 msgstr "Bezpečné obchody"
 
-#: src/gui/setup_players.cpp:72
+#: src/gui/setup_players.cpp:75
 msgid "Unsecure chars in names"
 msgstr "Nebezpečné znaky ve jménech"
 
-#: src/gui/setup_players.cpp:75
+#: src/gui/setup_players.cpp:78
 msgid "Show statuses"
 msgstr "Zobrazovat statusy"
 
-#: src/gui/setup_players.cpp:78
+#: src/gui/setup_players.cpp:81
 msgid "Show ip addresses on screenshots"
 msgstr "Zobrazovat IP adresy ve snímcích obrazovky"
 
-#: src/gui/setup_players.cpp:81
+#: src/gui/setup_players.cpp:84
 msgid "Allow self heal with mouse click"
 msgstr "Povolit léčení sebe sama kliknutím myši"
 
@@ -2261,23 +2261,23 @@ msgstr "Ignorovaný"
 msgid "Erased"
 msgstr "Vymazán"
 
-#: src/gui/setup_relations.cpp:239
+#: src/gui/setup_relations.cpp:238
 msgid "Allow trading"
 msgstr "Povolit obchodování"
 
-#: src/gui/setup_relations.cpp:241
+#: src/gui/setup_relations.cpp:240
 msgid "Allow whispers"
 msgstr "Povolit šeptání"
 
-#: src/gui/setup_relations.cpp:244
+#: src/gui/setup_relations.cpp:243
 msgid "Old"
 msgstr "Starý"
 
-#: src/gui/setup_relations.cpp:246
+#: src/gui/setup_relations.cpp:245
 msgid "Relations"
 msgstr "Vztahy"
 
-#: src/gui/setup_relations.cpp:271
+#: src/gui/setup_relations.cpp:270
 msgid "When ignoring:"
 msgstr "Když ignoruji:"
 
@@ -3247,30 +3247,34 @@ msgid "Command:"
 msgstr "Příkaz:"
 
 #: src/gui/textcommandeditor.cpp:200
+msgid "Comment:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:203
 msgid "Mana:"
 msgstr "Mana:"
 
-#: src/gui/textcommandeditor.cpp:206
+#: src/gui/textcommandeditor.cpp:209
 msgid "Target Type:"
 msgstr "Typ cíle:"
 
-#: src/gui/textcommandeditor.cpp:212
+#: src/gui/textcommandeditor.cpp:215
 msgid "Icon:"
 msgstr "Ikona:"
 
-#: src/gui/textcommandeditor.cpp:218
+#: src/gui/textcommandeditor.cpp:221
 msgid "Magic level:"
 msgstr "Úroveň magie:"
 
-#: src/gui/textcommandeditor.cpp:224
+#: src/gui/textcommandeditor.cpp:227
 msgid "Magic School:"
 msgstr "Škola magie:"
 
-#: src/gui/textcommandeditor.cpp:230
+#: src/gui/textcommandeditor.cpp:233
 msgid "School level:"
 msgstr "Úroveň školy:"
 
-#: src/gui/textcommandeditor.cpp:235
+#: src/gui/textcommandeditor.cpp:238
 msgid "Save"
 msgstr "Uložit"
 
@@ -3498,23 +3502,23 @@ msgstr "Hranice domácího místa"
 msgid "Road Point"
 msgstr "Bod cesty"
 
-#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:474
+#: src/gui/whoisonline.cpp:85 src/gui/whoisonline.cpp:478
 msgid "Who Is Online - Updating"
 msgstr "Kdo je online - Obnovuji"
 
-#: src/gui/whoisonline.cpp:104
+#: src/gui/whoisonline.cpp:108
 msgid "Update"
 msgstr "Obnovit"
 
-#: src/gui/whoisonline.cpp:297
+#: src/gui/whoisonline.cpp:301
 msgid "Who Is Online - "
 msgstr "Kdo je online - "
 
-#: src/gui/whoisonline.cpp:488
+#: src/gui/whoisonline.cpp:492
 msgid "Who Is Online - error"
 msgstr "Kdo je online - chyba"
 
-#: src/gui/whoisonline.cpp:519
+#: src/gui/whoisonline.cpp:523
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -3794,49 +3798,49 @@ msgid "Cart"
 msgstr "Košík"
 
 #: src/keyboardconfig.cpp:43
+msgid "Basic Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:44
 msgid "Move Up"
 msgstr "Pohyb nahoru"
 
-#: src/keyboardconfig.cpp:44
+#: src/keyboardconfig.cpp:45
 msgid "Move Down"
 msgstr "Pohyb dolů"
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:46
 msgid "Move Left"
 msgstr "Pohyb vlevo"
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:47
 msgid "Move Right"
 msgstr "Pohyb vpravo"
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:50
 msgid "Target & Attack"
 msgstr "Cíl & Útok"
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:52
 msgid "Move to Target"
 msgstr "Přejít k cíli"
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:54
 msgid "Change Move to Target type"
 msgstr "Změnit typ přesunu k cíli"
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:56
 msgid "Move to Home location"
 msgstr "Přejít na domácí místo"
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:58
 msgid "Set home location"
 msgstr "Nastavit domácí místo"
 
-#: src/keyboardconfig.cpp:59
+#: src/keyboardconfig.cpp:60
 msgid "Move to navigation point"
 msgstr ""
 
-#: src/keyboardconfig.cpp:61
-msgid "Smilie"
-msgstr "Smajlíky"
-
 #: src/keyboardconfig.cpp:63
 msgid "Stop Attack"
 msgstr "Zastavit Útok"
@@ -3882,300 +3886,328 @@ msgid "Change Map View Mode"
 msgstr "Změnit mód zobrazení mapy"
 
 #: src/keyboardconfig.cpp:80
+msgid "Select OK"
+msgstr "Vybrat OK"
+
+#: src/keyboardconfig.cpp:83
+msgid "Shortcuts Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:84
 msgid "Item Shortcuts Key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82 src/keyboardconfig.cpp:84
 #: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:88
 #: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:92
 #: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:96
 #: src/keyboardconfig.cpp:98 src/keyboardconfig.cpp:100
 #: src/keyboardconfig.cpp:102 src/keyboardconfig.cpp:104
 #: src/keyboardconfig.cpp:106 src/keyboardconfig.cpp:108
-#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:113
-#: src/keyboardconfig.cpp:115 src/keyboardconfig.cpp:117
+#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:112
+#: src/keyboardconfig.cpp:114 src/keyboardconfig.cpp:117
 #: src/keyboardconfig.cpp:119 src/keyboardconfig.cpp:121
-#: src/keyboardconfig.cpp:360
+#: src/keyboardconfig.cpp:123 src/keyboardconfig.cpp:125
+#: src/keyboardconfig.cpp:367
 #, c-format
 msgid "Item Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:122
+#: src/keyboardconfig.cpp:126
+msgid "Windows Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:127
 msgid "Help Window"
 msgstr "Okno nápovědy"
 
-#: src/keyboardconfig.cpp:124
+#: src/keyboardconfig.cpp:129
 msgid "Status Window"
 msgstr "Stavové okno"
 
-#: src/keyboardconfig.cpp:126
+#: src/keyboardconfig.cpp:131
 msgid "Inventory Window"
 msgstr "Okno inventáře"
 
-#: src/keyboardconfig.cpp:128
+#: src/keyboardconfig.cpp:133
 msgid "Equipment Window"
 msgstr "Okno vybavení"
 
-#: src/keyboardconfig.cpp:130
+#: src/keyboardconfig.cpp:135
 msgid "Skill Window"
 msgstr "Okno dovedností"
 
-#: src/keyboardconfig.cpp:132
+#: src/keyboardconfig.cpp:137
 msgid "Minimap Window"
 msgstr "Okno s minimapou"
 
-#: src/keyboardconfig.cpp:134
+#: src/keyboardconfig.cpp:139
 msgid "Chat Window"
 msgstr "Okno s chatem"
 
-#: src/keyboardconfig.cpp:136
+#: src/keyboardconfig.cpp:141
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:138
+#: src/keyboardconfig.cpp:143
 msgid "Setup Window"
 msgstr "Okno nastavení"
 
-#: src/keyboardconfig.cpp:140
+#: src/keyboardconfig.cpp:145
 msgid "Debug Window"
 msgstr "Debug okno"
 
-#: src/keyboardconfig.cpp:142
+#: src/keyboardconfig.cpp:147
 msgid "Social Window"
 msgstr "Okno spolešenství"
 
-#: src/keyboardconfig.cpp:144
+#: src/keyboardconfig.cpp:149
 msgid "Emote Shortcut Window"
 msgstr "Okno zkratek smajlíků"
 
-#: src/keyboardconfig.cpp:146
+#: src/keyboardconfig.cpp:151
 msgid "Outfits Window"
 msgstr "Okno výstroje"
 
-#: src/keyboardconfig.cpp:148
+#: src/keyboardconfig.cpp:153
 msgid "Shop Window"
 msgstr "Okno s obchodem"
 
-#: src/keyboardconfig.cpp:150
+#: src/keyboardconfig.cpp:155
 msgid "Quick drop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:152
+#: src/keyboardconfig.cpp:157
 msgid "Kill Stats Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:154
+#: src/keyboardconfig.cpp:159
 msgid "Commands Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:156
+#: src/keyboardconfig.cpp:161
 msgid "Bot Checker Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboardconfig.cpp:164
 msgid "Who Is Online Window"
 msgstr "Okno \"Kdo je online\""
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboardconfig.cpp:166
 msgid "Did you know Window"
 msgstr "Okno \"Víte že...\""
 
-#: src/keyboardconfig.cpp:164
+#: src/keyboardconfig.cpp:169
 msgid "Previous Social Tab"
 msgstr "Předchozí záložka společenství"
 
-#: src/keyboardconfig.cpp:166
+#: src/keyboardconfig.cpp:171
 msgid "Next Social Tab"
 msgstr "Další záložka společenství"
 
-#: src/keyboardconfig.cpp:168 src/keyboardconfig.cpp:170
-#: src/keyboardconfig.cpp:172 src/keyboardconfig.cpp:174
-#: src/keyboardconfig.cpp:176 src/keyboardconfig.cpp:178
-#: src/keyboardconfig.cpp:180 src/keyboardconfig.cpp:182
-#: src/keyboardconfig.cpp:184 src/keyboardconfig.cpp:186
-#: src/keyboardconfig.cpp:188 src/keyboardconfig.cpp:190
-#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
-#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
-#: src/keyboardconfig.cpp:201 src/keyboardconfig.cpp:203
-#: src/keyboardconfig.cpp:205 src/keyboardconfig.cpp:207
-#: src/keyboardconfig.cpp:209 src/keyboardconfig.cpp:211
-#: src/keyboardconfig.cpp:213 src/keyboardconfig.cpp:215
-#: src/keyboardconfig.cpp:217 src/keyboardconfig.cpp:220
-#: src/keyboardconfig.cpp:223 src/keyboardconfig.cpp:226
-#: src/keyboardconfig.cpp:228 src/keyboardconfig.cpp:230
-#: src/keyboardconfig.cpp:232 src/keyboardconfig.cpp:234
-#: src/keyboardconfig.cpp:236 src/keyboardconfig.cpp:238
-#: src/keyboardconfig.cpp:240 src/keyboardconfig.cpp:242
-#: src/keyboardconfig.cpp:244 src/keyboardconfig.cpp:247
-#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
-#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
-#: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:259
-#: src/keyboardconfig.cpp:355
+#: src/keyboardconfig.cpp:173
+msgid "Emotes Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:174
+msgid "Smilie"
+msgstr "Smajlíky"
+
+#: src/keyboardconfig.cpp:175 src/keyboardconfig.cpp:177
+#: src/keyboardconfig.cpp:179 src/keyboardconfig.cpp:181
+#: src/keyboardconfig.cpp:183 src/keyboardconfig.cpp:185
+#: src/keyboardconfig.cpp:187 src/keyboardconfig.cpp:189
+#: src/keyboardconfig.cpp:191 src/keyboardconfig.cpp:193
+#: src/keyboardconfig.cpp:195 src/keyboardconfig.cpp:197
+#: src/keyboardconfig.cpp:200 src/keyboardconfig.cpp:202
+#: src/keyboardconfig.cpp:204 src/keyboardconfig.cpp:206
+#: src/keyboardconfig.cpp:208 src/keyboardconfig.cpp:210
+#: src/keyboardconfig.cpp:212 src/keyboardconfig.cpp:214
+#: src/keyboardconfig.cpp:216 src/keyboardconfig.cpp:218
+#: src/keyboardconfig.cpp:220 src/keyboardconfig.cpp:222
+#: src/keyboardconfig.cpp:224 src/keyboardconfig.cpp:227
+#: src/keyboardconfig.cpp:230 src/keyboardconfig.cpp:233
+#: src/keyboardconfig.cpp:235 src/keyboardconfig.cpp:237
+#: src/keyboardconfig.cpp:239 src/keyboardconfig.cpp:241
+#: src/keyboardconfig.cpp:243 src/keyboardconfig.cpp:245
+#: src/keyboardconfig.cpp:247 src/keyboardconfig.cpp:249
+#: src/keyboardconfig.cpp:251 src/keyboardconfig.cpp:254
+#: src/keyboardconfig.cpp:256 src/keyboardconfig.cpp:258
+#: src/keyboardconfig.cpp:260 src/keyboardconfig.cpp:262
+#: src/keyboardconfig.cpp:264 src/keyboardconfig.cpp:266
+#: src/keyboardconfig.cpp:362
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "Zkratka smajlíku %d"
 
-#: src/keyboardconfig.cpp:261
+#: src/keyboardconfig.cpp:268
+msgid "Outfits Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:269
 msgid "Wear Outfit"
 msgstr "Obléct výstroj"
 
-#: src/keyboardconfig.cpp:263
+#: src/keyboardconfig.cpp:271
 msgid "Copy Outfit"
 msgstr "Kopírovat výstroj"
 
-#: src/keyboardconfig.cpp:265
+#: src/keyboardconfig.cpp:273
 msgid "Copy equipped to Outfit"
 msgstr "Kopírovat výbavu do výstroje"
 
-#: src/keyboardconfig.cpp:267
+#: src/keyboardconfig.cpp:275
+msgid "Chat Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:276
 msgid "Toggle Chat"
 msgstr "Přepnout chat"
 
-#: src/keyboardconfig.cpp:269
+#: src/keyboardconfig.cpp:278
 msgid "Scroll Chat Up"
 msgstr "Rolovat chat nahoru"
 
-#: src/keyboardconfig.cpp:271
+#: src/keyboardconfig.cpp:280
 msgid "Scroll Chat Down"
 msgstr "Rolovat chat dolů"
 
-#: src/keyboardconfig.cpp:273
+#: src/keyboardconfig.cpp:282
 msgid "Previous Chat Tab"
 msgstr "Předchozí záložka chatu"
 
-#: src/keyboardconfig.cpp:275
+#: src/keyboardconfig.cpp:284
 msgid "Next Chat Tab"
 msgstr "Další záložka chatu"
 
-#: src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:287
 msgid "Close current Chat Tab"
 msgstr "Zavřít stávající záložku chatu"
 
-#: src/keyboardconfig.cpp:280
+#: src/keyboardconfig.cpp:289
 msgid "Previous chat line"
 msgstr "Předchozí řádek chatu"
 
-#: src/keyboardconfig.cpp:282
+#: src/keyboardconfig.cpp:291
 msgid "Next chat line"
 msgstr "Další řádek chatu"
 
-#: src/keyboardconfig.cpp:284
+#: src/keyboardconfig.cpp:293
 msgid "Chat Auto Complete"
 msgstr "Autodoplňování v chatu"
 
-#: src/keyboardconfig.cpp:286
+#: src/keyboardconfig.cpp:295
 msgid "Deactivate Chat Input"
 msgstr "Deaktivovat vstup chatu"
 
-#: src/keyboardconfig.cpp:288
-msgid "Select OK"
-msgstr "Vybrat OK"
+#: src/keyboardconfig.cpp:297
+msgid "Other Keys"
+msgstr ""
 
-#: src/keyboardconfig.cpp:291
+#: src/keyboardconfig.cpp:298
 msgid "Ignore input 1"
 msgstr "Ignorovat vstup 1"
 
-#: src/keyboardconfig.cpp:293
+#: src/keyboardconfig.cpp:300
 msgid "Ignore input 2"
 msgstr "Ignorovat vstup 2"
 
-#: src/keyboardconfig.cpp:295
+#: src/keyboardconfig.cpp:302
 msgid "Direct Up"
 msgstr "Otočit nahoru"
 
-#: src/keyboardconfig.cpp:296
+#: src/keyboardconfig.cpp:303
 msgid "Direct Down"
 msgstr "Otočit dolů"
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboardconfig.cpp:305
 msgid "Direct Left"
 msgstr "Otočit vlevo"
 
-#: src/keyboardconfig.cpp:299
+#: src/keyboardconfig.cpp:306
 msgid "Direct Right"
 msgstr "Otočit vpravo"
 
-#: src/keyboardconfig.cpp:301
+#: src/keyboardconfig.cpp:308
 msgid "Crazy moves"
 msgstr "Šílené pohyby"
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboardconfig.cpp:310
 msgid "Change Crazy Move mode"
 msgstr "Změnit mód šílených pohybů"
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboardconfig.cpp:312
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboardconfig.cpp:314
 msgid "Quick Drop N Items"
 msgstr ""
 
-#: src/keyboardconfig.cpp:309
+#: src/keyboardconfig.cpp:316
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/keyboardconfig.cpp:311
+#: src/keyboardconfig.cpp:318
 msgid "Quick heal target or self"
 msgstr "Rychlé léčení cíle nebo sebe"
 
-#: src/keyboardconfig.cpp:313
+#: src/keyboardconfig.cpp:320
 msgid "Use #itenplz spell"
 msgstr "Použít kouzlo #itenplz"
 
-#: src/keyboardconfig.cpp:315
+#: src/keyboardconfig.cpp:322
 msgid "Use magic attack"
 msgstr "Použít magický útok"
 
-#: src/keyboardconfig.cpp:317
+#: src/keyboardconfig.cpp:324
 msgid "Switch magic attack"
 msgstr "Přepnout magický útok"
 
-#: src/keyboardconfig.cpp:319
+#: src/keyboardconfig.cpp:326
 msgid "Change move type"
 msgstr "Změnit typ pohybu"
 
-#: src/keyboardconfig.cpp:321
+#: src/keyboardconfig.cpp:328
 msgid "Change Attack Weapon Type"
 msgstr "Změnit typ útočné zbraně"
 
-#: src/keyboardconfig.cpp:323
+#: src/keyboardconfig.cpp:330
 msgid "Change Attack Type"
 msgstr "Změnit typ útoku"
 
-#: src/keyboardconfig.cpp:325
+#: src/keyboardconfig.cpp:332
 msgid "Change Follow mode"
 msgstr "Změnit mód následování"
 
-#: src/keyboardconfig.cpp:327
+#: src/keyboardconfig.cpp:334
 msgid "Change Imitation mode"
 msgstr "Změnit mód imitace"
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboardconfig.cpp:337
 msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:331
+#: src/keyboardconfig.cpp:338
 msgid "On / Off audio"
 msgstr "Zapnout/Vypnout audio"
 
-#: src/keyboardconfig.cpp:333
+#: src/keyboardconfig.cpp:340
 msgid "Enable / Disable away mode"
 msgstr "Zapnout/Vypnout Away mód"
 
-#: src/keyboardconfig.cpp:335
+#: src/keyboardconfig.cpp:342
 msgid "Emulate right click from keyboard"
 msgstr "Emulovat pravý klik z klávesnice"
 
-#: src/keyboardconfig.cpp:337
+#: src/keyboardconfig.cpp:344
 msgid "Toggle camera mode"
 msgstr "přemnout mód kamery"
 
-#: src/keyboardconfig.cpp:339
+#: src/keyboardconfig.cpp:346
 msgid "Modifier key"
 msgstr "Klávesa modifikátoru"
 
-#: src/keyboardconfig.cpp:411
+#: src/keyboardconfig.cpp:425
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -4184,41 +4216,41 @@ msgstr ""
 "Konflikt klávesy \"%s\" a klávesy \"%s\". Vyřešte jej, neboť se hra může "
 "chovat podivně."
 
-#: src/localplayer.cpp:377
+#: src/localplayer.cpp:380
 msgid "You were killed by "
 msgstr "Zabil vás "
 
-#: src/localplayer.cpp:1416
+#: src/localplayer.cpp:1422
 msgid "Tried to pick up nonexistent item."
 msgstr "Snažili jste se sebrat neexistující předmět."
 
-#: src/localplayer.cpp:1418
+#: src/localplayer.cpp:1424
 msgid "Item is too heavy."
 msgstr "Předmět je příliš těžký."
 
-#: src/localplayer.cpp:1420
+#: src/localplayer.cpp:1426
 msgid "Item is too far away."
 msgstr "Předmět je příliš daleko."
 
-#: src/localplayer.cpp:1422
+#: src/localplayer.cpp:1428
 msgid "Inventory is full."
 msgstr "Inventář je plný."
 
-#: src/localplayer.cpp:1424
+#: src/localplayer.cpp:1430
 msgid "Stack is too big."
 msgstr "Hromada je příliš velká."
 
-#: src/localplayer.cpp:1427
+#: src/localplayer.cpp:1433
 msgid "Item belongs to someone else."
 msgstr "Předmět patří někomu jinému."
 
-#: src/localplayer.cpp:1430
+#: src/localplayer.cpp:1436
 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:1454
+#: src/localplayer.cpp:1460
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -4226,27 +4258,27 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/localplayer.cpp:3168
+#: src/localplayer.cpp:3174
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:3468
+#: src/localplayer.cpp:3494
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3470 src/localplayer.cpp:3485
+#: src/localplayer.cpp:3496 src/localplayer.cpp:3511
 msgid "Follow canceled"
 msgstr "Následování zrušeno."
 
-#: src/localplayer.cpp:3477
+#: src/localplayer.cpp:3503
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3479 src/localplayer.cpp:3487
+#: src/localplayer.cpp:3505 src/localplayer.cpp:3513
 msgid "Imitation canceled"
 msgstr "Imitace zrušena."
 
-#: src/localplayer.cpp:3832
+#: src/localplayer.cpp:3858
 msgid "You see "
 msgstr "Vidíte "
 
@@ -4629,15 +4661,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:286
+#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:284
 msgid "Item sharing enabled."
 msgstr "Sdílení předmětů povoleno."
 
-#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:296
+#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:294
 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:306
+#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:304
 msgid "Item sharing not possible."
 msgstr "Sdílení předmětů není možné."
 
@@ -4645,15 +4677,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:248
+#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:246
 msgid "Experience sharing enabled."
 msgstr "Sdílení zkušeností povoleno."
 
-#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:258
+#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:256
 msgid "Experience sharing disabled."
 msgstr "Sdílení zkušeností zakázáno."
 
-#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:268
+#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:266
 msgid "Experience sharing not possible."
 msgstr "Sdílení zkušeností není možné."
 
@@ -4732,54 +4764,54 @@ msgstr "Toto uživatelské jméno je již používáno."
 msgid "Username permanently erased."
 msgstr "Uživatelské jméno bylo trvale odstraněno."
 
-#: src/net/ea/partyhandler.cpp:82
+#: src/net/ea/partyhandler.cpp:80
 msgid "Could not create party."
 msgstr "Nelze vytvořit partu."
 
-#: src/net/ea/partyhandler.cpp:84
+#: src/net/ea/partyhandler.cpp:82
 msgid "Party successfully created."
 msgstr "Parta úspěšně vytvořena."
 
-#: src/net/ea/partyhandler.cpp:140
+#: src/net/ea/partyhandler.cpp:138
 #, c-format
 msgid "%s has joined your party."
 msgstr "%s se připojil k vaší partě."
 
-#: src/net/ea/partyhandler.cpp:176
+#: src/net/ea/partyhandler.cpp:174
 #, c-format
 msgid "%s is already a member of a party."
 msgstr "%s je již členem vaší party."
 
-#: src/net/ea/partyhandler.cpp:181
+#: src/net/ea/partyhandler.cpp:179
 #, c-format
 msgid "%s refused your invitation."
 msgstr "%s zamítl vaši pozvánku."
 
-#: src/net/ea/partyhandler.cpp:186
+#: src/net/ea/partyhandler.cpp:184
 #, c-format
 msgid "%s is now a member of your party."
 msgstr "%s je nyní člen vaší party."
 
-#: src/net/ea/partyhandler.cpp:191
+#: src/net/ea/partyhandler.cpp:189
 #, c-format
 msgid "%s can't join your party because party is full."
 msgstr "%s nemůže být členem party, jelikož je parta plná."
 
-#: src/net/ea/partyhandler.cpp:196
+#: src/net/ea/partyhandler.cpp:194
 #, c-format
 msgid "QQQ Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:356
+#: src/net/ea/partyhandler.cpp:354
 msgid "You have left the party."
 msgstr "Odešel jste z party."
 
-#: src/net/ea/partyhandler.cpp:369
+#: src/net/ea/partyhandler.cpp:367
 #, c-format
 msgid "%s has left your party."
 msgstr "%s opustil vaši partu."
 
-#: src/net/ea/partyhandler.cpp:448
+#: src/net/ea/partyhandler.cpp:446
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr "Neznámý člen se snažil říct: %s"
@@ -4937,83 +4969,83 @@ msgstr "Nelze zlepšit tuto dovednost!"
 msgid "Equip arrows first."
 msgstr "nejdřív se vybavte šípy."
 
-#: src/net/ea/specialhandler.cpp:149
+#: src/net/ea/specialhandler.cpp:146
 msgid "Trade failed!"
 msgstr "Obchod selhal!"
 
-#: src/net/ea/specialhandler.cpp:152
+#: src/net/ea/specialhandler.cpp:149
 msgid "Emote failed!"
 msgstr "Smajlík selhal!"
 
-#: src/net/ea/specialhandler.cpp:155
+#: src/net/ea/specialhandler.cpp:152
 msgid "Sit failed!"
 msgstr "Sednutí selhalo!"
 
-#: src/net/ea/specialhandler.cpp:158
+#: src/net/ea/specialhandler.cpp:155
 msgid "Chat creating failed!"
 msgstr "Selhalo vytváčení postavy!"
 
-#: src/net/ea/specialhandler.cpp:161
+#: src/net/ea/specialhandler.cpp:158
 msgid "Could not join party!"
 msgstr "Nemůžete vstoupit do party!"
 
-#: src/net/ea/specialhandler.cpp:164
+#: src/net/ea/specialhandler.cpp:161
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:177
+#: src/net/ea/specialhandler.cpp:174
 msgid "You have not yet reached a high enough lvl!"
 msgstr "Nedosáhl jste ještě dostatečně vysoké úrovně!"
 
-#: src/net/ea/specialhandler.cpp:181
+#: src/net/ea/specialhandler.cpp:178
 msgid "Insufficient HP!"
 msgstr "Nedostatek životů (HP)!"
 
-#: src/net/ea/specialhandler.cpp:184
+#: src/net/ea/specialhandler.cpp:181
 msgid "Insufficient SP!"
 msgstr "Nedostatek many (SP)!"
 
-#: src/net/ea/specialhandler.cpp:187
+#: src/net/ea/specialhandler.cpp:184
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:190
+#: src/net/ea/specialhandler.cpp:187
 msgid "You cannot do that right now!"
 msgstr "Nyní toto nelze!"
 
-#: src/net/ea/specialhandler.cpp:193
+#: src/net/ea/specialhandler.cpp:190
 msgid "Seems you need more money... ;-)"
 msgstr "Vypadá to že potřebujete více peněz... ;-)"
 
-#: src/net/ea/specialhandler.cpp:196
+#: src/net/ea/specialhandler.cpp:193
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Nemůžete použít tuto dovednost s touto zbraní!"
 
-#: src/net/ea/specialhandler.cpp:200
+#: src/net/ea/specialhandler.cpp:197
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:203
+#: src/net/ea/specialhandler.cpp:200
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:206
+#: src/net/ea/specialhandler.cpp:203
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:209
+#: src/net/ea/specialhandler.cpp:206
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:220
+#: src/net/ea/specialhandler.cpp:217
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:223
+#: src/net/ea/specialhandler.cpp:220
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:226
+#: src/net/ea/specialhandler.cpp:223
 msgid "Poison had no effect..."
 msgstr ""
 
diff --git a/po/de.po b/po/de.po
index eba613f93..6802e25d7 100644
--- a/po/de.po
+++ b/po/de.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-09-17 16:12+0300\n"
-"PO-Revision-Date: 2011-09-16 20:11+0000\n"
+"POT-Creation-Date: 2011-09-27 22:18+0300\n"
+"PO-Revision-Date: 2011-09-27 19:20+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: German (http://www.transifex.net/projects/p/manaplus/team/"
 "de/)\n"
@@ -23,25 +23,25 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: src/actorspritemanager.cpp:1088
+#: src/actorspritemanager.cpp:1133
 msgid "Visible on map"
 msgstr ""
 
-#: src/being.cpp:548
+#: src/being.cpp:547
 msgid "dodge"
 msgstr "ausweichen"
 
-#: src/being.cpp:548
+#: src/being.cpp:547
 msgid "miss"
 msgstr "verfehlt"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1527
+#: src/being.cpp:1526
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1532
+#: src/being.cpp:1531
 msgid "I"
 msgstr ""
 
@@ -49,43 +49,43 @@ msgstr ""
 msgid "Setup"
 msgstr "Einstellungen"
 
-#: src/client.cpp:841 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:842 src/gui/setup_perfomance.cpp:48
 msgid "Perfomance"
 msgstr ""
 
-#: src/client.cpp:846 src/gui/setup_video.cpp:315
+#: src/client.cpp:847 src/gui/setup_video.cpp:315
 msgid "Video"
 msgstr "Video"
 
-#: src/client.cpp:851
+#: src/client.cpp:852
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:932
+#: src/client.cpp:934
 msgid "Connecting to server"
 msgstr "Verbinde zum Server"
 
-#: src/client.cpp:963
+#: src/client.cpp:965
 msgid "Logging in"
 msgstr "Anmelden"
 
-#: src/client.cpp:996
+#: src/client.cpp:998
 msgid "Entering game world"
 msgstr "Betrete die Spielwelt"
 
-#: src/client.cpp:1096
+#: src/client.cpp:1098
 msgid "Requesting characters"
 msgstr "Spielfiguren werden angefragt"
 
-#: src/client.cpp:1127
+#: src/client.cpp:1129
 msgid "Connecting to the game server"
 msgstr "Verbinde zum Charakterserver"
 
-#: src/client.cpp:1137
+#: src/client.cpp:1139
 msgid "Changing game servers"
 msgstr "Charakterserver wechseln"
 
-#: src/client.cpp:1180 src/client.cpp:1187 src/client.cpp:1321
+#: src/client.cpp:1182 src/client.cpp:1189 src/client.cpp:1323
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:221 src/gui/charselectdialog.cpp:253
 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
@@ -95,50 +95,50 @@ msgstr "Charakterserver wechseln"
 msgid "Error"
 msgstr "Fehler"
 
-#: src/client.cpp:1196
+#: src/client.cpp:1198
 msgid "Requesting registration details"
 msgstr "Anfrage der Registrierungsdetails"
 
-#: src/client.cpp:1222
+#: src/client.cpp:1224
 msgid "Password Change"
 msgstr "Passwort ändern"
 
-#: src/client.cpp:1223
+#: src/client.cpp:1225
 msgid "Password changed successfully!"
 msgstr "Passwort erfolgreich geändert!"
 
-#: src/client.cpp:1242
+#: src/client.cpp:1244
 msgid "Email Change"
 msgstr "E-Mail ändern"
 
-#: src/client.cpp:1243
+#: src/client.cpp:1245
 msgid "Email changed successfully!"
 msgstr "E-Mail erfolgreich geändert!"
 
-#: src/client.cpp:1263
+#: src/client.cpp:1265
 msgid "Unregister Successful"
 msgstr "erfolgreich abgemeldet."
 
-#: src/client.cpp:1264
+#: src/client.cpp:1266
 msgid "Farewell, come back any time..."
 msgstr "Leb wohl und komme jeder Zeit wieder..."
 
-#: src/client.cpp:1463 src/client.cpp:1493 src/client.cpp:1508
-#: src/client.cpp:1933 src/client.cpp:1940
+#: src/client.cpp:1465 src/client.cpp:1495 src/client.cpp:1510
+#: src/client.cpp:1935 src/client.cpp:1942
 #, 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:1639
+#: src/client.cpp:1641
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Ungültiger Updateserver: %s"
 
-#: src/client.cpp:1673 src/client.cpp:1679
+#: src/client.cpp:1675 src/client.cpp:1681
 msgid "Error creating updates directory!"
 msgstr "Fehler beim Erstellen des Verzeichnisses für Updates!"
 
-#: src/client.cpp:1700
+#: src/client.cpp:1702
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -348,11 +348,11 @@ msgstr "Ignoriere eingehende Handelsanfragen"
 msgid "Accepting incoming trade requests"
 msgstr "Akzeptiere eingehende Handelsanfragen"
 
-#: src/game.cpp:1729
+#: src/game.cpp:1727
 msgid "Could Not Load Map"
 msgstr "Karte konnte nicht geladen werden."
 
-#: src/game.cpp:1730
+#: src/game.cpp:1728
 #, c-format
 msgid "Error while loading %s"
 msgstr "Fehler beim Laden von %s"
@@ -387,7 +387,7 @@ msgstr "Name"
 
 #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:133
 #: src/gui/popupmenu.cpp:283 src/gui/popupmenu.cpp:596
-#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:265
+#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:265
 msgid "Attack"
 msgstr "Angriff"
 
@@ -441,7 +441,7 @@ msgstr "-"
 #: src/gui/buydialog.cpp:99 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:294
-#: src/keyboardconfig.cpp:290
+#: src/keyboardconfig.cpp:82
 msgid "Quit"
 msgstr "Beenden"
 
@@ -476,7 +476,7 @@ msgstr "Verkaufen"
 #: src/gui/popupmenu.cpp:1858 src/gui/popupmenu.cpp:1897
 #: src/gui/popupmenu.cpp:1949 src/gui/popupmenu.cpp:1969
 #: src/gui/quitdialog.cpp:55 src/gui/register.cpp:82 src/gui/setup.cpp:72
-#: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:238
+#: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:241
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
 #: src/gui/updaterwindow.cpp:161
 msgid "Cancel"
@@ -645,8 +645,8 @@ msgid "Enter password:"
 msgstr ""
 
 #: src/gui/charselectdialog.cpp:410 src/gui/serverdialog.cpp:298
-#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:122
-#: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:241
+#: src/gui/setup_relations.cpp:242 src/gui/shopwindow.cpp:122
+#: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244
 msgid "Delete"
 msgstr "Löschen"
 
@@ -898,7 +898,7 @@ msgid "Did You Know?"
 msgstr ""
 
 #: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
-#: src/gui/inventorywindow.cpp:206 src/gui/npcdialog.cpp:53
+#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:53
 #: src/gui/popupmenu.cpp:556 src/gui/shopwindow.cpp:113
 msgid "Close"
 msgstr "Schließen"
@@ -925,7 +925,7 @@ msgid "Equipment"
 msgstr "Ausrüstung"
 
 #: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160
-#: src/gui/inventorywindow.cpp:539 src/gui/inventorywindow.cpp:548
+#: src/gui/inventorywindow.cpp:538 src/gui/inventorywindow.cpp:547
 #: src/gui/popupmenu.cpp:1656 src/gui/popupmenu.cpp:1748
 #: src/gui/popupmenu.cpp:1793
 msgid "Unequip"
@@ -955,37 +955,33 @@ msgstr ""
 msgid "by type"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:111 src/gui/windowmenu.cpp:76
+#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:76
 #: src/inventory.cpp:249
 msgid "Inventory"
 msgstr "Inventar"
 
-#: src/gui/inventorywindow.cpp:136
+#: src/gui/inventorywindow.cpp:137
 msgid "Slots:"
 msgstr "Plätze:"
 
-#: src/gui/inventorywindow.cpp:148
+#: src/gui/inventorywindow.cpp:149
 msgid "Filter:"
 msgstr "Filter:"
 
-#: src/gui/inventorywindow.cpp:149
-msgid "Sort:"
-msgstr "Sortieren:"
-
-#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:541
-#: src/gui/inventorywindow.cpp:550 src/gui/popupmenu.cpp:1658
+#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:540
+#: src/gui/inventorywindow.cpp:549 src/gui/popupmenu.cpp:1658
 #: src/gui/popupmenu.cpp:1750 src/gui/popupmenu.cpp:1795
 msgid "Equip"
 msgstr "Ausrüsten"
 
-#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:542
-#: src/gui/inventorywindow.cpp:546 src/gui/popupmenu.cpp:1662
+#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:541
+#: src/gui/inventorywindow.cpp:545 src/gui/popupmenu.cpp:1662
 #: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1754
 #: src/gui/popupmenu.cpp:1799
 msgid "Use"
 msgstr "Benutzen"
 
-#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:646
+#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:645
 #: src/gui/popupmenu.cpp:1667 src/gui/popupmenu.cpp:1759
 #: src/gui/popupmenu.cpp:1804
 msgid "Drop..."
@@ -1005,17 +1001,17 @@ msgstr "Ausrüstung"
 msgid "Weight:"
 msgstr "Gewicht:"
 
-#: src/gui/inventorywindow.cpp:204 src/gui/inventorywindow.cpp:637
+#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:636
 #: src/gui/popupmenu.cpp:1642 src/gui/popupmenu.cpp:1771
 #: src/gui/popupmenu.cpp:1816 src/gui/setup.cpp:73
 msgid "Store"
 msgstr "Aufbewahren"
 
-#: src/gui/inventorywindow.cpp:205 src/gui/popupmenu.cpp:1683
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1683
 msgid "Retrieve"
 msgstr "Abholen"
 
-#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1672
+#: src/gui/inventorywindow.cpp:647 src/gui/popupmenu.cpp:1672
 #: src/gui/popupmenu.cpp:1764 src/gui/popupmenu.cpp:1809
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
@@ -2208,30 +2204,34 @@ msgid "Show own name"
 msgstr "Eigenen Namen anzeigen"
 
 #: src/gui/setup_players.cpp:63
+msgid "Enable extended mouse targeting"
+msgstr ""
+
+#: src/gui/setup_players.cpp:66
 msgid "Target dead players"
 msgstr "Anvisieren toter Spieler"
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_players.cpp:69
 msgid "Visible names"
 msgstr "Sichtbare Namen"
 
-#: src/gui/setup_players.cpp:69
+#: src/gui/setup_players.cpp:72
 msgid "Secure trades"
 msgstr ""
 
-#: src/gui/setup_players.cpp:72
+#: src/gui/setup_players.cpp:75
 msgid "Unsecure chars in names"
 msgstr ""
 
-#: src/gui/setup_players.cpp:75
+#: src/gui/setup_players.cpp:78
 msgid "Show statuses"
 msgstr ""
 
-#: src/gui/setup_players.cpp:78
+#: src/gui/setup_players.cpp:81
 msgid "Show ip addresses on screenshots"
 msgstr "IP auf Screenshots anzeigen."
 
-#: src/gui/setup_players.cpp:81
+#: src/gui/setup_players.cpp:84
 msgid "Allow self heal with mouse click"
 msgstr ""
 
@@ -2259,23 +2259,23 @@ msgstr "Ignoriert"
 msgid "Erased"
 msgstr "Gelöscht"
 
-#: src/gui/setup_relations.cpp:239
+#: src/gui/setup_relations.cpp:238
 msgid "Allow trading"
 msgstr "Handeln erlauben"
 
-#: src/gui/setup_relations.cpp:241
+#: src/gui/setup_relations.cpp:240
 msgid "Allow whispers"
 msgstr "Flüstern erlauben"
 
-#: src/gui/setup_relations.cpp:244
+#: src/gui/setup_relations.cpp:243
 msgid "Old"
 msgstr "Alt"
 
-#: src/gui/setup_relations.cpp:246
+#: src/gui/setup_relations.cpp:245
 msgid "Relations"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:271
+#: src/gui/setup_relations.cpp:270
 msgid "When ignoring:"
 msgstr "Wenn ignorierend:"
 
@@ -3250,30 +3250,34 @@ msgid "Command:"
 msgstr "Befehl:"
 
 #: src/gui/textcommandeditor.cpp:200
+msgid "Comment:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:203
 msgid "Mana:"
 msgstr "Mana:"
 
-#: src/gui/textcommandeditor.cpp:206
+#: src/gui/textcommandeditor.cpp:209
 msgid "Target Type:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:212
+#: src/gui/textcommandeditor.cpp:215
 msgid "Icon:"
 msgstr "Icon:"
 
-#: src/gui/textcommandeditor.cpp:218
+#: src/gui/textcommandeditor.cpp:221
 msgid "Magic level:"
 msgstr "Magielevel:"
 
-#: src/gui/textcommandeditor.cpp:224
+#: src/gui/textcommandeditor.cpp:227
 msgid "Magic School:"
 msgstr "Magieschule:"
 
-#: src/gui/textcommandeditor.cpp:230
+#: src/gui/textcommandeditor.cpp:233
 msgid "School level:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:235
+#: src/gui/textcommandeditor.cpp:238
 msgid "Save"
 msgstr "Speichern"
 
@@ -3503,23 +3507,23 @@ msgstr ""
 msgid "Road Point"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:474
+#: src/gui/whoisonline.cpp:85 src/gui/whoisonline.cpp:478
 msgid "Who Is Online - Updating"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:104
+#: src/gui/whoisonline.cpp:108
 msgid "Update"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:297
+#: src/gui/whoisonline.cpp:301
 msgid "Who Is Online - "
 msgstr ""
 
-#: src/gui/whoisonline.cpp:488
+#: src/gui/whoisonline.cpp:492
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:519
+#: src/gui/whoisonline.cpp:523
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -3803,49 +3807,49 @@ msgid "Cart"
 msgstr ""
 
 #: src/keyboardconfig.cpp:43
+msgid "Basic Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:44
 msgid "Move Up"
 msgstr "Laufe Hoch"
 
-#: src/keyboardconfig.cpp:44
+#: src/keyboardconfig.cpp:45
 msgid "Move Down"
 msgstr "Laufe Runter"
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:46
 msgid "Move Left"
 msgstr "Laufe nach Links"
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:47
 msgid "Move Right"
 msgstr "Laufe nach Rechts"
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:50
 msgid "Target & Attack"
 msgstr "Zielen & Angreifen"
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:52
 msgid "Move to Target"
 msgstr ""
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:54
 msgid "Change Move to Target type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:56
 msgid "Move to Home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:58
 msgid "Set home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:59
+#: src/keyboardconfig.cpp:60
 msgid "Move to navigation point"
 msgstr ""
 
-#: src/keyboardconfig.cpp:61
-msgid "Smilie"
-msgstr "Grinsen"
-
 #: src/keyboardconfig.cpp:63
 msgid "Stop Attack"
 msgstr "Angriff abbrechen"
@@ -3891,368 +3895,396 @@ msgid "Change Map View Mode"
 msgstr ""
 
 #: src/keyboardconfig.cpp:80
+msgid "Select OK"
+msgstr "OK auswählen"
+
+#: src/keyboardconfig.cpp:83
+msgid "Shortcuts Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:84
 msgid "Item Shortcuts Key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82 src/keyboardconfig.cpp:84
 #: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:88
 #: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:92
 #: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:96
 #: src/keyboardconfig.cpp:98 src/keyboardconfig.cpp:100
 #: src/keyboardconfig.cpp:102 src/keyboardconfig.cpp:104
 #: src/keyboardconfig.cpp:106 src/keyboardconfig.cpp:108
-#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:113
-#: src/keyboardconfig.cpp:115 src/keyboardconfig.cpp:117
+#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:112
+#: src/keyboardconfig.cpp:114 src/keyboardconfig.cpp:117
 #: src/keyboardconfig.cpp:119 src/keyboardconfig.cpp:121
-#: src/keyboardconfig.cpp:360
+#: src/keyboardconfig.cpp:123 src/keyboardconfig.cpp:125
+#: src/keyboardconfig.cpp:367
 #, c-format
 msgid "Item Shortcut %d"
 msgstr "Kurztaste %d"
 
-#: src/keyboardconfig.cpp:122
+#: src/keyboardconfig.cpp:126
+msgid "Windows Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:127
 msgid "Help Window"
 msgstr "Hilfefenster"
 
-#: src/keyboardconfig.cpp:124
+#: src/keyboardconfig.cpp:129
 msgid "Status Window"
 msgstr "Statusfenster"
 
-#: src/keyboardconfig.cpp:126
+#: src/keyboardconfig.cpp:131
 msgid "Inventory Window"
 msgstr "Inventarfenster"
 
-#: src/keyboardconfig.cpp:128
+#: src/keyboardconfig.cpp:133
 msgid "Equipment Window"
 msgstr "Ausrüstungsfenster"
 
-#: src/keyboardconfig.cpp:130
+#: src/keyboardconfig.cpp:135
 msgid "Skill Window"
 msgstr "Fertigkeitenfenster"
 
-#: src/keyboardconfig.cpp:132
+#: src/keyboardconfig.cpp:137
 msgid "Minimap Window"
 msgstr "Kartenfenster"
 
-#: src/keyboardconfig.cpp:134
+#: src/keyboardconfig.cpp:139
 msgid "Chat Window"
 msgstr "Chatfenster"
 
-#: src/keyboardconfig.cpp:136
+#: src/keyboardconfig.cpp:141
 msgid "Item Shortcut Window"
 msgstr "Kurztastenfenster"
 
-#: src/keyboardconfig.cpp:138
+#: src/keyboardconfig.cpp:143
 msgid "Setup Window"
 msgstr "Einstellungen"
 
-#: src/keyboardconfig.cpp:140
+#: src/keyboardconfig.cpp:145
 msgid "Debug Window"
 msgstr "Debugfenster"
 
-#: src/keyboardconfig.cpp:142
+#: src/keyboardconfig.cpp:147
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:144
+#: src/keyboardconfig.cpp:149
 msgid "Emote Shortcut Window"
 msgstr "Kurztasten für Gefühle"
 
-#: src/keyboardconfig.cpp:146
+#: src/keyboardconfig.cpp:151
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:148
+#: src/keyboardconfig.cpp:153
 msgid "Shop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:150
+#: src/keyboardconfig.cpp:155
 msgid "Quick drop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:152
+#: src/keyboardconfig.cpp:157
 msgid "Kill Stats Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:154
+#: src/keyboardconfig.cpp:159
 msgid "Commands Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:156
+#: src/keyboardconfig.cpp:161
 msgid "Bot Checker Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboardconfig.cpp:164
 msgid "Who Is Online Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboardconfig.cpp:166
 msgid "Did you know Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:164
+#: src/keyboardconfig.cpp:169
 msgid "Previous Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:166
+#: src/keyboardconfig.cpp:171
 msgid "Next Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:168 src/keyboardconfig.cpp:170
-#: src/keyboardconfig.cpp:172 src/keyboardconfig.cpp:174
-#: src/keyboardconfig.cpp:176 src/keyboardconfig.cpp:178
-#: src/keyboardconfig.cpp:180 src/keyboardconfig.cpp:182
-#: src/keyboardconfig.cpp:184 src/keyboardconfig.cpp:186
-#: src/keyboardconfig.cpp:188 src/keyboardconfig.cpp:190
-#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
-#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
-#: src/keyboardconfig.cpp:201 src/keyboardconfig.cpp:203
-#: src/keyboardconfig.cpp:205 src/keyboardconfig.cpp:207
-#: src/keyboardconfig.cpp:209 src/keyboardconfig.cpp:211
-#: src/keyboardconfig.cpp:213 src/keyboardconfig.cpp:215
-#: src/keyboardconfig.cpp:217 src/keyboardconfig.cpp:220
-#: src/keyboardconfig.cpp:223 src/keyboardconfig.cpp:226
-#: src/keyboardconfig.cpp:228 src/keyboardconfig.cpp:230
-#: src/keyboardconfig.cpp:232 src/keyboardconfig.cpp:234
-#: src/keyboardconfig.cpp:236 src/keyboardconfig.cpp:238
-#: src/keyboardconfig.cpp:240 src/keyboardconfig.cpp:242
-#: src/keyboardconfig.cpp:244 src/keyboardconfig.cpp:247
-#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
-#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
-#: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:259
-#: src/keyboardconfig.cpp:355
+#: src/keyboardconfig.cpp:173
+msgid "Emotes Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:174
+msgid "Smilie"
+msgstr "Grinsen"
+
+#: src/keyboardconfig.cpp:175 src/keyboardconfig.cpp:177
+#: src/keyboardconfig.cpp:179 src/keyboardconfig.cpp:181
+#: src/keyboardconfig.cpp:183 src/keyboardconfig.cpp:185
+#: src/keyboardconfig.cpp:187 src/keyboardconfig.cpp:189
+#: src/keyboardconfig.cpp:191 src/keyboardconfig.cpp:193
+#: src/keyboardconfig.cpp:195 src/keyboardconfig.cpp:197
+#: src/keyboardconfig.cpp:200 src/keyboardconfig.cpp:202
+#: src/keyboardconfig.cpp:204 src/keyboardconfig.cpp:206
+#: src/keyboardconfig.cpp:208 src/keyboardconfig.cpp:210
+#: src/keyboardconfig.cpp:212 src/keyboardconfig.cpp:214
+#: src/keyboardconfig.cpp:216 src/keyboardconfig.cpp:218
+#: src/keyboardconfig.cpp:220 src/keyboardconfig.cpp:222
+#: src/keyboardconfig.cpp:224 src/keyboardconfig.cpp:227
+#: src/keyboardconfig.cpp:230 src/keyboardconfig.cpp:233
+#: src/keyboardconfig.cpp:235 src/keyboardconfig.cpp:237
+#: src/keyboardconfig.cpp:239 src/keyboardconfig.cpp:241
+#: src/keyboardconfig.cpp:243 src/keyboardconfig.cpp:245
+#: src/keyboardconfig.cpp:247 src/keyboardconfig.cpp:249
+#: src/keyboardconfig.cpp:251 src/keyboardconfig.cpp:254
+#: src/keyboardconfig.cpp:256 src/keyboardconfig.cpp:258
+#: src/keyboardconfig.cpp:260 src/keyboardconfig.cpp:262
+#: src/keyboardconfig.cpp:264 src/keyboardconfig.cpp:266
+#: src/keyboardconfig.cpp:362
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "Gefühlstaste %d"
 
-#: src/keyboardconfig.cpp:261
+#: src/keyboardconfig.cpp:268
+msgid "Outfits Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:269
 msgid "Wear Outfit"
 msgstr "Ausrüstung anziehen"
 
-#: src/keyboardconfig.cpp:263
+#: src/keyboardconfig.cpp:271
 msgid "Copy Outfit"
 msgstr "Ausrüstung kopieren"
 
-#: src/keyboardconfig.cpp:265
+#: src/keyboardconfig.cpp:273
 msgid "Copy equipped to Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:267
+#: src/keyboardconfig.cpp:275
+msgid "Chat Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:276
 msgid "Toggle Chat"
 msgstr "Chat ein/aus"
 
-#: src/keyboardconfig.cpp:269
+#: src/keyboardconfig.cpp:278
 msgid "Scroll Chat Up"
 msgstr "Im Chat hochscrollen"
 
-#: src/keyboardconfig.cpp:271
+#: src/keyboardconfig.cpp:280
 msgid "Scroll Chat Down"
 msgstr "Im Chat runter scrollen"
 
-#: src/keyboardconfig.cpp:273
+#: src/keyboardconfig.cpp:282
 msgid "Previous Chat Tab"
 msgstr "Voriger Tab"
 
-#: src/keyboardconfig.cpp:275
+#: src/keyboardconfig.cpp:284
 msgid "Next Chat Tab"
 msgstr "Nächster Tab"
 
-#: src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:287
 msgid "Close current Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:280
+#: src/keyboardconfig.cpp:289
 msgid "Previous chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:282
+#: src/keyboardconfig.cpp:291
 msgid "Next chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:284
+#: src/keyboardconfig.cpp:293
 msgid "Chat Auto Complete"
 msgstr ""
 
-#: src/keyboardconfig.cpp:286
+#: src/keyboardconfig.cpp:295
 msgid "Deactivate Chat Input"
 msgstr ""
 
-#: src/keyboardconfig.cpp:288
-msgid "Select OK"
-msgstr "OK auswählen"
+#: src/keyboardconfig.cpp:297
+msgid "Other Keys"
+msgstr ""
 
-#: src/keyboardconfig.cpp:291
+#: src/keyboardconfig.cpp:298
 msgid "Ignore input 1"
 msgstr "Ignoriere Eingabe 1"
 
-#: src/keyboardconfig.cpp:293
+#: src/keyboardconfig.cpp:300
 msgid "Ignore input 2"
 msgstr "Ignoriere Eingabe 2"
 
-#: src/keyboardconfig.cpp:295
+#: src/keyboardconfig.cpp:302
 msgid "Direct Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:296
+#: src/keyboardconfig.cpp:303
 msgid "Direct Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboardconfig.cpp:305
 msgid "Direct Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:299
+#: src/keyboardconfig.cpp:306
 msgid "Direct Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:301
+#: src/keyboardconfig.cpp:308
 msgid "Crazy moves"
 msgstr ""
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboardconfig.cpp:310
 msgid "Change Crazy Move mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboardconfig.cpp:312
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboardconfig.cpp:314
 msgid "Quick Drop N Items"
 msgstr ""
 
-#: src/keyboardconfig.cpp:309
+#: src/keyboardconfig.cpp:316
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/keyboardconfig.cpp:311
+#: src/keyboardconfig.cpp:318
 msgid "Quick heal target or self"
 msgstr ""
 
-#: src/keyboardconfig.cpp:313
+#: src/keyboardconfig.cpp:320
 msgid "Use #itenplz spell"
 msgstr ""
 
-#: src/keyboardconfig.cpp:315
+#: src/keyboardconfig.cpp:322
 msgid "Use magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:317
+#: src/keyboardconfig.cpp:324
 msgid "Switch magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:319
+#: src/keyboardconfig.cpp:326
 msgid "Change move type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:321
+#: src/keyboardconfig.cpp:328
 msgid "Change Attack Weapon Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:323
+#: src/keyboardconfig.cpp:330
 msgid "Change Attack Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:325
+#: src/keyboardconfig.cpp:332
 msgid "Change Follow mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:327
+#: src/keyboardconfig.cpp:334
 msgid "Change Imitation mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboardconfig.cpp:337
 msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:331
+#: src/keyboardconfig.cpp:338
 msgid "On / Off audio"
 msgstr ""
 
-#: src/keyboardconfig.cpp:333
+#: src/keyboardconfig.cpp:340
 msgid "Enable / Disable away mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:335
+#: src/keyboardconfig.cpp:342
 msgid "Emulate right click from keyboard"
 msgstr ""
 
-#: src/keyboardconfig.cpp:337
+#: src/keyboardconfig.cpp:344
 msgid "Toggle camera mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:339
+#: src/keyboardconfig.cpp:346
 msgid "Modifier key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:411
+#: src/keyboardconfig.cpp:425
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:377
+#: src/localplayer.cpp:380
 msgid "You were killed by "
 msgstr ""
 
-#: src/localplayer.cpp:1416
+#: src/localplayer.cpp:1422
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1418
+#: src/localplayer.cpp:1424
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1420
+#: src/localplayer.cpp:1426
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1422
+#: src/localplayer.cpp:1428
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1424
+#: src/localplayer.cpp:1430
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1427
+#: src/localplayer.cpp:1433
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1430
+#: src/localplayer.cpp:1436
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1454
+#: src/localplayer.cpp:1460
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/localplayer.cpp:3168
+#: src/localplayer.cpp:3174
 msgid "Away"
 msgstr "Abwesend"
 
-#: src/localplayer.cpp:3468
+#: src/localplayer.cpp:3494
 msgid "Follow: "
 msgstr "Folgen:"
 
-#: src/localplayer.cpp:3470 src/localplayer.cpp:3485
+#: src/localplayer.cpp:3496 src/localplayer.cpp:3511
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3477
+#: src/localplayer.cpp:3503
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3479 src/localplayer.cpp:3487
+#: src/localplayer.cpp:3505 src/localplayer.cpp:3513
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3832
+#: src/localplayer.cpp:3858
 msgid "You see "
 msgstr "Du siehst"
 
@@ -4633,15 +4665,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:286
+#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:284
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:296
+#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:294
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:306
+#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:304
 msgid "Item sharing not possible."
 msgstr ""
 
@@ -4649,15 +4681,15 @@ msgstr ""
 msgid "Item sharing unknown."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:248
+#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:246
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:258
+#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:256
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:268
+#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:266
 msgid "Experience sharing not possible."
 msgstr ""
 
@@ -4736,54 +4768,54 @@ msgstr ""
 msgid "Username permanently erased."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:82
+#: src/net/ea/partyhandler.cpp:80
 msgid "Could not create party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:84
+#: src/net/ea/partyhandler.cpp:82
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:140
+#: src/net/ea/partyhandler.cpp:138
 #, c-format
 msgid "%s has joined your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:176
+#: src/net/ea/partyhandler.cpp:174
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:181
+#: src/net/ea/partyhandler.cpp:179
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:186
+#: src/net/ea/partyhandler.cpp:184
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:191
+#: src/net/ea/partyhandler.cpp:189
 #, c-format
 msgid "%s can't join your party because party is full."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:196
+#: src/net/ea/partyhandler.cpp:194
 #, c-format
 msgid "QQQ Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:356
+#: src/net/ea/partyhandler.cpp:354
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:369
+#: src/net/ea/partyhandler.cpp:367
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:448
+#: src/net/ea/partyhandler.cpp:446
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
@@ -4942,83 +4974,83 @@ msgstr ""
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:149
+#: src/net/ea/specialhandler.cpp:146
 msgid "Trade failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:152
+#: src/net/ea/specialhandler.cpp:149
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:155
+#: src/net/ea/specialhandler.cpp:152
 msgid "Sit failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:158
+#: src/net/ea/specialhandler.cpp:155
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:161
+#: src/net/ea/specialhandler.cpp:158
 msgid "Could not join party!"
 msgstr "Konnte Party nicht beitreten!"
 
-#: src/net/ea/specialhandler.cpp:164
+#: src/net/ea/specialhandler.cpp:161
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:177
+#: src/net/ea/specialhandler.cpp:174
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:181
+#: src/net/ea/specialhandler.cpp:178
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:184
+#: src/net/ea/specialhandler.cpp:181
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:187
+#: src/net/ea/specialhandler.cpp:184
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:190
+#: src/net/ea/specialhandler.cpp:187
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:193
+#: src/net/ea/specialhandler.cpp:190
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:196
+#: src/net/ea/specialhandler.cpp:193
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:200
+#: src/net/ea/specialhandler.cpp:197
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:203
+#: src/net/ea/specialhandler.cpp:200
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:206
+#: src/net/ea/specialhandler.cpp:203
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:209
+#: src/net/ea/specialhandler.cpp:206
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:220
+#: src/net/ea/specialhandler.cpp:217
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:223
+#: src/net/ea/specialhandler.cpp:220
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:226
+#: src/net/ea/specialhandler.cpp:223
 msgid "Poison had no effect..."
 msgstr ""
 
diff --git a/po/es.po b/po/es.po
index 7fb91889d..52325a3fd 100644
--- a/po/es.po
+++ b/po/es.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-09-17 16:12+0300\n"
-"PO-Revision-Date: 2011-09-17 04:30+0000\n"
+"POT-Creation-Date: 2011-09-27 22:18+0300\n"
+"PO-Revision-Date: 2011-09-27 19:30+0000\n"
 "Last-Translator: nelson6e65 <nelson6e65-manaplus@yahoo.es>\n"
 "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/"
 "manaplus/team/es/)\n"
@@ -23,25 +23,25 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: src/actorspritemanager.cpp:1088
+#: src/actorspritemanager.cpp:1133
 msgid "Visible on map"
 msgstr "Visible sobre el mapa"
 
-#: src/being.cpp:548
+#: src/being.cpp:547
 msgid "dodge"
 msgstr "evade"
 
-#: src/being.cpp:548
+#: src/being.cpp:547
 msgid "miss"
 msgstr "falla"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1527
+#: src/being.cpp:1526
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1532
+#: src/being.cpp:1531
 msgid "I"
 msgstr "I"
 
@@ -49,43 +49,43 @@ msgstr "I"
 msgid "Setup"
 msgstr "Configuración"
 
-#: src/client.cpp:841 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:842 src/gui/setup_perfomance.cpp:48
 msgid "Perfomance"
 msgstr "Rendimiento"
 
-#: src/client.cpp:846 src/gui/setup_video.cpp:315
+#: src/client.cpp:847 src/gui/setup_video.cpp:315
 msgid "Video"
 msgstr "Vídeo"
 
-#: src/client.cpp:851
+#: src/client.cpp:852
 msgid "Themes"
 msgstr "Temas"
 
-#: src/client.cpp:932
+#: src/client.cpp:934
 msgid "Connecting to server"
 msgstr "Conectando al servidor"
 
-#: src/client.cpp:963
+#: src/client.cpp:965
 msgid "Logging in"
 msgstr "Accediendo a la cuenta"
 
-#: src/client.cpp:996
+#: src/client.cpp:998
 msgid "Entering game world"
 msgstr "Entrando al mundo del juego"
 
-#: src/client.cpp:1096
+#: src/client.cpp:1098
 msgid "Requesting characters"
 msgstr "Cargando personajes"
 
-#: src/client.cpp:1127
+#: src/client.cpp:1129
 msgid "Connecting to the game server"
 msgstr "Conectando al servidor del juego"
 
-#: src/client.cpp:1137
+#: src/client.cpp:1139
 msgid "Changing game servers"
 msgstr "Cambiando servidores del juego"
 
-#: src/client.cpp:1180 src/client.cpp:1187 src/client.cpp:1321
+#: src/client.cpp:1182 src/client.cpp:1189 src/client.cpp:1323
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:221 src/gui/charselectdialog.cpp:253
 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
@@ -95,50 +95,50 @@ msgstr "Cambiando servidores del juego"
 msgid "Error"
 msgstr "Error"
 
-#: src/client.cpp:1196
+#: src/client.cpp:1198
 msgid "Requesting registration details"
 msgstr "Solicitando detalles de registro"
 
-#: src/client.cpp:1222
+#: src/client.cpp:1224
 msgid "Password Change"
 msgstr "Cambio de contraseña"
 
-#: src/client.cpp:1223
+#: src/client.cpp:1225
 msgid "Password changed successfully!"
 msgstr "¡Contraseña cambiada exitosamente!"
 
-#: src/client.cpp:1242
+#: src/client.cpp:1244
 msgid "Email Change"
 msgstr "Cambio de Email"
 
-#: src/client.cpp:1243
+#: src/client.cpp:1245
 msgid "Email changed successfully!"
 msgstr "¡Email modificado exitosamente!"
 
-#: src/client.cpp:1263
+#: src/client.cpp:1265
 msgid "Unregister Successful"
 msgstr "Registro cancelado"
 
-#: src/client.cpp:1264
+#: src/client.cpp:1266
 msgid "Farewell, come back any time..."
 msgstr "Adiós, vuelve cuando quieras..."
 
-#: src/client.cpp:1463 src/client.cpp:1493 src/client.cpp:1508
-#: src/client.cpp:1933 src/client.cpp:1940
+#: src/client.cpp:1465 src/client.cpp:1495 src/client.cpp:1510
+#: src/client.cpp:1935 src/client.cpp:1942
 #, 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:1639
+#: src/client.cpp:1641
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Servidor de actualización inválido: %s"
 
-#: src/client.cpp:1673 src/client.cpp:1679
+#: src/client.cpp:1675 src/client.cpp:1681
 msgid "Error creating updates directory!"
 msgstr "¡Error al crear la carpeta de actualizaciones!"
 
-#: src/client.cpp:1700
+#: src/client.cpp:1702
 #, 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."
@@ -347,11 +347,11 @@ msgstr "Ignorando las peticiones de intercambio"
 msgid "Accepting incoming trade requests"
 msgstr "Aceptando las peticiones de intercambio"
 
-#: src/game.cpp:1729
+#: src/game.cpp:1727
 msgid "Could Not Load Map"
 msgstr "No se pudo cargar el mapa"
 
-#: src/game.cpp:1730
+#: src/game.cpp:1728
 #, c-format
 msgid "Error while loading %s"
 msgstr "Error mientras cargaba %s"
@@ -386,7 +386,7 @@ msgstr "Nombre"
 
 #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:133
 #: src/gui/popupmenu.cpp:283 src/gui/popupmenu.cpp:596
-#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:265
+#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:265
 msgid "Attack"
 msgstr "Atacar"
 
@@ -440,7 +440,7 @@ msgstr "-"
 #: src/gui/buydialog.cpp:99 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:294
-#: src/keyboardconfig.cpp:290
+#: src/keyboardconfig.cpp:82
 msgid "Quit"
 msgstr "Salir"
 
@@ -475,7 +475,7 @@ msgstr "Vender"
 #: src/gui/popupmenu.cpp:1858 src/gui/popupmenu.cpp:1897
 #: src/gui/popupmenu.cpp:1949 src/gui/popupmenu.cpp:1969
 #: src/gui/quitdialog.cpp:55 src/gui/register.cpp:82 src/gui/setup.cpp:72
-#: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:238
+#: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:241
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
 #: src/gui/updaterwindow.cpp:161
 msgid "Cancel"
@@ -644,8 +644,8 @@ msgid "Enter password:"
 msgstr "Ingrese contraseña:"
 
 #: src/gui/charselectdialog.cpp:410 src/gui/serverdialog.cpp:298
-#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:122
-#: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:241
+#: src/gui/setup_relations.cpp:242 src/gui/shopwindow.cpp:122
+#: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244
 msgid "Delete"
 msgstr "Borrar"
 
@@ -897,7 +897,7 @@ msgid "Did You Know?"
 msgstr "¿Sabías que...?"
 
 #: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
-#: src/gui/inventorywindow.cpp:206 src/gui/npcdialog.cpp:53
+#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:53
 #: src/gui/popupmenu.cpp:556 src/gui/shopwindow.cpp:113
 msgid "Close"
 msgstr "Cerrar"
@@ -924,7 +924,7 @@ msgid "Equipment"
 msgstr "Equipamiento"
 
 #: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160
-#: src/gui/inventorywindow.cpp:539 src/gui/inventorywindow.cpp:548
+#: src/gui/inventorywindow.cpp:538 src/gui/inventorywindow.cpp:547
 #: src/gui/popupmenu.cpp:1656 src/gui/popupmenu.cpp:1748
 #: src/gui/popupmenu.cpp:1793
 msgid "Unequip"
@@ -954,37 +954,33 @@ msgstr "por cantidad"
 msgid "by type"
 msgstr "por tipo"
 
-#: src/gui/inventorywindow.cpp:111 src/gui/windowmenu.cpp:76
+#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:76
 #: src/inventory.cpp:249
 msgid "Inventory"
 msgstr "Inventario"
 
-#: src/gui/inventorywindow.cpp:136
+#: src/gui/inventorywindow.cpp:137
 msgid "Slots:"
 msgstr "Espacios:"
 
-#: src/gui/inventorywindow.cpp:148
+#: src/gui/inventorywindow.cpp:149
 msgid "Filter:"
 msgstr "Filtro:"
 
-#: src/gui/inventorywindow.cpp:149
-msgid "Sort:"
-msgstr "Ordenar:"
-
-#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:541
-#: src/gui/inventorywindow.cpp:550 src/gui/popupmenu.cpp:1658
+#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:540
+#: src/gui/inventorywindow.cpp:549 src/gui/popupmenu.cpp:1658
 #: src/gui/popupmenu.cpp:1750 src/gui/popupmenu.cpp:1795
 msgid "Equip"
 msgstr "Equipar"
 
-#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:542
-#: src/gui/inventorywindow.cpp:546 src/gui/popupmenu.cpp:1662
+#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:541
+#: src/gui/inventorywindow.cpp:545 src/gui/popupmenu.cpp:1662
 #: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1754
 #: src/gui/popupmenu.cpp:1799
 msgid "Use"
 msgstr "Usar"
 
-#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:646
+#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:645
 #: src/gui/popupmenu.cpp:1667 src/gui/popupmenu.cpp:1759
 #: src/gui/popupmenu.cpp:1804
 msgid "Drop..."
@@ -1004,17 +1000,17 @@ msgstr "Conjuntos"
 msgid "Weight:"
 msgstr "Peso:"
 
-#: src/gui/inventorywindow.cpp:204 src/gui/inventorywindow.cpp:637
+#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:636
 #: src/gui/popupmenu.cpp:1642 src/gui/popupmenu.cpp:1771
 #: src/gui/popupmenu.cpp:1816 src/gui/setup.cpp:73
 msgid "Store"
 msgstr "Almacenar"
 
-#: src/gui/inventorywindow.cpp:205 src/gui/popupmenu.cpp:1683
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1683
 msgid "Retrieve"
 msgstr "Recuperar"
 
-#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1672
+#: src/gui/inventorywindow.cpp:647 src/gui/popupmenu.cpp:1672
 #: src/gui/popupmenu.cpp:1764 src/gui/popupmenu.cpp:1809
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
@@ -2207,30 +2203,34 @@ msgid "Show own name"
 msgstr "Mostrar nombre propio"
 
 #: src/gui/setup_players.cpp:63
+msgid "Enable extended mouse targeting"
+msgstr "Activar la selección extendida con el ratón"
+
+#: src/gui/setup_players.cpp:66
 msgid "Target dead players"
 msgstr "Apuntar a jugadores muertos"
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_players.cpp:69
 msgid "Visible names"
 msgstr "Nombres Visibles"
 
-#: src/gui/setup_players.cpp:69
+#: src/gui/setup_players.cpp:72
 msgid "Secure trades"
 msgstr "Intercambios seguros"
 
-#: src/gui/setup_players.cpp:72
+#: src/gui/setup_players.cpp:75
 msgid "Unsecure chars in names"
 msgstr "Carácteres inseguros en los nombres"
 
-#: src/gui/setup_players.cpp:75
+#: src/gui/setup_players.cpp:78
 msgid "Show statuses"
 msgstr "Mostrar estados"
 
-#: src/gui/setup_players.cpp:78
+#: src/gui/setup_players.cpp:81
 msgid "Show ip addresses on screenshots"
 msgstr "Mostrar dirección IP en la captura de pantalla"
 
-#: src/gui/setup_players.cpp:81
+#: src/gui/setup_players.cpp:84
 msgid "Allow self heal with mouse click"
 msgstr "Permitir curarse a sí mismo con clic del ratón"
 
@@ -2258,23 +2258,23 @@ msgstr "Ignorado"
 msgid "Erased"
 msgstr "Borrado"
 
-#: src/gui/setup_relations.cpp:239
+#: src/gui/setup_relations.cpp:238
 msgid "Allow trading"
 msgstr "Permitir intercambios"
 
-#: src/gui/setup_relations.cpp:241
+#: src/gui/setup_relations.cpp:240
 msgid "Allow whispers"
 msgstr "Permitir mensajes privados"
 
-#: src/gui/setup_relations.cpp:244
+#: src/gui/setup_relations.cpp:243
 msgid "Old"
 msgstr "Viejo"
 
-#: src/gui/setup_relations.cpp:246
+#: src/gui/setup_relations.cpp:245
 msgid "Relations"
 msgstr "Relaciones"
 
-#: src/gui/setup_relations.cpp:271
+#: src/gui/setup_relations.cpp:270
 msgid "When ignoring:"
 msgstr "Cuando se ignora a alguien:"
 
@@ -3244,30 +3244,34 @@ msgid "Command:"
 msgstr "Comando:"
 
 #: src/gui/textcommandeditor.cpp:200
+msgid "Comment:"
+msgstr "Comentario:"
+
+#: src/gui/textcommandeditor.cpp:203
 msgid "Mana:"
 msgstr "Maná:"
 
-#: src/gui/textcommandeditor.cpp:206
+#: src/gui/textcommandeditor.cpp:209
 msgid "Target Type:"
 msgstr "Tipo de objetivo:"
 
-#: src/gui/textcommandeditor.cpp:212
+#: src/gui/textcommandeditor.cpp:215
 msgid "Icon:"
 msgstr "Ícono:"
 
-#: src/gui/textcommandeditor.cpp:218
+#: src/gui/textcommandeditor.cpp:221
 msgid "Magic level:"
 msgstr "Nivel de Magia:"
 
-#: src/gui/textcommandeditor.cpp:224
+#: src/gui/textcommandeditor.cpp:227
 msgid "Magic School:"
 msgstr "Escuela de Magia:"
 
-#: src/gui/textcommandeditor.cpp:230
+#: src/gui/textcommandeditor.cpp:233
 msgid "School level:"
 msgstr "Nivel de Escuela:"
 
-#: src/gui/textcommandeditor.cpp:235
+#: src/gui/textcommandeditor.cpp:238
 msgid "Save"
 msgstr "Guardar"
 
@@ -3497,23 +3501,23 @@ msgstr "Limites de Lugar de Inicio"
 msgid "Road Point"
 msgstr "Mostrar camino"
 
-#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:474
+#: src/gui/whoisonline.cpp:85 src/gui/whoisonline.cpp:478
 msgid "Who Is Online - Updating"
 msgstr "Quién está conectado - Actualizando"
 
-#: src/gui/whoisonline.cpp:104
+#: src/gui/whoisonline.cpp:108
 msgid "Update"
 msgstr "Actualizar"
 
-#: src/gui/whoisonline.cpp:297
+#: src/gui/whoisonline.cpp:301
 msgid "Who Is Online - "
 msgstr "Quienes están conectados - "
 
-#: src/gui/whoisonline.cpp:488
+#: src/gui/whoisonline.cpp:492
 msgid "Who Is Online - error"
 msgstr "Quienes están conectados - error"
 
-#: src/gui/whoisonline.cpp:519
+#: src/gui/whoisonline.cpp:523
 msgid "Who Is Online - Update"
 msgstr "Quienes están conectados - Actualizar"
 
@@ -3797,49 +3801,49 @@ msgid "Cart"
 msgstr "Mochila"
 
 #: src/keyboardconfig.cpp:43
+msgid "Basic Keys"
+msgstr "Teclas Básicas"
+
+#: src/keyboardconfig.cpp:44
 msgid "Move Up"
 msgstr "Mover para arriba"
 
-#: src/keyboardconfig.cpp:44
+#: src/keyboardconfig.cpp:45
 msgid "Move Down"
 msgstr "Mover para abajo"
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:46
 msgid "Move Left"
 msgstr "Izquierda"
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:47
 msgid "Move Right"
 msgstr "Derecha"
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:50
 msgid "Target & Attack"
 msgstr "Seleccionar & Atacar"
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:52
 msgid "Move to Target"
 msgstr "Mover al objetivo"
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:54
 msgid "Change Move to Target type"
 msgstr "Cambiar tipos de movimientos hacia la diana"
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:56
 msgid "Move to Home location"
 msgstr "Mover hacia la localizacion inicial"
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:58
 msgid "Set home location"
 msgstr "Fijar localización de hogar"
 
-#: src/keyboardconfig.cpp:59
+#: src/keyboardconfig.cpp:60
 msgid "Move to navigation point"
 msgstr "Mover al punto de navegación"
 
-#: src/keyboardconfig.cpp:61
-msgid "Smilie"
-msgstr "Emoticono"
-
 #: src/keyboardconfig.cpp:63
 msgid "Stop Attack"
 msgstr "Parar el ataque"
@@ -3885,300 +3889,328 @@ msgid "Change Map View Mode"
 msgstr "Cambiar el tipo de vista del mapa"
 
 #: src/keyboardconfig.cpp:80
+msgid "Select OK"
+msgstr "Seleccionar OK"
+
+#: src/keyboardconfig.cpp:83
+msgid "Shortcuts Keys"
+msgstr "Teclas de Atajos"
+
+#: src/keyboardconfig.cpp:84
 msgid "Item Shortcuts Key"
 msgstr "Tecla de acceso directo de objeto"
 
-#: src/keyboardconfig.cpp:82 src/keyboardconfig.cpp:84
 #: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:88
 #: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:92
 #: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:96
 #: src/keyboardconfig.cpp:98 src/keyboardconfig.cpp:100
 #: src/keyboardconfig.cpp:102 src/keyboardconfig.cpp:104
 #: src/keyboardconfig.cpp:106 src/keyboardconfig.cpp:108
-#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:113
-#: src/keyboardconfig.cpp:115 src/keyboardconfig.cpp:117
+#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:112
+#: src/keyboardconfig.cpp:114 src/keyboardconfig.cpp:117
 #: src/keyboardconfig.cpp:119 src/keyboardconfig.cpp:121
-#: src/keyboardconfig.cpp:360
+#: src/keyboardconfig.cpp:123 src/keyboardconfig.cpp:125
+#: src/keyboardconfig.cpp:367
 #, c-format
 msgid "Item Shortcut %d"
 msgstr "Atajo para el objeto %d"
 
-#: src/keyboardconfig.cpp:122
+#: src/keyboardconfig.cpp:126
+msgid "Windows Keys"
+msgstr "Teclas de Ventanas"
+
+#: src/keyboardconfig.cpp:127
 msgid "Help Window"
 msgstr "Ventana de ayuda"
 
-#: src/keyboardconfig.cpp:124
+#: src/keyboardconfig.cpp:129
 msgid "Status Window"
 msgstr "Ventana de Estado"
 
-#: src/keyboardconfig.cpp:126
+#: src/keyboardconfig.cpp:131
 msgid "Inventory Window"
 msgstr "Ventana de inventario"
 
-#: src/keyboardconfig.cpp:128
+#: src/keyboardconfig.cpp:133
 msgid "Equipment Window"
 msgstr "Ventana de equipamiento"
 
-#: src/keyboardconfig.cpp:130
+#: src/keyboardconfig.cpp:135
 msgid "Skill Window"
 msgstr "Ventana de habilidades"
 
-#: src/keyboardconfig.cpp:132
+#: src/keyboardconfig.cpp:137
 msgid "Minimap Window"
 msgstr "Ventana del minimapa"
 
-#: src/keyboardconfig.cpp:134
+#: src/keyboardconfig.cpp:139
 msgid "Chat Window"
 msgstr "Ventana de Chat"
 
-#: src/keyboardconfig.cpp:136
+#: src/keyboardconfig.cpp:141
 msgid "Item Shortcut Window"
 msgstr "Ventana de atajos para objetos"
 
-#: src/keyboardconfig.cpp:138
+#: src/keyboardconfig.cpp:143
 msgid "Setup Window"
 msgstr "Ventana de Configuración"
 
-#: src/keyboardconfig.cpp:140
+#: src/keyboardconfig.cpp:145
 msgid "Debug Window"
 msgstr "Ventana de Problemas"
 
-#: src/keyboardconfig.cpp:142
+#: src/keyboardconfig.cpp:147
 msgid "Social Window"
 msgstr "Ventana Social"
 
-#: src/keyboardconfig.cpp:144
+#: src/keyboardconfig.cpp:149
 msgid "Emote Shortcut Window"
 msgstr "Ventana de Emoticonos"
 
-#: src/keyboardconfig.cpp:146
+#: src/keyboardconfig.cpp:151
 msgid "Outfits Window"
 msgstr "Ventana de Conjuntos"
 
-#: src/keyboardconfig.cpp:148
+#: src/keyboardconfig.cpp:153
 msgid "Shop Window"
 msgstr "Ventana de la tienda"
 
-#: src/keyboardconfig.cpp:150
+#: src/keyboardconfig.cpp:155
 msgid "Quick drop Window"
 msgstr "Ventana de lanzamiento de objetos"
 
-#: src/keyboardconfig.cpp:152
+#: src/keyboardconfig.cpp:157
 msgid "Kill Stats Window"
 msgstr "Ventana de Estadísticas"
 
-#: src/keyboardconfig.cpp:154
+#: src/keyboardconfig.cpp:159
 msgid "Commands Window"
 msgstr "Ventana de comandos"
 
-#: src/keyboardconfig.cpp:156
+#: src/keyboardconfig.cpp:161
 msgid "Bot Checker Window"
 msgstr "Ventana de comprobador de robot"
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboardconfig.cpp:164
 msgid "Who Is Online Window"
 msgstr "Ventana de jugadores conectados"
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboardconfig.cpp:166
 msgid "Did you know Window"
 msgstr "Ventana ¿Sabías que.."
 
-#: src/keyboardconfig.cpp:164
+#: src/keyboardconfig.cpp:169
 msgid "Previous Social Tab"
 msgstr "Pestaña Social Previa"
 
-#: src/keyboardconfig.cpp:166
+#: src/keyboardconfig.cpp:171
 msgid "Next Social Tab"
 msgstr "Pestaña Social Siguiente"
 
-#: src/keyboardconfig.cpp:168 src/keyboardconfig.cpp:170
-#: src/keyboardconfig.cpp:172 src/keyboardconfig.cpp:174
-#: src/keyboardconfig.cpp:176 src/keyboardconfig.cpp:178
-#: src/keyboardconfig.cpp:180 src/keyboardconfig.cpp:182
-#: src/keyboardconfig.cpp:184 src/keyboardconfig.cpp:186
-#: src/keyboardconfig.cpp:188 src/keyboardconfig.cpp:190
-#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
-#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
-#: src/keyboardconfig.cpp:201 src/keyboardconfig.cpp:203
-#: src/keyboardconfig.cpp:205 src/keyboardconfig.cpp:207
-#: src/keyboardconfig.cpp:209 src/keyboardconfig.cpp:211
-#: src/keyboardconfig.cpp:213 src/keyboardconfig.cpp:215
-#: src/keyboardconfig.cpp:217 src/keyboardconfig.cpp:220
-#: src/keyboardconfig.cpp:223 src/keyboardconfig.cpp:226
-#: src/keyboardconfig.cpp:228 src/keyboardconfig.cpp:230
-#: src/keyboardconfig.cpp:232 src/keyboardconfig.cpp:234
-#: src/keyboardconfig.cpp:236 src/keyboardconfig.cpp:238
-#: src/keyboardconfig.cpp:240 src/keyboardconfig.cpp:242
-#: src/keyboardconfig.cpp:244 src/keyboardconfig.cpp:247
-#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
-#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
-#: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:259
-#: src/keyboardconfig.cpp:355
+#: src/keyboardconfig.cpp:173
+msgid "Emotes Keys"
+msgstr "Teclas de Emoticones"
+
+#: src/keyboardconfig.cpp:174
+msgid "Smilie"
+msgstr "Emoticono"
+
+#: src/keyboardconfig.cpp:175 src/keyboardconfig.cpp:177
+#: src/keyboardconfig.cpp:179 src/keyboardconfig.cpp:181
+#: src/keyboardconfig.cpp:183 src/keyboardconfig.cpp:185
+#: src/keyboardconfig.cpp:187 src/keyboardconfig.cpp:189
+#: src/keyboardconfig.cpp:191 src/keyboardconfig.cpp:193
+#: src/keyboardconfig.cpp:195 src/keyboardconfig.cpp:197
+#: src/keyboardconfig.cpp:200 src/keyboardconfig.cpp:202
+#: src/keyboardconfig.cpp:204 src/keyboardconfig.cpp:206
+#: src/keyboardconfig.cpp:208 src/keyboardconfig.cpp:210
+#: src/keyboardconfig.cpp:212 src/keyboardconfig.cpp:214
+#: src/keyboardconfig.cpp:216 src/keyboardconfig.cpp:218
+#: src/keyboardconfig.cpp:220 src/keyboardconfig.cpp:222
+#: src/keyboardconfig.cpp:224 src/keyboardconfig.cpp:227
+#: src/keyboardconfig.cpp:230 src/keyboardconfig.cpp:233
+#: src/keyboardconfig.cpp:235 src/keyboardconfig.cpp:237
+#: src/keyboardconfig.cpp:239 src/keyboardconfig.cpp:241
+#: src/keyboardconfig.cpp:243 src/keyboardconfig.cpp:245
+#: src/keyboardconfig.cpp:247 src/keyboardconfig.cpp:249
+#: src/keyboardconfig.cpp:251 src/keyboardconfig.cpp:254
+#: src/keyboardconfig.cpp:256 src/keyboardconfig.cpp:258
+#: src/keyboardconfig.cpp:260 src/keyboardconfig.cpp:262
+#: src/keyboardconfig.cpp:264 src/keyboardconfig.cpp:266
+#: src/keyboardconfig.cpp:362
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "Atajo para Emoticono %d"
 
-#: src/keyboardconfig.cpp:261
+#: src/keyboardconfig.cpp:268
+msgid "Outfits Keys"
+msgstr "Teclas de Conjuntos"
+
+#: src/keyboardconfig.cpp:269
 msgid "Wear Outfit"
 msgstr "Ponerse el conjunto"
 
-#: src/keyboardconfig.cpp:263
+#: src/keyboardconfig.cpp:271
 msgid "Copy Outfit"
 msgstr "Copiar el conjunto"
 
-#: src/keyboardconfig.cpp:265
+#: src/keyboardconfig.cpp:273
 msgid "Copy equipped to Outfit"
 msgstr "Copiar lo que tiene equipado a Conjunto"
 
-#: src/keyboardconfig.cpp:267
+#: src/keyboardconfig.cpp:275
+msgid "Chat Keys"
+msgstr "Teclas del Chat"
+
+#: src/keyboardconfig.cpp:276
 msgid "Toggle Chat"
 msgstr "Cambiar Chat"
 
-#: src/keyboardconfig.cpp:269
+#: src/keyboardconfig.cpp:278
 msgid "Scroll Chat Up"
 msgstr "Desplazarse hacia arriba en el chat"
 
-#: src/keyboardconfig.cpp:271
+#: src/keyboardconfig.cpp:280
 msgid "Scroll Chat Down"
 msgstr "Desplazarse hacia abajo en el chat"
 
-#: src/keyboardconfig.cpp:273
+#: src/keyboardconfig.cpp:282
 msgid "Previous Chat Tab"
 msgstr "Pestaña de Chat Anterior"
 
-#: src/keyboardconfig.cpp:275
+#: src/keyboardconfig.cpp:284
 msgid "Next Chat Tab"
 msgstr "Siguiente Pestaña De Chat"
 
-#: src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:287
 msgid "Close current Chat Tab"
 msgstr "Cerrar la Pestaña activa del Chat"
 
-#: src/keyboardconfig.cpp:280
+#: src/keyboardconfig.cpp:289
 msgid "Previous chat line"
 msgstr "Línea previa del chat"
 
-#: src/keyboardconfig.cpp:282
+#: src/keyboardconfig.cpp:291
 msgid "Next chat line"
 msgstr "Siguiente línea del chat"
 
-#: src/keyboardconfig.cpp:284
+#: src/keyboardconfig.cpp:293
 msgid "Chat Auto Complete"
 msgstr "Completar texto automáticamente en chat"
 
-#: src/keyboardconfig.cpp:286
+#: src/keyboardconfig.cpp:295
 msgid "Deactivate Chat Input"
 msgstr "Desactivar entrada al Chat"
 
-#: src/keyboardconfig.cpp:288
-msgid "Select OK"
-msgstr "Seleccionar OK"
+#: src/keyboardconfig.cpp:297
+msgid "Other Keys"
+msgstr "Otras Teclas"
 
-#: src/keyboardconfig.cpp:291
+#: src/keyboardconfig.cpp:298
 msgid "Ignore input 1"
 msgstr "Ignorar input 1"
 
-#: src/keyboardconfig.cpp:293
+#: src/keyboardconfig.cpp:300
 msgid "Ignore input 2"
 msgstr "Ignorar input 2"
 
-#: src/keyboardconfig.cpp:295
+#: src/keyboardconfig.cpp:302
 msgid "Direct Up"
 msgstr "Arriba"
 
-#: src/keyboardconfig.cpp:296
+#: src/keyboardconfig.cpp:303
 msgid "Direct Down"
 msgstr "Abajo"
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboardconfig.cpp:305
 msgid "Direct Left"
 msgstr "Izquierda"
 
-#: src/keyboardconfig.cpp:299
+#: src/keyboardconfig.cpp:306
 msgid "Direct Right"
 msgstr "Derecha"
 
-#: src/keyboardconfig.cpp:301
+#: src/keyboardconfig.cpp:308
 msgid "Crazy moves"
 msgstr "Movimientos locos"
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboardconfig.cpp:310
 msgid "Change Crazy Move mode"
 msgstr "Cambiar  el tipo de movimientos locos"
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboardconfig.cpp:312
 msgid "Quick Drop N Items from 0 slot"
 msgstr "Lanzamiento de N objetos desde 0 casillas"
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboardconfig.cpp:314
 msgid "Quick Drop N Items"
 msgstr "Dejar caer N artículos rápidamente"
 
-#: src/keyboardconfig.cpp:309
+#: src/keyboardconfig.cpp:316
 msgid "Switch Quick Drop Counter"
 msgstr "Cambiar el contador de lanzamientos"
 
-#: src/keyboardconfig.cpp:311
+#: src/keyboardconfig.cpp:318
 msgid "Quick heal target or self"
 msgstr "Curar rápidamente a objetivo o a sí mismo"
 
-#: src/keyboardconfig.cpp:313
+#: src/keyboardconfig.cpp:320
 msgid "Use #itenplz spell"
 msgstr "Usar el hechizo #itenplz"
 
-#: src/keyboardconfig.cpp:315
+#: src/keyboardconfig.cpp:322
 msgid "Use magic attack"
 msgstr "Usar ataque mágico"
 
-#: src/keyboardconfig.cpp:317
+#: src/keyboardconfig.cpp:324
 msgid "Switch magic attack"
 msgstr "Intercambiar ataque mágico"
 
-#: src/keyboardconfig.cpp:319
+#: src/keyboardconfig.cpp:326
 msgid "Change move type"
 msgstr "Cambiar tipo de maniobra"
 
-#: src/keyboardconfig.cpp:321
+#: src/keyboardconfig.cpp:328
 msgid "Change Attack Weapon Type"
 msgstr "Cambiar tipo de arma de ataque"
 
-#: src/keyboardconfig.cpp:323
+#: src/keyboardconfig.cpp:330
 msgid "Change Attack Type"
 msgstr "Cambiar tipo de ataque"
 
-#: src/keyboardconfig.cpp:325
+#: src/keyboardconfig.cpp:332
 msgid "Change Follow mode"
 msgstr "Cambiar modo de perseguir"
 
-#: src/keyboardconfig.cpp:327
+#: src/keyboardconfig.cpp:334
 msgid "Change Imitation mode"
 msgstr "Cambiar modo de Imitación"
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboardconfig.cpp:337
 msgid "Disable / Enable Game modifier keys"
 msgstr "Habilitar / Deshabilitar las teclas de modification del juego"
 
-#: src/keyboardconfig.cpp:331
+#: src/keyboardconfig.cpp:338
 msgid "On / Off audio"
 msgstr "Encender / Apagar audio"
 
-#: src/keyboardconfig.cpp:333
+#: src/keyboardconfig.cpp:340
 msgid "Enable / Disable away mode"
 msgstr "Habilitar / Deshabilitar modo AFK"
 
-#: src/keyboardconfig.cpp:335
+#: src/keyboardconfig.cpp:342
 msgid "Emulate right click from keyboard"
 msgstr "Emular clic derecho desde el teclado"
 
-#: src/keyboardconfig.cpp:337
+#: src/keyboardconfig.cpp:344
 msgid "Toggle camera mode"
 msgstr "Interruptor de tipo de cámara"
 
-#: src/keyboardconfig.cpp:339
+#: src/keyboardconfig.cpp:346
 msgid "Modifier key"
 msgstr "Tecla modificadora"
 
-#: src/keyboardconfig.cpp:411
+#: src/keyboardconfig.cpp:425
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -4187,68 +4219,68 @@ msgstr ""
 "Conflito con las teclas \"%s\" e \"%s\" . Resuelva el conflicto, o el juego "
 "puede presentar un comportamiento raro."
 
-#: src/localplayer.cpp:377
+#: src/localplayer.cpp:380
 msgid "You were killed by "
 msgstr "Fuiste eliminado por "
 
-#: src/localplayer.cpp:1416
+#: src/localplayer.cpp:1422
 msgid "Tried to pick up nonexistent item."
 msgstr "Intentaste recoger un objeto inexistante."
 
-#: src/localplayer.cpp:1418
+#: src/localplayer.cpp:1424
 msgid "Item is too heavy."
 msgstr "El artículo es muy pesado."
 
-#: src/localplayer.cpp:1420
+#: src/localplayer.cpp:1426
 msgid "Item is too far away."
 msgstr "El artículo está muy lejos."
 
-#: src/localplayer.cpp:1422
+#: src/localplayer.cpp:1428
 msgid "Inventory is full."
 msgstr "El inventario está lleno."
 
-#: src/localplayer.cpp:1424
+#: src/localplayer.cpp:1430
 msgid "Stack is too big."
 msgstr "El agrupamiento es demasiado grande."
 
-#: src/localplayer.cpp:1427
+#: src/localplayer.cpp:1433
 msgid "Item belongs to someone else."
 msgstr "El artículo pertenece a alguien más."
 
-#: src/localplayer.cpp:1430
+#: src/localplayer.cpp:1436
 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:1454
+#: src/localplayer.cpp:1460
 #, 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:3168
+#: src/localplayer.cpp:3174
 msgid "Away"
 msgstr "Fuera del Teclado"
 
-#: src/localplayer.cpp:3468
+#: src/localplayer.cpp:3494
 msgid "Follow: "
 msgstr "Seguir: "
 
-#: src/localplayer.cpp:3470 src/localplayer.cpp:3485
+#: src/localplayer.cpp:3496 src/localplayer.cpp:3511
 msgid "Follow canceled"
 msgstr "Seguir cancelado"
 
-#: src/localplayer.cpp:3477
+#: src/localplayer.cpp:3503
 msgid "Imitation: "
 msgstr "Imitacion: "
 
-#: src/localplayer.cpp:3479 src/localplayer.cpp:3487
+#: src/localplayer.cpp:3505 src/localplayer.cpp:3513
 msgid "Imitation canceled"
 msgstr "Imitación cancelada"
 
-#: src/localplayer.cpp:3832
+#: src/localplayer.cpp:3858
 msgid "You see "
 msgstr "Ves "
 
@@ -4639,15 +4671,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:286
+#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:284
 msgid "Item sharing enabled."
 msgstr "Compartir objetos habilitado."
 
-#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:296
+#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:294
 msgid "Item sharing disabled."
 msgstr "Compartir objetos desabilitado."
 
-#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:306
+#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:304
 msgid "Item sharing not possible."
 msgstr "No es posible el compartir objetos."
 
@@ -4655,15 +4687,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:248
+#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:246
 msgid "Experience sharing enabled."
 msgstr "Compartir experiencia activado."
 
-#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:258
+#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:256
 msgid "Experience sharing disabled."
 msgstr "Compartir experiencia desactivado ."
 
-#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:268
+#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:266
 msgid "Experience sharing not possible."
 msgstr "Imposible compartir experiencia."
 
@@ -4746,54 +4778,54 @@ msgstr "Este nombre de usuario ya está escogido."
 msgid "Username permanently erased."
 msgstr "Nombre de usuario borrado permanentemente."
 
-#: src/net/ea/partyhandler.cpp:82
+#: src/net/ea/partyhandler.cpp:80
 msgid "Could not create party."
 msgstr "No es posible crear un grupo."
 
-#: src/net/ea/partyhandler.cpp:84
+#: src/net/ea/partyhandler.cpp:82
 msgid "Party successfully created."
 msgstr "Grupo creado."
 
-#: src/net/ea/partyhandler.cpp:140
+#: src/net/ea/partyhandler.cpp:138
 #, c-format
 msgid "%s has joined your party."
 msgstr "%s se ha unido a tu grupo."
 
-#: src/net/ea/partyhandler.cpp:176
+#: src/net/ea/partyhandler.cpp:174
 #, c-format
 msgid "%s is already a member of a party."
 msgstr "%s ya es miembro de otro grupo."
 
-#: src/net/ea/partyhandler.cpp:181
+#: src/net/ea/partyhandler.cpp:179
 #, c-format
 msgid "%s refused your invitation."
 msgstr "%s cancelo tu invitación."
 
-#: src/net/ea/partyhandler.cpp:186
+#: src/net/ea/partyhandler.cpp:184
 #, c-format
 msgid "%s is now a member of your party."
 msgstr "%s ahora es un miembro de tu grupo."
 
-#: src/net/ea/partyhandler.cpp:191
+#: src/net/ea/partyhandler.cpp:189
 #, c-format
 msgid "%s can't join your party because party is full."
 msgstr "%s no puede unirse a tu grupo porque está completamente lleno."
 
-#: src/net/ea/partyhandler.cpp:196
+#: src/net/ea/partyhandler.cpp:194
 #, c-format
 msgid "QQQ Unknown invite response for %s."
 msgstr "QQQ respuesta desconocida a la invitacion de %s."
 
-#: src/net/ea/partyhandler.cpp:356
+#: src/net/ea/partyhandler.cpp:354
 msgid "You have left the party."
 msgstr "Has dejado el grupo."
 
-#: src/net/ea/partyhandler.cpp:369
+#: src/net/ea/partyhandler.cpp:367
 #, c-format
 msgid "%s has left your party."
 msgstr "%s dejó tu grupo."
 
-#: src/net/ea/partyhandler.cpp:448
+#: src/net/ea/partyhandler.cpp:446
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr "Un miembro desconocido intentó decir: %s"
@@ -4952,83 +4984,83 @@ msgstr "¡Imposible incrementar!"
 msgid "Equip arrows first."
 msgstr "Equipar las flechas primero."
 
-#: src/net/ea/specialhandler.cpp:149
+#: src/net/ea/specialhandler.cpp:146
 msgid "Trade failed!"
 msgstr "¡Fallo al intercambiar!"
 
-#: src/net/ea/specialhandler.cpp:152
+#: src/net/ea/specialhandler.cpp:149
 msgid "Emote failed!"
 msgstr "¡Fallo al hacer un emoticono!"
 
-#: src/net/ea/specialhandler.cpp:155
+#: src/net/ea/specialhandler.cpp:152
 msgid "Sit failed!"
 msgstr "¡Fallo al sentarse!"
 
-#: src/net/ea/specialhandler.cpp:158
+#: src/net/ea/specialhandler.cpp:155
 msgid "Chat creating failed!"
 msgstr "¡Fallo al crear un chat!"
 
-#: src/net/ea/specialhandler.cpp:161
+#: src/net/ea/specialhandler.cpp:158
 msgid "Could not join party!"
 msgstr "¡No se puede unir al grupo!"
 
-#: src/net/ea/specialhandler.cpp:164
+#: src/net/ea/specialhandler.cpp:161
 msgid "Cannot shout!"
 msgstr "¡Imposible gritar!"
 
-#: src/net/ea/specialhandler.cpp:177
+#: src/net/ea/specialhandler.cpp:174
 msgid "You have not yet reached a high enough lvl!"
 msgstr "¡Aún no has alcanzado un nivel lo suficientemente alto!"
 
-#: src/net/ea/specialhandler.cpp:181
+#: src/net/ea/specialhandler.cpp:178
 msgid "Insufficient HP!"
 msgstr "PV insuficiente!"
 
-#: src/net/ea/specialhandler.cpp:184
+#: src/net/ea/specialhandler.cpp:181
 msgid "Insufficient SP!"
 msgstr "SP insuficiente!"
 
-#: src/net/ea/specialhandler.cpp:187
+#: src/net/ea/specialhandler.cpp:184
 msgid "You have no memos!"
 msgstr "No tienes ninguna nota armenzada!"
 
-#: src/net/ea/specialhandler.cpp:190
+#: src/net/ea/specialhandler.cpp:187
 msgid "You cannot do that right now!"
 msgstr "No puedes hacer esto ahora mismo!"
 
-#: src/net/ea/specialhandler.cpp:193
+#: src/net/ea/specialhandler.cpp:190
 msgid "Seems you need more money... ;-)"
 msgstr "Parece que necesitas más dinero... ;-)"
 
-#: src/net/ea/specialhandler.cpp:196
+#: src/net/ea/specialhandler.cpp:193
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "¡No puedes usar esta habilidad con este tipo de arma!"
 
-#: src/net/ea/specialhandler.cpp:200
+#: src/net/ea/specialhandler.cpp:197
 msgid "You need another red gem!"
 msgstr "Necesitas otra Gema Roja!"
 
-#: src/net/ea/specialhandler.cpp:203
+#: src/net/ea/specialhandler.cpp:200
 msgid "You need another blue gem!"
 msgstr "Necesitas otra Gema Azul!"
 
-#: src/net/ea/specialhandler.cpp:206
+#: src/net/ea/specialhandler.cpp:203
 msgid "You're carrying to much to do this!"
 msgstr "Llevas muchas cosas para hacer esto!"
 
-#: src/net/ea/specialhandler.cpp:209
+#: src/net/ea/specialhandler.cpp:206
 msgid "Huh? What's that?"
 msgstr "Huh? Qué es eso?"
 
-#: src/net/ea/specialhandler.cpp:220
+#: src/net/ea/specialhandler.cpp:217
 msgid "Warp failed..."
 msgstr "Fallo al teletransportar..."
 
-#: src/net/ea/specialhandler.cpp:223
+#: src/net/ea/specialhandler.cpp:220
 msgid "Could not steal anything..."
 msgstr "No puedes robar nada..."
 
-#: src/net/ea/specialhandler.cpp:226
+#: src/net/ea/specialhandler.cpp:223
 msgid "Poison had no effect..."
 msgstr "Veneno no tuvo ningún efecto..."
 
diff --git a/po/fi.po b/po/fi.po
index 6a2de694a..656647833 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-09-17 16:12+0300\n"
-"PO-Revision-Date: 2011-09-16 20:12+0000\n"
+"POT-Creation-Date: 2011-09-27 22:18+0300\n"
+"PO-Revision-Date: 2011-09-27 19:20+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: fi\n"
@@ -19,25 +19,25 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: src/actorspritemanager.cpp:1088
+#: src/actorspritemanager.cpp:1133
 msgid "Visible on map"
 msgstr "Näkyvillä kartalla"
 
-#: src/being.cpp:548
+#: src/being.cpp:547
 msgid "dodge"
 msgstr "väistö"
 
-#: src/being.cpp:548
+#: src/being.cpp:547
 msgid "miss"
 msgstr "huti"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1527
+#: src/being.cpp:1526
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1532
+#: src/being.cpp:1531
 msgid "I"
 msgstr ""
 
@@ -45,43 +45,43 @@ msgstr ""
 msgid "Setup"
 msgstr "Asetukset"
 
-#: src/client.cpp:841 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:842 src/gui/setup_perfomance.cpp:48
 msgid "Perfomance"
 msgstr ""
 
-#: src/client.cpp:846 src/gui/setup_video.cpp:315
+#: src/client.cpp:847 src/gui/setup_video.cpp:315
 msgid "Video"
 msgstr "Kuva"
 
-#: src/client.cpp:851
+#: src/client.cpp:852
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:932
+#: src/client.cpp:934
 msgid "Connecting to server"
 msgstr "Yhdistän palvelimeen"
 
-#: src/client.cpp:963
+#: src/client.cpp:965
 msgid "Logging in"
 msgstr "Kirjaudun sisään"
 
-#: src/client.cpp:996
+#: src/client.cpp:998
 msgid "Entering game world"
 msgstr "Siirryn pelimaailmaan"
 
-#: src/client.cpp:1096
+#: src/client.cpp:1098
 msgid "Requesting characters"
 msgstr "Pyydän hahmoja"
 
-#: src/client.cpp:1127
+#: src/client.cpp:1129
 msgid "Connecting to the game server"
 msgstr "Yhdistän pelipalvelimeen"
 
-#: src/client.cpp:1137
+#: src/client.cpp:1139
 msgid "Changing game servers"
 msgstr "Vaihdan pelipalvelinta"
 
-#: src/client.cpp:1180 src/client.cpp:1187 src/client.cpp:1321
+#: src/client.cpp:1182 src/client.cpp:1189 src/client.cpp:1323
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:221 src/gui/charselectdialog.cpp:253
 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
@@ -91,50 +91,50 @@ msgstr "Vaihdan pelipalvelinta"
 msgid "Error"
 msgstr "Virhe"
 
-#: src/client.cpp:1196
+#: src/client.cpp:1198
 msgid "Requesting registration details"
 msgstr "Pyydän rekisteröitymisen yksityiskohtia"
 
-#: src/client.cpp:1222
+#: src/client.cpp:1224
 msgid "Password Change"
 msgstr "Salasanan vaihto"
 
-#: src/client.cpp:1223
+#: src/client.cpp:1225
 msgid "Password changed successfully!"
 msgstr "Salasana vaihdettu onnistuneesti!"
 
-#: src/client.cpp:1242
+#: src/client.cpp:1244
 msgid "Email Change"
 msgstr "Sähköpostin vaihto"
 
-#: src/client.cpp:1243
+#: src/client.cpp:1245
 msgid "Email changed successfully!"
 msgstr "Sähköpostiosoite vaihdettu onnistuneesti!"
 
-#: src/client.cpp:1263
+#: src/client.cpp:1265
 msgid "Unregister Successful"
 msgstr "Tietojen poisto onnistui"
 
-#: src/client.cpp:1264
+#: src/client.cpp:1266
 msgid "Farewell, come back any time..."
 msgstr "Näkemisiin, tule pian takaisin..."
 
-#: src/client.cpp:1463 src/client.cpp:1493 src/client.cpp:1508
-#: src/client.cpp:1933 src/client.cpp:1940
+#: src/client.cpp:1465 src/client.cpp:1495 src/client.cpp:1510
+#: src/client.cpp:1935 src/client.cpp:1942
 #, 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:1639
+#: src/client.cpp:1641
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Epäkelpo päivitysosoite: %s"
 
-#: src/client.cpp:1673 src/client.cpp:1679
+#: src/client.cpp:1675 src/client.cpp:1681
 msgid "Error creating updates directory!"
 msgstr "Päivityshakemistoa luodessa tapahtui virhe!"
 
-#: src/client.cpp:1700
+#: src/client.cpp:1702
 #, 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."
@@ -344,11 +344,11 @@ msgstr "Et huomioi kaupankäyntipyyntöjä"
 msgid "Accepting incoming trade requests"
 msgstr "Hyväksyt kaupankäyntipyynnöt"
 
-#: src/game.cpp:1729
+#: src/game.cpp:1727
 msgid "Could Not Load Map"
 msgstr "Kartan lataaminen epäonnistui"
 
-#: src/game.cpp:1730
+#: src/game.cpp:1728
 #, c-format
 msgid "Error while loading %s"
 msgstr "Kohdetta %s ladattaessa tapahtui virhe."
@@ -383,7 +383,7 @@ msgstr "Nimi"
 
 #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:133
 #: src/gui/popupmenu.cpp:283 src/gui/popupmenu.cpp:596
-#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:265
+#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:265
 msgid "Attack"
 msgstr "Hyökkää"
 
@@ -437,7 +437,7 @@ msgstr "-"
 #: src/gui/buydialog.cpp:99 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:294
-#: src/keyboardconfig.cpp:290
+#: src/keyboardconfig.cpp:82
 msgid "Quit"
 msgstr "Sulje"
 
@@ -472,7 +472,7 @@ msgstr "Myy"
 #: src/gui/popupmenu.cpp:1858 src/gui/popupmenu.cpp:1897
 #: src/gui/popupmenu.cpp:1949 src/gui/popupmenu.cpp:1969
 #: src/gui/quitdialog.cpp:55 src/gui/register.cpp:82 src/gui/setup.cpp:72
-#: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:238
+#: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:241
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
 #: src/gui/updaterwindow.cpp:161
 msgid "Cancel"
@@ -641,8 +641,8 @@ msgid "Enter password:"
 msgstr "Salasana:"
 
 #: src/gui/charselectdialog.cpp:410 src/gui/serverdialog.cpp:298
-#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:122
-#: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:241
+#: src/gui/setup_relations.cpp:242 src/gui/shopwindow.cpp:122
+#: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244
 msgid "Delete"
 msgstr "Poista"
 
@@ -894,7 +894,7 @@ msgid "Did You Know?"
 msgstr ""
 
 #: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
-#: src/gui/inventorywindow.cpp:206 src/gui/npcdialog.cpp:53
+#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:53
 #: src/gui/popupmenu.cpp:556 src/gui/shopwindow.cpp:113
 msgid "Close"
 msgstr "Sulje"
@@ -921,7 +921,7 @@ msgid "Equipment"
 msgstr "Varusteet"
 
 #: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160
-#: src/gui/inventorywindow.cpp:539 src/gui/inventorywindow.cpp:548
+#: src/gui/inventorywindow.cpp:538 src/gui/inventorywindow.cpp:547
 #: src/gui/popupmenu.cpp:1656 src/gui/popupmenu.cpp:1748
 #: src/gui/popupmenu.cpp:1793
 msgid "Unequip"
@@ -951,37 +951,33 @@ msgstr ""
 msgid "by type"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:111 src/gui/windowmenu.cpp:76
+#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:76
 #: src/inventory.cpp:249
 msgid "Inventory"
 msgstr "Tavarat"
 
-#: src/gui/inventorywindow.cpp:136
+#: src/gui/inventorywindow.cpp:137
 msgid "Slots:"
 msgstr "Paikkoja:"
 
-#: src/gui/inventorywindow.cpp:148
+#: src/gui/inventorywindow.cpp:149
 msgid "Filter:"
 msgstr "Suodin:"
 
-#: src/gui/inventorywindow.cpp:149
-msgid "Sort:"
-msgstr "Järj.:"
-
-#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:541
-#: src/gui/inventorywindow.cpp:550 src/gui/popupmenu.cpp:1658
+#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:540
+#: src/gui/inventorywindow.cpp:549 src/gui/popupmenu.cpp:1658
 #: src/gui/popupmenu.cpp:1750 src/gui/popupmenu.cpp:1795
 msgid "Equip"
 msgstr "Ota käyttöön"
 
-#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:542
-#: src/gui/inventorywindow.cpp:546 src/gui/popupmenu.cpp:1662
+#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:541
+#: src/gui/inventorywindow.cpp:545 src/gui/popupmenu.cpp:1662
 #: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1754
 #: src/gui/popupmenu.cpp:1799
 msgid "Use"
 msgstr "Käytä"
 
-#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:646
+#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:645
 #: src/gui/popupmenu.cpp:1667 src/gui/popupmenu.cpp:1759
 #: src/gui/popupmenu.cpp:1804
 msgid "Drop..."
@@ -1001,17 +997,17 @@ msgstr "Asukokonaisuudet"
 msgid "Weight:"
 msgstr "Paino:"
 
-#: src/gui/inventorywindow.cpp:204 src/gui/inventorywindow.cpp:637
+#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:636
 #: src/gui/popupmenu.cpp:1642 src/gui/popupmenu.cpp:1771
 #: src/gui/popupmenu.cpp:1816 src/gui/setup.cpp:73
 msgid "Store"
 msgstr "Varastoi"
 
-#: src/gui/inventorywindow.cpp:205 src/gui/popupmenu.cpp:1683
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1683
 msgid "Retrieve"
 msgstr "Ota"
 
-#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1672
+#: src/gui/inventorywindow.cpp:647 src/gui/popupmenu.cpp:1672
 #: src/gui/popupmenu.cpp:1764 src/gui/popupmenu.cpp:1809
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
@@ -2204,30 +2200,34 @@ msgid "Show own name"
 msgstr "Näytä oma nimi"
 
 #: src/gui/setup_players.cpp:63
+msgid "Enable extended mouse targeting"
+msgstr ""
+
+#: src/gui/setup_players.cpp:66
 msgid "Target dead players"
 msgstr "Ota kuolleetkin pelaajat kohteiksi"
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_players.cpp:69
 msgid "Visible names"
 msgstr "Näytä nimet"
 
-#: src/gui/setup_players.cpp:69
+#: src/gui/setup_players.cpp:72
 msgid "Secure trades"
 msgstr "Turvaa kaupat"
 
-#: src/gui/setup_players.cpp:72
+#: src/gui/setup_players.cpp:75
 msgid "Unsecure chars in names"
 msgstr ""
 
-#: src/gui/setup_players.cpp:75
+#: src/gui/setup_players.cpp:78
 msgid "Show statuses"
 msgstr ""
 
-#: src/gui/setup_players.cpp:78
+#: src/gui/setup_players.cpp:81
 msgid "Show ip addresses on screenshots"
 msgstr ""
 
-#: src/gui/setup_players.cpp:81
+#: src/gui/setup_players.cpp:84
 msgid "Allow self heal with mouse click"
 msgstr ""
 
@@ -2255,23 +2255,23 @@ msgstr "Huomiotta jätetty"
 msgid "Erased"
 msgstr "Pyyhitty"
 
-#: src/gui/setup_relations.cpp:239
+#: src/gui/setup_relations.cpp:238
 msgid "Allow trading"
 msgstr "Salli kaupakäynti"
 
-#: src/gui/setup_relations.cpp:241
+#: src/gui/setup_relations.cpp:240
 msgid "Allow whispers"
 msgstr "Salli kuiskaukset"
 
-#: src/gui/setup_relations.cpp:244
+#: src/gui/setup_relations.cpp:243
 msgid "Old"
 msgstr "Vanha"
 
-#: src/gui/setup_relations.cpp:246
+#: src/gui/setup_relations.cpp:245
 msgid "Relations"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:271
+#: src/gui/setup_relations.cpp:270
 msgid "When ignoring:"
 msgstr "Kun jätät huomiotta:"
 
@@ -3239,30 +3239,34 @@ msgid "Command:"
 msgstr "Komento:"
 
 #: src/gui/textcommandeditor.cpp:200
+msgid "Comment:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:203
 msgid "Mana:"
 msgstr "Mana:"
 
-#: src/gui/textcommandeditor.cpp:206
+#: src/gui/textcommandeditor.cpp:209
 msgid "Target Type:"
 msgstr "Kohdetyyppi:"
 
-#: src/gui/textcommandeditor.cpp:212
+#: src/gui/textcommandeditor.cpp:215
 msgid "Icon:"
 msgstr "Kuvake:"
 
-#: src/gui/textcommandeditor.cpp:218
+#: src/gui/textcommandeditor.cpp:221
 msgid "Magic level:"
 msgstr "Magiataso:"
 
-#: src/gui/textcommandeditor.cpp:224
+#: src/gui/textcommandeditor.cpp:227
 msgid "Magic School:"
 msgstr "Magian koulukunta:"
 
-#: src/gui/textcommandeditor.cpp:230
+#: src/gui/textcommandeditor.cpp:233
 msgid "School level:"
 msgstr "Koulukunnan taso:"
 
-#: src/gui/textcommandeditor.cpp:235
+#: src/gui/textcommandeditor.cpp:238
 msgid "Save"
 msgstr "Tallenna"
 
@@ -3490,23 +3494,23 @@ msgstr "Kotipaikan raja"
 msgid "Road Point"
 msgstr "Väyläpiste"
 
-#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:474
+#: src/gui/whoisonline.cpp:85 src/gui/whoisonline.cpp:478
 msgid "Who Is Online - Updating"
 msgstr "Kuka on linjoila - päivitän"
 
-#: src/gui/whoisonline.cpp:104
+#: src/gui/whoisonline.cpp:108
 msgid "Update"
 msgstr "Päivitä"
 
-#: src/gui/whoisonline.cpp:297
+#: src/gui/whoisonline.cpp:301
 msgid "Who Is Online - "
 msgstr "Kuka on linjoilla - "
 
-#: src/gui/whoisonline.cpp:488
+#: src/gui/whoisonline.cpp:492
 msgid "Who Is Online - error"
 msgstr "Kuka on linjoilla - virhe"
 
-#: src/gui/whoisonline.cpp:519
+#: src/gui/whoisonline.cpp:523
 msgid "Who Is Online - Update"
 msgstr "Kuka on linjoilla - päivitä"
 
@@ -3791,49 +3795,49 @@ msgid "Cart"
 msgstr "Kärry"
 
 #: src/keyboardconfig.cpp:43
+msgid "Basic Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:44
 msgid "Move Up"
 msgstr "Ylöspäin"
 
-#: src/keyboardconfig.cpp:44
+#: src/keyboardconfig.cpp:45
 msgid "Move Down"
 msgstr "Alaspäin"
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:46
 msgid "Move Left"
 msgstr "Vasemmalle"
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:47
 msgid "Move Right"
 msgstr "Oikealle"
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:50
 msgid "Target & Attack"
 msgstr "Kohdista ja hyökkää"
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:52
 msgid "Move to Target"
 msgstr "Mene kohteen luo"
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:54
 msgid "Change Move to Target type"
 msgstr "Muuta kohteen luo liikkumisen tyyppiä"
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:56
 msgid "Move to Home location"
 msgstr "Siirry kotipaikkaan"
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:58
 msgid "Set home location"
 msgstr "Aseta kotipaikka"
 
-#: src/keyboardconfig.cpp:59
+#: src/keyboardconfig.cpp:60
 msgid "Move to navigation point"
 msgstr "Siirry reittipisteeseen"
 
-#: src/keyboardconfig.cpp:61
-msgid "Smilie"
-msgstr "Hymiö"
-
 #: src/keyboardconfig.cpp:63
 msgid "Stop Attack"
 msgstr "Keskeytä hyökkäys"
@@ -3879,300 +3883,328 @@ msgid "Change Map View Mode"
 msgstr "Vaihda karttanäkymää"
 
 #: src/keyboardconfig.cpp:80
+msgid "Select OK"
+msgstr "Valitse OK"
+
+#: src/keyboardconfig.cpp:83
+msgid "Shortcuts Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:84
 msgid "Item Shortcuts Key"
 msgstr "Tavaroiden pikavalintanäppäin"
 
-#: src/keyboardconfig.cpp:82 src/keyboardconfig.cpp:84
 #: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:88
 #: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:92
 #: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:96
 #: src/keyboardconfig.cpp:98 src/keyboardconfig.cpp:100
 #: src/keyboardconfig.cpp:102 src/keyboardconfig.cpp:104
 #: src/keyboardconfig.cpp:106 src/keyboardconfig.cpp:108
-#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:113
-#: src/keyboardconfig.cpp:115 src/keyboardconfig.cpp:117
+#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:112
+#: src/keyboardconfig.cpp:114 src/keyboardconfig.cpp:117
 #: src/keyboardconfig.cpp:119 src/keyboardconfig.cpp:121
-#: src/keyboardconfig.cpp:360
+#: src/keyboardconfig.cpp:123 src/keyboardconfig.cpp:125
+#: src/keyboardconfig.cpp:367
 #, c-format
 msgid "Item Shortcut %d"
 msgstr "Tavarapikavalinta %d"
 
-#: src/keyboardconfig.cpp:122
+#: src/keyboardconfig.cpp:126
+msgid "Windows Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:127
 msgid "Help Window"
 msgstr "Ohjeikkuna"
 
-#: src/keyboardconfig.cpp:124
+#: src/keyboardconfig.cpp:129
 msgid "Status Window"
 msgstr "Tilaikkuna"
 
-#: src/keyboardconfig.cpp:126
+#: src/keyboardconfig.cpp:131
 msgid "Inventory Window"
 msgstr "Tavaraikkuna"
 
-#: src/keyboardconfig.cpp:128
+#: src/keyboardconfig.cpp:133
 msgid "Equipment Window"
 msgstr "Varusteikkuna"
 
-#: src/keyboardconfig.cpp:130
+#: src/keyboardconfig.cpp:135
 msgid "Skill Window"
 msgstr "Taitoikkuna"
 
-#: src/keyboardconfig.cpp:132
+#: src/keyboardconfig.cpp:137
 msgid "Minimap Window"
 msgstr "Karttaikkuna"
 
-#: src/keyboardconfig.cpp:134
+#: src/keyboardconfig.cpp:139
 msgid "Chat Window"
 msgstr "Keskusteluikkuna"
 
-#: src/keyboardconfig.cpp:136
+#: src/keyboardconfig.cpp:141
 msgid "Item Shortcut Window"
 msgstr "Tavaroiden pikavalintaikkuna"
 
-#: src/keyboardconfig.cpp:138
+#: src/keyboardconfig.cpp:143
 msgid "Setup Window"
 msgstr "Asetusikkuna"
 
-#: src/keyboardconfig.cpp:140
+#: src/keyboardconfig.cpp:145
 msgid "Debug Window"
 msgstr "Debug-ikkuna"
 
-#: src/keyboardconfig.cpp:142
+#: src/keyboardconfig.cpp:147
 msgid "Social Window"
 msgstr "Suhdeikkuna"
 
-#: src/keyboardconfig.cpp:144
+#: src/keyboardconfig.cpp:149
 msgid "Emote Shortcut Window"
 msgstr "Eleiden pikavalintaikkuna"
 
-#: src/keyboardconfig.cpp:146
+#: src/keyboardconfig.cpp:151
 msgid "Outfits Window"
 msgstr "Asukokonaisuusikkuna"
 
-#: src/keyboardconfig.cpp:148
+#: src/keyboardconfig.cpp:153
 msgid "Shop Window"
 msgstr "Kauppaikkuna"
 
-#: src/keyboardconfig.cpp:150
+#: src/keyboardconfig.cpp:155
 msgid "Quick drop Window"
 msgstr "Pikapudotusikkuna"
 
-#: src/keyboardconfig.cpp:152
+#: src/keyboardconfig.cpp:157
 msgid "Kill Stats Window"
 msgstr "Tappotilastoikkuna"
 
-#: src/keyboardconfig.cpp:154
+#: src/keyboardconfig.cpp:159
 msgid "Commands Window"
 msgstr "Komentoikkuna"
 
-#: src/keyboardconfig.cpp:156
+#: src/keyboardconfig.cpp:161
 msgid "Bot Checker Window"
 msgstr "Bottitutkaikkuna"
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboardconfig.cpp:164
 msgid "Who Is Online Window"
 msgstr "Kuka on linjoilla -ikkuna"
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboardconfig.cpp:166
 msgid "Did you know Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:164
+#: src/keyboardconfig.cpp:169
 msgid "Previous Social Tab"
 msgstr "Edellinen sos. välilehti"
 
-#: src/keyboardconfig.cpp:166
+#: src/keyboardconfig.cpp:171
 msgid "Next Social Tab"
 msgstr "Seuraava sos. välilehti"
 
-#: src/keyboardconfig.cpp:168 src/keyboardconfig.cpp:170
-#: src/keyboardconfig.cpp:172 src/keyboardconfig.cpp:174
-#: src/keyboardconfig.cpp:176 src/keyboardconfig.cpp:178
-#: src/keyboardconfig.cpp:180 src/keyboardconfig.cpp:182
-#: src/keyboardconfig.cpp:184 src/keyboardconfig.cpp:186
-#: src/keyboardconfig.cpp:188 src/keyboardconfig.cpp:190
-#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
-#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
-#: src/keyboardconfig.cpp:201 src/keyboardconfig.cpp:203
-#: src/keyboardconfig.cpp:205 src/keyboardconfig.cpp:207
-#: src/keyboardconfig.cpp:209 src/keyboardconfig.cpp:211
-#: src/keyboardconfig.cpp:213 src/keyboardconfig.cpp:215
-#: src/keyboardconfig.cpp:217 src/keyboardconfig.cpp:220
-#: src/keyboardconfig.cpp:223 src/keyboardconfig.cpp:226
-#: src/keyboardconfig.cpp:228 src/keyboardconfig.cpp:230
-#: src/keyboardconfig.cpp:232 src/keyboardconfig.cpp:234
-#: src/keyboardconfig.cpp:236 src/keyboardconfig.cpp:238
-#: src/keyboardconfig.cpp:240 src/keyboardconfig.cpp:242
-#: src/keyboardconfig.cpp:244 src/keyboardconfig.cpp:247
-#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
-#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
-#: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:259
-#: src/keyboardconfig.cpp:355
+#: src/keyboardconfig.cpp:173
+msgid "Emotes Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:174
+msgid "Smilie"
+msgstr "Hymiö"
+
+#: src/keyboardconfig.cpp:175 src/keyboardconfig.cpp:177
+#: src/keyboardconfig.cpp:179 src/keyboardconfig.cpp:181
+#: src/keyboardconfig.cpp:183 src/keyboardconfig.cpp:185
+#: src/keyboardconfig.cpp:187 src/keyboardconfig.cpp:189
+#: src/keyboardconfig.cpp:191 src/keyboardconfig.cpp:193
+#: src/keyboardconfig.cpp:195 src/keyboardconfig.cpp:197
+#: src/keyboardconfig.cpp:200 src/keyboardconfig.cpp:202
+#: src/keyboardconfig.cpp:204 src/keyboardconfig.cpp:206
+#: src/keyboardconfig.cpp:208 src/keyboardconfig.cpp:210
+#: src/keyboardconfig.cpp:212 src/keyboardconfig.cpp:214
+#: src/keyboardconfig.cpp:216 src/keyboardconfig.cpp:218
+#: src/keyboardconfig.cpp:220 src/keyboardconfig.cpp:222
+#: src/keyboardconfig.cpp:224 src/keyboardconfig.cpp:227
+#: src/keyboardconfig.cpp:230 src/keyboardconfig.cpp:233
+#: src/keyboardconfig.cpp:235 src/keyboardconfig.cpp:237
+#: src/keyboardconfig.cpp:239 src/keyboardconfig.cpp:241
+#: src/keyboardconfig.cpp:243 src/keyboardconfig.cpp:245
+#: src/keyboardconfig.cpp:247 src/keyboardconfig.cpp:249
+#: src/keyboardconfig.cpp:251 src/keyboardconfig.cpp:254
+#: src/keyboardconfig.cpp:256 src/keyboardconfig.cpp:258
+#: src/keyboardconfig.cpp:260 src/keyboardconfig.cpp:262
+#: src/keyboardconfig.cpp:264 src/keyboardconfig.cpp:266
+#: src/keyboardconfig.cpp:362
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "Eleen pikavalinta %d"
 
-#: src/keyboardconfig.cpp:261
+#: src/keyboardconfig.cpp:268
+msgid "Outfits Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:269
 msgid "Wear Outfit"
 msgstr "Pue asu"
 
-#: src/keyboardconfig.cpp:263
+#: src/keyboardconfig.cpp:271
 msgid "Copy Outfit"
 msgstr "Kopioi asu"
 
-#: src/keyboardconfig.cpp:265
+#: src/keyboardconfig.cpp:273
 msgid "Copy equipped to Outfit"
 msgstr "Kopioi varusteet asuksi"
 
-#: src/keyboardconfig.cpp:267
+#: src/keyboardconfig.cpp:275
+msgid "Chat Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:276
 msgid "Toggle Chat"
 msgstr "Ota keskustelu käyttöön/pois käytöstä"
 
-#: src/keyboardconfig.cpp:269
+#: src/keyboardconfig.cpp:278
 msgid "Scroll Chat Up"
 msgstr "Vieritä keskustelua ylös"
 
-#: src/keyboardconfig.cpp:271
+#: src/keyboardconfig.cpp:280
 msgid "Scroll Chat Down"
 msgstr "Vieritä keskustelua alas"
 
-#: src/keyboardconfig.cpp:273
+#: src/keyboardconfig.cpp:282
 msgid "Previous Chat Tab"
 msgstr "Edellinen keskusteluvälilehti"
 
-#: src/keyboardconfig.cpp:275
+#: src/keyboardconfig.cpp:284
 msgid "Next Chat Tab"
 msgstr "Seuraava keskusteluvälilehti"
 
-#: src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:287
 msgid "Close current Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:280
+#: src/keyboardconfig.cpp:289
 msgid "Previous chat line"
 msgstr "Edellinen keskustelulinja"
 
-#: src/keyboardconfig.cpp:282
+#: src/keyboardconfig.cpp:291
 msgid "Next chat line"
 msgstr "Seuraava keskustelulinja"
 
-#: src/keyboardconfig.cpp:284
+#: src/keyboardconfig.cpp:293
 msgid "Chat Auto Complete"
 msgstr "Sarkaintäydennys keskustelussa"
 
-#: src/keyboardconfig.cpp:286
+#: src/keyboardconfig.cpp:295
 msgid "Deactivate Chat Input"
 msgstr "Poistu keskustelusyötöstä"
 
-#: src/keyboardconfig.cpp:288
-msgid "Select OK"
-msgstr "Valitse OK"
+#: src/keyboardconfig.cpp:297
+msgid "Other Keys"
+msgstr ""
 
-#: src/keyboardconfig.cpp:291
+#: src/keyboardconfig.cpp:298
 msgid "Ignore input 1"
 msgstr "Jätä huomiotta syöte 1"
 
-#: src/keyboardconfig.cpp:293
+#: src/keyboardconfig.cpp:300
 msgid "Ignore input 2"
 msgstr "Jätä huomiotta syöte 2"
 
-#: src/keyboardconfig.cpp:295
+#: src/keyboardconfig.cpp:302
 msgid "Direct Up"
 msgstr "Vie ylös"
 
-#: src/keyboardconfig.cpp:296
+#: src/keyboardconfig.cpp:303
 msgid "Direct Down"
 msgstr "Vie alas"
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboardconfig.cpp:305
 msgid "Direct Left"
 msgstr "Vie vasemmalle"
 
-#: src/keyboardconfig.cpp:299
+#: src/keyboardconfig.cpp:306
 msgid "Direct Right"
 msgstr "Vie oikealle"
 
-#: src/keyboardconfig.cpp:301
+#: src/keyboardconfig.cpp:308
 msgid "Crazy moves"
 msgstr "Villiliikkeet"
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboardconfig.cpp:310
 msgid "Change Crazy Move mode"
 msgstr "Muuta villiliiketilaa"
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboardconfig.cpp:312
 msgid "Quick Drop N Items from 0 slot"
 msgstr "Pudota nopeasti N esinettä paikasta 0"
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboardconfig.cpp:314
 msgid "Quick Drop N Items"
 msgstr "Pudota nopeasti N esinettä"
 
-#: src/keyboardconfig.cpp:309
+#: src/keyboardconfig.cpp:316
 msgid "Switch Quick Drop Counter"
 msgstr "Vaihda nopean pudotuksen laskuria"
 
-#: src/keyboardconfig.cpp:311
+#: src/keyboardconfig.cpp:318
 msgid "Quick heal target or self"
 msgstr "Pikaparanna kohde tai itse"
 
-#: src/keyboardconfig.cpp:313
+#: src/keyboardconfig.cpp:320
 msgid "Use #itenplz spell"
 msgstr "Käytä #itenplz-loitsua"
 
-#: src/keyboardconfig.cpp:315
+#: src/keyboardconfig.cpp:322
 msgid "Use magic attack"
 msgstr "Käytä magiahyökkäystä"
 
-#: src/keyboardconfig.cpp:317
+#: src/keyboardconfig.cpp:324
 msgid "Switch magic attack"
 msgstr "Vaihda magiahyökkäystä"
 
-#: src/keyboardconfig.cpp:319
+#: src/keyboardconfig.cpp:326
 msgid "Change move type"
 msgstr "Vaihda liikkumistyyppiä"
 
-#: src/keyboardconfig.cpp:321
+#: src/keyboardconfig.cpp:328
 msgid "Change Attack Weapon Type"
 msgstr "Vaihda hyökkäysaseen tyyppiä"
 
-#: src/keyboardconfig.cpp:323
+#: src/keyboardconfig.cpp:330
 msgid "Change Attack Type"
 msgstr "Vaihda hyökkäystyyppiä"
 
-#: src/keyboardconfig.cpp:325
+#: src/keyboardconfig.cpp:332
 msgid "Change Follow mode"
 msgstr "Vaihda seuraustyyliä"
 
-#: src/keyboardconfig.cpp:327
+#: src/keyboardconfig.cpp:334
 msgid "Change Imitation mode"
 msgstr "Vaihda matkintatyyliä"
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboardconfig.cpp:337
 msgid "Disable / Enable Game modifier keys"
 msgstr "Ota käyttöön / poista pelimuokkaimet"
 
-#: src/keyboardconfig.cpp:331
+#: src/keyboardconfig.cpp:338
 msgid "On / Off audio"
 msgstr "Äänet päälle / pois"
 
-#: src/keyboardconfig.cpp:333
+#: src/keyboardconfig.cpp:340
 msgid "Enable / Disable away mode"
 msgstr "Aseta / peru poissaolo"
 
-#: src/keyboardconfig.cpp:335
+#: src/keyboardconfig.cpp:342
 msgid "Emulate right click from keyboard"
 msgstr "Kontekstivalikkoon \"klikkaus\" näppäimistöltä"
 
-#: src/keyboardconfig.cpp:337
+#: src/keyboardconfig.cpp:344
 msgid "Toggle camera mode"
 msgstr "Vaihda kameran toimintaa"
 
-#: src/keyboardconfig.cpp:339
+#: src/keyboardconfig.cpp:346
 msgid "Modifier key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:411
+#: src/keyboardconfig.cpp:425
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -4181,68 +4213,68 @@ msgstr ""
 "Päällekkäiset näppäinoikotiet \"%s\" ja \"%s\" voivat aiheuttaa outouksia; "
 "ole hyvä ja poista päällekkäisyydet. "
 
-#: src/localplayer.cpp:377
+#: src/localplayer.cpp:380
 msgid "You were killed by "
 msgstr "Sinut otti hengiltä "
 
-#: src/localplayer.cpp:1416
+#: src/localplayer.cpp:1422
 msgid "Tried to pick up nonexistent item."
 msgstr "Yritit nostaa olemattoman tavaran."
 
-#: src/localplayer.cpp:1418
+#: src/localplayer.cpp:1424
 msgid "Item is too heavy."
 msgstr "Tavara on liian painava."
 
-#: src/localplayer.cpp:1420
+#: src/localplayer.cpp:1426
 msgid "Item is too far away."
 msgstr "Tavara on liian kaukana."
 
-#: src/localplayer.cpp:1422
+#: src/localplayer.cpp:1428
 msgid "Inventory is full."
 msgstr "Sinulla on liikaa tavaraa ennestään."
 
-#: src/localplayer.cpp:1424
+#: src/localplayer.cpp:1430
 msgid "Stack is too big."
 msgstr "Kasa on liian suuri."
 
-#: src/localplayer.cpp:1427
+#: src/localplayer.cpp:1433
 msgid "Item belongs to someone else."
 msgstr "Tavara kuuluu jollekulle muulle."
 
-#: src/localplayer.cpp:1430
+#: src/localplayer.cpp:1436
 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:1454
+#: src/localplayer.cpp:1460
 #, 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:3168
+#: src/localplayer.cpp:3174
 msgid "Away"
 msgstr "Poissa"
 
-#: src/localplayer.cpp:3468
+#: src/localplayer.cpp:3494
 msgid "Follow: "
 msgstr "Seuraa: "
 
-#: src/localplayer.cpp:3470 src/localplayer.cpp:3485
+#: src/localplayer.cpp:3496 src/localplayer.cpp:3511
 msgid "Follow canceled"
 msgstr "Seuraaminen keskeytetty"
 
-#: src/localplayer.cpp:3477
+#: src/localplayer.cpp:3503
 msgid "Imitation: "
 msgstr "Matki: "
 
-#: src/localplayer.cpp:3479 src/localplayer.cpp:3487
+#: src/localplayer.cpp:3505 src/localplayer.cpp:3513
 msgid "Imitation canceled"
 msgstr "Matkiminen keskeytetty"
 
-#: src/localplayer.cpp:3832
+#: src/localplayer.cpp:3858
 msgid "You see "
 msgstr "Näet "
 
@@ -4629,15 +4661,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:286
+#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:284
 msgid "Item sharing enabled."
 msgstr "Saaliinjako käytössä."
 
-#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:296
+#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:294
 msgid "Item sharing disabled."
 msgstr "Saaliinjako poistettu käytöstä."
 
-#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:306
+#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:304
 msgid "Item sharing not possible."
 msgstr "Saaliinjako ei ole mahdollista."
 
@@ -4645,15 +4677,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:248
+#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:246
 msgid "Experience sharing enabled."
 msgstr "Kokemuksen jako käytössä."
 
-#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:258
+#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:256
 msgid "Experience sharing disabled."
 msgstr "Kokemuksen jako pois käytöstä."
 
-#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:268
+#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:266
 msgid "Experience sharing not possible."
 msgstr "Kokemuksen jako ei ole mahdollista."
 
@@ -4735,54 +4767,54 @@ msgstr "Käyttäjätunnus on jo käytössä."
 msgid "Username permanently erased."
 msgstr "Käyttäjänimi pysyvästi poistettu."
 
-#: src/net/ea/partyhandler.cpp:82
+#: src/net/ea/partyhandler.cpp:80
 msgid "Could not create party."
 msgstr "Ryhmän luonti epäonnistui."
 
-#: src/net/ea/partyhandler.cpp:84
+#: src/net/ea/partyhandler.cpp:82
 msgid "Party successfully created."
 msgstr "Ryhmä luotu."
 
-#: src/net/ea/partyhandler.cpp:140
+#: src/net/ea/partyhandler.cpp:138
 #, c-format
 msgid "%s has joined your party."
 msgstr "%s on liittynyt ryhmääsi."
 
-#: src/net/ea/partyhandler.cpp:176
+#: src/net/ea/partyhandler.cpp:174
 #, c-format
 msgid "%s is already a member of a party."
 msgstr "%s kuuluu jo johonkin ryhmään."
 
-#: src/net/ea/partyhandler.cpp:181
+#: src/net/ea/partyhandler.cpp:179
 #, c-format
 msgid "%s refused your invitation."
 msgstr "%s ei ottanut kutsuasi vastaan."
 
-#: src/net/ea/partyhandler.cpp:186
+#: src/net/ea/partyhandler.cpp:184
 #, c-format
 msgid "%s is now a member of your party."
 msgstr "%s on nyt ryhmäsi jäsen."
 
-#: src/net/ea/partyhandler.cpp:191
+#: src/net/ea/partyhandler.cpp:189
 #, c-format
 msgid "%s can't join your party because party is full."
 msgstr "%s ei voi liittyä ryhmääsi, koska se on täynnä."
 
-#: src/net/ea/partyhandler.cpp:196
+#: src/net/ea/partyhandler.cpp:194
 #, c-format
 msgid "QQQ Unknown invite response for %s."
 msgstr "QQQ Tuntematon kutsuvastaus kohteella %s."
 
-#: src/net/ea/partyhandler.cpp:356
+#: src/net/ea/partyhandler.cpp:354
 msgid "You have left the party."
 msgstr "Erosit ryhmästä."
 
-#: src/net/ea/partyhandler.cpp:369
+#: src/net/ea/partyhandler.cpp:367
 #, c-format
 msgid "%s has left your party."
 msgstr "%s on eronnut ryhmästä."
 
-#: src/net/ea/partyhandler.cpp:448
+#: src/net/ea/partyhandler.cpp:446
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr "Tuntematon jäsen yritti sanoa: %s"
@@ -4940,83 +4972,83 @@ msgstr "Taidon korottaminen epäonnistui!"
 msgid "Equip arrows first."
 msgstr "Varusta ensin nuolia."
 
-#: src/net/ea/specialhandler.cpp:149
+#: src/net/ea/specialhandler.cpp:146
 msgid "Trade failed!"
 msgstr "Kauppa epäonnistui!"
 
-#: src/net/ea/specialhandler.cpp:152
+#: src/net/ea/specialhandler.cpp:149
 msgid "Emote failed!"
 msgstr "Elehtiminen epäonnistui!"
 
-#: src/net/ea/specialhandler.cpp:155
+#: src/net/ea/specialhandler.cpp:152
 msgid "Sit failed!"
 msgstr "Istuminen epäonnistui!"
 
-#: src/net/ea/specialhandler.cpp:158
+#: src/net/ea/specialhandler.cpp:155
 msgid "Chat creating failed!"
 msgstr "Keskustelun luonti epäonnistui!"
 
-#: src/net/ea/specialhandler.cpp:161
+#: src/net/ea/specialhandler.cpp:158
 msgid "Could not join party!"
 msgstr "Ryhmään liittyminen epäonnistui!"
 
-#: src/net/ea/specialhandler.cpp:164
+#: src/net/ea/specialhandler.cpp:161
 msgid "Cannot shout!"
 msgstr "Huutaminen epäonnistui!"
 
-#: src/net/ea/specialhandler.cpp:177
+#: src/net/ea/specialhandler.cpp:174
 msgid "You have not yet reached a high enough lvl!"
 msgstr "Et ole vielä riittävän korkealla tasolla!"
 
-#: src/net/ea/specialhandler.cpp:181
+#: src/net/ea/specialhandler.cpp:178
 msgid "Insufficient HP!"
 msgstr "Voimapisteesi eivät riitä!"
 
-#: src/net/ea/specialhandler.cpp:184
+#: src/net/ea/specialhandler.cpp:181
 msgid "Insufficient SP!"
 msgstr "Manapisteesi eivät riitä!"
 
-#: src/net/ea/specialhandler.cpp:187
+#: src/net/ea/specialhandler.cpp:184
 msgid "You have no memos!"
 msgstr "Sinulla ei ole muistioita (memo)."
 
-#: src/net/ea/specialhandler.cpp:190
+#: src/net/ea/specialhandler.cpp:187
 msgid "You cannot do that right now!"
 msgstr "Et voi tehdä tätä juuri nyt."
 
-#: src/net/ea/specialhandler.cpp:193
+#: src/net/ea/specialhandler.cpp:190
 msgid "Seems you need more money... ;-)"
 msgstr "Näyttää siltä että tarvitset lisää rahaa."
 
-#: src/net/ea/specialhandler.cpp:196
+#: src/net/ea/specialhandler.cpp:193
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Et voi käyttää tätä taitoa tuollaisen aseen kanssa."
 
-#: src/net/ea/specialhandler.cpp:200
+#: src/net/ea/specialhandler.cpp:197
 msgid "You need another red gem!"
 msgstr "Tarvitset toisen punaisen helmen."
 
-#: src/net/ea/specialhandler.cpp:203
+#: src/net/ea/specialhandler.cpp:200
 msgid "You need another blue gem!"
 msgstr "Tarvitset toisen sinisen helmen."
 
-#: src/net/ea/specialhandler.cpp:206
+#: src/net/ea/specialhandler.cpp:203
 msgid "You're carrying to much to do this!"
 msgstr "Kannat liian paljon tehdäksesi tällaista!"
 
-#: src/net/ea/specialhandler.cpp:209
+#: src/net/ea/specialhandler.cpp:206
 msgid "Huh? What's that?"
 msgstr "Siis mikä?"
 
-#: src/net/ea/specialhandler.cpp:220
+#: src/net/ea/specialhandler.cpp:217
 msgid "Warp failed..."
 msgstr "Siirtymä (warp) epäonnistui..."
 
-#: src/net/ea/specialhandler.cpp:223
+#: src/net/ea/specialhandler.cpp:220
 msgid "Could not steal anything..."
 msgstr "Varastaminen ei onnistunut..."
 
-#: src/net/ea/specialhandler.cpp:226
+#: src/net/ea/specialhandler.cpp:223
 msgid "Poison had no effect..."
 msgstr "Myrkyllä ei ollut vaikutusta..."
 
diff --git a/po/fr.po b/po/fr.po
index 29fc8a192..33a08e1ed 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-09-17 16:12+0300\n"
-"PO-Revision-Date: 2011-09-16 20:11+0000\n"
+"POT-Creation-Date: 2011-09-27 22:18+0300\n"
+"PO-Revision-Date: 2011-09-27 19:20+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: French (http://www.transifex.net/projects/p/manaplus/team/"
 "fr/)\n"
@@ -22,25 +22,25 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
-#: src/actorspritemanager.cpp:1088
+#: src/actorspritemanager.cpp:1133
 msgid "Visible on map"
 msgstr "Visible sur la carte"
 
-#: src/being.cpp:548
+#: src/being.cpp:547
 msgid "dodge"
 msgstr "esquivé"
 
-#: src/being.cpp:548
+#: src/being.cpp:547
 msgid "miss"
 msgstr "raté"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1527
+#: src/being.cpp:1526
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1532
+#: src/being.cpp:1531
 msgid "I"
 msgstr "I"
 
@@ -48,43 +48,43 @@ msgstr "I"
 msgid "Setup"
 msgstr "Configuration"
 
-#: src/client.cpp:841 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:842 src/gui/setup_perfomance.cpp:48
 msgid "Perfomance"
-msgstr ""
+msgstr "Performance"
 
-#: src/client.cpp:846 src/gui/setup_video.cpp:315
+#: src/client.cpp:847 src/gui/setup_video.cpp:315
 msgid "Video"
 msgstr "Vidéo"
 
-#: src/client.cpp:851
+#: src/client.cpp:852
 msgid "Themes"
-msgstr ""
+msgstr "Thèmes"
 
-#: src/client.cpp:932
+#: src/client.cpp:934
 msgid "Connecting to server"
 msgstr "Connexion au serveur"
 
-#: src/client.cpp:963
+#: src/client.cpp:965
 msgid "Logging in"
 msgstr "Connexion"
 
-#: src/client.cpp:996
+#: src/client.cpp:998
 msgid "Entering game world"
 msgstr "Vous entrez dans un nouveau monde"
 
-#: src/client.cpp:1096
+#: src/client.cpp:1098
 msgid "Requesting characters"
 msgstr "Téléchargement des personnages"
 
-#: src/client.cpp:1127
+#: src/client.cpp:1129
 msgid "Connecting to the game server"
 msgstr "Connexion au serveur de jeu"
 
-#: src/client.cpp:1137
+#: src/client.cpp:1139
 msgid "Changing game servers"
 msgstr "Changement de serveur de jeu"
 
-#: src/client.cpp:1180 src/client.cpp:1187 src/client.cpp:1321
+#: src/client.cpp:1182 src/client.cpp:1189 src/client.cpp:1323
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:221 src/gui/charselectdialog.cpp:253
 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
@@ -94,50 +94,50 @@ msgstr "Changement de serveur de jeu"
 msgid "Error"
 msgstr "Erreur"
 
-#: src/client.cpp:1196
+#: src/client.cpp:1198
 msgid "Requesting registration details"
 msgstr "Demande des paramètres d'inscription"
 
-#: src/client.cpp:1222
+#: src/client.cpp:1224
 msgid "Password Change"
 msgstr "Changement de mot de passe"
 
-#: src/client.cpp:1223
+#: src/client.cpp:1225
 msgid "Password changed successfully!"
 msgstr "Le mot de passe a été changé avec succès !"
 
-#: src/client.cpp:1242
+#: src/client.cpp:1244
 msgid "Email Change"
 msgstr "Changer d'e-mail"
 
-#: src/client.cpp:1243
+#: src/client.cpp:1245
 msgid "Email changed successfully!"
 msgstr "L'adresse e-mail a été changée avec succès !"
 
-#: src/client.cpp:1263
+#: src/client.cpp:1265
 msgid "Unregister Successful"
 msgstr "Désinscription réussie"
 
-#: src/client.cpp:1264
+#: src/client.cpp:1266
 msgid "Farewell, come back any time..."
 msgstr "A bientôt, revenez quand vous voudrez..."
 
-#: src/client.cpp:1463 src/client.cpp:1493 src/client.cpp:1508
-#: src/client.cpp:1933 src/client.cpp:1940
+#: src/client.cpp:1465 src/client.cpp:1495 src/client.cpp:1510
+#: src/client.cpp:1935 src/client.cpp:1942
 #, 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:1639
+#: src/client.cpp:1641
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Site de mise à jour invalide : %s"
 
-#: src/client.cpp:1673 src/client.cpp:1679
+#: src/client.cpp:1675 src/client.cpp:1681
 msgid "Error creating updates directory!"
 msgstr "Impossible de créer le dossier de mise à jour !"
 
-#: src/client.cpp:1700
+#: src/client.cpp:1702
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -349,11 +349,11 @@ msgstr "Ignorer les requêtes d'échanges entrantes"
 msgid "Accepting incoming trade requests"
 msgstr "Accepter les requêtes d'échanges entrantes"
 
-#: src/game.cpp:1729
+#: src/game.cpp:1727
 msgid "Could Not Load Map"
 msgstr "La carte n'a pu être chargée"
 
-#: src/game.cpp:1730
+#: src/game.cpp:1728
 #, c-format
 msgid "Error while loading %s"
 msgstr "Erreur durant le chargement %s"
@@ -388,7 +388,7 @@ msgstr "Nom"
 
 #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:133
 #: src/gui/popupmenu.cpp:283 src/gui/popupmenu.cpp:596
-#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:265
+#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:265
 msgid "Attack"
 msgstr "Attaquer"
 
@@ -442,7 +442,7 @@ msgstr "-"
 #: src/gui/buydialog.cpp:99 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:294
-#: src/keyboardconfig.cpp:290
+#: src/keyboardconfig.cpp:82
 msgid "Quit"
 msgstr "Quitter"
 
@@ -477,7 +477,7 @@ msgstr "Vendre"
 #: src/gui/popupmenu.cpp:1858 src/gui/popupmenu.cpp:1897
 #: src/gui/popupmenu.cpp:1949 src/gui/popupmenu.cpp:1969
 #: src/gui/quitdialog.cpp:55 src/gui/register.cpp:82 src/gui/setup.cpp:72
-#: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:238
+#: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:241
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
 #: src/gui/updaterwindow.cpp:161
 msgid "Cancel"
@@ -646,8 +646,8 @@ msgid "Enter password:"
 msgstr "Entrer le mot de passe :"
 
 #: src/gui/charselectdialog.cpp:410 src/gui/serverdialog.cpp:298
-#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:122
-#: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:241
+#: src/gui/setup_relations.cpp:242 src/gui/shopwindow.cpp:122
+#: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244
 msgid "Delete"
 msgstr "Supprimer"
 
@@ -899,7 +899,7 @@ msgid "Did You Know?"
 msgstr "Le saviez-vous ?"
 
 #: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
-#: src/gui/inventorywindow.cpp:206 src/gui/npcdialog.cpp:53
+#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:53
 #: src/gui/popupmenu.cpp:556 src/gui/shopwindow.cpp:113
 msgid "Close"
 msgstr "Fermer"
@@ -926,7 +926,7 @@ msgid "Equipment"
 msgstr "Équipement"
 
 #: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160
-#: src/gui/inventorywindow.cpp:539 src/gui/inventorywindow.cpp:548
+#: src/gui/inventorywindow.cpp:538 src/gui/inventorywindow.cpp:547
 #: src/gui/popupmenu.cpp:1656 src/gui/popupmenu.cpp:1748
 #: src/gui/popupmenu.cpp:1793
 msgid "Unequip"
@@ -938,55 +938,51 @@ msgstr "Aide"
 
 #: src/gui/inventorywindow.cpp:71
 msgid "by name"
-msgstr ""
+msgstr "par nom"
 
 #: src/gui/inventorywindow.cpp:72
 msgid "by id"
-msgstr ""
+msgstr "par numéro d'identification"
 
 #: src/gui/inventorywindow.cpp:73
 msgid "by weight"
-msgstr ""
+msgstr "par poids"
 
 #: src/gui/inventorywindow.cpp:74
 msgid "by amount"
-msgstr ""
+msgstr "par nombre"
 
 #: src/gui/inventorywindow.cpp:75
 msgid "by type"
-msgstr ""
+msgstr "par type"
 
-#: src/gui/inventorywindow.cpp:111 src/gui/windowmenu.cpp:76
+#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:76
 #: src/inventory.cpp:249
 msgid "Inventory"
 msgstr "Inventaire"
 
-#: src/gui/inventorywindow.cpp:136
+#: src/gui/inventorywindow.cpp:137
 msgid "Slots:"
 msgstr "Emplacements :"
 
-#: src/gui/inventorywindow.cpp:148
+#: src/gui/inventorywindow.cpp:149
 msgid "Filter:"
 msgstr "Filtre :"
 
-#: src/gui/inventorywindow.cpp:149
-msgid "Sort:"
-msgstr "Tri :"
-
-#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:541
-#: src/gui/inventorywindow.cpp:550 src/gui/popupmenu.cpp:1658
+#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:540
+#: src/gui/inventorywindow.cpp:549 src/gui/popupmenu.cpp:1658
 #: src/gui/popupmenu.cpp:1750 src/gui/popupmenu.cpp:1795
 msgid "Equip"
 msgstr "Équiper"
 
-#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:542
-#: src/gui/inventorywindow.cpp:546 src/gui/popupmenu.cpp:1662
+#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:541
+#: src/gui/inventorywindow.cpp:545 src/gui/popupmenu.cpp:1662
 #: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1754
 #: src/gui/popupmenu.cpp:1799
 msgid "Use"
 msgstr "Utiliser"
 
-#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:646
+#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:645
 #: src/gui/popupmenu.cpp:1667 src/gui/popupmenu.cpp:1759
 #: src/gui/popupmenu.cpp:1804
 msgid "Drop..."
@@ -1006,17 +1002,17 @@ msgstr "Tenues"
 msgid "Weight:"
 msgstr "Poids :"
 
-#: src/gui/inventorywindow.cpp:204 src/gui/inventorywindow.cpp:637
+#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:636
 #: src/gui/popupmenu.cpp:1642 src/gui/popupmenu.cpp:1771
 #: src/gui/popupmenu.cpp:1816 src/gui/setup.cpp:73
 msgid "Store"
 msgstr "Entreposer"
 
-#: src/gui/inventorywindow.cpp:205 src/gui/popupmenu.cpp:1683
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1683
 msgid "Retrieve"
 msgstr "Récupérer"
 
-#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1672
+#: src/gui/inventorywindow.cpp:647 src/gui/popupmenu.cpp:1672
 #: src/gui/popupmenu.cpp:1764 src/gui/popupmenu.cpp:1809
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
@@ -1461,7 +1457,7 @@ msgstr "Enlever"
 
 #: src/gui/popupmenu.cpp:507
 msgid "Warp"
-msgstr ""
+msgstr "Télétransportation"
 
 #: src/gui/popupmenu.cpp:520
 msgid "Load old outfits"
@@ -1489,7 +1485,7 @@ msgstr "Activer la surbrillance"
 
 #: src/gui/popupmenu.cpp:566
 msgid "Don't remove name"
-msgstr ""
+msgstr "Ne pas enlever les noms"
 
 #: src/gui/popupmenu.cpp:568
 msgid "Remove name"
@@ -2105,7 +2101,7 @@ msgstr "Enregistrer les conversations des PNJ"
 
 #: src/gui/setup_other.cpp:157
 msgid "Bots support"
-msgstr ""
+msgstr "Supports de robot"
 
 #: src/gui/setup_other.cpp:159
 msgid "Enable auction bot support"
@@ -2145,7 +2141,7 @@ msgstr "Montrer le fond"
 
 #: src/gui/setup_perfomance.cpp:55
 msgid "Better perfomance (enable for better perfomance)"
-msgstr ""
+msgstr "Meilleure Performance (Autoriser une meilleure performance)"
 
 #: src/gui/setup_perfomance.cpp:58
 msgid "Auto adjust perfomance"
@@ -2158,18 +2154,20 @@ 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)"
 
 #: src/gui/setup_perfomance.cpp:67
 msgid "Enable map reduce (Software)"
-msgstr ""
+msgstr "Autoriser la réduction des cartes (Programme)"
 
 #: src/gui/setup_perfomance.cpp:70
 msgid "Better quality (disable for better perfomance)"
-msgstr ""
+msgstr "Meilleure qualité (quitter pour une meilleure performance)"
 
 #: src/gui/setup_perfomance.cpp:73
 msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr ""
+"Autoriser les correction des champs alpha ( Programme, cela peut être lent)"
 
 #: src/gui/setup_perfomance.cpp:77
 msgid "Show beings transparency"
@@ -2177,15 +2175,15 @@ msgstr "Montrer les êtres en transparence"
 
 #: src/gui/setup_perfomance.cpp:80
 msgid "Enable reorder sprites."
-msgstr ""
+msgstr "Autoriser la réorganisation des cartes éléments de dessin"
 
 #: src/gui/setup_perfomance.cpp:83
 msgid "Small memory (enable for lower memory usage)"
-msgstr ""
+msgstr "Petite mémoire (autoriser pour une utilisation faible de la mémoire)"
 
 #: src/gui/setup_perfomance.cpp:86
 msgid "Disable advanced beings caching (Software)"
-msgstr ""
+msgstr "Disable advanced beings caching (Software)"
 
 #: src/gui/setup_perfomance.cpp:89
 msgid "Disable beings caching (Software)"
@@ -2208,32 +2206,36 @@ msgid "Show own name"
 msgstr "Afficher son propre nom"
 
 #: src/gui/setup_players.cpp:63
+msgid "Enable extended mouse targeting"
+msgstr ""
+
+#: src/gui/setup_players.cpp:66
 msgid "Target dead players"
 msgstr "Cibler les joueurs morts"
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_players.cpp:69
 msgid "Visible names"
 msgstr "Afficher les noms"
 
-#: src/gui/setup_players.cpp:69
+#: src/gui/setup_players.cpp:72
 msgid "Secure trades"
 msgstr "Protection des échanges"
 
-#: src/gui/setup_players.cpp:72
+#: src/gui/setup_players.cpp:75
 msgid "Unsecure chars in names"
 msgstr "Caractère à risque dans le nom"
 
-#: src/gui/setup_players.cpp:75
+#: src/gui/setup_players.cpp:78
 msgid "Show statuses"
 msgstr "Montrer les Status"
 
-#: src/gui/setup_players.cpp:78
+#: src/gui/setup_players.cpp:81
 msgid "Show ip addresses on screenshots"
-msgstr ""
+msgstr "Montrer les adresses ip sur les photos d'écran"
 
-#: src/gui/setup_players.cpp:81
+#: src/gui/setup_players.cpp:84
 msgid "Allow self heal with mouse click"
-msgstr ""
+msgstr "Autoriser la récupération automatique sur clic droit de la sourie"
 
 #: src/gui/setup_relations.cpp:65
 msgid "Relation"
@@ -2259,23 +2261,23 @@ msgstr "Ignoré"
 msgid "Erased"
 msgstr "Effacé"
 
-#: src/gui/setup_relations.cpp:239
+#: src/gui/setup_relations.cpp:238
 msgid "Allow trading"
 msgstr "Autoriser les échanges"
 
-#: src/gui/setup_relations.cpp:241
+#: src/gui/setup_relations.cpp:240
 msgid "Allow whispers"
 msgstr "Autoriser les messages privés"
 
-#: src/gui/setup_relations.cpp:244
+#: src/gui/setup_relations.cpp:243
 msgid "Old"
 msgstr "Ancien"
 
-#: src/gui/setup_relations.cpp:246
+#: src/gui/setup_relations.cpp:245
 msgid "Relations"
-msgstr ""
+msgstr "Relations"
 
-#: src/gui/setup_relations.cpp:271
+#: src/gui/setup_relations.cpp:270
 msgid "When ignoring:"
 msgstr "Quand ignoré :"
 
@@ -2333,7 +2335,7 @@ msgstr "Police sécurisée"
 
 #: src/gui/setup_theme.cpp:151
 msgid "Japanese font"
-msgstr ""
+msgstr "police japonaise"
 
 #: src/gui/setup_theme.cpp:183
 msgid "Font size"
@@ -2538,7 +2540,7 @@ msgstr "Montrer les liens dans l'annonce"
 
 #: src/gui/shopwindow.cpp:148 src/gui/shopwindow.cpp:149
 msgid "Auction"
-msgstr ""
+msgstr "Enchère"
 
 #: src/gui/shopwindow.cpp:748 src/net/ea/tradehandler.cpp:106
 #: src/net/manaserv/tradehandler.cpp:127
@@ -3254,30 +3256,34 @@ msgid "Command:"
 msgstr "Commande :"
 
 #: src/gui/textcommandeditor.cpp:200
+msgid "Comment:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:203
 msgid "Mana:"
 msgstr "Mana : "
 
-#: src/gui/textcommandeditor.cpp:206
+#: src/gui/textcommandeditor.cpp:209
 msgid "Target Type:"
 msgstr "Type de cible"
 
-#: src/gui/textcommandeditor.cpp:212
+#: src/gui/textcommandeditor.cpp:215
 msgid "Icon:"
 msgstr "Icône : "
 
-#: src/gui/textcommandeditor.cpp:218
+#: src/gui/textcommandeditor.cpp:221
 msgid "Magic level:"
 msgstr "Niveau de Magie :"
 
-#: src/gui/textcommandeditor.cpp:224
+#: src/gui/textcommandeditor.cpp:227
 msgid "Magic School:"
 msgstr "École de magie : "
 
-#: src/gui/textcommandeditor.cpp:230
+#: src/gui/textcommandeditor.cpp:233
 msgid "School level:"
 msgstr "Niveau scolaire : "
 
-#: src/gui/textcommandeditor.cpp:235
+#: src/gui/textcommandeditor.cpp:238
 msgid "Save"
 msgstr "Sauvegarder"
 
@@ -3507,23 +3513,23 @@ msgstr "Limites de votre position"
 msgid "Road Point"
 msgstr "Étape"
 
-#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:474
+#: src/gui/whoisonline.cpp:85 src/gui/whoisonline.cpp:478
 msgid "Who Is Online - Updating"
 msgstr "Qui est en ligne - Mise à jour"
 
-#: src/gui/whoisonline.cpp:104
+#: src/gui/whoisonline.cpp:108
 msgid "Update"
 msgstr "Mise à jour"
 
-#: src/gui/whoisonline.cpp:297
+#: src/gui/whoisonline.cpp:301
 msgid "Who Is Online - "
 msgstr "Qui est en ligne - "
 
-#: src/gui/whoisonline.cpp:488
+#: src/gui/whoisonline.cpp:492
 msgid "Who Is Online - error"
 msgstr "Qui est en ligne - Erreur"
 
-#: src/gui/whoisonline.cpp:519
+#: src/gui/whoisonline.cpp:523
 msgid "Who Is Online - Update"
 msgstr "Qui est en ligne - Mise à jour"
 
@@ -3811,49 +3817,49 @@ msgid "Cart"
 msgstr "Sac"
 
 #: src/keyboardconfig.cpp:43
+msgid "Basic Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:44
 msgid "Move Up"
 msgstr "Monter"
 
-#: src/keyboardconfig.cpp:44
+#: src/keyboardconfig.cpp:45
 msgid "Move Down"
 msgstr "Descendre"
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:46
 msgid "Move Left"
 msgstr "Aller à gauche"
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:47
 msgid "Move Right"
 msgstr "Aller à droite"
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:50
 msgid "Target & Attack"
 msgstr "Viser et Attaquer"
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:52
 msgid "Move to Target"
 msgstr "Aller à la cible"
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:54
 msgid "Change Move to Target type"
 msgstr "Changer le type de déplacement vers les cibles"
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:56
 msgid "Move to Home location"
 msgstr "Aller à l'emplacement de base"
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:58
 msgid "Set home location"
 msgstr "Définir l'emplacement de base"
 
-#: src/keyboardconfig.cpp:59
+#: src/keyboardconfig.cpp:60
 msgid "Move to navigation point"
 msgstr "Aller jusqu'au point de navigation"
 
-#: src/keyboardconfig.cpp:61
-msgid "Smilie"
-msgstr "Smileys"
-
 #: src/keyboardconfig.cpp:63
 msgid "Stop Attack"
 msgstr "Arrêter d'attaquer"
@@ -3899,300 +3905,328 @@ msgid "Change Map View Mode"
 msgstr "Changer le mode de vision de carte"
 
 #: src/keyboardconfig.cpp:80
+msgid "Select OK"
+msgstr "Sélectionner OK"
+
+#: src/keyboardconfig.cpp:83
+msgid "Shortcuts Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:84
 msgid "Item Shortcuts Key"
 msgstr "Touche de raccourcis items"
 
-#: src/keyboardconfig.cpp:82 src/keyboardconfig.cpp:84
 #: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:88
 #: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:92
 #: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:96
 #: src/keyboardconfig.cpp:98 src/keyboardconfig.cpp:100
 #: src/keyboardconfig.cpp:102 src/keyboardconfig.cpp:104
 #: src/keyboardconfig.cpp:106 src/keyboardconfig.cpp:108
-#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:113
-#: src/keyboardconfig.cpp:115 src/keyboardconfig.cpp:117
+#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:112
+#: src/keyboardconfig.cpp:114 src/keyboardconfig.cpp:117
 #: src/keyboardconfig.cpp:119 src/keyboardconfig.cpp:121
-#: src/keyboardconfig.cpp:360
+#: src/keyboardconfig.cpp:123 src/keyboardconfig.cpp:125
+#: src/keyboardconfig.cpp:367
 #, c-format
 msgid "Item Shortcut %d"
 msgstr "Raccourci Objet %d"
 
-#: src/keyboardconfig.cpp:122
+#: src/keyboardconfig.cpp:126
+msgid "Windows Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:127
 msgid "Help Window"
 msgstr "Fenêtre d'Aide"
 
-#: src/keyboardconfig.cpp:124
+#: src/keyboardconfig.cpp:129
 msgid "Status Window"
 msgstr "Fenêtre d'état"
 
-#: src/keyboardconfig.cpp:126
+#: src/keyboardconfig.cpp:131
 msgid "Inventory Window"
 msgstr "Fenêtre de l'inventaire"
 
-#: src/keyboardconfig.cpp:128
+#: src/keyboardconfig.cpp:133
 msgid "Equipment Window"
 msgstr "Fenêtre d'équipements."
 
-#: src/keyboardconfig.cpp:130
+#: src/keyboardconfig.cpp:135
 msgid "Skill Window"
 msgstr "Fenêtre de compétences"
 
-#: src/keyboardconfig.cpp:132
+#: src/keyboardconfig.cpp:137
 msgid "Minimap Window"
 msgstr "Fenêtre de Mini-carte"
 
-#: src/keyboardconfig.cpp:134
+#: src/keyboardconfig.cpp:139
 msgid "Chat Window"
 msgstr "Fenêtre de conversation"
 
-#: src/keyboardconfig.cpp:136
+#: src/keyboardconfig.cpp:141
 msgid "Item Shortcut Window"
 msgstr "Fenêtre de raccourci objet"
 
-#: src/keyboardconfig.cpp:138
+#: src/keyboardconfig.cpp:143
 msgid "Setup Window"
 msgstr "Fenêtre de configuration"
 
-#: src/keyboardconfig.cpp:140
+#: src/keyboardconfig.cpp:145
 msgid "Debug Window"
 msgstr "Fenêtre d'informations"
 
-#: src/keyboardconfig.cpp:142
+#: src/keyboardconfig.cpp:147
 msgid "Social Window"
 msgstr "Groupes et Guildes"
 
-#: src/keyboardconfig.cpp:144
+#: src/keyboardconfig.cpp:149
 msgid "Emote Shortcut Window"
 msgstr "Fenêtre de raccourcis d’émoticônes"
 
-#: src/keyboardconfig.cpp:146
+#: src/keyboardconfig.cpp:151
 msgid "Outfits Window"
 msgstr "Fenêtre des tenues"
 
-#: src/keyboardconfig.cpp:148
+#: src/keyboardconfig.cpp:153
 msgid "Shop Window"
 msgstr "Fenêtre du magasin"
 
-#: src/keyboardconfig.cpp:150
+#: src/keyboardconfig.cpp:155
 msgid "Quick drop Window"
 msgstr "Fenêtre pour jeter les items"
 
-#: src/keyboardconfig.cpp:152
+#: src/keyboardconfig.cpp:157
 msgid "Kill Stats Window"
 msgstr "Fenêtre de statistiques"
 
-#: src/keyboardconfig.cpp:154
+#: src/keyboardconfig.cpp:159
 msgid "Commands Window"
 msgstr "Fenêtre de commandes"
 
-#: src/keyboardconfig.cpp:156
+#: src/keyboardconfig.cpp:161
 msgid "Bot Checker Window"
 msgstr "Fenêtre du testeur de robot"
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboardconfig.cpp:164
 msgid "Who Is Online Window"
 msgstr "Fenêtre - Qui est en ligne ?"
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboardconfig.cpp:166
 msgid "Did you know Window"
 msgstr "Connaissiez-vous la fenêtre ?"
 
-#: src/keyboardconfig.cpp:164
+#: src/keyboardconfig.cpp:169
 msgid "Previous Social Tab"
 msgstr "Onglet de dialogue précédent"
 
-#: src/keyboardconfig.cpp:166
+#: src/keyboardconfig.cpp:171
 msgid "Next Social Tab"
 msgstr "Onglet de dialogue suivant"
 
-#: src/keyboardconfig.cpp:168 src/keyboardconfig.cpp:170
-#: src/keyboardconfig.cpp:172 src/keyboardconfig.cpp:174
-#: src/keyboardconfig.cpp:176 src/keyboardconfig.cpp:178
-#: src/keyboardconfig.cpp:180 src/keyboardconfig.cpp:182
-#: src/keyboardconfig.cpp:184 src/keyboardconfig.cpp:186
-#: src/keyboardconfig.cpp:188 src/keyboardconfig.cpp:190
-#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
-#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
-#: src/keyboardconfig.cpp:201 src/keyboardconfig.cpp:203
-#: src/keyboardconfig.cpp:205 src/keyboardconfig.cpp:207
-#: src/keyboardconfig.cpp:209 src/keyboardconfig.cpp:211
-#: src/keyboardconfig.cpp:213 src/keyboardconfig.cpp:215
-#: src/keyboardconfig.cpp:217 src/keyboardconfig.cpp:220
-#: src/keyboardconfig.cpp:223 src/keyboardconfig.cpp:226
-#: src/keyboardconfig.cpp:228 src/keyboardconfig.cpp:230
-#: src/keyboardconfig.cpp:232 src/keyboardconfig.cpp:234
-#: src/keyboardconfig.cpp:236 src/keyboardconfig.cpp:238
-#: src/keyboardconfig.cpp:240 src/keyboardconfig.cpp:242
-#: src/keyboardconfig.cpp:244 src/keyboardconfig.cpp:247
-#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
-#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
-#: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:259
-#: src/keyboardconfig.cpp:355
+#: src/keyboardconfig.cpp:173
+msgid "Emotes Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:174
+msgid "Smilie"
+msgstr "Smileys"
+
+#: src/keyboardconfig.cpp:175 src/keyboardconfig.cpp:177
+#: src/keyboardconfig.cpp:179 src/keyboardconfig.cpp:181
+#: src/keyboardconfig.cpp:183 src/keyboardconfig.cpp:185
+#: src/keyboardconfig.cpp:187 src/keyboardconfig.cpp:189
+#: src/keyboardconfig.cpp:191 src/keyboardconfig.cpp:193
+#: src/keyboardconfig.cpp:195 src/keyboardconfig.cpp:197
+#: src/keyboardconfig.cpp:200 src/keyboardconfig.cpp:202
+#: src/keyboardconfig.cpp:204 src/keyboardconfig.cpp:206
+#: src/keyboardconfig.cpp:208 src/keyboardconfig.cpp:210
+#: src/keyboardconfig.cpp:212 src/keyboardconfig.cpp:214
+#: src/keyboardconfig.cpp:216 src/keyboardconfig.cpp:218
+#: src/keyboardconfig.cpp:220 src/keyboardconfig.cpp:222
+#: src/keyboardconfig.cpp:224 src/keyboardconfig.cpp:227
+#: src/keyboardconfig.cpp:230 src/keyboardconfig.cpp:233
+#: src/keyboardconfig.cpp:235 src/keyboardconfig.cpp:237
+#: src/keyboardconfig.cpp:239 src/keyboardconfig.cpp:241
+#: src/keyboardconfig.cpp:243 src/keyboardconfig.cpp:245
+#: src/keyboardconfig.cpp:247 src/keyboardconfig.cpp:249
+#: src/keyboardconfig.cpp:251 src/keyboardconfig.cpp:254
+#: src/keyboardconfig.cpp:256 src/keyboardconfig.cpp:258
+#: src/keyboardconfig.cpp:260 src/keyboardconfig.cpp:262
+#: src/keyboardconfig.cpp:264 src/keyboardconfig.cpp:266
+#: src/keyboardconfig.cpp:362
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "Raccourci d'émoticône %d"
 
-#: src/keyboardconfig.cpp:261
+#: src/keyboardconfig.cpp:268
+msgid "Outfits Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:269
 msgid "Wear Outfit"
 msgstr "Mettre la tenue"
 
-#: src/keyboardconfig.cpp:263
+#: src/keyboardconfig.cpp:271
 msgid "Copy Outfit"
 msgstr "Copier la tenue"
 
-#: src/keyboardconfig.cpp:265
+#: src/keyboardconfig.cpp:273
 msgid "Copy equipped to Outfit"
 msgstr "Copier l'équipement porté dans les tenues"
 
-#: src/keyboardconfig.cpp:267
+#: src/keyboardconfig.cpp:275
+msgid "Chat Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:276
 msgid "Toggle Chat"
 msgstr "Activer / Désactiver la conversation"
 
-#: src/keyboardconfig.cpp:269
+#: src/keyboardconfig.cpp:278
 msgid "Scroll Chat Up"
 msgstr "Défiler la conversation (haut)"
 
-#: src/keyboardconfig.cpp:271
+#: src/keyboardconfig.cpp:280
 msgid "Scroll Chat Down"
 msgstr "Défiler la conversation (bas)"
 
-#: src/keyboardconfig.cpp:273
+#: src/keyboardconfig.cpp:282
 msgid "Previous Chat Tab"
 msgstr "Onglet de conversation précédent"
 
-#: src/keyboardconfig.cpp:275
+#: src/keyboardconfig.cpp:284
 msgid "Next Chat Tab"
 msgstr "Onglet de conversation suivant"
 
-#: src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:287
 msgid "Close current Chat Tab"
 msgstr "Fermer la fenêtre de dialogue ouverte"
 
-#: src/keyboardconfig.cpp:280
+#: src/keyboardconfig.cpp:289
 msgid "Previous chat line"
 msgstr "Ligne de conversation précédente"
 
-#: src/keyboardconfig.cpp:282
+#: src/keyboardconfig.cpp:291
 msgid "Next chat line"
 msgstr "Ligne de conversation suivante"
 
-#: src/keyboardconfig.cpp:284
+#: src/keyboardconfig.cpp:293
 msgid "Chat Auto Complete"
 msgstr "Auto complétion du chat"
 
-#: src/keyboardconfig.cpp:286
+#: src/keyboardconfig.cpp:295
 msgid "Deactivate Chat Input"
 msgstr "Désactiver la saisie dans le chat"
 
-#: src/keyboardconfig.cpp:288
-msgid "Select OK"
-msgstr "Sélectionner OK"
+#: src/keyboardconfig.cpp:297
+msgid "Other Keys"
+msgstr ""
 
-#: src/keyboardconfig.cpp:291
+#: src/keyboardconfig.cpp:298
 msgid "Ignore input 1"
 msgstr "Ignorer l'entrée 1"
 
-#: src/keyboardconfig.cpp:293
+#: src/keyboardconfig.cpp:300
 msgid "Ignore input 2"
 msgstr "Ignorer l'entrée 2"
 
-#: src/keyboardconfig.cpp:295
+#: src/keyboardconfig.cpp:302
 msgid "Direct Up"
 msgstr "Vers le haut"
 
-#: src/keyboardconfig.cpp:296
+#: src/keyboardconfig.cpp:303
 msgid "Direct Down"
 msgstr "Vers le bas"
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboardconfig.cpp:305
 msgid "Direct Left"
 msgstr "Vers la gauche"
 
-#: src/keyboardconfig.cpp:299
+#: src/keyboardconfig.cpp:306
 msgid "Direct Right"
 msgstr "Vers la droite"
 
-#: src/keyboardconfig.cpp:301
+#: src/keyboardconfig.cpp:308
 msgid "Crazy moves"
 msgstr "Mouvements de dingue"
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboardconfig.cpp:310
 msgid "Change Crazy Move mode"
 msgstr "Changer le mode de mouvement de dingue"
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboardconfig.cpp:312
 msgid "Quick Drop N Items from 0 slot"
 msgstr "Jeter rapidement N objets depuis l'emplacement 0"
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboardconfig.cpp:314
 msgid "Quick Drop N Items"
 msgstr "Jeter rapidement N objets"
 
-#: src/keyboardconfig.cpp:309
+#: src/keyboardconfig.cpp:316
 msgid "Switch Quick Drop Counter"
 msgstr "Changer de compteur de jet rapide d'objets"
 
-#: src/keyboardconfig.cpp:311
+#: src/keyboardconfig.cpp:318
 msgid "Quick heal target or self"
 msgstr "Soins rapides de la cible ou de soi"
 
-#: src/keyboardconfig.cpp:313
+#: src/keyboardconfig.cpp:320
 msgid "Use #itenplz spell"
 msgstr "Utiliser le sort #itenplz"
 
-#: src/keyboardconfig.cpp:315
+#: src/keyboardconfig.cpp:322
 msgid "Use magic attack"
 msgstr "Utiliser l'attaque magique"
 
-#: src/keyboardconfig.cpp:317
+#: src/keyboardconfig.cpp:324
 msgid "Switch magic attack"
 msgstr "Changer d'attaque magique"
 
-#: src/keyboardconfig.cpp:319
+#: src/keyboardconfig.cpp:326
 msgid "Change move type"
 msgstr "Changer de type de mouvement"
 
-#: src/keyboardconfig.cpp:321
+#: src/keyboardconfig.cpp:328
 msgid "Change Attack Weapon Type"
 msgstr "Changer de type d'arme d'attaque"
 
-#: src/keyboardconfig.cpp:323
+#: src/keyboardconfig.cpp:330
 msgid "Change Attack Type"
 msgstr "Changer de type d'attaque"
 
-#: src/keyboardconfig.cpp:325
+#: src/keyboardconfig.cpp:332
 msgid "Change Follow mode"
 msgstr "Changer de type de suivi"
 
-#: src/keyboardconfig.cpp:327
+#: src/keyboardconfig.cpp:334
 msgid "Change Imitation mode"
 msgstr "Changer de type d'imitation"
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboardconfig.cpp:337
 msgid "Disable / Enable Game modifier keys"
 msgstr "Désactiver / Activer les touches de modifications du jeu"
 
-#: src/keyboardconfig.cpp:331
+#: src/keyboardconfig.cpp:338
 msgid "On / Off audio"
 msgstr "Son On / Off"
 
-#: src/keyboardconfig.cpp:333
+#: src/keyboardconfig.cpp:340
 msgid "Enable / Disable away mode"
 msgstr "Activer / Désactiver le mode en absence"
 
-#: src/keyboardconfig.cpp:335
+#: src/keyboardconfig.cpp:342
 msgid "Emulate right click from keyboard"
 msgstr "Emuler le clic droit à partir du clavier"
 
-#: src/keyboardconfig.cpp:337
+#: src/keyboardconfig.cpp:344
 msgid "Toggle camera mode"
 msgstr "Changer le mode caméra"
 
-#: src/keyboardconfig.cpp:339
+#: src/keyboardconfig.cpp:346
 msgid "Modifier key"
 msgstr "Modifier la touche"
 
-#: src/keyboardconfig.cpp:411
+#: src/keyboardconfig.cpp:425
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -4201,68 +4235,68 @@ 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:377
+#: src/localplayer.cpp:380
 msgid "You were killed by "
 msgstr "Vous avez été tué par "
 
-#: src/localplayer.cpp:1416
+#: src/localplayer.cpp:1422
 msgid "Tried to pick up nonexistent item."
 msgstr "Vous avez essayé de prendre un item qui n'existe pas."
 
-#: src/localplayer.cpp:1418
+#: src/localplayer.cpp:1424
 msgid "Item is too heavy."
 msgstr "L'objet est trop lourd."
 
-#: src/localplayer.cpp:1420
+#: src/localplayer.cpp:1426
 msgid "Item is too far away."
 msgstr "L'objet est trop éloigné"
 
-#: src/localplayer.cpp:1422
+#: src/localplayer.cpp:1428
 msgid "Inventory is full."
 msgstr "L'inventaire est plein"
 
-#: src/localplayer.cpp:1424
+#: src/localplayer.cpp:1430
 msgid "Stack is too big."
 msgstr "La pile est trop grande"
 
-#: src/localplayer.cpp:1427
+#: src/localplayer.cpp:1433
 msgid "Item belongs to someone else."
 msgstr "L'objet appartient a quelqu'un d'autre"
 
-#: src/localplayer.cpp:1430
+#: src/localplayer.cpp:1436
 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:1454
+#: src/localplayer.cpp:1460
 #, 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:3168
+#: src/localplayer.cpp:3174
 msgid "Away"
 msgstr "Inactif"
 
-#: src/localplayer.cpp:3468
+#: src/localplayer.cpp:3494
 msgid "Follow: "
 msgstr "Suivre : "
 
-#: src/localplayer.cpp:3470 src/localplayer.cpp:3485
+#: src/localplayer.cpp:3496 src/localplayer.cpp:3511
 msgid "Follow canceled"
 msgstr "Suivi annulé"
 
-#: src/localplayer.cpp:3477
+#: src/localplayer.cpp:3503
 msgid "Imitation: "
 msgstr "Imitation: "
 
-#: src/localplayer.cpp:3479 src/localplayer.cpp:3487
+#: src/localplayer.cpp:3505 src/localplayer.cpp:3513
 msgid "Imitation canceled"
 msgstr "Imitation annulée"
 
-#: src/localplayer.cpp:3832
+#: src/localplayer.cpp:3858
 msgid "You see "
 msgstr "Vous voyez  "
 
@@ -4661,15 +4695,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:286
+#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:284
 msgid "Item sharing enabled."
 msgstr "Partage d'objet activé."
 
-#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:296
+#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:294
 msgid "Item sharing disabled."
 msgstr "Partage d'objet désactivé."
 
-#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:306
+#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:304
 msgid "Item sharing not possible."
 msgstr "Partage d'objet impossible."
 
@@ -4677,15 +4711,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:248
+#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:246
 msgid "Experience sharing enabled."
 msgstr "Partage d'expérience autorisé."
 
-#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:258
+#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:256
 msgid "Experience sharing disabled."
 msgstr "Partage d'expérience non autorisé."
 
-#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:268
+#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:266
 msgid "Experience sharing not possible."
 msgstr "Partage d'expérience impossible."
 
@@ -4768,54 +4802,54 @@ msgstr "Ce nom d'utilisateur est déjà utilisé."
 msgid "Username permanently erased."
 msgstr "Le nom de l'utilisateur a été éliminé de façon permanente."
 
-#: src/net/ea/partyhandler.cpp:82
+#: src/net/ea/partyhandler.cpp:80
 msgid "Could not create party."
 msgstr "Le groupe n'a pu être créé."
 
-#: src/net/ea/partyhandler.cpp:84
+#: src/net/ea/partyhandler.cpp:82
 msgid "Party successfully created."
 msgstr "Création du groupe réussie."
 
-#: src/net/ea/partyhandler.cpp:140
+#: src/net/ea/partyhandler.cpp:138
 #, c-format
 msgid "%s has joined your party."
 msgstr "%s a rejoint votre groupe."
 
-#: src/net/ea/partyhandler.cpp:176
+#: src/net/ea/partyhandler.cpp:174
 #, c-format
 msgid "%s is already a member of a party."
 msgstr "%s est déjà membre du groupe."
 
-#: src/net/ea/partyhandler.cpp:181
+#: src/net/ea/partyhandler.cpp:179
 #, c-format
 msgid "%s refused your invitation."
 msgstr "%s a refusé votre invitation."
 
-#: src/net/ea/partyhandler.cpp:186
+#: src/net/ea/partyhandler.cpp:184
 #, c-format
 msgid "%s is now a member of your party."
 msgstr "%s est maintenant membre de votre groupe."
 
-#: src/net/ea/partyhandler.cpp:191
+#: src/net/ea/partyhandler.cpp:189
 #, c-format
 msgid "%s can't join your party because party is full."
 msgstr "%s ne peut rejoindre votre groupe. Celui-ci est complet."
 
-#: src/net/ea/partyhandler.cpp:196
+#: src/net/ea/partyhandler.cpp:194
 #, c-format
 msgid "QQQ Unknown invite response for %s."
 msgstr "QQQ Erreur inconnue sur l'invitation de %s."
 
-#: src/net/ea/partyhandler.cpp:356
+#: src/net/ea/partyhandler.cpp:354
 msgid "You have left the party."
 msgstr "Vous avez quitté le groupe."
 
-#: src/net/ea/partyhandler.cpp:369
+#: src/net/ea/partyhandler.cpp:367
 #, c-format
 msgid "%s has left your party."
 msgstr "%s a quitté le groupe."
 
-#: src/net/ea/partyhandler.cpp:448
+#: src/net/ea/partyhandler.cpp:446
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr "Un membre inconnu a essayé de dire : %s"
@@ -4983,83 +5017,83 @@ msgstr "Ne peut pas augmenter la capacité !"
 msgid "Equip arrows first."
 msgstr "Équiper d'abord les flèches!"
 
-#: src/net/ea/specialhandler.cpp:149
+#: src/net/ea/specialhandler.cpp:146
 msgid "Trade failed!"
 msgstr "Échec de la transaction !"
 
-#: src/net/ea/specialhandler.cpp:152
+#: src/net/ea/specialhandler.cpp:149
 msgid "Emote failed!"
 msgstr "Émoticône non réalisée !"
 
-#: src/net/ea/specialhandler.cpp:155
+#: src/net/ea/specialhandler.cpp:152
 msgid "Sit failed!"
 msgstr "Vous n'avez pas pu vous asseoir !"
 
-#: src/net/ea/specialhandler.cpp:158
+#: src/net/ea/specialhandler.cpp:155
 msgid "Chat creating failed!"
 msgstr "Vous n'avez pas pu créer la conversation !"
 
-#: src/net/ea/specialhandler.cpp:161
+#: src/net/ea/specialhandler.cpp:158
 msgid "Could not join party!"
 msgstr "Vous n'avez pas pu rejoindre le groupe !"
 
-#: src/net/ea/specialhandler.cpp:164
+#: src/net/ea/specialhandler.cpp:161
 msgid "Cannot shout!"
 msgstr "Vous ne pouvez pas crier !"
 
-#: src/net/ea/specialhandler.cpp:177
+#: src/net/ea/specialhandler.cpp:174
 msgid "You have not yet reached a high enough lvl!"
 msgstr "Vous n'avez pas atteint un niveau suffisant !"
 
-#: src/net/ea/specialhandler.cpp:181
+#: src/net/ea/specialhandler.cpp:178
 msgid "Insufficient HP!"
 msgstr "Pas assez de vie !"
 
-#: src/net/ea/specialhandler.cpp:184
+#: src/net/ea/specialhandler.cpp:181
 msgid "Insufficient SP!"
 msgstr "PV insuffisant !"
 
-#: src/net/ea/specialhandler.cpp:187
+#: src/net/ea/specialhandler.cpp:184
 msgid "You have no memos!"
 msgstr "Vous n'avez pas de messages !"
 
-#: src/net/ea/specialhandler.cpp:190
+#: src/net/ea/specialhandler.cpp:187
 msgid "You cannot do that right now!"
 msgstr "Vous ne pouvez faire cela maintenant !"
 
-#: src/net/ea/specialhandler.cpp:193
+#: src/net/ea/specialhandler.cpp:190
 msgid "Seems you need more money... ;-)"
 msgstr "Il semblerait que vous ayez besoin de plus d'argent... ;)"
 
-#: src/net/ea/specialhandler.cpp:196
+#: src/net/ea/specialhandler.cpp:193
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Vous ne pouvez utiliser ce pouvoir avec ce type d'arme !"
 
-#: src/net/ea/specialhandler.cpp:200
+#: src/net/ea/specialhandler.cpp:197
 msgid "You need another red gem!"
 msgstr "Vous avez besoin d'une autre pierre précieuse rouge !"
 
-#: src/net/ea/specialhandler.cpp:203
+#: src/net/ea/specialhandler.cpp:200
 msgid "You need another blue gem!"
 msgstr "Vous avez besoin d'une autre pierre précieuse bleue !"
 
-#: src/net/ea/specialhandler.cpp:206
+#: src/net/ea/specialhandler.cpp:203
 msgid "You're carrying to much to do this!"
 msgstr "Vous portez trop de choses pour pouvoir faire cela !"
 
-#: src/net/ea/specialhandler.cpp:209
+#: src/net/ea/specialhandler.cpp:206
 msgid "Huh? What's that?"
 msgstr "Hé ? Qu'est-ce donc que cela ?"
 
-#: src/net/ea/specialhandler.cpp:220
+#: src/net/ea/specialhandler.cpp:217
 msgid "Warp failed..."
 msgstr "Enchainement échoué..."
 
-#: src/net/ea/specialhandler.cpp:223
+#: src/net/ea/specialhandler.cpp:220
 msgid "Could not steal anything..."
 msgstr "Vous n'avez rien pu voler..."
 
-#: src/net/ea/specialhandler.cpp:226
+#: src/net/ea/specialhandler.cpp:223
 msgid "Poison had no effect..."
 msgstr "Le poison fut sans effet..."
 
diff --git a/po/hr.po b/po/hr.po
index 9b536203a..58b3cb0bf 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-09-17 16:12+0300\n"
+"POT-Creation-Date: 2011-09-27 22:18+0300\n"
 "PO-Revision-Date: 2011-08-09 22:16+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,25 +18,25 @@ msgstr ""
 "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:1088
+#: src/actorspritemanager.cpp:1133
 msgid "Visible on map"
 msgstr ""
 
-#: src/being.cpp:548
+#: src/being.cpp:547
 msgid "dodge"
 msgstr ""
 
-#: src/being.cpp:548
+#: src/being.cpp:547
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1527
+#: src/being.cpp:1526
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1532
+#: src/being.cpp:1531
 msgid "I"
 msgstr ""
 
@@ -44,43 +44,43 @@ msgstr ""
 msgid "Setup"
 msgstr "Podešavanje"
 
-#: src/client.cpp:841 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:842 src/gui/setup_perfomance.cpp:48
 msgid "Perfomance"
 msgstr ""
 
-#: src/client.cpp:846 src/gui/setup_video.cpp:315
+#: src/client.cpp:847 src/gui/setup_video.cpp:315
 msgid "Video"
 msgstr "Slika"
 
-#: src/client.cpp:851
+#: src/client.cpp:852
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:932
+#: src/client.cpp:934
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:963
+#: src/client.cpp:965
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:996
+#: src/client.cpp:998
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1096
+#: src/client.cpp:1098
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:1127
+#: src/client.cpp:1129
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:1137
+#: src/client.cpp:1139
 msgid "Changing game servers"
 msgstr ""
 
-#: src/client.cpp:1180 src/client.cpp:1187 src/client.cpp:1321
+#: src/client.cpp:1182 src/client.cpp:1189 src/client.cpp:1323
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:221 src/gui/charselectdialog.cpp:253
 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
@@ -90,50 +90,50 @@ msgstr ""
 msgid "Error"
 msgstr "Greška"
 
-#: src/client.cpp:1196
+#: src/client.cpp:1198
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1222
+#: src/client.cpp:1224
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:1223
+#: src/client.cpp:1225
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1242
+#: src/client.cpp:1244
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:1243
+#: src/client.cpp:1245
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1263
+#: src/client.cpp:1265
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:1264
+#: src/client.cpp:1266
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1463 src/client.cpp:1493 src/client.cpp:1508
-#: src/client.cpp:1933 src/client.cpp:1940
+#: src/client.cpp:1465 src/client.cpp:1495 src/client.cpp:1510
+#: src/client.cpp:1935 src/client.cpp:1942
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1639
+#: src/client.cpp:1641
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1673 src/client.cpp:1679
+#: src/client.cpp:1675 src/client.cpp:1681
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:1700
+#: src/client.cpp:1702
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -346,11 +346,11 @@ msgstr "Ignoriranje dolaznih zahtjeva za trgovanje"
 msgid "Accepting incoming trade requests"
 msgstr "Prihvaćanje dolaznih zahtjeva za trgovanje"
 
-#: src/game.cpp:1729
+#: src/game.cpp:1727
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:1730
+#: src/game.cpp:1728
 #, c-format
 msgid "Error while loading %s"
 msgstr "Greška prilikom učitavanja %s"
@@ -385,7 +385,7 @@ msgstr "Ime"
 
 #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:133
 #: src/gui/popupmenu.cpp:283 src/gui/popupmenu.cpp:596
-#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:265
+#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:265
 msgid "Attack"
 msgstr "Napad"
 
@@ -439,7 +439,7 @@ msgstr ""
 #: src/gui/buydialog.cpp:99 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:294
-#: src/keyboardconfig.cpp:290
+#: src/keyboardconfig.cpp:82
 msgid "Quit"
 msgstr "Izlaz"
 
@@ -474,7 +474,7 @@ msgstr "Prodaj"
 #: src/gui/popupmenu.cpp:1858 src/gui/popupmenu.cpp:1897
 #: src/gui/popupmenu.cpp:1949 src/gui/popupmenu.cpp:1969
 #: src/gui/quitdialog.cpp:55 src/gui/register.cpp:82 src/gui/setup.cpp:72
-#: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:238
+#: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:241
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
 #: src/gui/updaterwindow.cpp:161
 msgid "Cancel"
@@ -643,8 +643,8 @@ msgid "Enter password:"
 msgstr ""
 
 #: src/gui/charselectdialog.cpp:410 src/gui/serverdialog.cpp:298
-#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:122
-#: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:241
+#: src/gui/setup_relations.cpp:242 src/gui/shopwindow.cpp:122
+#: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244
 msgid "Delete"
 msgstr "Obriši"
 
@@ -896,7 +896,7 @@ msgid "Did You Know?"
 msgstr ""
 
 #: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
-#: src/gui/inventorywindow.cpp:206 src/gui/npcdialog.cpp:53
+#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:53
 #: src/gui/popupmenu.cpp:556 src/gui/shopwindow.cpp:113
 msgid "Close"
 msgstr "Zatvori"
@@ -923,7 +923,7 @@ msgid "Equipment"
 msgstr "Oprema"
 
 #: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160
-#: src/gui/inventorywindow.cpp:539 src/gui/inventorywindow.cpp:548
+#: src/gui/inventorywindow.cpp:538 src/gui/inventorywindow.cpp:547
 #: src/gui/popupmenu.cpp:1656 src/gui/popupmenu.cpp:1748
 #: src/gui/popupmenu.cpp:1793
 msgid "Unequip"
@@ -955,37 +955,33 @@ msgstr ""
 msgid "by type"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:111 src/gui/windowmenu.cpp:76
+#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:76
 #: src/inventory.cpp:249
 msgid "Inventory"
 msgstr "Zalihe"
 
-#: src/gui/inventorywindow.cpp:136
+#: src/gui/inventorywindow.cpp:137
 msgid "Slots:"
 msgstr "Mjesta:"
 
-#: src/gui/inventorywindow.cpp:148
-msgid "Filter:"
-msgstr ""
-
 #: src/gui/inventorywindow.cpp:149
-msgid "Sort:"
+msgid "Filter:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:541
-#: src/gui/inventorywindow.cpp:550 src/gui/popupmenu.cpp:1658
+#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:540
+#: src/gui/inventorywindow.cpp:549 src/gui/popupmenu.cpp:1658
 #: src/gui/popupmenu.cpp:1750 src/gui/popupmenu.cpp:1795
 msgid "Equip"
 msgstr "Opremi"
 
-#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:542
-#: src/gui/inventorywindow.cpp:546 src/gui/popupmenu.cpp:1662
+#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:541
+#: src/gui/inventorywindow.cpp:545 src/gui/popupmenu.cpp:1662
 #: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1754
 #: src/gui/popupmenu.cpp:1799
 msgid "Use"
 msgstr "Upotrijebi"
 
-#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:646
+#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:645
 #: src/gui/popupmenu.cpp:1667 src/gui/popupmenu.cpp:1759
 #: src/gui/popupmenu.cpp:1804
 msgid "Drop..."
@@ -1005,17 +1001,17 @@ msgstr ""
 msgid "Weight:"
 msgstr "Težina:"
 
-#: src/gui/inventorywindow.cpp:204 src/gui/inventorywindow.cpp:637
+#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:636
 #: src/gui/popupmenu.cpp:1642 src/gui/popupmenu.cpp:1771
 #: src/gui/popupmenu.cpp:1816 src/gui/setup.cpp:73
 msgid "Store"
 msgstr "Pohrani"
 
-#: src/gui/inventorywindow.cpp:205 src/gui/popupmenu.cpp:1683
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1683
 msgid "Retrieve"
 msgstr "Preuzmi"
 
-#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1672
+#: src/gui/inventorywindow.cpp:647 src/gui/popupmenu.cpp:1672
 #: src/gui/popupmenu.cpp:1764 src/gui/popupmenu.cpp:1809
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
@@ -2208,30 +2204,34 @@ msgid "Show own name"
 msgstr ""
 
 #: src/gui/setup_players.cpp:63
-msgid "Target dead players"
+msgid "Enable extended mouse targeting"
 msgstr ""
 
 #: src/gui/setup_players.cpp:66
+msgid "Target dead players"
+msgstr ""
+
+#: src/gui/setup_players.cpp:69
 msgid "Visible names"
 msgstr "Vidljiva imena"
 
-#: src/gui/setup_players.cpp:69
+#: src/gui/setup_players.cpp:72
 msgid "Secure trades"
 msgstr ""
 
-#: src/gui/setup_players.cpp:72
+#: src/gui/setup_players.cpp:75
 msgid "Unsecure chars in names"
 msgstr ""
 
-#: src/gui/setup_players.cpp:75
+#: src/gui/setup_players.cpp:78
 msgid "Show statuses"
 msgstr ""
 
-#: src/gui/setup_players.cpp:78
+#: src/gui/setup_players.cpp:81
 msgid "Show ip addresses on screenshots"
 msgstr ""
 
-#: src/gui/setup_players.cpp:81
+#: src/gui/setup_players.cpp:84
 msgid "Allow self heal with mouse click"
 msgstr ""
 
@@ -2259,23 +2259,23 @@ msgstr "Ignorirano"
 msgid "Erased"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:239
+#: src/gui/setup_relations.cpp:238
 msgid "Allow trading"
 msgstr "Dozvoli trgovanje"
 
-#: src/gui/setup_relations.cpp:241
+#: src/gui/setup_relations.cpp:240
 msgid "Allow whispers"
 msgstr "Dozvoli šapate"
 
-#: src/gui/setup_relations.cpp:244
+#: src/gui/setup_relations.cpp:243
 msgid "Old"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:246
+#: src/gui/setup_relations.cpp:245
 msgid "Relations"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:271
+#: src/gui/setup_relations.cpp:270
 msgid "When ignoring:"
 msgstr "Kad ignorira:"
 
@@ -3242,30 +3242,34 @@ msgid "Command:"
 msgstr ""
 
 #: src/gui/textcommandeditor.cpp:200
+msgid "Comment:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:203
 msgid "Mana:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:206
+#: src/gui/textcommandeditor.cpp:209
 msgid "Target Type:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:212
+#: src/gui/textcommandeditor.cpp:215
 msgid "Icon:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:218
+#: src/gui/textcommandeditor.cpp:221
 msgid "Magic level:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:224
+#: src/gui/textcommandeditor.cpp:227
 msgid "Magic School:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:230
+#: src/gui/textcommandeditor.cpp:233
 msgid "School level:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:235
+#: src/gui/textcommandeditor.cpp:238
 msgid "Save"
 msgstr ""
 
@@ -3493,23 +3497,23 @@ msgstr ""
 msgid "Road Point"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:474
+#: src/gui/whoisonline.cpp:85 src/gui/whoisonline.cpp:478
 msgid "Who Is Online - Updating"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:104
+#: src/gui/whoisonline.cpp:108
 msgid "Update"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:297
+#: src/gui/whoisonline.cpp:301
 msgid "Who Is Online - "
 msgstr ""
 
-#: src/gui/whoisonline.cpp:488
+#: src/gui/whoisonline.cpp:492
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:519
+#: src/gui/whoisonline.cpp:523
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -3790,49 +3794,49 @@ msgid "Cart"
 msgstr ""
 
 #: src/keyboardconfig.cpp:43
+msgid "Basic Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:44
 msgid "Move Up"
 msgstr "Pomakni Gore"
 
-#: src/keyboardconfig.cpp:44
+#: src/keyboardconfig.cpp:45
 msgid "Move Down"
 msgstr "Pomakni Dolje"
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:46
 msgid "Move Left"
 msgstr "Pomakni Ulijevo"
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:47
 msgid "Move Right"
 msgstr "Pomakni Udesno"
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:50
 msgid "Target & Attack"
 msgstr "Meta i Napad"
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:52
 msgid "Move to Target"
 msgstr ""
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:54
 msgid "Change Move to Target type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:56
 msgid "Move to Home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:58
 msgid "Set home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:59
+#: src/keyboardconfig.cpp:60
 msgid "Move to navigation point"
 msgstr ""
 
-#: src/keyboardconfig.cpp:61
-msgid "Smilie"
-msgstr "Smajlić"
-
 #: src/keyboardconfig.cpp:63
 msgid "Stop Attack"
 msgstr "Prekini Napad"
@@ -3878,341 +3882,371 @@ msgid "Change Map View Mode"
 msgstr ""
 
 #: src/keyboardconfig.cpp:80
+msgid "Select OK"
+msgstr "Odaberite OK"
+
+#: src/keyboardconfig.cpp:83
+#, fuzzy
+msgid "Shortcuts Keys"
+msgstr "Prečac do Predmeta %d"
+
+#: src/keyboardconfig.cpp:84
 msgid "Item Shortcuts Key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82 src/keyboardconfig.cpp:84
 #: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:88
 #: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:92
 #: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:96
 #: src/keyboardconfig.cpp:98 src/keyboardconfig.cpp:100
 #: src/keyboardconfig.cpp:102 src/keyboardconfig.cpp:104
 #: src/keyboardconfig.cpp:106 src/keyboardconfig.cpp:108
-#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:113
-#: src/keyboardconfig.cpp:115 src/keyboardconfig.cpp:117
+#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:112
+#: src/keyboardconfig.cpp:114 src/keyboardconfig.cpp:117
 #: src/keyboardconfig.cpp:119 src/keyboardconfig.cpp:121
-#: src/keyboardconfig.cpp:360
+#: src/keyboardconfig.cpp:123 src/keyboardconfig.cpp:125
+#: src/keyboardconfig.cpp:367
 #, c-format
 msgid "Item Shortcut %d"
 msgstr "Prečac do Predmeta %d"
 
-#: src/keyboardconfig.cpp:122
+#: src/keyboardconfig.cpp:126
+msgid "Windows Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:127
 msgid "Help Window"
 msgstr "Prozor za Pomoć"
 
-#: src/keyboardconfig.cpp:124
+#: src/keyboardconfig.cpp:129
 msgid "Status Window"
 msgstr "Prozor Statusa"
 
-#: src/keyboardconfig.cpp:126
+#: src/keyboardconfig.cpp:131
 msgid "Inventory Window"
 msgstr "Prozor Inventara"
 
-#: src/keyboardconfig.cpp:128
+#: src/keyboardconfig.cpp:133
 msgid "Equipment Window"
 msgstr "Prozor Opreme"
 
-#: src/keyboardconfig.cpp:130
+#: src/keyboardconfig.cpp:135
 msgid "Skill Window"
 msgstr "Prozor Vještine"
 
-#: src/keyboardconfig.cpp:132
+#: src/keyboardconfig.cpp:137
 msgid "Minimap Window"
 msgstr "Prozor Minikarte"
 
-#: src/keyboardconfig.cpp:134
+#: src/keyboardconfig.cpp:139
 msgid "Chat Window"
 msgstr "Chat Prozor"
 
-#: src/keyboardconfig.cpp:136
+#: src/keyboardconfig.cpp:141
 msgid "Item Shortcut Window"
 msgstr "Prozor za Prečice do Predmeta"
 
-#: src/keyboardconfig.cpp:138
+#: src/keyboardconfig.cpp:143
 msgid "Setup Window"
 msgstr "Prozor za Postavke"
 
-#: src/keyboardconfig.cpp:140
+#: src/keyboardconfig.cpp:145
 msgid "Debug Window"
 msgstr "Debug Prozor"
 
-#: src/keyboardconfig.cpp:142
+#: src/keyboardconfig.cpp:147
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:144
+#: src/keyboardconfig.cpp:149
 msgid "Emote Shortcut Window"
 msgstr "Prozor Prečica za Ispoljavanje emocija"
 
-#: src/keyboardconfig.cpp:146
+#: src/keyboardconfig.cpp:151
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:148
+#: src/keyboardconfig.cpp:153
 msgid "Shop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:150
+#: src/keyboardconfig.cpp:155
 msgid "Quick drop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:152
+#: src/keyboardconfig.cpp:157
 msgid "Kill Stats Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:154
+#: src/keyboardconfig.cpp:159
 msgid "Commands Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:156
+#: src/keyboardconfig.cpp:161
 msgid "Bot Checker Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboardconfig.cpp:164
 msgid "Who Is Online Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboardconfig.cpp:166
 msgid "Did you know Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:164
+#: src/keyboardconfig.cpp:169
 msgid "Previous Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:166
+#: src/keyboardconfig.cpp:171
 msgid "Next Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:168 src/keyboardconfig.cpp:170
-#: src/keyboardconfig.cpp:172 src/keyboardconfig.cpp:174
-#: src/keyboardconfig.cpp:176 src/keyboardconfig.cpp:178
-#: src/keyboardconfig.cpp:180 src/keyboardconfig.cpp:182
-#: src/keyboardconfig.cpp:184 src/keyboardconfig.cpp:186
-#: src/keyboardconfig.cpp:188 src/keyboardconfig.cpp:190
-#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
-#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
-#: src/keyboardconfig.cpp:201 src/keyboardconfig.cpp:203
-#: src/keyboardconfig.cpp:205 src/keyboardconfig.cpp:207
-#: src/keyboardconfig.cpp:209 src/keyboardconfig.cpp:211
-#: src/keyboardconfig.cpp:213 src/keyboardconfig.cpp:215
-#: src/keyboardconfig.cpp:217 src/keyboardconfig.cpp:220
-#: src/keyboardconfig.cpp:223 src/keyboardconfig.cpp:226
-#: src/keyboardconfig.cpp:228 src/keyboardconfig.cpp:230
-#: src/keyboardconfig.cpp:232 src/keyboardconfig.cpp:234
-#: src/keyboardconfig.cpp:236 src/keyboardconfig.cpp:238
-#: src/keyboardconfig.cpp:240 src/keyboardconfig.cpp:242
-#: src/keyboardconfig.cpp:244 src/keyboardconfig.cpp:247
-#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
-#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
-#: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:259
-#: src/keyboardconfig.cpp:355
+#: src/keyboardconfig.cpp:173
+msgid "Emotes Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:174
+msgid "Smilie"
+msgstr "Smajlić"
+
+#: src/keyboardconfig.cpp:175 src/keyboardconfig.cpp:177
+#: src/keyboardconfig.cpp:179 src/keyboardconfig.cpp:181
+#: src/keyboardconfig.cpp:183 src/keyboardconfig.cpp:185
+#: src/keyboardconfig.cpp:187 src/keyboardconfig.cpp:189
+#: src/keyboardconfig.cpp:191 src/keyboardconfig.cpp:193
+#: src/keyboardconfig.cpp:195 src/keyboardconfig.cpp:197
+#: src/keyboardconfig.cpp:200 src/keyboardconfig.cpp:202
+#: src/keyboardconfig.cpp:204 src/keyboardconfig.cpp:206
+#: src/keyboardconfig.cpp:208 src/keyboardconfig.cpp:210
+#: src/keyboardconfig.cpp:212 src/keyboardconfig.cpp:214
+#: src/keyboardconfig.cpp:216 src/keyboardconfig.cpp:218
+#: src/keyboardconfig.cpp:220 src/keyboardconfig.cpp:222
+#: src/keyboardconfig.cpp:224 src/keyboardconfig.cpp:227
+#: src/keyboardconfig.cpp:230 src/keyboardconfig.cpp:233
+#: src/keyboardconfig.cpp:235 src/keyboardconfig.cpp:237
+#: src/keyboardconfig.cpp:239 src/keyboardconfig.cpp:241
+#: src/keyboardconfig.cpp:243 src/keyboardconfig.cpp:245
+#: src/keyboardconfig.cpp:247 src/keyboardconfig.cpp:249
+#: src/keyboardconfig.cpp:251 src/keyboardconfig.cpp:254
+#: src/keyboardconfig.cpp:256 src/keyboardconfig.cpp:258
+#: src/keyboardconfig.cpp:260 src/keyboardconfig.cpp:262
+#: src/keyboardconfig.cpp:264 src/keyboardconfig.cpp:266
+#: src/keyboardconfig.cpp:362
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "Prečica za Ispoljavanje emocija %d"
 
-#: src/keyboardconfig.cpp:261
+#: src/keyboardconfig.cpp:268
+msgid "Outfits Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:269
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:263
+#: src/keyboardconfig.cpp:271
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:265
+#: src/keyboardconfig.cpp:273
 msgid "Copy equipped to Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:267
+#: src/keyboardconfig.cpp:275
+#, fuzzy
+msgid "Chat Keys"
+msgstr "Chat"
+
+#: src/keyboardconfig.cpp:276
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:269
+#: src/keyboardconfig.cpp:278
 msgid "Scroll Chat Up"
 msgstr "Pomakni Chat Gore"
 
-#: src/keyboardconfig.cpp:271
+#: src/keyboardconfig.cpp:280
 msgid "Scroll Chat Down"
 msgstr "Pomakni Chat Dolje"
 
-#: src/keyboardconfig.cpp:273
+#: src/keyboardconfig.cpp:282
 msgid "Previous Chat Tab"
 msgstr "Prethodna Chat Kartica"
 
-#: src/keyboardconfig.cpp:275
+#: src/keyboardconfig.cpp:284
 msgid "Next Chat Tab"
 msgstr "Sljedeća Chat Kartica"
 
-#: src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:287
 msgid "Close current Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:280
+#: src/keyboardconfig.cpp:289
 msgid "Previous chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:282
+#: src/keyboardconfig.cpp:291
 msgid "Next chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:284
+#: src/keyboardconfig.cpp:293
 msgid "Chat Auto Complete"
 msgstr ""
 
-#: src/keyboardconfig.cpp:286
+#: src/keyboardconfig.cpp:295
 msgid "Deactivate Chat Input"
 msgstr ""
 
-#: src/keyboardconfig.cpp:288
-msgid "Select OK"
-msgstr "Odaberite OK"
+#: src/keyboardconfig.cpp:297
+msgid "Other Keys"
+msgstr ""
 
-#: src/keyboardconfig.cpp:291
+#: src/keyboardconfig.cpp:298
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:293
+#: src/keyboardconfig.cpp:300
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:295
+#: src/keyboardconfig.cpp:302
 msgid "Direct Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:296
+#: src/keyboardconfig.cpp:303
 msgid "Direct Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboardconfig.cpp:305
 msgid "Direct Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:299
+#: src/keyboardconfig.cpp:306
 msgid "Direct Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:301
+#: src/keyboardconfig.cpp:308
 msgid "Crazy moves"
 msgstr ""
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboardconfig.cpp:310
 msgid "Change Crazy Move mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboardconfig.cpp:312
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboardconfig.cpp:314
 msgid "Quick Drop N Items"
 msgstr ""
 
-#: src/keyboardconfig.cpp:309
+#: src/keyboardconfig.cpp:316
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/keyboardconfig.cpp:311
+#: src/keyboardconfig.cpp:318
 msgid "Quick heal target or self"
 msgstr ""
 
-#: src/keyboardconfig.cpp:313
+#: src/keyboardconfig.cpp:320
 msgid "Use #itenplz spell"
 msgstr ""
 
-#: src/keyboardconfig.cpp:315
+#: src/keyboardconfig.cpp:322
 msgid "Use magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:317
+#: src/keyboardconfig.cpp:324
 msgid "Switch magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:319
+#: src/keyboardconfig.cpp:326
 msgid "Change move type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:321
+#: src/keyboardconfig.cpp:328
 msgid "Change Attack Weapon Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:323
+#: src/keyboardconfig.cpp:330
 msgid "Change Attack Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:325
+#: src/keyboardconfig.cpp:332
 msgid "Change Follow mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:327
+#: src/keyboardconfig.cpp:334
 msgid "Change Imitation mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboardconfig.cpp:337
 msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:331
+#: src/keyboardconfig.cpp:338
 msgid "On / Off audio"
 msgstr ""
 
-#: src/keyboardconfig.cpp:333
+#: src/keyboardconfig.cpp:340
 msgid "Enable / Disable away mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:335
+#: src/keyboardconfig.cpp:342
 msgid "Emulate right click from keyboard"
 msgstr ""
 
-#: src/keyboardconfig.cpp:337
+#: src/keyboardconfig.cpp:344
 msgid "Toggle camera mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:339
+#: src/keyboardconfig.cpp:346
 msgid "Modifier key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:411
+#: src/keyboardconfig.cpp:425
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:377
+#: src/localplayer.cpp:380
 msgid "You were killed by "
 msgstr ""
 
-#: src/localplayer.cpp:1416
+#: src/localplayer.cpp:1422
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1418
+#: src/localplayer.cpp:1424
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1420
+#: src/localplayer.cpp:1426
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1422
+#: src/localplayer.cpp:1428
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1424
+#: src/localplayer.cpp:1430
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1427
+#: src/localplayer.cpp:1433
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1430
+#: src/localplayer.cpp:1436
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1454
+#: src/localplayer.cpp:1460
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -4220,27 +4254,27 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/localplayer.cpp:3168
+#: src/localplayer.cpp:3174
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:3468
+#: src/localplayer.cpp:3494
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3470 src/localplayer.cpp:3485
+#: src/localplayer.cpp:3496 src/localplayer.cpp:3511
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3477
+#: src/localplayer.cpp:3503
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3479 src/localplayer.cpp:3487
+#: src/localplayer.cpp:3505 src/localplayer.cpp:3513
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3832
+#: src/localplayer.cpp:3858
 msgid "You see "
 msgstr ""
 
@@ -4621,15 +4655,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:286
+#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:284
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:296
+#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:294
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:306
+#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:304
 msgid "Item sharing not possible."
 msgstr ""
 
@@ -4637,15 +4671,15 @@ msgstr ""
 msgid "Item sharing unknown."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:248
+#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:246
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:258
+#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:256
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:268
+#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:266
 msgid "Experience sharing not possible."
 msgstr ""
 
@@ -4724,54 +4758,54 @@ msgstr ""
 msgid "Username permanently erased."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:82
+#: src/net/ea/partyhandler.cpp:80
 msgid "Could not create party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:84
+#: src/net/ea/partyhandler.cpp:82
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:140
+#: src/net/ea/partyhandler.cpp:138
 #, c-format
 msgid "%s has joined your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:176
+#: src/net/ea/partyhandler.cpp:174
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:181
+#: src/net/ea/partyhandler.cpp:179
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:186
+#: src/net/ea/partyhandler.cpp:184
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:191
+#: src/net/ea/partyhandler.cpp:189
 #, c-format
 msgid "%s can't join your party because party is full."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:196
+#: src/net/ea/partyhandler.cpp:194
 #, c-format
 msgid "QQQ Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:356
+#: src/net/ea/partyhandler.cpp:354
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:369
+#: src/net/ea/partyhandler.cpp:367
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:448
+#: src/net/ea/partyhandler.cpp:446
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
@@ -4925,83 +4959,83 @@ msgstr ""
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:149
+#: src/net/ea/specialhandler.cpp:146
 msgid "Trade failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:152
+#: src/net/ea/specialhandler.cpp:149
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:155
+#: src/net/ea/specialhandler.cpp:152
 msgid "Sit failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:158
+#: src/net/ea/specialhandler.cpp:155
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:161
+#: src/net/ea/specialhandler.cpp:158
 msgid "Could not join party!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:164
+#: src/net/ea/specialhandler.cpp:161
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:177
+#: src/net/ea/specialhandler.cpp:174
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:181
+#: src/net/ea/specialhandler.cpp:178
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:184
+#: src/net/ea/specialhandler.cpp:181
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:187
+#: src/net/ea/specialhandler.cpp:184
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:190
+#: src/net/ea/specialhandler.cpp:187
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:193
+#: src/net/ea/specialhandler.cpp:190
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:196
+#: src/net/ea/specialhandler.cpp:193
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:200
+#: src/net/ea/specialhandler.cpp:197
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:203
+#: src/net/ea/specialhandler.cpp:200
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:206
+#: src/net/ea/specialhandler.cpp:203
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:209
+#: src/net/ea/specialhandler.cpp:206
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:220
+#: src/net/ea/specialhandler.cpp:217
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:223
+#: src/net/ea/specialhandler.cpp:220
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:226
+#: src/net/ea/specialhandler.cpp:223
 msgid "Poison had no effect..."
 msgstr ""
 
diff --git a/po/hu.po b/po/hu.po
index b622ecf27..5d4144367 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-09-17 16:12+0300\n"
+"POT-Creation-Date: 2011-09-27 22:18+0300\n"
 "PO-Revision-Date: 2011-08-09 22:16+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,25 +17,25 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: src/actorspritemanager.cpp:1088
+#: src/actorspritemanager.cpp:1133
 msgid "Visible on map"
 msgstr ""
 
-#: src/being.cpp:548
+#: src/being.cpp:547
 msgid "dodge"
 msgstr ""
 
-#: src/being.cpp:548
+#: src/being.cpp:547
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1527
+#: src/being.cpp:1526
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1532
+#: src/being.cpp:1531
 msgid "I"
 msgstr ""
 
@@ -43,43 +43,43 @@ msgstr ""
 msgid "Setup"
 msgstr "Beállítások"
 
-#: src/client.cpp:841 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:842 src/gui/setup_perfomance.cpp:48
 msgid "Perfomance"
 msgstr ""
 
-#: src/client.cpp:846 src/gui/setup_video.cpp:315
+#: src/client.cpp:847 src/gui/setup_video.cpp:315
 msgid "Video"
 msgstr "Videó"
 
-#: src/client.cpp:851
+#: src/client.cpp:852
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:932
+#: src/client.cpp:934
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:963
+#: src/client.cpp:965
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:996
+#: src/client.cpp:998
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1096
+#: src/client.cpp:1098
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:1127
+#: src/client.cpp:1129
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:1137
+#: src/client.cpp:1139
 msgid "Changing game servers"
 msgstr ""
 
-#: src/client.cpp:1180 src/client.cpp:1187 src/client.cpp:1321
+#: src/client.cpp:1182 src/client.cpp:1189 src/client.cpp:1323
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:221 src/gui/charselectdialog.cpp:253
 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
@@ -89,50 +89,50 @@ msgstr ""
 msgid "Error"
 msgstr "Hiba"
 
-#: src/client.cpp:1196
+#: src/client.cpp:1198
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1222
+#: src/client.cpp:1224
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:1223
+#: src/client.cpp:1225
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1242
+#: src/client.cpp:1244
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:1243
+#: src/client.cpp:1245
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1263
+#: src/client.cpp:1265
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:1264
+#: src/client.cpp:1266
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1463 src/client.cpp:1493 src/client.cpp:1508
-#: src/client.cpp:1933 src/client.cpp:1940
+#: src/client.cpp:1465 src/client.cpp:1495 src/client.cpp:1510
+#: src/client.cpp:1935 src/client.cpp:1942
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1639
+#: src/client.cpp:1641
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1673 src/client.cpp:1679
+#: src/client.cpp:1675 src/client.cpp:1681
 msgid "Error creating updates directory!"
 msgstr "Hiba a frissítési könyvtár létrehozása közben!"
 
-#: src/client.cpp:1700
+#: src/client.cpp:1702
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -341,11 +341,11 @@ msgstr "Kereskedési kérelmek elutasítása"
 msgid "Accepting incoming trade requests"
 msgstr "Kereskedési kérelmek elfogadása"
 
-#: src/game.cpp:1729
+#: src/game.cpp:1727
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:1730
+#: src/game.cpp:1728
 #, c-format
 msgid "Error while loading %s"
 msgstr "Hiba %s betöltése közben"
@@ -380,7 +380,7 @@ msgstr "Név"
 
 #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:133
 #: src/gui/popupmenu.cpp:283 src/gui/popupmenu.cpp:596
-#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:265
+#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:265
 msgid "Attack"
 msgstr "Támadás"
 
@@ -434,7 +434,7 @@ msgstr ""
 #: src/gui/buydialog.cpp:99 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:294
-#: src/keyboardconfig.cpp:290
+#: src/keyboardconfig.cpp:82
 msgid "Quit"
 msgstr "Kilépés"
 
@@ -469,7 +469,7 @@ msgstr "Eladás"
 #: src/gui/popupmenu.cpp:1858 src/gui/popupmenu.cpp:1897
 #: src/gui/popupmenu.cpp:1949 src/gui/popupmenu.cpp:1969
 #: src/gui/quitdialog.cpp:55 src/gui/register.cpp:82 src/gui/setup.cpp:72
-#: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:238
+#: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:241
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
 #: src/gui/updaterwindow.cpp:161
 msgid "Cancel"
@@ -638,8 +638,8 @@ msgid "Enter password:"
 msgstr ""
 
 #: src/gui/charselectdialog.cpp:410 src/gui/serverdialog.cpp:298
-#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:122
-#: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:241
+#: src/gui/setup_relations.cpp:242 src/gui/shopwindow.cpp:122
+#: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244
 msgid "Delete"
 msgstr "Törlés"
 
@@ -891,7 +891,7 @@ msgid "Did You Know?"
 msgstr ""
 
 #: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
-#: src/gui/inventorywindow.cpp:206 src/gui/npcdialog.cpp:53
+#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:53
 #: src/gui/popupmenu.cpp:556 src/gui/shopwindow.cpp:113
 msgid "Close"
 msgstr "Bezár"
@@ -918,7 +918,7 @@ msgid "Equipment"
 msgstr "Felszerelés"
 
 #: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160
-#: src/gui/inventorywindow.cpp:539 src/gui/inventorywindow.cpp:548
+#: src/gui/inventorywindow.cpp:538 src/gui/inventorywindow.cpp:547
 #: src/gui/popupmenu.cpp:1656 src/gui/popupmenu.cpp:1748
 #: src/gui/popupmenu.cpp:1793
 msgid "Unequip"
@@ -950,37 +950,33 @@ msgstr ""
 msgid "by type"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:111 src/gui/windowmenu.cpp:76
+#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:76
 #: src/inventory.cpp:249
 msgid "Inventory"
 msgstr "Táska"
 
-#: src/gui/inventorywindow.cpp:136
+#: src/gui/inventorywindow.cpp:137
 msgid "Slots:"
 msgstr "Hely:"
 
-#: src/gui/inventorywindow.cpp:148
-msgid "Filter:"
-msgstr ""
-
 #: src/gui/inventorywindow.cpp:149
-msgid "Sort:"
+msgid "Filter:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:541
-#: src/gui/inventorywindow.cpp:550 src/gui/popupmenu.cpp:1658
+#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:540
+#: src/gui/inventorywindow.cpp:549 src/gui/popupmenu.cpp:1658
 #: src/gui/popupmenu.cpp:1750 src/gui/popupmenu.cpp:1795
 msgid "Equip"
 msgstr "Használ"
 
-#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:542
-#: src/gui/inventorywindow.cpp:546 src/gui/popupmenu.cpp:1662
+#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:541
+#: src/gui/inventorywindow.cpp:545 src/gui/popupmenu.cpp:1662
 #: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1754
 #: src/gui/popupmenu.cpp:1799
 msgid "Use"
 msgstr "Bevet"
 
-#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:646
+#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:645
 #: src/gui/popupmenu.cpp:1667 src/gui/popupmenu.cpp:1759
 #: src/gui/popupmenu.cpp:1804
 msgid "Drop..."
@@ -1000,17 +996,17 @@ msgstr ""
 msgid "Weight:"
 msgstr "Súly:"
 
-#: src/gui/inventorywindow.cpp:204 src/gui/inventorywindow.cpp:637
+#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:636
 #: src/gui/popupmenu.cpp:1642 src/gui/popupmenu.cpp:1771
 #: src/gui/popupmenu.cpp:1816 src/gui/setup.cpp:73
 msgid "Store"
 msgstr "Raktároz"
 
-#: src/gui/inventorywindow.cpp:205 src/gui/popupmenu.cpp:1683
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1683
 msgid "Retrieve"
 msgstr "Magához vesz"
 
-#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1672
+#: src/gui/inventorywindow.cpp:647 src/gui/popupmenu.cpp:1672
 #: src/gui/popupmenu.cpp:1764 src/gui/popupmenu.cpp:1809
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
@@ -2201,30 +2197,34 @@ msgid "Show own name"
 msgstr ""
 
 #: src/gui/setup_players.cpp:63
-msgid "Target dead players"
+msgid "Enable extended mouse targeting"
 msgstr ""
 
 #: src/gui/setup_players.cpp:66
+msgid "Target dead players"
+msgstr ""
+
+#: src/gui/setup_players.cpp:69
 msgid "Visible names"
 msgstr "Látható nevek"
 
-#: src/gui/setup_players.cpp:69
+#: src/gui/setup_players.cpp:72
 msgid "Secure trades"
 msgstr ""
 
-#: src/gui/setup_players.cpp:72
+#: src/gui/setup_players.cpp:75
 msgid "Unsecure chars in names"
 msgstr ""
 
-#: src/gui/setup_players.cpp:75
+#: src/gui/setup_players.cpp:78
 msgid "Show statuses"
 msgstr ""
 
-#: src/gui/setup_players.cpp:78
+#: src/gui/setup_players.cpp:81
 msgid "Show ip addresses on screenshots"
 msgstr ""
 
-#: src/gui/setup_players.cpp:81
+#: src/gui/setup_players.cpp:84
 msgid "Allow self heal with mouse click"
 msgstr ""
 
@@ -2252,23 +2252,23 @@ msgstr "Tiltott"
 msgid "Erased"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:239
+#: src/gui/setup_relations.cpp:238
 msgid "Allow trading"
 msgstr "Üzletelés engedélyezése"
 
-#: src/gui/setup_relations.cpp:241
+#: src/gui/setup_relations.cpp:240
 msgid "Allow whispers"
 msgstr "Privát engedélyezése"
 
-#: src/gui/setup_relations.cpp:244
+#: src/gui/setup_relations.cpp:243
 msgid "Old"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:246
+#: src/gui/setup_relations.cpp:245
 msgid "Relations"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:271
+#: src/gui/setup_relations.cpp:270
 msgid "When ignoring:"
 msgstr "Ha ignorolva van:"
 
@@ -3235,30 +3235,34 @@ msgid "Command:"
 msgstr ""
 
 #: src/gui/textcommandeditor.cpp:200
+msgid "Comment:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:203
 msgid "Mana:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:206
+#: src/gui/textcommandeditor.cpp:209
 msgid "Target Type:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:212
+#: src/gui/textcommandeditor.cpp:215
 msgid "Icon:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:218
+#: src/gui/textcommandeditor.cpp:221
 msgid "Magic level:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:224
+#: src/gui/textcommandeditor.cpp:227
 msgid "Magic School:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:230
+#: src/gui/textcommandeditor.cpp:233
 msgid "School level:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:235
+#: src/gui/textcommandeditor.cpp:238
 msgid "Save"
 msgstr ""
 
@@ -3487,23 +3491,23 @@ msgstr ""
 msgid "Road Point"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:474
+#: src/gui/whoisonline.cpp:85 src/gui/whoisonline.cpp:478
 msgid "Who Is Online - Updating"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:104
+#: src/gui/whoisonline.cpp:108
 msgid "Update"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:297
+#: src/gui/whoisonline.cpp:301
 msgid "Who Is Online - "
 msgstr ""
 
-#: src/gui/whoisonline.cpp:488
+#: src/gui/whoisonline.cpp:492
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:519
+#: src/gui/whoisonline.cpp:523
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -3785,49 +3789,49 @@ msgid "Cart"
 msgstr ""
 
 #: src/keyboardconfig.cpp:43
+msgid "Basic Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:44
 msgid "Move Up"
 msgstr "Mozgás felfelé"
 
-#: src/keyboardconfig.cpp:44
+#: src/keyboardconfig.cpp:45
 msgid "Move Down"
 msgstr "Mozgás lefelé"
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:46
 msgid "Move Left"
 msgstr "Mozgás balra"
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:47
 msgid "Move Right"
 msgstr "Mozgás jobbra"
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:50
 msgid "Target & Attack"
 msgstr "Kijelöl és Támad"
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:52
 msgid "Move to Target"
 msgstr ""
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:54
 msgid "Change Move to Target type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:56
 msgid "Move to Home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:58
 msgid "Set home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:59
+#: src/keyboardconfig.cpp:60
 msgid "Move to navigation point"
 msgstr ""
 
-#: src/keyboardconfig.cpp:61
-msgid "Smilie"
-msgstr "Hangulatjel"
-
 #: src/keyboardconfig.cpp:63
 msgid "Stop Attack"
 msgstr "Támadás Megszüntetése"
@@ -3873,368 +3877,398 @@ msgid "Change Map View Mode"
 msgstr ""
 
 #: src/keyboardconfig.cpp:80
+msgid "Select OK"
+msgstr "Ok Kiválasztása"
+
+#: src/keyboardconfig.cpp:83
+#, fuzzy
+msgid "Shortcuts Keys"
+msgstr "Gyorsmenü %d"
+
+#: src/keyboardconfig.cpp:84
 msgid "Item Shortcuts Key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82 src/keyboardconfig.cpp:84
 #: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:88
 #: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:92
 #: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:96
 #: src/keyboardconfig.cpp:98 src/keyboardconfig.cpp:100
 #: src/keyboardconfig.cpp:102 src/keyboardconfig.cpp:104
 #: src/keyboardconfig.cpp:106 src/keyboardconfig.cpp:108
-#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:113
-#: src/keyboardconfig.cpp:115 src/keyboardconfig.cpp:117
+#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:112
+#: src/keyboardconfig.cpp:114 src/keyboardconfig.cpp:117
 #: src/keyboardconfig.cpp:119 src/keyboardconfig.cpp:121
-#: src/keyboardconfig.cpp:360
+#: src/keyboardconfig.cpp:123 src/keyboardconfig.cpp:125
+#: src/keyboardconfig.cpp:367
 #, c-format
 msgid "Item Shortcut %d"
 msgstr "Gyorsmenü %d"
 
-#: src/keyboardconfig.cpp:122
+#: src/keyboardconfig.cpp:126
+msgid "Windows Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:127
 msgid "Help Window"
 msgstr "Súgó Ablak"
 
-#: src/keyboardconfig.cpp:124
+#: src/keyboardconfig.cpp:129
 msgid "Status Window"
 msgstr "Sztátusz Ablak"
 
-#: src/keyboardconfig.cpp:126
+#: src/keyboardconfig.cpp:131
 msgid "Inventory Window"
 msgstr "Táska Ablak"
 
-#: src/keyboardconfig.cpp:128
+#: src/keyboardconfig.cpp:133
 msgid "Equipment Window"
 msgstr "Felszerelés Ablak"
 
-#: src/keyboardconfig.cpp:130
+#: src/keyboardconfig.cpp:135
 msgid "Skill Window"
 msgstr "Képességek Ablak"
 
-#: src/keyboardconfig.cpp:132
+#: src/keyboardconfig.cpp:137
 msgid "Minimap Window"
 msgstr "Minitérkép Ablak"
 
-#: src/keyboardconfig.cpp:134
+#: src/keyboardconfig.cpp:139
 msgid "Chat Window"
 msgstr "Chat Ablak"
 
-#: src/keyboardconfig.cpp:136
+#: src/keyboardconfig.cpp:141
 msgid "Item Shortcut Window"
 msgstr "Gyorsmenü Ablak"
 
-#: src/keyboardconfig.cpp:138
+#: src/keyboardconfig.cpp:143
 msgid "Setup Window"
 msgstr "Beállítások Ablak"
 
-#: src/keyboardconfig.cpp:140
+#: src/keyboardconfig.cpp:145
 msgid "Debug Window"
 msgstr "Hibakereső Ablak"
 
-#: src/keyboardconfig.cpp:142
+#: src/keyboardconfig.cpp:147
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:144
+#: src/keyboardconfig.cpp:149
 msgid "Emote Shortcut Window"
 msgstr "Hangulatjel Gyorsmenü Ablak"
 
-#: src/keyboardconfig.cpp:146
+#: src/keyboardconfig.cpp:151
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:148
+#: src/keyboardconfig.cpp:153
 msgid "Shop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:150
+#: src/keyboardconfig.cpp:155
 msgid "Quick drop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:152
+#: src/keyboardconfig.cpp:157
 msgid "Kill Stats Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:154
+#: src/keyboardconfig.cpp:159
 msgid "Commands Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:156
+#: src/keyboardconfig.cpp:161
 msgid "Bot Checker Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboardconfig.cpp:164
 msgid "Who Is Online Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboardconfig.cpp:166
 msgid "Did you know Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:164
+#: src/keyboardconfig.cpp:169
 msgid "Previous Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:166
+#: src/keyboardconfig.cpp:171
 msgid "Next Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:168 src/keyboardconfig.cpp:170
-#: src/keyboardconfig.cpp:172 src/keyboardconfig.cpp:174
-#: src/keyboardconfig.cpp:176 src/keyboardconfig.cpp:178
-#: src/keyboardconfig.cpp:180 src/keyboardconfig.cpp:182
-#: src/keyboardconfig.cpp:184 src/keyboardconfig.cpp:186
-#: src/keyboardconfig.cpp:188 src/keyboardconfig.cpp:190
-#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
-#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
-#: src/keyboardconfig.cpp:201 src/keyboardconfig.cpp:203
-#: src/keyboardconfig.cpp:205 src/keyboardconfig.cpp:207
-#: src/keyboardconfig.cpp:209 src/keyboardconfig.cpp:211
-#: src/keyboardconfig.cpp:213 src/keyboardconfig.cpp:215
-#: src/keyboardconfig.cpp:217 src/keyboardconfig.cpp:220
-#: src/keyboardconfig.cpp:223 src/keyboardconfig.cpp:226
-#: src/keyboardconfig.cpp:228 src/keyboardconfig.cpp:230
-#: src/keyboardconfig.cpp:232 src/keyboardconfig.cpp:234
-#: src/keyboardconfig.cpp:236 src/keyboardconfig.cpp:238
-#: src/keyboardconfig.cpp:240 src/keyboardconfig.cpp:242
-#: src/keyboardconfig.cpp:244 src/keyboardconfig.cpp:247
-#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
-#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
-#: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:259
-#: src/keyboardconfig.cpp:355
+#: src/keyboardconfig.cpp:173
+msgid "Emotes Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:174
+msgid "Smilie"
+msgstr "Hangulatjel"
+
+#: src/keyboardconfig.cpp:175 src/keyboardconfig.cpp:177
+#: src/keyboardconfig.cpp:179 src/keyboardconfig.cpp:181
+#: src/keyboardconfig.cpp:183 src/keyboardconfig.cpp:185
+#: src/keyboardconfig.cpp:187 src/keyboardconfig.cpp:189
+#: src/keyboardconfig.cpp:191 src/keyboardconfig.cpp:193
+#: src/keyboardconfig.cpp:195 src/keyboardconfig.cpp:197
+#: src/keyboardconfig.cpp:200 src/keyboardconfig.cpp:202
+#: src/keyboardconfig.cpp:204 src/keyboardconfig.cpp:206
+#: src/keyboardconfig.cpp:208 src/keyboardconfig.cpp:210
+#: src/keyboardconfig.cpp:212 src/keyboardconfig.cpp:214
+#: src/keyboardconfig.cpp:216 src/keyboardconfig.cpp:218
+#: src/keyboardconfig.cpp:220 src/keyboardconfig.cpp:222
+#: src/keyboardconfig.cpp:224 src/keyboardconfig.cpp:227
+#: src/keyboardconfig.cpp:230 src/keyboardconfig.cpp:233
+#: src/keyboardconfig.cpp:235 src/keyboardconfig.cpp:237
+#: src/keyboardconfig.cpp:239 src/keyboardconfig.cpp:241
+#: src/keyboardconfig.cpp:243 src/keyboardconfig.cpp:245
+#: src/keyboardconfig.cpp:247 src/keyboardconfig.cpp:249
+#: src/keyboardconfig.cpp:251 src/keyboardconfig.cpp:254
+#: src/keyboardconfig.cpp:256 src/keyboardconfig.cpp:258
+#: src/keyboardconfig.cpp:260 src/keyboardconfig.cpp:262
+#: src/keyboardconfig.cpp:264 src/keyboardconfig.cpp:266
+#: src/keyboardconfig.cpp:362
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "Hangulatjel Gyorsmenü %d"
 
-#: src/keyboardconfig.cpp:261
+#: src/keyboardconfig.cpp:268
+msgid "Outfits Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:269
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:263
+#: src/keyboardconfig.cpp:271
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:265
+#: src/keyboardconfig.cpp:273
 msgid "Copy equipped to Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:267
+#: src/keyboardconfig.cpp:275
+#, fuzzy
+msgid "Chat Keys"
+msgstr "Chat"
+
+#: src/keyboardconfig.cpp:276
 msgid "Toggle Chat"
 msgstr "Chat Ki/Be Kapcsolása"
 
-#: src/keyboardconfig.cpp:269
+#: src/keyboardconfig.cpp:278
 msgid "Scroll Chat Up"
 msgstr "Csevej Felfele Görgetése"
 
-#: src/keyboardconfig.cpp:271
+#: src/keyboardconfig.cpp:280
 msgid "Scroll Chat Down"
 msgstr "Csevej Lefele Görgetése"
 
-#: src/keyboardconfig.cpp:273
+#: src/keyboardconfig.cpp:282
 msgid "Previous Chat Tab"
 msgstr "Előző Chat Fül"
 
-#: src/keyboardconfig.cpp:275
+#: src/keyboardconfig.cpp:284
 msgid "Next Chat Tab"
 msgstr "Következő Chat Fül"
 
-#: src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:287
 msgid "Close current Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:280
+#: src/keyboardconfig.cpp:289
 msgid "Previous chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:282
+#: src/keyboardconfig.cpp:291
 msgid "Next chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:284
+#: src/keyboardconfig.cpp:293
 msgid "Chat Auto Complete"
 msgstr ""
 
-#: src/keyboardconfig.cpp:286
+#: src/keyboardconfig.cpp:295
 msgid "Deactivate Chat Input"
 msgstr ""
 
-#: src/keyboardconfig.cpp:288
-msgid "Select OK"
-msgstr "Ok Kiválasztása"
+#: src/keyboardconfig.cpp:297
+msgid "Other Keys"
+msgstr ""
 
-#: src/keyboardconfig.cpp:291
+#: src/keyboardconfig.cpp:298
 msgid "Ignore input 1"
 msgstr "Ignore input 1"
 
-#: src/keyboardconfig.cpp:293
+#: src/keyboardconfig.cpp:300
 msgid "Ignore input 2"
 msgstr "Ignore input 2"
 
-#: src/keyboardconfig.cpp:295
+#: src/keyboardconfig.cpp:302
 msgid "Direct Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:296
+#: src/keyboardconfig.cpp:303
 msgid "Direct Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboardconfig.cpp:305
 msgid "Direct Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:299
+#: src/keyboardconfig.cpp:306
 msgid "Direct Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:301
+#: src/keyboardconfig.cpp:308
 msgid "Crazy moves"
 msgstr ""
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboardconfig.cpp:310
 msgid "Change Crazy Move mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboardconfig.cpp:312
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboardconfig.cpp:314
 msgid "Quick Drop N Items"
 msgstr ""
 
-#: src/keyboardconfig.cpp:309
+#: src/keyboardconfig.cpp:316
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/keyboardconfig.cpp:311
+#: src/keyboardconfig.cpp:318
 msgid "Quick heal target or self"
 msgstr ""
 
-#: src/keyboardconfig.cpp:313
+#: src/keyboardconfig.cpp:320
 msgid "Use #itenplz spell"
 msgstr ""
 
-#: src/keyboardconfig.cpp:315
+#: src/keyboardconfig.cpp:322
 msgid "Use magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:317
+#: src/keyboardconfig.cpp:324
 msgid "Switch magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:319
+#: src/keyboardconfig.cpp:326
 msgid "Change move type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:321
+#: src/keyboardconfig.cpp:328
 msgid "Change Attack Weapon Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:323
+#: src/keyboardconfig.cpp:330
 msgid "Change Attack Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:325
+#: src/keyboardconfig.cpp:332
 msgid "Change Follow mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:327
+#: src/keyboardconfig.cpp:334
 msgid "Change Imitation mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboardconfig.cpp:337
 msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:331
+#: src/keyboardconfig.cpp:338
 msgid "On / Off audio"
 msgstr ""
 
-#: src/keyboardconfig.cpp:333
+#: src/keyboardconfig.cpp:340
 msgid "Enable / Disable away mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:335
+#: src/keyboardconfig.cpp:342
 msgid "Emulate right click from keyboard"
 msgstr ""
 
-#: src/keyboardconfig.cpp:337
+#: src/keyboardconfig.cpp:344
 msgid "Toggle camera mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:339
+#: src/keyboardconfig.cpp:346
 msgid "Modifier key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:411
+#: src/keyboardconfig.cpp:425
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:377
+#: src/localplayer.cpp:380
 msgid "You were killed by "
 msgstr ""
 
-#: src/localplayer.cpp:1416
+#: src/localplayer.cpp:1422
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1418
+#: src/localplayer.cpp:1424
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1420
+#: src/localplayer.cpp:1426
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1422
+#: src/localplayer.cpp:1428
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1424
+#: src/localplayer.cpp:1430
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1427
+#: src/localplayer.cpp:1433
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1430
+#: src/localplayer.cpp:1436
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1454
+#: src/localplayer.cpp:1460
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/localplayer.cpp:3168
+#: src/localplayer.cpp:3174
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:3468
+#: src/localplayer.cpp:3494
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3470 src/localplayer.cpp:3485
+#: src/localplayer.cpp:3496 src/localplayer.cpp:3511
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3477
+#: src/localplayer.cpp:3503
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3479 src/localplayer.cpp:3487
+#: src/localplayer.cpp:3505 src/localplayer.cpp:3513
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3832
+#: src/localplayer.cpp:3858
 msgid "You see "
 msgstr ""
 
@@ -4615,15 +4649,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:286
+#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:284
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:296
+#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:294
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:306
+#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:304
 msgid "Item sharing not possible."
 msgstr ""
 
@@ -4631,15 +4665,15 @@ msgstr ""
 msgid "Item sharing unknown."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:248
+#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:246
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:258
+#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:256
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:268
+#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:266
 msgid "Experience sharing not possible."
 msgstr ""
 
@@ -4718,54 +4752,54 @@ msgstr ""
 msgid "Username permanently erased."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:82
+#: src/net/ea/partyhandler.cpp:80
 msgid "Could not create party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:84
+#: src/net/ea/partyhandler.cpp:82
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:140
+#: src/net/ea/partyhandler.cpp:138
 #, c-format
 msgid "%s has joined your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:176
+#: src/net/ea/partyhandler.cpp:174
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:181
+#: src/net/ea/partyhandler.cpp:179
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:186
+#: src/net/ea/partyhandler.cpp:184
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:191
+#: src/net/ea/partyhandler.cpp:189
 #, c-format
 msgid "%s can't join your party because party is full."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:196
+#: src/net/ea/partyhandler.cpp:194
 #, c-format
 msgid "QQQ Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:356
+#: src/net/ea/partyhandler.cpp:354
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:369
+#: src/net/ea/partyhandler.cpp:367
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:448
+#: src/net/ea/partyhandler.cpp:446
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
@@ -4921,83 +4955,83 @@ msgstr ""
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:149
+#: src/net/ea/specialhandler.cpp:146
 msgid "Trade failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:152
+#: src/net/ea/specialhandler.cpp:149
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:155
+#: src/net/ea/specialhandler.cpp:152
 msgid "Sit failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:158
+#: src/net/ea/specialhandler.cpp:155
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:161
+#: src/net/ea/specialhandler.cpp:158
 msgid "Could not join party!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:164
+#: src/net/ea/specialhandler.cpp:161
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:177
+#: src/net/ea/specialhandler.cpp:174
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:181
+#: src/net/ea/specialhandler.cpp:178
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:184
+#: src/net/ea/specialhandler.cpp:181
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:187
+#: src/net/ea/specialhandler.cpp:184
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:190
+#: src/net/ea/specialhandler.cpp:187
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:193
+#: src/net/ea/specialhandler.cpp:190
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:196
+#: src/net/ea/specialhandler.cpp:193
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:200
+#: src/net/ea/specialhandler.cpp:197
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:203
+#: src/net/ea/specialhandler.cpp:200
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:206
+#: src/net/ea/specialhandler.cpp:203
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:209
+#: src/net/ea/specialhandler.cpp:206
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:220
+#: src/net/ea/specialhandler.cpp:217
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:223
+#: src/net/ea/specialhandler.cpp:220
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:226
+#: src/net/ea/specialhandler.cpp:223
 msgid "Poison had no effect..."
 msgstr ""
 
diff --git a/po/id.po b/po/id.po
index 6b3177773..4ae2c1924 100644
--- a/po/id.po
+++ b/po/id.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-09-17 16:12+0300\n"
-"PO-Revision-Date: 2011-09-16 20:12+0000\n"
+"POT-Creation-Date: 2011-09-27 22:18+0300\n"
+"PO-Revision-Date: 2011-09-27 19:20+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: Indonesian (http://www.transifex.net/projects/p/manaplus/team/"
 "id/)\n"
@@ -21,25 +21,25 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: src/actorspritemanager.cpp:1088
+#: src/actorspritemanager.cpp:1133
 msgid "Visible on map"
 msgstr "Terlihat di peta"
 
-#: src/being.cpp:548
+#: src/being.cpp:547
 msgid "dodge"
 msgstr "Menghindar"
 
-#: src/being.cpp:548
+#: src/being.cpp:547
 msgid "miss"
 msgstr "Luput"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1527
+#: src/being.cpp:1526
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1532
+#: src/being.cpp:1531
 msgid "I"
 msgstr "l"
 
@@ -47,43 +47,43 @@ msgstr "l"
 msgid "Setup"
 msgstr "Pengaturan"
 
-#: src/client.cpp:841 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:842 src/gui/setup_perfomance.cpp:48
 msgid "Perfomance"
 msgstr ""
 
-#: src/client.cpp:846 src/gui/setup_video.cpp:315
+#: src/client.cpp:847 src/gui/setup_video.cpp:315
 msgid "Video"
 msgstr "Video"
 
-#: src/client.cpp:851
+#: src/client.cpp:852
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:932
+#: src/client.cpp:934
 msgid "Connecting to server"
 msgstr "Terhubung dengan server"
 
-#: src/client.cpp:963
+#: src/client.cpp:965
 msgid "Logging in"
 msgstr "Masuk"
 
-#: src/client.cpp:996
+#: src/client.cpp:998
 msgid "Entering game world"
 msgstr "Memasuki arena permainan"
 
-#: src/client.cpp:1096
+#: src/client.cpp:1098
 msgid "Requesting characters"
 msgstr "Pemilihan karakter"
 
-#: src/client.cpp:1127
+#: src/client.cpp:1129
 msgid "Connecting to the game server"
 msgstr "terhubung dengan server"
 
-#: src/client.cpp:1137
+#: src/client.cpp:1139
 msgid "Changing game servers"
 msgstr "Pergantian server"
 
-#: src/client.cpp:1180 src/client.cpp:1187 src/client.cpp:1321
+#: src/client.cpp:1182 src/client.cpp:1189 src/client.cpp:1323
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:221 src/gui/charselectdialog.cpp:253
 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
@@ -93,50 +93,50 @@ msgstr "Pergantian server"
 msgid "Error"
 msgstr "Kesalahan"
 
-#: src/client.cpp:1196
+#: src/client.cpp:1198
 msgid "Requesting registration details"
 msgstr "Meminta detail registrasi"
 
-#: src/client.cpp:1222
+#: src/client.cpp:1224
 msgid "Password Change"
 msgstr "Ubah sandi"
 
-#: src/client.cpp:1223
+#: src/client.cpp:1225
 msgid "Password changed successfully!"
 msgstr "Perubahan sandi berhasil"
 
-#: src/client.cpp:1242
+#: src/client.cpp:1244
 msgid "Email Change"
 msgstr "Perubahan email"
 
-#: src/client.cpp:1243
+#: src/client.cpp:1245
 msgid "Email changed successfully!"
 msgstr "Perubahan email berhasil"
 
-#: src/client.cpp:1263
+#: src/client.cpp:1265
 msgid "Unregister Successful"
 msgstr "Telah tidak terdaftar"
 
-#: src/client.cpp:1264
+#: src/client.cpp:1266
 msgid "Farewell, come back any time..."
 msgstr "Selamat tinggal, datang kembali setiap saat"
 
-#: src/client.cpp:1463 src/client.cpp:1493 src/client.cpp:1508
-#: src/client.cpp:1933 src/client.cpp:1940
+#: src/client.cpp:1465 src/client.cpp:1495 src/client.cpp:1510
+#: src/client.cpp:1935 src/client.cpp:1942
 #, 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:1639
+#: src/client.cpp:1641
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Gagal mengupdate host: %s"
 
-#: src/client.cpp:1673 src/client.cpp:1679
+#: src/client.cpp:1675 src/client.cpp:1681
 msgid "Error creating updates directory!"
 msgstr "Gagal membuat direktori update!"
 
-#: src/client.cpp:1700
+#: src/client.cpp:1702
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "kesalahan %s tidak ada dan tidak dapat dibuat!keluar."
@@ -340,11 +340,11 @@ msgstr "Abaikan permohonan transaksi"
 msgid "Accepting incoming trade requests"
 msgstr "Terima permohonan transaksi"
 
-#: src/game.cpp:1729
+#: src/game.cpp:1727
 msgid "Could Not Load Map"
 msgstr "Tidak dapat menampilkan peta"
 
-#: src/game.cpp:1730
+#: src/game.cpp:1728
 #, c-format
 msgid "Error while loading %s"
 msgstr "Error ketika menunggu %s"
@@ -379,7 +379,7 @@ msgstr "Nama"
 
 #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:133
 #: src/gui/popupmenu.cpp:283 src/gui/popupmenu.cpp:596
-#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:265
+#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:265
 msgid "Attack"
 msgstr "Pukul"
 
@@ -433,7 +433,7 @@ msgstr "-"
 #: src/gui/buydialog.cpp:99 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:294
-#: src/keyboardconfig.cpp:290
+#: src/keyboardconfig.cpp:82
 msgid "Quit"
 msgstr "Keluar"
 
@@ -468,7 +468,7 @@ msgstr "Jual"
 #: src/gui/popupmenu.cpp:1858 src/gui/popupmenu.cpp:1897
 #: src/gui/popupmenu.cpp:1949 src/gui/popupmenu.cpp:1969
 #: src/gui/quitdialog.cpp:55 src/gui/register.cpp:82 src/gui/setup.cpp:72
-#: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:238
+#: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:241
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
 #: src/gui/updaterwindow.cpp:161
 msgid "Cancel"
@@ -637,8 +637,8 @@ msgid "Enter password:"
 msgstr "Masukkan sandi"
 
 #: src/gui/charselectdialog.cpp:410 src/gui/serverdialog.cpp:298
-#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:122
-#: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:241
+#: src/gui/setup_relations.cpp:242 src/gui/shopwindow.cpp:122
+#: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244
 msgid "Delete"
 msgstr "Hapus"
 
@@ -890,7 +890,7 @@ msgid "Did You Know?"
 msgstr "Apakah kamu tahu?"
 
 #: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
-#: src/gui/inventorywindow.cpp:206 src/gui/npcdialog.cpp:53
+#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:53
 #: src/gui/popupmenu.cpp:556 src/gui/shopwindow.cpp:113
 msgid "Close"
 msgstr "Tutup"
@@ -917,7 +917,7 @@ msgid "Equipment"
 msgstr "Perlengkapan"
 
 #: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160
-#: src/gui/inventorywindow.cpp:539 src/gui/inventorywindow.cpp:548
+#: src/gui/inventorywindow.cpp:538 src/gui/inventorywindow.cpp:547
 #: src/gui/popupmenu.cpp:1656 src/gui/popupmenu.cpp:1748
 #: src/gui/popupmenu.cpp:1793
 msgid "Unequip"
@@ -947,37 +947,33 @@ msgstr ""
 msgid "by type"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:111 src/gui/windowmenu.cpp:76
+#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:76
 #: src/inventory.cpp:249
 msgid "Inventory"
 msgstr "Perbekalan"
 
-#: src/gui/inventorywindow.cpp:136
+#: src/gui/inventorywindow.cpp:137
 msgid "Slots:"
 msgstr "Slot"
 
-#: src/gui/inventorywindow.cpp:148
+#: src/gui/inventorywindow.cpp:149
 msgid "Filter:"
 msgstr "Penyaring:"
 
-#: src/gui/inventorywindow.cpp:149
-msgid "Sort:"
-msgstr "Susun"
-
-#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:541
-#: src/gui/inventorywindow.cpp:550 src/gui/popupmenu.cpp:1658
+#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:540
+#: src/gui/inventorywindow.cpp:549 src/gui/popupmenu.cpp:1658
 #: src/gui/popupmenu.cpp:1750 src/gui/popupmenu.cpp:1795
 msgid "Equip"
 msgstr "Pakai"
 
-#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:542
-#: src/gui/inventorywindow.cpp:546 src/gui/popupmenu.cpp:1662
+#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:541
+#: src/gui/inventorywindow.cpp:545 src/gui/popupmenu.cpp:1662
 #: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1754
 #: src/gui/popupmenu.cpp:1799
 msgid "Use"
 msgstr "Gunakan"
 
-#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:646
+#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:645
 #: src/gui/popupmenu.cpp:1667 src/gui/popupmenu.cpp:1759
 #: src/gui/popupmenu.cpp:1804
 msgid "Drop..."
@@ -997,17 +993,17 @@ msgstr "Setelan"
 msgid "Weight:"
 msgstr "Berat"
 
-#: src/gui/inventorywindow.cpp:204 src/gui/inventorywindow.cpp:637
+#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:636
 #: src/gui/popupmenu.cpp:1642 src/gui/popupmenu.cpp:1771
 #: src/gui/popupmenu.cpp:1816 src/gui/setup.cpp:73
 msgid "Store"
 msgstr "Simpan"
 
-#: src/gui/inventorywindow.cpp:205 src/gui/popupmenu.cpp:1683
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1683
 msgid "Retrieve"
 msgstr "Kembalikan"
 
-#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1672
+#: src/gui/inventorywindow.cpp:647 src/gui/popupmenu.cpp:1672
 #: src/gui/popupmenu.cpp:1764 src/gui/popupmenu.cpp:1809
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
@@ -2196,30 +2192,34 @@ msgid "Show own name"
 msgstr "Perlihatkan nama sendiri"
 
 #: src/gui/setup_players.cpp:63
+msgid "Enable extended mouse targeting"
+msgstr ""
+
+#: src/gui/setup_players.cpp:66
 msgid "Target dead players"
 msgstr "Target pemain yang mati"
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_players.cpp:69
 msgid "Visible names"
 msgstr "Nama yang tampak"
 
-#: src/gui/setup_players.cpp:69
+#: src/gui/setup_players.cpp:72
 msgid "Secure trades"
 msgstr "Pertukaran yang aman"
 
-#: src/gui/setup_players.cpp:72
+#: src/gui/setup_players.cpp:75
 msgid "Unsecure chars in names"
 msgstr "Penggunaan karakter yang tidak diperbolehkan pada nama"
 
-#: src/gui/setup_players.cpp:75
+#: src/gui/setup_players.cpp:78
 msgid "Show statuses"
 msgstr "Perlihatkan status"
 
-#: src/gui/setup_players.cpp:78
+#: src/gui/setup_players.cpp:81
 msgid "Show ip addresses on screenshots"
 msgstr ""
 
-#: src/gui/setup_players.cpp:81
+#: src/gui/setup_players.cpp:84
 msgid "Allow self heal with mouse click"
 msgstr ""
 
@@ -2247,23 +2247,23 @@ msgstr "Ditolak"
 msgid "Erased"
 msgstr "Dihapus"
 
-#: src/gui/setup_relations.cpp:239
+#: src/gui/setup_relations.cpp:238
 msgid "Allow trading"
 msgstr "Perbolehkan penukaran"
 
-#: src/gui/setup_relations.cpp:241
+#: src/gui/setup_relations.cpp:240
 msgid "Allow whispers"
 msgstr "Perbolehkan berbisik"
 
-#: src/gui/setup_relations.cpp:244
+#: src/gui/setup_relations.cpp:243
 msgid "Old"
 msgstr "Lama"
 
-#: src/gui/setup_relations.cpp:246
+#: src/gui/setup_relations.cpp:245
 msgid "Relations"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:271
+#: src/gui/setup_relations.cpp:270
 msgid "When ignoring:"
 msgstr "Ketika menolak:"
 
@@ -3230,30 +3230,34 @@ msgid "Command:"
 msgstr "Perintah:"
 
 #: src/gui/textcommandeditor.cpp:200
+msgid "Comment:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:203
 msgid "Mana:"
 msgstr "Mana:"
 
-#: src/gui/textcommandeditor.cpp:206
+#: src/gui/textcommandeditor.cpp:209
 msgid "Target Type:"
 msgstr "Tipe target:"
 
-#: src/gui/textcommandeditor.cpp:212
+#: src/gui/textcommandeditor.cpp:215
 msgid "Icon:"
 msgstr "Ikon:"
 
-#: src/gui/textcommandeditor.cpp:218
+#: src/gui/textcommandeditor.cpp:221
 msgid "Magic level:"
 msgstr "Level sihir:"
 
-#: src/gui/textcommandeditor.cpp:224
+#: src/gui/textcommandeditor.cpp:227
 msgid "Magic School:"
 msgstr "Sekolah sihir:"
 
-#: src/gui/textcommandeditor.cpp:230
+#: src/gui/textcommandeditor.cpp:233
 msgid "School level:"
 msgstr "Level sekolah:"
 
-#: src/gui/textcommandeditor.cpp:235
+#: src/gui/textcommandeditor.cpp:238
 msgid "Save"
 msgstr "Simpan"
 
@@ -3481,23 +3485,23 @@ msgstr ""
 msgid "Road Point"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:474
+#: src/gui/whoisonline.cpp:85 src/gui/whoisonline.cpp:478
 msgid "Who Is Online - Updating"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:104
+#: src/gui/whoisonline.cpp:108
 msgid "Update"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:297
+#: src/gui/whoisonline.cpp:301
 msgid "Who Is Online - "
 msgstr ""
 
-#: src/gui/whoisonline.cpp:488
+#: src/gui/whoisonline.cpp:492
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:519
+#: src/gui/whoisonline.cpp:523
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -3777,49 +3781,49 @@ msgid "Cart"
 msgstr ""
 
 #: src/keyboardconfig.cpp:43
-msgid "Move Up"
+msgid "Basic Keys"
 msgstr ""
 
 #: src/keyboardconfig.cpp:44
-msgid "Move Down"
+msgid "Move Up"
 msgstr ""
 
 #: src/keyboardconfig.cpp:45
-msgid "Move Left"
+msgid "Move Down"
 msgstr ""
 
 #: src/keyboardconfig.cpp:46
+msgid "Move Left"
+msgstr ""
+
+#: src/keyboardconfig.cpp:47
 msgid "Move Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:50
 msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:52
 msgid "Move to Target"
 msgstr ""
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:54
 msgid "Change Move to Target type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:56
 msgid "Move to Home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:58
 msgid "Set home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:59
+#: src/keyboardconfig.cpp:60
 msgid "Move to navigation point"
 msgstr ""
 
-#: src/keyboardconfig.cpp:61
-msgid "Smilie"
-msgstr ""
-
 #: src/keyboardconfig.cpp:63
 msgid "Stop Attack"
 msgstr ""
@@ -3865,367 +3869,395 @@ msgid "Change Map View Mode"
 msgstr ""
 
 #: src/keyboardconfig.cpp:80
+msgid "Select OK"
+msgstr ""
+
+#: src/keyboardconfig.cpp:83
+msgid "Shortcuts Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:84
 msgid "Item Shortcuts Key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82 src/keyboardconfig.cpp:84
 #: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:88
 #: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:92
 #: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:96
 #: src/keyboardconfig.cpp:98 src/keyboardconfig.cpp:100
 #: src/keyboardconfig.cpp:102 src/keyboardconfig.cpp:104
 #: src/keyboardconfig.cpp:106 src/keyboardconfig.cpp:108
-#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:113
-#: src/keyboardconfig.cpp:115 src/keyboardconfig.cpp:117
+#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:112
+#: src/keyboardconfig.cpp:114 src/keyboardconfig.cpp:117
 #: src/keyboardconfig.cpp:119 src/keyboardconfig.cpp:121
-#: src/keyboardconfig.cpp:360
+#: src/keyboardconfig.cpp:123 src/keyboardconfig.cpp:125
+#: src/keyboardconfig.cpp:367
 #, c-format
 msgid "Item Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:122
+#: src/keyboardconfig.cpp:126
+msgid "Windows Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:127
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:124
+#: src/keyboardconfig.cpp:129
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:126
+#: src/keyboardconfig.cpp:131
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:128
+#: src/keyboardconfig.cpp:133
 msgid "Equipment Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:130
+#: src/keyboardconfig.cpp:135
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:132
+#: src/keyboardconfig.cpp:137
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:134
+#: src/keyboardconfig.cpp:139
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:136
+#: src/keyboardconfig.cpp:141
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:138
+#: src/keyboardconfig.cpp:143
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:140
+#: src/keyboardconfig.cpp:145
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:142
+#: src/keyboardconfig.cpp:147
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:144
+#: src/keyboardconfig.cpp:149
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:146
+#: src/keyboardconfig.cpp:151
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:148
+#: src/keyboardconfig.cpp:153
 msgid "Shop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:150
+#: src/keyboardconfig.cpp:155
 msgid "Quick drop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:152
+#: src/keyboardconfig.cpp:157
 msgid "Kill Stats Window"
 msgstr "Jendela stat membunuh"
 
-#: src/keyboardconfig.cpp:154
+#: src/keyboardconfig.cpp:159
 msgid "Commands Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:156
+#: src/keyboardconfig.cpp:161
 msgid "Bot Checker Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboardconfig.cpp:164
 msgid "Who Is Online Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboardconfig.cpp:166
 msgid "Did you know Window"
 msgstr "Apakah kamu mengetahui jendela"
 
-#: src/keyboardconfig.cpp:164
+#: src/keyboardconfig.cpp:169
 msgid "Previous Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:166
+#: src/keyboardconfig.cpp:171
 msgid "Next Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:168 src/keyboardconfig.cpp:170
-#: src/keyboardconfig.cpp:172 src/keyboardconfig.cpp:174
-#: src/keyboardconfig.cpp:176 src/keyboardconfig.cpp:178
-#: src/keyboardconfig.cpp:180 src/keyboardconfig.cpp:182
-#: src/keyboardconfig.cpp:184 src/keyboardconfig.cpp:186
-#: src/keyboardconfig.cpp:188 src/keyboardconfig.cpp:190
-#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
-#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
-#: src/keyboardconfig.cpp:201 src/keyboardconfig.cpp:203
-#: src/keyboardconfig.cpp:205 src/keyboardconfig.cpp:207
-#: src/keyboardconfig.cpp:209 src/keyboardconfig.cpp:211
-#: src/keyboardconfig.cpp:213 src/keyboardconfig.cpp:215
-#: src/keyboardconfig.cpp:217 src/keyboardconfig.cpp:220
-#: src/keyboardconfig.cpp:223 src/keyboardconfig.cpp:226
-#: src/keyboardconfig.cpp:228 src/keyboardconfig.cpp:230
-#: src/keyboardconfig.cpp:232 src/keyboardconfig.cpp:234
-#: src/keyboardconfig.cpp:236 src/keyboardconfig.cpp:238
-#: src/keyboardconfig.cpp:240 src/keyboardconfig.cpp:242
-#: src/keyboardconfig.cpp:244 src/keyboardconfig.cpp:247
-#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
-#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
-#: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:259
-#: src/keyboardconfig.cpp:355
+#: src/keyboardconfig.cpp:173
+msgid "Emotes Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:174
+msgid "Smilie"
+msgstr ""
+
+#: src/keyboardconfig.cpp:175 src/keyboardconfig.cpp:177
+#: src/keyboardconfig.cpp:179 src/keyboardconfig.cpp:181
+#: src/keyboardconfig.cpp:183 src/keyboardconfig.cpp:185
+#: src/keyboardconfig.cpp:187 src/keyboardconfig.cpp:189
+#: src/keyboardconfig.cpp:191 src/keyboardconfig.cpp:193
+#: src/keyboardconfig.cpp:195 src/keyboardconfig.cpp:197
+#: src/keyboardconfig.cpp:200 src/keyboardconfig.cpp:202
+#: src/keyboardconfig.cpp:204 src/keyboardconfig.cpp:206
+#: src/keyboardconfig.cpp:208 src/keyboardconfig.cpp:210
+#: src/keyboardconfig.cpp:212 src/keyboardconfig.cpp:214
+#: src/keyboardconfig.cpp:216 src/keyboardconfig.cpp:218
+#: src/keyboardconfig.cpp:220 src/keyboardconfig.cpp:222
+#: src/keyboardconfig.cpp:224 src/keyboardconfig.cpp:227
+#: src/keyboardconfig.cpp:230 src/keyboardconfig.cpp:233
+#: src/keyboardconfig.cpp:235 src/keyboardconfig.cpp:237
+#: src/keyboardconfig.cpp:239 src/keyboardconfig.cpp:241
+#: src/keyboardconfig.cpp:243 src/keyboardconfig.cpp:245
+#: src/keyboardconfig.cpp:247 src/keyboardconfig.cpp:249
+#: src/keyboardconfig.cpp:251 src/keyboardconfig.cpp:254
+#: src/keyboardconfig.cpp:256 src/keyboardconfig.cpp:258
+#: src/keyboardconfig.cpp:260 src/keyboardconfig.cpp:262
+#: src/keyboardconfig.cpp:264 src/keyboardconfig.cpp:266
+#: src/keyboardconfig.cpp:362
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:261
+#: src/keyboardconfig.cpp:268
+msgid "Outfits Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:269
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:263
+#: src/keyboardconfig.cpp:271
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:265
+#: src/keyboardconfig.cpp:273
 msgid "Copy equipped to Outfit"
 msgstr "Salin barang-barang yang dipakai ke Setelan"
 
-#: src/keyboardconfig.cpp:267
+#: src/keyboardconfig.cpp:275
+msgid "Chat Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:276
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:269
+#: src/keyboardconfig.cpp:278
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:271
+#: src/keyboardconfig.cpp:280
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:273
+#: src/keyboardconfig.cpp:282
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:275
+#: src/keyboardconfig.cpp:284
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:287
 msgid "Close current Chat Tab"
 msgstr "Tutup tab obrolan ini"
 
-#: src/keyboardconfig.cpp:280
+#: src/keyboardconfig.cpp:289
 msgid "Previous chat line"
 msgstr "Garis obrolan sebelumnya"
 
-#: src/keyboardconfig.cpp:282
+#: src/keyboardconfig.cpp:291
 msgid "Next chat line"
 msgstr "Garis obrolan selanjutnya"
 
-#: src/keyboardconfig.cpp:284
+#: src/keyboardconfig.cpp:293
 msgid "Chat Auto Complete"
 msgstr ""
 
-#: src/keyboardconfig.cpp:286
+#: src/keyboardconfig.cpp:295
 msgid "Deactivate Chat Input"
 msgstr ""
 
-#: src/keyboardconfig.cpp:288
-msgid "Select OK"
+#: src/keyboardconfig.cpp:297
+msgid "Other Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:291
+#: src/keyboardconfig.cpp:298
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:293
+#: src/keyboardconfig.cpp:300
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:295
+#: src/keyboardconfig.cpp:302
 msgid "Direct Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:296
+#: src/keyboardconfig.cpp:303
 msgid "Direct Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboardconfig.cpp:305
 msgid "Direct Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:299
+#: src/keyboardconfig.cpp:306
 msgid "Direct Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:301
+#: src/keyboardconfig.cpp:308
 msgid "Crazy moves"
 msgstr ""
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboardconfig.cpp:310
 msgid "Change Crazy Move mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboardconfig.cpp:312
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboardconfig.cpp:314
 msgid "Quick Drop N Items"
 msgstr ""
 
-#: src/keyboardconfig.cpp:309
+#: src/keyboardconfig.cpp:316
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/keyboardconfig.cpp:311
+#: src/keyboardconfig.cpp:318
 msgid "Quick heal target or self"
 msgstr ""
 
-#: src/keyboardconfig.cpp:313
+#: src/keyboardconfig.cpp:320
 msgid "Use #itenplz spell"
 msgstr ""
 
-#: src/keyboardconfig.cpp:315
+#: src/keyboardconfig.cpp:322
 msgid "Use magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:317
+#: src/keyboardconfig.cpp:324
 msgid "Switch magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:319
+#: src/keyboardconfig.cpp:326
 msgid "Change move type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:321
+#: src/keyboardconfig.cpp:328
 msgid "Change Attack Weapon Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:323
+#: src/keyboardconfig.cpp:330
 msgid "Change Attack Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:325
+#: src/keyboardconfig.cpp:332
 msgid "Change Follow mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:327
+#: src/keyboardconfig.cpp:334
 msgid "Change Imitation mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboardconfig.cpp:337
 msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:331
+#: src/keyboardconfig.cpp:338
 msgid "On / Off audio"
 msgstr ""
 
-#: src/keyboardconfig.cpp:333
+#: src/keyboardconfig.cpp:340
 msgid "Enable / Disable away mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:335
+#: src/keyboardconfig.cpp:342
 msgid "Emulate right click from keyboard"
 msgstr ""
 
-#: src/keyboardconfig.cpp:337
+#: src/keyboardconfig.cpp:344
 msgid "Toggle camera mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:339
+#: src/keyboardconfig.cpp:346
 msgid "Modifier key"
 msgstr "Kunci pengubah"
 
-#: src/keyboardconfig.cpp:411
+#: src/keyboardconfig.cpp:425
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:377
+#: src/localplayer.cpp:380
 msgid "You were killed by "
 msgstr ""
 
-#: src/localplayer.cpp:1416
+#: src/localplayer.cpp:1422
 msgid "Tried to pick up nonexistent item."
 msgstr "Mencoba mengambil item yang tidak lagi ada"
 
-#: src/localplayer.cpp:1418
+#: src/localplayer.cpp:1424
 msgid "Item is too heavy."
 msgstr "item terlalu berat"
 
-#: src/localplayer.cpp:1420
+#: src/localplayer.cpp:1426
 msgid "Item is too far away."
 msgstr "barang terlalu jauh"
 
-#: src/localplayer.cpp:1422
+#: src/localplayer.cpp:1428
 msgid "Inventory is full."
 msgstr "Perbekalan sudah penuh"
 
-#: src/localplayer.cpp:1424
+#: src/localplayer.cpp:1430
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1427
+#: src/localplayer.cpp:1433
 msgid "Item belongs to someone else."
 msgstr "Barang milik orang lain."
 
-#: src/localplayer.cpp:1430
+#: src/localplayer.cpp:1436
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1454
+#: src/localplayer.cpp:1460
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 
-#: src/localplayer.cpp:3168
+#: src/localplayer.cpp:3174
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:3468
+#: src/localplayer.cpp:3494
 msgid "Follow: "
 msgstr "Ikuti:"
 
-#: src/localplayer.cpp:3470 src/localplayer.cpp:3485
+#: src/localplayer.cpp:3496 src/localplayer.cpp:3511
 msgid "Follow canceled"
 msgstr "Batal mengikuti"
 
-#: src/localplayer.cpp:3477
+#: src/localplayer.cpp:3503
 msgid "Imitation: "
 msgstr "Tirukan:"
 
-#: src/localplayer.cpp:3479 src/localplayer.cpp:3487
+#: src/localplayer.cpp:3505 src/localplayer.cpp:3513
 msgid "Imitation canceled"
 msgstr "Batal menirukan"
 
-#: src/localplayer.cpp:3832
+#: src/localplayer.cpp:3858
 msgid "You see "
 msgstr ""
 
@@ -4606,15 +4638,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:286
+#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:284
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:296
+#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:294
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:306
+#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:304
 msgid "Item sharing not possible."
 msgstr ""
 
@@ -4622,15 +4654,15 @@ msgstr ""
 msgid "Item sharing unknown."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:248
+#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:246
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:258
+#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:256
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:268
+#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:266
 msgid "Experience sharing not possible."
 msgstr ""
 
@@ -4709,54 +4741,54 @@ msgstr ""
 msgid "Username permanently erased."
 msgstr "Username dihapus permanen."
 
-#: src/net/ea/partyhandler.cpp:82
+#: src/net/ea/partyhandler.cpp:80
 msgid "Could not create party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:84
+#: src/net/ea/partyhandler.cpp:82
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:140
+#: src/net/ea/partyhandler.cpp:138
 #, c-format
 msgid "%s has joined your party."
 msgstr "%s telah bergabung dengan kelompok"
 
-#: src/net/ea/partyhandler.cpp:176
+#: src/net/ea/partyhandler.cpp:174
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:181
+#: src/net/ea/partyhandler.cpp:179
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:186
+#: src/net/ea/partyhandler.cpp:184
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:191
+#: src/net/ea/partyhandler.cpp:189
 #, c-format
 msgid "%s can't join your party because party is full."
 msgstr "%s tidak dapat bergabung dengan kelompok karena kelompok sudah penuh."
 
-#: src/net/ea/partyhandler.cpp:196
+#: src/net/ea/partyhandler.cpp:194
 #, c-format
 msgid "QQQ Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:356
+#: src/net/ea/partyhandler.cpp:354
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:369
+#: src/net/ea/partyhandler.cpp:367
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:448
+#: src/net/ea/partyhandler.cpp:446
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
@@ -4910,83 +4942,83 @@ msgstr ""
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:149
+#: src/net/ea/specialhandler.cpp:146
 msgid "Trade failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:152
+#: src/net/ea/specialhandler.cpp:149
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:155
+#: src/net/ea/specialhandler.cpp:152
 msgid "Sit failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:158
+#: src/net/ea/specialhandler.cpp:155
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:161
+#: src/net/ea/specialhandler.cpp:158
 msgid "Could not join party!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:164
+#: src/net/ea/specialhandler.cpp:161
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:177
+#: src/net/ea/specialhandler.cpp:174
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:181
+#: src/net/ea/specialhandler.cpp:178
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:184
+#: src/net/ea/specialhandler.cpp:181
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:187
+#: src/net/ea/specialhandler.cpp:184
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:190
+#: src/net/ea/specialhandler.cpp:187
 msgid "You cannot do that right now!"
 msgstr "Anda tidak dapat melakukannya sekarang"
 
-#: src/net/ea/specialhandler.cpp:193
+#: src/net/ea/specialhandler.cpp:190
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:196
+#: src/net/ea/specialhandler.cpp:193
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Tidak dapat menggunakan skill tersebut dengan senjata tersebut"
 
-#: src/net/ea/specialhandler.cpp:200
+#: src/net/ea/specialhandler.cpp:197
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:203
+#: src/net/ea/specialhandler.cpp:200
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:206
+#: src/net/ea/specialhandler.cpp:203
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:209
+#: src/net/ea/specialhandler.cpp:206
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:220
+#: src/net/ea/specialhandler.cpp:217
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:223
+#: src/net/ea/specialhandler.cpp:220
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:226
+#: src/net/ea/specialhandler.cpp:223
 msgid "Poison had no effect..."
 msgstr ""
 
diff --git a/po/ja.po b/po/ja.po
index 61154b831..08969270e 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-09-17 16:12+0300\n"
-"PO-Revision-Date: 2011-09-16 20:11+0000\n"
+"POT-Creation-Date: 2011-09-27 22:18+0300\n"
+"PO-Revision-Date: 2011-09-27 19:20+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: Japanese (http://www.transifex.net/projects/p/manaplus/team/"
 "ja/)\n"
@@ -22,25 +22,25 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: src/actorspritemanager.cpp:1088
+#: src/actorspritemanager.cpp:1133
 msgid "Visible on map"
 msgstr ""
 
-#: src/being.cpp:548
+#: src/being.cpp:547
 msgid "dodge"
 msgstr "ドッジ"
 
-#: src/being.cpp:548
+#: src/being.cpp:547
 msgid "miss"
 msgstr "ミス"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1527
+#: src/being.cpp:1526
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1532
+#: src/being.cpp:1531
 msgid "I"
 msgstr ""
 
@@ -48,43 +48,43 @@ msgstr ""
 msgid "Setup"
 msgstr "設定"
 
-#: src/client.cpp:841 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:842 src/gui/setup_perfomance.cpp:48
 msgid "Perfomance"
 msgstr ""
 
-#: src/client.cpp:846 src/gui/setup_video.cpp:315
+#: src/client.cpp:847 src/gui/setup_video.cpp:315
 msgid "Video"
 msgstr "ビデオ"
 
-#: src/client.cpp:851
+#: src/client.cpp:852
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:932
+#: src/client.cpp:934
 msgid "Connecting to server"
 msgstr "サーバー通信中…"
 
-#: src/client.cpp:963
+#: src/client.cpp:965
 msgid "Logging in"
 msgstr "ログイン中…"
 
-#: src/client.cpp:996
+#: src/client.cpp:998
 msgid "Entering game world"
 msgstr "ゲームの世界に入る中"
 
-#: src/client.cpp:1096
+#: src/client.cpp:1098
 msgid "Requesting characters"
 msgstr "服：％d"
 
-#: src/client.cpp:1127
+#: src/client.cpp:1129
 msgid "Connecting to the game server"
 msgstr "ゲームサーバー通信中…"
 
-#: src/client.cpp:1137
+#: src/client.cpp:1139
 msgid "Changing game servers"
 msgstr "サーバーを入り替え中…"
 
-#: src/client.cpp:1180 src/client.cpp:1187 src/client.cpp:1321
+#: src/client.cpp:1182 src/client.cpp:1189 src/client.cpp:1323
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:221 src/gui/charselectdialog.cpp:253
 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
@@ -94,50 +94,50 @@ msgstr "サーバーを入り替え中…"
 msgid "Error"
 msgstr "エラー"
 
-#: src/client.cpp:1196
+#: src/client.cpp:1198
 msgid "Requesting registration details"
 msgstr "登録細目を要請中"
 
-#: src/client.cpp:1222
+#: src/client.cpp:1224
 msgid "Password Change"
 msgstr "パスワード変更"
 
-#: src/client.cpp:1223
+#: src/client.cpp:1225
 msgid "Password changed successfully!"
 msgstr "パスワード変更成功！"
 
-#: src/client.cpp:1242
+#: src/client.cpp:1244
 msgid "Email Change"
 msgstr "メール変更"
 
-#: src/client.cpp:1243
+#: src/client.cpp:1245
 msgid "Email changed successfully!"
 msgstr "メール変更成功！"
 
-#: src/client.cpp:1263
+#: src/client.cpp:1265
 msgid "Unregister Successful"
 msgstr "登録解除成功"
 
-#: src/client.cpp:1264
+#: src/client.cpp:1266
 msgid "Farewell, come back any time..."
 msgstr "さよなら、いつでも戻ってね..."
 
-#: src/client.cpp:1463 src/client.cpp:1493 src/client.cpp:1508
-#: src/client.cpp:1933 src/client.cpp:1940
+#: src/client.cpp:1465 src/client.cpp:1495 src/client.cpp:1510
+#: src/client.cpp:1935 src/client.cpp:1942
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s は存在しないので作成することが不可能！終了中…"
 
-#: src/client.cpp:1639
+#: src/client.cpp:1641
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "無効なアップデートホスト:  %s"
 
-#: src/client.cpp:1673 src/client.cpp:1679
+#: src/client.cpp:1675 src/client.cpp:1681
 msgid "Error creating updates directory!"
 msgstr "更新フォルダの作成エラー"
 
-#: src/client.cpp:1700
+#: src/client.cpp:1702
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "エラー： %s は存在しないので作成することが不可能！終了中…"
@@ -342,11 +342,11 @@ msgstr "他人からのトレードリクエストを無視します。"
 msgid "Accepting incoming trade requests"
 msgstr "他人からのトレードリクエストを受け入れます。"
 
-#: src/game.cpp:1729
+#: src/game.cpp:1727
 msgid "Could Not Load Map"
 msgstr "マップをロードできませんでした"
 
-#: src/game.cpp:1730
+#: src/game.cpp:1728
 #, c-format
 msgid "Error while loading %s"
 msgstr "%sをロードしている間にエラーが起きました。"
@@ -381,7 +381,7 @@ msgstr "名前"
 
 #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:133
 #: src/gui/popupmenu.cpp:283 src/gui/popupmenu.cpp:596
-#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:265
+#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:265
 msgid "Attack"
 msgstr "攻撃"
 
@@ -435,7 +435,7 @@ msgstr "-"
 #: src/gui/buydialog.cpp:99 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:294
-#: src/keyboardconfig.cpp:290
+#: src/keyboardconfig.cpp:82
 msgid "Quit"
 msgstr "終了"
 
@@ -470,7 +470,7 @@ msgstr "売る"
 #: src/gui/popupmenu.cpp:1858 src/gui/popupmenu.cpp:1897
 #: src/gui/popupmenu.cpp:1949 src/gui/popupmenu.cpp:1969
 #: src/gui/quitdialog.cpp:55 src/gui/register.cpp:82 src/gui/setup.cpp:72
-#: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:238
+#: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:241
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
 #: src/gui/updaterwindow.cpp:161
 msgid "Cancel"
@@ -639,8 +639,8 @@ msgid "Enter password:"
 msgstr ""
 
 #: src/gui/charselectdialog.cpp:410 src/gui/serverdialog.cpp:298
-#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:122
-#: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:241
+#: src/gui/setup_relations.cpp:242 src/gui/shopwindow.cpp:122
+#: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244
 msgid "Delete"
 msgstr "削除"
 
@@ -892,7 +892,7 @@ msgid "Did You Know?"
 msgstr ""
 
 #: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
-#: src/gui/inventorywindow.cpp:206 src/gui/npcdialog.cpp:53
+#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:53
 #: src/gui/popupmenu.cpp:556 src/gui/shopwindow.cpp:113
 msgid "Close"
 msgstr "閉じる"
@@ -919,7 +919,7 @@ msgid "Equipment"
 msgstr "装備"
 
 #: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160
-#: src/gui/inventorywindow.cpp:539 src/gui/inventorywindow.cpp:548
+#: src/gui/inventorywindow.cpp:538 src/gui/inventorywindow.cpp:547
 #: src/gui/popupmenu.cpp:1656 src/gui/popupmenu.cpp:1748
 #: src/gui/popupmenu.cpp:1793
 msgid "Unequip"
@@ -949,37 +949,33 @@ msgstr ""
 msgid "by type"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:111 src/gui/windowmenu.cpp:76
+#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:76
 #: src/inventory.cpp:249
 msgid "Inventory"
 msgstr "アイテム"
 
-#: src/gui/inventorywindow.cpp:136
+#: src/gui/inventorywindow.cpp:137
 msgid "Slots:"
 msgstr "スロット"
 
-#: src/gui/inventorywindow.cpp:148
+#: src/gui/inventorywindow.cpp:149
 msgid "Filter:"
 msgstr "フィルタ："
 
-#: src/gui/inventorywindow.cpp:149
-msgid "Sort:"
-msgstr "類："
-
-#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:541
-#: src/gui/inventorywindow.cpp:550 src/gui/popupmenu.cpp:1658
+#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:540
+#: src/gui/inventorywindow.cpp:549 src/gui/popupmenu.cpp:1658
 #: src/gui/popupmenu.cpp:1750 src/gui/popupmenu.cpp:1795
 msgid "Equip"
 msgstr "装備する"
 
-#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:542
-#: src/gui/inventorywindow.cpp:546 src/gui/popupmenu.cpp:1662
+#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:541
+#: src/gui/inventorywindow.cpp:545 src/gui/popupmenu.cpp:1662
 #: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1754
 #: src/gui/popupmenu.cpp:1799
 msgid "Use"
 msgstr "使う"
 
-#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:646
+#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:645
 #: src/gui/popupmenu.cpp:1667 src/gui/popupmenu.cpp:1759
 #: src/gui/popupmenu.cpp:1804
 msgid "Drop..."
@@ -999,17 +995,17 @@ msgstr "服"
 msgid "Weight:"
 msgstr "重量"
 
-#: src/gui/inventorywindow.cpp:204 src/gui/inventorywindow.cpp:637
+#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:636
 #: src/gui/popupmenu.cpp:1642 src/gui/popupmenu.cpp:1771
 #: src/gui/popupmenu.cpp:1816 src/gui/setup.cpp:73
 msgid "Store"
 msgstr "保存"
 
-#: src/gui/inventorywindow.cpp:205 src/gui/popupmenu.cpp:1683
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1683
 msgid "Retrieve"
 msgstr "取り戻す"
 
-#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1672
+#: src/gui/inventorywindow.cpp:647 src/gui/popupmenu.cpp:1672
 #: src/gui/popupmenu.cpp:1764 src/gui/popupmenu.cpp:1809
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
@@ -2200,30 +2196,34 @@ msgid "Show own name"
 msgstr "自分の名前を表示する"
 
 #: src/gui/setup_players.cpp:63
-msgid "Target dead players"
+msgid "Enable extended mouse targeting"
 msgstr ""
 
 #: src/gui/setup_players.cpp:66
+msgid "Target dead players"
+msgstr ""
+
+#: src/gui/setup_players.cpp:69
 msgid "Visible names"
 msgstr "名前を表示する"
 
-#: src/gui/setup_players.cpp:69
+#: src/gui/setup_players.cpp:72
 msgid "Secure trades"
 msgstr ""
 
-#: src/gui/setup_players.cpp:72
+#: src/gui/setup_players.cpp:75
 msgid "Unsecure chars in names"
 msgstr ""
 
-#: src/gui/setup_players.cpp:75
+#: src/gui/setup_players.cpp:78
 msgid "Show statuses"
 msgstr ""
 
-#: src/gui/setup_players.cpp:78
+#: src/gui/setup_players.cpp:81
 msgid "Show ip addresses on screenshots"
 msgstr ""
 
-#: src/gui/setup_players.cpp:81
+#: src/gui/setup_players.cpp:84
 msgid "Allow self heal with mouse click"
 msgstr ""
 
@@ -2251,23 +2251,23 @@ msgstr "無視する"
 msgid "Erased"
 msgstr "消した"
 
-#: src/gui/setup_relations.cpp:239
+#: src/gui/setup_relations.cpp:238
 msgid "Allow trading"
 msgstr "交換を承認する"
 
-#: src/gui/setup_relations.cpp:241
+#: src/gui/setup_relations.cpp:240
 msgid "Allow whispers"
 msgstr "プライベートメッセージを受け取ることを承認する"
 
-#: src/gui/setup_relations.cpp:244
+#: src/gui/setup_relations.cpp:243
 msgid "Old"
 msgstr "古い"
 
-#: src/gui/setup_relations.cpp:246
+#: src/gui/setup_relations.cpp:245
 msgid "Relations"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:271
+#: src/gui/setup_relations.cpp:270
 msgid "When ignoring:"
 msgstr "無視の際には："
 
@@ -3234,30 +3234,34 @@ msgid "Command:"
 msgstr "コマンド："
 
 #: src/gui/textcommandeditor.cpp:200
+msgid "Comment:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:203
 msgid "Mana:"
 msgstr "マナ："
 
-#: src/gui/textcommandeditor.cpp:206
+#: src/gui/textcommandeditor.cpp:209
 msgid "Target Type:"
 msgstr "ターゲットタイプ："
 
-#: src/gui/textcommandeditor.cpp:212
+#: src/gui/textcommandeditor.cpp:215
 msgid "Icon:"
 msgstr "アイコン"
 
-#: src/gui/textcommandeditor.cpp:218
+#: src/gui/textcommandeditor.cpp:221
 msgid "Magic level:"
 msgstr "魔法レベル："
 
-#: src/gui/textcommandeditor.cpp:224
+#: src/gui/textcommandeditor.cpp:227
 msgid "Magic School:"
 msgstr "魔法学園"
 
-#: src/gui/textcommandeditor.cpp:230
+#: src/gui/textcommandeditor.cpp:233
 msgid "School level:"
 msgstr "学校レベル："
 
-#: src/gui/textcommandeditor.cpp:235
+#: src/gui/textcommandeditor.cpp:238
 msgid "Save"
 msgstr "セーブ"
 
@@ -3487,23 +3491,23 @@ msgstr ""
 msgid "Road Point"
 msgstr "ロードのポイント"
 
-#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:474
+#: src/gui/whoisonline.cpp:85 src/gui/whoisonline.cpp:478
 msgid "Who Is Online - Updating"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:104
+#: src/gui/whoisonline.cpp:108
 msgid "Update"
 msgstr "アップデート"
 
-#: src/gui/whoisonline.cpp:297
+#: src/gui/whoisonline.cpp:301
 msgid "Who Is Online - "
 msgstr ""
 
-#: src/gui/whoisonline.cpp:488
+#: src/gui/whoisonline.cpp:492
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:519
+#: src/gui/whoisonline.cpp:523
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -3788,49 +3792,49 @@ msgid "Cart"
 msgstr "荷馬車"
 
 #: src/keyboardconfig.cpp:43
+msgid "Basic Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:44
 msgid "Move Up"
 msgstr "上移動"
 
-#: src/keyboardconfig.cpp:44
+#: src/keyboardconfig.cpp:45
 msgid "Move Down"
 msgstr "下移動"
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:46
 msgid "Move Left"
 msgstr "左移動"
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:47
 msgid "Move Right"
 msgstr "右移動"
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:50
 msgid "Target & Attack"
 msgstr "ターゲットと攻撃"
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:52
 msgid "Move to Target"
 msgstr "ターゲットに動く"
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:54
 msgid "Change Move to Target type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:56
 msgid "Move to Home location"
 msgstr "ホーム場所に動く"
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:58
 msgid "Set home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:59
+#: src/keyboardconfig.cpp:60
 msgid "Move to navigation point"
 msgstr ""
 
-#: src/keyboardconfig.cpp:61
-msgid "Smilie"
-msgstr "スマイリー"
-
 #: src/keyboardconfig.cpp:63
 msgid "Stop Attack"
 msgstr "攻撃を止める"
@@ -3876,367 +3880,395 @@ msgid "Change Map View Mode"
 msgstr ""
 
 #: src/keyboardconfig.cpp:80
+msgid "Select OK"
+msgstr "OKを選択する"
+
+#: src/keyboardconfig.cpp:83
+msgid "Shortcuts Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:84
 msgid "Item Shortcuts Key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82 src/keyboardconfig.cpp:84
 #: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:88
 #: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:92
 #: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:96
 #: src/keyboardconfig.cpp:98 src/keyboardconfig.cpp:100
 #: src/keyboardconfig.cpp:102 src/keyboardconfig.cpp:104
 #: src/keyboardconfig.cpp:106 src/keyboardconfig.cpp:108
-#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:113
-#: src/keyboardconfig.cpp:115 src/keyboardconfig.cpp:117
+#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:112
+#: src/keyboardconfig.cpp:114 src/keyboardconfig.cpp:117
 #: src/keyboardconfig.cpp:119 src/keyboardconfig.cpp:121
-#: src/keyboardconfig.cpp:360
+#: src/keyboardconfig.cpp:123 src/keyboardconfig.cpp:125
+#: src/keyboardconfig.cpp:367
 #, c-format
 msgid "Item Shortcut %d"
 msgstr "アイテムショートカット: %d"
 
-#: src/keyboardconfig.cpp:122
+#: src/keyboardconfig.cpp:126
+msgid "Windows Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:127
 msgid "Help Window"
 msgstr "ヘルプウィンドウ"
 
-#: src/keyboardconfig.cpp:124
+#: src/keyboardconfig.cpp:129
 msgid "Status Window"
 msgstr "ステータス・ウィンドウ"
 
-#: src/keyboardconfig.cpp:126
+#: src/keyboardconfig.cpp:131
 msgid "Inventory Window"
 msgstr "在庫ウィンドウ"
 
-#: src/keyboardconfig.cpp:128
+#: src/keyboardconfig.cpp:133
 msgid "Equipment Window"
 msgstr "装備ウィンドウ"
 
-#: src/keyboardconfig.cpp:130
+#: src/keyboardconfig.cpp:135
 msgid "Skill Window"
 msgstr "スキルウィンドウ"
 
-#: src/keyboardconfig.cpp:132
+#: src/keyboardconfig.cpp:137
 msgid "Minimap Window"
 msgstr "小さなマップウィンドウ"
 
-#: src/keyboardconfig.cpp:134
+#: src/keyboardconfig.cpp:139
 msgid "Chat Window"
 msgstr "チャットウィンドウ"
 
-#: src/keyboardconfig.cpp:136
+#: src/keyboardconfig.cpp:141
 msgid "Item Shortcut Window"
 msgstr "アイテムショートカットウィンドウ"
 
-#: src/keyboardconfig.cpp:138
+#: src/keyboardconfig.cpp:143
 msgid "Setup Window"
 msgstr "設定ウィンドウ"
 
-#: src/keyboardconfig.cpp:140
+#: src/keyboardconfig.cpp:145
 msgid "Debug Window"
 msgstr "デバグウィンドウ"
 
-#: src/keyboardconfig.cpp:142
+#: src/keyboardconfig.cpp:147
 msgid "Social Window"
 msgstr "ソシアルウインドウ"
 
-#: src/keyboardconfig.cpp:144
+#: src/keyboardconfig.cpp:149
 msgid "Emote Shortcut Window"
 msgstr "表情ショートカットウィンドウ"
 
-#: src/keyboardconfig.cpp:146
+#: src/keyboardconfig.cpp:151
 msgid "Outfits Window"
 msgstr "服ウインドウ"
 
-#: src/keyboardconfig.cpp:148
+#: src/keyboardconfig.cpp:153
 msgid "Shop Window"
 msgstr "ショップウィンドウ"
 
-#: src/keyboardconfig.cpp:150
+#: src/keyboardconfig.cpp:155
 msgid "Quick drop Window"
 msgstr "クイックドロップウィンドウ"
 
-#: src/keyboardconfig.cpp:152
+#: src/keyboardconfig.cpp:157
 msgid "Kill Stats Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:154
+#: src/keyboardconfig.cpp:159
 msgid "Commands Window"
 msgstr "コマンドウインドウ"
 
-#: src/keyboardconfig.cpp:156
+#: src/keyboardconfig.cpp:161
 msgid "Bot Checker Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboardconfig.cpp:164
 msgid "Who Is Online Window"
 msgstr "オンライン・ウザー・ウインドウ"
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboardconfig.cpp:166
 msgid "Did you know Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:164
+#: src/keyboardconfig.cpp:169
 msgid "Previous Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:166
+#: src/keyboardconfig.cpp:171
 msgid "Next Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:168 src/keyboardconfig.cpp:170
-#: src/keyboardconfig.cpp:172 src/keyboardconfig.cpp:174
-#: src/keyboardconfig.cpp:176 src/keyboardconfig.cpp:178
-#: src/keyboardconfig.cpp:180 src/keyboardconfig.cpp:182
-#: src/keyboardconfig.cpp:184 src/keyboardconfig.cpp:186
-#: src/keyboardconfig.cpp:188 src/keyboardconfig.cpp:190
-#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
-#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
-#: src/keyboardconfig.cpp:201 src/keyboardconfig.cpp:203
-#: src/keyboardconfig.cpp:205 src/keyboardconfig.cpp:207
-#: src/keyboardconfig.cpp:209 src/keyboardconfig.cpp:211
-#: src/keyboardconfig.cpp:213 src/keyboardconfig.cpp:215
-#: src/keyboardconfig.cpp:217 src/keyboardconfig.cpp:220
-#: src/keyboardconfig.cpp:223 src/keyboardconfig.cpp:226
-#: src/keyboardconfig.cpp:228 src/keyboardconfig.cpp:230
-#: src/keyboardconfig.cpp:232 src/keyboardconfig.cpp:234
-#: src/keyboardconfig.cpp:236 src/keyboardconfig.cpp:238
-#: src/keyboardconfig.cpp:240 src/keyboardconfig.cpp:242
-#: src/keyboardconfig.cpp:244 src/keyboardconfig.cpp:247
-#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
-#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
-#: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:259
-#: src/keyboardconfig.cpp:355
+#: src/keyboardconfig.cpp:173
+msgid "Emotes Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:174
+msgid "Smilie"
+msgstr "スマイリー"
+
+#: src/keyboardconfig.cpp:175 src/keyboardconfig.cpp:177
+#: src/keyboardconfig.cpp:179 src/keyboardconfig.cpp:181
+#: src/keyboardconfig.cpp:183 src/keyboardconfig.cpp:185
+#: src/keyboardconfig.cpp:187 src/keyboardconfig.cpp:189
+#: src/keyboardconfig.cpp:191 src/keyboardconfig.cpp:193
+#: src/keyboardconfig.cpp:195 src/keyboardconfig.cpp:197
+#: src/keyboardconfig.cpp:200 src/keyboardconfig.cpp:202
+#: src/keyboardconfig.cpp:204 src/keyboardconfig.cpp:206
+#: src/keyboardconfig.cpp:208 src/keyboardconfig.cpp:210
+#: src/keyboardconfig.cpp:212 src/keyboardconfig.cpp:214
+#: src/keyboardconfig.cpp:216 src/keyboardconfig.cpp:218
+#: src/keyboardconfig.cpp:220 src/keyboardconfig.cpp:222
+#: src/keyboardconfig.cpp:224 src/keyboardconfig.cpp:227
+#: src/keyboardconfig.cpp:230 src/keyboardconfig.cpp:233
+#: src/keyboardconfig.cpp:235 src/keyboardconfig.cpp:237
+#: src/keyboardconfig.cpp:239 src/keyboardconfig.cpp:241
+#: src/keyboardconfig.cpp:243 src/keyboardconfig.cpp:245
+#: src/keyboardconfig.cpp:247 src/keyboardconfig.cpp:249
+#: src/keyboardconfig.cpp:251 src/keyboardconfig.cpp:254
+#: src/keyboardconfig.cpp:256 src/keyboardconfig.cpp:258
+#: src/keyboardconfig.cpp:260 src/keyboardconfig.cpp:262
+#: src/keyboardconfig.cpp:264 src/keyboardconfig.cpp:266
+#: src/keyboardconfig.cpp:362
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "スマイリーショートカット: %d"
 
-#: src/keyboardconfig.cpp:261
+#: src/keyboardconfig.cpp:268
+msgid "Outfits Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:269
 msgid "Wear Outfit"
 msgstr "服を着る"
 
-#: src/keyboardconfig.cpp:263
+#: src/keyboardconfig.cpp:271
 msgid "Copy Outfit"
 msgstr "服をコピーする"
 
-#: src/keyboardconfig.cpp:265
+#: src/keyboardconfig.cpp:273
 msgid "Copy equipped to Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:267
+#: src/keyboardconfig.cpp:275
+msgid "Chat Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:276
 msgid "Toggle Chat"
 msgstr "トグルチャット"
 
-#: src/keyboardconfig.cpp:269
+#: src/keyboardconfig.cpp:278
 msgid "Scroll Chat Up"
 msgstr "チャットを上にスクロールする"
 
-#: src/keyboardconfig.cpp:271
+#: src/keyboardconfig.cpp:280
 msgid "Scroll Chat Down"
 msgstr "チャットを下にスクロールする"
 
-#: src/keyboardconfig.cpp:273
+#: src/keyboardconfig.cpp:282
 msgid "Previous Chat Tab"
 msgstr "前のチャットタブ"
 
-#: src/keyboardconfig.cpp:275
+#: src/keyboardconfig.cpp:284
 msgid "Next Chat Tab"
 msgstr "次のチャットタブ"
 
-#: src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:287
 msgid "Close current Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:280
+#: src/keyboardconfig.cpp:289
 msgid "Previous chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:282
+#: src/keyboardconfig.cpp:291
 msgid "Next chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:284
+#: src/keyboardconfig.cpp:293
 msgid "Chat Auto Complete"
 msgstr ""
 
-#: src/keyboardconfig.cpp:286
+#: src/keyboardconfig.cpp:295
 msgid "Deactivate Chat Input"
 msgstr ""
 
-#: src/keyboardconfig.cpp:288
-msgid "Select OK"
-msgstr "OKを選択する"
+#: src/keyboardconfig.cpp:297
+msgid "Other Keys"
+msgstr ""
 
-#: src/keyboardconfig.cpp:291
+#: src/keyboardconfig.cpp:298
 msgid "Ignore input 1"
 msgstr "インプット１無視"
 
-#: src/keyboardconfig.cpp:293
+#: src/keyboardconfig.cpp:300
 msgid "Ignore input 2"
 msgstr "インプット２無視"
 
-#: src/keyboardconfig.cpp:295
+#: src/keyboardconfig.cpp:302
 msgid "Direct Up"
 msgstr "方向上"
 
-#: src/keyboardconfig.cpp:296
+#: src/keyboardconfig.cpp:303
 msgid "Direct Down"
 msgstr "方向下"
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboardconfig.cpp:305
 msgid "Direct Left"
 msgstr "方向 左"
 
-#: src/keyboardconfig.cpp:299
+#: src/keyboardconfig.cpp:306
 msgid "Direct Right"
 msgstr "方向右"
 
-#: src/keyboardconfig.cpp:301
+#: src/keyboardconfig.cpp:308
 msgid "Crazy moves"
 msgstr "クレイジーに移動"
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboardconfig.cpp:310
 msgid "Change Crazy Move mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboardconfig.cpp:312
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboardconfig.cpp:314
 msgid "Quick Drop N Items"
 msgstr ""
 
-#: src/keyboardconfig.cpp:309
+#: src/keyboardconfig.cpp:316
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/keyboardconfig.cpp:311
+#: src/keyboardconfig.cpp:318
 msgid "Quick heal target or self"
 msgstr ""
 
-#: src/keyboardconfig.cpp:313
+#: src/keyboardconfig.cpp:320
 msgid "Use #itenplz spell"
 msgstr "#itenplz は呪文を使う"
 
-#: src/keyboardconfig.cpp:315
+#: src/keyboardconfig.cpp:322
 msgid "Use magic attack"
 msgstr "魔法攻撃を使用"
 
-#: src/keyboardconfig.cpp:317
+#: src/keyboardconfig.cpp:324
 msgid "Switch magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:319
+#: src/keyboardconfig.cpp:326
 msgid "Change move type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:321
+#: src/keyboardconfig.cpp:328
 msgid "Change Attack Weapon Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:323
+#: src/keyboardconfig.cpp:330
 msgid "Change Attack Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:325
+#: src/keyboardconfig.cpp:332
 msgid "Change Follow mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:327
+#: src/keyboardconfig.cpp:334
 msgid "Change Imitation mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboardconfig.cpp:337
 msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:331
+#: src/keyboardconfig.cpp:338
 msgid "On / Off audio"
 msgstr "アウディオ　オン/オフ"
 
-#: src/keyboardconfig.cpp:333
+#: src/keyboardconfig.cpp:340
 msgid "Enable / Disable away mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:335
+#: src/keyboardconfig.cpp:342
 msgid "Emulate right click from keyboard"
 msgstr ""
 
-#: src/keyboardconfig.cpp:337
+#: src/keyboardconfig.cpp:344
 msgid "Toggle camera mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:339
+#: src/keyboardconfig.cpp:346
 msgid "Modifier key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:411
+#: src/keyboardconfig.cpp:425
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:377
+#: src/localplayer.cpp:380
 msgid "You were killed by "
 msgstr ""
 
-#: src/localplayer.cpp:1416
+#: src/localplayer.cpp:1422
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1418
+#: src/localplayer.cpp:1424
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1420
+#: src/localplayer.cpp:1426
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1422
+#: src/localplayer.cpp:1428
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1424
+#: src/localplayer.cpp:1430
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1427
+#: src/localplayer.cpp:1433
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1430
+#: src/localplayer.cpp:1436
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1454
+#: src/localplayer.cpp:1460
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 
-#: src/localplayer.cpp:3168
+#: src/localplayer.cpp:3174
 msgid "Away"
 msgstr "去って"
 
-#: src/localplayer.cpp:3468
+#: src/localplayer.cpp:3494
 msgid "Follow: "
 msgstr "従う: "
 
-#: src/localplayer.cpp:3470 src/localplayer.cpp:3485
+#: src/localplayer.cpp:3496 src/localplayer.cpp:3511
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3477
+#: src/localplayer.cpp:3503
 msgid "Imitation: "
 msgstr "擬い: "
 
-#: src/localplayer.cpp:3479 src/localplayer.cpp:3487
+#: src/localplayer.cpp:3505 src/localplayer.cpp:3513
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3832
+#: src/localplayer.cpp:3858
 msgid "You see "
 msgstr "あなた"
 
@@ -4621,15 +4653,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:286
+#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:284
 msgid "Item sharing enabled."
 msgstr "アイテムシェア有効"
 
-#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:296
+#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:294
 msgid "Item sharing disabled."
 msgstr "アイテムシェア無効"
 
-#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:306
+#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:304
 msgid "Item sharing not possible."
 msgstr "アイテムシェア不可能"
 
@@ -4637,15 +4669,15 @@ msgstr "アイテムシェア不可能"
 msgid "Item sharing unknown."
 msgstr "アイテムシェア不明"
 
-#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:248
+#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:246
 msgid "Experience sharing enabled."
 msgstr "経験シェア有効"
 
-#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:258
+#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:256
 msgid "Experience sharing disabled."
 msgstr "経験シェア無効"
 
-#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:268
+#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:266
 msgid "Experience sharing not possible."
 msgstr "経験シェア不可能"
 
@@ -4726,54 +4758,54 @@ msgstr "ユーザ名はもう使われている。"
 msgid "Username permanently erased."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:82
+#: src/net/ea/partyhandler.cpp:80
 msgid "Could not create party."
 msgstr "パーティ作成失敗"
 
-#: src/net/ea/partyhandler.cpp:84
+#: src/net/ea/partyhandler.cpp:82
 msgid "Party successfully created."
 msgstr "パーティ作成成功"
 
-#: src/net/ea/partyhandler.cpp:140
+#: src/net/ea/partyhandler.cpp:138
 #, c-format
 msgid "%s has joined your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:176
+#: src/net/ea/partyhandler.cpp:174
 #, c-format
 msgid "%s is already a member of a party."
 msgstr "%sはもうパーティのメンバーである。"
 
-#: src/net/ea/partyhandler.cpp:181
+#: src/net/ea/partyhandler.cpp:179
 #, c-format
 msgid "%s refused your invitation."
 msgstr "%sは招待を拒んだ。"
 
-#: src/net/ea/partyhandler.cpp:186
+#: src/net/ea/partyhandler.cpp:184
 #, c-format
 msgid "%s is now a member of your party."
 msgstr "%sは今からパーティのメンバーになった。"
 
-#: src/net/ea/partyhandler.cpp:191
+#: src/net/ea/partyhandler.cpp:189
 #, c-format
 msgid "%s can't join your party because party is full."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:196
+#: src/net/ea/partyhandler.cpp:194
 #, c-format
 msgid "QQQ Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:356
+#: src/net/ea/partyhandler.cpp:354
 msgid "You have left the party."
 msgstr "パーティから離れた。"
 
-#: src/net/ea/partyhandler.cpp:369
+#: src/net/ea/partyhandler.cpp:367
 #, c-format
 msgid "%s has left your party."
 msgstr "%sがパーティから離れた。"
 
-#: src/net/ea/partyhandler.cpp:448
+#: src/net/ea/partyhandler.cpp:446
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr "不明なメンバーが言おうとした事: %s"
@@ -4929,83 +4961,83 @@ msgstr "スキルはもう上がらない！"
 msgid "Equip arrows first."
 msgstr "矢を先に装備してください。"
 
-#: src/net/ea/specialhandler.cpp:149
+#: src/net/ea/specialhandler.cpp:146
 msgid "Trade failed!"
 msgstr "取引失敗"
 
-#: src/net/ea/specialhandler.cpp:152
+#: src/net/ea/specialhandler.cpp:149
 msgid "Emote failed!"
 msgstr "スマイリー表示失敗"
 
-#: src/net/ea/specialhandler.cpp:155
+#: src/net/ea/specialhandler.cpp:152
 msgid "Sit failed!"
 msgstr "触ることが失敗した。"
 
-#: src/net/ea/specialhandler.cpp:158
+#: src/net/ea/specialhandler.cpp:155
 msgid "Chat creating failed!"
 msgstr "チャット作成失敗"
 
-#: src/net/ea/specialhandler.cpp:161
+#: src/net/ea/specialhandler.cpp:158
 msgid "Could not join party!"
 msgstr "パーティに参加できなかった！"
 
-#: src/net/ea/specialhandler.cpp:164
+#: src/net/ea/specialhandler.cpp:161
 msgid "Cannot shout!"
 msgstr "叫べない！"
 
-#: src/net/ea/specialhandler.cpp:177
+#: src/net/ea/specialhandler.cpp:174
 msgid "You have not yet reached a high enough lvl!"
 msgstr "あなたはまだ十分に高いlvlを達していない！"
 
-#: src/net/ea/specialhandler.cpp:181
+#: src/net/ea/specialhandler.cpp:178
 msgid "Insufficient HP!"
 msgstr "HP不足！"
 
-#: src/net/ea/specialhandler.cpp:184
+#: src/net/ea/specialhandler.cpp:181
 msgid "Insufficient SP!"
 msgstr "SP不足！"
 
-#: src/net/ea/specialhandler.cpp:187
+#: src/net/ea/specialhandler.cpp:184
 msgid "You have no memos!"
 msgstr "メモなし！"
 
-#: src/net/ea/specialhandler.cpp:190
+#: src/net/ea/specialhandler.cpp:187
 msgid "You cannot do that right now!"
 msgstr "今この行動は無理。"
 
-#: src/net/ea/specialhandler.cpp:193
+#: src/net/ea/specialhandler.cpp:190
 msgid "Seems you need more money... ;-)"
 msgstr "金欠みたいんじゃないか…"
 
-#: src/net/ea/specialhandler.cpp:196
+#: src/net/ea/specialhandler.cpp:193
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "本スキルがこの武器と使えない。"
 
-#: src/net/ea/specialhandler.cpp:200
+#: src/net/ea/specialhandler.cpp:197
 msgid "You need another red gem!"
 msgstr "他の赤宝石が必要となった！"
 
-#: src/net/ea/specialhandler.cpp:203
+#: src/net/ea/specialhandler.cpp:200
 msgid "You need another blue gem!"
 msgstr "他の青宝石が必要となった！"
 
-#: src/net/ea/specialhandler.cpp:206
+#: src/net/ea/specialhandler.cpp:203
 msgid "You're carrying to much to do this!"
 msgstr "アイテムが持ちすぎている状態！"
 
-#: src/net/ea/specialhandler.cpp:209
+#: src/net/ea/specialhandler.cpp:206
 msgid "Huh? What's that?"
 msgstr "うん？何それ？"
 
-#: src/net/ea/specialhandler.cpp:220
+#: src/net/ea/specialhandler.cpp:217
 msgid "Warp failed..."
 msgstr "ワープが失敗した。"
 
-#: src/net/ea/specialhandler.cpp:223
+#: src/net/ea/specialhandler.cpp:220
 msgid "Could not steal anything..."
 msgstr "何も盗めなかった…"
 
-#: src/net/ea/specialhandler.cpp:226
+#: src/net/ea/specialhandler.cpp:223
 msgid "Poison had no effect..."
 msgstr "毒は不効果"
 
diff --git a/po/manaplus.pot b/po/manaplus.pot
index 27ac0b8ce..e3858ef62 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-09-17 16:12+0300\n"
+"POT-Creation-Date: 2011-09-27 22:18+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"
@@ -18,25 +18,25 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: src/actorspritemanager.cpp:1088
+#: src/actorspritemanager.cpp:1133
 msgid "Visible on map"
 msgstr ""
 
-#: src/being.cpp:548
+#: src/being.cpp:547
 msgid "dodge"
 msgstr ""
 
-#: src/being.cpp:548
+#: src/being.cpp:547
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1527
+#: src/being.cpp:1526
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1532
+#: src/being.cpp:1531
 msgid "I"
 msgstr ""
 
@@ -44,43 +44,43 @@ msgstr ""
 msgid "Setup"
 msgstr ""
 
-#: src/client.cpp:841 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:842 src/gui/setup_perfomance.cpp:48
 msgid "Perfomance"
 msgstr ""
 
-#: src/client.cpp:846 src/gui/setup_video.cpp:315
+#: src/client.cpp:847 src/gui/setup_video.cpp:315
 msgid "Video"
 msgstr ""
 
-#: src/client.cpp:851
+#: src/client.cpp:852
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:932
+#: src/client.cpp:934
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:963
+#: src/client.cpp:965
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:996
+#: src/client.cpp:998
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1096
+#: src/client.cpp:1098
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:1127
+#: src/client.cpp:1129
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:1137
+#: src/client.cpp:1139
 msgid "Changing game servers"
 msgstr ""
 
-#: src/client.cpp:1180 src/client.cpp:1187 src/client.cpp:1321
+#: src/client.cpp:1182 src/client.cpp:1189 src/client.cpp:1323
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:221 src/gui/charselectdialog.cpp:253
 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
@@ -90,50 +90,50 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: src/client.cpp:1196
+#: src/client.cpp:1198
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1222
+#: src/client.cpp:1224
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:1223
+#: src/client.cpp:1225
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1242
+#: src/client.cpp:1244
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:1243
+#: src/client.cpp:1245
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1263
+#: src/client.cpp:1265
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:1264
+#: src/client.cpp:1266
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1463 src/client.cpp:1493 src/client.cpp:1508
-#: src/client.cpp:1933 src/client.cpp:1940
+#: src/client.cpp:1465 src/client.cpp:1495 src/client.cpp:1510
+#: src/client.cpp:1935 src/client.cpp:1942
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1639
+#: src/client.cpp:1641
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1673 src/client.cpp:1679
+#: src/client.cpp:1675 src/client.cpp:1681
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:1700
+#: src/client.cpp:1702
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -339,11 +339,11 @@ msgstr ""
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:1729
+#: src/game.cpp:1727
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:1730
+#: src/game.cpp:1728
 #, c-format
 msgid "Error while loading %s"
 msgstr ""
@@ -378,7 +378,7 @@ msgstr ""
 
 #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:133
 #: src/gui/popupmenu.cpp:283 src/gui/popupmenu.cpp:596
-#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:265
+#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:265
 msgid "Attack"
 msgstr ""
 
@@ -432,7 +432,7 @@ msgstr ""
 #: src/gui/buydialog.cpp:99 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:294
-#: src/keyboardconfig.cpp:290
+#: src/keyboardconfig.cpp:82
 msgid "Quit"
 msgstr ""
 
@@ -467,7 +467,7 @@ msgstr ""
 #: src/gui/popupmenu.cpp:1858 src/gui/popupmenu.cpp:1897
 #: src/gui/popupmenu.cpp:1949 src/gui/popupmenu.cpp:1969
 #: src/gui/quitdialog.cpp:55 src/gui/register.cpp:82 src/gui/setup.cpp:72
-#: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:238
+#: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:241
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
 #: src/gui/updaterwindow.cpp:161
 msgid "Cancel"
@@ -636,8 +636,8 @@ msgid "Enter password:"
 msgstr ""
 
 #: src/gui/charselectdialog.cpp:410 src/gui/serverdialog.cpp:298
-#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:122
-#: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:241
+#: src/gui/setup_relations.cpp:242 src/gui/shopwindow.cpp:122
+#: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244
 msgid "Delete"
 msgstr ""
 
@@ -889,7 +889,7 @@ msgid "Did You Know?"
 msgstr ""
 
 #: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
-#: src/gui/inventorywindow.cpp:206 src/gui/npcdialog.cpp:53
+#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:53
 #: src/gui/popupmenu.cpp:556 src/gui/shopwindow.cpp:113
 msgid "Close"
 msgstr ""
@@ -916,7 +916,7 @@ msgid "Equipment"
 msgstr ""
 
 #: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160
-#: src/gui/inventorywindow.cpp:539 src/gui/inventorywindow.cpp:548
+#: src/gui/inventorywindow.cpp:538 src/gui/inventorywindow.cpp:547
 #: src/gui/popupmenu.cpp:1656 src/gui/popupmenu.cpp:1748
 #: src/gui/popupmenu.cpp:1793
 msgid "Unequip"
@@ -946,37 +946,33 @@ msgstr ""
 msgid "by type"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:111 src/gui/windowmenu.cpp:76
+#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:76
 #: src/inventory.cpp:249
 msgid "Inventory"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:136
+#: src/gui/inventorywindow.cpp:137
 msgid "Slots:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:148
-msgid "Filter:"
-msgstr ""
-
 #: src/gui/inventorywindow.cpp:149
-msgid "Sort:"
+msgid "Filter:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:541
-#: src/gui/inventorywindow.cpp:550 src/gui/popupmenu.cpp:1658
+#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:540
+#: src/gui/inventorywindow.cpp:549 src/gui/popupmenu.cpp:1658
 #: src/gui/popupmenu.cpp:1750 src/gui/popupmenu.cpp:1795
 msgid "Equip"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:542
-#: src/gui/inventorywindow.cpp:546 src/gui/popupmenu.cpp:1662
+#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:541
+#: src/gui/inventorywindow.cpp:545 src/gui/popupmenu.cpp:1662
 #: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1754
 #: src/gui/popupmenu.cpp:1799
 msgid "Use"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:646
+#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:645
 #: src/gui/popupmenu.cpp:1667 src/gui/popupmenu.cpp:1759
 #: src/gui/popupmenu.cpp:1804
 msgid "Drop..."
@@ -996,17 +992,17 @@ msgstr ""
 msgid "Weight:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:204 src/gui/inventorywindow.cpp:637
+#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:636
 #: src/gui/popupmenu.cpp:1642 src/gui/popupmenu.cpp:1771
 #: src/gui/popupmenu.cpp:1816 src/gui/setup.cpp:73
 msgid "Store"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:205 src/gui/popupmenu.cpp:1683
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1683
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1672
+#: src/gui/inventorywindow.cpp:647 src/gui/popupmenu.cpp:1672
 #: src/gui/popupmenu.cpp:1764 src/gui/popupmenu.cpp:1809
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
@@ -2197,30 +2193,34 @@ msgid "Show own name"
 msgstr ""
 
 #: src/gui/setup_players.cpp:63
-msgid "Target dead players"
+msgid "Enable extended mouse targeting"
 msgstr ""
 
 #: src/gui/setup_players.cpp:66
-msgid "Visible names"
+msgid "Target dead players"
 msgstr ""
 
 #: src/gui/setup_players.cpp:69
-msgid "Secure trades"
+msgid "Visible names"
 msgstr ""
 
 #: src/gui/setup_players.cpp:72
-msgid "Unsecure chars in names"
+msgid "Secure trades"
 msgstr ""
 
 #: src/gui/setup_players.cpp:75
-msgid "Show statuses"
+msgid "Unsecure chars in names"
 msgstr ""
 
 #: src/gui/setup_players.cpp:78
-msgid "Show ip addresses on screenshots"
+msgid "Show statuses"
 msgstr ""
 
 #: src/gui/setup_players.cpp:81
+msgid "Show ip addresses on screenshots"
+msgstr ""
+
+#: src/gui/setup_players.cpp:84
 msgid "Allow self heal with mouse click"
 msgstr ""
 
@@ -2248,23 +2248,23 @@ msgstr ""
 msgid "Erased"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:239
+#: src/gui/setup_relations.cpp:238
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:241
+#: src/gui/setup_relations.cpp:240
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:244
+#: src/gui/setup_relations.cpp:243
 msgid "Old"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:246
+#: src/gui/setup_relations.cpp:245
 msgid "Relations"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:271
+#: src/gui/setup_relations.cpp:270
 msgid "When ignoring:"
 msgstr ""
 
@@ -3231,30 +3231,34 @@ msgid "Command:"
 msgstr ""
 
 #: src/gui/textcommandeditor.cpp:200
+msgid "Comment:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:203
 msgid "Mana:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:206
+#: src/gui/textcommandeditor.cpp:209
 msgid "Target Type:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:212
+#: src/gui/textcommandeditor.cpp:215
 msgid "Icon:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:218
+#: src/gui/textcommandeditor.cpp:221
 msgid "Magic level:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:224
+#: src/gui/textcommandeditor.cpp:227
 msgid "Magic School:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:230
+#: src/gui/textcommandeditor.cpp:233
 msgid "School level:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:235
+#: src/gui/textcommandeditor.cpp:238
 msgid "Save"
 msgstr ""
 
@@ -3482,23 +3486,23 @@ msgstr ""
 msgid "Road Point"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:474
+#: src/gui/whoisonline.cpp:85 src/gui/whoisonline.cpp:478
 msgid "Who Is Online - Updating"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:104
+#: src/gui/whoisonline.cpp:108
 msgid "Update"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:297
+#: src/gui/whoisonline.cpp:301
 msgid "Who Is Online - "
 msgstr ""
 
-#: src/gui/whoisonline.cpp:488
+#: src/gui/whoisonline.cpp:492
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:519
+#: src/gui/whoisonline.cpp:523
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -3778,49 +3782,49 @@ msgid "Cart"
 msgstr ""
 
 #: src/keyboardconfig.cpp:43
-msgid "Move Up"
+msgid "Basic Keys"
 msgstr ""
 
 #: src/keyboardconfig.cpp:44
-msgid "Move Down"
+msgid "Move Up"
 msgstr ""
 
 #: src/keyboardconfig.cpp:45
-msgid "Move Left"
+msgid "Move Down"
 msgstr ""
 
 #: src/keyboardconfig.cpp:46
+msgid "Move Left"
+msgstr ""
+
+#: src/keyboardconfig.cpp:47
 msgid "Move Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:50
 msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:52
 msgid "Move to Target"
 msgstr ""
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:54
 msgid "Change Move to Target type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:56
 msgid "Move to Home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:58
 msgid "Set home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:59
+#: src/keyboardconfig.cpp:60
 msgid "Move to navigation point"
 msgstr ""
 
-#: src/keyboardconfig.cpp:61
-msgid "Smilie"
-msgstr ""
-
 #: src/keyboardconfig.cpp:63
 msgid "Stop Attack"
 msgstr ""
@@ -3866,368 +3870,396 @@ msgid "Change Map View Mode"
 msgstr ""
 
 #: src/keyboardconfig.cpp:80
+msgid "Select OK"
+msgstr ""
+
+#: src/keyboardconfig.cpp:83
+msgid "Shortcuts Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:84
 msgid "Item Shortcuts Key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82 src/keyboardconfig.cpp:84
 #: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:88
 #: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:92
 #: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:96
 #: src/keyboardconfig.cpp:98 src/keyboardconfig.cpp:100
 #: src/keyboardconfig.cpp:102 src/keyboardconfig.cpp:104
 #: src/keyboardconfig.cpp:106 src/keyboardconfig.cpp:108
-#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:113
-#: src/keyboardconfig.cpp:115 src/keyboardconfig.cpp:117
+#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:112
+#: src/keyboardconfig.cpp:114 src/keyboardconfig.cpp:117
 #: src/keyboardconfig.cpp:119 src/keyboardconfig.cpp:121
-#: src/keyboardconfig.cpp:360
+#: src/keyboardconfig.cpp:123 src/keyboardconfig.cpp:125
+#: src/keyboardconfig.cpp:367
 #, c-format
 msgid "Item Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:122
+#: src/keyboardconfig.cpp:126
+msgid "Windows Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:127
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:124
+#: src/keyboardconfig.cpp:129
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:126
+#: src/keyboardconfig.cpp:131
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:128
+#: src/keyboardconfig.cpp:133
 msgid "Equipment Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:130
+#: src/keyboardconfig.cpp:135
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:132
+#: src/keyboardconfig.cpp:137
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:134
+#: src/keyboardconfig.cpp:139
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:136
+#: src/keyboardconfig.cpp:141
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:138
+#: src/keyboardconfig.cpp:143
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:140
+#: src/keyboardconfig.cpp:145
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:142
+#: src/keyboardconfig.cpp:147
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:144
+#: src/keyboardconfig.cpp:149
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:146
+#: src/keyboardconfig.cpp:151
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:148
+#: src/keyboardconfig.cpp:153
 msgid "Shop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:150
+#: src/keyboardconfig.cpp:155
 msgid "Quick drop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:152
+#: src/keyboardconfig.cpp:157
 msgid "Kill Stats Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:154
+#: src/keyboardconfig.cpp:159
 msgid "Commands Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:156
+#: src/keyboardconfig.cpp:161
 msgid "Bot Checker Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboardconfig.cpp:164
 msgid "Who Is Online Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboardconfig.cpp:166
 msgid "Did you know Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:164
+#: src/keyboardconfig.cpp:169
 msgid "Previous Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:166
+#: src/keyboardconfig.cpp:171
 msgid "Next Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:168 src/keyboardconfig.cpp:170
-#: src/keyboardconfig.cpp:172 src/keyboardconfig.cpp:174
-#: src/keyboardconfig.cpp:176 src/keyboardconfig.cpp:178
-#: src/keyboardconfig.cpp:180 src/keyboardconfig.cpp:182
-#: src/keyboardconfig.cpp:184 src/keyboardconfig.cpp:186
-#: src/keyboardconfig.cpp:188 src/keyboardconfig.cpp:190
-#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
-#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
-#: src/keyboardconfig.cpp:201 src/keyboardconfig.cpp:203
-#: src/keyboardconfig.cpp:205 src/keyboardconfig.cpp:207
-#: src/keyboardconfig.cpp:209 src/keyboardconfig.cpp:211
-#: src/keyboardconfig.cpp:213 src/keyboardconfig.cpp:215
-#: src/keyboardconfig.cpp:217 src/keyboardconfig.cpp:220
-#: src/keyboardconfig.cpp:223 src/keyboardconfig.cpp:226
-#: src/keyboardconfig.cpp:228 src/keyboardconfig.cpp:230
-#: src/keyboardconfig.cpp:232 src/keyboardconfig.cpp:234
-#: src/keyboardconfig.cpp:236 src/keyboardconfig.cpp:238
-#: src/keyboardconfig.cpp:240 src/keyboardconfig.cpp:242
-#: src/keyboardconfig.cpp:244 src/keyboardconfig.cpp:247
-#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
-#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
-#: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:259
-#: src/keyboardconfig.cpp:355
+#: src/keyboardconfig.cpp:173
+msgid "Emotes Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:174
+msgid "Smilie"
+msgstr ""
+
+#: src/keyboardconfig.cpp:175 src/keyboardconfig.cpp:177
+#: src/keyboardconfig.cpp:179 src/keyboardconfig.cpp:181
+#: src/keyboardconfig.cpp:183 src/keyboardconfig.cpp:185
+#: src/keyboardconfig.cpp:187 src/keyboardconfig.cpp:189
+#: src/keyboardconfig.cpp:191 src/keyboardconfig.cpp:193
+#: src/keyboardconfig.cpp:195 src/keyboardconfig.cpp:197
+#: src/keyboardconfig.cpp:200 src/keyboardconfig.cpp:202
+#: src/keyboardconfig.cpp:204 src/keyboardconfig.cpp:206
+#: src/keyboardconfig.cpp:208 src/keyboardconfig.cpp:210
+#: src/keyboardconfig.cpp:212 src/keyboardconfig.cpp:214
+#: src/keyboardconfig.cpp:216 src/keyboardconfig.cpp:218
+#: src/keyboardconfig.cpp:220 src/keyboardconfig.cpp:222
+#: src/keyboardconfig.cpp:224 src/keyboardconfig.cpp:227
+#: src/keyboardconfig.cpp:230 src/keyboardconfig.cpp:233
+#: src/keyboardconfig.cpp:235 src/keyboardconfig.cpp:237
+#: src/keyboardconfig.cpp:239 src/keyboardconfig.cpp:241
+#: src/keyboardconfig.cpp:243 src/keyboardconfig.cpp:245
+#: src/keyboardconfig.cpp:247 src/keyboardconfig.cpp:249
+#: src/keyboardconfig.cpp:251 src/keyboardconfig.cpp:254
+#: src/keyboardconfig.cpp:256 src/keyboardconfig.cpp:258
+#: src/keyboardconfig.cpp:260 src/keyboardconfig.cpp:262
+#: src/keyboardconfig.cpp:264 src/keyboardconfig.cpp:266
+#: src/keyboardconfig.cpp:362
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:261
+#: src/keyboardconfig.cpp:268
+msgid "Outfits Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:269
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:263
+#: src/keyboardconfig.cpp:271
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:265
+#: src/keyboardconfig.cpp:273
 msgid "Copy equipped to Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:267
+#: src/keyboardconfig.cpp:275
+msgid "Chat Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:276
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:269
+#: src/keyboardconfig.cpp:278
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:271
+#: src/keyboardconfig.cpp:280
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:273
+#: src/keyboardconfig.cpp:282
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:275
+#: src/keyboardconfig.cpp:284
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:287
 msgid "Close current Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:280
+#: src/keyboardconfig.cpp:289
 msgid "Previous chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:282
+#: src/keyboardconfig.cpp:291
 msgid "Next chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:284
+#: src/keyboardconfig.cpp:293
 msgid "Chat Auto Complete"
 msgstr ""
 
-#: src/keyboardconfig.cpp:286
+#: src/keyboardconfig.cpp:295
 msgid "Deactivate Chat Input"
 msgstr ""
 
-#: src/keyboardconfig.cpp:288
-msgid "Select OK"
+#: src/keyboardconfig.cpp:297
+msgid "Other Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:291
+#: src/keyboardconfig.cpp:298
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:293
+#: src/keyboardconfig.cpp:300
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:295
+#: src/keyboardconfig.cpp:302
 msgid "Direct Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:296
+#: src/keyboardconfig.cpp:303
 msgid "Direct Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboardconfig.cpp:305
 msgid "Direct Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:299
+#: src/keyboardconfig.cpp:306
 msgid "Direct Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:301
+#: src/keyboardconfig.cpp:308
 msgid "Crazy moves"
 msgstr ""
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboardconfig.cpp:310
 msgid "Change Crazy Move mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboardconfig.cpp:312
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboardconfig.cpp:314
 msgid "Quick Drop N Items"
 msgstr ""
 
-#: src/keyboardconfig.cpp:309
+#: src/keyboardconfig.cpp:316
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/keyboardconfig.cpp:311
+#: src/keyboardconfig.cpp:318
 msgid "Quick heal target or self"
 msgstr ""
 
-#: src/keyboardconfig.cpp:313
+#: src/keyboardconfig.cpp:320
 msgid "Use #itenplz spell"
 msgstr ""
 
-#: src/keyboardconfig.cpp:315
+#: src/keyboardconfig.cpp:322
 msgid "Use magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:317
+#: src/keyboardconfig.cpp:324
 msgid "Switch magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:319
+#: src/keyboardconfig.cpp:326
 msgid "Change move type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:321
+#: src/keyboardconfig.cpp:328
 msgid "Change Attack Weapon Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:323
+#: src/keyboardconfig.cpp:330
 msgid "Change Attack Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:325
+#: src/keyboardconfig.cpp:332
 msgid "Change Follow mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:327
+#: src/keyboardconfig.cpp:334
 msgid "Change Imitation mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboardconfig.cpp:337
 msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:331
+#: src/keyboardconfig.cpp:338
 msgid "On / Off audio"
 msgstr ""
 
-#: src/keyboardconfig.cpp:333
+#: src/keyboardconfig.cpp:340
 msgid "Enable / Disable away mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:335
+#: src/keyboardconfig.cpp:342
 msgid "Emulate right click from keyboard"
 msgstr ""
 
-#: src/keyboardconfig.cpp:337
+#: src/keyboardconfig.cpp:344
 msgid "Toggle camera mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:339
+#: src/keyboardconfig.cpp:346
 msgid "Modifier key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:411
+#: src/keyboardconfig.cpp:425
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:377
+#: src/localplayer.cpp:380
 msgid "You were killed by "
 msgstr ""
 
-#: src/localplayer.cpp:1416
+#: src/localplayer.cpp:1422
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1418
+#: src/localplayer.cpp:1424
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1420
+#: src/localplayer.cpp:1426
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1422
+#: src/localplayer.cpp:1428
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1424
+#: src/localplayer.cpp:1430
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1427
+#: src/localplayer.cpp:1433
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1430
+#: src/localplayer.cpp:1436
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1454
+#: src/localplayer.cpp:1460
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/localplayer.cpp:3168
+#: src/localplayer.cpp:3174
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:3468
+#: src/localplayer.cpp:3494
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3470 src/localplayer.cpp:3485
+#: src/localplayer.cpp:3496 src/localplayer.cpp:3511
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3477
+#: src/localplayer.cpp:3503
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3479 src/localplayer.cpp:3487
+#: src/localplayer.cpp:3505 src/localplayer.cpp:3513
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3832
+#: src/localplayer.cpp:3858
 msgid "You see "
 msgstr ""
 
@@ -4608,15 +4640,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:286
+#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:284
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:296
+#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:294
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:306
+#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:304
 msgid "Item sharing not possible."
 msgstr ""
 
@@ -4624,15 +4656,15 @@ msgstr ""
 msgid "Item sharing unknown."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:248
+#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:246
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:258
+#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:256
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:268
+#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:266
 msgid "Experience sharing not possible."
 msgstr ""
 
@@ -4711,54 +4743,54 @@ msgstr ""
 msgid "Username permanently erased."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:82
+#: src/net/ea/partyhandler.cpp:80
 msgid "Could not create party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:84
+#: src/net/ea/partyhandler.cpp:82
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:140
+#: src/net/ea/partyhandler.cpp:138
 #, c-format
 msgid "%s has joined your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:176
+#: src/net/ea/partyhandler.cpp:174
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:181
+#: src/net/ea/partyhandler.cpp:179
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:186
+#: src/net/ea/partyhandler.cpp:184
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:191
+#: src/net/ea/partyhandler.cpp:189
 #, c-format
 msgid "%s can't join your party because party is full."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:196
+#: src/net/ea/partyhandler.cpp:194
 #, c-format
 msgid "QQQ Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:356
+#: src/net/ea/partyhandler.cpp:354
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:369
+#: src/net/ea/partyhandler.cpp:367
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:448
+#: src/net/ea/partyhandler.cpp:446
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
@@ -4910,83 +4942,83 @@ msgstr ""
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:149
+#: src/net/ea/specialhandler.cpp:146
 msgid "Trade failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:152
+#: src/net/ea/specialhandler.cpp:149
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:155
+#: src/net/ea/specialhandler.cpp:152
 msgid "Sit failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:158
+#: src/net/ea/specialhandler.cpp:155
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:161
+#: src/net/ea/specialhandler.cpp:158
 msgid "Could not join party!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:164
+#: src/net/ea/specialhandler.cpp:161
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:177
+#: src/net/ea/specialhandler.cpp:174
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:181
+#: src/net/ea/specialhandler.cpp:178
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:184
+#: src/net/ea/specialhandler.cpp:181
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:187
+#: src/net/ea/specialhandler.cpp:184
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:190
+#: src/net/ea/specialhandler.cpp:187
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:193
+#: src/net/ea/specialhandler.cpp:190
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:196
+#: src/net/ea/specialhandler.cpp:193
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:200
+#: src/net/ea/specialhandler.cpp:197
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:203
+#: src/net/ea/specialhandler.cpp:200
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:206
+#: src/net/ea/specialhandler.cpp:203
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:209
+#: src/net/ea/specialhandler.cpp:206
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:220
+#: src/net/ea/specialhandler.cpp:217
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:223
+#: src/net/ea/specialhandler.cpp:220
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:226
+#: src/net/ea/specialhandler.cpp:223
 msgid "Poison had no effect..."
 msgstr ""
 
diff --git a/po/nl_BE.po b/po/nl_BE.po
index 0e25387f3..3b291a563 100644
--- a/po/nl_BE.po
+++ b/po/nl_BE.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-09-17 16:12+0300\n"
-"PO-Revision-Date: 2011-09-16 20:12+0000\n"
+"POT-Creation-Date: 2011-09-27 22:18+0300\n"
+"PO-Revision-Date: 2011-09-27 19:20+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"
@@ -20,25 +20,25 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: src/actorspritemanager.cpp:1088
+#: src/actorspritemanager.cpp:1133
 msgid "Visible on map"
 msgstr "Zichtbaar op de map"
 
-#: src/being.cpp:548
+#: src/being.cpp:547
 msgid "dodge"
 msgstr "ontwijkt"
 
-#: src/being.cpp:548
+#: src/being.cpp:547
 msgid "miss"
 msgstr "mist"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1527
+#: src/being.cpp:1526
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1532
+#: src/being.cpp:1531
 msgid "I"
 msgstr "I"
 
@@ -46,43 +46,43 @@ msgstr "I"
 msgid "Setup"
 msgstr "Configureren"
 
-#: src/client.cpp:841 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:842 src/gui/setup_perfomance.cpp:48
 msgid "Perfomance"
 msgstr ""
 
-#: src/client.cpp:846 src/gui/setup_video.cpp:315
+#: src/client.cpp:847 src/gui/setup_video.cpp:315
 msgid "Video"
 msgstr "Video"
 
-#: src/client.cpp:851
+#: src/client.cpp:852
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:932
+#: src/client.cpp:934
 msgid "Connecting to server"
 msgstr "Verbinden met server"
 
-#: src/client.cpp:963
+#: src/client.cpp:965
 msgid "Logging in"
 msgstr "Inloggen"
 
-#: src/client.cpp:996
+#: src/client.cpp:998
 msgid "Entering game world"
 msgstr "Spelwereld binnenkomen"
 
-#: src/client.cpp:1096
+#: src/client.cpp:1098
 msgid "Requesting characters"
 msgstr "Aanvragen personage"
 
-#: src/client.cpp:1127
+#: src/client.cpp:1129
 msgid "Connecting to the game server"
 msgstr "Verbinden met de spelserver"
 
-#: src/client.cpp:1137
+#: src/client.cpp:1139
 msgid "Changing game servers"
 msgstr "Wijzigen spelservers"
 
-#: src/client.cpp:1180 src/client.cpp:1187 src/client.cpp:1321
+#: src/client.cpp:1182 src/client.cpp:1189 src/client.cpp:1323
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:221 src/gui/charselectdialog.cpp:253
 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
@@ -92,50 +92,50 @@ msgstr "Wijzigen spelservers"
 msgid "Error"
 msgstr "Fout"
 
-#: src/client.cpp:1196
+#: src/client.cpp:1198
 msgid "Requesting registration details"
 msgstr "Aanvragen registratie details"
 
-#: src/client.cpp:1222
+#: src/client.cpp:1224
 msgid "Password Change"
 msgstr "Paswoord Wijziging"
 
-#: src/client.cpp:1223
+#: src/client.cpp:1225
 msgid "Password changed successfully!"
 msgstr "Paswoord is gewijzigd!"
 
-#: src/client.cpp:1242
+#: src/client.cpp:1244
 msgid "Email Change"
 msgstr "Email Wijziging"
 
-#: src/client.cpp:1243
+#: src/client.cpp:1245
 msgid "Email changed successfully!"
 msgstr "Email is gewijzigd!"
 
-#: src/client.cpp:1263
+#: src/client.cpp:1265
 msgid "Unregister Successful"
 msgstr "Registratie ongedaan gemaakt!"
 
-#: src/client.cpp:1264
+#: src/client.cpp:1266
 msgid "Farewell, come back any time..."
 msgstr "Tot ziens..."
 
-#: src/client.cpp:1463 src/client.cpp:1493 src/client.cpp:1508
-#: src/client.cpp:1933 src/client.cpp:1940
+#: src/client.cpp:1465 src/client.cpp:1495 src/client.cpp:1510
+#: src/client.cpp:1935 src/client.cpp:1942
 #, 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:1639
+#: src/client.cpp:1641
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Ongeldige update host %s"
 
-#: src/client.cpp:1673 src/client.cpp:1679
+#: src/client.cpp:1675 src/client.cpp:1681
 msgid "Error creating updates directory!"
 msgstr "Fout bij het creëren van de update map!"
 
-#: src/client.cpp:1700
+#: src/client.cpp:1702
 #, 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."
@@ -344,11 +344,11 @@ msgstr "Inkomende handelsaanvragen negeren"
 msgid "Accepting incoming trade requests"
 msgstr "Inkomende handelsaanvragen accepteren"
 
-#: src/game.cpp:1729
+#: src/game.cpp:1727
 msgid "Could Not Load Map"
 msgstr "Kon Map Niet Laden"
 
-#: src/game.cpp:1730
+#: src/game.cpp:1728
 #, c-format
 msgid "Error while loading %s"
 msgstr "Fout bij het laden van %s"
@@ -383,7 +383,7 @@ msgstr "Naam"
 
 #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:133
 #: src/gui/popupmenu.cpp:283 src/gui/popupmenu.cpp:596
-#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:265
+#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:265
 msgid "Attack"
 msgstr "Aanvallen"
 
@@ -437,7 +437,7 @@ msgstr "-"
 #: src/gui/buydialog.cpp:99 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:294
-#: src/keyboardconfig.cpp:290
+#: src/keyboardconfig.cpp:82
 msgid "Quit"
 msgstr "Afsluiten"
 
@@ -472,7 +472,7 @@ msgstr "Verkopen"
 #: src/gui/popupmenu.cpp:1858 src/gui/popupmenu.cpp:1897
 #: src/gui/popupmenu.cpp:1949 src/gui/popupmenu.cpp:1969
 #: src/gui/quitdialog.cpp:55 src/gui/register.cpp:82 src/gui/setup.cpp:72
-#: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:238
+#: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:241
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
 #: src/gui/updaterwindow.cpp:161
 msgid "Cancel"
@@ -641,8 +641,8 @@ msgid "Enter password:"
 msgstr "Geef wachtwoord:"
 
 #: src/gui/charselectdialog.cpp:410 src/gui/serverdialog.cpp:298
-#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:122
-#: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:241
+#: src/gui/setup_relations.cpp:242 src/gui/shopwindow.cpp:122
+#: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244
 msgid "Delete"
 msgstr "Verwijderen"
 
@@ -894,7 +894,7 @@ msgid "Did You Know?"
 msgstr "Weet u?"
 
 #: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
-#: src/gui/inventorywindow.cpp:206 src/gui/npcdialog.cpp:53
+#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:53
 #: src/gui/popupmenu.cpp:556 src/gui/shopwindow.cpp:113
 msgid "Close"
 msgstr "Sluiten"
@@ -921,7 +921,7 @@ msgid "Equipment"
 msgstr "Uitrusting"
 
 #: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160
-#: src/gui/inventorywindow.cpp:539 src/gui/inventorywindow.cpp:548
+#: src/gui/inventorywindow.cpp:538 src/gui/inventorywindow.cpp:547
 #: src/gui/popupmenu.cpp:1656 src/gui/popupmenu.cpp:1748
 #: src/gui/popupmenu.cpp:1793
 msgid "Unequip"
@@ -951,37 +951,33 @@ msgstr ""
 msgid "by type"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:111 src/gui/windowmenu.cpp:76
+#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:76
 #: src/inventory.cpp:249
 msgid "Inventory"
 msgstr "Inventaris"
 
-#: src/gui/inventorywindow.cpp:136
+#: src/gui/inventorywindow.cpp:137
 msgid "Slots:"
 msgstr "Sloten:"
 
-#: src/gui/inventorywindow.cpp:148
+#: src/gui/inventorywindow.cpp:149
 msgid "Filter:"
 msgstr "Filter:"
 
-#: src/gui/inventorywindow.cpp:149
-msgid "Sort:"
-msgstr "Sorteer:"
-
-#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:541
-#: src/gui/inventorywindow.cpp:550 src/gui/popupmenu.cpp:1658
+#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:540
+#: src/gui/inventorywindow.cpp:549 src/gui/popupmenu.cpp:1658
 #: src/gui/popupmenu.cpp:1750 src/gui/popupmenu.cpp:1795
 msgid "Equip"
 msgstr "Uitrusten"
 
-#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:542
-#: src/gui/inventorywindow.cpp:546 src/gui/popupmenu.cpp:1662
+#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:541
+#: src/gui/inventorywindow.cpp:545 src/gui/popupmenu.cpp:1662
 #: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1754
 #: src/gui/popupmenu.cpp:1799
 msgid "Use"
 msgstr "Gebruiken"
 
-#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:646
+#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:645
 #: src/gui/popupmenu.cpp:1667 src/gui/popupmenu.cpp:1759
 #: src/gui/popupmenu.cpp:1804
 msgid "Drop..."
@@ -1001,17 +997,17 @@ msgstr "Kleren"
 msgid "Weight:"
 msgstr "Gewicht:"
 
-#: src/gui/inventorywindow.cpp:204 src/gui/inventorywindow.cpp:637
+#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:636
 #: src/gui/popupmenu.cpp:1642 src/gui/popupmenu.cpp:1771
 #: src/gui/popupmenu.cpp:1816 src/gui/setup.cpp:73
 msgid "Store"
 msgstr "Opslaan"
 
-#: src/gui/inventorywindow.cpp:205 src/gui/popupmenu.cpp:1683
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1683
 msgid "Retrieve"
 msgstr "Afhalen"
 
-#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1672
+#: src/gui/inventorywindow.cpp:647 src/gui/popupmenu.cpp:1672
 #: src/gui/popupmenu.cpp:1764 src/gui/popupmenu.cpp:1809
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
@@ -2204,30 +2200,34 @@ msgid "Show own name"
 msgstr "Toon eigen naam"
 
 #: src/gui/setup_players.cpp:63
+msgid "Enable extended mouse targeting"
+msgstr ""
+
+#: src/gui/setup_players.cpp:66
 msgid "Target dead players"
 msgstr "Viseer dode spelers"
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_players.cpp:69
 msgid "Visible names"
 msgstr "Zichtbare namen"
 
-#: src/gui/setup_players.cpp:69
+#: src/gui/setup_players.cpp:72
 msgid "Secure trades"
 msgstr ""
 
-#: src/gui/setup_players.cpp:72
+#: src/gui/setup_players.cpp:75
 msgid "Unsecure chars in names"
 msgstr ""
 
-#: src/gui/setup_players.cpp:75
+#: src/gui/setup_players.cpp:78
 msgid "Show statuses"
 msgstr ""
 
-#: src/gui/setup_players.cpp:78
+#: src/gui/setup_players.cpp:81
 msgid "Show ip addresses on screenshots"
 msgstr ""
 
-#: src/gui/setup_players.cpp:81
+#: src/gui/setup_players.cpp:84
 msgid "Allow self heal with mouse click"
 msgstr ""
 
@@ -2255,23 +2255,23 @@ msgstr "Genegeerd"
 msgid "Erased"
 msgstr "Gewist"
 
-#: src/gui/setup_relations.cpp:239
+#: src/gui/setup_relations.cpp:238
 msgid "Allow trading"
 msgstr "Handelen toestaan"
 
-#: src/gui/setup_relations.cpp:241
+#: src/gui/setup_relations.cpp:240
 msgid "Allow whispers"
 msgstr "Fluisteren toestaan"
 
-#: src/gui/setup_relations.cpp:244
+#: src/gui/setup_relations.cpp:243
 msgid "Old"
 msgstr "Oud"
 
-#: src/gui/setup_relations.cpp:246
+#: src/gui/setup_relations.cpp:245
 msgid "Relations"
 msgstr "Relaties"
 
-#: src/gui/setup_relations.cpp:271
+#: src/gui/setup_relations.cpp:270
 msgid "When ignoring:"
 msgstr "Tijdens negeren:"
 
@@ -3244,30 +3244,34 @@ msgid "Command:"
 msgstr "Commando:"
 
 #: src/gui/textcommandeditor.cpp:200
+msgid "Comment:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:203
 msgid "Mana:"
 msgstr "Mana:"
 
-#: src/gui/textcommandeditor.cpp:206
+#: src/gui/textcommandeditor.cpp:209
 msgid "Target Type:"
 msgstr "Doel Type:"
 
-#: src/gui/textcommandeditor.cpp:212
+#: src/gui/textcommandeditor.cpp:215
 msgid "Icon:"
 msgstr "Icoon:"
 
-#: src/gui/textcommandeditor.cpp:218
+#: src/gui/textcommandeditor.cpp:221
 msgid "Magic level:"
 msgstr "Magie niveau:"
 
-#: src/gui/textcommandeditor.cpp:224
+#: src/gui/textcommandeditor.cpp:227
 msgid "Magic School:"
 msgstr "Magie School:"
 
-#: src/gui/textcommandeditor.cpp:230
+#: src/gui/textcommandeditor.cpp:233
 msgid "School level:"
 msgstr "School niveau:"
 
-#: src/gui/textcommandeditor.cpp:235
+#: src/gui/textcommandeditor.cpp:238
 msgid "Save"
 msgstr "Bewaren"
 
@@ -3497,23 +3501,23 @@ msgstr ""
 msgid "Road Point"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:474
+#: src/gui/whoisonline.cpp:85 src/gui/whoisonline.cpp:478
 msgid "Who Is Online - Updating"
 msgstr "Wie Is Online - Bijwerken"
 
-#: src/gui/whoisonline.cpp:104
+#: src/gui/whoisonline.cpp:108
 msgid "Update"
 msgstr "Bijwerken"
 
-#: src/gui/whoisonline.cpp:297
+#: src/gui/whoisonline.cpp:301
 msgid "Who Is Online - "
 msgstr "Wie Is Online - "
 
-#: src/gui/whoisonline.cpp:488
+#: src/gui/whoisonline.cpp:492
 msgid "Who Is Online - error"
 msgstr "Wie Is Online - fout"
 
-#: src/gui/whoisonline.cpp:519
+#: src/gui/whoisonline.cpp:523
 msgid "Who Is Online - Update"
 msgstr "Wie Is Online - Bijgewerkt"
 
@@ -3802,49 +3806,49 @@ msgid "Cart"
 msgstr ""
 
 #: src/keyboardconfig.cpp:43
+msgid "Basic Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:44
 msgid "Move Up"
 msgstr "Omhoog"
 
-#: src/keyboardconfig.cpp:44
+#: src/keyboardconfig.cpp:45
 msgid "Move Down"
 msgstr "Omlaag"
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:46
 msgid "Move Left"
 msgstr "Naar links"
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:47
 msgid "Move Right"
 msgstr "Naar rechts"
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:50
 msgid "Target & Attack"
 msgstr "Viseren en Aanvallen"
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:52
 msgid "Move to Target"
 msgstr "Beweeg tot aan Doel"
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:54
 msgid "Change Move to Target type"
 msgstr "Wijzig Bewegen tot aan Doel type"
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:56
 msgid "Move to Home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:58
 msgid "Set home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:59
+#: src/keyboardconfig.cpp:60
 msgid "Move to navigation point"
 msgstr ""
 
-#: src/keyboardconfig.cpp:61
-msgid "Smilie"
-msgstr "Smilie"
-
 #: src/keyboardconfig.cpp:63
 msgid "Stop Attack"
 msgstr "Aanval stoppen"
@@ -3890,368 +3894,396 @@ msgid "Change Map View Mode"
 msgstr "Wijzig Map Tonen Modus"
 
 #: src/keyboardconfig.cpp:80
+msgid "Select OK"
+msgstr "OK selecteren"
+
+#: src/keyboardconfig.cpp:83
+msgid "Shortcuts Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:84
 msgid "Item Shortcuts Key"
 msgstr "Voorwerpsnelkoppelingstoets"
 
-#: src/keyboardconfig.cpp:82 src/keyboardconfig.cpp:84
 #: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:88
 #: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:92
 #: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:96
 #: src/keyboardconfig.cpp:98 src/keyboardconfig.cpp:100
 #: src/keyboardconfig.cpp:102 src/keyboardconfig.cpp:104
 #: src/keyboardconfig.cpp:106 src/keyboardconfig.cpp:108
-#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:113
-#: src/keyboardconfig.cpp:115 src/keyboardconfig.cpp:117
+#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:112
+#: src/keyboardconfig.cpp:114 src/keyboardconfig.cpp:117
 #: src/keyboardconfig.cpp:119 src/keyboardconfig.cpp:121
-#: src/keyboardconfig.cpp:360
+#: src/keyboardconfig.cpp:123 src/keyboardconfig.cpp:125
+#: src/keyboardconfig.cpp:367
 #, c-format
 msgid "Item Shortcut %d"
 msgstr "Snelkoppeling naar voorwerp %d"
 
-#: src/keyboardconfig.cpp:122
+#: src/keyboardconfig.cpp:126
+msgid "Windows Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:127
 msgid "Help Window"
 msgstr "Help venster"
 
-#: src/keyboardconfig.cpp:124
+#: src/keyboardconfig.cpp:129
 msgid "Status Window"
 msgstr "Statusvenster"
 
-#: src/keyboardconfig.cpp:126
+#: src/keyboardconfig.cpp:131
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:128
+#: src/keyboardconfig.cpp:133
 msgid "Equipment Window"
 msgstr "Uitrustingsvenster"
 
-#: src/keyboardconfig.cpp:130
+#: src/keyboardconfig.cpp:135
 msgid "Skill Window"
 msgstr "Vaardigheidsvenster"
 
-#: src/keyboardconfig.cpp:132
+#: src/keyboardconfig.cpp:137
 msgid "Minimap Window"
 msgstr "Minimapvenster"
 
-#: src/keyboardconfig.cpp:134
+#: src/keyboardconfig.cpp:139
 msgid "Chat Window"
 msgstr "Gespreksvenster"
 
-#: src/keyboardconfig.cpp:136
+#: src/keyboardconfig.cpp:141
 msgid "Item Shortcut Window"
 msgstr "Voorwerpsnelkoppelingsvenster"
 
-#: src/keyboardconfig.cpp:138
+#: src/keyboardconfig.cpp:143
 msgid "Setup Window"
 msgstr "Instellingenvenster"
 
-#: src/keyboardconfig.cpp:140
+#: src/keyboardconfig.cpp:145
 msgid "Debug Window"
 msgstr "Debugvenster"
 
-#: src/keyboardconfig.cpp:142
+#: src/keyboardconfig.cpp:147
 msgid "Social Window"
 msgstr "Sociaal Venster"
 
-#: src/keyboardconfig.cpp:144
+#: src/keyboardconfig.cpp:149
 msgid "Emote Shortcut Window"
 msgstr "Emoticonsnelkoppelingsvenster"
 
-#: src/keyboardconfig.cpp:146
+#: src/keyboardconfig.cpp:151
 msgid "Outfits Window"
 msgstr "Kleren Venster"
 
-#: src/keyboardconfig.cpp:148
+#: src/keyboardconfig.cpp:153
 msgid "Shop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:150
+#: src/keyboardconfig.cpp:155
 msgid "Quick drop Window"
 msgstr "Snel neerleggingsvenster"
 
-#: src/keyboardconfig.cpp:152
+#: src/keyboardconfig.cpp:157
 msgid "Kill Stats Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:154
+#: src/keyboardconfig.cpp:159
 msgid "Commands Window"
 msgstr "Commando Venster"
 
-#: src/keyboardconfig.cpp:156
+#: src/keyboardconfig.cpp:161
 msgid "Bot Checker Window"
 msgstr "Bot Controle Venster"
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboardconfig.cpp:164
 msgid "Who Is Online Window"
 msgstr "Wie Is Online Venster"
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboardconfig.cpp:166
 msgid "Did you know Window"
 msgstr "Weet u Venster"
 
-#: src/keyboardconfig.cpp:164
+#: src/keyboardconfig.cpp:169
 msgid "Previous Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:166
+#: src/keyboardconfig.cpp:171
 msgid "Next Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:168 src/keyboardconfig.cpp:170
-#: src/keyboardconfig.cpp:172 src/keyboardconfig.cpp:174
-#: src/keyboardconfig.cpp:176 src/keyboardconfig.cpp:178
-#: src/keyboardconfig.cpp:180 src/keyboardconfig.cpp:182
-#: src/keyboardconfig.cpp:184 src/keyboardconfig.cpp:186
-#: src/keyboardconfig.cpp:188 src/keyboardconfig.cpp:190
-#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
-#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
-#: src/keyboardconfig.cpp:201 src/keyboardconfig.cpp:203
-#: src/keyboardconfig.cpp:205 src/keyboardconfig.cpp:207
-#: src/keyboardconfig.cpp:209 src/keyboardconfig.cpp:211
-#: src/keyboardconfig.cpp:213 src/keyboardconfig.cpp:215
-#: src/keyboardconfig.cpp:217 src/keyboardconfig.cpp:220
-#: src/keyboardconfig.cpp:223 src/keyboardconfig.cpp:226
-#: src/keyboardconfig.cpp:228 src/keyboardconfig.cpp:230
-#: src/keyboardconfig.cpp:232 src/keyboardconfig.cpp:234
-#: src/keyboardconfig.cpp:236 src/keyboardconfig.cpp:238
-#: src/keyboardconfig.cpp:240 src/keyboardconfig.cpp:242
-#: src/keyboardconfig.cpp:244 src/keyboardconfig.cpp:247
-#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
-#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
-#: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:259
-#: src/keyboardconfig.cpp:355
+#: src/keyboardconfig.cpp:173
+msgid "Emotes Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:174
+msgid "Smilie"
+msgstr "Smilie"
+
+#: src/keyboardconfig.cpp:175 src/keyboardconfig.cpp:177
+#: src/keyboardconfig.cpp:179 src/keyboardconfig.cpp:181
+#: src/keyboardconfig.cpp:183 src/keyboardconfig.cpp:185
+#: src/keyboardconfig.cpp:187 src/keyboardconfig.cpp:189
+#: src/keyboardconfig.cpp:191 src/keyboardconfig.cpp:193
+#: src/keyboardconfig.cpp:195 src/keyboardconfig.cpp:197
+#: src/keyboardconfig.cpp:200 src/keyboardconfig.cpp:202
+#: src/keyboardconfig.cpp:204 src/keyboardconfig.cpp:206
+#: src/keyboardconfig.cpp:208 src/keyboardconfig.cpp:210
+#: src/keyboardconfig.cpp:212 src/keyboardconfig.cpp:214
+#: src/keyboardconfig.cpp:216 src/keyboardconfig.cpp:218
+#: src/keyboardconfig.cpp:220 src/keyboardconfig.cpp:222
+#: src/keyboardconfig.cpp:224 src/keyboardconfig.cpp:227
+#: src/keyboardconfig.cpp:230 src/keyboardconfig.cpp:233
+#: src/keyboardconfig.cpp:235 src/keyboardconfig.cpp:237
+#: src/keyboardconfig.cpp:239 src/keyboardconfig.cpp:241
+#: src/keyboardconfig.cpp:243 src/keyboardconfig.cpp:245
+#: src/keyboardconfig.cpp:247 src/keyboardconfig.cpp:249
+#: src/keyboardconfig.cpp:251 src/keyboardconfig.cpp:254
+#: src/keyboardconfig.cpp:256 src/keyboardconfig.cpp:258
+#: src/keyboardconfig.cpp:260 src/keyboardconfig.cpp:262
+#: src/keyboardconfig.cpp:264 src/keyboardconfig.cpp:266
+#: src/keyboardconfig.cpp:362
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "Emoticon snelkoppeling %d"
 
-#: src/keyboardconfig.cpp:261
+#: src/keyboardconfig.cpp:268
+msgid "Outfits Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:269
 msgid "Wear Outfit"
 msgstr "Draag Kledij"
 
-#: src/keyboardconfig.cpp:263
+#: src/keyboardconfig.cpp:271
 msgid "Copy Outfit"
 msgstr "Kopiëer Kledij"
 
-#: src/keyboardconfig.cpp:265
+#: src/keyboardconfig.cpp:273
 msgid "Copy equipped to Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:267
+#: src/keyboardconfig.cpp:275
+msgid "Chat Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:276
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:269
+#: src/keyboardconfig.cpp:278
 msgid "Scroll Chat Up"
 msgstr "Chat omhoogscrollen"
 
-#: src/keyboardconfig.cpp:271
+#: src/keyboardconfig.cpp:280
 msgid "Scroll Chat Down"
 msgstr "Chat omlaagscrollen"
 
-#: src/keyboardconfig.cpp:273
+#: src/keyboardconfig.cpp:282
 msgid "Previous Chat Tab"
 msgstr "Vorige chattab"
 
-#: src/keyboardconfig.cpp:275
+#: src/keyboardconfig.cpp:284
 msgid "Next Chat Tab"
 msgstr "Volgende chattab"
 
-#: src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:287
 msgid "Close current Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:280
+#: src/keyboardconfig.cpp:289
 msgid "Previous chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:282
+#: src/keyboardconfig.cpp:291
 msgid "Next chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:284
+#: src/keyboardconfig.cpp:293
 msgid "Chat Auto Complete"
 msgstr ""
 
-#: src/keyboardconfig.cpp:286
+#: src/keyboardconfig.cpp:295
 msgid "Deactivate Chat Input"
 msgstr ""
 
-#: src/keyboardconfig.cpp:288
-msgid "Select OK"
-msgstr "OK selecteren"
+#: src/keyboardconfig.cpp:297
+msgid "Other Keys"
+msgstr ""
 
-#: src/keyboardconfig.cpp:291
+#: src/keyboardconfig.cpp:298
 msgid "Ignore input 1"
 msgstr "Ingave 1 negeren"
 
-#: src/keyboardconfig.cpp:293
+#: src/keyboardconfig.cpp:300
 msgid "Ignore input 2"
 msgstr "Ingave 2 negeren"
 
-#: src/keyboardconfig.cpp:295
+#: src/keyboardconfig.cpp:302
 msgid "Direct Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:296
+#: src/keyboardconfig.cpp:303
 msgid "Direct Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboardconfig.cpp:305
 msgid "Direct Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:299
+#: src/keyboardconfig.cpp:306
 msgid "Direct Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:301
+#: src/keyboardconfig.cpp:308
 msgid "Crazy moves"
 msgstr ""
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboardconfig.cpp:310
 msgid "Change Crazy Move mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboardconfig.cpp:312
 msgid "Quick Drop N Items from 0 slot"
 msgstr "Snel N Voorwerpen van slot 0 neerleggen"
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboardconfig.cpp:314
 msgid "Quick Drop N Items"
 msgstr "Snel N Voorwerpen Neerleggen"
 
-#: src/keyboardconfig.cpp:309
+#: src/keyboardconfig.cpp:316
 msgid "Switch Quick Drop Counter"
 msgstr "Wissel Snel Neerleggingsteller"
 
-#: src/keyboardconfig.cpp:311
+#: src/keyboardconfig.cpp:318
 msgid "Quick heal target or self"
 msgstr "Snel jezelf of iemand anders genezen"
 
-#: src/keyboardconfig.cpp:313
+#: src/keyboardconfig.cpp:320
 msgid "Use #itenplz spell"
 msgstr "Gebruik #itenplz spreuk"
 
-#: src/keyboardconfig.cpp:315
+#: src/keyboardconfig.cpp:322
 msgid "Use magic attack"
 msgstr "Gebruik magie aanval"
 
-#: src/keyboardconfig.cpp:317
+#: src/keyboardconfig.cpp:324
 msgid "Switch magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:319
+#: src/keyboardconfig.cpp:326
 msgid "Change move type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:321
+#: src/keyboardconfig.cpp:328
 msgid "Change Attack Weapon Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:323
+#: src/keyboardconfig.cpp:330
 msgid "Change Attack Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:325
+#: src/keyboardconfig.cpp:332
 msgid "Change Follow mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:327
+#: src/keyboardconfig.cpp:334
 msgid "Change Imitation mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboardconfig.cpp:337
 msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:331
+#: src/keyboardconfig.cpp:338
 msgid "On / Off audio"
 msgstr "Aan / Uit audio"
 
-#: src/keyboardconfig.cpp:333
+#: src/keyboardconfig.cpp:340
 msgid "Enable / Disable away mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:335
+#: src/keyboardconfig.cpp:342
 msgid "Emulate right click from keyboard"
 msgstr ""
 
-#: src/keyboardconfig.cpp:337
+#: src/keyboardconfig.cpp:344
 msgid "Toggle camera mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:339
+#: src/keyboardconfig.cpp:346
 msgid "Modifier key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:411
+#: src/keyboardconfig.cpp:425
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:377
+#: src/localplayer.cpp:380
 msgid "You were killed by "
 msgstr "U bent gedoodt door "
 
-#: src/localplayer.cpp:1416
+#: src/localplayer.cpp:1422
 msgid "Tried to pick up nonexistent item."
 msgstr "Geprobeerd een nietbestaand voorwerp op te rapen."
 
-#: src/localplayer.cpp:1418
+#: src/localplayer.cpp:1424
 msgid "Item is too heavy."
 msgstr "Voorwerp is te zwaar."
 
-#: src/localplayer.cpp:1420
+#: src/localplayer.cpp:1426
 msgid "Item is too far away."
 msgstr "Voorwerp is te ver weg."
 
-#: src/localplayer.cpp:1422
+#: src/localplayer.cpp:1428
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1424
+#: src/localplayer.cpp:1430
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1427
+#: src/localplayer.cpp:1433
 msgid "Item belongs to someone else."
 msgstr "Voorwerp behoort bij iemand anders."
 
-#: src/localplayer.cpp:1430
+#: src/localplayer.cpp:1436
 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:1454
+#: src/localplayer.cpp:1460
 #, 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:3168
+#: src/localplayer.cpp:3174
 msgid "Away"
 msgstr "Weg"
 
-#: src/localplayer.cpp:3468
+#: src/localplayer.cpp:3494
 msgid "Follow: "
 msgstr "Volg: "
 
-#: src/localplayer.cpp:3470 src/localplayer.cpp:3485
+#: src/localplayer.cpp:3496 src/localplayer.cpp:3511
 msgid "Follow canceled"
 msgstr "Volgen onderbroken"
 
-#: src/localplayer.cpp:3477
+#: src/localplayer.cpp:3503
 msgid "Imitation: "
 msgstr "Imitatie: "
 
-#: src/localplayer.cpp:3479 src/localplayer.cpp:3487
+#: src/localplayer.cpp:3505 src/localplayer.cpp:3513
 msgid "Imitation canceled"
 msgstr "Imitatie onderbroken"
 
-#: src/localplayer.cpp:3832
+#: src/localplayer.cpp:3858
 msgid "You see "
 msgstr ""
 
@@ -4642,15 +4674,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:286
+#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:284
 msgid "Item sharing enabled."
 msgstr "Voorwerpdeling ingeschakeld."
 
-#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:296
+#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:294
 msgid "Item sharing disabled."
 msgstr "Voorwerpdeling uitgeschakeld."
 
-#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:306
+#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:304
 msgid "Item sharing not possible."
 msgstr "Voorwerpdeling is niet mogelijk."
 
@@ -4658,15 +4690,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:248
+#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:246
 msgid "Experience sharing enabled."
 msgstr "Ervaringsdeling ingeschakeld."
 
-#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:258
+#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:256
 msgid "Experience sharing disabled."
 msgstr "Ervaringsdeling uitgeschakeld."
 
-#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:268
+#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:266
 msgid "Experience sharing not possible."
 msgstr "Ervaringsdeling is niet mogelijk."
 
@@ -4747,54 +4779,54 @@ msgstr "Deze gebruikersnaam is al genomen."
 msgid "Username permanently erased."
 msgstr "Gebruikersnaam is compleet verwijderd"
 
-#: src/net/ea/partyhandler.cpp:82
+#: src/net/ea/partyhandler.cpp:80
 msgid "Could not create party."
 msgstr "Kan geen groep aanmaken."
 
-#: src/net/ea/partyhandler.cpp:84
+#: src/net/ea/partyhandler.cpp:82
 msgid "Party successfully created."
 msgstr "Groep succesvol aangemaakt."
 
-#: src/net/ea/partyhandler.cpp:140
+#: src/net/ea/partyhandler.cpp:138
 #, c-format
 msgid "%s has joined your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:176
+#: src/net/ea/partyhandler.cpp:174
 #, c-format
 msgid "%s is already a member of a party."
 msgstr "%s is al een lid van een groep."
 
-#: src/net/ea/partyhandler.cpp:181
+#: src/net/ea/partyhandler.cpp:179
 #, c-format
 msgid "%s refused your invitation."
 msgstr "%s wees jouw uitnodiging af."
 
-#: src/net/ea/partyhandler.cpp:186
+#: src/net/ea/partyhandler.cpp:184
 #, c-format
 msgid "%s is now a member of your party."
 msgstr "%s is nu een lid van jouw groep."
 
-#: src/net/ea/partyhandler.cpp:191
+#: src/net/ea/partyhandler.cpp:189
 #, c-format
 msgid "%s can't join your party because party is full."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:196
+#: src/net/ea/partyhandler.cpp:194
 #, c-format
 msgid "QQQ Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:356
+#: src/net/ea/partyhandler.cpp:354
 msgid "You have left the party."
 msgstr "Je hebt de groep verlaten."
 
-#: src/net/ea/partyhandler.cpp:369
+#: src/net/ea/partyhandler.cpp:367
 #, c-format
 msgid "%s has left your party."
 msgstr "%s heeft jouw groep verlaten."
 
-#: src/net/ea/partyhandler.cpp:448
+#: src/net/ea/partyhandler.cpp:446
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr "Een onbekend lid probeerde te zeggen: %s"
@@ -4955,83 +4987,83 @@ msgstr ""
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:149
+#: src/net/ea/specialhandler.cpp:146
 msgid "Trade failed!"
 msgstr "Handel mislukte!"
 
-#: src/net/ea/specialhandler.cpp:152
+#: src/net/ea/specialhandler.cpp:149
 msgid "Emote failed!"
 msgstr "Emoticon gefaald!"
 
-#: src/net/ea/specialhandler.cpp:155
+#: src/net/ea/specialhandler.cpp:152
 msgid "Sit failed!"
 msgstr "Zitten niet mogelijk!"
 
-#: src/net/ea/specialhandler.cpp:158
+#: src/net/ea/specialhandler.cpp:155
 msgid "Chat creating failed!"
 msgstr "Chatcreatie mislukte!"
 
-#: src/net/ea/specialhandler.cpp:161
+#: src/net/ea/specialhandler.cpp:158
 msgid "Could not join party!"
 msgstr "Kan je niet bij de groep voegen!"
 
-#: src/net/ea/specialhandler.cpp:164
+#: src/net/ea/specialhandler.cpp:161
 msgid "Cannot shout!"
 msgstr "Kan niet roepen!"
 
-#: src/net/ea/specialhandler.cpp:177
+#: src/net/ea/specialhandler.cpp:174
 msgid "You have not yet reached a high enough lvl!"
 msgstr "Je hebt nog geen hoog genoeg level bereikt!"
 
-#: src/net/ea/specialhandler.cpp:181
+#: src/net/ea/specialhandler.cpp:178
 msgid "Insufficient HP!"
 msgstr "Onvoldoende leven!"
 
-#: src/net/ea/specialhandler.cpp:184
+#: src/net/ea/specialhandler.cpp:181
 msgid "Insufficient SP!"
 msgstr "Onvoldoende Vaardigheidspunten!"
 
-#: src/net/ea/specialhandler.cpp:187
+#: src/net/ea/specialhandler.cpp:184
 msgid "You have no memos!"
 msgstr "Je hebt geen memo's!"
 
-#: src/net/ea/specialhandler.cpp:190
+#: src/net/ea/specialhandler.cpp:187
 msgid "You cannot do that right now!"
 msgstr "Je kan dat nu niet doen!"
 
-#: src/net/ea/specialhandler.cpp:193
+#: src/net/ea/specialhandler.cpp:190
 msgid "Seems you need more money... ;-)"
 msgstr "Het lijkt erop dat je meer geld nodig hebt... ;-)"
 
-#: src/net/ea/specialhandler.cpp:196
+#: src/net/ea/specialhandler.cpp:193
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Je kan die vaardigheid niet gebruiken met dit type wapen!"
 
-#: src/net/ea/specialhandler.cpp:200
+#: src/net/ea/specialhandler.cpp:197
 msgid "You need another red gem!"
 msgstr "Je hebt een andere rode edelsteen nodig!"
 
-#: src/net/ea/specialhandler.cpp:203
+#: src/net/ea/specialhandler.cpp:200
 msgid "You need another blue gem!"
 msgstr "Je hebt een andere blauwe edelsteen nodig!"
 
-#: src/net/ea/specialhandler.cpp:206
+#: src/net/ea/specialhandler.cpp:203
 msgid "You're carrying to much to do this!"
 msgstr "Je draagt teveel bij je om dit te doen!"
 
-#: src/net/ea/specialhandler.cpp:209
+#: src/net/ea/specialhandler.cpp:206
 msgid "Huh? What's that?"
 msgstr "Huh? Wat is dat?"
 
-#: src/net/ea/specialhandler.cpp:220
+#: src/net/ea/specialhandler.cpp:217
 msgid "Warp failed..."
 msgstr "Warp mislukt..."
 
-#: src/net/ea/specialhandler.cpp:223
+#: src/net/ea/specialhandler.cpp:220
 msgid "Could not steal anything..."
 msgstr "Kon niets stelen..."
 
-#: src/net/ea/specialhandler.cpp:226
+#: src/net/ea/specialhandler.cpp:223
 msgid "Poison had no effect..."
 msgstr "Gif had geen effect..."
 
diff --git a/po/pt.po b/po/pt.po
index 8b2d54bbb..672424c4a 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-09-17 16:12+0300\n"
-"PO-Revision-Date: 2011-09-16 20:15+0000\n"
-"Last-Translator: freya <freya.df@gmail.com>\n"
+"POT-Creation-Date: 2011-09-27 22:18+0300\n"
+"PO-Revision-Date: 2011-09-27 19:20+0000\n"
+"Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: Portuguese (http://www.transifex.net/projects/p/manaplus/team/"
 "pt/)\n"
 "Language: pt\n"
@@ -21,25 +21,25 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: src/actorspritemanager.cpp:1088
+#: src/actorspritemanager.cpp:1133
 msgid "Visible on map"
 msgstr "Visivel no mapa"
 
-#: src/being.cpp:548
+#: src/being.cpp:547
 msgid "dodge"
 msgstr "desviou"
 
-#: src/being.cpp:548
+#: src/being.cpp:547
 msgid "miss"
 msgstr "errou"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1527
+#: src/being.cpp:1526
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1532
+#: src/being.cpp:1531
 msgid "I"
 msgstr "l"
 
@@ -47,43 +47,43 @@ msgstr "l"
 msgid "Setup"
 msgstr "Configurar"
 
-#: src/client.cpp:841 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:842 src/gui/setup_perfomance.cpp:48
 msgid "Perfomance"
 msgstr "Performance"
 
-#: src/client.cpp:846 src/gui/setup_video.cpp:315
+#: src/client.cpp:847 src/gui/setup_video.cpp:315
 msgid "Video"
 msgstr "Vídeo"
 
-#: src/client.cpp:851
+#: src/client.cpp:852
 msgid "Themes"
 msgstr "Temas"
 
-#: src/client.cpp:932
+#: src/client.cpp:934
 msgid "Connecting to server"
 msgstr "Conectando ao servidor"
 
-#: src/client.cpp:963
+#: src/client.cpp:965
 msgid "Logging in"
 msgstr "Efetuando login"
 
-#: src/client.cpp:996
+#: src/client.cpp:998
 msgid "Entering game world"
 msgstr "Entrando no domínio do jogo"
 
-#: src/client.cpp:1096
+#: src/client.cpp:1098
 msgid "Requesting characters"
 msgstr "Requisitando personagens"
 
-#: src/client.cpp:1127
+#: src/client.cpp:1129
 msgid "Connecting to the game server"
 msgstr "Conectando ao servidor do jogo"
 
-#: src/client.cpp:1137
+#: src/client.cpp:1139
 msgid "Changing game servers"
 msgstr "Mudando servidores do jogo"
 
-#: src/client.cpp:1180 src/client.cpp:1187 src/client.cpp:1321
+#: src/client.cpp:1182 src/client.cpp:1189 src/client.cpp:1323
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:221 src/gui/charselectdialog.cpp:253
 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
@@ -93,50 +93,50 @@ msgstr "Mudando servidores do jogo"
 msgid "Error"
 msgstr "Erro"
 
-#: src/client.cpp:1196
+#: src/client.cpp:1198
 msgid "Requesting registration details"
 msgstr "Requisitando detalhes do registro"
 
-#: src/client.cpp:1222
+#: src/client.cpp:1224
 msgid "Password Change"
 msgstr "Mudar senha"
 
-#: src/client.cpp:1223
+#: src/client.cpp:1225
 msgid "Password changed successfully!"
 msgstr "Senha modificada com sucesso!"
 
-#: src/client.cpp:1242
+#: src/client.cpp:1244
 msgid "Email Change"
 msgstr "Mudar email"
 
-#: src/client.cpp:1243
+#: src/client.cpp:1245
 msgid "Email changed successfully!"
 msgstr "Email modificado com sucesso!"
 
-#: src/client.cpp:1263
+#: src/client.cpp:1265
 msgid "Unregister Successful"
 msgstr "Registro cancelado com sucesso"
 
-#: src/client.cpp:1264
+#: src/client.cpp:1266
 msgid "Farewell, come back any time..."
 msgstr "Tchau, volte sempre..."
 
-#: src/client.cpp:1463 src/client.cpp:1493 src/client.cpp:1508
-#: src/client.cpp:1933 src/client.cpp:1940
+#: src/client.cpp:1465 src/client.cpp:1495 src/client.cpp:1510
+#: src/client.cpp:1935 src/client.cpp:1942
 #, 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:1639
+#: src/client.cpp:1641
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Host de atualização inválido: %s"
 
-#: src/client.cpp:1673 src/client.cpp:1679
+#: src/client.cpp:1675 src/client.cpp:1681
 msgid "Error creating updates directory!"
 msgstr "Erro ao criar pasta de atualizações!"
 
-#: src/client.cpp:1700
+#: src/client.cpp:1702
 #, 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."
@@ -345,11 +345,11 @@ msgstr "Ignorando propostas de negócios"
 msgid "Accepting incoming trade requests"
 msgstr "Aceitando propostas de negócios"
 
-#: src/game.cpp:1729
+#: src/game.cpp:1727
 msgid "Could Not Load Map"
 msgstr "Não foi possível carregar o mapa"
 
-#: src/game.cpp:1730
+#: src/game.cpp:1728
 #, c-format
 msgid "Error while loading %s"
 msgstr "Erro ao carregar %s"
@@ -384,7 +384,7 @@ msgstr "Nome"
 
 #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:133
 #: src/gui/popupmenu.cpp:283 src/gui/popupmenu.cpp:596
-#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:265
+#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:265
 msgid "Attack"
 msgstr "Atacar"
 
@@ -438,7 +438,7 @@ msgstr "-"
 #: src/gui/buydialog.cpp:99 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:294
-#: src/keyboardconfig.cpp:290
+#: src/keyboardconfig.cpp:82
 msgid "Quit"
 msgstr "Sair"
 
@@ -473,7 +473,7 @@ msgstr "Vender"
 #: src/gui/popupmenu.cpp:1858 src/gui/popupmenu.cpp:1897
 #: src/gui/popupmenu.cpp:1949 src/gui/popupmenu.cpp:1969
 #: src/gui/quitdialog.cpp:55 src/gui/register.cpp:82 src/gui/setup.cpp:72
-#: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:238
+#: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:241
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
 #: src/gui/updaterwindow.cpp:161
 msgid "Cancel"
@@ -642,8 +642,8 @@ msgid "Enter password:"
 msgstr "Entre com a senha"
 
 #: src/gui/charselectdialog.cpp:410 src/gui/serverdialog.cpp:298
-#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:122
-#: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:241
+#: src/gui/setup_relations.cpp:242 src/gui/shopwindow.cpp:122
+#: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244
 msgid "Delete"
 msgstr "Excluir"
 
@@ -895,7 +895,7 @@ msgid "Did You Know?"
 msgstr "Você sabia?"
 
 #: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
-#: src/gui/inventorywindow.cpp:206 src/gui/npcdialog.cpp:53
+#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:53
 #: src/gui/popupmenu.cpp:556 src/gui/shopwindow.cpp:113
 msgid "Close"
 msgstr "Fechar"
@@ -922,7 +922,7 @@ msgid "Equipment"
 msgstr "Equipamento"
 
 #: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160
-#: src/gui/inventorywindow.cpp:539 src/gui/inventorywindow.cpp:548
+#: src/gui/inventorywindow.cpp:538 src/gui/inventorywindow.cpp:547
 #: src/gui/popupmenu.cpp:1656 src/gui/popupmenu.cpp:1748
 #: src/gui/popupmenu.cpp:1793
 msgid "Unequip"
@@ -952,37 +952,33 @@ msgstr "por quantidade"
 msgid "by type"
 msgstr "por tipo"
 
-#: src/gui/inventorywindow.cpp:111 src/gui/windowmenu.cpp:76
+#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:76
 #: src/inventory.cpp:249
 msgid "Inventory"
 msgstr "Inventário"
 
-#: src/gui/inventorywindow.cpp:136
+#: src/gui/inventorywindow.cpp:137
 msgid "Slots:"
 msgstr "Slots:"
 
-#: src/gui/inventorywindow.cpp:148
+#: src/gui/inventorywindow.cpp:149
 msgid "Filter:"
 msgstr "Filtro:"
 
-#: src/gui/inventorywindow.cpp:149
-msgid "Sort:"
-msgstr "Classificar"
-
-#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:541
-#: src/gui/inventorywindow.cpp:550 src/gui/popupmenu.cpp:1658
+#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:540
+#: src/gui/inventorywindow.cpp:549 src/gui/popupmenu.cpp:1658
 #: src/gui/popupmenu.cpp:1750 src/gui/popupmenu.cpp:1795
 msgid "Equip"
 msgstr "Equipar"
 
-#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:542
-#: src/gui/inventorywindow.cpp:546 src/gui/popupmenu.cpp:1662
+#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:541
+#: src/gui/inventorywindow.cpp:545 src/gui/popupmenu.cpp:1662
 #: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1754
 #: src/gui/popupmenu.cpp:1799
 msgid "Use"
 msgstr "Usar"
 
-#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:646
+#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:645
 #: src/gui/popupmenu.cpp:1667 src/gui/popupmenu.cpp:1759
 #: src/gui/popupmenu.cpp:1804
 msgid "Drop..."
@@ -1002,17 +998,17 @@ msgstr "Roupas"
 msgid "Weight:"
 msgstr "Peso:"
 
-#: src/gui/inventorywindow.cpp:204 src/gui/inventorywindow.cpp:637
+#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:636
 #: src/gui/popupmenu.cpp:1642 src/gui/popupmenu.cpp:1771
 #: src/gui/popupmenu.cpp:1816 src/gui/setup.cpp:73
 msgid "Store"
 msgstr "Armazenar"
 
-#: src/gui/inventorywindow.cpp:205 src/gui/popupmenu.cpp:1683
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1683
 msgid "Retrieve"
 msgstr "Retirar"
 
-#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1672
+#: src/gui/inventorywindow.cpp:647 src/gui/popupmenu.cpp:1672
 #: src/gui/popupmenu.cpp:1764 src/gui/popupmenu.cpp:1809
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
@@ -2204,30 +2200,34 @@ msgid "Show own name"
 msgstr "Mostrar o próprio nome"
 
 #: src/gui/setup_players.cpp:63
+msgid "Enable extended mouse targeting"
+msgstr ""
+
+#: src/gui/setup_players.cpp:66
 msgid "Target dead players"
 msgstr "Jogadores mortos como alvo"
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_players.cpp:69
 msgid "Visible names"
 msgstr "Nomes visíveis"
 
-#: src/gui/setup_players.cpp:69
+#: src/gui/setup_players.cpp:72
 msgid "Secure trades"
 msgstr "Trocas seguras"
 
-#: src/gui/setup_players.cpp:72
+#: src/gui/setup_players.cpp:75
 msgid "Unsecure chars in names"
 msgstr "Letras de nome inseguras"
 
-#: src/gui/setup_players.cpp:75
+#: src/gui/setup_players.cpp:78
 msgid "Show statuses"
 msgstr "Ver status"
 
-#: src/gui/setup_players.cpp:78
+#: src/gui/setup_players.cpp:81
 msgid "Show ip addresses on screenshots"
 msgstr "Mostrar endereço de ip nas capturas de tela"
 
-#: src/gui/setup_players.cpp:81
+#: src/gui/setup_players.cpp:84
 msgid "Allow self heal with mouse click"
 msgstr "Permitir curar-se com o clique do mouse "
 
@@ -2255,23 +2255,23 @@ msgstr "Ignorado"
 msgid "Erased"
 msgstr "Apagado"
 
-#: src/gui/setup_relations.cpp:239
+#: src/gui/setup_relations.cpp:238
 msgid "Allow trading"
 msgstr "Permitir negociações"
 
-#: src/gui/setup_relations.cpp:241
+#: src/gui/setup_relations.cpp:240
 msgid "Allow whispers"
 msgstr "Permitir mensagens particulares"
 
-#: src/gui/setup_relations.cpp:244
+#: src/gui/setup_relations.cpp:243
 msgid "Old"
 msgstr "Antigo"
 
-#: src/gui/setup_relations.cpp:246
+#: src/gui/setup_relations.cpp:245
 msgid "Relations"
 msgstr "Relações"
 
-#: src/gui/setup_relations.cpp:271
+#: src/gui/setup_relations.cpp:270
 msgid "When ignoring:"
 msgstr "Quando ignorar:"
 
@@ -3242,30 +3242,34 @@ msgid "Command:"
 msgstr "Comando:"
 
 #: src/gui/textcommandeditor.cpp:200
+msgid "Comment:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:203
 msgid "Mana:"
 msgstr "Mana:"
 
-#: src/gui/textcommandeditor.cpp:206
+#: src/gui/textcommandeditor.cpp:209
 msgid "Target Type:"
 msgstr "Tipo de alvo:"
 
-#: src/gui/textcommandeditor.cpp:212
+#: src/gui/textcommandeditor.cpp:215
 msgid "Icon:"
 msgstr "Icone:"
 
-#: src/gui/textcommandeditor.cpp:218
+#: src/gui/textcommandeditor.cpp:221
 msgid "Magic level:"
 msgstr "Nível mágico:"
 
-#: src/gui/textcommandeditor.cpp:224
+#: src/gui/textcommandeditor.cpp:227
 msgid "Magic School:"
 msgstr "Escola de Feitiço:"
 
-#: src/gui/textcommandeditor.cpp:230
+#: src/gui/textcommandeditor.cpp:233
 msgid "School level:"
 msgstr "Nível da escola:"
 
-#: src/gui/textcommandeditor.cpp:235
+#: src/gui/textcommandeditor.cpp:238
 msgid "Save"
 msgstr "Salvar"
 
@@ -3494,23 +3498,23 @@ msgstr "Borda do Lugar Inicial"
 msgid "Road Point"
 msgstr "Ponto de estrada"
 
-#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:474
+#: src/gui/whoisonline.cpp:85 src/gui/whoisonline.cpp:478
 msgid "Who Is Online - Updating"
 msgstr "Quem está online - Atualizando"
 
-#: src/gui/whoisonline.cpp:104
+#: src/gui/whoisonline.cpp:108
 msgid "Update"
 msgstr "Atualizar"
 
-#: src/gui/whoisonline.cpp:297
+#: src/gui/whoisonline.cpp:301
 msgid "Who Is Online - "
 msgstr "Quem está online - "
 
-#: src/gui/whoisonline.cpp:488
+#: src/gui/whoisonline.cpp:492
 msgid "Who Is Online - error"
 msgstr "Quem está online - Erro"
 
-#: src/gui/whoisonline.cpp:519
+#: src/gui/whoisonline.cpp:523
 msgid "Who Is Online - Update"
 msgstr "Quem está online - Atualizado"
 
@@ -3792,49 +3796,49 @@ msgid "Cart"
 msgstr "Carrinho"
 
 #: src/keyboardconfig.cpp:43
+msgid "Basic Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:44
 msgid "Move Up"
 msgstr "Mover para Cima"
 
-#: src/keyboardconfig.cpp:44
+#: src/keyboardconfig.cpp:45
 msgid "Move Down"
 msgstr "Mover para Baixo"
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:46
 msgid "Move Left"
 msgstr "Esquerda"
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:47
 msgid "Move Right"
 msgstr "Direita"
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:50
 msgid "Target & Attack"
 msgstr "Selecionar & Atacar"
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:52
 msgid "Move to Target"
 msgstr "Mover para o alvo"
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:54
 msgid "Change Move to Target type"
 msgstr "Mudar o tipo de movimento ao alvo"
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:56
 msgid "Move to Home location"
 msgstr "Mover para localização"
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:58
 msgid "Set home location"
 msgstr "Definir localização"
 
-#: src/keyboardconfig.cpp:59
+#: src/keyboardconfig.cpp:60
 msgid "Move to navigation point"
 msgstr "Mover para ponto de navegação"
 
-#: src/keyboardconfig.cpp:61
-msgid "Smilie"
-msgstr "Emoticon"
-
 #: src/keyboardconfig.cpp:63
 msgid "Stop Attack"
 msgstr "Parar ataque"
@@ -3880,300 +3884,328 @@ msgid "Change Map View Mode"
 msgstr "Mudar o modo de visualização de mapas"
 
 #: src/keyboardconfig.cpp:80
+msgid "Select OK"
+msgstr "Selecionar OK"
+
+#: src/keyboardconfig.cpp:83
+msgid "Shortcuts Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:84
 msgid "Item Shortcuts Key"
 msgstr "Atalhos de item"
 
-#: src/keyboardconfig.cpp:82 src/keyboardconfig.cpp:84
 #: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:88
 #: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:92
 #: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:96
 #: src/keyboardconfig.cpp:98 src/keyboardconfig.cpp:100
 #: src/keyboardconfig.cpp:102 src/keyboardconfig.cpp:104
 #: src/keyboardconfig.cpp:106 src/keyboardconfig.cpp:108
-#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:113
-#: src/keyboardconfig.cpp:115 src/keyboardconfig.cpp:117
+#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:112
+#: src/keyboardconfig.cpp:114 src/keyboardconfig.cpp:117
 #: src/keyboardconfig.cpp:119 src/keyboardconfig.cpp:121
-#: src/keyboardconfig.cpp:360
+#: src/keyboardconfig.cpp:123 src/keyboardconfig.cpp:125
+#: src/keyboardconfig.cpp:367
 #, c-format
 msgid "Item Shortcut %d"
 msgstr "Atalho para item %d"
 
-#: src/keyboardconfig.cpp:122
+#: src/keyboardconfig.cpp:126
+msgid "Windows Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:127
 msgid "Help Window"
 msgstr "Janela de Ajuda"
 
-#: src/keyboardconfig.cpp:124
+#: src/keyboardconfig.cpp:129
 msgid "Status Window"
 msgstr "Janela de Status"
 
-#: src/keyboardconfig.cpp:126
+#: src/keyboardconfig.cpp:131
 msgid "Inventory Window"
 msgstr "Janela de inventário"
 
-#: src/keyboardconfig.cpp:128
+#: src/keyboardconfig.cpp:133
 msgid "Equipment Window"
 msgstr "Janela de equipamento"
 
-#: src/keyboardconfig.cpp:130
+#: src/keyboardconfig.cpp:135
 msgid "Skill Window"
 msgstr "Janela de Habilidade"
 
-#: src/keyboardconfig.cpp:132
+#: src/keyboardconfig.cpp:137
 msgid "Minimap Window"
 msgstr "Janela de Minimapa"
 
-#: src/keyboardconfig.cpp:134
+#: src/keyboardconfig.cpp:139
 msgid "Chat Window"
 msgstr "Janela de chat"
 
-#: src/keyboardconfig.cpp:136
+#: src/keyboardconfig.cpp:141
 msgid "Item Shortcut Window"
 msgstr "Janela de atalhos para itens"
 
-#: src/keyboardconfig.cpp:138
+#: src/keyboardconfig.cpp:143
 msgid "Setup Window"
 msgstr "Janela de Configurações"
 
-#: src/keyboardconfig.cpp:140
+#: src/keyboardconfig.cpp:145
 msgid "Debug Window"
 msgstr "Janela de Depuração"
 
-#: src/keyboardconfig.cpp:142
+#: src/keyboardconfig.cpp:147
 msgid "Social Window"
 msgstr "Janela social"
 
-#: src/keyboardconfig.cpp:144
+#: src/keyboardconfig.cpp:149
 msgid "Emote Shortcut Window"
 msgstr "Janela de atalho para emoticons"
 
-#: src/keyboardconfig.cpp:146
+#: src/keyboardconfig.cpp:151
 msgid "Outfits Window"
 msgstr "Janela de roupas"
 
-#: src/keyboardconfig.cpp:148
+#: src/keyboardconfig.cpp:153
 msgid "Shop Window"
 msgstr "Janela Loja"
 
-#: src/keyboardconfig.cpp:150
+#: src/keyboardconfig.cpp:155
 msgid "Quick drop Window"
 msgstr "Janela Descarte rápido"
 
-#: src/keyboardconfig.cpp:152
+#: src/keyboardconfig.cpp:157
 msgid "Kill Stats Window"
 msgstr "Janeja de mortes"
 
-#: src/keyboardconfig.cpp:154
+#: src/keyboardconfig.cpp:159
 msgid "Commands Window"
 msgstr "Janela Comandos"
 
-#: src/keyboardconfig.cpp:156
+#: src/keyboardconfig.cpp:161
 msgid "Bot Checker Window"
 msgstr "Janela Analisador de bot"
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboardconfig.cpp:164
 msgid "Who Is Online Window"
 msgstr "Janela Quem está online"
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboardconfig.cpp:166
 msgid "Did you know Window"
 msgstr "Janela Você sabia"
 
-#: src/keyboardconfig.cpp:164
+#: src/keyboardconfig.cpp:169
 msgid "Previous Social Tab"
 msgstr "Aba social anterior"
 
-#: src/keyboardconfig.cpp:166
+#: src/keyboardconfig.cpp:171
 msgid "Next Social Tab"
 msgstr "Próxima aba social"
 
-#: src/keyboardconfig.cpp:168 src/keyboardconfig.cpp:170
-#: src/keyboardconfig.cpp:172 src/keyboardconfig.cpp:174
-#: src/keyboardconfig.cpp:176 src/keyboardconfig.cpp:178
-#: src/keyboardconfig.cpp:180 src/keyboardconfig.cpp:182
-#: src/keyboardconfig.cpp:184 src/keyboardconfig.cpp:186
-#: src/keyboardconfig.cpp:188 src/keyboardconfig.cpp:190
-#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
-#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
-#: src/keyboardconfig.cpp:201 src/keyboardconfig.cpp:203
-#: src/keyboardconfig.cpp:205 src/keyboardconfig.cpp:207
-#: src/keyboardconfig.cpp:209 src/keyboardconfig.cpp:211
-#: src/keyboardconfig.cpp:213 src/keyboardconfig.cpp:215
-#: src/keyboardconfig.cpp:217 src/keyboardconfig.cpp:220
-#: src/keyboardconfig.cpp:223 src/keyboardconfig.cpp:226
-#: src/keyboardconfig.cpp:228 src/keyboardconfig.cpp:230
-#: src/keyboardconfig.cpp:232 src/keyboardconfig.cpp:234
-#: src/keyboardconfig.cpp:236 src/keyboardconfig.cpp:238
-#: src/keyboardconfig.cpp:240 src/keyboardconfig.cpp:242
-#: src/keyboardconfig.cpp:244 src/keyboardconfig.cpp:247
-#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
-#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
-#: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:259
-#: src/keyboardconfig.cpp:355
+#: src/keyboardconfig.cpp:173
+msgid "Emotes Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:174
+msgid "Smilie"
+msgstr "Emoticon"
+
+#: src/keyboardconfig.cpp:175 src/keyboardconfig.cpp:177
+#: src/keyboardconfig.cpp:179 src/keyboardconfig.cpp:181
+#: src/keyboardconfig.cpp:183 src/keyboardconfig.cpp:185
+#: src/keyboardconfig.cpp:187 src/keyboardconfig.cpp:189
+#: src/keyboardconfig.cpp:191 src/keyboardconfig.cpp:193
+#: src/keyboardconfig.cpp:195 src/keyboardconfig.cpp:197
+#: src/keyboardconfig.cpp:200 src/keyboardconfig.cpp:202
+#: src/keyboardconfig.cpp:204 src/keyboardconfig.cpp:206
+#: src/keyboardconfig.cpp:208 src/keyboardconfig.cpp:210
+#: src/keyboardconfig.cpp:212 src/keyboardconfig.cpp:214
+#: src/keyboardconfig.cpp:216 src/keyboardconfig.cpp:218
+#: src/keyboardconfig.cpp:220 src/keyboardconfig.cpp:222
+#: src/keyboardconfig.cpp:224 src/keyboardconfig.cpp:227
+#: src/keyboardconfig.cpp:230 src/keyboardconfig.cpp:233
+#: src/keyboardconfig.cpp:235 src/keyboardconfig.cpp:237
+#: src/keyboardconfig.cpp:239 src/keyboardconfig.cpp:241
+#: src/keyboardconfig.cpp:243 src/keyboardconfig.cpp:245
+#: src/keyboardconfig.cpp:247 src/keyboardconfig.cpp:249
+#: src/keyboardconfig.cpp:251 src/keyboardconfig.cpp:254
+#: src/keyboardconfig.cpp:256 src/keyboardconfig.cpp:258
+#: src/keyboardconfig.cpp:260 src/keyboardconfig.cpp:262
+#: src/keyboardconfig.cpp:264 src/keyboardconfig.cpp:266
+#: src/keyboardconfig.cpp:362
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "Atalho para emoticon %d"
 
-#: src/keyboardconfig.cpp:261
+#: src/keyboardconfig.cpp:268
+msgid "Outfits Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:269
 msgid "Wear Outfit"
 msgstr "Vestir roupas"
 
-#: src/keyboardconfig.cpp:263
+#: src/keyboardconfig.cpp:271
 msgid "Copy Outfit"
 msgstr "Copiar roupas"
 
-#: src/keyboardconfig.cpp:265
+#: src/keyboardconfig.cpp:273
 msgid "Copy equipped to Outfit"
 msgstr "Copiar roupa equipada"
 
-#: src/keyboardconfig.cpp:267
+#: src/keyboardconfig.cpp:275
+msgid "Chat Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:276
 msgid "Toggle Chat"
 msgstr "Alternar para chat"
 
-#: src/keyboardconfig.cpp:269
+#: src/keyboardconfig.cpp:278
 msgid "Scroll Chat Up"
 msgstr "Rolar chat para cima"
 
-#: src/keyboardconfig.cpp:271
+#: src/keyboardconfig.cpp:280
 msgid "Scroll Chat Down"
 msgstr "Rolar chat para baixo"
 
-#: src/keyboardconfig.cpp:273
+#: src/keyboardconfig.cpp:282
 msgid "Previous Chat Tab"
 msgstr "Aba de chat anterior"
 
-#: src/keyboardconfig.cpp:275
+#: src/keyboardconfig.cpp:284
 msgid "Next Chat Tab"
 msgstr "Próxima aba de chat"
 
-#: src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:287
 msgid "Close current Chat Tab"
 msgstr "Fechar aba de chat atual"
 
-#: src/keyboardconfig.cpp:280
+#: src/keyboardconfig.cpp:289
 msgid "Previous chat line"
 msgstr "Linha de chat anterior"
 
-#: src/keyboardconfig.cpp:282
+#: src/keyboardconfig.cpp:291
 msgid "Next chat line"
 msgstr "Próxima linha de chat"
 
-#: src/keyboardconfig.cpp:284
+#: src/keyboardconfig.cpp:293
 msgid "Chat Auto Complete"
 msgstr "Chat auto completar"
 
-#: src/keyboardconfig.cpp:286
+#: src/keyboardconfig.cpp:295
 msgid "Deactivate Chat Input"
 msgstr "Desativar entrada de chat"
 
-#: src/keyboardconfig.cpp:288
-msgid "Select OK"
-msgstr "Selecionar OK"
+#: src/keyboardconfig.cpp:297
+msgid "Other Keys"
+msgstr ""
 
-#: src/keyboardconfig.cpp:291
+#: src/keyboardconfig.cpp:298
 msgid "Ignore input 1"
 msgstr "Ignorar input 1"
 
-#: src/keyboardconfig.cpp:293
+#: src/keyboardconfig.cpp:300
 msgid "Ignore input 2"
 msgstr "Ignorar input 2"
 
-#: src/keyboardconfig.cpp:295
+#: src/keyboardconfig.cpp:302
 msgid "Direct Up"
 msgstr "Para cima"
 
-#: src/keyboardconfig.cpp:296
+#: src/keyboardconfig.cpp:303
 msgid "Direct Down"
 msgstr "Para baixo"
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboardconfig.cpp:305
 msgid "Direct Left"
 msgstr "Para esquerda"
 
-#: src/keyboardconfig.cpp:299
+#: src/keyboardconfig.cpp:306
 msgid "Direct Right"
 msgstr "Para direita"
 
-#: src/keyboardconfig.cpp:301
+#: src/keyboardconfig.cpp:308
 msgid "Crazy moves"
 msgstr "Movimentos loucos"
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboardconfig.cpp:310
 msgid "Change Crazy Move mode"
 msgstr "Trocar Modo de movimentos loucos"
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboardconfig.cpp:312
 msgid "Quick Drop N Items from 0 slot"
 msgstr "Descartar rapidamente N itens do slot 0"
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboardconfig.cpp:314
 msgid "Quick Drop N Items"
 msgstr "Descartar rapidamente N itens"
 
-#: src/keyboardconfig.cpp:309
+#: src/keyboardconfig.cpp:316
 msgid "Switch Quick Drop Counter"
 msgstr "Mudar contador de descarte"
 
-#: src/keyboardconfig.cpp:311
+#: src/keyboardconfig.cpp:318
 msgid "Quick heal target or self"
 msgstr "Curar um alvo ou você mesmo"
 
-#: src/keyboardconfig.cpp:313
+#: src/keyboardconfig.cpp:320
 msgid "Use #itenplz spell"
 msgstr "Usa feitiço #itenplz"
 
-#: src/keyboardconfig.cpp:315
+#: src/keyboardconfig.cpp:322
 msgid "Use magic attack"
 msgstr "Usar feitiço de ataque"
 
-#: src/keyboardconfig.cpp:317
+#: src/keyboardconfig.cpp:324
 msgid "Switch magic attack"
 msgstr "Trocar feitiço de ataque"
 
-#: src/keyboardconfig.cpp:319
+#: src/keyboardconfig.cpp:326
 msgid "Change move type"
 msgstr "Mudar tipo de movimento"
 
-#: src/keyboardconfig.cpp:321
+#: src/keyboardconfig.cpp:328
 msgid "Change Attack Weapon Type"
 msgstr "Mudar tipo de ataque de arma"
 
-#: src/keyboardconfig.cpp:323
+#: src/keyboardconfig.cpp:330
 msgid "Change Attack Type"
 msgstr "Mudar tipo de ataque"
 
-#: src/keyboardconfig.cpp:325
+#: src/keyboardconfig.cpp:332
 msgid "Change Follow mode"
 msgstr "Mudar modo de seguir"
 
-#: src/keyboardconfig.cpp:327
+#: src/keyboardconfig.cpp:334
 msgid "Change Imitation mode"
 msgstr "Mudar modo de imitação"
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboardconfig.cpp:337
 msgid "Disable / Enable Game modifier keys"
 msgstr "Habilitar / Desabilitar Chaves de modificação"
 
-#: src/keyboardconfig.cpp:331
+#: src/keyboardconfig.cpp:338
 msgid "On / Off audio"
 msgstr "Ligar / Desligar áudio"
 
-#: src/keyboardconfig.cpp:333
+#: src/keyboardconfig.cpp:340
 msgid "Enable / Disable away mode"
 msgstr "Habilitar / Desabilitar modo indisponivel "
 
-#: src/keyboardconfig.cpp:335
+#: src/keyboardconfig.cpp:342
 msgid "Emulate right click from keyboard"
 msgstr "Emular botão direito do teclado"
 
-#: src/keyboardconfig.cpp:337
+#: src/keyboardconfig.cpp:344
 msgid "Toggle camera mode"
 msgstr "Alterar modo de camera"
 
-#: src/keyboardconfig.cpp:339
+#: src/keyboardconfig.cpp:346
 msgid "Modifier key"
 msgstr "Modificar chave"
 
-#: src/keyboardconfig.cpp:411
+#: src/keyboardconfig.cpp:425
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -4182,68 +4214,68 @@ msgstr ""
 "Conflito com as teclas \"%s\" e \"%s\" . Resolva o conflito para não "
 "comprometer a jogabilidade."
 
-#: src/localplayer.cpp:377
+#: src/localplayer.cpp:380
 msgid "You were killed by "
 msgstr "Você foi morto por "
 
-#: src/localplayer.cpp:1416
+#: src/localplayer.cpp:1422
 msgid "Tried to pick up nonexistent item."
 msgstr "Você tentou pegar um item não existente."
 
-#: src/localplayer.cpp:1418
+#: src/localplayer.cpp:1424
 msgid "Item is too heavy."
 msgstr "Este item é muito pesado."
 
-#: src/localplayer.cpp:1420
+#: src/localplayer.cpp:1426
 msgid "Item is too far away."
 msgstr "Item está muito longe"
 
-#: src/localplayer.cpp:1422
+#: src/localplayer.cpp:1428
 msgid "Inventory is full."
 msgstr "O inventário está cheio."
 
-#: src/localplayer.cpp:1424
+#: src/localplayer.cpp:1430
 msgid "Stack is too big."
 msgstr "Esta pilha é muito grande."
 
-#: src/localplayer.cpp:1427
+#: src/localplayer.cpp:1433
 msgid "Item belongs to someone else."
 msgstr "Este item pertence a outra pessoa."
 
-#: src/localplayer.cpp:1430
+#: src/localplayer.cpp:1436
 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:1454
+#: src/localplayer.cpp:1460
 #, 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:3168
+#: src/localplayer.cpp:3174
 msgid "Away"
 msgstr "Indisponivel "
 
-#: src/localplayer.cpp:3468
+#: src/localplayer.cpp:3494
 msgid "Follow: "
 msgstr "Seguindo:"
 
-#: src/localplayer.cpp:3470 src/localplayer.cpp:3485
+#: src/localplayer.cpp:3496 src/localplayer.cpp:3511
 msgid "Follow canceled"
 msgstr "Seguir cancelado"
 
-#: src/localplayer.cpp:3477
+#: src/localplayer.cpp:3503
 msgid "Imitation: "
 msgstr "Imitando:"
 
-#: src/localplayer.cpp:3479 src/localplayer.cpp:3487
+#: src/localplayer.cpp:3505 src/localplayer.cpp:3513
 msgid "Imitation canceled"
 msgstr "Imitação cancelada"
 
-#: src/localplayer.cpp:3832
+#: src/localplayer.cpp:3858
 msgid "You see "
 msgstr "Você vê "
 
@@ -4635,15 +4667,15 @@ 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."
 
-#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:286
+#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:284
 msgid "Item sharing enabled."
 msgstr "Compartilhamento de itens habilitado."
 
-#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:296
+#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:294
 msgid "Item sharing disabled."
 msgstr "Compartilhamento de itens desabilitado."
 
-#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:306
+#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:304
 msgid "Item sharing not possible."
 msgstr "Não é possível compartilhar itens."
 
@@ -4651,15 +4683,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:248
+#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:246
 msgid "Experience sharing enabled."
 msgstr "Compartilhamento de experiência habilitado."
 
-#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:258
+#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:256
 msgid "Experience sharing disabled."
 msgstr "Compartilhamento de experiência desabilitado."
 
-#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:268
+#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:266
 msgid "Experience sharing not possible."
 msgstr "Não é possível compartilhar experiência."
 
@@ -4742,54 +4774,54 @@ msgstr "Este nome de usuário já está em uso."
 msgid "Username permanently erased."
 msgstr "Usuário deletado."
 
-#: src/net/ea/partyhandler.cpp:82
+#: src/net/ea/partyhandler.cpp:80
 msgid "Could not create party."
 msgstr "Não foi possível criar o grupo."
 
-#: src/net/ea/partyhandler.cpp:84
+#: src/net/ea/partyhandler.cpp:82
 msgid "Party successfully created."
 msgstr "Grupo criado."
 
-#: src/net/ea/partyhandler.cpp:140
+#: src/net/ea/partyhandler.cpp:138
 #, c-format
 msgid "%s has joined your party."
 msgstr "%s se junto ao grupo"
 
-#: src/net/ea/partyhandler.cpp:176
+#: src/net/ea/partyhandler.cpp:174
 #, c-format
 msgid "%s is already a member of a party."
 msgstr "%s já é membro de um grupo."
 
-#: src/net/ea/partyhandler.cpp:181
+#: src/net/ea/partyhandler.cpp:179
 #, c-format
 msgid "%s refused your invitation."
 msgstr "%s recusou seu convite."
 
-#: src/net/ea/partyhandler.cpp:186
+#: src/net/ea/partyhandler.cpp:184
 #, c-format
 msgid "%s is now a member of your party."
 msgstr "%s agora é um membro do seu grupo."
 
-#: src/net/ea/partyhandler.cpp:191
+#: src/net/ea/partyhandler.cpp:189
 #, c-format
 msgid "%s can't join your party because party is full."
 msgstr "%s não pode se juntar ao gupo cheio."
 
-#: src/net/ea/partyhandler.cpp:196
+#: src/net/ea/partyhandler.cpp:194
 #, c-format
 msgid "QQQ Unknown invite response for %s."
 msgstr "QQQ resposta de convite desconhecida por %s."
 
-#: src/net/ea/partyhandler.cpp:356
+#: src/net/ea/partyhandler.cpp:354
 msgid "You have left the party."
 msgstr "Você saiu do grupo."
 
-#: src/net/ea/partyhandler.cpp:369
+#: src/net/ea/partyhandler.cpp:367
 #, c-format
 msgid "%s has left your party."
 msgstr "%s saiu do seu grupo."
 
-#: src/net/ea/partyhandler.cpp:448
+#: src/net/ea/partyhandler.cpp:446
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr "Um membro desconhecido tentou dizer: %s"
@@ -4950,83 +4982,83 @@ msgstr "Impossível aumentar o atributo!"
 msgid "Equip arrows first."
 msgstr "Equipe as flechas primeiro."
 
-#: src/net/ea/specialhandler.cpp:149
+#: src/net/ea/specialhandler.cpp:146
 msgid "Trade failed!"
 msgstr "Falha na negociação!"
 
-#: src/net/ea/specialhandler.cpp:152
+#: src/net/ea/specialhandler.cpp:149
 msgid "Emote failed!"
 msgstr "Falha no emoticon!"
 
-#: src/net/ea/specialhandler.cpp:155
+#: src/net/ea/specialhandler.cpp:152
 msgid "Sit failed!"
 msgstr "Falha ao sentar!"
 
-#: src/net/ea/specialhandler.cpp:158
+#: src/net/ea/specialhandler.cpp:155
 msgid "Chat creating failed!"
 msgstr "Falha ao criar Chat!"
 
-#: src/net/ea/specialhandler.cpp:161
+#: src/net/ea/specialhandler.cpp:158
 msgid "Could not join party!"
 msgstr "Impossivel entrar no grupo!"
 
-#: src/net/ea/specialhandler.cpp:164
+#: src/net/ea/specialhandler.cpp:161
 msgid "Cannot shout!"
 msgstr "Impossivel gritar!"
 
-#: src/net/ea/specialhandler.cpp:177
+#: src/net/ea/specialhandler.cpp:174
 msgid "You have not yet reached a high enough lvl!"
 msgstr "Você ainda não tem o nivel necessário!"
 
-#: src/net/ea/specialhandler.cpp:181
+#: src/net/ea/specialhandler.cpp:178
 msgid "Insufficient HP!"
 msgstr "HP insuficiente!"
 
-#: src/net/ea/specialhandler.cpp:184
+#: src/net/ea/specialhandler.cpp:181
 msgid "Insufficient SP!"
 msgstr "SP insuficiente!"
 
-#: src/net/ea/specialhandler.cpp:187
+#: src/net/ea/specialhandler.cpp:184
 msgid "You have no memos!"
 msgstr "Você não tem nenhuma nota armazenada!"
 
-#: src/net/ea/specialhandler.cpp:190
+#: src/net/ea/specialhandler.cpp:187
 msgid "You cannot do that right now!"
 msgstr "Você não pode fazer isso agora!"
 
-#: src/net/ea/specialhandler.cpp:193
+#: src/net/ea/specialhandler.cpp:190
 msgid "Seems you need more money... ;-)"
 msgstr "Parece que você precisa de mais dinheiro... ;-)"
 
-#: src/net/ea/specialhandler.cpp:196
+#: src/net/ea/specialhandler.cpp:193
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Você não pode usar essa habilidade com esse tipo de arma!"
 
-#: src/net/ea/specialhandler.cpp:200
+#: src/net/ea/specialhandler.cpp:197
 msgid "You need another red gem!"
 msgstr "Você precisa de outra gema vermelha!"
 
-#: src/net/ea/specialhandler.cpp:203
+#: src/net/ea/specialhandler.cpp:200
 msgid "You need another blue gem!"
 msgstr "Você precisa de outra jóia azul!"
 
-#: src/net/ea/specialhandler.cpp:206
+#: src/net/ea/specialhandler.cpp:203
 msgid "You're carrying to much to do this!"
 msgstr "Você está com muita carga para fazer isso!"
 
-#: src/net/ea/specialhandler.cpp:209
+#: src/net/ea/specialhandler.cpp:206
 msgid "Huh? What's that?"
 msgstr "Hã? O que é isso?"
 
-#: src/net/ea/specialhandler.cpp:220
+#: src/net/ea/specialhandler.cpp:217
 msgid "Warp failed..."
 msgstr "Falha ao transportar..."
 
-#: src/net/ea/specialhandler.cpp:223
+#: src/net/ea/specialhandler.cpp:220
 msgid "Could not steal anything..."
 msgstr "Não foi possível roubar nada..."
 
-#: src/net/ea/specialhandler.cpp:226
+#: src/net/ea/specialhandler.cpp:223
 msgid "Poison had no effect..."
 msgstr "Veneno não surtiu efeito..."
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 80d404092..8ab3fd9c0 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-09-17 16:12+0300\n"
-"PO-Revision-Date: 2011-09-16 20:15+0000\n"
-"Last-Translator: freya <freya.df@gmail.com>\n"
+"POT-Creation-Date: 2011-09-27 22:18+0300\n"
+"PO-Revision-Date: 2011-09-27 19:20+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: pt_BR\n"
@@ -23,25 +23,25 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
-#: src/actorspritemanager.cpp:1088
+#: src/actorspritemanager.cpp:1133
 msgid "Visible on map"
 msgstr "Mapa visivel "
 
-#: src/being.cpp:548
+#: src/being.cpp:547
 msgid "dodge"
 msgstr "por nome"
 
-#: src/being.cpp:548
+#: src/being.cpp:547
 msgid "miss"
 msgstr "por id"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1527
+#: src/being.cpp:1526
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1532
+#: src/being.cpp:1531
 msgid "I"
 msgstr "I"
 
@@ -49,43 +49,43 @@ msgstr "I"
 msgid "Setup"
 msgstr "por peso"
 
-#: src/client.cpp:841 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:842 src/gui/setup_perfomance.cpp:48
 msgid "Perfomance"
 msgstr "Performance"
 
-#: src/client.cpp:846 src/gui/setup_video.cpp:315
+#: src/client.cpp:847 src/gui/setup_video.cpp:315
 msgid "Video"
 msgstr "Vídeo"
 
-#: src/client.cpp:851
+#: src/client.cpp:852
 msgid "Themes"
 msgstr "Temas"
 
-#: src/client.cpp:932
+#: src/client.cpp:934
 msgid "Connecting to server"
 msgstr "por quantidade"
 
-#: src/client.cpp:963
+#: src/client.cpp:965
 msgid "Logging in"
 msgstr "por tipo"
 
-#: src/client.cpp:996
+#: src/client.cpp:998
 msgid "Entering game world"
 msgstr "Habilitar rolagem preguisoça "
 
-#: src/client.cpp:1096
+#: src/client.cpp:1098
 msgid "Requesting characters"
 msgstr "Rolagem preguiçosa"
 
-#: src/client.cpp:1127
+#: src/client.cpp:1129
 msgid "Connecting to the game server"
 msgstr "Conectando ao servidor do jogo"
 
-#: src/client.cpp:1137
+#: src/client.cpp:1139
 msgid "Changing game servers"
 msgstr "Mudando servidores do jogo"
 
-#: src/client.cpp:1180 src/client.cpp:1187 src/client.cpp:1321
+#: src/client.cpp:1182 src/client.cpp:1189 src/client.cpp:1323
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:221 src/gui/charselectdialog.cpp:253
 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
@@ -95,50 +95,50 @@ msgstr "Mudando servidores do jogo"
 msgid "Error"
 msgstr "Erro"
 
-#: src/client.cpp:1196
+#: src/client.cpp:1198
 msgid "Requesting registration details"
 msgstr "Requisitando detalhes do registro"
 
-#: src/client.cpp:1222
+#: src/client.cpp:1224
 msgid "Password Change"
 msgstr "Mudar senha"
 
-#: src/client.cpp:1223
+#: src/client.cpp:1225
 msgid "Password changed successfully!"
 msgstr "Senha modificada com sucesso!"
 
-#: src/client.cpp:1242
+#: src/client.cpp:1244
 msgid "Email Change"
 msgstr "Mudar email"
 
-#: src/client.cpp:1243
+#: src/client.cpp:1245
 msgid "Email changed successfully!"
 msgstr "Email modificado com sucesso!"
 
-#: src/client.cpp:1263
+#: src/client.cpp:1265
 msgid "Unregister Successful"
 msgstr "Registro cancelado com sucesso"
 
-#: src/client.cpp:1264
+#: src/client.cpp:1266
 msgid "Farewell, come back any time..."
 msgstr "Tchau, volte sempre..."
 
-#: src/client.cpp:1463 src/client.cpp:1493 src/client.cpp:1508
-#: src/client.cpp:1933 src/client.cpp:1940
+#: src/client.cpp:1465 src/client.cpp:1495 src/client.cpp:1510
+#: src/client.cpp:1935 src/client.cpp:1942
 #, 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:1639
+#: src/client.cpp:1641
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Host de atualização inválido: %s"
 
-#: src/client.cpp:1673 src/client.cpp:1679
+#: src/client.cpp:1675 src/client.cpp:1681
 msgid "Error creating updates directory!"
 msgstr "Erro ao criar pasta de atualizações!"
 
-#: src/client.cpp:1700
+#: src/client.cpp:1702
 #, 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."
@@ -347,11 +347,11 @@ msgstr "Ignorando propostas de negócios"
 msgid "Accepting incoming trade requests"
 msgstr "Aceitando propostas de negócios"
 
-#: src/game.cpp:1729
+#: src/game.cpp:1727
 msgid "Could Not Load Map"
 msgstr "Não foi possível carregar o mapa"
 
-#: src/game.cpp:1730
+#: src/game.cpp:1728
 #, c-format
 msgid "Error while loading %s"
 msgstr "Erro ao carregar %s"
@@ -386,7 +386,7 @@ msgstr "Nome"
 
 #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:133
 #: src/gui/popupmenu.cpp:283 src/gui/popupmenu.cpp:596
-#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:265
+#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:265
 msgid "Attack"
 msgstr "Atacar"
 
@@ -440,7 +440,7 @@ msgstr "-"
 #: src/gui/buydialog.cpp:99 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:294
-#: src/keyboardconfig.cpp:290
+#: src/keyboardconfig.cpp:82
 msgid "Quit"
 msgstr "Sair"
 
@@ -475,7 +475,7 @@ msgstr "Vender"
 #: src/gui/popupmenu.cpp:1858 src/gui/popupmenu.cpp:1897
 #: src/gui/popupmenu.cpp:1949 src/gui/popupmenu.cpp:1969
 #: src/gui/quitdialog.cpp:55 src/gui/register.cpp:82 src/gui/setup.cpp:72
-#: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:238
+#: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:241
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
 #: src/gui/updaterwindow.cpp:161
 msgid "Cancel"
@@ -644,8 +644,8 @@ msgid "Enter password:"
 msgstr "Entre com a senha:"
 
 #: src/gui/charselectdialog.cpp:410 src/gui/serverdialog.cpp:298
-#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:122
-#: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:241
+#: src/gui/setup_relations.cpp:242 src/gui/shopwindow.cpp:122
+#: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244
 msgid "Delete"
 msgstr "Excluir"
 
@@ -897,7 +897,7 @@ msgid "Did You Know?"
 msgstr "Você Sabia?"
 
 #: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
-#: src/gui/inventorywindow.cpp:206 src/gui/npcdialog.cpp:53
+#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:53
 #: src/gui/popupmenu.cpp:556 src/gui/shopwindow.cpp:113
 msgid "Close"
 msgstr "Fechar"
@@ -924,7 +924,7 @@ msgid "Equipment"
 msgstr "Equipamento"
 
 #: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160
-#: src/gui/inventorywindow.cpp:539 src/gui/inventorywindow.cpp:548
+#: src/gui/inventorywindow.cpp:538 src/gui/inventorywindow.cpp:547
 #: src/gui/popupmenu.cpp:1656 src/gui/popupmenu.cpp:1748
 #: src/gui/popupmenu.cpp:1793
 msgid "Unequip"
@@ -954,37 +954,33 @@ msgstr "por quantidade"
 msgid "by type"
 msgstr "por tipo"
 
-#: src/gui/inventorywindow.cpp:111 src/gui/windowmenu.cpp:76
+#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:76
 #: src/inventory.cpp:249
 msgid "Inventory"
 msgstr "Inventário"
 
-#: src/gui/inventorywindow.cpp:136
+#: src/gui/inventorywindow.cpp:137
 msgid "Slots:"
 msgstr "Slots:"
 
-#: src/gui/inventorywindow.cpp:148
+#: src/gui/inventorywindow.cpp:149
 msgid "Filter:"
 msgstr "Filtro:"
 
-#: src/gui/inventorywindow.cpp:149
-msgid "Sort:"
-msgstr "Classificar"
-
-#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:541
-#: src/gui/inventorywindow.cpp:550 src/gui/popupmenu.cpp:1658
+#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:540
+#: src/gui/inventorywindow.cpp:549 src/gui/popupmenu.cpp:1658
 #: src/gui/popupmenu.cpp:1750 src/gui/popupmenu.cpp:1795
 msgid "Equip"
 msgstr "Equipar"
 
-#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:542
-#: src/gui/inventorywindow.cpp:546 src/gui/popupmenu.cpp:1662
+#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:541
+#: src/gui/inventorywindow.cpp:545 src/gui/popupmenu.cpp:1662
 #: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1754
 #: src/gui/popupmenu.cpp:1799
 msgid "Use"
 msgstr "Usar"
 
-#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:646
+#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:645
 #: src/gui/popupmenu.cpp:1667 src/gui/popupmenu.cpp:1759
 #: src/gui/popupmenu.cpp:1804
 msgid "Drop..."
@@ -1004,17 +1000,17 @@ msgstr "Roupas"
 msgid "Weight:"
 msgstr "Peso:"
 
-#: src/gui/inventorywindow.cpp:204 src/gui/inventorywindow.cpp:637
+#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:636
 #: src/gui/popupmenu.cpp:1642 src/gui/popupmenu.cpp:1771
 #: src/gui/popupmenu.cpp:1816 src/gui/setup.cpp:73
 msgid "Store"
 msgstr "Armazenar"
 
-#: src/gui/inventorywindow.cpp:205 src/gui/popupmenu.cpp:1683
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1683
 msgid "Retrieve"
 msgstr "Retirar"
 
-#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1672
+#: src/gui/inventorywindow.cpp:647 src/gui/popupmenu.cpp:1672
 #: src/gui/popupmenu.cpp:1764 src/gui/popupmenu.cpp:1809
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
@@ -2206,30 +2202,34 @@ msgid "Show own name"
 msgstr "Mostrar o próprio nome"
 
 #: src/gui/setup_players.cpp:63
+msgid "Enable extended mouse targeting"
+msgstr ""
+
+#: src/gui/setup_players.cpp:66
 msgid "Target dead players"
 msgstr "Jogadores mortos como alvo"
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_players.cpp:69
 msgid "Visible names"
 msgstr "Nomes visíveis"
 
-#: src/gui/setup_players.cpp:69
+#: src/gui/setup_players.cpp:72
 msgid "Secure trades"
 msgstr "Trocas seguras"
 
-#: src/gui/setup_players.cpp:72
+#: src/gui/setup_players.cpp:75
 msgid "Unsecure chars in names"
 msgstr "Letras inseguras no nome"
 
-#: src/gui/setup_players.cpp:75
+#: src/gui/setup_players.cpp:78
 msgid "Show statuses"
 msgstr "Mostrar status"
 
-#: src/gui/setup_players.cpp:78
+#: src/gui/setup_players.cpp:81
 msgid "Show ip addresses on screenshots"
 msgstr "Mostrar endereço de ip nas capturas de tela"
 
-#: src/gui/setup_players.cpp:81
+#: src/gui/setup_players.cpp:84
 msgid "Allow self heal with mouse click"
 msgstr "Permitir se curar com o clique do mouse"
 
@@ -2257,23 +2257,23 @@ msgstr "Ignorado"
 msgid "Erased"
 msgstr "Apagado"
 
-#: src/gui/setup_relations.cpp:239
+#: src/gui/setup_relations.cpp:238
 msgid "Allow trading"
 msgstr "Permitir negociações"
 
-#: src/gui/setup_relations.cpp:241
+#: src/gui/setup_relations.cpp:240
 msgid "Allow whispers"
 msgstr "Permitir mensagens particulares"
 
-#: src/gui/setup_relations.cpp:244
+#: src/gui/setup_relations.cpp:243
 msgid "Old"
 msgstr "Antigo"
 
-#: src/gui/setup_relations.cpp:246
+#: src/gui/setup_relations.cpp:245
 msgid "Relations"
 msgstr "Relações"
 
-#: src/gui/setup_relations.cpp:271
+#: src/gui/setup_relations.cpp:270
 msgid "When ignoring:"
 msgstr "Quando ignorar:"
 
@@ -3244,30 +3244,34 @@ msgid "Command:"
 msgstr "Comando:"
 
 #: src/gui/textcommandeditor.cpp:200
+msgid "Comment:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:203
 msgid "Mana:"
 msgstr "Mana:"
 
-#: src/gui/textcommandeditor.cpp:206
+#: src/gui/textcommandeditor.cpp:209
 msgid "Target Type:"
 msgstr "Tipo de alvo:"
 
-#: src/gui/textcommandeditor.cpp:212
+#: src/gui/textcommandeditor.cpp:215
 msgid "Icon:"
 msgstr "Icone:"
 
-#: src/gui/textcommandeditor.cpp:218
+#: src/gui/textcommandeditor.cpp:221
 msgid "Magic level:"
 msgstr "Nível mágico:"
 
-#: src/gui/textcommandeditor.cpp:224
+#: src/gui/textcommandeditor.cpp:227
 msgid "Magic School:"
 msgstr "Escola de Feitiço:"
 
-#: src/gui/textcommandeditor.cpp:230
+#: src/gui/textcommandeditor.cpp:233
 msgid "School level:"
 msgstr "Nível da escola:"
 
-#: src/gui/textcommandeditor.cpp:235
+#: src/gui/textcommandeditor.cpp:238
 msgid "Save"
 msgstr "Salvar"
 
@@ -3496,23 +3500,23 @@ msgstr "Borda do Lugar Inicial"
 msgid "Road Point"
 msgstr "Ponto de estrada"
 
-#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:474
+#: src/gui/whoisonline.cpp:85 src/gui/whoisonline.cpp:478
 msgid "Who Is Online - Updating"
 msgstr "Quem está online - Atualizando"
 
-#: src/gui/whoisonline.cpp:104
+#: src/gui/whoisonline.cpp:108
 msgid "Update"
 msgstr "Atualizar"
 
-#: src/gui/whoisonline.cpp:297
+#: src/gui/whoisonline.cpp:301
 msgid "Who Is Online - "
 msgstr "Quem está online - "
 
-#: src/gui/whoisonline.cpp:488
+#: src/gui/whoisonline.cpp:492
 msgid "Who Is Online - error"
 msgstr "Quem está online - Erro"
 
-#: src/gui/whoisonline.cpp:519
+#: src/gui/whoisonline.cpp:523
 msgid "Who Is Online - Update"
 msgstr "Quem está online - Atualizado"
 
@@ -3794,49 +3798,49 @@ msgid "Cart"
 msgstr "Carrinho"
 
 #: src/keyboardconfig.cpp:43
+msgid "Basic Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:44
 msgid "Move Up"
 msgstr "Mover para Cima"
 
-#: src/keyboardconfig.cpp:44
+#: src/keyboardconfig.cpp:45
 msgid "Move Down"
 msgstr "Mover para Baixo"
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:46
 msgid "Move Left"
 msgstr "Esquerda"
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:47
 msgid "Move Right"
 msgstr "Direita"
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:50
 msgid "Target & Attack"
 msgstr "Selecionar & Atacar"
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:52
 msgid "Move to Target"
 msgstr "Mover para o alvo"
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:54
 msgid "Change Move to Target type"
 msgstr "Mudar o tipo de movimento ao alvo"
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:56
 msgid "Move to Home location"
 msgstr "Mover para localização"
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:58
 msgid "Set home location"
 msgstr "Definir localização"
 
-#: src/keyboardconfig.cpp:59
+#: src/keyboardconfig.cpp:60
 msgid "Move to navigation point"
 msgstr "Mover para ponto de navegação"
 
-#: src/keyboardconfig.cpp:61
-msgid "Smilie"
-msgstr "Emoticon"
-
 #: src/keyboardconfig.cpp:63
 msgid "Stop Attack"
 msgstr "Parar ataque"
@@ -3882,300 +3886,328 @@ msgid "Change Map View Mode"
 msgstr "Mudar o modo de visualização de mapas"
 
 #: src/keyboardconfig.cpp:80
+msgid "Select OK"
+msgstr "Selecionar OK"
+
+#: src/keyboardconfig.cpp:83
+msgid "Shortcuts Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:84
 msgid "Item Shortcuts Key"
 msgstr "Atalhos de item"
 
-#: src/keyboardconfig.cpp:82 src/keyboardconfig.cpp:84
 #: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:88
 #: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:92
 #: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:96
 #: src/keyboardconfig.cpp:98 src/keyboardconfig.cpp:100
 #: src/keyboardconfig.cpp:102 src/keyboardconfig.cpp:104
 #: src/keyboardconfig.cpp:106 src/keyboardconfig.cpp:108
-#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:113
-#: src/keyboardconfig.cpp:115 src/keyboardconfig.cpp:117
+#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:112
+#: src/keyboardconfig.cpp:114 src/keyboardconfig.cpp:117
 #: src/keyboardconfig.cpp:119 src/keyboardconfig.cpp:121
-#: src/keyboardconfig.cpp:360
+#: src/keyboardconfig.cpp:123 src/keyboardconfig.cpp:125
+#: src/keyboardconfig.cpp:367
 #, c-format
 msgid "Item Shortcut %d"
 msgstr "Atalho para item %d"
 
-#: src/keyboardconfig.cpp:122
+#: src/keyboardconfig.cpp:126
+msgid "Windows Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:127
 msgid "Help Window"
 msgstr "Janela de Ajuda"
 
-#: src/keyboardconfig.cpp:124
+#: src/keyboardconfig.cpp:129
 msgid "Status Window"
 msgstr "Janela de Status"
 
-#: src/keyboardconfig.cpp:126
+#: src/keyboardconfig.cpp:131
 msgid "Inventory Window"
 msgstr "Janela de inventário"
 
-#: src/keyboardconfig.cpp:128
+#: src/keyboardconfig.cpp:133
 msgid "Equipment Window"
 msgstr "Janela de equipamento"
 
-#: src/keyboardconfig.cpp:130
+#: src/keyboardconfig.cpp:135
 msgid "Skill Window"
 msgstr "Janela de Habilidade"
 
-#: src/keyboardconfig.cpp:132
+#: src/keyboardconfig.cpp:137
 msgid "Minimap Window"
 msgstr "Janela de Minimapa"
 
-#: src/keyboardconfig.cpp:134
+#: src/keyboardconfig.cpp:139
 msgid "Chat Window"
 msgstr "Janela de chat"
 
-#: src/keyboardconfig.cpp:136
+#: src/keyboardconfig.cpp:141
 msgid "Item Shortcut Window"
 msgstr "Janela de atalhos para itens"
 
-#: src/keyboardconfig.cpp:138
+#: src/keyboardconfig.cpp:143
 msgid "Setup Window"
 msgstr "Janela de Configurações"
 
-#: src/keyboardconfig.cpp:140
+#: src/keyboardconfig.cpp:145
 msgid "Debug Window"
 msgstr "Janela de Depuração"
 
-#: src/keyboardconfig.cpp:142
+#: src/keyboardconfig.cpp:147
 msgid "Social Window"
 msgstr "Janela social"
 
-#: src/keyboardconfig.cpp:144
+#: src/keyboardconfig.cpp:149
 msgid "Emote Shortcut Window"
 msgstr "Janela de atalho para emoticons"
 
-#: src/keyboardconfig.cpp:146
+#: src/keyboardconfig.cpp:151
 msgid "Outfits Window"
 msgstr "Janela de roupas"
 
-#: src/keyboardconfig.cpp:148
+#: src/keyboardconfig.cpp:153
 msgid "Shop Window"
 msgstr "Janela Loja"
 
-#: src/keyboardconfig.cpp:150
+#: src/keyboardconfig.cpp:155
 msgid "Quick drop Window"
 msgstr "Janela Descarte rápido"
 
-#: src/keyboardconfig.cpp:152
+#: src/keyboardconfig.cpp:157
 msgid "Kill Stats Window"
 msgstr "Janela de estado de mortes"
 
-#: src/keyboardconfig.cpp:154
+#: src/keyboardconfig.cpp:159
 msgid "Commands Window"
 msgstr "Janela Comandos"
 
-#: src/keyboardconfig.cpp:156
+#: src/keyboardconfig.cpp:161
 msgid "Bot Checker Window"
 msgstr "Janela Analisador de bot"
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboardconfig.cpp:164
 msgid "Who Is Online Window"
 msgstr "Janela Quem está online"
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboardconfig.cpp:166
 msgid "Did you know Window"
 msgstr "Janela Você Sabia "
 
-#: src/keyboardconfig.cpp:164
+#: src/keyboardconfig.cpp:169
 msgid "Previous Social Tab"
 msgstr "Aba social anterior"
 
-#: src/keyboardconfig.cpp:166
+#: src/keyboardconfig.cpp:171
 msgid "Next Social Tab"
 msgstr "Próxima aba social"
 
-#: src/keyboardconfig.cpp:168 src/keyboardconfig.cpp:170
-#: src/keyboardconfig.cpp:172 src/keyboardconfig.cpp:174
-#: src/keyboardconfig.cpp:176 src/keyboardconfig.cpp:178
-#: src/keyboardconfig.cpp:180 src/keyboardconfig.cpp:182
-#: src/keyboardconfig.cpp:184 src/keyboardconfig.cpp:186
-#: src/keyboardconfig.cpp:188 src/keyboardconfig.cpp:190
-#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
-#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
-#: src/keyboardconfig.cpp:201 src/keyboardconfig.cpp:203
-#: src/keyboardconfig.cpp:205 src/keyboardconfig.cpp:207
-#: src/keyboardconfig.cpp:209 src/keyboardconfig.cpp:211
-#: src/keyboardconfig.cpp:213 src/keyboardconfig.cpp:215
-#: src/keyboardconfig.cpp:217 src/keyboardconfig.cpp:220
-#: src/keyboardconfig.cpp:223 src/keyboardconfig.cpp:226
-#: src/keyboardconfig.cpp:228 src/keyboardconfig.cpp:230
-#: src/keyboardconfig.cpp:232 src/keyboardconfig.cpp:234
-#: src/keyboardconfig.cpp:236 src/keyboardconfig.cpp:238
-#: src/keyboardconfig.cpp:240 src/keyboardconfig.cpp:242
-#: src/keyboardconfig.cpp:244 src/keyboardconfig.cpp:247
-#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
-#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
-#: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:259
-#: src/keyboardconfig.cpp:355
+#: src/keyboardconfig.cpp:173
+msgid "Emotes Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:174
+msgid "Smilie"
+msgstr "Emoticon"
+
+#: src/keyboardconfig.cpp:175 src/keyboardconfig.cpp:177
+#: src/keyboardconfig.cpp:179 src/keyboardconfig.cpp:181
+#: src/keyboardconfig.cpp:183 src/keyboardconfig.cpp:185
+#: src/keyboardconfig.cpp:187 src/keyboardconfig.cpp:189
+#: src/keyboardconfig.cpp:191 src/keyboardconfig.cpp:193
+#: src/keyboardconfig.cpp:195 src/keyboardconfig.cpp:197
+#: src/keyboardconfig.cpp:200 src/keyboardconfig.cpp:202
+#: src/keyboardconfig.cpp:204 src/keyboardconfig.cpp:206
+#: src/keyboardconfig.cpp:208 src/keyboardconfig.cpp:210
+#: src/keyboardconfig.cpp:212 src/keyboardconfig.cpp:214
+#: src/keyboardconfig.cpp:216 src/keyboardconfig.cpp:218
+#: src/keyboardconfig.cpp:220 src/keyboardconfig.cpp:222
+#: src/keyboardconfig.cpp:224 src/keyboardconfig.cpp:227
+#: src/keyboardconfig.cpp:230 src/keyboardconfig.cpp:233
+#: src/keyboardconfig.cpp:235 src/keyboardconfig.cpp:237
+#: src/keyboardconfig.cpp:239 src/keyboardconfig.cpp:241
+#: src/keyboardconfig.cpp:243 src/keyboardconfig.cpp:245
+#: src/keyboardconfig.cpp:247 src/keyboardconfig.cpp:249
+#: src/keyboardconfig.cpp:251 src/keyboardconfig.cpp:254
+#: src/keyboardconfig.cpp:256 src/keyboardconfig.cpp:258
+#: src/keyboardconfig.cpp:260 src/keyboardconfig.cpp:262
+#: src/keyboardconfig.cpp:264 src/keyboardconfig.cpp:266
+#: src/keyboardconfig.cpp:362
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "Atalho para emoticon %d"
 
-#: src/keyboardconfig.cpp:261
+#: src/keyboardconfig.cpp:268
+msgid "Outfits Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:269
 msgid "Wear Outfit"
 msgstr "Vestir roupas"
 
-#: src/keyboardconfig.cpp:263
+#: src/keyboardconfig.cpp:271
 msgid "Copy Outfit"
 msgstr "Copiar roupas"
 
-#: src/keyboardconfig.cpp:265
+#: src/keyboardconfig.cpp:273
 msgid "Copy equipped to Outfit"
 msgstr "Copiar roupa equipada"
 
-#: src/keyboardconfig.cpp:267
+#: src/keyboardconfig.cpp:275
+msgid "Chat Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:276
 msgid "Toggle Chat"
 msgstr "Alternar para chat"
 
-#: src/keyboardconfig.cpp:269
+#: src/keyboardconfig.cpp:278
 msgid "Scroll Chat Up"
 msgstr "Rolar chat para cima"
 
-#: src/keyboardconfig.cpp:271
+#: src/keyboardconfig.cpp:280
 msgid "Scroll Chat Down"
 msgstr "Rolar chat para baixo"
 
-#: src/keyboardconfig.cpp:273
+#: src/keyboardconfig.cpp:282
 msgid "Previous Chat Tab"
 msgstr "Aba de chat anterior"
 
-#: src/keyboardconfig.cpp:275
+#: src/keyboardconfig.cpp:284
 msgid "Next Chat Tab"
 msgstr "Próxima aba de chat"
 
-#: src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:287
 msgid "Close current Chat Tab"
 msgstr "Fechar aba de chat atual"
 
-#: src/keyboardconfig.cpp:280
+#: src/keyboardconfig.cpp:289
 msgid "Previous chat line"
 msgstr "Linha de chat anterior"
 
-#: src/keyboardconfig.cpp:282
+#: src/keyboardconfig.cpp:291
 msgid "Next chat line"
 msgstr "Próxima linha de chat"
 
-#: src/keyboardconfig.cpp:284
+#: src/keyboardconfig.cpp:293
 msgid "Chat Auto Complete"
 msgstr "Chat auto completar"
 
-#: src/keyboardconfig.cpp:286
+#: src/keyboardconfig.cpp:295
 msgid "Deactivate Chat Input"
 msgstr "Desativar entrada de chat"
 
-#: src/keyboardconfig.cpp:288
-msgid "Select OK"
-msgstr "Selecionar OK"
+#: src/keyboardconfig.cpp:297
+msgid "Other Keys"
+msgstr ""
 
-#: src/keyboardconfig.cpp:291
+#: src/keyboardconfig.cpp:298
 msgid "Ignore input 1"
 msgstr "Ignorar input 1"
 
-#: src/keyboardconfig.cpp:293
+#: src/keyboardconfig.cpp:300
 msgid "Ignore input 2"
 msgstr "Ignorar input 2"
 
-#: src/keyboardconfig.cpp:295
+#: src/keyboardconfig.cpp:302
 msgid "Direct Up"
 msgstr "Para cima"
 
-#: src/keyboardconfig.cpp:296
+#: src/keyboardconfig.cpp:303
 msgid "Direct Down"
 msgstr "Para baixo"
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboardconfig.cpp:305
 msgid "Direct Left"
 msgstr "Para esquerda"
 
-#: src/keyboardconfig.cpp:299
+#: src/keyboardconfig.cpp:306
 msgid "Direct Right"
 msgstr "Para direita"
 
-#: src/keyboardconfig.cpp:301
+#: src/keyboardconfig.cpp:308
 msgid "Crazy moves"
 msgstr "Movimentos loucos"
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboardconfig.cpp:310
 msgid "Change Crazy Move mode"
 msgstr "Trocar Modo de movimentos loucos"
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboardconfig.cpp:312
 msgid "Quick Drop N Items from 0 slot"
 msgstr "Descartar rapidamente N itens do slot 0"
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboardconfig.cpp:314
 msgid "Quick Drop N Items"
 msgstr "Descartar rapidamente N itens"
 
-#: src/keyboardconfig.cpp:309
+#: src/keyboardconfig.cpp:316
 msgid "Switch Quick Drop Counter"
 msgstr "Mudar contador de descarte"
 
-#: src/keyboardconfig.cpp:311
+#: src/keyboardconfig.cpp:318
 msgid "Quick heal target or self"
 msgstr "Curar um alvo ou você mesmo"
 
-#: src/keyboardconfig.cpp:313
+#: src/keyboardconfig.cpp:320
 msgid "Use #itenplz spell"
 msgstr "Usa feitiço #itenplz"
 
-#: src/keyboardconfig.cpp:315
+#: src/keyboardconfig.cpp:322
 msgid "Use magic attack"
 msgstr "Usar feitiço de ataque"
 
-#: src/keyboardconfig.cpp:317
+#: src/keyboardconfig.cpp:324
 msgid "Switch magic attack"
 msgstr "Trocar feitiço de ataque"
 
-#: src/keyboardconfig.cpp:319
+#: src/keyboardconfig.cpp:326
 msgid "Change move type"
 msgstr "Mudar tipo de movimento"
 
-#: src/keyboardconfig.cpp:321
+#: src/keyboardconfig.cpp:328
 msgid "Change Attack Weapon Type"
 msgstr "Mudar tipo de ataque de arma"
 
-#: src/keyboardconfig.cpp:323
+#: src/keyboardconfig.cpp:330
 msgid "Change Attack Type"
 msgstr "Mudar tipo de ataque"
 
-#: src/keyboardconfig.cpp:325
+#: src/keyboardconfig.cpp:332
 msgid "Change Follow mode"
 msgstr "Mudar modo de seguir"
 
-#: src/keyboardconfig.cpp:327
+#: src/keyboardconfig.cpp:334
 msgid "Change Imitation mode"
 msgstr "Mudar modo de imitação"
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboardconfig.cpp:337
 msgid "Disable / Enable Game modifier keys"
 msgstr "Habilitar / Desabilitar Chaves de modificação"
 
-#: src/keyboardconfig.cpp:331
+#: src/keyboardconfig.cpp:338
 msgid "On / Off audio"
 msgstr "Ligar / Desligar áudio"
 
-#: src/keyboardconfig.cpp:333
+#: src/keyboardconfig.cpp:340
 msgid "Enable / Disable away mode"
 msgstr "Habilitar / Desabilitar modo indisponivel "
 
-#: src/keyboardconfig.cpp:335
+#: src/keyboardconfig.cpp:342
 msgid "Emulate right click from keyboard"
 msgstr "Emular botão direito do teclado"
 
-#: src/keyboardconfig.cpp:337
+#: src/keyboardconfig.cpp:344
 msgid "Toggle camera mode"
 msgstr "Alterar modo de camera"
 
-#: src/keyboardconfig.cpp:339
+#: src/keyboardconfig.cpp:346
 msgid "Modifier key"
 msgstr "Chave de modificação"
 
-#: src/keyboardconfig.cpp:411
+#: src/keyboardconfig.cpp:425
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -4184,68 +4216,68 @@ msgstr ""
 "Conflito com as teclas \"%s\" e \"%s\" . Resolva o conflito para não "
 "comprometer a jogabilidade."
 
-#: src/localplayer.cpp:377
+#: src/localplayer.cpp:380
 msgid "You were killed by "
 msgstr "Você foi morto por "
 
-#: src/localplayer.cpp:1416
+#: src/localplayer.cpp:1422
 msgid "Tried to pick up nonexistent item."
 msgstr "Você tentou pegar um item não existente."
 
-#: src/localplayer.cpp:1418
+#: src/localplayer.cpp:1424
 msgid "Item is too heavy."
 msgstr "Este item é muito pesado."
 
-#: src/localplayer.cpp:1420
+#: src/localplayer.cpp:1426
 msgid "Item is too far away."
 msgstr "Item está muito longe"
 
-#: src/localplayer.cpp:1422
+#: src/localplayer.cpp:1428
 msgid "Inventory is full."
 msgstr "O inventário está cheio."
 
-#: src/localplayer.cpp:1424
+#: src/localplayer.cpp:1430
 msgid "Stack is too big."
 msgstr "Esta pilha é muito grande."
 
-#: src/localplayer.cpp:1427
+#: src/localplayer.cpp:1433
 msgid "Item belongs to someone else."
 msgstr "Este item pertence a outra pessoa."
 
-#: src/localplayer.cpp:1430
+#: src/localplayer.cpp:1436
 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:1454
+#: src/localplayer.cpp:1460
 #, 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:3168
+#: src/localplayer.cpp:3174
 msgid "Away"
 msgstr "Indisponivel "
 
-#: src/localplayer.cpp:3468
+#: src/localplayer.cpp:3494
 msgid "Follow: "
 msgstr "Seguindo:"
 
-#: src/localplayer.cpp:3470 src/localplayer.cpp:3485
+#: src/localplayer.cpp:3496 src/localplayer.cpp:3511
 msgid "Follow canceled"
 msgstr "Seguindo cancelado"
 
-#: src/localplayer.cpp:3477
+#: src/localplayer.cpp:3503
 msgid "Imitation: "
 msgstr "Imitando:"
 
-#: src/localplayer.cpp:3479 src/localplayer.cpp:3487
+#: src/localplayer.cpp:3505 src/localplayer.cpp:3513
 msgid "Imitation canceled"
 msgstr "Imitação cancelada"
 
-#: src/localplayer.cpp:3832
+#: src/localplayer.cpp:3858
 msgid "You see "
 msgstr "Você vê "
 
@@ -4637,15 +4669,15 @@ 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."
 
-#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:286
+#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:284
 msgid "Item sharing enabled."
 msgstr "Compartilhamento de itens habilitado."
 
-#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:296
+#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:294
 msgid "Item sharing disabled."
 msgstr "Compartilhamento de itens desabilitado."
 
-#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:306
+#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:304
 msgid "Item sharing not possible."
 msgstr "Não é possível compartilhar itens."
 
@@ -4653,15 +4685,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:248
+#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:246
 msgid "Experience sharing enabled."
 msgstr "Compartilhamento de experiência habilitado."
 
-#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:258
+#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:256
 msgid "Experience sharing disabled."
 msgstr "Compartilhamento de experiência desabilitado."
 
-#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:268
+#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:266
 msgid "Experience sharing not possible."
 msgstr "Não é possível compartilhar experiência."
 
@@ -4744,54 +4776,54 @@ msgstr "Este nome de usuário já está em uso."
 msgid "Username permanently erased."
 msgstr "Usuário apagado permanentemente. "
 
-#: src/net/ea/partyhandler.cpp:82
+#: src/net/ea/partyhandler.cpp:80
 msgid "Could not create party."
 msgstr "Não foi possível criar o grupo."
 
-#: src/net/ea/partyhandler.cpp:84
+#: src/net/ea/partyhandler.cpp:82
 msgid "Party successfully created."
 msgstr "Grupo criado."
 
-#: src/net/ea/partyhandler.cpp:140
+#: src/net/ea/partyhandler.cpp:138
 #, c-format
 msgid "%s has joined your party."
 msgstr "%s se juntou ao grupo"
 
-#: src/net/ea/partyhandler.cpp:176
+#: src/net/ea/partyhandler.cpp:174
 #, c-format
 msgid "%s is already a member of a party."
 msgstr "%s já é membro de um grupo."
 
-#: src/net/ea/partyhandler.cpp:181
+#: src/net/ea/partyhandler.cpp:179
 #, c-format
 msgid "%s refused your invitation."
 msgstr "%s recusou seu convite."
 
-#: src/net/ea/partyhandler.cpp:186
+#: src/net/ea/partyhandler.cpp:184
 #, c-format
 msgid "%s is now a member of your party."
 msgstr "%s agora é um membro do seu grupo."
 
-#: src/net/ea/partyhandler.cpp:191
+#: src/net/ea/partyhandler.cpp:189
 #, c-format
 msgid "%s can't join your party because party is full."
 msgstr "%s não pode se juntar ao grupo cheio."
 
-#: src/net/ea/partyhandler.cpp:196
+#: src/net/ea/partyhandler.cpp:194
 #, c-format
 msgid "QQQ Unknown invite response for %s."
 msgstr "QQQ resposta de convite desconhecida por %s."
 
-#: src/net/ea/partyhandler.cpp:356
+#: src/net/ea/partyhandler.cpp:354
 msgid "You have left the party."
 msgstr "Você saiu do grupo."
 
-#: src/net/ea/partyhandler.cpp:369
+#: src/net/ea/partyhandler.cpp:367
 #, c-format
 msgid "%s has left your party."
 msgstr "%s saiu do seu grupo."
 
-#: src/net/ea/partyhandler.cpp:448
+#: src/net/ea/partyhandler.cpp:446
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr "Um membro desconhecido tentou dizer: %s"
@@ -4952,83 +4984,83 @@ msgstr "Impossível aumentar o atributo!"
 msgid "Equip arrows first."
 msgstr "Equipe as flechas primeiro."
 
-#: src/net/ea/specialhandler.cpp:149
+#: src/net/ea/specialhandler.cpp:146
 msgid "Trade failed!"
 msgstr "Falha na negociação!"
 
-#: src/net/ea/specialhandler.cpp:152
+#: src/net/ea/specialhandler.cpp:149
 msgid "Emote failed!"
 msgstr "Falha no emoticon!"
 
-#: src/net/ea/specialhandler.cpp:155
+#: src/net/ea/specialhandler.cpp:152
 msgid "Sit failed!"
 msgstr "Falha ao sentar!"
 
-#: src/net/ea/specialhandler.cpp:158
+#: src/net/ea/specialhandler.cpp:155
 msgid "Chat creating failed!"
 msgstr "Falha ao criar Chat!"
 
-#: src/net/ea/specialhandler.cpp:161
+#: src/net/ea/specialhandler.cpp:158
 msgid "Could not join party!"
 msgstr "Impossivel entrar no grupo!"
 
-#: src/net/ea/specialhandler.cpp:164
+#: src/net/ea/specialhandler.cpp:161
 msgid "Cannot shout!"
 msgstr "Impossivel gritar!"
 
-#: src/net/ea/specialhandler.cpp:177
+#: src/net/ea/specialhandler.cpp:174
 msgid "You have not yet reached a high enough lvl!"
 msgstr "Você ainda não tem o nivel necessário!"
 
-#: src/net/ea/specialhandler.cpp:181
+#: src/net/ea/specialhandler.cpp:178
 msgid "Insufficient HP!"
 msgstr "HP insuficiente!"
 
-#: src/net/ea/specialhandler.cpp:184
+#: src/net/ea/specialhandler.cpp:181
 msgid "Insufficient SP!"
 msgstr "SP insuficiente!"
 
-#: src/net/ea/specialhandler.cpp:187
+#: src/net/ea/specialhandler.cpp:184
 msgid "You have no memos!"
 msgstr "Você não tem nenhuma nota armazenada!"
 
-#: src/net/ea/specialhandler.cpp:190
+#: src/net/ea/specialhandler.cpp:187
 msgid "You cannot do that right now!"
 msgstr "Você não pode fazer isso agora!"
 
-#: src/net/ea/specialhandler.cpp:193
+#: src/net/ea/specialhandler.cpp:190
 msgid "Seems you need more money... ;-)"
 msgstr "Parece que você precisa de mais dinheiro... ;-)"
 
-#: src/net/ea/specialhandler.cpp:196
+#: src/net/ea/specialhandler.cpp:193
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Você não pode usar essa habilidade com esse tipo de arma!"
 
-#: src/net/ea/specialhandler.cpp:200
+#: src/net/ea/specialhandler.cpp:197
 msgid "You need another red gem!"
 msgstr "Você precisa de outra gema vermelha!"
 
-#: src/net/ea/specialhandler.cpp:203
+#: src/net/ea/specialhandler.cpp:200
 msgid "You need another blue gem!"
 msgstr "Você precisa de outra jóia azul!"
 
-#: src/net/ea/specialhandler.cpp:206
+#: src/net/ea/specialhandler.cpp:203
 msgid "You're carrying to much to do this!"
 msgstr "Você está com muita carga para fazer isso!"
 
-#: src/net/ea/specialhandler.cpp:209
+#: src/net/ea/specialhandler.cpp:206
 msgid "Huh? What's that?"
 msgstr "Hã? O que é isso?"
 
-#: src/net/ea/specialhandler.cpp:220
+#: src/net/ea/specialhandler.cpp:217
 msgid "Warp failed..."
 msgstr "Falha ao transportar..."
 
-#: src/net/ea/specialhandler.cpp:223
+#: src/net/ea/specialhandler.cpp:220
 msgid "Could not steal anything..."
 msgstr "Não foi possível roubar nada..."
 
-#: src/net/ea/specialhandler.cpp:226
+#: src/net/ea/specialhandler.cpp:223
 msgid "Poison had no effect..."
 msgstr "Veneno não surtiu efeito..."
 
diff --git a/po/ru.po b/po/ru.po
index d3548195c..94b5cfa2a 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-09-17 16:12+0300\n"
-"PO-Revision-Date: 2011-09-16 20:13+0000\n"
+"POT-Creation-Date: 2011-09-27 22:18+0300\n"
+"PO-Revision-Date: 2011-09-27 19:23+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: Russian (http://www.transifex.net/projects/p/manaplus/team/"
 "ru/)\n"
@@ -23,25 +23,25 @@ msgstr ""
 "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:1088
+#: src/actorspritemanager.cpp:1133
 msgid "Visible on map"
 msgstr "Видимые на карте"
 
-#: src/being.cpp:548
+#: src/being.cpp:547
 msgid "dodge"
 msgstr "уворот"
 
-#: src/being.cpp:548
+#: src/being.cpp:547
 msgid "miss"
 msgstr "промах"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1527
+#: src/being.cpp:1526
 msgid "A"
 msgstr "О"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1532
+#: src/being.cpp:1531
 msgid "I"
 msgstr "Б"
 
@@ -49,43 +49,43 @@ msgstr "Б"
 msgid "Setup"
 msgstr "Настройка"
 
-#: src/client.cpp:841 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:842 src/gui/setup_perfomance.cpp:48
 msgid "Perfomance"
 msgstr "Производительность"
 
-#: src/client.cpp:846 src/gui/setup_video.cpp:315
+#: src/client.cpp:847 src/gui/setup_video.cpp:315
 msgid "Video"
 msgstr "Видео"
 
-#: src/client.cpp:851
+#: src/client.cpp:852
 msgid "Themes"
 msgstr "Темы"
 
-#: src/client.cpp:932
+#: src/client.cpp:934
 msgid "Connecting to server"
 msgstr "Идет подключение к серверу..."
 
-#: src/client.cpp:963
+#: src/client.cpp:965
 msgid "Logging in"
 msgstr "Авторизация"
 
-#: src/client.cpp:996
+#: src/client.cpp:998
 msgid "Entering game world"
 msgstr "Входим в игровой мир"
 
-#: src/client.cpp:1096
+#: src/client.cpp:1098
 msgid "Requesting characters"
 msgstr "Получение списка персонажей"
 
-#: src/client.cpp:1127
+#: src/client.cpp:1129
 msgid "Connecting to the game server"
 msgstr "Подключение к игровому серверу"
 
-#: src/client.cpp:1137
+#: src/client.cpp:1139
 msgid "Changing game servers"
 msgstr "Смена игрового сервера"
 
-#: src/client.cpp:1180 src/client.cpp:1187 src/client.cpp:1321
+#: src/client.cpp:1182 src/client.cpp:1189 src/client.cpp:1323
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:221 src/gui/charselectdialog.cpp:253
 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
@@ -95,50 +95,50 @@ msgstr "Смена игрового сервера"
 msgid "Error"
 msgstr "Ошибка"
 
-#: src/client.cpp:1196
+#: src/client.cpp:1198
 msgid "Requesting registration details"
 msgstr "Запрос регистрационных данных"
 
-#: src/client.cpp:1222
+#: src/client.cpp:1224
 msgid "Password Change"
 msgstr "Изменить Пароль"
 
-#: src/client.cpp:1223
+#: src/client.cpp:1225
 msgid "Password changed successfully!"
 msgstr "Пароль изменен!"
 
-#: src/client.cpp:1242
+#: src/client.cpp:1244
 msgid "Email Change"
 msgstr "Сменить Email"
 
-#: src/client.cpp:1243
+#: src/client.cpp:1245
 msgid "Email changed successfully!"
 msgstr "Email изменен!"
 
-#: src/client.cpp:1263
+#: src/client.cpp:1265
 msgid "Unregister Successful"
 msgstr "Регистрация удалена"
 
-#: src/client.cpp:1264
+#: src/client.cpp:1266
 msgid "Farewell, come back any time..."
 msgstr "Хорошо, возвращайтесь в любое время..."
 
-#: src/client.cpp:1463 src/client.cpp:1493 src/client.cpp:1508
-#: src/client.cpp:1933 src/client.cpp:1940
+#: src/client.cpp:1465 src/client.cpp:1495 src/client.cpp:1510
+#: src/client.cpp:1935 src/client.cpp:1942
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s не существует, и не может быть создано! Выход."
 
-#: src/client.cpp:1639
+#: src/client.cpp:1641
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Некорректный сервер обновлений: %s"
 
-#: src/client.cpp:1673 src/client.cpp:1679
+#: src/client.cpp:1675 src/client.cpp:1681
 msgid "Error creating updates directory!"
 msgstr "Ошибка создания директории для обновлений!"
 
-#: src/client.cpp:1700
+#: src/client.cpp:1702
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Ошибка: %s не существует, и не может быть создан! Выход."
@@ -353,11 +353,11 @@ msgstr "Игнорировать предложения о торговле"
 msgid "Accepting incoming trade requests"
 msgstr "Принимать предложения о торговле"
 
-#: src/game.cpp:1729
+#: src/game.cpp:1727
 msgid "Could Not Load Map"
 msgstr "Не удалось загрузить карту"
 
-#: src/game.cpp:1730
+#: src/game.cpp:1728
 #, c-format
 msgid "Error while loading %s"
 msgstr "Ошибка во время загрузки %s"
@@ -392,7 +392,7 @@ msgstr "Имя"
 
 #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:133
 #: src/gui/popupmenu.cpp:283 src/gui/popupmenu.cpp:596
-#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:265
+#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:265
 msgid "Attack"
 msgstr "Атака"
 
@@ -446,7 +446,7 @@ msgstr "-"
 #: src/gui/buydialog.cpp:99 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:294
-#: src/keyboardconfig.cpp:290
+#: src/keyboardconfig.cpp:82
 msgid "Quit"
 msgstr "Выход"
 
@@ -481,7 +481,7 @@ msgstr "Продать"
 #: src/gui/popupmenu.cpp:1858 src/gui/popupmenu.cpp:1897
 #: src/gui/popupmenu.cpp:1949 src/gui/popupmenu.cpp:1969
 #: src/gui/quitdialog.cpp:55 src/gui/register.cpp:82 src/gui/setup.cpp:72
-#: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:238
+#: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:241
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
 #: src/gui/updaterwindow.cpp:161
 msgid "Cancel"
@@ -650,8 +650,8 @@ msgid "Enter password:"
 msgstr "Введите пароль:"
 
 #: src/gui/charselectdialog.cpp:410 src/gui/serverdialog.cpp:298
-#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:122
-#: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:241
+#: src/gui/setup_relations.cpp:242 src/gui/shopwindow.cpp:122
+#: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244
 msgid "Delete"
 msgstr "Удалить"
 
@@ -903,7 +903,7 @@ msgid "Did You Know?"
 msgstr "Вы знаете?"
 
 #: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
-#: src/gui/inventorywindow.cpp:206 src/gui/npcdialog.cpp:53
+#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:53
 #: src/gui/popupmenu.cpp:556 src/gui/shopwindow.cpp:113
 msgid "Close"
 msgstr "Закрыть"
@@ -930,7 +930,7 @@ msgid "Equipment"
 msgstr "Снаряжение"
 
 #: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160
-#: src/gui/inventorywindow.cpp:539 src/gui/inventorywindow.cpp:548
+#: src/gui/inventorywindow.cpp:538 src/gui/inventorywindow.cpp:547
 #: src/gui/popupmenu.cpp:1656 src/gui/popupmenu.cpp:1748
 #: src/gui/popupmenu.cpp:1793
 msgid "Unequip"
@@ -960,37 +960,33 @@ msgstr "по кол-ву."
 msgid "by type"
 msgstr "по типу"
 
-#: src/gui/inventorywindow.cpp:111 src/gui/windowmenu.cpp:76
+#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:76
 #: src/inventory.cpp:249
 msgid "Inventory"
 msgstr "Инвентарь"
 
-#: src/gui/inventorywindow.cpp:136
+#: src/gui/inventorywindow.cpp:137
 msgid "Slots:"
 msgstr "Вместимость:"
 
-#: src/gui/inventorywindow.cpp:148
+#: src/gui/inventorywindow.cpp:149
 msgid "Filter:"
 msgstr "Фильтр:"
 
-#: src/gui/inventorywindow.cpp:149
-msgid "Sort:"
-msgstr "Сорт.:"
-
-#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:541
-#: src/gui/inventorywindow.cpp:550 src/gui/popupmenu.cpp:1658
+#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:540
+#: src/gui/inventorywindow.cpp:549 src/gui/popupmenu.cpp:1658
 #: src/gui/popupmenu.cpp:1750 src/gui/popupmenu.cpp:1795
 msgid "Equip"
 msgstr "Надеть"
 
-#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:542
-#: src/gui/inventorywindow.cpp:546 src/gui/popupmenu.cpp:1662
+#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:541
+#: src/gui/inventorywindow.cpp:545 src/gui/popupmenu.cpp:1662
 #: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1754
 #: src/gui/popupmenu.cpp:1799
 msgid "Use"
 msgstr "Использовать"
 
-#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:646
+#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:645
 #: src/gui/popupmenu.cpp:1667 src/gui/popupmenu.cpp:1759
 #: src/gui/popupmenu.cpp:1804
 msgid "Drop..."
@@ -1010,17 +1006,17 @@ msgstr "Наряды"
 msgid "Weight:"
 msgstr "Вес:"
 
-#: src/gui/inventorywindow.cpp:204 src/gui/inventorywindow.cpp:637
+#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:636
 #: src/gui/popupmenu.cpp:1642 src/gui/popupmenu.cpp:1771
 #: src/gui/popupmenu.cpp:1816 src/gui/setup.cpp:73
 msgid "Store"
 msgstr "Сохранить"
 
-#: src/gui/inventorywindow.cpp:205 src/gui/popupmenu.cpp:1683
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1683
 msgid "Retrieve"
 msgstr "Получить"
 
-#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1672
+#: src/gui/inventorywindow.cpp:647 src/gui/popupmenu.cpp:1672
 #: src/gui/popupmenu.cpp:1764 src/gui/popupmenu.cpp:1809
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
@@ -2219,30 +2215,34 @@ msgid "Show own name"
 msgstr "Показать свое имя"
 
 #: src/gui/setup_players.cpp:63
+msgid "Enable extended mouse targeting"
+msgstr "Включить расширенное наведение мыши"
+
+#: src/gui/setup_players.cpp:66
 msgid "Target dead players"
 msgstr "Наводить фокус на мертвых игроков"
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_players.cpp:69
 msgid "Visible names"
 msgstr "Видимые имена"
 
-#: src/gui/setup_players.cpp:69
+#: src/gui/setup_players.cpp:72
 msgid "Secure trades"
 msgstr "Защитить торговлю"
 
-#: src/gui/setup_players.cpp:72
+#: src/gui/setup_players.cpp:75
 msgid "Unsecure chars in names"
 msgstr "Небезопасные символы"
 
-#: src/gui/setup_players.cpp:75
+#: src/gui/setup_players.cpp:78
 msgid "Show statuses"
 msgstr "Показывать статусы"
 
-#: src/gui/setup_players.cpp:78
+#: src/gui/setup_players.cpp:81
 msgid "Show ip addresses on screenshots"
 msgstr "Показывать ip адреса на снимках экрана"
 
-#: src/gui/setup_players.cpp:81
+#: src/gui/setup_players.cpp:84
 msgid "Allow self heal with mouse click"
 msgstr "Включить самолечение по клику мыши"
 
@@ -2270,23 +2270,23 @@ msgstr "Игнорировано"
 msgid "Erased"
 msgstr "Стерт"
 
-#: src/gui/setup_relations.cpp:239
+#: src/gui/setup_relations.cpp:238
 msgid "Allow trading"
 msgstr "Разрешить торговлю"
 
-#: src/gui/setup_relations.cpp:241
+#: src/gui/setup_relations.cpp:240
 msgid "Allow whispers"
 msgstr "Разрешить шептание"
 
-#: src/gui/setup_relations.cpp:244
+#: src/gui/setup_relations.cpp:243
 msgid "Old"
 msgstr "Старые"
 
-#: src/gui/setup_relations.cpp:246
+#: src/gui/setup_relations.cpp:245
 msgid "Relations"
 msgstr "Связи"
 
-#: src/gui/setup_relations.cpp:271
+#: src/gui/setup_relations.cpp:270
 msgid "When ignoring:"
 msgstr "Когда игнорируется:"
 
@@ -3259,30 +3259,34 @@ msgid "Command:"
 msgstr "Команда:"
 
 #: src/gui/textcommandeditor.cpp:200
+msgid "Comment:"
+msgstr "Комментарий:"
+
+#: src/gui/textcommandeditor.cpp:203
 msgid "Mana:"
 msgstr "Мана:"
 
-#: src/gui/textcommandeditor.cpp:206
+#: src/gui/textcommandeditor.cpp:209
 msgid "Target Type:"
 msgstr "Тип цели:"
 
-#: src/gui/textcommandeditor.cpp:212
+#: src/gui/textcommandeditor.cpp:215
 msgid "Icon:"
 msgstr "Картинка:"
 
-#: src/gui/textcommandeditor.cpp:218
+#: src/gui/textcommandeditor.cpp:221
 msgid "Magic level:"
 msgstr "Уровень Магии:"
 
-#: src/gui/textcommandeditor.cpp:224
+#: src/gui/textcommandeditor.cpp:227
 msgid "Magic School:"
 msgstr "Школа Магии:"
 
-#: src/gui/textcommandeditor.cpp:230
+#: src/gui/textcommandeditor.cpp:233
 msgid "School level:"
 msgstr "Уровень школы:"
 
-#: src/gui/textcommandeditor.cpp:235
+#: src/gui/textcommandeditor.cpp:238
 msgid "Save"
 msgstr "Сохранить"
 
@@ -3512,23 +3516,23 @@ msgstr "Бордюр домашней позиции"
 msgid "Road Point"
 msgstr "Точка дороги"
 
-#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:474
+#: src/gui/whoisonline.cpp:85 src/gui/whoisonline.cpp:478
 msgid "Who Is Online - Updating"
 msgstr "Кто онлайн - обновление"
 
-#: src/gui/whoisonline.cpp:104
+#: src/gui/whoisonline.cpp:108
 msgid "Update"
 msgstr "Обновить"
 
-#: src/gui/whoisonline.cpp:297
+#: src/gui/whoisonline.cpp:301
 msgid "Who Is Online - "
 msgstr "Кто онлайн - "
 
-#: src/gui/whoisonline.cpp:488
+#: src/gui/whoisonline.cpp:492
 msgid "Who Is Online - error"
 msgstr "Кто онлайн - ошибка"
 
-#: src/gui/whoisonline.cpp:519
+#: src/gui/whoisonline.cpp:523
 msgid "Who Is Online - Update"
 msgstr "Кто онлайн - обновление"
 
@@ -3811,49 +3815,49 @@ msgid "Cart"
 msgstr "Телега"
 
 #: src/keyboardconfig.cpp:43
+msgid "Basic Keys"
+msgstr "Основные клавиши"
+
+#: src/keyboardconfig.cpp:44
 msgid "Move Up"
 msgstr "Движение вверх"
 
-#: src/keyboardconfig.cpp:44
+#: src/keyboardconfig.cpp:45
 msgid "Move Down"
 msgstr "Движение вниз"
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:46
 msgid "Move Left"
 msgstr "Движение влево"
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:47
 msgid "Move Right"
 msgstr "Движение вправо"
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:50
 msgid "Target & Attack"
 msgstr "Прицел и атака"
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:52
 msgid "Move to Target"
 msgstr "Движение к цели"
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:54
 msgid "Change Move to Target type"
 msgstr "Изменение типа движения и атаки"
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:56
 msgid "Move to Home location"
 msgstr "Переход к Домашней локации"
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:58
 msgid "Set home location"
 msgstr "Установка Домашней локации"
 
-#: src/keyboardconfig.cpp:59
+#: src/keyboardconfig.cpp:60
 msgid "Move to navigation point"
 msgstr "Движение к навигационной точке"
 
-#: src/keyboardconfig.cpp:61
-msgid "Smilie"
-msgstr "Смайлы"
-
 #: src/keyboardconfig.cpp:63
 msgid "Stop Attack"
 msgstr "Остановка атаки"
@@ -3899,300 +3903,328 @@ msgid "Change Map View Mode"
 msgstr "Изменение режима отображения карты"
 
 #: src/keyboardconfig.cpp:80
+msgid "Select OK"
+msgstr "Выбор Ok"
+
+#: src/keyboardconfig.cpp:83
+msgid "Shortcuts Keys"
+msgstr "Клавиши быстрых действий"
+
+#: src/keyboardconfig.cpp:84
 msgid "Item Shortcuts Key"
 msgstr "Горячие клавиши предметов"
 
-#: src/keyboardconfig.cpp:82 src/keyboardconfig.cpp:84
 #: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:88
 #: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:92
 #: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:96
 #: src/keyboardconfig.cpp:98 src/keyboardconfig.cpp:100
 #: src/keyboardconfig.cpp:102 src/keyboardconfig.cpp:104
 #: src/keyboardconfig.cpp:106 src/keyboardconfig.cpp:108
-#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:113
-#: src/keyboardconfig.cpp:115 src/keyboardconfig.cpp:117
+#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:112
+#: src/keyboardconfig.cpp:114 src/keyboardconfig.cpp:117
 #: src/keyboardconfig.cpp:119 src/keyboardconfig.cpp:121
-#: src/keyboardconfig.cpp:360
+#: src/keyboardconfig.cpp:123 src/keyboardconfig.cpp:125
+#: src/keyboardconfig.cpp:367
 #, c-format
 msgid "Item Shortcut %d"
 msgstr "Комбинация клавиш быстрого предмета %d"
 
-#: src/keyboardconfig.cpp:122
+#: src/keyboardconfig.cpp:126
+msgid "Windows Keys"
+msgstr "Клавиши окон"
+
+#: src/keyboardconfig.cpp:127
 msgid "Help Window"
 msgstr "Окно помощи"
 
-#: src/keyboardconfig.cpp:124
+#: src/keyboardconfig.cpp:129
 msgid "Status Window"
 msgstr "Окно статуса"
 
-#: src/keyboardconfig.cpp:126
+#: src/keyboardconfig.cpp:131
 msgid "Inventory Window"
 msgstr "Окно инвентаря"
 
-#: src/keyboardconfig.cpp:128
+#: src/keyboardconfig.cpp:133
 msgid "Equipment Window"
 msgstr "Окно экипировки"
 
-#: src/keyboardconfig.cpp:130
+#: src/keyboardconfig.cpp:135
 msgid "Skill Window"
 msgstr "Окно навыков"
 
-#: src/keyboardconfig.cpp:132
+#: src/keyboardconfig.cpp:137
 msgid "Minimap Window"
 msgstr "Окно мини-карты"
 
-#: src/keyboardconfig.cpp:134
+#: src/keyboardconfig.cpp:139
 msgid "Chat Window"
 msgstr "Окно чата"
 
-#: src/keyboardconfig.cpp:136
+#: src/keyboardconfig.cpp:141
 msgid "Item Shortcut Window"
 msgstr "Окно быстрого использования предметов"
 
-#: src/keyboardconfig.cpp:138
+#: src/keyboardconfig.cpp:143
 msgid "Setup Window"
 msgstr "Окно настроек"
 
-#: src/keyboardconfig.cpp:140
+#: src/keyboardconfig.cpp:145
 msgid "Debug Window"
 msgstr "Окно отладки"
 
-#: src/keyboardconfig.cpp:142
+#: src/keyboardconfig.cpp:147
 msgid "Social Window"
 msgstr "Окно общества"
 
-#: src/keyboardconfig.cpp:144
+#: src/keyboardconfig.cpp:149
 msgid "Emote Shortcut Window"
 msgstr "Окно эмоций"
 
-#: src/keyboardconfig.cpp:146
+#: src/keyboardconfig.cpp:151
 msgid "Outfits Window"
 msgstr "Окно нарядов"
 
-#: src/keyboardconfig.cpp:148
+#: src/keyboardconfig.cpp:153
 msgid "Shop Window"
 msgstr "Окно магазина"
 
-#: src/keyboardconfig.cpp:150
+#: src/keyboardconfig.cpp:155
 msgid "Quick drop Window"
 msgstr "Окно быстрого бросания предметов"
 
-#: src/keyboardconfig.cpp:152
+#: src/keyboardconfig.cpp:157
 msgid "Kill Stats Window"
 msgstr "Окно статистики атак"
 
-#: src/keyboardconfig.cpp:154
+#: src/keyboardconfig.cpp:159
 msgid "Commands Window"
 msgstr "Окно команд"
 
-#: src/keyboardconfig.cpp:156
+#: src/keyboardconfig.cpp:161
 msgid "Bot Checker Window"
 msgstr "Окно детектора ботов"
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboardconfig.cpp:164
 msgid "Who Is Online Window"
 msgstr "Окно кто онлайн"
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboardconfig.cpp:166
 msgid "Did you know Window"
 msgstr "Окно \"Вы знаете?\""
 
-#: src/keyboardconfig.cpp:164
+#: src/keyboardconfig.cpp:169
 msgid "Previous Social Tab"
 msgstr "Предыдущая закладка общества"
 
-#: src/keyboardconfig.cpp:166
+#: src/keyboardconfig.cpp:171
 msgid "Next Social Tab"
 msgstr "Следующая закладка общества"
 
-#: src/keyboardconfig.cpp:168 src/keyboardconfig.cpp:170
-#: src/keyboardconfig.cpp:172 src/keyboardconfig.cpp:174
-#: src/keyboardconfig.cpp:176 src/keyboardconfig.cpp:178
-#: src/keyboardconfig.cpp:180 src/keyboardconfig.cpp:182
-#: src/keyboardconfig.cpp:184 src/keyboardconfig.cpp:186
-#: src/keyboardconfig.cpp:188 src/keyboardconfig.cpp:190
-#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
-#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
-#: src/keyboardconfig.cpp:201 src/keyboardconfig.cpp:203
-#: src/keyboardconfig.cpp:205 src/keyboardconfig.cpp:207
-#: src/keyboardconfig.cpp:209 src/keyboardconfig.cpp:211
-#: src/keyboardconfig.cpp:213 src/keyboardconfig.cpp:215
-#: src/keyboardconfig.cpp:217 src/keyboardconfig.cpp:220
-#: src/keyboardconfig.cpp:223 src/keyboardconfig.cpp:226
-#: src/keyboardconfig.cpp:228 src/keyboardconfig.cpp:230
-#: src/keyboardconfig.cpp:232 src/keyboardconfig.cpp:234
-#: src/keyboardconfig.cpp:236 src/keyboardconfig.cpp:238
-#: src/keyboardconfig.cpp:240 src/keyboardconfig.cpp:242
-#: src/keyboardconfig.cpp:244 src/keyboardconfig.cpp:247
-#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
-#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
-#: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:259
-#: src/keyboardconfig.cpp:355
+#: src/keyboardconfig.cpp:173
+msgid "Emotes Keys"
+msgstr "Клавиши смайлов"
+
+#: src/keyboardconfig.cpp:174
+msgid "Smilie"
+msgstr "Смайлы"
+
+#: src/keyboardconfig.cpp:175 src/keyboardconfig.cpp:177
+#: src/keyboardconfig.cpp:179 src/keyboardconfig.cpp:181
+#: src/keyboardconfig.cpp:183 src/keyboardconfig.cpp:185
+#: src/keyboardconfig.cpp:187 src/keyboardconfig.cpp:189
+#: src/keyboardconfig.cpp:191 src/keyboardconfig.cpp:193
+#: src/keyboardconfig.cpp:195 src/keyboardconfig.cpp:197
+#: src/keyboardconfig.cpp:200 src/keyboardconfig.cpp:202
+#: src/keyboardconfig.cpp:204 src/keyboardconfig.cpp:206
+#: src/keyboardconfig.cpp:208 src/keyboardconfig.cpp:210
+#: src/keyboardconfig.cpp:212 src/keyboardconfig.cpp:214
+#: src/keyboardconfig.cpp:216 src/keyboardconfig.cpp:218
+#: src/keyboardconfig.cpp:220 src/keyboardconfig.cpp:222
+#: src/keyboardconfig.cpp:224 src/keyboardconfig.cpp:227
+#: src/keyboardconfig.cpp:230 src/keyboardconfig.cpp:233
+#: src/keyboardconfig.cpp:235 src/keyboardconfig.cpp:237
+#: src/keyboardconfig.cpp:239 src/keyboardconfig.cpp:241
+#: src/keyboardconfig.cpp:243 src/keyboardconfig.cpp:245
+#: src/keyboardconfig.cpp:247 src/keyboardconfig.cpp:249
+#: src/keyboardconfig.cpp:251 src/keyboardconfig.cpp:254
+#: src/keyboardconfig.cpp:256 src/keyboardconfig.cpp:258
+#: src/keyboardconfig.cpp:260 src/keyboardconfig.cpp:262
+#: src/keyboardconfig.cpp:264 src/keyboardconfig.cpp:266
+#: src/keyboardconfig.cpp:362
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "Комбинация клавиш для смайла %d"
 
-#: src/keyboardconfig.cpp:261
+#: src/keyboardconfig.cpp:268
+msgid "Outfits Keys"
+msgstr "Клавиши нарядов"
+
+#: src/keyboardconfig.cpp:269
 msgid "Wear Outfit"
 msgstr "Надеть наряд"
 
-#: src/keyboardconfig.cpp:263
+#: src/keyboardconfig.cpp:271
 msgid "Copy Outfit"
 msgstr "Копировать наряд"
 
-#: src/keyboardconfig.cpp:265
+#: src/keyboardconfig.cpp:273
 msgid "Copy equipped to Outfit"
 msgstr "Копирование надетого наряда"
 
-#: src/keyboardconfig.cpp:267
+#: src/keyboardconfig.cpp:275
+msgid "Chat Keys"
+msgstr "Клавиши чата"
+
+#: src/keyboardconfig.cpp:276
 msgid "Toggle Chat"
 msgstr "Переключение на чат"
 
-#: src/keyboardconfig.cpp:269
+#: src/keyboardconfig.cpp:278
 msgid "Scroll Chat Up"
 msgstr "Прокручивание чата вверх"
 
-#: src/keyboardconfig.cpp:271
+#: src/keyboardconfig.cpp:280
 msgid "Scroll Chat Down"
 msgstr "Прокручивание чата вниз"
 
-#: src/keyboardconfig.cpp:273
+#: src/keyboardconfig.cpp:282
 msgid "Previous Chat Tab"
 msgstr "Предыдущая закладка чата"
 
-#: src/keyboardconfig.cpp:275
+#: src/keyboardconfig.cpp:284
 msgid "Next Chat Tab"
 msgstr "Следующая закладка чата"
 
-#: src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:287
 msgid "Close current Chat Tab"
 msgstr "Закрыть текущую вкладку чата"
 
-#: src/keyboardconfig.cpp:280
+#: src/keyboardconfig.cpp:289
 msgid "Previous chat line"
 msgstr "Предыдущая строка чата"
 
-#: src/keyboardconfig.cpp:282
+#: src/keyboardconfig.cpp:291
 msgid "Next chat line"
 msgstr "Следующая строка чата"
 
-#: src/keyboardconfig.cpp:284
+#: src/keyboardconfig.cpp:293
 msgid "Chat Auto Complete"
 msgstr "Автозавершение в чате"
 
-#: src/keyboardconfig.cpp:286
+#: src/keyboardconfig.cpp:295
 msgid "Deactivate Chat Input"
 msgstr "Отключение фокуса ввода"
 
-#: src/keyboardconfig.cpp:288
-msgid "Select OK"
-msgstr "Выбор Ok"
+#: src/keyboardconfig.cpp:297
+msgid "Other Keys"
+msgstr "Другие клавиши"
 
-#: src/keyboardconfig.cpp:291
+#: src/keyboardconfig.cpp:298
 msgid "Ignore input 1"
 msgstr "Игнорирование ввода 1"
 
-#: src/keyboardconfig.cpp:293
+#: src/keyboardconfig.cpp:300
 msgid "Ignore input 2"
 msgstr "Игнорирование ввода 2"
 
-#: src/keyboardconfig.cpp:295
+#: src/keyboardconfig.cpp:302
 msgid "Direct Up"
 msgstr "Повернуться вверх"
 
-#: src/keyboardconfig.cpp:296
+#: src/keyboardconfig.cpp:303
 msgid "Direct Down"
 msgstr "Повернуться вниз"
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboardconfig.cpp:305
 msgid "Direct Left"
 msgstr "Повернуться влево"
 
-#: src/keyboardconfig.cpp:299
+#: src/keyboardconfig.cpp:306
 msgid "Direct Right"
 msgstr "Повернуться вправо"
 
-#: src/keyboardconfig.cpp:301
+#: src/keyboardconfig.cpp:308
 msgid "Crazy moves"
 msgstr "Сумасшедшие движения"
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboardconfig.cpp:310
 msgid "Change Crazy Move mode"
 msgstr "Поменять режим сумасшедших движений"
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboardconfig.cpp:312
 msgid "Quick Drop N Items from 0 slot"
 msgstr "Быстрый сброс N предметов из 0 слота"
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboardconfig.cpp:314
 msgid "Quick Drop N Items"
 msgstr "Быстрый сброс N предметов"
 
-#: src/keyboardconfig.cpp:309
+#: src/keyboardconfig.cpp:316
 msgid "Switch Quick Drop Counter"
 msgstr "Переключение счётчика быстрого сброса"
 
-#: src/keyboardconfig.cpp:311
+#: src/keyboardconfig.cpp:318
 msgid "Quick heal target or self"
 msgstr "Быстрое лечения себя или цели"
 
-#: src/keyboardconfig.cpp:313
+#: src/keyboardconfig.cpp:320
 msgid "Use #itenplz spell"
 msgstr "Использование заклинания #itenplz"
 
-#: src/keyboardconfig.cpp:315
+#: src/keyboardconfig.cpp:322
 msgid "Use magic attack"
 msgstr "Использование магической атаки"
 
-#: src/keyboardconfig.cpp:317
+#: src/keyboardconfig.cpp:324
 msgid "Switch magic attack"
 msgstr "Переключение маг. атаки"
 
-#: src/keyboardconfig.cpp:319
+#: src/keyboardconfig.cpp:326
 msgid "Change move type"
 msgstr "Изменение типа движения"
 
-#: src/keyboardconfig.cpp:321
+#: src/keyboardconfig.cpp:328
 msgid "Change Attack Weapon Type"
 msgstr "Измение типа атаки оружием"
 
-#: src/keyboardconfig.cpp:323
+#: src/keyboardconfig.cpp:330
 msgid "Change Attack Type"
 msgstr "Изменение типа атаки"
 
-#: src/keyboardconfig.cpp:325
+#: src/keyboardconfig.cpp:332
 msgid "Change Follow mode"
 msgstr "Изменение режима следования"
 
-#: src/keyboardconfig.cpp:327
+#: src/keyboardconfig.cpp:334
 msgid "Change Imitation mode"
 msgstr "Изменение режима имитации"
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboardconfig.cpp:337
 msgid "Disable / Enable Game modifier keys"
 msgstr "Включение / Выключение специальных модификаторов"
 
-#: src/keyboardconfig.cpp:331
+#: src/keyboardconfig.cpp:338
 msgid "On / Off audio"
 msgstr "Вкл. / Выкл. звука"
 
-#: src/keyboardconfig.cpp:333
+#: src/keyboardconfig.cpp:340
 msgid "Enable / Disable away mode"
 msgstr "Включение / Выключение режима отошел"
 
-#: src/keyboardconfig.cpp:335
+#: src/keyboardconfig.cpp:342
 msgid "Emulate right click from keyboard"
 msgstr "Эмуляция правого клика с клавиатуры"
 
-#: src/keyboardconfig.cpp:337
+#: src/keyboardconfig.cpp:344
 msgid "Toggle camera mode"
 msgstr "Изменение режима камеры"
 
-#: src/keyboardconfig.cpp:339
+#: src/keyboardconfig.cpp:346
 msgid "Modifier key"
 msgstr "Кнопка-модификатор"
 
-#: src/keyboardconfig.cpp:411
+#: src/keyboardconfig.cpp:425
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -4201,41 +4233,41 @@ msgstr ""
 "Конфликт клавиш \"%s\" и \"%s\".Исправьте их, или игра может себя странно "
 "вести."
 
-#: src/localplayer.cpp:377
+#: src/localplayer.cpp:380
 msgid "You were killed by "
 msgstr "Вы были убиты "
 
-#: src/localplayer.cpp:1416
+#: src/localplayer.cpp:1422
 msgid "Tried to pick up nonexistent item."
 msgstr "Попытка поднять несуществующий предмет."
 
-#: src/localplayer.cpp:1418
+#: src/localplayer.cpp:1424
 msgid "Item is too heavy."
 msgstr "Предмет слишком тяжелый."
 
-#: src/localplayer.cpp:1420
+#: src/localplayer.cpp:1426
 msgid "Item is too far away."
 msgstr "Предмет слишком далеко"
 
-#: src/localplayer.cpp:1422
+#: src/localplayer.cpp:1428
 msgid "Inventory is full."
 msgstr "Инвентарь переполнен."
 
-#: src/localplayer.cpp:1424
+#: src/localplayer.cpp:1430
 msgid "Stack is too big."
 msgstr "Слишком много предметов."
 
-#: src/localplayer.cpp:1427
+#: src/localplayer.cpp:1433
 msgid "Item belongs to someone else."
 msgstr "Предмет принадлежит кому-то еще."
 
-#: src/localplayer.cpp:1430
+#: src/localplayer.cpp:1436
 msgid "Unknown problem picking up item."
 msgstr "Неизвестная проблема при поднятии предмета."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1454
+#: src/localplayer.cpp:1460
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -4243,27 +4275,27 @@ msgstr[0] "Вы подняли %d [@@%d|%s@@]."
 msgstr[1] "Вы подняли %d [@@%d|%s@@]."
 msgstr[2] "Вы подняли %d [@@%d|%s@@]."
 
-#: src/localplayer.cpp:3168
+#: src/localplayer.cpp:3174
 msgid "Away"
 msgstr "Отошел"
 
-#: src/localplayer.cpp:3468
+#: src/localplayer.cpp:3494
 msgid "Follow: "
 msgstr "Следование: "
 
-#: src/localplayer.cpp:3470 src/localplayer.cpp:3485
+#: src/localplayer.cpp:3496 src/localplayer.cpp:3511
 msgid "Follow canceled"
 msgstr "Следование отменено"
 
-#: src/localplayer.cpp:3477
+#: src/localplayer.cpp:3503
 msgid "Imitation: "
 msgstr "Имитация: "
 
-#: src/localplayer.cpp:3479 src/localplayer.cpp:3487
+#: src/localplayer.cpp:3505 src/localplayer.cpp:3513
 msgid "Imitation canceled"
 msgstr "Имитация отменена"
 
-#: src/localplayer.cpp:3832
+#: src/localplayer.cpp:3858
 msgid "You see "
 msgstr "Вы видите "
 
@@ -4651,15 +4683,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:286
+#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:284
 msgid "Item sharing enabled."
 msgstr "Обмен предметами включен"
 
-#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:296
+#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:294
 msgid "Item sharing disabled."
 msgstr "Обмен предметами выключен"
 
-#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:306
+#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:304
 msgid "Item sharing not possible."
 msgstr "Обмен предметами невозможен."
 
@@ -4667,15 +4699,15 @@ msgstr "Обмен предметами невозможен."
 msgid "Item sharing unknown."
 msgstr "Статус обмена предметами неизвестен."
 
-#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:248
+#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:246
 msgid "Experience sharing enabled."
 msgstr "Обмен опытом вклыючен."
 
-#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:258
+#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:256
 msgid "Experience sharing disabled."
 msgstr "Обмен опытом выкючен."
 
-#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:268
+#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:266
 msgid "Experience sharing not possible."
 msgstr "Обмен опытом невозможен."
 
@@ -4755,54 +4787,54 @@ msgstr "Это имя пользователя уже занято."
 msgid "Username permanently erased."
 msgstr "Пользователь удален"
 
-#: src/net/ea/partyhandler.cpp:82
+#: src/net/ea/partyhandler.cpp:80
 msgid "Could not create party."
 msgstr "Не удалось создать группу."
 
-#: src/net/ea/partyhandler.cpp:84
+#: src/net/ea/partyhandler.cpp:82
 msgid "Party successfully created."
 msgstr "Группа успешно создана."
 
-#: src/net/ea/partyhandler.cpp:140
+#: src/net/ea/partyhandler.cpp:138
 #, c-format
 msgid "%s has joined your party."
 msgstr "%s присоединился к группе."
 
-#: src/net/ea/partyhandler.cpp:176
+#: src/net/ea/partyhandler.cpp:174
 #, c-format
 msgid "%s is already a member of a party."
 msgstr "%s уже в Вашей группе."
 
-#: src/net/ea/partyhandler.cpp:181
+#: src/net/ea/partyhandler.cpp:179
 #, c-format
 msgid "%s refused your invitation."
 msgstr "%s отверг Ваше приглашение."
 
-#: src/net/ea/partyhandler.cpp:186
+#: src/net/ea/partyhandler.cpp:184
 #, c-format
 msgid "%s is now a member of your party."
 msgstr "%s теперь в Вашей группе."
 
-#: src/net/ea/partyhandler.cpp:191
+#: src/net/ea/partyhandler.cpp:189
 #, c-format
 msgid "%s can't join your party because party is full."
 msgstr "%s не может присоединиться к Вашей группе, т.к. группа переполнена."
 
-#: src/net/ea/partyhandler.cpp:196
+#: src/net/ea/partyhandler.cpp:194
 #, c-format
 msgid "QQQ Unknown invite response for %s."
 msgstr "QQQ Неизвестный ответ на приглашение для %s"
 
-#: src/net/ea/partyhandler.cpp:356
+#: src/net/ea/partyhandler.cpp:354
 msgid "You have left the party."
 msgstr "Вы покинули группу."
 
-#: src/net/ea/partyhandler.cpp:369
+#: src/net/ea/partyhandler.cpp:367
 #, c-format
 msgid "%s has left your party."
 msgstr "%s покинул Вашу группу."
 
-#: src/net/ea/partyhandler.cpp:448
+#: src/net/ea/partyhandler.cpp:446
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr "Неизвестный участник попытался сказать: %s"
@@ -4962,83 +4994,83 @@ msgstr "Не удалось увеличить навык!"
 msgid "Equip arrows first."
 msgstr "Для начала экипируйтесь стрелами!"
 
-#: src/net/ea/specialhandler.cpp:149
+#: src/net/ea/specialhandler.cpp:146
 msgid "Trade failed!"
 msgstr "Не удалось начать торговлю!"
 
-#: src/net/ea/specialhandler.cpp:152
+#: src/net/ea/specialhandler.cpp:149
 msgid "Emote failed!"
 msgstr "Не удалось использовать смайлик!"
 
-#: src/net/ea/specialhandler.cpp:155
+#: src/net/ea/specialhandler.cpp:152
 msgid "Sit failed!"
 msgstr "Не удалось присесть!"
 
-#: src/net/ea/specialhandler.cpp:158
+#: src/net/ea/specialhandler.cpp:155
 msgid "Chat creating failed!"
 msgstr "Не удалось создать чат!"
 
-#: src/net/ea/specialhandler.cpp:161
+#: src/net/ea/specialhandler.cpp:158
 msgid "Could not join party!"
 msgstr "Нельзя присоединиться к группе!"
 
-#: src/net/ea/specialhandler.cpp:164
+#: src/net/ea/specialhandler.cpp:161
 msgid "Cannot shout!"
 msgstr "Нельзя кричать!"
 
-#: src/net/ea/specialhandler.cpp:177
+#: src/net/ea/specialhandler.cpp:174
 msgid "You have not yet reached a high enough lvl!"
 msgstr "У Вас недостаточный уровень!"
 
-#: src/net/ea/specialhandler.cpp:181
+#: src/net/ea/specialhandler.cpp:178
 msgid "Insufficient HP!"
 msgstr "Недостаточно ОЖ!"
 
-#: src/net/ea/specialhandler.cpp:184
+#: src/net/ea/specialhandler.cpp:181
 msgid "Insufficient SP!"
 msgstr "Недостаточно Маны"
 
-#: src/net/ea/specialhandler.cpp:187
+#: src/net/ea/specialhandler.cpp:184
 msgid "You have no memos!"
 msgstr "У Вас нет записей!"
 
-#: src/net/ea/specialhandler.cpp:190
+#: src/net/ea/specialhandler.cpp:187
 msgid "You cannot do that right now!"
 msgstr "Вы не можете сделать это сейчас!"
 
-#: src/net/ea/specialhandler.cpp:193
+#: src/net/ea/specialhandler.cpp:190
 msgid "Seems you need more money... ;-)"
 msgstr "Похоже, Вам нужно боьше денег... ;-)"
 
-#: src/net/ea/specialhandler.cpp:196
+#: src/net/ea/specialhandler.cpp:193
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Вы не можете использовать это умение с этим видом оружия!"
 
-#: src/net/ea/specialhandler.cpp:200
+#: src/net/ea/specialhandler.cpp:197
 msgid "You need another red gem!"
 msgstr "Вам нужен другой красный камень!"
 
-#: src/net/ea/specialhandler.cpp:203
+#: src/net/ea/specialhandler.cpp:200
 msgid "You need another blue gem!"
 msgstr "Вам нужен другой синий камень!"
 
-#: src/net/ea/specialhandler.cpp:206
+#: src/net/ea/specialhandler.cpp:203
 msgid "You're carrying to much to do this!"
 msgstr "Вы несёте слишком много, чтобы сделать это!"
 
-#: src/net/ea/specialhandler.cpp:209
+#: src/net/ea/specialhandler.cpp:206
 msgid "Huh? What's that?"
 msgstr "А? Что это?"
 
-#: src/net/ea/specialhandler.cpp:220
+#: src/net/ea/specialhandler.cpp:217
 msgid "Warp failed..."
 msgstr "Изменение не удалось..."
 
-#: src/net/ea/specialhandler.cpp:223
+#: src/net/ea/specialhandler.cpp:220
 msgid "Could not steal anything..."
 msgstr "Не удалось ничего украсть..."
 
-#: src/net/ea/specialhandler.cpp:226
+#: src/net/ea/specialhandler.cpp:223
 msgid "Poison had no effect..."
 msgstr "Яд не подействовал..."
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 9170e805f..0311dd212 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-09-17 16:12+0300\n"
-"PO-Revision-Date: 2011-09-16 20:12+0000\n"
+"POT-Creation-Date: 2011-09-27 22:18+0300\n"
+"PO-Revision-Date: 2011-09-27 19:20+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: Chinese (China) (http://www.transifex.net/projects/p/manaplus/"
 "team/zh_CN/)\n"
@@ -20,25 +20,25 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: src/actorspritemanager.cpp:1088
+#: src/actorspritemanager.cpp:1133
 msgid "Visible on map"
 msgstr "在地图上可见"
 
-#: src/being.cpp:548
+#: src/being.cpp:547
 msgid "dodge"
 msgstr "躲闪"
 
-#: src/being.cpp:548
+#: src/being.cpp:547
 msgid "miss"
 msgstr "小姐"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1527
+#: src/being.cpp:1526
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1532
+#: src/being.cpp:1531
 msgid "I"
 msgstr "I"
 
@@ -46,43 +46,43 @@ msgstr "I"
 msgid "Setup"
 msgstr "设置"
 
-#: src/client.cpp:841 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:842 src/gui/setup_perfomance.cpp:48
 msgid "Perfomance"
 msgstr "Perfomance"
 
-#: src/client.cpp:846 src/gui/setup_video.cpp:315
+#: src/client.cpp:847 src/gui/setup_video.cpp:315
 msgid "Video"
 msgstr "视频"
 
-#: src/client.cpp:851
+#: src/client.cpp:852
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:932
+#: src/client.cpp:934
 msgid "Connecting to server"
 msgstr "连接到服务器"
 
-#: src/client.cpp:963
+#: src/client.cpp:965
 msgid "Logging in"
 msgstr "登录"
 
-#: src/client.cpp:996
+#: src/client.cpp:998
 msgid "Entering game world"
 msgstr "进入游戏世界"
 
-#: src/client.cpp:1096
+#: src/client.cpp:1098
 msgid "Requesting characters"
 msgstr "请求字符"
 
-#: src/client.cpp:1127
+#: src/client.cpp:1129
 msgid "Connecting to the game server"
 msgstr "连接到游戏服务器"
 
-#: src/client.cpp:1137
+#: src/client.cpp:1139
 msgid "Changing game servers"
 msgstr "更改游戏服务器"
 
-#: src/client.cpp:1180 src/client.cpp:1187 src/client.cpp:1321
+#: src/client.cpp:1182 src/client.cpp:1189 src/client.cpp:1323
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:221 src/gui/charselectdialog.cpp:253
 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
@@ -92,50 +92,50 @@ msgstr "更改游戏服务器"
 msgid "Error"
 msgstr "错误"
 
-#: src/client.cpp:1196
+#: src/client.cpp:1198
 msgid "Requesting registration details"
 msgstr "申请登记的详细信息"
 
-#: src/client.cpp:1222
+#: src/client.cpp:1224
 msgid "Password Change"
 msgstr "密码更改"
 
-#: src/client.cpp:1223
+#: src/client.cpp:1225
 msgid "Password changed successfully!"
 msgstr "密码成功！"
 
-#: src/client.cpp:1242
+#: src/client.cpp:1244
 msgid "Email Change"
 msgstr "电子邮件变更"
 
-#: src/client.cpp:1243
+#: src/client.cpp:1245
 msgid "Email changed successfully!"
 msgstr "电子邮件已变更成功！"
 
-#: src/client.cpp:1263
+#: src/client.cpp:1265
 msgid "Unregister Successful"
 msgstr "注销成功"
 
-#: src/client.cpp:1264
+#: src/client.cpp:1266
 msgid "Farewell, come back any time..."
 msgstr "永别了，任何时候回来... ..."
 
-#: src/client.cpp:1463 src/client.cpp:1493 src/client.cpp:1508
-#: src/client.cpp:1933 src/client.cpp:1940
+#: src/client.cpp:1465 src/client.cpp:1495 src/client.cpp:1510
+#: src/client.cpp:1935 src/client.cpp:1942
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1639
+#: src/client.cpp:1641
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1673 src/client.cpp:1679
+#: src/client.cpp:1675 src/client.cpp:1681
 msgid "Error creating updates directory!"
 msgstr "创建更新目录错误！"
 
-#: src/client.cpp:1700
+#: src/client.cpp:1702
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -336,11 +336,11 @@ msgstr "忽略新进的交易请求"
 msgid "Accepting incoming trade requests"
 msgstr "接受传入的交易请求"
 
-#: src/game.cpp:1729
+#: src/game.cpp:1727
 msgid "Could Not Load Map"
 msgstr "不能加载地图"
 
-#: src/game.cpp:1730
+#: src/game.cpp:1728
 #, c-format
 msgid "Error while loading %s"
 msgstr "加载%s时出现错误"
@@ -375,7 +375,7 @@ msgstr "姓名"
 
 #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:133
 #: src/gui/popupmenu.cpp:283 src/gui/popupmenu.cpp:596
-#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:265
+#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:265
 msgid "Attack"
 msgstr "攻击"
 
@@ -429,7 +429,7 @@ msgstr "-"
 #: src/gui/buydialog.cpp:99 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:294
-#: src/keyboardconfig.cpp:290
+#: src/keyboardconfig.cpp:82
 msgid "Quit"
 msgstr "退出"
 
@@ -464,7 +464,7 @@ msgstr "出售"
 #: src/gui/popupmenu.cpp:1858 src/gui/popupmenu.cpp:1897
 #: src/gui/popupmenu.cpp:1949 src/gui/popupmenu.cpp:1969
 #: src/gui/quitdialog.cpp:55 src/gui/register.cpp:82 src/gui/setup.cpp:72
-#: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:238
+#: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:241
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
 #: src/gui/updaterwindow.cpp:161
 msgid "Cancel"
@@ -633,8 +633,8 @@ msgid "Enter password:"
 msgstr "输入密码："
 
 #: src/gui/charselectdialog.cpp:410 src/gui/serverdialog.cpp:298
-#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:122
-#: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:241
+#: src/gui/setup_relations.cpp:242 src/gui/shopwindow.cpp:122
+#: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244
 msgid "Delete"
 msgstr "删除"
 
@@ -886,7 +886,7 @@ msgid "Did You Know?"
 msgstr "你知道吗？"
 
 #: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
-#: src/gui/inventorywindow.cpp:206 src/gui/npcdialog.cpp:53
+#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:53
 #: src/gui/popupmenu.cpp:556 src/gui/shopwindow.cpp:113
 msgid "Close"
 msgstr "关闭"
@@ -913,7 +913,7 @@ msgid "Equipment"
 msgstr "装备"
 
 #: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160
-#: src/gui/inventorywindow.cpp:539 src/gui/inventorywindow.cpp:548
+#: src/gui/inventorywindow.cpp:538 src/gui/inventorywindow.cpp:547
 #: src/gui/popupmenu.cpp:1656 src/gui/popupmenu.cpp:1748
 #: src/gui/popupmenu.cpp:1793
 msgid "Unequip"
@@ -943,37 +943,33 @@ msgstr ""
 msgid "by type"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:111 src/gui/windowmenu.cpp:76
+#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:76
 #: src/inventory.cpp:249
 msgid "Inventory"
 msgstr "物品栏"
 
-#: src/gui/inventorywindow.cpp:136
+#: src/gui/inventorywindow.cpp:137
 msgid "Slots:"
 msgstr "槽："
 
-#: src/gui/inventorywindow.cpp:148
+#: src/gui/inventorywindow.cpp:149
 msgid "Filter:"
 msgstr "过滤器："
 
-#: src/gui/inventorywindow.cpp:149
-msgid "Sort:"
-msgstr "排序："
-
-#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:541
-#: src/gui/inventorywindow.cpp:550 src/gui/popupmenu.cpp:1658
+#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:540
+#: src/gui/inventorywindow.cpp:549 src/gui/popupmenu.cpp:1658
 #: src/gui/popupmenu.cpp:1750 src/gui/popupmenu.cpp:1795
 msgid "Equip"
 msgstr "装备"
 
-#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:542
-#: src/gui/inventorywindow.cpp:546 src/gui/popupmenu.cpp:1662
+#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:541
+#: src/gui/inventorywindow.cpp:545 src/gui/popupmenu.cpp:1662
 #: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1754
 #: src/gui/popupmenu.cpp:1799
 msgid "Use"
 msgstr "使用"
 
-#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:646
+#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:645
 #: src/gui/popupmenu.cpp:1667 src/gui/popupmenu.cpp:1759
 #: src/gui/popupmenu.cpp:1804
 msgid "Drop..."
@@ -993,17 +989,17 @@ msgstr "装具"
 msgid "Weight:"
 msgstr "重量："
 
-#: src/gui/inventorywindow.cpp:204 src/gui/inventorywindow.cpp:637
+#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:636
 #: src/gui/popupmenu.cpp:1642 src/gui/popupmenu.cpp:1771
 #: src/gui/popupmenu.cpp:1816 src/gui/setup.cpp:73
 msgid "Store"
 msgstr "存储"
 
-#: src/gui/inventorywindow.cpp:205 src/gui/popupmenu.cpp:1683
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1683
 msgid "Retrieve"
 msgstr "取回"
 
-#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1672
+#: src/gui/inventorywindow.cpp:647 src/gui/popupmenu.cpp:1672
 #: src/gui/popupmenu.cpp:1764 src/gui/popupmenu.cpp:1809
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
@@ -2192,30 +2188,34 @@ msgid "Show own name"
 msgstr "显示自己的名字"
 
 #: src/gui/setup_players.cpp:63
+msgid "Enable extended mouse targeting"
+msgstr ""
+
+#: src/gui/setup_players.cpp:66
 msgid "Target dead players"
 msgstr "目标死球员"
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_players.cpp:69
 msgid "Visible names"
 msgstr "可见姓名"
 
-#: src/gui/setup_players.cpp:69
+#: src/gui/setup_players.cpp:72
 msgid "Secure trades"
 msgstr ""
 
-#: src/gui/setup_players.cpp:72
+#: src/gui/setup_players.cpp:75
 msgid "Unsecure chars in names"
 msgstr ""
 
-#: src/gui/setup_players.cpp:75
+#: src/gui/setup_players.cpp:78
 msgid "Show statuses"
 msgstr "显示状态"
 
-#: src/gui/setup_players.cpp:78
+#: src/gui/setup_players.cpp:81
 msgid "Show ip addresses on screenshots"
 msgstr ""
 
-#: src/gui/setup_players.cpp:81
+#: src/gui/setup_players.cpp:84
 msgid "Allow self heal with mouse click"
 msgstr ""
 
@@ -2243,23 +2243,23 @@ msgstr "忽略"
 msgid "Erased"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:239
+#: src/gui/setup_relations.cpp:238
 msgid "Allow trading"
 msgstr "允许交易"
 
-#: src/gui/setup_relations.cpp:241
+#: src/gui/setup_relations.cpp:240
 msgid "Allow whispers"
 msgstr "允许密语"
 
-#: src/gui/setup_relations.cpp:244
+#: src/gui/setup_relations.cpp:243
 msgid "Old"
 msgstr "旧"
 
-#: src/gui/setup_relations.cpp:246
+#: src/gui/setup_relations.cpp:245
 msgid "Relations"
 msgstr "关系"
 
-#: src/gui/setup_relations.cpp:271
+#: src/gui/setup_relations.cpp:270
 msgid "When ignoring:"
 msgstr "当忽略时："
 
@@ -3226,30 +3226,34 @@ msgid "Command:"
 msgstr "命令："
 
 #: src/gui/textcommandeditor.cpp:200
+msgid "Comment:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:203
 msgid "Mana:"
 msgstr "法力："
 
-#: src/gui/textcommandeditor.cpp:206
+#: src/gui/textcommandeditor.cpp:209
 msgid "Target Type:"
 msgstr "目标类型："
 
-#: src/gui/textcommandeditor.cpp:212
+#: src/gui/textcommandeditor.cpp:215
 msgid "Icon:"
 msgstr "图示："
 
-#: src/gui/textcommandeditor.cpp:218
+#: src/gui/textcommandeditor.cpp:221
 msgid "Magic level:"
 msgstr "魔法等级："
 
-#: src/gui/textcommandeditor.cpp:224
+#: src/gui/textcommandeditor.cpp:227
 msgid "Magic School:"
 msgstr "魔法学院："
 
-#: src/gui/textcommandeditor.cpp:230
+#: src/gui/textcommandeditor.cpp:233
 msgid "School level:"
 msgstr "学校层次："
 
-#: src/gui/textcommandeditor.cpp:235
+#: src/gui/textcommandeditor.cpp:238
 msgid "Save"
 msgstr "保存"
 
@@ -3477,23 +3481,23 @@ msgstr "家居广场边界"
 msgid "Road Point"
 msgstr "路点"
 
-#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:474
+#: src/gui/whoisonline.cpp:85 src/gui/whoisonline.cpp:478
 msgid "Who Is Online - Updating"
 msgstr "谁在线 - 更新"
 
-#: src/gui/whoisonline.cpp:104
+#: src/gui/whoisonline.cpp:108
 msgid "Update"
 msgstr "更新"
 
-#: src/gui/whoisonline.cpp:297
+#: src/gui/whoisonline.cpp:301
 msgid "Who Is Online - "
 msgstr "谁在线 -"
 
-#: src/gui/whoisonline.cpp:488
+#: src/gui/whoisonline.cpp:492
 msgid "Who Is Online - error"
 msgstr "谁在线 - 错误"
 
-#: src/gui/whoisonline.cpp:519
+#: src/gui/whoisonline.cpp:523
 msgid "Who Is Online - Update"
 msgstr "谁在线 - 更新"
 
@@ -3773,49 +3777,49 @@ msgid "Cart"
 msgstr ""
 
 #: src/keyboardconfig.cpp:43
+msgid "Basic Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:44
 msgid "Move Up"
 msgstr "向上移动"
 
-#: src/keyboardconfig.cpp:44
+#: src/keyboardconfig.cpp:45
 msgid "Move Down"
 msgstr "向下移动"
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:46
 msgid "Move Left"
 msgstr "向左移动"
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:47
 msgid "Move Right"
 msgstr "向右移动"
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:50
 msgid "Target & Attack"
 msgstr "对准并攻击"
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:52
 msgid "Move to Target"
 msgstr "移动到目标"
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:54
 msgid "Change Move to Target type"
 msgstr "更改移动到目标类型"
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:56
 msgid "Move to Home location"
 msgstr "移动到首页位置"
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:58
 msgid "Set home location"
 msgstr "设为首页位置"
 
-#: src/keyboardconfig.cpp:59
+#: src/keyboardconfig.cpp:60
 msgid "Move to navigation point"
 msgstr "移动导航点"
 
-#: src/keyboardconfig.cpp:61
-msgid "Smilie"
-msgstr "笑脸"
-
 #: src/keyboardconfig.cpp:63
 msgid "Stop Attack"
 msgstr "停止攻击"
@@ -3861,367 +3865,395 @@ msgid "Change Map View Mode"
 msgstr "更改地图浏览模式"
 
 #: src/keyboardconfig.cpp:80
+msgid "Select OK"
+msgstr "选择OK"
+
+#: src/keyboardconfig.cpp:83
+msgid "Shortcuts Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:84
 msgid "Item Shortcuts Key"
 msgstr "项目的快捷方式键"
 
-#: src/keyboardconfig.cpp:82 src/keyboardconfig.cpp:84
 #: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:88
 #: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:92
 #: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:96
 #: src/keyboardconfig.cpp:98 src/keyboardconfig.cpp:100
 #: src/keyboardconfig.cpp:102 src/keyboardconfig.cpp:104
 #: src/keyboardconfig.cpp:106 src/keyboardconfig.cpp:108
-#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:113
-#: src/keyboardconfig.cpp:115 src/keyboardconfig.cpp:117
+#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:112
+#: src/keyboardconfig.cpp:114 src/keyboardconfig.cpp:117
 #: src/keyboardconfig.cpp:119 src/keyboardconfig.cpp:121
-#: src/keyboardconfig.cpp:360
+#: src/keyboardconfig.cpp:123 src/keyboardconfig.cpp:125
+#: src/keyboardconfig.cpp:367
 #, c-format
 msgid "Item Shortcut %d"
 msgstr "物品快捷 %d"
 
-#: src/keyboardconfig.cpp:122
+#: src/keyboardconfig.cpp:126
+msgid "Windows Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:127
 msgid "Help Window"
 msgstr "帮助窗口"
 
-#: src/keyboardconfig.cpp:124
+#: src/keyboardconfig.cpp:129
 msgid "Status Window"
 msgstr "状态窗口"
 
-#: src/keyboardconfig.cpp:126
+#: src/keyboardconfig.cpp:131
 msgid "Inventory Window"
 msgstr "物品栏窗口"
 
-#: src/keyboardconfig.cpp:128
+#: src/keyboardconfig.cpp:133
 msgid "Equipment Window"
 msgstr "装备窗口"
 
-#: src/keyboardconfig.cpp:130
+#: src/keyboardconfig.cpp:135
 msgid "Skill Window"
 msgstr "技能窗口"
 
-#: src/keyboardconfig.cpp:132
+#: src/keyboardconfig.cpp:137
 msgid "Minimap Window"
 msgstr "小地图窗口"
 
-#: src/keyboardconfig.cpp:134
+#: src/keyboardconfig.cpp:139
 msgid "Chat Window"
 msgstr "聊天窗口"
 
-#: src/keyboardconfig.cpp:136
+#: src/keyboardconfig.cpp:141
 msgid "Item Shortcut Window"
 msgstr "物品快捷窗口"
 
-#: src/keyboardconfig.cpp:138
+#: src/keyboardconfig.cpp:143
 msgid "Setup Window"
 msgstr "设置窗口"
 
-#: src/keyboardconfig.cpp:140
+#: src/keyboardconfig.cpp:145
 msgid "Debug Window"
 msgstr "Debug窗口"
 
-#: src/keyboardconfig.cpp:142
+#: src/keyboardconfig.cpp:147
 msgid "Social Window"
 msgstr "社会窗口"
 
-#: src/keyboardconfig.cpp:144
+#: src/keyboardconfig.cpp:149
 msgid "Emote Shortcut Window"
 msgstr "表情快捷窗口"
 
-#: src/keyboardconfig.cpp:146
+#: src/keyboardconfig.cpp:151
 msgid "Outfits Window"
 msgstr "装具窗口"
 
-#: src/keyboardconfig.cpp:148
+#: src/keyboardconfig.cpp:153
 msgid "Shop Window"
 msgstr "橱窗"
 
-#: src/keyboardconfig.cpp:150
+#: src/keyboardconfig.cpp:155
 msgid "Quick drop Window"
 msgstr "快速下拉窗口"
 
-#: src/keyboardconfig.cpp:152
+#: src/keyboardconfig.cpp:157
 msgid "Kill Stats Window"
 msgstr "杀敌统计窗口"
 
-#: src/keyboardconfig.cpp:154
+#: src/keyboardconfig.cpp:159
 msgid "Commands Window"
 msgstr "命令的窗口"
 
-#: src/keyboardconfig.cpp:156
+#: src/keyboardconfig.cpp:161
 msgid "Bot Checker Window"
 msgstr "BOT检查窗口"
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboardconfig.cpp:164
 msgid "Who Is Online Window"
 msgstr "谁是在线窗口"
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboardconfig.cpp:166
 msgid "Did you know Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:164
+#: src/keyboardconfig.cpp:169
 msgid "Previous Social Tab"
 msgstr "上一页社会标签"
 
-#: src/keyboardconfig.cpp:166
+#: src/keyboardconfig.cpp:171
 msgid "Next Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:168 src/keyboardconfig.cpp:170
-#: src/keyboardconfig.cpp:172 src/keyboardconfig.cpp:174
-#: src/keyboardconfig.cpp:176 src/keyboardconfig.cpp:178
-#: src/keyboardconfig.cpp:180 src/keyboardconfig.cpp:182
-#: src/keyboardconfig.cpp:184 src/keyboardconfig.cpp:186
-#: src/keyboardconfig.cpp:188 src/keyboardconfig.cpp:190
-#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
-#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
-#: src/keyboardconfig.cpp:201 src/keyboardconfig.cpp:203
-#: src/keyboardconfig.cpp:205 src/keyboardconfig.cpp:207
-#: src/keyboardconfig.cpp:209 src/keyboardconfig.cpp:211
-#: src/keyboardconfig.cpp:213 src/keyboardconfig.cpp:215
-#: src/keyboardconfig.cpp:217 src/keyboardconfig.cpp:220
-#: src/keyboardconfig.cpp:223 src/keyboardconfig.cpp:226
-#: src/keyboardconfig.cpp:228 src/keyboardconfig.cpp:230
-#: src/keyboardconfig.cpp:232 src/keyboardconfig.cpp:234
-#: src/keyboardconfig.cpp:236 src/keyboardconfig.cpp:238
-#: src/keyboardconfig.cpp:240 src/keyboardconfig.cpp:242
-#: src/keyboardconfig.cpp:244 src/keyboardconfig.cpp:247
-#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
-#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
-#: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:259
-#: src/keyboardconfig.cpp:355
+#: src/keyboardconfig.cpp:173
+msgid "Emotes Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:174
+msgid "Smilie"
+msgstr "笑脸"
+
+#: src/keyboardconfig.cpp:175 src/keyboardconfig.cpp:177
+#: src/keyboardconfig.cpp:179 src/keyboardconfig.cpp:181
+#: src/keyboardconfig.cpp:183 src/keyboardconfig.cpp:185
+#: src/keyboardconfig.cpp:187 src/keyboardconfig.cpp:189
+#: src/keyboardconfig.cpp:191 src/keyboardconfig.cpp:193
+#: src/keyboardconfig.cpp:195 src/keyboardconfig.cpp:197
+#: src/keyboardconfig.cpp:200 src/keyboardconfig.cpp:202
+#: src/keyboardconfig.cpp:204 src/keyboardconfig.cpp:206
+#: src/keyboardconfig.cpp:208 src/keyboardconfig.cpp:210
+#: src/keyboardconfig.cpp:212 src/keyboardconfig.cpp:214
+#: src/keyboardconfig.cpp:216 src/keyboardconfig.cpp:218
+#: src/keyboardconfig.cpp:220 src/keyboardconfig.cpp:222
+#: src/keyboardconfig.cpp:224 src/keyboardconfig.cpp:227
+#: src/keyboardconfig.cpp:230 src/keyboardconfig.cpp:233
+#: src/keyboardconfig.cpp:235 src/keyboardconfig.cpp:237
+#: src/keyboardconfig.cpp:239 src/keyboardconfig.cpp:241
+#: src/keyboardconfig.cpp:243 src/keyboardconfig.cpp:245
+#: src/keyboardconfig.cpp:247 src/keyboardconfig.cpp:249
+#: src/keyboardconfig.cpp:251 src/keyboardconfig.cpp:254
+#: src/keyboardconfig.cpp:256 src/keyboardconfig.cpp:258
+#: src/keyboardconfig.cpp:260 src/keyboardconfig.cpp:262
+#: src/keyboardconfig.cpp:264 src/keyboardconfig.cpp:266
+#: src/keyboardconfig.cpp:362
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "表情快捷键为 %d"
 
-#: src/keyboardconfig.cpp:261
+#: src/keyboardconfig.cpp:268
+msgid "Outfits Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:269
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:263
+#: src/keyboardconfig.cpp:271
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:265
+#: src/keyboardconfig.cpp:273
 msgid "Copy equipped to Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:267
+#: src/keyboardconfig.cpp:275
+msgid "Chat Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:276
 msgid "Toggle Chat"
 msgstr "切换聊天"
 
-#: src/keyboardconfig.cpp:269
+#: src/keyboardconfig.cpp:278
 msgid "Scroll Chat Up"
 msgstr "向上滚动聊天记录"
 
-#: src/keyboardconfig.cpp:271
+#: src/keyboardconfig.cpp:280
 msgid "Scroll Chat Down"
 msgstr "向下滚动聊天记录"
 
-#: src/keyboardconfig.cpp:273
+#: src/keyboardconfig.cpp:282
 msgid "Previous Chat Tab"
 msgstr "上一个聊天窗口标签页"
 
-#: src/keyboardconfig.cpp:275
+#: src/keyboardconfig.cpp:284
 msgid "Next Chat Tab"
 msgstr "下一个聊天窗口标签页"
 
-#: src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:287
 msgid "Close current Chat Tab"
 msgstr "关闭当前聊天标签"
 
-#: src/keyboardconfig.cpp:280
+#: src/keyboardconfig.cpp:289
 msgid "Previous chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:282
+#: src/keyboardconfig.cpp:291
 msgid "Next chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:284
+#: src/keyboardconfig.cpp:293
 msgid "Chat Auto Complete"
 msgstr "自动完成交谈"
 
-#: src/keyboardconfig.cpp:286
+#: src/keyboardconfig.cpp:295
 msgid "Deactivate Chat Input"
 msgstr "停用聊天输入"
 
-#: src/keyboardconfig.cpp:288
-msgid "Select OK"
-msgstr "选择OK"
+#: src/keyboardconfig.cpp:297
+msgid "Other Keys"
+msgstr ""
 
-#: src/keyboardconfig.cpp:291
+#: src/keyboardconfig.cpp:298
 msgid "Ignore input 1"
 msgstr "忽略输入1"
 
-#: src/keyboardconfig.cpp:293
+#: src/keyboardconfig.cpp:300
 msgid "Ignore input 2"
 msgstr "忽略输入2"
 
-#: src/keyboardconfig.cpp:295
+#: src/keyboardconfig.cpp:302
 msgid "Direct Up"
 msgstr "直接向上"
 
-#: src/keyboardconfig.cpp:296
+#: src/keyboardconfig.cpp:303
 msgid "Direct Down"
 msgstr "直接下"
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboardconfig.cpp:305
 msgid "Direct Left"
 msgstr "直接离开"
 
-#: src/keyboardconfig.cpp:299
+#: src/keyboardconfig.cpp:306
 msgid "Direct Right"
 msgstr "直接对"
 
-#: src/keyboardconfig.cpp:301
+#: src/keyboardconfig.cpp:308
 msgid "Crazy moves"
 msgstr ""
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboardconfig.cpp:310
 msgid "Change Crazy Move mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboardconfig.cpp:312
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboardconfig.cpp:314
 msgid "Quick Drop N Items"
 msgstr "快速下降序号项目"
 
-#: src/keyboardconfig.cpp:309
+#: src/keyboardconfig.cpp:316
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/keyboardconfig.cpp:311
+#: src/keyboardconfig.cpp:318
 msgid "Quick heal target or self"
 msgstr "快速愈合的目标或自我"
 
-#: src/keyboardconfig.cpp:313
+#: src/keyboardconfig.cpp:320
 msgid "Use #itenplz spell"
 msgstr ""
 
-#: src/keyboardconfig.cpp:315
+#: src/keyboardconfig.cpp:322
 msgid "Use magic attack"
 msgstr "使用魔法攻击"
 
-#: src/keyboardconfig.cpp:317
+#: src/keyboardconfig.cpp:324
 msgid "Switch magic attack"
 msgstr "切换魔法攻击"
 
-#: src/keyboardconfig.cpp:319
+#: src/keyboardconfig.cpp:326
 msgid "Change move type"
 msgstr "更改移动类型"
 
-#: src/keyboardconfig.cpp:321
+#: src/keyboardconfig.cpp:328
 msgid "Change Attack Weapon Type"
 msgstr "更改攻击型武器"
 
-#: src/keyboardconfig.cpp:323
+#: src/keyboardconfig.cpp:330
 msgid "Change Attack Type"
 msgstr "更改攻击类型"
 
-#: src/keyboardconfig.cpp:325
+#: src/keyboardconfig.cpp:332
 msgid "Change Follow mode"
 msgstr "更改跟随模式"
 
-#: src/keyboardconfig.cpp:327
+#: src/keyboardconfig.cpp:334
 msgid "Change Imitation mode"
 msgstr "更改仿模式"
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboardconfig.cpp:337
 msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:331
+#: src/keyboardconfig.cpp:338
 msgid "On / Off audio"
 msgstr "开/关 音频"
 
-#: src/keyboardconfig.cpp:333
+#: src/keyboardconfig.cpp:340
 msgid "Enable / Disable away mode"
 msgstr "启用/禁用离开模式"
 
-#: src/keyboardconfig.cpp:335
+#: src/keyboardconfig.cpp:342
 msgid "Emulate right click from keyboard"
 msgstr "从键盘模拟右键单击"
 
-#: src/keyboardconfig.cpp:337
+#: src/keyboardconfig.cpp:344
 msgid "Toggle camera mode"
 msgstr "切换模式"
 
-#: src/keyboardconfig.cpp:339
+#: src/keyboardconfig.cpp:346
 msgid "Modifier key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:411
+#: src/keyboardconfig.cpp:425
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:377
+#: src/localplayer.cpp:380
 msgid "You were killed by "
 msgstr "你被打死"
 
-#: src/localplayer.cpp:1416
+#: src/localplayer.cpp:1422
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1418
+#: src/localplayer.cpp:1424
 msgid "Item is too heavy."
 msgstr "项目是太重了。"
 
-#: src/localplayer.cpp:1420
+#: src/localplayer.cpp:1426
 msgid "Item is too far away."
 msgstr "物品太远了。"
 
-#: src/localplayer.cpp:1422
+#: src/localplayer.cpp:1428
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1424
+#: src/localplayer.cpp:1430
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1427
+#: src/localplayer.cpp:1433
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1430
+#: src/localplayer.cpp:1436
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1454
+#: src/localplayer.cpp:1460
 #, 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:3168
+#: src/localplayer.cpp:3174
 msgid "Away"
 msgstr "距离"
 
-#: src/localplayer.cpp:3468
+#: src/localplayer.cpp:3494
 msgid "Follow: "
 msgstr "跟随:"
 
-#: src/localplayer.cpp:3470 src/localplayer.cpp:3485
+#: src/localplayer.cpp:3496 src/localplayer.cpp:3511
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3477
+#: src/localplayer.cpp:3503
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3479 src/localplayer.cpp:3487
+#: src/localplayer.cpp:3505 src/localplayer.cpp:3513
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3832
+#: src/localplayer.cpp:3858
 msgid "You see "
 msgstr "你看"
 
@@ -4606,15 +4638,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:286
+#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:284
 msgid "Item sharing enabled."
 msgstr "物品共享开启。"
 
-#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:296
+#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:294
 msgid "Item sharing disabled."
 msgstr "物品共享关闭。"
 
-#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:306
+#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:304
 msgid "Item sharing not possible."
 msgstr "物品共享不可能。"
 
@@ -4622,15 +4654,15 @@ msgstr "物品共享不可能。"
 msgid "Item sharing unknown."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:248
+#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:246
 msgid "Experience sharing enabled."
 msgstr "经验共享开启。"
 
-#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:258
+#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:256
 msgid "Experience sharing disabled."
 msgstr "经验共享关闭。"
 
-#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:268
+#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:266
 msgid "Experience sharing not possible."
 msgstr "经验共享不可能。"
 
@@ -4711,54 +4743,54 @@ msgstr ""
 msgid "Username permanently erased."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:82
+#: src/net/ea/partyhandler.cpp:80
 msgid "Could not create party."
 msgstr "无法创建帮会。"
 
-#: src/net/ea/partyhandler.cpp:84
+#: src/net/ea/partyhandler.cpp:82
 msgid "Party successfully created."
 msgstr "帮会创建成功。"
 
-#: src/net/ea/partyhandler.cpp:140
+#: src/net/ea/partyhandler.cpp:138
 #, c-format
 msgid "%s has joined your party."
 msgstr "%s已经加入你的党。"
 
-#: src/net/ea/partyhandler.cpp:176
+#: src/net/ea/partyhandler.cpp:174
 #, c-format
 msgid "%s is already a member of a party."
 msgstr "%s已经是你的帮会成员了。"
 
-#: src/net/ea/partyhandler.cpp:181
+#: src/net/ea/partyhandler.cpp:179
 #, c-format
 msgid "%s refused your invitation."
 msgstr "%s拒绝了您的邀请。"
 
-#: src/net/ea/partyhandler.cpp:186
+#: src/net/ea/partyhandler.cpp:184
 #, c-format
 msgid "%s is now a member of your party."
 msgstr "%s现在是你帮会中的成员了。"
 
-#: src/net/ea/partyhandler.cpp:191
+#: src/net/ea/partyhandler.cpp:189
 #, c-format
 msgid "%s can't join your party because party is full."
 msgstr "%s不能加入团队，因为团队成员已满。"
 
-#: src/net/ea/partyhandler.cpp:196
+#: src/net/ea/partyhandler.cpp:194
 #, c-format
 msgid "QQQ Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:356
+#: src/net/ea/partyhandler.cpp:354
 msgid "You have left the party."
 msgstr "你以退出帮会"
 
-#: src/net/ea/partyhandler.cpp:369
+#: src/net/ea/partyhandler.cpp:367
 #, c-format
 msgid "%s has left your party."
 msgstr "%s已经离开你的帮会。"
 
-#: src/net/ea/partyhandler.cpp:448
+#: src/net/ea/partyhandler.cpp:446
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr "一未知成员尝试说：%s"
@@ -4912,83 +4944,83 @@ msgstr "不能提升技能!"
 msgid "Equip arrows first."
 msgstr "请先装备弓箭。"
 
-#: src/net/ea/specialhandler.cpp:149
+#: src/net/ea/specialhandler.cpp:146
 msgid "Trade failed!"
 msgstr "交易失败！"
 
-#: src/net/ea/specialhandler.cpp:152
+#: src/net/ea/specialhandler.cpp:149
 msgid "Emote failed!"
 msgstr "发送表情失败！"
 
-#: src/net/ea/specialhandler.cpp:155
+#: src/net/ea/specialhandler.cpp:152
 msgid "Sit failed!"
 msgstr "原地休息失败！"
 
-#: src/net/ea/specialhandler.cpp:158
+#: src/net/ea/specialhandler.cpp:155
 msgid "Chat creating failed!"
 msgstr "聊天创建失败！"
 
-#: src/net/ea/specialhandler.cpp:161
+#: src/net/ea/specialhandler.cpp:158
 msgid "Could not join party!"
 msgstr "不能加入工会！"
 
-#: src/net/ea/specialhandler.cpp:164
+#: src/net/ea/specialhandler.cpp:161
 msgid "Cannot shout!"
 msgstr "无法呼喊！"
 
-#: src/net/ea/specialhandler.cpp:177
+#: src/net/ea/specialhandler.cpp:174
 msgid "You have not yet reached a high enough lvl!"
 msgstr "你还没有达到足够的等级！"
 
-#: src/net/ea/specialhandler.cpp:181
+#: src/net/ea/specialhandler.cpp:178
 msgid "Insufficient HP!"
 msgstr "HP不足！"
 
-#: src/net/ea/specialhandler.cpp:184
+#: src/net/ea/specialhandler.cpp:181
 msgid "Insufficient SP!"
 msgstr "SP不足！"
 
-#: src/net/ea/specialhandler.cpp:187
+#: src/net/ea/specialhandler.cpp:184
 msgid "You have no memos!"
 msgstr "没有备忘录"
 
-#: src/net/ea/specialhandler.cpp:190
+#: src/net/ea/specialhandler.cpp:187
 msgid "You cannot do that right now!"
 msgstr "你无法办到！"
 
-#: src/net/ea/specialhandler.cpp:193
+#: src/net/ea/specialhandler.cpp:190
 msgid "Seems you need more money... ;-)"
 msgstr "看起来需要更多金币…… ;-)"
 
-#: src/net/ea/specialhandler.cpp:196
+#: src/net/ea/specialhandler.cpp:193
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "此武器无法用来使用此项技能！"
 
-#: src/net/ea/specialhandler.cpp:200
+#: src/net/ea/specialhandler.cpp:197
 msgid "You need another red gem!"
 msgstr "你需要另一颗红宝石！"
 
-#: src/net/ea/specialhandler.cpp:203
+#: src/net/ea/specialhandler.cpp:200
 msgid "You need another blue gem!"
 msgstr "你需要另一颗蓝宝石！"
 
-#: src/net/ea/specialhandler.cpp:206
+#: src/net/ea/specialhandler.cpp:203
 msgid "You're carrying to much to do this!"
 msgstr "你已负重太多，无法办到！"
 
-#: src/net/ea/specialhandler.cpp:209
+#: src/net/ea/specialhandler.cpp:206
 msgid "Huh? What's that?"
 msgstr "啊？那是什么？"
 
-#: src/net/ea/specialhandler.cpp:220
+#: src/net/ea/specialhandler.cpp:217
 msgid "Warp failed..."
 msgstr "传送失败..."
 
-#: src/net/ea/specialhandler.cpp:223
+#: src/net/ea/specialhandler.cpp:220
 msgid "Could not steal anything..."
 msgstr "无法偷取任何物品..."
 
-#: src/net/ea/specialhandler.cpp:226
+#: src/net/ea/specialhandler.cpp:223
 msgid "Poison had no effect..."
 msgstr "毒药无效..."
 
-- 
cgit v1.2.3-60-g2f50


From 0212baff3e8257e3183327c64e247dc390ebb5c2 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Tue, 27 Sep 2011 23:09:43 +0300
Subject: Update authors list.

---
 AUTHORS               | 18 +++++++++---------
 data/help/es/team.txt | 18 +++++++++---------
 data/help/fr/team.txt | 18 +++++++++---------
 data/help/ru/team.txt | 17 +++++++++--------
 data/help/team.txt    | 18 +++++++++---------
 5 files changed, 45 insertions(+), 44 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 2bdfbd6e5..b352bffb2 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -10,15 +10,15 @@ Maarten Vanraes (AL13N) <maarten.vanraes gmail com>
 Mihail Barer (Necromonger) <>
 
 == Translators ==
-Aline Ferraz de Souza (Freya) <freya.df gmail com>        (pt, pt_BR)
-Andrei Karas (4144) <akaras inbox ru>                     (ru)
-Bernard Hugonnet (Nard) <>                                (fr)
-Maarten Vanraes (AL13N) <maarten.vanraes gmail com>       (nl_BE)
-Mihail Barer (Necromonger) <>                             (ru)
-Sini Ruohomaa (Byakushin) <sini.ruohomaa iki fi>          (fi)
-Yohann Ferreira (Bertram) <bertram cegetel net>           (fr)
-Antoine Ruck (Jumpy) <antoinebcn hotmail com>             (fr,es)
-Nelson Martell (nelson6e65) <nelson6eeduardo65 gmail com> (es)
+Aline Ferraz de Souza (Freya) <freya.df gmail com>         (pt, pt_BR)
+Andrei Karas (4144) <akaras inbox ru>                      (ru)
+Bernard Hugonnet (Nard) <>                                 (fr)
+Maarten Vanraes (AL13N) <maarten.vanraes gmail com>        (nl_BE)
+Mihail Barer (Necromonger) <>                              (ru)
+Sini Ruohomaa (Byakushin) <sini.ruohomaa iki fi>           (fi)
+Yohann Ferreira (Bertram) <bertram cegetel net>            (fr)
+Antoine Ruck (Jumpy) <antoinebcn hotmail com>              (fr,es)
+Nelson Martell (nelson6e65) <nelson6e65-manaplus yahoo es> (es)
 alastrim
 GonzoDark
 
diff --git a/data/help/es/team.txt b/data/help/es/team.txt
index bb43341ee..df8ad2610 100644
--- a/data/help/es/team.txt
+++ b/data/help/es/team.txt
@@ -13,15 +13,15 @@
 ##9Mihail Barer (Necromonger) <>
  
 ##3== Traductores ==
-##9Aline Ferraz de Souza (Freya) <freya.df gmail com>        (pt, pt_BR)
-##9Andrei Karas (4144) <akaras inbox ru>                     (ru)
-##9Bernard Hugonnet (Nard) <>                                (fr)
-##9Maarten Vanraes (AL13N) <maarten.vanraes gmail com>       (nl_BE)
-##9Mihail Barer (Necromonger) <>                             (ru)
-##9Sini Ruohomaa (Byakushin) <sini.ruohomaa iki fi>          (fi)
-##9Yohann Ferreira (Bertram) <bertram cegetel net>           (fr)
-##9Antoine Ruck (Jumpy) <antoinebcn hotmail com>             (fr,es)
-##9Nelson Martell (nelson6e65) <nelson6eeduardo65 gmail com> (es)
+##9Aline Ferraz de Souza (Freya) <freya.df gmail com>         (pt, pt_BR)
+##9Andrei Karas (4144) <akaras inbox ru>                      (ru)
+##9Bernard Hugonnet (Nard) <>                                 (fr)
+##9Maarten Vanraes (AL13N) <maarten.vanraes gmail com>        (nl_BE)
+##9Mihail Barer (Necromonger) <>                              (ru)
+##9Sini Ruohomaa (Byakushin) <sini.ruohomaa iki fi>           (fi)
+##9Yohann Ferreira (Bertram) <bertram cegetel net>            (fr)
+##9Antoine Ruck (Jumpy) <antoinebcn hotmail com>              (fr,es)
+##9Nelson Martell (nelson6e65) <nelson6e65-manaplus yahoo es> (es)
 ##9alastrim
 ##9GonzoDark
  
diff --git a/data/help/fr/team.txt b/data/help/fr/team.txt
index 6222f48bb..fa307a2c1 100644
--- a/data/help/fr/team.txt
+++ b/data/help/fr/team.txt
@@ -13,15 +13,15 @@
 ##9Mihail Barer (Necromonger) <>
  
 ##3== traducteurs ==
-##9Aline Ferraz de Souza (Freya) <freya.df gmail com>        (pt, pt_BR)
-##9Andrei Karas (4144) <akaras inbox ru>                     (ru)
-##9Bernard Hugonnet (Nard) <>                                (fr)
-##9Maarten Vanraes (AL13N) <maarten.vanraes gmail com>       (nl_BE)
-##9Mihail Barer (Necromonger) <>                             (ru)
-##9Sini Ruohomaa (Byakushin) <sini.ruohomaa iki fi>          (fi)
-##9Yohann Ferreira (Bertram) <bertram cegetel net>           (fr)
-##9Antoine Ruck (Jumpy) <antoinebcn hotmail com>             (fr,es)
-##9Nelson Martell (nelson6e65) <nelson6eeduardo65 gmail com> (es)
+##9Aline Ferraz de Souza (Freya) <freya.df gmail com>         (pt, pt_BR)
+##9Andrei Karas (4144) <akaras inbox ru>                      (ru)
+##9Bernard Hugonnet (Nard) <>                                 (fr)
+##9Maarten Vanraes (AL13N) <maarten.vanraes gmail com>        (nl_BE)
+##9Mihail Barer (Necromonger) <>                              (ru)
+##9Sini Ruohomaa (Byakushin) <sini.ruohomaa iki fi>           (fi)
+##9Yohann Ferreira (Bertram) <bertram cegetel net>            (fr)
+##9Antoine Ruck (Jumpy) <antoinebcn hotmail com>              (fr,es)
+##9Nelson Martell (nelson6e65) <nelson6e65-manaplus yahoo es> (es)
 ##9alastrim
 ##9GonzoDark
  
diff --git a/data/help/ru/team.txt b/data/help/ru/team.txt
index 0c8470fd1..355fe8ddf 100644
--- a/data/help/ru/team.txt
+++ b/data/help/ru/team.txt
@@ -13,15 +13,16 @@
 ##9Mihail Barer (Necromonger) <>
  
 ##3== Переводчики ==
-##9Aline Ferraz de Souza (Freya) <freya.df gmail com>
-##9Bernard Hugonnet (Nard) <>
-##9Maarten Vanraes (AL13N) <maarten.vanraes gmail com>
-##9Mihail Barer (Necromonger) <>
-##9Yohann Ferreira (Bertram) <bertram cegetel net>
-##9Antoine Ruck (Jumpy) <antoinebcn hotmail com>
+##9Aline Ferraz de Souza (Freya) <freya.df gmail com>         (pt, pt_BR)
+##9Andrei Karas (4144) <akaras inbox ru>                      (ru)
+##9Bernard Hugonnet (Nard) <>                                 (fr)
+##9Maarten Vanraes (AL13N) <maarten.vanraes gmail com>        (nl_BE)
+##9Mihail Barer (Necromonger) <>                              (ru)
+##9Sini Ruohomaa (Byakushin) <sini.ruohomaa iki fi>           (fi)
+##9Yohann Ferreira (Bertram) <bertram cegetel net>            (fr)
+##9Antoine Ruck (Jumpy) <antoinebcn hotmail com>              (fr,es)
+##9Nelson Martell (nelson6e65) <nelson6e65-manaplus yahoo es> (es)
 ##9alastrim
-##9GonzoDark
-##9nelson6e65
  
 ##3== Художники ==
 ##9Aline Ferraz de Souza (Freya) <freya.df gmail com>
diff --git a/data/help/team.txt b/data/help/team.txt
index d940a1694..83e062412 100644
--- a/data/help/team.txt
+++ b/data/help/team.txt
@@ -13,15 +13,15 @@
 ##9Mihail Barer (Necromonger) <>
  
 ##3== Translators ==
-##9Aline Ferraz de Souza (Freya) <freya.df gmail com>        (pt, pt_BR)
-##9Andrei Karas (4144) <akaras inbox ru>                     (ru)
-##9Bernard Hugonnet (Nard) <>                                (fr)
-##9Maarten Vanraes (AL13N) <maarten.vanraes gmail com>       (nl_BE)
-##9Mihail Barer (Necromonger) <>                             (ru)
-##9Sini Ruohomaa (Byakushin) <sini.ruohomaa iki fi>          (fi)
-##9Yohann Ferreira (Bertram) <bertram cegetel net>           (fr)
-##9Antoine Ruck (Jumpy) <antoinebcn hotmail com>             (fr,es)
-##9Nelson Martell (nelson6e65) <nelson6eeduardo65 gmail com> (es)
+##9Aline Ferraz de Souza (Freya) <freya.df gmail com>         (pt, pt_BR)
+##9Andrei Karas (4144) <akaras inbox ru>                      (ru)
+##9Bernard Hugonnet (Nard) <>                                 (fr)
+##9Maarten Vanraes (AL13N) <maarten.vanraes gmail com>        (nl_BE)
+##9Mihail Barer (Necromonger) <>                              (ru)
+##9Sini Ruohomaa (Byakushin) <sini.ruohomaa iki fi>           (fi)
+##9Yohann Ferreira (Bertram) <bertram cegetel net>            (fr)
+##9Antoine Ruck (Jumpy) <antoinebcn hotmail com>              (fr,es)
+##9Nelson Martell (nelson6e65) <nelson6e65-manaplus yahoo es> (es)
 ##9alastrim
 ##9GonzoDark
  
-- 
cgit v1.2.3-60-g2f50


From cbbea0950f07c61c4649308f40333a89da21a521 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Tue, 27 Sep 2011 23:49:45 +0300
Subject: Add pitriss to authors list.

---
 AUTHORS               | 1 +
 data/help/es/team.txt | 1 +
 data/help/fr/team.txt | 1 +
 data/help/ru/team.txt | 1 +
 data/help/team.txt    | 1 +
 5 files changed, 5 insertions(+)

diff --git a/AUTHORS b/AUTHORS
index b352bffb2..fd0ac2d5e 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -15,6 +15,7 @@ Andrei Karas (4144) <akaras inbox ru>                      (ru)
 Bernard Hugonnet (Nard) <>                                 (fr)
 Maarten Vanraes (AL13N) <maarten.vanraes gmail com>        (nl_BE)
 Mihail Barer (Necromonger) <>                              (ru)
+Petr Varkoček (pitriss) <>                                 (cs)
 Sini Ruohomaa (Byakushin) <sini.ruohomaa iki fi>           (fi)
 Yohann Ferreira (Bertram) <bertram cegetel net>            (fr)
 Antoine Ruck (Jumpy) <antoinebcn hotmail com>              (fr,es)
diff --git a/data/help/es/team.txt b/data/help/es/team.txt
index df8ad2610..494b5221c 100644
--- a/data/help/es/team.txt
+++ b/data/help/es/team.txt
@@ -18,6 +18,7 @@
 ##9Bernard Hugonnet (Nard) <>                                 (fr)
 ##9Maarten Vanraes (AL13N) <maarten.vanraes gmail com>        (nl_BE)
 ##9Mihail Barer (Necromonger) <>                              (ru)
+##9Petr Varkoček (pitriss) <>                                 (cs)
 ##9Sini Ruohomaa (Byakushin) <sini.ruohomaa iki fi>           (fi)
 ##9Yohann Ferreira (Bertram) <bertram cegetel net>            (fr)
 ##9Antoine Ruck (Jumpy) <antoinebcn hotmail com>              (fr,es)
diff --git a/data/help/fr/team.txt b/data/help/fr/team.txt
index fa307a2c1..ca93d3edd 100644
--- a/data/help/fr/team.txt
+++ b/data/help/fr/team.txt
@@ -18,6 +18,7 @@
 ##9Bernard Hugonnet (Nard) <>                                 (fr)
 ##9Maarten Vanraes (AL13N) <maarten.vanraes gmail com>        (nl_BE)
 ##9Mihail Barer (Necromonger) <>                              (ru)
+##9Petr Varkoček (pitriss) <>                                 (cs)
 ##9Sini Ruohomaa (Byakushin) <sini.ruohomaa iki fi>           (fi)
 ##9Yohann Ferreira (Bertram) <bertram cegetel net>            (fr)
 ##9Antoine Ruck (Jumpy) <antoinebcn hotmail com>              (fr,es)
diff --git a/data/help/ru/team.txt b/data/help/ru/team.txt
index 355fe8ddf..5b2bea822 100644
--- a/data/help/ru/team.txt
+++ b/data/help/ru/team.txt
@@ -18,6 +18,7 @@
 ##9Bernard Hugonnet (Nard) <>                                 (fr)
 ##9Maarten Vanraes (AL13N) <maarten.vanraes gmail com>        (nl_BE)
 ##9Mihail Barer (Necromonger) <>                              (ru)
+##9Petr Varkoček (pitriss) <>                                 (cs)
 ##9Sini Ruohomaa (Byakushin) <sini.ruohomaa iki fi>           (fi)
 ##9Yohann Ferreira (Bertram) <bertram cegetel net>            (fr)
 ##9Antoine Ruck (Jumpy) <antoinebcn hotmail com>              (fr,es)
diff --git a/data/help/team.txt b/data/help/team.txt
index 83e062412..4f2c85826 100644
--- a/data/help/team.txt
+++ b/data/help/team.txt
@@ -18,6 +18,7 @@
 ##9Bernard Hugonnet (Nard) <>                                 (fr)
 ##9Maarten Vanraes (AL13N) <maarten.vanraes gmail com>        (nl_BE)
 ##9Mihail Barer (Necromonger) <>                              (ru)
+##9Petr Varkoček (pitriss) <>                                 (cs)
 ##9Sini Ruohomaa (Byakushin) <sini.ruohomaa iki fi>           (fi)
 ##9Yohann Ferreira (Bertram) <bertram cegetel net>            (fr)
 ##9Antoine Ruck (Jumpy) <antoinebcn hotmail com>              (fr,es)
-- 
cgit v1.2.3-60-g2f50


From 39c0baaad44c49c41ac9311bcf39c2844a49e921 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Wed, 28 Sep 2011 02:27:32 +0300
Subject: Show current experience after 99 level.

---
 src/gui/statuswindow.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/gui/statuswindow.cpp b/src/gui/statuswindow.cpp
index 203338708..170fd6ab4 100644
--- a/src/gui/statuswindow.cpp
+++ b/src/gui/statuswindow.cpp
@@ -502,7 +502,8 @@ void StatusWindow::updateProgressBar(ProgressBar *bar, int value, int max,
     if (max == 0)
     {
         bar->setText(_("Max"));
-        bar->setProgress(1.0);
+        bar->setProgress(1);
+        bar->setText(toString(value));
     }
     else
     {
-- 
cgit v1.2.3-60-g2f50


From 36f19b67df5ba7b00e91d9a234088f276b8bf513 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Wed, 28 Sep 2011 18:48:09 +0300
Subject: Add untarget key. By default unassigned. It remove targeting but not
 stop server side attack.

---
 src/game.cpp           | 10 +++++++---
 src/keyboardconfig.cpp |  2 ++
 src/keyboardconfig.h   |  1 +
 src/localplayer.cpp    |  5 +++++
 src/localplayer.h      |  2 ++
 5 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/game.cpp b/src/game.cpp
index 81f987376..0527e8481 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -1148,6 +1148,7 @@ void Game::handleInput()
                 && !NpcDialog::isAnyInputFocused()
                 && (!player_node || !player_node->getAwayMode())
                 && !keyboard.isKeyActive(keyboard.KEY_TARGET)
+                && !keyboard.isKeyActive(keyboard.KEY_UNTARGET)
                 && !InventoryWindow::isAnyInputFocused())
             {
 //                const int tKey = keyboard.getKeyIndex(event.key.keysym.sym);
@@ -1611,7 +1612,8 @@ void Game::handleInput()
                 keyboard.isKeyActive(keyboard.KEY_TARGET_CLOSEST) ||
                 keyboard.isKeyActive(keyboard.KEY_TARGET_NPC) ||
                 (joystick && joystick->buttonPressed(3))) &&
-                !keyboard.isKeyActive(keyboard.KEY_TARGET))
+                !keyboard.isKeyActive(keyboard.KEY_TARGET) &&
+                !keyboard.isKeyActive(keyboard.KEY_UNTARGET))
             {
                 ActorSprite::Type currentTarget = ActorSprite::UNKNOWN;
                 if (keyboard.isKeyActive(keyboard.KEY_TARGET_CLOSEST) ||
@@ -1663,10 +1665,12 @@ void Game::handleInput()
 
         // Stop attacking if the right key is pressed
         if (!keyboard.isKeyActive(keyboard.KEY_ATTACK)
-            && keyboard.isKeyActive(keyboard.KEY_TARGET)
             && !keyboard.isKeyActive(keyboard.KEY_EMOTE))
         {
-            player_node->stopAttack();
+            if (keyboard.isKeyActive(keyboard.KEY_TARGET))
+                player_node->stopAttack();
+            else if (keyboard.isKeyActive(keyboard.KEY_UNTARGET))
+                player_node->untarget();
         }
 
         if (joystick)
diff --git a/src/keyboardconfig.cpp b/src/keyboardconfig.cpp
index f9831c18f..fdc8201ca 100644
--- a/src/keyboardconfig.cpp
+++ b/src/keyboardconfig.cpp
@@ -61,6 +61,8 @@ static KeyData const keyData[KeyboardConfig::KEY_TOTAL] = {
         KeyboardConfig::GRP_DEFAULT},
     {"keyTalk", SDLK_t, N_("Talk"), KeyboardConfig::GRP_DEFAULT},
     {"keyTarget", SDLK_LSHIFT, N_("Stop Attack"), KeyboardConfig::GRP_DEFAULT},
+    {"keyUnTarget", KeyboardConfig::KEY_NO_VALUE,
+        N_("Untarget"), KeyboardConfig::GRP_DEFAULT},
     {"keyTargetClosest", SDLK_a, N_("Target Closest"),
         KeyboardConfig::GRP_DEFAULT},
     {"keyTargetNPC", SDLK_n, N_("Target NPC"), KeyboardConfig::GRP_DEFAULT},
diff --git a/src/keyboardconfig.h b/src/keyboardconfig.h
index bfec0fc87..b322eb6d1 100644
--- a/src/keyboardconfig.h
+++ b/src/keyboardconfig.h
@@ -174,6 +174,7 @@ class KeyboardConfig
             KEY_MOVE_TO_POINT,
             KEY_TALK,
             KEY_TARGET,
+            KEY_UNTARGET,
             KEY_TARGET_CLOSEST,
             KEY_TARGET_NPC,
             KEY_TARGET_PLAYER,
diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index 324f3af54..721c71b1a 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -1389,6 +1389,11 @@ void LocalPlayer::stopAttack()
     if (mServerAttack && mAction == ATTACK)
         Net::getPlayerHandler()->stopAttack();
 
+    untarget();
+}
+
+void LocalPlayer::untarget()
+{
     if (mAction == ATTACK)
         setAction(STAND);
 
diff --git a/src/localplayer.h b/src/localplayer.h
index 278598d58..bbd17f53c 100644
--- a/src/localplayer.h
+++ b/src/localplayer.h
@@ -152,6 +152,8 @@ class LocalPlayer : public Being, public ActorSpriteListener,
 
         void stopAttack();
 
+        void untarget();
+
         /**
          * Returns the current target of the player. Returns 0 if no being is
          * currently targeted.
-- 
cgit v1.2.3-60-g2f50


From b22ce8d250b1fa995f76c337e1cba6a4b164fe23 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Wed, 28 Sep 2011 20:48:05 +0300
Subject: Add amount text field to buy dialog.

---
 src/gui/buydialog.cpp            | 51 +++++++++++++++++++++++++++++++++-------
 src/gui/buydialog.h              |  6 +++++
 src/gui/widgets/inttextfield.cpp |  5 ++++
 src/gui/widgets/textfield.cpp    |  4 ++--
 src/gui/widgets/textfield.h      |  7 +++++-
 5 files changed, 62 insertions(+), 11 deletions(-)

diff --git a/src/gui/buydialog.cpp b/src/gui/buydialog.cpp
index 8628afc6e..7fad622df 100644
--- a/src/gui/buydialog.cpp
+++ b/src/gui/buydialog.cpp
@@ -22,6 +22,7 @@
 
 #include "gui/buydialog.h"
 
+#include "keyboardconfig.h"
 #include "shopitem.h"
 #include "units.h"
 
@@ -29,6 +30,7 @@
 #include "gui/tradewindow.h"
 
 #include "gui/widgets/button.h"
+#include "gui/widgets/inttextfield.h"
 #include "gui/widgets/label.h"
 #include "gui/widgets/layout.h"
 #include "gui/widgets/scrollarea.h"
@@ -77,6 +79,9 @@ void BuyDialog::init()
     setMinHeight(230);
     setDefaultSize(260, 230, ImageRect::CENTER);
 
+    mEnabledKeyboard = keyboard.isEnabled();
+    keyboard.setEnabled(false);
+
     mShopItems = new ShopItems;
 
     mShopItemList = new ShopListBox(mShopItems, mShopItems);
@@ -89,6 +94,15 @@ void BuyDialog::init()
     mMoneyLabel = new Label(strprintf(_("Price: %s / Total: %s"),
                                             "", ""));
 
+    mAmountField = new IntTextField(1, 1, 123);
+    mAmountField->setActionEventId("amount");
+    mAmountField->addActionListener(this);
+    mAmountField->setSendAlwaysEvents(true);
+    mAmountField->setEnabled(false);
+
+    mAmountLabel = new Label(_("Amount:"));
+    mAmountLabel->adjustSize();
+
     // TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
     // You may change this symbol if your language uses another.
     mIncreaseButton = new Button(_("+"), "inc", this);
@@ -114,15 +128,17 @@ void BuyDialog::init()
     ContainerPlacer placer;
     placer = getPlacer(0, 0);
 
-    placer(0, 0, mScrollArea, 8, 5).setPadding(3);
+    placer(0, 0, mScrollArea, 9, 5).setPadding(3);
     placer(0, 5, mDecreaseButton);
-    placer(1, 5, mSlider, 3);
-    placer(4, 5, mIncreaseButton);
-    placer(5, 5, mQuantityLabel, 2);
-    placer(7, 5, mAddMaxButton);
-    placer(0, 6, mMoneyLabel, 8);
-    placer(6, 7, mBuyButton);
-    placer(7, 7, mQuitButton);
+    placer(1, 5, mSlider, 4);
+    placer(5, 5, mIncreaseButton);
+    placer(6, 5, mQuantityLabel, 2);
+    placer(8, 5, mAddMaxButton);
+    placer(0, 6, mAmountLabel, 2);
+    placer(2, 6, mAmountField, 2);
+    placer(0, 7, mMoneyLabel, 8);
+    placer(7, 8, mBuyButton);
+    placer(8, 8, mQuitButton);
 
     Layout &layout = getLayout();
     layout.setRowHeight(0, Layout::AUTO_SET);
@@ -188,24 +204,34 @@ void BuyDialog::action(const gcn::ActionEvent &event)
     if (event.getId() == "slider")
     {
         mAmountItems = static_cast<int>(mSlider->getValue());
+        mAmountField->setValue(mAmountItems);
         updateButtonsAndLabels();
     }
     else if (event.getId() == "inc" && mAmountItems < mMaxItems)
     {
         mAmountItems++;
         mSlider->setValue(mAmountItems);
+        mAmountField->setValue(mAmountItems);
         updateButtonsAndLabels();
     }
     else if (event.getId() == "dec" && mAmountItems > 1)
     {
         mAmountItems--;
         mSlider->setValue(mAmountItems);
+        mAmountField->setValue(mAmountItems);
         updateButtonsAndLabels();
     }
     else if (event.getId() == "max")
     {
         mAmountItems = mMaxItems;
         mSlider->setValue(mAmountItems);
+        mAmountField->setValue(mAmountItems);
+        updateButtonsAndLabels();
+    }
+    else if (event.getId() == "amount")
+    {
+        mAmountItems = mAmountField->getValue();
+        mSlider->setValue(mAmountItems);
         updateButtonsAndLabels();
     }
     // TODO: Actually we'd have a bug elsewhere if this check for the number
@@ -256,6 +282,8 @@ void BuyDialog::valueChanged(const gcn::SelectionEvent &event A_UNUSED)
 
     updateButtonsAndLabels();
     mSlider->gcn::Slider::setScale(1, mMaxItems);
+    mAmountField->setRange(1, mMaxItems);
+    mAmountField->setValue(1);
 }
 
 void BuyDialog::updateButtonsAndLabels()
@@ -297,6 +325,7 @@ void BuyDialog::updateButtonsAndLabels()
     mDecreaseButton->setEnabled(mAmountItems > 1);
     mBuyButton->setEnabled(mAmountItems > 0);
     mSlider->setEnabled(mMaxItems > 1);
+    mAmountField->setEnabled(mAmountItems > 0);
 
     // Update quantity and money labels
     mQuantityLabel->setCaption(strprintf("%d / %d", mAmountItems, mMaxItems));
@@ -326,3 +355,9 @@ void BuyDialog::closeAll()
             (*it)->close();
     }
 }
+
+void BuyDialog::scheduleDelete()
+{
+    keyboard.setEnabled(mEnabledKeyboard);
+    Window::scheduleDelete();
+}
diff --git a/src/gui/buydialog.h b/src/gui/buydialog.h
index 0ba2e5cb3..53d20e1e5 100644
--- a/src/gui/buydialog.h
+++ b/src/gui/buydialog.h
@@ -38,6 +38,7 @@
 
 class ShopItems;
 class ShopListBox;
+class IntTextField;
 class ListBox;
 
 /**
@@ -124,6 +125,8 @@ class BuyDialog : public Window, public gcn::ActionListener,
          */
         static void closeAll();
 
+        void scheduleDelete();
+
     private:
         typedef std::list<BuyDialog*> DialogList;
         static DialogList instances;
@@ -140,6 +143,8 @@ class BuyDialog : public Window, public gcn::ActionListener,
         gcn::Label *mMoneyLabel;
         gcn::Label *mQuantityLabel;
         gcn::Slider *mSlider;
+        gcn::Label *mAmountLabel;
+        IntTextField *mAmountField;
 
         ShopItems *mShopItems;
 
@@ -147,6 +152,7 @@ class BuyDialog : public Window, public gcn::ActionListener,
         int mAmountItems;
         int mMaxItems;
         std::string mNick;
+        bool mEnabledKeyboard;
 };
 
 #endif
diff --git a/src/gui/widgets/inttextfield.cpp b/src/gui/widgets/inttextfield.cpp
index 021340fbe..89544e108 100644
--- a/src/gui/widgets/inttextfield.cpp
+++ b/src/gui/widgets/inttextfield.cpp
@@ -50,6 +50,9 @@ void IntTextField::keyPressed(gcn::KeyEvent &event)
         key.getValue() == Key::DELETE)
     {
         setText(std::string());
+        if (mSendAlwaysEvents)
+            distributeActionEvent();
+
         event.consume();
     }
 
@@ -62,6 +65,8 @@ void IntTextField::keyPressed(gcn::KeyEvent &event)
     int i;
     s >> i;
     setValue(i);
+    if (mSendAlwaysEvents)
+        distributeActionEvent();
 }
 
 void IntTextField::setRange(int min, int max)
diff --git a/src/gui/widgets/textfield.cpp b/src/gui/widgets/textfield.cpp
index 5d4fbc0b4..6ce4cbf3b 100644
--- a/src/gui/widgets/textfield.cpp
+++ b/src/gui/widgets/textfield.cpp
@@ -51,11 +51,11 @@ TextField::TextField(const std::string &text, bool loseFocusOnTab,
                      gcn::ActionListener* listener, std::string eventId,
                      bool sendAlwaysEvents):
     gcn::TextField(text),
+    mSendAlwaysEvents(sendAlwaysEvents),
     mNumeric(false),
     mMinimum(0),
     mMaximum(0),
-    mLastEventPaste(false),
-    mSendAlwaysEvents(sendAlwaysEvents)
+    mLastEventPaste(false)
 {
     setFrameSize(2);
 
diff --git a/src/gui/widgets/textfield.h b/src/gui/widgets/textfield.h
index 7e19099e8..93f970168 100644
--- a/src/gui/widgets/textfield.h
+++ b/src/gui/widgets/textfield.h
@@ -96,6 +96,12 @@ class TextField : public gcn::TextField
          */
         int getValue() const;
 
+        void setSendAlwaysEvents(bool b)
+        { mSendAlwaysEvents = b; }
+
+    protected:
+        bool mSendAlwaysEvents;
+
     private:
         void handlePaste();
 
@@ -109,7 +115,6 @@ class TextField : public gcn::TextField
         int mMaximum;
         bool mLoseFocusOnTab;
         int mLastEventPaste;
-        bool mSendAlwaysEvents;
 };
 
 #endif
-- 
cgit v1.2.3-60-g2f50


From d9eab6bbcd939f1238283ac9bbe003e06de4169c Mon Sep 17 00:00:00 2001
From: Erik Schilling <ablu.erikschilling@googlemail.com>
Date: Sun, 18 Sep 2011 02:39:48 +0800
Subject: Fixed item popup still visible after closing inventory window.

Reviewed-by: Bertram.

Conflicts:

	src/gui/widgets/itemcontainer.cpp
---
 src/gui/inventorywindow.cpp       | 6 ++++++
 src/gui/inventorywindow.h         | 5 +++++
 src/gui/widgets/itemcontainer.cpp | 5 +++++
 src/gui/widgets/itemcontainer.h   | 2 ++
 src/gui/widgets/window.h          | 2 +-
 5 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index 35165a16a..d6377e4dd 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -375,6 +375,12 @@ Item *InventoryWindow::getSelectedItem() const
     return mItems->getSelectedItem();
 }
 
+void InventoryWindow::widgetHidden(const gcn::Event &event)
+{
+    Window::widgetHidden(event);
+    mItems->hidePopup();
+}
+
 void InventoryWindow::mouseClicked(gcn::MouseEvent &event)
 {
     Window::mouseClicked(event);
diff --git a/src/gui/inventorywindow.h b/src/gui/inventorywindow.h
index 5592b9449..959f65d7c 100644
--- a/src/gui/inventorywindow.h
+++ b/src/gui/inventorywindow.h
@@ -84,6 +84,11 @@ class InventoryWindow : public Window,
          */
         Item* getSelectedItem() const;
 
+        /**
+         * Handles closing of the window
+         */
+        virtual void widgetHidden(const gcn::Event &event);
+
         /**
          * Handles the mouse clicks.
          */
diff --git a/src/gui/widgets/itemcontainer.cpp b/src/gui/widgets/itemcontainer.cpp
index 2cc80ee8b..de8b3c277 100644
--- a/src/gui/widgets/itemcontainer.cpp
+++ b/src/gui/widgets/itemcontainer.cpp
@@ -327,6 +327,11 @@ void ItemContainer::distributeValueChangedEvent()
     }
 }
 
+void ItemContainer::hidePopup()
+{
+    mItemPopup->setVisible(false);
+}
+
 void ItemContainer::keyPressed(gcn::KeyEvent &event A_UNUSED)
 {
     /*switch (event.getKey().getValue())
diff --git a/src/gui/widgets/itemcontainer.h b/src/gui/widgets/itemcontainer.h
index 845bfb3a9..e4188f54b 100644
--- a/src/gui/widgets/itemcontainer.h
+++ b/src/gui/widgets/itemcontainer.h
@@ -73,6 +73,8 @@ class ItemContainer : public gcn::Widget,
          */
         virtual ~ItemContainer();
 
+        void hidePopup();
+
         /**
          * Necessary for checking how full the inventory is.
          */
diff --git a/src/gui/widgets/window.h b/src/gui/widgets/window.h
index cc7c6e6a1..ffc27ab10 100644
--- a/src/gui/widgets/window.h
+++ b/src/gui/widgets/window.h
@@ -120,7 +120,7 @@ class Window : public gcn::Window, gcn::WidgetListener
         /**
          * Called whenever the widget is hidden.
          */
-        virtual void widgetHidden(const gcn::Event& event);
+        virtual void widgetHidden(const gcn::Event &event);
 
         /**
          * Sets whether or not the window has a close button.
-- 
cgit v1.2.3-60-g2f50


From 727808b197394912f212641fb2e39088eab82060 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Wed, 28 Sep 2011 21:27:33 +0300
Subject: Add some checks after previous commit.

---
 src/gui/inventorywindow.cpp       | 3 ++-
 src/gui/widgets/itemcontainer.cpp | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index d6377e4dd..f52151698 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -378,7 +378,8 @@ Item *InventoryWindow::getSelectedItem() const
 void InventoryWindow::widgetHidden(const gcn::Event &event)
 {
     Window::widgetHidden(event);
-    mItems->hidePopup();
+    if (mItems)
+        mItems->hidePopup();
 }
 
 void InventoryWindow::mouseClicked(gcn::MouseEvent &event)
diff --git a/src/gui/widgets/itemcontainer.cpp b/src/gui/widgets/itemcontainer.cpp
index de8b3c277..9a17d81cd 100644
--- a/src/gui/widgets/itemcontainer.cpp
+++ b/src/gui/widgets/itemcontainer.cpp
@@ -329,7 +329,8 @@ void ItemContainer::distributeValueChangedEvent()
 
 void ItemContainer::hidePopup()
 {
-    mItemPopup->setVisible(false);
+    if (mItemPopup)
+        mItemPopup->setVisible(false);
 }
 
 void ItemContainer::keyPressed(gcn::KeyEvent &event A_UNUSED)
-- 
cgit v1.2.3-60-g2f50


From 739fd277e28120cd643ac443a013b482698427ba Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Wed, 28 Sep 2011 23:00:20 +0300
Subject: Hide popups in different hidden windows.

---
 src/gui/inventorywindow.h                  |  2 +-
 src/gui/shortcutwindow.cpp                 | 19 +++++++++++++++++++
 src/gui/shortcutwindow.h                   |  2 ++
 src/gui/widgets/dropshortcutcontainer.cpp  |  9 ++++++++-
 src/gui/widgets/dropshortcutcontainer.h    |  2 ++
 src/gui/widgets/emoteshortcutcontainer.cpp |  8 +++++++-
 src/gui/widgets/emoteshortcutcontainer.h   |  8 ++++++++
 src/gui/widgets/itemshortcutcontainer.cpp  | 14 ++++++++++++--
 src/gui/widgets/itemshortcutcontainer.h    |  2 ++
 src/gui/widgets/spellshortcutcontainer.cpp |  9 ++++++++-
 src/gui/widgets/spellshortcutcontainer.h   |  2 ++
 11 files changed, 71 insertions(+), 6 deletions(-)

diff --git a/src/gui/inventorywindow.h b/src/gui/inventorywindow.h
index 959f65d7c..9dadeb5a8 100644
--- a/src/gui/inventorywindow.h
+++ b/src/gui/inventorywindow.h
@@ -87,7 +87,7 @@ class InventoryWindow : public Window,
         /**
          * Handles closing of the window
          */
-        virtual void widgetHidden(const gcn::Event &event);
+        void widgetHidden(const gcn::Event &event);
 
         /**
          * Handles the mouse clicks.
diff --git a/src/gui/shortcutwindow.cpp b/src/gui/shortcutwindow.cpp
index df21488a5..6d48da197 100644
--- a/src/gui/shortcutwindow.cpp
+++ b/src/gui/shortcutwindow.cpp
@@ -159,3 +159,22 @@ int ShortcutWindow::getTabIndex()
         return 0;
     return mTabs->getSelectedTabIndex();
 }
+
+void ShortcutWindow::widgetHidden(const gcn::Event &event)
+{
+    if (mItems)
+        mItems->widgetHidden(event);
+    if (mTabs)
+    {
+        ScrollArea *scroll = static_cast<ScrollArea*>(
+            mTabs->getCurrentWidget());
+        if (scroll)
+        {
+            ShortcutContainer *content = static_cast<ShortcutContainer*>(
+                scroll->getContent());
+
+            if (content)
+                content->widgetHidden(event);
+        }
+    }
+}
diff --git a/src/gui/shortcutwindow.h b/src/gui/shortcutwindow.h
index 1c91835e8..8627a5dce 100644
--- a/src/gui/shortcutwindow.h
+++ b/src/gui/shortcutwindow.h
@@ -56,6 +56,8 @@ class ShortcutWindow : public Window
 
         int getTabIndex();
 
+        void widgetHidden(const gcn::Event &event);
+
     private:
         ShortcutWindow();
         ShortcutContainer *mItems;
diff --git a/src/gui/widgets/dropshortcutcontainer.cpp b/src/gui/widgets/dropshortcutcontainer.cpp
index b628cf2d4..1fa272448 100644
--- a/src/gui/widgets/dropshortcutcontainer.cpp
+++ b/src/gui/widgets/dropshortcutcontainer.cpp
@@ -306,5 +306,12 @@ void DropShortcutContainer::mouseMoved(gcn::MouseEvent &event)
 // Hide ItemTooltip
 void DropShortcutContainer::mouseExited(gcn::MouseEvent &event A_UNUSED)
 {
-    mItemPopup->setVisible(false);
+    if (mItemPopup)
+        mItemPopup->setVisible(false);
+}
+
+void DropShortcutContainer::widgetHidden(const gcn::Event &event A_UNUSED)
+{
+    if (mItemPopup)
+        mItemPopup->setVisible(false);
 }
diff --git a/src/gui/widgets/dropshortcutcontainer.h b/src/gui/widgets/dropshortcutcontainer.h
index b2d63a7dd..348f48567 100644
--- a/src/gui/widgets/dropshortcutcontainer.h
+++ b/src/gui/widgets/dropshortcutcontainer.h
@@ -76,6 +76,8 @@ class DropShortcutContainer : public ShortcutContainer
          */
         void mouseReleased(gcn::MouseEvent &event);
 
+        void widgetHidden(const gcn::Event &event);
+
     private:
         void mouseExited(gcn::MouseEvent &event);
         void mouseMoved(gcn::MouseEvent &event);
diff --git a/src/gui/widgets/emoteshortcutcontainer.cpp b/src/gui/widgets/emoteshortcutcontainer.cpp
index 5aced193f..cc9e8badf 100644
--- a/src/gui/widgets/emoteshortcutcontainer.cpp
+++ b/src/gui/widgets/emoteshortcutcontainer.cpp
@@ -252,4 +252,10 @@ void EmoteShortcutContainer::mouseExited(gcn::MouseEvent &event A_UNUSED)
 {
     if (mEmotePopup)
         mEmotePopup->setVisible(false);
-}
\ No newline at end of file
+}
+
+void EmoteShortcutContainer::widgetHidden(const gcn::Event &event A_UNUSED)
+{
+    if (mEmotePopup)
+        mEmotePopup->setVisible(false);
+}
diff --git a/src/gui/widgets/emoteshortcutcontainer.h b/src/gui/widgets/emoteshortcutcontainer.h
index b1cc866d2..06c009f0b 100644
--- a/src/gui/widgets/emoteshortcutcontainer.h
+++ b/src/gui/widgets/emoteshortcutcontainer.h
@@ -27,6 +27,12 @@
 
 #include <vector>
 
+#ifdef __GNUC__
+#define A_UNUSED  __attribute__ ((unused))
+#else
+#define A_UNUSED
+#endif
+
 class AnimatedSprite;
 class Image;
 class TextPopup;
@@ -73,6 +79,8 @@ class EmoteShortcutContainer : public ShortcutContainer
 
         void mouseExited(gcn::MouseEvent &event);
 
+        void widgetHidden(const gcn::Event &event);
+
     private:
         std::vector<const EmoteSprite*> mEmoteImg;
 
diff --git a/src/gui/widgets/itemshortcutcontainer.cpp b/src/gui/widgets/itemshortcutcontainer.cpp
index 79685fe45..560045a29 100644
--- a/src/gui/widgets/itemshortcutcontainer.cpp
+++ b/src/gui/widgets/itemshortcutcontainer.cpp
@@ -378,6 +378,16 @@ void ItemShortcutContainer::mouseMoved(gcn::MouseEvent &event)
 // Hide ItemTooltip
 void ItemShortcutContainer::mouseExited(gcn::MouseEvent &event A_UNUSED)
 {
-    mItemPopup->setVisible(false);
-    mSpellPopup->setVisible(false);
+    if (mItemPopup)
+        mItemPopup->setVisible(false);
+    if (mSpellPopup)
+        mSpellPopup->setVisible(false);
+}
+
+void ItemShortcutContainer::widgetHidden(const gcn::Event &event A_UNUSED)
+{
+    if (mItemPopup)
+        mItemPopup->setVisible(false);
+    if (mSpellPopup)
+        mSpellPopup->setVisible(false);
 }
diff --git a/src/gui/widgets/itemshortcutcontainer.h b/src/gui/widgets/itemshortcutcontainer.h
index e6b32c6f8..473cef350 100644
--- a/src/gui/widgets/itemshortcutcontainer.h
+++ b/src/gui/widgets/itemshortcutcontainer.h
@@ -78,6 +78,8 @@ class ItemShortcutContainer : public ShortcutContainer
          */
         void mouseReleased(gcn::MouseEvent &event);
 
+        void widgetHidden(const gcn::Event &event);
+
     private:
         void mouseExited(gcn::MouseEvent &event);
         void mouseMoved(gcn::MouseEvent &event);
diff --git a/src/gui/widgets/spellshortcutcontainer.cpp b/src/gui/widgets/spellshortcutcontainer.cpp
index 8abe727b5..6317dd56f 100644
--- a/src/gui/widgets/spellshortcutcontainer.cpp
+++ b/src/gui/widgets/spellshortcutcontainer.cpp
@@ -290,5 +290,12 @@ void SpellShortcutContainer::mouseMoved(gcn::MouseEvent &event)
 // Hide SpellTooltip
 void SpellShortcutContainer::mouseExited(gcn::MouseEvent &event A_UNUSED)
 {
-    mSpellPopup->setVisible(false);
+    if (mSpellPopup)
+        mSpellPopup->setVisible(false);
+}
+
+void SpellShortcutContainer::widgetHidden(const gcn::Event &event A_UNUSED)
+{
+    if (mSpellPopup)
+        mSpellPopup->setVisible(false);
 }
diff --git a/src/gui/widgets/spellshortcutcontainer.h b/src/gui/widgets/spellshortcutcontainer.h
index 2155e2a8b..88b00338a 100644
--- a/src/gui/widgets/spellshortcutcontainer.h
+++ b/src/gui/widgets/spellshortcutcontainer.h
@@ -77,6 +77,8 @@ class SpellShortcutContainer : public ShortcutContainer
          */
         void mouseReleased(gcn::MouseEvent &event);
 
+        void widgetHidden(const gcn::Event &event);
+
     private:
         void mouseExited(gcn::MouseEvent &event);
         void mouseMoved(gcn::MouseEvent &event);
-- 
cgit v1.2.3-60-g2f50


From 35bea0b5c14601e4e6ef52890417d75cc1a1e28e Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Thu, 29 Sep 2011 20:12:49 +0300
Subject: Fix move to target in attack range.

---
 src/localplayer.cpp | 10 +++++++++-
 src/localplayer.h   |  2 ++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index 721c71b1a..28ffc4cf5 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -3452,6 +3452,14 @@ int LocalPlayer::getPathLength(Being* being)
     }
 }
 
+int LocalPlayer::getAttackRange2()
+{
+    int range = getAttackRange();
+    if (range == 1)
+        range = 2;
+    return range;
+}
+
 void LocalPlayer::attack2(Being *target, bool keep, bool dontChangeEquipment)
 {
     if (!dontChangeEquipment && target)
@@ -3459,7 +3467,7 @@ void LocalPlayer::attack2(Being *target, bool keep, bool dontChangeEquipment)
 
     if ((!target || getAttackType() == 0 || getAttackType() == 3)
         || (withinAttackRange(target, true, 1)
-        && getPathLength(target) <= getAttackRange() + 1))
+        && getPathLength(target) <= getAttackRange2()))
     {
         attack(target, keep);
         if (getAttackType() == 2)
diff --git a/src/localplayer.h b/src/localplayer.h
index bbd17f53c..447306994 100644
--- a/src/localplayer.h
+++ b/src/localplayer.h
@@ -139,6 +139,8 @@ class LocalPlayer : public Being, public ActorSpriteListener,
          */
         int getAttackRange();
 
+        int getAttackRange2();
+
         void attack(Being *target = NULL, bool keep = false,
                     bool dontChangeEquipment = false);
 
-- 
cgit v1.2.3-60-g2f50


From 091ee55284482caab0cd179a3ba1eacd665cb6a0 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sat, 1 Oct 2011 01:28:15 +0300
Subject: Update and rebuild translations.

---
 po/cs.po        | 396 +++++++++++++++++++++++++++--------------------------
 po/de.po        | 396 +++++++++++++++++++++++++++--------------------------
 po/es.po        | 398 +++++++++++++++++++++++++++--------------------------
 po/fi.po        | 396 +++++++++++++++++++++++++++--------------------------
 po/fr.po        | 396 +++++++++++++++++++++++++++--------------------------
 po/hr.po        | 395 +++++++++++++++++++++++++++--------------------------
 po/hu.po        | 395 +++++++++++++++++++++++++++--------------------------
 po/id.po        | 396 +++++++++++++++++++++++++++--------------------------
 po/ja.po        | 396 +++++++++++++++++++++++++++--------------------------
 po/manaplus.pot | 394 +++++++++++++++++++++++++++--------------------------
 po/nl_BE.po     | 396 +++++++++++++++++++++++++++--------------------------
 po/pt.po        | 414 +++++++++++++++++++++++++++++---------------------------
 po/pt_BR.po     | 414 +++++++++++++++++++++++++++++---------------------------
 po/ru.po        | 396 +++++++++++++++++++++++++++--------------------------
 po/zh_CN.po     | 396 +++++++++++++++++++++++++++--------------------------
 15 files changed, 3049 insertions(+), 2925 deletions(-)

diff --git a/po/cs.po b/po/cs.po
index 40b1ff5ee..a113d1029 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-09-27 22:18+0300\n"
-"PO-Revision-Date: 2011-09-27 19:20+0000\n"
+"POT-Creation-Date: 2011-10-01 01:22+0300\n"
+"PO-Revision-Date: 2011-09-30 14:45+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: Czech (http://www.transifex.net/projects/p/manaplus/team/"
 "cs/)\n"
@@ -341,19 +341,19 @@ msgstr "Spojení se serverem bylo ztraceno."
 msgid "Network Error"
 msgstr "Chyba sítě"
 
-#: src/game.cpp:1320
+#: src/game.cpp:1321
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorovat příchozí žádosti o obchodování"
 
-#: src/game.cpp:1330
+#: src/game.cpp:1331
 msgid "Accepting incoming trade requests"
 msgstr "Akceptovat příchozí žádosti o obchodování"
 
-#: src/game.cpp:1727
+#: src/game.cpp:1731
 msgid "Could Not Load Map"
 msgstr "Nelze načíst mapu"
 
-#: src/game.cpp:1728
+#: src/game.cpp:1732
 #, c-format
 msgid "Error while loading %s"
 msgstr "Chyba při načítání %s"
@@ -411,44 +411,48 @@ msgstr "Výsledek"
 msgid "Reset"
 msgstr "Vynulovat"
 
-#: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:98
+#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
 #: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
 #: src/gui/popupmenu.cpp:273 src/gui/popupmenu.cpp:654
 msgid "Buy"
 msgstr "Nákup"
 
-#: src/gui/buydialog.cpp:89 src/gui/buydialog.cpp:303
+#: src/gui/buydialog.cpp:94 src/gui/buydialog.cpp:332
 #: src/gui/selldialog.cpp:88 src/gui/selldialog.cpp:325
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Cena: %s / Celkem %s"
 
+#: src/gui/buydialog.cpp:103
+msgid "Amount:"
+msgstr ""
+
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:94 src/gui/itemamountwindow.cpp:207
+#: 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:973
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:974
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:97 src/gui/itemamountwindow.cpp:206
+#: 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:985
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:986
 msgid "-"
 msgstr ""
 
-#: src/gui/buydialog.cpp:99 src/gui/quitdialog.cpp:47
+#: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:294
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:84
 msgid "Quit"
 msgstr "Ukončit"
 
-#: src/gui/buydialog.cpp:100 src/gui/selldialog.cpp:95
-#: src/gui/statuswindow.cpp:504 src/gui/statuswindow.cpp:553
-#: src/gui/statuswindow.cpp:972 src/gui/statuswindow.cpp:1003
+#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
+#: src/gui/statuswindow.cpp:504 src/gui/statuswindow.cpp:554
+#: src/gui/statuswindow.cpp:973 src/gui/statuswindow.cpp:1004
 msgid "Max"
 msgstr "Vše"
 
@@ -926,7 +930,7 @@ msgid "Equipment"
 msgstr "Vybavení"
 
 #: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160
-#: src/gui/inventorywindow.cpp:538 src/gui/inventorywindow.cpp:547
+#: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554
 #: src/gui/popupmenu.cpp:1656 src/gui/popupmenu.cpp:1748
 #: src/gui/popupmenu.cpp:1793
 msgid "Unequip"
@@ -969,20 +973,20 @@ msgstr "Sloty:"
 msgid "Filter:"
 msgstr "Filtr:"
 
-#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:540
-#: src/gui/inventorywindow.cpp:549 src/gui/popupmenu.cpp:1658
+#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547
+#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1658
 #: src/gui/popupmenu.cpp:1750 src/gui/popupmenu.cpp:1795
 msgid "Equip"
 msgstr "Vybavit"
 
-#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:541
-#: src/gui/inventorywindow.cpp:545 src/gui/popupmenu.cpp:1662
+#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548
+#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1662
 #: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1754
 #: src/gui/popupmenu.cpp:1799
 msgid "Use"
 msgstr "Použít"
 
-#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:645
+#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652
 #: src/gui/popupmenu.cpp:1667 src/gui/popupmenu.cpp:1759
 #: src/gui/popupmenu.cpp:1804
 msgid "Drop..."
@@ -1002,7 +1006,7 @@ msgstr "Výstroje"
 msgid "Weight:"
 msgstr "Hmotnost:"
 
-#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:636
+#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643
 #: src/gui/popupmenu.cpp:1642 src/gui/popupmenu.cpp:1771
 #: src/gui/popupmenu.cpp:1816 src/gui/setup.cpp:73
 msgid "Store"
@@ -1012,7 +1016,7 @@ msgstr "Uložit"
 msgid "Retrieve"
 msgstr "Vzít"
 
-#: src/gui/inventorywindow.cpp:647 src/gui/popupmenu.cpp:1672
+#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1672
 #: src/gui/popupmenu.cpp:1764 src/gui/popupmenu.cpp:1809
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
@@ -3063,130 +3067,130 @@ msgstr "Úroveň: %d (GM %d)"
 msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:647 src/gui/statuswindow.cpp:712
-#: src/gui/statuswindow.cpp:732 src/gui/statuswindow.cpp:748
-#: src/gui/statuswindow.cpp:794 src/gui/statuswindow.cpp:823
-#: src/gui/statuswindow.cpp:846 src/gui/statuswindow.cpp:865
+#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:713
+#: src/gui/statuswindow.cpp:733 src/gui/statuswindow.cpp:749
+#: src/gui/statuswindow.cpp:795 src/gui/statuswindow.cpp:824
+#: src/gui/statuswindow.cpp:847 src/gui/statuswindow.cpp:866
 msgid "(D)"
 msgstr "(D)"
 
-#: src/gui/statuswindow.cpp:650 src/gui/statuswindow.cpp:773
+#: src/gui/statuswindow.cpp:651 src/gui/statuswindow.cpp:774
 msgid "(I)"
 msgstr "(I)"
 
-#: src/gui/statuswindow.cpp:653 src/gui/statuswindow.cpp:770
+#: src/gui/statuswindow.cpp:654 src/gui/statuswindow.cpp:771
 msgid "(c)"
 msgstr "(c)"
 
-#: src/gui/statuswindow.cpp:656
+#: src/gui/statuswindow.cpp:657
 msgid "(C)"
 msgstr "(C)"
 
-#: src/gui/statuswindow.cpp:659 src/gui/statuswindow.cpp:757
+#: src/gui/statuswindow.cpp:660 src/gui/statuswindow.cpp:758
 msgid "(d)"
 msgstr "(d)"
 
-#: src/gui/statuswindow.cpp:662 src/gui/statuswindow.cpp:676
-#: src/gui/statuswindow.cpp:705 src/gui/statuswindow.cpp:724
-#: src/gui/statuswindow.cpp:741 src/gui/statuswindow.cpp:760
-#: src/gui/statuswindow.cpp:782 src/gui/statuswindow.cpp:812
-#: src/gui/statuswindow.cpp:838 src/gui/statuswindow.cpp:852
-#: src/gui/statuswindow.cpp:868 src/gui/statuswindow.cpp:881
+#: src/gui/statuswindow.cpp:663 src/gui/statuswindow.cpp:677
+#: src/gui/statuswindow.cpp:706 src/gui/statuswindow.cpp:725
+#: src/gui/statuswindow.cpp:742 src/gui/statuswindow.cpp:761
+#: src/gui/statuswindow.cpp:783 src/gui/statuswindow.cpp:813
+#: src/gui/statuswindow.cpp:839 src/gui/statuswindow.cpp:853
+#: src/gui/statuswindow.cpp:869 src/gui/statuswindow.cpp:882
 msgid "(?)"
 msgstr "(?)"
 
-#: src/gui/statuswindow.cpp:673
+#: src/gui/statuswindow.cpp:674
 msgid "(a)"
 msgstr "(a)"
 
-#: src/gui/statuswindow.cpp:684
+#: src/gui/statuswindow.cpp:685
 msgid "(0)"
 msgstr "(0)"
 
-#: src/gui/statuswindow.cpp:687
+#: src/gui/statuswindow.cpp:688
 msgid "(1)"
 msgstr "(1)"
 
-#: src/gui/statuswindow.cpp:690
+#: src/gui/statuswindow.cpp:691
 msgid "(2)"
 msgstr " (2)"
 
-#: src/gui/statuswindow.cpp:693 src/gui/statuswindow.cpp:800
+#: src/gui/statuswindow.cpp:694 src/gui/statuswindow.cpp:801
 msgid "(3)"
 msgstr "(3)"
 
-#: src/gui/statuswindow.cpp:696
+#: src/gui/statuswindow.cpp:697
 msgid "(5)"
 msgstr "(5)"
 
-#: src/gui/statuswindow.cpp:699
+#: src/gui/statuswindow.cpp:700
 msgid "(7)"
 msgstr "(7)"
 
-#: src/gui/statuswindow.cpp:702 src/gui/statuswindow.cpp:754
-#: src/gui/statuswindow.cpp:809 src/gui/statuswindow.cpp:878
+#: src/gui/statuswindow.cpp:703 src/gui/statuswindow.cpp:755
+#: src/gui/statuswindow.cpp:810 src/gui/statuswindow.cpp:879
 msgid "(A)"
 msgstr "(A)"
 
-#: src/gui/statuswindow.cpp:715
+#: src/gui/statuswindow.cpp:716
 msgid "(R)"
 msgstr "(R)"
 
-#: src/gui/statuswindow.cpp:718
+#: src/gui/statuswindow.cpp:719
 msgid "(M)"
 msgstr "(M)"
 
-#: src/gui/statuswindow.cpp:721
+#: src/gui/statuswindow.cpp:722
 msgid "(P)"
 msgstr "(P)"
 
-#: src/gui/statuswindow.cpp:735
+#: src/gui/statuswindow.cpp:736
 msgid "(s)"
 msgstr "(s)"
 
-#: src/gui/statuswindow.cpp:738 src/gui/statuswindow.cpp:791
+#: src/gui/statuswindow.cpp:739 src/gui/statuswindow.cpp:792
 msgid "(S)"
 msgstr "(S)"
 
-#: src/gui/statuswindow.cpp:751 src/gui/statuswindow.cpp:806
-#: src/gui/statuswindow.cpp:859
+#: src/gui/statuswindow.cpp:752 src/gui/statuswindow.cpp:807
+#: src/gui/statuswindow.cpp:860
 msgid "(G)"
 msgstr "(G)"
 
-#: src/gui/statuswindow.cpp:767
+#: src/gui/statuswindow.cpp:768
 msgid "(f)"
 msgstr "(f)"
 
-#: src/gui/statuswindow.cpp:776 src/gui/statuswindow.cpp:797
-#: src/gui/statuswindow.cpp:862
+#: src/gui/statuswindow.cpp:777 src/gui/statuswindow.cpp:798
+#: src/gui/statuswindow.cpp:863
 msgid "(F)"
 msgstr "(F)"
 
-#: src/gui/statuswindow.cpp:779 src/gui/statuswindow.cpp:829
+#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:830
 msgid "(U)"
 msgstr "(U)"
 
-#: src/gui/statuswindow.cpp:803
+#: src/gui/statuswindow.cpp:804
 msgid "(g)"
 msgstr "(g)"
 
-#: src/gui/statuswindow.cpp:820
+#: src/gui/statuswindow.cpp:821
 msgid "(N)"
 msgstr "(N)"
 
-#: src/gui/statuswindow.cpp:826
+#: src/gui/statuswindow.cpp:827
 msgid "(u)"
 msgstr "(u)"
 
-#: src/gui/statuswindow.cpp:832
+#: src/gui/statuswindow.cpp:833
 msgid "(e)"
 msgstr "(e)"
 
-#: src/gui/statuswindow.cpp:835
+#: src/gui/statuswindow.cpp:836
 msgid "(b)"
 msgstr "(b)"
 
-#: src/gui/statuswindow.cpp:849 src/gui/statuswindow.cpp:875
+#: src/gui/statuswindow.cpp:850 src/gui/statuswindow.cpp:876
 msgid "(O)"
 msgstr "(O)"
 
@@ -3845,369 +3849,373 @@ msgstr ""
 msgid "Stop Attack"
 msgstr "Zastavit Útok"
 
-#: src/keyboardconfig.cpp:64
+#: src/keyboardconfig.cpp:65
+msgid "Untarget"
+msgstr ""
+
+#: src/keyboardconfig.cpp:66
 msgid "Target Closest"
 msgstr "Zaměřit nejbližší"
 
-#: src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:68
 msgid "Target NPC"
 msgstr "Zaměřit NPC"
 
-#: src/keyboardconfig.cpp:67
+#: src/keyboardconfig.cpp:69
 msgid "Target Player"
 msgstr "Zaměřit hráče"
 
-#: src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:71
 msgid "Pickup"
 msgstr "Sebrat"
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:72
 msgid "Change Pickup Type"
 msgstr "Změnit typ sběru"
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:74
 msgid "Hide Windows"
 msgstr "Skrýt okna"
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:76
 msgid "Sit"
 msgstr "Sednout si"
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:77
 msgid "Screenshot"
 msgstr "Snímek obrazovky"
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:78
 msgid "Enable/Disable Trading"
 msgstr "Zapnout/Vypnout obchody"
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:80
 msgid "Change Map View Mode"
 msgstr "Změnit mód zobrazení mapy"
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:82
 msgid "Select OK"
 msgstr "Vybrat OK"
 
-#: src/keyboardconfig.cpp:83
+#: src/keyboardconfig.cpp:85
 msgid "Shortcuts Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:86
 msgid "Item Shortcuts Key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:88
-#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:92
-#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:96
-#: src/keyboardconfig.cpp:98 src/keyboardconfig.cpp:100
-#: src/keyboardconfig.cpp:102 src/keyboardconfig.cpp:104
-#: src/keyboardconfig.cpp:106 src/keyboardconfig.cpp:108
-#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:112
-#: src/keyboardconfig.cpp:114 src/keyboardconfig.cpp:117
-#: src/keyboardconfig.cpp:119 src/keyboardconfig.cpp:121
-#: src/keyboardconfig.cpp:123 src/keyboardconfig.cpp:125
-#: src/keyboardconfig.cpp:367
+#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:90
+#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:94
+#: src/keyboardconfig.cpp:96 src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:100 src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:104 src/keyboardconfig.cpp:106
+#: src/keyboardconfig.cpp:108 src/keyboardconfig.cpp:110
+#: src/keyboardconfig.cpp:112 src/keyboardconfig.cpp:114
+#: src/keyboardconfig.cpp:116 src/keyboardconfig.cpp:119
+#: src/keyboardconfig.cpp:121 src/keyboardconfig.cpp:123
+#: src/keyboardconfig.cpp:125 src/keyboardconfig.cpp:127
+#: src/keyboardconfig.cpp:369
 #, c-format
 msgid "Item Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:126
+#: src/keyboardconfig.cpp:128
 msgid "Windows Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:127
+#: src/keyboardconfig.cpp:129
 msgid "Help Window"
 msgstr "Okno nápovědy"
 
-#: src/keyboardconfig.cpp:129
+#: src/keyboardconfig.cpp:131
 msgid "Status Window"
 msgstr "Stavové okno"
 
-#: src/keyboardconfig.cpp:131
+#: src/keyboardconfig.cpp:133
 msgid "Inventory Window"
 msgstr "Okno inventáře"
 
-#: src/keyboardconfig.cpp:133
+#: src/keyboardconfig.cpp:135
 msgid "Equipment Window"
 msgstr "Okno vybavení"
 
-#: src/keyboardconfig.cpp:135
+#: src/keyboardconfig.cpp:137
 msgid "Skill Window"
 msgstr "Okno dovedností"
 
-#: src/keyboardconfig.cpp:137
+#: src/keyboardconfig.cpp:139
 msgid "Minimap Window"
 msgstr "Okno s minimapou"
 
-#: src/keyboardconfig.cpp:139
+#: src/keyboardconfig.cpp:141
 msgid "Chat Window"
 msgstr "Okno s chatem"
 
-#: src/keyboardconfig.cpp:141
+#: src/keyboardconfig.cpp:143
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:143
+#: src/keyboardconfig.cpp:145
 msgid "Setup Window"
 msgstr "Okno nastavení"
 
-#: src/keyboardconfig.cpp:145
+#: src/keyboardconfig.cpp:147
 msgid "Debug Window"
 msgstr "Debug okno"
 
-#: src/keyboardconfig.cpp:147
+#: src/keyboardconfig.cpp:149
 msgid "Social Window"
 msgstr "Okno spolešenství"
 
-#: src/keyboardconfig.cpp:149
+#: src/keyboardconfig.cpp:151
 msgid "Emote Shortcut Window"
 msgstr "Okno zkratek smajlíků"
 
-#: src/keyboardconfig.cpp:151
+#: src/keyboardconfig.cpp:153
 msgid "Outfits Window"
 msgstr "Okno výstroje"
 
-#: src/keyboardconfig.cpp:153
+#: src/keyboardconfig.cpp:155
 msgid "Shop Window"
 msgstr "Okno s obchodem"
 
-#: src/keyboardconfig.cpp:155
+#: src/keyboardconfig.cpp:157
 msgid "Quick drop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:157
+#: src/keyboardconfig.cpp:159
 msgid "Kill Stats Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboardconfig.cpp:161
 msgid "Commands Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboardconfig.cpp:163
 msgid "Bot Checker Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:164
+#: src/keyboardconfig.cpp:166
 msgid "Who Is Online Window"
 msgstr "Okno \"Kdo je online\""
 
-#: src/keyboardconfig.cpp:166
+#: src/keyboardconfig.cpp:168
 msgid "Did you know Window"
 msgstr "Okno \"Víte že...\""
 
-#: src/keyboardconfig.cpp:169
+#: src/keyboardconfig.cpp:171
 msgid "Previous Social Tab"
 msgstr "Předchozí záložka společenství"
 
-#: src/keyboardconfig.cpp:171
+#: src/keyboardconfig.cpp:173
 msgid "Next Social Tab"
 msgstr "Další záložka společenství"
 
-#: src/keyboardconfig.cpp:173
+#: src/keyboardconfig.cpp:175
 msgid "Emotes Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:174
+#: src/keyboardconfig.cpp:176
 msgid "Smilie"
 msgstr "Smajlíky"
 
-#: src/keyboardconfig.cpp:175 src/keyboardconfig.cpp:177
-#: src/keyboardconfig.cpp:179 src/keyboardconfig.cpp:181
-#: src/keyboardconfig.cpp:183 src/keyboardconfig.cpp:185
-#: src/keyboardconfig.cpp:187 src/keyboardconfig.cpp:189
-#: src/keyboardconfig.cpp:191 src/keyboardconfig.cpp:193
-#: src/keyboardconfig.cpp:195 src/keyboardconfig.cpp:197
-#: src/keyboardconfig.cpp:200 src/keyboardconfig.cpp:202
-#: src/keyboardconfig.cpp:204 src/keyboardconfig.cpp:206
-#: src/keyboardconfig.cpp:208 src/keyboardconfig.cpp:210
-#: src/keyboardconfig.cpp:212 src/keyboardconfig.cpp:214
-#: src/keyboardconfig.cpp:216 src/keyboardconfig.cpp:218
-#: src/keyboardconfig.cpp:220 src/keyboardconfig.cpp:222
-#: src/keyboardconfig.cpp:224 src/keyboardconfig.cpp:227
-#: src/keyboardconfig.cpp:230 src/keyboardconfig.cpp:233
-#: src/keyboardconfig.cpp:235 src/keyboardconfig.cpp:237
-#: src/keyboardconfig.cpp:239 src/keyboardconfig.cpp:241
-#: src/keyboardconfig.cpp:243 src/keyboardconfig.cpp:245
-#: src/keyboardconfig.cpp:247 src/keyboardconfig.cpp:249
-#: src/keyboardconfig.cpp:251 src/keyboardconfig.cpp:254
-#: src/keyboardconfig.cpp:256 src/keyboardconfig.cpp:258
-#: src/keyboardconfig.cpp:260 src/keyboardconfig.cpp:262
-#: src/keyboardconfig.cpp:264 src/keyboardconfig.cpp:266
-#: src/keyboardconfig.cpp:362
+#: src/keyboardconfig.cpp:177 src/keyboardconfig.cpp:179
+#: src/keyboardconfig.cpp:181 src/keyboardconfig.cpp:183
+#: src/keyboardconfig.cpp:185 src/keyboardconfig.cpp:187
+#: src/keyboardconfig.cpp:189 src/keyboardconfig.cpp:191
+#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
+#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
+#: src/keyboardconfig.cpp:202 src/keyboardconfig.cpp:204
+#: src/keyboardconfig.cpp:206 src/keyboardconfig.cpp:208
+#: src/keyboardconfig.cpp:210 src/keyboardconfig.cpp:212
+#: src/keyboardconfig.cpp:214 src/keyboardconfig.cpp:216
+#: src/keyboardconfig.cpp:218 src/keyboardconfig.cpp:220
+#: src/keyboardconfig.cpp:222 src/keyboardconfig.cpp:224
+#: src/keyboardconfig.cpp:226 src/keyboardconfig.cpp:229
+#: src/keyboardconfig.cpp:232 src/keyboardconfig.cpp:235
+#: src/keyboardconfig.cpp:237 src/keyboardconfig.cpp:239
+#: src/keyboardconfig.cpp:241 src/keyboardconfig.cpp:243
+#: src/keyboardconfig.cpp:245 src/keyboardconfig.cpp:247
+#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
+#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:256
+#: src/keyboardconfig.cpp:258 src/keyboardconfig.cpp:260
+#: src/keyboardconfig.cpp:262 src/keyboardconfig.cpp:264
+#: src/keyboardconfig.cpp:266 src/keyboardconfig.cpp:268
+#: src/keyboardconfig.cpp:364
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "Zkratka smajlíku %d"
 
-#: src/keyboardconfig.cpp:268
+#: src/keyboardconfig.cpp:270
 msgid "Outfits Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:269
+#: src/keyboardconfig.cpp:271
 msgid "Wear Outfit"
 msgstr "Obléct výstroj"
 
-#: src/keyboardconfig.cpp:271
+#: src/keyboardconfig.cpp:273
 msgid "Copy Outfit"
 msgstr "Kopírovat výstroj"
 
-#: src/keyboardconfig.cpp:273
+#: src/keyboardconfig.cpp:275
 msgid "Copy equipped to Outfit"
 msgstr "Kopírovat výbavu do výstroje"
 
-#: src/keyboardconfig.cpp:275
+#: src/keyboardconfig.cpp:277
 msgid "Chat Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:276
+#: src/keyboardconfig.cpp:278
 msgid "Toggle Chat"
 msgstr "Přepnout chat"
 
-#: src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:280
 msgid "Scroll Chat Up"
 msgstr "Rolovat chat nahoru"
 
-#: src/keyboardconfig.cpp:280
+#: src/keyboardconfig.cpp:282
 msgid "Scroll Chat Down"
 msgstr "Rolovat chat dolů"
 
-#: src/keyboardconfig.cpp:282
+#: src/keyboardconfig.cpp:284
 msgid "Previous Chat Tab"
 msgstr "Předchozí záložka chatu"
 
-#: src/keyboardconfig.cpp:284
+#: src/keyboardconfig.cpp:286
 msgid "Next Chat Tab"
 msgstr "Další záložka chatu"
 
-#: src/keyboardconfig.cpp:287
+#: src/keyboardconfig.cpp:289
 msgid "Close current Chat Tab"
 msgstr "Zavřít stávající záložku chatu"
 
-#: src/keyboardconfig.cpp:289
+#: src/keyboardconfig.cpp:291
 msgid "Previous chat line"
 msgstr "Předchozí řádek chatu"
 
-#: src/keyboardconfig.cpp:291
+#: src/keyboardconfig.cpp:293
 msgid "Next chat line"
 msgstr "Další řádek chatu"
 
-#: src/keyboardconfig.cpp:293
+#: src/keyboardconfig.cpp:295
 msgid "Chat Auto Complete"
 msgstr "Autodoplňování v chatu"
 
-#: src/keyboardconfig.cpp:295
+#: src/keyboardconfig.cpp:297
 msgid "Deactivate Chat Input"
 msgstr "Deaktivovat vstup chatu"
 
-#: src/keyboardconfig.cpp:297
+#: src/keyboardconfig.cpp:299
 msgid "Other Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboardconfig.cpp:300
 msgid "Ignore input 1"
 msgstr "Ignorovat vstup 1"
 
-#: src/keyboardconfig.cpp:300
+#: src/keyboardconfig.cpp:302
 msgid "Ignore input 2"
 msgstr "Ignorovat vstup 2"
 
-#: src/keyboardconfig.cpp:302
+#: src/keyboardconfig.cpp:304
 msgid "Direct Up"
 msgstr "Otočit nahoru"
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboardconfig.cpp:305
 msgid "Direct Down"
 msgstr "Otočit dolů"
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboardconfig.cpp:307
 msgid "Direct Left"
 msgstr "Otočit vlevo"
 
-#: src/keyboardconfig.cpp:306
+#: src/keyboardconfig.cpp:308
 msgid "Direct Right"
 msgstr "Otočit vpravo"
 
-#: src/keyboardconfig.cpp:308
+#: src/keyboardconfig.cpp:310
 msgid "Crazy moves"
 msgstr "Šílené pohyby"
 
-#: src/keyboardconfig.cpp:310
+#: src/keyboardconfig.cpp:312
 msgid "Change Crazy Move mode"
 msgstr "Změnit mód šílených pohybů"
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboardconfig.cpp:314
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:314
+#: src/keyboardconfig.cpp:316
 msgid "Quick Drop N Items"
 msgstr ""
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboardconfig.cpp:318
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/keyboardconfig.cpp:318
+#: src/keyboardconfig.cpp:320
 msgid "Quick heal target or self"
 msgstr "Rychlé léčení cíle nebo sebe"
 
-#: src/keyboardconfig.cpp:320
+#: src/keyboardconfig.cpp:322
 msgid "Use #itenplz spell"
 msgstr "Použít kouzlo #itenplz"
 
-#: src/keyboardconfig.cpp:322
+#: src/keyboardconfig.cpp:324
 msgid "Use magic attack"
 msgstr "Použít magický útok"
 
-#: src/keyboardconfig.cpp:324
+#: src/keyboardconfig.cpp:326
 msgid "Switch magic attack"
 msgstr "Přepnout magický útok"
 
-#: src/keyboardconfig.cpp:326
+#: src/keyboardconfig.cpp:328
 msgid "Change move type"
 msgstr "Změnit typ pohybu"
 
-#: src/keyboardconfig.cpp:328
+#: src/keyboardconfig.cpp:330
 msgid "Change Attack Weapon Type"
 msgstr "Změnit typ útočné zbraně"
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboardconfig.cpp:332
 msgid "Change Attack Type"
 msgstr "Změnit typ útoku"
 
-#: src/keyboardconfig.cpp:332
+#: src/keyboardconfig.cpp:334
 msgid "Change Follow mode"
 msgstr "Změnit mód následování"
 
-#: src/keyboardconfig.cpp:334
+#: src/keyboardconfig.cpp:336
 msgid "Change Imitation mode"
 msgstr "Změnit mód imitace"
 
-#: src/keyboardconfig.cpp:337
+#: src/keyboardconfig.cpp:339
 msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:338
+#: src/keyboardconfig.cpp:340
 msgid "On / Off audio"
 msgstr "Zapnout/Vypnout audio"
 
-#: src/keyboardconfig.cpp:340
+#: src/keyboardconfig.cpp:342
 msgid "Enable / Disable away mode"
 msgstr "Zapnout/Vypnout Away mód"
 
-#: src/keyboardconfig.cpp:342
+#: src/keyboardconfig.cpp:344
 msgid "Emulate right click from keyboard"
 msgstr "Emulovat pravý klik z klávesnice"
 
-#: src/keyboardconfig.cpp:344
+#: src/keyboardconfig.cpp:346
 msgid "Toggle camera mode"
 msgstr "přemnout mód kamery"
 
-#: src/keyboardconfig.cpp:346
+#: src/keyboardconfig.cpp:348
 msgid "Modifier key"
 msgstr "Klávesa modifikátoru"
 
-#: src/keyboardconfig.cpp:425
+#: src/keyboardconfig.cpp:427
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -4220,37 +4228,37 @@ msgstr ""
 msgid "You were killed by "
 msgstr "Zabil vás "
 
-#: src/localplayer.cpp:1422
+#: src/localplayer.cpp:1427
 msgid "Tried to pick up nonexistent item."
 msgstr "Snažili jste se sebrat neexistující předmět."
 
-#: src/localplayer.cpp:1424
+#: src/localplayer.cpp:1429
 msgid "Item is too heavy."
 msgstr "Předmět je příliš těžký."
 
-#: src/localplayer.cpp:1426
+#: src/localplayer.cpp:1431
 msgid "Item is too far away."
 msgstr "Předmět je příliš daleko."
 
-#: src/localplayer.cpp:1428
+#: src/localplayer.cpp:1433
 msgid "Inventory is full."
 msgstr "Inventář je plný."
 
-#: src/localplayer.cpp:1430
+#: src/localplayer.cpp:1435
 msgid "Stack is too big."
 msgstr "Hromada je příliš velká."
 
-#: src/localplayer.cpp:1433
+#: src/localplayer.cpp:1438
 msgid "Item belongs to someone else."
 msgstr "Předmět patří někomu jinému."
 
-#: src/localplayer.cpp:1436
+#: src/localplayer.cpp:1441
 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:1460
+#: src/localplayer.cpp:1465
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -4258,27 +4266,27 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/localplayer.cpp:3174
+#: src/localplayer.cpp:3179
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:3494
+#: src/localplayer.cpp:3507
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3496 src/localplayer.cpp:3511
+#: src/localplayer.cpp:3509 src/localplayer.cpp:3524
 msgid "Follow canceled"
 msgstr "Následování zrušeno."
 
-#: src/localplayer.cpp:3503
+#: src/localplayer.cpp:3516
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3505 src/localplayer.cpp:3513
+#: src/localplayer.cpp:3518 src/localplayer.cpp:3526
 msgid "Imitation canceled"
 msgstr "Imitace zrušena."
 
-#: src/localplayer.cpp:3858
+#: src/localplayer.cpp:3871
 msgid "You see "
 msgstr "Vidíte "
 
diff --git a/po/de.po b/po/de.po
index 6802e25d7..8d0c459f7 100644
--- a/po/de.po
+++ b/po/de.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-09-27 22:18+0300\n"
-"PO-Revision-Date: 2011-09-27 19:20+0000\n"
+"POT-Creation-Date: 2011-10-01 01:22+0300\n"
+"PO-Revision-Date: 2011-09-30 14:45+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: German (http://www.transifex.net/projects/p/manaplus/team/"
 "de/)\n"
@@ -340,19 +340,19 @@ msgstr "Die Verbindung zum Server wurde getrennt."
 msgid "Network Error"
 msgstr "Netzwerkfehler"
 
-#: src/game.cpp:1320
+#: src/game.cpp:1321
 msgid "Ignoring incoming trade requests"
 msgstr "Ignoriere eingehende Handelsanfragen"
 
-#: src/game.cpp:1330
+#: src/game.cpp:1331
 msgid "Accepting incoming trade requests"
 msgstr "Akzeptiere eingehende Handelsanfragen"
 
-#: src/game.cpp:1727
+#: src/game.cpp:1731
 msgid "Could Not Load Map"
 msgstr "Karte konnte nicht geladen werden."
 
-#: src/game.cpp:1728
+#: src/game.cpp:1732
 #, c-format
 msgid "Error while loading %s"
 msgstr "Fehler beim Laden von %s"
@@ -410,44 +410,48 @@ msgstr "Resultat"
 msgid "Reset"
 msgstr "Zurücksetzten"
 
-#: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:98
+#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
 #: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
 #: src/gui/popupmenu.cpp:273 src/gui/popupmenu.cpp:654
 msgid "Buy"
 msgstr "Kaufen"
 
-#: src/gui/buydialog.cpp:89 src/gui/buydialog.cpp:303
+#: src/gui/buydialog.cpp:94 src/gui/buydialog.cpp:332
 #: src/gui/selldialog.cpp:88 src/gui/selldialog.cpp:325
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Preis: %s / Gesamt: %s"
 
+#: src/gui/buydialog.cpp:103
+msgid "Amount:"
+msgstr ""
+
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:94 src/gui/itemamountwindow.cpp:207
+#: 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:973
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:974
 msgid "+"
 msgstr "+"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:97 src/gui/itemamountwindow.cpp:206
+#: 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:985
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:986
 msgid "-"
 msgstr "-"
 
-#: src/gui/buydialog.cpp:99 src/gui/quitdialog.cpp:47
+#: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:294
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:84
 msgid "Quit"
 msgstr "Beenden"
 
-#: src/gui/buydialog.cpp:100 src/gui/selldialog.cpp:95
-#: src/gui/statuswindow.cpp:504 src/gui/statuswindow.cpp:553
-#: src/gui/statuswindow.cpp:972 src/gui/statuswindow.cpp:1003
+#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
+#: src/gui/statuswindow.cpp:504 src/gui/statuswindow.cpp:554
+#: src/gui/statuswindow.cpp:973 src/gui/statuswindow.cpp:1004
 msgid "Max"
 msgstr "Max"
 
@@ -925,7 +929,7 @@ msgid "Equipment"
 msgstr "Ausrüstung"
 
 #: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160
-#: src/gui/inventorywindow.cpp:538 src/gui/inventorywindow.cpp:547
+#: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554
 #: src/gui/popupmenu.cpp:1656 src/gui/popupmenu.cpp:1748
 #: src/gui/popupmenu.cpp:1793
 msgid "Unequip"
@@ -968,20 +972,20 @@ msgstr "Plätze:"
 msgid "Filter:"
 msgstr "Filter:"
 
-#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:540
-#: src/gui/inventorywindow.cpp:549 src/gui/popupmenu.cpp:1658
+#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547
+#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1658
 #: src/gui/popupmenu.cpp:1750 src/gui/popupmenu.cpp:1795
 msgid "Equip"
 msgstr "Ausrüsten"
 
-#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:541
-#: src/gui/inventorywindow.cpp:545 src/gui/popupmenu.cpp:1662
+#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548
+#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1662
 #: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1754
 #: src/gui/popupmenu.cpp:1799
 msgid "Use"
 msgstr "Benutzen"
 
-#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:645
+#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652
 #: src/gui/popupmenu.cpp:1667 src/gui/popupmenu.cpp:1759
 #: src/gui/popupmenu.cpp:1804
 msgid "Drop..."
@@ -1001,7 +1005,7 @@ msgstr "Ausrüstung"
 msgid "Weight:"
 msgstr "Gewicht:"
 
-#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:636
+#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643
 #: src/gui/popupmenu.cpp:1642 src/gui/popupmenu.cpp:1771
 #: src/gui/popupmenu.cpp:1816 src/gui/setup.cpp:73
 msgid "Store"
@@ -1011,7 +1015,7 @@ msgstr "Aufbewahren"
 msgid "Retrieve"
 msgstr "Abholen"
 
-#: src/gui/inventorywindow.cpp:647 src/gui/popupmenu.cpp:1672
+#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1672
 #: src/gui/popupmenu.cpp:1764 src/gui/popupmenu.cpp:1809
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
@@ -3066,130 +3070,130 @@ msgstr "Level: %d (GM %d)"
 msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:647 src/gui/statuswindow.cpp:712
-#: src/gui/statuswindow.cpp:732 src/gui/statuswindow.cpp:748
-#: src/gui/statuswindow.cpp:794 src/gui/statuswindow.cpp:823
-#: src/gui/statuswindow.cpp:846 src/gui/statuswindow.cpp:865
+#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:713
+#: src/gui/statuswindow.cpp:733 src/gui/statuswindow.cpp:749
+#: src/gui/statuswindow.cpp:795 src/gui/statuswindow.cpp:824
+#: src/gui/statuswindow.cpp:847 src/gui/statuswindow.cpp:866
 msgid "(D)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:650 src/gui/statuswindow.cpp:773
+#: src/gui/statuswindow.cpp:651 src/gui/statuswindow.cpp:774
 msgid "(I)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:653 src/gui/statuswindow.cpp:770
+#: src/gui/statuswindow.cpp:654 src/gui/statuswindow.cpp:771
 msgid "(c)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:656
+#: src/gui/statuswindow.cpp:657
 msgid "(C)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:659 src/gui/statuswindow.cpp:757
+#: src/gui/statuswindow.cpp:660 src/gui/statuswindow.cpp:758
 msgid "(d)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:662 src/gui/statuswindow.cpp:676
-#: src/gui/statuswindow.cpp:705 src/gui/statuswindow.cpp:724
-#: src/gui/statuswindow.cpp:741 src/gui/statuswindow.cpp:760
-#: src/gui/statuswindow.cpp:782 src/gui/statuswindow.cpp:812
-#: src/gui/statuswindow.cpp:838 src/gui/statuswindow.cpp:852
-#: src/gui/statuswindow.cpp:868 src/gui/statuswindow.cpp:881
+#: src/gui/statuswindow.cpp:663 src/gui/statuswindow.cpp:677
+#: src/gui/statuswindow.cpp:706 src/gui/statuswindow.cpp:725
+#: src/gui/statuswindow.cpp:742 src/gui/statuswindow.cpp:761
+#: src/gui/statuswindow.cpp:783 src/gui/statuswindow.cpp:813
+#: src/gui/statuswindow.cpp:839 src/gui/statuswindow.cpp:853
+#: src/gui/statuswindow.cpp:869 src/gui/statuswindow.cpp:882
 msgid "(?)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:673
+#: src/gui/statuswindow.cpp:674
 msgid "(a)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:684
+#: src/gui/statuswindow.cpp:685
 msgid "(0)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:687
+#: src/gui/statuswindow.cpp:688
 msgid "(1)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:690
+#: src/gui/statuswindow.cpp:691
 msgid "(2)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:693 src/gui/statuswindow.cpp:800
+#: src/gui/statuswindow.cpp:694 src/gui/statuswindow.cpp:801
 msgid "(3)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:696
+#: src/gui/statuswindow.cpp:697
 msgid "(5)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:699
+#: src/gui/statuswindow.cpp:700
 msgid "(7)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:702 src/gui/statuswindow.cpp:754
-#: src/gui/statuswindow.cpp:809 src/gui/statuswindow.cpp:878
+#: src/gui/statuswindow.cpp:703 src/gui/statuswindow.cpp:755
+#: src/gui/statuswindow.cpp:810 src/gui/statuswindow.cpp:879
 msgid "(A)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:715
+#: src/gui/statuswindow.cpp:716
 msgid "(R)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:718
+#: src/gui/statuswindow.cpp:719
 msgid "(M)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:721
+#: src/gui/statuswindow.cpp:722
 msgid "(P)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:735
+#: src/gui/statuswindow.cpp:736
 msgid "(s)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:738 src/gui/statuswindow.cpp:791
+#: src/gui/statuswindow.cpp:739 src/gui/statuswindow.cpp:792
 msgid "(S)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:751 src/gui/statuswindow.cpp:806
-#: src/gui/statuswindow.cpp:859
+#: src/gui/statuswindow.cpp:752 src/gui/statuswindow.cpp:807
+#: src/gui/statuswindow.cpp:860
 msgid "(G)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:767
+#: src/gui/statuswindow.cpp:768
 msgid "(f)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:776 src/gui/statuswindow.cpp:797
-#: src/gui/statuswindow.cpp:862
+#: src/gui/statuswindow.cpp:777 src/gui/statuswindow.cpp:798
+#: src/gui/statuswindow.cpp:863
 msgid "(F)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:779 src/gui/statuswindow.cpp:829
+#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:830
 msgid "(U)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:803
+#: src/gui/statuswindow.cpp:804
 msgid "(g)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:820
+#: src/gui/statuswindow.cpp:821
 msgid "(N)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:826
+#: src/gui/statuswindow.cpp:827
 msgid "(u)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:832
+#: src/gui/statuswindow.cpp:833
 msgid "(e)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:835
+#: src/gui/statuswindow.cpp:836
 msgid "(b)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:849 src/gui/statuswindow.cpp:875
+#: src/gui/statuswindow.cpp:850 src/gui/statuswindow.cpp:876
 msgid "(O)"
 msgstr ""
 
@@ -3854,369 +3858,373 @@ msgstr ""
 msgid "Stop Attack"
 msgstr "Angriff abbrechen"
 
-#: src/keyboardconfig.cpp:64
-msgid "Target Closest"
+#: src/keyboardconfig.cpp:65
+msgid "Untarget"
 msgstr ""
 
 #: src/keyboardconfig.cpp:66
+msgid "Target Closest"
+msgstr ""
+
+#: src/keyboardconfig.cpp:68
 msgid "Target NPC"
 msgstr "NPC anvisieren"
 
-#: src/keyboardconfig.cpp:67
+#: src/keyboardconfig.cpp:69
 msgid "Target Player"
 msgstr "Spieler anvisieren"
 
-#: src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:71
 msgid "Pickup"
 msgstr "Aufheben"
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:72
 msgid "Change Pickup Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:74
 msgid "Hide Windows"
 msgstr "Fenster ausblenden"
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:76
 msgid "Sit"
 msgstr "Sitzen"
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:77
 msgid "Screenshot"
 msgstr "Bildschirmfoto"
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:78
 msgid "Enable/Disable Trading"
 msgstr "Handeln erlauben/verbieten"
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:80
 msgid "Change Map View Mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:82
 msgid "Select OK"
 msgstr "OK auswählen"
 
-#: src/keyboardconfig.cpp:83
+#: src/keyboardconfig.cpp:85
 msgid "Shortcuts Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:86
 msgid "Item Shortcuts Key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:88
-#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:92
-#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:96
-#: src/keyboardconfig.cpp:98 src/keyboardconfig.cpp:100
-#: src/keyboardconfig.cpp:102 src/keyboardconfig.cpp:104
-#: src/keyboardconfig.cpp:106 src/keyboardconfig.cpp:108
-#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:112
-#: src/keyboardconfig.cpp:114 src/keyboardconfig.cpp:117
-#: src/keyboardconfig.cpp:119 src/keyboardconfig.cpp:121
-#: src/keyboardconfig.cpp:123 src/keyboardconfig.cpp:125
-#: src/keyboardconfig.cpp:367
+#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:90
+#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:94
+#: src/keyboardconfig.cpp:96 src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:100 src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:104 src/keyboardconfig.cpp:106
+#: src/keyboardconfig.cpp:108 src/keyboardconfig.cpp:110
+#: src/keyboardconfig.cpp:112 src/keyboardconfig.cpp:114
+#: src/keyboardconfig.cpp:116 src/keyboardconfig.cpp:119
+#: src/keyboardconfig.cpp:121 src/keyboardconfig.cpp:123
+#: src/keyboardconfig.cpp:125 src/keyboardconfig.cpp:127
+#: src/keyboardconfig.cpp:369
 #, c-format
 msgid "Item Shortcut %d"
 msgstr "Kurztaste %d"
 
-#: src/keyboardconfig.cpp:126
+#: src/keyboardconfig.cpp:128
 msgid "Windows Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:127
+#: src/keyboardconfig.cpp:129
 msgid "Help Window"
 msgstr "Hilfefenster"
 
-#: src/keyboardconfig.cpp:129
+#: src/keyboardconfig.cpp:131
 msgid "Status Window"
 msgstr "Statusfenster"
 
-#: src/keyboardconfig.cpp:131
+#: src/keyboardconfig.cpp:133
 msgid "Inventory Window"
 msgstr "Inventarfenster"
 
-#: src/keyboardconfig.cpp:133
+#: src/keyboardconfig.cpp:135
 msgid "Equipment Window"
 msgstr "Ausrüstungsfenster"
 
-#: src/keyboardconfig.cpp:135
+#: src/keyboardconfig.cpp:137
 msgid "Skill Window"
 msgstr "Fertigkeitenfenster"
 
-#: src/keyboardconfig.cpp:137
+#: src/keyboardconfig.cpp:139
 msgid "Minimap Window"
 msgstr "Kartenfenster"
 
-#: src/keyboardconfig.cpp:139
+#: src/keyboardconfig.cpp:141
 msgid "Chat Window"
 msgstr "Chatfenster"
 
-#: src/keyboardconfig.cpp:141
+#: src/keyboardconfig.cpp:143
 msgid "Item Shortcut Window"
 msgstr "Kurztastenfenster"
 
-#: src/keyboardconfig.cpp:143
+#: src/keyboardconfig.cpp:145
 msgid "Setup Window"
 msgstr "Einstellungen"
 
-#: src/keyboardconfig.cpp:145
+#: src/keyboardconfig.cpp:147
 msgid "Debug Window"
 msgstr "Debugfenster"
 
-#: src/keyboardconfig.cpp:147
+#: src/keyboardconfig.cpp:149
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:149
+#: src/keyboardconfig.cpp:151
 msgid "Emote Shortcut Window"
 msgstr "Kurztasten für Gefühle"
 
-#: src/keyboardconfig.cpp:151
+#: src/keyboardconfig.cpp:153
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:153
+#: src/keyboardconfig.cpp:155
 msgid "Shop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:155
+#: src/keyboardconfig.cpp:157
 msgid "Quick drop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:157
+#: src/keyboardconfig.cpp:159
 msgid "Kill Stats Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboardconfig.cpp:161
 msgid "Commands Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboardconfig.cpp:163
 msgid "Bot Checker Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:164
+#: src/keyboardconfig.cpp:166
 msgid "Who Is Online Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:166
+#: src/keyboardconfig.cpp:168
 msgid "Did you know Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:169
+#: src/keyboardconfig.cpp:171
 msgid "Previous Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:171
+#: src/keyboardconfig.cpp:173
 msgid "Next Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:173
+#: src/keyboardconfig.cpp:175
 msgid "Emotes Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:174
+#: src/keyboardconfig.cpp:176
 msgid "Smilie"
 msgstr "Grinsen"
 
-#: src/keyboardconfig.cpp:175 src/keyboardconfig.cpp:177
-#: src/keyboardconfig.cpp:179 src/keyboardconfig.cpp:181
-#: src/keyboardconfig.cpp:183 src/keyboardconfig.cpp:185
-#: src/keyboardconfig.cpp:187 src/keyboardconfig.cpp:189
-#: src/keyboardconfig.cpp:191 src/keyboardconfig.cpp:193
-#: src/keyboardconfig.cpp:195 src/keyboardconfig.cpp:197
-#: src/keyboardconfig.cpp:200 src/keyboardconfig.cpp:202
-#: src/keyboardconfig.cpp:204 src/keyboardconfig.cpp:206
-#: src/keyboardconfig.cpp:208 src/keyboardconfig.cpp:210
-#: src/keyboardconfig.cpp:212 src/keyboardconfig.cpp:214
-#: src/keyboardconfig.cpp:216 src/keyboardconfig.cpp:218
-#: src/keyboardconfig.cpp:220 src/keyboardconfig.cpp:222
-#: src/keyboardconfig.cpp:224 src/keyboardconfig.cpp:227
-#: src/keyboardconfig.cpp:230 src/keyboardconfig.cpp:233
-#: src/keyboardconfig.cpp:235 src/keyboardconfig.cpp:237
-#: src/keyboardconfig.cpp:239 src/keyboardconfig.cpp:241
-#: src/keyboardconfig.cpp:243 src/keyboardconfig.cpp:245
-#: src/keyboardconfig.cpp:247 src/keyboardconfig.cpp:249
-#: src/keyboardconfig.cpp:251 src/keyboardconfig.cpp:254
-#: src/keyboardconfig.cpp:256 src/keyboardconfig.cpp:258
-#: src/keyboardconfig.cpp:260 src/keyboardconfig.cpp:262
-#: src/keyboardconfig.cpp:264 src/keyboardconfig.cpp:266
-#: src/keyboardconfig.cpp:362
+#: src/keyboardconfig.cpp:177 src/keyboardconfig.cpp:179
+#: src/keyboardconfig.cpp:181 src/keyboardconfig.cpp:183
+#: src/keyboardconfig.cpp:185 src/keyboardconfig.cpp:187
+#: src/keyboardconfig.cpp:189 src/keyboardconfig.cpp:191
+#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
+#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
+#: src/keyboardconfig.cpp:202 src/keyboardconfig.cpp:204
+#: src/keyboardconfig.cpp:206 src/keyboardconfig.cpp:208
+#: src/keyboardconfig.cpp:210 src/keyboardconfig.cpp:212
+#: src/keyboardconfig.cpp:214 src/keyboardconfig.cpp:216
+#: src/keyboardconfig.cpp:218 src/keyboardconfig.cpp:220
+#: src/keyboardconfig.cpp:222 src/keyboardconfig.cpp:224
+#: src/keyboardconfig.cpp:226 src/keyboardconfig.cpp:229
+#: src/keyboardconfig.cpp:232 src/keyboardconfig.cpp:235
+#: src/keyboardconfig.cpp:237 src/keyboardconfig.cpp:239
+#: src/keyboardconfig.cpp:241 src/keyboardconfig.cpp:243
+#: src/keyboardconfig.cpp:245 src/keyboardconfig.cpp:247
+#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
+#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:256
+#: src/keyboardconfig.cpp:258 src/keyboardconfig.cpp:260
+#: src/keyboardconfig.cpp:262 src/keyboardconfig.cpp:264
+#: src/keyboardconfig.cpp:266 src/keyboardconfig.cpp:268
+#: src/keyboardconfig.cpp:364
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "Gefühlstaste %d"
 
-#: src/keyboardconfig.cpp:268
+#: src/keyboardconfig.cpp:270
 msgid "Outfits Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:269
+#: src/keyboardconfig.cpp:271
 msgid "Wear Outfit"
 msgstr "Ausrüstung anziehen"
 
-#: src/keyboardconfig.cpp:271
+#: src/keyboardconfig.cpp:273
 msgid "Copy Outfit"
 msgstr "Ausrüstung kopieren"
 
-#: src/keyboardconfig.cpp:273
+#: src/keyboardconfig.cpp:275
 msgid "Copy equipped to Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:275
+#: src/keyboardconfig.cpp:277
 msgid "Chat Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:276
+#: src/keyboardconfig.cpp:278
 msgid "Toggle Chat"
 msgstr "Chat ein/aus"
 
-#: src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:280
 msgid "Scroll Chat Up"
 msgstr "Im Chat hochscrollen"
 
-#: src/keyboardconfig.cpp:280
+#: src/keyboardconfig.cpp:282
 msgid "Scroll Chat Down"
 msgstr "Im Chat runter scrollen"
 
-#: src/keyboardconfig.cpp:282
+#: src/keyboardconfig.cpp:284
 msgid "Previous Chat Tab"
 msgstr "Voriger Tab"
 
-#: src/keyboardconfig.cpp:284
+#: src/keyboardconfig.cpp:286
 msgid "Next Chat Tab"
 msgstr "Nächster Tab"
 
-#: src/keyboardconfig.cpp:287
+#: src/keyboardconfig.cpp:289
 msgid "Close current Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:289
+#: src/keyboardconfig.cpp:291
 msgid "Previous chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:291
+#: src/keyboardconfig.cpp:293
 msgid "Next chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:293
+#: src/keyboardconfig.cpp:295
 msgid "Chat Auto Complete"
 msgstr ""
 
-#: src/keyboardconfig.cpp:295
+#: src/keyboardconfig.cpp:297
 msgid "Deactivate Chat Input"
 msgstr ""
 
-#: src/keyboardconfig.cpp:297
+#: src/keyboardconfig.cpp:299
 msgid "Other Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboardconfig.cpp:300
 msgid "Ignore input 1"
 msgstr "Ignoriere Eingabe 1"
 
-#: src/keyboardconfig.cpp:300
+#: src/keyboardconfig.cpp:302
 msgid "Ignore input 2"
 msgstr "Ignoriere Eingabe 2"
 
-#: src/keyboardconfig.cpp:302
+#: src/keyboardconfig.cpp:304
 msgid "Direct Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboardconfig.cpp:305
 msgid "Direct Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboardconfig.cpp:307
 msgid "Direct Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:306
+#: src/keyboardconfig.cpp:308
 msgid "Direct Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:308
+#: src/keyboardconfig.cpp:310
 msgid "Crazy moves"
 msgstr ""
 
-#: src/keyboardconfig.cpp:310
+#: src/keyboardconfig.cpp:312
 msgid "Change Crazy Move mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboardconfig.cpp:314
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:314
+#: src/keyboardconfig.cpp:316
 msgid "Quick Drop N Items"
 msgstr ""
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboardconfig.cpp:318
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/keyboardconfig.cpp:318
+#: src/keyboardconfig.cpp:320
 msgid "Quick heal target or self"
 msgstr ""
 
-#: src/keyboardconfig.cpp:320
+#: src/keyboardconfig.cpp:322
 msgid "Use #itenplz spell"
 msgstr ""
 
-#: src/keyboardconfig.cpp:322
+#: src/keyboardconfig.cpp:324
 msgid "Use magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:324
+#: src/keyboardconfig.cpp:326
 msgid "Switch magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:326
+#: src/keyboardconfig.cpp:328
 msgid "Change move type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:328
+#: src/keyboardconfig.cpp:330
 msgid "Change Attack Weapon Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboardconfig.cpp:332
 msgid "Change Attack Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:332
+#: src/keyboardconfig.cpp:334
 msgid "Change Follow mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:334
+#: src/keyboardconfig.cpp:336
 msgid "Change Imitation mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:337
+#: src/keyboardconfig.cpp:339
 msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:338
+#: src/keyboardconfig.cpp:340
 msgid "On / Off audio"
 msgstr ""
 
-#: src/keyboardconfig.cpp:340
+#: src/keyboardconfig.cpp:342
 msgid "Enable / Disable away mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:342
+#: src/keyboardconfig.cpp:344
 msgid "Emulate right click from keyboard"
 msgstr ""
 
-#: src/keyboardconfig.cpp:344
+#: src/keyboardconfig.cpp:346
 msgid "Toggle camera mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:346
+#: src/keyboardconfig.cpp:348
 msgid "Modifier key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:425
+#: src/keyboardconfig.cpp:427
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -4227,64 +4235,64 @@ msgstr ""
 msgid "You were killed by "
 msgstr ""
 
-#: src/localplayer.cpp:1422
+#: src/localplayer.cpp:1427
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1424
+#: src/localplayer.cpp:1429
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1426
+#: src/localplayer.cpp:1431
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1428
+#: src/localplayer.cpp:1433
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1430
+#: src/localplayer.cpp:1435
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1433
+#: src/localplayer.cpp:1438
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1436
+#: src/localplayer.cpp:1441
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1460
+#: src/localplayer.cpp:1465
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/localplayer.cpp:3174
+#: src/localplayer.cpp:3179
 msgid "Away"
 msgstr "Abwesend"
 
-#: src/localplayer.cpp:3494
+#: src/localplayer.cpp:3507
 msgid "Follow: "
 msgstr "Folgen:"
 
-#: src/localplayer.cpp:3496 src/localplayer.cpp:3511
+#: src/localplayer.cpp:3509 src/localplayer.cpp:3524
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3503
+#: src/localplayer.cpp:3516
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3505 src/localplayer.cpp:3513
+#: src/localplayer.cpp:3518 src/localplayer.cpp:3526
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3858
+#: src/localplayer.cpp:3871
 msgid "You see "
 msgstr "Du siehst"
 
diff --git a/po/es.po b/po/es.po
index 52325a3fd..2ad19eb6b 100644
--- a/po/es.po
+++ b/po/es.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-09-27 22:18+0300\n"
-"PO-Revision-Date: 2011-09-27 19:30+0000\n"
-"Last-Translator: nelson6e65 <nelson6e65-manaplus@yahoo.es>\n"
+"POT-Creation-Date: 2011-10-01 01:22+0300\n"
+"PO-Revision-Date: 2011-09-30 14:45+0000\n"
+"Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/"
 "manaplus/team/es/)\n"
 "Language: es\n"
@@ -339,19 +339,19 @@ msgstr "Se ha perdido la conexión con el servidor."
 msgid "Network Error"
 msgstr "Error de Red"
 
-#: src/game.cpp:1320
+#: src/game.cpp:1321
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorando las peticiones de intercambio"
 
-#: src/game.cpp:1330
+#: src/game.cpp:1331
 msgid "Accepting incoming trade requests"
 msgstr "Aceptando las peticiones de intercambio"
 
-#: src/game.cpp:1727
+#: src/game.cpp:1731
 msgid "Could Not Load Map"
 msgstr "No se pudo cargar el mapa"
 
-#: src/game.cpp:1728
+#: src/game.cpp:1732
 #, c-format
 msgid "Error while loading %s"
 msgstr "Error mientras cargaba %s"
@@ -409,44 +409,48 @@ msgstr "Resultado"
 msgid "Reset"
 msgstr "Restablecer"
 
-#: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:98
+#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
 #: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
 #: src/gui/popupmenu.cpp:273 src/gui/popupmenu.cpp:654
 msgid "Buy"
 msgstr "Comprar"
 
-#: src/gui/buydialog.cpp:89 src/gui/buydialog.cpp:303
+#: src/gui/buydialog.cpp:94 src/gui/buydialog.cpp:332
 #: src/gui/selldialog.cpp:88 src/gui/selldialog.cpp:325
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Precio: %s / Total: %s"
 
+#: src/gui/buydialog.cpp:103
+msgid "Amount:"
+msgstr ""
+
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:94 src/gui/itemamountwindow.cpp:207
+#: 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:973
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:974
 msgid "+"
 msgstr "+"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:97 src/gui/itemamountwindow.cpp:206
+#: 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:985
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:986
 msgid "-"
 msgstr "-"
 
-#: src/gui/buydialog.cpp:99 src/gui/quitdialog.cpp:47
+#: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:294
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:84
 msgid "Quit"
 msgstr "Salir"
 
-#: src/gui/buydialog.cpp:100 src/gui/selldialog.cpp:95
-#: src/gui/statuswindow.cpp:504 src/gui/statuswindow.cpp:553
-#: src/gui/statuswindow.cpp:972 src/gui/statuswindow.cpp:1003
+#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
+#: src/gui/statuswindow.cpp:504 src/gui/statuswindow.cpp:554
+#: src/gui/statuswindow.cpp:973 src/gui/statuswindow.cpp:1004
 msgid "Max"
 msgstr "Máximo"
 
@@ -924,7 +928,7 @@ msgid "Equipment"
 msgstr "Equipamiento"
 
 #: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160
-#: src/gui/inventorywindow.cpp:538 src/gui/inventorywindow.cpp:547
+#: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554
 #: src/gui/popupmenu.cpp:1656 src/gui/popupmenu.cpp:1748
 #: src/gui/popupmenu.cpp:1793
 msgid "Unequip"
@@ -967,20 +971,20 @@ msgstr "Espacios:"
 msgid "Filter:"
 msgstr "Filtro:"
 
-#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:540
-#: src/gui/inventorywindow.cpp:549 src/gui/popupmenu.cpp:1658
+#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547
+#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1658
 #: src/gui/popupmenu.cpp:1750 src/gui/popupmenu.cpp:1795
 msgid "Equip"
 msgstr "Equipar"
 
-#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:541
-#: src/gui/inventorywindow.cpp:545 src/gui/popupmenu.cpp:1662
+#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548
+#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1662
 #: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1754
 #: src/gui/popupmenu.cpp:1799
 msgid "Use"
 msgstr "Usar"
 
-#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:645
+#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652
 #: src/gui/popupmenu.cpp:1667 src/gui/popupmenu.cpp:1759
 #: src/gui/popupmenu.cpp:1804
 msgid "Drop..."
@@ -1000,7 +1004,7 @@ msgstr "Conjuntos"
 msgid "Weight:"
 msgstr "Peso:"
 
-#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:636
+#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643
 #: src/gui/popupmenu.cpp:1642 src/gui/popupmenu.cpp:1771
 #: src/gui/popupmenu.cpp:1816 src/gui/setup.cpp:73
 msgid "Store"
@@ -1010,7 +1014,7 @@ msgstr "Almacenar"
 msgid "Retrieve"
 msgstr "Recuperar"
 
-#: src/gui/inventorywindow.cpp:647 src/gui/popupmenu.cpp:1672
+#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1672
 #: src/gui/popupmenu.cpp:1764 src/gui/popupmenu.cpp:1809
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
@@ -3060,130 +3064,130 @@ msgstr "Nivel: %d (GM %d)"
 msgid "Correction points: %d"
 msgstr "Puntos de corrección: %d"
 
-#: src/gui/statuswindow.cpp:647 src/gui/statuswindow.cpp:712
-#: src/gui/statuswindow.cpp:732 src/gui/statuswindow.cpp:748
-#: src/gui/statuswindow.cpp:794 src/gui/statuswindow.cpp:823
-#: src/gui/statuswindow.cpp:846 src/gui/statuswindow.cpp:865
+#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:713
+#: src/gui/statuswindow.cpp:733 src/gui/statuswindow.cpp:749
+#: src/gui/statuswindow.cpp:795 src/gui/statuswindow.cpp:824
+#: src/gui/statuswindow.cpp:847 src/gui/statuswindow.cpp:866
 msgid "(D)"
 msgstr "(D)"
 
-#: src/gui/statuswindow.cpp:650 src/gui/statuswindow.cpp:773
+#: src/gui/statuswindow.cpp:651 src/gui/statuswindow.cpp:774
 msgid "(I)"
 msgstr "(I)"
 
-#: src/gui/statuswindow.cpp:653 src/gui/statuswindow.cpp:770
+#: src/gui/statuswindow.cpp:654 src/gui/statuswindow.cpp:771
 msgid "(c)"
 msgstr "(c)"
 
-#: src/gui/statuswindow.cpp:656
+#: src/gui/statuswindow.cpp:657
 msgid "(C)"
 msgstr "(C)"
 
-#: src/gui/statuswindow.cpp:659 src/gui/statuswindow.cpp:757
+#: src/gui/statuswindow.cpp:660 src/gui/statuswindow.cpp:758
 msgid "(d)"
 msgstr "(d)"
 
-#: src/gui/statuswindow.cpp:662 src/gui/statuswindow.cpp:676
-#: src/gui/statuswindow.cpp:705 src/gui/statuswindow.cpp:724
-#: src/gui/statuswindow.cpp:741 src/gui/statuswindow.cpp:760
-#: src/gui/statuswindow.cpp:782 src/gui/statuswindow.cpp:812
-#: src/gui/statuswindow.cpp:838 src/gui/statuswindow.cpp:852
-#: src/gui/statuswindow.cpp:868 src/gui/statuswindow.cpp:881
+#: src/gui/statuswindow.cpp:663 src/gui/statuswindow.cpp:677
+#: src/gui/statuswindow.cpp:706 src/gui/statuswindow.cpp:725
+#: src/gui/statuswindow.cpp:742 src/gui/statuswindow.cpp:761
+#: src/gui/statuswindow.cpp:783 src/gui/statuswindow.cpp:813
+#: src/gui/statuswindow.cpp:839 src/gui/statuswindow.cpp:853
+#: src/gui/statuswindow.cpp:869 src/gui/statuswindow.cpp:882
 msgid "(?)"
 msgstr "(?)"
 
-#: src/gui/statuswindow.cpp:673
+#: src/gui/statuswindow.cpp:674
 msgid "(a)"
 msgstr "(a)"
 
-#: src/gui/statuswindow.cpp:684
+#: src/gui/statuswindow.cpp:685
 msgid "(0)"
 msgstr "(0)"
 
-#: src/gui/statuswindow.cpp:687
+#: src/gui/statuswindow.cpp:688
 msgid "(1)"
 msgstr "(1)"
 
-#: src/gui/statuswindow.cpp:690
+#: src/gui/statuswindow.cpp:691
 msgid "(2)"
 msgstr "(2)"
 
-#: src/gui/statuswindow.cpp:693 src/gui/statuswindow.cpp:800
+#: src/gui/statuswindow.cpp:694 src/gui/statuswindow.cpp:801
 msgid "(3)"
 msgstr "(3)"
 
-#: src/gui/statuswindow.cpp:696
+#: src/gui/statuswindow.cpp:697
 msgid "(5)"
 msgstr "(5)"
 
-#: src/gui/statuswindow.cpp:699
+#: src/gui/statuswindow.cpp:700
 msgid "(7)"
 msgstr "(7)"
 
-#: src/gui/statuswindow.cpp:702 src/gui/statuswindow.cpp:754
-#: src/gui/statuswindow.cpp:809 src/gui/statuswindow.cpp:878
+#: src/gui/statuswindow.cpp:703 src/gui/statuswindow.cpp:755
+#: src/gui/statuswindow.cpp:810 src/gui/statuswindow.cpp:879
 msgid "(A)"
 msgstr "(A)"
 
-#: src/gui/statuswindow.cpp:715
+#: src/gui/statuswindow.cpp:716
 msgid "(R)"
 msgstr "(R)"
 
-#: src/gui/statuswindow.cpp:718
+#: src/gui/statuswindow.cpp:719
 msgid "(M)"
 msgstr "(M)"
 
-#: src/gui/statuswindow.cpp:721
+#: src/gui/statuswindow.cpp:722
 msgid "(P)"
 msgstr "(P)"
 
-#: src/gui/statuswindow.cpp:735
+#: src/gui/statuswindow.cpp:736
 msgid "(s)"
 msgstr "(s)"
 
-#: src/gui/statuswindow.cpp:738 src/gui/statuswindow.cpp:791
+#: src/gui/statuswindow.cpp:739 src/gui/statuswindow.cpp:792
 msgid "(S)"
 msgstr "(S)"
 
-#: src/gui/statuswindow.cpp:751 src/gui/statuswindow.cpp:806
-#: src/gui/statuswindow.cpp:859
+#: src/gui/statuswindow.cpp:752 src/gui/statuswindow.cpp:807
+#: src/gui/statuswindow.cpp:860
 msgid "(G)"
 msgstr "(G)"
 
-#: src/gui/statuswindow.cpp:767
+#: src/gui/statuswindow.cpp:768
 msgid "(f)"
 msgstr "(f)"
 
-#: src/gui/statuswindow.cpp:776 src/gui/statuswindow.cpp:797
-#: src/gui/statuswindow.cpp:862
+#: src/gui/statuswindow.cpp:777 src/gui/statuswindow.cpp:798
+#: src/gui/statuswindow.cpp:863
 msgid "(F)"
 msgstr "(F)"
 
-#: src/gui/statuswindow.cpp:779 src/gui/statuswindow.cpp:829
+#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:830
 msgid "(U)"
 msgstr "(U)"
 
-#: src/gui/statuswindow.cpp:803
+#: src/gui/statuswindow.cpp:804
 msgid "(g)"
 msgstr "(g)"
 
-#: src/gui/statuswindow.cpp:820
+#: src/gui/statuswindow.cpp:821
 msgid "(N)"
 msgstr "(N)"
 
-#: src/gui/statuswindow.cpp:826
+#: src/gui/statuswindow.cpp:827
 msgid "(u)"
 msgstr "(u)"
 
-#: src/gui/statuswindow.cpp:832
+#: src/gui/statuswindow.cpp:833
 msgid "(e)"
 msgstr "(e)"
 
-#: src/gui/statuswindow.cpp:835
+#: src/gui/statuswindow.cpp:836
 msgid "(b)"
 msgstr "(b)"
 
-#: src/gui/statuswindow.cpp:849 src/gui/statuswindow.cpp:875
+#: src/gui/statuswindow.cpp:850 src/gui/statuswindow.cpp:876
 msgid "(O)"
 msgstr "(O)"
 
@@ -3848,369 +3852,373 @@ msgstr "Mover al punto de navegación"
 msgid "Stop Attack"
 msgstr "Parar el ataque"
 
-#: src/keyboardconfig.cpp:64
+#: src/keyboardconfig.cpp:65
+msgid "Untarget"
+msgstr ""
+
+#: src/keyboardconfig.cpp:66
 msgid "Target Closest"
 msgstr "Apuntar al más cercano"
 
-#: src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:68
 msgid "Target NPC"
 msgstr "Seleccionar NPC"
 
-#: src/keyboardconfig.cpp:67
+#: src/keyboardconfig.cpp:69
 msgid "Target Player"
 msgstr "Seleccionar Jugador"
 
-#: src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:71
 msgid "Pickup"
 msgstr "Coger"
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:72
 msgid "Change Pickup Type"
 msgstr "Cambiar el tipo de recogida"
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:74
 msgid "Hide Windows"
 msgstr "Esconder ventanas"
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:76
 msgid "Sit"
 msgstr "Sentarse"
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:77
 msgid "Screenshot"
 msgstr "Imprimir pantalla"
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:78
 msgid "Enable/Disable Trading"
 msgstr "Habilitar/Desabilitar intercambios"
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:80
 msgid "Change Map View Mode"
 msgstr "Cambiar el tipo de vista del mapa"
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:82
 msgid "Select OK"
 msgstr "Seleccionar OK"
 
-#: src/keyboardconfig.cpp:83
+#: src/keyboardconfig.cpp:85
 msgid "Shortcuts Keys"
 msgstr "Teclas de Atajos"
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:86
 msgid "Item Shortcuts Key"
 msgstr "Tecla de acceso directo de objeto"
 
-#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:88
-#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:92
-#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:96
-#: src/keyboardconfig.cpp:98 src/keyboardconfig.cpp:100
-#: src/keyboardconfig.cpp:102 src/keyboardconfig.cpp:104
-#: src/keyboardconfig.cpp:106 src/keyboardconfig.cpp:108
-#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:112
-#: src/keyboardconfig.cpp:114 src/keyboardconfig.cpp:117
-#: src/keyboardconfig.cpp:119 src/keyboardconfig.cpp:121
-#: src/keyboardconfig.cpp:123 src/keyboardconfig.cpp:125
-#: src/keyboardconfig.cpp:367
+#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:90
+#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:94
+#: src/keyboardconfig.cpp:96 src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:100 src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:104 src/keyboardconfig.cpp:106
+#: src/keyboardconfig.cpp:108 src/keyboardconfig.cpp:110
+#: src/keyboardconfig.cpp:112 src/keyboardconfig.cpp:114
+#: src/keyboardconfig.cpp:116 src/keyboardconfig.cpp:119
+#: src/keyboardconfig.cpp:121 src/keyboardconfig.cpp:123
+#: src/keyboardconfig.cpp:125 src/keyboardconfig.cpp:127
+#: src/keyboardconfig.cpp:369
 #, c-format
 msgid "Item Shortcut %d"
 msgstr "Atajo para el objeto %d"
 
-#: src/keyboardconfig.cpp:126
+#: src/keyboardconfig.cpp:128
 msgid "Windows Keys"
 msgstr "Teclas de Ventanas"
 
-#: src/keyboardconfig.cpp:127
+#: src/keyboardconfig.cpp:129
 msgid "Help Window"
 msgstr "Ventana de ayuda"
 
-#: src/keyboardconfig.cpp:129
+#: src/keyboardconfig.cpp:131
 msgid "Status Window"
 msgstr "Ventana de Estado"
 
-#: src/keyboardconfig.cpp:131
+#: src/keyboardconfig.cpp:133
 msgid "Inventory Window"
 msgstr "Ventana de inventario"
 
-#: src/keyboardconfig.cpp:133
+#: src/keyboardconfig.cpp:135
 msgid "Equipment Window"
 msgstr "Ventana de equipamiento"
 
-#: src/keyboardconfig.cpp:135
+#: src/keyboardconfig.cpp:137
 msgid "Skill Window"
 msgstr "Ventana de habilidades"
 
-#: src/keyboardconfig.cpp:137
+#: src/keyboardconfig.cpp:139
 msgid "Minimap Window"
 msgstr "Ventana del minimapa"
 
-#: src/keyboardconfig.cpp:139
+#: src/keyboardconfig.cpp:141
 msgid "Chat Window"
 msgstr "Ventana de Chat"
 
-#: src/keyboardconfig.cpp:141
+#: src/keyboardconfig.cpp:143
 msgid "Item Shortcut Window"
 msgstr "Ventana de atajos para objetos"
 
-#: src/keyboardconfig.cpp:143
+#: src/keyboardconfig.cpp:145
 msgid "Setup Window"
 msgstr "Ventana de Configuración"
 
-#: src/keyboardconfig.cpp:145
+#: src/keyboardconfig.cpp:147
 msgid "Debug Window"
 msgstr "Ventana de Problemas"
 
-#: src/keyboardconfig.cpp:147
+#: src/keyboardconfig.cpp:149
 msgid "Social Window"
 msgstr "Ventana Social"
 
-#: src/keyboardconfig.cpp:149
+#: src/keyboardconfig.cpp:151
 msgid "Emote Shortcut Window"
 msgstr "Ventana de Emoticonos"
 
-#: src/keyboardconfig.cpp:151
+#: src/keyboardconfig.cpp:153
 msgid "Outfits Window"
 msgstr "Ventana de Conjuntos"
 
-#: src/keyboardconfig.cpp:153
+#: src/keyboardconfig.cpp:155
 msgid "Shop Window"
 msgstr "Ventana de la tienda"
 
-#: src/keyboardconfig.cpp:155
+#: src/keyboardconfig.cpp:157
 msgid "Quick drop Window"
 msgstr "Ventana de lanzamiento de objetos"
 
-#: src/keyboardconfig.cpp:157
+#: src/keyboardconfig.cpp:159
 msgid "Kill Stats Window"
 msgstr "Ventana de Estadísticas"
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboardconfig.cpp:161
 msgid "Commands Window"
 msgstr "Ventana de comandos"
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboardconfig.cpp:163
 msgid "Bot Checker Window"
 msgstr "Ventana de comprobador de robot"
 
-#: src/keyboardconfig.cpp:164
+#: src/keyboardconfig.cpp:166
 msgid "Who Is Online Window"
 msgstr "Ventana de jugadores conectados"
 
-#: src/keyboardconfig.cpp:166
+#: src/keyboardconfig.cpp:168
 msgid "Did you know Window"
 msgstr "Ventana ¿Sabías que.."
 
-#: src/keyboardconfig.cpp:169
+#: src/keyboardconfig.cpp:171
 msgid "Previous Social Tab"
 msgstr "Pestaña Social Previa"
 
-#: src/keyboardconfig.cpp:171
+#: src/keyboardconfig.cpp:173
 msgid "Next Social Tab"
 msgstr "Pestaña Social Siguiente"
 
-#: src/keyboardconfig.cpp:173
+#: src/keyboardconfig.cpp:175
 msgid "Emotes Keys"
 msgstr "Teclas de Emoticones"
 
-#: src/keyboardconfig.cpp:174
+#: src/keyboardconfig.cpp:176
 msgid "Smilie"
 msgstr "Emoticono"
 
-#: src/keyboardconfig.cpp:175 src/keyboardconfig.cpp:177
-#: src/keyboardconfig.cpp:179 src/keyboardconfig.cpp:181
-#: src/keyboardconfig.cpp:183 src/keyboardconfig.cpp:185
-#: src/keyboardconfig.cpp:187 src/keyboardconfig.cpp:189
-#: src/keyboardconfig.cpp:191 src/keyboardconfig.cpp:193
-#: src/keyboardconfig.cpp:195 src/keyboardconfig.cpp:197
-#: src/keyboardconfig.cpp:200 src/keyboardconfig.cpp:202
-#: src/keyboardconfig.cpp:204 src/keyboardconfig.cpp:206
-#: src/keyboardconfig.cpp:208 src/keyboardconfig.cpp:210
-#: src/keyboardconfig.cpp:212 src/keyboardconfig.cpp:214
-#: src/keyboardconfig.cpp:216 src/keyboardconfig.cpp:218
-#: src/keyboardconfig.cpp:220 src/keyboardconfig.cpp:222
-#: src/keyboardconfig.cpp:224 src/keyboardconfig.cpp:227
-#: src/keyboardconfig.cpp:230 src/keyboardconfig.cpp:233
-#: src/keyboardconfig.cpp:235 src/keyboardconfig.cpp:237
-#: src/keyboardconfig.cpp:239 src/keyboardconfig.cpp:241
-#: src/keyboardconfig.cpp:243 src/keyboardconfig.cpp:245
-#: src/keyboardconfig.cpp:247 src/keyboardconfig.cpp:249
-#: src/keyboardconfig.cpp:251 src/keyboardconfig.cpp:254
-#: src/keyboardconfig.cpp:256 src/keyboardconfig.cpp:258
-#: src/keyboardconfig.cpp:260 src/keyboardconfig.cpp:262
-#: src/keyboardconfig.cpp:264 src/keyboardconfig.cpp:266
-#: src/keyboardconfig.cpp:362
+#: src/keyboardconfig.cpp:177 src/keyboardconfig.cpp:179
+#: src/keyboardconfig.cpp:181 src/keyboardconfig.cpp:183
+#: src/keyboardconfig.cpp:185 src/keyboardconfig.cpp:187
+#: src/keyboardconfig.cpp:189 src/keyboardconfig.cpp:191
+#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
+#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
+#: src/keyboardconfig.cpp:202 src/keyboardconfig.cpp:204
+#: src/keyboardconfig.cpp:206 src/keyboardconfig.cpp:208
+#: src/keyboardconfig.cpp:210 src/keyboardconfig.cpp:212
+#: src/keyboardconfig.cpp:214 src/keyboardconfig.cpp:216
+#: src/keyboardconfig.cpp:218 src/keyboardconfig.cpp:220
+#: src/keyboardconfig.cpp:222 src/keyboardconfig.cpp:224
+#: src/keyboardconfig.cpp:226 src/keyboardconfig.cpp:229
+#: src/keyboardconfig.cpp:232 src/keyboardconfig.cpp:235
+#: src/keyboardconfig.cpp:237 src/keyboardconfig.cpp:239
+#: src/keyboardconfig.cpp:241 src/keyboardconfig.cpp:243
+#: src/keyboardconfig.cpp:245 src/keyboardconfig.cpp:247
+#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
+#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:256
+#: src/keyboardconfig.cpp:258 src/keyboardconfig.cpp:260
+#: src/keyboardconfig.cpp:262 src/keyboardconfig.cpp:264
+#: src/keyboardconfig.cpp:266 src/keyboardconfig.cpp:268
+#: src/keyboardconfig.cpp:364
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "Atajo para Emoticono %d"
 
-#: src/keyboardconfig.cpp:268
+#: src/keyboardconfig.cpp:270
 msgid "Outfits Keys"
 msgstr "Teclas de Conjuntos"
 
-#: src/keyboardconfig.cpp:269
+#: src/keyboardconfig.cpp:271
 msgid "Wear Outfit"
 msgstr "Ponerse el conjunto"
 
-#: src/keyboardconfig.cpp:271
+#: src/keyboardconfig.cpp:273
 msgid "Copy Outfit"
 msgstr "Copiar el conjunto"
 
-#: src/keyboardconfig.cpp:273
+#: src/keyboardconfig.cpp:275
 msgid "Copy equipped to Outfit"
 msgstr "Copiar lo que tiene equipado a Conjunto"
 
-#: src/keyboardconfig.cpp:275
+#: src/keyboardconfig.cpp:277
 msgid "Chat Keys"
 msgstr "Teclas del Chat"
 
-#: src/keyboardconfig.cpp:276
+#: src/keyboardconfig.cpp:278
 msgid "Toggle Chat"
 msgstr "Cambiar Chat"
 
-#: src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:280
 msgid "Scroll Chat Up"
 msgstr "Desplazarse hacia arriba en el chat"
 
-#: src/keyboardconfig.cpp:280
+#: src/keyboardconfig.cpp:282
 msgid "Scroll Chat Down"
 msgstr "Desplazarse hacia abajo en el chat"
 
-#: src/keyboardconfig.cpp:282
+#: src/keyboardconfig.cpp:284
 msgid "Previous Chat Tab"
 msgstr "Pestaña de Chat Anterior"
 
-#: src/keyboardconfig.cpp:284
+#: src/keyboardconfig.cpp:286
 msgid "Next Chat Tab"
 msgstr "Siguiente Pestaña De Chat"
 
-#: src/keyboardconfig.cpp:287
+#: src/keyboardconfig.cpp:289
 msgid "Close current Chat Tab"
 msgstr "Cerrar la Pestaña activa del Chat"
 
-#: src/keyboardconfig.cpp:289
+#: src/keyboardconfig.cpp:291
 msgid "Previous chat line"
 msgstr "Línea previa del chat"
 
-#: src/keyboardconfig.cpp:291
+#: src/keyboardconfig.cpp:293
 msgid "Next chat line"
 msgstr "Siguiente línea del chat"
 
-#: src/keyboardconfig.cpp:293
+#: src/keyboardconfig.cpp:295
 msgid "Chat Auto Complete"
 msgstr "Completar texto automáticamente en chat"
 
-#: src/keyboardconfig.cpp:295
+#: src/keyboardconfig.cpp:297
 msgid "Deactivate Chat Input"
 msgstr "Desactivar entrada al Chat"
 
-#: src/keyboardconfig.cpp:297
+#: src/keyboardconfig.cpp:299
 msgid "Other Keys"
 msgstr "Otras Teclas"
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboardconfig.cpp:300
 msgid "Ignore input 1"
 msgstr "Ignorar input 1"
 
-#: src/keyboardconfig.cpp:300
+#: src/keyboardconfig.cpp:302
 msgid "Ignore input 2"
 msgstr "Ignorar input 2"
 
-#: src/keyboardconfig.cpp:302
+#: src/keyboardconfig.cpp:304
 msgid "Direct Up"
 msgstr "Arriba"
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboardconfig.cpp:305
 msgid "Direct Down"
 msgstr "Abajo"
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboardconfig.cpp:307
 msgid "Direct Left"
 msgstr "Izquierda"
 
-#: src/keyboardconfig.cpp:306
+#: src/keyboardconfig.cpp:308
 msgid "Direct Right"
 msgstr "Derecha"
 
-#: src/keyboardconfig.cpp:308
+#: src/keyboardconfig.cpp:310
 msgid "Crazy moves"
 msgstr "Movimientos locos"
 
-#: src/keyboardconfig.cpp:310
+#: src/keyboardconfig.cpp:312
 msgid "Change Crazy Move mode"
 msgstr "Cambiar  el tipo de movimientos locos"
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboardconfig.cpp:314
 msgid "Quick Drop N Items from 0 slot"
 msgstr "Lanzamiento de N objetos desde 0 casillas"
 
-#: src/keyboardconfig.cpp:314
+#: src/keyboardconfig.cpp:316
 msgid "Quick Drop N Items"
 msgstr "Dejar caer N artículos rápidamente"
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboardconfig.cpp:318
 msgid "Switch Quick Drop Counter"
 msgstr "Cambiar el contador de lanzamientos"
 
-#: src/keyboardconfig.cpp:318
+#: src/keyboardconfig.cpp:320
 msgid "Quick heal target or self"
 msgstr "Curar rápidamente a objetivo o a sí mismo"
 
-#: src/keyboardconfig.cpp:320
+#: src/keyboardconfig.cpp:322
 msgid "Use #itenplz spell"
 msgstr "Usar el hechizo #itenplz"
 
-#: src/keyboardconfig.cpp:322
+#: src/keyboardconfig.cpp:324
 msgid "Use magic attack"
 msgstr "Usar ataque mágico"
 
-#: src/keyboardconfig.cpp:324
+#: src/keyboardconfig.cpp:326
 msgid "Switch magic attack"
 msgstr "Intercambiar ataque mágico"
 
-#: src/keyboardconfig.cpp:326
+#: src/keyboardconfig.cpp:328
 msgid "Change move type"
 msgstr "Cambiar tipo de maniobra"
 
-#: src/keyboardconfig.cpp:328
+#: src/keyboardconfig.cpp:330
 msgid "Change Attack Weapon Type"
 msgstr "Cambiar tipo de arma de ataque"
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboardconfig.cpp:332
 msgid "Change Attack Type"
 msgstr "Cambiar tipo de ataque"
 
-#: src/keyboardconfig.cpp:332
+#: src/keyboardconfig.cpp:334
 msgid "Change Follow mode"
 msgstr "Cambiar modo de perseguir"
 
-#: src/keyboardconfig.cpp:334
+#: src/keyboardconfig.cpp:336
 msgid "Change Imitation mode"
 msgstr "Cambiar modo de Imitación"
 
-#: src/keyboardconfig.cpp:337
+#: src/keyboardconfig.cpp:339
 msgid "Disable / Enable Game modifier keys"
 msgstr "Habilitar / Deshabilitar las teclas de modification del juego"
 
-#: src/keyboardconfig.cpp:338
+#: src/keyboardconfig.cpp:340
 msgid "On / Off audio"
 msgstr "Encender / Apagar audio"
 
-#: src/keyboardconfig.cpp:340
+#: src/keyboardconfig.cpp:342
 msgid "Enable / Disable away mode"
 msgstr "Habilitar / Deshabilitar modo AFK"
 
-#: src/keyboardconfig.cpp:342
+#: src/keyboardconfig.cpp:344
 msgid "Emulate right click from keyboard"
 msgstr "Emular clic derecho desde el teclado"
 
-#: src/keyboardconfig.cpp:344
+#: src/keyboardconfig.cpp:346
 msgid "Toggle camera mode"
 msgstr "Interruptor de tipo de cámara"
 
-#: src/keyboardconfig.cpp:346
+#: src/keyboardconfig.cpp:348
 msgid "Modifier key"
 msgstr "Tecla modificadora"
 
-#: src/keyboardconfig.cpp:425
+#: src/keyboardconfig.cpp:427
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -4223,64 +4231,64 @@ msgstr ""
 msgid "You were killed by "
 msgstr "Fuiste eliminado por "
 
-#: src/localplayer.cpp:1422
+#: src/localplayer.cpp:1427
 msgid "Tried to pick up nonexistent item."
 msgstr "Intentaste recoger un objeto inexistante."
 
-#: src/localplayer.cpp:1424
+#: src/localplayer.cpp:1429
 msgid "Item is too heavy."
 msgstr "El artículo es muy pesado."
 
-#: src/localplayer.cpp:1426
+#: src/localplayer.cpp:1431
 msgid "Item is too far away."
 msgstr "El artículo está muy lejos."
 
-#: src/localplayer.cpp:1428
+#: src/localplayer.cpp:1433
 msgid "Inventory is full."
 msgstr "El inventario está lleno."
 
-#: src/localplayer.cpp:1430
+#: src/localplayer.cpp:1435
 msgid "Stack is too big."
 msgstr "El agrupamiento es demasiado grande."
 
-#: src/localplayer.cpp:1433
+#: src/localplayer.cpp:1438
 msgid "Item belongs to someone else."
 msgstr "El artículo pertenece a alguien más."
 
-#: src/localplayer.cpp:1436
+#: src/localplayer.cpp:1441
 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:1460
+#: src/localplayer.cpp:1465
 #, 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:3174
+#: src/localplayer.cpp:3179
 msgid "Away"
 msgstr "Fuera del Teclado"
 
-#: src/localplayer.cpp:3494
+#: src/localplayer.cpp:3507
 msgid "Follow: "
 msgstr "Seguir: "
 
-#: src/localplayer.cpp:3496 src/localplayer.cpp:3511
+#: src/localplayer.cpp:3509 src/localplayer.cpp:3524
 msgid "Follow canceled"
 msgstr "Seguir cancelado"
 
-#: src/localplayer.cpp:3503
+#: src/localplayer.cpp:3516
 msgid "Imitation: "
 msgstr "Imitacion: "
 
-#: src/localplayer.cpp:3505 src/localplayer.cpp:3513
+#: src/localplayer.cpp:3518 src/localplayer.cpp:3526
 msgid "Imitation canceled"
 msgstr "Imitación cancelada"
 
-#: src/localplayer.cpp:3858
+#: src/localplayer.cpp:3871
 msgid "You see "
 msgstr "Ves "
 
diff --git a/po/fi.po b/po/fi.po
index 656647833..1c85c8dbd 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-09-27 22:18+0300\n"
-"PO-Revision-Date: 2011-09-27 19:20+0000\n"
+"POT-Creation-Date: 2011-10-01 01:22+0300\n"
+"PO-Revision-Date: 2011-09-30 14:45+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: fi\n"
@@ -336,19 +336,19 @@ msgstr "Yhteys palvelimeen katkesi."
 msgid "Network Error"
 msgstr "Verkkovirhe"
 
-#: src/game.cpp:1320
+#: src/game.cpp:1321
 msgid "Ignoring incoming trade requests"
 msgstr "Et huomioi kaupankäyntipyyntöjä"
 
-#: src/game.cpp:1330
+#: src/game.cpp:1331
 msgid "Accepting incoming trade requests"
 msgstr "Hyväksyt kaupankäyntipyynnöt"
 
-#: src/game.cpp:1727
+#: src/game.cpp:1731
 msgid "Could Not Load Map"
 msgstr "Kartan lataaminen epäonnistui"
 
-#: src/game.cpp:1728
+#: src/game.cpp:1732
 #, c-format
 msgid "Error while loading %s"
 msgstr "Kohdetta %s ladattaessa tapahtui virhe."
@@ -406,44 +406,48 @@ msgstr "Tulos"
 msgid "Reset"
 msgstr "Nollaa"
 
-#: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:98
+#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
 #: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
 #: src/gui/popupmenu.cpp:273 src/gui/popupmenu.cpp:654
 msgid "Buy"
 msgstr "Osta"
 
-#: src/gui/buydialog.cpp:89 src/gui/buydialog.cpp:303
+#: src/gui/buydialog.cpp:94 src/gui/buydialog.cpp:332
 #: src/gui/selldialog.cpp:88 src/gui/selldialog.cpp:325
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Hinta: %s / Kaikkiaan: %s"
 
+#: src/gui/buydialog.cpp:103
+msgid "Amount:"
+msgstr ""
+
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:94 src/gui/itemamountwindow.cpp:207
+#: 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:973
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:974
 msgid "+"
 msgstr "+"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:97 src/gui/itemamountwindow.cpp:206
+#: 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:985
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:986
 msgid "-"
 msgstr "-"
 
-#: src/gui/buydialog.cpp:99 src/gui/quitdialog.cpp:47
+#: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:294
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:84
 msgid "Quit"
 msgstr "Sulje"
 
-#: src/gui/buydialog.cpp:100 src/gui/selldialog.cpp:95
-#: src/gui/statuswindow.cpp:504 src/gui/statuswindow.cpp:553
-#: src/gui/statuswindow.cpp:972 src/gui/statuswindow.cpp:1003
+#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
+#: src/gui/statuswindow.cpp:504 src/gui/statuswindow.cpp:554
+#: src/gui/statuswindow.cpp:973 src/gui/statuswindow.cpp:1004
 msgid "Max"
 msgstr "Max"
 
@@ -921,7 +925,7 @@ msgid "Equipment"
 msgstr "Varusteet"
 
 #: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160
-#: src/gui/inventorywindow.cpp:538 src/gui/inventorywindow.cpp:547
+#: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554
 #: src/gui/popupmenu.cpp:1656 src/gui/popupmenu.cpp:1748
 #: src/gui/popupmenu.cpp:1793
 msgid "Unequip"
@@ -964,20 +968,20 @@ msgstr "Paikkoja:"
 msgid "Filter:"
 msgstr "Suodin:"
 
-#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:540
-#: src/gui/inventorywindow.cpp:549 src/gui/popupmenu.cpp:1658
+#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547
+#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1658
 #: src/gui/popupmenu.cpp:1750 src/gui/popupmenu.cpp:1795
 msgid "Equip"
 msgstr "Ota käyttöön"
 
-#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:541
-#: src/gui/inventorywindow.cpp:545 src/gui/popupmenu.cpp:1662
+#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548
+#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1662
 #: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1754
 #: src/gui/popupmenu.cpp:1799
 msgid "Use"
 msgstr "Käytä"
 
-#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:645
+#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652
 #: src/gui/popupmenu.cpp:1667 src/gui/popupmenu.cpp:1759
 #: src/gui/popupmenu.cpp:1804
 msgid "Drop..."
@@ -997,7 +1001,7 @@ msgstr "Asukokonaisuudet"
 msgid "Weight:"
 msgstr "Paino:"
 
-#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:636
+#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643
 #: src/gui/popupmenu.cpp:1642 src/gui/popupmenu.cpp:1771
 #: src/gui/popupmenu.cpp:1816 src/gui/setup.cpp:73
 msgid "Store"
@@ -1007,7 +1011,7 @@ msgstr "Varastoi"
 msgid "Retrieve"
 msgstr "Ota"
 
-#: src/gui/inventorywindow.cpp:647 src/gui/popupmenu.cpp:1672
+#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1672
 #: src/gui/popupmenu.cpp:1764 src/gui/popupmenu.cpp:1809
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
@@ -3055,130 +3059,130 @@ msgstr "Taso: %d (GM %d)"
 msgid "Correction points: %d"
 msgstr "Korjauspisteitä: %d"
 
-#: src/gui/statuswindow.cpp:647 src/gui/statuswindow.cpp:712
-#: src/gui/statuswindow.cpp:732 src/gui/statuswindow.cpp:748
-#: src/gui/statuswindow.cpp:794 src/gui/statuswindow.cpp:823
-#: src/gui/statuswindow.cpp:846 src/gui/statuswindow.cpp:865
+#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:713
+#: src/gui/statuswindow.cpp:733 src/gui/statuswindow.cpp:749
+#: src/gui/statuswindow.cpp:795 src/gui/statuswindow.cpp:824
+#: src/gui/statuswindow.cpp:847 src/gui/statuswindow.cpp:866
 msgid "(D)"
 msgstr "(D)"
 
-#: src/gui/statuswindow.cpp:650 src/gui/statuswindow.cpp:773
+#: src/gui/statuswindow.cpp:651 src/gui/statuswindow.cpp:774
 msgid "(I)"
 msgstr "(I)"
 
-#: src/gui/statuswindow.cpp:653 src/gui/statuswindow.cpp:770
+#: src/gui/statuswindow.cpp:654 src/gui/statuswindow.cpp:771
 msgid "(c)"
 msgstr "(c)"
 
-#: src/gui/statuswindow.cpp:656
+#: src/gui/statuswindow.cpp:657
 msgid "(C)"
 msgstr "(C)"
 
-#: src/gui/statuswindow.cpp:659 src/gui/statuswindow.cpp:757
+#: src/gui/statuswindow.cpp:660 src/gui/statuswindow.cpp:758
 msgid "(d)"
 msgstr "(d)"
 
-#: src/gui/statuswindow.cpp:662 src/gui/statuswindow.cpp:676
-#: src/gui/statuswindow.cpp:705 src/gui/statuswindow.cpp:724
-#: src/gui/statuswindow.cpp:741 src/gui/statuswindow.cpp:760
-#: src/gui/statuswindow.cpp:782 src/gui/statuswindow.cpp:812
-#: src/gui/statuswindow.cpp:838 src/gui/statuswindow.cpp:852
-#: src/gui/statuswindow.cpp:868 src/gui/statuswindow.cpp:881
+#: src/gui/statuswindow.cpp:663 src/gui/statuswindow.cpp:677
+#: src/gui/statuswindow.cpp:706 src/gui/statuswindow.cpp:725
+#: src/gui/statuswindow.cpp:742 src/gui/statuswindow.cpp:761
+#: src/gui/statuswindow.cpp:783 src/gui/statuswindow.cpp:813
+#: src/gui/statuswindow.cpp:839 src/gui/statuswindow.cpp:853
+#: src/gui/statuswindow.cpp:869 src/gui/statuswindow.cpp:882
 msgid "(?)"
 msgstr "(?)"
 
-#: src/gui/statuswindow.cpp:673
+#: src/gui/statuswindow.cpp:674
 msgid "(a)"
 msgstr "(a)"
 
-#: src/gui/statuswindow.cpp:684
+#: src/gui/statuswindow.cpp:685
 msgid "(0)"
 msgstr "(0)"
 
-#: src/gui/statuswindow.cpp:687
+#: src/gui/statuswindow.cpp:688
 msgid "(1)"
 msgstr "(1)"
 
-#: src/gui/statuswindow.cpp:690
+#: src/gui/statuswindow.cpp:691
 msgid "(2)"
 msgstr "(2)"
 
-#: src/gui/statuswindow.cpp:693 src/gui/statuswindow.cpp:800
+#: src/gui/statuswindow.cpp:694 src/gui/statuswindow.cpp:801
 msgid "(3)"
 msgstr "(3)"
 
-#: src/gui/statuswindow.cpp:696
+#: src/gui/statuswindow.cpp:697
 msgid "(5)"
 msgstr "(5)"
 
-#: src/gui/statuswindow.cpp:699
+#: src/gui/statuswindow.cpp:700
 msgid "(7)"
 msgstr "(7)"
 
-#: src/gui/statuswindow.cpp:702 src/gui/statuswindow.cpp:754
-#: src/gui/statuswindow.cpp:809 src/gui/statuswindow.cpp:878
+#: src/gui/statuswindow.cpp:703 src/gui/statuswindow.cpp:755
+#: src/gui/statuswindow.cpp:810 src/gui/statuswindow.cpp:879
 msgid "(A)"
 msgstr "(A)"
 
-#: src/gui/statuswindow.cpp:715
+#: src/gui/statuswindow.cpp:716
 msgid "(R)"
 msgstr "(R)"
 
-#: src/gui/statuswindow.cpp:718
+#: src/gui/statuswindow.cpp:719
 msgid "(M)"
 msgstr "(M)"
 
-#: src/gui/statuswindow.cpp:721
+#: src/gui/statuswindow.cpp:722
 msgid "(P)"
 msgstr "(P)"
 
-#: src/gui/statuswindow.cpp:735
+#: src/gui/statuswindow.cpp:736
 msgid "(s)"
 msgstr "(s)"
 
-#: src/gui/statuswindow.cpp:738 src/gui/statuswindow.cpp:791
+#: src/gui/statuswindow.cpp:739 src/gui/statuswindow.cpp:792
 msgid "(S)"
 msgstr "(S)"
 
-#: src/gui/statuswindow.cpp:751 src/gui/statuswindow.cpp:806
-#: src/gui/statuswindow.cpp:859
+#: src/gui/statuswindow.cpp:752 src/gui/statuswindow.cpp:807
+#: src/gui/statuswindow.cpp:860
 msgid "(G)"
 msgstr "(G)"
 
-#: src/gui/statuswindow.cpp:767
+#: src/gui/statuswindow.cpp:768
 msgid "(f)"
 msgstr "(f)"
 
-#: src/gui/statuswindow.cpp:776 src/gui/statuswindow.cpp:797
-#: src/gui/statuswindow.cpp:862
+#: src/gui/statuswindow.cpp:777 src/gui/statuswindow.cpp:798
+#: src/gui/statuswindow.cpp:863
 msgid "(F)"
 msgstr "(F)"
 
-#: src/gui/statuswindow.cpp:779 src/gui/statuswindow.cpp:829
+#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:830
 msgid "(U)"
 msgstr "(U)"
 
-#: src/gui/statuswindow.cpp:803
+#: src/gui/statuswindow.cpp:804
 msgid "(g)"
 msgstr "(g)"
 
-#: src/gui/statuswindow.cpp:820
+#: src/gui/statuswindow.cpp:821
 msgid "(N)"
 msgstr "(N)"
 
-#: src/gui/statuswindow.cpp:826
+#: src/gui/statuswindow.cpp:827
 msgid "(u)"
 msgstr "(u)"
 
-#: src/gui/statuswindow.cpp:832
+#: src/gui/statuswindow.cpp:833
 msgid "(e)"
 msgstr "(e)"
 
-#: src/gui/statuswindow.cpp:835
+#: src/gui/statuswindow.cpp:836
 msgid "(b)"
 msgstr "(b)"
 
-#: src/gui/statuswindow.cpp:849 src/gui/statuswindow.cpp:875
+#: src/gui/statuswindow.cpp:850 src/gui/statuswindow.cpp:876
 msgid "(O)"
 msgstr "(O)"
 
@@ -3842,369 +3846,373 @@ msgstr "Siirry reittipisteeseen"
 msgid "Stop Attack"
 msgstr "Keskeytä hyökkäys"
 
-#: src/keyboardconfig.cpp:64
+#: src/keyboardconfig.cpp:65
+msgid "Untarget"
+msgstr ""
+
+#: src/keyboardconfig.cpp:66
 msgid "Target Closest"
 msgstr "Lähin kohteeksi"
 
-#: src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:68
 msgid "Target NPC"
 msgstr "NPC kohteeksi"
 
-#: src/keyboardconfig.cpp:67
+#: src/keyboardconfig.cpp:69
 msgid "Target Player"
 msgstr "Pelaaja kohteeksi"
 
-#: src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:71
 msgid "Pickup"
 msgstr "Nouki"
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:72
 msgid "Change Pickup Type"
 msgstr "Muuta noston tyyppiä"
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:74
 msgid "Hide Windows"
 msgstr "Piilota ikkunat"
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:76
 msgid "Sit"
 msgstr "Istu"
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:77
 msgid "Screenshot"
 msgstr "Kuvankaappaus"
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:78
 msgid "Enable/Disable Trading"
 msgstr "Salli/estä kaupankäynti"
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:80
 msgid "Change Map View Mode"
 msgstr "Vaihda karttanäkymää"
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:82
 msgid "Select OK"
 msgstr "Valitse OK"
 
-#: src/keyboardconfig.cpp:83
+#: src/keyboardconfig.cpp:85
 msgid "Shortcuts Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:86
 msgid "Item Shortcuts Key"
 msgstr "Tavaroiden pikavalintanäppäin"
 
-#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:88
-#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:92
-#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:96
-#: src/keyboardconfig.cpp:98 src/keyboardconfig.cpp:100
-#: src/keyboardconfig.cpp:102 src/keyboardconfig.cpp:104
-#: src/keyboardconfig.cpp:106 src/keyboardconfig.cpp:108
-#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:112
-#: src/keyboardconfig.cpp:114 src/keyboardconfig.cpp:117
-#: src/keyboardconfig.cpp:119 src/keyboardconfig.cpp:121
-#: src/keyboardconfig.cpp:123 src/keyboardconfig.cpp:125
-#: src/keyboardconfig.cpp:367
+#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:90
+#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:94
+#: src/keyboardconfig.cpp:96 src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:100 src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:104 src/keyboardconfig.cpp:106
+#: src/keyboardconfig.cpp:108 src/keyboardconfig.cpp:110
+#: src/keyboardconfig.cpp:112 src/keyboardconfig.cpp:114
+#: src/keyboardconfig.cpp:116 src/keyboardconfig.cpp:119
+#: src/keyboardconfig.cpp:121 src/keyboardconfig.cpp:123
+#: src/keyboardconfig.cpp:125 src/keyboardconfig.cpp:127
+#: src/keyboardconfig.cpp:369
 #, c-format
 msgid "Item Shortcut %d"
 msgstr "Tavarapikavalinta %d"
 
-#: src/keyboardconfig.cpp:126
+#: src/keyboardconfig.cpp:128
 msgid "Windows Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:127
+#: src/keyboardconfig.cpp:129
 msgid "Help Window"
 msgstr "Ohjeikkuna"
 
-#: src/keyboardconfig.cpp:129
+#: src/keyboardconfig.cpp:131
 msgid "Status Window"
 msgstr "Tilaikkuna"
 
-#: src/keyboardconfig.cpp:131
+#: src/keyboardconfig.cpp:133
 msgid "Inventory Window"
 msgstr "Tavaraikkuna"
 
-#: src/keyboardconfig.cpp:133
+#: src/keyboardconfig.cpp:135
 msgid "Equipment Window"
 msgstr "Varusteikkuna"
 
-#: src/keyboardconfig.cpp:135
+#: src/keyboardconfig.cpp:137
 msgid "Skill Window"
 msgstr "Taitoikkuna"
 
-#: src/keyboardconfig.cpp:137
+#: src/keyboardconfig.cpp:139
 msgid "Minimap Window"
 msgstr "Karttaikkuna"
 
-#: src/keyboardconfig.cpp:139
+#: src/keyboardconfig.cpp:141
 msgid "Chat Window"
 msgstr "Keskusteluikkuna"
 
-#: src/keyboardconfig.cpp:141
+#: src/keyboardconfig.cpp:143
 msgid "Item Shortcut Window"
 msgstr "Tavaroiden pikavalintaikkuna"
 
-#: src/keyboardconfig.cpp:143
+#: src/keyboardconfig.cpp:145
 msgid "Setup Window"
 msgstr "Asetusikkuna"
 
-#: src/keyboardconfig.cpp:145
+#: src/keyboardconfig.cpp:147
 msgid "Debug Window"
 msgstr "Debug-ikkuna"
 
-#: src/keyboardconfig.cpp:147
+#: src/keyboardconfig.cpp:149
 msgid "Social Window"
 msgstr "Suhdeikkuna"
 
-#: src/keyboardconfig.cpp:149
+#: src/keyboardconfig.cpp:151
 msgid "Emote Shortcut Window"
 msgstr "Eleiden pikavalintaikkuna"
 
-#: src/keyboardconfig.cpp:151
+#: src/keyboardconfig.cpp:153
 msgid "Outfits Window"
 msgstr "Asukokonaisuusikkuna"
 
-#: src/keyboardconfig.cpp:153
+#: src/keyboardconfig.cpp:155
 msgid "Shop Window"
 msgstr "Kauppaikkuna"
 
-#: src/keyboardconfig.cpp:155
+#: src/keyboardconfig.cpp:157
 msgid "Quick drop Window"
 msgstr "Pikapudotusikkuna"
 
-#: src/keyboardconfig.cpp:157
+#: src/keyboardconfig.cpp:159
 msgid "Kill Stats Window"
 msgstr "Tappotilastoikkuna"
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboardconfig.cpp:161
 msgid "Commands Window"
 msgstr "Komentoikkuna"
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboardconfig.cpp:163
 msgid "Bot Checker Window"
 msgstr "Bottitutkaikkuna"
 
-#: src/keyboardconfig.cpp:164
+#: src/keyboardconfig.cpp:166
 msgid "Who Is Online Window"
 msgstr "Kuka on linjoilla -ikkuna"
 
-#: src/keyboardconfig.cpp:166
+#: src/keyboardconfig.cpp:168
 msgid "Did you know Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:169
+#: src/keyboardconfig.cpp:171
 msgid "Previous Social Tab"
 msgstr "Edellinen sos. välilehti"
 
-#: src/keyboardconfig.cpp:171
+#: src/keyboardconfig.cpp:173
 msgid "Next Social Tab"
 msgstr "Seuraava sos. välilehti"
 
-#: src/keyboardconfig.cpp:173
+#: src/keyboardconfig.cpp:175
 msgid "Emotes Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:174
+#: src/keyboardconfig.cpp:176
 msgid "Smilie"
 msgstr "Hymiö"
 
-#: src/keyboardconfig.cpp:175 src/keyboardconfig.cpp:177
-#: src/keyboardconfig.cpp:179 src/keyboardconfig.cpp:181
-#: src/keyboardconfig.cpp:183 src/keyboardconfig.cpp:185
-#: src/keyboardconfig.cpp:187 src/keyboardconfig.cpp:189
-#: src/keyboardconfig.cpp:191 src/keyboardconfig.cpp:193
-#: src/keyboardconfig.cpp:195 src/keyboardconfig.cpp:197
-#: src/keyboardconfig.cpp:200 src/keyboardconfig.cpp:202
-#: src/keyboardconfig.cpp:204 src/keyboardconfig.cpp:206
-#: src/keyboardconfig.cpp:208 src/keyboardconfig.cpp:210
-#: src/keyboardconfig.cpp:212 src/keyboardconfig.cpp:214
-#: src/keyboardconfig.cpp:216 src/keyboardconfig.cpp:218
-#: src/keyboardconfig.cpp:220 src/keyboardconfig.cpp:222
-#: src/keyboardconfig.cpp:224 src/keyboardconfig.cpp:227
-#: src/keyboardconfig.cpp:230 src/keyboardconfig.cpp:233
-#: src/keyboardconfig.cpp:235 src/keyboardconfig.cpp:237
-#: src/keyboardconfig.cpp:239 src/keyboardconfig.cpp:241
-#: src/keyboardconfig.cpp:243 src/keyboardconfig.cpp:245
-#: src/keyboardconfig.cpp:247 src/keyboardconfig.cpp:249
-#: src/keyboardconfig.cpp:251 src/keyboardconfig.cpp:254
-#: src/keyboardconfig.cpp:256 src/keyboardconfig.cpp:258
-#: src/keyboardconfig.cpp:260 src/keyboardconfig.cpp:262
-#: src/keyboardconfig.cpp:264 src/keyboardconfig.cpp:266
-#: src/keyboardconfig.cpp:362
+#: src/keyboardconfig.cpp:177 src/keyboardconfig.cpp:179
+#: src/keyboardconfig.cpp:181 src/keyboardconfig.cpp:183
+#: src/keyboardconfig.cpp:185 src/keyboardconfig.cpp:187
+#: src/keyboardconfig.cpp:189 src/keyboardconfig.cpp:191
+#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
+#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
+#: src/keyboardconfig.cpp:202 src/keyboardconfig.cpp:204
+#: src/keyboardconfig.cpp:206 src/keyboardconfig.cpp:208
+#: src/keyboardconfig.cpp:210 src/keyboardconfig.cpp:212
+#: src/keyboardconfig.cpp:214 src/keyboardconfig.cpp:216
+#: src/keyboardconfig.cpp:218 src/keyboardconfig.cpp:220
+#: src/keyboardconfig.cpp:222 src/keyboardconfig.cpp:224
+#: src/keyboardconfig.cpp:226 src/keyboardconfig.cpp:229
+#: src/keyboardconfig.cpp:232 src/keyboardconfig.cpp:235
+#: src/keyboardconfig.cpp:237 src/keyboardconfig.cpp:239
+#: src/keyboardconfig.cpp:241 src/keyboardconfig.cpp:243
+#: src/keyboardconfig.cpp:245 src/keyboardconfig.cpp:247
+#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
+#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:256
+#: src/keyboardconfig.cpp:258 src/keyboardconfig.cpp:260
+#: src/keyboardconfig.cpp:262 src/keyboardconfig.cpp:264
+#: src/keyboardconfig.cpp:266 src/keyboardconfig.cpp:268
+#: src/keyboardconfig.cpp:364
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "Eleen pikavalinta %d"
 
-#: src/keyboardconfig.cpp:268
+#: src/keyboardconfig.cpp:270
 msgid "Outfits Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:269
+#: src/keyboardconfig.cpp:271
 msgid "Wear Outfit"
 msgstr "Pue asu"
 
-#: src/keyboardconfig.cpp:271
+#: src/keyboardconfig.cpp:273
 msgid "Copy Outfit"
 msgstr "Kopioi asu"
 
-#: src/keyboardconfig.cpp:273
+#: src/keyboardconfig.cpp:275
 msgid "Copy equipped to Outfit"
 msgstr "Kopioi varusteet asuksi"
 
-#: src/keyboardconfig.cpp:275
+#: src/keyboardconfig.cpp:277
 msgid "Chat Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:276
+#: src/keyboardconfig.cpp:278
 msgid "Toggle Chat"
 msgstr "Ota keskustelu käyttöön/pois käytöstä"
 
-#: src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:280
 msgid "Scroll Chat Up"
 msgstr "Vieritä keskustelua ylös"
 
-#: src/keyboardconfig.cpp:280
+#: src/keyboardconfig.cpp:282
 msgid "Scroll Chat Down"
 msgstr "Vieritä keskustelua alas"
 
-#: src/keyboardconfig.cpp:282
+#: src/keyboardconfig.cpp:284
 msgid "Previous Chat Tab"
 msgstr "Edellinen keskusteluvälilehti"
 
-#: src/keyboardconfig.cpp:284
+#: src/keyboardconfig.cpp:286
 msgid "Next Chat Tab"
 msgstr "Seuraava keskusteluvälilehti"
 
-#: src/keyboardconfig.cpp:287
+#: src/keyboardconfig.cpp:289
 msgid "Close current Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:289
+#: src/keyboardconfig.cpp:291
 msgid "Previous chat line"
 msgstr "Edellinen keskustelulinja"
 
-#: src/keyboardconfig.cpp:291
+#: src/keyboardconfig.cpp:293
 msgid "Next chat line"
 msgstr "Seuraava keskustelulinja"
 
-#: src/keyboardconfig.cpp:293
+#: src/keyboardconfig.cpp:295
 msgid "Chat Auto Complete"
 msgstr "Sarkaintäydennys keskustelussa"
 
-#: src/keyboardconfig.cpp:295
+#: src/keyboardconfig.cpp:297
 msgid "Deactivate Chat Input"
 msgstr "Poistu keskustelusyötöstä"
 
-#: src/keyboardconfig.cpp:297
+#: src/keyboardconfig.cpp:299
 msgid "Other Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboardconfig.cpp:300
 msgid "Ignore input 1"
 msgstr "Jätä huomiotta syöte 1"
 
-#: src/keyboardconfig.cpp:300
+#: src/keyboardconfig.cpp:302
 msgid "Ignore input 2"
 msgstr "Jätä huomiotta syöte 2"
 
-#: src/keyboardconfig.cpp:302
+#: src/keyboardconfig.cpp:304
 msgid "Direct Up"
 msgstr "Vie ylös"
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboardconfig.cpp:305
 msgid "Direct Down"
 msgstr "Vie alas"
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboardconfig.cpp:307
 msgid "Direct Left"
 msgstr "Vie vasemmalle"
 
-#: src/keyboardconfig.cpp:306
+#: src/keyboardconfig.cpp:308
 msgid "Direct Right"
 msgstr "Vie oikealle"
 
-#: src/keyboardconfig.cpp:308
+#: src/keyboardconfig.cpp:310
 msgid "Crazy moves"
 msgstr "Villiliikkeet"
 
-#: src/keyboardconfig.cpp:310
+#: src/keyboardconfig.cpp:312
 msgid "Change Crazy Move mode"
 msgstr "Muuta villiliiketilaa"
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboardconfig.cpp:314
 msgid "Quick Drop N Items from 0 slot"
 msgstr "Pudota nopeasti N esinettä paikasta 0"
 
-#: src/keyboardconfig.cpp:314
+#: src/keyboardconfig.cpp:316
 msgid "Quick Drop N Items"
 msgstr "Pudota nopeasti N esinettä"
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboardconfig.cpp:318
 msgid "Switch Quick Drop Counter"
 msgstr "Vaihda nopean pudotuksen laskuria"
 
-#: src/keyboardconfig.cpp:318
+#: src/keyboardconfig.cpp:320
 msgid "Quick heal target or self"
 msgstr "Pikaparanna kohde tai itse"
 
-#: src/keyboardconfig.cpp:320
+#: src/keyboardconfig.cpp:322
 msgid "Use #itenplz spell"
 msgstr "Käytä #itenplz-loitsua"
 
-#: src/keyboardconfig.cpp:322
+#: src/keyboardconfig.cpp:324
 msgid "Use magic attack"
 msgstr "Käytä magiahyökkäystä"
 
-#: src/keyboardconfig.cpp:324
+#: src/keyboardconfig.cpp:326
 msgid "Switch magic attack"
 msgstr "Vaihda magiahyökkäystä"
 
-#: src/keyboardconfig.cpp:326
+#: src/keyboardconfig.cpp:328
 msgid "Change move type"
 msgstr "Vaihda liikkumistyyppiä"
 
-#: src/keyboardconfig.cpp:328
+#: src/keyboardconfig.cpp:330
 msgid "Change Attack Weapon Type"
 msgstr "Vaihda hyökkäysaseen tyyppiä"
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboardconfig.cpp:332
 msgid "Change Attack Type"
 msgstr "Vaihda hyökkäystyyppiä"
 
-#: src/keyboardconfig.cpp:332
+#: src/keyboardconfig.cpp:334
 msgid "Change Follow mode"
 msgstr "Vaihda seuraustyyliä"
 
-#: src/keyboardconfig.cpp:334
+#: src/keyboardconfig.cpp:336
 msgid "Change Imitation mode"
 msgstr "Vaihda matkintatyyliä"
 
-#: src/keyboardconfig.cpp:337
+#: src/keyboardconfig.cpp:339
 msgid "Disable / Enable Game modifier keys"
 msgstr "Ota käyttöön / poista pelimuokkaimet"
 
-#: src/keyboardconfig.cpp:338
+#: src/keyboardconfig.cpp:340
 msgid "On / Off audio"
 msgstr "Äänet päälle / pois"
 
-#: src/keyboardconfig.cpp:340
+#: src/keyboardconfig.cpp:342
 msgid "Enable / Disable away mode"
 msgstr "Aseta / peru poissaolo"
 
-#: src/keyboardconfig.cpp:342
+#: src/keyboardconfig.cpp:344
 msgid "Emulate right click from keyboard"
 msgstr "Kontekstivalikkoon \"klikkaus\" näppäimistöltä"
 
-#: src/keyboardconfig.cpp:344
+#: src/keyboardconfig.cpp:346
 msgid "Toggle camera mode"
 msgstr "Vaihda kameran toimintaa"
 
-#: src/keyboardconfig.cpp:346
+#: src/keyboardconfig.cpp:348
 msgid "Modifier key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:425
+#: src/keyboardconfig.cpp:427
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -4217,64 +4225,64 @@ msgstr ""
 msgid "You were killed by "
 msgstr "Sinut otti hengiltä "
 
-#: src/localplayer.cpp:1422
+#: src/localplayer.cpp:1427
 msgid "Tried to pick up nonexistent item."
 msgstr "Yritit nostaa olemattoman tavaran."
 
-#: src/localplayer.cpp:1424
+#: src/localplayer.cpp:1429
 msgid "Item is too heavy."
 msgstr "Tavara on liian painava."
 
-#: src/localplayer.cpp:1426
+#: src/localplayer.cpp:1431
 msgid "Item is too far away."
 msgstr "Tavara on liian kaukana."
 
-#: src/localplayer.cpp:1428
+#: src/localplayer.cpp:1433
 msgid "Inventory is full."
 msgstr "Sinulla on liikaa tavaraa ennestään."
 
-#: src/localplayer.cpp:1430
+#: src/localplayer.cpp:1435
 msgid "Stack is too big."
 msgstr "Kasa on liian suuri."
 
-#: src/localplayer.cpp:1433
+#: src/localplayer.cpp:1438
 msgid "Item belongs to someone else."
 msgstr "Tavara kuuluu jollekulle muulle."
 
-#: src/localplayer.cpp:1436
+#: src/localplayer.cpp:1441
 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:1460
+#: src/localplayer.cpp:1465
 #, 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:3174
+#: src/localplayer.cpp:3179
 msgid "Away"
 msgstr "Poissa"
 
-#: src/localplayer.cpp:3494
+#: src/localplayer.cpp:3507
 msgid "Follow: "
 msgstr "Seuraa: "
 
-#: src/localplayer.cpp:3496 src/localplayer.cpp:3511
+#: src/localplayer.cpp:3509 src/localplayer.cpp:3524
 msgid "Follow canceled"
 msgstr "Seuraaminen keskeytetty"
 
-#: src/localplayer.cpp:3503
+#: src/localplayer.cpp:3516
 msgid "Imitation: "
 msgstr "Matki: "
 
-#: src/localplayer.cpp:3505 src/localplayer.cpp:3513
+#: src/localplayer.cpp:3518 src/localplayer.cpp:3526
 msgid "Imitation canceled"
 msgstr "Matkiminen keskeytetty"
 
-#: src/localplayer.cpp:3858
+#: src/localplayer.cpp:3871
 msgid "You see "
 msgstr "Näet "
 
diff --git a/po/fr.po b/po/fr.po
index 33a08e1ed..1346aaa13 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-09-27 22:18+0300\n"
-"PO-Revision-Date: 2011-09-27 19:20+0000\n"
+"POT-Creation-Date: 2011-10-01 01:22+0300\n"
+"PO-Revision-Date: 2011-09-30 14:45+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: French (http://www.transifex.net/projects/p/manaplus/team/"
 "fr/)\n"
@@ -341,19 +341,19 @@ msgstr ""
 msgid "Network Error"
 msgstr "Erreur Réseau"
 
-#: src/game.cpp:1320
+#: src/game.cpp:1321
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorer les requêtes d'échanges entrantes"
 
-#: src/game.cpp:1330
+#: src/game.cpp:1331
 msgid "Accepting incoming trade requests"
 msgstr "Accepter les requêtes d'échanges entrantes"
 
-#: src/game.cpp:1727
+#: src/game.cpp:1731
 msgid "Could Not Load Map"
 msgstr "La carte n'a pu être chargée"
 
-#: src/game.cpp:1728
+#: src/game.cpp:1732
 #, c-format
 msgid "Error while loading %s"
 msgstr "Erreur durant le chargement %s"
@@ -411,44 +411,48 @@ msgstr "Résultat"
 msgid "Reset"
 msgstr "Réinitialiser"
 
-#: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:98
+#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
 #: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
 #: src/gui/popupmenu.cpp:273 src/gui/popupmenu.cpp:654
 msgid "Buy"
 msgstr "Acheter"
 
-#: src/gui/buydialog.cpp:89 src/gui/buydialog.cpp:303
+#: src/gui/buydialog.cpp:94 src/gui/buydialog.cpp:332
 #: src/gui/selldialog.cpp:88 src/gui/selldialog.cpp:325
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Prix : %s / Total : %s"
 
+#: src/gui/buydialog.cpp:103
+msgid "Amount:"
+msgstr ""
+
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:94 src/gui/itemamountwindow.cpp:207
+#: 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:973
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:974
 msgid "+"
 msgstr "+"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:97 src/gui/itemamountwindow.cpp:206
+#: 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:985
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:986
 msgid "-"
 msgstr "-"
 
-#: src/gui/buydialog.cpp:99 src/gui/quitdialog.cpp:47
+#: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:294
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:84
 msgid "Quit"
 msgstr "Quitter"
 
-#: src/gui/buydialog.cpp:100 src/gui/selldialog.cpp:95
-#: src/gui/statuswindow.cpp:504 src/gui/statuswindow.cpp:553
-#: src/gui/statuswindow.cpp:972 src/gui/statuswindow.cpp:1003
+#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
+#: src/gui/statuswindow.cpp:504 src/gui/statuswindow.cpp:554
+#: src/gui/statuswindow.cpp:973 src/gui/statuswindow.cpp:1004
 msgid "Max"
 msgstr "Max."
 
@@ -926,7 +930,7 @@ msgid "Equipment"
 msgstr "Équipement"
 
 #: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160
-#: src/gui/inventorywindow.cpp:538 src/gui/inventorywindow.cpp:547
+#: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554
 #: src/gui/popupmenu.cpp:1656 src/gui/popupmenu.cpp:1748
 #: src/gui/popupmenu.cpp:1793
 msgid "Unequip"
@@ -969,20 +973,20 @@ msgstr "Emplacements :"
 msgid "Filter:"
 msgstr "Filtre :"
 
-#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:540
-#: src/gui/inventorywindow.cpp:549 src/gui/popupmenu.cpp:1658
+#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547
+#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1658
 #: src/gui/popupmenu.cpp:1750 src/gui/popupmenu.cpp:1795
 msgid "Equip"
 msgstr "Équiper"
 
-#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:541
-#: src/gui/inventorywindow.cpp:545 src/gui/popupmenu.cpp:1662
+#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548
+#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1662
 #: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1754
 #: src/gui/popupmenu.cpp:1799
 msgid "Use"
 msgstr "Utiliser"
 
-#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:645
+#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652
 #: src/gui/popupmenu.cpp:1667 src/gui/popupmenu.cpp:1759
 #: src/gui/popupmenu.cpp:1804
 msgid "Drop..."
@@ -1002,7 +1006,7 @@ msgstr "Tenues"
 msgid "Weight:"
 msgstr "Poids :"
 
-#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:636
+#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643
 #: src/gui/popupmenu.cpp:1642 src/gui/popupmenu.cpp:1771
 #: src/gui/popupmenu.cpp:1816 src/gui/setup.cpp:73
 msgid "Store"
@@ -1012,7 +1016,7 @@ msgstr "Entreposer"
 msgid "Retrieve"
 msgstr "Récupérer"
 
-#: src/gui/inventorywindow.cpp:647 src/gui/popupmenu.cpp:1672
+#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1672
 #: src/gui/popupmenu.cpp:1764 src/gui/popupmenu.cpp:1809
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
@@ -3072,130 +3076,130 @@ msgstr "Niveau : %d (GM %d)"
 msgid "Correction points: %d"
 msgstr "Points de correction : %d"
 
-#: src/gui/statuswindow.cpp:647 src/gui/statuswindow.cpp:712
-#: src/gui/statuswindow.cpp:732 src/gui/statuswindow.cpp:748
-#: src/gui/statuswindow.cpp:794 src/gui/statuswindow.cpp:823
-#: src/gui/statuswindow.cpp:846 src/gui/statuswindow.cpp:865
+#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:713
+#: src/gui/statuswindow.cpp:733 src/gui/statuswindow.cpp:749
+#: src/gui/statuswindow.cpp:795 src/gui/statuswindow.cpp:824
+#: src/gui/statuswindow.cpp:847 src/gui/statuswindow.cpp:866
 msgid "(D)"
 msgstr "(D)"
 
-#: src/gui/statuswindow.cpp:650 src/gui/statuswindow.cpp:773
+#: src/gui/statuswindow.cpp:651 src/gui/statuswindow.cpp:774
 msgid "(I)"
 msgstr "(I)"
 
-#: src/gui/statuswindow.cpp:653 src/gui/statuswindow.cpp:770
+#: src/gui/statuswindow.cpp:654 src/gui/statuswindow.cpp:771
 msgid "(c)"
 msgstr "(c)"
 
-#: src/gui/statuswindow.cpp:656
+#: src/gui/statuswindow.cpp:657
 msgid "(C)"
 msgstr "(C)"
 
-#: src/gui/statuswindow.cpp:659 src/gui/statuswindow.cpp:757
+#: src/gui/statuswindow.cpp:660 src/gui/statuswindow.cpp:758
 msgid "(d)"
 msgstr "(d)"
 
-#: src/gui/statuswindow.cpp:662 src/gui/statuswindow.cpp:676
-#: src/gui/statuswindow.cpp:705 src/gui/statuswindow.cpp:724
-#: src/gui/statuswindow.cpp:741 src/gui/statuswindow.cpp:760
-#: src/gui/statuswindow.cpp:782 src/gui/statuswindow.cpp:812
-#: src/gui/statuswindow.cpp:838 src/gui/statuswindow.cpp:852
-#: src/gui/statuswindow.cpp:868 src/gui/statuswindow.cpp:881
+#: src/gui/statuswindow.cpp:663 src/gui/statuswindow.cpp:677
+#: src/gui/statuswindow.cpp:706 src/gui/statuswindow.cpp:725
+#: src/gui/statuswindow.cpp:742 src/gui/statuswindow.cpp:761
+#: src/gui/statuswindow.cpp:783 src/gui/statuswindow.cpp:813
+#: src/gui/statuswindow.cpp:839 src/gui/statuswindow.cpp:853
+#: src/gui/statuswindow.cpp:869 src/gui/statuswindow.cpp:882
 msgid "(?)"
 msgstr "(?)"
 
-#: src/gui/statuswindow.cpp:673
+#: src/gui/statuswindow.cpp:674
 msgid "(a)"
 msgstr "(a)"
 
-#: src/gui/statuswindow.cpp:684
+#: src/gui/statuswindow.cpp:685
 msgid "(0)"
 msgstr "(0)"
 
-#: src/gui/statuswindow.cpp:687
+#: src/gui/statuswindow.cpp:688
 msgid "(1)"
 msgstr "(1)"
 
-#: src/gui/statuswindow.cpp:690
+#: src/gui/statuswindow.cpp:691
 msgid "(2)"
 msgstr "(2)"
 
-#: src/gui/statuswindow.cpp:693 src/gui/statuswindow.cpp:800
+#: src/gui/statuswindow.cpp:694 src/gui/statuswindow.cpp:801
 msgid "(3)"
 msgstr "(3)"
 
-#: src/gui/statuswindow.cpp:696
+#: src/gui/statuswindow.cpp:697
 msgid "(5)"
 msgstr "(5)"
 
-#: src/gui/statuswindow.cpp:699
+#: src/gui/statuswindow.cpp:700
 msgid "(7)"
 msgstr "(7)"
 
-#: src/gui/statuswindow.cpp:702 src/gui/statuswindow.cpp:754
-#: src/gui/statuswindow.cpp:809 src/gui/statuswindow.cpp:878
+#: src/gui/statuswindow.cpp:703 src/gui/statuswindow.cpp:755
+#: src/gui/statuswindow.cpp:810 src/gui/statuswindow.cpp:879
 msgid "(A)"
 msgstr "(A)"
 
-#: src/gui/statuswindow.cpp:715
+#: src/gui/statuswindow.cpp:716
 msgid "(R)"
 msgstr "(R)"
 
-#: src/gui/statuswindow.cpp:718
+#: src/gui/statuswindow.cpp:719
 msgid "(M)"
 msgstr "(M)"
 
-#: src/gui/statuswindow.cpp:721
+#: src/gui/statuswindow.cpp:722
 msgid "(P)"
 msgstr "(P)"
 
-#: src/gui/statuswindow.cpp:735
+#: src/gui/statuswindow.cpp:736
 msgid "(s)"
 msgstr "(s)"
 
-#: src/gui/statuswindow.cpp:738 src/gui/statuswindow.cpp:791
+#: src/gui/statuswindow.cpp:739 src/gui/statuswindow.cpp:792
 msgid "(S)"
 msgstr "(S)"
 
-#: src/gui/statuswindow.cpp:751 src/gui/statuswindow.cpp:806
-#: src/gui/statuswindow.cpp:859
+#: src/gui/statuswindow.cpp:752 src/gui/statuswindow.cpp:807
+#: src/gui/statuswindow.cpp:860
 msgid "(G)"
 msgstr "(G)"
 
-#: src/gui/statuswindow.cpp:767
+#: src/gui/statuswindow.cpp:768
 msgid "(f)"
 msgstr "(f)"
 
-#: src/gui/statuswindow.cpp:776 src/gui/statuswindow.cpp:797
-#: src/gui/statuswindow.cpp:862
+#: src/gui/statuswindow.cpp:777 src/gui/statuswindow.cpp:798
+#: src/gui/statuswindow.cpp:863
 msgid "(F)"
 msgstr "(F)"
 
-#: src/gui/statuswindow.cpp:779 src/gui/statuswindow.cpp:829
+#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:830
 msgid "(U)"
 msgstr "(U)"
 
-#: src/gui/statuswindow.cpp:803
+#: src/gui/statuswindow.cpp:804
 msgid "(g)"
 msgstr "(g)"
 
-#: src/gui/statuswindow.cpp:820
+#: src/gui/statuswindow.cpp:821
 msgid "(N)"
 msgstr "(N)"
 
-#: src/gui/statuswindow.cpp:826
+#: src/gui/statuswindow.cpp:827
 msgid "(u)"
 msgstr "(u)"
 
-#: src/gui/statuswindow.cpp:832
+#: src/gui/statuswindow.cpp:833
 msgid "(e)"
 msgstr "(e)"
 
-#: src/gui/statuswindow.cpp:835
+#: src/gui/statuswindow.cpp:836
 msgid "(b)"
 msgstr "(b)"
 
-#: src/gui/statuswindow.cpp:849 src/gui/statuswindow.cpp:875
+#: src/gui/statuswindow.cpp:850 src/gui/statuswindow.cpp:876
 msgid "(O)"
 msgstr "(O)"
 
@@ -3864,369 +3868,373 @@ msgstr "Aller jusqu'au point de navigation"
 msgid "Stop Attack"
 msgstr "Arrêter d'attaquer"
 
-#: src/keyboardconfig.cpp:64
+#: src/keyboardconfig.cpp:65
+msgid "Untarget"
+msgstr ""
+
+#: src/keyboardconfig.cpp:66
 msgid "Target Closest"
 msgstr "Viser le monstre le plus proche"
 
-#: src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:68
 msgid "Target NPC"
 msgstr "Cibler le PNJ"
 
-#: src/keyboardconfig.cpp:67
+#: src/keyboardconfig.cpp:69
 msgid "Target Player"
 msgstr "Viser le Joueur"
 
-#: src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:71
 msgid "Pickup"
 msgstr "Ramasser"
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:72
 msgid "Change Pickup Type"
 msgstr "Changer le type de ramassage"
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:74
 msgid "Hide Windows"
 msgstr "Cacher les fenêtres"
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:76
 msgid "Sit"
 msgstr "S'asseoir"
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:77
 msgid "Screenshot"
 msgstr "Capture d'écran"
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:78
 msgid "Enable/Disable Trading"
 msgstr "Activer/Désactiver les échanges"
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:80
 msgid "Change Map View Mode"
 msgstr "Changer le mode de vision de carte"
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:82
 msgid "Select OK"
 msgstr "Sélectionner OK"
 
-#: src/keyboardconfig.cpp:83
+#: src/keyboardconfig.cpp:85
 msgid "Shortcuts Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:86
 msgid "Item Shortcuts Key"
 msgstr "Touche de raccourcis items"
 
-#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:88
-#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:92
-#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:96
-#: src/keyboardconfig.cpp:98 src/keyboardconfig.cpp:100
-#: src/keyboardconfig.cpp:102 src/keyboardconfig.cpp:104
-#: src/keyboardconfig.cpp:106 src/keyboardconfig.cpp:108
-#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:112
-#: src/keyboardconfig.cpp:114 src/keyboardconfig.cpp:117
-#: src/keyboardconfig.cpp:119 src/keyboardconfig.cpp:121
-#: src/keyboardconfig.cpp:123 src/keyboardconfig.cpp:125
-#: src/keyboardconfig.cpp:367
+#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:90
+#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:94
+#: src/keyboardconfig.cpp:96 src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:100 src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:104 src/keyboardconfig.cpp:106
+#: src/keyboardconfig.cpp:108 src/keyboardconfig.cpp:110
+#: src/keyboardconfig.cpp:112 src/keyboardconfig.cpp:114
+#: src/keyboardconfig.cpp:116 src/keyboardconfig.cpp:119
+#: src/keyboardconfig.cpp:121 src/keyboardconfig.cpp:123
+#: src/keyboardconfig.cpp:125 src/keyboardconfig.cpp:127
+#: src/keyboardconfig.cpp:369
 #, c-format
 msgid "Item Shortcut %d"
 msgstr "Raccourci Objet %d"
 
-#: src/keyboardconfig.cpp:126
+#: src/keyboardconfig.cpp:128
 msgid "Windows Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:127
+#: src/keyboardconfig.cpp:129
 msgid "Help Window"
 msgstr "Fenêtre d'Aide"
 
-#: src/keyboardconfig.cpp:129
+#: src/keyboardconfig.cpp:131
 msgid "Status Window"
 msgstr "Fenêtre d'état"
 
-#: src/keyboardconfig.cpp:131
+#: src/keyboardconfig.cpp:133
 msgid "Inventory Window"
 msgstr "Fenêtre de l'inventaire"
 
-#: src/keyboardconfig.cpp:133
+#: src/keyboardconfig.cpp:135
 msgid "Equipment Window"
 msgstr "Fenêtre d'équipements."
 
-#: src/keyboardconfig.cpp:135
+#: src/keyboardconfig.cpp:137
 msgid "Skill Window"
 msgstr "Fenêtre de compétences"
 
-#: src/keyboardconfig.cpp:137
+#: src/keyboardconfig.cpp:139
 msgid "Minimap Window"
 msgstr "Fenêtre de Mini-carte"
 
-#: src/keyboardconfig.cpp:139
+#: src/keyboardconfig.cpp:141
 msgid "Chat Window"
 msgstr "Fenêtre de conversation"
 
-#: src/keyboardconfig.cpp:141
+#: src/keyboardconfig.cpp:143
 msgid "Item Shortcut Window"
 msgstr "Fenêtre de raccourci objet"
 
-#: src/keyboardconfig.cpp:143
+#: src/keyboardconfig.cpp:145
 msgid "Setup Window"
 msgstr "Fenêtre de configuration"
 
-#: src/keyboardconfig.cpp:145
+#: src/keyboardconfig.cpp:147
 msgid "Debug Window"
 msgstr "Fenêtre d'informations"
 
-#: src/keyboardconfig.cpp:147
+#: src/keyboardconfig.cpp:149
 msgid "Social Window"
 msgstr "Groupes et Guildes"
 
-#: src/keyboardconfig.cpp:149
+#: src/keyboardconfig.cpp:151
 msgid "Emote Shortcut Window"
 msgstr "Fenêtre de raccourcis d’émoticônes"
 
-#: src/keyboardconfig.cpp:151
+#: src/keyboardconfig.cpp:153
 msgid "Outfits Window"
 msgstr "Fenêtre des tenues"
 
-#: src/keyboardconfig.cpp:153
+#: src/keyboardconfig.cpp:155
 msgid "Shop Window"
 msgstr "Fenêtre du magasin"
 
-#: src/keyboardconfig.cpp:155
+#: src/keyboardconfig.cpp:157
 msgid "Quick drop Window"
 msgstr "Fenêtre pour jeter les items"
 
-#: src/keyboardconfig.cpp:157
+#: src/keyboardconfig.cpp:159
 msgid "Kill Stats Window"
 msgstr "Fenêtre de statistiques"
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboardconfig.cpp:161
 msgid "Commands Window"
 msgstr "Fenêtre de commandes"
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboardconfig.cpp:163
 msgid "Bot Checker Window"
 msgstr "Fenêtre du testeur de robot"
 
-#: src/keyboardconfig.cpp:164
+#: src/keyboardconfig.cpp:166
 msgid "Who Is Online Window"
 msgstr "Fenêtre - Qui est en ligne ?"
 
-#: src/keyboardconfig.cpp:166
+#: src/keyboardconfig.cpp:168
 msgid "Did you know Window"
 msgstr "Connaissiez-vous la fenêtre ?"
 
-#: src/keyboardconfig.cpp:169
+#: src/keyboardconfig.cpp:171
 msgid "Previous Social Tab"
 msgstr "Onglet de dialogue précédent"
 
-#: src/keyboardconfig.cpp:171
+#: src/keyboardconfig.cpp:173
 msgid "Next Social Tab"
 msgstr "Onglet de dialogue suivant"
 
-#: src/keyboardconfig.cpp:173
+#: src/keyboardconfig.cpp:175
 msgid "Emotes Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:174
+#: src/keyboardconfig.cpp:176
 msgid "Smilie"
 msgstr "Smileys"
 
-#: src/keyboardconfig.cpp:175 src/keyboardconfig.cpp:177
-#: src/keyboardconfig.cpp:179 src/keyboardconfig.cpp:181
-#: src/keyboardconfig.cpp:183 src/keyboardconfig.cpp:185
-#: src/keyboardconfig.cpp:187 src/keyboardconfig.cpp:189
-#: src/keyboardconfig.cpp:191 src/keyboardconfig.cpp:193
-#: src/keyboardconfig.cpp:195 src/keyboardconfig.cpp:197
-#: src/keyboardconfig.cpp:200 src/keyboardconfig.cpp:202
-#: src/keyboardconfig.cpp:204 src/keyboardconfig.cpp:206
-#: src/keyboardconfig.cpp:208 src/keyboardconfig.cpp:210
-#: src/keyboardconfig.cpp:212 src/keyboardconfig.cpp:214
-#: src/keyboardconfig.cpp:216 src/keyboardconfig.cpp:218
-#: src/keyboardconfig.cpp:220 src/keyboardconfig.cpp:222
-#: src/keyboardconfig.cpp:224 src/keyboardconfig.cpp:227
-#: src/keyboardconfig.cpp:230 src/keyboardconfig.cpp:233
-#: src/keyboardconfig.cpp:235 src/keyboardconfig.cpp:237
-#: src/keyboardconfig.cpp:239 src/keyboardconfig.cpp:241
-#: src/keyboardconfig.cpp:243 src/keyboardconfig.cpp:245
-#: src/keyboardconfig.cpp:247 src/keyboardconfig.cpp:249
-#: src/keyboardconfig.cpp:251 src/keyboardconfig.cpp:254
-#: src/keyboardconfig.cpp:256 src/keyboardconfig.cpp:258
-#: src/keyboardconfig.cpp:260 src/keyboardconfig.cpp:262
-#: src/keyboardconfig.cpp:264 src/keyboardconfig.cpp:266
-#: src/keyboardconfig.cpp:362
+#: src/keyboardconfig.cpp:177 src/keyboardconfig.cpp:179
+#: src/keyboardconfig.cpp:181 src/keyboardconfig.cpp:183
+#: src/keyboardconfig.cpp:185 src/keyboardconfig.cpp:187
+#: src/keyboardconfig.cpp:189 src/keyboardconfig.cpp:191
+#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
+#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
+#: src/keyboardconfig.cpp:202 src/keyboardconfig.cpp:204
+#: src/keyboardconfig.cpp:206 src/keyboardconfig.cpp:208
+#: src/keyboardconfig.cpp:210 src/keyboardconfig.cpp:212
+#: src/keyboardconfig.cpp:214 src/keyboardconfig.cpp:216
+#: src/keyboardconfig.cpp:218 src/keyboardconfig.cpp:220
+#: src/keyboardconfig.cpp:222 src/keyboardconfig.cpp:224
+#: src/keyboardconfig.cpp:226 src/keyboardconfig.cpp:229
+#: src/keyboardconfig.cpp:232 src/keyboardconfig.cpp:235
+#: src/keyboardconfig.cpp:237 src/keyboardconfig.cpp:239
+#: src/keyboardconfig.cpp:241 src/keyboardconfig.cpp:243
+#: src/keyboardconfig.cpp:245 src/keyboardconfig.cpp:247
+#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
+#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:256
+#: src/keyboardconfig.cpp:258 src/keyboardconfig.cpp:260
+#: src/keyboardconfig.cpp:262 src/keyboardconfig.cpp:264
+#: src/keyboardconfig.cpp:266 src/keyboardconfig.cpp:268
+#: src/keyboardconfig.cpp:364
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "Raccourci d'émoticône %d"
 
-#: src/keyboardconfig.cpp:268
+#: src/keyboardconfig.cpp:270
 msgid "Outfits Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:269
+#: src/keyboardconfig.cpp:271
 msgid "Wear Outfit"
 msgstr "Mettre la tenue"
 
-#: src/keyboardconfig.cpp:271
+#: src/keyboardconfig.cpp:273
 msgid "Copy Outfit"
 msgstr "Copier la tenue"
 
-#: src/keyboardconfig.cpp:273
+#: src/keyboardconfig.cpp:275
 msgid "Copy equipped to Outfit"
 msgstr "Copier l'équipement porté dans les tenues"
 
-#: src/keyboardconfig.cpp:275
+#: src/keyboardconfig.cpp:277
 msgid "Chat Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:276
+#: src/keyboardconfig.cpp:278
 msgid "Toggle Chat"
 msgstr "Activer / Désactiver la conversation"
 
-#: src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:280
 msgid "Scroll Chat Up"
 msgstr "Défiler la conversation (haut)"
 
-#: src/keyboardconfig.cpp:280
+#: src/keyboardconfig.cpp:282
 msgid "Scroll Chat Down"
 msgstr "Défiler la conversation (bas)"
 
-#: src/keyboardconfig.cpp:282
+#: src/keyboardconfig.cpp:284
 msgid "Previous Chat Tab"
 msgstr "Onglet de conversation précédent"
 
-#: src/keyboardconfig.cpp:284
+#: src/keyboardconfig.cpp:286
 msgid "Next Chat Tab"
 msgstr "Onglet de conversation suivant"
 
-#: src/keyboardconfig.cpp:287
+#: src/keyboardconfig.cpp:289
 msgid "Close current Chat Tab"
 msgstr "Fermer la fenêtre de dialogue ouverte"
 
-#: src/keyboardconfig.cpp:289
+#: src/keyboardconfig.cpp:291
 msgid "Previous chat line"
 msgstr "Ligne de conversation précédente"
 
-#: src/keyboardconfig.cpp:291
+#: src/keyboardconfig.cpp:293
 msgid "Next chat line"
 msgstr "Ligne de conversation suivante"
 
-#: src/keyboardconfig.cpp:293
+#: src/keyboardconfig.cpp:295
 msgid "Chat Auto Complete"
 msgstr "Auto complétion du chat"
 
-#: src/keyboardconfig.cpp:295
+#: src/keyboardconfig.cpp:297
 msgid "Deactivate Chat Input"
 msgstr "Désactiver la saisie dans le chat"
 
-#: src/keyboardconfig.cpp:297
+#: src/keyboardconfig.cpp:299
 msgid "Other Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboardconfig.cpp:300
 msgid "Ignore input 1"
 msgstr "Ignorer l'entrée 1"
 
-#: src/keyboardconfig.cpp:300
+#: src/keyboardconfig.cpp:302
 msgid "Ignore input 2"
 msgstr "Ignorer l'entrée 2"
 
-#: src/keyboardconfig.cpp:302
+#: src/keyboardconfig.cpp:304
 msgid "Direct Up"
 msgstr "Vers le haut"
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboardconfig.cpp:305
 msgid "Direct Down"
 msgstr "Vers le bas"
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboardconfig.cpp:307
 msgid "Direct Left"
 msgstr "Vers la gauche"
 
-#: src/keyboardconfig.cpp:306
+#: src/keyboardconfig.cpp:308
 msgid "Direct Right"
 msgstr "Vers la droite"
 
-#: src/keyboardconfig.cpp:308
+#: src/keyboardconfig.cpp:310
 msgid "Crazy moves"
 msgstr "Mouvements de dingue"
 
-#: src/keyboardconfig.cpp:310
+#: src/keyboardconfig.cpp:312
 msgid "Change Crazy Move mode"
 msgstr "Changer le mode de mouvement de dingue"
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboardconfig.cpp:314
 msgid "Quick Drop N Items from 0 slot"
 msgstr "Jeter rapidement N objets depuis l'emplacement 0"
 
-#: src/keyboardconfig.cpp:314
+#: src/keyboardconfig.cpp:316
 msgid "Quick Drop N Items"
 msgstr "Jeter rapidement N objets"
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboardconfig.cpp:318
 msgid "Switch Quick Drop Counter"
 msgstr "Changer de compteur de jet rapide d'objets"
 
-#: src/keyboardconfig.cpp:318
+#: src/keyboardconfig.cpp:320
 msgid "Quick heal target or self"
 msgstr "Soins rapides de la cible ou de soi"
 
-#: src/keyboardconfig.cpp:320
+#: src/keyboardconfig.cpp:322
 msgid "Use #itenplz spell"
 msgstr "Utiliser le sort #itenplz"
 
-#: src/keyboardconfig.cpp:322
+#: src/keyboardconfig.cpp:324
 msgid "Use magic attack"
 msgstr "Utiliser l'attaque magique"
 
-#: src/keyboardconfig.cpp:324
+#: src/keyboardconfig.cpp:326
 msgid "Switch magic attack"
 msgstr "Changer d'attaque magique"
 
-#: src/keyboardconfig.cpp:326
+#: src/keyboardconfig.cpp:328
 msgid "Change move type"
 msgstr "Changer de type de mouvement"
 
-#: src/keyboardconfig.cpp:328
+#: src/keyboardconfig.cpp:330
 msgid "Change Attack Weapon Type"
 msgstr "Changer de type d'arme d'attaque"
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboardconfig.cpp:332
 msgid "Change Attack Type"
 msgstr "Changer de type d'attaque"
 
-#: src/keyboardconfig.cpp:332
+#: src/keyboardconfig.cpp:334
 msgid "Change Follow mode"
 msgstr "Changer de type de suivi"
 
-#: src/keyboardconfig.cpp:334
+#: src/keyboardconfig.cpp:336
 msgid "Change Imitation mode"
 msgstr "Changer de type d'imitation"
 
-#: src/keyboardconfig.cpp:337
+#: src/keyboardconfig.cpp:339
 msgid "Disable / Enable Game modifier keys"
 msgstr "Désactiver / Activer les touches de modifications du jeu"
 
-#: src/keyboardconfig.cpp:338
+#: src/keyboardconfig.cpp:340
 msgid "On / Off audio"
 msgstr "Son On / Off"
 
-#: src/keyboardconfig.cpp:340
+#: src/keyboardconfig.cpp:342
 msgid "Enable / Disable away mode"
 msgstr "Activer / Désactiver le mode en absence"
 
-#: src/keyboardconfig.cpp:342
+#: src/keyboardconfig.cpp:344
 msgid "Emulate right click from keyboard"
 msgstr "Emuler le clic droit à partir du clavier"
 
-#: src/keyboardconfig.cpp:344
+#: src/keyboardconfig.cpp:346
 msgid "Toggle camera mode"
 msgstr "Changer le mode caméra"
 
-#: src/keyboardconfig.cpp:346
+#: src/keyboardconfig.cpp:348
 msgid "Modifier key"
 msgstr "Modifier la touche"
 
-#: src/keyboardconfig.cpp:425
+#: src/keyboardconfig.cpp:427
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -4239,64 +4247,64 @@ msgstr ""
 msgid "You were killed by "
 msgstr "Vous avez été tué par "
 
-#: src/localplayer.cpp:1422
+#: src/localplayer.cpp:1427
 msgid "Tried to pick up nonexistent item."
 msgstr "Vous avez essayé de prendre un item qui n'existe pas."
 
-#: src/localplayer.cpp:1424
+#: src/localplayer.cpp:1429
 msgid "Item is too heavy."
 msgstr "L'objet est trop lourd."
 
-#: src/localplayer.cpp:1426
+#: src/localplayer.cpp:1431
 msgid "Item is too far away."
 msgstr "L'objet est trop éloigné"
 
-#: src/localplayer.cpp:1428
+#: src/localplayer.cpp:1433
 msgid "Inventory is full."
 msgstr "L'inventaire est plein"
 
-#: src/localplayer.cpp:1430
+#: src/localplayer.cpp:1435
 msgid "Stack is too big."
 msgstr "La pile est trop grande"
 
-#: src/localplayer.cpp:1433
+#: src/localplayer.cpp:1438
 msgid "Item belongs to someone else."
 msgstr "L'objet appartient a quelqu'un d'autre"
 
-#: src/localplayer.cpp:1436
+#: src/localplayer.cpp:1441
 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:1460
+#: src/localplayer.cpp:1465
 #, 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:3174
+#: src/localplayer.cpp:3179
 msgid "Away"
 msgstr "Inactif"
 
-#: src/localplayer.cpp:3494
+#: src/localplayer.cpp:3507
 msgid "Follow: "
 msgstr "Suivre : "
 
-#: src/localplayer.cpp:3496 src/localplayer.cpp:3511
+#: src/localplayer.cpp:3509 src/localplayer.cpp:3524
 msgid "Follow canceled"
 msgstr "Suivi annulé"
 
-#: src/localplayer.cpp:3503
+#: src/localplayer.cpp:3516
 msgid "Imitation: "
 msgstr "Imitation: "
 
-#: src/localplayer.cpp:3505 src/localplayer.cpp:3513
+#: src/localplayer.cpp:3518 src/localplayer.cpp:3526
 msgid "Imitation canceled"
 msgstr "Imitation annulée"
 
-#: src/localplayer.cpp:3858
+#: src/localplayer.cpp:3871
 msgid "You see "
 msgstr "Vous voyez  "
 
diff --git a/po/hr.po b/po/hr.po
index 58b3cb0bf..9f6fe475d 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-09-27 22:18+0300\n"
+"POT-Creation-Date: 2011-10-01 01:22+0300\n"
 "PO-Revision-Date: 2011-08-09 22:16+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -338,19 +338,19 @@ msgstr ""
 msgid "Network Error"
 msgstr "Mreža Greška"
 
-#: src/game.cpp:1320
+#: src/game.cpp:1321
 msgid "Ignoring incoming trade requests"
 msgstr "Ignoriranje dolaznih zahtjeva za trgovanje"
 
-#: src/game.cpp:1330
+#: src/game.cpp:1331
 msgid "Accepting incoming trade requests"
 msgstr "Prihvaćanje dolaznih zahtjeva za trgovanje"
 
-#: src/game.cpp:1727
+#: src/game.cpp:1731
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:1728
+#: src/game.cpp:1732
 #, c-format
 msgid "Error while loading %s"
 msgstr "Greška prilikom učitavanja %s"
@@ -408,44 +408,49 @@ msgstr ""
 msgid "Reset"
 msgstr "Poništi"
 
-#: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:98
+#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
 #: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
 #: src/gui/popupmenu.cpp:273 src/gui/popupmenu.cpp:654
 msgid "Buy"
 msgstr "Kupi"
 
-#: src/gui/buydialog.cpp:89 src/gui/buydialog.cpp:303
+#: src/gui/buydialog.cpp:94 src/gui/buydialog.cpp:332
 #: src/gui/selldialog.cpp:88 src/gui/selldialog.cpp:325
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Cijena: %s / Ukupno: %s"
 
+#: src/gui/buydialog.cpp:103
+#, fuzzy
+msgid "Amount:"
+msgstr "Korisnički račun: %s"
+
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:94 src/gui/itemamountwindow.cpp:207
+#: 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:973
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:974
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:97 src/gui/itemamountwindow.cpp:206
+#: 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:985
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:986
 msgid "-"
 msgstr ""
 
-#: src/gui/buydialog.cpp:99 src/gui/quitdialog.cpp:47
+#: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:294
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:84
 msgid "Quit"
 msgstr "Izlaz"
 
-#: src/gui/buydialog.cpp:100 src/gui/selldialog.cpp:95
-#: src/gui/statuswindow.cpp:504 src/gui/statuswindow.cpp:553
-#: src/gui/statuswindow.cpp:972 src/gui/statuswindow.cpp:1003
+#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
+#: src/gui/statuswindow.cpp:504 src/gui/statuswindow.cpp:554
+#: src/gui/statuswindow.cpp:973 src/gui/statuswindow.cpp:1004
 msgid "Max"
 msgstr "Max"
 
@@ -923,7 +928,7 @@ msgid "Equipment"
 msgstr "Oprema"
 
 #: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160
-#: src/gui/inventorywindow.cpp:538 src/gui/inventorywindow.cpp:547
+#: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554
 #: src/gui/popupmenu.cpp:1656 src/gui/popupmenu.cpp:1748
 #: src/gui/popupmenu.cpp:1793
 msgid "Unequip"
@@ -968,20 +973,20 @@ msgstr "Mjesta:"
 msgid "Filter:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:540
-#: src/gui/inventorywindow.cpp:549 src/gui/popupmenu.cpp:1658
+#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547
+#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1658
 #: src/gui/popupmenu.cpp:1750 src/gui/popupmenu.cpp:1795
 msgid "Equip"
 msgstr "Opremi"
 
-#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:541
-#: src/gui/inventorywindow.cpp:545 src/gui/popupmenu.cpp:1662
+#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548
+#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1662
 #: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1754
 #: src/gui/popupmenu.cpp:1799
 msgid "Use"
 msgstr "Upotrijebi"
 
-#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:645
+#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652
 #: src/gui/popupmenu.cpp:1667 src/gui/popupmenu.cpp:1759
 #: src/gui/popupmenu.cpp:1804
 msgid "Drop..."
@@ -1001,7 +1006,7 @@ msgstr ""
 msgid "Weight:"
 msgstr "Težina:"
 
-#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:636
+#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643
 #: src/gui/popupmenu.cpp:1642 src/gui/popupmenu.cpp:1771
 #: src/gui/popupmenu.cpp:1816 src/gui/setup.cpp:73
 msgid "Store"
@@ -1011,7 +1016,7 @@ msgstr "Pohrani"
 msgid "Retrieve"
 msgstr "Preuzmi"
 
-#: src/gui/inventorywindow.cpp:647 src/gui/popupmenu.cpp:1672
+#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1672
 #: src/gui/popupmenu.cpp:1764 src/gui/popupmenu.cpp:1809
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
@@ -3058,130 +3063,130 @@ msgstr ""
 msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:647 src/gui/statuswindow.cpp:712
-#: src/gui/statuswindow.cpp:732 src/gui/statuswindow.cpp:748
-#: src/gui/statuswindow.cpp:794 src/gui/statuswindow.cpp:823
-#: src/gui/statuswindow.cpp:846 src/gui/statuswindow.cpp:865
+#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:713
+#: src/gui/statuswindow.cpp:733 src/gui/statuswindow.cpp:749
+#: src/gui/statuswindow.cpp:795 src/gui/statuswindow.cpp:824
+#: src/gui/statuswindow.cpp:847 src/gui/statuswindow.cpp:866
 msgid "(D)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:650 src/gui/statuswindow.cpp:773
+#: src/gui/statuswindow.cpp:651 src/gui/statuswindow.cpp:774
 msgid "(I)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:653 src/gui/statuswindow.cpp:770
+#: src/gui/statuswindow.cpp:654 src/gui/statuswindow.cpp:771
 msgid "(c)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:656
+#: src/gui/statuswindow.cpp:657
 msgid "(C)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:659 src/gui/statuswindow.cpp:757
+#: src/gui/statuswindow.cpp:660 src/gui/statuswindow.cpp:758
 msgid "(d)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:662 src/gui/statuswindow.cpp:676
-#: src/gui/statuswindow.cpp:705 src/gui/statuswindow.cpp:724
-#: src/gui/statuswindow.cpp:741 src/gui/statuswindow.cpp:760
-#: src/gui/statuswindow.cpp:782 src/gui/statuswindow.cpp:812
-#: src/gui/statuswindow.cpp:838 src/gui/statuswindow.cpp:852
-#: src/gui/statuswindow.cpp:868 src/gui/statuswindow.cpp:881
+#: src/gui/statuswindow.cpp:663 src/gui/statuswindow.cpp:677
+#: src/gui/statuswindow.cpp:706 src/gui/statuswindow.cpp:725
+#: src/gui/statuswindow.cpp:742 src/gui/statuswindow.cpp:761
+#: src/gui/statuswindow.cpp:783 src/gui/statuswindow.cpp:813
+#: src/gui/statuswindow.cpp:839 src/gui/statuswindow.cpp:853
+#: src/gui/statuswindow.cpp:869 src/gui/statuswindow.cpp:882
 msgid "(?)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:673
+#: src/gui/statuswindow.cpp:674
 msgid "(a)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:684
+#: src/gui/statuswindow.cpp:685
 msgid "(0)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:687
+#: src/gui/statuswindow.cpp:688
 msgid "(1)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:690
+#: src/gui/statuswindow.cpp:691
 msgid "(2)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:693 src/gui/statuswindow.cpp:800
+#: src/gui/statuswindow.cpp:694 src/gui/statuswindow.cpp:801
 msgid "(3)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:696
+#: src/gui/statuswindow.cpp:697
 msgid "(5)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:699
+#: src/gui/statuswindow.cpp:700
 msgid "(7)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:702 src/gui/statuswindow.cpp:754
-#: src/gui/statuswindow.cpp:809 src/gui/statuswindow.cpp:878
+#: src/gui/statuswindow.cpp:703 src/gui/statuswindow.cpp:755
+#: src/gui/statuswindow.cpp:810 src/gui/statuswindow.cpp:879
 msgid "(A)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:715
+#: src/gui/statuswindow.cpp:716
 msgid "(R)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:718
+#: src/gui/statuswindow.cpp:719
 msgid "(M)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:721
+#: src/gui/statuswindow.cpp:722
 msgid "(P)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:735
+#: src/gui/statuswindow.cpp:736
 msgid "(s)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:738 src/gui/statuswindow.cpp:791
+#: src/gui/statuswindow.cpp:739 src/gui/statuswindow.cpp:792
 msgid "(S)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:751 src/gui/statuswindow.cpp:806
-#: src/gui/statuswindow.cpp:859
+#: src/gui/statuswindow.cpp:752 src/gui/statuswindow.cpp:807
+#: src/gui/statuswindow.cpp:860
 msgid "(G)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:767
+#: src/gui/statuswindow.cpp:768
 msgid "(f)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:776 src/gui/statuswindow.cpp:797
-#: src/gui/statuswindow.cpp:862
+#: src/gui/statuswindow.cpp:777 src/gui/statuswindow.cpp:798
+#: src/gui/statuswindow.cpp:863
 msgid "(F)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:779 src/gui/statuswindow.cpp:829
+#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:830
 msgid "(U)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:803
+#: src/gui/statuswindow.cpp:804
 msgid "(g)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:820
+#: src/gui/statuswindow.cpp:821
 msgid "(N)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:826
+#: src/gui/statuswindow.cpp:827
 msgid "(u)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:832
+#: src/gui/statuswindow.cpp:833
 msgid "(e)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:835
+#: src/gui/statuswindow.cpp:836
 msgid "(b)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:849 src/gui/statuswindow.cpp:875
+#: src/gui/statuswindow.cpp:850 src/gui/statuswindow.cpp:876
 msgid "(O)"
 msgstr ""
 
@@ -3841,371 +3846,375 @@ msgstr ""
 msgid "Stop Attack"
 msgstr "Prekini Napad"
 
-#: src/keyboardconfig.cpp:64
-msgid "Target Closest"
+#: src/keyboardconfig.cpp:65
+msgid "Untarget"
 msgstr ""
 
 #: src/keyboardconfig.cpp:66
+msgid "Target Closest"
+msgstr ""
+
+#: src/keyboardconfig.cpp:68
 msgid "Target NPC"
 msgstr "Ciljaj NPC"
 
-#: src/keyboardconfig.cpp:67
+#: src/keyboardconfig.cpp:69
 msgid "Target Player"
 msgstr "Ciljaj Igrača"
 
-#: src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:71
 msgid "Pickup"
 msgstr "Pokupi"
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:72
 msgid "Change Pickup Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:74
 msgid "Hide Windows"
 msgstr "Skrij Prozore"
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:76
 msgid "Sit"
 msgstr "Sjedni"
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:77
 msgid "Screenshot"
 msgstr "Snimak zaslona"
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:78
 msgid "Enable/Disable Trading"
 msgstr "Omogući/Onemogući Trgovanje"
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:80
 msgid "Change Map View Mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:82
 msgid "Select OK"
 msgstr "Odaberite OK"
 
-#: src/keyboardconfig.cpp:83
+#: src/keyboardconfig.cpp:85
 #, fuzzy
 msgid "Shortcuts Keys"
 msgstr "Prečac do Predmeta %d"
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:86
 msgid "Item Shortcuts Key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:88
-#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:92
-#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:96
-#: src/keyboardconfig.cpp:98 src/keyboardconfig.cpp:100
-#: src/keyboardconfig.cpp:102 src/keyboardconfig.cpp:104
-#: src/keyboardconfig.cpp:106 src/keyboardconfig.cpp:108
-#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:112
-#: src/keyboardconfig.cpp:114 src/keyboardconfig.cpp:117
-#: src/keyboardconfig.cpp:119 src/keyboardconfig.cpp:121
-#: src/keyboardconfig.cpp:123 src/keyboardconfig.cpp:125
-#: src/keyboardconfig.cpp:367
+#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:90
+#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:94
+#: src/keyboardconfig.cpp:96 src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:100 src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:104 src/keyboardconfig.cpp:106
+#: src/keyboardconfig.cpp:108 src/keyboardconfig.cpp:110
+#: src/keyboardconfig.cpp:112 src/keyboardconfig.cpp:114
+#: src/keyboardconfig.cpp:116 src/keyboardconfig.cpp:119
+#: src/keyboardconfig.cpp:121 src/keyboardconfig.cpp:123
+#: src/keyboardconfig.cpp:125 src/keyboardconfig.cpp:127
+#: src/keyboardconfig.cpp:369
 #, c-format
 msgid "Item Shortcut %d"
 msgstr "Prečac do Predmeta %d"
 
-#: src/keyboardconfig.cpp:126
+#: src/keyboardconfig.cpp:128
 msgid "Windows Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:127
+#: src/keyboardconfig.cpp:129
 msgid "Help Window"
 msgstr "Prozor za Pomoć"
 
-#: src/keyboardconfig.cpp:129
+#: src/keyboardconfig.cpp:131
 msgid "Status Window"
 msgstr "Prozor Statusa"
 
-#: src/keyboardconfig.cpp:131
+#: src/keyboardconfig.cpp:133
 msgid "Inventory Window"
 msgstr "Prozor Inventara"
 
-#: src/keyboardconfig.cpp:133
+#: src/keyboardconfig.cpp:135
 msgid "Equipment Window"
 msgstr "Prozor Opreme"
 
-#: src/keyboardconfig.cpp:135
+#: src/keyboardconfig.cpp:137
 msgid "Skill Window"
 msgstr "Prozor Vještine"
 
-#: src/keyboardconfig.cpp:137
+#: src/keyboardconfig.cpp:139
 msgid "Minimap Window"
 msgstr "Prozor Minikarte"
 
-#: src/keyboardconfig.cpp:139
+#: src/keyboardconfig.cpp:141
 msgid "Chat Window"
 msgstr "Chat Prozor"
 
-#: src/keyboardconfig.cpp:141
+#: src/keyboardconfig.cpp:143
 msgid "Item Shortcut Window"
 msgstr "Prozor za Prečice do Predmeta"
 
-#: src/keyboardconfig.cpp:143
+#: src/keyboardconfig.cpp:145
 msgid "Setup Window"
 msgstr "Prozor za Postavke"
 
-#: src/keyboardconfig.cpp:145
+#: src/keyboardconfig.cpp:147
 msgid "Debug Window"
 msgstr "Debug Prozor"
 
-#: src/keyboardconfig.cpp:147
+#: src/keyboardconfig.cpp:149
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:149
+#: src/keyboardconfig.cpp:151
 msgid "Emote Shortcut Window"
 msgstr "Prozor Prečica za Ispoljavanje emocija"
 
-#: src/keyboardconfig.cpp:151
+#: src/keyboardconfig.cpp:153
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:153
+#: src/keyboardconfig.cpp:155
 msgid "Shop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:155
+#: src/keyboardconfig.cpp:157
 msgid "Quick drop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:157
+#: src/keyboardconfig.cpp:159
 msgid "Kill Stats Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboardconfig.cpp:161
 msgid "Commands Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboardconfig.cpp:163
 msgid "Bot Checker Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:164
+#: src/keyboardconfig.cpp:166
 msgid "Who Is Online Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:166
+#: src/keyboardconfig.cpp:168
 msgid "Did you know Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:169
+#: src/keyboardconfig.cpp:171
 msgid "Previous Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:171
+#: src/keyboardconfig.cpp:173
 msgid "Next Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:173
+#: src/keyboardconfig.cpp:175
 msgid "Emotes Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:174
+#: src/keyboardconfig.cpp:176
 msgid "Smilie"
 msgstr "Smajlić"
 
-#: src/keyboardconfig.cpp:175 src/keyboardconfig.cpp:177
-#: src/keyboardconfig.cpp:179 src/keyboardconfig.cpp:181
-#: src/keyboardconfig.cpp:183 src/keyboardconfig.cpp:185
-#: src/keyboardconfig.cpp:187 src/keyboardconfig.cpp:189
-#: src/keyboardconfig.cpp:191 src/keyboardconfig.cpp:193
-#: src/keyboardconfig.cpp:195 src/keyboardconfig.cpp:197
-#: src/keyboardconfig.cpp:200 src/keyboardconfig.cpp:202
-#: src/keyboardconfig.cpp:204 src/keyboardconfig.cpp:206
-#: src/keyboardconfig.cpp:208 src/keyboardconfig.cpp:210
-#: src/keyboardconfig.cpp:212 src/keyboardconfig.cpp:214
-#: src/keyboardconfig.cpp:216 src/keyboardconfig.cpp:218
-#: src/keyboardconfig.cpp:220 src/keyboardconfig.cpp:222
-#: src/keyboardconfig.cpp:224 src/keyboardconfig.cpp:227
-#: src/keyboardconfig.cpp:230 src/keyboardconfig.cpp:233
-#: src/keyboardconfig.cpp:235 src/keyboardconfig.cpp:237
-#: src/keyboardconfig.cpp:239 src/keyboardconfig.cpp:241
-#: src/keyboardconfig.cpp:243 src/keyboardconfig.cpp:245
-#: src/keyboardconfig.cpp:247 src/keyboardconfig.cpp:249
-#: src/keyboardconfig.cpp:251 src/keyboardconfig.cpp:254
-#: src/keyboardconfig.cpp:256 src/keyboardconfig.cpp:258
-#: src/keyboardconfig.cpp:260 src/keyboardconfig.cpp:262
-#: src/keyboardconfig.cpp:264 src/keyboardconfig.cpp:266
-#: src/keyboardconfig.cpp:362
+#: src/keyboardconfig.cpp:177 src/keyboardconfig.cpp:179
+#: src/keyboardconfig.cpp:181 src/keyboardconfig.cpp:183
+#: src/keyboardconfig.cpp:185 src/keyboardconfig.cpp:187
+#: src/keyboardconfig.cpp:189 src/keyboardconfig.cpp:191
+#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
+#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
+#: src/keyboardconfig.cpp:202 src/keyboardconfig.cpp:204
+#: src/keyboardconfig.cpp:206 src/keyboardconfig.cpp:208
+#: src/keyboardconfig.cpp:210 src/keyboardconfig.cpp:212
+#: src/keyboardconfig.cpp:214 src/keyboardconfig.cpp:216
+#: src/keyboardconfig.cpp:218 src/keyboardconfig.cpp:220
+#: src/keyboardconfig.cpp:222 src/keyboardconfig.cpp:224
+#: src/keyboardconfig.cpp:226 src/keyboardconfig.cpp:229
+#: src/keyboardconfig.cpp:232 src/keyboardconfig.cpp:235
+#: src/keyboardconfig.cpp:237 src/keyboardconfig.cpp:239
+#: src/keyboardconfig.cpp:241 src/keyboardconfig.cpp:243
+#: src/keyboardconfig.cpp:245 src/keyboardconfig.cpp:247
+#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
+#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:256
+#: src/keyboardconfig.cpp:258 src/keyboardconfig.cpp:260
+#: src/keyboardconfig.cpp:262 src/keyboardconfig.cpp:264
+#: src/keyboardconfig.cpp:266 src/keyboardconfig.cpp:268
+#: src/keyboardconfig.cpp:364
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "Prečica za Ispoljavanje emocija %d"
 
-#: src/keyboardconfig.cpp:268
+#: src/keyboardconfig.cpp:270
 msgid "Outfits Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:269
+#: src/keyboardconfig.cpp:271
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:271
+#: src/keyboardconfig.cpp:273
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:273
+#: src/keyboardconfig.cpp:275
 msgid "Copy equipped to Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:275
+#: src/keyboardconfig.cpp:277
 #, fuzzy
 msgid "Chat Keys"
 msgstr "Chat"
 
-#: src/keyboardconfig.cpp:276
+#: src/keyboardconfig.cpp:278
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:280
 msgid "Scroll Chat Up"
 msgstr "Pomakni Chat Gore"
 
-#: src/keyboardconfig.cpp:280
+#: src/keyboardconfig.cpp:282
 msgid "Scroll Chat Down"
 msgstr "Pomakni Chat Dolje"
 
-#: src/keyboardconfig.cpp:282
+#: src/keyboardconfig.cpp:284
 msgid "Previous Chat Tab"
 msgstr "Prethodna Chat Kartica"
 
-#: src/keyboardconfig.cpp:284
+#: src/keyboardconfig.cpp:286
 msgid "Next Chat Tab"
 msgstr "Sljedeća Chat Kartica"
 
-#: src/keyboardconfig.cpp:287
+#: src/keyboardconfig.cpp:289
 msgid "Close current Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:289
+#: src/keyboardconfig.cpp:291
 msgid "Previous chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:291
+#: src/keyboardconfig.cpp:293
 msgid "Next chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:293
+#: src/keyboardconfig.cpp:295
 msgid "Chat Auto Complete"
 msgstr ""
 
-#: src/keyboardconfig.cpp:295
+#: src/keyboardconfig.cpp:297
 msgid "Deactivate Chat Input"
 msgstr ""
 
-#: src/keyboardconfig.cpp:297
+#: src/keyboardconfig.cpp:299
 msgid "Other Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboardconfig.cpp:300
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:300
+#: src/keyboardconfig.cpp:302
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:302
+#: src/keyboardconfig.cpp:304
 msgid "Direct Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboardconfig.cpp:305
 msgid "Direct Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboardconfig.cpp:307
 msgid "Direct Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:306
+#: src/keyboardconfig.cpp:308
 msgid "Direct Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:308
+#: src/keyboardconfig.cpp:310
 msgid "Crazy moves"
 msgstr ""
 
-#: src/keyboardconfig.cpp:310
+#: src/keyboardconfig.cpp:312
 msgid "Change Crazy Move mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboardconfig.cpp:314
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:314
+#: src/keyboardconfig.cpp:316
 msgid "Quick Drop N Items"
 msgstr ""
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboardconfig.cpp:318
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/keyboardconfig.cpp:318
+#: src/keyboardconfig.cpp:320
 msgid "Quick heal target or self"
 msgstr ""
 
-#: src/keyboardconfig.cpp:320
+#: src/keyboardconfig.cpp:322
 msgid "Use #itenplz spell"
 msgstr ""
 
-#: src/keyboardconfig.cpp:322
+#: src/keyboardconfig.cpp:324
 msgid "Use magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:324
+#: src/keyboardconfig.cpp:326
 msgid "Switch magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:326
+#: src/keyboardconfig.cpp:328
 msgid "Change move type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:328
+#: src/keyboardconfig.cpp:330
 msgid "Change Attack Weapon Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboardconfig.cpp:332
 msgid "Change Attack Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:332
+#: src/keyboardconfig.cpp:334
 msgid "Change Follow mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:334
+#: src/keyboardconfig.cpp:336
 msgid "Change Imitation mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:337
+#: src/keyboardconfig.cpp:339
 msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:338
+#: src/keyboardconfig.cpp:340
 msgid "On / Off audio"
 msgstr ""
 
-#: src/keyboardconfig.cpp:340
+#: src/keyboardconfig.cpp:342
 msgid "Enable / Disable away mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:342
+#: src/keyboardconfig.cpp:344
 msgid "Emulate right click from keyboard"
 msgstr ""
 
-#: src/keyboardconfig.cpp:344
+#: src/keyboardconfig.cpp:346
 msgid "Toggle camera mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:346
+#: src/keyboardconfig.cpp:348
 msgid "Modifier key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:425
+#: src/keyboardconfig.cpp:427
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -4216,37 +4225,37 @@ msgstr ""
 msgid "You were killed by "
 msgstr ""
 
-#: src/localplayer.cpp:1422
+#: src/localplayer.cpp:1427
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1424
+#: src/localplayer.cpp:1429
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1426
+#: src/localplayer.cpp:1431
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1428
+#: src/localplayer.cpp:1433
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1430
+#: src/localplayer.cpp:1435
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1433
+#: src/localplayer.cpp:1438
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1436
+#: src/localplayer.cpp:1441
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1460
+#: src/localplayer.cpp:1465
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -4254,27 +4263,27 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/localplayer.cpp:3174
+#: src/localplayer.cpp:3179
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:3494
+#: src/localplayer.cpp:3507
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3496 src/localplayer.cpp:3511
+#: src/localplayer.cpp:3509 src/localplayer.cpp:3524
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3503
+#: src/localplayer.cpp:3516
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3505 src/localplayer.cpp:3513
+#: src/localplayer.cpp:3518 src/localplayer.cpp:3526
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3858
+#: src/localplayer.cpp:3871
 msgid "You see "
 msgstr ""
 
diff --git a/po/hu.po b/po/hu.po
index 5d4144367..f7cbcef29 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-09-27 22:18+0300\n"
+"POT-Creation-Date: 2011-10-01 01:22+0300\n"
 "PO-Revision-Date: 2011-08-09 22:16+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -333,19 +333,19 @@ msgstr ""
 msgid "Network Error"
 msgstr "Hálózati hiba"
 
-#: src/game.cpp:1320
+#: src/game.cpp:1321
 msgid "Ignoring incoming trade requests"
 msgstr "Kereskedési kérelmek elutasítása"
 
-#: src/game.cpp:1330
+#: src/game.cpp:1331
 msgid "Accepting incoming trade requests"
 msgstr "Kereskedési kérelmek elfogadása"
 
-#: src/game.cpp:1727
+#: src/game.cpp:1731
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:1728
+#: src/game.cpp:1732
 #, c-format
 msgid "Error while loading %s"
 msgstr "Hiba %s betöltése közben"
@@ -403,44 +403,49 @@ msgstr ""
 msgid "Reset"
 msgstr "Alaphelyzet"
 
-#: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:98
+#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
 #: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
 #: src/gui/popupmenu.cpp:273 src/gui/popupmenu.cpp:654
 msgid "Buy"
 msgstr "Vétel"
 
-#: src/gui/buydialog.cpp:89 src/gui/buydialog.cpp:303
+#: src/gui/buydialog.cpp:94 src/gui/buydialog.cpp:332
 #: src/gui/selldialog.cpp:88 src/gui/selldialog.cpp:325
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Ár: %s / Teljes: %s"
 
+#: src/gui/buydialog.cpp:103
+#, fuzzy
+msgid "Amount:"
+msgstr "Fiók: %s"
+
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:94 src/gui/itemamountwindow.cpp:207
+#: 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:973
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:974
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:97 src/gui/itemamountwindow.cpp:206
+#: 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:985
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:986
 msgid "-"
 msgstr ""
 
-#: src/gui/buydialog.cpp:99 src/gui/quitdialog.cpp:47
+#: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:294
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:84
 msgid "Quit"
 msgstr "Kilépés"
 
-#: src/gui/buydialog.cpp:100 src/gui/selldialog.cpp:95
-#: src/gui/statuswindow.cpp:504 src/gui/statuswindow.cpp:553
-#: src/gui/statuswindow.cpp:972 src/gui/statuswindow.cpp:1003
+#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
+#: src/gui/statuswindow.cpp:504 src/gui/statuswindow.cpp:554
+#: src/gui/statuswindow.cpp:973 src/gui/statuswindow.cpp:1004
 msgid "Max"
 msgstr "Max."
 
@@ -918,7 +923,7 @@ msgid "Equipment"
 msgstr "Felszerelés"
 
 #: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160
-#: src/gui/inventorywindow.cpp:538 src/gui/inventorywindow.cpp:547
+#: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554
 #: src/gui/popupmenu.cpp:1656 src/gui/popupmenu.cpp:1748
 #: src/gui/popupmenu.cpp:1793
 msgid "Unequip"
@@ -963,20 +968,20 @@ msgstr "Hely:"
 msgid "Filter:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:540
-#: src/gui/inventorywindow.cpp:549 src/gui/popupmenu.cpp:1658
+#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547
+#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1658
 #: src/gui/popupmenu.cpp:1750 src/gui/popupmenu.cpp:1795
 msgid "Equip"
 msgstr "Használ"
 
-#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:541
-#: src/gui/inventorywindow.cpp:545 src/gui/popupmenu.cpp:1662
+#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548
+#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1662
 #: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1754
 #: src/gui/popupmenu.cpp:1799
 msgid "Use"
 msgstr "Bevet"
 
-#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:645
+#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652
 #: src/gui/popupmenu.cpp:1667 src/gui/popupmenu.cpp:1759
 #: src/gui/popupmenu.cpp:1804
 msgid "Drop..."
@@ -996,7 +1001,7 @@ msgstr ""
 msgid "Weight:"
 msgstr "Súly:"
 
-#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:636
+#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643
 #: src/gui/popupmenu.cpp:1642 src/gui/popupmenu.cpp:1771
 #: src/gui/popupmenu.cpp:1816 src/gui/setup.cpp:73
 msgid "Store"
@@ -1006,7 +1011,7 @@ msgstr "Raktároz"
 msgid "Retrieve"
 msgstr "Magához vesz"
 
-#: src/gui/inventorywindow.cpp:647 src/gui/popupmenu.cpp:1672
+#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1672
 #: src/gui/popupmenu.cpp:1764 src/gui/popupmenu.cpp:1809
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
@@ -3051,130 +3056,130 @@ msgstr ""
 msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:647 src/gui/statuswindow.cpp:712
-#: src/gui/statuswindow.cpp:732 src/gui/statuswindow.cpp:748
-#: src/gui/statuswindow.cpp:794 src/gui/statuswindow.cpp:823
-#: src/gui/statuswindow.cpp:846 src/gui/statuswindow.cpp:865
+#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:713
+#: src/gui/statuswindow.cpp:733 src/gui/statuswindow.cpp:749
+#: src/gui/statuswindow.cpp:795 src/gui/statuswindow.cpp:824
+#: src/gui/statuswindow.cpp:847 src/gui/statuswindow.cpp:866
 msgid "(D)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:650 src/gui/statuswindow.cpp:773
+#: src/gui/statuswindow.cpp:651 src/gui/statuswindow.cpp:774
 msgid "(I)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:653 src/gui/statuswindow.cpp:770
+#: src/gui/statuswindow.cpp:654 src/gui/statuswindow.cpp:771
 msgid "(c)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:656
+#: src/gui/statuswindow.cpp:657
 msgid "(C)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:659 src/gui/statuswindow.cpp:757
+#: src/gui/statuswindow.cpp:660 src/gui/statuswindow.cpp:758
 msgid "(d)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:662 src/gui/statuswindow.cpp:676
-#: src/gui/statuswindow.cpp:705 src/gui/statuswindow.cpp:724
-#: src/gui/statuswindow.cpp:741 src/gui/statuswindow.cpp:760
-#: src/gui/statuswindow.cpp:782 src/gui/statuswindow.cpp:812
-#: src/gui/statuswindow.cpp:838 src/gui/statuswindow.cpp:852
-#: src/gui/statuswindow.cpp:868 src/gui/statuswindow.cpp:881
+#: src/gui/statuswindow.cpp:663 src/gui/statuswindow.cpp:677
+#: src/gui/statuswindow.cpp:706 src/gui/statuswindow.cpp:725
+#: src/gui/statuswindow.cpp:742 src/gui/statuswindow.cpp:761
+#: src/gui/statuswindow.cpp:783 src/gui/statuswindow.cpp:813
+#: src/gui/statuswindow.cpp:839 src/gui/statuswindow.cpp:853
+#: src/gui/statuswindow.cpp:869 src/gui/statuswindow.cpp:882
 msgid "(?)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:673
+#: src/gui/statuswindow.cpp:674
 msgid "(a)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:684
+#: src/gui/statuswindow.cpp:685
 msgid "(0)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:687
+#: src/gui/statuswindow.cpp:688
 msgid "(1)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:690
+#: src/gui/statuswindow.cpp:691
 msgid "(2)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:693 src/gui/statuswindow.cpp:800
+#: src/gui/statuswindow.cpp:694 src/gui/statuswindow.cpp:801
 msgid "(3)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:696
+#: src/gui/statuswindow.cpp:697
 msgid "(5)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:699
+#: src/gui/statuswindow.cpp:700
 msgid "(7)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:702 src/gui/statuswindow.cpp:754
-#: src/gui/statuswindow.cpp:809 src/gui/statuswindow.cpp:878
+#: src/gui/statuswindow.cpp:703 src/gui/statuswindow.cpp:755
+#: src/gui/statuswindow.cpp:810 src/gui/statuswindow.cpp:879
 msgid "(A)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:715
+#: src/gui/statuswindow.cpp:716
 msgid "(R)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:718
+#: src/gui/statuswindow.cpp:719
 msgid "(M)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:721
+#: src/gui/statuswindow.cpp:722
 msgid "(P)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:735
+#: src/gui/statuswindow.cpp:736
 msgid "(s)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:738 src/gui/statuswindow.cpp:791
+#: src/gui/statuswindow.cpp:739 src/gui/statuswindow.cpp:792
 msgid "(S)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:751 src/gui/statuswindow.cpp:806
-#: src/gui/statuswindow.cpp:859
+#: src/gui/statuswindow.cpp:752 src/gui/statuswindow.cpp:807
+#: src/gui/statuswindow.cpp:860
 msgid "(G)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:767
+#: src/gui/statuswindow.cpp:768
 msgid "(f)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:776 src/gui/statuswindow.cpp:797
-#: src/gui/statuswindow.cpp:862
+#: src/gui/statuswindow.cpp:777 src/gui/statuswindow.cpp:798
+#: src/gui/statuswindow.cpp:863
 msgid "(F)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:779 src/gui/statuswindow.cpp:829
+#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:830
 msgid "(U)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:803
+#: src/gui/statuswindow.cpp:804
 msgid "(g)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:820
+#: src/gui/statuswindow.cpp:821
 msgid "(N)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:826
+#: src/gui/statuswindow.cpp:827
 msgid "(u)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:832
+#: src/gui/statuswindow.cpp:833
 msgid "(e)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:835
+#: src/gui/statuswindow.cpp:836
 msgid "(b)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:849 src/gui/statuswindow.cpp:875
+#: src/gui/statuswindow.cpp:850 src/gui/statuswindow.cpp:876
 msgid "(O)"
 msgstr ""
 
@@ -3836,371 +3841,375 @@ msgstr ""
 msgid "Stop Attack"
 msgstr "Támadás Megszüntetése"
 
-#: src/keyboardconfig.cpp:64
-msgid "Target Closest"
+#: src/keyboardconfig.cpp:65
+msgid "Untarget"
 msgstr ""
 
 #: src/keyboardconfig.cpp:66
+msgid "Target Closest"
+msgstr ""
+
+#: src/keyboardconfig.cpp:68
 msgid "Target NPC"
 msgstr "Gépjátékost Kijelöl"
 
-#: src/keyboardconfig.cpp:67
+#: src/keyboardconfig.cpp:69
 msgid "Target Player"
 msgstr "Játékost Kijelöl"
 
-#: src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:71
 msgid "Pickup"
 msgstr "Felvesz"
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:72
 msgid "Change Pickup Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:74
 msgid "Hide Windows"
 msgstr "Ablakok Elrejtése"
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:76
 msgid "Sit"
 msgstr "Ülés"
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:77
 msgid "Screenshot"
 msgstr "Képernyőkép"
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:78
 msgid "Enable/Disable Trading"
 msgstr "Üzletelés Engedélyezése/Tiltása"
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:80
 msgid "Change Map View Mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:82
 msgid "Select OK"
 msgstr "Ok Kiválasztása"
 
-#: src/keyboardconfig.cpp:83
+#: src/keyboardconfig.cpp:85
 #, fuzzy
 msgid "Shortcuts Keys"
 msgstr "Gyorsmenü %d"
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:86
 msgid "Item Shortcuts Key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:88
-#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:92
-#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:96
-#: src/keyboardconfig.cpp:98 src/keyboardconfig.cpp:100
-#: src/keyboardconfig.cpp:102 src/keyboardconfig.cpp:104
-#: src/keyboardconfig.cpp:106 src/keyboardconfig.cpp:108
-#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:112
-#: src/keyboardconfig.cpp:114 src/keyboardconfig.cpp:117
-#: src/keyboardconfig.cpp:119 src/keyboardconfig.cpp:121
-#: src/keyboardconfig.cpp:123 src/keyboardconfig.cpp:125
-#: src/keyboardconfig.cpp:367
+#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:90
+#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:94
+#: src/keyboardconfig.cpp:96 src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:100 src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:104 src/keyboardconfig.cpp:106
+#: src/keyboardconfig.cpp:108 src/keyboardconfig.cpp:110
+#: src/keyboardconfig.cpp:112 src/keyboardconfig.cpp:114
+#: src/keyboardconfig.cpp:116 src/keyboardconfig.cpp:119
+#: src/keyboardconfig.cpp:121 src/keyboardconfig.cpp:123
+#: src/keyboardconfig.cpp:125 src/keyboardconfig.cpp:127
+#: src/keyboardconfig.cpp:369
 #, c-format
 msgid "Item Shortcut %d"
 msgstr "Gyorsmenü %d"
 
-#: src/keyboardconfig.cpp:126
+#: src/keyboardconfig.cpp:128
 msgid "Windows Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:127
+#: src/keyboardconfig.cpp:129
 msgid "Help Window"
 msgstr "Súgó Ablak"
 
-#: src/keyboardconfig.cpp:129
+#: src/keyboardconfig.cpp:131
 msgid "Status Window"
 msgstr "Sztátusz Ablak"
 
-#: src/keyboardconfig.cpp:131
+#: src/keyboardconfig.cpp:133
 msgid "Inventory Window"
 msgstr "Táska Ablak"
 
-#: src/keyboardconfig.cpp:133
+#: src/keyboardconfig.cpp:135
 msgid "Equipment Window"
 msgstr "Felszerelés Ablak"
 
-#: src/keyboardconfig.cpp:135
+#: src/keyboardconfig.cpp:137
 msgid "Skill Window"
 msgstr "Képességek Ablak"
 
-#: src/keyboardconfig.cpp:137
+#: src/keyboardconfig.cpp:139
 msgid "Minimap Window"
 msgstr "Minitérkép Ablak"
 
-#: src/keyboardconfig.cpp:139
+#: src/keyboardconfig.cpp:141
 msgid "Chat Window"
 msgstr "Chat Ablak"
 
-#: src/keyboardconfig.cpp:141
+#: src/keyboardconfig.cpp:143
 msgid "Item Shortcut Window"
 msgstr "Gyorsmenü Ablak"
 
-#: src/keyboardconfig.cpp:143
+#: src/keyboardconfig.cpp:145
 msgid "Setup Window"
 msgstr "Beállítások Ablak"
 
-#: src/keyboardconfig.cpp:145
+#: src/keyboardconfig.cpp:147
 msgid "Debug Window"
 msgstr "Hibakereső Ablak"
 
-#: src/keyboardconfig.cpp:147
+#: src/keyboardconfig.cpp:149
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:149
+#: src/keyboardconfig.cpp:151
 msgid "Emote Shortcut Window"
 msgstr "Hangulatjel Gyorsmenü Ablak"
 
-#: src/keyboardconfig.cpp:151
+#: src/keyboardconfig.cpp:153
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:153
+#: src/keyboardconfig.cpp:155
 msgid "Shop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:155
+#: src/keyboardconfig.cpp:157
 msgid "Quick drop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:157
+#: src/keyboardconfig.cpp:159
 msgid "Kill Stats Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboardconfig.cpp:161
 msgid "Commands Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboardconfig.cpp:163
 msgid "Bot Checker Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:164
+#: src/keyboardconfig.cpp:166
 msgid "Who Is Online Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:166
+#: src/keyboardconfig.cpp:168
 msgid "Did you know Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:169
+#: src/keyboardconfig.cpp:171
 msgid "Previous Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:171
+#: src/keyboardconfig.cpp:173
 msgid "Next Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:173
+#: src/keyboardconfig.cpp:175
 msgid "Emotes Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:174
+#: src/keyboardconfig.cpp:176
 msgid "Smilie"
 msgstr "Hangulatjel"
 
-#: src/keyboardconfig.cpp:175 src/keyboardconfig.cpp:177
-#: src/keyboardconfig.cpp:179 src/keyboardconfig.cpp:181
-#: src/keyboardconfig.cpp:183 src/keyboardconfig.cpp:185
-#: src/keyboardconfig.cpp:187 src/keyboardconfig.cpp:189
-#: src/keyboardconfig.cpp:191 src/keyboardconfig.cpp:193
-#: src/keyboardconfig.cpp:195 src/keyboardconfig.cpp:197
-#: src/keyboardconfig.cpp:200 src/keyboardconfig.cpp:202
-#: src/keyboardconfig.cpp:204 src/keyboardconfig.cpp:206
-#: src/keyboardconfig.cpp:208 src/keyboardconfig.cpp:210
-#: src/keyboardconfig.cpp:212 src/keyboardconfig.cpp:214
-#: src/keyboardconfig.cpp:216 src/keyboardconfig.cpp:218
-#: src/keyboardconfig.cpp:220 src/keyboardconfig.cpp:222
-#: src/keyboardconfig.cpp:224 src/keyboardconfig.cpp:227
-#: src/keyboardconfig.cpp:230 src/keyboardconfig.cpp:233
-#: src/keyboardconfig.cpp:235 src/keyboardconfig.cpp:237
-#: src/keyboardconfig.cpp:239 src/keyboardconfig.cpp:241
-#: src/keyboardconfig.cpp:243 src/keyboardconfig.cpp:245
-#: src/keyboardconfig.cpp:247 src/keyboardconfig.cpp:249
-#: src/keyboardconfig.cpp:251 src/keyboardconfig.cpp:254
-#: src/keyboardconfig.cpp:256 src/keyboardconfig.cpp:258
-#: src/keyboardconfig.cpp:260 src/keyboardconfig.cpp:262
-#: src/keyboardconfig.cpp:264 src/keyboardconfig.cpp:266
-#: src/keyboardconfig.cpp:362
+#: src/keyboardconfig.cpp:177 src/keyboardconfig.cpp:179
+#: src/keyboardconfig.cpp:181 src/keyboardconfig.cpp:183
+#: src/keyboardconfig.cpp:185 src/keyboardconfig.cpp:187
+#: src/keyboardconfig.cpp:189 src/keyboardconfig.cpp:191
+#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
+#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
+#: src/keyboardconfig.cpp:202 src/keyboardconfig.cpp:204
+#: src/keyboardconfig.cpp:206 src/keyboardconfig.cpp:208
+#: src/keyboardconfig.cpp:210 src/keyboardconfig.cpp:212
+#: src/keyboardconfig.cpp:214 src/keyboardconfig.cpp:216
+#: src/keyboardconfig.cpp:218 src/keyboardconfig.cpp:220
+#: src/keyboardconfig.cpp:222 src/keyboardconfig.cpp:224
+#: src/keyboardconfig.cpp:226 src/keyboardconfig.cpp:229
+#: src/keyboardconfig.cpp:232 src/keyboardconfig.cpp:235
+#: src/keyboardconfig.cpp:237 src/keyboardconfig.cpp:239
+#: src/keyboardconfig.cpp:241 src/keyboardconfig.cpp:243
+#: src/keyboardconfig.cpp:245 src/keyboardconfig.cpp:247
+#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
+#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:256
+#: src/keyboardconfig.cpp:258 src/keyboardconfig.cpp:260
+#: src/keyboardconfig.cpp:262 src/keyboardconfig.cpp:264
+#: src/keyboardconfig.cpp:266 src/keyboardconfig.cpp:268
+#: src/keyboardconfig.cpp:364
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "Hangulatjel Gyorsmenü %d"
 
-#: src/keyboardconfig.cpp:268
+#: src/keyboardconfig.cpp:270
 msgid "Outfits Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:269
+#: src/keyboardconfig.cpp:271
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:271
+#: src/keyboardconfig.cpp:273
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:273
+#: src/keyboardconfig.cpp:275
 msgid "Copy equipped to Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:275
+#: src/keyboardconfig.cpp:277
 #, fuzzy
 msgid "Chat Keys"
 msgstr "Chat"
 
-#: src/keyboardconfig.cpp:276
+#: src/keyboardconfig.cpp:278
 msgid "Toggle Chat"
 msgstr "Chat Ki/Be Kapcsolása"
 
-#: src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:280
 msgid "Scroll Chat Up"
 msgstr "Csevej Felfele Görgetése"
 
-#: src/keyboardconfig.cpp:280
+#: src/keyboardconfig.cpp:282
 msgid "Scroll Chat Down"
 msgstr "Csevej Lefele Görgetése"
 
-#: src/keyboardconfig.cpp:282
+#: src/keyboardconfig.cpp:284
 msgid "Previous Chat Tab"
 msgstr "Előző Chat Fül"
 
-#: src/keyboardconfig.cpp:284
+#: src/keyboardconfig.cpp:286
 msgid "Next Chat Tab"
 msgstr "Következő Chat Fül"
 
-#: src/keyboardconfig.cpp:287
+#: src/keyboardconfig.cpp:289
 msgid "Close current Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:289
+#: src/keyboardconfig.cpp:291
 msgid "Previous chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:291
+#: src/keyboardconfig.cpp:293
 msgid "Next chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:293
+#: src/keyboardconfig.cpp:295
 msgid "Chat Auto Complete"
 msgstr ""
 
-#: src/keyboardconfig.cpp:295
+#: src/keyboardconfig.cpp:297
 msgid "Deactivate Chat Input"
 msgstr ""
 
-#: src/keyboardconfig.cpp:297
+#: src/keyboardconfig.cpp:299
 msgid "Other Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboardconfig.cpp:300
 msgid "Ignore input 1"
 msgstr "Ignore input 1"
 
-#: src/keyboardconfig.cpp:300
+#: src/keyboardconfig.cpp:302
 msgid "Ignore input 2"
 msgstr "Ignore input 2"
 
-#: src/keyboardconfig.cpp:302
+#: src/keyboardconfig.cpp:304
 msgid "Direct Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboardconfig.cpp:305
 msgid "Direct Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboardconfig.cpp:307
 msgid "Direct Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:306
+#: src/keyboardconfig.cpp:308
 msgid "Direct Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:308
+#: src/keyboardconfig.cpp:310
 msgid "Crazy moves"
 msgstr ""
 
-#: src/keyboardconfig.cpp:310
+#: src/keyboardconfig.cpp:312
 msgid "Change Crazy Move mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboardconfig.cpp:314
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:314
+#: src/keyboardconfig.cpp:316
 msgid "Quick Drop N Items"
 msgstr ""
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboardconfig.cpp:318
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/keyboardconfig.cpp:318
+#: src/keyboardconfig.cpp:320
 msgid "Quick heal target or self"
 msgstr ""
 
-#: src/keyboardconfig.cpp:320
+#: src/keyboardconfig.cpp:322
 msgid "Use #itenplz spell"
 msgstr ""
 
-#: src/keyboardconfig.cpp:322
+#: src/keyboardconfig.cpp:324
 msgid "Use magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:324
+#: src/keyboardconfig.cpp:326
 msgid "Switch magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:326
+#: src/keyboardconfig.cpp:328
 msgid "Change move type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:328
+#: src/keyboardconfig.cpp:330
 msgid "Change Attack Weapon Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboardconfig.cpp:332
 msgid "Change Attack Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:332
+#: src/keyboardconfig.cpp:334
 msgid "Change Follow mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:334
+#: src/keyboardconfig.cpp:336
 msgid "Change Imitation mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:337
+#: src/keyboardconfig.cpp:339
 msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:338
+#: src/keyboardconfig.cpp:340
 msgid "On / Off audio"
 msgstr ""
 
-#: src/keyboardconfig.cpp:340
+#: src/keyboardconfig.cpp:342
 msgid "Enable / Disable away mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:342
+#: src/keyboardconfig.cpp:344
 msgid "Emulate right click from keyboard"
 msgstr ""
 
-#: src/keyboardconfig.cpp:344
+#: src/keyboardconfig.cpp:346
 msgid "Toggle camera mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:346
+#: src/keyboardconfig.cpp:348
 msgid "Modifier key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:425
+#: src/keyboardconfig.cpp:427
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -4211,64 +4220,64 @@ msgstr ""
 msgid "You were killed by "
 msgstr ""
 
-#: src/localplayer.cpp:1422
+#: src/localplayer.cpp:1427
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1424
+#: src/localplayer.cpp:1429
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1426
+#: src/localplayer.cpp:1431
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1428
+#: src/localplayer.cpp:1433
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1430
+#: src/localplayer.cpp:1435
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1433
+#: src/localplayer.cpp:1438
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1436
+#: src/localplayer.cpp:1441
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1460
+#: src/localplayer.cpp:1465
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/localplayer.cpp:3174
+#: src/localplayer.cpp:3179
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:3494
+#: src/localplayer.cpp:3507
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3496 src/localplayer.cpp:3511
+#: src/localplayer.cpp:3509 src/localplayer.cpp:3524
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3503
+#: src/localplayer.cpp:3516
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3505 src/localplayer.cpp:3513
+#: src/localplayer.cpp:3518 src/localplayer.cpp:3526
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3858
+#: src/localplayer.cpp:3871
 msgid "You see "
 msgstr ""
 
diff --git a/po/id.po b/po/id.po
index 4ae2c1924..d717add9c 100644
--- a/po/id.po
+++ b/po/id.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-09-27 22:18+0300\n"
+"POT-Creation-Date: 2011-10-01 01:22+0300\n"
 "PO-Revision-Date: 2011-09-27 19:20+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: Indonesian (http://www.transifex.net/projects/p/manaplus/team/"
@@ -332,19 +332,19 @@ msgstr "Koneksi ke server terputus"
 msgid "Network Error"
 msgstr "Kesalahan jaringan"
 
-#: src/game.cpp:1320
+#: src/game.cpp:1321
 msgid "Ignoring incoming trade requests"
 msgstr "Abaikan permohonan transaksi"
 
-#: src/game.cpp:1330
+#: src/game.cpp:1331
 msgid "Accepting incoming trade requests"
 msgstr "Terima permohonan transaksi"
 
-#: src/game.cpp:1727
+#: src/game.cpp:1731
 msgid "Could Not Load Map"
 msgstr "Tidak dapat menampilkan peta"
 
-#: src/game.cpp:1728
+#: src/game.cpp:1732
 #, c-format
 msgid "Error while loading %s"
 msgstr "Error ketika menunggu %s"
@@ -402,44 +402,49 @@ msgstr "Hasil"
 msgid "Reset"
 msgstr "Reset"
 
-#: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:98
+#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
 #: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
 #: src/gui/popupmenu.cpp:273 src/gui/popupmenu.cpp:654
 msgid "Buy"
 msgstr "Beli"
 
-#: src/gui/buydialog.cpp:89 src/gui/buydialog.cpp:303
+#: src/gui/buydialog.cpp:94 src/gui/buydialog.cpp:332
 #: src/gui/selldialog.cpp:88 src/gui/selldialog.cpp:325
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Harga: %s/ Total: %s"
 
+#: src/gui/buydialog.cpp:103
+#, fuzzy
+msgid "Amount:"
+msgstr "Akun:%s"
+
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:94 src/gui/itemamountwindow.cpp:207
+#: 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:973
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:974
 msgid "+"
 msgstr "+"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:97 src/gui/itemamountwindow.cpp:206
+#: 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:985
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:986
 msgid "-"
 msgstr "-"
 
-#: src/gui/buydialog.cpp:99 src/gui/quitdialog.cpp:47
+#: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:294
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:84
 msgid "Quit"
 msgstr "Keluar"
 
-#: src/gui/buydialog.cpp:100 src/gui/selldialog.cpp:95
-#: src/gui/statuswindow.cpp:504 src/gui/statuswindow.cpp:553
-#: src/gui/statuswindow.cpp:972 src/gui/statuswindow.cpp:1003
+#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
+#: src/gui/statuswindow.cpp:504 src/gui/statuswindow.cpp:554
+#: src/gui/statuswindow.cpp:973 src/gui/statuswindow.cpp:1004
 msgid "Max"
 msgstr "Max"
 
@@ -917,7 +922,7 @@ msgid "Equipment"
 msgstr "Perlengkapan"
 
 #: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160
-#: src/gui/inventorywindow.cpp:538 src/gui/inventorywindow.cpp:547
+#: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554
 #: src/gui/popupmenu.cpp:1656 src/gui/popupmenu.cpp:1748
 #: src/gui/popupmenu.cpp:1793
 msgid "Unequip"
@@ -960,20 +965,20 @@ msgstr "Slot"
 msgid "Filter:"
 msgstr "Penyaring:"
 
-#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:540
-#: src/gui/inventorywindow.cpp:549 src/gui/popupmenu.cpp:1658
+#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547
+#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1658
 #: src/gui/popupmenu.cpp:1750 src/gui/popupmenu.cpp:1795
 msgid "Equip"
 msgstr "Pakai"
 
-#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:541
-#: src/gui/inventorywindow.cpp:545 src/gui/popupmenu.cpp:1662
+#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548
+#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1662
 #: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1754
 #: src/gui/popupmenu.cpp:1799
 msgid "Use"
 msgstr "Gunakan"
 
-#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:645
+#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652
 #: src/gui/popupmenu.cpp:1667 src/gui/popupmenu.cpp:1759
 #: src/gui/popupmenu.cpp:1804
 msgid "Drop..."
@@ -993,7 +998,7 @@ msgstr "Setelan"
 msgid "Weight:"
 msgstr "Berat"
 
-#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:636
+#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643
 #: src/gui/popupmenu.cpp:1642 src/gui/popupmenu.cpp:1771
 #: src/gui/popupmenu.cpp:1816 src/gui/setup.cpp:73
 msgid "Store"
@@ -1003,7 +1008,7 @@ msgstr "Simpan"
 msgid "Retrieve"
 msgstr "Kembalikan"
 
-#: src/gui/inventorywindow.cpp:647 src/gui/popupmenu.cpp:1672
+#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1672
 #: src/gui/popupmenu.cpp:1764 src/gui/popupmenu.cpp:1809
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
@@ -3046,130 +3051,130 @@ msgstr ""
 msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:647 src/gui/statuswindow.cpp:712
-#: src/gui/statuswindow.cpp:732 src/gui/statuswindow.cpp:748
-#: src/gui/statuswindow.cpp:794 src/gui/statuswindow.cpp:823
-#: src/gui/statuswindow.cpp:846 src/gui/statuswindow.cpp:865
+#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:713
+#: src/gui/statuswindow.cpp:733 src/gui/statuswindow.cpp:749
+#: src/gui/statuswindow.cpp:795 src/gui/statuswindow.cpp:824
+#: src/gui/statuswindow.cpp:847 src/gui/statuswindow.cpp:866
 msgid "(D)"
 msgstr "(D)"
 
-#: src/gui/statuswindow.cpp:650 src/gui/statuswindow.cpp:773
+#: src/gui/statuswindow.cpp:651 src/gui/statuswindow.cpp:774
 msgid "(I)"
 msgstr "(l)"
 
-#: src/gui/statuswindow.cpp:653 src/gui/statuswindow.cpp:770
+#: src/gui/statuswindow.cpp:654 src/gui/statuswindow.cpp:771
 msgid "(c)"
 msgstr "(c)"
 
-#: src/gui/statuswindow.cpp:656
+#: src/gui/statuswindow.cpp:657
 msgid "(C)"
 msgstr "(C)"
 
-#: src/gui/statuswindow.cpp:659 src/gui/statuswindow.cpp:757
+#: src/gui/statuswindow.cpp:660 src/gui/statuswindow.cpp:758
 msgid "(d)"
 msgstr "(d)"
 
-#: src/gui/statuswindow.cpp:662 src/gui/statuswindow.cpp:676
-#: src/gui/statuswindow.cpp:705 src/gui/statuswindow.cpp:724
-#: src/gui/statuswindow.cpp:741 src/gui/statuswindow.cpp:760
-#: src/gui/statuswindow.cpp:782 src/gui/statuswindow.cpp:812
-#: src/gui/statuswindow.cpp:838 src/gui/statuswindow.cpp:852
-#: src/gui/statuswindow.cpp:868 src/gui/statuswindow.cpp:881
+#: src/gui/statuswindow.cpp:663 src/gui/statuswindow.cpp:677
+#: src/gui/statuswindow.cpp:706 src/gui/statuswindow.cpp:725
+#: src/gui/statuswindow.cpp:742 src/gui/statuswindow.cpp:761
+#: src/gui/statuswindow.cpp:783 src/gui/statuswindow.cpp:813
+#: src/gui/statuswindow.cpp:839 src/gui/statuswindow.cpp:853
+#: src/gui/statuswindow.cpp:869 src/gui/statuswindow.cpp:882
 msgid "(?)"
 msgstr "(?)"
 
-#: src/gui/statuswindow.cpp:673
+#: src/gui/statuswindow.cpp:674
 msgid "(a)"
 msgstr "(a)"
 
-#: src/gui/statuswindow.cpp:684
+#: src/gui/statuswindow.cpp:685
 msgid "(0)"
 msgstr "(0)"
 
-#: src/gui/statuswindow.cpp:687
+#: src/gui/statuswindow.cpp:688
 msgid "(1)"
 msgstr "(1)"
 
-#: src/gui/statuswindow.cpp:690
+#: src/gui/statuswindow.cpp:691
 msgid "(2)"
 msgstr "(2)"
 
-#: src/gui/statuswindow.cpp:693 src/gui/statuswindow.cpp:800
+#: src/gui/statuswindow.cpp:694 src/gui/statuswindow.cpp:801
 msgid "(3)"
 msgstr "(3)"
 
-#: src/gui/statuswindow.cpp:696
+#: src/gui/statuswindow.cpp:697
 msgid "(5)"
 msgstr "(5)"
 
-#: src/gui/statuswindow.cpp:699
+#: src/gui/statuswindow.cpp:700
 msgid "(7)"
 msgstr "(7)"
 
-#: src/gui/statuswindow.cpp:702 src/gui/statuswindow.cpp:754
-#: src/gui/statuswindow.cpp:809 src/gui/statuswindow.cpp:878
+#: src/gui/statuswindow.cpp:703 src/gui/statuswindow.cpp:755
+#: src/gui/statuswindow.cpp:810 src/gui/statuswindow.cpp:879
 msgid "(A)"
 msgstr "(A)"
 
-#: src/gui/statuswindow.cpp:715
+#: src/gui/statuswindow.cpp:716
 msgid "(R)"
 msgstr "(R)"
 
-#: src/gui/statuswindow.cpp:718
+#: src/gui/statuswindow.cpp:719
 msgid "(M)"
 msgstr "(M)"
 
-#: src/gui/statuswindow.cpp:721
+#: src/gui/statuswindow.cpp:722
 msgid "(P)"
 msgstr "(P)"
 
-#: src/gui/statuswindow.cpp:735
+#: src/gui/statuswindow.cpp:736
 msgid "(s)"
 msgstr "(s)"
 
-#: src/gui/statuswindow.cpp:738 src/gui/statuswindow.cpp:791
+#: src/gui/statuswindow.cpp:739 src/gui/statuswindow.cpp:792
 msgid "(S)"
 msgstr "(S)"
 
-#: src/gui/statuswindow.cpp:751 src/gui/statuswindow.cpp:806
-#: src/gui/statuswindow.cpp:859
+#: src/gui/statuswindow.cpp:752 src/gui/statuswindow.cpp:807
+#: src/gui/statuswindow.cpp:860
 msgid "(G)"
 msgstr "(G)"
 
-#: src/gui/statuswindow.cpp:767
+#: src/gui/statuswindow.cpp:768
 msgid "(f)"
 msgstr "(f)"
 
-#: src/gui/statuswindow.cpp:776 src/gui/statuswindow.cpp:797
-#: src/gui/statuswindow.cpp:862
+#: src/gui/statuswindow.cpp:777 src/gui/statuswindow.cpp:798
+#: src/gui/statuswindow.cpp:863
 msgid "(F)"
 msgstr "(F)"
 
-#: src/gui/statuswindow.cpp:779 src/gui/statuswindow.cpp:829
+#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:830
 msgid "(U)"
 msgstr "(U)"
 
-#: src/gui/statuswindow.cpp:803
+#: src/gui/statuswindow.cpp:804
 msgid "(g)"
 msgstr "(g)"
 
-#: src/gui/statuswindow.cpp:820
+#: src/gui/statuswindow.cpp:821
 msgid "(N)"
 msgstr "(N)"
 
-#: src/gui/statuswindow.cpp:826
+#: src/gui/statuswindow.cpp:827
 msgid "(u)"
 msgstr "(u)"
 
-#: src/gui/statuswindow.cpp:832
+#: src/gui/statuswindow.cpp:833
 msgid "(e)"
 msgstr "(e)"
 
-#: src/gui/statuswindow.cpp:835
+#: src/gui/statuswindow.cpp:836
 msgid "(b)"
 msgstr "(b)"
 
-#: src/gui/statuswindow.cpp:849 src/gui/statuswindow.cpp:875
+#: src/gui/statuswindow.cpp:850 src/gui/statuswindow.cpp:876
 msgid "(O)"
 msgstr "(O)"
 
@@ -3828,369 +3833,374 @@ msgstr ""
 msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:64
+#: src/keyboardconfig.cpp:65
+#, fuzzy
+msgid "Untarget"
+msgstr "Target"
+
+#: src/keyboardconfig.cpp:66
 msgid "Target Closest"
 msgstr ""
 
-#: src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:68
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:67
+#: src/keyboardconfig.cpp:69
 msgid "Target Player"
 msgstr ""
 
-#: src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:71
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:72
 msgid "Change Pickup Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:74
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:76
 msgid "Sit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:77
 msgid "Screenshot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:78
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:80
 msgid "Change Map View Mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:82
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:83
+#: src/keyboardconfig.cpp:85
 msgid "Shortcuts Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:86
 msgid "Item Shortcuts Key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:88
-#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:92
-#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:96
-#: src/keyboardconfig.cpp:98 src/keyboardconfig.cpp:100
-#: src/keyboardconfig.cpp:102 src/keyboardconfig.cpp:104
-#: src/keyboardconfig.cpp:106 src/keyboardconfig.cpp:108
-#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:112
-#: src/keyboardconfig.cpp:114 src/keyboardconfig.cpp:117
-#: src/keyboardconfig.cpp:119 src/keyboardconfig.cpp:121
-#: src/keyboardconfig.cpp:123 src/keyboardconfig.cpp:125
-#: src/keyboardconfig.cpp:367
+#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:90
+#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:94
+#: src/keyboardconfig.cpp:96 src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:100 src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:104 src/keyboardconfig.cpp:106
+#: src/keyboardconfig.cpp:108 src/keyboardconfig.cpp:110
+#: src/keyboardconfig.cpp:112 src/keyboardconfig.cpp:114
+#: src/keyboardconfig.cpp:116 src/keyboardconfig.cpp:119
+#: src/keyboardconfig.cpp:121 src/keyboardconfig.cpp:123
+#: src/keyboardconfig.cpp:125 src/keyboardconfig.cpp:127
+#: src/keyboardconfig.cpp:369
 #, c-format
 msgid "Item Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:126
+#: src/keyboardconfig.cpp:128
 msgid "Windows Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:127
+#: src/keyboardconfig.cpp:129
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:129
+#: src/keyboardconfig.cpp:131
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:131
+#: src/keyboardconfig.cpp:133
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:133
+#: src/keyboardconfig.cpp:135
 msgid "Equipment Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:135
+#: src/keyboardconfig.cpp:137
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:137
+#: src/keyboardconfig.cpp:139
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:139
+#: src/keyboardconfig.cpp:141
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:141
+#: src/keyboardconfig.cpp:143
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:143
+#: src/keyboardconfig.cpp:145
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:145
+#: src/keyboardconfig.cpp:147
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:147
+#: src/keyboardconfig.cpp:149
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:149
+#: src/keyboardconfig.cpp:151
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:151
+#: src/keyboardconfig.cpp:153
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:153
+#: src/keyboardconfig.cpp:155
 msgid "Shop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:155
+#: src/keyboardconfig.cpp:157
 msgid "Quick drop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:157
+#: src/keyboardconfig.cpp:159
 msgid "Kill Stats Window"
 msgstr "Jendela stat membunuh"
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboardconfig.cpp:161
 msgid "Commands Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboardconfig.cpp:163
 msgid "Bot Checker Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:164
+#: src/keyboardconfig.cpp:166
 msgid "Who Is Online Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:166
+#: src/keyboardconfig.cpp:168
 msgid "Did you know Window"
 msgstr "Apakah kamu mengetahui jendela"
 
-#: src/keyboardconfig.cpp:169
+#: src/keyboardconfig.cpp:171
 msgid "Previous Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:171
+#: src/keyboardconfig.cpp:173
 msgid "Next Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:173
+#: src/keyboardconfig.cpp:175
 msgid "Emotes Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:174
+#: src/keyboardconfig.cpp:176
 msgid "Smilie"
 msgstr ""
 
-#: src/keyboardconfig.cpp:175 src/keyboardconfig.cpp:177
-#: src/keyboardconfig.cpp:179 src/keyboardconfig.cpp:181
-#: src/keyboardconfig.cpp:183 src/keyboardconfig.cpp:185
-#: src/keyboardconfig.cpp:187 src/keyboardconfig.cpp:189
-#: src/keyboardconfig.cpp:191 src/keyboardconfig.cpp:193
-#: src/keyboardconfig.cpp:195 src/keyboardconfig.cpp:197
-#: src/keyboardconfig.cpp:200 src/keyboardconfig.cpp:202
-#: src/keyboardconfig.cpp:204 src/keyboardconfig.cpp:206
-#: src/keyboardconfig.cpp:208 src/keyboardconfig.cpp:210
-#: src/keyboardconfig.cpp:212 src/keyboardconfig.cpp:214
-#: src/keyboardconfig.cpp:216 src/keyboardconfig.cpp:218
-#: src/keyboardconfig.cpp:220 src/keyboardconfig.cpp:222
-#: src/keyboardconfig.cpp:224 src/keyboardconfig.cpp:227
-#: src/keyboardconfig.cpp:230 src/keyboardconfig.cpp:233
-#: src/keyboardconfig.cpp:235 src/keyboardconfig.cpp:237
-#: src/keyboardconfig.cpp:239 src/keyboardconfig.cpp:241
-#: src/keyboardconfig.cpp:243 src/keyboardconfig.cpp:245
-#: src/keyboardconfig.cpp:247 src/keyboardconfig.cpp:249
-#: src/keyboardconfig.cpp:251 src/keyboardconfig.cpp:254
-#: src/keyboardconfig.cpp:256 src/keyboardconfig.cpp:258
-#: src/keyboardconfig.cpp:260 src/keyboardconfig.cpp:262
-#: src/keyboardconfig.cpp:264 src/keyboardconfig.cpp:266
-#: src/keyboardconfig.cpp:362
+#: src/keyboardconfig.cpp:177 src/keyboardconfig.cpp:179
+#: src/keyboardconfig.cpp:181 src/keyboardconfig.cpp:183
+#: src/keyboardconfig.cpp:185 src/keyboardconfig.cpp:187
+#: src/keyboardconfig.cpp:189 src/keyboardconfig.cpp:191
+#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
+#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
+#: src/keyboardconfig.cpp:202 src/keyboardconfig.cpp:204
+#: src/keyboardconfig.cpp:206 src/keyboardconfig.cpp:208
+#: src/keyboardconfig.cpp:210 src/keyboardconfig.cpp:212
+#: src/keyboardconfig.cpp:214 src/keyboardconfig.cpp:216
+#: src/keyboardconfig.cpp:218 src/keyboardconfig.cpp:220
+#: src/keyboardconfig.cpp:222 src/keyboardconfig.cpp:224
+#: src/keyboardconfig.cpp:226 src/keyboardconfig.cpp:229
+#: src/keyboardconfig.cpp:232 src/keyboardconfig.cpp:235
+#: src/keyboardconfig.cpp:237 src/keyboardconfig.cpp:239
+#: src/keyboardconfig.cpp:241 src/keyboardconfig.cpp:243
+#: src/keyboardconfig.cpp:245 src/keyboardconfig.cpp:247
+#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
+#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:256
+#: src/keyboardconfig.cpp:258 src/keyboardconfig.cpp:260
+#: src/keyboardconfig.cpp:262 src/keyboardconfig.cpp:264
+#: src/keyboardconfig.cpp:266 src/keyboardconfig.cpp:268
+#: src/keyboardconfig.cpp:364
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:268
+#: src/keyboardconfig.cpp:270
 msgid "Outfits Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:269
+#: src/keyboardconfig.cpp:271
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:271
+#: src/keyboardconfig.cpp:273
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:273
+#: src/keyboardconfig.cpp:275
 msgid "Copy equipped to Outfit"
 msgstr "Salin barang-barang yang dipakai ke Setelan"
 
-#: src/keyboardconfig.cpp:275
+#: src/keyboardconfig.cpp:277
 msgid "Chat Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:276
+#: src/keyboardconfig.cpp:278
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:280
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:280
+#: src/keyboardconfig.cpp:282
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:282
+#: src/keyboardconfig.cpp:284
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:284
+#: src/keyboardconfig.cpp:286
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:287
+#: src/keyboardconfig.cpp:289
 msgid "Close current Chat Tab"
 msgstr "Tutup tab obrolan ini"
 
-#: src/keyboardconfig.cpp:289
+#: src/keyboardconfig.cpp:291
 msgid "Previous chat line"
 msgstr "Garis obrolan sebelumnya"
 
-#: src/keyboardconfig.cpp:291
+#: src/keyboardconfig.cpp:293
 msgid "Next chat line"
 msgstr "Garis obrolan selanjutnya"
 
-#: src/keyboardconfig.cpp:293
+#: src/keyboardconfig.cpp:295
 msgid "Chat Auto Complete"
 msgstr ""
 
-#: src/keyboardconfig.cpp:295
+#: src/keyboardconfig.cpp:297
 msgid "Deactivate Chat Input"
 msgstr ""
 
-#: src/keyboardconfig.cpp:297
+#: src/keyboardconfig.cpp:299
 msgid "Other Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboardconfig.cpp:300
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:300
+#: src/keyboardconfig.cpp:302
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:302
+#: src/keyboardconfig.cpp:304
 msgid "Direct Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboardconfig.cpp:305
 msgid "Direct Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboardconfig.cpp:307
 msgid "Direct Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:306
+#: src/keyboardconfig.cpp:308
 msgid "Direct Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:308
+#: src/keyboardconfig.cpp:310
 msgid "Crazy moves"
 msgstr ""
 
-#: src/keyboardconfig.cpp:310
+#: src/keyboardconfig.cpp:312
 msgid "Change Crazy Move mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboardconfig.cpp:314
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:314
+#: src/keyboardconfig.cpp:316
 msgid "Quick Drop N Items"
 msgstr ""
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboardconfig.cpp:318
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/keyboardconfig.cpp:318
+#: src/keyboardconfig.cpp:320
 msgid "Quick heal target or self"
 msgstr ""
 
-#: src/keyboardconfig.cpp:320
+#: src/keyboardconfig.cpp:322
 msgid "Use #itenplz spell"
 msgstr ""
 
-#: src/keyboardconfig.cpp:322
+#: src/keyboardconfig.cpp:324
 msgid "Use magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:324
+#: src/keyboardconfig.cpp:326
 msgid "Switch magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:326
+#: src/keyboardconfig.cpp:328
 msgid "Change move type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:328
+#: src/keyboardconfig.cpp:330
 msgid "Change Attack Weapon Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboardconfig.cpp:332
 msgid "Change Attack Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:332
+#: src/keyboardconfig.cpp:334
 msgid "Change Follow mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:334
+#: src/keyboardconfig.cpp:336
 msgid "Change Imitation mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:337
+#: src/keyboardconfig.cpp:339
 msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:338
+#: src/keyboardconfig.cpp:340
 msgid "On / Off audio"
 msgstr ""
 
-#: src/keyboardconfig.cpp:340
+#: src/keyboardconfig.cpp:342
 msgid "Enable / Disable away mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:342
+#: src/keyboardconfig.cpp:344
 msgid "Emulate right click from keyboard"
 msgstr ""
 
-#: src/keyboardconfig.cpp:344
+#: src/keyboardconfig.cpp:346
 msgid "Toggle camera mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:346
+#: src/keyboardconfig.cpp:348
 msgid "Modifier key"
 msgstr "Kunci pengubah"
 
-#: src/keyboardconfig.cpp:425
+#: src/keyboardconfig.cpp:427
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -4201,63 +4211,63 @@ msgstr ""
 msgid "You were killed by "
 msgstr ""
 
-#: src/localplayer.cpp:1422
+#: src/localplayer.cpp:1427
 msgid "Tried to pick up nonexistent item."
 msgstr "Mencoba mengambil item yang tidak lagi ada"
 
-#: src/localplayer.cpp:1424
+#: src/localplayer.cpp:1429
 msgid "Item is too heavy."
 msgstr "item terlalu berat"
 
-#: src/localplayer.cpp:1426
+#: src/localplayer.cpp:1431
 msgid "Item is too far away."
 msgstr "barang terlalu jauh"
 
-#: src/localplayer.cpp:1428
+#: src/localplayer.cpp:1433
 msgid "Inventory is full."
 msgstr "Perbekalan sudah penuh"
 
-#: src/localplayer.cpp:1430
+#: src/localplayer.cpp:1435
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1433
+#: src/localplayer.cpp:1438
 msgid "Item belongs to someone else."
 msgstr "Barang milik orang lain."
 
-#: src/localplayer.cpp:1436
+#: src/localplayer.cpp:1441
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1460
+#: src/localplayer.cpp:1465
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 
-#: src/localplayer.cpp:3174
+#: src/localplayer.cpp:3179
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:3494
+#: src/localplayer.cpp:3507
 msgid "Follow: "
 msgstr "Ikuti:"
 
-#: src/localplayer.cpp:3496 src/localplayer.cpp:3511
+#: src/localplayer.cpp:3509 src/localplayer.cpp:3524
 msgid "Follow canceled"
 msgstr "Batal mengikuti"
 
-#: src/localplayer.cpp:3503
+#: src/localplayer.cpp:3516
 msgid "Imitation: "
 msgstr "Tirukan:"
 
-#: src/localplayer.cpp:3505 src/localplayer.cpp:3513
+#: src/localplayer.cpp:3518 src/localplayer.cpp:3526
 msgid "Imitation canceled"
 msgstr "Batal menirukan"
 
-#: src/localplayer.cpp:3858
+#: src/localplayer.cpp:3871
 msgid "You see "
 msgstr ""
 
diff --git a/po/ja.po b/po/ja.po
index 08969270e..e6e77c1c4 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-09-27 22:18+0300\n"
-"PO-Revision-Date: 2011-09-27 19:20+0000\n"
+"POT-Creation-Date: 2011-10-01 01:22+0300\n"
+"PO-Revision-Date: 2011-09-30 14:45+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: Japanese (http://www.transifex.net/projects/p/manaplus/team/"
 "ja/)\n"
@@ -334,19 +334,19 @@ msgstr ""
 msgid "Network Error"
 msgstr "ネットワークエラー"
 
-#: src/game.cpp:1320
+#: src/game.cpp:1321
 msgid "Ignoring incoming trade requests"
 msgstr "他人からのトレードリクエストを無視します。"
 
-#: src/game.cpp:1330
+#: src/game.cpp:1331
 msgid "Accepting incoming trade requests"
 msgstr "他人からのトレードリクエストを受け入れます。"
 
-#: src/game.cpp:1727
+#: src/game.cpp:1731
 msgid "Could Not Load Map"
 msgstr "マップをロードできませんでした"
 
-#: src/game.cpp:1728
+#: src/game.cpp:1732
 #, c-format
 msgid "Error while loading %s"
 msgstr "%sをロードしている間にエラーが起きました。"
@@ -404,44 +404,48 @@ msgstr "結果"
 msgid "Reset"
 msgstr "リセット"
 
-#: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:98
+#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
 #: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
 #: src/gui/popupmenu.cpp:273 src/gui/popupmenu.cpp:654
 msgid "Buy"
 msgstr "買う"
 
-#: src/gui/buydialog.cpp:89 src/gui/buydialog.cpp:303
+#: src/gui/buydialog.cpp:94 src/gui/buydialog.cpp:332
 #: src/gui/selldialog.cpp:88 src/gui/selldialog.cpp:325
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "価格:%s /合計:%s"
 
+#: src/gui/buydialog.cpp:103
+msgid "Amount:"
+msgstr ""
+
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:94 src/gui/itemamountwindow.cpp:207
+#: 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:973
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:974
 msgid "+"
 msgstr "+"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:97 src/gui/itemamountwindow.cpp:206
+#: 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:985
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:986
 msgid "-"
 msgstr "-"
 
-#: src/gui/buydialog.cpp:99 src/gui/quitdialog.cpp:47
+#: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:294
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:84
 msgid "Quit"
 msgstr "終了"
 
-#: src/gui/buydialog.cpp:100 src/gui/selldialog.cpp:95
-#: src/gui/statuswindow.cpp:504 src/gui/statuswindow.cpp:553
-#: src/gui/statuswindow.cpp:972 src/gui/statuswindow.cpp:1003
+#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
+#: src/gui/statuswindow.cpp:504 src/gui/statuswindow.cpp:554
+#: src/gui/statuswindow.cpp:973 src/gui/statuswindow.cpp:1004
 msgid "Max"
 msgstr "最大"
 
@@ -919,7 +923,7 @@ msgid "Equipment"
 msgstr "装備"
 
 #: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160
-#: src/gui/inventorywindow.cpp:538 src/gui/inventorywindow.cpp:547
+#: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554
 #: src/gui/popupmenu.cpp:1656 src/gui/popupmenu.cpp:1748
 #: src/gui/popupmenu.cpp:1793
 msgid "Unequip"
@@ -962,20 +966,20 @@ msgstr "スロット"
 msgid "Filter:"
 msgstr "フィルタ："
 
-#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:540
-#: src/gui/inventorywindow.cpp:549 src/gui/popupmenu.cpp:1658
+#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547
+#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1658
 #: src/gui/popupmenu.cpp:1750 src/gui/popupmenu.cpp:1795
 msgid "Equip"
 msgstr "装備する"
 
-#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:541
-#: src/gui/inventorywindow.cpp:545 src/gui/popupmenu.cpp:1662
+#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548
+#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1662
 #: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1754
 #: src/gui/popupmenu.cpp:1799
 msgid "Use"
 msgstr "使う"
 
-#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:645
+#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652
 #: src/gui/popupmenu.cpp:1667 src/gui/popupmenu.cpp:1759
 #: src/gui/popupmenu.cpp:1804
 msgid "Drop..."
@@ -995,7 +999,7 @@ msgstr "服"
 msgid "Weight:"
 msgstr "重量"
 
-#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:636
+#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643
 #: src/gui/popupmenu.cpp:1642 src/gui/popupmenu.cpp:1771
 #: src/gui/popupmenu.cpp:1816 src/gui/setup.cpp:73
 msgid "Store"
@@ -1005,7 +1009,7 @@ msgstr "保存"
 msgid "Retrieve"
 msgstr "取り戻す"
 
-#: src/gui/inventorywindow.cpp:647 src/gui/popupmenu.cpp:1672
+#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1672
 #: src/gui/popupmenu.cpp:1764 src/gui/popupmenu.cpp:1809
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
@@ -3050,130 +3054,130 @@ msgstr "レベル： %d (GM %d)"
 msgid "Correction points: %d"
 msgstr "修正点： %d"
 
-#: src/gui/statuswindow.cpp:647 src/gui/statuswindow.cpp:712
-#: src/gui/statuswindow.cpp:732 src/gui/statuswindow.cpp:748
-#: src/gui/statuswindow.cpp:794 src/gui/statuswindow.cpp:823
-#: src/gui/statuswindow.cpp:846 src/gui/statuswindow.cpp:865
+#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:713
+#: src/gui/statuswindow.cpp:733 src/gui/statuswindow.cpp:749
+#: src/gui/statuswindow.cpp:795 src/gui/statuswindow.cpp:824
+#: src/gui/statuswindow.cpp:847 src/gui/statuswindow.cpp:866
 msgid "(D)"
 msgstr "(D)"
 
-#: src/gui/statuswindow.cpp:650 src/gui/statuswindow.cpp:773
+#: src/gui/statuswindow.cpp:651 src/gui/statuswindow.cpp:774
 msgid "(I)"
 msgstr "(I)"
 
-#: src/gui/statuswindow.cpp:653 src/gui/statuswindow.cpp:770
+#: src/gui/statuswindow.cpp:654 src/gui/statuswindow.cpp:771
 msgid "(c)"
 msgstr "(c)"
 
-#: src/gui/statuswindow.cpp:656
+#: src/gui/statuswindow.cpp:657
 msgid "(C)"
 msgstr "(C)"
 
-#: src/gui/statuswindow.cpp:659 src/gui/statuswindow.cpp:757
+#: src/gui/statuswindow.cpp:660 src/gui/statuswindow.cpp:758
 msgid "(d)"
 msgstr "(d)"
 
-#: src/gui/statuswindow.cpp:662 src/gui/statuswindow.cpp:676
-#: src/gui/statuswindow.cpp:705 src/gui/statuswindow.cpp:724
-#: src/gui/statuswindow.cpp:741 src/gui/statuswindow.cpp:760
-#: src/gui/statuswindow.cpp:782 src/gui/statuswindow.cpp:812
-#: src/gui/statuswindow.cpp:838 src/gui/statuswindow.cpp:852
-#: src/gui/statuswindow.cpp:868 src/gui/statuswindow.cpp:881
+#: src/gui/statuswindow.cpp:663 src/gui/statuswindow.cpp:677
+#: src/gui/statuswindow.cpp:706 src/gui/statuswindow.cpp:725
+#: src/gui/statuswindow.cpp:742 src/gui/statuswindow.cpp:761
+#: src/gui/statuswindow.cpp:783 src/gui/statuswindow.cpp:813
+#: src/gui/statuswindow.cpp:839 src/gui/statuswindow.cpp:853
+#: src/gui/statuswindow.cpp:869 src/gui/statuswindow.cpp:882
 msgid "(?)"
 msgstr "(?)"
 
-#: src/gui/statuswindow.cpp:673
+#: src/gui/statuswindow.cpp:674
 msgid "(a)"
 msgstr "(a)"
 
-#: src/gui/statuswindow.cpp:684
+#: src/gui/statuswindow.cpp:685
 msgid "(0)"
 msgstr "(0)"
 
-#: src/gui/statuswindow.cpp:687
+#: src/gui/statuswindow.cpp:688
 msgid "(1)"
 msgstr "(1)"
 
-#: src/gui/statuswindow.cpp:690
+#: src/gui/statuswindow.cpp:691
 msgid "(2)"
 msgstr "(2)"
 
-#: src/gui/statuswindow.cpp:693 src/gui/statuswindow.cpp:800
+#: src/gui/statuswindow.cpp:694 src/gui/statuswindow.cpp:801
 msgid "(3)"
 msgstr "(3)"
 
-#: src/gui/statuswindow.cpp:696
+#: src/gui/statuswindow.cpp:697
 msgid "(5)"
 msgstr "(5)"
 
-#: src/gui/statuswindow.cpp:699
+#: src/gui/statuswindow.cpp:700
 msgid "(7)"
 msgstr "(7)"
 
-#: src/gui/statuswindow.cpp:702 src/gui/statuswindow.cpp:754
-#: src/gui/statuswindow.cpp:809 src/gui/statuswindow.cpp:878
+#: src/gui/statuswindow.cpp:703 src/gui/statuswindow.cpp:755
+#: src/gui/statuswindow.cpp:810 src/gui/statuswindow.cpp:879
 msgid "(A)"
 msgstr "(A)"
 
-#: src/gui/statuswindow.cpp:715
+#: src/gui/statuswindow.cpp:716
 msgid "(R)"
 msgstr "(R)"
 
-#: src/gui/statuswindow.cpp:718
+#: src/gui/statuswindow.cpp:719
 msgid "(M)"
 msgstr "(M)"
 
-#: src/gui/statuswindow.cpp:721
+#: src/gui/statuswindow.cpp:722
 msgid "(P)"
 msgstr "(P)"
 
-#: src/gui/statuswindow.cpp:735
+#: src/gui/statuswindow.cpp:736
 msgid "(s)"
 msgstr "(s)"
 
-#: src/gui/statuswindow.cpp:738 src/gui/statuswindow.cpp:791
+#: src/gui/statuswindow.cpp:739 src/gui/statuswindow.cpp:792
 msgid "(S)"
 msgstr "(S)"
 
-#: src/gui/statuswindow.cpp:751 src/gui/statuswindow.cpp:806
-#: src/gui/statuswindow.cpp:859
+#: src/gui/statuswindow.cpp:752 src/gui/statuswindow.cpp:807
+#: src/gui/statuswindow.cpp:860
 msgid "(G)"
 msgstr "(G)"
 
-#: src/gui/statuswindow.cpp:767
+#: src/gui/statuswindow.cpp:768
 msgid "(f)"
 msgstr "(f)"
 
-#: src/gui/statuswindow.cpp:776 src/gui/statuswindow.cpp:797
-#: src/gui/statuswindow.cpp:862
+#: src/gui/statuswindow.cpp:777 src/gui/statuswindow.cpp:798
+#: src/gui/statuswindow.cpp:863
 msgid "(F)"
 msgstr "(F)"
 
-#: src/gui/statuswindow.cpp:779 src/gui/statuswindow.cpp:829
+#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:830
 msgid "(U)"
 msgstr "(U)"
 
-#: src/gui/statuswindow.cpp:803
+#: src/gui/statuswindow.cpp:804
 msgid "(g)"
 msgstr "(g)"
 
-#: src/gui/statuswindow.cpp:820
+#: src/gui/statuswindow.cpp:821
 msgid "(N)"
 msgstr "(N)"
 
-#: src/gui/statuswindow.cpp:826
+#: src/gui/statuswindow.cpp:827
 msgid "(u)"
 msgstr "(u)"
 
-#: src/gui/statuswindow.cpp:832
+#: src/gui/statuswindow.cpp:833
 msgid "(e)"
 msgstr "(e)"
 
-#: src/gui/statuswindow.cpp:835
+#: src/gui/statuswindow.cpp:836
 msgid "(b)"
 msgstr "(b)"
 
-#: src/gui/statuswindow.cpp:849 src/gui/statuswindow.cpp:875
+#: src/gui/statuswindow.cpp:850 src/gui/statuswindow.cpp:876
 msgid "(O)"
 msgstr "(O)"
 
@@ -3839,369 +3843,373 @@ msgstr ""
 msgid "Stop Attack"
 msgstr "攻撃を止める"
 
-#: src/keyboardconfig.cpp:64
+#: src/keyboardconfig.cpp:65
+msgid "Untarget"
+msgstr ""
+
+#: src/keyboardconfig.cpp:66
 msgid "Target Closest"
 msgstr "最も近いを目標にする"
 
-#: src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:68
 msgid "Target NPC"
 msgstr "NPCを狙う"
 
-#: src/keyboardconfig.cpp:67
+#: src/keyboardconfig.cpp:69
 msgid "Target Player"
 msgstr "プレイヤーを狙う"
 
-#: src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:71
 msgid "Pickup"
 msgstr "拾う"
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:72
 msgid "Change Pickup Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:74
 msgid "Hide Windows"
 msgstr "ウィンドウを隠す"
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:76
 msgid "Sit"
 msgstr "座る"
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:77
 msgid "Screenshot"
 msgstr "スクリーンショット"
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:78
 msgid "Enable/Disable Trading"
 msgstr "取引を可能/不可能にする"
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:80
 msgid "Change Map View Mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:82
 msgid "Select OK"
 msgstr "OKを選択する"
 
-#: src/keyboardconfig.cpp:83
+#: src/keyboardconfig.cpp:85
 msgid "Shortcuts Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:86
 msgid "Item Shortcuts Key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:88
-#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:92
-#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:96
-#: src/keyboardconfig.cpp:98 src/keyboardconfig.cpp:100
-#: src/keyboardconfig.cpp:102 src/keyboardconfig.cpp:104
-#: src/keyboardconfig.cpp:106 src/keyboardconfig.cpp:108
-#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:112
-#: src/keyboardconfig.cpp:114 src/keyboardconfig.cpp:117
-#: src/keyboardconfig.cpp:119 src/keyboardconfig.cpp:121
-#: src/keyboardconfig.cpp:123 src/keyboardconfig.cpp:125
-#: src/keyboardconfig.cpp:367
+#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:90
+#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:94
+#: src/keyboardconfig.cpp:96 src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:100 src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:104 src/keyboardconfig.cpp:106
+#: src/keyboardconfig.cpp:108 src/keyboardconfig.cpp:110
+#: src/keyboardconfig.cpp:112 src/keyboardconfig.cpp:114
+#: src/keyboardconfig.cpp:116 src/keyboardconfig.cpp:119
+#: src/keyboardconfig.cpp:121 src/keyboardconfig.cpp:123
+#: src/keyboardconfig.cpp:125 src/keyboardconfig.cpp:127
+#: src/keyboardconfig.cpp:369
 #, c-format
 msgid "Item Shortcut %d"
 msgstr "アイテムショートカット: %d"
 
-#: src/keyboardconfig.cpp:126
+#: src/keyboardconfig.cpp:128
 msgid "Windows Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:127
+#: src/keyboardconfig.cpp:129
 msgid "Help Window"
 msgstr "ヘルプウィンドウ"
 
-#: src/keyboardconfig.cpp:129
+#: src/keyboardconfig.cpp:131
 msgid "Status Window"
 msgstr "ステータス・ウィンドウ"
 
-#: src/keyboardconfig.cpp:131
+#: src/keyboardconfig.cpp:133
 msgid "Inventory Window"
 msgstr "在庫ウィンドウ"
 
-#: src/keyboardconfig.cpp:133
+#: src/keyboardconfig.cpp:135
 msgid "Equipment Window"
 msgstr "装備ウィンドウ"
 
-#: src/keyboardconfig.cpp:135
+#: src/keyboardconfig.cpp:137
 msgid "Skill Window"
 msgstr "スキルウィンドウ"
 
-#: src/keyboardconfig.cpp:137
+#: src/keyboardconfig.cpp:139
 msgid "Minimap Window"
 msgstr "小さなマップウィンドウ"
 
-#: src/keyboardconfig.cpp:139
+#: src/keyboardconfig.cpp:141
 msgid "Chat Window"
 msgstr "チャットウィンドウ"
 
-#: src/keyboardconfig.cpp:141
+#: src/keyboardconfig.cpp:143
 msgid "Item Shortcut Window"
 msgstr "アイテムショートカットウィンドウ"
 
-#: src/keyboardconfig.cpp:143
+#: src/keyboardconfig.cpp:145
 msgid "Setup Window"
 msgstr "設定ウィンドウ"
 
-#: src/keyboardconfig.cpp:145
+#: src/keyboardconfig.cpp:147
 msgid "Debug Window"
 msgstr "デバグウィンドウ"
 
-#: src/keyboardconfig.cpp:147
+#: src/keyboardconfig.cpp:149
 msgid "Social Window"
 msgstr "ソシアルウインドウ"
 
-#: src/keyboardconfig.cpp:149
+#: src/keyboardconfig.cpp:151
 msgid "Emote Shortcut Window"
 msgstr "表情ショートカットウィンドウ"
 
-#: src/keyboardconfig.cpp:151
+#: src/keyboardconfig.cpp:153
 msgid "Outfits Window"
 msgstr "服ウインドウ"
 
-#: src/keyboardconfig.cpp:153
+#: src/keyboardconfig.cpp:155
 msgid "Shop Window"
 msgstr "ショップウィンドウ"
 
-#: src/keyboardconfig.cpp:155
+#: src/keyboardconfig.cpp:157
 msgid "Quick drop Window"
 msgstr "クイックドロップウィンドウ"
 
-#: src/keyboardconfig.cpp:157
+#: src/keyboardconfig.cpp:159
 msgid "Kill Stats Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboardconfig.cpp:161
 msgid "Commands Window"
 msgstr "コマンドウインドウ"
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboardconfig.cpp:163
 msgid "Bot Checker Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:164
+#: src/keyboardconfig.cpp:166
 msgid "Who Is Online Window"
 msgstr "オンライン・ウザー・ウインドウ"
 
-#: src/keyboardconfig.cpp:166
+#: src/keyboardconfig.cpp:168
 msgid "Did you know Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:169
+#: src/keyboardconfig.cpp:171
 msgid "Previous Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:171
+#: src/keyboardconfig.cpp:173
 msgid "Next Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:173
+#: src/keyboardconfig.cpp:175
 msgid "Emotes Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:174
+#: src/keyboardconfig.cpp:176
 msgid "Smilie"
 msgstr "スマイリー"
 
-#: src/keyboardconfig.cpp:175 src/keyboardconfig.cpp:177
-#: src/keyboardconfig.cpp:179 src/keyboardconfig.cpp:181
-#: src/keyboardconfig.cpp:183 src/keyboardconfig.cpp:185
-#: src/keyboardconfig.cpp:187 src/keyboardconfig.cpp:189
-#: src/keyboardconfig.cpp:191 src/keyboardconfig.cpp:193
-#: src/keyboardconfig.cpp:195 src/keyboardconfig.cpp:197
-#: src/keyboardconfig.cpp:200 src/keyboardconfig.cpp:202
-#: src/keyboardconfig.cpp:204 src/keyboardconfig.cpp:206
-#: src/keyboardconfig.cpp:208 src/keyboardconfig.cpp:210
-#: src/keyboardconfig.cpp:212 src/keyboardconfig.cpp:214
-#: src/keyboardconfig.cpp:216 src/keyboardconfig.cpp:218
-#: src/keyboardconfig.cpp:220 src/keyboardconfig.cpp:222
-#: src/keyboardconfig.cpp:224 src/keyboardconfig.cpp:227
-#: src/keyboardconfig.cpp:230 src/keyboardconfig.cpp:233
-#: src/keyboardconfig.cpp:235 src/keyboardconfig.cpp:237
-#: src/keyboardconfig.cpp:239 src/keyboardconfig.cpp:241
-#: src/keyboardconfig.cpp:243 src/keyboardconfig.cpp:245
-#: src/keyboardconfig.cpp:247 src/keyboardconfig.cpp:249
-#: src/keyboardconfig.cpp:251 src/keyboardconfig.cpp:254
-#: src/keyboardconfig.cpp:256 src/keyboardconfig.cpp:258
-#: src/keyboardconfig.cpp:260 src/keyboardconfig.cpp:262
-#: src/keyboardconfig.cpp:264 src/keyboardconfig.cpp:266
-#: src/keyboardconfig.cpp:362
+#: src/keyboardconfig.cpp:177 src/keyboardconfig.cpp:179
+#: src/keyboardconfig.cpp:181 src/keyboardconfig.cpp:183
+#: src/keyboardconfig.cpp:185 src/keyboardconfig.cpp:187
+#: src/keyboardconfig.cpp:189 src/keyboardconfig.cpp:191
+#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
+#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
+#: src/keyboardconfig.cpp:202 src/keyboardconfig.cpp:204
+#: src/keyboardconfig.cpp:206 src/keyboardconfig.cpp:208
+#: src/keyboardconfig.cpp:210 src/keyboardconfig.cpp:212
+#: src/keyboardconfig.cpp:214 src/keyboardconfig.cpp:216
+#: src/keyboardconfig.cpp:218 src/keyboardconfig.cpp:220
+#: src/keyboardconfig.cpp:222 src/keyboardconfig.cpp:224
+#: src/keyboardconfig.cpp:226 src/keyboardconfig.cpp:229
+#: src/keyboardconfig.cpp:232 src/keyboardconfig.cpp:235
+#: src/keyboardconfig.cpp:237 src/keyboardconfig.cpp:239
+#: src/keyboardconfig.cpp:241 src/keyboardconfig.cpp:243
+#: src/keyboardconfig.cpp:245 src/keyboardconfig.cpp:247
+#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
+#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:256
+#: src/keyboardconfig.cpp:258 src/keyboardconfig.cpp:260
+#: src/keyboardconfig.cpp:262 src/keyboardconfig.cpp:264
+#: src/keyboardconfig.cpp:266 src/keyboardconfig.cpp:268
+#: src/keyboardconfig.cpp:364
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "スマイリーショートカット: %d"
 
-#: src/keyboardconfig.cpp:268
+#: src/keyboardconfig.cpp:270
 msgid "Outfits Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:269
+#: src/keyboardconfig.cpp:271
 msgid "Wear Outfit"
 msgstr "服を着る"
 
-#: src/keyboardconfig.cpp:271
+#: src/keyboardconfig.cpp:273
 msgid "Copy Outfit"
 msgstr "服をコピーする"
 
-#: src/keyboardconfig.cpp:273
+#: src/keyboardconfig.cpp:275
 msgid "Copy equipped to Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:275
+#: src/keyboardconfig.cpp:277
 msgid "Chat Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:276
+#: src/keyboardconfig.cpp:278
 msgid "Toggle Chat"
 msgstr "トグルチャット"
 
-#: src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:280
 msgid "Scroll Chat Up"
 msgstr "チャットを上にスクロールする"
 
-#: src/keyboardconfig.cpp:280
+#: src/keyboardconfig.cpp:282
 msgid "Scroll Chat Down"
 msgstr "チャットを下にスクロールする"
 
-#: src/keyboardconfig.cpp:282
+#: src/keyboardconfig.cpp:284
 msgid "Previous Chat Tab"
 msgstr "前のチャットタブ"
 
-#: src/keyboardconfig.cpp:284
+#: src/keyboardconfig.cpp:286
 msgid "Next Chat Tab"
 msgstr "次のチャットタブ"
 
-#: src/keyboardconfig.cpp:287
+#: src/keyboardconfig.cpp:289
 msgid "Close current Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:289
+#: src/keyboardconfig.cpp:291
 msgid "Previous chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:291
+#: src/keyboardconfig.cpp:293
 msgid "Next chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:293
+#: src/keyboardconfig.cpp:295
 msgid "Chat Auto Complete"
 msgstr ""
 
-#: src/keyboardconfig.cpp:295
+#: src/keyboardconfig.cpp:297
 msgid "Deactivate Chat Input"
 msgstr ""
 
-#: src/keyboardconfig.cpp:297
+#: src/keyboardconfig.cpp:299
 msgid "Other Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboardconfig.cpp:300
 msgid "Ignore input 1"
 msgstr "インプット１無視"
 
-#: src/keyboardconfig.cpp:300
+#: src/keyboardconfig.cpp:302
 msgid "Ignore input 2"
 msgstr "インプット２無視"
 
-#: src/keyboardconfig.cpp:302
+#: src/keyboardconfig.cpp:304
 msgid "Direct Up"
 msgstr "方向上"
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboardconfig.cpp:305
 msgid "Direct Down"
 msgstr "方向下"
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboardconfig.cpp:307
 msgid "Direct Left"
 msgstr "方向 左"
 
-#: src/keyboardconfig.cpp:306
+#: src/keyboardconfig.cpp:308
 msgid "Direct Right"
 msgstr "方向右"
 
-#: src/keyboardconfig.cpp:308
+#: src/keyboardconfig.cpp:310
 msgid "Crazy moves"
 msgstr "クレイジーに移動"
 
-#: src/keyboardconfig.cpp:310
+#: src/keyboardconfig.cpp:312
 msgid "Change Crazy Move mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboardconfig.cpp:314
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:314
+#: src/keyboardconfig.cpp:316
 msgid "Quick Drop N Items"
 msgstr ""
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboardconfig.cpp:318
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/keyboardconfig.cpp:318
+#: src/keyboardconfig.cpp:320
 msgid "Quick heal target or self"
 msgstr ""
 
-#: src/keyboardconfig.cpp:320
+#: src/keyboardconfig.cpp:322
 msgid "Use #itenplz spell"
 msgstr "#itenplz は呪文を使う"
 
-#: src/keyboardconfig.cpp:322
+#: src/keyboardconfig.cpp:324
 msgid "Use magic attack"
 msgstr "魔法攻撃を使用"
 
-#: src/keyboardconfig.cpp:324
+#: src/keyboardconfig.cpp:326
 msgid "Switch magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:326
+#: src/keyboardconfig.cpp:328
 msgid "Change move type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:328
+#: src/keyboardconfig.cpp:330
 msgid "Change Attack Weapon Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboardconfig.cpp:332
 msgid "Change Attack Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:332
+#: src/keyboardconfig.cpp:334
 msgid "Change Follow mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:334
+#: src/keyboardconfig.cpp:336
 msgid "Change Imitation mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:337
+#: src/keyboardconfig.cpp:339
 msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:338
+#: src/keyboardconfig.cpp:340
 msgid "On / Off audio"
 msgstr "アウディオ　オン/オフ"
 
-#: src/keyboardconfig.cpp:340
+#: src/keyboardconfig.cpp:342
 msgid "Enable / Disable away mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:342
+#: src/keyboardconfig.cpp:344
 msgid "Emulate right click from keyboard"
 msgstr ""
 
-#: src/keyboardconfig.cpp:344
+#: src/keyboardconfig.cpp:346
 msgid "Toggle camera mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:346
+#: src/keyboardconfig.cpp:348
 msgid "Modifier key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:425
+#: src/keyboardconfig.cpp:427
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -4212,63 +4220,63 @@ msgstr ""
 msgid "You were killed by "
 msgstr ""
 
-#: src/localplayer.cpp:1422
+#: src/localplayer.cpp:1427
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1424
+#: src/localplayer.cpp:1429
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1426
+#: src/localplayer.cpp:1431
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1428
+#: src/localplayer.cpp:1433
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1430
+#: src/localplayer.cpp:1435
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1433
+#: src/localplayer.cpp:1438
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1436
+#: src/localplayer.cpp:1441
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1460
+#: src/localplayer.cpp:1465
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 
-#: src/localplayer.cpp:3174
+#: src/localplayer.cpp:3179
 msgid "Away"
 msgstr "去って"
 
-#: src/localplayer.cpp:3494
+#: src/localplayer.cpp:3507
 msgid "Follow: "
 msgstr "従う: "
 
-#: src/localplayer.cpp:3496 src/localplayer.cpp:3511
+#: src/localplayer.cpp:3509 src/localplayer.cpp:3524
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3503
+#: src/localplayer.cpp:3516
 msgid "Imitation: "
 msgstr "擬い: "
 
-#: src/localplayer.cpp:3505 src/localplayer.cpp:3513
+#: src/localplayer.cpp:3518 src/localplayer.cpp:3526
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3858
+#: src/localplayer.cpp:3871
 msgid "You see "
 msgstr "あなた"
 
diff --git a/po/manaplus.pot b/po/manaplus.pot
index e3858ef62..6d582de39 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-09-27 22:18+0300\n"
+"POT-Creation-Date: 2011-10-01 01:22+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"
@@ -331,19 +331,19 @@ msgstr ""
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:1320
+#: src/game.cpp:1321
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:1330
+#: src/game.cpp:1331
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:1727
+#: src/game.cpp:1731
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:1728
+#: src/game.cpp:1732
 #, c-format
 msgid "Error while loading %s"
 msgstr ""
@@ -401,44 +401,48 @@ msgstr ""
 msgid "Reset"
 msgstr ""
 
-#: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:98
+#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
 #: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
 #: src/gui/popupmenu.cpp:273 src/gui/popupmenu.cpp:654
 msgid "Buy"
 msgstr ""
 
-#: src/gui/buydialog.cpp:89 src/gui/buydialog.cpp:303
+#: src/gui/buydialog.cpp:94 src/gui/buydialog.cpp:332
 #: src/gui/selldialog.cpp:88 src/gui/selldialog.cpp:325
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
 
+#: src/gui/buydialog.cpp:103
+msgid "Amount:"
+msgstr ""
+
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:94 src/gui/itemamountwindow.cpp:207
+#: 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:973
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:974
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:97 src/gui/itemamountwindow.cpp:206
+#: 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:985
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:986
 msgid "-"
 msgstr ""
 
-#: src/gui/buydialog.cpp:99 src/gui/quitdialog.cpp:47
+#: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:294
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:84
 msgid "Quit"
 msgstr ""
 
-#: src/gui/buydialog.cpp:100 src/gui/selldialog.cpp:95
-#: src/gui/statuswindow.cpp:504 src/gui/statuswindow.cpp:553
-#: src/gui/statuswindow.cpp:972 src/gui/statuswindow.cpp:1003
+#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
+#: src/gui/statuswindow.cpp:504 src/gui/statuswindow.cpp:554
+#: src/gui/statuswindow.cpp:973 src/gui/statuswindow.cpp:1004
 msgid "Max"
 msgstr ""
 
@@ -916,7 +920,7 @@ msgid "Equipment"
 msgstr ""
 
 #: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160
-#: src/gui/inventorywindow.cpp:538 src/gui/inventorywindow.cpp:547
+#: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554
 #: src/gui/popupmenu.cpp:1656 src/gui/popupmenu.cpp:1748
 #: src/gui/popupmenu.cpp:1793
 msgid "Unequip"
@@ -959,20 +963,20 @@ msgstr ""
 msgid "Filter:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:540
-#: src/gui/inventorywindow.cpp:549 src/gui/popupmenu.cpp:1658
+#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547
+#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1658
 #: src/gui/popupmenu.cpp:1750 src/gui/popupmenu.cpp:1795
 msgid "Equip"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:541
-#: src/gui/inventorywindow.cpp:545 src/gui/popupmenu.cpp:1662
+#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548
+#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1662
 #: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1754
 #: src/gui/popupmenu.cpp:1799
 msgid "Use"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:645
+#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652
 #: src/gui/popupmenu.cpp:1667 src/gui/popupmenu.cpp:1759
 #: src/gui/popupmenu.cpp:1804
 msgid "Drop..."
@@ -992,7 +996,7 @@ msgstr ""
 msgid "Weight:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:636
+#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643
 #: src/gui/popupmenu.cpp:1642 src/gui/popupmenu.cpp:1771
 #: src/gui/popupmenu.cpp:1816 src/gui/setup.cpp:73
 msgid "Store"
@@ -1002,7 +1006,7 @@ msgstr ""
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:647 src/gui/popupmenu.cpp:1672
+#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1672
 #: src/gui/popupmenu.cpp:1764 src/gui/popupmenu.cpp:1809
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
@@ -3047,130 +3051,130 @@ msgstr ""
 msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:647 src/gui/statuswindow.cpp:712
-#: src/gui/statuswindow.cpp:732 src/gui/statuswindow.cpp:748
-#: src/gui/statuswindow.cpp:794 src/gui/statuswindow.cpp:823
-#: src/gui/statuswindow.cpp:846 src/gui/statuswindow.cpp:865
+#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:713
+#: src/gui/statuswindow.cpp:733 src/gui/statuswindow.cpp:749
+#: src/gui/statuswindow.cpp:795 src/gui/statuswindow.cpp:824
+#: src/gui/statuswindow.cpp:847 src/gui/statuswindow.cpp:866
 msgid "(D)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:650 src/gui/statuswindow.cpp:773
+#: src/gui/statuswindow.cpp:651 src/gui/statuswindow.cpp:774
 msgid "(I)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:653 src/gui/statuswindow.cpp:770
+#: src/gui/statuswindow.cpp:654 src/gui/statuswindow.cpp:771
 msgid "(c)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:656
+#: src/gui/statuswindow.cpp:657
 msgid "(C)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:659 src/gui/statuswindow.cpp:757
+#: src/gui/statuswindow.cpp:660 src/gui/statuswindow.cpp:758
 msgid "(d)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:662 src/gui/statuswindow.cpp:676
-#: src/gui/statuswindow.cpp:705 src/gui/statuswindow.cpp:724
-#: src/gui/statuswindow.cpp:741 src/gui/statuswindow.cpp:760
-#: src/gui/statuswindow.cpp:782 src/gui/statuswindow.cpp:812
-#: src/gui/statuswindow.cpp:838 src/gui/statuswindow.cpp:852
-#: src/gui/statuswindow.cpp:868 src/gui/statuswindow.cpp:881
+#: src/gui/statuswindow.cpp:663 src/gui/statuswindow.cpp:677
+#: src/gui/statuswindow.cpp:706 src/gui/statuswindow.cpp:725
+#: src/gui/statuswindow.cpp:742 src/gui/statuswindow.cpp:761
+#: src/gui/statuswindow.cpp:783 src/gui/statuswindow.cpp:813
+#: src/gui/statuswindow.cpp:839 src/gui/statuswindow.cpp:853
+#: src/gui/statuswindow.cpp:869 src/gui/statuswindow.cpp:882
 msgid "(?)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:673
+#: src/gui/statuswindow.cpp:674
 msgid "(a)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:684
+#: src/gui/statuswindow.cpp:685
 msgid "(0)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:687
+#: src/gui/statuswindow.cpp:688
 msgid "(1)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:690
+#: src/gui/statuswindow.cpp:691
 msgid "(2)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:693 src/gui/statuswindow.cpp:800
+#: src/gui/statuswindow.cpp:694 src/gui/statuswindow.cpp:801
 msgid "(3)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:696
+#: src/gui/statuswindow.cpp:697
 msgid "(5)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:699
+#: src/gui/statuswindow.cpp:700
 msgid "(7)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:702 src/gui/statuswindow.cpp:754
-#: src/gui/statuswindow.cpp:809 src/gui/statuswindow.cpp:878
+#: src/gui/statuswindow.cpp:703 src/gui/statuswindow.cpp:755
+#: src/gui/statuswindow.cpp:810 src/gui/statuswindow.cpp:879
 msgid "(A)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:715
+#: src/gui/statuswindow.cpp:716
 msgid "(R)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:718
+#: src/gui/statuswindow.cpp:719
 msgid "(M)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:721
+#: src/gui/statuswindow.cpp:722
 msgid "(P)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:735
+#: src/gui/statuswindow.cpp:736
 msgid "(s)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:738 src/gui/statuswindow.cpp:791
+#: src/gui/statuswindow.cpp:739 src/gui/statuswindow.cpp:792
 msgid "(S)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:751 src/gui/statuswindow.cpp:806
-#: src/gui/statuswindow.cpp:859
+#: src/gui/statuswindow.cpp:752 src/gui/statuswindow.cpp:807
+#: src/gui/statuswindow.cpp:860
 msgid "(G)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:767
+#: src/gui/statuswindow.cpp:768
 msgid "(f)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:776 src/gui/statuswindow.cpp:797
-#: src/gui/statuswindow.cpp:862
+#: src/gui/statuswindow.cpp:777 src/gui/statuswindow.cpp:798
+#: src/gui/statuswindow.cpp:863
 msgid "(F)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:779 src/gui/statuswindow.cpp:829
+#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:830
 msgid "(U)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:803
+#: src/gui/statuswindow.cpp:804
 msgid "(g)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:820
+#: src/gui/statuswindow.cpp:821
 msgid "(N)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:826
+#: src/gui/statuswindow.cpp:827
 msgid "(u)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:832
+#: src/gui/statuswindow.cpp:833
 msgid "(e)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:835
+#: src/gui/statuswindow.cpp:836
 msgid "(b)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:849 src/gui/statuswindow.cpp:875
+#: src/gui/statuswindow.cpp:850 src/gui/statuswindow.cpp:876
 msgid "(O)"
 msgstr ""
 
@@ -3829,369 +3833,373 @@ msgstr ""
 msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:64
-msgid "Target Closest"
+#: src/keyboardconfig.cpp:65
+msgid "Untarget"
 msgstr ""
 
 #: src/keyboardconfig.cpp:66
+msgid "Target Closest"
+msgstr ""
+
+#: src/keyboardconfig.cpp:68
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:67
+#: src/keyboardconfig.cpp:69
 msgid "Target Player"
 msgstr ""
 
-#: src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:71
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:72
 msgid "Change Pickup Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:74
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:76
 msgid "Sit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:77
 msgid "Screenshot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:78
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:80
 msgid "Change Map View Mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:82
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:83
+#: src/keyboardconfig.cpp:85
 msgid "Shortcuts Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:86
 msgid "Item Shortcuts Key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:88
-#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:92
-#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:96
-#: src/keyboardconfig.cpp:98 src/keyboardconfig.cpp:100
-#: src/keyboardconfig.cpp:102 src/keyboardconfig.cpp:104
-#: src/keyboardconfig.cpp:106 src/keyboardconfig.cpp:108
-#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:112
-#: src/keyboardconfig.cpp:114 src/keyboardconfig.cpp:117
-#: src/keyboardconfig.cpp:119 src/keyboardconfig.cpp:121
-#: src/keyboardconfig.cpp:123 src/keyboardconfig.cpp:125
-#: src/keyboardconfig.cpp:367
+#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:90
+#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:94
+#: src/keyboardconfig.cpp:96 src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:100 src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:104 src/keyboardconfig.cpp:106
+#: src/keyboardconfig.cpp:108 src/keyboardconfig.cpp:110
+#: src/keyboardconfig.cpp:112 src/keyboardconfig.cpp:114
+#: src/keyboardconfig.cpp:116 src/keyboardconfig.cpp:119
+#: src/keyboardconfig.cpp:121 src/keyboardconfig.cpp:123
+#: src/keyboardconfig.cpp:125 src/keyboardconfig.cpp:127
+#: src/keyboardconfig.cpp:369
 #, c-format
 msgid "Item Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:126
+#: src/keyboardconfig.cpp:128
 msgid "Windows Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:127
+#: src/keyboardconfig.cpp:129
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:129
+#: src/keyboardconfig.cpp:131
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:131
+#: src/keyboardconfig.cpp:133
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:133
+#: src/keyboardconfig.cpp:135
 msgid "Equipment Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:135
+#: src/keyboardconfig.cpp:137
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:137
+#: src/keyboardconfig.cpp:139
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:139
+#: src/keyboardconfig.cpp:141
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:141
+#: src/keyboardconfig.cpp:143
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:143
+#: src/keyboardconfig.cpp:145
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:145
+#: src/keyboardconfig.cpp:147
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:147
+#: src/keyboardconfig.cpp:149
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:149
+#: src/keyboardconfig.cpp:151
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:151
+#: src/keyboardconfig.cpp:153
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:153
+#: src/keyboardconfig.cpp:155
 msgid "Shop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:155
+#: src/keyboardconfig.cpp:157
 msgid "Quick drop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:157
+#: src/keyboardconfig.cpp:159
 msgid "Kill Stats Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboardconfig.cpp:161
 msgid "Commands Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboardconfig.cpp:163
 msgid "Bot Checker Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:164
+#: src/keyboardconfig.cpp:166
 msgid "Who Is Online Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:166
+#: src/keyboardconfig.cpp:168
 msgid "Did you know Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:169
+#: src/keyboardconfig.cpp:171
 msgid "Previous Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:171
+#: src/keyboardconfig.cpp:173
 msgid "Next Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:173
+#: src/keyboardconfig.cpp:175
 msgid "Emotes Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:174
+#: src/keyboardconfig.cpp:176
 msgid "Smilie"
 msgstr ""
 
-#: src/keyboardconfig.cpp:175 src/keyboardconfig.cpp:177
-#: src/keyboardconfig.cpp:179 src/keyboardconfig.cpp:181
-#: src/keyboardconfig.cpp:183 src/keyboardconfig.cpp:185
-#: src/keyboardconfig.cpp:187 src/keyboardconfig.cpp:189
-#: src/keyboardconfig.cpp:191 src/keyboardconfig.cpp:193
-#: src/keyboardconfig.cpp:195 src/keyboardconfig.cpp:197
-#: src/keyboardconfig.cpp:200 src/keyboardconfig.cpp:202
-#: src/keyboardconfig.cpp:204 src/keyboardconfig.cpp:206
-#: src/keyboardconfig.cpp:208 src/keyboardconfig.cpp:210
-#: src/keyboardconfig.cpp:212 src/keyboardconfig.cpp:214
-#: src/keyboardconfig.cpp:216 src/keyboardconfig.cpp:218
-#: src/keyboardconfig.cpp:220 src/keyboardconfig.cpp:222
-#: src/keyboardconfig.cpp:224 src/keyboardconfig.cpp:227
-#: src/keyboardconfig.cpp:230 src/keyboardconfig.cpp:233
-#: src/keyboardconfig.cpp:235 src/keyboardconfig.cpp:237
-#: src/keyboardconfig.cpp:239 src/keyboardconfig.cpp:241
-#: src/keyboardconfig.cpp:243 src/keyboardconfig.cpp:245
-#: src/keyboardconfig.cpp:247 src/keyboardconfig.cpp:249
-#: src/keyboardconfig.cpp:251 src/keyboardconfig.cpp:254
-#: src/keyboardconfig.cpp:256 src/keyboardconfig.cpp:258
-#: src/keyboardconfig.cpp:260 src/keyboardconfig.cpp:262
-#: src/keyboardconfig.cpp:264 src/keyboardconfig.cpp:266
-#: src/keyboardconfig.cpp:362
+#: src/keyboardconfig.cpp:177 src/keyboardconfig.cpp:179
+#: src/keyboardconfig.cpp:181 src/keyboardconfig.cpp:183
+#: src/keyboardconfig.cpp:185 src/keyboardconfig.cpp:187
+#: src/keyboardconfig.cpp:189 src/keyboardconfig.cpp:191
+#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
+#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
+#: src/keyboardconfig.cpp:202 src/keyboardconfig.cpp:204
+#: src/keyboardconfig.cpp:206 src/keyboardconfig.cpp:208
+#: src/keyboardconfig.cpp:210 src/keyboardconfig.cpp:212
+#: src/keyboardconfig.cpp:214 src/keyboardconfig.cpp:216
+#: src/keyboardconfig.cpp:218 src/keyboardconfig.cpp:220
+#: src/keyboardconfig.cpp:222 src/keyboardconfig.cpp:224
+#: src/keyboardconfig.cpp:226 src/keyboardconfig.cpp:229
+#: src/keyboardconfig.cpp:232 src/keyboardconfig.cpp:235
+#: src/keyboardconfig.cpp:237 src/keyboardconfig.cpp:239
+#: src/keyboardconfig.cpp:241 src/keyboardconfig.cpp:243
+#: src/keyboardconfig.cpp:245 src/keyboardconfig.cpp:247
+#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
+#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:256
+#: src/keyboardconfig.cpp:258 src/keyboardconfig.cpp:260
+#: src/keyboardconfig.cpp:262 src/keyboardconfig.cpp:264
+#: src/keyboardconfig.cpp:266 src/keyboardconfig.cpp:268
+#: src/keyboardconfig.cpp:364
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:268
+#: src/keyboardconfig.cpp:270
 msgid "Outfits Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:269
+#: src/keyboardconfig.cpp:271
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:271
+#: src/keyboardconfig.cpp:273
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:273
+#: src/keyboardconfig.cpp:275
 msgid "Copy equipped to Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:275
+#: src/keyboardconfig.cpp:277
 msgid "Chat Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:276
+#: src/keyboardconfig.cpp:278
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:280
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:280
+#: src/keyboardconfig.cpp:282
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:282
+#: src/keyboardconfig.cpp:284
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:284
+#: src/keyboardconfig.cpp:286
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:287
+#: src/keyboardconfig.cpp:289
 msgid "Close current Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:289
+#: src/keyboardconfig.cpp:291
 msgid "Previous chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:291
+#: src/keyboardconfig.cpp:293
 msgid "Next chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:293
+#: src/keyboardconfig.cpp:295
 msgid "Chat Auto Complete"
 msgstr ""
 
-#: src/keyboardconfig.cpp:295
+#: src/keyboardconfig.cpp:297
 msgid "Deactivate Chat Input"
 msgstr ""
 
-#: src/keyboardconfig.cpp:297
+#: src/keyboardconfig.cpp:299
 msgid "Other Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboardconfig.cpp:300
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:300
+#: src/keyboardconfig.cpp:302
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:302
+#: src/keyboardconfig.cpp:304
 msgid "Direct Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboardconfig.cpp:305
 msgid "Direct Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboardconfig.cpp:307
 msgid "Direct Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:306
+#: src/keyboardconfig.cpp:308
 msgid "Direct Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:308
+#: src/keyboardconfig.cpp:310
 msgid "Crazy moves"
 msgstr ""
 
-#: src/keyboardconfig.cpp:310
+#: src/keyboardconfig.cpp:312
 msgid "Change Crazy Move mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboardconfig.cpp:314
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:314
+#: src/keyboardconfig.cpp:316
 msgid "Quick Drop N Items"
 msgstr ""
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboardconfig.cpp:318
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/keyboardconfig.cpp:318
+#: src/keyboardconfig.cpp:320
 msgid "Quick heal target or self"
 msgstr ""
 
-#: src/keyboardconfig.cpp:320
+#: src/keyboardconfig.cpp:322
 msgid "Use #itenplz spell"
 msgstr ""
 
-#: src/keyboardconfig.cpp:322
+#: src/keyboardconfig.cpp:324
 msgid "Use magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:324
+#: src/keyboardconfig.cpp:326
 msgid "Switch magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:326
+#: src/keyboardconfig.cpp:328
 msgid "Change move type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:328
+#: src/keyboardconfig.cpp:330
 msgid "Change Attack Weapon Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboardconfig.cpp:332
 msgid "Change Attack Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:332
+#: src/keyboardconfig.cpp:334
 msgid "Change Follow mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:334
+#: src/keyboardconfig.cpp:336
 msgid "Change Imitation mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:337
+#: src/keyboardconfig.cpp:339
 msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:338
+#: src/keyboardconfig.cpp:340
 msgid "On / Off audio"
 msgstr ""
 
-#: src/keyboardconfig.cpp:340
+#: src/keyboardconfig.cpp:342
 msgid "Enable / Disable away mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:342
+#: src/keyboardconfig.cpp:344
 msgid "Emulate right click from keyboard"
 msgstr ""
 
-#: src/keyboardconfig.cpp:344
+#: src/keyboardconfig.cpp:346
 msgid "Toggle camera mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:346
+#: src/keyboardconfig.cpp:348
 msgid "Modifier key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:425
+#: src/keyboardconfig.cpp:427
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -4202,64 +4210,64 @@ msgstr ""
 msgid "You were killed by "
 msgstr ""
 
-#: src/localplayer.cpp:1422
+#: src/localplayer.cpp:1427
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1424
+#: src/localplayer.cpp:1429
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1426
+#: src/localplayer.cpp:1431
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1428
+#: src/localplayer.cpp:1433
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1430
+#: src/localplayer.cpp:1435
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1433
+#: src/localplayer.cpp:1438
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1436
+#: src/localplayer.cpp:1441
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1460
+#: src/localplayer.cpp:1465
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/localplayer.cpp:3174
+#: src/localplayer.cpp:3179
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:3494
+#: src/localplayer.cpp:3507
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3496 src/localplayer.cpp:3511
+#: src/localplayer.cpp:3509 src/localplayer.cpp:3524
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3503
+#: src/localplayer.cpp:3516
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3505 src/localplayer.cpp:3513
+#: src/localplayer.cpp:3518 src/localplayer.cpp:3526
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3858
+#: src/localplayer.cpp:3871
 msgid "You see "
 msgstr ""
 
diff --git a/po/nl_BE.po b/po/nl_BE.po
index 3b291a563..511a5d758 100644
--- a/po/nl_BE.po
+++ b/po/nl_BE.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-09-27 22:18+0300\n"
-"PO-Revision-Date: 2011-09-27 19:20+0000\n"
+"POT-Creation-Date: 2011-10-01 01:22+0300\n"
+"PO-Revision-Date: 2011-09-30 14:45+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"
@@ -336,19 +336,19 @@ msgstr "De verbinding met de server is verbroken."
 msgid "Network Error"
 msgstr "Netwerkfout"
 
-#: src/game.cpp:1320
+#: src/game.cpp:1321
 msgid "Ignoring incoming trade requests"
 msgstr "Inkomende handelsaanvragen negeren"
 
-#: src/game.cpp:1330
+#: src/game.cpp:1331
 msgid "Accepting incoming trade requests"
 msgstr "Inkomende handelsaanvragen accepteren"
 
-#: src/game.cpp:1727
+#: src/game.cpp:1731
 msgid "Could Not Load Map"
 msgstr "Kon Map Niet Laden"
 
-#: src/game.cpp:1728
+#: src/game.cpp:1732
 #, c-format
 msgid "Error while loading %s"
 msgstr "Fout bij het laden van %s"
@@ -406,44 +406,48 @@ msgstr "Resultaat"
 msgid "Reset"
 msgstr "Reset"
 
-#: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:98
+#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
 #: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
 #: src/gui/popupmenu.cpp:273 src/gui/popupmenu.cpp:654
 msgid "Buy"
 msgstr "Kopen"
 
-#: src/gui/buydialog.cpp:89 src/gui/buydialog.cpp:303
+#: src/gui/buydialog.cpp:94 src/gui/buydialog.cpp:332
 #: src/gui/selldialog.cpp:88 src/gui/selldialog.cpp:325
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Prijs: %s / Totaal: %s"
 
+#: src/gui/buydialog.cpp:103
+msgid "Amount:"
+msgstr ""
+
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:94 src/gui/itemamountwindow.cpp:207
+#: 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:973
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:974
 msgid "+"
 msgstr "+"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:97 src/gui/itemamountwindow.cpp:206
+#: 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:985
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:986
 msgid "-"
 msgstr "-"
 
-#: src/gui/buydialog.cpp:99 src/gui/quitdialog.cpp:47
+#: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:294
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:84
 msgid "Quit"
 msgstr "Afsluiten"
 
-#: src/gui/buydialog.cpp:100 src/gui/selldialog.cpp:95
-#: src/gui/statuswindow.cpp:504 src/gui/statuswindow.cpp:553
-#: src/gui/statuswindow.cpp:972 src/gui/statuswindow.cpp:1003
+#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
+#: src/gui/statuswindow.cpp:504 src/gui/statuswindow.cpp:554
+#: src/gui/statuswindow.cpp:973 src/gui/statuswindow.cpp:1004
 msgid "Max"
 msgstr "Maximum"
 
@@ -921,7 +925,7 @@ msgid "Equipment"
 msgstr "Uitrusting"
 
 #: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160
-#: src/gui/inventorywindow.cpp:538 src/gui/inventorywindow.cpp:547
+#: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554
 #: src/gui/popupmenu.cpp:1656 src/gui/popupmenu.cpp:1748
 #: src/gui/popupmenu.cpp:1793
 msgid "Unequip"
@@ -964,20 +968,20 @@ msgstr "Sloten:"
 msgid "Filter:"
 msgstr "Filter:"
 
-#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:540
-#: src/gui/inventorywindow.cpp:549 src/gui/popupmenu.cpp:1658
+#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547
+#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1658
 #: src/gui/popupmenu.cpp:1750 src/gui/popupmenu.cpp:1795
 msgid "Equip"
 msgstr "Uitrusten"
 
-#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:541
-#: src/gui/inventorywindow.cpp:545 src/gui/popupmenu.cpp:1662
+#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548
+#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1662
 #: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1754
 #: src/gui/popupmenu.cpp:1799
 msgid "Use"
 msgstr "Gebruiken"
 
-#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:645
+#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652
 #: src/gui/popupmenu.cpp:1667 src/gui/popupmenu.cpp:1759
 #: src/gui/popupmenu.cpp:1804
 msgid "Drop..."
@@ -997,7 +1001,7 @@ msgstr "Kleren"
 msgid "Weight:"
 msgstr "Gewicht:"
 
-#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:636
+#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643
 #: src/gui/popupmenu.cpp:1642 src/gui/popupmenu.cpp:1771
 #: src/gui/popupmenu.cpp:1816 src/gui/setup.cpp:73
 msgid "Store"
@@ -1007,7 +1011,7 @@ msgstr "Opslaan"
 msgid "Retrieve"
 msgstr "Afhalen"
 
-#: src/gui/inventorywindow.cpp:647 src/gui/popupmenu.cpp:1672
+#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1672
 #: src/gui/popupmenu.cpp:1764 src/gui/popupmenu.cpp:1809
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
@@ -3060,130 +3064,130 @@ msgstr "Niveau: %d (GM %d)"
 msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:647 src/gui/statuswindow.cpp:712
-#: src/gui/statuswindow.cpp:732 src/gui/statuswindow.cpp:748
-#: src/gui/statuswindow.cpp:794 src/gui/statuswindow.cpp:823
-#: src/gui/statuswindow.cpp:846 src/gui/statuswindow.cpp:865
+#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:713
+#: src/gui/statuswindow.cpp:733 src/gui/statuswindow.cpp:749
+#: src/gui/statuswindow.cpp:795 src/gui/statuswindow.cpp:824
+#: src/gui/statuswindow.cpp:847 src/gui/statuswindow.cpp:866
 msgid "(D)"
 msgstr "(D)"
 
-#: src/gui/statuswindow.cpp:650 src/gui/statuswindow.cpp:773
+#: src/gui/statuswindow.cpp:651 src/gui/statuswindow.cpp:774
 msgid "(I)"
 msgstr "(I)"
 
-#: src/gui/statuswindow.cpp:653 src/gui/statuswindow.cpp:770
+#: src/gui/statuswindow.cpp:654 src/gui/statuswindow.cpp:771
 msgid "(c)"
 msgstr "(c)"
 
-#: src/gui/statuswindow.cpp:656
+#: src/gui/statuswindow.cpp:657
 msgid "(C)"
 msgstr "(C)"
 
-#: src/gui/statuswindow.cpp:659 src/gui/statuswindow.cpp:757
+#: src/gui/statuswindow.cpp:660 src/gui/statuswindow.cpp:758
 msgid "(d)"
 msgstr "(d)"
 
-#: src/gui/statuswindow.cpp:662 src/gui/statuswindow.cpp:676
-#: src/gui/statuswindow.cpp:705 src/gui/statuswindow.cpp:724
-#: src/gui/statuswindow.cpp:741 src/gui/statuswindow.cpp:760
-#: src/gui/statuswindow.cpp:782 src/gui/statuswindow.cpp:812
-#: src/gui/statuswindow.cpp:838 src/gui/statuswindow.cpp:852
-#: src/gui/statuswindow.cpp:868 src/gui/statuswindow.cpp:881
+#: src/gui/statuswindow.cpp:663 src/gui/statuswindow.cpp:677
+#: src/gui/statuswindow.cpp:706 src/gui/statuswindow.cpp:725
+#: src/gui/statuswindow.cpp:742 src/gui/statuswindow.cpp:761
+#: src/gui/statuswindow.cpp:783 src/gui/statuswindow.cpp:813
+#: src/gui/statuswindow.cpp:839 src/gui/statuswindow.cpp:853
+#: src/gui/statuswindow.cpp:869 src/gui/statuswindow.cpp:882
 msgid "(?)"
 msgstr "(?)"
 
-#: src/gui/statuswindow.cpp:673
+#: src/gui/statuswindow.cpp:674
 msgid "(a)"
 msgstr "(a)"
 
-#: src/gui/statuswindow.cpp:684
+#: src/gui/statuswindow.cpp:685
 msgid "(0)"
 msgstr "(0)"
 
-#: src/gui/statuswindow.cpp:687
+#: src/gui/statuswindow.cpp:688
 msgid "(1)"
 msgstr "(1)"
 
-#: src/gui/statuswindow.cpp:690
+#: src/gui/statuswindow.cpp:691
 msgid "(2)"
 msgstr "(2)"
 
-#: src/gui/statuswindow.cpp:693 src/gui/statuswindow.cpp:800
+#: src/gui/statuswindow.cpp:694 src/gui/statuswindow.cpp:801
 msgid "(3)"
 msgstr "(3)"
 
-#: src/gui/statuswindow.cpp:696
+#: src/gui/statuswindow.cpp:697
 msgid "(5)"
 msgstr "(5)"
 
-#: src/gui/statuswindow.cpp:699
+#: src/gui/statuswindow.cpp:700
 msgid "(7)"
 msgstr "(7)"
 
-#: src/gui/statuswindow.cpp:702 src/gui/statuswindow.cpp:754
-#: src/gui/statuswindow.cpp:809 src/gui/statuswindow.cpp:878
+#: src/gui/statuswindow.cpp:703 src/gui/statuswindow.cpp:755
+#: src/gui/statuswindow.cpp:810 src/gui/statuswindow.cpp:879
 msgid "(A)"
 msgstr "(A)"
 
-#: src/gui/statuswindow.cpp:715
+#: src/gui/statuswindow.cpp:716
 msgid "(R)"
 msgstr "(R)"
 
-#: src/gui/statuswindow.cpp:718
+#: src/gui/statuswindow.cpp:719
 msgid "(M)"
 msgstr "(M)"
 
-#: src/gui/statuswindow.cpp:721
+#: src/gui/statuswindow.cpp:722
 msgid "(P)"
 msgstr "(P)"
 
-#: src/gui/statuswindow.cpp:735
+#: src/gui/statuswindow.cpp:736
 msgid "(s)"
 msgstr "(s)"
 
-#: src/gui/statuswindow.cpp:738 src/gui/statuswindow.cpp:791
+#: src/gui/statuswindow.cpp:739 src/gui/statuswindow.cpp:792
 msgid "(S)"
 msgstr "(S)"
 
-#: src/gui/statuswindow.cpp:751 src/gui/statuswindow.cpp:806
-#: src/gui/statuswindow.cpp:859
+#: src/gui/statuswindow.cpp:752 src/gui/statuswindow.cpp:807
+#: src/gui/statuswindow.cpp:860
 msgid "(G)"
 msgstr "(G)"
 
-#: src/gui/statuswindow.cpp:767
+#: src/gui/statuswindow.cpp:768
 msgid "(f)"
 msgstr "(f)"
 
-#: src/gui/statuswindow.cpp:776 src/gui/statuswindow.cpp:797
-#: src/gui/statuswindow.cpp:862
+#: src/gui/statuswindow.cpp:777 src/gui/statuswindow.cpp:798
+#: src/gui/statuswindow.cpp:863
 msgid "(F)"
 msgstr "(F)"
 
-#: src/gui/statuswindow.cpp:779 src/gui/statuswindow.cpp:829
+#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:830
 msgid "(U)"
 msgstr "(U)"
 
-#: src/gui/statuswindow.cpp:803
+#: src/gui/statuswindow.cpp:804
 msgid "(g)"
 msgstr "(g)"
 
-#: src/gui/statuswindow.cpp:820
+#: src/gui/statuswindow.cpp:821
 msgid "(N)"
 msgstr "(N)"
 
-#: src/gui/statuswindow.cpp:826
+#: src/gui/statuswindow.cpp:827
 msgid "(u)"
 msgstr "(u)"
 
-#: src/gui/statuswindow.cpp:832
+#: src/gui/statuswindow.cpp:833
 msgid "(e)"
 msgstr "(e)"
 
-#: src/gui/statuswindow.cpp:835
+#: src/gui/statuswindow.cpp:836
 msgid "(b)"
 msgstr "(b)"
 
-#: src/gui/statuswindow.cpp:849 src/gui/statuswindow.cpp:875
+#: src/gui/statuswindow.cpp:850 src/gui/statuswindow.cpp:876
 msgid "(O)"
 msgstr "(O)"
 
@@ -3853,369 +3857,373 @@ msgstr ""
 msgid "Stop Attack"
 msgstr "Aanval stoppen"
 
-#: src/keyboardconfig.cpp:64
+#: src/keyboardconfig.cpp:65
+msgid "Untarget"
+msgstr ""
+
+#: src/keyboardconfig.cpp:66
 msgid "Target Closest"
 msgstr "Dichtsbijzijnde viseren"
 
-#: src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:68
 msgid "Target NPC"
 msgstr "NPC viseren"
 
-#: src/keyboardconfig.cpp:67
+#: src/keyboardconfig.cpp:69
 msgid "Target Player"
 msgstr "Speler viseren"
 
-#: src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:71
 msgid "Pickup"
 msgstr "Oprapen"
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:72
 msgid "Change Pickup Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:74
 msgid "Hide Windows"
 msgstr "Vensters verbergen"
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:76
 msgid "Sit"
 msgstr "Zitten"
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:77
 msgid "Screenshot"
 msgstr "Schermafdruk"
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:78
 msgid "Enable/Disable Trading"
 msgstr "Handelen inschakelen/uitschakelen"
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:80
 msgid "Change Map View Mode"
 msgstr "Wijzig Map Tonen Modus"
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:82
 msgid "Select OK"
 msgstr "OK selecteren"
 
-#: src/keyboardconfig.cpp:83
+#: src/keyboardconfig.cpp:85
 msgid "Shortcuts Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:86
 msgid "Item Shortcuts Key"
 msgstr "Voorwerpsnelkoppelingstoets"
 
-#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:88
-#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:92
-#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:96
-#: src/keyboardconfig.cpp:98 src/keyboardconfig.cpp:100
-#: src/keyboardconfig.cpp:102 src/keyboardconfig.cpp:104
-#: src/keyboardconfig.cpp:106 src/keyboardconfig.cpp:108
-#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:112
-#: src/keyboardconfig.cpp:114 src/keyboardconfig.cpp:117
-#: src/keyboardconfig.cpp:119 src/keyboardconfig.cpp:121
-#: src/keyboardconfig.cpp:123 src/keyboardconfig.cpp:125
-#: src/keyboardconfig.cpp:367
+#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:90
+#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:94
+#: src/keyboardconfig.cpp:96 src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:100 src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:104 src/keyboardconfig.cpp:106
+#: src/keyboardconfig.cpp:108 src/keyboardconfig.cpp:110
+#: src/keyboardconfig.cpp:112 src/keyboardconfig.cpp:114
+#: src/keyboardconfig.cpp:116 src/keyboardconfig.cpp:119
+#: src/keyboardconfig.cpp:121 src/keyboardconfig.cpp:123
+#: src/keyboardconfig.cpp:125 src/keyboardconfig.cpp:127
+#: src/keyboardconfig.cpp:369
 #, c-format
 msgid "Item Shortcut %d"
 msgstr "Snelkoppeling naar voorwerp %d"
 
-#: src/keyboardconfig.cpp:126
+#: src/keyboardconfig.cpp:128
 msgid "Windows Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:127
+#: src/keyboardconfig.cpp:129
 msgid "Help Window"
 msgstr "Help venster"
 
-#: src/keyboardconfig.cpp:129
+#: src/keyboardconfig.cpp:131
 msgid "Status Window"
 msgstr "Statusvenster"
 
-#: src/keyboardconfig.cpp:131
+#: src/keyboardconfig.cpp:133
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:133
+#: src/keyboardconfig.cpp:135
 msgid "Equipment Window"
 msgstr "Uitrustingsvenster"
 
-#: src/keyboardconfig.cpp:135
+#: src/keyboardconfig.cpp:137
 msgid "Skill Window"
 msgstr "Vaardigheidsvenster"
 
-#: src/keyboardconfig.cpp:137
+#: src/keyboardconfig.cpp:139
 msgid "Minimap Window"
 msgstr "Minimapvenster"
 
-#: src/keyboardconfig.cpp:139
+#: src/keyboardconfig.cpp:141
 msgid "Chat Window"
 msgstr "Gespreksvenster"
 
-#: src/keyboardconfig.cpp:141
+#: src/keyboardconfig.cpp:143
 msgid "Item Shortcut Window"
 msgstr "Voorwerpsnelkoppelingsvenster"
 
-#: src/keyboardconfig.cpp:143
+#: src/keyboardconfig.cpp:145
 msgid "Setup Window"
 msgstr "Instellingenvenster"
 
-#: src/keyboardconfig.cpp:145
+#: src/keyboardconfig.cpp:147
 msgid "Debug Window"
 msgstr "Debugvenster"
 
-#: src/keyboardconfig.cpp:147
+#: src/keyboardconfig.cpp:149
 msgid "Social Window"
 msgstr "Sociaal Venster"
 
-#: src/keyboardconfig.cpp:149
+#: src/keyboardconfig.cpp:151
 msgid "Emote Shortcut Window"
 msgstr "Emoticonsnelkoppelingsvenster"
 
-#: src/keyboardconfig.cpp:151
+#: src/keyboardconfig.cpp:153
 msgid "Outfits Window"
 msgstr "Kleren Venster"
 
-#: src/keyboardconfig.cpp:153
+#: src/keyboardconfig.cpp:155
 msgid "Shop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:155
+#: src/keyboardconfig.cpp:157
 msgid "Quick drop Window"
 msgstr "Snel neerleggingsvenster"
 
-#: src/keyboardconfig.cpp:157
+#: src/keyboardconfig.cpp:159
 msgid "Kill Stats Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboardconfig.cpp:161
 msgid "Commands Window"
 msgstr "Commando Venster"
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboardconfig.cpp:163
 msgid "Bot Checker Window"
 msgstr "Bot Controle Venster"
 
-#: src/keyboardconfig.cpp:164
+#: src/keyboardconfig.cpp:166
 msgid "Who Is Online Window"
 msgstr "Wie Is Online Venster"
 
-#: src/keyboardconfig.cpp:166
+#: src/keyboardconfig.cpp:168
 msgid "Did you know Window"
 msgstr "Weet u Venster"
 
-#: src/keyboardconfig.cpp:169
+#: src/keyboardconfig.cpp:171
 msgid "Previous Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:171
+#: src/keyboardconfig.cpp:173
 msgid "Next Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:173
+#: src/keyboardconfig.cpp:175
 msgid "Emotes Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:174
+#: src/keyboardconfig.cpp:176
 msgid "Smilie"
 msgstr "Smilie"
 
-#: src/keyboardconfig.cpp:175 src/keyboardconfig.cpp:177
-#: src/keyboardconfig.cpp:179 src/keyboardconfig.cpp:181
-#: src/keyboardconfig.cpp:183 src/keyboardconfig.cpp:185
-#: src/keyboardconfig.cpp:187 src/keyboardconfig.cpp:189
-#: src/keyboardconfig.cpp:191 src/keyboardconfig.cpp:193
-#: src/keyboardconfig.cpp:195 src/keyboardconfig.cpp:197
-#: src/keyboardconfig.cpp:200 src/keyboardconfig.cpp:202
-#: src/keyboardconfig.cpp:204 src/keyboardconfig.cpp:206
-#: src/keyboardconfig.cpp:208 src/keyboardconfig.cpp:210
-#: src/keyboardconfig.cpp:212 src/keyboardconfig.cpp:214
-#: src/keyboardconfig.cpp:216 src/keyboardconfig.cpp:218
-#: src/keyboardconfig.cpp:220 src/keyboardconfig.cpp:222
-#: src/keyboardconfig.cpp:224 src/keyboardconfig.cpp:227
-#: src/keyboardconfig.cpp:230 src/keyboardconfig.cpp:233
-#: src/keyboardconfig.cpp:235 src/keyboardconfig.cpp:237
-#: src/keyboardconfig.cpp:239 src/keyboardconfig.cpp:241
-#: src/keyboardconfig.cpp:243 src/keyboardconfig.cpp:245
-#: src/keyboardconfig.cpp:247 src/keyboardconfig.cpp:249
-#: src/keyboardconfig.cpp:251 src/keyboardconfig.cpp:254
-#: src/keyboardconfig.cpp:256 src/keyboardconfig.cpp:258
-#: src/keyboardconfig.cpp:260 src/keyboardconfig.cpp:262
-#: src/keyboardconfig.cpp:264 src/keyboardconfig.cpp:266
-#: src/keyboardconfig.cpp:362
+#: src/keyboardconfig.cpp:177 src/keyboardconfig.cpp:179
+#: src/keyboardconfig.cpp:181 src/keyboardconfig.cpp:183
+#: src/keyboardconfig.cpp:185 src/keyboardconfig.cpp:187
+#: src/keyboardconfig.cpp:189 src/keyboardconfig.cpp:191
+#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
+#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
+#: src/keyboardconfig.cpp:202 src/keyboardconfig.cpp:204
+#: src/keyboardconfig.cpp:206 src/keyboardconfig.cpp:208
+#: src/keyboardconfig.cpp:210 src/keyboardconfig.cpp:212
+#: src/keyboardconfig.cpp:214 src/keyboardconfig.cpp:216
+#: src/keyboardconfig.cpp:218 src/keyboardconfig.cpp:220
+#: src/keyboardconfig.cpp:222 src/keyboardconfig.cpp:224
+#: src/keyboardconfig.cpp:226 src/keyboardconfig.cpp:229
+#: src/keyboardconfig.cpp:232 src/keyboardconfig.cpp:235
+#: src/keyboardconfig.cpp:237 src/keyboardconfig.cpp:239
+#: src/keyboardconfig.cpp:241 src/keyboardconfig.cpp:243
+#: src/keyboardconfig.cpp:245 src/keyboardconfig.cpp:247
+#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
+#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:256
+#: src/keyboardconfig.cpp:258 src/keyboardconfig.cpp:260
+#: src/keyboardconfig.cpp:262 src/keyboardconfig.cpp:264
+#: src/keyboardconfig.cpp:266 src/keyboardconfig.cpp:268
+#: src/keyboardconfig.cpp:364
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "Emoticon snelkoppeling %d"
 
-#: src/keyboardconfig.cpp:268
+#: src/keyboardconfig.cpp:270
 msgid "Outfits Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:269
+#: src/keyboardconfig.cpp:271
 msgid "Wear Outfit"
 msgstr "Draag Kledij"
 
-#: src/keyboardconfig.cpp:271
+#: src/keyboardconfig.cpp:273
 msgid "Copy Outfit"
 msgstr "Kopiëer Kledij"
 
-#: src/keyboardconfig.cpp:273
+#: src/keyboardconfig.cpp:275
 msgid "Copy equipped to Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:275
+#: src/keyboardconfig.cpp:277
 msgid "Chat Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:276
+#: src/keyboardconfig.cpp:278
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:280
 msgid "Scroll Chat Up"
 msgstr "Chat omhoogscrollen"
 
-#: src/keyboardconfig.cpp:280
+#: src/keyboardconfig.cpp:282
 msgid "Scroll Chat Down"
 msgstr "Chat omlaagscrollen"
 
-#: src/keyboardconfig.cpp:282
+#: src/keyboardconfig.cpp:284
 msgid "Previous Chat Tab"
 msgstr "Vorige chattab"
 
-#: src/keyboardconfig.cpp:284
+#: src/keyboardconfig.cpp:286
 msgid "Next Chat Tab"
 msgstr "Volgende chattab"
 
-#: src/keyboardconfig.cpp:287
+#: src/keyboardconfig.cpp:289
 msgid "Close current Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:289
+#: src/keyboardconfig.cpp:291
 msgid "Previous chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:291
+#: src/keyboardconfig.cpp:293
 msgid "Next chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:293
+#: src/keyboardconfig.cpp:295
 msgid "Chat Auto Complete"
 msgstr ""
 
-#: src/keyboardconfig.cpp:295
+#: src/keyboardconfig.cpp:297
 msgid "Deactivate Chat Input"
 msgstr ""
 
-#: src/keyboardconfig.cpp:297
+#: src/keyboardconfig.cpp:299
 msgid "Other Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboardconfig.cpp:300
 msgid "Ignore input 1"
 msgstr "Ingave 1 negeren"
 
-#: src/keyboardconfig.cpp:300
+#: src/keyboardconfig.cpp:302
 msgid "Ignore input 2"
 msgstr "Ingave 2 negeren"
 
-#: src/keyboardconfig.cpp:302
+#: src/keyboardconfig.cpp:304
 msgid "Direct Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboardconfig.cpp:305
 msgid "Direct Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboardconfig.cpp:307
 msgid "Direct Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:306
+#: src/keyboardconfig.cpp:308
 msgid "Direct Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:308
+#: src/keyboardconfig.cpp:310
 msgid "Crazy moves"
 msgstr ""
 
-#: src/keyboardconfig.cpp:310
+#: src/keyboardconfig.cpp:312
 msgid "Change Crazy Move mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboardconfig.cpp:314
 msgid "Quick Drop N Items from 0 slot"
 msgstr "Snel N Voorwerpen van slot 0 neerleggen"
 
-#: src/keyboardconfig.cpp:314
+#: src/keyboardconfig.cpp:316
 msgid "Quick Drop N Items"
 msgstr "Snel N Voorwerpen Neerleggen"
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboardconfig.cpp:318
 msgid "Switch Quick Drop Counter"
 msgstr "Wissel Snel Neerleggingsteller"
 
-#: src/keyboardconfig.cpp:318
+#: src/keyboardconfig.cpp:320
 msgid "Quick heal target or self"
 msgstr "Snel jezelf of iemand anders genezen"
 
-#: src/keyboardconfig.cpp:320
+#: src/keyboardconfig.cpp:322
 msgid "Use #itenplz spell"
 msgstr "Gebruik #itenplz spreuk"
 
-#: src/keyboardconfig.cpp:322
+#: src/keyboardconfig.cpp:324
 msgid "Use magic attack"
 msgstr "Gebruik magie aanval"
 
-#: src/keyboardconfig.cpp:324
+#: src/keyboardconfig.cpp:326
 msgid "Switch magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:326
+#: src/keyboardconfig.cpp:328
 msgid "Change move type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:328
+#: src/keyboardconfig.cpp:330
 msgid "Change Attack Weapon Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboardconfig.cpp:332
 msgid "Change Attack Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:332
+#: src/keyboardconfig.cpp:334
 msgid "Change Follow mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:334
+#: src/keyboardconfig.cpp:336
 msgid "Change Imitation mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:337
+#: src/keyboardconfig.cpp:339
 msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:338
+#: src/keyboardconfig.cpp:340
 msgid "On / Off audio"
 msgstr "Aan / Uit audio"
 
-#: src/keyboardconfig.cpp:340
+#: src/keyboardconfig.cpp:342
 msgid "Enable / Disable away mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:342
+#: src/keyboardconfig.cpp:344
 msgid "Emulate right click from keyboard"
 msgstr ""
 
-#: src/keyboardconfig.cpp:344
+#: src/keyboardconfig.cpp:346
 msgid "Toggle camera mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:346
+#: src/keyboardconfig.cpp:348
 msgid "Modifier key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:425
+#: src/keyboardconfig.cpp:427
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -4226,64 +4234,64 @@ msgstr ""
 msgid "You were killed by "
 msgstr "U bent gedoodt door "
 
-#: src/localplayer.cpp:1422
+#: src/localplayer.cpp:1427
 msgid "Tried to pick up nonexistent item."
 msgstr "Geprobeerd een nietbestaand voorwerp op te rapen."
 
-#: src/localplayer.cpp:1424
+#: src/localplayer.cpp:1429
 msgid "Item is too heavy."
 msgstr "Voorwerp is te zwaar."
 
-#: src/localplayer.cpp:1426
+#: src/localplayer.cpp:1431
 msgid "Item is too far away."
 msgstr "Voorwerp is te ver weg."
 
-#: src/localplayer.cpp:1428
+#: src/localplayer.cpp:1433
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1430
+#: src/localplayer.cpp:1435
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1433
+#: src/localplayer.cpp:1438
 msgid "Item belongs to someone else."
 msgstr "Voorwerp behoort bij iemand anders."
 
-#: src/localplayer.cpp:1436
+#: src/localplayer.cpp:1441
 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:1460
+#: src/localplayer.cpp:1465
 #, 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:3174
+#: src/localplayer.cpp:3179
 msgid "Away"
 msgstr "Weg"
 
-#: src/localplayer.cpp:3494
+#: src/localplayer.cpp:3507
 msgid "Follow: "
 msgstr "Volg: "
 
-#: src/localplayer.cpp:3496 src/localplayer.cpp:3511
+#: src/localplayer.cpp:3509 src/localplayer.cpp:3524
 msgid "Follow canceled"
 msgstr "Volgen onderbroken"
 
-#: src/localplayer.cpp:3503
+#: src/localplayer.cpp:3516
 msgid "Imitation: "
 msgstr "Imitatie: "
 
-#: src/localplayer.cpp:3505 src/localplayer.cpp:3513
+#: src/localplayer.cpp:3518 src/localplayer.cpp:3526
 msgid "Imitation canceled"
 msgstr "Imitatie onderbroken"
 
-#: src/localplayer.cpp:3858
+#: src/localplayer.cpp:3871
 msgid "You see "
 msgstr ""
 
diff --git a/po/pt.po b/po/pt.po
index 672424c4a..a7cd4b86c 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-09-27 22:18+0300\n"
-"PO-Revision-Date: 2011-09-27 19:20+0000\n"
+"POT-Creation-Date: 2011-10-01 01:22+0300\n"
+"PO-Revision-Date: 2011-09-30 14:45+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: Portuguese (http://www.transifex.net/projects/p/manaplus/team/"
 "pt/)\n"
@@ -337,19 +337,19 @@ msgstr "A conexão com o servidor caiu."
 msgid "Network Error"
 msgstr "Erro de conexão"
 
-#: src/game.cpp:1320
+#: src/game.cpp:1321
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorando propostas de negócios"
 
-#: src/game.cpp:1330
+#: src/game.cpp:1331
 msgid "Accepting incoming trade requests"
 msgstr "Aceitando propostas de negócios"
 
-#: src/game.cpp:1727
+#: src/game.cpp:1731
 msgid "Could Not Load Map"
 msgstr "Não foi possível carregar o mapa"
 
-#: src/game.cpp:1728
+#: src/game.cpp:1732
 #, c-format
 msgid "Error while loading %s"
 msgstr "Erro ao carregar %s"
@@ -407,44 +407,48 @@ msgstr "Resultado"
 msgid "Reset"
 msgstr "Resetar"
 
-#: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:98
+#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
 #: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
 #: src/gui/popupmenu.cpp:273 src/gui/popupmenu.cpp:654
 msgid "Buy"
 msgstr "Comprar"
 
-#: src/gui/buydialog.cpp:89 src/gui/buydialog.cpp:303
+#: src/gui/buydialog.cpp:94 src/gui/buydialog.cpp:332
 #: src/gui/selldialog.cpp:88 src/gui/selldialog.cpp:325
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Preço: %s / Total: %s"
 
+#: src/gui/buydialog.cpp:103
+msgid "Amount:"
+msgstr ""
+
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:94 src/gui/itemamountwindow.cpp:207
+#: 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:973
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:974
 msgid "+"
 msgstr "+"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:97 src/gui/itemamountwindow.cpp:206
+#: 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:985
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:986
 msgid "-"
 msgstr "-"
 
-#: src/gui/buydialog.cpp:99 src/gui/quitdialog.cpp:47
+#: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:294
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:84
 msgid "Quit"
 msgstr "Sair"
 
-#: src/gui/buydialog.cpp:100 src/gui/selldialog.cpp:95
-#: src/gui/statuswindow.cpp:504 src/gui/statuswindow.cpp:553
-#: src/gui/statuswindow.cpp:972 src/gui/statuswindow.cpp:1003
+#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
+#: src/gui/statuswindow.cpp:504 src/gui/statuswindow.cpp:554
+#: src/gui/statuswindow.cpp:973 src/gui/statuswindow.cpp:1004
 msgid "Max"
 msgstr "Máximo"
 
@@ -922,7 +926,7 @@ msgid "Equipment"
 msgstr "Equipamento"
 
 #: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160
-#: src/gui/inventorywindow.cpp:538 src/gui/inventorywindow.cpp:547
+#: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554
 #: src/gui/popupmenu.cpp:1656 src/gui/popupmenu.cpp:1748
 #: src/gui/popupmenu.cpp:1793
 msgid "Unequip"
@@ -965,20 +969,20 @@ msgstr "Slots:"
 msgid "Filter:"
 msgstr "Filtro:"
 
-#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:540
-#: src/gui/inventorywindow.cpp:549 src/gui/popupmenu.cpp:1658
+#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547
+#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1658
 #: src/gui/popupmenu.cpp:1750 src/gui/popupmenu.cpp:1795
 msgid "Equip"
 msgstr "Equipar"
 
-#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:541
-#: src/gui/inventorywindow.cpp:545 src/gui/popupmenu.cpp:1662
+#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548
+#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1662
 #: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1754
 #: src/gui/popupmenu.cpp:1799
 msgid "Use"
 msgstr "Usar"
 
-#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:645
+#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652
 #: src/gui/popupmenu.cpp:1667 src/gui/popupmenu.cpp:1759
 #: src/gui/popupmenu.cpp:1804
 msgid "Drop..."
@@ -998,7 +1002,7 @@ msgstr "Roupas"
 msgid "Weight:"
 msgstr "Peso:"
 
-#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:636
+#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643
 #: src/gui/popupmenu.cpp:1642 src/gui/popupmenu.cpp:1771
 #: src/gui/popupmenu.cpp:1816 src/gui/setup.cpp:73
 msgid "Store"
@@ -1008,7 +1012,7 @@ msgstr "Armazenar"
 msgid "Retrieve"
 msgstr "Retirar"
 
-#: src/gui/inventorywindow.cpp:647 src/gui/popupmenu.cpp:1672
+#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1672
 #: src/gui/popupmenu.cpp:1764 src/gui/popupmenu.cpp:1809
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
@@ -2201,7 +2205,7 @@ msgstr "Mostrar o próprio nome"
 
 #: src/gui/setup_players.cpp:63
 msgid "Enable extended mouse targeting"
-msgstr ""
+msgstr "Ativar segmentação prolongada de mouse"
 
 #: src/gui/setup_players.cpp:66
 msgid "Target dead players"
@@ -3058,130 +3062,130 @@ msgstr "Nível: %d (GM %d)"
 msgid "Correction points: %d"
 msgstr "Pontos de correção: %d"
 
-#: src/gui/statuswindow.cpp:647 src/gui/statuswindow.cpp:712
-#: src/gui/statuswindow.cpp:732 src/gui/statuswindow.cpp:748
-#: src/gui/statuswindow.cpp:794 src/gui/statuswindow.cpp:823
-#: src/gui/statuswindow.cpp:846 src/gui/statuswindow.cpp:865
+#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:713
+#: src/gui/statuswindow.cpp:733 src/gui/statuswindow.cpp:749
+#: src/gui/statuswindow.cpp:795 src/gui/statuswindow.cpp:824
+#: src/gui/statuswindow.cpp:847 src/gui/statuswindow.cpp:866
 msgid "(D)"
 msgstr "(D)"
 
-#: src/gui/statuswindow.cpp:650 src/gui/statuswindow.cpp:773
+#: src/gui/statuswindow.cpp:651 src/gui/statuswindow.cpp:774
 msgid "(I)"
 msgstr "(I)"
 
-#: src/gui/statuswindow.cpp:653 src/gui/statuswindow.cpp:770
+#: src/gui/statuswindow.cpp:654 src/gui/statuswindow.cpp:771
 msgid "(c)"
 msgstr "(c)"
 
-#: src/gui/statuswindow.cpp:656
+#: src/gui/statuswindow.cpp:657
 msgid "(C)"
 msgstr "(C)"
 
-#: src/gui/statuswindow.cpp:659 src/gui/statuswindow.cpp:757
+#: src/gui/statuswindow.cpp:660 src/gui/statuswindow.cpp:758
 msgid "(d)"
 msgstr "(d)"
 
-#: src/gui/statuswindow.cpp:662 src/gui/statuswindow.cpp:676
-#: src/gui/statuswindow.cpp:705 src/gui/statuswindow.cpp:724
-#: src/gui/statuswindow.cpp:741 src/gui/statuswindow.cpp:760
-#: src/gui/statuswindow.cpp:782 src/gui/statuswindow.cpp:812
-#: src/gui/statuswindow.cpp:838 src/gui/statuswindow.cpp:852
-#: src/gui/statuswindow.cpp:868 src/gui/statuswindow.cpp:881
+#: src/gui/statuswindow.cpp:663 src/gui/statuswindow.cpp:677
+#: src/gui/statuswindow.cpp:706 src/gui/statuswindow.cpp:725
+#: src/gui/statuswindow.cpp:742 src/gui/statuswindow.cpp:761
+#: src/gui/statuswindow.cpp:783 src/gui/statuswindow.cpp:813
+#: src/gui/statuswindow.cpp:839 src/gui/statuswindow.cpp:853
+#: src/gui/statuswindow.cpp:869 src/gui/statuswindow.cpp:882
 msgid "(?)"
 msgstr "(?)"
 
-#: src/gui/statuswindow.cpp:673
+#: src/gui/statuswindow.cpp:674
 msgid "(a)"
 msgstr "(a)"
 
-#: src/gui/statuswindow.cpp:684
+#: src/gui/statuswindow.cpp:685
 msgid "(0)"
 msgstr "(0)"
 
-#: src/gui/statuswindow.cpp:687
+#: src/gui/statuswindow.cpp:688
 msgid "(1)"
 msgstr "(1)"
 
-#: src/gui/statuswindow.cpp:690
+#: src/gui/statuswindow.cpp:691
 msgid "(2)"
 msgstr "(2)"
 
-#: src/gui/statuswindow.cpp:693 src/gui/statuswindow.cpp:800
+#: src/gui/statuswindow.cpp:694 src/gui/statuswindow.cpp:801
 msgid "(3)"
 msgstr "(3)"
 
-#: src/gui/statuswindow.cpp:696
+#: src/gui/statuswindow.cpp:697
 msgid "(5)"
 msgstr "(4)"
 
-#: src/gui/statuswindow.cpp:699
+#: src/gui/statuswindow.cpp:700
 msgid "(7)"
 msgstr "(7)"
 
-#: src/gui/statuswindow.cpp:702 src/gui/statuswindow.cpp:754
-#: src/gui/statuswindow.cpp:809 src/gui/statuswindow.cpp:878
+#: src/gui/statuswindow.cpp:703 src/gui/statuswindow.cpp:755
+#: src/gui/statuswindow.cpp:810 src/gui/statuswindow.cpp:879
 msgid "(A)"
 msgstr "(A)"
 
-#: src/gui/statuswindow.cpp:715
+#: src/gui/statuswindow.cpp:716
 msgid "(R)"
 msgstr "(R)"
 
-#: src/gui/statuswindow.cpp:718
+#: src/gui/statuswindow.cpp:719
 msgid "(M)"
 msgstr "(M)"
 
-#: src/gui/statuswindow.cpp:721
+#: src/gui/statuswindow.cpp:722
 msgid "(P)"
 msgstr "(P)"
 
-#: src/gui/statuswindow.cpp:735
+#: src/gui/statuswindow.cpp:736
 msgid "(s)"
 msgstr "(s)"
 
-#: src/gui/statuswindow.cpp:738 src/gui/statuswindow.cpp:791
+#: src/gui/statuswindow.cpp:739 src/gui/statuswindow.cpp:792
 msgid "(S)"
 msgstr "(S)"
 
-#: src/gui/statuswindow.cpp:751 src/gui/statuswindow.cpp:806
-#: src/gui/statuswindow.cpp:859
+#: src/gui/statuswindow.cpp:752 src/gui/statuswindow.cpp:807
+#: src/gui/statuswindow.cpp:860
 msgid "(G)"
 msgstr "(G)"
 
-#: src/gui/statuswindow.cpp:767
+#: src/gui/statuswindow.cpp:768
 msgid "(f)"
 msgstr "(f)"
 
-#: src/gui/statuswindow.cpp:776 src/gui/statuswindow.cpp:797
-#: src/gui/statuswindow.cpp:862
+#: src/gui/statuswindow.cpp:777 src/gui/statuswindow.cpp:798
+#: src/gui/statuswindow.cpp:863
 msgid "(F)"
 msgstr "(F)"
 
-#: src/gui/statuswindow.cpp:779 src/gui/statuswindow.cpp:829
+#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:830
 msgid "(U)"
 msgstr "(U)"
 
-#: src/gui/statuswindow.cpp:803
+#: src/gui/statuswindow.cpp:804
 msgid "(g)"
 msgstr "(g)"
 
-#: src/gui/statuswindow.cpp:820
+#: src/gui/statuswindow.cpp:821
 msgid "(N)"
 msgstr "(N)"
 
-#: src/gui/statuswindow.cpp:826
+#: src/gui/statuswindow.cpp:827
 msgid "(u)"
 msgstr "(u)"
 
-#: src/gui/statuswindow.cpp:832
+#: src/gui/statuswindow.cpp:833
 msgid "(e)"
 msgstr "(e)"
 
-#: src/gui/statuswindow.cpp:835
+#: src/gui/statuswindow.cpp:836
 msgid "(b)"
 msgstr "(b)"
 
-#: src/gui/statuswindow.cpp:849 src/gui/statuswindow.cpp:875
+#: src/gui/statuswindow.cpp:850 src/gui/statuswindow.cpp:876
 msgid "(O)"
 msgstr "(O)"
 
@@ -3243,7 +3247,7 @@ msgstr "Comando:"
 
 #: src/gui/textcommandeditor.cpp:200
 msgid "Comment:"
-msgstr ""
+msgstr "Comentario:"
 
 #: src/gui/textcommandeditor.cpp:203
 msgid "Mana:"
@@ -3797,7 +3801,7 @@ msgstr "Carrinho"
 
 #: src/keyboardconfig.cpp:43
 msgid "Basic Keys"
-msgstr ""
+msgstr "Teclas básicas"
 
 #: src/keyboardconfig.cpp:44
 msgid "Move Up"
@@ -3843,369 +3847,373 @@ msgstr "Mover para ponto de navegação"
 msgid "Stop Attack"
 msgstr "Parar ataque"
 
-#: src/keyboardconfig.cpp:64
+#: src/keyboardconfig.cpp:65
+msgid "Untarget"
+msgstr ""
+
+#: src/keyboardconfig.cpp:66
 msgid "Target Closest"
 msgstr "Selecionar alvo mais próximo"
 
-#: src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:68
 msgid "Target NPC"
 msgstr "Selecionar NPC"
 
-#: src/keyboardconfig.cpp:67
+#: src/keyboardconfig.cpp:69
 msgid "Target Player"
 msgstr "Selecionar Jogador"
 
-#: src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:71
 msgid "Pickup"
 msgstr "Pegar item"
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:72
 msgid "Change Pickup Type"
 msgstr "Mudar o modo de pegar itens"
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:74
 msgid "Hide Windows"
 msgstr "Esconder janelas"
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:76
 msgid "Sit"
 msgstr "Sentar"
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:77
 msgid "Screenshot"
 msgstr "Screenshot"
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:78
 msgid "Enable/Disable Trading"
 msgstr "Habilitar/Desabilitar Negociações"
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:80
 msgid "Change Map View Mode"
 msgstr "Mudar o modo de visualização de mapas"
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:82
 msgid "Select OK"
 msgstr "Selecionar OK"
 
-#: src/keyboardconfig.cpp:83
+#: src/keyboardconfig.cpp:85
 msgid "Shortcuts Keys"
-msgstr ""
+msgstr "Teclas de atalho"
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:86
 msgid "Item Shortcuts Key"
 msgstr "Atalhos de item"
 
-#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:88
-#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:92
-#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:96
-#: src/keyboardconfig.cpp:98 src/keyboardconfig.cpp:100
-#: src/keyboardconfig.cpp:102 src/keyboardconfig.cpp:104
-#: src/keyboardconfig.cpp:106 src/keyboardconfig.cpp:108
-#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:112
-#: src/keyboardconfig.cpp:114 src/keyboardconfig.cpp:117
-#: src/keyboardconfig.cpp:119 src/keyboardconfig.cpp:121
-#: src/keyboardconfig.cpp:123 src/keyboardconfig.cpp:125
-#: src/keyboardconfig.cpp:367
+#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:90
+#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:94
+#: src/keyboardconfig.cpp:96 src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:100 src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:104 src/keyboardconfig.cpp:106
+#: src/keyboardconfig.cpp:108 src/keyboardconfig.cpp:110
+#: src/keyboardconfig.cpp:112 src/keyboardconfig.cpp:114
+#: src/keyboardconfig.cpp:116 src/keyboardconfig.cpp:119
+#: src/keyboardconfig.cpp:121 src/keyboardconfig.cpp:123
+#: src/keyboardconfig.cpp:125 src/keyboardconfig.cpp:127
+#: src/keyboardconfig.cpp:369
 #, c-format
 msgid "Item Shortcut %d"
 msgstr "Atalho para item %d"
 
-#: src/keyboardconfig.cpp:126
+#: src/keyboardconfig.cpp:128
 msgid "Windows Keys"
-msgstr ""
+msgstr "Teclas de janelas"
 
-#: src/keyboardconfig.cpp:127
+#: src/keyboardconfig.cpp:129
 msgid "Help Window"
 msgstr "Janela de Ajuda"
 
-#: src/keyboardconfig.cpp:129
+#: src/keyboardconfig.cpp:131
 msgid "Status Window"
 msgstr "Janela de Status"
 
-#: src/keyboardconfig.cpp:131
+#: src/keyboardconfig.cpp:133
 msgid "Inventory Window"
 msgstr "Janela de inventário"
 
-#: src/keyboardconfig.cpp:133
+#: src/keyboardconfig.cpp:135
 msgid "Equipment Window"
 msgstr "Janela de equipamento"
 
-#: src/keyboardconfig.cpp:135
+#: src/keyboardconfig.cpp:137
 msgid "Skill Window"
 msgstr "Janela de Habilidade"
 
-#: src/keyboardconfig.cpp:137
+#: src/keyboardconfig.cpp:139
 msgid "Minimap Window"
 msgstr "Janela de Minimapa"
 
-#: src/keyboardconfig.cpp:139
+#: src/keyboardconfig.cpp:141
 msgid "Chat Window"
 msgstr "Janela de chat"
 
-#: src/keyboardconfig.cpp:141
+#: src/keyboardconfig.cpp:143
 msgid "Item Shortcut Window"
 msgstr "Janela de atalhos para itens"
 
-#: src/keyboardconfig.cpp:143
+#: src/keyboardconfig.cpp:145
 msgid "Setup Window"
 msgstr "Janela de Configurações"
 
-#: src/keyboardconfig.cpp:145
+#: src/keyboardconfig.cpp:147
 msgid "Debug Window"
 msgstr "Janela de Depuração"
 
-#: src/keyboardconfig.cpp:147
+#: src/keyboardconfig.cpp:149
 msgid "Social Window"
 msgstr "Janela social"
 
-#: src/keyboardconfig.cpp:149
+#: src/keyboardconfig.cpp:151
 msgid "Emote Shortcut Window"
 msgstr "Janela de atalho para emoticons"
 
-#: src/keyboardconfig.cpp:151
+#: src/keyboardconfig.cpp:153
 msgid "Outfits Window"
 msgstr "Janela de roupas"
 
-#: src/keyboardconfig.cpp:153
+#: src/keyboardconfig.cpp:155
 msgid "Shop Window"
 msgstr "Janela Loja"
 
-#: src/keyboardconfig.cpp:155
+#: src/keyboardconfig.cpp:157
 msgid "Quick drop Window"
 msgstr "Janela Descarte rápido"
 
-#: src/keyboardconfig.cpp:157
+#: src/keyboardconfig.cpp:159
 msgid "Kill Stats Window"
 msgstr "Janeja de mortes"
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboardconfig.cpp:161
 msgid "Commands Window"
 msgstr "Janela Comandos"
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboardconfig.cpp:163
 msgid "Bot Checker Window"
 msgstr "Janela Analisador de bot"
 
-#: src/keyboardconfig.cpp:164
+#: src/keyboardconfig.cpp:166
 msgid "Who Is Online Window"
 msgstr "Janela Quem está online"
 
-#: src/keyboardconfig.cpp:166
+#: src/keyboardconfig.cpp:168
 msgid "Did you know Window"
 msgstr "Janela Você sabia"
 
-#: src/keyboardconfig.cpp:169
+#: src/keyboardconfig.cpp:171
 msgid "Previous Social Tab"
 msgstr "Aba social anterior"
 
-#: src/keyboardconfig.cpp:171
+#: src/keyboardconfig.cpp:173
 msgid "Next Social Tab"
 msgstr "Próxima aba social"
 
-#: src/keyboardconfig.cpp:173
+#: src/keyboardconfig.cpp:175
 msgid "Emotes Keys"
-msgstr ""
+msgstr "Teclas de emoções"
 
-#: src/keyboardconfig.cpp:174
+#: src/keyboardconfig.cpp:176
 msgid "Smilie"
 msgstr "Emoticon"
 
-#: src/keyboardconfig.cpp:175 src/keyboardconfig.cpp:177
-#: src/keyboardconfig.cpp:179 src/keyboardconfig.cpp:181
-#: src/keyboardconfig.cpp:183 src/keyboardconfig.cpp:185
-#: src/keyboardconfig.cpp:187 src/keyboardconfig.cpp:189
-#: src/keyboardconfig.cpp:191 src/keyboardconfig.cpp:193
-#: src/keyboardconfig.cpp:195 src/keyboardconfig.cpp:197
-#: src/keyboardconfig.cpp:200 src/keyboardconfig.cpp:202
-#: src/keyboardconfig.cpp:204 src/keyboardconfig.cpp:206
-#: src/keyboardconfig.cpp:208 src/keyboardconfig.cpp:210
-#: src/keyboardconfig.cpp:212 src/keyboardconfig.cpp:214
-#: src/keyboardconfig.cpp:216 src/keyboardconfig.cpp:218
-#: src/keyboardconfig.cpp:220 src/keyboardconfig.cpp:222
-#: src/keyboardconfig.cpp:224 src/keyboardconfig.cpp:227
-#: src/keyboardconfig.cpp:230 src/keyboardconfig.cpp:233
-#: src/keyboardconfig.cpp:235 src/keyboardconfig.cpp:237
-#: src/keyboardconfig.cpp:239 src/keyboardconfig.cpp:241
-#: src/keyboardconfig.cpp:243 src/keyboardconfig.cpp:245
-#: src/keyboardconfig.cpp:247 src/keyboardconfig.cpp:249
-#: src/keyboardconfig.cpp:251 src/keyboardconfig.cpp:254
-#: src/keyboardconfig.cpp:256 src/keyboardconfig.cpp:258
-#: src/keyboardconfig.cpp:260 src/keyboardconfig.cpp:262
-#: src/keyboardconfig.cpp:264 src/keyboardconfig.cpp:266
-#: src/keyboardconfig.cpp:362
+#: src/keyboardconfig.cpp:177 src/keyboardconfig.cpp:179
+#: src/keyboardconfig.cpp:181 src/keyboardconfig.cpp:183
+#: src/keyboardconfig.cpp:185 src/keyboardconfig.cpp:187
+#: src/keyboardconfig.cpp:189 src/keyboardconfig.cpp:191
+#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
+#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
+#: src/keyboardconfig.cpp:202 src/keyboardconfig.cpp:204
+#: src/keyboardconfig.cpp:206 src/keyboardconfig.cpp:208
+#: src/keyboardconfig.cpp:210 src/keyboardconfig.cpp:212
+#: src/keyboardconfig.cpp:214 src/keyboardconfig.cpp:216
+#: src/keyboardconfig.cpp:218 src/keyboardconfig.cpp:220
+#: src/keyboardconfig.cpp:222 src/keyboardconfig.cpp:224
+#: src/keyboardconfig.cpp:226 src/keyboardconfig.cpp:229
+#: src/keyboardconfig.cpp:232 src/keyboardconfig.cpp:235
+#: src/keyboardconfig.cpp:237 src/keyboardconfig.cpp:239
+#: src/keyboardconfig.cpp:241 src/keyboardconfig.cpp:243
+#: src/keyboardconfig.cpp:245 src/keyboardconfig.cpp:247
+#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
+#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:256
+#: src/keyboardconfig.cpp:258 src/keyboardconfig.cpp:260
+#: src/keyboardconfig.cpp:262 src/keyboardconfig.cpp:264
+#: src/keyboardconfig.cpp:266 src/keyboardconfig.cpp:268
+#: src/keyboardconfig.cpp:364
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "Atalho para emoticon %d"
 
-#: src/keyboardconfig.cpp:268
+#: src/keyboardconfig.cpp:270
 msgid "Outfits Keys"
-msgstr ""
+msgstr "Teclas de vestuario"
 
-#: src/keyboardconfig.cpp:269
+#: src/keyboardconfig.cpp:271
 msgid "Wear Outfit"
 msgstr "Vestir roupas"
 
-#: src/keyboardconfig.cpp:271
+#: src/keyboardconfig.cpp:273
 msgid "Copy Outfit"
 msgstr "Copiar roupas"
 
-#: src/keyboardconfig.cpp:273
+#: src/keyboardconfig.cpp:275
 msgid "Copy equipped to Outfit"
 msgstr "Copiar roupa equipada"
 
-#: src/keyboardconfig.cpp:275
+#: src/keyboardconfig.cpp:277
 msgid "Chat Keys"
-msgstr ""
+msgstr "Teclas de conversação"
 
-#: src/keyboardconfig.cpp:276
+#: src/keyboardconfig.cpp:278
 msgid "Toggle Chat"
 msgstr "Alternar para chat"
 
-#: src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:280
 msgid "Scroll Chat Up"
 msgstr "Rolar chat para cima"
 
-#: src/keyboardconfig.cpp:280
+#: src/keyboardconfig.cpp:282
 msgid "Scroll Chat Down"
 msgstr "Rolar chat para baixo"
 
-#: src/keyboardconfig.cpp:282
+#: src/keyboardconfig.cpp:284
 msgid "Previous Chat Tab"
 msgstr "Aba de chat anterior"
 
-#: src/keyboardconfig.cpp:284
+#: src/keyboardconfig.cpp:286
 msgid "Next Chat Tab"
 msgstr "Próxima aba de chat"
 
-#: src/keyboardconfig.cpp:287
+#: src/keyboardconfig.cpp:289
 msgid "Close current Chat Tab"
 msgstr "Fechar aba de chat atual"
 
-#: src/keyboardconfig.cpp:289
+#: src/keyboardconfig.cpp:291
 msgid "Previous chat line"
 msgstr "Linha de chat anterior"
 
-#: src/keyboardconfig.cpp:291
+#: src/keyboardconfig.cpp:293
 msgid "Next chat line"
 msgstr "Próxima linha de chat"
 
-#: src/keyboardconfig.cpp:293
+#: src/keyboardconfig.cpp:295
 msgid "Chat Auto Complete"
 msgstr "Chat auto completar"
 
-#: src/keyboardconfig.cpp:295
+#: src/keyboardconfig.cpp:297
 msgid "Deactivate Chat Input"
 msgstr "Desativar entrada de chat"
 
-#: src/keyboardconfig.cpp:297
+#: src/keyboardconfig.cpp:299
 msgid "Other Keys"
-msgstr ""
+msgstr "Outras teclas"
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboardconfig.cpp:300
 msgid "Ignore input 1"
 msgstr "Ignorar input 1"
 
-#: src/keyboardconfig.cpp:300
+#: src/keyboardconfig.cpp:302
 msgid "Ignore input 2"
 msgstr "Ignorar input 2"
 
-#: src/keyboardconfig.cpp:302
+#: src/keyboardconfig.cpp:304
 msgid "Direct Up"
 msgstr "Para cima"
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboardconfig.cpp:305
 msgid "Direct Down"
 msgstr "Para baixo"
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboardconfig.cpp:307
 msgid "Direct Left"
 msgstr "Para esquerda"
 
-#: src/keyboardconfig.cpp:306
+#: src/keyboardconfig.cpp:308
 msgid "Direct Right"
 msgstr "Para direita"
 
-#: src/keyboardconfig.cpp:308
+#: src/keyboardconfig.cpp:310
 msgid "Crazy moves"
 msgstr "Movimentos loucos"
 
-#: src/keyboardconfig.cpp:310
+#: src/keyboardconfig.cpp:312
 msgid "Change Crazy Move mode"
 msgstr "Trocar Modo de movimentos loucos"
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboardconfig.cpp:314
 msgid "Quick Drop N Items from 0 slot"
 msgstr "Descartar rapidamente N itens do slot 0"
 
-#: src/keyboardconfig.cpp:314
+#: src/keyboardconfig.cpp:316
 msgid "Quick Drop N Items"
 msgstr "Descartar rapidamente N itens"
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboardconfig.cpp:318
 msgid "Switch Quick Drop Counter"
 msgstr "Mudar contador de descarte"
 
-#: src/keyboardconfig.cpp:318
+#: src/keyboardconfig.cpp:320
 msgid "Quick heal target or self"
 msgstr "Curar um alvo ou você mesmo"
 
-#: src/keyboardconfig.cpp:320
+#: src/keyboardconfig.cpp:322
 msgid "Use #itenplz spell"
 msgstr "Usa feitiço #itenplz"
 
-#: src/keyboardconfig.cpp:322
+#: src/keyboardconfig.cpp:324
 msgid "Use magic attack"
 msgstr "Usar feitiço de ataque"
 
-#: src/keyboardconfig.cpp:324
+#: src/keyboardconfig.cpp:326
 msgid "Switch magic attack"
 msgstr "Trocar feitiço de ataque"
 
-#: src/keyboardconfig.cpp:326
+#: src/keyboardconfig.cpp:328
 msgid "Change move type"
 msgstr "Mudar tipo de movimento"
 
-#: src/keyboardconfig.cpp:328
+#: src/keyboardconfig.cpp:330
 msgid "Change Attack Weapon Type"
 msgstr "Mudar tipo de ataque de arma"
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboardconfig.cpp:332
 msgid "Change Attack Type"
 msgstr "Mudar tipo de ataque"
 
-#: src/keyboardconfig.cpp:332
+#: src/keyboardconfig.cpp:334
 msgid "Change Follow mode"
 msgstr "Mudar modo de seguir"
 
-#: src/keyboardconfig.cpp:334
+#: src/keyboardconfig.cpp:336
 msgid "Change Imitation mode"
 msgstr "Mudar modo de imitação"
 
-#: src/keyboardconfig.cpp:337
+#: src/keyboardconfig.cpp:339
 msgid "Disable / Enable Game modifier keys"
 msgstr "Habilitar / Desabilitar Chaves de modificação"
 
-#: src/keyboardconfig.cpp:338
+#: src/keyboardconfig.cpp:340
 msgid "On / Off audio"
 msgstr "Ligar / Desligar áudio"
 
-#: src/keyboardconfig.cpp:340
+#: src/keyboardconfig.cpp:342
 msgid "Enable / Disable away mode"
 msgstr "Habilitar / Desabilitar modo indisponivel "
 
-#: src/keyboardconfig.cpp:342
+#: src/keyboardconfig.cpp:344
 msgid "Emulate right click from keyboard"
 msgstr "Emular botão direito do teclado"
 
-#: src/keyboardconfig.cpp:344
+#: src/keyboardconfig.cpp:346
 msgid "Toggle camera mode"
 msgstr "Alterar modo de camera"
 
-#: src/keyboardconfig.cpp:346
+#: src/keyboardconfig.cpp:348
 msgid "Modifier key"
 msgstr "Modificar chave"
 
-#: src/keyboardconfig.cpp:425
+#: src/keyboardconfig.cpp:427
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -4218,64 +4226,64 @@ msgstr ""
 msgid "You were killed by "
 msgstr "Você foi morto por "
 
-#: src/localplayer.cpp:1422
+#: src/localplayer.cpp:1427
 msgid "Tried to pick up nonexistent item."
 msgstr "Você tentou pegar um item não existente."
 
-#: src/localplayer.cpp:1424
+#: src/localplayer.cpp:1429
 msgid "Item is too heavy."
 msgstr "Este item é muito pesado."
 
-#: src/localplayer.cpp:1426
+#: src/localplayer.cpp:1431
 msgid "Item is too far away."
 msgstr "Item está muito longe"
 
-#: src/localplayer.cpp:1428
+#: src/localplayer.cpp:1433
 msgid "Inventory is full."
 msgstr "O inventário está cheio."
 
-#: src/localplayer.cpp:1430
+#: src/localplayer.cpp:1435
 msgid "Stack is too big."
 msgstr "Esta pilha é muito grande."
 
-#: src/localplayer.cpp:1433
+#: src/localplayer.cpp:1438
 msgid "Item belongs to someone else."
 msgstr "Este item pertence a outra pessoa."
 
-#: src/localplayer.cpp:1436
+#: src/localplayer.cpp:1441
 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:1460
+#: src/localplayer.cpp:1465
 #, 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:3174
+#: src/localplayer.cpp:3179
 msgid "Away"
 msgstr "Indisponivel "
 
-#: src/localplayer.cpp:3494
+#: src/localplayer.cpp:3507
 msgid "Follow: "
 msgstr "Seguindo:"
 
-#: src/localplayer.cpp:3496 src/localplayer.cpp:3511
+#: src/localplayer.cpp:3509 src/localplayer.cpp:3524
 msgid "Follow canceled"
 msgstr "Seguir cancelado"
 
-#: src/localplayer.cpp:3503
+#: src/localplayer.cpp:3516
 msgid "Imitation: "
 msgstr "Imitando:"
 
-#: src/localplayer.cpp:3505 src/localplayer.cpp:3513
+#: src/localplayer.cpp:3518 src/localplayer.cpp:3526
 msgid "Imitation canceled"
 msgstr "Imitação cancelada"
 
-#: src/localplayer.cpp:3858
+#: src/localplayer.cpp:3871
 msgid "You see "
 msgstr "Você vê "
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 8ab3fd9c0..5f046c8f4 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-09-27 22:18+0300\n"
-"PO-Revision-Date: 2011-09-27 19:20+0000\n"
+"POT-Creation-Date: 2011-10-01 01:22+0300\n"
+"PO-Revision-Date: 2011-09-30 14:45+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: Portuguese (Brazilian) (http://www.transifex.net/projects/p/"
 "manaplus/team/pt_BR/)\n"
@@ -339,19 +339,19 @@ msgstr "A conexão com o servidor caiu."
 msgid "Network Error"
 msgstr "Erro de conexão"
 
-#: src/game.cpp:1320
+#: src/game.cpp:1321
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorando propostas de negócios"
 
-#: src/game.cpp:1330
+#: src/game.cpp:1331
 msgid "Accepting incoming trade requests"
 msgstr "Aceitando propostas de negócios"
 
-#: src/game.cpp:1727
+#: src/game.cpp:1731
 msgid "Could Not Load Map"
 msgstr "Não foi possível carregar o mapa"
 
-#: src/game.cpp:1728
+#: src/game.cpp:1732
 #, c-format
 msgid "Error while loading %s"
 msgstr "Erro ao carregar %s"
@@ -409,44 +409,48 @@ msgstr "Resultado"
 msgid "Reset"
 msgstr "Resetar"
 
-#: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:98
+#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
 #: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
 #: src/gui/popupmenu.cpp:273 src/gui/popupmenu.cpp:654
 msgid "Buy"
 msgstr "Comprar"
 
-#: src/gui/buydialog.cpp:89 src/gui/buydialog.cpp:303
+#: src/gui/buydialog.cpp:94 src/gui/buydialog.cpp:332
 #: src/gui/selldialog.cpp:88 src/gui/selldialog.cpp:325
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Preço: %s / Total: %s"
 
+#: src/gui/buydialog.cpp:103
+msgid "Amount:"
+msgstr ""
+
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:94 src/gui/itemamountwindow.cpp:207
+#: 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:973
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:974
 msgid "+"
 msgstr "+"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:97 src/gui/itemamountwindow.cpp:206
+#: 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:985
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:986
 msgid "-"
 msgstr "-"
 
-#: src/gui/buydialog.cpp:99 src/gui/quitdialog.cpp:47
+#: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:294
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:84
 msgid "Quit"
 msgstr "Sair"
 
-#: src/gui/buydialog.cpp:100 src/gui/selldialog.cpp:95
-#: src/gui/statuswindow.cpp:504 src/gui/statuswindow.cpp:553
-#: src/gui/statuswindow.cpp:972 src/gui/statuswindow.cpp:1003
+#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
+#: src/gui/statuswindow.cpp:504 src/gui/statuswindow.cpp:554
+#: src/gui/statuswindow.cpp:973 src/gui/statuswindow.cpp:1004
 msgid "Max"
 msgstr "Máximo"
 
@@ -924,7 +928,7 @@ msgid "Equipment"
 msgstr "Equipamento"
 
 #: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160
-#: src/gui/inventorywindow.cpp:538 src/gui/inventorywindow.cpp:547
+#: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554
 #: src/gui/popupmenu.cpp:1656 src/gui/popupmenu.cpp:1748
 #: src/gui/popupmenu.cpp:1793
 msgid "Unequip"
@@ -967,20 +971,20 @@ msgstr "Slots:"
 msgid "Filter:"
 msgstr "Filtro:"
 
-#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:540
-#: src/gui/inventorywindow.cpp:549 src/gui/popupmenu.cpp:1658
+#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547
+#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1658
 #: src/gui/popupmenu.cpp:1750 src/gui/popupmenu.cpp:1795
 msgid "Equip"
 msgstr "Equipar"
 
-#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:541
-#: src/gui/inventorywindow.cpp:545 src/gui/popupmenu.cpp:1662
+#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548
+#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1662
 #: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1754
 #: src/gui/popupmenu.cpp:1799
 msgid "Use"
 msgstr "Usar"
 
-#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:645
+#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652
 #: src/gui/popupmenu.cpp:1667 src/gui/popupmenu.cpp:1759
 #: src/gui/popupmenu.cpp:1804
 msgid "Drop..."
@@ -1000,7 +1004,7 @@ msgstr "Roupas"
 msgid "Weight:"
 msgstr "Peso:"
 
-#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:636
+#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643
 #: src/gui/popupmenu.cpp:1642 src/gui/popupmenu.cpp:1771
 #: src/gui/popupmenu.cpp:1816 src/gui/setup.cpp:73
 msgid "Store"
@@ -1010,7 +1014,7 @@ msgstr "Armazenar"
 msgid "Retrieve"
 msgstr "Retirar"
 
-#: src/gui/inventorywindow.cpp:647 src/gui/popupmenu.cpp:1672
+#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1672
 #: src/gui/popupmenu.cpp:1764 src/gui/popupmenu.cpp:1809
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
@@ -2203,7 +2207,7 @@ msgstr "Mostrar o próprio nome"
 
 #: src/gui/setup_players.cpp:63
 msgid "Enable extended mouse targeting"
-msgstr ""
+msgstr "Ativar segmentação de mouse prolongado"
 
 #: src/gui/setup_players.cpp:66
 msgid "Target dead players"
@@ -3060,130 +3064,130 @@ msgstr "Nível: %d (GM %d)"
 msgid "Correction points: %d"
 msgstr "Pontos de correção: %d"
 
-#: src/gui/statuswindow.cpp:647 src/gui/statuswindow.cpp:712
-#: src/gui/statuswindow.cpp:732 src/gui/statuswindow.cpp:748
-#: src/gui/statuswindow.cpp:794 src/gui/statuswindow.cpp:823
-#: src/gui/statuswindow.cpp:846 src/gui/statuswindow.cpp:865
+#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:713
+#: src/gui/statuswindow.cpp:733 src/gui/statuswindow.cpp:749
+#: src/gui/statuswindow.cpp:795 src/gui/statuswindow.cpp:824
+#: src/gui/statuswindow.cpp:847 src/gui/statuswindow.cpp:866
 msgid "(D)"
 msgstr "(D)"
 
-#: src/gui/statuswindow.cpp:650 src/gui/statuswindow.cpp:773
+#: src/gui/statuswindow.cpp:651 src/gui/statuswindow.cpp:774
 msgid "(I)"
 msgstr "(l)"
 
-#: src/gui/statuswindow.cpp:653 src/gui/statuswindow.cpp:770
+#: src/gui/statuswindow.cpp:654 src/gui/statuswindow.cpp:771
 msgid "(c)"
 msgstr "(c)"
 
-#: src/gui/statuswindow.cpp:656
+#: src/gui/statuswindow.cpp:657
 msgid "(C)"
 msgstr "(C)"
 
-#: src/gui/statuswindow.cpp:659 src/gui/statuswindow.cpp:757
+#: src/gui/statuswindow.cpp:660 src/gui/statuswindow.cpp:758
 msgid "(d)"
 msgstr "(d)"
 
-#: src/gui/statuswindow.cpp:662 src/gui/statuswindow.cpp:676
-#: src/gui/statuswindow.cpp:705 src/gui/statuswindow.cpp:724
-#: src/gui/statuswindow.cpp:741 src/gui/statuswindow.cpp:760
-#: src/gui/statuswindow.cpp:782 src/gui/statuswindow.cpp:812
-#: src/gui/statuswindow.cpp:838 src/gui/statuswindow.cpp:852
-#: src/gui/statuswindow.cpp:868 src/gui/statuswindow.cpp:881
+#: src/gui/statuswindow.cpp:663 src/gui/statuswindow.cpp:677
+#: src/gui/statuswindow.cpp:706 src/gui/statuswindow.cpp:725
+#: src/gui/statuswindow.cpp:742 src/gui/statuswindow.cpp:761
+#: src/gui/statuswindow.cpp:783 src/gui/statuswindow.cpp:813
+#: src/gui/statuswindow.cpp:839 src/gui/statuswindow.cpp:853
+#: src/gui/statuswindow.cpp:869 src/gui/statuswindow.cpp:882
 msgid "(?)"
 msgstr "(?)"
 
-#: src/gui/statuswindow.cpp:673
+#: src/gui/statuswindow.cpp:674
 msgid "(a)"
 msgstr "(a)"
 
-#: src/gui/statuswindow.cpp:684
+#: src/gui/statuswindow.cpp:685
 msgid "(0)"
 msgstr "(0)"
 
-#: src/gui/statuswindow.cpp:687
+#: src/gui/statuswindow.cpp:688
 msgid "(1)"
 msgstr "(1)"
 
-#: src/gui/statuswindow.cpp:690
+#: src/gui/statuswindow.cpp:691
 msgid "(2)"
 msgstr "(2)"
 
-#: src/gui/statuswindow.cpp:693 src/gui/statuswindow.cpp:800
+#: src/gui/statuswindow.cpp:694 src/gui/statuswindow.cpp:801
 msgid "(3)"
 msgstr "(3)"
 
-#: src/gui/statuswindow.cpp:696
+#: src/gui/statuswindow.cpp:697
 msgid "(5)"
 msgstr "(5)"
 
-#: src/gui/statuswindow.cpp:699
+#: src/gui/statuswindow.cpp:700
 msgid "(7)"
 msgstr "(7)"
 
-#: src/gui/statuswindow.cpp:702 src/gui/statuswindow.cpp:754
-#: src/gui/statuswindow.cpp:809 src/gui/statuswindow.cpp:878
+#: src/gui/statuswindow.cpp:703 src/gui/statuswindow.cpp:755
+#: src/gui/statuswindow.cpp:810 src/gui/statuswindow.cpp:879
 msgid "(A)"
 msgstr "(A)"
 
-#: src/gui/statuswindow.cpp:715
+#: src/gui/statuswindow.cpp:716
 msgid "(R)"
 msgstr "(R)"
 
-#: src/gui/statuswindow.cpp:718
+#: src/gui/statuswindow.cpp:719
 msgid "(M)"
 msgstr "(M)"
 
-#: src/gui/statuswindow.cpp:721
+#: src/gui/statuswindow.cpp:722
 msgid "(P)"
 msgstr "(P)"
 
-#: src/gui/statuswindow.cpp:735
+#: src/gui/statuswindow.cpp:736
 msgid "(s)"
 msgstr "(s)"
 
-#: src/gui/statuswindow.cpp:738 src/gui/statuswindow.cpp:791
+#: src/gui/statuswindow.cpp:739 src/gui/statuswindow.cpp:792
 msgid "(S)"
 msgstr "(S)"
 
-#: src/gui/statuswindow.cpp:751 src/gui/statuswindow.cpp:806
-#: src/gui/statuswindow.cpp:859
+#: src/gui/statuswindow.cpp:752 src/gui/statuswindow.cpp:807
+#: src/gui/statuswindow.cpp:860
 msgid "(G)"
 msgstr "(G)"
 
-#: src/gui/statuswindow.cpp:767
+#: src/gui/statuswindow.cpp:768
 msgid "(f)"
 msgstr "(f)"
 
-#: src/gui/statuswindow.cpp:776 src/gui/statuswindow.cpp:797
-#: src/gui/statuswindow.cpp:862
+#: src/gui/statuswindow.cpp:777 src/gui/statuswindow.cpp:798
+#: src/gui/statuswindow.cpp:863
 msgid "(F)"
 msgstr "(F)"
 
-#: src/gui/statuswindow.cpp:779 src/gui/statuswindow.cpp:829
+#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:830
 msgid "(U)"
 msgstr "(U)"
 
-#: src/gui/statuswindow.cpp:803
+#: src/gui/statuswindow.cpp:804
 msgid "(g)"
 msgstr "(g)"
 
-#: src/gui/statuswindow.cpp:820
+#: src/gui/statuswindow.cpp:821
 msgid "(N)"
 msgstr "(N)"
 
-#: src/gui/statuswindow.cpp:826
+#: src/gui/statuswindow.cpp:827
 msgid "(u)"
 msgstr "(u)"
 
-#: src/gui/statuswindow.cpp:832
+#: src/gui/statuswindow.cpp:833
 msgid "(e)"
 msgstr "(e)"
 
-#: src/gui/statuswindow.cpp:835
+#: src/gui/statuswindow.cpp:836
 msgid "(b)"
 msgstr "(b)"
 
-#: src/gui/statuswindow.cpp:849 src/gui/statuswindow.cpp:875
+#: src/gui/statuswindow.cpp:850 src/gui/statuswindow.cpp:876
 msgid "(O)"
 msgstr "(O)"
 
@@ -3245,7 +3249,7 @@ msgstr "Comando:"
 
 #: src/gui/textcommandeditor.cpp:200
 msgid "Comment:"
-msgstr ""
+msgstr "Comentario:"
 
 #: src/gui/textcommandeditor.cpp:203
 msgid "Mana:"
@@ -3799,7 +3803,7 @@ msgstr "Carrinho"
 
 #: src/keyboardconfig.cpp:43
 msgid "Basic Keys"
-msgstr ""
+msgstr "Teclas básicas"
 
 #: src/keyboardconfig.cpp:44
 msgid "Move Up"
@@ -3845,369 +3849,373 @@ msgstr "Mover para ponto de navegação"
 msgid "Stop Attack"
 msgstr "Parar ataque"
 
-#: src/keyboardconfig.cpp:64
+#: src/keyboardconfig.cpp:65
+msgid "Untarget"
+msgstr ""
+
+#: src/keyboardconfig.cpp:66
 msgid "Target Closest"
 msgstr "Selecionar alvo mais próximo"
 
-#: src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:68
 msgid "Target NPC"
 msgstr "Selecionar NPC"
 
-#: src/keyboardconfig.cpp:67
+#: src/keyboardconfig.cpp:69
 msgid "Target Player"
 msgstr "Selecionar Jogador"
 
-#: src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:71
 msgid "Pickup"
 msgstr "Pegar item"
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:72
 msgid "Change Pickup Type"
 msgstr "Mudar o modo de pegar itens"
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:74
 msgid "Hide Windows"
 msgstr "Esconder janelas"
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:76
 msgid "Sit"
 msgstr "Sentar"
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:77
 msgid "Screenshot"
 msgstr "Screenshot"
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:78
 msgid "Enable/Disable Trading"
 msgstr "Habilitar/Desabilitar Negociações"
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:80
 msgid "Change Map View Mode"
 msgstr "Mudar o modo de visualização de mapas"
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:82
 msgid "Select OK"
 msgstr "Selecionar OK"
 
-#: src/keyboardconfig.cpp:83
+#: src/keyboardconfig.cpp:85
 msgid "Shortcuts Keys"
-msgstr ""
+msgstr "Teclas de atalho"
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:86
 msgid "Item Shortcuts Key"
 msgstr "Atalhos de item"
 
-#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:88
-#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:92
-#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:96
-#: src/keyboardconfig.cpp:98 src/keyboardconfig.cpp:100
-#: src/keyboardconfig.cpp:102 src/keyboardconfig.cpp:104
-#: src/keyboardconfig.cpp:106 src/keyboardconfig.cpp:108
-#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:112
-#: src/keyboardconfig.cpp:114 src/keyboardconfig.cpp:117
-#: src/keyboardconfig.cpp:119 src/keyboardconfig.cpp:121
-#: src/keyboardconfig.cpp:123 src/keyboardconfig.cpp:125
-#: src/keyboardconfig.cpp:367
+#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:90
+#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:94
+#: src/keyboardconfig.cpp:96 src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:100 src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:104 src/keyboardconfig.cpp:106
+#: src/keyboardconfig.cpp:108 src/keyboardconfig.cpp:110
+#: src/keyboardconfig.cpp:112 src/keyboardconfig.cpp:114
+#: src/keyboardconfig.cpp:116 src/keyboardconfig.cpp:119
+#: src/keyboardconfig.cpp:121 src/keyboardconfig.cpp:123
+#: src/keyboardconfig.cpp:125 src/keyboardconfig.cpp:127
+#: src/keyboardconfig.cpp:369
 #, c-format
 msgid "Item Shortcut %d"
 msgstr "Atalho para item %d"
 
-#: src/keyboardconfig.cpp:126
+#: src/keyboardconfig.cpp:128
 msgid "Windows Keys"
-msgstr ""
+msgstr "Teclas de janelas"
 
-#: src/keyboardconfig.cpp:127
+#: src/keyboardconfig.cpp:129
 msgid "Help Window"
 msgstr "Janela de Ajuda"
 
-#: src/keyboardconfig.cpp:129
+#: src/keyboardconfig.cpp:131
 msgid "Status Window"
 msgstr "Janela de Status"
 
-#: src/keyboardconfig.cpp:131
+#: src/keyboardconfig.cpp:133
 msgid "Inventory Window"
 msgstr "Janela de inventário"
 
-#: src/keyboardconfig.cpp:133
+#: src/keyboardconfig.cpp:135
 msgid "Equipment Window"
 msgstr "Janela de equipamento"
 
-#: src/keyboardconfig.cpp:135
+#: src/keyboardconfig.cpp:137
 msgid "Skill Window"
 msgstr "Janela de Habilidade"
 
-#: src/keyboardconfig.cpp:137
+#: src/keyboardconfig.cpp:139
 msgid "Minimap Window"
 msgstr "Janela de Minimapa"
 
-#: src/keyboardconfig.cpp:139
+#: src/keyboardconfig.cpp:141
 msgid "Chat Window"
 msgstr "Janela de chat"
 
-#: src/keyboardconfig.cpp:141
+#: src/keyboardconfig.cpp:143
 msgid "Item Shortcut Window"
 msgstr "Janela de atalhos para itens"
 
-#: src/keyboardconfig.cpp:143
+#: src/keyboardconfig.cpp:145
 msgid "Setup Window"
 msgstr "Janela de Configurações"
 
-#: src/keyboardconfig.cpp:145
+#: src/keyboardconfig.cpp:147
 msgid "Debug Window"
 msgstr "Janela de Depuração"
 
-#: src/keyboardconfig.cpp:147
+#: src/keyboardconfig.cpp:149
 msgid "Social Window"
 msgstr "Janela social"
 
-#: src/keyboardconfig.cpp:149
+#: src/keyboardconfig.cpp:151
 msgid "Emote Shortcut Window"
 msgstr "Janela de atalho para emoticons"
 
-#: src/keyboardconfig.cpp:151
+#: src/keyboardconfig.cpp:153
 msgid "Outfits Window"
 msgstr "Janela de roupas"
 
-#: src/keyboardconfig.cpp:153
+#: src/keyboardconfig.cpp:155
 msgid "Shop Window"
 msgstr "Janela Loja"
 
-#: src/keyboardconfig.cpp:155
+#: src/keyboardconfig.cpp:157
 msgid "Quick drop Window"
 msgstr "Janela Descarte rápido"
 
-#: src/keyboardconfig.cpp:157
+#: src/keyboardconfig.cpp:159
 msgid "Kill Stats Window"
 msgstr "Janela de estado de mortes"
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboardconfig.cpp:161
 msgid "Commands Window"
 msgstr "Janela Comandos"
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboardconfig.cpp:163
 msgid "Bot Checker Window"
 msgstr "Janela Analisador de bot"
 
-#: src/keyboardconfig.cpp:164
+#: src/keyboardconfig.cpp:166
 msgid "Who Is Online Window"
 msgstr "Janela Quem está online"
 
-#: src/keyboardconfig.cpp:166
+#: src/keyboardconfig.cpp:168
 msgid "Did you know Window"
 msgstr "Janela Você Sabia "
 
-#: src/keyboardconfig.cpp:169
+#: src/keyboardconfig.cpp:171
 msgid "Previous Social Tab"
 msgstr "Aba social anterior"
 
-#: src/keyboardconfig.cpp:171
+#: src/keyboardconfig.cpp:173
 msgid "Next Social Tab"
 msgstr "Próxima aba social"
 
-#: src/keyboardconfig.cpp:173
+#: src/keyboardconfig.cpp:175
 msgid "Emotes Keys"
-msgstr ""
+msgstr "Teclas de emoções"
 
-#: src/keyboardconfig.cpp:174
+#: src/keyboardconfig.cpp:176
 msgid "Smilie"
 msgstr "Emoticon"
 
-#: src/keyboardconfig.cpp:175 src/keyboardconfig.cpp:177
-#: src/keyboardconfig.cpp:179 src/keyboardconfig.cpp:181
-#: src/keyboardconfig.cpp:183 src/keyboardconfig.cpp:185
-#: src/keyboardconfig.cpp:187 src/keyboardconfig.cpp:189
-#: src/keyboardconfig.cpp:191 src/keyboardconfig.cpp:193
-#: src/keyboardconfig.cpp:195 src/keyboardconfig.cpp:197
-#: src/keyboardconfig.cpp:200 src/keyboardconfig.cpp:202
-#: src/keyboardconfig.cpp:204 src/keyboardconfig.cpp:206
-#: src/keyboardconfig.cpp:208 src/keyboardconfig.cpp:210
-#: src/keyboardconfig.cpp:212 src/keyboardconfig.cpp:214
-#: src/keyboardconfig.cpp:216 src/keyboardconfig.cpp:218
-#: src/keyboardconfig.cpp:220 src/keyboardconfig.cpp:222
-#: src/keyboardconfig.cpp:224 src/keyboardconfig.cpp:227
-#: src/keyboardconfig.cpp:230 src/keyboardconfig.cpp:233
-#: src/keyboardconfig.cpp:235 src/keyboardconfig.cpp:237
-#: src/keyboardconfig.cpp:239 src/keyboardconfig.cpp:241
-#: src/keyboardconfig.cpp:243 src/keyboardconfig.cpp:245
-#: src/keyboardconfig.cpp:247 src/keyboardconfig.cpp:249
-#: src/keyboardconfig.cpp:251 src/keyboardconfig.cpp:254
-#: src/keyboardconfig.cpp:256 src/keyboardconfig.cpp:258
-#: src/keyboardconfig.cpp:260 src/keyboardconfig.cpp:262
-#: src/keyboardconfig.cpp:264 src/keyboardconfig.cpp:266
-#: src/keyboardconfig.cpp:362
+#: src/keyboardconfig.cpp:177 src/keyboardconfig.cpp:179
+#: src/keyboardconfig.cpp:181 src/keyboardconfig.cpp:183
+#: src/keyboardconfig.cpp:185 src/keyboardconfig.cpp:187
+#: src/keyboardconfig.cpp:189 src/keyboardconfig.cpp:191
+#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
+#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
+#: src/keyboardconfig.cpp:202 src/keyboardconfig.cpp:204
+#: src/keyboardconfig.cpp:206 src/keyboardconfig.cpp:208
+#: src/keyboardconfig.cpp:210 src/keyboardconfig.cpp:212
+#: src/keyboardconfig.cpp:214 src/keyboardconfig.cpp:216
+#: src/keyboardconfig.cpp:218 src/keyboardconfig.cpp:220
+#: src/keyboardconfig.cpp:222 src/keyboardconfig.cpp:224
+#: src/keyboardconfig.cpp:226 src/keyboardconfig.cpp:229
+#: src/keyboardconfig.cpp:232 src/keyboardconfig.cpp:235
+#: src/keyboardconfig.cpp:237 src/keyboardconfig.cpp:239
+#: src/keyboardconfig.cpp:241 src/keyboardconfig.cpp:243
+#: src/keyboardconfig.cpp:245 src/keyboardconfig.cpp:247
+#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
+#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:256
+#: src/keyboardconfig.cpp:258 src/keyboardconfig.cpp:260
+#: src/keyboardconfig.cpp:262 src/keyboardconfig.cpp:264
+#: src/keyboardconfig.cpp:266 src/keyboardconfig.cpp:268
+#: src/keyboardconfig.cpp:364
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "Atalho para emoticon %d"
 
-#: src/keyboardconfig.cpp:268
+#: src/keyboardconfig.cpp:270
 msgid "Outfits Keys"
-msgstr ""
+msgstr "Teclas de vestuario"
 
-#: src/keyboardconfig.cpp:269
+#: src/keyboardconfig.cpp:271
 msgid "Wear Outfit"
 msgstr "Vestir roupas"
 
-#: src/keyboardconfig.cpp:271
+#: src/keyboardconfig.cpp:273
 msgid "Copy Outfit"
 msgstr "Copiar roupas"
 
-#: src/keyboardconfig.cpp:273
+#: src/keyboardconfig.cpp:275
 msgid "Copy equipped to Outfit"
 msgstr "Copiar roupa equipada"
 
-#: src/keyboardconfig.cpp:275
+#: src/keyboardconfig.cpp:277
 msgid "Chat Keys"
-msgstr ""
+msgstr "Teclas de conversasão"
 
-#: src/keyboardconfig.cpp:276
+#: src/keyboardconfig.cpp:278
 msgid "Toggle Chat"
 msgstr "Alternar para chat"
 
-#: src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:280
 msgid "Scroll Chat Up"
 msgstr "Rolar chat para cima"
 
-#: src/keyboardconfig.cpp:280
+#: src/keyboardconfig.cpp:282
 msgid "Scroll Chat Down"
 msgstr "Rolar chat para baixo"
 
-#: src/keyboardconfig.cpp:282
+#: src/keyboardconfig.cpp:284
 msgid "Previous Chat Tab"
 msgstr "Aba de chat anterior"
 
-#: src/keyboardconfig.cpp:284
+#: src/keyboardconfig.cpp:286
 msgid "Next Chat Tab"
 msgstr "Próxima aba de chat"
 
-#: src/keyboardconfig.cpp:287
+#: src/keyboardconfig.cpp:289
 msgid "Close current Chat Tab"
 msgstr "Fechar aba de chat atual"
 
-#: src/keyboardconfig.cpp:289
+#: src/keyboardconfig.cpp:291
 msgid "Previous chat line"
 msgstr "Linha de chat anterior"
 
-#: src/keyboardconfig.cpp:291
+#: src/keyboardconfig.cpp:293
 msgid "Next chat line"
 msgstr "Próxima linha de chat"
 
-#: src/keyboardconfig.cpp:293
+#: src/keyboardconfig.cpp:295
 msgid "Chat Auto Complete"
 msgstr "Chat auto completar"
 
-#: src/keyboardconfig.cpp:295
+#: src/keyboardconfig.cpp:297
 msgid "Deactivate Chat Input"
 msgstr "Desativar entrada de chat"
 
-#: src/keyboardconfig.cpp:297
+#: src/keyboardconfig.cpp:299
 msgid "Other Keys"
-msgstr ""
+msgstr "Outras teclas"
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboardconfig.cpp:300
 msgid "Ignore input 1"
 msgstr "Ignorar input 1"
 
-#: src/keyboardconfig.cpp:300
+#: src/keyboardconfig.cpp:302
 msgid "Ignore input 2"
 msgstr "Ignorar input 2"
 
-#: src/keyboardconfig.cpp:302
+#: src/keyboardconfig.cpp:304
 msgid "Direct Up"
 msgstr "Para cima"
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboardconfig.cpp:305
 msgid "Direct Down"
 msgstr "Para baixo"
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboardconfig.cpp:307
 msgid "Direct Left"
 msgstr "Para esquerda"
 
-#: src/keyboardconfig.cpp:306
+#: src/keyboardconfig.cpp:308
 msgid "Direct Right"
 msgstr "Para direita"
 
-#: src/keyboardconfig.cpp:308
+#: src/keyboardconfig.cpp:310
 msgid "Crazy moves"
 msgstr "Movimentos loucos"
 
-#: src/keyboardconfig.cpp:310
+#: src/keyboardconfig.cpp:312
 msgid "Change Crazy Move mode"
 msgstr "Trocar Modo de movimentos loucos"
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboardconfig.cpp:314
 msgid "Quick Drop N Items from 0 slot"
 msgstr "Descartar rapidamente N itens do slot 0"
 
-#: src/keyboardconfig.cpp:314
+#: src/keyboardconfig.cpp:316
 msgid "Quick Drop N Items"
 msgstr "Descartar rapidamente N itens"
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboardconfig.cpp:318
 msgid "Switch Quick Drop Counter"
 msgstr "Mudar contador de descarte"
 
-#: src/keyboardconfig.cpp:318
+#: src/keyboardconfig.cpp:320
 msgid "Quick heal target or self"
 msgstr "Curar um alvo ou você mesmo"
 
-#: src/keyboardconfig.cpp:320
+#: src/keyboardconfig.cpp:322
 msgid "Use #itenplz spell"
 msgstr "Usa feitiço #itenplz"
 
-#: src/keyboardconfig.cpp:322
+#: src/keyboardconfig.cpp:324
 msgid "Use magic attack"
 msgstr "Usar feitiço de ataque"
 
-#: src/keyboardconfig.cpp:324
+#: src/keyboardconfig.cpp:326
 msgid "Switch magic attack"
 msgstr "Trocar feitiço de ataque"
 
-#: src/keyboardconfig.cpp:326
+#: src/keyboardconfig.cpp:328
 msgid "Change move type"
 msgstr "Mudar tipo de movimento"
 
-#: src/keyboardconfig.cpp:328
+#: src/keyboardconfig.cpp:330
 msgid "Change Attack Weapon Type"
 msgstr "Mudar tipo de ataque de arma"
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboardconfig.cpp:332
 msgid "Change Attack Type"
 msgstr "Mudar tipo de ataque"
 
-#: src/keyboardconfig.cpp:332
+#: src/keyboardconfig.cpp:334
 msgid "Change Follow mode"
 msgstr "Mudar modo de seguir"
 
-#: src/keyboardconfig.cpp:334
+#: src/keyboardconfig.cpp:336
 msgid "Change Imitation mode"
 msgstr "Mudar modo de imitação"
 
-#: src/keyboardconfig.cpp:337
+#: src/keyboardconfig.cpp:339
 msgid "Disable / Enable Game modifier keys"
 msgstr "Habilitar / Desabilitar Chaves de modificação"
 
-#: src/keyboardconfig.cpp:338
+#: src/keyboardconfig.cpp:340
 msgid "On / Off audio"
 msgstr "Ligar / Desligar áudio"
 
-#: src/keyboardconfig.cpp:340
+#: src/keyboardconfig.cpp:342
 msgid "Enable / Disable away mode"
 msgstr "Habilitar / Desabilitar modo indisponivel "
 
-#: src/keyboardconfig.cpp:342
+#: src/keyboardconfig.cpp:344
 msgid "Emulate right click from keyboard"
 msgstr "Emular botão direito do teclado"
 
-#: src/keyboardconfig.cpp:344
+#: src/keyboardconfig.cpp:346
 msgid "Toggle camera mode"
 msgstr "Alterar modo de camera"
 
-#: src/keyboardconfig.cpp:346
+#: src/keyboardconfig.cpp:348
 msgid "Modifier key"
 msgstr "Chave de modificação"
 
-#: src/keyboardconfig.cpp:425
+#: src/keyboardconfig.cpp:427
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -4220,64 +4228,64 @@ msgstr ""
 msgid "You were killed by "
 msgstr "Você foi morto por "
 
-#: src/localplayer.cpp:1422
+#: src/localplayer.cpp:1427
 msgid "Tried to pick up nonexistent item."
 msgstr "Você tentou pegar um item não existente."
 
-#: src/localplayer.cpp:1424
+#: src/localplayer.cpp:1429
 msgid "Item is too heavy."
 msgstr "Este item é muito pesado."
 
-#: src/localplayer.cpp:1426
+#: src/localplayer.cpp:1431
 msgid "Item is too far away."
 msgstr "Item está muito longe"
 
-#: src/localplayer.cpp:1428
+#: src/localplayer.cpp:1433
 msgid "Inventory is full."
 msgstr "O inventário está cheio."
 
-#: src/localplayer.cpp:1430
+#: src/localplayer.cpp:1435
 msgid "Stack is too big."
 msgstr "Esta pilha é muito grande."
 
-#: src/localplayer.cpp:1433
+#: src/localplayer.cpp:1438
 msgid "Item belongs to someone else."
 msgstr "Este item pertence a outra pessoa."
 
-#: src/localplayer.cpp:1436
+#: src/localplayer.cpp:1441
 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:1460
+#: src/localplayer.cpp:1465
 #, 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:3174
+#: src/localplayer.cpp:3179
 msgid "Away"
 msgstr "Indisponivel "
 
-#: src/localplayer.cpp:3494
+#: src/localplayer.cpp:3507
 msgid "Follow: "
 msgstr "Seguindo:"
 
-#: src/localplayer.cpp:3496 src/localplayer.cpp:3511
+#: src/localplayer.cpp:3509 src/localplayer.cpp:3524
 msgid "Follow canceled"
 msgstr "Seguindo cancelado"
 
-#: src/localplayer.cpp:3503
+#: src/localplayer.cpp:3516
 msgid "Imitation: "
 msgstr "Imitando:"
 
-#: src/localplayer.cpp:3505 src/localplayer.cpp:3513
+#: src/localplayer.cpp:3518 src/localplayer.cpp:3526
 msgid "Imitation canceled"
 msgstr "Imitação cancelada"
 
-#: src/localplayer.cpp:3858
+#: src/localplayer.cpp:3871
 msgid "You see "
 msgstr "Você vê "
 
diff --git a/po/ru.po b/po/ru.po
index 94b5cfa2a..06516f093 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-09-27 22:18+0300\n"
-"PO-Revision-Date: 2011-09-27 19:23+0000\n"
+"POT-Creation-Date: 2011-10-01 01:22+0300\n"
+"PO-Revision-Date: 2011-09-30 14:47+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: Russian (http://www.transifex.net/projects/p/manaplus/team/"
 "ru/)\n"
@@ -345,19 +345,19 @@ msgstr "Соединение с сервером потеряно."
 msgid "Network Error"
 msgstr "Ошибка сети"
 
-#: src/game.cpp:1320
+#: src/game.cpp:1321
 msgid "Ignoring incoming trade requests"
 msgstr "Игнорировать предложения о торговле"
 
-#: src/game.cpp:1330
+#: src/game.cpp:1331
 msgid "Accepting incoming trade requests"
 msgstr "Принимать предложения о торговле"
 
-#: src/game.cpp:1727
+#: src/game.cpp:1731
 msgid "Could Not Load Map"
 msgstr "Не удалось загрузить карту"
 
-#: src/game.cpp:1728
+#: src/game.cpp:1732
 #, c-format
 msgid "Error while loading %s"
 msgstr "Ошибка во время загрузки %s"
@@ -415,44 +415,48 @@ msgstr "Результат"
 msgid "Reset"
 msgstr "Сбросить"
 
-#: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:98
+#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
 #: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
 #: src/gui/popupmenu.cpp:273 src/gui/popupmenu.cpp:654
 msgid "Buy"
 msgstr "Купить"
 
-#: src/gui/buydialog.cpp:89 src/gui/buydialog.cpp:303
+#: src/gui/buydialog.cpp:94 src/gui/buydialog.cpp:332
 #: src/gui/selldialog.cpp:88 src/gui/selldialog.cpp:325
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Цена: %s / Всего: %s"
 
+#: src/gui/buydialog.cpp:103
+msgid "Amount:"
+msgstr "Количество:"
+
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:94 src/gui/itemamountwindow.cpp:207
+#: 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:973
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:974
 msgid "+"
 msgstr "+"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:97 src/gui/itemamountwindow.cpp:206
+#: 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:985
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:986
 msgid "-"
 msgstr "-"
 
-#: src/gui/buydialog.cpp:99 src/gui/quitdialog.cpp:47
+#: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:294
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:84
 msgid "Quit"
 msgstr "Выход"
 
-#: src/gui/buydialog.cpp:100 src/gui/selldialog.cpp:95
-#: src/gui/statuswindow.cpp:504 src/gui/statuswindow.cpp:553
-#: src/gui/statuswindow.cpp:972 src/gui/statuswindow.cpp:1003
+#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
+#: src/gui/statuswindow.cpp:504 src/gui/statuswindow.cpp:554
+#: src/gui/statuswindow.cpp:973 src/gui/statuswindow.cpp:1004
 msgid "Max"
 msgstr "Макс"
 
@@ -930,7 +934,7 @@ msgid "Equipment"
 msgstr "Снаряжение"
 
 #: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160
-#: src/gui/inventorywindow.cpp:538 src/gui/inventorywindow.cpp:547
+#: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554
 #: src/gui/popupmenu.cpp:1656 src/gui/popupmenu.cpp:1748
 #: src/gui/popupmenu.cpp:1793
 msgid "Unequip"
@@ -973,20 +977,20 @@ msgstr "Вместимость:"
 msgid "Filter:"
 msgstr "Фильтр:"
 
-#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:540
-#: src/gui/inventorywindow.cpp:549 src/gui/popupmenu.cpp:1658
+#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547
+#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1658
 #: src/gui/popupmenu.cpp:1750 src/gui/popupmenu.cpp:1795
 msgid "Equip"
 msgstr "Надеть"
 
-#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:541
-#: src/gui/inventorywindow.cpp:545 src/gui/popupmenu.cpp:1662
+#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548
+#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1662
 #: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1754
 #: src/gui/popupmenu.cpp:1799
 msgid "Use"
 msgstr "Использовать"
 
-#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:645
+#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652
 #: src/gui/popupmenu.cpp:1667 src/gui/popupmenu.cpp:1759
 #: src/gui/popupmenu.cpp:1804
 msgid "Drop..."
@@ -1006,7 +1010,7 @@ msgstr "Наряды"
 msgid "Weight:"
 msgstr "Вес:"
 
-#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:636
+#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643
 #: src/gui/popupmenu.cpp:1642 src/gui/popupmenu.cpp:1771
 #: src/gui/popupmenu.cpp:1816 src/gui/setup.cpp:73
 msgid "Store"
@@ -1016,7 +1020,7 @@ msgstr "Сохранить"
 msgid "Retrieve"
 msgstr "Получить"
 
-#: src/gui/inventorywindow.cpp:647 src/gui/popupmenu.cpp:1672
+#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1672
 #: src/gui/popupmenu.cpp:1764 src/gui/popupmenu.cpp:1809
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
@@ -3075,130 +3079,130 @@ msgstr "Уровень: %d (GM %d)"
 msgid "Correction points: %d"
 msgstr "Очков навыков: %d"
 
-#: src/gui/statuswindow.cpp:647 src/gui/statuswindow.cpp:712
-#: src/gui/statuswindow.cpp:732 src/gui/statuswindow.cpp:748
-#: src/gui/statuswindow.cpp:794 src/gui/statuswindow.cpp:823
-#: src/gui/statuswindow.cpp:846 src/gui/statuswindow.cpp:865
+#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:713
+#: src/gui/statuswindow.cpp:733 src/gui/statuswindow.cpp:749
+#: src/gui/statuswindow.cpp:795 src/gui/statuswindow.cpp:824
+#: src/gui/statuswindow.cpp:847 src/gui/statuswindow.cpp:866
 msgid "(D)"
 msgstr "(D)"
 
-#: src/gui/statuswindow.cpp:650 src/gui/statuswindow.cpp:773
+#: src/gui/statuswindow.cpp:651 src/gui/statuswindow.cpp:774
 msgid "(I)"
 msgstr "(I)"
 
-#: src/gui/statuswindow.cpp:653 src/gui/statuswindow.cpp:770
+#: src/gui/statuswindow.cpp:654 src/gui/statuswindow.cpp:771
 msgid "(c)"
 msgstr "(c)"
 
-#: src/gui/statuswindow.cpp:656
+#: src/gui/statuswindow.cpp:657
 msgid "(C)"
 msgstr "(C)"
 
-#: src/gui/statuswindow.cpp:659 src/gui/statuswindow.cpp:757
+#: src/gui/statuswindow.cpp:660 src/gui/statuswindow.cpp:758
 msgid "(d)"
 msgstr "(d)"
 
-#: src/gui/statuswindow.cpp:662 src/gui/statuswindow.cpp:676
-#: src/gui/statuswindow.cpp:705 src/gui/statuswindow.cpp:724
-#: src/gui/statuswindow.cpp:741 src/gui/statuswindow.cpp:760
-#: src/gui/statuswindow.cpp:782 src/gui/statuswindow.cpp:812
-#: src/gui/statuswindow.cpp:838 src/gui/statuswindow.cpp:852
-#: src/gui/statuswindow.cpp:868 src/gui/statuswindow.cpp:881
+#: src/gui/statuswindow.cpp:663 src/gui/statuswindow.cpp:677
+#: src/gui/statuswindow.cpp:706 src/gui/statuswindow.cpp:725
+#: src/gui/statuswindow.cpp:742 src/gui/statuswindow.cpp:761
+#: src/gui/statuswindow.cpp:783 src/gui/statuswindow.cpp:813
+#: src/gui/statuswindow.cpp:839 src/gui/statuswindow.cpp:853
+#: src/gui/statuswindow.cpp:869 src/gui/statuswindow.cpp:882
 msgid "(?)"
 msgstr "(?)"
 
-#: src/gui/statuswindow.cpp:673
+#: src/gui/statuswindow.cpp:674
 msgid "(a)"
 msgstr "(a)"
 
-#: src/gui/statuswindow.cpp:684
+#: src/gui/statuswindow.cpp:685
 msgid "(0)"
 msgstr "(0)"
 
-#: src/gui/statuswindow.cpp:687
+#: src/gui/statuswindow.cpp:688
 msgid "(1)"
 msgstr "(1)"
 
-#: src/gui/statuswindow.cpp:690
+#: src/gui/statuswindow.cpp:691
 msgid "(2)"
 msgstr "(2)"
 
-#: src/gui/statuswindow.cpp:693 src/gui/statuswindow.cpp:800
+#: src/gui/statuswindow.cpp:694 src/gui/statuswindow.cpp:801
 msgid "(3)"
 msgstr "(3)"
 
-#: src/gui/statuswindow.cpp:696
+#: src/gui/statuswindow.cpp:697
 msgid "(5)"
 msgstr "(5)"
 
-#: src/gui/statuswindow.cpp:699
+#: src/gui/statuswindow.cpp:700
 msgid "(7)"
 msgstr "(7)"
 
-#: src/gui/statuswindow.cpp:702 src/gui/statuswindow.cpp:754
-#: src/gui/statuswindow.cpp:809 src/gui/statuswindow.cpp:878
+#: src/gui/statuswindow.cpp:703 src/gui/statuswindow.cpp:755
+#: src/gui/statuswindow.cpp:810 src/gui/statuswindow.cpp:879
 msgid "(A)"
 msgstr "(A)"
 
-#: src/gui/statuswindow.cpp:715
+#: src/gui/statuswindow.cpp:716
 msgid "(R)"
 msgstr "(R)"
 
-#: src/gui/statuswindow.cpp:718
+#: src/gui/statuswindow.cpp:719
 msgid "(M)"
 msgstr "(M)"
 
-#: src/gui/statuswindow.cpp:721
+#: src/gui/statuswindow.cpp:722
 msgid "(P)"
 msgstr "(P)"
 
-#: src/gui/statuswindow.cpp:735
+#: src/gui/statuswindow.cpp:736
 msgid "(s)"
 msgstr "(s)"
 
-#: src/gui/statuswindow.cpp:738 src/gui/statuswindow.cpp:791
+#: src/gui/statuswindow.cpp:739 src/gui/statuswindow.cpp:792
 msgid "(S)"
 msgstr "(S)"
 
-#: src/gui/statuswindow.cpp:751 src/gui/statuswindow.cpp:806
-#: src/gui/statuswindow.cpp:859
+#: src/gui/statuswindow.cpp:752 src/gui/statuswindow.cpp:807
+#: src/gui/statuswindow.cpp:860
 msgid "(G)"
 msgstr "(G)"
 
-#: src/gui/statuswindow.cpp:767
+#: src/gui/statuswindow.cpp:768
 msgid "(f)"
 msgstr "(f)"
 
-#: src/gui/statuswindow.cpp:776 src/gui/statuswindow.cpp:797
-#: src/gui/statuswindow.cpp:862
+#: src/gui/statuswindow.cpp:777 src/gui/statuswindow.cpp:798
+#: src/gui/statuswindow.cpp:863
 msgid "(F)"
 msgstr "(F)"
 
-#: src/gui/statuswindow.cpp:779 src/gui/statuswindow.cpp:829
+#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:830
 msgid "(U)"
 msgstr "(U)"
 
-#: src/gui/statuswindow.cpp:803
+#: src/gui/statuswindow.cpp:804
 msgid "(g)"
 msgstr "(g)"
 
-#: src/gui/statuswindow.cpp:820
+#: src/gui/statuswindow.cpp:821
 msgid "(N)"
 msgstr "(N)"
 
-#: src/gui/statuswindow.cpp:826
+#: src/gui/statuswindow.cpp:827
 msgid "(u)"
 msgstr "(u)"
 
-#: src/gui/statuswindow.cpp:832
+#: src/gui/statuswindow.cpp:833
 msgid "(e)"
 msgstr "(e)"
 
-#: src/gui/statuswindow.cpp:835
+#: src/gui/statuswindow.cpp:836
 msgid "(b)"
 msgstr "(b)"
 
-#: src/gui/statuswindow.cpp:849 src/gui/statuswindow.cpp:875
+#: src/gui/statuswindow.cpp:850 src/gui/statuswindow.cpp:876
 msgid "(O)"
 msgstr "(O)"
 
@@ -3862,369 +3866,373 @@ msgstr "Движение к навигационной точке"
 msgid "Stop Attack"
 msgstr "Остановка атаки"
 
-#: src/keyboardconfig.cpp:64
+#: src/keyboardconfig.cpp:65
+msgid "Untarget"
+msgstr "снять выделение"
+
+#: src/keyboardconfig.cpp:66
 msgid "Target Closest"
 msgstr "Выбор ближнего монстра"
 
-#: src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:68
 msgid "Target NPC"
 msgstr "Выбор NPC"
 
-#: src/keyboardconfig.cpp:67
+#: src/keyboardconfig.cpp:69
 msgid "Target Player"
 msgstr "Выбор игрока"
 
-#: src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:71
 msgid "Pickup"
 msgstr "Поднятие предметов"
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:72
 msgid "Change Pickup Type"
 msgstr "Изменение типа подбора предметов"
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:74
 msgid "Hide Windows"
 msgstr "Скрытие окон"
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:76
 msgid "Sit"
 msgstr "Приседание/Вставание"
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:77
 msgid "Screenshot"
 msgstr "Создание скриншота"
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:78
 msgid "Enable/Disable Trading"
 msgstr "Разрешение/Запрет торговли"
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:80
 msgid "Change Map View Mode"
 msgstr "Изменение режима отображения карты"
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:82
 msgid "Select OK"
 msgstr "Выбор Ok"
 
-#: src/keyboardconfig.cpp:83
+#: src/keyboardconfig.cpp:85
 msgid "Shortcuts Keys"
 msgstr "Клавиши быстрых действий"
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:86
 msgid "Item Shortcuts Key"
 msgstr "Горячие клавиши предметов"
 
-#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:88
-#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:92
-#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:96
-#: src/keyboardconfig.cpp:98 src/keyboardconfig.cpp:100
-#: src/keyboardconfig.cpp:102 src/keyboardconfig.cpp:104
-#: src/keyboardconfig.cpp:106 src/keyboardconfig.cpp:108
-#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:112
-#: src/keyboardconfig.cpp:114 src/keyboardconfig.cpp:117
-#: src/keyboardconfig.cpp:119 src/keyboardconfig.cpp:121
-#: src/keyboardconfig.cpp:123 src/keyboardconfig.cpp:125
-#: src/keyboardconfig.cpp:367
+#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:90
+#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:94
+#: src/keyboardconfig.cpp:96 src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:100 src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:104 src/keyboardconfig.cpp:106
+#: src/keyboardconfig.cpp:108 src/keyboardconfig.cpp:110
+#: src/keyboardconfig.cpp:112 src/keyboardconfig.cpp:114
+#: src/keyboardconfig.cpp:116 src/keyboardconfig.cpp:119
+#: src/keyboardconfig.cpp:121 src/keyboardconfig.cpp:123
+#: src/keyboardconfig.cpp:125 src/keyboardconfig.cpp:127
+#: src/keyboardconfig.cpp:369
 #, c-format
 msgid "Item Shortcut %d"
 msgstr "Комбинация клавиш быстрого предмета %d"
 
-#: src/keyboardconfig.cpp:126
+#: src/keyboardconfig.cpp:128
 msgid "Windows Keys"
 msgstr "Клавиши окон"
 
-#: src/keyboardconfig.cpp:127
+#: src/keyboardconfig.cpp:129
 msgid "Help Window"
 msgstr "Окно помощи"
 
-#: src/keyboardconfig.cpp:129
+#: src/keyboardconfig.cpp:131
 msgid "Status Window"
 msgstr "Окно статуса"
 
-#: src/keyboardconfig.cpp:131
+#: src/keyboardconfig.cpp:133
 msgid "Inventory Window"
 msgstr "Окно инвентаря"
 
-#: src/keyboardconfig.cpp:133
+#: src/keyboardconfig.cpp:135
 msgid "Equipment Window"
 msgstr "Окно экипировки"
 
-#: src/keyboardconfig.cpp:135
+#: src/keyboardconfig.cpp:137
 msgid "Skill Window"
 msgstr "Окно навыков"
 
-#: src/keyboardconfig.cpp:137
+#: src/keyboardconfig.cpp:139
 msgid "Minimap Window"
 msgstr "Окно мини-карты"
 
-#: src/keyboardconfig.cpp:139
+#: src/keyboardconfig.cpp:141
 msgid "Chat Window"
 msgstr "Окно чата"
 
-#: src/keyboardconfig.cpp:141
+#: src/keyboardconfig.cpp:143
 msgid "Item Shortcut Window"
 msgstr "Окно быстрого использования предметов"
 
-#: src/keyboardconfig.cpp:143
+#: src/keyboardconfig.cpp:145
 msgid "Setup Window"
 msgstr "Окно настроек"
 
-#: src/keyboardconfig.cpp:145
+#: src/keyboardconfig.cpp:147
 msgid "Debug Window"
 msgstr "Окно отладки"
 
-#: src/keyboardconfig.cpp:147
+#: src/keyboardconfig.cpp:149
 msgid "Social Window"
 msgstr "Окно общества"
 
-#: src/keyboardconfig.cpp:149
+#: src/keyboardconfig.cpp:151
 msgid "Emote Shortcut Window"
 msgstr "Окно эмоций"
 
-#: src/keyboardconfig.cpp:151
+#: src/keyboardconfig.cpp:153
 msgid "Outfits Window"
 msgstr "Окно нарядов"
 
-#: src/keyboardconfig.cpp:153
+#: src/keyboardconfig.cpp:155
 msgid "Shop Window"
 msgstr "Окно магазина"
 
-#: src/keyboardconfig.cpp:155
+#: src/keyboardconfig.cpp:157
 msgid "Quick drop Window"
 msgstr "Окно быстрого бросания предметов"
 
-#: src/keyboardconfig.cpp:157
+#: src/keyboardconfig.cpp:159
 msgid "Kill Stats Window"
 msgstr "Окно статистики атак"
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboardconfig.cpp:161
 msgid "Commands Window"
 msgstr "Окно команд"
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboardconfig.cpp:163
 msgid "Bot Checker Window"
 msgstr "Окно детектора ботов"
 
-#: src/keyboardconfig.cpp:164
+#: src/keyboardconfig.cpp:166
 msgid "Who Is Online Window"
 msgstr "Окно кто онлайн"
 
-#: src/keyboardconfig.cpp:166
+#: src/keyboardconfig.cpp:168
 msgid "Did you know Window"
 msgstr "Окно \"Вы знаете?\""
 
-#: src/keyboardconfig.cpp:169
+#: src/keyboardconfig.cpp:171
 msgid "Previous Social Tab"
 msgstr "Предыдущая закладка общества"
 
-#: src/keyboardconfig.cpp:171
+#: src/keyboardconfig.cpp:173
 msgid "Next Social Tab"
 msgstr "Следующая закладка общества"
 
-#: src/keyboardconfig.cpp:173
+#: src/keyboardconfig.cpp:175
 msgid "Emotes Keys"
 msgstr "Клавиши смайлов"
 
-#: src/keyboardconfig.cpp:174
+#: src/keyboardconfig.cpp:176
 msgid "Smilie"
 msgstr "Смайлы"
 
-#: src/keyboardconfig.cpp:175 src/keyboardconfig.cpp:177
-#: src/keyboardconfig.cpp:179 src/keyboardconfig.cpp:181
-#: src/keyboardconfig.cpp:183 src/keyboardconfig.cpp:185
-#: src/keyboardconfig.cpp:187 src/keyboardconfig.cpp:189
-#: src/keyboardconfig.cpp:191 src/keyboardconfig.cpp:193
-#: src/keyboardconfig.cpp:195 src/keyboardconfig.cpp:197
-#: src/keyboardconfig.cpp:200 src/keyboardconfig.cpp:202
-#: src/keyboardconfig.cpp:204 src/keyboardconfig.cpp:206
-#: src/keyboardconfig.cpp:208 src/keyboardconfig.cpp:210
-#: src/keyboardconfig.cpp:212 src/keyboardconfig.cpp:214
-#: src/keyboardconfig.cpp:216 src/keyboardconfig.cpp:218
-#: src/keyboardconfig.cpp:220 src/keyboardconfig.cpp:222
-#: src/keyboardconfig.cpp:224 src/keyboardconfig.cpp:227
-#: src/keyboardconfig.cpp:230 src/keyboardconfig.cpp:233
-#: src/keyboardconfig.cpp:235 src/keyboardconfig.cpp:237
-#: src/keyboardconfig.cpp:239 src/keyboardconfig.cpp:241
-#: src/keyboardconfig.cpp:243 src/keyboardconfig.cpp:245
-#: src/keyboardconfig.cpp:247 src/keyboardconfig.cpp:249
-#: src/keyboardconfig.cpp:251 src/keyboardconfig.cpp:254
-#: src/keyboardconfig.cpp:256 src/keyboardconfig.cpp:258
-#: src/keyboardconfig.cpp:260 src/keyboardconfig.cpp:262
-#: src/keyboardconfig.cpp:264 src/keyboardconfig.cpp:266
-#: src/keyboardconfig.cpp:362
+#: src/keyboardconfig.cpp:177 src/keyboardconfig.cpp:179
+#: src/keyboardconfig.cpp:181 src/keyboardconfig.cpp:183
+#: src/keyboardconfig.cpp:185 src/keyboardconfig.cpp:187
+#: src/keyboardconfig.cpp:189 src/keyboardconfig.cpp:191
+#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
+#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
+#: src/keyboardconfig.cpp:202 src/keyboardconfig.cpp:204
+#: src/keyboardconfig.cpp:206 src/keyboardconfig.cpp:208
+#: src/keyboardconfig.cpp:210 src/keyboardconfig.cpp:212
+#: src/keyboardconfig.cpp:214 src/keyboardconfig.cpp:216
+#: src/keyboardconfig.cpp:218 src/keyboardconfig.cpp:220
+#: src/keyboardconfig.cpp:222 src/keyboardconfig.cpp:224
+#: src/keyboardconfig.cpp:226 src/keyboardconfig.cpp:229
+#: src/keyboardconfig.cpp:232 src/keyboardconfig.cpp:235
+#: src/keyboardconfig.cpp:237 src/keyboardconfig.cpp:239
+#: src/keyboardconfig.cpp:241 src/keyboardconfig.cpp:243
+#: src/keyboardconfig.cpp:245 src/keyboardconfig.cpp:247
+#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
+#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:256
+#: src/keyboardconfig.cpp:258 src/keyboardconfig.cpp:260
+#: src/keyboardconfig.cpp:262 src/keyboardconfig.cpp:264
+#: src/keyboardconfig.cpp:266 src/keyboardconfig.cpp:268
+#: src/keyboardconfig.cpp:364
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "Комбинация клавиш для смайла %d"
 
-#: src/keyboardconfig.cpp:268
+#: src/keyboardconfig.cpp:270
 msgid "Outfits Keys"
 msgstr "Клавиши нарядов"
 
-#: src/keyboardconfig.cpp:269
+#: src/keyboardconfig.cpp:271
 msgid "Wear Outfit"
 msgstr "Надеть наряд"
 
-#: src/keyboardconfig.cpp:271
+#: src/keyboardconfig.cpp:273
 msgid "Copy Outfit"
 msgstr "Копировать наряд"
 
-#: src/keyboardconfig.cpp:273
+#: src/keyboardconfig.cpp:275
 msgid "Copy equipped to Outfit"
 msgstr "Копирование надетого наряда"
 
-#: src/keyboardconfig.cpp:275
+#: src/keyboardconfig.cpp:277
 msgid "Chat Keys"
 msgstr "Клавиши чата"
 
-#: src/keyboardconfig.cpp:276
+#: src/keyboardconfig.cpp:278
 msgid "Toggle Chat"
 msgstr "Переключение на чат"
 
-#: src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:280
 msgid "Scroll Chat Up"
 msgstr "Прокручивание чата вверх"
 
-#: src/keyboardconfig.cpp:280
+#: src/keyboardconfig.cpp:282
 msgid "Scroll Chat Down"
 msgstr "Прокручивание чата вниз"
 
-#: src/keyboardconfig.cpp:282
+#: src/keyboardconfig.cpp:284
 msgid "Previous Chat Tab"
 msgstr "Предыдущая закладка чата"
 
-#: src/keyboardconfig.cpp:284
+#: src/keyboardconfig.cpp:286
 msgid "Next Chat Tab"
 msgstr "Следующая закладка чата"
 
-#: src/keyboardconfig.cpp:287
+#: src/keyboardconfig.cpp:289
 msgid "Close current Chat Tab"
 msgstr "Закрыть текущую вкладку чата"
 
-#: src/keyboardconfig.cpp:289
+#: src/keyboardconfig.cpp:291
 msgid "Previous chat line"
 msgstr "Предыдущая строка чата"
 
-#: src/keyboardconfig.cpp:291
+#: src/keyboardconfig.cpp:293
 msgid "Next chat line"
 msgstr "Следующая строка чата"
 
-#: src/keyboardconfig.cpp:293
+#: src/keyboardconfig.cpp:295
 msgid "Chat Auto Complete"
 msgstr "Автозавершение в чате"
 
-#: src/keyboardconfig.cpp:295
+#: src/keyboardconfig.cpp:297
 msgid "Deactivate Chat Input"
 msgstr "Отключение фокуса ввода"
 
-#: src/keyboardconfig.cpp:297
+#: src/keyboardconfig.cpp:299
 msgid "Other Keys"
 msgstr "Другие клавиши"
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboardconfig.cpp:300
 msgid "Ignore input 1"
 msgstr "Игнорирование ввода 1"
 
-#: src/keyboardconfig.cpp:300
+#: src/keyboardconfig.cpp:302
 msgid "Ignore input 2"
 msgstr "Игнорирование ввода 2"
 
-#: src/keyboardconfig.cpp:302
+#: src/keyboardconfig.cpp:304
 msgid "Direct Up"
 msgstr "Повернуться вверх"
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboardconfig.cpp:305
 msgid "Direct Down"
 msgstr "Повернуться вниз"
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboardconfig.cpp:307
 msgid "Direct Left"
 msgstr "Повернуться влево"
 
-#: src/keyboardconfig.cpp:306
+#: src/keyboardconfig.cpp:308
 msgid "Direct Right"
 msgstr "Повернуться вправо"
 
-#: src/keyboardconfig.cpp:308
+#: src/keyboardconfig.cpp:310
 msgid "Crazy moves"
 msgstr "Сумасшедшие движения"
 
-#: src/keyboardconfig.cpp:310
+#: src/keyboardconfig.cpp:312
 msgid "Change Crazy Move mode"
 msgstr "Поменять режим сумасшедших движений"
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboardconfig.cpp:314
 msgid "Quick Drop N Items from 0 slot"
 msgstr "Быстрый сброс N предметов из 0 слота"
 
-#: src/keyboardconfig.cpp:314
+#: src/keyboardconfig.cpp:316
 msgid "Quick Drop N Items"
 msgstr "Быстрый сброс N предметов"
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboardconfig.cpp:318
 msgid "Switch Quick Drop Counter"
 msgstr "Переключение счётчика быстрого сброса"
 
-#: src/keyboardconfig.cpp:318
+#: src/keyboardconfig.cpp:320
 msgid "Quick heal target or self"
 msgstr "Быстрое лечения себя или цели"
 
-#: src/keyboardconfig.cpp:320
+#: src/keyboardconfig.cpp:322
 msgid "Use #itenplz spell"
 msgstr "Использование заклинания #itenplz"
 
-#: src/keyboardconfig.cpp:322
+#: src/keyboardconfig.cpp:324
 msgid "Use magic attack"
 msgstr "Использование магической атаки"
 
-#: src/keyboardconfig.cpp:324
+#: src/keyboardconfig.cpp:326
 msgid "Switch magic attack"
 msgstr "Переключение маг. атаки"
 
-#: src/keyboardconfig.cpp:326
+#: src/keyboardconfig.cpp:328
 msgid "Change move type"
 msgstr "Изменение типа движения"
 
-#: src/keyboardconfig.cpp:328
+#: src/keyboardconfig.cpp:330
 msgid "Change Attack Weapon Type"
 msgstr "Измение типа атаки оружием"
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboardconfig.cpp:332
 msgid "Change Attack Type"
 msgstr "Изменение типа атаки"
 
-#: src/keyboardconfig.cpp:332
+#: src/keyboardconfig.cpp:334
 msgid "Change Follow mode"
 msgstr "Изменение режима следования"
 
-#: src/keyboardconfig.cpp:334
+#: src/keyboardconfig.cpp:336
 msgid "Change Imitation mode"
 msgstr "Изменение режима имитации"
 
-#: src/keyboardconfig.cpp:337
+#: src/keyboardconfig.cpp:339
 msgid "Disable / Enable Game modifier keys"
 msgstr "Включение / Выключение специальных модификаторов"
 
-#: src/keyboardconfig.cpp:338
+#: src/keyboardconfig.cpp:340
 msgid "On / Off audio"
 msgstr "Вкл. / Выкл. звука"
 
-#: src/keyboardconfig.cpp:340
+#: src/keyboardconfig.cpp:342
 msgid "Enable / Disable away mode"
 msgstr "Включение / Выключение режима отошел"
 
-#: src/keyboardconfig.cpp:342
+#: src/keyboardconfig.cpp:344
 msgid "Emulate right click from keyboard"
 msgstr "Эмуляция правого клика с клавиатуры"
 
-#: src/keyboardconfig.cpp:344
+#: src/keyboardconfig.cpp:346
 msgid "Toggle camera mode"
 msgstr "Изменение режима камеры"
 
-#: src/keyboardconfig.cpp:346
+#: src/keyboardconfig.cpp:348
 msgid "Modifier key"
 msgstr "Кнопка-модификатор"
 
-#: src/keyboardconfig.cpp:425
+#: src/keyboardconfig.cpp:427
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -4237,37 +4245,37 @@ msgstr ""
 msgid "You were killed by "
 msgstr "Вы были убиты "
 
-#: src/localplayer.cpp:1422
+#: src/localplayer.cpp:1427
 msgid "Tried to pick up nonexistent item."
 msgstr "Попытка поднять несуществующий предмет."
 
-#: src/localplayer.cpp:1424
+#: src/localplayer.cpp:1429
 msgid "Item is too heavy."
 msgstr "Предмет слишком тяжелый."
 
-#: src/localplayer.cpp:1426
+#: src/localplayer.cpp:1431
 msgid "Item is too far away."
 msgstr "Предмет слишком далеко"
 
-#: src/localplayer.cpp:1428
+#: src/localplayer.cpp:1433
 msgid "Inventory is full."
 msgstr "Инвентарь переполнен."
 
-#: src/localplayer.cpp:1430
+#: src/localplayer.cpp:1435
 msgid "Stack is too big."
 msgstr "Слишком много предметов."
 
-#: src/localplayer.cpp:1433
+#: src/localplayer.cpp:1438
 msgid "Item belongs to someone else."
 msgstr "Предмет принадлежит кому-то еще."
 
-#: src/localplayer.cpp:1436
+#: src/localplayer.cpp:1441
 msgid "Unknown problem picking up item."
 msgstr "Неизвестная проблема при поднятии предмета."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1460
+#: src/localplayer.cpp:1465
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -4275,27 +4283,27 @@ msgstr[0] "Вы подняли %d [@@%d|%s@@]."
 msgstr[1] "Вы подняли %d [@@%d|%s@@]."
 msgstr[2] "Вы подняли %d [@@%d|%s@@]."
 
-#: src/localplayer.cpp:3174
+#: src/localplayer.cpp:3179
 msgid "Away"
 msgstr "Отошел"
 
-#: src/localplayer.cpp:3494
+#: src/localplayer.cpp:3507
 msgid "Follow: "
 msgstr "Следование: "
 
-#: src/localplayer.cpp:3496 src/localplayer.cpp:3511
+#: src/localplayer.cpp:3509 src/localplayer.cpp:3524
 msgid "Follow canceled"
 msgstr "Следование отменено"
 
-#: src/localplayer.cpp:3503
+#: src/localplayer.cpp:3516
 msgid "Imitation: "
 msgstr "Имитация: "
 
-#: src/localplayer.cpp:3505 src/localplayer.cpp:3513
+#: src/localplayer.cpp:3518 src/localplayer.cpp:3526
 msgid "Imitation canceled"
 msgstr "Имитация отменена"
 
-#: src/localplayer.cpp:3858
+#: src/localplayer.cpp:3871
 msgid "You see "
 msgstr "Вы видите "
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 0311dd212..2c7dcc85f 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-09-27 22:18+0300\n"
-"PO-Revision-Date: 2011-09-27 19:20+0000\n"
+"POT-Creation-Date: 2011-10-01 01:22+0300\n"
+"PO-Revision-Date: 2011-09-30 14:45+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: Chinese (China) (http://www.transifex.net/projects/p/manaplus/"
 "team/zh_CN/)\n"
@@ -328,19 +328,19 @@ msgstr "服务器的连接丢失。"
 msgid "Network Error"
 msgstr "网络错误"
 
-#: src/game.cpp:1320
+#: src/game.cpp:1321
 msgid "Ignoring incoming trade requests"
 msgstr "忽略新进的交易请求"
 
-#: src/game.cpp:1330
+#: src/game.cpp:1331
 msgid "Accepting incoming trade requests"
 msgstr "接受传入的交易请求"
 
-#: src/game.cpp:1727
+#: src/game.cpp:1731
 msgid "Could Not Load Map"
 msgstr "不能加载地图"
 
-#: src/game.cpp:1728
+#: src/game.cpp:1732
 #, c-format
 msgid "Error while loading %s"
 msgstr "加载%s时出现错误"
@@ -398,44 +398,48 @@ msgstr "结果"
 msgid "Reset"
 msgstr "重置"
 
-#: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:98
+#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
 #: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
 #: src/gui/popupmenu.cpp:273 src/gui/popupmenu.cpp:654
 msgid "Buy"
 msgstr "购买"
 
-#: src/gui/buydialog.cpp:89 src/gui/buydialog.cpp:303
+#: src/gui/buydialog.cpp:94 src/gui/buydialog.cpp:332
 #: src/gui/selldialog.cpp:88 src/gui/selldialog.cpp:325
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "价格：%s / 总价：%s"
 
+#: src/gui/buydialog.cpp:103
+msgid "Amount:"
+msgstr ""
+
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:94 src/gui/itemamountwindow.cpp:207
+#: 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:973
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:974
 msgid "+"
 msgstr "+"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:97 src/gui/itemamountwindow.cpp:206
+#: 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:985
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:986
 msgid "-"
 msgstr "-"
 
-#: src/gui/buydialog.cpp:99 src/gui/quitdialog.cpp:47
+#: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:294
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:84
 msgid "Quit"
 msgstr "退出"
 
-#: src/gui/buydialog.cpp:100 src/gui/selldialog.cpp:95
-#: src/gui/statuswindow.cpp:504 src/gui/statuswindow.cpp:553
-#: src/gui/statuswindow.cpp:972 src/gui/statuswindow.cpp:1003
+#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
+#: src/gui/statuswindow.cpp:504 src/gui/statuswindow.cpp:554
+#: src/gui/statuswindow.cpp:973 src/gui/statuswindow.cpp:1004
 msgid "Max"
 msgstr "最大"
 
@@ -913,7 +917,7 @@ msgid "Equipment"
 msgstr "装备"
 
 #: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160
-#: src/gui/inventorywindow.cpp:538 src/gui/inventorywindow.cpp:547
+#: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554
 #: src/gui/popupmenu.cpp:1656 src/gui/popupmenu.cpp:1748
 #: src/gui/popupmenu.cpp:1793
 msgid "Unequip"
@@ -956,20 +960,20 @@ msgstr "槽："
 msgid "Filter:"
 msgstr "过滤器："
 
-#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:540
-#: src/gui/inventorywindow.cpp:549 src/gui/popupmenu.cpp:1658
+#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547
+#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1658
 #: src/gui/popupmenu.cpp:1750 src/gui/popupmenu.cpp:1795
 msgid "Equip"
 msgstr "装备"
 
-#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:541
-#: src/gui/inventorywindow.cpp:545 src/gui/popupmenu.cpp:1662
+#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548
+#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1662
 #: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1754
 #: src/gui/popupmenu.cpp:1799
 msgid "Use"
 msgstr "使用"
 
-#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:645
+#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652
 #: src/gui/popupmenu.cpp:1667 src/gui/popupmenu.cpp:1759
 #: src/gui/popupmenu.cpp:1804
 msgid "Drop..."
@@ -989,7 +993,7 @@ msgstr "装具"
 msgid "Weight:"
 msgstr "重量："
 
-#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:636
+#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643
 #: src/gui/popupmenu.cpp:1642 src/gui/popupmenu.cpp:1771
 #: src/gui/popupmenu.cpp:1816 src/gui/setup.cpp:73
 msgid "Store"
@@ -999,7 +1003,7 @@ msgstr "存储"
 msgid "Retrieve"
 msgstr "取回"
 
-#: src/gui/inventorywindow.cpp:647 src/gui/popupmenu.cpp:1672
+#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1672
 #: src/gui/popupmenu.cpp:1764 src/gui/popupmenu.cpp:1809
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
@@ -3042,130 +3046,130 @@ msgstr "级别:%d (GM %d)"
 msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:647 src/gui/statuswindow.cpp:712
-#: src/gui/statuswindow.cpp:732 src/gui/statuswindow.cpp:748
-#: src/gui/statuswindow.cpp:794 src/gui/statuswindow.cpp:823
-#: src/gui/statuswindow.cpp:846 src/gui/statuswindow.cpp:865
+#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:713
+#: src/gui/statuswindow.cpp:733 src/gui/statuswindow.cpp:749
+#: src/gui/statuswindow.cpp:795 src/gui/statuswindow.cpp:824
+#: src/gui/statuswindow.cpp:847 src/gui/statuswindow.cpp:866
 msgid "(D)"
 msgstr "(D)"
 
-#: src/gui/statuswindow.cpp:650 src/gui/statuswindow.cpp:773
+#: src/gui/statuswindow.cpp:651 src/gui/statuswindow.cpp:774
 msgid "(I)"
 msgstr "(I)"
 
-#: src/gui/statuswindow.cpp:653 src/gui/statuswindow.cpp:770
+#: src/gui/statuswindow.cpp:654 src/gui/statuswindow.cpp:771
 msgid "(c)"
 msgstr "(c)"
 
-#: src/gui/statuswindow.cpp:656
+#: src/gui/statuswindow.cpp:657
 msgid "(C)"
 msgstr "(C)"
 
-#: src/gui/statuswindow.cpp:659 src/gui/statuswindow.cpp:757
+#: src/gui/statuswindow.cpp:660 src/gui/statuswindow.cpp:758
 msgid "(d)"
 msgstr "(d)"
 
-#: src/gui/statuswindow.cpp:662 src/gui/statuswindow.cpp:676
-#: src/gui/statuswindow.cpp:705 src/gui/statuswindow.cpp:724
-#: src/gui/statuswindow.cpp:741 src/gui/statuswindow.cpp:760
-#: src/gui/statuswindow.cpp:782 src/gui/statuswindow.cpp:812
-#: src/gui/statuswindow.cpp:838 src/gui/statuswindow.cpp:852
-#: src/gui/statuswindow.cpp:868 src/gui/statuswindow.cpp:881
+#: src/gui/statuswindow.cpp:663 src/gui/statuswindow.cpp:677
+#: src/gui/statuswindow.cpp:706 src/gui/statuswindow.cpp:725
+#: src/gui/statuswindow.cpp:742 src/gui/statuswindow.cpp:761
+#: src/gui/statuswindow.cpp:783 src/gui/statuswindow.cpp:813
+#: src/gui/statuswindow.cpp:839 src/gui/statuswindow.cpp:853
+#: src/gui/statuswindow.cpp:869 src/gui/statuswindow.cpp:882
 msgid "(?)"
 msgstr "(?)"
 
-#: src/gui/statuswindow.cpp:673
+#: src/gui/statuswindow.cpp:674
 msgid "(a)"
 msgstr "(a)"
 
-#: src/gui/statuswindow.cpp:684
+#: src/gui/statuswindow.cpp:685
 msgid "(0)"
 msgstr "(0)"
 
-#: src/gui/statuswindow.cpp:687
+#: src/gui/statuswindow.cpp:688
 msgid "(1)"
 msgstr "(1)"
 
-#: src/gui/statuswindow.cpp:690
+#: src/gui/statuswindow.cpp:691
 msgid "(2)"
 msgstr "(2)"
 
-#: src/gui/statuswindow.cpp:693 src/gui/statuswindow.cpp:800
+#: src/gui/statuswindow.cpp:694 src/gui/statuswindow.cpp:801
 msgid "(3)"
 msgstr "(3)"
 
-#: src/gui/statuswindow.cpp:696
+#: src/gui/statuswindow.cpp:697
 msgid "(5)"
 msgstr "(5)"
 
-#: src/gui/statuswindow.cpp:699
+#: src/gui/statuswindow.cpp:700
 msgid "(7)"
 msgstr "(7)"
 
-#: src/gui/statuswindow.cpp:702 src/gui/statuswindow.cpp:754
-#: src/gui/statuswindow.cpp:809 src/gui/statuswindow.cpp:878
+#: src/gui/statuswindow.cpp:703 src/gui/statuswindow.cpp:755
+#: src/gui/statuswindow.cpp:810 src/gui/statuswindow.cpp:879
 msgid "(A)"
 msgstr "(A)"
 
-#: src/gui/statuswindow.cpp:715
+#: src/gui/statuswindow.cpp:716
 msgid "(R)"
 msgstr "(R)"
 
-#: src/gui/statuswindow.cpp:718
+#: src/gui/statuswindow.cpp:719
 msgid "(M)"
 msgstr "(M)"
 
-#: src/gui/statuswindow.cpp:721
+#: src/gui/statuswindow.cpp:722
 msgid "(P)"
 msgstr "(P)"
 
-#: src/gui/statuswindow.cpp:735
+#: src/gui/statuswindow.cpp:736
 msgid "(s)"
 msgstr "(s)"
 
-#: src/gui/statuswindow.cpp:738 src/gui/statuswindow.cpp:791
+#: src/gui/statuswindow.cpp:739 src/gui/statuswindow.cpp:792
 msgid "(S)"
 msgstr "(S)"
 
-#: src/gui/statuswindow.cpp:751 src/gui/statuswindow.cpp:806
-#: src/gui/statuswindow.cpp:859
+#: src/gui/statuswindow.cpp:752 src/gui/statuswindow.cpp:807
+#: src/gui/statuswindow.cpp:860
 msgid "(G)"
 msgstr "(G)"
 
-#: src/gui/statuswindow.cpp:767
+#: src/gui/statuswindow.cpp:768
 msgid "(f)"
 msgstr "(f)"
 
-#: src/gui/statuswindow.cpp:776 src/gui/statuswindow.cpp:797
-#: src/gui/statuswindow.cpp:862
+#: src/gui/statuswindow.cpp:777 src/gui/statuswindow.cpp:798
+#: src/gui/statuswindow.cpp:863
 msgid "(F)"
 msgstr "(F)"
 
-#: src/gui/statuswindow.cpp:779 src/gui/statuswindow.cpp:829
+#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:830
 msgid "(U)"
 msgstr "(U)"
 
-#: src/gui/statuswindow.cpp:803
+#: src/gui/statuswindow.cpp:804
 msgid "(g)"
 msgstr "(g)"
 
-#: src/gui/statuswindow.cpp:820
+#: src/gui/statuswindow.cpp:821
 msgid "(N)"
 msgstr "(N)"
 
-#: src/gui/statuswindow.cpp:826
+#: src/gui/statuswindow.cpp:827
 msgid "(u)"
 msgstr "(u)"
 
-#: src/gui/statuswindow.cpp:832
+#: src/gui/statuswindow.cpp:833
 msgid "(e)"
 msgstr "(e)"
 
-#: src/gui/statuswindow.cpp:835
+#: src/gui/statuswindow.cpp:836
 msgid "(b)"
 msgstr "(b)"
 
-#: src/gui/statuswindow.cpp:849 src/gui/statuswindow.cpp:875
+#: src/gui/statuswindow.cpp:850 src/gui/statuswindow.cpp:876
 msgid "(O)"
 msgstr "(O)"
 
@@ -3824,369 +3828,373 @@ msgstr "移动导航点"
 msgid "Stop Attack"
 msgstr "停止攻击"
 
-#: src/keyboardconfig.cpp:64
+#: src/keyboardconfig.cpp:65
+msgid "Untarget"
+msgstr ""
+
+#: src/keyboardconfig.cpp:66
 msgid "Target Closest"
 msgstr "目标最接近"
 
-#: src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:68
 msgid "Target NPC"
 msgstr "目标NPC"
 
-#: src/keyboardconfig.cpp:67
+#: src/keyboardconfig.cpp:69
 msgid "Target Player"
 msgstr "目标玩家"
 
-#: src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:71
 msgid "Pickup"
 msgstr "捡起"
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:72
 msgid "Change Pickup Type"
 msgstr "更改皮卡型"
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:74
 msgid "Hide Windows"
 msgstr "隐藏窗口"
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:76
 msgid "Sit"
 msgstr "坐下"
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:77
 msgid "Screenshot"
 msgstr "屏幕快照"
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:78
 msgid "Enable/Disable Trading"
 msgstr "开启/关闭交易"
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:80
 msgid "Change Map View Mode"
 msgstr "更改地图浏览模式"
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:82
 msgid "Select OK"
 msgstr "选择OK"
 
-#: src/keyboardconfig.cpp:83
+#: src/keyboardconfig.cpp:85
 msgid "Shortcuts Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:86
 msgid "Item Shortcuts Key"
 msgstr "项目的快捷方式键"
 
-#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:88
-#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:92
-#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:96
-#: src/keyboardconfig.cpp:98 src/keyboardconfig.cpp:100
-#: src/keyboardconfig.cpp:102 src/keyboardconfig.cpp:104
-#: src/keyboardconfig.cpp:106 src/keyboardconfig.cpp:108
-#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:112
-#: src/keyboardconfig.cpp:114 src/keyboardconfig.cpp:117
-#: src/keyboardconfig.cpp:119 src/keyboardconfig.cpp:121
-#: src/keyboardconfig.cpp:123 src/keyboardconfig.cpp:125
-#: src/keyboardconfig.cpp:367
+#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:90
+#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:94
+#: src/keyboardconfig.cpp:96 src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:100 src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:104 src/keyboardconfig.cpp:106
+#: src/keyboardconfig.cpp:108 src/keyboardconfig.cpp:110
+#: src/keyboardconfig.cpp:112 src/keyboardconfig.cpp:114
+#: src/keyboardconfig.cpp:116 src/keyboardconfig.cpp:119
+#: src/keyboardconfig.cpp:121 src/keyboardconfig.cpp:123
+#: src/keyboardconfig.cpp:125 src/keyboardconfig.cpp:127
+#: src/keyboardconfig.cpp:369
 #, c-format
 msgid "Item Shortcut %d"
 msgstr "物品快捷 %d"
 
-#: src/keyboardconfig.cpp:126
+#: src/keyboardconfig.cpp:128
 msgid "Windows Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:127
+#: src/keyboardconfig.cpp:129
 msgid "Help Window"
 msgstr "帮助窗口"
 
-#: src/keyboardconfig.cpp:129
+#: src/keyboardconfig.cpp:131
 msgid "Status Window"
 msgstr "状态窗口"
 
-#: src/keyboardconfig.cpp:131
+#: src/keyboardconfig.cpp:133
 msgid "Inventory Window"
 msgstr "物品栏窗口"
 
-#: src/keyboardconfig.cpp:133
+#: src/keyboardconfig.cpp:135
 msgid "Equipment Window"
 msgstr "装备窗口"
 
-#: src/keyboardconfig.cpp:135
+#: src/keyboardconfig.cpp:137
 msgid "Skill Window"
 msgstr "技能窗口"
 
-#: src/keyboardconfig.cpp:137
+#: src/keyboardconfig.cpp:139
 msgid "Minimap Window"
 msgstr "小地图窗口"
 
-#: src/keyboardconfig.cpp:139
+#: src/keyboardconfig.cpp:141
 msgid "Chat Window"
 msgstr "聊天窗口"
 
-#: src/keyboardconfig.cpp:141
+#: src/keyboardconfig.cpp:143
 msgid "Item Shortcut Window"
 msgstr "物品快捷窗口"
 
-#: src/keyboardconfig.cpp:143
+#: src/keyboardconfig.cpp:145
 msgid "Setup Window"
 msgstr "设置窗口"
 
-#: src/keyboardconfig.cpp:145
+#: src/keyboardconfig.cpp:147
 msgid "Debug Window"
 msgstr "Debug窗口"
 
-#: src/keyboardconfig.cpp:147
+#: src/keyboardconfig.cpp:149
 msgid "Social Window"
 msgstr "社会窗口"
 
-#: src/keyboardconfig.cpp:149
+#: src/keyboardconfig.cpp:151
 msgid "Emote Shortcut Window"
 msgstr "表情快捷窗口"
 
-#: src/keyboardconfig.cpp:151
+#: src/keyboardconfig.cpp:153
 msgid "Outfits Window"
 msgstr "装具窗口"
 
-#: src/keyboardconfig.cpp:153
+#: src/keyboardconfig.cpp:155
 msgid "Shop Window"
 msgstr "橱窗"
 
-#: src/keyboardconfig.cpp:155
+#: src/keyboardconfig.cpp:157
 msgid "Quick drop Window"
 msgstr "快速下拉窗口"
 
-#: src/keyboardconfig.cpp:157
+#: src/keyboardconfig.cpp:159
 msgid "Kill Stats Window"
 msgstr "杀敌统计窗口"
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboardconfig.cpp:161
 msgid "Commands Window"
 msgstr "命令的窗口"
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboardconfig.cpp:163
 msgid "Bot Checker Window"
 msgstr "BOT检查窗口"
 
-#: src/keyboardconfig.cpp:164
+#: src/keyboardconfig.cpp:166
 msgid "Who Is Online Window"
 msgstr "谁是在线窗口"
 
-#: src/keyboardconfig.cpp:166
+#: src/keyboardconfig.cpp:168
 msgid "Did you know Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:169
+#: src/keyboardconfig.cpp:171
 msgid "Previous Social Tab"
 msgstr "上一页社会标签"
 
-#: src/keyboardconfig.cpp:171
+#: src/keyboardconfig.cpp:173
 msgid "Next Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:173
+#: src/keyboardconfig.cpp:175
 msgid "Emotes Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:174
+#: src/keyboardconfig.cpp:176
 msgid "Smilie"
 msgstr "笑脸"
 
-#: src/keyboardconfig.cpp:175 src/keyboardconfig.cpp:177
-#: src/keyboardconfig.cpp:179 src/keyboardconfig.cpp:181
-#: src/keyboardconfig.cpp:183 src/keyboardconfig.cpp:185
-#: src/keyboardconfig.cpp:187 src/keyboardconfig.cpp:189
-#: src/keyboardconfig.cpp:191 src/keyboardconfig.cpp:193
-#: src/keyboardconfig.cpp:195 src/keyboardconfig.cpp:197
-#: src/keyboardconfig.cpp:200 src/keyboardconfig.cpp:202
-#: src/keyboardconfig.cpp:204 src/keyboardconfig.cpp:206
-#: src/keyboardconfig.cpp:208 src/keyboardconfig.cpp:210
-#: src/keyboardconfig.cpp:212 src/keyboardconfig.cpp:214
-#: src/keyboardconfig.cpp:216 src/keyboardconfig.cpp:218
-#: src/keyboardconfig.cpp:220 src/keyboardconfig.cpp:222
-#: src/keyboardconfig.cpp:224 src/keyboardconfig.cpp:227
-#: src/keyboardconfig.cpp:230 src/keyboardconfig.cpp:233
-#: src/keyboardconfig.cpp:235 src/keyboardconfig.cpp:237
-#: src/keyboardconfig.cpp:239 src/keyboardconfig.cpp:241
-#: src/keyboardconfig.cpp:243 src/keyboardconfig.cpp:245
-#: src/keyboardconfig.cpp:247 src/keyboardconfig.cpp:249
-#: src/keyboardconfig.cpp:251 src/keyboardconfig.cpp:254
-#: src/keyboardconfig.cpp:256 src/keyboardconfig.cpp:258
-#: src/keyboardconfig.cpp:260 src/keyboardconfig.cpp:262
-#: src/keyboardconfig.cpp:264 src/keyboardconfig.cpp:266
-#: src/keyboardconfig.cpp:362
+#: src/keyboardconfig.cpp:177 src/keyboardconfig.cpp:179
+#: src/keyboardconfig.cpp:181 src/keyboardconfig.cpp:183
+#: src/keyboardconfig.cpp:185 src/keyboardconfig.cpp:187
+#: src/keyboardconfig.cpp:189 src/keyboardconfig.cpp:191
+#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
+#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
+#: src/keyboardconfig.cpp:202 src/keyboardconfig.cpp:204
+#: src/keyboardconfig.cpp:206 src/keyboardconfig.cpp:208
+#: src/keyboardconfig.cpp:210 src/keyboardconfig.cpp:212
+#: src/keyboardconfig.cpp:214 src/keyboardconfig.cpp:216
+#: src/keyboardconfig.cpp:218 src/keyboardconfig.cpp:220
+#: src/keyboardconfig.cpp:222 src/keyboardconfig.cpp:224
+#: src/keyboardconfig.cpp:226 src/keyboardconfig.cpp:229
+#: src/keyboardconfig.cpp:232 src/keyboardconfig.cpp:235
+#: src/keyboardconfig.cpp:237 src/keyboardconfig.cpp:239
+#: src/keyboardconfig.cpp:241 src/keyboardconfig.cpp:243
+#: src/keyboardconfig.cpp:245 src/keyboardconfig.cpp:247
+#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
+#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:256
+#: src/keyboardconfig.cpp:258 src/keyboardconfig.cpp:260
+#: src/keyboardconfig.cpp:262 src/keyboardconfig.cpp:264
+#: src/keyboardconfig.cpp:266 src/keyboardconfig.cpp:268
+#: src/keyboardconfig.cpp:364
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "表情快捷键为 %d"
 
-#: src/keyboardconfig.cpp:268
+#: src/keyboardconfig.cpp:270
 msgid "Outfits Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:269
+#: src/keyboardconfig.cpp:271
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:271
+#: src/keyboardconfig.cpp:273
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:273
+#: src/keyboardconfig.cpp:275
 msgid "Copy equipped to Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:275
+#: src/keyboardconfig.cpp:277
 msgid "Chat Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:276
+#: src/keyboardconfig.cpp:278
 msgid "Toggle Chat"
 msgstr "切换聊天"
 
-#: src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:280
 msgid "Scroll Chat Up"
 msgstr "向上滚动聊天记录"
 
-#: src/keyboardconfig.cpp:280
+#: src/keyboardconfig.cpp:282
 msgid "Scroll Chat Down"
 msgstr "向下滚动聊天记录"
 
-#: src/keyboardconfig.cpp:282
+#: src/keyboardconfig.cpp:284
 msgid "Previous Chat Tab"
 msgstr "上一个聊天窗口标签页"
 
-#: src/keyboardconfig.cpp:284
+#: src/keyboardconfig.cpp:286
 msgid "Next Chat Tab"
 msgstr "下一个聊天窗口标签页"
 
-#: src/keyboardconfig.cpp:287
+#: src/keyboardconfig.cpp:289
 msgid "Close current Chat Tab"
 msgstr "关闭当前聊天标签"
 
-#: src/keyboardconfig.cpp:289
+#: src/keyboardconfig.cpp:291
 msgid "Previous chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:291
+#: src/keyboardconfig.cpp:293
 msgid "Next chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:293
+#: src/keyboardconfig.cpp:295
 msgid "Chat Auto Complete"
 msgstr "自动完成交谈"
 
-#: src/keyboardconfig.cpp:295
+#: src/keyboardconfig.cpp:297
 msgid "Deactivate Chat Input"
 msgstr "停用聊天输入"
 
-#: src/keyboardconfig.cpp:297
+#: src/keyboardconfig.cpp:299
 msgid "Other Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboardconfig.cpp:300
 msgid "Ignore input 1"
 msgstr "忽略输入1"
 
-#: src/keyboardconfig.cpp:300
+#: src/keyboardconfig.cpp:302
 msgid "Ignore input 2"
 msgstr "忽略输入2"
 
-#: src/keyboardconfig.cpp:302
+#: src/keyboardconfig.cpp:304
 msgid "Direct Up"
 msgstr "直接向上"
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboardconfig.cpp:305
 msgid "Direct Down"
 msgstr "直接下"
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboardconfig.cpp:307
 msgid "Direct Left"
 msgstr "直接离开"
 
-#: src/keyboardconfig.cpp:306
+#: src/keyboardconfig.cpp:308
 msgid "Direct Right"
 msgstr "直接对"
 
-#: src/keyboardconfig.cpp:308
+#: src/keyboardconfig.cpp:310
 msgid "Crazy moves"
 msgstr ""
 
-#: src/keyboardconfig.cpp:310
+#: src/keyboardconfig.cpp:312
 msgid "Change Crazy Move mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboardconfig.cpp:314
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:314
+#: src/keyboardconfig.cpp:316
 msgid "Quick Drop N Items"
 msgstr "快速下降序号项目"
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboardconfig.cpp:318
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/keyboardconfig.cpp:318
+#: src/keyboardconfig.cpp:320
 msgid "Quick heal target or self"
 msgstr "快速愈合的目标或自我"
 
-#: src/keyboardconfig.cpp:320
+#: src/keyboardconfig.cpp:322
 msgid "Use #itenplz spell"
 msgstr ""
 
-#: src/keyboardconfig.cpp:322
+#: src/keyboardconfig.cpp:324
 msgid "Use magic attack"
 msgstr "使用魔法攻击"
 
-#: src/keyboardconfig.cpp:324
+#: src/keyboardconfig.cpp:326
 msgid "Switch magic attack"
 msgstr "切换魔法攻击"
 
-#: src/keyboardconfig.cpp:326
+#: src/keyboardconfig.cpp:328
 msgid "Change move type"
 msgstr "更改移动类型"
 
-#: src/keyboardconfig.cpp:328
+#: src/keyboardconfig.cpp:330
 msgid "Change Attack Weapon Type"
 msgstr "更改攻击型武器"
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboardconfig.cpp:332
 msgid "Change Attack Type"
 msgstr "更改攻击类型"
 
-#: src/keyboardconfig.cpp:332
+#: src/keyboardconfig.cpp:334
 msgid "Change Follow mode"
 msgstr "更改跟随模式"
 
-#: src/keyboardconfig.cpp:334
+#: src/keyboardconfig.cpp:336
 msgid "Change Imitation mode"
 msgstr "更改仿模式"
 
-#: src/keyboardconfig.cpp:337
+#: src/keyboardconfig.cpp:339
 msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:338
+#: src/keyboardconfig.cpp:340
 msgid "On / Off audio"
 msgstr "开/关 音频"
 
-#: src/keyboardconfig.cpp:340
+#: src/keyboardconfig.cpp:342
 msgid "Enable / Disable away mode"
 msgstr "启用/禁用离开模式"
 
-#: src/keyboardconfig.cpp:342
+#: src/keyboardconfig.cpp:344
 msgid "Emulate right click from keyboard"
 msgstr "从键盘模拟右键单击"
 
-#: src/keyboardconfig.cpp:344
+#: src/keyboardconfig.cpp:346
 msgid "Toggle camera mode"
 msgstr "切换模式"
 
-#: src/keyboardconfig.cpp:346
+#: src/keyboardconfig.cpp:348
 msgid "Modifier key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:425
+#: src/keyboardconfig.cpp:427
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -4197,63 +4205,63 @@ msgstr ""
 msgid "You were killed by "
 msgstr "你被打死"
 
-#: src/localplayer.cpp:1422
+#: src/localplayer.cpp:1427
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1424
+#: src/localplayer.cpp:1429
 msgid "Item is too heavy."
 msgstr "项目是太重了。"
 
-#: src/localplayer.cpp:1426
+#: src/localplayer.cpp:1431
 msgid "Item is too far away."
 msgstr "物品太远了。"
 
-#: src/localplayer.cpp:1428
+#: src/localplayer.cpp:1433
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1430
+#: src/localplayer.cpp:1435
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1433
+#: src/localplayer.cpp:1438
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1436
+#: src/localplayer.cpp:1441
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1460
+#: src/localplayer.cpp:1465
 #, 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:3174
+#: src/localplayer.cpp:3179
 msgid "Away"
 msgstr "距离"
 
-#: src/localplayer.cpp:3494
+#: src/localplayer.cpp:3507
 msgid "Follow: "
 msgstr "跟随:"
 
-#: src/localplayer.cpp:3496 src/localplayer.cpp:3511
+#: src/localplayer.cpp:3509 src/localplayer.cpp:3524
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3503
+#: src/localplayer.cpp:3516
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3505 src/localplayer.cpp:3513
+#: src/localplayer.cpp:3518 src/localplayer.cpp:3526
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3858
+#: src/localplayer.cpp:3871
 msgid "You see "
 msgstr "你看"
 
-- 
cgit v1.2.3-60-g2f50


From 17489dd53a4c094e351c4de1a48c1ff20417f375 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sat, 1 Oct 2011 01:32:17 +0300
Subject: Change version to 1.1.10.2.

---
 ChangeLog    | 17 ++++++++++++++++-
 README       |  2 +-
 README.txt   |  2 +-
 configure.ac |  2 +-
 packwin      |  2 +-
 src/main.h   |  4 ++--
 6 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6f75c08c1..ea6a84ead 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,20 @@
+2011-10-02 New release 1.1.10.2
+ManaPlus:
+fix: inactive state.
+fix: hide inventory filter if window too small.
+fix: mouse selection.
+fix: speed in targeting monsters.
+fix: move to target in attack range.
+add: comment for spells/commands.
+add: split keyboard keys to groups.
+add: chat or other windows scrolling with dragging mouse.
+add: limits for stop attack packet.
+add: show current experience after max level (for tmw after 99 level).
+add: untarget key. it not stop attack but remove selection from current target.
+add: amount field in buy dialog.
+
 2011-09-18 New release 1.1.9.18
-Manaplus:
+ManaPlus:
 fix: restore windows visible state after restart.
 fix: players sorting in relation and party tab.
 fix: configuration settings in first start.
diff --git a/README b/README
index 796236435..6956d4ef0 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 THE MANA PLUS CLIENT
 ===============
 
- Version: 1.1.9.18        Date: 2011-09-18
+ Version: 1.1.10.2        Date: 2011-10-02
 
  Development team:
   - See AUTHORS file for a list
diff --git a/README.txt b/README.txt
index 1585d5e0f..758408520 100644
--- a/README.txt
+++ b/README.txt
@@ -1,7 +1,7 @@
 THE MANA PLUS CLIENT
 ===============
 
- Version: 1.1.9.18        Date: 2011-09-18
+ Version: 1.1.10.2        Date: 2011-10-02
 
  Development team:
   - See AUTHORS file for a list
diff --git a/configure.ac b/configure.ac
index af9707059..c234fcbe5 100755
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.59)
-AC_INIT([ManaPlus], [1.1.9.18], [akaras@inbox.ru], [manaplus])
+AC_INIT([ManaPlus], [1.1.10.2], [akaras@inbox.ru], [manaplus])
 AM_INIT_AUTOMAKE([1.9])
 AC_CONFIG_HEADERS([config.h:config.h.in])
 AC_LANG_CPLUSPLUS
diff --git a/packwin b/packwin
index ae5398119..633f895b8 100755
--- a/packwin
+++ b/packwin
@@ -5,7 +5,7 @@ dir=`pwd`
 cd packaging/windows
 ./make-translations.sh
 makensis -DDLLDIR=$dir/../mana_win/libs/dll/ \
-    -DPRODUCT_VERSION="1.1.9.18" \
+    -DPRODUCT_VERSION="1.1.10.2" \
     -DEXESUFFIX=/src \
     -DUPX=true \
     setup.nsi
diff --git a/src/main.h b/src/main.h
index 0348d2700..95a1b1698 100644
--- a/src/main.h
+++ b/src/main.h
@@ -85,8 +85,8 @@
 //define DEBUG_ALPHA_CACHE 1
 //define DEBUG_OPENGL_LEAKS 1
 
-#define SMALL_VERSION "1.1.9.18"
-#define CHECK_VERSION "01.01.09.18"
+#define SMALL_VERSION "1.1.10.2"
+#define CHECK_VERSION "01.01.10.02"
 
 
 #define PACKAGE_EXTENDED_VERSION "ManaPlus (" PACKAGE_OS \
-- 
cgit v1.2.3-60-g2f50


From 99771a1fb50286fdb0b511f425312503e657eddc Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sat, 1 Oct 2011 05:07:19 +0300
Subject: Update es, pt, pt_BR translations.

---
 po/es.po    | 8 ++++----
 po/pt.po    | 8 ++++----
 po/pt_BR.po | 8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/po/es.po b/po/es.po
index 2ad19eb6b..b3d8a9a89 100644
--- a/po/es.po
+++ b/po/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
 "POT-Creation-Date: 2011-10-01 01:22+0300\n"
-"PO-Revision-Date: 2011-09-30 14:45+0000\n"
-"Last-Translator: akaras <akaras@inbox.ru>\n"
+"PO-Revision-Date: 2011-09-30 23:19+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"
@@ -423,7 +423,7 @@ msgstr "Precio: %s / Total: %s"
 
 #: src/gui/buydialog.cpp:103
 msgid "Amount:"
-msgstr ""
+msgstr "Cantidad:"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
@@ -3854,7 +3854,7 @@ msgstr "Parar el ataque"
 
 #: src/keyboardconfig.cpp:65
 msgid "Untarget"
-msgstr ""
+msgstr "Sin seleccionar"
 
 #: src/keyboardconfig.cpp:66
 msgid "Target Closest"
diff --git a/po/pt.po b/po/pt.po
index a7cd4b86c..1d9e989dc 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -11,8 +11,8 @@ msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
 "POT-Creation-Date: 2011-10-01 01:22+0300\n"
-"PO-Revision-Date: 2011-09-30 14:45+0000\n"
-"Last-Translator: akaras <akaras@inbox.ru>\n"
+"PO-Revision-Date: 2011-10-01 01:07+0000\n"
+"Last-Translator: freya <freya.df@gmail.com>\n"
 "Language-Team: Portuguese (http://www.transifex.net/projects/p/manaplus/team/"
 "pt/)\n"
 "Language: pt\n"
@@ -421,7 +421,7 @@ msgstr "Preço: %s / Total: %s"
 
 #: src/gui/buydialog.cpp:103
 msgid "Amount:"
-msgstr ""
+msgstr "Quantidade:"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
@@ -3849,7 +3849,7 @@ msgstr "Parar ataque"
 
 #: src/keyboardconfig.cpp:65
 msgid "Untarget"
-msgstr ""
+msgstr "Remover alvo"
 
 #: src/keyboardconfig.cpp:66
 msgid "Target Closest"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 5f046c8f4..c049a45e7 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -13,8 +13,8 @@ msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
 "POT-Creation-Date: 2011-10-01 01:22+0300\n"
-"PO-Revision-Date: 2011-09-30 14:45+0000\n"
-"Last-Translator: akaras <akaras@inbox.ru>\n"
+"PO-Revision-Date: 2011-10-01 01:07+0000\n"
+"Last-Translator: freya <freya.df@gmail.com>\n"
 "Language-Team: Portuguese (Brazilian) (http://www.transifex.net/projects/p/"
 "manaplus/team/pt_BR/)\n"
 "Language: pt_BR\n"
@@ -423,7 +423,7 @@ msgstr "Preço: %s / Total: %s"
 
 #: src/gui/buydialog.cpp:103
 msgid "Amount:"
-msgstr ""
+msgstr "Quantidade:"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
@@ -3851,7 +3851,7 @@ msgstr "Parar ataque"
 
 #: src/keyboardconfig.cpp:65
 msgid "Untarget"
-msgstr ""
+msgstr "Remover alvo"
 
 #: src/keyboardconfig.cpp:66
 msgid "Target Closest"
-- 
cgit v1.2.3-60-g2f50